From 386820d20a7051efcdc20d15aecb5956e2c8444a Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 3 May 2024 01:47:54 +0200 Subject: [PATCH] fix the rest of the things --- entities/chupacabra.tscn | 10 +++++----- entities/cthulhu.tscn | 2 -- entities/imp.tscn | 3 +-- entities/sacrifice_stone.tscn | 3 +-- entities/sheep.tscn | 2 ++ entities/summoning_circle_pentagram.tscn | 1 + entities/watcher.tscn | 8 +++++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/entities/chupacabra.tscn b/entities/chupacabra.tscn index 450c7ed..465c2d2 100644 --- a/entities/chupacabra.tscn +++ b/entities/chupacabra.tscn @@ -451,9 +451,9 @@ scene = ExtResource("14_nw8pn") [node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("6_qsds3")] autostart = true -mean_secs = 0.7 +mean_secs = 0.3 min_secs = 0.1 -max_secs = 1.3 +max_secs = 0.5 [node name="MovementSampler" parent="." instance=ExtResource("7_nq78n")] @@ -484,10 +484,10 @@ alternative_priority = 20 [node name="TiredTimer" parent="MovementWander" instance=ExtResource("6_qsds3")] one_shot = true -mean_secs = 0.6 +mean_secs = 0.4 deviation = 0.5 -min_secs = 0.3 -max_secs = 1.2 +min_secs = 0.1 +max_secs = 0.9 [node name="TrackerMeat" parent="MovementWander" instance=ExtResource("14_mk76g")] collision_mask = 8 diff --git a/entities/cthulhu.tscn b/entities/cthulhu.tscn index 51b1d16..ed789ac 100644 --- a/entities/cthulhu.tscn +++ b/entities/cthulhu.tscn @@ -199,7 +199,6 @@ radius = 50.0 radius = 56.0 [node name="Cthulhu" type="CharacterBody2D"] -y_sort_enabled = true collision_layer = 8 collision_mask = 8 script = ExtResource("1_b55wc") @@ -209,7 +208,6 @@ position = Vector2(0, -84) [node name="Sprite" parent="SpriteFocus" instance=ExtResource("1_a8ato")] unique_name_in_owner = true -y_sort_enabled = true position = Vector2(0, 48) scale = Vector2(2, 2) texture = ExtResource("2_13vnj") diff --git a/entities/imp.tscn b/entities/imp.tscn index 0ec8b7d..6897201 100644 --- a/entities/imp.tscn +++ b/entities/imp.tscn @@ -321,9 +321,8 @@ scene = ExtResource("5_yrfoq") [node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("10_phvea")] autostart = true -mean_secs = 3.4 min_secs = 1.0 -max_secs = 5.0 +max_secs = 3.0 [node name="MovementSampler" parent="." instance=ExtResource("7_ech8d")] diff --git a/entities/sacrifice_stone.tscn b/entities/sacrifice_stone.tscn index 95eb83b..21aa44b 100644 --- a/entities/sacrifice_stone.tscn +++ b/entities/sacrifice_stone.tscn @@ -18,7 +18,7 @@ offset = Vector2(0, -8) [node name="StoneArea" type="Area2D" parent="."] position = Vector2(0, -45) -collision_layer = 8 +collision_layer = 24 collision_mask = 0 monitoring = false @@ -32,7 +32,6 @@ debug_color = Color(1, 1, 1, 0.294118) diet = &"Trap" [node name="SacrificeTracker" parent="StoneArea" instance=ExtResource("2_6m7pn")] -collision_mask = 8 [node name="Shape" type="CollisionShape2D" parent="StoneArea/SacrificeTracker"] z_index = 1 diff --git a/entities/sheep.tscn b/entities/sheep.tscn index 2d37222..096330b 100644 --- a/entities/sheep.tscn +++ b/entities/sheep.tscn @@ -414,12 +414,14 @@ bus = &"FallSounds" [connection signal="move" from="MovementIdle" to="." method="_on_move"] [connection signal="move_disabled" from="MovementIdle" to="MovementIdle/BoredTimer" method="stop"] [connection signal="move_enabled" from="MovementIdle" to="MovementIdle/BoredTimer" method="start"] +[connection signal="timeout" from="MovementIdle/BoredTimer" to="MovementIdle/BoredTimer" method="randomize_wait_time"] [connection signal="timeout" from="MovementIdle/BoredTimer" to="MovementWander" method="randomize_direction"] [connection signal="changed_direction" from="MovementWander" to="MovementWander/WanderPriority" method="priority_conditional"] [connection signal="move" from="MovementWander" to="." method="_on_move"] [connection signal="move_disabled" from="MovementWander" to="MovementWander/TiredTimer" method="stop"] [connection signal="move_enabled" from="MovementWander" to="MovementWander/TiredTimer" method="start"] [connection signal="timeout" from="MovementWander/TiredTimer" to="MovementWander" method="clear_direction"] +[connection signal="timeout" from="MovementWander/TiredTimer" to="MovementWander/TiredTimer" method="randomize_wait_time"] [connection signal="changed_target" from="MovementRunFromMouse" to="MovementRunFromMouse/RunFromMousePriority" method="priority_conditional"] [connection signal="move" from="MovementRunFromMouse" to="." method="_on_move"] [connection signal="move_enabled" from="MovementRunFromMouse" to="MovementWander" method="clear_direction"] diff --git a/entities/summoning_circle_pentagram.tscn b/entities/summoning_circle_pentagram.tscn index 4492565..83cb27e 100644 --- a/entities/summoning_circle_pentagram.tscn +++ b/entities/summoning_circle_pentagram.tscn @@ -99,3 +99,4 @@ scene = ExtResource("9_wli14") [connection signal="matched" from="Recipes/FiveImps" to="Spawners/Chupacabra" method="spawn" flags=3 unbinds=1] [connection signal="matched" from="Recipes/FiveChupacabras" to="Spawners/Watcher" method="spawn" flags=3 unbinds=1] [connection signal="matched" from="Recipes/FiveWatchers" to="Spawners/Cthulhu" method="spawn" flags=3 unbinds=1] +[connection signal="spawned" from="Spawners/Cthulhu" to="Spawners/Cthulhu" method="log_spawned"] diff --git a/entities/watcher.tscn b/entities/watcher.tscn index d929999..44655aa 100644 --- a/entities/watcher.tscn +++ b/entities/watcher.tscn @@ -322,9 +322,10 @@ scene = ExtResource("14_cfqh8") [node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("11_20lvf")] autostart = true -mean_secs = 0.15 -min_secs = 0.05 -max_secs = 0.3 +mean_secs = 0.08 +deviation = 0.5 +min_secs = 0.02 +max_secs = 0.14 [node name="MovementSampler" parent="." instance=ExtResource("4_i1htf")] @@ -424,6 +425,7 @@ bus = &"KillSounds" [connection signal="ready" from="MovementTilt" to="MovementTilt" method="randomize_rotation_speed"] [connection signal="ready" from="MovementTilt" to="MovementTilt" method="randomize_direction"] [connection signal="timeout" from="MovementTilt/TimerStddev" to="MovementTilt" method="randomize_rotation_speed"] +[connection signal="timeout" from="MovementTilt/TimerStddev" to="MovementTilt/TimerStddev" method="randomize_wait_time"] [connection signal="changed_target" from="MovementTrap" to="MovementTrap/TrapPriority" method="priority_conditional"] [connection signal="move" from="MovementTrap" to="." method="_on_move"] [connection signal="move_disabled" from="MovementTrap" to="." method="_on_freed"]