Update

characters/vroid1-female.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=138 format=2]
+[gd_scene load_steps=143 format=2]
 
 [ext_resource path="res://scenes/characters/vroid1-female.gltf" type="PackedScene" id=1]
 [ext_resource path="res://scenes/hair/female-hair1.tscn" type="PackedScene" id=2]
@@ -29,6 +29,19 @@ filters = [ "skeleton/Skeleton:hand_l", "skeleton/Skeleton:index_1_l", "skeleton
 filter_enabled = true
 filters = [ "skeleton/Skeleton:hand_r", "skeleton/Skeleton:index_1_r", "skeleton/Skeleton:index_2_r", "skeleton/Skeleton:index_3_end_r", "skeleton/Skeleton:index_3_r", "skeleton/Skeleton:little_1_r", "skeleton/Skeleton:little_2_r", "skeleton/Skeleton:little_3_end_r", "skeleton/Skeleton:little_3_r", "skeleton/Skeleton:middle_1_r", "skeleton/Skeleton:middle_2_r", "skeleton/Skeleton:middle_3_end_r", "skeleton/Skeleton:middle_3_r", "skeleton/Skeleton:ring_1_r", "skeleton/Skeleton:ring_2_r", "skeleton/Skeleton:ring_3_end_r", "skeleton/Skeleton:ring_3_r", "skeleton/Skeleton:thumb_1_r", "skeleton/Skeleton:thumb_2_r", "skeleton/Skeleton:thumb_3_end_r", "skeleton/Skeleton:thumb_3_r" ]
 
+[sub_resource type="AnimationNodeAnimation" id=138]
+animation = "attack-melee-weapon1"
+
+[sub_resource type="AnimationNodeTimeScale" id=139]
+
+[sub_resource type="AnimationNodeBlendTree" id=135]
+nodes/Animation/node = SubResource( 138 )
+nodes/Animation/position = Vector2( 280, 140 )
+nodes/attack1_speed/node = SubResource( 139 )
+nodes/attack1_speed/position = Vector2( 600, 160 )
+nodes/output/position = Vector2( 900, 120 )
+node_connections = [ "output", 0, "attack1_speed", "attack1_speed", 0, "Animation" ]
+
 [sub_resource type="AnimationNodeAnimation" id=9]
 animation = "climb1"
 
@@ -58,7 +71,7 @@ node_connections = [ "output", 0, "TimeScale", "TimeScale", 0, "Animation" ]
 [sub_resource type="AnimationNodeBlendTree" id=15]
 
 [sub_resource type="AnimationNodeAnimation" id=16]
-animation = "start-grabbed"
+animation = "start-grabbed2"
 
 [sub_resource type="AnimationNodeTimeScale" id=17]
 
@@ -113,7 +126,7 @@ nodes/TimeScale/position = Vector2( 580, 100 )
 nodes/output/position = Vector2( 1120, 120 )
 nodes/t1/node = SubResource( 26 )
 nodes/t1/position = Vector2( 880, 100 )
-node_connections = [ "output", 0, "t1", "TimeScale", 0, "Animation", "TimeScale 2", 0, "Animation 2", "t1", 0, "TimeScale", "t1", 1, "TimeScale 2" ]
+node_connections = [ "output", 0, "t1", "TimeScale", 0, "Animation", "t1", 0, "TimeScale", "t1", 1, "TimeScale 2", "TimeScale 2", 0, "Animation 2" ]
 
 [sub_resource type="AnimationNodeAnimation" id=28]
 animation = "walk1p2"
@@ -355,7 +368,7 @@ nodes/attack2/position = Vector2( 1140, 300 )
 nodes/output/position = Vector2( 1580, 180 )
 nodes/speed/node = SubResource( 74 )
 nodes/speed/position = Vector2( 540, 60 )
-node_connections = [ "speed", 0, "Animation", "output", 0, "attack2", "TimeScale", 0, "Animation 2", "attack1", 0, "speed", "attack1", 1, "TimeScale", "attack2", 0, "attack1", "attack2", 1, "TimeScale 2", "TimeScale 2", 0, "Animation 3" ]
+node_connections = [ "speed", 0, "Animation", "output", 0, "attack2", "attack2", 0, "attack1", "attack2", 1, "TimeScale 2", "attack1", 0, "speed", "attack1", 1, "TimeScale", "TimeScale", 0, "Animation 2", "TimeScale 2", 0, "Animation 3" ]
 
 [sub_resource type="AnimationNodeAnimation" id=76]
 animation = "dagger-sacrifice-counter-p"
@@ -547,7 +560,15 @@ switch_mode = 2
 [sub_resource type="AnimationNodeStateMachineTransition" id=130]
 switch_mode = 2
 
+[sub_resource type="AnimationNodeStateMachineTransition" id=136]
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=137]
+switch_mode = 2
+auto_advance = true
+
 [sub_resource type="AnimationNodeStateMachine" id=110]
