Added slash walking

diff --git a/map/cube.tscn b/map/cube.tscn
index 2984a63eb14287a0c22f943bae5692291b5b3bdd..da047bfa6ba731e37e72137145c8a4365dee9be3 100644 (file)
--- a/map/cube.tscn
+++ b/map/cube.tscn
@@ -4,16 +4,13 @@
 
 [sub_resource type="BoxMesh" id="BoxMesh_tgywu"]
 
 
 [sub_resource type="BoxMesh" id="BoxMesh_tgywu"]
 

-[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_w8p6k"]
-data = PackedVector3Array(-0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5)
+[sub_resource type="BoxShape3D" id="BoxShape3D_w8p6k"]

 
 

-[node name="Cube" type="Node3D"]
+[node name="Cube" type="RigidBody3D"]

 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 mesh = SubResource("BoxMesh_tgywu")
 surface_material_override/0 = ExtResource("1_w8p6k")
 
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 mesh = SubResource("BoxMesh_tgywu")
 surface_material_override/0 = ExtResource("1_w8p6k")
 

-[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D"]
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"]
-shape = SubResource("ConcavePolygonShape3D_w8p6k")
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("BoxShape3D_w8p6k")

diff --git a/map/test.tscn b/map/test.tscn
index 6bf557424493b70c6917016dc7ba7dc2e686787a..9c4248b889da9601969d286da26b3c400e90609a 100644 (file)
--- a/map/test.tscn
+++ b/map/test.tscn
@@ -68,18 +68,24 @@ environment = SubResource("Environment_6uqi0")
 transform = Transform3D(-0.866024, -0.433016, 0.250001, 0, 0.499998, 0.866026, -0.500003, 0.749999, -0.43301, 0, 0, 0)
 shadow_enabled = true
 
 transform = Transform3D(-0.866024, -0.433016, 0.250001, 0, 0.499998, 0.866026, -0.500003, 0.749999, -0.43301, 0, 0, 0)
 shadow_enabled = true
 

-[node name="MeshInstance3D" type="MeshInstance3D" parent="map"]
+[node name="Floor" type="MeshInstance3D" parent="map"]

 mesh = SubResource("PlaneMesh_mf4mk")
 skeleton = NodePath("../..")
 surface_material_override/0 = ExtResource("6_v1i7h")
 
 mesh = SubResource("PlaneMesh_mf4mk")
 skeleton = NodePath("../..")
 surface_material_override/0 = ExtResource("6_v1i7h")
 

-[node name="StaticBody3D" type="StaticBody3D" parent="map/MeshInstance3D"]
+[node name="StaticBody3D" type="StaticBody3D" parent="map/Floor"]

 
 

-[node name="CollisionShape3D" type="CollisionShape3D" parent="map/MeshInstance3D/StaticBody3D"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="map/Floor/StaticBody3D"]

 shape = SubResource("ConcavePolygonShape3D_37kl0")
 
 [node name="Ramp" parent="map" instance=ExtResource("7_5owfa")]
 transform = Transform3D(-1.62606e-07, 0, -3.72, 0, 3.72, 0, 3.72, 0, -1.62606e-07, -0.137384, 0, 7.7898)
 
 [node name="Cube" parent="map" instance=ExtResource("8_f4bcd")]
 shape = SubResource("ConcavePolygonShape3D_37kl0")
 
 [node name="Ramp" parent="map" instance=ExtResource("7_5owfa")]
 transform = Transform3D(-1.62606e-07, 0, -3.72, 0, 3.72, 0, 3.72, 0, -1.62606e-07, -0.137384, 0, 7.7898)
 
 [node name="Cube" parent="map" instance=ExtResource("8_f4bcd")]

-transform = Transform3D(2.54, 0, 0, 0, 2.54, 0, 0, 0, 2.54, -7.30192, 1.27, 5.19269)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.30192, 0.5, 5.19269)
+
+[node name="Cube2" parent="map" instance=ExtResource("8_f4bcd")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.50389, 0.5, 3.21238)
+
+[node name="Cube3" parent="map" instance=ExtResource("8_f4bcd")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.92252, 0.5, 9.21799)

diff --git a/player/moves/slash.gd b/player/moves/slash.gd
index a9c3b91791c25b1626345568be7e31f55b84de76..ecabe45635b2cd8f17778cd5ad393561c137fd56 100644 (file)
--- a/player/moves/slash.gd
+++ b/player/moves/slash.gd
@@ -1,10 +1,9 @@
-extends Move
+extends Walk

 class_name Slash
 
 
 class_name Slash
 
 

-@onready var timer: Timer = $Timer
-

 var finished := false
 var finished := false

+const slash_walk_speed := 4.0

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


@@ -14,12 +13,19 @@ func should_enter(input: InputPacket) -> String:
        return "slash"
 
 
        return "slash"
 
 

+func update(input: InputPacket, delta: float):
+       player.velocity = get_new_velocity_from_input(input, delta, slash_walk_speed)
+       player.move_and_slide()
+       update_skin(delta)
+
+

 func on_enter_state():
        finished = false
        player.skin.animation_tree.animation_finished.connect(_on_animation_finished)
        player.skin.transition_slash()
 
 
 func on_enter_state():
        finished = false
        player.skin.animation_tree.animation_finished.connect(_on_animation_finished)
        player.skin.transition_slash()
 
 

-func _on_animation_finished(n: String):
+func _on_animation_finished(_name: String):
+       # TODO: make sure animation is finished by using name

        finished = true
        player.skin.animation_tree.animation_finished.disconnect(_on_animation_finished)
        finished = true
        player.skin.animation_tree.animation_finished.disconnect(_on_animation_finished)

diff --git a/player/moves/walk.gd b/player/moves/walk.gd
index 8d92aa7765b92fc34c73660fd6fe50e82c516203..8f57d980d07ac1eed74c944787d70d681f88a895 100644 (file)
--- a/player/moves/walk.gd
+++ b/player/moves/walk.gd
@@ -6,9 +6,16 @@ const skin_lean_limit := PI/4
 
 
 func update(input: InputPacket, delta: float):
 
 
 func update(input: InputPacket, delta: float):

-       player.velocity = get_new_velocity_from_input(input, delta)
+       player.velocity = get_new_velocity_from_input(input, delta, player.walk_speed)

        player.move_and_slide()
        player.move_and_slide()

-       
+       update_skin(delta)
+
+
+func on_enter_state():
+       player.skin.transition_move()
+
+
+func update_skin(delta: float):

        # update skin rotation
        var skin_target_angle := Vector3.BACK.signed_angle_to(
                player.last_movement_direction, 
        # update skin rotation
        var skin_target_angle := Vector3.BACK.signed_angle_to(
                player.last_movement_direction, 


@@ -35,11 +42,7 @@ func update(input: InputPacket, delta: float):
        player.skin.set_walking_speed(player.velocity.length())
 
 
        player.skin.set_walking_speed(player.velocity.length())
 
 

-func on_enter_state():
-       player.skin.transition_move()
-
-
-func get_new_velocity_from_input(input: InputPacket, delta: float) -> Vector3:
+func get_new_velocity_from_input(input: InputPacket, delta: float, speed: float) -> Vector3:

        # Get the XZ input direction based on player's input relative to the camera
        var forward := camera.global_basis.z
        var right := camera.global_basis.x
        # Get the XZ input direction based on player's input relative to the camera
        var forward := camera.global_basis.z
        var right := camera.global_basis.x


@@ -56,7 +59,7 @@ func get_new_velocity_from_input(input: InputPacket, delta: float) -> Vector3:
        player.floor_normal = player.get_floor_normal()
        player.ground_slope_input = (PI / 2) - player.velocity.angle_to(player.floor_normal)
        var new_velocity = player.velocity.move_toward(
        player.floor_normal = player.get_floor_normal()
        player.ground_slope_input = (PI / 2) - player.velocity.angle_to(player.floor_normal)
        var new_velocity = player.velocity.move_toward(

-               movement_direction * (player.walk_speed + player.ground_slope_input * player.walk_speed),
+               movement_direction * (speed + player.ground_slope_input * speed),

                player.acceleration * delta
                )
        
                player.acceleration * delta
                )
        

diff --git a/skin/prototype_skin.tscn b/skin/prototype_skin.tscn
index d03466e91364d8b16f94f29ad4ea2c3e3dfe9937..e3129fdba03a980fe4b5e59d384031606da31b0b 100644 (file)
--- a/skin/prototype_skin.tscn
+++ b/skin/prototype_skin.tscn
@@ -84,80 +84,80 @@ node_connections = [&"TimeScale", 0, &"movement", &"TimeScale 2", 0, &"Animation
 script = ExtResource("2_bmadk")
 
 [node name="Skeleton3D" parent="." index="0"]
 script = ExtResource("2_bmadk")
 
 [node name="Skeleton3D" parent="." index="0"]

-bones/0/position = Vector3(0.260809, 0.850218, 0.263214)
-bones/0/rotation = Quaternion(0.543906, -0.624426, 0.0838056, 0.554288)
-bones/1/position = Vector3(-0.300572, 0.836947, -0.174021)
-bones/1/rotation = Quaternion(0.407533, 0.452229, 0.412994, 0.677379)
-bones/3/position = Vector3(-0.00332663, 0.971291, 0.00832966)
-bones/3/rotation = Quaternion(0.0124273, -0.330532, -0.00299457, 0.943708)
+bones/0/position = Vector3(0.270028, 0.851461, 0.264908)
+bones/0/rotation = Quaternion(0.544509, -0.616614, 0.0920442, 0.561093)
+bones/1/position = Vector3(-0.295127, 0.836355, -0.176271)
+bones/1/rotation = Quaternion(0.413565, 0.418818, 0.43836, 0.679261)
+bones/3/position = Vector3(0.00433904, 0.971499, 0.00864462)
+bones/3/rotation = Quaternion(0.0123012, -0.332246, -0.00412245, 0.943103)

 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.0926959, 0.0413424, -0.00940879, 0.994791)
+bones/5/rotation = Quaternion(0.0927977, 0.0413896, -0.00869085, 0.994786)

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

-bones/6/rotation = Quaternion(0.10542, 0.123254, -0.0109976, 0.986699)
+bones/6/rotation = Quaternion(0.105521, 0.123403, -0.0102815, 0.986677)

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

-bones/7/rotation = Quaternion(0.230044, -0.00995115, 0.00277355, 0.973125)
-bones/8/rotation = Quaternion(-0.165359, 0.179676, -0.0306509, 0.969244)
-bones/9/rotation = Quaternion(-0.0600451, -0.00318861, -0.0170214, 0.998045)
-bones/10/position = Vector3(-0.00332665, 0.971291, 0.00832966)
-bones/10/rotation = Quaternion(0.262533, 0.852293, 0.439544, -0.107119)
-bones/11/position = Vector3(-0.00332651, 0.971291, 0.00832975)
-bones/11/rotation = Quaternion(-0.467532, 0.602775, 0.17825, 0.621533)
-bones/12/position = Vector3(0.0704251, 0.902782, 0.0459904)
-bones/12/rotation = Quaternion(0.922238, 0.0302365, 0.321662, 0.212361)
-bones/12/scale = Vector3(1.01669, 0.967434, 1.01669)
-bones/13/rotation = Quaternion(-1.22834e-07, -0.0245666, -4.08763e-08, 0.999698)
-bones/14/rotation = Quaternion(0.1744, -0.0254012, 0.00433313, 0.984338)
-bones/14/scale = Vector3(0.999989, 0.994181, 1.0064)
-bones/15/rotation = Quaternion(-3.75794e-08, 0.0369689, 1.1106e-08, 0.999317)
-bones/16/rotation = Quaternion(-0.414081, 0.0364559, 0.10814, 0.903058)
-bones/16/scale = Vector3(0.98537, 1.00297, 1.01311)
-bones/17/rotation = Quaternion(-0.024012, 0.934387, -0.355232, -0.012408)
+bones/7/rotation = Quaternion(0.22927, -0.0108848, 0.00299647, 0.973297)
+bones/8/rotation = Quaternion(-0.165383, 0.178894, -0.0305173, 0.969389)
+bones/9/rotation = Quaternion(-0.0606263, -0.00459032, -0.0193378, 0.997963)
+bones/10/position = Vector3(0.00433902, 0.971499, 0.00864462)
+bones/10/rotation = Quaternion(0.262682, 0.852081, 0.44035, -0.105113)
+bones/11/position = Vector3(0.00433916, 0.971499, 0.00864472)
+bones/11/rotation = Quaternion(-0.46701, 0.602207, 0.176755, 0.622901)
+bones/12/position = Vector3(0.0777541, 0.902861, 0.0466275)
+bones/12/rotation = Quaternion(0.921583, 0.025833, 0.323051, 0.213673)
+bones/12/scale = Vector3(1.01661, 0.967599, 1.01661)
+bones/13/rotation = Quaternion(-1.26323e-07, -0.0247807, -4.38685e-08, 0.999693)
+bones/14/rotation = Quaternion(0.175256, -0.0249497, 0.00427758, 0.984197)
+bones/14/scale = Vector3(0.999988, 0.994875, 1.00569)
+bones/15/rotation = Quaternion(1.95494e-09, 0.036925, 2.84537e-08, 0.999318)
+bones/16/rotation = Quaternion(-0.41199, 0.035511, 0.104794, 0.904445)
+bones/16/scale = Vector3(0.985397, 1.00347, 1.01258)
+bones/17/rotation = Quaternion(-0.0232165, 0.935033, -0.353423, -0.0163384)

 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.057873, 0.905054, -0.0563889)
-bones/18/rotation = Quaternion(0.938326, -0.10075, 0.328475, -0.0387085)
-bones/18/scale = Vector3(1.01534, 0.970017, 1.01534)
-bones/19/rotation = Quaternion(-5.55201e-10, 0.0869997, 1.28147e-08, 0.996208)
-bones/20/rotation = Quaternion(0.207993, 0.0867494, -0.017921, 0.974111)
-bones/20/scale = Vector3(0.999992, 0.99283, 1.0078)
-bones/21/rotation = Quaternion(-3.89034e-08, 0.0721712, -8.62977e-09, 0.997392)
-bones/22/rotation = Quaternion(-0.558689, 0.0715777, -0.110921, 0.818804)
-bones/22/scale = Vector3(0.988651, 0.990078, 1.02229)
-bones/23/rotation = Quaternion(-0.00191557, 0.937032, -0.349221, -0.00355639)
+bones/18/position = Vector3(-0.050136, 0.905485, -0.0562529)
+bones/18/rotation = Quaternion(0.937285, -0.105151, 0.33016, -0.0378905)
+bones/18/scale = Vector3(1.01537, 0.969947, 1.01537)
+bones/19/rotation = Quaternion(-5.51393e-09, 0.0869843, 1.18229e-08, 0.99621)
+bones/20/rotation = Quaternion(0.206626, 0.0871091, -0.0178722, 0.974371)
+bones/20/scale = Vector3(0.999992, 0.992574, 1.00808)
+bones/21/rotation = Quaternion(5.10922e-09, 0.0712599, 1.855e-08, 0.997458)
+bones/22/rotation = Quaternion(-0.554481, 0.0704888, -0.112759, 0.821504)
+bones/22/scale = Vector3(0.988646, 0.990506, 1.02187)
+bones/23/rotation = Quaternion(-0.00234848, 0.936879, -0.349617, -0.00452416)

 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.0543125, 1.58126, 0.159893)
-bones/24/rotation = Quaternion(0.155528, -0.0969794, -0.0618814, 0.98111)
-bones/25/position = Vector3(0.0576875, 1.61535, 0.171379)
-bones/25/rotation = Quaternion(-0.398519, 0.000798905, -0.369819, 0.839295)
-bones/26/position = Vector3(0.076152, 1.62748, 0.151458)
-bones/26/rotation = Quaternion(0.760778, -0.0326138, 0.63754, -0.117034)
+bones/24/position = Vector3(0.0619904, 1.58124, 0.160582)
+bones/24/rotation = Quaternion(0.154387, -0.101971, -0.0643804, 0.980623)
+bones/25/position = Vector3(0.0654202, 1.6154, 0.172014)
+bones/25/rotation = Quaternion(-0.397783, -0.00203388, -0.374429, 0.837596)
+bones/26/position = Vector3(0.0841292, 1.62739, 0.152235)
+bones/26/rotation = Quaternion(0.757927, -0.0339439, 0.641371, -0.114187)

 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.0639893, 1.56371, 0.1588)
