teatov/batrix
1
0
Fork 0
Code Issues Pull Requests Actions Releases 1 Activity

rename player-related classes

Browse Source
This commit is contained in:
Teatov
2025-08-14 14:38:05 +10:00
parent 77658021ec
commit 568104edf6
13 changed files with 133 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

241
scenes/player.tscn
View File

@@ -2,7 +2,6 @@
[ext_resource type="Script" uid="uid://bvvmaqn1fp6nq" path="res://scripts/gameplay/player/player.gd" id="1_xt3i8"]
[ext_resource type="Material" uid="uid://cc18ee0wbfoud" path="res://resources/materials/debug/debug_player.tres" id="2_0p422"]
[ext_resource type="Script" uid="uid://dmu2tkt0wo7d1" path="res://scripts/gameplay/player/player_attack.gd" id="3_8pbtx"]
[ext_resource type="PackedScene" uid="uid://c7odkr2qcnn74" path="res://assets/models/characters/batrix/batrix.gltf" id="3_f1ej7"]
[ext_resource type="Script" uid="uid://dqxvdi3i2ejs" path="res://scripts/gameplay/player/player_animator.gd" id="4_adlgp"]
[ext_resource type="Material" uid="uid://bdi02rpvdukem" path="res://resources/materials/debug/debug_attack.tres" id="4_ll2ct"]
@@ -25,6 +24,7 @@
[ext_resource type="AudioStream" uid="uid://chbx68a8mxve0" path="res://assets/sfx/player/player_hit_swoosh.wav" id="17_ke2ow"]
[ext_resource type="AudioStream" uid="uid://bef4e6hhaait3" path="res://assets/sfx/player/swing/player_swing_1.wav" id="18_31cv2"]
[ext_resource type="AudioStream" uid="uid://dt5i30dkgawb5" path="res://assets/sfx/player/swing/player_swing_2.wav" id="19_pf23h"]
[ext_resource type="Script" path="res://scripts/gameplay/player/player_attacker.gd" id="20_31cv2"]
[ext_resource type="Script" uid="uid://bxsmma3kjo381" path="res://scripts/gameplay/player/player_attack_effect.gd" id="24_31cv2"]
[ext_resource type="AudioStream" uid="uid://dgm4ccrcahaci" path="res://resources/footsteps/footsteps_baja.tres" id="27_31cv2"]
@@ -140,40 +140,40 @@ collision_layer = 16
script = ExtResource("1_xt3i8")
cursor_color = Color(0.964706, 0.870588, 0.917647, 1)
_collision_debug_material = ExtResource("2_0p422")
attack = NodePath("Attack")
attack = NodePath("Attacker")
[node name="Model" parent="." instance=ExtResource("3_f1ej7")]
[node name="Skeleton3D" parent="Model/Armature" index="0"]
bones/0/position = Vector3(-0.524439, 1.02264, -0.0364679)
bones/0/rotation = Quaternion(0.687846, -0.096709, -0.714909, -0.0801328)
bones/0/position = Vector3(-0.509322, 0.994931, -0.0478182)
bones/0/rotation = Quaternion(0.709228, -0.0727934, -0.698967, -0.056058)
bones/0/scale = Vector3(1, 1, 1)
bones/1/position = Vector3(-9.75365e-05, 0.0319142, -0.124525)
bones/1/rotation = Quaternion(-0.000141591, 0.789452, 0.613812, 0.000224233)
bones/2/rotation = Quaternion(6.24507e-10, 4.41808e-08, -6.03351e-10, 1)
bones/2/scale = Vector3(1, 1, 1)
bones/3/rotation = Quaternion(1.74623e-10, -2.60798e-10, -1.30968e-10, 1)
bones/4/position = Vector3(0.0508686, 0.933964, -0.0321962)
bones/4/rotation = Quaternion(0.207125, -0.0487409, 0.0797672, 0.973838)
bones/4/position = Vector3(0.0410619, 0.92757, -0.0356457)
bones/4/rotation = Quaternion(0.223396, -0.0946728, 0.0350542, 0.969486)
bones/5/position = Vector3(6.05363e-09, 0.111695, -8.19564e-08)
bones/5/rotation = Quaternion(0.0749254, -0.218292, 0.0864878, 0.969152)
bones/6/rotation = Quaternion(-0.419042, -0.138382, 0.0264841, 0.896969)
bones/7/rotation = Quaternion(0.350668, 0.0735306, -0.292144, 0.886723)
bones/8/rotation = Quaternion(-0.223759, 0.353186, 0.0976295, 0.903139)
bones/5/rotation = Quaternion(0.0735332, -0.199554, 0.125582, 0.96902)
bones/6/rotation = Quaternion(-0.419307, -0.128549, 0.021893, 0.898431)
bones/7/rotation = Quaternion(0.350038, 0.103815, -0.281842, 0.887277)
bones/8/rotation = Quaternion(-0.205147, 0.350995, 0.0975189, 0.908409)
bones/9/rotation = Quaternion(1.13474e-07, 0.707107, 0.707107, -5.23149e-08)
bones/10/scale = Vector3(1, 1, 1)
bones/11/position = Vector3(-0.0103687, -7.57917e-08, -0.00777752)
bones/11/scale = Vector3(1.22112, 1, 0.908669)
bones/11/position = Vector3(-0.0110016, -3.04479e-08, -0.00873453)
bones/11/scale = Vector3(1.2664, 1, 0.772095)
bones/12/position = Vector3(-0.00823868, 6.83734e-08, -0.0102097)
bones/13/position = Vector3(-0.0229232, -3.61523e-08, 0.000896164)
bones/13/scale = Vector3(1.22112, 0.999999, 0.908669)
bones/14/position = Vector3(-0.0385402, -5.25668e-08, -0.00573277)
bones/14/scale = Vector3(1.22112, 1, 0.908669)
bones/13/position = Vector3(-0.023624, -1.3441e-09, -0.000726155)
bones/13/scale = Vector3(1.2664, 1, 0.772095)
bones/14/position = Vector3(-0.0398201, 2.06584e-08, -0.00621833)
bones/14/scale = Vector3(1.2664, 1, 0.772096)
bones/15/position = Vector3(-0.0186913, 1.4579e-07, -0.0116523)
bones/16/position = Vector3(0.0176241, -1.16501e-07, 0.00955573)
bones/16/scale = Vector3(1.22112, 0.999999, 0.908669)
bones/17/position = Vector3(0.0340841, -1.10891e-07, 0.0021126)
bones/17/scale = Vector3(1.22112, 0.999999, 0.908669)
bones/16/position = Vector3(0.0184269, 1.72027e-07, 0.00634607)
bones/16/scale = Vector3(1.2664, 1, 0.772096)
bones/17/position = Vector3(0.0354973, 7.84004e-08, 0.000267413)
bones/17/scale = Vector3(1.2664, 1, 0.772096)
bones/18/position = Vector3(0.0138112, -1.99382e-07, -0.0106829)
bones/19/position = Vector3(-0.029965, -6.74833e-08, -0.0114938)
bones/20/position = Vector3(0.0319374, 2.70462e-10, -0.00811319)
@@ -183,19 +183,19 @@ bones/22/position = Vector3(-0.00351833, -2.67936e-08, 0.0010112)
bones/25/position = Vector3(-0.0442962, 0.0756351, 0.094034)
bones/25/rotation = Quaternion(-0.161417, 0.667625, 0.688436, 0.232975)
bones/26/position = Vector3(0.00351835, 2.9417e-08, 0.00101115)
bones/29/rotation = Quaternion(0.0376932, -0.560579, 0.825928, 0.0466204)
bones/30/rotation = Quaternion(-0.0881641, -0.00666916, -0.0743099, 0.993308)
bones/29/rotation = Quaternion(0.0358131, -0.592919, 0.803027, 0.0480797)
bones/30/rotation = Quaternion(-0.05837, -0.00548176, -0.0421818, 0.997388)
bones/31/rotation = Quaternion(0.00282337, 0.992799, -0.117349, -0.0238866)
bones/32/rotation = Quaternion(0.570454, -6.05212e-08, -1.29001e-06, 0.82133)
bones/32/rotation = Quaternion(0.559291, -4.29134e-08, -1.29076e-06, 0.828972)
bones/33/rotation = Quaternion(-0.0342351, -3.5846e-07, 8.54711e-08, 0.999414)
bones/35/rotation = Quaternion(0.324311, -0.116094, 0.338559, 0.875627)
bones/36/rotation = Quaternion(-0.720179, 2.66182e-07, 5.25906e-07, 0.693789)
bones/37/rotation = Quaternion(-0.0205028, -0.10076, 0.231045, 0.967494)
bones/38/rotation = Quaternion(-0.641319, 2.67015e-07, 1.00452e-06, 0.767275)
bones/35/rotation = Quaternion(0.303073, -0.108151, 0.308508, 0.895138)
bones/36/rotation = Quaternion(-0.649846, 3.16898e-07, 4.62288e-07, 0.760066)
bones/37/rotation = Quaternion(-0.0486405, -0.104208, 0.204466, 0.972095)
bones/38/rotation = Quaternion(-0.645978, 2.48e-07, 1.00563e-06, 0.763356)
bones/39/rotation = Quaternion(0.197471, 0.678974, 0.678974, -0.19747)
bones/39/scale = Vector3(1.08921, 1, 0.93757)
bones/39/scale = Vector3(1.11231, 1, 0.867862)
bones/41/position = Vector3(0.0170023, 0.00022532, -0.00384271)
bones/41/rotation = Quaternion(2.91755e-08, 0.0070825, -1.17823e-07, 0.999975)
bones/41/rotation = Quaternion(-2.2793e-08, 0.00598484, -1.22011e-07, 0.999982)
bones/41/scale = Vector3(0.999981, 1, 0.538573)
bones/42/position = Vector3(0.0392888, -1.17533e-06, -0.00209796)
bones/43/position = Vector3(-0.0495715, -2.58908e-06, 0.0301691)
@@ -203,9 +203,9 @@ bones/44/position = Vector3(-0.00910762, -1.30386e-08, 0.00452032)
bones/45/position = Vector3(-0.013421, 6.33299e-08, -0.0283991)
bones/46/position = Vector3(-0.0513805, 8.90344e-07, -0.0104124)
bones/47/position = Vector3(0.0446487, -1.27684e-06, -0.0177286)
bones/48/scale = Vector3(1.08921, 1, 0.93757)
bones/48/scale = Vector3(1.11231, 1, 0.867862)
bones/50/position = Vector3(-0.0139197, 0.000225418, -0.00485518)
bones/50/rotation = Quaternion(4.90528e-10, 0.00862028, 1.22952e-07, 0.999963)
bones/50/rotation = Quaternion(-3.14144e-08, 0.00728461, 7.8241e-08, 0.999973)
bones/50/scale = Vector3(0.999977, 1, 0.397035)
bones/51/position = Vector3(-0.0392888, -1.22121e-06, -0.00333335)
bones/52/position = Vector3(0.0495715, -2.68185e-06, 0.0147188)
@@ -213,16 +213,16 @@ bones/53/position = Vector3(0.00910765, -7.47593e-08, 0.000409614)
bones/54/position = Vector3(0.0134209, 4.70912e-08, -0.0184937)
bones/55/position = Vector3(0.0513805, 9.29226e-07, -0.0104125)
bones/56/position = Vector3(-0.0446488, -1.30966e-06, -0.0177287)
bones/57/rotation = Quaternion(0.276079, -0.0541187, -0.699893, 0.656507)
bones/58/rotation = Quaternion(0.682561, 0.13926, -0.205909, 0.687255)
bones/57/rotation = Quaternion(0.273654, -0.0435965, -0.711669, 0.645554)
bones/58/rotation = Quaternion(0.658261, 0.173487, -0.20396, 0.703559)
bones/58/scale = Vector3(1, 1, 1)
bones/59/position = Vector3(6.76707e-08, 0.319964, 1.83989e-09)
bones/59/rotation = Quaternion(0.394849, -0.37666, -0.148602, 0.824705)
bones/59/position = Vector3(5.40815e-09, 0.307144, -9.06498e-09)
bones/59/rotation = Quaternion(0.395933, -0.398605, -0.162316, 0.811175)
bones/59/scale = Vector3(1, 1, 1)
bones/60/rotation = Quaternion(0.00108044, -0.157389, 0.00017222, 0.987536)
bones/60/rotation = Quaternion(0.00108256, -0.144928, 0.000158582, 0.989442)
bones/60/scale = Vector3(1, 1, 1)
bones/61/position = Vector3(7.26394e-08, 0.0427884, -9.37813e-05)
bones/61/rotation = Quaternion(-0.254767, -0.213829, 0.127782, 0.934368)
bones/61/position = Vector3(-2.59791e-08, 0.046591, -0.000102098)
bones/61/rotation = Quaternion(-0.276157, -0.198124, 0.116921, 0.933174)
bones/61/scale = Vector3(1, 1, 1)
bones/62/rotation = Quaternion(0.493569, 0.84346, 0.0982726, -0.187901)
bones/63/rotation = Quaternion(0.52804, -0.147693, -0.0941254, 0.830964)
@@ -267,27 +267,27 @@ bones/93/rotation = Quaternion(-0.494209, 0.0204614, -0.0359497, 0.868359)
bones/93/scale = Vector3(1, 1.13164, 1)
bones/94/rotation = Quaternion(-0.547852, 0.057849, -0.0581314, 0.832546)
bones/94/scale = Vector3(1, 1.05697, 1)
bones/95/position = Vector3(6.28092e-08, 0.0427884, -9.39121e-05)
bones/95/rotation = Quaternion(-0.788472, -0.122721, -0.0313393, 0.601889)
bones/95/position = Vector3(-1.22626e-08, 0.0465911, -0.000102191)
bones/95/rotation = Quaternion(-0.795959, -0.113211, -0.0295759, 0.593934)
bones/95/scale = Vector3(1, 1, 1)
bones/96/position = Vector3(2.35029e-08, 0.319964, 2.06714e-09)
bones/96/rotation = Quaternion(-0.528711, -0.0842862, -0.194447, 0.821919)
bones/96/scale = Vector3(1, 1.13433, 1)
bones/96/position = Vector3(-4.57976e-08, 0.307144, 5.04497e-09)
bones/96/rotation = Quaternion(-0.52525, -0.08765, -0.208418, 0.820361)
bones/96/scale = Vector3(1, 1.15055, 1)
bones/97/position = Vector3(-0.00645471, 0.000163305, -0.00321278)
bones/97/rotation = Quaternion(0.248427, 0.0258538, -0.267814, 0.930533)
bones/98/position = Vector3(-5.76256e-09, 0.0159596, 0.000181361)
bones/98/rotation = Quaternion(-0.0586372, -0.00568235, -0.12181, 0.990804)
bones/99/rotation = Quaternion(-0.385839, 0.104819, -0.0157293, 0.916457)
bones/99/rotation = Quaternion(-0.399689, 0.116779, -0.0017598, 0.90918)
bones/99/scale = Vector3(1, 1, 1)
bones/100/rotation = Quaternion(0.0481859, -0.0287408, 0.490282, 0.869756)
bones/101/rotation = Quaternion(-0.00208133, 0.506936, 0.639016, 0.578507)
bones/100/rotation = Quaternion(0.0474244, -0.0299806, 0.512671, 0.85675)
bones/101/rotation = Quaternion(0.00919888, 0.49081, 0.646158, 0.584381)
bones/102/position = Vector3(6.2732e-09, 0.281682, 9.00968e-08)
bones/102/rotation = Quaternion(0.0490929, 5.00416e-05, 5.0113e-05, 0.998794)
bones/102/rotation = Quaternion(0.0266923, 4.91408e-05, 5.12579e-05, 0.999644)
bones/102/scale = Vector3(1, 1, 1)
bones/103/rotation = Quaternion(0.00109418, 0.000723166, -1.06405e-06, 0.999999)
bones/103/rotation = Quaternion(0.00109832, 0.00601476, -2.36188e-05, 0.999981)
bones/103/scale = Vector3(0.999997, 0.999997, 1)
bones/104/position = Vector3(-1.97803e-07, 0.068466, -0.000150014)
bones/104/rotation = Quaternion(-0.436657, 0.00137482, -0.00118515, 0.899626)
bones/104/rotation = Quaternion(-0.440103, 0.0120994, -0.0111051, 0.897797)
bones/104/scale = Vector3(1, 1, 1)
bones/105/rotation = Quaternion(-0.272954, 0.938438, 0.146391, -0.152973)
bones/106/rotation = Quaternion(0.58496, 0.153924, 0.0835466, 0.791928)
@@ -333,96 +333,96 @@ bones/136/scale = Vector3(1, 1.25698, 1)
bones/137/rotation = Quaternion(-0.479239, -0.0566498, 0.0570499, 0.873994)
bones/137/scale = Vector3(1, 1.15486, 1)
bones/138/position = Vector3(-1.96072e-07, 0.068466, -0.000149977)
bones/138/rotation = Quaternion(-0.848847, 0.000928811, 7.20994e-05, 0.528638)
bones/138/rotation = Quaternion(-0.849839, 0.00842519, 0.000387153, 0.526974)
bones/138/scale = Vector3(1, 1, 1)
bones/139/position = Vector3(3.48513e-09, 0.281682, 1.40144e-07)
bones/139/rotation = Quaternion(-0.689087, 1.83005e-06, 6.09371e-05, 0.724678)
bones/139/rotation = Quaternion(-0.697167, 1.14246e-06, 6.09538e-05, 0.716909)
bones/139/scale = Vector3(1, 1, 1)
bones/140/position = Vector3(-0.00091601, -0.00419344, -0.00166352)
bones/140/rotation = Quaternion(0.180101, -0.00275761, 0.0409847, 0.98279)
bones/140/scale = Vector3(1.12362, 1, 1)
bones/141/position = Vector3(2.32831e-10, 0.0159594, 0.000181319)
bones/141/rotation = Quaternion(-0.0876969, -0.00686066, -0.0793036, 0.992962)
bones/142/rotation = Quaternion(-0.631175, -0.0224744, 0.448558, 0.632384)
bones/142/rotation = Quaternion(-0.627963, -0.0317508, 0.444244, 0.638202)
bones/142/scale = Vector3(1, 1, 0.999999)
bones/143/position = Vector3(-0.00764884, 0.109973, 0.0700746)
bones/144/position = Vector3(0.0178655, 0.0526278, 0.100587)
bones/145/position = Vector3(0.0210242, -0.0147893, 0.099826)
bones/146/position = Vector3(-0.0215664, 0.0451318, -0.131066)
bones/147/position = Vector3(0.113703, 0.0315843, -0.0578424)
bones/147/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/148/position = Vector3(0.105268, 0.0909962, -0.050102)
bones/148/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/149/position = Vector3(0.0874399, 0.0739181, 0.0189367)
bones/149/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/150/position = Vector3(0.106422, 0.00266495, 0.00320829)
bones/150/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/151/position = Vector3(0.0562395, 0.0598586, 0.0646342)
bones/152/position = Vector3(0.0731033, -0.00997822, 0.0527525)
bones/153/position = Vector3(0.0382476, 0.112878, 0.0538631)
bones/153/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/154/position = Vector3(0.056066, 0.133482, 0.0432069)
bones/154/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/155/position = Vector3(0.0729227, 0.156904, 0.0137346)
bones/155/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/156/position = Vector3(0.0836328, 0.158995, -0.011929)
bones/156/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/157/position = Vector3(0.101089, 0.123116, -0.0425435)
bones/157/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/158/position = Vector3(0.0538709, 0.129498, -0.0710923)
bones/158/rotation = Quaternion(0.122201, -0.24275, 0.0116683, 0.962291)
bones/159/position = Vector3(-0.114849, 0.0663873, -0.0509387)
bones/159/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/160/position = Vector3(-0.107093, 0.120103, -0.0514104)
bones/160/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/161/position = Vector3(-0.102978, 0.126402, 0.0405153)
bones/161/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/162/position = Vector3(-0.125112, 0.0591295, 0.0369137)
bones/162/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/163/position = Vector3(-0.0484435, 0.0767409, 0.0930067)
bones/164/position = Vector3(-0.0692514, 0.00983942, 0.090501)
bones/165/position = Vector3(-0.0464268, 0.143048, 0.05757)
bones/165/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/166/position = Vector3(-0.0634142, 0.182659, 0.0205226)
bones/166/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/167/position = Vector3(-0.0564913, 0.197304, -0.0179697)
bones/167/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/168/position = Vector3(-0.0579478, 0.193984, -0.0456202)
bones/168/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/169/position = Vector3(-0.089663, 0.164595, -0.0638262)
bones/169/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/170/position = Vector3(-0.0564422, 0.148014, -0.0744984)
bones/170/rotation = Quaternion(0.0315606, 0.0252782, -0.315803, 0.947963)
bones/171/rotation = Quaternion(0.88392, -0.0553142, -0.226291, 0.405486)
bones/143/position = Vector3(-0.00977684, 0.110009, 0.0700904)
bones/144/position = Vector3(0.0101174, 0.0525767, 0.104673)
bones/145/position = Vector3(0.00678728, -0.0164962, 0.105971)
bones/146/position = Vector3(-0.00780965, 0.0439172, -0.136987)
bones/147/position = Vector3(0.119088, 0.0274, -0.0567642)
bones/147/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/148/position = Vector3(0.108078, 0.0874024, -0.0470377)
bones/148/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/149/position = Vector3(0.08159, 0.0713088, 0.0240798)
bones/149/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/150/position = Vector3(0.102804, -0.00488756, 0.0119127)
bones/150/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/151/position = Vector3(0.0505875, 0.0595045, 0.0702025)
bones/152/position = Vector3(0.0655902, -0.0127084, 0.0607059)
bones/153/position = Vector3(0.0363261, 0.110584, 0.0532361)
bones/153/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/154/position = Vector3(0.0575689, 0.131111, 0.0422142)
bones/154/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/155/position = Vector3(0.0743553, 0.154664, 0.0128061)
bones/155/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/156/position = Vector3(0.0845406, 0.156977, -0.0130514)
bones/156/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/157/position = Vector3(0.101361, 0.12102, -0.0430962)
bones/157/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/158/position = Vector3(0.0563635, 0.128918, -0.0695375)
bones/158/rotation = Quaternion(0.128323, -0.233519, -0.00414657, 0.963839)
bones/159/position = Vector3(-0.111627, 0.0615783, -0.0653986)
bones/159/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/160/position = Vector3(-0.102933, 0.113319, -0.0592115)
bones/160/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/161/position = Vector3(-0.106708, 0.122461, 0.0361705)
bones/161/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/162/position = Vector3(-0.129211, 0.0573469, 0.0261901)
bones/162/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/163/position = Vector3(-0.0525523, 0.0764716, 0.0970148)
bones/164/position = Vector3(-0.0807715, 0.00876589, 0.0907723)
bones/165/position = Vector3(-0.0495015, 0.142372, 0.0563151)
bones/165/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/166/position = Vector3(-0.0661212, 0.180157, 0.0201212)
bones/166/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/167/position = Vector3(-0.0596306, 0.195154, -0.0182209)
bones/167/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/168/position = Vector3(-0.0607534, 0.191763, -0.0458784)
bones/168/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/169/position = Vector3(-0.0908062, 0.160779, -0.0642596)
bones/169/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/170/position = Vector3(-0.0567139, 0.145932, -0.074734)
bones/170/rotation = Quaternion(0.0317483, 0.0233073, -0.291181, 0.955857)
bones/171/rotation = Quaternion(0.854971, 0.00733622, -0.260115, 0.448677)
bones/171/scale = Vector3(0.999998, 0.999997, 1.00001)
bones/172/position = Vector3(3.62338e-10, 0.531431, 3.56619e-08)
bones/172/rotation = Quaternion(0.200098, 6.02713e-08, 3.36634e-08, 0.979776)
bones/172/rotation = Quaternion(0.258803, -2.06746e-06, -4.1853e-07, 0.96593)
bones/172/scale = Vector3(1, 0.999998, 1.00001)
bones/173/position = Vector3(6.48577e-09, 0.418112, 8.79831e-08)
bones/173/rotation = Quaternion(-0.347174, -0.00263275, 0.00592214, 0.937778)
bones/173/rotation = Quaternion(-0.376693, -0.00422509, 0.0103832, 0.926271)
bones/173/scale = Vector3(1, 0.999992, 0.999996)
bones/174/rotation = Quaternion(-0.388439, -1.7287e-07, -1.04265e-07, 0.921475)
bones/175/position = Vector3(1.16517e-08, 0.418112, 8.45817e-08)
bones/175/rotation = Quaternion(-0.727948, -0.00165749, 0.00155503, 0.685628)
bones/175/rotation = Quaternion(-0.735503, -0.00277704, 0.00277694, 0.67751)
bones/175/scale = Vector3(1, 1, 1)
bones/176/position = Vector3(1.15382e-08, 0.531431, 3.0748e-08)
bones/176/rotation = Quaternion(-0.66914, -1.15438e-08, -1.84286e-07, 0.743137)
bones/176/scale = Vector3(1, 1.00433, 1)
bones/177/rotation = Quaternion(0.931697, -0.189264, 0.148462, 0.272174)
bones/176/rotation = Quaternion(-0.646424, -5.9335e-07, -1.08843e-06, 0.762979)
bones/176/scale = Vector3(1, 1.01069, 1)
bones/177/rotation = Quaternion(0.942402, -0.134367, 0.108775, 0.286342)
bones/177/scale = Vector3(1, 0.999998, 1.00001)
bones/178/position = Vector3(2.73163e-08, 0.531431, 1.20327e-09)
bones/178/rotation = Quaternion(0.330004, 7.43471e-07, 6.51879e-08, 0.94398)
bones/178/rotation = Quaternion(0.329132, 1.76459e-06, 3.5229e-07, 0.944284)
bones/178/scale = Vector3(1, 0.999999, 1.00001)
bones/179/position = Vector3(8.4155e-09, 0.418112, 3.97981e-07)
bones/179/rotation = Quaternion(-0.398044, -0.00465099, -0.142501, 0.906219)
bones/179/rotation = Quaternion(-0.431379, -0.000697695, -0.137163, 0.891683)
bones/179/scale = Vector3(1, 0.99999, 0.999998)
bones/180/rotation = Quaternion(-0.586566, 1.53844e-07, 1.64695e-07, 0.809901)
bones/180/rotation = Quaternion(-0.556989, 1.6083e-07, 1.64943e-07, 0.83052)
bones/181/position = Vector3(2.69973e-08, 0.418112, 4.26027e-07)
bones/181/rotation = Quaternion(-0.741143, 0.0179313, -0.0467407, 0.669478)
bones/181/rotation = Quaternion(-0.749706, 0.0184746, -0.0444561, 0.660017)
bones/181/scale = Vector3(1, 1, 1)
bones/182/position = Vector3(1.89344e-08, 0.531431, -1.32203e-08)
bones/182/rotation = Quaternion(-0.617551, 2.79398e-07, 5.06008e-07, 0.786531)
bones/182/scale = Vector3(1, 1.02465, 1)
bones/182/rotation = Quaternion(-0.617914, 5.15812e-07, 1.002e-06, 0.786246)
bones/182/scale = Vector3(1, 1.02443, 1)
[node name="BoneFlipper" type="SkeletonModifier3D" parent="Model/Armature/Skeleton3D" index="0"]
_import_path = NodePath("")
@@ -504,7 +504,7 @@ parameters/run->idle_oneshot/internal_active = false
parameters/run->idle_oneshot/request = 0
script = ExtResource("4_adlgp")
_player = NodePath("..")
_attack = NodePath("../Attack")
_attack = NodePath("../Attacker")
_bone_flipper = NodePath("../Model/Armature/Skeleton3D/BoneFlipper")
_sfx_audio_player = NodePath("../Audio/SFXPlayer")
_hurt_particles = NodePath("../Effects/HurtParticles")
@@ -518,19 +518,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
shape = SubResource("CapsuleShape3D_n6vi2")
debug_color = Color(0, 0.6, 0.7, 0.42)
[node name="Attack" type="Area3D" parent="." node_paths=PackedStringArray("_attack_shape_node")]
[node name="Attacker" type="Area3D" parent="." node_paths=PackedStringArray("_attack_shape_node")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
collision_layer = 32
collision_mask = 32
script = ExtResource("3_8pbtx")
script = ExtResource("20_31cv2")
_attack_shape_node = NodePath("AttackShape")
_collision_debug_material = ExtResource("4_ll2ct")
[node name="AttackShape" type="CollisionShape3D" parent="Attack"]
[node name="AttackShape" type="CollisionShape3D" parent="Attacker"]
shape = SubResource("CylinderShape3D_qsqht")
debug_color = Color(0, 0.6, 0.7, 0.42)
[node name="AimMesh" type="MeshInstance3D" parent="Attack"]
[node name="AimMesh" type="MeshInstance3D" parent="Attacker"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.28239)
material_override = ExtResource("12_a8ls1")
cast_shadow = 0
@@ -548,9 +548,10 @@ layers = 256
material_override = SubResource("StandardMaterial3D_m1xj5")
cast_shadow = 0
mesh = SubResource("SphereMesh_kqbjh")
skeleton = NodePath("../../Attack")
skeleton = NodePath("../../Attacker")
script = ExtResource("24_31cv2")
_attack = NodePath("../../Attack")
_swoop_effect_time = null
_attack = NodePath("../../Attacker")
[node name="HurtParticles" parent="Effects" instance=ExtResource("16_fulsm")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)

2
scenes/ui/cursor.tscn
View File

@@ -7,6 +7,8 @@
process_mode = 3
layer = 128
script = ExtResource("1_tkygf")
_side_change_speed = null
_screen_inset = null
_single_cursor = NodePath("CursorBase")
[node name="CursorBase" type="Control" parent="."]

5
scripts/audio/footsteps_player.gd
View File

@@ -8,11 +8,6 @@ var can_play: bool = true
@onready var _polyphonic := get_stream_playback() as AudioStreamPlaybackPolyphonic
func _ready() -> void:
if not _footsteps:
return
func play_footstep() -> void:
if can_play:
_polyphonic.play_stream(_footsteps)

6
scripts/gameplay/player/player.gd
View File

@@ -10,11 +10,11 @@ extends CharacterBody3D
@export var _collision_debug_material: Material
@export_group("References")
@export var attack: PlayerAttack
@export var attack: PlayerAttacker
var stats: PlayerStats = PlayerStats.new()
var movement: PlayerMovement = PlayerMovement.new()
var aiming: PlayerAiming = PlayerAiming.new()
var movement: PlayerMovementHandler = PlayerMovementHandler.new()
var aiming: PlayerAimingHandler = PlayerAimingHandler.new()
var _respawn_point: Vector3
var _debug_collision_shapes := DebugCollisionShapes.new()

2
scripts/gameplay/player/player_aiming.gd → scripts/gameplay/player/player_aiming_handler.gd
View File

@@ -1,4 +1,4 @@
class_name PlayerAiming
class_name PlayerAimingHandler
@export var _controller_aim_offset: float = 6
@export var _vertical_aim_aspect: float = 1.5

0
scripts/gameplay/player/player_aiming.gd.uid → scripts/gameplay/player/player_aiming_handler.gd.uid
View File

4
scripts/gameplay/player/player_animator.gd
View File

@@ -2,7 +2,7 @@ extends AnimationTree
@export_group("References")
@export var _player: Player
@export var _attack: PlayerAttack
@export var _attack: PlayerAttacker
@export var _bone_flipper: BoneFlipper
@export var _sfx_audio_player: AudioStreamPlayer3D
@export var _hurt_particles: GPUParticles3D
@@ -68,7 +68,7 @@ func _process(_delta: float) -> void:
func _is_left() -> bool:
return _attack.side == PlayerAttack.Side.LEFT
return _attack.side == PlayerAttacker.Side.LEFT
func _play_sound(stream: AudioStream) -> void:

2
scripts/gameplay/player/player_attack_effect.gd
View File

@@ -3,7 +3,7 @@ extends MeshInstance3D
@export var _swoop_effect_time: float = 0.25
@export_group("References")
@export var _attack: PlayerAttack
@export var _attack: PlayerAttacker
var _swoop_effect_timer: float

2
scripts/gameplay/player/player_attack.gd → scripts/gameplay/player/player_attacker.gd
View File

@@ -1,4 +1,4 @@
class_name PlayerAttack
class_name PlayerAttacker
extends Area3D
signal attacked

0
scripts/gameplay/player/player_attack.gd.uid → scripts/gameplay/player/player_attacker.gd.uid
View File

2
scripts/gameplay/player/player_movement.gd → scripts/gameplay/player/player_movement_handler.gd
View File

@@ -1,4 +1,4 @@
class_name PlayerMovement
class_name PlayerMovementHandler
@export var move_speed: float = 8

0
scripts/gameplay/player/player_movement.gd.uid → scripts/gameplay/player/player_movement_handler.gd.uid
View File

2
scripts/globals/cursor.gd
View File

@@ -69,7 +69,7 @@ func _handle_cursor(player_index: int, delta: float) -> void:
cursor.side = lerpf(
cursor.side as float,
(PI / 2.0) * (1.0 if player.attack.side == PlayerAttack.Side.LEFT else -1.0),
(PI / 2.0) * (1.0 if player.attack.side == PlayerAttacker.Side.LEFT else -1.0),
_side_change_speed * delta
)