+states/attack-melee1/node = SubResource( 135 )
+states/attack-melee1/position = Vector2( 1277, 411.193 )
 states/climb1/node = SubResource( 11 )
 states/climb1/position = Vector2( 804, 503.193 )
 states/climb1a/node = SubResource( 14 )
@@ -586,12 +607,12 @@ states/turn_right/node = SubResource( 126 )
 states/turn_right/position = Vector2( 1059, 620.193 )
 states/use_tap/node = SubResource( 85 )
 states/use_tap/position = Vector2( 283, 143.193 )
-transitions = [ "locomotion", "passenger", SubResource( 86 ), "passenger", "locomotion", SubResource( 87 ), "passenger", "drive", SubResource( 88 ), "drive", "passenger", SubResource( 89 ), "drive", "locomotion", SubResource( 90 ), "locomotion", "drive", SubResource( 91 ), "sacrifice", "sacrificed", SubResource( 92 ), "sacrificed", "sacrifice", SubResource( 93 ), "locomotion", "kneel", SubResource( 94 ), "kneel", "pray", SubResource( 95 ), "pray", "locomotion", SubResource( 96 ), "pray", "pray-startled", SubResource( 97 ), "pray-startled", "pray-startled-walk", SubResource( 98 ), "sleeping", "locomotion", SubResource( 99 ), "pray-startled-walk", "stand-startled", SubResource( 100 ), "stand-startled", "locomotion", SubResource( 101 ), "locomotion", "grabbed", SubResource( 102 ), "grabbed", "locomotion", SubResource( 103 ), "locomotion", "climb1", SubResource( 104 ), "climb1", "locomotion", SubResource( 105 ), "locomotion", "climb1a", SubResource( 106 ), "climb1a", "locomotion", SubResource( 107 ), "use_tap", "locomotion", SubResource( 108 ), "locomotion", "use_tap", SubResource( 109 ), "locomotion", "start_walking", SubResource( 117 ), "start_walking", "locomotion", SubResource( 118 ), "locomotion", "stop_walking", SubResource( 119 ), "stop_walking", "locomotion", SubResource( 120 ), "locomotion", "tun_left", SubResource( 127 ), "tun_left", "locomotion", SubResource( 128 ), "locomotion", "turn_right", SubResource( 129 ), "turn_right", "locomotion", SubResource( 130 ) ]
+transitions = [ "locomotion", "passenger", SubResource( 86 ), "passenger", "locomotion", SubResource( 87 ), "passenger", "drive", SubResource( 88 ), "drive", "passenger", SubResource( 89 ), "drive", "locomotion", SubResource( 90 ), "locomotion", "drive", SubResource( 91 ), "sacrifice", "sacrificed", SubResource( 92 ), "sacrificed", "sacrifice", SubResource( 93 ), "locomotion", "kneel", SubResource( 94 ), "kneel", "pray", SubResource( 95 ), "pray", "locomotion", SubResource( 96 ), "pray", "pray-startled", SubResource( 97 ), "pray-startled", "pray-startled-walk", SubResource( 98 ), "sleeping", "locomotion", SubResource( 99 ), "pray-startled-walk", "stand-startled", SubResource( 100 ), "stand-startled", "locomotion", SubResource( 101 ), "locomotion", "grabbed", SubResource( 102 ), "grabbed", "locomotion", SubResource( 103 ), "locomotion", "climb1", SubResource( 104 ), "climb1", "locomotion", SubResource( 105 ), "locomotion", "climb1a", SubResource( 106 ), "climb1a", "locomotion", SubResource( 107 ), "use_tap", "locomotion", SubResource( 108 ), "locomotion", "use_tap", SubResource( 109 ), "locomotion", "start_walking", SubResource( 117 ), "start_walking", "locomotion", SubResource( 118 ), "locomotion", "stop_walking", SubResource( 119 ), "stop_walking", "locomotion", SubResource( 120 ), "locomotion", "tun_left", SubResource( 127 ), "tun_left", "locomotion", SubResource( 128 ), "locomotion", "turn_right", SubResource( 129 ), "turn_right", "locomotion", SubResource( 130 ), "locomotion", "attack-melee1", SubResource( 136 ), "attack-melee1", "locomotion", SubResource( 137 ) ]
 start_node = "locomotion"
