diff --git a/src/scenes/characters/enemy.tscn b/src/scenes/characters/enemy.tscn index 9fd5a77..320bfec 100644 --- a/src/scenes/characters/enemy.tscn +++ b/src/scenes/characters/enemy.tscn @@ -73,7 +73,6 @@ bones/26/position = Vector3(2.06034e-08, 0.127601, 2.42761e-08) bones/26/rotation = Quaternion(-0.00824883, -0.00027077, -0.0328667, 0.999426) bones/28/rotation = Quaternion(0.702583, -0.000939743, -0.00133552, 0.7116) bones/29/rotation = Quaternion(0.741121, 0.00218291, 0.00265381, 0.671363) -bones/30/rotation = Quaternion(0.32527, 0.890055, 0.295977, -0.119997) bones/31/rotation = Quaternion(0.514882, -0.114149, 0.114482, 0.841879) bones/32/rotation = Quaternion(0.592003, -0.0381348, -0.090699, 0.799907) bones/34/position = Vector3(-0.00316938, 0.0987206, 0.0147918) @@ -103,14 +102,12 @@ bones/50/position = Vector3(-1.48779e-07, 0.1276, 5.9139e-08) bones/50/rotation = Quaternion(-8.73115e-08, 2.7474e-08, -1.28057e-07, 1) bones/51/position = Vector3(1.9461e-07, 0.127601, 6.06248e-08) bones/51/rotation = Quaternion(-0.00824876, 0.000270832, 0.032867, 0.999426) -bones/52/rotation = Quaternion(-0.2563, 0.855859, 0.0299184, -0.448241) bones/53/rotation = Quaternion(0.694912, 0.107145, -0.103549, 0.703488) bones/54/rotation = Quaternion(0.74112, -0.00218237, -0.00265409, 0.671363) bones/55/rotation = Quaternion(-0.325269, 0.890055, 0.295977, 0.119998) bones/56/rotation = Quaternion(0.514882, 0.11415, -0.114483, 0.841879) bones/57/rotation = Quaternion(0.592004, 0.0381346, 0.0906992, 0.799907) bones/59/position = Vector3(0.00316943, 0.0987207, 0.0147917) -bones/59/rotation = Quaternion(0.138771, -0.704916, 0.15571, 0.677932) bones/60/rotation = Quaternion(0.579984, 0.0462615, -0.0308755, 0.812727) bones/61/rotation = Quaternion(0.682777, -0.00174718, -0.00256448, 0.73062) bones/62/rotation = Quaternion(-0.00426532, -0.736714, -0.0394788, 0.675038) @@ -120,7 +117,6 @@ bones/64/rotation = Quaternion(0.670693, 0.0163391, -0.0185663, 0.741323) bones/65/rotation = Quaternion(0.692499, 0.00330364, 0.00403917, 0.7214) bones/66/rotation = Quaternion(-0.0684178, -0.72411, -0.0332339, 0.685477) bones/67/position = Vector3(0.00715371, 0.0679859, -0.0481984) -bones/67/rotation = Quaternion(0.108364, -0.768224, 0.166291, 0.608635) bones/68/rotation = Quaternion(0.629954, 0.0295149, 0.0177509, 0.775869) bones/69/rotation = Quaternion(0.816678, -0.0439534, -0.0509861, 0.573155) bones/70/rotation = Quaternion(-0.12906, -0.728937, 0.0250258, 0.67184) diff --git a/src/scenes/characters/player.tscn b/src/scenes/characters/player.tscn index bd1b58d..f69146f 100644 --- a/src/scenes/characters/player.tscn +++ b/src/scenes/characters/player.tscn @@ -43,53 +43,53 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0) [node name="Rig" parent="RigPivot" instance=ExtResource("3_n52bt")] [node name="Skeleton3D" parent="RigPivot/Rig/CharacterRig/GameRig" index="0"] -bones/0/position = Vector3(3.37508e-15, 0.892598, -0.0481736) +bones/0/position = Vector3(8.58084e-15, 0.895019, -0.0481735) bones/0/rotation = Quaternion(0.12582, 1.18262e-07, 1.49989e-08, 0.992053) bones/1/rotation = Quaternion(-0.0566577, -0.00072973, -0.0117082, 0.998325) bones/2/position = Vector3(3.20474e-09, 0.146689, -1.95578e-08) -bones/2/rotation = Quaternion(-0.00474949, -0.000463206, 0.00321576, 0.999983) +bones/2/rotation = Quaternion(-0.00317971, -0.000437766, 0.00321522, 0.99999) bones/3/position = Vector3(-2.01263e-09, 0.202058, -2.51457e-08) -bones/3/rotation = Quaternion(-0.0990345, -0.000413126, 0.00851833, 0.995047) +bones/3/rotation = Quaternion(-0.0976733, -0.000395437, 0.00851928, 0.995182) bones/4/position = Vector3(3.02934e-10, 0.0925562, 3.91155e-08) -bones/4/rotation = Quaternion(0.279353, 1.411e-08, 9.66205e-08, 0.960189) +bones/4/rotation = Quaternion(0.278136, 1.46012e-08, 9.44328e-08, 0.960542) bones/5/rotation = Quaternion(-0.0948564, -2.80691e-14, -2.26155e-08, 0.995491) -bones/6/rotation = Quaternion(-0.153287, -1.18211e-07, -1.56253e-08, 0.988182) -bones/7/position = Vector3(-4.01473e-08, 0.892598, -0.0481735) +bones/6/rotation = Quaternion(-0.154729, -1.17525e-07, -2.00353e-08, 0.987957) +bones/7/position = Vector3(-2.84857e-08, 0.895019, -0.0481735) bones/7/rotation = Quaternion(-0.0863677, -0.751104, -0.383052, 0.530711) -bones/8/position = Vector3(-6.21924e-08, 0.892598, -0.0481735) +bones/8/position = Vector3(-5.26355e-08, 0.895019, -0.0481735) bones/8/rotation = Quaternion(-0.0863677, 0.751104, 0.383052, 0.530711) -bones/9/position = Vector3(0.131144, 0.958802, -0.0351291) -bones/9/rotation = Quaternion(0.992545, 0.0211075, -0.0308392, 0.116007) +bones/9/position = Vector3(0.131144, 0.961223, -0.0351291) +bones/9/rotation = Quaternion(0.992778, 0.0209935, -0.0308923, 0.114003) bones/10/position = Vector3(-2.36129e-08, 0.26601, -2.14789e-08) bones/10/rotation = Quaternion(-3.13921e-08, -0.000695086, 1.20449e-08, 1) bones/11/position = Vector3(-4.6306e-08, 0.26601, 2.42145e-08) -bones/11/rotation = Quaternion(0.430313, -0.00070061, 0.000334144, 0.902679) +bones/11/rotation = Quaternion(0.425702, -0.000700662, 0.000329784, 0.904863) bones/12/position = Vector3(3.05151e-08, 0.22603, 5.03768e-08) bones/12/rotation = Quaternion(-8.19226e-09, -0.00710644, 4.16102e-08, 0.999975) bones/13/position = Vector3(-2.95495e-08, 0.22603, 2.68392e-09) -bones/13/rotation = Quaternion(-0.755929, 0.0119014, 0.0244278, 0.65409) +bones/13/rotation = Quaternion(-0.753959, 0.0118942, 0.0244169, 0.65636) bones/14/position = Vector3(-3.05481e-08, 0.139877, 1.64787e-08) bones/14/rotation = Quaternion(-9.66743e-05, 0.967474, -0.252972, -0.000383447) -bones/15/position = Vector3(-0.131144, 0.958802, -0.0351291) -bones/15/rotation = Quaternion(0.972099, -0.00598688, 0.0271796, 0.232916) +bones/15/position = Vector3(-0.131144, 0.961223, -0.0351291) +bones/15/rotation = Quaternion(0.972608, -0.00589253, 0.0272454, 0.230776) bones/16/position = Vector3(-1.10042e-08, 0.265705, -3.31989e-08) bones/16/rotation = Quaternion(-3.43227e-08, 0.00314323, 8.33075e-10, 0.999995) bones/17/position = Vector3(1.83545e-08, 0.265705, 6.98543e-10) -bones/17/rotation = Quaternion(0.453725, 0.00334755, -0.00170452, 0.891134) +bones/17/rotation = Quaternion(0.449409, 0.00332206, -0.00167137, 0.893319) bones/18/position = Vector3(1.2807e-08, 0.225719, -8.28774e-09) bones/18/rotation = Quaternion(-2.29017e-08, -0.00785732, 3.30149e-08, 0.999969) bones/19/position = Vector3(-1.27748e-08, 0.225719, 1.12004e-08) -bones/19/rotation = Quaternion(-0.692303, -0.0282143, -0.000438585, 0.721055) +bones/19/rotation = Quaternion(-0.690431, -0.0282045, -0.000573799, 0.722848) bones/20/position = Vector3(-1.30142e-08, 0.139877, -2.77457e-09) bones/20/rotation = Quaternion(-9.96472e-05, 0.967461, -0.253021, -0.000383039) -bones/21/position = Vector3(0.0251286, 1.42297, 0.0408048) -bones/21/rotation = Quaternion(-0.50042, -0.254995, -0.394861, 0.727078) -bones/22/position = Vector3(0.187502, 1.45905, -0.0282855) -bones/22/rotation = Quaternion(0.059026, -0.158275, 0.973929, -0.151416) +bones/21/position = Vector3(0.0251286, 1.42531, 0.0416884) +bones/21/rotation = Quaternion(-0.496275, -0.25675, -0.397875, 0.727658) +bones/22/position = Vector3(0.188079, 1.46182, -0.0257931) +bones/22/rotation = Quaternion(0.0538374, -0.159079, 0.97423, -0.150571) bones/23/position = Vector3(-5.41331e-09, 0.143946, -2.98023e-08) -bones/23/rotation = Quaternion(4.21752e-08, -0.00851079, -1.92762e-08, 0.999964) +bones/23/rotation = Quaternion(9.26843e-08, -0.0127032, -8.73232e-09, 0.999919) bones/24/position = Vector3(-6.33301e-08, 0.143946, 4.3873e-08) -bones/24/rotation = Quaternion(0.281763, -0.00845362, -0.01693, 0.959297) +bones/24/rotation = Quaternion(0.291547, -0.0127039, -0.0177098, 0.956308) bones/25/position = Vector3(1.30385e-08, 0.127601, 6.51926e-09) bones/25/rotation = Quaternion(1.49943e-07, -1.20606e-07, 9.91859e-08, 1) bones/26/position = Vector3(2.06034e-08, 0.127601, 2.42761e-08) @@ -114,14 +114,14 @@ bones/42/rotation = Quaternion(-0.120913, 0.799109, 0.0358921, 0.587807) bones/43/rotation = Quaternion(0.498693, -0.0202705, -0.0256953, 0.866161) bones/44/rotation = Quaternion(0.715385, 0.035306, 0.0573145, 0.695481) bones/45/rotation = Quaternion(-0.129059, 0.728936, -0.0250259, 0.67184) -bones/46/position = Vector3(-0.0113635, 1.42297, 0.0408048) -bones/46/rotation = Quaternion(-0.524954, 0.205117, 0.360587, 0.743187) -bones/47/position = Vector3(-0.162992, 1.45922, -0.0493854) -bones/47/rotation = Quaternion(-0.0970743, -0.133019, 0.971274, 0.171782) +bones/46/position = Vector3(-0.0113635, 1.42531, 0.0416884) +bones/46/rotation = Quaternion(-0.517535, 0.213485, 0.368233, 0.742284) +bones/47/position = Vector3(-0.165302, 1.46218, -0.0442294) +bones/47/rotation = Quaternion(-0.0852349, -0.135102, 0.972385, 0.170149) bones/48/position = Vector3(1.88476e-07, 0.143946, 1.02445e-08) -bones/48/rotation = Quaternion(8.70013e-08, -0.00137778, 7.62615e-08, 0.999999) +bones/48/rotation = Quaternion(-7.81787e-08, 0.00673743, -1.28125e-07, 0.999977) bones/49/position = Vector3(6.5191e-09, 0.143946, -1.95094e-08) -bones/49/rotation = Quaternion(0.312005, -0.00137739, 0.0286124, 0.949649) +bones/49/rotation = Quaternion(0.323275, 0.00673785, 0.0288427, 0.945841) bones/50/position = Vector3(-1.48779e-07, 0.1276, 5.9139e-08) bones/50/rotation = Quaternion(-8.73115e-08, 2.7474e-08, -1.28057e-07, 1) bones/51/position = Vector3(1.9461e-07, 0.127601, 6.06248e-08) @@ -147,19 +147,19 @@ bones/67/rotation = Quaternion(0.108364, -0.768224, 0.166291, 0.608635) bones/68/rotation = Quaternion(0.629954, 0.0295149, 0.0177509, 0.775869) bones/69/rotation = Quaternion(0.816678, -0.0439534, -0.0509861, 0.573155) bones/70/rotation = Quaternion(-0.12906, -0.728937, 0.0250258, 0.67184) -bones/71/position = Vector3(0.127191, 1.34061, -0.026958) -bones/71/rotation = Quaternion(1.89928e-08, 0.617641, 0.78646, -4.65874e-08) -bones/72/position = Vector3(-0.113426, 1.34061, -0.0269581) -bones/72/rotation = Quaternion(1.89929e-08, 0.617641, 0.78646, -4.65873e-08) +bones/71/position = Vector3(0.127191, 1.34338, -0.0266229) +bones/71/rotation = Quaternion(1.91721e-08, 0.615034, 0.788501, -4.64921e-08) +bones/72/position = Vector3(-0.113426, 1.34338, -0.026623) +bones/72/rotation = Quaternion(1.91783e-08, 0.614945, 0.78857, -4.64886e-08) [node name="RightHandBone" parent="RigPivot/Rig" index="2"] -transform = Transform3D(-0.962343, -0.2708, -0.0237162, 0.246289, -0.9055, 0.34556, -0.115053, 0.326706, 0.938097, -0.336809, 0.973542, -0.0481699) +transform = Transform3D(-0.962343, -0.270803, -0.0237132, 0.24331, -0.896965, 0.369126, -0.12123, 0.349456, 0.929077, -0.339119, 0.978719, -0.037363) [node name="LeftHandBone" parent="RigPivot/Rig" index="3"] -transform = Transform3D(-0.970496, 0.239167, 0.0306141, -0.224995, -0.943919, 0.241652, 0.0866923, 0.227634, 0.96988, 0.344327, 0.96324, -0.0615967) +transform = Transform3D(-0.970513, 0.239108, 0.0305211, -0.223046, -0.938818, 0.262434, 0.091404, 0.247888, 0.964467, 0.34489, 0.967359, -0.0540491) [node name="RayAttachment" type="BoneAttachment3D" parent="RigPivot/Rig"] -transform = Transform3D(-0.962343, -0.2708, -0.0237162, 0.246289, -0.9055, 0.34556, -0.115053, 0.326706, 0.938097, -0.336809, 0.973542, -0.0481699) +transform = Transform3D(-0.962343, -0.270803, -0.0237132, 0.24331, -0.896965, 0.369126, -0.12123, 0.349456, 0.929077, -0.339119, 0.978719, -0.037363) bone_name = "DEF-hand.R" bone_idx = 51 use_external_skeleton = true diff --git a/src/scenes/characters/rig.tscn b/src/scenes/characters/rig.tscn index 722df8b..206da66 100644 --- a/src/scenes/characters/rig.tscn +++ b/src/scenes/characters/rig.tscn @@ -1,10 +1,13 @@ -[gd_scene load_steps=19 format=3 uid="uid://ckwydalda0teo"] +[gd_scene load_steps=22 format=3 uid="uid://ckwydalda0teo"] [ext_resource type="Script" uid="uid://ckjbqjere1jpf" path="res://src/scripts/characters/rig.gd" id="1_n80wy"] [ext_resource type="PackedScene" uid="uid://xivf38sp0l78" path="res://assets/models/character/character_rig.glb" id="2_ow4sk"] [ext_resource type="PackedScene" uid="uid://bnkhiay2id2kl" path="res://assets/models/character/gear/longsword.glb" id="3_dka8l"] [ext_resource type="PackedScene" uid="uid://c7ahf78h5s3kx" path="res://assets/models/character/gear/tall_shield.glb" id="4_i4vhj"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_isuva"] +animation = &"Dash" + [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_6b80y"] animation = &"Defeat" @@ -50,7 +53,16 @@ xfade_time = 0.1 switch_mode = 2 advance_mode = 2 +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_yvrik"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dnffl"] +xfade_time = 0.2 +switch_mode = 2 +advance_mode = 2 + [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_mq48a"] +states/Dash/node = SubResource("AnimationNodeAnimation_isuva") +states/Dash/position = Vector2(434, -58) states/Defeat/node = SubResource("AnimationNodeAnimation_6b80y") states/Defeat/position = Vector2(584, -69) states/MoveSpace/node = SubResource("AnimationNodeBlendSpace1D_djdpq") @@ -62,7 +74,7 @@ states/OverheadRecover/position = Vector2(652, 123) states/Slash/node = SubResource("AnimationNodeAnimation_1br2m") states/Slash/position = Vector2(434, 243) states/Start/position = Vector2(239, 28) -transitions = ["Start", "MoveSpace", SubResource("AnimationNodeStateMachineTransition_gkl4x"), "MoveSpace", "Slash", SubResource("AnimationNodeStateMachineTransition_eek7r"), "Slash", "MoveSpace", SubResource("AnimationNodeStateMachineTransition_gxy77"), "MoveSpace", "Overhead", SubResource("AnimationNodeStateMachineTransition_isuva"), "Overhead", "OverheadRecover", SubResource("AnimationNodeStateMachineTransition_8x2vi"), "OverheadRecover", "MoveSpace", SubResource("AnimationNodeStateMachineTransition_eqygr")] +transitions = ["Start", "MoveSpace", SubResource("AnimationNodeStateMachineTransition_gkl4x"), "MoveSpace", "Slash", SubResource("AnimationNodeStateMachineTransition_eek7r"), "Slash", "MoveSpace", SubResource("AnimationNodeStateMachineTransition_gxy77"), "MoveSpace", "Overhead", SubResource("AnimationNodeStateMachineTransition_isuva"), "Overhead", "OverheadRecover", SubResource("AnimationNodeStateMachineTransition_8x2vi"), "OverheadRecover", "MoveSpace", SubResource("AnimationNodeStateMachineTransition_eqygr"), "MoveSpace", "Dash", SubResource("AnimationNodeStateMachineTransition_yvrik"), "Dash", "MoveSpace", SubResource("AnimationNodeStateMachineTransition_dnffl")] graph_offset = Vector2(-50, -104) [node name="Rig" type="Node3D"] @@ -71,114 +83,114 @@ script = ExtResource("1_n80wy") [node name="CharacterRig" parent="." instance=ExtResource("2_ow4sk")] [node name="Skeleton3D" parent="CharacterRig/GameRig" index="0"] -bones/0/position = Vector3(0.0276682, 0.903179, 0.0086448) -bones/0/rotation = Quaternion(0.155586, 1.17758e-07, 1.85474e-08, 0.987822) -bones/1/rotation = Quaternion(-0.0497934, 0.00362305, 0.058142, 0.997059) -bones/2/position = Vector3(6.23959e-10, 0.140892, 3.06754e-08) -bones/2/rotation = Quaternion(0.00933042, 0.000201999, -0.0491224, 0.998749) -bones/3/position = Vector3(2.32707e-09, 0.175705, -2.21538e-07) -bones/3/rotation = Quaternion(-0.265407, 0.0310372, -0.0790426, 0.96039) -bones/4/position = Vector3(-7.45063e-09, 0.0827501, -4.22106e-08) -bones/4/rotation = Quaternion(0.430518, 0.0184732, 0.225987, 0.873638) -bones/5/rotation = Quaternion(-0.0948568, -5.65495e-09, -1.01598e-07, 0.995491) -bones/6/rotation = Quaternion(-0.180423, -0.04801, -0.149312, 0.971004) -bones/7/position = Vector3(0.0276682, 0.903179, 0.00864496) -bones/7/rotation = Quaternion(-0.0703741, -0.739249, -0.405459, 0.533068) -bones/8/position = Vector3(0.0276682, 0.903179, 0.00864482) -bones/8/rotation = Quaternion(-0.070374, 0.739249, 0.405459, 0.533068) -bones/9/position = Vector3(0.158812, 0.968479, 0.0256444) -bones/9/rotation = Quaternion(0.986866, -0.0347172, -0.036593, -0.153461) -bones/10/position = Vector3(-1.28047e-08, 0.263565, 5.48525e-08) -bones/10/rotation = Quaternion(-4.57173e-08, -0.0075665, 2.94687e-08, 0.999971) -bones/11/position = Vector3(-7.19732e-09, 0.263565, -7.01984e-08) -bones/11/rotation = Quaternion(0.533853, -0.00756582, 0.00477709, 0.84553) -bones/12/position = Vector3(-6.11355e-09, 0.223526, 5.72814e-09) -bones/12/rotation = Quaternion(2.18907e-08, -0.00327906, 7.14397e-08, 0.999995) -bones/13/position = Vector3(-1.06738e-08, 0.223526, 1.43191e-08) -bones/13/rotation = Quaternion(-0.486355, 0.0179254, -0.0581729, 0.871638) -bones/14/position = Vector3(2.45242e-09, 0.139878, -1.43056e-08) -bones/14/rotation = Quaternion(-0.000103867, 0.96745, -0.253064, -0.000381529) -bones/15/position = Vector3(-0.103475, 0.968479, 0.0256444) -bones/15/rotation = Quaternion(0.925588, 1.73114e-05, 0.0210855, 0.377945) -bones/16/position = Vector3(-1.98544e-08, 0.26553, -1.10504e-07) -bones/16/rotation = Quaternion(1.83106e-08, 0.00524275, -7.19832e-08, 0.999986) -bones/17/position = Vector3(1.9963e-08, 0.26553, 2.04309e-08) -bones/17/rotation = Quaternion(0.428998, 0.00524208, -0.00248965, 0.903287) -bones/18/position = Vector3(2.07135e-08, 0.225541, 2.05872e-08) -bones/18/rotation = Quaternion(6.82911e-08, -0.00656821, 1.66762e-09, 0.999978) -bones/19/position = Vector3(6.57201e-09, 0.225541, -9.83437e-09) -bones/19/rotation = Quaternion(-0.676712, -0.0268497, 0.00119576, 0.735757) -bones/20/position = Vector3(1.26393e-08, 0.139878, -1.33116e-08) -bones/20/rotation = Quaternion(-9.94648e-05, 0.967459, -0.253029, -0.00038312) -bones/21/position = Vector3(0.0318322, 1.38876, 0.13565) -bones/21/rotation = Quaternion(-0.498675, -0.214179, -0.455467, 0.705692) -bones/22/position = Vector3(0.198838, 1.40388, 0.0699175) -bones/22/rotation = Quaternion(-0.208708, 0.364962, 0.899386, -0.119786) -bones/23/position = Vector3(-9.60146e-08, 0.140731, 1.69161e-07) -bones/23/rotation = Quaternion(-1.48099e-08, -0.153514, -5.42637e-08, 0.988147) -bones/24/position = Vector3(-5.41769e-08, 0.140731, 9.8138e-08) -bones/24/rotation = Quaternion(0.52553, -0.153514, -0.276021, 0.789977) -bones/25/position = Vector3(1.8073e-08, 0.124275, 4.49017e-08) -bones/25/rotation = Quaternion(-4.36853e-07, 0.0212255, 1.16255e-07, 0.999775) -bones/26/position = Vector3(1.16654e-07, 0.124275, 2.52368e-07) -bones/26/rotation = Quaternion(-0.139349, 0.0209606, -0.253272, 0.957077) -bones/28/rotation = Quaternion(0.702583, -0.000939986, -0.00133528, 0.7116) -bones/29/rotation = Quaternion(0.74112, 0.00218249, 0.00265346, 0.671364) +bones/0/position = Vector3(1.38503e-14, 0.899509, -0.0481735) +bones/0/rotation = Quaternion(0.12582, 1.18262e-07, 1.49989e-08, 0.992053) +bones/1/rotation = Quaternion(-0.0566577, -0.00072973, -0.0117082, 0.998325) +bones/2/position = Vector3(3.20474e-09, 0.146689, -1.95578e-08) +bones/2/rotation = Quaternion(-0.000274032, -0.000390671, 0.0032142, 0.999995) +bones/3/position = Vector3(-2.01263e-09, 0.202058, -2.51457e-08) +bones/3/rotation = Quaternion(-0.0950616, -0.00036149, 0.00852097, 0.995435) +bones/4/position = Vector3(3.02934e-10, 0.0925562, 3.91155e-08) +bones/4/rotation = Quaternion(0.275817, 1.47187e-08, 9.30538e-08, 0.96121) +bones/5/rotation = Quaternion(-0.0948564, -2.80691e-14, -2.26155e-08, 0.995491) +bones/6/rotation = Quaternion(-0.157749, -1.17717e-07, -1.88051e-08, 0.987479) +bones/7/position = Vector3(-2.15034e-08, 0.899509, -0.0481735) +bones/7/rotation = Quaternion(-0.0863677, -0.751104, -0.383052, 0.530711) +bones/8/position = Vector3(-8.1052e-08, 0.899509, -0.0481735) +bones/8/rotation = Quaternion(-0.0863677, 0.751104, 0.383052, 0.530711) +bones/9/position = Vector3(0.131144, 0.965713, -0.0351291) +bones/9/rotation = Quaternion(0.993206, 0.0207804, -0.030992, 0.110223) +bones/10/position = Vector3(-2.36129e-08, 0.26601, -2.14789e-08) +bones/10/rotation = Quaternion(-3.13921e-08, -0.000695086, 1.20449e-08, 1) +bones/11/position = Vector3(-4.6306e-08, 0.26601, 2.42145e-08) +bones/11/rotation = Quaternion(0.417093, -0.000700249, 0.000321492, 0.908864) +bones/12/position = Vector3(3.05151e-08, 0.22603, 5.03768e-08) +bones/12/rotation = Quaternion(-8.19226e-09, -0.00710644, 4.16102e-08, 0.999975) +bones/13/position = Vector3(-2.95495e-08, 0.22603, 2.68392e-09) +bones/13/rotation = Quaternion(-0.750237, 0.0118807, 0.0243974, 0.660612) +bones/14/position = Vector3(-3.05481e-08, 0.139877, 1.64787e-08) +bones/14/rotation = Quaternion(-9.66743e-05, 0.967474, -0.252972, -0.000383447) +bones/15/position = Vector3(-0.131144, 0.965713, -0.0351291) +bones/15/rotation = Quaternion(0.973556, -0.00571441, 0.0273692, 0.226731) +bones/16/position = Vector3(-1.10042e-08, 0.265705, -3.31989e-08) +bones/16/rotation = Quaternion(-3.43227e-08, 0.00314323, 8.33075e-10, 0.999995) +bones/17/position = Vector3(1.83545e-08, 0.265705, 6.98543e-10) +bones/17/rotation = Quaternion(0.441277, 0.00327404, -0.0016101, 0.897364) +bones/18/position = Vector3(1.2807e-08, 0.225719, -8.28774e-09) +bones/18/rotation = Quaternion(-2.29017e-08, -0.00785732, 3.30149e-08, 0.999969) +bones/19/position = Vector3(-1.27748e-08, 0.225719, 1.12004e-08) +bones/19/rotation = Quaternion(-0.686886, -0.0281857, -0.000827966, 0.726218) +bones/20/position = Vector3(-1.30142e-08, 0.139877, -2.77457e-09) +bones/20/rotation = Quaternion(-9.96472e-05, 0.967461, -0.253021, -0.000383039) +bones/21/position = Vector3(0.0251286, 1.4296, 0.0433173) +bones/21/rotation = Quaternion(-0.488682, -0.259917, -0.403412, 0.728623) +bones/22/position = Vector3(0.189119, 1.46689, -0.0211361) +bones/22/rotation = Quaternion(0.0442702, -0.16055, 0.974711, -0.149002) +bones/23/position = Vector3(-5.41331e-09, 0.143946, -2.98023e-08) +bones/23/rotation = Quaternion(6.47502e-08, -0.0205074, 1.47866e-08, 0.99979) +bones/24/position = Vector3(-6.33301e-08, 0.143946, 4.3873e-08) +bones/24/rotation = Quaternion(0.309387, -0.0204933, -0.0190713, 0.950524) +bones/25/position = Vector3(1.30385e-08, 0.127601, 6.51926e-09) +bones/25/rotation = Quaternion(1.49943e-07, -1.20606e-07, 9.91859e-08, 1) +bones/26/position = Vector3(2.06034e-08, 0.127601, 2.42761e-08) +bones/26/rotation = Quaternion(-0.00824883, -0.00027077, -0.0328667, 0.999426) +bones/28/rotation = Quaternion(0.702583, -0.000939743, -0.00133552, 0.7116) +bones/29/rotation = Quaternion(0.741121, 0.00218291, 0.00265381, 0.671363) bones/30/rotation = Quaternion(0.32527, 0.890055, 0.295977, -0.119997) -bones/31/rotation = Quaternion(0.514882, -0.114149, 0.114483, 0.841879) -bones/32/rotation = Quaternion(0.592003, -0.038135, -0.0906995, 0.799907) -bones/34/position = Vector3(-0.00316934, 0.0987206, 0.0147916) -bones/34/rotation = Quaternion(-0.0674701, 0.718446, 0.0663974, 0.689112) -bones/35/rotation = Quaternion(0.580804, -0.000892605, -0.0014976, 0.814042) -bones/36/rotation = Quaternion(0.682777, 0.00174459, 0.00256601, 0.730621) -bones/37/rotation = Quaternion(-0.00426538, 0.736714, 0.0394789, 0.675038) -bones/38/position = Vector3(-0.00622947, 0.0926414, -0.0236346) -bones/38/rotation = Quaternion(-0.109874, 0.743351, 0.0333518, 0.658973) -bones/39/rotation = Quaternion(0.63004, 0.00151927, 0.00238002, 0.776557) -bones/40/rotation = Quaternion(0.652642, -0.00308157, -0.0042118, 0.757649) -bones/41/rotation = Quaternion(-0.0684189, 0.72411, 0.0332352, 0.685477) -bones/42/position = Vector3(-0.00715369, 0.0679858, -0.0481985) -bones/42/rotation = Quaternion(-0.120913, 0.799109, 0.0358923, 0.587807) -bones/43/rotation = Quaternion(0.498693, -0.020271, -0.0256949, 0.866161) -bones/44/rotation = Quaternion(0.715384, 0.0353053, 0.0573144, 0.695481) -bones/45/rotation = Quaternion(-0.129059, 0.728936, -0.0250262, 0.67184) -bones/46/position = Vector3(-0.00423753, 1.39393, 0.137642) -bones/46/rotation = Quaternion(-0.437715, 0.32082, 0.377528, 0.750302) -bones/47/position = Vector3(-0.166419, 1.45619, 0.090094) -bones/47/rotation = Quaternion(-0.165904, -0.456877, 0.803189, 0.344421) -bones/48/position = Vector3(-1.79147e-07, 0.142917, 7.63032e-08) -bones/48/rotation = Quaternion(-2.96833e-08, -0.0422389, 4.1837e-08, 0.999108) -bones/49/position = Vector3(1.0754e-07, 0.142917, 2.90456e-08) -bones/49/rotation = Quaternion(0.316857, -0.0422384, 0.415565, 0.851542) -bones/50/position = Vector3(5.42904e-08, 0.126555, 7.38829e-09) -bones/50/rotation = Quaternion(-1.10793e-07, 0.0256502, 2.23855e-08, 0.999671) -bones/51/position = Vector3(-9.53121e-09, 0.126556, 5.9332e-09) -bones/51/rotation = Quaternion(-0.0783404, 0.0259177, 0.201201, 0.976068) +bones/31/rotation = Quaternion(0.514882, -0.114149, 0.114482, 0.841879) +bones/32/rotation = Quaternion(0.592003, -0.0381348, -0.090699, 0.799907) +bones/34/position = Vector3(-0.00316938, 0.0987206, 0.0147918) +bones/34/rotation = Quaternion(-0.0674699, 0.718446, 0.0663966, 0.689112) +bones/35/rotation = Quaternion(0.580803, -0.000892135, -0.0014975, 0.814042) +bones/36/rotation = Quaternion(0.682777, 0.00174509, 0.00256596, 0.73062) +bones/37/rotation = Quaternion(-0.00426514, 0.736714, 0.0394785, 0.675038) +bones/38/position = Vector3(-0.00622951, 0.0926415, -0.0236344) +bones/38/rotation = Quaternion(-0.109873, 0.743351, 0.0333507, 0.658973) +bones/39/rotation = Quaternion(0.630039, 0.00151959, 0.00237944, 0.776559) +bones/40/rotation = Quaternion(0.652643, -0.00308142, -0.00421108, 0.757648) +bones/41/rotation = Quaternion(-0.0684174, 0.72411, 0.0332337, 0.685478) +bones/42/position = Vector3(-0.00715362, 0.0679857, -0.0481983) +bones/42/rotation = Quaternion(-0.120913, 0.799109, 0.0358921, 0.587807) +bones/43/rotation = Quaternion(0.498693, -0.0202705, -0.0256953, 0.866161) +bones/44/rotation = Quaternion(0.715385, 0.035306, 0.0573145, 0.695481) +bones/45/rotation = Quaternion(-0.129059, 0.728936, -0.0250259, 0.67184) +bones/46/position = Vector3(-0.0113635, 1.4296, 0.0433173) +bones/46/rotation = Quaternion(-0.503894, 0.228676, 0.382182, 0.740091) +bones/47/position = Vector3(-0.169264, 1.4674, -0.0346418) +bones/47/rotation = Quaternion(-0.0634737, -0.138872, 0.974047, 0.167086) +bones/48/position = Vector3(1.88476e-07, 0.143946, 1.02445e-08) +bones/48/rotation = Quaternion(7.3233e-08, 0.0215803, 7.23502e-08, 0.999767) +bones/49/position = Vector3(6.5191e-09, 0.143946, -1.95094e-08) +bones/49/rotation = Quaternion(0.343809, 0.0215807, 0.028999, 0.938344) +bones/50/position = Vector3(-1.48779e-07, 0.1276, 5.9139e-08) +bones/50/rotation = Quaternion(-8.73115e-08, 2.7474e-08, -1.28057e-07, 1) +bones/51/position = Vector3(1.9461e-07, 0.127601, 6.06248e-08) +bones/51/rotation = Quaternion(-0.00824876, 0.000270832, 0.032867, 0.999426) bones/52/rotation = Quaternion(-0.2563, 0.855859, 0.0299184, -0.448241) -bones/53/rotation = Quaternion(0.694912, 0.107144, -0.103548, 0.703488) -bones/54/rotation = Quaternion(0.741121, -0.00218248, -0.00265434, 0.671363) -bones/55/rotation = Quaternion(-0.32527, 0.890055, 0.295976, 0.119998) -bones/56/rotation = Quaternion(0.514882, 0.11415, -0.114482, 0.841879) -bones/57/rotation = Quaternion(0.592004, 0.038134, 0.0906991, 0.799907) -bones/59/position = Vector3(0.00316948, 0.0987208, 0.0147918) +bones/53/rotation = Quaternion(0.694912, 0.107145, -0.103549, 0.703488) +bones/54/rotation = Quaternion(0.74112, -0.00218237, -0.00265409, 0.671363) +bones/55/rotation = Quaternion(-0.325269, 0.890055, 0.295977, 0.119998) +bones/56/rotation = Quaternion(0.514882, 0.11415, -0.114483, 0.841879) +bones/57/rotation = Quaternion(0.592004, 0.0381346, 0.0906992, 0.799907) +bones/59/position = Vector3(0.00316943, 0.0987207, 0.0147917) bones/59/rotation = Quaternion(0.138771, -0.704916, 0.15571, 0.677932) -bones/60/rotation = Quaternion(0.579985, 0.0462612, -0.0308753, 0.812727) -bones/61/rotation = Quaternion(0.682777, -0.00174739, -0.00256467, 0.730621) -bones/62/rotation = Quaternion(-0.0042654, -0.736714, -0.0394787, 0.675038) -bones/63/position = Vector3(0.00622964, 0.0926415, -0.0236343) -bones/63/rotation = Quaternion(0.104096, -0.719607, 0.186262, 0.660785) -bones/64/rotation = Quaternion(0.670693, 0.0163393, -0.0185665, 0.741323) -bones/65/rotation = Quaternion(0.692499, 0.00330374, 0.0040394, 0.7214) -bones/66/rotation = Quaternion(-0.0684177, -0.72411, -0.033234, 0.685477) -bones/67/position = Vector3(0.00715371, 0.0679857, -0.0481984) +bones/60/rotation = Quaternion(0.579984, 0.0462615, -0.0308755, 0.812727) +bones/61/rotation = Quaternion(0.682777, -0.00174718, -0.00256448, 0.73062) +bones/62/rotation = Quaternion(-0.00426532, -0.736714, -0.0394788, 0.675038) +bones/63/position = Vector3(0.00622955, 0.0926417, -0.0236344) +bones/63/rotation = Quaternion(0.104095, -0.719607, 0.186262, 0.660784) +bones/64/rotation = Quaternion(0.670693, 0.0163391, -0.0185663, 0.741323) +bones/65/rotation = Quaternion(0.692499, 0.00330364, 0.00403917, 0.7214) +bones/66/rotation = Quaternion(-0.0684178, -0.72411, -0.0332339, 0.685477) +bones/67/position = Vector3(0.00715371, 0.0679859, -0.0481984) bones/67/rotation = Quaternion(0.108364, -0.768224, 0.166291, 0.608635) -bones/68/rotation = Quaternion(0.629954, 0.0295146, 0.0177509, 0.775868) -bones/69/rotation = Quaternion(0.816677, -0.0439534, -0.0509862, 0.573155) -bones/70/rotation = Quaternion(-0.12906, -0.728936, 0.0250259, 0.67184) -bones/71/position = Vector3(0.118584, 1.30715, 0.0484368) -bones/71/rotation = Quaternion(0.0614123, 0.53913, 0.83878, 0.0449082) -bones/72/position = Vector3(-0.119248, 1.34121, 0.0615744) -bones/72/rotation = Quaternion(0.0614123, 0.53913, 0.83878, 0.0449082) +bones/68/rotation = Quaternion(0.629954, 0.0295149, 0.0177509, 0.775869) +bones/69/rotation = Quaternion(0.816678, -0.0439534, -0.0509861, 0.573155) +bones/70/rotation = Quaternion(-0.12906, -0.728937, 0.0250258, 0.67184) +bones/71/position = Vector3(0.127191, 1.34853, -0.0259919) +bones/71/rotation = Quaternion(1.95051e-08, 0.61018, 0.792263, -4.63113e-08) +bones/72/position = Vector3(-0.113426, 1.34853, -0.0259919) +bones/72/rotation = Quaternion(1.95052e-08, 0.61018, 0.792263, -4.63112e-08) [node name="Knight_01" parent="CharacterRig/GameRig/Skeleton3D" index="0"] visible = false @@ -196,7 +208,7 @@ anim_player = NodePath("../CharacterRig/AnimationPlayer") parameters/MoveSpace/blend_position = -5.743 [node name="RightHandBone" type="BoneAttachment3D" parent="."] -transform = Transform3D(-0.771571, 0.518161, -0.369035, -0.386879, -0.842715, -0.374375, -0.504978, -0.146085, 0.85068, -0.253479, 1.11055, -0.200387) +transform = Transform3D(-0.962343, -0.270803, -0.0237137, 0.237444, -0.879849, 0.411686, -0.13235, 0.390553, 0.911017, -0.343081, 0.988376, -0.0175742) bone_name = "DEF-hand.R" bone_idx = 51 use_external_skeleton = true @@ -208,7 +220,7 @@ transform = Transform3D(0.16656, 0.0770401, -0.983017, -0.982939, 0.0918653, -0. [node name="longsword" parent="RightHandBone/WeaponSlot" instance=ExtResource("3_dka8l")] [node name="LeftHandBone" type="BoneAttachment3D" parent="."] -transform = Transform3D(-0.513018, -0.843256, 0.16041, 0.0314673, 0.168275, 0.985238, -0.857801, 0.510492, -0.0597935, 0.114817, 1.2992, 0.475246) +transform = Transform3D(-0.970518, 0.239091, 0.0304979, -0.219262, -0.928324, 0.300233, 0.100095, 0.284694, 0.953378, 0.345925, 0.975197, -0.040213) bone_name = "DEF-hand.L" bone_idx = 26 use_external_skeleton = true diff --git a/src/scripts/characters/dash.gd b/src/scripts/characters/dash.gd index 028c2b7..2aef566 100644 --- a/src/scripts/characters/dash.gd +++ b/src/scripts/characters/dash.gd @@ -5,6 +5,17 @@ extends Node3D @onready var timer: Timer = $Timer var direction: Vector3 = Vector3.ZERO +var dash_duration: float = 0.1 +var time_remaining: float = 0.0 + +func _physics_process(delta: float) -> void: + if direction.is_zero_approx(): + return + + player.velocity = direction * player.SPEED * 5.0 + time_remaining -= delta + if time_remaining <= 0: + direction = Vector3.ZERO func _unhandled_input(event: InputEvent) -> void: if not timer.is_stopped(): @@ -13,6 +24,7 @@ func _unhandled_input(event: InputEvent) -> void: if event.is_action_pressed("dash"): direction = player.get_movement_direction() if not direction.is_zero_approx(): - print("We can dash!") + player.rig.playback.travel("Dash") timer.start(1.0) + time_remaining = dash_duration