diff --git a/Scenes/Actors/fsm_player.tscn b/Scenes/Actors/fsm_player.tscn index b3a341cf..9554f1b0 100644 --- a/Scenes/Actors/fsm_player.tscn +++ b/Scenes/Actors/fsm_player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=43 format=3 uid="uid://c4pr2707hbeph"] +[gd_scene load_steps=57 format=3 uid="uid://c4pr2707hbeph"] [ext_resource type="Script" uid="uid://d2ubk5gucny6s" path="res://Scripts/Components/FSM/PlayerFSMProxy.cs" id="1_g3wua"] [ext_resource type="Script" uid="uid://bw2hakslndaxm" path="res://Scripts/Components/FSM/PlayerStateMachine.cs" id="1_mpmil"] @@ -29,6 +29,7 @@ [ext_resource type="AudioStream" uid="uid://myr6n2c1u503" path="res://SFX/581602__samsterbirdies__beep-error.mp3" id="24_5tmtw"] [ext_resource type="Script" uid="uid://cem7a1agaqtrt" path="res://Scenes/InteractionController.cs" id="27_vwjki"] [ext_resource type="Script" uid="uid://d0bebi2vn171l" path="res://Scripts/Components/FSM/Player/PlayerFSMItemUseModule.cs" id="29_m323t"] +[ext_resource type="Texture2D" uid="uid://ddwhrlrgj6i00" path="res://Sprites/Actors/Cirno.png" id="30_li0ug"] [sub_resource type="CircleShape2D" id="CircleShape2D_b3hxm"] radius = 5.0 @@ -111,6 +112,117 @@ radius = 17.2627 [sub_resource type="CircleShape2D" id="CircleShape2D_g3wua"] radius = 9.0 +[sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_es1gk"] +input_0/name = "up" +input_0/auto_advance = false +input_0/break_loop_at_end = false +input_0/reset = true +input_1/name = "down" +input_1/auto_advance = false +input_1/break_loop_at_end = false +input_1/reset = true +input_2/name = "left" +input_2/auto_advance = false +input_2/break_loop_at_end = false +input_2/reset = true +input_3/name = "right" +input_3/auto_advance = false +input_3/break_loop_at_end = false +input_3/reset = true + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_4f2wn"] +animation = &"Walk_Down" + +[sub_resource type="AnimationNodeBlendSpace1D" id="AnimationNodeBlendSpace1D_fnw0c"] +blend_point_0/node = SubResource("AnimationNodeAnimation_4f2wn") +blend_point_0/pos = 0.0 + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_12erk"] +animation = &"Walk_Up" + +[sub_resource type="AnimationNodeBlendSpace1D" id="AnimationNodeBlendSpace1D_c4ide"] +blend_point_0/node = SubResource("AnimationNodeAnimation_12erk") +blend_point_0/pos = 0.0 + +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_fjg1v"] +graph_offset = Vector2(-110.364, 39.7151) +nodes/Transition/node = SubResource("AnimationNodeTransition_es1gk") +nodes/Transition/position = Vector2(706.667, 53.3333) +nodes/Walk_Down/node = SubResource("AnimationNodeBlendSpace1D_fnw0c") +nodes/Walk_Down/position = Vector2(426.667, 253.333) +nodes/Walk_Up/node = SubResource("AnimationNodeBlendSpace1D_c4ide") +nodes/Walk_Up/position = Vector2(426.667, 53.3333) +nodes/output/position = Vector2(280, 133.333) +node_connections = [&"Transition", 0, &"Walk_Up", &"Transition", 1, &"Walk_Down"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_hed00"] +advance_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_q2flx"] +advance_mode = 2 + +[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_k7ckg"] +states/BlendTree/node = SubResource("AnimationNodeBlendTree_fjg1v") +states/BlendTree/position = Vector2(401.333, 98.4444) +states/Start/position = Vector2(192, 98.963) +transitions = ["Start", "BlendTree", SubResource("AnimationNodeStateMachineTransition_hed00"), "BlendTree", "End", SubResource("AnimationNodeStateMachineTransition_q2flx")] + +[sub_resource type="Animation" id="Animation_qlmfy"] +resource_name = "Walk_Down" +length = 0.3 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("../Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [0, 1, 2] +} + +[sub_resource type="Animation" id="Animation_v2m0j"] +resource_name = "Walk_Up" +length = 0.3 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("../Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [3, 5, 4] +} + +[sub_resource type="Animation" id="Animation_awrib"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("../Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [0] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_nfrn8"] +_data = { +&"RESET": SubResource("Animation_awrib"), +&"Walk_Down": SubResource("Animation_qlmfy"), +&"Walk_Up": SubResource("Animation_v2m0j") +} + [node name="FSMPlayer" type="CharacterBody2D" node_paths=PackedStringArray("PlayerFSM", "InteractionController")] process_mode = 1 collision_layer = 2 @@ -168,7 +280,8 @@ shape = SubResource("CircleShape2D_b3hxm") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] material = ExtResource("4_5qlss") sprite_frames = ExtResource("4_s0ir4") -animation = &"idle" +animation = &"walk_down" +frame_progress = 0.50115 [node name="WeaponProvider" type="Node2D" parent="."] script = ExtResource("5_gp3hw") @@ -268,6 +381,27 @@ shape = SubResource("CircleShape2D_g3wua") [node name="ItemUser" type="Node2D" parent="."] script = ExtResource("29_m323t") +[node name="Sprite2D" type="Sprite2D" parent="."] +visible = false +texture = ExtResource("30_li0ug") +hframes = 3 +vframes = 4 + +[node name="AnimationTree" type="AnimationTree" parent="."] +root_node = NodePath(".") +tree_root = SubResource("AnimationNodeStateMachine_k7ckg") +anim_player = NodePath("AnimationPlayer") +parameters/BlendTree/Transition/current_state = "" +parameters/BlendTree/Transition/transition_request = "" +parameters/BlendTree/Transition/current_index = -1 +parameters/BlendTree/Walk_Down/blend_position = 0 +parameters/BlendTree/Walk_Up/blend_position = 0 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="AnimationTree"] +libraries = { +&"": SubResource("AnimationLibrary_nfrn8") +} + [connection signal="area_entered" from="DamageReceiver" to="DamageReceiver" method="_on_damage_hitbox_area_entered"] [connection signal="area_entered" from="InteractionProvider" to="InteractionProvider" method="_on_interaction_controller_area_entered"] [connection signal="area_exited" from="InteractionProvider" to="InteractionProvider" method="_on_interaction_controller_area_exited"]