-graph_offset = Vector2( -232, 15.1925 )
+graph_offset = Vector2( 176.598, 15.1925 )
 
 [sub_resource type="AnimationNodeBlendTree" id=111]
-graph_offset = Vector2( 0, -221 )
+graph_offset = Vector2( 445.846, -157.796 )
 nodes/Animation/node = SubResource( 5 )
 nodes/Animation/position = Vector2( 540, 280 )
 "nodes/Animation 2/node" = SubResource( 4 )
@@ -605,24 +626,17 @@ nodes/blade_right/position = Vector2( 1400, 100 )
 nodes/output/position = Vector2( 1820, -20 )
 nodes/state/node = SubResource( 110 )
 nodes/state/position = Vector2( 480, 120 )
-node_connections = [ "output", 0, "blade_right", "blade_right", 0, "blade_left", "blade_right", 1, "Animation 2", "blade_left", 0, "all_scale", "blade_left", 1, "Animation", "all_scale", 0, "state" ]
+node_connections = [ "output", 0, "blade_right", "all_scale", 0, "state", "blade_left", 0, "all_scale", "blade_left", 1, "Animation", "blade_right", 0, "blade_left", "blade_right", 1, "Animation 2" ]
 
 [sub_resource type="AnimationNodeStateMachinePlayback" id=112]
 
 [node name="vroid1-female" instance=ExtResource( 1 )]
 
-[node name="Skeleton" parent="skeleton" index="0"]
-bones/1/bound_children = [ NodePath("hips") ]
-bones/25/bound_children = [ NodePath("chest") ]
-bones/80/bound_children = [ NodePath("head") ]
-bones/99/bound_children = [ NodePath("wrist_l") ]
-bones/101/bound_children = [ NodePath("wrist_r") ]
-
 [node name="body" parent="skeleton/Skeleton" index="0"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00418961, 0.00654769, 0.00506566 )
 
 [node name="head" type="BoneAttachment" parent="skeleton/Skeleton" index="2"]
-transform = Transform( 0.695045, 0.34614, -0.630227, -0.0867818, 0.910422, 0.404298, 0.713771, -0.226324, 0.66284, -0.0445963, 1.35245, -0.0152731 )
+transform = Transform( 0.988223, 0.148734, 0.0362569, -0.141467, 0.79667, 0.587692, 0.0585027, -0.585856, 0.808242, -0.0111943, 1.32085, -0.0280195 )
 bone_name = "Head"
 
 [node name="marker_talk" type="Spatial" parent="skeleton/Skeleton/head" index="0"]
