Added shooting, more proper sword stuff

diff --git a/map/cube.tscn b/map/cube.tscn
index da047bfa6ba731e37e72137145c8a4365dee9be3..895fa89f94e0069bd8a679a82a6a146886bc63a4 100644 (file)
--- a/map/cube.tscn
+++ b/map/cube.tscn
@@ -7,10 +7,12 @@
 [sub_resource type="BoxShape3D" id="BoxShape3D_w8p6k"]
 
 [node name="Cube" type="RigidBody3D"]
 [sub_resource type="BoxShape3D" id="BoxShape3D_w8p6k"]
 
 [node name="Cube" type="RigidBody3D"]

+collision_layer = 4
+collision_mask = 7

 
 [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="CollisionShape3D" type="CollisionShape3D" parent="."]
+[node name="hitbox" type="CollisionShape3D" parent="." groups=["hitbox"]]

 shape = SubResource("BoxShape3D_w8p6k")
 shape = SubResource("BoxShape3D_w8p6k")

diff --git a/map/grid_material.tres b/map/grid_material.tres
index 5cdca8ed72980e5c29d426a7664867302bf094fb..93cbed9e315587b142e0db68e87ea38a721c8902 100644 (file)
--- a/map/grid_material.tres
+++ b/map/grid_material.tres
@@ -7,4 +7,3 @@ albedo_color = Color(0.46, 0.46, 0.46, 1)
 albedo_texture = ExtResource("1_h25oc")
 uv1_scale = Vector3(0.5, 0.5, 0.5)
 uv1_triplanar = true
 albedo_texture = ExtResource("1_h25oc")
 uv1_scale = Vector3(0.5, 0.5, 0.5)
 uv1_triplanar = true

-uv1_world_triplanar = true

diff --git a/player/input/InputHandler.gd b/player/input/InputHandler.gd
index 9d0e7de40047913637202add498f5fefaf17a6bc..1a02a87487cd42cb7017e2da5dd9a94275e180c9 100644 (file)
--- a/player/input/InputHandler.gd
+++ b/player/input/InputHandler.gd
@@ -23,6 +23,9 @@ func get_player_input() -> InputPacket:
        if Input.is_action_just_pressed("player-slash"):
                p.actions.append("slash")
        
        if Input.is_action_just_pressed("player-slash"):
                p.actions.append("slash")
        

+       if Input.is_action_just_pressed("player-shoot"):
+               p.actions.append("shoot")
+       

        if p.actions.is_empty():
                p.actions.append("idle")
                
        if p.actions.is_empty():
                p.actions.append("idle")
                

diff --git a/player/model.gd b/player/model.gd
index 862eb64886d630c456f0fff18dcabdc7dd72414f..71415a674d15aa1c64f5ea8df6724a601eb4d0d4 100644 (file)
--- a/player/model.gd
+++ b/player/model.gd
@@ -8,6 +8,7 @@ class_name PlayerModel
        "idle": $Idle,
        "walk": $Walk,
        "slash": $Slash,
        "idle": $Idle,
        "walk": $Walk,
        "slash": $Slash,

+       "shoot": $Shoot,

        "dash": $Dash,
        "fall": $Fall
 }
        "dash": $Dash,
        "fall": $Fall
 }

diff --git a/player/moves/Move.gd b/player/moves/Move.gd
index 1e6f0fade38c0536df147d0ba08773868005e69b..42cf711c27a5cc71043d43addcb78bef286c3149 100644 (file)
--- a/player/moves/Move.gd
+++ b/player/moves/Move.gd
@@ -11,6 +11,7 @@ static var moves_priority: Dictionary = {
        "idle": 0,
        "walk": 1,
        "slash": 2,
        "idle": 0,
        "walk": 1,
        "slash": 2,

+       "shoot": 3,

        "fall": 50,
        "dash": 100
 }
        "fall": 50,
        "dash": 100
 }

diff --git a/player/moves/shoot.gd b/player/moves/shoot.gd
new file mode 100644 (file)
index 0000000..ab317fa
--- /dev/null
+++ b/player/moves/shoot.gd
@@ -0,0 +1,31 @@
+extends Walk
+class_name Shoot
+
+
+var finished := false
+const shoot_walk_speed := 4.0
+
+
+func should_enter(input: InputPacket) -> String:
+       if finished:
+               input.actions.sort_custom(moves_priority_sort)
+               return input.actions[0]
+       return "shoot"
+
+
+func update(input: InputPacket, delta: float):
+       player.velocity = get_new_velocity_from_input(input, delta, shoot_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_gunfire()
+
+
+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)

