From 5be2709b6673f17a1cb4a61e3c35e4d7374596a5 Mon Sep 17 00:00:00 2001 From: Dustin Date: Sat, 9 Aug 2025 16:08:39 -0700 Subject: [PATCH] No idea what I was doing. so many weeks ago. --- src/actors/players/playerE/PlayerE.tscn | 45 ++++++++++++++++--------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/src/actors/players/playerE/PlayerE.tscn b/src/actors/players/playerE/PlayerE.tscn index 503c6e9..91d5e05 100644 --- a/src/actors/players/playerE/PlayerE.tscn +++ b/src/actors/players/playerE/PlayerE.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=43 format=2] +[gd_scene load_steps=45 format=2] [ext_resource path="res://lib/parent_scenes/actor.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/actors/players/playerE/PlayerE_SpriteFrames.tres" type="SpriteFrames" id=2] @@ -35,6 +35,7 @@ [ext_resource path="res://lib/components/Hitbox_Component.tscn" type="PackedScene" id=33] [ext_resource path="res://src/actors/players/playerE/Hurtbox-CollisionShape2D_StateReceiver.gd" type="Script" id=34] [ext_resource path="res://lib/components/Modifier_Receiver.tscn" type="PackedScene" id=35] +[ext_resource path="res://lib/classes/animated_sprite_state_receiver.gd" type="Script" id=36] [sub_resource type="Resource" id=3] resource_local_to_scene = true @@ -52,6 +53,14 @@ preserve_inertia = true is_grounded = true animation_sequence = [ "hurt" ] +[sub_resource type="SpriteFrames" id=8] +animations = [ { +"frames": [ ], +"loop": true, +"name": "default", +"speed": 5.0 +} ] + [sub_resource type="Resource" id=4] script = ExtResource( 24 ) state_name = "move" @@ -111,43 +120,47 @@ __meta__ = { } } -[node name="Movement_StateReceiver" parent="." index="2"] +[node name="AnimatedSprite_StateReceiver_Torso" type="AnimatedSprite" parent="." index="2"] +frames = SubResource( 8 ) +script = ExtResource( 36 ) + +[node name="Movement_StateReceiver" parent="." index="3"] script = ExtResource( 6 ) debug_velocity_controller = false -[node name="Modifier_Receiver" parent="." index="3" instance=ExtResource( 35 )] +[node name="Modifier_Receiver" parent="." index="4" instance=ExtResource( 35 )] callable_state_machine = NodePath("../Movement_StateMachine") debug_receiver = true -[node name="LedgeDetector" type="RayCast2D" parent="." index="4"] +[node name="LedgeDetector" type="RayCast2D" parent="." index="5"] unique_name_in_owner = true modulate = Color( 0, 1, 0, 1 ) position = Vector2( 6, -10 ) enabled = true cast_to = Vector2( 4, -1 ) -[node name="WallDetector" type="RayCast2D" parent="." index="5"] +[node name="WallDetector" type="RayCast2D" parent="." index="6"] unique_name_in_owner = true modulate = Color( 0, 1, 0, 1 ) position = Vector2( 6, -16 ) enabled = true cast_to = Vector2( 4, 4 ) -[node name="JumpAdjustorBack" type="RayCast2D" parent="." index="6"] +[node name="JumpAdjustorBack" type="RayCast2D" parent="." index="7"] unique_name_in_owner = true modulate = Color( 0, 1, 0, 1 ) position = Vector2( -8, -12 ) enabled = true cast_to = Vector2( 5, -14 ) -[node name="JumpAdjustorFront" type="RayCast2D" parent="." index="7"] +[node name="JumpAdjustorFront" type="RayCast2D" parent="." index="8"] unique_name_in_owner = true modulate = Color( 0, 1, 0, 1 ) position = Vector2( 7, -12 ) enabled = true cast_to = Vector2( -5, -14 ) -[node name="LadderDetector" type="RayCast2D" parent="." index="8"] +[node name="LadderDetector" type="RayCast2D" parent="." index="9"] unique_name_in_owner = true modulate = Color( 0, 1, 0, 1 ) enabled = true @@ -156,25 +169,25 @@ collision_mask = 1024 collide_with_areas = true collide_with_bodies = false -[node name="AudioStreamPlayer_StateReceiver" parent="." index="9"] +[node name="AudioStreamPlayer_StateReceiver" parent="." index="10"] sound_effects = [ SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ] -[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="10"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="11"] position = Vector2( 0, 2 ) shape = SubResource( 1 ) script = ExtResource( 31 ) callable_state_machine = NodePath("../Movement_StateMachine") -[node name="Health_Component" parent="." index="11" instance=ExtResource( 17 )] +[node name="Health_Component" parent="." index="12" instance=ExtResource( 17 )] unique_name_in_owner = true max_health = 100 -[node name="Stamina_Component" parent="." index="12" instance=ExtResource( 29 )] +[node name="Stamina_Component" parent="." index="13" instance=ExtResource( 29 )] unique_name_in_owner = true max_stamina = 50 recovery_rate = 2 -[node name="Hurtbox_Component" parent="." index="13" instance=ExtResource( 16 )] +[node name="Hurtbox_Component" parent="." index="14" instance=ExtResource( 16 )] collision_layer = 16 collision_mask = 128 hurtbox_entered_function = "hit_Receiver" @@ -186,13 +199,13 @@ shape = SubResource( 2 ) script = ExtResource( 34 ) callable_state_machine = NodePath("../../Movement_StateMachine") -[node name="Interactable_Receiver" type="Node" parent="." index="14"] +[node name="Interactable_Receiver" type="Node" parent="." index="15"] script = ExtResource( 21 ) interactable_parent_callback = "touch_the_thing" -[node name="PewMachine" parent="." index="15" instance=ExtResource( 28 )] +[node name="PewMachine" parent="." index="16" instance=ExtResource( 28 )] -[node name="Hitbox_Component" parent="." index="16" instance=ExtResource( 33 )] +[node name="Hitbox_Component" parent="." index="17" instance=ExtResource( 33 )] collision_layer = 192 damage_amount = 10