@@ -633,6 +647,9 @@ transform = Transform( 0.845972, -0.248965, 0.471515, 0.270435, 0.962465, 0.0230
 
 [node name="head_hurt" type="Area" parent="skeleton/Skeleton/head" index="2"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0.02 )
+collision_layer = 8
+collision_mask = 4
+monitorable = false
 
 [node name="CollisionShape" type="CollisionShape" parent="skeleton/Skeleton/head/head_hurt" index="0"]
 shape = SubResource( 1 )
@@ -649,43 +666,57 @@ transform = Transform( 1, -1.24197e-11, 0, 1.06852e-11, 1, -5.82077e-11, 0, 0, 1
 [node name="female-face1" parent="skeleton/Skeleton/head/face" index="0" instance=ExtResource( 3 )]
 
 [node name="hips" type="BoneAttachment" parent="skeleton/Skeleton" index="3"]
-transform = Transform( 0.932837, 0.0669982, 0.354143, 0.0474986, -0.99678, 0.0635026, 0.357293, -0.0424105, -0.933064, 0.000203875, 0.898321, -0.00645695 )
+transform = Transform( 0.989795, 0.0136796, -0.14192, 0.00710856, -0.998924, -0.046698, -0.142409, 0.0452161, -0.988735, 0.000203863, 0.86329, -0.00645694 )
 bone_name = "Hips"
 
 [node name="marker_dagger_sacrifice" type="Spatial" parent="skeleton/Skeleton/hips" index="0"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.2, 0.2 )
 
 [node name="hips_hurt" type="Area" parent="skeleton/Skeleton/hips" index="1"]
+collision_layer = 8
+collision_mask = 4
+monitorable = false
 
 [node name="CollisionShape" type="CollisionShape" parent="skeleton/Skeleton/hips/hips_hurt" index="0"]
 shape = SubResource( 2 )
 
 [node name="wrist_r" type="BoneAttachment" parent="skeleton/Skeleton" index="4"]
-transform = Transform( -0.287977, 0.919611, -0.267176, 0.942778, 0.321208, 0.0894101, 0.168042, -0.22614, -0.95949, 0.217922, 0.840792, 0.0647382 )
+transform = Transform( -0.184609, 0.953624, -0.23774, 0.867928, 0.271679, 0.415801, 0.461107, -0.12958, -0.877832, 0.257193, 0.805181, -0.0805364 )
 bone_name = "wrist_ik_R"
 
 [node name="weapon_right" type="Spatial" parent="skeleton/Skeleton/wrist_r" index="0"]
 transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, -0.08, 0, -0.01 )
 
 [node name="wrist_l" type="BoneAttachment" parent="skeleton/Skeleton" index="5"]
-transform = Transform( -0.0744099, -0.85538, 0.512627, -0.989629, 0.126679, 0.0677309, -0.122875, -0.50227, -0.855936, -0.175723, 0.838131, -0.0414757 )
+transform = Transform( -0.252208, -0.871285, 0.421014, -0.924053, 0.346005, 0.162504, -0.287261, -0.348054, -0.892379, -0.275192, 0.827823, -0.00582178 )
 bone_name = "wrist_ik_L"
 
 [node name="weapon_left" type="Spatial" parent="skeleton/Skeleton/wrist_l" index="0"]
 transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0.08, 0, -0.01 )
 
 [node name="chest" type="BoneAttachment" parent="skeleton/Skeleton" index="6"]
-transform = Transform( 0.941419, -0.0483243, -0.333891, 0.0575738, 0.998111, 0.0178291, 0.332436, -0.0360186, 0.942465, -0.00328054, 1.05887, -0.018731 )
+transform = Transform( 0.982621, -0.0259787, 0.183851, 0.0189799, 0.999071, 0.0397199, -0.184712, -0.0355462, 0.982102, -0.00488846, 1.02193, -0.0338627 )
 bone_name = "Chest"
 
 [node name="chest_hurt" type="Area" parent="skeleton/Skeleton/chest" index="0"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0 )
+collision_layer = 8
+collision_mask = 4
+monitorable = false
 
 [node name="CollisionShape" type="CollisionShape" parent="skeleton/Skeleton/chest/chest_hurt" index="0"]
 shape = SubResource( 3 )
 
 [node name="MeshInstance" type="MeshInstance" parent="skeleton/Skeleton" index="7"]
 
+[node name="neck" type="BoneAttachment" parent="skeleton/Skeleton" index="8"]
+transform = Transform( 0.973501, -0.192912, 0.12289, 0.178008, 0.976401, 0.122607, -0.143648, -0.0974797, 0.984768, 0.0031075, 1.24847, -0.0207927 )
+bone_name = "Neck"
+
+[node name="marker_neck_grab" type="Position3D" parent="skeleton/Skeleton/neck" index="0"]
+transform = Transform( 0.138457, -0.626832, -0.766778, -0.568055, 0.583953, -0.579924, 0.811199, 0.515912, -0.275226, 0, 0.023, -0.085 )
+visible = false
+
 [node name="AnimationTree" type="AnimationTree" parent="." index="2"]
 tree_root = SubResource( 111 )
 anim_player = NodePath("../AnimationPlayer")