-bones/28/rotation = Quaternion(0.126537, -0.391956, 0.216326, 0.88519)
-bones/29/position = Vector3(-0.110525, 1.56776, 0.15668)
-bones/29/rotation = Quaternion(0.145867, 0.0902686, 0.144719, 0.97449)
-bones/30/position = Vector3(-0.119795, 1.60089, 0.167902)
-bones/30/rotation = Quaternion(-0.404234, -0.0496072, 0.429242, 0.806155)
-bones/31/position = Vector3(-0.139175, 1.60996, 0.147256)
-bones/31/rotation = Quaternion(0.767822, 0.0968323, -0.630063, -0.0639819)
+bones/28/position = Vector3(0.0715579, 1.56363, 0.159615)
+bones/28/rotation = Quaternion(0.12326, -0.396106, 0.214343, 0.884287)
+bones/29/position = Vector3(-0.102899, 1.56885, 0.155918)
+bones/29/rotation = Quaternion(0.144438, 0.0855652, 0.141987, 0.975529)
+bones/30/position = Vector3(-0.112028, 1.60207, 0.166994)
+bones/30/rotation = Quaternion(-0.407215, -0.0513841, 0.424761, 0.806916)
+bones/31/position = Vector3(-0.131177, 1.61121, 0.146144)
+bones/31/rotation = Quaternion(0.771033, 0.0938318, -0.6265, -0.0648167)

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

