Cleaned up animation associations with states

diff --git a/model/prototype.glb b/model/prototype.glb
index a3948ab6ed064c3c1a55d59bf8819703e819d2c3..6c278df11b434214437467b685619d9279fc8992 100644 (file)
Binary files a/model/prototype.glb and b/model/prototype.glb differ

diff --git a/player/moves/Move.gd b/player/moves/Move.gd
index 42cf711c27a5cc71043d43addcb78bef286c3149..c914e9e3dad10365069491e10fd70617d926a551 100644 (file)
--- a/player/moves/Move.gd
+++ b/player/moves/Move.gd
@@ -12,8 +12,8 @@ static var moves_priority: Dictionary = {
        "walk": 1,
        "slash": 2,
        "shoot": 3,
        "walk": 1,
        "slash": 2,
        "shoot": 3,

-       "fall": 50,
-       "dash": 100
+       "dash": 50,
+       "fall": 100,

 }
 
 static func moves_priority_sort(a: String, b: String):
 }
 
 static func moves_priority_sort(a: String, b: String):

diff --git a/player/moves/fall.gd b/player/moves/fall.gd
index 034f41ffae1ae3fb99542b134ebe283ef9021564..205f19465d7a7cc3f75557083ac7853613e9c6aa 100644 (file)
--- a/player/moves/fall.gd
+++ b/player/moves/fall.gd
@@ -8,4 +8,4 @@ func update(_input: InputPacket, delta: float):
 
 
 func on_enter_state():
 
 
 func on_enter_state():

-       player.skin.transition_falling()
+       player.skin.transition_fall()

diff --git a/player/moves/idle.gd b/player/moves/idle.gd
index 123cd8d5cc43394a2ea0dd8e2b9b42d670d53b4f..69658848a5b2c0115f8c307f71da1cbf317e6855 100644 (file)
--- a/player/moves/idle.gd
+++ b/player/moves/idle.gd
@@ -9,7 +9,7 @@ func update(input: InputPacket, delta: float):
 
 func on_enter_state():
        player.idle_time = 0.0
 
 func on_enter_state():
        player.idle_time = 0.0

-       player.skin.transition_move()
+       player.skin.transition_idle()

 
 
 func on_exit_state():
 
 
 func on_exit_state():

diff --git a/player/moves/shoot.gd b/player/moves/shoot.gd
index ab317fa0b22c4bf6fad82f6ac2ac9c7915105741..ba878124edb9b8709be5cc4e389f68acfad5ff93 100644 (file)
--- a/player/moves/shoot.gd
+++ b/player/moves/shoot.gd
@@ -3,7 +3,7 @@ class_name Shoot
 
 
 var finished := false
 
 
 var finished := false

-const shoot_walk_speed := 4.0
+const shoot_walk_speed := 1.0

 
 
 func should_enter(input: InputPacket) -> String:
 
 
 func should_enter(input: InputPacket) -> String:


@@ -22,7 +22,7 @@ func update(input: InputPacket, delta: float):
 func on_enter_state():
        finished = false
        player.skin.animation_tree.animation_finished.connect(_on_animation_finished)
 func on_enter_state():
        finished = false
        player.skin.animation_tree.animation_finished.connect(_on_animation_finished)

-       player.skin.transition_gunfire()
+       player.skin.transition_shoot()

 
 
 func _on_animation_finished(_name: String):
 
 
 func _on_animation_finished(_name: String):

diff --git a/skin/prototype_skin.tscn b/skin/prototype_skin.tscn
index d34935c649450744d134b2ba26f9ebae201b2762..b789a0e4935668a41915d2b9aa3efd02d0d0395a 100644 (file)
--- a/skin/prototype_skin.tscn
+++ b/skin/prototype_skin.tscn
@@ -1,44 +1,79 @@
-[gd_scene load_steps=17 format=3 uid="uid://dvkx3t15l7mfb"]
+[gd_scene load_steps=22 format=3 uid="uid://dvkx3t15l7mfb"]

 
 [ext_resource type="PackedScene" uid="uid://bnmnurravolxk" path="res://model/prototype.glb" id="1_jji2g"]
 [ext_resource type="Script" uid="uid://cirxg6yaodoab" path="res://skin/skin.gd" id="2_bmadk"]
 [ext_resource type="PackedScene" uid="uid://bfolm8rrgm87w" path="res://skin/prototype_gun_skin.tscn" id="3_bmadk"]
 [ext_resource type="PackedScene" uid="uid://b3idqb7fb550a" path="res://player/sword.tscn" id="4_bmadk"]
 
 
 [ext_resource type="PackedScene" uid="uid://bnmnurravolxk" path="res://model/prototype.glb" id="1_jji2g"]
 [ext_resource type="Script" uid="uid://cirxg6yaodoab" path="res://skin/skin.gd" id="2_bmadk"]
 [ext_resource type="PackedScene" uid="uid://bfolm8rrgm87w" path="res://skin/prototype_gun_skin.tscn" id="3_bmadk"]
 [ext_resource type="PackedScene" uid="uid://b3idqb7fb550a" path="res://player/sword.tscn" id="4_bmadk"]
 