@@ -695,6 +726,7 @@ parameters/all_scale/scale = 1.0
 parameters/blade_left/blend_amount = 0.0
 parameters/blade_right/blend_amount = 0.0
 parameters/state/playback = SubResource( 112 )
+parameters/state/attack-melee1/attack1_speed/scale = 1.0
 parameters/state/climb1/TimeScale/scale = 2.0
 parameters/state/climb1a/TimeScale/scale = 2.0
 parameters/state/grabbed/TimeScale/scale = 1.0
@@ -702,7 +734,7 @@ parameters/state/kneel/TimeScale/scale = 1.0
 parameters/state/locomotion/loc/blend_position = Vector2( -0.00127554, 0.00220752 )
 parameters/state/locomotion/loc/0/TimeScale/scale = 2.0
 "parameters/state/locomotion/loc/0/TimeScale 2/scale" = 1.5
-parameters/state/locomotion/loc/0/t1/current = 1
+parameters/state/locomotion/loc/0/t1/current = 0
 parameters/state/locomotion/loc/1/TimeScale/scale = 1.0
 "parameters/state/locomotion/loc/1/TimeScale 2/scale" = 1.0
 parameters/state/locomotion/loc/1/Transition/current = 0

characters/vroid1-man.tscn

@@ -1,9 +1,18 @@
-[gd_scene load_steps=95 format=2]
+[gd_scene load_steps=103 format=2]
 
 [ext_resource path="res://scenes/characters/vroid1-man.gltf" type="PackedScene" id=1]
 [ext_resource path="res://scenes/hair/male-hair1.tscn" type="PackedScene" id=2]
 [ext_resource path="res://scenes/face/male-face.tscn" type="PackedScene" id=3]
 
+[sub_resource type="SphereShape" id=149]
+radius = 0.15
+
+[sub_resource type="SphereShape" id=148]
+radius = 0.18
+
+[sub_resource type="BoxShape" id=147]
+extents = Vector3( 0.2, 0.22, 0.12 )
+
 [sub_resource type="AnimationNodeAnimation" id=1]
 animation = "blend-blade-right"
 
@@ -18,6 +27,19 @@ filters = [ "Skeleton:j_bip_l_hand", "Skeleton:j_bip_l_index_1", "Skeleton:j_bip
 filter_enabled = true
 filters = [ "Skeleton:j_bip_r_hand", "Skeleton:j_bip_r_index_1", "Skeleton:j_bip_r_index_2", "Skeleton:j_bip_r_index_3", "Skeleton:j_bip_r_little_1", "Skeleton:j_bip_r_little_2", "Skeleton:j_bip_r_little_3", "Skeleton:j_bip_r_middle_1", "Skeleton:j_bip_r_middle_2", "Skeleton:j_bip_r_middle_3", "Skeleton:j_bip_r_ring_1", "Skeleton:j_bip_r_ring_2", "Skeleton:j_bip_r_ring_3", "Skeleton:j_bip_r_thumb_1", "Skeleton:j_bip_r_thumb_2", "Skeleton:j_bip_r_thumb_3" ]
 
+[sub_resource type="AnimationNodeAnimation" id=145]
+animation = "attack-melee-weapon1"
+
+[sub_resource type="AnimationNodeTimeScale" id=146]
+
+[sub_resource type="AnimationNodeBlendTree" id=142]
+graph_offset = Vector2( -534, 8 )
+nodes/Animation/node = SubResource( 145 )
+nodes/Animation/position = Vector2( -240, 158 )
+nodes/TimeScale/node = SubResource( 146 )
+nodes/TimeScale/position = Vector2( 60, 160 )
+node_connections = [ "output", 0, "TimeScale", "TimeScale", 0, "Animation" ]
+
 [sub_resource type="AnimationNodeAnimation" id=5]
 animation = "cliimb1"
 
@@ -58,11 +80,12 @@ nodes/output/position = Vector2( 740, 140 )
 node_connections = [ "output", 0, "TimeScale", "TimeScale", 0, "Animation" ]
 
 [sub_resource type="AnimationNodeAnimation" id=14]
-animation = "start-grab"
+animation = "start-grab2"
 
 [sub_resource type="AnimationNodeTimeScale" id=15]
 
 [sub_resource type="AnimationNodeBlendTree" id=16]
+graph_offset = Vector2( 119.058, 0 )
 nodes/Animation/node = SubResource( 14 )
 nodes/Animation/position = Vector2( 573, 137 )
 nodes/TimeScale/node = SubResource( 15 )
@@ -375,7 +398,15 @@ xfade_time = 0.5
 switch_mode = 2
 xfade_time = 0.5
 
+[sub_resource type="AnimationNodeStateMachineTransition" id=143]
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=144]
+switch_mode = 2
+auto_advance = true
+
 [sub_resource type="AnimationNodeStateMachine" id=70]
