From f0c26f6c10aa93fb796bf7287fcbdf9a27e1406c Mon Sep 17 00:00:00 2001 From: Ultrablob Date: Thu, 6 Feb 2025 13:13:44 -0500 Subject: [PATCH] change stuff --- bullet.tscn | 2 +- entagon.tscn | 2 +- main.tscn | 5 ++--- main_menu.tscn | 4 +--- tar.tscn | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/bullet.tscn b/bullet.tscn index 45568ea..2398538 100644 --- a/bullet.tscn +++ b/bullet.tscn @@ -55,8 +55,8 @@ radius = 30.0 collision_layer = 2 physics_material_override = SubResource("PhysicsMaterial_xnhwp") gravity_scale = 1.66533e-16 -max_contacts_reported = 1 contact_monitor = true +max_contacts_reported = 1 linear_velocity = Vector2(2.08165e-12, 2.08165e-12) script = ExtResource("1_3q13i") diff --git a/entagon.tscn b/entagon.tscn index 8106dd9..4d15de3 100644 --- a/entagon.tscn +++ b/entagon.tscn @@ -65,8 +65,8 @@ radius = 30.0 collision_mask = 0 physics_material_override = SubResource("PhysicsMaterial_odemo") gravity_scale = 1.66533e-16 -max_contacts_reported = 2 contact_monitor = true +max_contacts_reported = 2 linear_damp = 3.0 angular_velocity = 0.174533 script = ExtResource("1_726g8") diff --git a/main.tscn b/main.tscn index 1e45ebb..f39d532 100644 --- a/main.tscn +++ b/main.tscn @@ -13,7 +13,7 @@ [ext_resource type="Script" path="res://wave_enemy.gd" id="7_54h7d"] [ext_resource type="Texture2D" uid="uid://cwquv3mq5kk1d" path="res://countdown-spritesheet.png" id="8_e1eub"] [ext_resource type="Resource" uid="uid://ba01r62bwm6av" path="res://eptagon_enemy.tres" id="9_q67ak"] -[ext_resource type="Resource" uid="uid://c805aej5v7cvr" path="res://eart.tres" id="10_jib8h"] +[ext_resource type="Resource" path="res://eart.tres" id="10_jib8h"] [ext_resource type="AudioStream" uid="uid://dn65uapn0wsok" path="res://impactMetal_002.ogg" id="11_acuni"] [ext_resource type="Script" path="res://CollisionCheck.gd" id="11_ryeyk"] [ext_resource type="FontFile" uid="uid://bnguin7bsyx6e" path="res://Kenney Future.ttf" id="11_s4q6p"] @@ -129,7 +129,7 @@ wait_for_killed = true [sub_resource type="Resource" id="Resource_2j32b"] script = ExtResource("4_um0x7") -enemies = Array[ExtResource("7_54h7d")]([ExtResource("5_e24vf"), ExtResource("9_q67ak")]) +enemies = Array[ExtResource("7_54h7d")]([ExtResource("5_xdrk0"), ExtResource("9_q67ak")]) quantities = Array[int]([2, 2]) spawning_duration = 10.0 wait = 3.0 @@ -670,7 +670,6 @@ script = ExtResource("1_3dydx") script = ExtResource("1_ifu8g") waves = Array[ExtResource("4_um0x7")]([SubResource("Resource_ur7l5"), SubResource("Resource_kupyp"), SubResource("Resource_o8cet"), SubResource("Resource_0cevq"), SubResource("Resource_eppj0"), SubResource("Resource_rpu1y"), SubResource("Resource_4b1vo"), SubResource("Resource_gg7kj"), SubResource("Resource_fjkob"), SubResource("Resource_5sdy5"), SubResource("Resource_61v84"), SubResource("Resource_82qld"), SubResource("Resource_2j32b")]) wave_label = NodePath("../UI/Wave Count") -start_wave = 10 [node name="Timer" type="Timer" parent="Spawner"] wait_time = 0.1 diff --git a/main_menu.tscn b/main_menu.tscn index c0e6a86..7e447e5 100644 --- a/main_menu.tscn +++ b/main_menu.tscn @@ -163,7 +163,6 @@ theme_override_fonts/font = ExtResource("4_ybv7t") theme_override_font_sizes/font_size = 54 item_count = 2 popup/item_0/text = "Relative" -popup/item_0/id = 0 popup/item_1/text = "Absolute" popup/item_1/id = 1 @@ -181,7 +180,6 @@ theme_override_fonts/font = ExtResource("4_ybv7t") theme_override_font_sizes/font_size = 54 item_count = 3 popup/item_0/text = "Row" -popup/item_0/id = 0 popup/item_1/text = "Ite" popup/item_1/id = 1 popup/item_2/text = "Iamond" @@ -325,8 +323,8 @@ bus = &"Music" [connection signal="pressed" from="Layout/Play" to="." method="play"] [connection signal="pressed" from="Layout/Settings" to="Settings Panel" method="show"] [connection signal="pressed" from="Layout/Tutorial" to="Tutorial Text" method="show"] -[connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="save"] [connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="hide"] +[connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="save"] [connection signal="text_changed" from="Settings Panel/Menu/Username" to="Settings Panel" method="check_valid"] [connection signal="text_changed" from="Settings Panel/Menu/Username" to="Settings Panel/Menu/Username" method="check"] [connection signal="value_changed" from="Settings Panel/Menu/MusicVolume" to="Settings Panel/Menu/MusicVolume" method="_on_value_changed"] diff --git a/tar.tscn b/tar.tscn index d5593c0..4044f7a 100644 --- a/tar.tscn +++ b/tar.tscn @@ -467,8 +467,8 @@ animations = [{ position = Vector2(386, 292) gravity_scale = 1.66533e-16 freeze = true -max_contacts_reported = 5 contact_monitor = true +max_contacts_reported = 5 linear_damp = 2.0 script = ExtResource("1_7s3by")