-bones/33/position = Vector3(-0.11717, 1.54888, 0.155269)
-bones/33/rotation = Quaternion(0.0983186, 0.383704, -0.140896, 0.907333)
-bones/34/position = Vector3(-0.0248074, 1.51034, 0.258574)
-bones/34/rotation = Quaternion(-0.610152, -0.0326277, 0.0263909, 0.791172)
-bones/35/position = Vector3(-0.0265186, 1.52173, 0.29851)
-bones/35/rotation = Quaternion(-0.757839, -0.0372989, 0.0192307, 0.651091)
+bones/33/position = Vector3(-0.109658, 1.55001, 0.154489)
+bones/33/rotation = Quaternion(0.0992337, 0.379141, -0.143936, 0.908674)
+bones/34/position = Vector3(-0.018487, 1.51108, 0.258705)
+bones/34/rotation = Quaternion(-0.611249, -0.0340911, 0.0210244, 0.790424)
+bones/35/position = Vector3(-0.0204789, 1.52257, 0.2986)
+bones/35/rotation = Quaternion(-0.758757, -0.0376451, 0.0136785, 0.650141)

 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.0106351, 1.52893, 0.268918)
-bones/37/rotation = Quaternion(-0.127564, 0.595186, 0.767143, 0.202418)
-bones/38/position = Vector3(-0.0422035, 1.52635, 0.268303)
-bones/38/rotation = Quaternion(0.063662, 0.607427, 0.750407, -0.252724)
-bones/39/position = Vector3(0.0159209, 1.58539, 0.2448)
-bones/39/rotation = Quaternion(-0.0326277, 0.610152, 0.791172, -0.0263909)
-bones/40/position = Vector3(-0.0064448, 1.57441, 0.261408)
-bones/40/rotation = Quaternion(0.721115, 0.590974, 0.279516, -0.229375)
+bones/37/position = Vector3(-0.00428274, 1.5296, 0.269136)
+bones/37/rotation = Quaternion(-0.129223, 0.595547, 0.765217, 0.207527)
+bones/38/position = Vector3(-0.035861, 1.52722, 0.268243)
+bones/38/rotation = Quaternion(0.0626225, 0.609167, 0.750859, -0.247396)
+bones/39/position = Vector3(0.0228687, 1.58582, 0.245133)
+bones/39/rotation = Quaternion(-0.0340911, 0.611249, 0.790424, -0.0210244)
+bones/40/position = Vector3(0.000281591, 1.57503, 0.261564)
+bones/40/rotation = Quaternion(0.722086, 0.589885, 0.282868, -0.224972)

 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 +165,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.0385118, 1.58756, 0.246178)