+states/attack-melee1/node = SubResource( 142 )
+states/attack-melee1/position = Vector2( 804.317, 380 )
 states/climb1/node = SubResource( 7 )
 states/climb1/position = Vector2( 359.444, 656 )
 states/climb1a/node = SubResource( 10 )
@@ -402,12 +433,12 @@ states/turn_right/node = SubResource( 110 )
 states/turn_right/position = Vector2( 177.444, 671 )
 states/use_tap/node = SubResource( 54 )
 states/use_tap/position = Vector2( -138.556, 174 )
-transitions = [ "locomotion", "drive", SubResource( 55 ), "drive", "locomotion", SubResource( 56 ), "locomotion", "passenger", SubResource( 57 ), "passenger", "locomotion", SubResource( 58 ), "drive", "passenger", SubResource( 59 ), "passenger", "drive", SubResource( 60 ), "sleeping", "locomotion", SubResource( 61 ), "locomotion", "grab", SubResource( 62 ), "grab", "locomotion", SubResource( 63 ), "locomotion", "climb1", SubResource( 64 ), "climb1", "locomotion", SubResource( 65 ), "locomotion", "climb1a", SubResource( 66 ), "climb1a", "locomotion", SubResource( 67 ), "locomotion", "use_tap", SubResource( 68 ), "use_tap", "locomotion", SubResource( 69 ), "locomotion", "stop_walking", SubResource( 100 ), "stop_walking", "locomotion", SubResource( 101 ), "locomotion", "start_walking", SubResource( 103 ), "start_walking", "locomotion", SubResource( 104 ), "locomotion", "turn_left", SubResource( 111 ), "turn_left", "locomotion", SubResource( 112 ), "locomotion", "turn_right", SubResource( 113 ), "turn_right", "locomotion", SubResource( 114 ) ]
+transitions = [ "locomotion", "drive", SubResource( 55 ), "drive", "locomotion", SubResource( 56 ), "locomotion", "passenger", SubResource( 57 ), "passenger", "locomotion", SubResource( 58 ), "drive", "passenger", SubResource( 59 ), "passenger", "drive", SubResource( 60 ), "sleeping", "locomotion", SubResource( 61 ), "locomotion", "grab", SubResource( 62 ), "grab", "locomotion", SubResource( 63 ), "locomotion", "climb1", SubResource( 64 ), "climb1", "locomotion", SubResource( 65 ), "locomotion", "climb1a", SubResource( 66 ), "climb1a", "locomotion", SubResource( 67 ), "locomotion", "use_tap", SubResource( 68 ), "use_tap", "locomotion", SubResource( 69 ), "locomotion", "stop_walking", SubResource( 100 ), "stop_walking", "locomotion", SubResource( 101 ), "locomotion", "start_walking", SubResource( 103 ), "start_walking", "locomotion", SubResource( 104 ), "locomotion", "turn_left", SubResource( 111 ), "turn_left", "locomotion", SubResource( 112 ), "locomotion", "turn_right", SubResource( 113 ), "turn_right", "locomotion", SubResource( 114 ), "locomotion", "attack-melee1", SubResource( 143 ), "attack-melee1", "locomotion", SubResource( 144 ) ]
 start_node = "locomotion"
-graph_offset = Vector2( -470.556, -68 )
+graph_offset = Vector2( -103.683, 58 )
 
 [sub_resource type="AnimationNodeBlendTree" id=71]
