1
Fork 0
mirror of https://github.com/Steffo99/hella-farm.git synced 2024-11-21 23:54:23 +00:00

fix the rest of the things

This commit is contained in:
Steffo 2024-05-03 01:47:54 +02:00
parent 233905daae
commit 386820d20a
Signed by: steffo
GPG key ID: 5ADA3868646C3FC0
7 changed files with 15 additions and 14 deletions

View file

@ -451,9 +451,9 @@ scene = ExtResource("14_nw8pn")
[node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("6_qsds3")] [node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("6_qsds3")]
autostart = true autostart = true
mean_secs = 0.7 mean_secs = 0.3
min_secs = 0.1 min_secs = 0.1
max_secs = 1.3 max_secs = 0.5
[node name="MovementSampler" parent="." instance=ExtResource("7_nq78n")] [node name="MovementSampler" parent="." instance=ExtResource("7_nq78n")]
@ -484,10 +484,10 @@ alternative_priority = 20
[node name="TiredTimer" parent="MovementWander" instance=ExtResource("6_qsds3")] [node name="TiredTimer" parent="MovementWander" instance=ExtResource("6_qsds3")]
one_shot = true one_shot = true
mean_secs = 0.6 mean_secs = 0.4
deviation = 0.5 deviation = 0.5
min_secs = 0.3 min_secs = 0.1
max_secs = 1.2 max_secs = 0.9
[node name="TrackerMeat" parent="MovementWander" instance=ExtResource("14_mk76g")] [node name="TrackerMeat" parent="MovementWander" instance=ExtResource("14_mk76g")]
collision_mask = 8 collision_mask = 8

View file

@ -199,7 +199,6 @@ radius = 50.0
radius = 56.0 radius = 56.0
[node name="Cthulhu" type="CharacterBody2D"] [node name="Cthulhu" type="CharacterBody2D"]
y_sort_enabled = true
collision_layer = 8 collision_layer = 8
collision_mask = 8 collision_mask = 8
script = ExtResource("1_b55wc") script = ExtResource("1_b55wc")
@ -209,7 +208,6 @@ position = Vector2(0, -84)
[node name="Sprite" parent="SpriteFocus" instance=ExtResource("1_a8ato")] [node name="Sprite" parent="SpriteFocus" instance=ExtResource("1_a8ato")]
unique_name_in_owner = true unique_name_in_owner = true
y_sort_enabled = true
position = Vector2(0, 48) position = Vector2(0, 48)
scale = Vector2(2, 2) scale = Vector2(2, 2)
texture = ExtResource("2_13vnj") texture = ExtResource("2_13vnj")

View file

@ -321,9 +321,8 @@ scene = ExtResource("5_yrfoq")
[node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("10_phvea")] [node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("10_phvea")]
autostart = true autostart = true
mean_secs = 3.4
min_secs = 1.0 min_secs = 1.0
max_secs = 5.0 max_secs = 3.0
[node name="MovementSampler" parent="." instance=ExtResource("7_ech8d")] [node name="MovementSampler" parent="." instance=ExtResource("7_ech8d")]

View file

@ -18,7 +18,7 @@ offset = Vector2(0, -8)
[node name="StoneArea" type="Area2D" parent="."] [node name="StoneArea" type="Area2D" parent="."]
position = Vector2(0, -45) position = Vector2(0, -45)
collision_layer = 8 collision_layer = 24
collision_mask = 0 collision_mask = 0
monitoring = false monitoring = false
@ -32,7 +32,6 @@ debug_color = Color(1, 1, 1, 0.294118)
diet = &"Trap" diet = &"Trap"
[node name="SacrificeTracker" parent="StoneArea" instance=ExtResource("2_6m7pn")] [node name="SacrificeTracker" parent="StoneArea" instance=ExtResource("2_6m7pn")]
collision_mask = 8
[node name="Shape" type="CollisionShape2D" parent="StoneArea/SacrificeTracker"] [node name="Shape" type="CollisionShape2D" parent="StoneArea/SacrificeTracker"]
z_index = 1 z_index = 1

View file

@ -414,12 +414,14 @@ bus = &"FallSounds"
[connection signal="move" from="MovementIdle" to="." method="_on_move"] [connection signal="move" from="MovementIdle" to="." method="_on_move"]
[connection signal="move_disabled" from="MovementIdle" to="MovementIdle/BoredTimer" method="stop"] [connection signal="move_disabled" from="MovementIdle" to="MovementIdle/BoredTimer" method="stop"]
[connection signal="move_enabled" from="MovementIdle" to="MovementIdle/BoredTimer" method="start"] [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="timeout" from="MovementIdle/BoredTimer" to="MovementWander" method="randomize_direction"]
[connection signal="changed_direction" from="MovementWander" to="MovementWander/WanderPriority" method="priority_conditional"] [connection signal="changed_direction" from="MovementWander" to="MovementWander/WanderPriority" method="priority_conditional"]
[connection signal="move" from="MovementWander" to="." method="_on_move"] [connection signal="move" from="MovementWander" to="." method="_on_move"]
[connection signal="move_disabled" from="MovementWander" to="MovementWander/TiredTimer" method="stop"] [connection signal="move_disabled" from="MovementWander" to="MovementWander/TiredTimer" method="stop"]
[connection signal="move_enabled" from="MovementWander" to="MovementWander/TiredTimer" method="start"] [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" 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="changed_target" from="MovementRunFromMouse" to="MovementRunFromMouse/RunFromMousePriority" method="priority_conditional"]
[connection signal="move" from="MovementRunFromMouse" to="." method="_on_move"] [connection signal="move" from="MovementRunFromMouse" to="." method="_on_move"]
[connection signal="move_enabled" from="MovementRunFromMouse" to="MovementWander" method="clear_direction"] [connection signal="move_enabled" from="MovementRunFromMouse" to="MovementWander" method="clear_direction"]

View file

@ -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/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/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="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"]

View file

@ -322,9 +322,10 @@ scene = ExtResource("14_cfqh8")
[node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("11_20lvf")] [node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("11_20lvf")]
autostart = true autostart = true
mean_secs = 0.15 mean_secs = 0.08
min_secs = 0.05 deviation = 0.5
max_secs = 0.3 min_secs = 0.02
max_secs = 0.14
[node name="MovementSampler" parent="." instance=ExtResource("4_i1htf")] [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_rotation_speed"]
[connection signal="ready" from="MovementTilt" to="MovementTilt" method="randomize_direction"] [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" 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="changed_target" from="MovementTrap" to="MovementTrap/TrapPriority" method="priority_conditional"]
[connection signal="move" from="MovementTrap" to="." method="_on_move"] [connection signal="move" from="MovementTrap" to="." method="_on_move"]
[connection signal="move_disabled" from="MovementTrap" to="." method="_on_freed"] [connection signal="move_disabled" from="MovementTrap" to="." method="_on_freed"]