-bones/44/rotation = Quaternion(-0.633626, 0.606347, 0.29544, -0.378915)
+bones/44/position = Vector3(0.045426, 1.58784, 0.246692)
+bones/44/rotation = Quaternion(-0.632478, 0.610498, 0.293198, -0.375897)

 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 +174,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.0159209, 1.58539, 0.2448)
-bones/48/rotation = Quaternion(-0.0326277, 0.610152, 0.791172, -0.0263909)
-bones/50/position = Vector3(-0.076632, 1.57781, 0.242996)
-bones/50/rotation = Quaternion(-0.0326277, 0.610152, 0.791172, -0.0263909)
-bones/51/position = Vector3(-0.0534387, 1.57056, 0.260492)
-bones/51/rotation = Quaternion(0.77221, -0.525617, -0.283235, -0.217248)
+bones/48/position = Vector3(0.0228687, 1.58582, 0.245133)
+bones/48/rotation = Quaternion(-0.0340911, 0.611249, 0.790424, -0.0210244)
+bones/50/position = Vector3(-0.0697131, 1.57887, 0.242514)
+bones/50/rotation = Quaternion(-0.0340911, 0.611249, 0.790424, -0.0210244)
+bones/51/position = Vector3(-0.046727, 1.5715, 0.260234)
+bones/51/rotation = Quaternion(0.771942, -0.527544, -0.278453, -0.219696)

 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 +187,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.0992758, 1.57628, 0.243475)
-bones/55/rotation = Quaternion(0.576179, 0.648551, 0.337609, 0.365265)
+bones/55/position = Vector3(-0.0923701, 1.57748, 0.242794)
+bones/55/rotation = Quaternion(0.576446, 0.645327, 0.338243, 0.369939)

 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 +196,168 @@ 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.076632, 1.57781, 0.242996)