-graph_offset = Vector2( -499.98, 0 )
+graph_offset = Vector2( -610.686, 0 )
 nodes/Animation/node = SubResource( 2 )
 nodes/Animation/position = Vector2( -200, 260 )
 "nodes/Animation 2/node" = SubResource( 1 )
@@ -427,6 +458,7 @@ node_connections = [ "output", 0, "blade_right", "blade_left", 0, "state", "blad
 
 [node name="Skeleton" parent="." index="0"]
 bones/1/bound_children = [ NodePath("hips") ]
+bones/23/bound_children = [ NodePath("chest") ]
 bones/75/bound_children = [ NodePath("neck") ]
 bones/76/bound_children = [ NodePath("head") ]
 bones/80/bound_children = [ NodePath("penis_2") ]
@@ -434,7 +466,7 @@ bones/94/bound_children = [ NodePath("wrist_r") ]
 bones/96/bound_children = [ NodePath("wrist_l") ]
 
 [node name="wrist_r" type="BoneAttachment" parent="Skeleton" index="2"]
-transform = Transform( 0.0279129, 0.998729, 0.041974, 0.083992, -0.0441852, 0.995486, 0.996075, -0.0242614, -0.0851186, 0.24008, 1.0159, -0.0583036 )
+transform = Transform( 0.0279129, 0.998728, 0.0419739, 0.0839921, -0.0441851, 0.995486, 0.996075, -0.0242615, -0.0851187, 0.24008, 1.0159, -0.0177416 )
 bone_name = "wrist_ik_r"
 
 [node name="marker_wrist_r_grab" type="Position3D" parent="Skeleton/wrist_r" index="0"]
@@ -445,7 +477,7 @@ visible = false
 transform = Transform( -1.62921e-07, -1, 0, -1.62921e-07, 2.65431e-14, 1, -1, 1.62921e-07, -1.62921e-07, -0.0452205, -0.00161505, -0.0947611 )
 
 [node name="wrist_l" type="BoneAttachment" parent="Skeleton" index="3"]
-transform = Transform( 0.531637, -0.84656, 0.0264325, -0.0845947, -0.0220212, 0.996172, -0.842737, -0.531838, -0.0833217, -0.202819, 1.0271, -0.0530299 )
+transform = Transform( 0.531637, -0.84656, 0.0264325, -0.0845947, -0.0220212, 0.996172, -0.842737, -0.531838, -0.0833217, -0.202819, 1.01771, -0.0990905 )
 bone_name = "wrist_ik_l"
 
 [node name="marker_wrist_l_grab" type="Position3D" parent="Skeleton/wrist_l" index="0"]
@@ -456,7 +488,7 @@ visible = false
 transform = Transform( -1.62921e-07, 1, 0, 1.62921e-07, 2.65431e-14, -1, -1, -1.62921e-07, -1.62921e-07, 0.04, -0.01, -0.089 )
 
 [node name="head" type="BoneAttachment" parent="Skeleton" index="4"]
-transform = Transform( 0.998061, -0.0095934, -0.0614997, 0.0314598, 0.930306, 0.365432, 0.0537078, -0.366659, 0.928804, -0.0330975, 1.69764, -0.00609486 )
+transform = Transform( 0.992423, -0.0725141, 0.0991927, 0.0314417, 0.93028, 0.3655, -0.118781, -0.359611, 0.92551, -0.0334505, 1.69764, -0.0088316 )
 bone_name = "J_Bip_C_Head"
 
 [node name="marker_talk" type="Position3D" parent="Skeleton/head" index="0"]
@@ -473,16 +505,33 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.011 )
 
 [node name="male-face" parent="Skeleton/head/face" index="0" instance=ExtResource( 3 )]
 
+[node name="head_hurt" type="Area" parent="Skeleton/head" index="3"]
+collision_layer = 8
+collision_mask = 4
+monitorable = false
+
+[node name="CollisionShape" type="CollisionShape" parent="Skeleton/head/head_hurt" index="0"]
+transform = Transform( 0.967007, -0.0921614, 0.237496, 0.0940632, 0.995561, 0.00333673, -0.236749, 0.019113, 0.971383, 0.00128094, 0.0854003, 0.000879645 )
+shape = SubResource( 149 )
+
 [node name="hips" type="BoneAttachment" parent="Skeleton" index="5"]