diff --git a/player/moves/shoot.gd.uid b/player/moves/shoot.gd.uid
new file mode 100644 (file)
index 0000000..1c2545d
--- /dev/null
+++ b/player/moves/shoot.gd.uid
@@ -0,0 +1 @@
+uid://c8c16gqh0fmwv

diff --git a/player/player.tscn b/player/player.tscn
index f9e8714acc457cba77cafc93a06916c342c087ae..5998596204a13242adbd9303244705b2c058ebf0 100644 (file)
--- a/player/player.tscn
+++ b/player/player.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=3 uid="uid://cchu1yltrhuk3"]
+[gd_scene load_steps=13 format=3 uid="uid://cchu1yltrhuk3"]

 
 [ext_resource type="PackedScene" uid="uid://dvkx3t15l7mfb" path="res://skin/prototype_skin.tscn" id="1_4flbx"]
 [ext_resource type="Script" uid="uid://dcv34jq0jett0" path="res://player/player.gd" id="1_onrkg"]
 
 [ext_resource type="PackedScene" uid="uid://dvkx3t15l7mfb" path="res://skin/prototype_skin.tscn" id="1_4flbx"]
 [ext_resource type="Script" uid="uid://dcv34jq0jett0" path="res://player/player.gd" id="1_onrkg"]


@@ -10,6 +10,7 @@
 [ext_resource type="Script" uid="uid://bdiks0m7vsn5w" path="res://player/moves/dash.gd" id="8_hg6s5"]
 [ext_resource type="Script" uid="uid://b0oj5iuvr8omo" path="res://player/moves/fall.gd" id="9_hg6s5"]
 [ext_resource type="Script" uid="uid://d28gnkyqsg3t" path="res://player/moves/slash.gd" id="10_8t03j"]
 [ext_resource type="Script" uid="uid://bdiks0m7vsn5w" path="res://player/moves/dash.gd" id="8_hg6s5"]
 [ext_resource type="Script" uid="uid://b0oj5iuvr8omo" path="res://player/moves/fall.gd" id="9_hg6s5"]
 [ext_resource type="Script" uid="uid://d28gnkyqsg3t" path="res://player/moves/slash.gd" id="10_8t03j"]

+[ext_resource type="Script" uid="uid://c8c16gqh0fmwv" path="res://player/moves/shoot.gd" id="11_2ieo8"]

 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"]
 
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"]
 


@@ -18,7 +19,7 @@ collision_layer = 2
 collision_mask = 5
 script = ExtResource("1_onrkg")
 
 collision_mask = 5
 script = ExtResource("1_onrkg")
 

-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+[node name="hitbox" type="CollisionShape3D" parent="." groups=["hitbox"]]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 shape = SubResource("CapsuleShape3D_sh265")
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 shape = SubResource("CapsuleShape3D_sh265")
 


@@ -65,4 +66,8 @@ metadata/_custom_type_script = "uid://c886t1c86q0m6"
 script = ExtResource("10_8t03j")
 metadata/_custom_type_script = "uid://c886t1c86q0m6"
 
 script = ExtResource("10_8t03j")
 metadata/_custom_type_script = "uid://c886t1c86q0m6"
 

+[node name="Shoot" type="Node" parent="Model"]
+script = ExtResource("11_2ieo8")
+metadata/_custom_type_script = "uid://c886t1c86q0m6"
+

 [connection signal="timeout" from="Model/Dash/Timer" to="Model/Dash" method="_on_timer_timeout"]
 [connection signal="timeout" from="Model/Dash/Timer" to="Model/Dash" method="_on_timer_timeout"]

diff --git a/player/sword.gd b/player/sword.gd
new file mode 100644 (file)
index 0000000..34c39b2
--- /dev/null
+++ b/player/sword.gd
@@ -0,0 +1,7 @@
+extends Node3D
+class_name PlayerSword
+
+
+func _on_hurtbox_body_entered(body: Node3D) -> void:
+       if body.get_tree().get_node_count_in_group("hitbox"):
+               print_debug("Found hitbox: " + str(body))