-bones/59/rotation = Quaternion(-0.0326278, 0.610152, 0.791172, -0.0263908)
-bones/61/position = Vector3(-0.0223898, 1.48396, 0.245314)
-bones/61/rotation = Quaternion(-0.610152, -0.0326277, 0.0263909, 0.791172)
-bones/62/position = Vector3(-0.0228228, 1.49199, 0.233837)
-bones/62/rotation = Quaternion(-0.520536, -0.0295663, 0.0297805, 0.852808)
-bones/65/position = Vector3(-0.0289261, 1.57735, 0.188436)
-bones/65/rotation = Quaternion(0.985602, 0.0386778, 0.0162811, 0.163789)
-bones/66/position = Vector3(-0.0186139, 1.44016, 0.23557)
-bones/66/rotation = Quaternion(0.306211, 0.00325928, 0.0418381, 0.951038)
+bones/59/position = Vector3(-0.0697131, 1.57887, 0.242514)
+bones/59/rotation = Quaternion(-0.0340911, 0.611249, 0.790424, -0.0210244)
+bones/61/position = Vector3(-0.0161288, 1.48466, 0.245526)
+bones/61/rotation = Quaternion(-0.611249, -0.0340911, 0.0210244, 0.790424)
+bones/62/position = Vector3(-0.0164048, 1.49266, 0.234027)
+bones/62/rotation = Quaternion(-0.521709, -0.0316039, 0.0246055, 0.852183)
+bones/65/position = Vector3(-0.0215248, 1.57796, 0.188386)
+bones/65/rotation = Quaternion(0.985462, 0.0346401, 0.020107, 0.165109)
+bones/66/position = Vector3(-0.0125616, 1.44081, 0.235912)
+bones/66/rotation = Quaternion(0.304974, -0.00199179, 0.0400032, 0.951518)

 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.019414, 1.45742, 0.1869)
-bones/68/rotation = Quaternion(0.815429, 0.0277015, 0.0315232, 0.577333)
-bones/69/position = Vector3(0.0541203, 1.58414, 0.190055)
-bones/69/rotation = Quaternion(0.994865, -0.0493679, -0.0139424, -0.0872457)
-bones/72/position = Vector3(-0.111986, 1.57055, 0.186813)
-bones/72/rotation = Quaternion(0.987063, 0.132045, 0.0261005, -0.0871167)
-bones/75/position = Vector3(-0.0242242, 1.50067, 0.269247)
-bones/75/rotation = Quaternion(-0.451126, -0.394733, -0.457219, 0.65698)
+bones/68/position = Vector3(-0.0124626, 1.4579, 0.186979)
+bones/68/rotation = Quaternion(0.814727, 0.0223993, 0.0332045, 0.57846)
+bones/69/position = Vector3(0.0615476, 1.5842, 0.190736)
+bones/69/rotation = Quaternion(0.994842, -0.0523429, -0.00913097, -0.0864083)
+bones/72/position = Vector3(-0.104597, 1.57171, 0.186036)
+bones/72/rotation = Quaternion(0.987471, 0.129137, 0.0306738, -0.0853395)
+bones/75/position = Vector3(-0.0180647, 1.50143, 0.269405)
+bones/75/rotation = Quaternion(-0.451121, -0.396665, -0.461005, 0.653162)

 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.0242242, 1.50067, 0.269247)
-bones/77/rotation = Quaternion(-0.49062, 0.343779, 0.500441, 0.625033)
+bones/77/position = Vector3(-0.0180647, 1.50143, 0.269405)
+bones/77/rotation = Quaternion(-0.492382, 0.343187, 0.495738, 0.627715)

 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.0230094, 1.48761, 0.261811)
-bones/79/rotation = Quaternion(-0.393505, -0.377613, -0.378704, 0.74776)
+bones/79/position = Vector3(-0.0168716, 1.48834, 0.262008)
+bones/79/rotation = Quaternion(-0.393889, -0.380062, -0.382556, 0.744348)

 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.0230094, 1.48761, 0.261811)
-bones/81/rotation = Quaternion(-0.430275, 0.329661, 0.430724, 0.72157)
+bones/81/position = Vector3(-0.0168716, 1.48834, 0.262008)
+bones/81/rotation = Quaternion(-0.431878, 0.328354, 0.425986, 0.724017)

 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.0400326, 1.59362, 0.249532)
-bones/83/rotation = Quaternion(0.146047, 0.485886, 0.642091, 0.574721)
+bones/83/position = Vector3(0.0469521, 1.5939, 0.25005)
+bones/83/rotation = Quaternion(0.144165, 0.483525, 0.640255, 0.579219)

 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/scale = Vector3(0.999999, 1, 0.999999)
 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/scale = Vector3(0.999999, 1, 0.999999)

-bones/87/position = Vector3(-0.0105706, 1.57971, 0.260853)
-bones/87/rotation = Quaternion(-0.386085, 0.083486, 0.917332, 0.0497047)
+bones/87/position = Vector3(-0.00380325, 1.58036, 0.260961)
+bones/87/rotation = Quaternion(-0.389967, 0.0855813, 0.915325, 0.0527402)

 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.101886, 1.58201, 0.246753)
-bones/89/rotation = Quaternion(0.197642, -0.483431, -0.590102, 0.61564)
+bones/89/position = Vector3(-0.0949708, 1.58324, 0.246035)
+bones/89/rotation = Quaternion(0.197973, -0.487502, -0.590746, 0.611693)

 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.0502105, 1.57646, 0.260081)
-bones/93/rotation = Quaternion(0.360097, 0.115652, 0.917546, -0.122739)
+bones/93/position = Vector3(-0.0434555, 1.57738, 0.259839)
+bones/93/rotation = Quaternion(0.356501, 0.116007, 0.919431, -0.118729)

 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.0462226, 1.5878, 0.220367)
