diff --git a/player.tscn b/player.tscn index c930d65..dec33d3 100644 --- a/player.tscn +++ b/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=3 uid="uid://0m1hk2nu4bps"] +[gd_scene load_steps=29 format=3 uid="uid://0m1hk2nu4bps"] [ext_resource type="Script" path="res://player.gd" id="1_0pgv8"] [ext_resource type="Texture2D" uid="uid://5pmqr3y62guu" path="res://player/currentCloth.tres" id="2_45h8h"] @@ -442,6 +442,9 @@ _data = { "idle": ExtResource("2_ymiw5") } +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_ydofw"] +filters = ["Skeleton2D/root/Hips/LegLeft:position:x", "Skeleton2D/root/Hips/LegLeft:position:y", "Skeleton2D/root/Hips/LegLeft:rotation", "Skeleton2D/root/Hips/LegRight:position:x", "Skeleton2D/root/Hips/LegRight:position:y", "Skeleton2D/root/Hips/LegRight:rotation"] + [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_hn1cf"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_myrjl"] @@ -450,6 +453,18 @@ animation = &"WalkLeft" [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_50xfb"] animation = &"WalkRight" +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_i0qvo"] +animation = &"WalkLeft" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ml43n"] +animation = &"WalkRight" + +[sub_resource type="AnimationNodeBlendSpace2D" id="AnimationNodeBlendSpace2D_l88j3"] +blend_point_0/node = SubResource("AnimationNodeAnimation_i0qvo") +blend_point_0/pos = Vector2(-1, 0) +blend_point_1/node = SubResource("AnimationNodeAnimation_ml43n") +blend_point_1/pos = Vector2(1, 0) + [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_dx8h8"] animation = &"idle" @@ -486,20 +501,24 @@ advance_condition = &"WalkRight" states/BlendTree/node = SubResource("AnimationNodeBlendTree_hn1cf") states/BlendTree/position = Vector2(668, 238) states/End/position = Vector2(328, 289) -states/Start/position = Vector2(371, 25) +states/Start/position = Vector2(132, -10) states/WalkLeft/node = SubResource("AnimationNodeAnimation_myrjl") -states/WalkLeft/position = Vector2(495, 179) +states/WalkLeft/position = Vector2(-72, 143) states/WalkRight/node = SubResource("AnimationNodeAnimation_50xfb") -states/WalkRight/position = Vector2(259, 179) +states/WalkRight/position = Vector2(304, 143) +states/Walkspace/node = SubResource("AnimationNodeBlendSpace2D_l88j3") +states/Walkspace/position = Vector2(487, 126) states/idle/node = SubResource("AnimationNodeAnimation_dx8h8") -states/idle/position = Vector2(371, 111) +states/idle/position = Vector2(138, 66) transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_ogkr4"), "idle", "WalkLeft", SubResource("AnimationNodeStateMachineTransition_q2u5u"), "WalkLeft", "idle", SubResource("AnimationNodeStateMachineTransition_0oq83"), "idle", "WalkRight", SubResource("AnimationNodeStateMachineTransition_p8n5f"), "WalkRight", "idle", SubResource("AnimationNodeStateMachineTransition_yhvwn"), "WalkRight", "WalkLeft", SubResource("AnimationNodeStateMachineTransition_xfa3x"), "WalkLeft", "WalkRight", SubResource("AnimationNodeStateMachineTransition_m2u4j")] -graph_offset = Vector2(-106, 41) +graph_offset = Vector2(-292, -6) [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_wgp38"] -graph_offset = Vector2(-144, 42) +graph_offset = Vector2(-182.362, 30.8934) +nodes/Blend2/node = SubResource("AnimationNodeBlend2_ydofw") +nodes/Blend2/position = Vector2(380, 180) nodes/Locomotion/node = SubResource("AnimationNodeStateMachine_x16w7") -nodes/Locomotion/position = Vector2(180, 120) +nodes/Locomotion/position = Vector2(100, 120) nodes/output/position = Vector2(380, 120) node_connections = [&"output", 0, &"Locomotion"] @@ -532,58 +551,63 @@ playback_default_blend_time = 0.3 [node name="AnimationTree" type="AnimationTree" parent="." groups=["Animation"]] tree_root = SubResource("AnimationNodeBlendTree_wgp38") anim_player = NodePath("../AnimationPlayer") -parameters/Locomotion/conditions/Idle = false +parameters/Blend2/blend_amount = 0 +parameters/Locomotion/conditions/Idle = true parameters/Locomotion/conditions/WalkLeft = false parameters/Locomotion/conditions/WalkRight = false +parameters/Locomotion/Walkspace/blend_position = Vector2(-0.00198412, 0.923077) [node name="Skeleton2D" type="Skeleton2D" parent="."] position = Vector2(17, 0) [node name="BootL" type="Sprite2D" parent="Skeleton2D"] -position = Vector2(42, -41) +position = Vector2(-96.8819, -35.0051) +rotation = 0.435284 +scale = Vector2(1, 1) texture = ExtResource("2_45h8h") region_enabled = true region_rect = Rect2(896, 768, 128, 128) [node name="BootR" type="Sprite2D" parent="Skeleton2D"] -position = Vector2(-71, -48) +position = Vector2(42.9032, -41.0059) +rotation = -0.698758 texture = ExtResource("2_45h8h") region_enabled = true region_rect = Rect2(896, 768, 128, 128) [node name="Body" type="Sprite2D" parent="Skeleton2D"] -position = Vector2(51, -222.399) +position = Vector2(59, -231) texture = ExtResource("2_45h8h") offset = Vector2(-15, 0) region_enabled = true region_rect = Rect2(0, 640, 384, 384) [node name="HandL" type="Sprite2D" parent="Skeleton2D/Body"] -position = Vector2(-29.3091, 50.5049) +position = Vector2(-3, 54) texture = ExtResource("2_45h8h") region_enabled = true region_rect = Rect2(768, 768, 128, 128) [node name="HandR" type="Sprite2D" parent="Skeleton2D/Body"] show_behind_parent = true -position = Vector2(-151.18, 31.2505) +position = Vector2(-160, 29) texture = ExtResource("2_45h8h") region_enabled = true region_rect = Rect2(768, 768, 128, 128) [node name="Tail" type="Sprite2D" parent="Skeleton2D/Body"] show_behind_parent = true -position = Vector2(44, 92.3986) -rotation = -0.217798 -scale = Vector2(1, 1) +position = Vector2(36, 101) +rotation = -0.132128 texture = ExtResource("2_45h8h") offset = Vector2(70, 0) region_enabled = true region_rect = Rect2(768, 640, 256, 128) [node name="Head" type="Sprite2D" parent="Skeleton2D"] -position = Vector2(-40, -395.399) -rotation = 0.00139138 +position = Vector2(-32, -404) +rotation = 0.0756305 +scale = Vector2(1, 1) texture = ExtResource("2_45h8h") offset = Vector2(0, -168) region_enabled = true