diff --git a/player/sword.gd.uid b/player/sword.gd.uid
new file mode 100644 (file)
index 0000000..75ecb6a
--- /dev/null
+++ b/player/sword.gd.uid
@@ -0,0 +1 @@
+uid://bohyp1pxi57tm

diff --git a/player/sword.tscn b/player/sword.tscn
new file mode 100644 (file)
index 0000000..905cdea
--- /dev/null
+++ b/player/sword.tscn
@@ -0,0 +1,25 @@
+[gd_scene load_steps=4 format=3 uid="uid://b3idqb7fb550a"]
+
+[ext_resource type="Script" uid="uid://bohyp1pxi57tm" path="res://player/sword.gd" id="1_hv1tj"]
+[ext_resource type="PackedScene" uid="uid://c465xpmcc4rh1" path="res://skin/prototype_sword_skin.tscn" id="1_rk2yr"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_rk2yr"]
+radius = 0.114308
+height = 1.12802
+
+[node name="Sword" type="Node3D"]
+script = ExtResource("1_hv1tj")
+
+[node name="skin" parent="." instance=ExtResource("1_rk2yr")]
+
+[node name="hurtbox" type="Area3D" parent="." groups=["hurtbox"]]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.720478)
+collision_layer = 2
+collision_mask = 5
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="hurtbox"]
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0)
+shape = SubResource("CapsuleShape3D_rk2yr")
+debug_color = Color(1, 0, 0.25, 1)
+
+[connection signal="body_entered" from="hurtbox" to="." method="_on_hurtbox_body_entered"]

diff --git a/project.godot b/project.godot
index 8cca96d0f6f7797030d7c82f5f3716662a76c3f4..7f71890e7ae3f3a88fd766c3ad5dc3975428e048 100644 (file)
--- a/project.godot
+++ b/project.godot
@@ -50,7 +50,7 @@ player-slash={
 }
 player-shoot={
 "deadzone": 0.2,
 }
 player-shoot={
 "deadzone": 0.2,

-"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":2,"position":Vector2(1287, 24),"global_position":Vector2(1306, 120),"factor":1.0,"button_index":2,"canceled":false,"pressed":true,"double_click":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)

 ]
 }
 player-dash={
 ]
 }
 player-dash={

diff --git a/skin/prototype_skin.tscn b/skin/prototype_skin.tscn
index e3129fdba03a980fe4b5e59d384031606da31b0b..d34935c649450744d134b2ba26f9ebae201b2762 100644 (file)
--- a/skin/prototype_skin.tscn
+++ b/skin/prototype_skin.tscn
@@ -2,8 +2,8 @@
 
 [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://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://c465xpmcc4rh1" path="res://skin/prototype_sword_skin.tscn" id="2_s02u1"]

 [ext_resource type="PackedScene" uid="uid://bfolm8rrgm87w" path="res://skin/prototype_gun_skin.tscn" id="3_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_kang0"]
 animation = &"attack-gunfire"


@@ -60,7 +60,7 @@ 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(-400.628, 24.5853)
+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/node = SubResource("AnimationNodeAnimation_i12oj")
 nodes/Animation/position = Vector2(-80, 510)
 "nodes/Animation 2/node" = SubResource("AnimationNodeAnimation_kang0")


@@ -74,7 +74,7 @@ nodes/TimeScale/position = Vector2(890, 90)
 nodes/dashing/node = SubResource("AnimationNodeAnimation_gs4tf")
 nodes/dashing/position = Vector2(-150, 310)
 nodes/movement/node = SubResource("AnimationNodeTransition_i12oj")
 nodes/dashing/node = SubResource("AnimationNodeAnimation_gs4tf")
 nodes/dashing/position = Vector2(-150, 310)
 nodes/movement/node = SubResource("AnimationNodeTransition_i12oj")

-nodes/movement/position = Vector2(510, 120)
+nodes/movement/position = Vector2(500, 120)

 nodes/output/position = Vector2(1210, 100)
 nodes/walking/node = SubResource("AnimationNodeBlendSpace1D_gs4tf")
 nodes/walking/position = Vector2(-250, 100)
 nodes/output/position = Vector2(1210, 100)
 nodes/walking/node = SubResource("AnimationNodeBlendSpace1D_gs4tf")
 nodes/walking/position = Vector2(-250, 100)


@@ -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.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/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/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.0927977, 0.0413896, -0.00869085, 0.994786)
+bones/5/rotation = Quaternion(0.10004, 0.0414301, -0.0106079, 0.994064)

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

-bones/6/rotation = Quaternion(0.105521, 0.123403, -0.0102815, 0.986677)
+bones/6/rotation = Quaternion(0.112859, 0.123421, -0.0121759, 0.985841)

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

-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/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/17/scale = Vector3(0.999462, 1.00037, 1.00017)
 bones/17/scale = Vector3(0.999462, 1.00037, 1.00017)

-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/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/23/scale = Vector3(0.999647, 1.00025, 1.0001)
 bones/23/scale = Vector3(0.999647, 1.00025, 1.0001)

-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/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/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.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/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/31/scale = Vector3(1.00001, 0.999994, 1)
 bones/31/scale = Vector3(1.00001, 0.999994, 1)

-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/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/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.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/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/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.045426, 1.58784, 0.246692)
-bones/44/rotation = Quaternion(-0.632478, 0.610498, 0.293198, -0.375897)
+bones/44/position = Vector3(0.0437177, 1.58342, 0.247428)
+bones/44/rotation = Quaternion(-0.623155, 0.615409, 0.294075, -0.382713)

 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.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/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/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.0923701, 1.57748, 0.242794)
