From a663df578c3f364f17ec1e7599246e480b17fb44 Mon Sep 17 00:00:00 2001 From: IDynamixI985 Date: Tue, 15 Sep 2026 19:55:32 -0500 Subject: [PATCH 1/5] Make cat walk around --- .../characters/npcs/cat/cat.tscn | 140 +++++++++++++++++- .../characters/npcs/cat/components/cat.tres | 2 +- scenes/world_map/frays_end.tscn | 10 ++ 3 files changed, 150 insertions(+), 2 deletions(-) diff --git a/scenes/game_elements/characters/npcs/cat/cat.tscn b/scenes/game_elements/characters/npcs/cat/cat.tscn index 0d0bb3beda..4faf526104 100644 --- a/scenes/game_elements/characters/npcs/cat/cat.tscn +++ b/scenes/game_elements/characters/npcs/cat/cat.tscn @@ -6,6 +6,9 @@ [ext_resource type="Script" uid="uid://djeshbrs3vwnb" path="res://scenes/game_elements/characters/npcs/components/pet_interaction.gd" id="4_t04tf"] [ext_resource type="AudioStream" uid="uid://di2b2rgca1udv" path="res://scenes/game_elements/characters/npcs/cat/components/412017__skymary__cat-meow-short.wav" id="5_t04tf"] [ext_resource type="Script" uid="uid://dxvv340yej4py" path="res://scenes/game_logic/fact_counter/fact_counter.gd" id="6_0bwy3"] +[ext_resource type="Script" uid="uid://b3hx1n2yl88qr" path="res://scenes/game_logic/character_animation_player_behavior.gd" id="7_fpcy1"] +[ext_resource type="Script" uid="uid://cx0sk4uhvnii0" path="res://scenes/game_logic/walk_behaviors/erratic_walk_behavior.gd" id="9_gm6tl"] +[ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="10_i6tmh"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_3vyb7"] height = 26.0 @@ -18,8 +21,108 @@ random_pitch = 1.15 streams_count = 1 stream_0/stream = ExtResource("5_t04tf") +[sub_resource type="Animation" id="Animation_fpcy1"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("AnimatedSprite2D:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [&"idle"] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("AnimatedSprite2D:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [4] +} + +[sub_resource type="Animation" id="Animation_uymb4"] +resource_name = "idle" +length = 0.9 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("AnimatedSprite2D:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [&"idle"] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("AnimatedSprite2D:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] +} + +[sub_resource type="Animation" id="Animation_my03d"] +resource_name = "walk" +length = 0.9 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("AnimatedSprite2D:animation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [&"walk"] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("AnimatedSprite2D:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_ymecv"] +_data = { +&"RESET": SubResource("Animation_fpcy1"), +&"idle": SubResource("Animation_uymb4"), +&"walk": SubResource("Animation_my03d") +} + +[sub_resource type="Resource" id="Resource_u5bk5"] +script = ExtResource("10_i6tmh") +walk_speed = 70.0 +run_speed = 70.0 +stopping_step = 200.0 +moving_step = 150.0 +stuck_speed = 70.0 +metadata/_custom_type_script = "uid://csev4hv57utxv" + [node name="Cat" type="CharacterBody2D" unique_id=1950923165] -collision_layer = 2 +collision_layer = 34 +collision_mask = 1041 motion_mode = 1 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=556665806] @@ -28,6 +131,7 @@ position = Vector2(0, -30) sprite_frames = ExtResource("3_qosq0") animation = &"idle" autoplay = "idle" +frame = 4 [node name="RandomFrameSpriteBehavior" type="Node2D" parent="AnimatedSprite2D" unique_id=1044391226 node_paths=PackedStringArray("sprite")] position = Vector2(0, 30) @@ -40,6 +144,7 @@ rotation = -1.5708 shape = SubResource("CapsuleShape2D_3vyb7") [node name="InteractArea" type="Area2D" parent="." unique_id=1432241865] +unique_name_in_owner = true collision_layer = 32 collision_mask = 0 script = ExtResource("4_8kxh7") @@ -65,3 +170,36 @@ fact_counter = NodePath("../FactCounter") [node name="FactCounter" type="Node" parent="." unique_id=539544383] script = ExtResource("6_0bwy3") prefix = "cats_petted" + +[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1636558305] +libraries/ = SubResource("AnimationLibrary_ymecv") + +[node name="CharacterAnimationPlayerBehavior" type="Node2D" parent="AnimationPlayer" unique_id=360462469 node_paths=PackedStringArray("character", "animation_player")] +script = ExtResource("7_fpcy1") +character = NodePath("../..") +animation_player = NodePath("..") +metadata/_custom_type_script = "uid://b3hx1n2yl88qr" + +[node name="ErraticWalkBehavior" type="Node2D" parent="." unique_id=453552834 node_paths=PackedStringArray("character")] +unique_name_in_owner = true +process_mode = 4 +script = ExtResource("9_gm6tl") +speeds = SubResource("Resource_u5bk5") +travel_distance = 350.0 +character = NodePath("..") +metadata/_custom_type_script = "uid://cx0sk4uhvnii0" + +[node name="Timer" type="Timer" parent="." unique_id=352204476] +unique_name_in_owner = true +wait_time = 2.0 +one_shot = true +autostart = true + +[connection signal="interaction_ended" from="InteractArea" to="Timer" method="start"] +[connection signal="interaction_started" from="InteractArea" to="Timer" method="stop" unbinds=2] +[connection signal="interaction_started" from="InteractArea" to="." method="set_velocity" unbinds=2 binds= [Vector2(0, 0)]] +[connection signal="interaction_started" from="InteractArea" to="ErraticWalkBehavior" method="set_process_mode" unbinds=2 binds= [4]] +[connection signal="direction_changed" from="ErraticWalkBehavior" to="Timer" method="start"] +[connection signal="direction_changed" from="ErraticWalkBehavior" to="." method="set_velocity" binds= [Vector2(0, 0)]] +[connection signal="direction_changed" from="ErraticWalkBehavior" to="ErraticWalkBehavior" method="set_process_mode" binds= [4]] +[connection signal="timeout" from="Timer" to="ErraticWalkBehavior" method="set_process_mode" binds= [0]] diff --git a/scenes/game_elements/characters/npcs/cat/components/cat.tres b/scenes/game_elements/characters/npcs/cat/components/cat.tres index db37b01235..816155ba86 100644 --- a/scenes/game_elements/characters/npcs/cat/components/cat.tres +++ b/scenes/game_elements/characters/npcs/cat/components/cat.tres @@ -153,5 +153,5 @@ animations = [{ }], "loop": 1, "name": &"walk", -"speed": 5.0 +"speed": 10.0 }] diff --git a/scenes/world_map/frays_end.tscn b/scenes/world_map/frays_end.tscn index 4b8247882b..fde58b228a 100644 --- a/scenes/world_map/frays_end.tscn +++ b/scenes/world_map/frays_end.tscn @@ -838,6 +838,16 @@ position = Vector2(969.4194, 2045.982) scale = Vector2(1.1060888, 1.0290669) polygon = PackedVector2Array(-877.343, -208.91, -817.673, -167.124, -758.004, -191.418, -697.43, -150.605, -638.664, -170.04, -579.899, -209.882, -460.559, -201.136, -390.04, -228.345, -324.042, -206.966, -255.332, -160.322, -168.539, -205.023, -99.8287, -193.362, -2.18738, -175.87, 55.6742, -183.644, 109.919, -223.486, 171.397, -226.401, 217.506, -200.164, 320.572, -186.559, 404.652, -186.559, 505.005, -189.475, 517.662, -237.091, 589.455, -238.273, 670.946, -241.251, 812.201, -217.423, 889.163, -140.978, 974.222, 0.017334, -874.675, -0.992798) +[node name="CatLimit" type="StaticBody2D" parent="OnTheGround" unique_id=1094201463] +collision_layer = 1024 +collision_mask = 0 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="OnTheGround/CatLimit" unique_id=2080080761] +position = Vector2(205, 645) +rotation = 0.013729122 +build_mode = 1 +polygon = PackedVector2Array(-76.41846, -29.953674, 64.659775, -170.90381, 332.64825, -173.58319, 395.5257, 35.573303, 696.19525, 9.443054, 1186.2062, 79.72247, 1325.4037, 238.82642, 1116.8237, 343.6999, 1029.0837, 508.91998, 245.0364, 583.691, 174.9423, 431.63898, 12.998764, 436.86273, -40.261673, 272.57843, -114.03733, 216.586, -135.2024, 131.86853) + [node name="Trees" type="Node2D" parent="OnTheGround" unique_id=378434157] y_sort_enabled = true metadata/_edit_lock_ = true From 2a63dd4491e4acbc9d3e169297064d9605387908 Mon Sep 17 00:00:00 2001 From: IDynamixI985 Date: Thu, 17 Sep 2026 18:10:59 -0500 Subject: [PATCH 2/5] Add wandering behavior and exit limits --- .../characters/npcs/cat/cat.tscn | 9 ++++++- scenes/world_map/frays_end.tscn | 27 ++++++++++++++----- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/scenes/game_elements/characters/npcs/cat/cat.tscn b/scenes/game_elements/characters/npcs/cat/cat.tscn index 4faf526104..08c84686f1 100644 --- a/scenes/game_elements/characters/npcs/cat/cat.tscn +++ b/scenes/game_elements/characters/npcs/cat/cat.tscn @@ -2,6 +2,7 @@ [ext_resource type="Script" uid="uid://cms2wqtbxjl1h" path="res://scenes/game_logic/sprite_behaviors/random_frame_sprite_behavior.gd" id="2_t04tf"] [ext_resource type="SpriteFrames" uid="uid://caou2u7vffhei" path="res://scenes/game_elements/characters/npcs/cat/components/cat.tres" id="3_qosq0"] +[ext_resource type="Script" uid="uid://dy68p7gf07pi3" path="res://scenes/game_logic/sprite_behaviors/character_sprite_behavior.gd" id="3_ymecv"] [ext_resource type="Script" uid="uid://du8wfijr35r35" path="res://scenes/game_elements/props/interact_area/interact_area.gd" id="4_8kxh7"] [ext_resource type="Script" uid="uid://djeshbrs3vwnb" path="res://scenes/game_elements/characters/npcs/components/pet_interaction.gd" id="4_t04tf"] [ext_resource type="AudioStream" uid="uid://di2b2rgca1udv" path="res://scenes/game_elements/characters/npcs/cat/components/412017__skymary__cat-meow-short.wav" id="5_t04tf"] @@ -122,7 +123,7 @@ metadata/_custom_type_script = "uid://csev4hv57utxv" [node name="Cat" type="CharacterBody2D" unique_id=1950923165] collision_layer = 34 -collision_mask = 1041 +collision_mask = 19 motion_mode = 1 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=556665806] @@ -139,6 +140,12 @@ script = ExtResource("2_t04tf") sprite = NodePath("..") metadata/_custom_type_script = "uid://cms2wqtbxjl1h" +[node name="CharacterSpriteBehavior" type="Node2D" parent="AnimatedSprite2D" unique_id=750356762 node_paths=PackedStringArray("character", "sprite")] +script = ExtResource("3_ymecv") +character = NodePath("../..") +play_animations = false +sprite = NodePath("..") + [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=557938036] rotation = -1.5708 shape = SubResource("CapsuleShape2D_3vyb7") diff --git a/scenes/world_map/frays_end.tscn b/scenes/world_map/frays_end.tscn index fde58b228a..79336f91a1 100644 --- a/scenes/world_map/frays_end.tscn +++ b/scenes/world_map/frays_end.tscn @@ -101,6 +101,15 @@ _data = { } point_count = 4 +[sub_resource type="RectangleShape2D" id="RectangleShape2D_gm6tl"] +size = Vector2(28, 320) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_6fau3"] +size = Vector2(33, 195) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_u5bk5"] +size = Vector2(334.125, 49) + [sub_resource type="RectangleShape2D" id="RectangleShape2D_qgpx3"] size = Vector2(320, 64) @@ -839,14 +848,20 @@ scale = Vector2(1.1060888, 1.0290669) polygon = PackedVector2Array(-877.343, -208.91, -817.673, -167.124, -758.004, -191.418, -697.43, -150.605, -638.664, -170.04, -579.899, -209.882, -460.559, -201.136, -390.04, -228.345, -324.042, -206.966, -255.332, -160.322, -168.539, -205.023, -99.8287, -193.362, -2.18738, -175.87, 55.6742, -183.644, 109.919, -223.486, 171.397, -226.401, 217.506, -200.164, 320.572, -186.559, 404.652, -186.559, 505.005, -189.475, 517.662, -237.091, 589.455, -238.273, 670.946, -241.251, 812.201, -217.423, 889.163, -140.978, 974.222, 0.017334, -874.675, -0.992798) [node name="CatLimit" type="StaticBody2D" parent="OnTheGround" unique_id=1094201463] -collision_layer = 1024 +collision_layer = 2 collision_mask = 0 -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="OnTheGround/CatLimit" unique_id=2080080761] -position = Vector2(205, 645) -rotation = 0.013729122 -build_mode = 1 -polygon = PackedVector2Array(-76.41846, -29.953674, 64.659775, -170.90381, 332.64825, -173.58319, 395.5257, 35.573303, 696.19525, 9.443054, 1186.2062, 79.72247, 1325.4037, 238.82642, 1116.8237, 343.6999, 1029.0837, 508.91998, 245.0364, 583.691, 174.9423, 431.63898, 12.998764, 436.86273, -40.261673, 272.57843, -114.03733, 216.586, -135.2024, 131.86853) +[node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=65509031] +position = Vector2(52, 737) +shape = SubResource("RectangleShape2D_gm6tl") + +[node name="CollisionShape2D2" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=252151575] +position = Vector2(3007, 860) +shape = SubResource("RectangleShape2D_6fau3") + +[node name="CollisionShape2D3" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=206951936] +position = Vector2(2529, -35) +shape = SubResource("RectangleShape2D_u5bk5") [node name="Trees" type="Node2D" parent="OnTheGround" unique_id=378434157] y_sort_enabled = true From abad3206289c651fa9f9e137a4d888bf5012c720 Mon Sep 17 00:00:00 2001 From: IDynamixI985 Date: Fri, 18 Sep 2026 17:43:27 -0500 Subject: [PATCH 3/5] Make cat walk around --- scenes/game_elements/characters/npcs/cat/cat.tscn | 2 +- scenes/world_map/frays_end.tscn | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scenes/game_elements/characters/npcs/cat/cat.tscn b/scenes/game_elements/characters/npcs/cat/cat.tscn index 08c84686f1..6b1c960636 100644 --- a/scenes/game_elements/characters/npcs/cat/cat.tscn +++ b/scenes/game_elements/characters/npcs/cat/cat.tscn @@ -123,7 +123,7 @@ metadata/_custom_type_script = "uid://csev4hv57utxv" [node name="Cat" type="CharacterBody2D" unique_id=1950923165] collision_layer = 34 -collision_mask = 19 +collision_mask = 531 motion_mode = 1 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=556665806] diff --git a/scenes/world_map/frays_end.tscn b/scenes/world_map/frays_end.tscn index 79336f91a1..20afd3ec77 100644 --- a/scenes/world_map/frays_end.tscn +++ b/scenes/world_map/frays_end.tscn @@ -105,10 +105,10 @@ point_count = 4 size = Vector2(28, 320) [sub_resource type="RectangleShape2D" id="RectangleShape2D_6fau3"] -size = Vector2(33, 195) +size = Vector2(33, 217) [sub_resource type="RectangleShape2D" id="RectangleShape2D_u5bk5"] -size = Vector2(334.125, 49) +size = Vector2(65, 49) [sub_resource type="RectangleShape2D" id="RectangleShape2D_qgpx3"] size = Vector2(320, 64) @@ -848,7 +848,7 @@ scale = Vector2(1.1060888, 1.0290669) polygon = PackedVector2Array(-877.343, -208.91, -817.673, -167.124, -758.004, -191.418, -697.43, -150.605, -638.664, -170.04, -579.899, -209.882, -460.559, -201.136, -390.04, -228.345, -324.042, -206.966, -255.332, -160.322, -168.539, -205.023, -99.8287, -193.362, -2.18738, -175.87, 55.6742, -183.644, 109.919, -223.486, 171.397, -226.401, 217.506, -200.164, 320.572, -186.559, 404.652, -186.559, 505.005, -189.475, 517.662, -237.091, 589.455, -238.273, 670.946, -241.251, 812.201, -217.423, 889.163, -140.978, 974.222, 0.017334, -874.675, -0.992798) [node name="CatLimit" type="StaticBody2D" parent="OnTheGround" unique_id=1094201463] -collision_layer = 2 +collision_layer = 16 collision_mask = 0 [node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=65509031] @@ -856,13 +856,17 @@ position = Vector2(52, 737) shape = SubResource("RectangleShape2D_gm6tl") [node name="CollisionShape2D2" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=252151575] -position = Vector2(3007, 860) +position = Vector2(3055, 862.5) shape = SubResource("RectangleShape2D_6fau3") [node name="CollisionShape2D3" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=206951936] position = Vector2(2529, -35) shape = SubResource("RectangleShape2D_u5bk5") +[node name="CollisionShape2D4" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=1006129908] +position = Vector2(2658, 1977) +shape = SubResource("RectangleShape2D_u5bk5") + [node name="Trees" type="Node2D" parent="OnTheGround" unique_id=378434157] y_sort_enabled = true metadata/_edit_lock_ = true From 047d3e7e0abfa496fce5f3990eb5eaf48924b110 Mon Sep 17 00:00:00 2001 From: IDynamixI985 Date: Sun, 20 Sep 2026 12:22:37 -0500 Subject: [PATCH 4/5] Make cat walk around --- .../characters/npcs/cat/cat.tscn | 2 +- scenes/world_map/frays_end.tscn | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/scenes/game_elements/characters/npcs/cat/cat.tscn b/scenes/game_elements/characters/npcs/cat/cat.tscn index 6b1c960636..61511ee005 100644 --- a/scenes/game_elements/characters/npcs/cat/cat.tscn +++ b/scenes/game_elements/characters/npcs/cat/cat.tscn @@ -123,7 +123,7 @@ metadata/_custom_type_script = "uid://csev4hv57utxv" [node name="Cat" type="CharacterBody2D" unique_id=1950923165] collision_layer = 34 -collision_mask = 531 +collision_mask = 563 motion_mode = 1 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=556665806] diff --git a/scenes/world_map/frays_end.tscn b/scenes/world_map/frays_end.tscn index 20afd3ec77..9a587de41b 100644 --- a/scenes/world_map/frays_end.tscn +++ b/scenes/world_map/frays_end.tscn @@ -107,9 +107,15 @@ size = Vector2(28, 320) [sub_resource type="RectangleShape2D" id="RectangleShape2D_6fau3"] size = Vector2(33, 217) +[sub_resource type="RectangleShape2D" id="RectangleShape2D_bu3x1"] +size = Vector2(341.5, 14.5) + [sub_resource type="RectangleShape2D" id="RectangleShape2D_u5bk5"] size = Vector2(65, 49) +[sub_resource type="RectangleShape2D" id="RectangleShape2D_ojao8"] +size = Vector2(65, 49) + [sub_resource type="RectangleShape2D" id="RectangleShape2D_qgpx3"] size = Vector2(320, 64) @@ -506,7 +512,7 @@ character_seed = 3363471871 look_at_side = 1 [node name="Cat" parent="OnTheGround/NPCs" unique_id=1091997689 instance=ExtResource("52_ppslc")] -position = Vector2(267, 642) +position = Vector2(1383, 687) [node name="BeachTownie" parent="OnTheGround/NPCs" unique_id=1268570065 instance=ExtResource("54_duxxr")] position = Vector2(2719, 1720) @@ -848,7 +854,7 @@ scale = Vector2(1.1060888, 1.0290669) polygon = PackedVector2Array(-877.343, -208.91, -817.673, -167.124, -758.004, -191.418, -697.43, -150.605, -638.664, -170.04, -579.899, -209.882, -460.559, -201.136, -390.04, -228.345, -324.042, -206.966, -255.332, -160.322, -168.539, -205.023, -99.8287, -193.362, -2.18738, -175.87, 55.6742, -183.644, 109.919, -223.486, 171.397, -226.401, 217.506, -200.164, 320.572, -186.559, 404.652, -186.559, 505.005, -189.475, 517.662, -237.091, 589.455, -238.273, 670.946, -241.251, 812.201, -217.423, 889.163, -140.978, 974.222, 0.017334, -874.675, -0.992798) [node name="CatLimit" type="StaticBody2D" parent="OnTheGround" unique_id=1094201463] -collision_layer = 16 +collision_layer = 32 collision_mask = 0 [node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=65509031] @@ -856,17 +862,21 @@ position = Vector2(52, 737) shape = SubResource("RectangleShape2D_gm6tl") [node name="CollisionShape2D2" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=252151575] -position = Vector2(3055, 862.5) +position = Vector2(2959, 862.5) shape = SubResource("RectangleShape2D_6fau3") [node name="CollisionShape2D3" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=206951936] -position = Vector2(2529, -35) -shape = SubResource("RectangleShape2D_u5bk5") +position = Vector2(2524, 7.75) +shape = SubResource("RectangleShape2D_bu3x1") [node name="CollisionShape2D4" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=1006129908] position = Vector2(2658, 1977) shape = SubResource("RectangleShape2D_u5bk5") +[node name="CollisionShape2D5" type="CollisionShape2D" parent="OnTheGround/CatLimit" unique_id=1596236520] +position = Vector2(992, 1287) +shape = SubResource("RectangleShape2D_ojao8") + [node name="Trees" type="Node2D" parent="OnTheGround" unique_id=378434157] y_sort_enabled = true metadata/_edit_lock_ = true From 3aeb4520165e04d86c331420fb508590860a2a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= Date: Tue, 22 Sep 2026 12:51:20 -0300 Subject: [PATCH 5/5] Fixups --- .../characters/npcs/cat/cat.tscn | 106 +----------------- 1 file changed, 2 insertions(+), 104 deletions(-) diff --git a/scenes/game_elements/characters/npcs/cat/cat.tscn b/scenes/game_elements/characters/npcs/cat/cat.tscn index 61511ee005..86cee5877f 100644 --- a/scenes/game_elements/characters/npcs/cat/cat.tscn +++ b/scenes/game_elements/characters/npcs/cat/cat.tscn @@ -7,7 +7,6 @@ [ext_resource type="Script" uid="uid://djeshbrs3vwnb" path="res://scenes/game_elements/characters/npcs/components/pet_interaction.gd" id="4_t04tf"] [ext_resource type="AudioStream" uid="uid://di2b2rgca1udv" path="res://scenes/game_elements/characters/npcs/cat/components/412017__skymary__cat-meow-short.wav" id="5_t04tf"] [ext_resource type="Script" uid="uid://dxvv340yej4py" path="res://scenes/game_logic/fact_counter/fact_counter.gd" id="6_0bwy3"] -[ext_resource type="Script" uid="uid://b3hx1n2yl88qr" path="res://scenes/game_logic/character_animation_player_behavior.gd" id="7_fpcy1"] [ext_resource type="Script" uid="uid://cx0sk4uhvnii0" path="res://scenes/game_logic/walk_behaviors/erratic_walk_behavior.gd" id="9_gm6tl"] [ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="10_i6tmh"] @@ -22,96 +21,6 @@ random_pitch = 1.15 streams_count = 1 stream_0/stream = ExtResource("5_t04tf") -[sub_resource type="Animation" id="Animation_fpcy1"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("AnimatedSprite2D:animation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [&"idle"] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("AnimatedSprite2D:frame") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [4] -} - -[sub_resource type="Animation" id="Animation_uymb4"] -resource_name = "idle" -length = 0.9 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("AnimatedSprite2D:animation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [&"idle"] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("AnimatedSprite2D:frame") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] -} - -[sub_resource type="Animation" id="Animation_my03d"] -resource_name = "walk" -length = 0.9 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("AnimatedSprite2D:animation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [&"walk"] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("AnimatedSprite2D:frame") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_ymecv"] -_data = { -&"RESET": SubResource("Animation_fpcy1"), -&"idle": SubResource("Animation_uymb4"), -&"walk": SubResource("Animation_my03d") -} - [sub_resource type="Resource" id="Resource_u5bk5"] script = ExtResource("10_i6tmh") walk_speed = 70.0 @@ -122,8 +31,8 @@ stuck_speed = 70.0 metadata/_custom_type_script = "uid://csev4hv57utxv" [node name="Cat" type="CharacterBody2D" unique_id=1950923165] -collision_layer = 34 -collision_mask = 563 +collision_layer = 2 +collision_mask = 531 motion_mode = 1 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=556665806] @@ -132,7 +41,6 @@ position = Vector2(0, -30) sprite_frames = ExtResource("3_qosq0") animation = &"idle" autoplay = "idle" -frame = 4 [node name="RandomFrameSpriteBehavior" type="Node2D" parent="AnimatedSprite2D" unique_id=1044391226 node_paths=PackedStringArray("sprite")] position = Vector2(0, 30) @@ -143,7 +51,6 @@ metadata/_custom_type_script = "uid://cms2wqtbxjl1h" [node name="CharacterSpriteBehavior" type="Node2D" parent="AnimatedSprite2D" unique_id=750356762 node_paths=PackedStringArray("character", "sprite")] script = ExtResource("3_ymecv") character = NodePath("../..") -play_animations = false sprite = NodePath("..") [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=557938036] @@ -178,15 +85,6 @@ fact_counter = NodePath("../FactCounter") script = ExtResource("6_0bwy3") prefix = "cats_petted" -[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1636558305] -libraries/ = SubResource("AnimationLibrary_ymecv") - -[node name="CharacterAnimationPlayerBehavior" type="Node2D" parent="AnimationPlayer" unique_id=360462469 node_paths=PackedStringArray("character", "animation_player")] -script = ExtResource("7_fpcy1") -character = NodePath("../..") -animation_player = NodePath("..") -metadata/_custom_type_script = "uid://b3hx1n2yl88qr" - [node name="ErraticWalkBehavior" type="Node2D" parent="." unique_id=453552834 node_paths=PackedStringArray("character")] unique_name_in_owner = true process_mode = 4