-bones/95/rotation = Quaternion(0.474871, -0.28364, -0.0995455, 0.827126)
-bones/96/position = Vector3(0.0424527, 1.60694, 0.250786)
-bones/96/rotation = Quaternion(0.665667, -0.39403, 0.184675, 0.606236)
-bones/98/position = Vector3(-0.0125464, 1.59308, 0.278235)
-bones/98/rotation = Quaternion(0.757386, -0.401954, 0.498242, 0.128666)
-bones/99/position = Vector3(-0.105918, 1.57537, 0.217382)
-bones/99/rotation = Quaternion(0.448127, 0.305313, 0.175892, 0.821601)
-bones/100/position = Vector3(-0.106474, 1.59476, 0.247878)
-bones/100/rotation = Quaternion(0.634767, 0.435169, -0.121642, 0.626818)
-bones/102/position = Vector3(-0.0511101, 1.58993, 0.277483)
-bones/102/rotation = Quaternion(0.731607, 0.459823, -0.471279, 0.176665)
-bones/103/position = Vector3(0.00749761, 1.50257, 0.249712)
-bones/103/rotation = Quaternion(-0.372414, -0.287302, -0.3134, 0.824952)
-bones/105/position = Vector3(-0.0553325, 1.4973, 0.248326)
-bones/105/rotation = Quaternion(-0.400628, 0.239885, 0.372357, 0.802061)
-bones/107/position = Vector3(0.0462226, 1.5878, 0.220367)
-bones/107/rotation = Quaternion(0.813968, -0.325194, -0.450707, 0.169022)
-bones/109/position = Vector3(-0.105918, 1.57537, 0.217382)
-bones/109/rotation = Quaternion(0.775819, 0.387165, 0.478718, 0.137976)
-bones/111/position = Vector3(-0.0210255, 1.64636, 0.271682)
-bones/111/rotation = Quaternion(0.705506, 0.0983078, 0.701745, -0.012326)
-bones/112/position = Vector3(0.00644714, 1.65661, 0.260267)
-bones/112/rotation = Quaternion(0.78185, 0.168766, 0.600189, -0.00132718)
-bones/113/position = Vector3(0.0282244, 1.66034, 0.239429)
-bones/113/rotation = Quaternion(0.91877, 0.155791, 0.359486, 0.0485797)
-bones/114/position = Vector3(-0.051159, 1.64389, 0.271094)
-bones/114/rotation = Quaternion(0.724671, -0.0401706, -0.686575, 0.043053)
-bones/115/position = Vector3(-0.0794692, 1.64957, 0.258593)
-bones/115/rotation = Quaternion(0.804523, -0.104366, -0.582996, 0.0443585)
-bones/116/position = Vector3(-0.10074, 1.64978, 0.236916)
-bones/116/rotation = Quaternion(0.935225, -0.0812375, -0.336411, 0.0747079)
-bones/117/position = Vector3(-0.0305775, 1.57734, 0.273205)
-bones/117/rotation = Quaternion(0.979523, 0.0381063, 0.017577, 0.196913)
+bones/95/position = Vector3(0.0533655, 1.58799, 0.220947)
+bones/95/rotation = Quaternion(0.473437, -0.289056, -0.0998857, 0.826031)
+bones/96/position = Vector3(0.0494375, 1.60721, 0.251304)
+bones/96/rotation = Quaternion(0.662827, -0.398782, 0.186053, 0.605821)
+bones/98/position = Vector3(-0.00584428, 1.59378, 0.278295)
+bones/98/rotation = Quaternion(0.753643, -0.404521, 0.501644, 0.129379)
+bones/99/position = Vector3(-0.0987845, 1.57656, 0.216643)
+bones/99/rotation = Quaternion(0.447446, 0.300309, 0.174792, 0.824048)
+bones/100/position = Vector3(-0.0994829, 1.59602, 0.247092)
+bones/100/rotation = Quaternion(0.636071, 0.430078, -0.121387, 0.629056)
+bones/102/position = Vector3(-0.04442, 1.59088, 0.277204)
+bones/102/rotation = Quaternion(0.735062, 0.456034, -0.469097, 0.177948)
+bones/103/position = Vector3(0.0141503, 1.50297, 0.249998)
+bones/103/rotation = Quaternion(-0.372886, -0.29009, -0.317524, 0.822182)
+bones/105/position = Vector3(-0.0490063, 1.49823, 0.248212)
+bones/105/rotation = Quaternion(-0.402371, 0.238048, 0.367584, 0.803936)
+bones/107/position = Vector3(0.0533655, 1.58799, 0.220947)
+bones/107/rotation = Quaternion(0.814693, -0.329189, -0.447257, 0.166946)
+bones/109/position = Vector3(-0.0987845, 1.57656, 0.216643)
+bones/109/rotation = Quaternion(0.77481, 0.384458, 0.481295, 0.142185)
+bones/111/position = Vector3(-0.0139044, 1.6471, 0.271549)
+bones/111/rotation = Quaternion(0.702691, 0.0967643, 0.70483, -0.00873733)
+bones/112/position = Vector3(0.0137378, 1.65714, 0.260359)
+bones/112/rotation = Quaternion(0.779716, 0.166802, 0.603502, 0.00231898)
+bones/113/position = Vector3(0.0357255, 1.66067, 0.239709)
+bones/113/rotation = Quaternion(0.917614, 0.152875, 0.363265, 0.0515089)
+bones/114/position = Vector3(-0.0440473, 1.64484, 0.270696)
+bones/114/rotation = Quaternion(0.727555, -0.0435667, -0.683414, 0.0413636)
+bones/115/position = Vector3(-0.0722053, 1.65068, 0.257928)
+bones/115/rotation = Quaternion(0.806723, -0.107921, -0.579411, 0.0428193)
+bones/116/position = Vector3(-0.093279, 1.65098, 0.23606)
+bones/116/rotation = Quaternion(0.936363, -0.0850956, -0.332372, 0.0742474)
+bones/117/position = Vector3(-0.0239355, 1.57815, 0.273137)
+bones/117/rotation = Quaternion(0.979338, 0.0339428, 0.021263, 0.198226)

 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.0261338, 1.52271, 0.274666)
-bones/119/rotation = Quaternion(0.987097, 0.0418359, 0.00328954, -0.154527)
+bones/119/position = Vector3(-0.019874, 1.52349, 0.274758)
+bones/119/rotation = Quaternion(0.987379, 0.0392066, 0.00819129, -0.15323)

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