-bones/55/rotation = Quaternion(0.576446, 0.645327, 0.338243, 0.369939)
+bones/55/position = Vector3(-0.0941834, 1.5749, 0.245189)
+bones/55/rotation = Quaternion(0.579674, 0.646186, 0.326737, 0.373718)

 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.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/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/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.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/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/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.0180647, 1.50143, 0.269405)
-bones/77/rotation = Quaternion(-0.492382, 0.343187, 0.495738, 0.627715)
+bones/77/position = Vector3(-0.0206614, 1.49828, 0.272313)
+bones/77/rotation = Quaternion(-0.49258, 0.354504, 0.491, 0.624988)

 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.0168716, 1.48834, 0.262008)
-bones/79/rotation = Quaternion(-0.393889, -0.380062, -0.382556, 0.744348)
+bones/79/position = Vector3(-0.0197252, 1.48505, 0.26513)
+bones/79/rotation = Quaternion(-0.405186, -0.376388, -0.382309, 0.740268)

 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.0168716, 1.48834, 0.262008)
-bones/81/rotation = Quaternion(-0.431878, 0.328354, 0.425986, 0.724017)
+bones/81/position = Vector3(-0.0197252, 1.48505, 0.26513)
+bones/81/rotation = Quaternion(-0.433419, 0.33917, 0.420355, 0.721397)

 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.0469521, 1.5939, 0.25005)
-bones/83/rotation = Quaternion(0.144165, 0.483525, 0.640255, 0.579219)
+bones/83/position = Vector3(0.0453617, 1.58952, 0.250665)
+bones/83/rotation = Quaternion(0.146141, 0.491277, 0.631068, 0.582274)

 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.00380325, 1.58036, 0.260961)
-bones/87/rotation = Quaternion(-0.389967, 0.0855813, 0.915325, 0.0527402)
+bones/87/position = Vector3(-0.00538095, 1.57681, 0.262279)
+bones/87/rotation = Quaternion(-0.384656, 0.0966166, 0.916318, 0.0553783)

 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.0949708, 1.58324, 0.246035)
-bones/89/rotation = Quaternion(0.197973, -0.487502, -0.590746, 0.611693)
+bones/89/position = Vector3(-0.096666, 1.58075, 0.248359)
+bones/89/rotation = Quaternion(0.185849, -0.490594, -0.59191, 0.611899)

 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.0434555, 1.57738, 0.259839)
-bones/93/rotation = Quaternion(0.356501, 0.116007, 0.919431, -0.118729)
+bones/93/position = Vector3(-0.0450855, 1.57439, 0.261691)
+bones/93/rotation = Quaternion(0.363485, 0.120801, 0.917195, -0.109719)

 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.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/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/118/scale = Vector3(0.999997, 1.00001, 0.999997)
 bones/118/scale = Vector3(0.999997, 1.00001, 0.999997)

-bones/119/position = Vector3(-0.019874, 1.52349, 0.274758)
-bones/119/rotation = Quaternion(0.987379, 0.0392066, 0.00819129, -0.15323)
+bones/119/position = Vector3(-0.022117, 1.52045, 0.277307)
+bones/119/rotation = Quaternion(0.98896, 0.0313852, 0.00340637, -0.144781)

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