-transform = Transform( 0.988538, -0.146769, 0.0353867, 0.150102, 0.98061, -0.125986, -0.0162097, 0.129854, 0.991401, 0.000514592, 1.10104, -0.0117666 )
+transform = Transform( 0.98661, -0.156797, -0.0449004, 0.150109, 0.980609, -0.125986, 0.063784, 0.117559, 0.991015, 0.000514592, 1.10104, -0.0117666 )
 bone_name = "J_Bip_C_Hips"
 
 [node name="marker_hips_action" type="Position3D" parent="Skeleton/hips" index="0"]
 transform = Transform( 0.999999, 0.000161137, 0.00126248, -0.000160797, 1, -0.000193566, -0.00126263, 0.000193223, 0.999999, 0.0136906, -0.0795597, 0.214268 )
 visible = false
 
+[node name="hips_hurt" type="Area" parent="Skeleton/hips" index="1"]
+collision_layer = 8
+collision_mask = 4
+monitorable = false
+
+[node name="CollisionShape" type="CollisionShape" parent="Skeleton/hips/hips_hurt" index="0"]
+shape = SubResource( 148 )
+
 [node name="neck" type="BoneAttachment" parent="Skeleton" index="6"]
-transform = Transform( 0.999522, -0.0284599, 0.0120657, 0.0262095, 0.987195, 0.157347, -0.0163893, -0.156956, 0.987469, -0.0303023, 1.60068, 0.00932036 )
+transform = Transform( 0.997574, -0.0156814, -0.0678291, 0.0262169, 0.987195, 0.157347, 0.0644932, -0.158743, 0.985211, -0.0319104, 1.60068, 0.0067592 )
 bone_name = "J_Bip_C_Neck"
 
 [node name="marker_neck_grab" type="Position3D" parent="Skeleton/neck" index="0"]
@@ -490,13 +539,25 @@ transform = Transform( 0.998758, -0.00781338, 0.0492147, 0.00787775, 0.999969, -
 visible = false
 
 [node name="penis_2" type="BoneAttachment" parent="Skeleton" index="7"]
-transform = Transform( 0.988538, 0.119852, -0.0918097, 0.150102, -0.845508, 0.51243, -0.0162103, -0.520337, -0.853807, 0.0156493, 0.991264, -0.105296 )
+transform = Transform( 0.986609, 0.161544, -0.0224677, 0.15011, -0.845507, 0.51243, 0.0637833, -0.508941, -0.858435, 0.023164, 0.991264, -0.103765 )
 bone_name = "penis2"
 
 [node name="marker_penis_action" type="Position3D" parent="Skeleton/penis_2" index="0"]
 transform = Transform( 0.998824, -0.0252848, -0.0413812, 0.0249792, 0.999657, -0.00788352, 0.0415664, 0.00684074, 0.999113, -0.0100176, 0.0641036, 0.0307807 )
 visible = false
 
+[node name="chest" type="BoneAttachment" parent="Skeleton" index="8"]
+transform = Transform( 0.997574, -0.0296453, -0.0629938, 0.0262256, 0.998173, -0.0544359, 0.0644925, 0.0526517, 0.996528, -0.0239998, 1.33823, -0.00887859 )
+bone_name = "J_Bip_C_Chest"
+
+[node name="chest_hurt" type="Area" parent="Skeleton/chest" index="0"]
+collision_layer = 8
+collision_mask = 4
+monitorable = false
+
+[node name="CollisionShape" type="CollisionShape" parent="Skeleton/chest/chest_hurt" index="0"]
+shape = SubResource( 147 )
+
 [node name="AnimationTree" type="AnimationTree" parent="." index="2"]
 tree_root = SubResource( 71 )
 anim_player = NodePath("../AnimationPlayer")
@@ -506,6 +567,7 @@ root_motion_track = NodePath("Skeleton:Root")
 parameters/blade_left/blend_amount = 0.0
 parameters/blade_right/blend_amount = 0.0
 parameters/state/playback = SubResource( 72 )
+parameters/state/attack-melee1/TimeScale/scale = 1.0
 parameters/state/climb1/TimeScale/scale = 2.0
 parameters/state/climb1a/TimeScale/scale = 2.0
 parameters/state/drive/TimeScale/scale = 1.0