-bones/120/position = Vector3(0.0434393, 1.65248, 0.20542)
-bones/120/rotation = Quaternion(0.991082, 0.076244, -0.00178211, -0.109267)
-bones/121/position = Vector3(-0.113147, 1.63966, 0.202368)
-bones/121/rotation = Quaternion(0.993777, 0.0069944, 0.0121131, -0.110509)
-bones/122/position = Vector3(0.0439993, 1.37437, 0.0433833)
-bones/122/rotation = Quaternion(-0.365398, -0.398515, -0.618093, 0.570641)
-bones/123/position = Vector3(0.152034, 1.37101, 0.0515237)
-bones/123/rotation = Quaternion(0.919211, 0.161082, 0.359186, 0.00949816)
-bones/123/scale = Vector3(1.03824, 0.927691, 1.03824)
-bones/124/rotation = Quaternion(-1.46959e-08, -0.100083, 7.47384e-08, 0.994979)
-bones/125/rotation = Quaternion(-0.210795, -0.0990992, -0.0196473, 0.972296)
-bones/125/scale = Vector3(0.999855, 0.982971, 1.02113)
-bones/126/rotation = Quaternion(6.5256e-08, 0.098668, 5.88083e-08, 0.995121)
-bones/127/rotation = Quaternion(-0.1071, 0.0980205, -0.16455, 0.975625)
-bones/127/scale = Vector3(0.977049, 1.06169, 0.967147)
-bones/128/rotation = Quaternion(-0.0731249, 0.705143, -0.0139537, 0.705146)
-bones/129/rotation = Quaternion(-0.155047, -0.00651886, 0.00452205, 0.987875)
+bones/120/position = Vector3(0.051191, 1.65264, 0.205855)
+bones/120/rotation = Quaternion(0.991452, 0.0733923, 0.00294629, -0.107829)
+bones/121/position = Vector3(-0.105445, 1.64087, 0.201424)
+bones/121/rotation = Quaternion(0.993852, 0.00415549, 0.0169351, -0.109332)
+bones/122/position = Vector3(0.0519979, 1.37457, 0.0439271)
+bones/122/rotation = Quaternion(-0.363821, -0.400574, -0.618764, 0.569479)
+bones/123/position = Vector3(0.160019, 1.37137, 0.0527295)
+bones/123/rotation = Quaternion(0.918876, 0.161165, 0.360031, 0.00837197)
+bones/123/scale = Vector3(1.0382, 0.927759, 1.0382)
+bones/124/rotation = Quaternion(-6.61433e-08, -0.100131, 1.82487e-07, 0.994974)
+bones/125/rotation = Quaternion(-0.211934, -0.0990449, -0.0197504, 0.972052)
+bones/125/scale = Vector3(0.999855, 0.983068, 1.021)
+bones/126/rotation = Quaternion(-1.53445e-07, 0.0985773, -1.58269e-07, 0.995129)
+bones/127/rotation = Quaternion(-0.106892, 0.0978717, -0.178048, 0.97329)
+bones/127/scale = Vector3(0.979179, 1.06007, 0.966882)
+bones/128/rotation = Quaternion(-0.0771123, 0.704966, -0.00969187, 0.70497)
+bones/129/rotation = Quaternion(-0.154869, -0.00754397, 0.00438758, 0.987897)

 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.173412, 0.0939553, 0.292765, 0.935622)
-bones/132/rotation = Quaternion(0.00893959, 0.0248256, -0.00803413, 0.99962)
+bones/131/rotation = Quaternion(-0.169692, 0.0949172, 0.292936, 0.936154)
+bones/132/rotation = Quaternion(0.00974477, 0.0217251, -0.00578252, 0.9997)

 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.0488227, 0.698503, 0.147633, 0.698509)
-bones/136/rotation = Quaternion(-0.202828, 0.00136395, -0.015064, 0.979098)
+bones/135/rotation = Quaternion(-0.0471875, 0.698662, 0.146656, 0.698668)
+bones/136/rotation = Quaternion(-0.203179, 0.00130395, -0.0151117, 0.979024)

 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.121134, 0.674338, 0.275439, 0.674335)
-bones/140/rotation = Quaternion(-0.287817, -0.0175467, -0.0307168, 0.957032)
+bones/139/rotation = Quaternion(-0.12045, 0.674432, 0.275279, 0.674429)
+bones/140/rotation = Quaternion(-0.287395, -0.0177249, -0.0307302, 0.957155)

 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.117837, 0.666246, 0.315477, 0.665361)
-bones/144/rotation = Quaternion(-0.347964, -0.0089929, -0.0572633, 0.935714)
+bones/143/rotation = Quaternion(-0.117541, 0.66646, 0.314679, 0.665577)
+bones/144/rotation = Quaternion(-0.347536, -0.0091226, -0.0572757, 0.935871)

 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.0420267, 1.3761, 0.0125278)
-bones/147/rotation = Quaternion(-0.532395, 0.213218, 0.508462, 0.642309)
-bones/148/position = Vector3(-0.137401, 1.36702, -0.0381431)
-bones/148/rotation = Quaternion(0.957397, -0.135038, 0.0873326, -0.23985)
-bones/148/scale = Vector3(1.02815, 0.945984, 1.02815)
-bones/149/rotation = Quaternion(1.87618e-08, 0.0777852, -5.86921e-09, 0.99697)
+bones/147/position = Vector3(-0.033885, 1.37635, 0.0127584)
+bones/147/rotation = Quaternion(-0.532543, 0.213186, 0.506936, 0.643402)
+bones/148/position = Vector3(-0.129174, 1.36756, -0.0380795)
+bones/148/rotation = Quaternion(0.957534, -0.136346, 0.0874215, -0.238529)
+bones/148/scale = Vector3(1.02802, 0.946235, 1.02802)
+bones/149/rotation = Quaternion(2.80971e-08, 0.0776354, -4.48821e-09, 0.996982)

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

