From ae06e7cce93830747314c52e1b2cdc423256e5e4 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 2 May 2024 03:36:23 +0200 Subject: [PATCH] fix yindex --- behaviours/draggable.tscn | 2 +- entities/barn.tscn | 14 +++++++-- entities/chupacabra.tscn | 40 ++++++++++++++----------- entities/cthulhu.tscn | 29 +++++++++--------- entities/gold.tscn | 6 ++-- entities/imp.tscn | 29 ++++++++++++------ entities/monocle.tscn | 6 +++- entities/sacrifice_stone.tscn | 9 +++--- entities/sheep.tscn | 56 +++++++++++++++++++---------------- entities/skull.tscn | 21 ++++++++----- entities/top_hat.tscn | 18 ++++++----- entities/tree.tscn | 6 ++-- entities/watcher.tscn | 42 +++++++++++++------------- scenes/game/cursor.tscn | 2 +- scenes/game/main_game.tscn | 3 -- 15 files changed, 162 insertions(+), 121 deletions(-) diff --git a/behaviours/draggable.tscn b/behaviours/draggable.tscn index 3fe3100..9a8e760 100644 --- a/behaviours/draggable.tscn +++ b/behaviours/draggable.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://behaviours/draggable.gd" id="1_hdedq"] [node name="Draggable" type="Area2D"] -collision_layer = 0 +collision_layer = 128 collision_mask = 128 input_pickable = false monitoring = false diff --git a/entities/barn.tscn b/entities/barn.tscn index 78128c2..29c5a10 100644 --- a/entities/barn.tscn +++ b/entities/barn.tscn @@ -451,16 +451,22 @@ libraries = { } [node name="Top" type="CollisionShape2D" parent="."] +z_index = 10 position = Vector2(32, -63) shape = SubResource("RectangleShape2D_7lwl1") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Bottom" type="CollisionShape2D" parent="."] +z_index = 10 position = Vector2(32, 1) shape = SubResource("RectangleShape2D_l8xvy") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Back" type="CollisionShape2D" parent="."] +z_index = 10 position = Vector2(92.5, -31) shape = SubResource("RectangleShape2D_cpwqc") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="ClickableArea" type="Area2D" parent="."] collision_layer = 128 @@ -468,21 +474,23 @@ collision_mask = 128 monitoring = false [node name="Shape" type="CollisionShape2D" parent="ClickableArea"] +z_index = 10 position = Vector2(32, -83) shape = SubResource("RectangleShape2D_1bxxn") -debug_color = Color(0.584314, 0.380392, 1, 0.243137) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="BlockedTracker" parent="." instance=ExtResource("6_x01u8")] unique_name_in_owner = true [node name="Shape" type="CollisionShape2D" parent="BlockedTracker"] +z_index = 10 position = Vector2(50.5, -31) shape = SubResource("RectangleShape2D_0ike4") -debug_color = Color(0.733333, 0.447059, 0.411765, 0.419608) +debug_color = Color(1, 1, 0, 0.294118) [node name="SheepSpawner" parent="." instance=ExtResource("7_07yq6")] unique_name_in_owner = true -position = Vector2(50, -26) +position = Vector2(50, -1) scene = ExtResource("8_kgtsi") [connection signal="coin_inserted" from="." to="SheepSpawner" method="spawn"] diff --git a/entities/chupacabra.tscn b/entities/chupacabra.tscn index b2a3fa4..5ac1ef9 100644 --- a/entities/chupacabra.tscn +++ b/entities/chupacabra.tscn @@ -358,8 +358,8 @@ radius = 320.0 [sub_resource type="CircleShape2D" id="CircleShape2D_dcrcb"] radius = 48.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_kjhx2"] -radius = 25.19 +[sub_resource type="CircleShape2D" id="CircleShape2D_7g5uo"] +radius = 32.0 [sub_resource type="CircleShape2D" id="CircleShape2D_vm5g3"] radius = 32.0 @@ -377,25 +377,24 @@ unique_name_in_owner = true y_sort_enabled = true scale = Vector2(2, 2) texture = ExtResource("2_3kvme") +offset = Vector2(0, -15.5) left_texture = ExtResource("2_3kvme") right_texture = ExtResource("3_rolht") [node name="TopHatter" parent="Sprite" instance=ExtResource("16_ltvqn")] unique_name_in_owner = true -scale = Vector2(0.5, 0.5) +position = Vector2(0, -15.5) acceptable_diets = Array[StringName]([&"TopHat"]) target = 1 [node name="Sprite" type="Sprite2D" parent="Sprite/TopHatter"] -visible = false z_index = 1 -position = Vector2(-1, -39) -scale = Vector2(2, 2) +position = Vector2(-3.5, -20) texture = ExtResource("5_qjgou") [node name="Shape" type="CollisionShape2D" parent="Sprite/TopHatter"] shape = SubResource("CircleShape2D_binyt") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="Sprite/TopHatter" instance=ExtResource("7_hdgjp")] scene = ExtResource("8_fa8aq") @@ -405,20 +404,18 @@ enabled = false [node name="Monocler" parent="Sprite" instance=ExtResource("16_ltvqn")] unique_name_in_owner = true -scale = Vector2(0.5, 0.5) +position = Vector2(0, -15.5) acceptable_diets = Array[StringName]([&"Monocle"]) target = 1 [node name="Sprite" type="Sprite2D" parent="Sprite/Monocler"] -visible = false z_index = 1 -position = Vector2(-9, -17) -scale = Vector2(2, 2) +position = Vector2(-4, -8) texture = ExtResource("5_bcm2q") [node name="Shape" type="CollisionShape2D" parent="Sprite/Monocler"] shape = SubResource("CircleShape2D_binyt") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="Sprite/Monocler" instance=ExtResource("7_hdgjp")] scene = ExtResource("10_k033w") @@ -427,6 +424,7 @@ enabled = false [node name="Sacrificable" parent="Sprite/Monocler" instance=ExtResource("7_igror")] [node name="Shape" type="CollisionShape2D" parent="."] +position = Vector2(0, -31) shape = SubResource("CircleShape2D_mnexs") [node name="Animator" type="AnimationPlayer" parent="."] @@ -446,6 +444,7 @@ diet = &"Demon" kind = &"Chupacabra" [node name="GoldSpawner" parent="." instance=ExtResource("7_hdgjp")] +position = Vector2(0, -31) scene = ExtResource("14_nw8pn") [node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("6_qsds3")] @@ -456,6 +455,7 @@ max_secs = 1.8 [node name="MovementSampler" parent="." instance=ExtResource("7_nq78n")] [node name="MovementIdle" parent="." instance=ExtResource("8_7fxrt")] +position = Vector2(0, -31) speed = 0.0 enabled = false @@ -472,6 +472,7 @@ max_secs = 9.0 [node name="MovementWander" parent="." instance=ExtResource("8_7fxrt")] unique_name_in_owner = true +position = Vector2(0, -31) speed = 333.0 enabled = false @@ -491,7 +492,7 @@ acceptable_diets = Array[StringName]([&"Meat"]) [node name="Shape" type="CollisionShape2D" parent="MovementWander/TrackerMeat"] shape = SubResource("CircleShape2D_wya3j") -debug_color = Color(1, 0.498039, 0, 0) +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementWander/TrackerMeat" node_paths=PackedStringArray("tracker") instance=ExtResource("15_xay6p")] tracker = NodePath("..") @@ -500,9 +501,10 @@ tracker = NodePath("..") [node name="Shape" type="CollisionShape2D" parent="MovementWander/CursorSense"] shape = SubResource("CircleShape2D_dcrcb") -debug_color = Color(1, 1, 0, 0) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="MovementTrap" parent="." instance=ExtResource("13_vh42q")] +position = Vector2(0, -31) speed = 600.0 enabled = false @@ -514,13 +516,14 @@ collision_mask = 8 acceptable_diets = Array[StringName]([&"Trap"]) [node name="Shape" type="CollisionShape2D" parent="MovementTrap/TrackerTrap"] -shape = SubResource("CircleShape2D_kjhx2") -debug_color = Color(1, 0.498039, 0, 0) +shape = SubResource("CircleShape2D_7g5uo") +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementTrap/TrackerTrap" node_paths=PackedStringArray("tracker") instance=ExtResource("15_xay6p")] tracker = NodePath("..") [node name="MovementDrag" parent="." instance=ExtResource("12_oildi")] +position = Vector2(0, -31) enabled = false [node name="DragPriority" parent="MovementDrag" instance=ExtResource("9_7i81t")] @@ -530,7 +533,7 @@ alternative_priority = 50 [node name="Shape" type="CollisionShape2D" parent="MovementDrag/Draggable"] shape = SubResource("CircleShape2D_vm5g3") -debug_color = Color(1, 1, 1, 0) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] stream = ExtResource("14_u2uf4") @@ -542,11 +545,12 @@ bus = &"FallSounds" [node name="Eater" parent="." instance=ExtResource("16_ltvqn")] unique_name_in_owner = true +position = Vector2(0, -31) acceptable_diets = Array[StringName]([&"Meat"]) [node name="Shape" type="CollisionShape2D" parent="Eater"] shape = SubResource("CircleShape2D_binyt") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="EatSound" type="AudioStreamPlayer2D" parent="Eater"] stream = ExtResource("17_ccla5") diff --git a/entities/cthulhu.tscn b/entities/cthulhu.tscn index 5d32e7a..9e7f490 100644 --- a/entities/cthulhu.tscn +++ b/entities/cthulhu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://gl4umoff474y"] +[gd_scene load_steps=28 format=3 uid="uid://gl4umoff474y"] [ext_resource type="PackedScene" uid="uid://bxbjfev0lhwws" path="res://behaviours/sprite_left_right.tscn" id="1_a8ato"] [ext_resource type="Script" path="res://entities/cthulhu.gd" id="1_b55wc"] @@ -21,7 +21,7 @@ [ext_resource type="AudioStream" uid="uid://c1yuksnjdd6g2" path="res://entities/imp_eat.ogg" id="19_3hopf"] [sub_resource type="CircleShape2D" id="CircleShape2D_wjkbi"] -radius = 56.0 +radius = 28.0 [sub_resource type="CircleShape2D" id="CircleShape2D_uw0y6"] radius = 50.0 @@ -193,6 +193,9 @@ _data = { [sub_resource type="CircleShape2D" id="CircleShape2D_ptf8q"] radius = 50.0 +[sub_resource type="CircleShape2D" id="CircleShape2D_4bt8o"] +radius = 56.0 + [node name="Cthulhu" type="CharacterBody2D"] y_sort_enabled = true collision_layer = 8 @@ -200,6 +203,7 @@ collision_mask = 8 script = ExtResource("1_b55wc") [node name="SpriteFocus" type="Node2D" parent="."] +position = Vector2(0, -84) [node name="Sprite" parent="SpriteFocus" instance=ExtResource("1_a8ato")] unique_name_in_owner = true @@ -213,20 +217,18 @@ right_texture = ExtResource("4_1wxgg") [node name="TopHatter" parent="SpriteFocus/Sprite" instance=ExtResource("15_vopba")] unique_name_in_owner = true position = Vector2(0, -6) -scale = Vector2(0.5, 0.5) acceptable_diets = Array[StringName]([&"TopHat"]) target = 1 [node name="Sprite" type="Sprite2D" parent="SpriteFocus/Sprite/TopHatter"] visible = false z_index = 1 -position = Vector2(1, -54) -scale = Vector2(2, 2) +position = Vector2(0, -28) texture = ExtResource("5_a1p2d") [node name="Shape" type="CollisionShape2D" parent="SpriteFocus/Sprite/TopHatter"] shape = SubResource("CircleShape2D_wjkbi") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="SpriteFocus/Sprite/TopHatter" instance=ExtResource("7_op2gq")] scene = ExtResource("8_essd3") @@ -235,28 +237,27 @@ enabled = false [node name="Monocler" parent="SpriteFocus/Sprite" instance=ExtResource("15_vopba")] unique_name_in_owner = true position = Vector2(0, -6) -scale = Vector2(0.5, 0.5) acceptable_diets = Array[StringName]([&"Monocle"]) target = 1 [node name="Sprite" type="Sprite2D" parent="SpriteFocus/Sprite/Monocler"] visible = false z_index = 1 -position = Vector2(10, -19) -scale = Vector2(2, 2) +position = Vector2(5, -9.5) texture = ExtResource("6_04snb") [node name="Shape" type="CollisionShape2D" parent="SpriteFocus/Sprite/Monocler"] shape = SubResource("CircleShape2D_wjkbi") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="SpriteFocus/Sprite/Monocler" instance=ExtResource("7_op2gq")] scene = ExtResource("10_dmlhw") enabled = false [node name="Shape" type="CollisionShape2D" parent="."] -position = Vector2(0, 36) +position = Vector2(0, -48) shape = SubResource("CircleShape2D_uw0y6") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Animator" type="AnimationPlayer" parent="."] unique_name_in_owner = true @@ -270,7 +271,7 @@ blend_times = [&"drag_start", &"drag_loop", 0.5] [node name="MovementSampler" parent="." instance=ExtResource("6_truco")] [node name="MovementDrag" parent="." instance=ExtResource("8_mvkr6")] -position = Vector2(1, 0) +position = Vector2(0, -84) enabled = false [node name="DragPriority" parent="MovementDrag" instance=ExtResource("9_7b55p")] @@ -293,7 +294,7 @@ bus = &"FallSounds" [node name="Eater" parent="." instance=ExtResource("15_vopba")] unique_name_in_owner = true -position = Vector2(0, 36) +position = Vector2(0, -48) collision_mask = 24 acceptable_diets = Array[StringName]([&"Demon"]) @@ -302,7 +303,7 @@ stream = ExtResource("19_3hopf") bus = &"KillSounds" [node name="Shape" type="CollisionShape2D" parent="Eater"] -shape = SubResource("CircleShape2D_wjkbi") +shape = SubResource("CircleShape2D_4bt8o") debug_color = Color(1, 0, 0, 0) [connection signal="eaten" from="SpriteFocus/Sprite/TopHatter" to="." method="_on_eater_eaten"] diff --git a/entities/gold.tscn b/entities/gold.tscn index 85e85a2..2743164 100644 --- a/entities/gold.tscn +++ b/entities/gold.tscn @@ -30,14 +30,16 @@ texture = ExtResource("2_tt3v6") [node name="MagnetizeArea" parent="." instance=ExtResource("3_ne3sj")] [node name="Shape" type="CollisionShape2D" parent="MagnetizeArea"] +z_index = -1 shape = SubResource("CircleShape2D_w1h35") -debug_color = Color(0.337255, 0.611765, 1, 0) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="CollectArea" parent="." instance=ExtResource("3_ne3sj")] [node name="Shape" type="CollisionShape2D" parent="CollectArea"] +z_index = -1 shape = SubResource("CircleShape2D_jm7yp") -debug_color = Color(0, 0.388235, 0.815686, 0.219608) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="MoveTowards" parent="." instance=ExtResource("5_bcbgf")] unique_name_in_owner = true diff --git a/entities/imp.tscn b/entities/imp.tscn index 0ea3033..aed73d8 100644 --- a/entities/imp.tscn +++ b/entities/imp.tscn @@ -223,8 +223,8 @@ _data = { [sub_resource type="CircleShape2D" id="CircleShape2D_1bmhf"] radius = 256.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_swh57"] -radius = 25.19 +[sub_resource type="CircleShape2D" id="CircleShape2D_y3ttb"] +radius = 32.0 [sub_resource type="CircleShape2D" id="CircleShape2D_50iad"] radius = 32.0 @@ -244,11 +244,13 @@ unique_name_in_owner = true y_sort_enabled = true scale = Vector2(2, 2) texture = ExtResource("3_qda0k") +offset = Vector2(0, -16) left_texture = ExtResource("3_qda0k") right_texture = ExtResource("4_0sckn") [node name="TopHatter" parent="Sprite" instance=ExtResource("14_w2h8x")] unique_name_in_owner = true +position = Vector2(0, -16) scale = Vector2(0.5, 0.5) acceptable_diets = Array[StringName]([&"TopHat"]) target = 1 @@ -262,7 +264,7 @@ texture = ExtResource("5_w4u6a") [node name="Shape" type="CollisionShape2D" parent="Sprite/TopHatter"] shape = SubResource("CircleShape2D_6l0s5") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="Sprite/TopHatter" instance=ExtResource("4_d8lgm")] scene = ExtResource("8_m3as1") @@ -272,6 +274,7 @@ enabled = false [node name="Monocler" parent="Sprite" instance=ExtResource("14_w2h8x")] unique_name_in_owner = true +position = Vector2(0, -16) scale = Vector2(0.5, 0.5) acceptable_diets = Array[StringName]([&"Monocle"]) target = 1 @@ -285,7 +288,7 @@ texture = ExtResource("6_jebbv") [node name="Shape" type="CollisionShape2D" parent="Sprite/Monocler"] shape = SubResource("CircleShape2D_6l0s5") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="Sprite/Monocler" instance=ExtResource("4_d8lgm")] scene = ExtResource("10_gikey") @@ -294,7 +297,9 @@ enabled = false [node name="Sacrificable" parent="Sprite/Monocler" instance=ExtResource("7_gg20m")] [node name="Shape" type="CollisionShape2D" parent="."] +position = Vector2(0, -32) shape = SubResource("CircleShape2D_ide4n") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Animator" type="AnimationPlayer" parent="."] unique_name_in_owner = true @@ -311,6 +316,7 @@ diet = &"Demon" kind = &"Imp" [node name="GoldSpawner" parent="." instance=ExtResource("4_d8lgm")] +position = Vector2(0, -32) scene = ExtResource("5_yrfoq") [node name="SpawnTimer" parent="GoldSpawner" instance=ExtResource("10_phvea")] @@ -322,6 +328,7 @@ max_secs = 5.0 [node name="MovementSampler" parent="." instance=ExtResource("7_ech8d")] [node name="MovementWander" parent="." instance=ExtResource("8_ffcw0")] +position = Vector2(0, -32) speed = 25.0 enabled = false @@ -337,6 +344,7 @@ min_secs = 0.6 max_secs = 3.0 [node name="MovementHunt" parent="." instance=ExtResource("11_4ra22")] +position = Vector2(0, -32) speed = 110.0 enabled = false @@ -348,13 +356,14 @@ acceptable_diets = Array[StringName]([&"Meat"]) [node name="Shape" type="CollisionShape2D" parent="MovementHunt/TrackerMeat"] shape = SubResource("CircleShape2D_1bmhf") -debug_color = Color(1, 0.498039, 0, 0) +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementHunt/TrackerMeat" node_paths=PackedStringArray("tracker") instance=ExtResource("13_mwxuf")] tracker = NodePath("..") [node name="MovementTrap" parent="." instance=ExtResource("11_4ra22")] y_sort_enabled = true +position = Vector2(0, -32) speed = 600.0 enabled = false @@ -366,13 +375,14 @@ collision_mask = 8 acceptable_diets = Array[StringName]([&"Trap"]) [node name="Shape" type="CollisionShape2D" parent="MovementTrap/TrackerTrap"] -shape = SubResource("CircleShape2D_swh57") -debug_color = Color(1, 0.498039, 0, 0) +shape = SubResource("CircleShape2D_y3ttb") +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementTrap/TrackerTrap" node_paths=PackedStringArray("tracker") instance=ExtResource("13_mwxuf")] tracker = NodePath("..") [node name="MovementDrag" parent="." instance=ExtResource("14_p3w0g")] +position = Vector2(0, -32) enabled = false [node name="DragPriority" parent="MovementDrag" instance=ExtResource("9_2wb1b")] @@ -382,7 +392,7 @@ alternative_priority = 50 [node name="Shape" type="CollisionShape2D" parent="MovementDrag/Draggable"] shape = SubResource("CircleShape2D_50iad") -debug_color = Color(1, 1, 1, 0) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] stream = ExtResource("16_0frai") @@ -394,11 +404,12 @@ bus = &"FallSounds" [node name="Eater" parent="." instance=ExtResource("14_w2h8x")] unique_name_in_owner = true +position = Vector2(0, -32) acceptable_diets = Array[StringName]([&"Meat"]) [node name="Shape" type="CollisionShape2D" parent="Eater"] shape = SubResource("CircleShape2D_qhk1q") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="EatSound" type="AudioStreamPlayer2D" parent="Eater"] stream = ExtResource("19_7la6c") diff --git a/entities/monocle.tscn b/entities/monocle.tscn index 2af70e5..fab3e0f 100644 --- a/entities/monocle.tscn +++ b/entities/monocle.tscn @@ -116,9 +116,12 @@ script = ExtResource("1_ehpfj") y_sort_enabled = true scale = Vector2(2, 2) texture = ExtResource("1_omrit") +offset = Vector2(0, -2) [node name="Shape" type="CollisionShape2D" parent="."] +position = Vector2(0, -4) shape = SubResource("CircleShape2D_o7chm") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Animator" type="AnimationPlayer" parent="."] unique_name_in_owner = true @@ -132,12 +135,13 @@ next/drag_start = &"drag_loop" diet = &"Monocle" [node name="MovementDrag" parent="." instance=ExtResource("2_jgnsw")] +position = Vector2(0, -4) [node name="Draggable" parent="MovementDrag" instance=ExtResource("3_e0ni5")] [node name="Shape" type="CollisionShape2D" parent="MovementDrag/Draggable"] shape = SubResource("CircleShape2D_juisb") -debug_color = Color(1, 1, 1, 0) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] stream = ExtResource("5_bs8m7") diff --git a/entities/sacrifice_stone.tscn b/entities/sacrifice_stone.tscn index 990d456..95eb83b 100644 --- a/entities/sacrifice_stone.tscn +++ b/entities/sacrifice_stone.tscn @@ -9,16 +9,15 @@ radius = 8.0 [node name="SacrificeStone" type="Node2D"] -y_sort_enabled = true script = ExtResource("1_sgl1t") [node name="Sprite" type="Sprite2D" parent="."] -y_sort_enabled = true scale = Vector2(2, 2) texture = ExtResource("2_rbklw") +offset = Vector2(0, -8) [node name="StoneArea" type="Area2D" parent="."] -position = Vector2(0, -29) +position = Vector2(0, -45) collision_layer = 8 collision_mask = 0 monitoring = false @@ -27,7 +26,7 @@ monitoring = false z_index = 1 shape = SubResource("CircleShape2D_yv6hf") one_way_collision_margin = 27.5 -debug_color = Color(1, 0, 0, 0.419608) +debug_color = Color(1, 1, 1, 0.294118) [node name="Edible" parent="StoneArea" instance=ExtResource("1_y58y4")] diet = &"Trap" @@ -39,7 +38,7 @@ collision_mask = 8 z_index = 1 shape = SubResource("CircleShape2D_yv6hf") one_way_collision_margin = 27.5 -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 1, 0, 0.294118) [connection signal="tracked" from="StoneArea/SacrificeTracker" to="." method="_on_tracked"] [connection signal="untracked" from="StoneArea/SacrificeTracker" to="." method="_on_untracked"] diff --git a/entities/sheep.tscn b/entities/sheep.tscn index 5745344..2e82b79 100644 --- a/entities/sheep.tscn +++ b/entities/sheep.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=3 uid="uid://bc2bm8lbol18w"] +[gd_scene load_steps=39 format=3 uid="uid://bc2bm8lbol18w"] [ext_resource type="Script" path="res://entities/sheep.gd" id="1_4dmll"] [ext_resource type="Texture2D" uid="uid://iljp5yn3ehfk" path="res://entities/sheep_left.png" id="2_t13f5"] @@ -29,8 +29,11 @@ [ext_resource type="AudioStream" uid="uid://cwsg776c11xfc" path="res://entities/fall.ogg" id="17_8kst2"] [ext_resource type="PackedScene" uid="uid://jg7qkbswgqjc" path="res://behaviours/eater.tscn" id="22_lilpq"] -[sub_resource type="CircleShape2D" id="CircleShape2D_kq6qs"] -radius = 40.0 +[sub_resource type="CircleShape2D" id="CircleShape2D_c2ya8"] +radius = 20.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_0ijhp"] +radius = 20.0 [sub_resource type="CircleShape2D" id="CircleShape2D_c5tcn"] radius = 24.0 @@ -203,14 +206,13 @@ _data = { radius = 144.0 [sub_resource type="CircleShape2D" id="CircleShape2D_nn3xr"] -radius = 25.19 +radius = 24.0 [sub_resource type="CircleShape2D" id="CircleShape2D_bct1e"] -radius = 8.65 +radius = 24.0 [node name="Sheep" type="CharacterBody2D"] z_index = 1 -y_sort_enabled = true collision_layer = 8 collision_mask = 8 motion_mode = 1 @@ -218,29 +220,27 @@ script = ExtResource("1_4dmll") [node name="Sprite" parent="." instance=ExtResource("2_xbkrm")] unique_name_in_owner = true -position = Vector2(0, -4) scale = Vector2(2, 2) texture = ExtResource("2_t13f5") +offset = Vector2(0, -15) left_texture = ExtResource("2_t13f5") right_texture = ExtResource("4_5qoof") [node name="TopHatter" parent="Sprite" instance=ExtResource("22_lilpq")] unique_name_in_owner = true -position = Vector2(0, 2) -scale = Vector2(0.5, 0.5) +position = Vector2(0, -13) acceptable_diets = Array[StringName]([&"TopHat"]) target = 1 [node name="Sprite" type="Sprite2D" parent="Sprite/TopHatter"] visible = false z_index = 1 -position = Vector2(-10, -28) -scale = Vector2(2, 2) +position = Vector2(-9, -14) texture = ExtResource("5_gfn7a") [node name="Shape" type="CollisionShape2D" parent="Sprite/TopHatter"] -shape = SubResource("CircleShape2D_kq6qs") -debug_color = Color(1, 0, 0, 0) +shape = SubResource("CircleShape2D_c2ya8") +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="Sprite/TopHatter" instance=ExtResource("7_5is0u")] scene = ExtResource("8_d32x5") @@ -250,21 +250,19 @@ enabled = false [node name="Monocler" parent="Sprite" instance=ExtResource("22_lilpq")] unique_name_in_owner = true -position = Vector2(0, 2) -scale = Vector2(0.5, 0.5) +position = Vector2(0, -13) acceptable_diets = Array[StringName]([&"Monocle"]) target = 1 [node name="Sprite" type="Sprite2D" parent="Sprite/Monocler"] visible = false z_index = 1 -position = Vector2(-15, -5) -scale = Vector2(2, 2) +position = Vector2(-8, -2.5) texture = ExtResource("6_q0o52") [node name="Shape" type="CollisionShape2D" parent="Sprite/Monocler"] -shape = SubResource("CircleShape2D_kq6qs") -debug_color = Color(1, 0, 0, 0) +shape = SubResource("CircleShape2D_0ijhp") +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="Sprite/Monocler" instance=ExtResource("7_5is0u")] scene = ExtResource("10_dmfsp") @@ -273,9 +271,12 @@ enabled = false [node name="Sacrificable" parent="Sprite/Monocler" instance=ExtResource("8_43m1b")] [node name="Shape" type="CollisionShape2D" parent="."] +position = Vector2(0, -26) shape = SubResource("CircleShape2D_c5tcn") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Spawner" parent="." instance=ExtResource("7_5is0u")] +position = Vector2(0, -26) scene = ExtResource("12_lutsy") [node name="Animator" type="AnimationPlayer" parent="."] @@ -296,6 +297,7 @@ kind = &"Sheep" [node name="MovementSampler" parent="." instance=ExtResource("9_s5lod")] [node name="MovementIdle" parent="." instance=ExtResource("10_05kcd")] +position = Vector2(0, -26) speed = 0.0 enabled = false @@ -311,6 +313,7 @@ min_secs = 1.0 max_secs = 5.0 [node name="MovementWander" parent="." instance=ExtResource("10_05kcd")] +position = Vector2(0, -26) speed = 33.0 enabled = false @@ -323,6 +326,7 @@ min_secs = 0.3 max_secs = 1.5 [node name="MovementRunFromMouse" parent="." instance=ExtResource("12_x2g3x")] +position = Vector2(0, -26) speed = -66.0 enabled = false @@ -333,9 +337,10 @@ alternative_priority = 30 [node name="Shape" type="CollisionShape2D" parent="MovementRunFromMouse/CursorSense"] shape = SubResource("CircleShape2D_etpf6") -debug_color = Color(1, 1, 0, 0) +debug_color = Color(0, 1, 0, 0.294118) [node name="MovementRunFromHunter" parent="." instance=ExtResource("12_x2g3x")] +position = Vector2(0, -26) speed = -66.0 enabled = false @@ -346,12 +351,13 @@ alternative_priority = 40 [node name="Shape" type="CollisionShape2D" parent="MovementRunFromHunter/HunterSense"] shape = SubResource("CircleShape2D_etpf6") -debug_color = Color(1, 1, 0, 0) +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementRunFromHunter/HunterSense" node_paths=PackedStringArray("tracker") instance=ExtResource("13_jf6em")] tracker = NodePath("..") [node name="MovementTrap" parent="." instance=ExtResource("12_x2g3x")] +position = Vector2(0, -26) speed = 600.0 enabled = false @@ -364,12 +370,13 @@ acceptable_diets = Array[StringName]([&"Trap"]) [node name="Shape" type="CollisionShape2D" parent="MovementTrap/TrackerTrap"] shape = SubResource("CircleShape2D_nn3xr") -debug_color = Color(1, 0.498039, 0, 0) +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementTrap/TrackerTrap" node_paths=PackedStringArray("tracker") instance=ExtResource("13_jf6em")] tracker = NodePath("..") [node name="MovementBarn" parent="." instance=ExtResource("10_05kcd")] +position = Vector2(0, -26) speed = 66.0 direction = Vector2(-1, 0) enabled = false @@ -382,18 +389,17 @@ wait_time = 2.0 one_shot = true [node name="MovementDrag" parent="." instance=ExtResource("14_3wojv")] +position = Vector2(0, -26) enabled = false [node name="DragPriority" parent="MovementDrag" instance=ExtResource("11_0jlmk")] alternative_priority = 50 [node name="Draggable" parent="MovementDrag" instance=ExtResource("14_0b1hs")] -collision_layer = 128 [node name="Shape" type="CollisionShape2D" parent="MovementDrag/Draggable"] -scale = Vector2(3, 3) shape = SubResource("CircleShape2D_bct1e") -debug_color = Color(1, 1, 1, 0) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] stream = ExtResource("16_nswfl") diff --git a/entities/skull.tscn b/entities/skull.tscn index b78e8ec..3d967ca 100644 --- a/entities/skull.tscn +++ b/entities/skull.tscn @@ -107,11 +107,11 @@ _data = { "drag_start": SubResource("Animation_2igbw") } -[sub_resource type="CircleShape2D" id="CircleShape2D_dsv26"] -radius = 32.0 +[sub_resource type="CircleShape2D" id="CircleShape2D_hg0y7"] +radius = 12.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_d45uh"] -radius = 32.0 +[sub_resource type="CircleShape2D" id="CircleShape2D_pt4sw"] +radius = 12.0 [node name="Skull" type="CharacterBody2D"] y_sort_enabled = true @@ -125,9 +125,12 @@ y_sort_enabled = true position = Vector2(2, 0) scale = Vector2(2, 2) texture = ExtResource("1_v6qk3") +offset = Vector2(0, -6) [node name="Shape" type="CollisionShape2D" parent="."] +position = Vector2(0, -12) shape = SubResource("CircleShape2D_ypibs") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Animator" type="AnimationPlayer" parent="."] unique_name_in_owner = true @@ -143,6 +146,7 @@ kind = &"Skull" [node name="MovementSampler" parent="." instance=ExtResource("4_xvv7l")] [node name="MovementTrap" parent="." instance=ExtResource("5_lnjls")] +position = Vector2(0, -12) speed = 600.0 enabled = false @@ -154,13 +158,14 @@ collision_mask = 8 acceptable_diets = Array[StringName]([&"Trap"]) [node name="Shape" type="CollisionShape2D" parent="MovementTrap/TrackerTrap"] -shape = SubResource("CircleShape2D_dsv26") -debug_color = Color(1, 0.498039, 0, 0) +shape = SubResource("CircleShape2D_hg0y7") +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementTrap/TrackerTrap" node_paths=PackedStringArray("tracker") instance=ExtResource("8_0o770")] tracker = NodePath("..") [node name="MovementDrag" parent="." instance=ExtResource("3_83m1a")] +position = Vector2(0, -12) enabled = false [node name="DragPriority" parent="MovementDrag" instance=ExtResource("6_8jeho")] @@ -169,8 +174,8 @@ alternative_priority = 50 [node name="Draggable" parent="MovementDrag" instance=ExtResource("2_h0icd")] [node name="Shape" type="CollisionShape2D" parent="MovementDrag/Draggable"] -shape = SubResource("CircleShape2D_d45uh") -debug_color = Color(1, 1, 1, 0) +shape = SubResource("CircleShape2D_pt4sw") +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] stream = ExtResource("5_duqrf") diff --git a/entities/top_hat.tscn b/entities/top_hat.tscn index 9e98840..a9ae1ab 100644 --- a/entities/top_hat.tscn +++ b/entities/top_hat.tscn @@ -7,8 +7,8 @@ [ext_resource type="PackedScene" uid="uid://dijcjahkddudv" path="res://behaviours/draggable.tscn" id="4_fcvjo"] [ext_resource type="AudioStream" uid="uid://cwsg776c11xfc" path="res://entities/fall.ogg" id="6_6tpnh"] -[sub_resource type="CircleShape2D" id="CircleShape2D_o7chm"] -radius = 12.0 +[sub_resource type="CircleShape2D" id="CircleShape2D_fsfem"] +radius = 16.0 [sub_resource type="Animation" id="Animation_gokbg"] length = 0.001 @@ -101,8 +101,8 @@ _data = { "drag_start": SubResource("Animation_2igbw") } -[sub_resource type="CircleShape2D" id="CircleShape2D_juisb"] -radius = 12.0 +[sub_resource type="CircleShape2D" id="CircleShape2D_pcfsk"] +radius = 16.0 [node name="TopHat" type="CharacterBody2D"] y_sort_enabled = true @@ -115,9 +115,12 @@ script = ExtResource("1_0eh11") y_sort_enabled = true scale = Vector2(2, 2) texture = ExtResource("1_gbqic") +offset = Vector2(0, -8) [node name="Shape" type="CollisionShape2D" parent="."] -shape = SubResource("CircleShape2D_o7chm") +position = Vector2(0, -16) +shape = SubResource("CircleShape2D_fsfem") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Animator" type="AnimationPlayer" parent="."] unique_name_in_owner = true @@ -131,12 +134,13 @@ next/drag_start = &"drag_loop" diet = &"TopHat" [node name="MovementDrag" parent="." instance=ExtResource("3_gy414")] +position = Vector2(0, -16) [node name="Draggable" parent="MovementDrag" instance=ExtResource("4_fcvjo")] [node name="Shape" type="CollisionShape2D" parent="MovementDrag/Draggable"] -shape = SubResource("CircleShape2D_juisb") -debug_color = Color(1, 1, 1, 0) +shape = SubResource("CircleShape2D_pcfsk") +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] bus = &"DragSounds" diff --git a/entities/tree.tscn b/entities/tree.tscn index d82fd81..0749252 100644 --- a/entities/tree.tscn +++ b/entities/tree.tscn @@ -10,16 +10,16 @@ height = 91.0 y_sort_enabled = true [node name="Sprite" type="Sprite2D" parent="."] -y_sort_enabled = true -position = Vector2(0, -48) scale = Vector2(2, 2) texture = ExtResource("1_yk0t0") +offset = Vector2(0, -31) [node name="Upper" type="StaticBody2D" parent="."] +position = Vector2(0, -13) collision_layer = 16 collision_mask = 0 [node name="Shape" type="CollisionShape2D" parent="Upper"] position = Vector2(0, -68) shape = SubResource("CapsuleShape2D_0arkv") -debug_color = Color(0, 0.294118, 0.345098, 0.419608) +debug_color = Color(0, 0.6, 1, 0.294118) diff --git a/entities/watcher.tscn b/entities/watcher.tscn index 2adcb17..fd891e0 100644 --- a/entities/watcher.tscn +++ b/entities/watcher.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=39 format=3 uid="uid://dnjtduk0hla3f"] +[gd_scene load_steps=40 format=3 uid="uid://dnjtduk0hla3f"] [ext_resource type="Script" path="res://entities/watcher.gd" id="1_brahc"] [ext_resource type="PackedScene" uid="uid://bxbjfev0lhwws" path="res://behaviours/sprite_left_right.tscn" id="1_thu73"] @@ -28,8 +28,11 @@ [ext_resource type="PackedScene" uid="uid://jg7qkbswgqjc" path="res://behaviours/eater.tscn" id="19_ktenf"] [ext_resource type="AudioStream" uid="uid://c1yuksnjdd6g2" path="res://entities/imp_eat.ogg" id="20_bdcer"] -[sub_resource type="CircleShape2D" id="CircleShape2D_x5uuo"] -radius = 40.0 +[sub_resource type="CircleShape2D" id="CircleShape2D_mfngl"] +radius = 20.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_arucr"] +radius = 20.0 [sub_resource type="CircleShape2D" id="CircleShape2D_diig7"] radius = 32.0 @@ -227,8 +230,8 @@ _data = { "fly": SubResource("Animation_lrqld") } -[sub_resource type="CircleShape2D" id="CircleShape2D_a0gfn"] -radius = 25.19 +[sub_resource type="CircleShape2D" id="CircleShape2D_dpwsl"] +radius = 32.0 [sub_resource type="CircleShape2D" id="CircleShape2D_w03iw"] radius = 256.0 @@ -254,7 +257,6 @@ right_texture = ExtResource("3_k8fgk") [node name="TopHatter" parent="Sprite" instance=ExtResource("19_ktenf")] unique_name_in_owner = true -scale = Vector2(0.5, 0.5) collision_mask = 16 acceptable_diets = Array[StringName]([&"TopHat"]) target = 1 @@ -262,13 +264,12 @@ target = 1 [node name="Sprite" type="Sprite2D" parent="Sprite/TopHatter"] visible = false z_index = 1 -position = Vector2(-4, -29) -scale = Vector2(2, 2) +position = Vector2(-2, -14.5) texture = ExtResource("5_axhwx") [node name="Shape" type="CollisionShape2D" parent="Sprite/TopHatter"] -shape = SubResource("CircleShape2D_x5uuo") -debug_color = Color(1, 0, 0, 0) +shape = SubResource("CircleShape2D_mfngl") +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="Sprite/TopHatter" instance=ExtResource("7_kaba2")] scene = ExtResource("8_4xe4s") @@ -278,7 +279,6 @@ enabled = false [node name="Monocler" parent="Sprite" instance=ExtResource("19_ktenf")] unique_name_in_owner = true -scale = Vector2(0.5, 0.5) collision_mask = 16 acceptable_diets = Array[StringName]([&"Monocle"]) target = 1 @@ -286,13 +286,12 @@ target = 1 [node name="Sprite" type="Sprite2D" parent="Sprite/Monocler"] visible = false z_index = 1 -position = Vector2(1, -4) -scale = Vector2(4.0012, 1.97504) +position = Vector2(-1.5, -1.5) texture = ExtResource("6_owihj") [node name="Shape" type="CollisionShape2D" parent="Sprite/Monocler"] -shape = SubResource("CircleShape2D_x5uuo") -debug_color = Color(1, 0, 0, 0) +shape = SubResource("CircleShape2D_arucr") +debug_color = Color(1, 0, 0, 0.294118) [node name="Spawner" parent="Sprite/Monocler" instance=ExtResource("7_kaba2")] scene = ExtResource("10_wf4xh") @@ -302,6 +301,7 @@ enabled = false [node name="Shape" type="CollisionShape2D" parent="."] shape = SubResource("CircleShape2D_diig7") +debug_color = Color(0, 0.6, 1, 0.294118) [node name="Animator" type="AnimationPlayer" parent="."] unique_name_in_owner = true @@ -356,8 +356,8 @@ collision_mask = 8 acceptable_diets = Array[StringName]([&"Trap"]) [node name="Shape" type="CollisionShape2D" parent="MovementTrap/TrackerTrap"] -shape = SubResource("CircleShape2D_a0gfn") -debug_color = Color(1, 0.498039, 0, 0) +shape = SubResource("CircleShape2D_dpwsl") +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementTrap/TrackerTrap" node_paths=PackedStringArray("tracker") instance=ExtResource("16_ch04y")] tracker = NodePath("..") @@ -374,14 +374,14 @@ collision_mask = 48 acceptable_diets = Array[StringName]([&"Meat"]) [node name="Shape" type="CollisionShape2D" parent="MovementHunt/TrackerMeat"] +position = Vector2(4, 29) shape = SubResource("CircleShape2D_w03iw") -debug_color = Color(1, 0.498039, 0, 0) +debug_color = Color(1, 1, 0, 0.294118) [node name="TargetPicker" parent="MovementHunt/TrackerMeat" node_paths=PackedStringArray("tracker") instance=ExtResource("16_ch04y")] tracker = NodePath("..") [node name="MovementDrag" parent="." instance=ExtResource("8_jy8ay")] -position = Vector2(1, 0) enabled = false [node name="DragPriority" parent="MovementDrag" instance=ExtResource("9_wtsor")] @@ -391,7 +391,7 @@ alternative_priority = 50 [node name="Shape" type="CollisionShape2D" parent="MovementDrag/Draggable"] shape = SubResource("CircleShape2D_ywwo3") -debug_color = Color(1, 1, 1, 0) +debug_color = Color(0, 1, 0.701961, 0.294118) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] stream = ExtResource("11_rydo5") @@ -408,7 +408,7 @@ acceptable_diets = Array[StringName]([&"Meat"]) [node name="Shape" type="CollisionShape2D" parent="Eater"] shape = SubResource("CircleShape2D_3tmg0") -debug_color = Color(1, 0, 0, 0) +debug_color = Color(1, 0, 0, 0.294118) [node name="EatSound" type="AudioStreamPlayer2D" parent="Eater"] stream = ExtResource("20_bdcer") diff --git a/scenes/game/cursor.tscn b/scenes/game/cursor.tscn index 93a90ea..e52f34f 100644 --- a/scenes/game/cursor.tscn +++ b/scenes/game/cursor.tscn @@ -16,7 +16,7 @@ script = ExtResource("1_1og6v") [node name="Shape" type="CollisionShape2D" parent="."] shape = SubResource("CircleShape2D_6ky4x") -debug_color = Color(0, 0.411765, 0, 0) +debug_color = Color(0, 1, 0.701961, 0.588235) [node name="GoldDisplay" parent="." instance=ExtResource("2_5c4iq")] unique_name_in_owner = true diff --git a/scenes/game/main_game.tscn b/scenes/game/main_game.tscn index 2a88ecd..ff64618 100644 --- a/scenes/game/main_game.tscn +++ b/scenes/game/main_game.tscn @@ -936,9 +936,6 @@ position = Vector2(480, 241) [node name="Tree4" parent="Entities" instance=ExtResource("18_r8twr")] position = Vector2(171, 118) -[node name="Tree5" parent="Entities" instance=ExtResource("18_r8twr")] -position = Vector2(374, -132) - [node name="Tree6" parent="Entities" instance=ExtResource("18_r8twr")] position = Vector2(439, 88)