-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/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/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.169692, 0.0949172, 0.292936, 0.936154)
-bones/132/rotation = Quaternion(0.00974477, 0.0217251, -0.00578252, 0.9997)
+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/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.0471875, 0.698662, 0.146656, 0.698668)
-bones/136/rotation = Quaternion(-0.203179, 0.00130395, -0.0151117, 0.979024)
+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/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.12045, 0.674432, 0.275279, 0.674429)
-bones/140/rotation = Quaternion(-0.287395, -0.0177249, -0.0307302, 0.957155)
+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/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.117541, 0.66646, 0.314679, 0.665577)
-bones/144/rotation = Quaternion(-0.347536, -0.0091226, -0.0572757, 0.935871)
+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/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.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/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/149/scale = Vector3(1, 1, 1)
 bones/149/scale = Vector3(1, 1, 1)

-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/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/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.246006, -0.0482938, -0.185842, 0.950059)
-bones/157/rotation = Quaternion(0.192959, 0.0801031, -0.01909, 0.977745)
+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/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.061406, -0.702496, -0.0960278, 0.702501)
-bones/161/rotation = Quaternion(-0.297928, 0.00983442, 0.0224443, 0.954274)
+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/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.0970743, -0.690488, -0.192437, 0.690486)
-bones/165/rotation = Quaternion(-0.337698, -0.00918308, 0.032905, 0.940635)
+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/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.0810759, -0.689056, -0.211313, 0.688459)
-bones/169/rotation = Quaternion(-0.366751, -0.0201386, 0.0657769, 0.927773)
+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/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.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)
+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)

 
 [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.22263, -0.774794, -0.591717, -0.568213, 0.390075, -0.724552, 0.792193, 0.497529, -0.353406, 0.270028, 0.851461, 0.264908)
+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)

 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.264863, -0.249105, 0.931555, 0.941939, 0.273608, -0.194651, -0.206393, 0.929023, 0.307111, -0.295127, 0.836355, -0.176271)
+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)

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


@@ -379,14 +379,14 @@ external_skeleton = NodePath("../Skeleton3D")
 [node name="socket" type="Node3D" parent="hand_R" index="0"]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)
 
 [node name="socket" type="Node3D" parent="hand_R" index="0"]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)
 

-[node name="prototype_sword" parent="hand_R/socket" index="0" instance=ExtResource("2_s02u1")]
+[node name="Sword" parent="hand_R/socket" index="0" instance=ExtResource("4_bmadk")]

 
 [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
 
 [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" = false
+"parameters/TimeScale 3/scale" = 2.0

 parameters/movement/current_state = "move"
 parameters/movement/transition_request = ""
 parameters/movement/current_index = 0
 parameters/movement/current_state = "move"
 parameters/movement/transition_request = ""
 parameters/movement/current_index = 0

diff --git a/skin/prototype_sword_skin.tscn b/skin/prototype_sword_skin.tscn
index c6000690c8c4a3545d5ed100811c1671f107b334..1e5a2dbf725e9b9648ca93eac3e76f0e066aa34a 100644 (file)
--- a/skin/prototype_sword_skin.tscn
+++ b/skin/prototype_sword_skin.tscn
@@ -1,17 +1,5 @@
-[gd_scene load_steps=3 format=3 uid="uid://c465xpmcc4rh1"]
+[gd_scene load_steps=2 format=3 uid="uid://c465xpmcc4rh1"]

 
 [ext_resource type="PackedScene" uid="uid://nwqdx8lhgyk4" path="res://model/prototype_sword.glb" id="1_sm572"]
 
 
 [ext_resource type="PackedScene" uid="uid://nwqdx8lhgyk4" path="res://model/prototype_sword.glb" id="1_sm572"]
 

-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_7a313"]
-radius = 0.114308
-height = 1.12802
-

 [node name="prototype_sword" instance=ExtResource("1_sm572")]
 [node name="prototype_sword" instance=ExtResource("1_sm572")]

-
-[node name="Area3D" type="Area3D" parent="." index="1" groups=["hurtbox"]]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.720478)
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0)
-shape = SubResource("CapsuleShape3D_7a313")
-debug_color = Color(1, 0, 0.25, 1)