-bones/150/rotation = Quaternion(-0.207097, 0.0768977, 0.0152901, 0.975174)
-bones/150/scale = Vector3(0.999856, 0.987839, 1.01435)
-bones/151/rotation = Quaternion(2.97942e-08, -0.0219948, -1.54666e-07, 0.999758)
-bones/152/rotation = Quaternion(-0.166004, -0.0224551, -0.134659, 0.97663)
-bones/152/scale = Vector3(0.978342, 1.04288, 0.982124)
-bones/153/rotation = Quaternion(-0.0213379, -0.70655, -0.0334097, 0.706552)
-bones/154/rotation = Quaternion(-0.148406, 0.0100726, -0.0081282, 0.988842)
+bones/150/rotation = Quaternion(-0.207112, 0.076964, 0.0153047, 0.975165)
+bones/150/scale = Vector3(0.999856, 0.988004, 1.01415)
+bones/151/rotation = Quaternion(-4.64438e-08, -0.0127388, 6.83102e-08, 0.999919)
+bones/152/rotation = Quaternion(-0.128035, -0.0126412, -0.124264, 0.983873)
+bones/152/scale = Vector3(0.977615, 1.04689, 0.978579)
+bones/153/rotation = Quaternion(-0.0226814, -0.706523, -0.0336532, 0.706526)
+bones/154/rotation = Quaternion(-0.146887, 0.0103149, -0.00825121, 0.989065)

 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.245072, -0.0481661, -0.184453, 0.950577)
-bones/157/rotation = Quaternion(0.193105, 0.0818672, -0.0212757, 0.977525)
+bones/156/rotation = Quaternion(-0.246006, -0.0482938, -0.185842, 0.950059)
+bones/157/rotation = Quaternion(0.192959, 0.0801031, -0.01909, 0.977745)

 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.0615507, -0.702517, -0.0956269, 0.702522)
-bones/161/rotation = Quaternion(-0.297813, 0.00981792, 0.0224213, 0.95431)
+bones/160/rotation = Quaternion(-0.061406, -0.702496, -0.0960278, 0.702501)
+bones/161/rotation = Quaternion(-0.297928, 0.00983442, 0.0224443, 0.954274)

 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.0964021, -0.690589, -0.192046, 0.690588)
-bones/165/rotation = Quaternion(-0.337576, -0.00922042, 0.0328847, 0.940679)
+bones/164/rotation = Quaternion(-0.0970743, -0.690488, -0.192437, 0.690486)
+bones/165/rotation = Quaternion(-0.337698, -0.00918308, 0.032905, 0.940635)

 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.0816627, -0.68895, -0.211786, 0.68835)
-bones/169/rotation = Quaternion(-0.366493, -0.0201185, 0.0657716, 0.927875)
+bones/168/rotation = Quaternion(-0.0810759, -0.689056, -0.211313, 0.688459)
+bones/169/rotation = Quaternion(-0.366751, -0.0201386, 0.0657769, 0.927773)

 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.0706828, 1.25841, 0.0844252)
-bones/172/rotation = Quaternion(-0.137078, 0.547015, 0.819355, 0.103158)
-bones/173/position = Vector3(-0.0928381, 1.26176, 0.0257663)
-bones/173/rotation = Quaternion(-0.137078, 0.547015, 0.819355, 0.103158)
+bones/172/position = Vector3(0.0785831, 1.25865, 0.0851168)
+bones/172/rotation = Quaternion(-0.138653, 0.547037, 0.818983, 0.103892)
+bones/173/position = Vector3(-0.0847034, 1.26189, 0.0258698)
+bones/173/rotation = Quaternion(-0.138653, 0.547037, 0.818983, 0.103892)

 
 [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.206137, -0.772163, -0.601059, -0.586353, 0.394286, -0.707622, 0.783388, 0.4983, -0.371484, 0.260809, 0.850218, 0.263214)
+transform = Transform3D(0.22263, -0.774794, -0.591717, -0.568213, 0.390075, -0.724552, 0.792193, 0.497529, -0.353406, 0.270028, 0.851461, 0.264908)

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


@@ -370,7 +370,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.249849, -0.190911, 0.949278, 0.928103, 0.326706, -0.178572, -0.276043, 0.925644, 0.258812, -0.300572, 0.836947, -0.174021)
+transform = Transform3D(0.264863, -0.249105, 0.931555, 0.941939, 0.273608, -0.194651, -0.206393, 0.929023, 0.307111, -0.295127, 0.836355, -0.176271)

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


@@ -391,5 +391,3 @@ parameters/movement/current_state = "move"
 parameters/movement/transition_request = ""
 parameters/movement/current_index = 0
 parameters/walking/blend_position = 0.0
 parameters/movement/transition_request = ""
 parameters/movement/current_index = 0
 parameters/walking/blend_position = 0.0

-
-[connection signal="animation_finished" from="AnimationTree" to="." method="_on_animation_tree_animation_finished"]

diff --git a/skin/skin.gd b/skin/skin.gd
index fefb78772f189343a51755a58a173da3ea752f4b..d2221fd9a8caa73bfa41dddd51965c1910196ed5 100644 (file)
--- a/skin/skin.gd
+++ b/skin/skin.gd
@@ -29,7 +29,3 @@ func transition_slash():
 
 func transition_gunfire():
        animation_tree.set("parameters/movement/transition_request", "gunfire")
 
 func transition_gunfire():
        animation_tree.set("parameters/movement/transition_request", "gunfire")

-
-
-func _on_animation_tree_animation_finished(anim_name: StringName) -> void:
-       print_debug("Finished animation: " + anim_name)