-[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_kang0"]
-animation = &"attack-gunfire"
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_gs4tf"]
+animation = &"move-dash"

 
 

-[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_i12oj"]
-animation = &"attack-slashing"
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_sgpsa"]
+animation = &"move-fallToLanding"

 
 

-[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_bmadk"]
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_qa1c6"]
+animation = &"move-fallToRoll"

 
 

-[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_aeac7"]
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ar2gu"]
+animation = &"move-falling"

 
 [sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_s02u1"]
 
 
 [sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_s02u1"]
 

-[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_gs4tf"]
-animation = &"move-dash"
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_0pqp2"]
+animation = &"idle-default"
+
+[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_aeac7"]
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_kang0"]
+animation = &"attack-gunfire"
+
+[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_bmadk"]
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_i12oj"]
+animation = &"attack-slashing"

 
 [sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_i12oj"]
 sync = true
 xfade_time = 0.25
 
 [sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_i12oj"]
 sync = true
 xfade_time = 0.25

-input_0/name = "move"
+input_0/name = "idle"

 input_0/auto_advance = false
 input_0/break_loop_at_end = false
 input_0/reset = true
 input_0/auto_advance = false
 input_0/break_loop_at_end = false
 input_0/reset = true

-input_1/name = "dash"
+input_1/name = "move"

 input_1/auto_advance = false
 input_1/break_loop_at_end = false
 input_1/reset = true
 input_1/auto_advance = false
 input_1/break_loop_at_end = false
 input_1/reset = true

-input_2/name = "slash"
+input_2/name = "dash"

 input_2/auto_advance = false
 input_2/break_loop_at_end = false
 input_2/reset = true
 input_2/auto_advance = false
 input_2/break_loop_at_end = false
 input_2/reset = true

-input_3/name = "gunfire"
+input_3/name = "slash"

 input_3/auto_advance = false
 input_3/break_loop_at_end = false
 input_3/reset = true
 input_3/auto_advance = false
 input_3/break_loop_at_end = false
 input_3/reset = true

+input_4/name = "shoot"
+input_4/auto_advance = false
+input_4/break_loop_at_end = false
+input_4/reset = true
+input_5/name = "fall"
+input_5/auto_advance = false
+input_5/break_loop_at_end = false
+input_5/reset = true
+input_6/name = "fallToRoll"
+input_6/auto_advance = false
+input_6/break_loop_at_end = false
+input_6/reset = true
+input_7/name = "fallToLanding"
+input_7/auto_advance = false
+input_7/break_loop_at_end = false
+input_7/reset = true
+input_8/name = "suddenStop"
+input_8/auto_advance = false
+input_8/break_loop_at_end = false
+input_8/reset = true
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_v2urp"]
+animation = &"move-suddenStop"

 
 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_s02u1"]
 animation = &"idle-default"
 
 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_s02u1"]
 animation = &"idle-default"


@@ -60,104 +95,115 @@ min_space = 0.0
 max_space = 16.0
 
 [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_s02u1"]
 max_space = 16.0
 
 [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_s02u1"]

-graph_offset = Vector2(-351.668, 53.3853)
-nodes/Animation/node = SubResource("AnimationNodeAnimation_i12oj")
-nodes/Animation/position = Vector2(-80, 510)
-"nodes/Animation 2/node" = SubResource("AnimationNodeAnimation_kang0")
-"nodes/Animation 2/position" = Vector2(-50, 780)
-nodes/TimeScale/node = SubResource("AnimationNodeTimeScale_s02u1")
-nodes/TimeScale/position = Vector2(890, 90)
-"nodes/TimeScale 2/node" = SubResource("AnimationNodeTimeScale_bmadk")
-"nodes/TimeScale 2/position" = Vector2(110, 500)
-"nodes/TimeScale 3/node" = SubResource("AnimationNodeTimeScale_aeac7")
-"nodes/TimeScale 3/position" = Vector2(140, 730)
+graph_offset = Vector2(-266.815, 19.2029)

 nodes/dashing/node = SubResource("AnimationNodeAnimation_gs4tf")
 nodes/dashing/node = SubResource("AnimationNodeAnimation_gs4tf")

-nodes/dashing/position = Vector2(-150, 310)
-nodes/movement/node = SubResource("AnimationNodeTransition_i12oj")
-nodes/movement/position = Vector2(500, 120)
-nodes/output/position = Vector2(1210, 100)
-nodes/walking/node = SubResource("AnimationNodeBlendSpace1D_gs4tf")
-nodes/walking/position = Vector2(-250, 100)
-node_connections = [&"TimeScale", 0, &"movement", &"TimeScale 2", 0, &"Animation", &"TimeScale 3", 0, &"Animation 2", &"movement", 0, &"walking", &"movement", 1, &"dashing", &"movement", 2, &"TimeScale 2", &"movement", 3, &"TimeScale 3", &"output", 0, &"TimeScale"]
+nodes/dashing/position = Vector2(-10, -260)
+nodes/fallToLanding/node = SubResource("AnimationNodeAnimation_sgpsa")
+nodes/fallToLanding/position = Vector2(0, 720)
+nodes/fallToRoll/node = SubResource("AnimationNodeAnimation_qa1c6")
+nodes/fallToRoll/position = Vector2(10, 530)
+nodes/falling/node = SubResource("AnimationNodeAnimation_ar2gu")
+nodes/falling/position = Vector2(10, 350)
+"nodes/global timescale/node" = SubResource("AnimationNodeTimeScale_s02u1")
+"nodes/global timescale/position" = Vector2(1050, 130)
+nodes/idle/node = SubResource("AnimationNodeAnimation_0pqp2")
+nodes/idle/position = Vector2(0, -650)
+nodes/output/position = Vector2(1370, 140)
+nodes/shooting/node = SubResource("AnimationNodeAnimation_kang0")
+nodes/shooting/position = Vector2(-180, 160)
+"nodes/shooting timescale/node" = SubResource("AnimationNodeTimeScale_aeac7")
+"nodes/shooting timescale/position" = Vector2(10, 110)
+nodes/slashing/node = SubResource("AnimationNodeAnimation_i12oj")
+nodes/slashing/position = Vector2(-200, -70)
+"nodes/slashing timescale/node" = SubResource("AnimationNodeTimeScale_bmadk")
+"nodes/slashing timescale/position" = Vector2(-10, -80)
+nodes/state/node = SubResource("AnimationNodeTransition_i12oj")
+nodes/state/position = Vector2(660, 160)
+nodes/suddenStop/node = SubResource("AnimationNodeAnimation_v2urp")
+nodes/suddenStop/position = Vector2(20, 920)
+"nodes/walking speed/node" = SubResource("AnimationNodeBlendSpace1D_gs4tf")
+"nodes/walking speed/position" = Vector2(-20, -470)
+node_connections = [&"global timescale", 0, &"state", &"output", 0, &"global timescale", &"shooting timescale", 0, &"shooting", &"slashing timescale", 0, &"slashing", &"state", 0, &"idle", &"state", 1, &"walking speed", &"state", 2, &"dashing", &"state", 3, &"slashing timescale", &"state", 4, &"shooting timescale", &"state", 5, &"falling", &"state", 6, &"fallToRoll", &"state", 7, &"fallToLanding", &"state", 8, &"suddenStop"]

 
 [node name="prototype" instance=ExtResource("1_jji2g")]
 script = ExtResource("2_bmadk")
 
 [node name="Skeleton3D" parent="." index="0"]
 
 [node name="prototype" instance=ExtResource("1_jji2g")]
 script = ExtResource("2_bmadk")
 
 [node name="Skeleton3D" parent="." index="0"]

-bones/0/position = Vector3(0.262053, 0.82787, 0.248012)
-bones/0/rotation = Quaternion(0.556195, -0.611889, 0.0754563, 0.557266)
-bones/1/position = Vector3(-0.282775, 0.821772, -0.183114)
-bones/1/rotation = Quaternion(0.411676, 0.450333, 0.41405, 0.67549)
-bones/3/position = Vector3(0.00461849, 0.967352, 0.000256157)
-bones/3/rotation = Quaternion(0.0189196, -0.330894, -0.0030936, 0.943473)
+bones/0/position = Vector3(0.254558, 0.838955, 0.255605)
+bones/0/rotation = Quaternion(0.541654, -0.658138, 0.049597, 0.520582)
+bones/1/position = Vector3(-0.260736, 0.825744, -0.172523)
+bones/1/rotation = Quaternion(0.394415, 0.470713, 0.429427, 0.662162)
+bones/3/position = Vector3(0.00576772, 0.970959, 0.00718728)
+bones/3/rotation = Quaternion(0.0141055, -0.330065, -0.00441453, 0.943843)

 bones/4/rotation = Quaternion(-0.0801557, -2.41264e-07, -4.07088e-07, 0.996782)
 bones/4/rotation = Quaternion(-0.0801557, -2.41264e-07, -4.07088e-07, 0.996782)

-bones/5/rotation = Quaternion(0.10004, 0.0414301, -0.0106079, 0.994064)
+bones/5/rotation = Quaternion(0.0955005, 0.0411486, -0.00902313, 0.994538)

 bones/5/scale = Vector3(1, 1, 1)
 bones/5/scale = Vector3(1, 1, 1)

-bones/6/rotation = Quaternion(0.112859, 0.123421, -0.0121759, 0.985841)
+bones/6/rotation = Quaternion(0.108226, 0.122669, -0.0106062, 0.986472)

 bones/6/scale = Vector3(1, 0.999996, 1)
 bones/6/scale = Vector3(1, 0.999996, 1)

-bones/7/rotation = Quaternion(0.206167, -0.0102952, 0.00383805, 0.978455)
-bones/8/rotation = Quaternion(-0.165318, 0.180943, -0.030867, 0.969008)
-bones/9/rotation = Quaternion(-0.0669052, -0.00504943, -0.0278085, 0.997359)
-bones/10/position = Vector3(0.00461848, 0.967352, 0.000256154)
-bones/10/rotation = Quaternion(0.25993, 0.850151, 0.444681, -0.109262)
-bones/11/position = Vector3(0.00461861, 0.967352, 0.000256251)
-bones/11/rotation = Quaternion(-0.464996, 0.600531, 0.183025, 0.624214)
-bones/12/position = Vector3(0.0786043, 0.898698, 0.0371982)
-bones/12/rotation = Quaternion(0.920193, 0.0263784, 0.321288, 0.222088)
-bones/12/scale = Vector3(1.01676, 0.967304, 1.01676)
-bones/13/rotation = Quaternion(-1.20094e-07, -0.0243985, -3.85265e-08, 0.999702)
-bones/14/rotation = Quaternion(0.181014, -0.0243744, 0.00432022, 0.983169)
-bones/14/scale = Vector3(0.999989, 0.993999, 1.0066)
-bones/15/rotation = Quaternion(-3.75836e-08, 0.0366999, 1.82359e-08, 0.999326)
-bones/16/rotation = Quaternion(-0.41045, 0.0355485, 0.107545, 0.904821)
-bones/16/scale = Vector3(0.98543, 1.00332, 1.01272)
-bones/17/rotation = Quaternion(-0.0228111, 0.935177, -0.353005, -0.0176651)
+bones/7/rotation = Quaternion(0.220807, -0.0103571, 0.00319196, 0.975257)
+bones/8/rotation = Quaternion(-0.165362, 0.179548, -0.0306287, 0.969268)
+bones/9/rotation = Quaternion(-0.0811125, -0.00275616, -0.022256, 0.996453)
+bones/10/position = Vector3(0.0057677, 0.970959, 0.00718728)
+bones/10/rotation = Quaternion(0.263195, 0.851131, 0.441245, -0.10774)
+bones/11/position = Vector3(0.00576784, 0.970959, 0.00718737)
+bones/11/rotation = Quaternion(-0.465679, 0.60321, 0.179241, 0.622217)
+bones/12/position = Vector3(0.0794458, 0.902199, 0.0444813)
+bones/12/rotation = Quaternion(0.92906, 0.0350876, 0.32361, 0.175762)
+bones/12/scale = Vector3(1.02276, 0.955979, 1.02276)
+bones/13/rotation = Quaternion(-7.01643e-08, -0.0263359, -5.74867e-10, 0.999653)
+bones/14/rotation = Quaternion(0.0935761, -0.0265522, 0.00235215, 0.995255)
+bones/14/scale = Vector3(0.99999, 0.998196, 1.00207)
+bones/15/rotation = Quaternion(5.3846e-08, 0.0345665, 3.35389e-08, 0.999402)
+bones/16/rotation = Quaternion(-0.373342, 0.0329114, 0.110044, 0.920556)
+bones/16/scale = Vector3(0.980344, 1.01133, 1.01111)
+bones/17/rotation = Quaternion(-0.0229687, 0.935171, -0.35301, -0.0176437)

 bones/17/scale = Vector3(0.999462, 1.00037, 1.00017)
 bones/17/scale = Vector3(0.999462, 1.00037, 1.00017)

-bones/18/position = Vector3(-0.0496132, 0.901705, -0.065263)
-bones/18/rotation = Quaternion(0.937905, -0.110583, 0.327875, -0.0245877)
-bones/18/scale = Vector3(1.016, 0.968744, 1.016)
-bones/19/rotation = Quaternion(3.33886e-09, 0.0870118, 1.35935e-08, 0.996207)
-bones/20/rotation = Quaternion(0.228565, 0.0864795, -0.019731, 0.969479)
-bones/20/scale = Vector3(0.999994, 0.990947, 1.00987)
-bones/21/rotation = Quaternion(-1.73251e-08, 0.0714689, 4.8656e-09, 0.997443)
-bones/22/rotation = Quaternion(-0.562268, 0.070568, -0.110012, 0.816561)
-bones/22/scale = Vector3(0.987866, 0.989292, 1.02398)
-bones/23/rotation = Quaternion(-0.00183115, 0.937092, -0.349063, -0.00337386)
+bones/18/position = Vector3(-0.0489176, 0.90496, -0.0577633)
+bones/18/rotation = Quaternion(0.938684, -0.0721663, 0.328401, -0.0762727)
+bones/18/scale = Vector3(1.02377, 0.954111, 1.02377)
+bones/19/rotation = Quaternion(2.30103e-08, 0.0898458, -6.43723e-09, 0.995956)
+bones/20/rotation = Quaternion(0.10634, 0.0903511, -0.00908029, 0.990175)
+bones/20/scale = Vector3(0.999988, 0.997059, 1.00339)
+bones/21/rotation = Quaternion(-2.80819e-08, 0.0723691, 3.57681e-09, 0.997378)
+bones/22/rotation = Quaternion(-0.511695, 0.0726008, -0.103233, 0.849847)
+bones/22/scale = Vector3(0.981636, 0.991297, 1.0298)
+bones/23/rotation = Quaternion(-0.00225072, 0.936919, -0.349514, -0.0043055)

 bones/23/scale = Vector3(0.999647, 1.00025, 1.0001)
 bones/23/scale = Vector3(0.999647, 1.00025, 1.0001)

-bones/24/position = Vector3(0.0591595, 1.57526, 0.161271)
-bones/24/rotation = Quaternion(0.144751, -0.0981269, -0.071335, 0.982003)
-bones/25/position = Vector3(0.0631231, 1.60957, 0.172062)
-bones/25/rotation = Quaternion(-0.407157, 0.00223336, -0.378116, 0.831412)
-bones/26/position = Vector3(0.0819499, 1.62071, 0.15176)
-bones/26/rotation = Quaternion(0.762214, -0.0343937, 0.638181, -0.102823)
+bones/24/position = Vector3(0.0632086, 1.58226, 0.158954)
+bones/24/rotation = Quaternion(0.132055, -0.101198, -0.0654134, 0.983891)
+bones/25/position = Vector3(0.066908, 1.61688, 0.168819)
+bones/25/rotation = Quaternion(-0.41733, -0.00693385, -0.375698, 0.827429)
+bones/26/position = Vector3(0.0855795, 1.62785, 0.148421)
+bones/26/rotation = Quaternion(0.761898, -0.0222159, 0.640262, -0.095305)

 bones/26/scale = Vector3(1.00001, 0.999978, 1.00001)
 bones/27/scale = Vector3(0.999989, 1.00002, 0.999994)
 bones/26/scale = Vector3(1.00001, 0.999978, 1.00001)
 bones/27/scale = Vector3(0.999989, 1.00002, 0.999994)

-bones/28/position = Vector3(0.0685826, 1.55728, 0.160451)
-bones/28/rotation = Quaternion(0.113933, -0.390131, 0.210787, 0.889037)
-bones/29/position = Vector3(-0.10582, 1.5649, 0.158545)
-bones/29/rotation = Quaternion(0.137339, 0.0912337, 0.133476, 0.97724)
-bones/30/position = Vector3(-0.114358, 1.59843, 0.169137)
-bones/30/rotation = Quaternion(-0.412192, -0.0402602, 0.421712, 0.80662)
-bones/31/position = Vector3(-0.133611, 1.60748, 0.148342)
-bones/31/rotation = Quaternion(0.768693, 0.0825171, -0.631128, -0.0630855)
+bones/28/position = Vector3(0.072664, 1.56456, 0.15873)
+bones/28/rotation = Quaternion(0.102959, -0.389223, 0.220151, 0.888503)
+bones/29/position = Vector3(-0.10182, 1.57055, 0.155659)
+bones/29/rotation = Quaternion(0.12318, 0.0908223, 0.136682, 0.978722)
+bones/30/position = Vector3(-0.110691, 1.60434, 0.16545)
+bones/30/rotation = Quaternion(-0.42402, -0.0386312, 0.42451, 0.799066)
+bones/31/position = Vector3(-0.129897, 1.61268, 0.144314)
+bones/31/rotation = Quaternion(0.77089, 0.0774972, -0.630273, -0.0497912)

 bones/31/scale = Vector3(1.00001, 0.999994, 1)
 bones/31/scale = Vector3(1.00001, 0.999994, 1)

-bones/33/position = Vector3(-0.112858, 1.54613, 0.157522)
-bones/33/rotation = Quaternion(0.0932082, 0.382244, -0.15425, 0.906316)
-bones/34/position = Vector3(-0.0210743, 1.50775, 0.261455)
-bones/34/rotation = Quaternion(-0.618207, -0.0251232, 0.0191175, 0.785381)
-bones/35/position = Vector3(-0.0224686, 1.51994, 0.301167)
-bones/35/rotation = Quaternion(-0.764541, -0.0284765, 0.0136292, 0.643801)
+bones/32/scale = Vector3(0.999997, 1, 1)
+bones/33/position = Vector3(-0.1087, 1.5517, 0.155111)
+bones/33/rotation = Quaternion(0.0797983, 0.37797, -0.155221, 0.909218)
+bones/34/position = Vector3(-0.017148, 1.51709, 0.26056)
+bones/34/rotation = Quaternion(-0.628723, -0.0296795, 0.0210814, 0.776777)
+bones/35/position = Vector3(-0.0188498, 1.53037, 0.299908)
+bones/35/rotation = Quaternion(-0.773098, -0.0333359, 0.0146291, 0.633241)

 bones/35/scale = Vector3(1.00001, 0.999983, 1.00001)
 bones/36/rotation = Quaternion(0.172811, -6.05809e-08, 3.59375e-07, 0.984955)
 bones/36/scale = Vector3(0.99999, 1.00002, 0.999994)
 bones/35/scale = Vector3(1.00001, 0.999983, 1.00001)
 bones/36/rotation = Quaternion(0.172811, -6.05809e-08, 3.59375e-07, 0.984955)
 bones/36/scale = Vector3(0.99999, 1.00002, 0.999994)

-bones/37/position = Vector3(-0.0065094, 1.52625, 0.271411)
-bones/37/rotation = Quaternion(-0.122491, 0.604244, 0.75922, 0.208496)
-bones/38/position = Vector3(-0.0381879, 1.52434, 0.270883)
-bones/38/rotation = Quaternion(0.0733172, 0.613822, 0.746908, -0.244899)
-bones/39/position = Vector3(0.0211195, 1.58169, 0.246151)
-bones/39/rotation = Quaternion(-0.0251232, 0.618207, 0.785381, -0.0191175)
-bones/40/position = Vector3(-0.00136522, 1.57144, 0.26293)
-bones/40/rotation = Quaternion(0.729785, 0.585885, 0.275263, -0.219963)
+bones/37/position = Vector3(-0.0027746, 1.53597, 0.270072)
+bones/37/rotation = Quaternion(-0.129987, 0.613359, 0.751506, 0.205262)
+bones/38/position = Vector3(-0.0343711, 1.53375, 0.269452)
+bones/38/rotation = Quaternion(0.0719333, 0.624865, 0.737679, -0.245355)
+bones/39/position = Vector3(0.0245832, 1.59089, 0.24342)
+bones/39/rotation = Quaternion(-0.0297373, 0.628656, 0.776829, -0.0210815)
+bones/40/position = Vector3(0.00202242, 1.58099, 0.260439)
+bones/40/rotation = Quaternion(0.729417, 0.593288, 0.268376, -0.209604)

 bones/40/scale = Vector3(0.999995, 1.00001, 0.999995)
 bones/41/rotation = Quaternion(0.0748491, -0.0181048, -0.043127, 0.996097)
 bones/41/scale = Vector3(1.00001, 0.999982, 1.00001)
 bones/40/scale = Vector3(0.999995, 1.00001, 0.999995)
 bones/41/rotation = Quaternion(0.0748491, -0.0181048, -0.043127, 0.996097)
 bones/41/scale = Vector3(1.00001, 0.999982, 1.00001)


@@ -165,8 +211,8 @@ bones/42/rotation = Quaternion(0.274347, -0.0136375, -0.129823, 0.95273)
 bones/42/scale = Vector3(0.999995, 1.00001, 0.999997)
 bones/43/rotation = Quaternion(0.278039, -0.00341864, 0.067147, 0.958214)
 bones/43/scale = Vector3(1, 0.999998, 1)
 bones/42/scale = Vector3(0.999995, 1.00001, 0.999997)
 bones/43/rotation = Quaternion(0.278039, -0.00341864, 0.067147, 0.958214)
 bones/43/scale = Vector3(1, 0.999998, 1)

-bones/44/position = Vector3(0.0437177, 1.58342, 0.247428)
-bones/44/rotation = Quaternion(-0.623155, 0.615409, 0.294075, -0.382713)
+bones/44/position = Vector3(0.0471606, 1.59283, 0.244767)
+bones/44/rotation = Quaternion(-0.621157, 0.617895, 0.282238, -0.390784)

 bones/44/scale = Vector3(1, 0.999997, 1)
 bones/45/rotation = Quaternion(0.216098, -2.38372e-06, 7.31266e-05, 0.976372)
 bones/45/scale = Vector3(0.999997, 1, 0.999998)
 bones/44/scale = Vector3(1, 0.999997, 1)
 bones/45/rotation = Quaternion(0.216098, -2.38372e-06, 7.31266e-05, 0.976372)
 bones/45/scale = Vector3(0.999997, 1, 0.999998)


@@ -174,12 +220,12 @@ bones/46/rotation = Quaternion(0.356984, 0.00871236, -0.115499, 0.926902)
 bones/46/scale = Vector3(0.999999, 1, 0.999997)
 bones/47/rotation = Quaternion(0.0323356, 0.0279349, -0.125373, 0.991189)
 bones/47/scale = Vector3(1.00001, 0.999983, 1.00001)
 bones/46/scale = Vector3(0.999999, 1, 0.999997)
 bones/47/rotation = Quaternion(0.0323356, 0.0279349, -0.125373, 0.991189)
 bones/47/scale = Vector3(1.00001, 0.999983, 1.00001)

-bones/48/position = Vector3(0.0211195, 1.58169, 0.246151)
-bones/48/rotation = Quaternion(-0.0251232, 0.618206, 0.785382, -0.0191175)
-bones/50/position = Vector3(-0.0715137, 1.57596, 0.244635)
-bones/50/rotation = Quaternion(-0.0251232, 0.618207, 0.785381, -0.0191175)
-bones/51/position = Vector3(-0.0484347, 1.56857, 0.262224)
-bones/51/rotation = Quaternion(0.768476, -0.536656, -0.276603, -0.21198)
+bones/48/position = Vector3(0.0245832, 1.59089, 0.24342)
+bones/48/rotation = Quaternion(-0.0296794, 0.628724, 0.776776, -0.0210815)
+bones/50/position = Vector3(-0.068052, 1.5844, 0.241604)
+bones/50/rotation = Quaternion(-0.0297373, 0.628656, 0.776829, -0.0210815)
+bones/51/position = Vector3(-0.0450133, 1.57769, 0.259517)
+bones/51/rotation = Quaternion(0.774319, -0.536445, -0.268098, -0.201941)

 bones/51/scale = Vector3(1, 0.999997, 1)
 bones/52/rotation = Quaternion(0.0748466, 0.0181067, 0.0431008, 0.996099)
 bones/52/scale = Vector3(0.999999, 1, 0.999999)
 bones/51/scale = Vector3(1, 0.999997, 1)
 bones/52/rotation = Quaternion(0.0748466, 0.0181067, 0.0431008, 0.996099)
 bones/52/scale = Vector3(0.999999, 1, 0.999999)


@@ -187,8 +233,8 @@ bones/53/rotation = Quaternion(0.274349, 0.0136351, 0.129833, 0.952728)
 bones/53/scale = Vector3(0.999999, 1, 0.999999)
 bones/54/rotation = Quaternion(0.27804, 0.00341749, -0.0671438, 0.958214)
 bones/54/scale = Vector3(0.999997, 1.00001, 0.999996)
 bones/53/scale = Vector3(0.999999, 1, 0.999999)
 bones/54/rotation = Quaternion(0.27804, 0.00341749, -0.0671438, 0.958214)
 bones/54/scale = Vector3(0.999997, 1.00001, 0.999996)

-bones/55/position = Vector3(-0.0941834, 1.5749, 0.245189)
-bones/55/rotation = Quaternion(0.579674, 0.646186, 0.326737, 0.373718)
+bones/55/position = Vector3(-0.0907774, 1.583, 0.242008)
+bones/55/rotation = Quaternion(0.570847, 0.651953, 0.321064, 0.382112)

 bones/55/scale = Vector3(1.00001, 0.999987, 1.00001)
 bones/56/rotation = Quaternion(0.216093, 4.47298e-06, -8.28337e-05, 0.976373)
 bones/56/scale = Vector3(0.999988, 1.00002, 0.999992)
 bones/55/scale = Vector3(1.00001, 0.999987, 1.00001)
 bones/56/rotation = Quaternion(0.216093, 4.47298e-06, -8.28337e-05, 0.976373)
 bones/56/scale = Vector3(0.999988, 1.00002, 0.999992)


@@ -196,168 +242,176 @@ bones/57/rotation = Quaternion(0.356984, -0.0087149, 0.115506, 0.926901)
 bones/57/scale = Vector3(1, 0.999998, 0.999997)
 bones/58/rotation = Quaternion(0.0323454, -0.0279339, 0.125381, 0.991188)
 bones/58/scale = Vector3(1, 0.999999, 1)
 bones/57/scale = Vector3(1, 0.999998, 0.999997)
 bones/58/rotation = Quaternion(0.0323454, -0.0279339, 0.125381, 0.991188)
 bones/58/scale = Vector3(1, 0.999999, 1)

-bones/59/position = Vector3(-0.0715137, 1.57596, 0.244635)
-bones/59/rotation = Quaternion(-0.0251232, 0.618207, 0.785381, -0.0191175)
-bones/61/position = Vector3(-0.0192326, 1.48105, 0.248657)
-bones/61/rotation = Quaternion(-0.618207, -0.0251232, 0.0191175, 0.785381)
-bones/62/position = Vector3(-0.019528, 1.48886, 0.23702)
-bones/62/rotation = Quaternion(-0.529174, -0.0228963, 0.0217351, 0.847926)
-bones/65/position = Vector3(-0.0239581, 1.57343, 0.189999)
-bones/65/rotation = Quaternion(0.984306, 0.0287213, 0.0131051, 0.173624)
-bones/66/position = Vector3(-0.0163948, 1.43699, 0.239773)
-bones/66/rotation = Quaternion(0.296877, 0.00151818, 0.0315332, 0.954394)
+bones/59/position = Vector3(-0.068052, 1.5844, 0.241604)
+bones/59/rotation = Quaternion(-0.0296795, 0.628723, 0.776776, -0.0210814)
+bones/61/position = Vector3(-0.0150224, 1.49009, 0.24857)
+bones/61/rotation = Quaternion(-0.62892, -0.029591, 0.0209973, 0.776623)
+bones/62/position = Vector3(-0.0153136, 1.49756, 0.236724)
+bones/62/rotation = Quaternion(-0.540694, -0.0272349, 0.0240658, 0.840434)
+bones/65/position = Vector3(-0.02017, 1.58075, 0.187317)
+bones/65/rotation = Quaternion(0.981693, 0.0326054, 0.0161923, 0.186959)
+bones/66/position = Vector3(-0.0117735, 1.44583, 0.24092)
+bones/66/rotation = Quaternion(0.283827, 0.000554801, 0.0364003, 0.958184)

 bones/66/scale = Vector3(0.999995, 1.00001, 0.999996)
 bones/67/scale = Vector3(1.00001, 0.999993, 1)
 bones/66/scale = Vector3(0.999995, 1.00001, 0.999996)
 bones/67/scale = Vector3(1.00001, 0.999993, 1)

-bones/68/position = Vector3(-0.0166084, 1.45323, 0.19055)
-bones/68/rotation = Quaternion(0.809972, 0.0201278, 0.0243219, 0.585618)
-bones/69/position = Vector3(0.0590729, 1.57875, 0.191371)
-bones/69/rotation = Quaternion(0.995092, -0.0599859, -0.0136351, -0.0775122)
-bones/72/position = Vector3(-0.107132, 1.56833, 0.188677)
-bones/72/rotation = Quaternion(0.989228, 0.121885, 0.0246203, -0.0772414)
-bones/75/position = Vector3(-0.0206614, 1.49828, 0.272313)
-bones/75/rotation = Quaternion(-0.462172, -0.393781, -0.459637, 0.648126)
+bones/68/position = Vector3(-0.0118416, 1.4607, 0.191267)
+bones/68/rotation = Quaternion(0.801804, 0.0222761, 0.0287942, 0.596477)
+bones/69/position = Vector3(0.0629362, 1.58656, 0.189043)
+bones/69/rotation = Quaternion(0.996331, -0.05571, -0.0103837, -0.0641384)
+bones/72/position = Vector3(-0.103341, 1.57477, 0.185628)
+bones/72/rotation = Quaternion(0.989583, 0.126634, 0.0253899, -0.0636042)
+bones/75/position = Vector3(-0.0167249, 1.50793, 0.27168)
+bones/75/rotation = Quaternion(-0.467947, -0.403732, -0.45278, 0.642664)

 bones/76/rotation = Quaternion(-0.15209, -0.0958223, 0.266082, 0.947041)
 bones/76/scale = Vector3(0.999994, 1.00001, 0.999993)
 bones/76/rotation = Quaternion(-0.15209, -0.0958223, 0.266082, 0.947041)
 bones/76/scale = Vector3(0.999994, 1.00001, 0.999993)

-bones/77/position = Vector3(-0.0206614, 1.49828, 0.272313)
-bones/77/rotation = Quaternion(-0.49258, 0.354504, 0.491, 0.624988)
+bones/77/position = Vector3(-0.0167249, 1.50793, 0.27168)
+bones/77/rotation = Quaternion(-0.503869, 0.35729, 0.487447, 0.617135)
+bones/77/scale = Vector3(0.999999, 1, 0.999999)

 bones/78/rotation = Quaternion(-0.152094, 0.095823, -0.266084, 0.94704)
 bones/78/scale = Vector3(0.999994, 1.00001, 0.999994)
 bones/78/rotation = Quaternion(-0.152094, 0.095823, -0.266084, 0.94704)
 bones/78/scale = Vector3(0.999994, 1.00001, 0.999994)

-bones/79/position = Vector3(-0.0197252, 1.48505, 0.26513)
-bones/79/rotation = Quaternion(-0.405186, -0.376388, -0.382309, 0.740268)
+bones/79/position = Vector3(-0.0156518, 1.49451, 0.264874)
+bones/79/rotation = Quaternion(-0.41241, -0.385322, -0.375168, 0.735319)

 bones/79/scale = Vector3(1, 0.999999, 1)
 bones/80/rotation = Quaternion(-0.00824502, 0.0772326, 0.0389061, 0.99622)
 bones/80/scale = Vector3(1, 0.999999, 1)
 bones/79/scale = Vector3(1, 0.999999, 1)
 bones/80/rotation = Quaternion(-0.00824502, 0.0772326, 0.0389061, 0.99622)
 bones/80/scale = Vector3(1, 0.999999, 1)

-bones/81/position = Vector3(-0.0197252, 1.48505, 0.26513)
-bones/81/rotation = Quaternion(-0.433419, 0.33917, 0.420355, 0.721397)
+bones/81/position = Vector3(-0.0156518, 1.49451, 0.264874)
+bones/81/rotation = Quaternion(-0.445762, 0.340972, 0.417591, 0.714599)

 bones/81/scale = Vector3(0.999996, 1.00001, 0.999996)
 bones/82/rotation = Quaternion(-0.00825141, -0.0772324, -0.0389073, 0.99622)
 bones/82/scale = Vector3(1.00001, 0.999987, 1.00001)
 bones/81/scale = Vector3(0.999996, 1.00001, 0.999996)
 bones/82/rotation = Quaternion(-0.00825141, -0.0772324, -0.0389073, 0.99622)
 bones/82/scale = Vector3(1.00001, 0.999987, 1.00001)

-bones/83/position = Vector3(0.0453617, 1.58952, 0.250665)
-bones/83/rotation = Quaternion(0.146141, 0.491277, 0.631068, 0.582274)
+bones/83/position = Vector3(0.0487418, 1.59903, 0.247841)
+bones/83/rotation = Quaternion(0.134391, 0.498786, 0.627216, 0.582882)

 bones/83/scale = Vector3(0.999994, 1.00001, 0.999994)
 bones/84/rotation = Quaternion(-0.223178, 5.86239e-06, 0.0152086, 0.974659)
 bones/84/scale = Vector3(1.00001, 0.999993, 1)
 bones/85/rotation = Quaternion(-0.299458, -3.83782e-06, -0.0939993, 0.949468)
 bones/83/scale = Vector3(0.999994, 1.00001, 0.999994)
 bones/84/rotation = Quaternion(-0.223178, 5.86239e-06, 0.0152086, 0.974659)
 bones/84/scale = Vector3(1.00001, 0.999993, 1)
 bones/85/rotation = Quaternion(-0.299458, -3.83782e-06, -0.0939993, 0.949468)

+bones/86/rotation = Quaternion(-0.172948, -1.18312e-06, 0.1731, 0.969601)

 bones/86/scale = Vector3(0.999999, 1, 0.999999)
 bones/86/scale = Vector3(0.999999, 1, 0.999999)

-bones/87/position = Vector3(-0.00538095, 1.57681, 0.262279)
-bones/87/rotation = Quaternion(-0.384656, 0.0966166, 0.916318, 0.0553783)
+bones/87/position = Vector3(-0.00203343, 1.5863, 0.259618)
+bones/87/rotation = Quaternion(-0.388364, 0.107127, 0.914074, 0.046534)

 bones/87/scale = Vector3(1, 0.999989, 1)
 bones/88/scale = Vector3(0.999997, 1.00001, 0.999997)
 bones/87/scale = Vector3(1, 0.999989, 1)
 bones/88/scale = Vector3(0.999997, 1.00001, 0.999997)

-bones/89/position = Vector3(-0.096666, 1.58075, 0.248359)
-bones/89/rotation = Quaternion(0.185849, -0.490594, -0.59191, 0.611899)
+bones/89/position = Vector3(-0.0933263, 1.58891, 0.245002)
+bones/89/rotation = Quaternion(0.18128, -0.499471, -0.582076, 0.61551)

 bones/89/scale = Vector3(0.999998, 1, 0.999998)
 bones/90/rotation = Quaternion(-0.223161, 1.53166e-06, -0.0151752, 0.974664)
 bones/90/scale = Vector3(1, 0.999999, 1)
 bones/91/rotation = Quaternion(-0.29947, -3.38501e-06, 0.0939802, 0.949466)
 bones/92/rotation = Quaternion(-0.172941, 1.6437e-06, -0.173091, 0.969603)
 bones/92/scale = Vector3(1, 0.999994, 1)
 bones/89/scale = Vector3(0.999998, 1, 0.999998)
 bones/90/rotation = Quaternion(-0.223161, 1.53166e-06, -0.0151752, 0.974664)
 bones/90/scale = Vector3(1, 0.999999, 1)
 bones/91/rotation = Quaternion(-0.29947, -3.38501e-06, 0.0939802, 0.949466)
 bones/92/rotation = Quaternion(-0.172941, 1.6437e-06, -0.173091, 0.969603)
 bones/92/scale = Vector3(1, 0.999994, 1)

-bones/93/position = Vector3(-0.0450855, 1.57439, 0.261691)
-bones/93/rotation = Quaternion(0.363485, 0.120801, 0.917195, -0.109719)
+bones/93/position = Vector3(-0.0417086, 1.58352, 0.25884)
+bones/93/rotation = Quaternion(0.361814, 0.135001, 0.91603, -0.108417)

 bones/93/scale = Vector3(0.999998, 1, 0.999998)
 bones/94/scale = Vector3(1, 0.999989, 1.00001)
 bones/93/scale = Vector3(0.999998, 1, 0.999998)
 bones/94/scale = Vector3(1, 0.999989, 1.00001)

-bones/95/position = Vector3(0.0513714, 1.58303, 0.221599)
-bones/95/rotation = Quaternion(0.463588, -0.288644, -0.105896, 0.830997)
-bones/96/position = Vector3(0.048038, 1.60282, 0.251664)
-bones/96/rotation = Quaternion(0.655705, -0.398453, 0.181481, 0.615102)
-bones/98/position = Vector3(-0.00703546, 1.59057, 0.279398)
-bones/98/rotation = Quaternion(0.752387, -0.404765, 0.49998, 0.14177)
-bones/99/position = Vector3(-0.100905, 1.57362, 0.219131)
-bones/99/rotation = Quaternion(0.443355, 0.303239, 0.163788, 0.827439)
-bones/100/position = Vector3(-0.10098, 1.59362, 0.249234)
-bones/100/rotation = Quaternion(0.632927, 0.427983, -0.133165, 0.631269)
-bones/102/position = Vector3(-0.0456583, 1.5882, 0.278785)
-bones/102/rotation = Quaternion(0.734072, 0.447679, -0.478416, 0.178438)
-bones/103/position = Vector3(0.0113513, 1.499, 0.252473)
-bones/103/rotation = Quaternion(-0.383858, -0.285569, -0.318737, 0.818236)
-bones/105/position = Vector3(-0.0518947, 1.49516, 0.251505)
-bones/105/rotation = Quaternion(-0.405583, 0.2486, 0.362014, 0.801652)
-bones/107/position = Vector3(0.0513714, 1.58303, 0.221599)
-bones/107/rotation = Quaternion(0.808324, -0.337923, -0.45011, 0.172687)
-bones/109/position = Vector3(-0.100905, 1.57362, 0.219131)
-bones/109/rotation = Quaternion(0.778946, 0.383898, 0.472555, 0.150192)
-bones/111/position = Vector3(-0.0144167, 1.64387, 0.27181)
-bones/111/rotation = Quaternion(0.707351, 0.0978399, 0.700056, 0.00185662)
-bones/112/position = Vector3(0.0132363, 1.65332, 0.26014)
-bones/112/rotation = Quaternion(0.784205, 0.166504, 0.597615, 0.0124692)
-bones/113/position = Vector3(0.0350365, 1.65618, 0.239189)
-bones/113/rotation = Quaternion(0.920217, 0.14978, 0.356395, 0.061223)
-bones/114/position = Vector3(-0.0445964, 1.64203, 0.271331)
-bones/114/rotation = Quaternion(0.722997, -0.054461, -0.687353, 0.0430721)
-bones/115/position = Vector3(-0.0728119, 1.64805, 0.258776)
-bones/115/rotation = Quaternion(0.802271, -0.118461, -0.583252, 0.0463186)
-bones/116/position = Vector3(-0.0941256, 1.64827, 0.23714)
-bones/116/rotation = Quaternion(0.933173, -0.0942332, -0.337382, 0.0805037)
-bones/117/position = Vector3(-0.0254033, 1.5751, 0.274715)
-bones/117/rotation = Quaternion(0.977895, 0.0282632, 0.0140656, 0.206699)
+bones/95/position = Vector3(0.0549584, 1.59177, 0.219)
+bones/95/rotation = Quaternion(0.453811, -0.290385, -0.097147, 0.836836)
+bones/96/position = Vector3(0.0513145, 1.61236, 0.248482)
+bones/96/rotation = Quaternion(0.648497, -0.394874, 0.1913, 0.622038)
+bones/97/rotation = Quaternion(0.295791, 1.83677e-07, 0.145407, 0.944121)
+bones/98/position = Vector3(-0.00389743, 1.60051, 0.276341)
+bones/98/rotation = Quaternion(0.750722, -0.395141, 0.508106, 0.148687)
+bones/99/position = Vector3(-0.0973364, 1.58095, 0.215958)
+bones/99/rotation = Quaternion(0.430411, 0.304979, 0.164498, 0.833471)
+bones/100/position = Vector3(-0.0976917, 1.60193, 0.245561)
+bones/100/rotation = Quaternion(0.62275, 0.42697, -0.134686, 0.641668)
+bones/101/rotation = Quaternion(0.29579, -1.73553e-07, -0.145407, 0.944121)
+bones/102/position = Vector3(-0.0424954, 1.59781, 0.275584)
+bones/102/rotation = Quaternion(0.731003, 0.443783, -0.481626, 0.191641)
+bones/103/position = Vector3(0.0153911, 1.50839, 0.252054)
+bones/103/rotation = Quaternion(-0.3927, -0.293788, -0.312431, 0.813549)
+bones/105/position = Vector3(-0.0478019, 1.50397, 0.250816)
+bones/105/rotation = Quaternion(-0.418463, 0.249518, 0.360898, 0.795225)
+bones/107/position = Vector3(0.0549584, 1.59177, 0.219)
+bones/107/rotation = Quaternion(0.80864, -0.340959, -0.442492, 0.184524)
+bones/109/position = Vector3(-0.0973364, 1.58095, 0.215958)
+bones/109/rotation = Quaternion(0.773881, 0.393157, 0.470113, 0.159779)
+bones/111/position = Vector3(-0.0116722, 1.65352, 0.267245)
+bones/111/rotation = Quaternion(0.704904, 0.110405, 0.7006, 0.00898649)
+bones/112/position = Vector3(0.0159679, 1.66287, 0.255469)
+bones/112/rotation = Quaternion(0.781582, 0.177885, 0.597533, 0.021005)
+bones/113/position = Vector3(0.0378621, 1.66534, 0.234565)
+bones/113/rotation = Quaternion(0.917648, 0.15834, 0.357205, 0.0724899)
+bones/114/position = Vector3(-0.0418325, 1.65141, 0.266654)
+bones/114/rotation = Quaternion(0.724482, -0.0608033, -0.684349, 0.0556342)
+bones/115/position = Vector3(-0.0700248, 1.65685, 0.253783)
+bones/115/rotation = Quaternion(0.803676, -0.123063, -0.579171, 0.0593402)
+bones/115/scale = Vector3(1, 1, 1)
+bones/116/position = Vector3(-0.0912168, 1.6563, 0.232035)
+bones/116/rotation = Quaternion(0.933288, -0.0952384, -0.333127, 0.0944982)
+bones/117/position = Vector3(-0.022111, 1.58477, 0.271987)
+bones/117/rotation = Quaternion(0.974834, 0.0320411, 0.017282, 0.219939)
+bones/118/rotation = Quaternion(-0.0510138, 1.13334e-07, -1.45437e-07, 0.998698)

 bones/118/scale = Vector3(0.999997, 1.00001, 0.999997)
 bones/118/scale = Vector3(0.999997, 1.00001, 0.999997)

-bones/119/position = Vector3(-0.022117, 1.52045, 0.277307)
-bones/119/rotation = Quaternion(0.98896, 0.0313852, 0.00340637, -0.144781)
+bones/119/position = Vector3(-0.0183711, 1.53022, 0.276045)
+bones/119/rotation = Quaternion(0.990696, 0.0359696, 0.00520812, -0.131151)

 bones/119/scale = Vector3(1, 0.999997, 1)
 bones/119/scale = Vector3(1, 0.999997, 1)

-bones/120/position = Vector3(0.0500025, 1.64734, 0.20531)
-bones/120/rotation = Quaternion(0.992852, 0.0657485, -0.0024819, -0.0995799)
-bones/121/position = Vector3(-0.106824, 1.63774, 0.202823)
-bones/121/rotation = Quaternion(0.99485, -0.00338658, 0.0121057, -0.100573)
-bones/122/position = Vector3(0.0483407, 1.36938, 0.0445982)
-bones/122/rotation = Quaternion(-0.355169, -0.373222, -0.647351, 0.561691)
-bones/123/position = Vector3(0.1559, 1.35952, 0.0537062)
-bones/123/rotation = Quaternion(0.913887, 0.150609, 0.37699, 0.00245953)
-bones/123/scale = Vector3(1.03709, 0.929758, 1.03709)
-bones/124/rotation = Quaternion(7.00295e-10, -0.104649, -7.10795e-08, 0.994509)
-bones/125/rotation = Quaternion(-0.191293, -0.103922, -0.018589, 0.975839)
-bones/125/scale = Vector3(0.99986, 0.986334, 1.01693)
-bones/126/rotation = Quaternion(-4.74848e-08, 0.0940052, -6.29756e-08, 0.995572)
-bones/127/rotation = Quaternion(-0.107049, 0.0931205, -0.189208, 0.971632)
-bones/127/scale = Vector3(0.981511, 1.0564, 0.967911)
-bones/128/rotation = Quaternion(-0.0669001, 0.705386, -0.0195584, 0.705388)
-bones/129/rotation = Quaternion(-0.143617, -0.0065532, 0.00594316, 0.989594)
+bones/120/position = Vector3(0.0530914, 1.65569, 0.201025)
+bones/120/rotation = Quaternion(0.993853, 0.0700903, -0.00104836, -0.0856848)
+bones/121/position = Vector3(-0.103693, 1.64455, 0.197906)
+bones/121/rotation = Quaternion(0.996101, 0.00121772, 0.014584, -0.0870014)
+bones/122/position = Vector3(0.0525306, 1.37359, 0.0452609)
+bones/122/rotation = Quaternion(-0.361671, -0.389625, -0.63081, 0.565213)
+bones/123/position = Vector3(0.160392, 1.36749, 0.054257)
+bones/123/rotation = Quaternion(0.89431, 0.155797, 0.414257, 0.0657933)
+bones/123/scale = Vector3(1.04805, 0.910409, 1.04805)
+bones/124/rotation = Quaternion(2.41439e-08, -0.1232, -1.30599e-07, 0.992382)
+bones/125/rotation = Quaternion(-0.0793156, -0.122977, -0.00851191, 0.989198)
+bones/125/scale = Vector3(0.999907, 0.997135, 1.00394)
+bones/126/rotation = Quaternion(5.27345e-08, 0.0954053, 6.08487e-08, 0.995439)
+bones/127/rotation = Quaternion(-0.168332, 0.0938547, -0.138443, 0.971437)
+bones/127/scale = Vector3(0.96755, 1.07421, 0.967874)
+bones/128/rotation = Quaternion(-0.100056, 0.703533, 0.00806706, 0.703538)
+bones/129/rotation = Quaternion(-0.197173, -0.00709394, -0.00083363, 0.980343)

 bones/130/rotation = Quaternion(-4.31224e-06, 8.13943e-08, 6.78632e-05, 1)
 bones/130/rotation = Quaternion(-4.31224e-06, 8.13943e-08, 6.78632e-05, 1)

-bones/131/rotation = Quaternion(-0.190633, 0.0890234, 0.290135, 0.933572)
-bones/132/rotation = Quaternion(0.00895718, 0.0212426, -0.00784238, 0.999703)
+bones/131/rotation = Quaternion(-0.176879, 0.0925997, 0.2908, 0.935721)
+bones/132/rotation = Quaternion(0.00972523, 0.0216292, -0.00544807, 0.999704)

 bones/133/rotation = Quaternion(0.00626499, 6.74476e-08, -1.43925e-05, 0.99998)
 bones/133/rotation = Quaternion(0.00626499, 6.74476e-08, -1.43925e-05, 0.99998)

-bones/135/rotation = Quaternion(-0.0282153, 0.698914, 0.149112, 0.69892)
-bones/136/rotation = Quaternion(-0.190682, 0.00452201, -0.0131507, 0.981553)
+bones/135/rotation = Quaternion(-0.0441967, 0.698704, 0.147185, 0.69871)
+bones/136/rotation = Quaternion(-0.200756, 0.0019421, -0.0147267, 0.979529)

 bones/137/rotation = Quaternion(4.65474e-06, -7.81623e-08, -2.01332e-05, 1)
 bones/137/rotation = Quaternion(4.65474e-06, -7.81623e-08, -2.01332e-05, 1)

-bones/139/rotation = Quaternion(-0.100694, 0.675419, 0.278355, 0.675417)
-bones/140/rotation = Quaternion(-0.275871, -0.0120984, -0.0281399, 0.960706)
+bones/139/rotation = Quaternion(-0.116356, 0.674724, 0.275607, 0.674722)
+bones/140/rotation = Quaternion(-0.285697, -0.0167027, -0.0302855, 0.957696)
+bones/140/scale = Vector3(1, 0.999993, 1)

 bones/141/rotation = Quaternion(4.3083e-06, -3.352e-08, -1.93224e-06, 1)
 bones/141/rotation = Quaternion(4.3083e-06, -3.352e-08, -1.93224e-06, 1)

-bones/143/rotation = Quaternion(-0.0976707, 0.667072, 0.318787, 0.666221)
-bones/144/rotation = Quaternion(-0.336427, -0.00327973, -0.0546144, 0.940119)
+bones/143/rotation = Quaternion(-0.113983, 0.666326, 0.316542, 0.665446)
+bones/144/rotation = Quaternion(-0.345542, -0.00813388, -0.0568093, 0.936647)

 bones/145/rotation = Quaternion(-7.65809e-06, 2.29663e-08, 6.55561e-05, 1)
 bones/145/rotation = Quaternion(-7.65809e-06, 2.29663e-08, 6.55561e-05, 1)

-bones/147/position = Vector3(-0.0376723, 1.37095, 0.0137193)
-bones/147/rotation = Quaternion(-0.532846, 0.188786, 0.540854, 0.622826)
-bones/148/position = Vector3(-0.132501, 1.35444, -0.036068)
-bones/148/rotation = Quaternion(0.958477, -0.12053, 0.0628, -0.250701)
-bones/148/scale = Vector3(1.02767, 0.946872, 1.02767)
-bones/149/rotation = Quaternion(-3.82286e-08, 0.0825394, 3.99747e-08, 0.996588)
+bones/145/scale = Vector3(1, 0.999999, 1)
+bones/147/position = Vector3(-0.0334532, 1.37509, 0.0142861)
+bones/147/rotation = Quaternion(-0.532468, 0.205519, 0.520115, 0.63539)
+bones/148/position = Vector3(-0.128802, 1.36369, -0.0357618)
+bones/148/rotation = Quaternion(0.975, -0.129104, 0.0254053, -0.179059)
+bones/148/scale = Vector3(1.03867, 0.926924, 1.03867)
+bones/149/rotation = Quaternion(-1.02894e-07, 0.0980929, -1.11617e-07, 0.995177)

 bones/149/scale = Vector3(1, 1, 1)
 bones/149/scale = Vector3(1, 1, 1)

-bones/150/rotation = Quaternion(-0.19902, 0.0820798, 0.0156588, 0.976427)
-bones/150/scale = Vector3(0.999857, 0.988587, 1.01346)
-bones/151/rotation = Quaternion(3.99426e-08, -0.0183733, -5.53192e-08, 0.999831)
-bones/152/rotation = Quaternion(-0.180462, -0.018633, -0.118719, 0.976213)
-bones/152/scale = Vector3(0.977567, 1.04171, 0.983983)
-bones/153/rotation = Quaternion(-0.0205262, -0.706535, -0.0345411, 0.706537)
-bones/154/rotation = Quaternion(-0.1467, 0.00988873, -0.00833214, 0.989097)
+bones/150/rotation = Quaternion(-0.0543543, 0.0980348, 0.0047269, 0.993686)
+bones/150/scale = Vector3(0.999931, 0.998835, 1.00156)
+bones/151/rotation = Quaternion(6.9719e-10, -0.0300902, 2.98957e-08, 0.999547)
+bones/152/rotation = Quaternion(-0.246656, -0.0299428, -0.131519, 0.95967)
+bones/152/scale = Vector3(0.969594, 1.04704, 0.99059)
+bones/153/rotation = Quaternion(-0.0262573, -0.706459, -0.0337427, 0.706461)
+bones/154/rotation = Quaternion(-0.146267, 0.0106058, -0.00826707, 0.989154)

 bones/155/rotation = Quaternion(8.39836e-07, -2.08393e-07, -6.54599e-05, 1)
 bones/155/rotation = Quaternion(8.39836e-07, -2.08393e-07, -6.54599e-05, 1)

-bones/156/rotation = Quaternion(-0.247655, -0.0476644, -0.185024, 0.949822)
-bones/157/rotation = Quaternion(0.189681, 0.0803685, -0.0195457, 0.978356)
+bones/156/rotation = Quaternion(-0.250613, -0.0476399, -0.187786, 0.948504)
+bones/157/rotation = Quaternion(0.188129, 0.0785113, -0.0160984, 0.978869)

 bones/158/rotation = Quaternion(0.00626376, -7.70711e-08, 1.34285e-05, 0.99998)
 bones/158/rotation = Quaternion(0.00626376, -7.70711e-08, 1.34285e-05, 0.99998)

-bones/160/rotation = Quaternion(-0.0616642, -0.702533, -0.0953121, 0.702538)
-bones/161/rotation = Quaternion(-0.267093, 0.00973364, 0.0193973, 0.963426)
+bones/160/rotation = Quaternion(-0.0613531, -0.702488, -0.0961746, 0.702493)
+bones/161/rotation = Quaternion(-0.30469, 0.00976669, 0.0230834, 0.952122)

 bones/162/rotation = Quaternion(6.46779e-06, 1.28029e-07, 1.90929e-05, 1)
 bones/162/rotation = Quaternion(6.46779e-06, 1.28029e-07, 1.90929e-05, 1)

-bones/164/rotation = Quaternion(-0.0847148, -0.692734, -0.181839, 0.692732)
-bones/165/rotation = Quaternion(-0.3225, -0.0104283, 0.0312938, 0.945994)
+bones/164/rotation = Quaternion(-0.0990558, -0.690043, -0.194607, 0.690041)
+bones/165/rotation = Quaternion(-0.340923, -0.00891987, 0.0332542, 0.939461)

 bones/166/rotation = Quaternion(4.68059e-06, -2.29112e-07, 1.73853e-06, 1)
 bones/166/rotation = Quaternion(4.68059e-06, -2.29112e-07, 1.73853e-06, 1)

-bones/168/rotation = Quaternion(-0.0807186, -0.689132, -0.210949, 0.688536)
-bones/169/rotation = Quaternion(-0.351943, -0.0195946, 0.0650183, 0.933555)
+bones/168/rotation = Quaternion(-0.080861, -0.689095, -0.21114, 0.688498)
+bones/169/rotation = Quaternion(-0.366349, -0.019898, 0.0657483, 0.927939)

 bones/170/rotation = Quaternion(-9.53796e-06, -2.47026e-08, -6.50589e-05, 1)
 bones/170/rotation = Quaternion(-9.53796e-06, -2.47026e-08, -6.50589e-05, 1)

-bones/172/position = Vector3(0.0768334, 1.25227, 0.0809554)
-bones/172/rotation = Quaternion(-0.139631, 0.529198, 0.830977, 0.0996484)
-bones/173/position = Vector3(-0.0867218, 1.25535, 0.0223565)
-bones/173/rotation = Quaternion(-0.139631, 0.529198, 0.830977, 0.0996484)
+bones/172/position = Vector3(0.0798486, 1.25729, 0.0848281)
+bones/172/rotation = Quaternion(-0.138164, 0.541208, 0.823163, 0.102019)
+bones/173/position = Vector3(-0.0836711, 1.2606, 0.0261508)
+bones/173/rotation = Quaternion(-0.138164, 0.541208, 0.823163, 0.102019)

 
 [node name="hand_L" type="BoneAttachment3D" parent="." index="2"]
 unique_name_in_owner = true
 
 [node name="hand_L" type="BoneAttachment3D" parent="." index="2"]
 unique_name_in_owner = true

-transform = Transform3D(0.239796, -0.764758, -0.598033, -0.596561, 0.369907, -0.712238, 0.765907, 0.527555, -0.367522, 0.262053, 0.82787, 0.248012)
+transform = Transform3D(0.12879, -0.764604, -0.631501, -0.661327, 0.408302, -0.629234, 0.738958, 0.498668, -0.453068, 0.254558, 0.838955, 0.255605)

 bone_name = "weapon.L"
 bone_idx = 0
 use_external_skeleton = true
 bone_name = "weapon.L"
 bone_idx = 0
 use_external_skeleton = true


@@ -370,7 +424,7 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0,
 
 [node name="hand_R" type="BoneAttachment3D" parent="." index="3"]
 unique_name_in_owner = true
 
 [node name="hand_R" type="BoneAttachment3D" parent="." index="3"]
 unique_name_in_owner = true

-transform = Transform3D(0.251526, -0.188592, 0.949299, 0.930155, 0.318171, -0.183244, -0.267481, 0.929086, 0.255448, -0.282775, 0.821772, -0.183114)
+transform = Transform3D(0.188043, -0.197388, 0.962122, 0.940013, 0.320059, -0.118059, -0.284632, 0.926606, 0.245732, -0.260736, 0.825744, -0.172523)

 bone_name = "weapon.R"
 bone_idx = 1
 use_external_skeleton = true
 bone_name = "weapon.R"
 bone_idx = 1
 use_external_skeleton = true


@@ -384,10 +438,10 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0,
 [node name="AnimationTree" type="AnimationTree" parent="." index="4"]
 tree_root = SubResource("AnimationNodeBlendTree_s02u1")
 anim_player = NodePath("../AnimationPlayer")
 [node name="AnimationTree" type="AnimationTree" parent="." index="4"]
 tree_root = SubResource("AnimationNodeBlendTree_s02u1")
 anim_player = NodePath("../AnimationPlayer")

-parameters/TimeScale/scale = 1.5
-"parameters/TimeScale 2/scale" = 1.5
-"parameters/TimeScale 3/scale" = 2.0
-parameters/movement/current_state = "move"
-parameters/movement/transition_request = ""
-parameters/movement/current_index = 0
-parameters/walking/blend_position = 0.0
+"parameters/global timescale/scale" = 1.5
+"parameters/shooting timescale/scale" = 3.0
+"parameters/slashing timescale/scale" = 1.5
+parameters/state/current_state = "idle"
+parameters/state/transition_request = ""
+parameters/state/current_index = 0
+"parameters/walking speed/blend_position" = 0.0

diff --git a/skin/skin.gd b/skin/skin.gd
index d2221fd9a8caa73bfa41dddd51965c1910196ed5..7780b64d82784ea5051db9620c5a767b74991e26 100644 (file)
--- a/skin/skin.gd
+++ b/skin/skin.gd
@@ -6,26 +6,45 @@ class_name AnimatedSkin
 @onready var animation_player: AnimationPlayer = $AnimationPlayer
 
 
 @onready var animation_player: AnimationPlayer = $AnimationPlayer
 
 

-func set_walking_speed(s: float):
-       animation_tree.set("parameters/walking/blend_position", s)
+func left_hand_visible(b: bool = true):
+       %hand_L.visible = b

 
 
 
 

-func transition_move():
-       animation_tree.set("parameters/movement/transition_request", "move")
+func right_hand_visible(b: bool = true):
+       %hand_R.visible = b
+       

 
 

+func set_walking_speed(s: float):
+       animation_tree.set("parameters/walking speed/blend_position", s)

 
 

-func transition_falling():
-       # TODO: falling state
-       animation_tree.set("parameters/movement/transition_request", "move")
+### state transitions

 
 

+func transition(to_state: String):
+       animation_tree.set("parameters/state/transition_request", to_state)
+       
+func transition_idle():
+       transition("idle")

 
 

-func transition_dash():
-       animation_tree.set("parameters/movement/transition_request", "dash")
+func transition_move():
+       transition("move")

 
 

+func transition_dash():
+       transition("dash")

 
 func transition_slash():
 
 func transition_slash():

-       animation_tree.set("parameters/movement/transition_request", "slash")
+       transition("slash")
+
+func transition_shoot():
+       transition("shoot")
+
+func transition_fall():
+       transition("fall")
+
+func transition_fallToRoll():
+       transition("fallToRoll")

 
 

+func transition_fallToLanding():
+       transition("fallToLanding")

 
 

-func transition_gunfire():
-       animation_tree.set("parameters/movement/transition_request", "gunfire")
+func transition_suddenStop():
+       transition("suddenStop")