add player swing sounds

assets/sfx/player/swing/player_swing_1.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://bef4e6hhaait3"
+path="res://.godot/imported/player_swing_1.wav-d89fc2eee234ac0360f30552cd5a9b0a.sample"
+
+[deps]
+
+source_file="res://assets/sfx/player/swing/player_swing_1.wav"
+dest_files=["res://.godot/imported/player_swing_1.wav-d89fc2eee234ac0360f30552cd5a9b0a.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

assets/sfx/player/swing/player_swing_2.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dt5i30dkgawb5"
+path="res://.godot/imported/player_swing_2.wav-6468b9e6cc5cf0301ef16ccc59ccaa44.sample"
+
+[deps]
+
+source_file="res://assets/sfx/player/swing/player_swing_2.wav"
+dest_files=["res://.godot/imported/player_swing_2.wav-6468b9e6cc5cf0301ef16ccc59ccaa44.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

scenes/player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=46 format=3 uid="uid://b73y71y3efmv"]
+[gd_scene load_steps=49 format=3 uid="uid://b73y71y3efmv"]
 
 [ext_resource type="Script" uid="uid://bvvmaqn1fp6nq" path="res://scripts/player/player.gd" id="1_xt3i8"]
 [ext_resource type="Material" uid="uid://cc18ee0wbfoud" path="res://resources/materials/debug/debug_player.tres" id="2_0p422"]
@@ -25,6 +25,8 @@
 [ext_resource type="AudioStream" uid="uid://incq8v34i45p" path="res://assets/sfx/player/hit/player_hit_5.wav" id="16_dt7fs"]
 [ext_resource type="PackedScene" uid="uid://dc5m5q8bi1imd" path="res://scenes/effects/player/player_hurt_particles.tscn" id="16_fulsm"]
 [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"]
 
 [sub_resource type="Curve" id="Curve_03vie"]
 _data = [Vector2(0.952555, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
@@ -101,6 +103,12 @@ random_pitch = 1.1
 streams_count = 1
 stream_0/stream = ExtResource("17_ke2ow")
 
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_dt7fs"]
+random_pitch = 1.25
+streams_count = 2
+stream_0/stream = ExtResource("18_31cv2")
+stream_1/stream = ExtResource("19_pf23h")
+
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_n6vi2"]
 radius = 0.35
 height = 1.8
@@ -136,57 +144,57 @@ _collision_debug_material = ExtResource("2_0p422")
 [node name="Model" parent="." instance=ExtResource("3_f1ej7")]
 
 [node name="Skeleton3D" parent="Model/Armature" index="0"]
-bones/0/position = Vector3(-0.500184, 0.964422, -0.0893307)
-bones/0/rotation = Quaternion(0.722864, -0.0982987, -0.678032, -0.0898824)
+bones/0/position = Vector3(-0.497, 0.964785, -0.0689891)
+bones/0/rotation = Quaternion(0.728121, -0.0598231, -0.681319, -0.0454466)
 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.00948739, 0.920967, -0.0486467)
-bones/4/rotation = Quaternion(0.27284, -0.210528, -0.0769222, 0.935585)
+bones/4/position = Vector3(0.0258346, 0.922661, -0.0417116)
+bones/4/rotation = Quaternion(0.24761, -0.15152, -0.0233426, 0.956654)
 bones/5/position = Vector3(6.05363e-09, 0.111695, -8.19564e-08)
-bones/5/rotation = Quaternion(0.0715466, -0.13952, 0.227144, 0.961156)
-bones/6/rotation = Quaternion(-0.419672, -0.109832, 0.0131658, 0.90091)
-bones/7/rotation = Quaternion(0.343429, 0.179348, -0.260324, 0.884377)
-bones/8/rotation = Quaternion(-0.112539, 0.322054, 0.0986558, 0.934817)
+bones/5/rotation = Quaternion(0.0721415, -0.169577, 0.177886, 0.966641)
+bones/6/rotation = Quaternion(-0.419522, -0.118701, 0.0172992, 0.899785)
+bones/7/rotation = Quaternion(0.347703, 0.139592, -0.27093, 0.886687)
+bones/8/rotation = Quaternion(-0.152994, 0.340754, 0.0974963, 0.922483)
 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.0110016, -3.04479e-08, -0.00873453)
-bones/11/scale = Vector3(1.34295, 1, 0.440598)
+bones/11/scale = Vector3(1.31805, 1, 0.556622)
 bones/12/position = Vector3(-0.00823868, 6.83734e-08, -0.0102097)
-bones/13/position = Vector3(-0.0248087, 8.91106e-08, -0.00352779)
-bones/13/scale = Vector3(1.34295, 1, 0.440597)
-bones/14/position = Vector3(-0.0419837, 8.35227e-08, -0.00730157)
-bones/14/scale = Vector3(1.34295, 1, 0.440598)
+bones/13/position = Vector3(-0.0244234, 1.59193e-07, -0.00261331)
+bones/13/scale = Vector3(1.31806, 1, 0.556622)
+bones/14/position = Vector3(-0.0412802, 2.07389e-07, -0.00693105)
+bones/14/scale = Vector3(1.31805, 1, 0.556622)
 bones/15/position = Vector3(-0.0186913, 1.4579e-07, -0.0116523)
-bones/16/position = Vector3(0.019784, -8.4581e-08, 0.000705551)
-bones/16/scale = Vector3(1.34295, 1, 0.440598)
-bones/17/position = Vector3(0.0378862, -1.67934e-07, -0.00293307)
-bones/17/scale = Vector3(1.34295, 1, 0.440598)
+bones/16/position = Vector3(0.0193426, 9.28941e-08, 0.00255203)
+bones/16/scale = Vector3(1.31806, 1, 0.556622)
+bones/17/position = Vector3(0.0371093, 1.29856e-07, -0.0018878)
+bones/17/scale = Vector3(1.31805, 1, 0.556622)
 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)
-bones/21/position = Vector3(0.0449917, 0.0779816, 0.0935919)
+bones/21/position = Vector3(0.0451364, 0.0764193, 0.0935001)
 bones/21/rotation = Quaternion(0.160115, 0.667183, 0.68874, -0.234237)
 bones/22/position = Vector3(-0.00351833, -2.67936e-08, 0.0010112)
-bones/25/position = Vector3(-0.0441566, 0.077198, 0.0941226)
+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.0461112, -0.387547, 0.919899, 0.0383144)
-bones/30/rotation = Quaternion(0.037869, 0.00648395, 0.0351636, 0.998643)
+bones/29/rotation = Quaternion(0.0412521, -0.493703, 0.867561, 0.0435029)
+bones/30/rotation = Quaternion(0.0732894, -0.00155206, -0.00268963, 0.997306)
 bones/31/rotation = Quaternion(0.00282337, 0.992799, -0.117349, -0.0238866)
-bones/32/rotation = Quaternion(0.748453, -3.6458e-07, -1.23914e-06, 0.663187)
+bones/32/rotation = Quaternion(0.61105, -1.24096e-07, -1.28448e-06, 0.791592)
 bones/33/rotation = Quaternion(-0.0342351, -3.5846e-07, 8.54711e-08, 0.999414)
-bones/35/rotation = Quaternion(0.567885, 0.00691739, 0.262844, 0.779982)
-bones/36/rotation = Quaternion(-0.250743, 4.67397e-07, 3.23428e-07, 0.968054)
-bones/37/rotation = Quaternion(0.118718, -0.0703626, 0.155841, 0.978094)
-bones/38/rotation = Quaternion(-0.0328405, 8.16975e-07, 6.33988e-07, 0.999461)
+bones/35/rotation = Quaternion(0.354165, -0.0745854, 0.284521, 0.887723)
+bones/36/rotation = Quaternion(-0.234115, 4.83183e-07, 2.86554e-07, 0.972209)
+bones/37/rotation = Quaternion(-0.0619873, -0.10263, 0.173915, 0.977435)
+bones/38/rotation = Quaternion(-0.358287, 5.65501e-07, 8.65778e-07, 0.933611)
 bones/39/rotation = Quaternion(0.197471, 0.678974, 0.678974, -0.19747)
-bones/39/scale = Vector3(1.08305, 1, 0.811625)
+bones/39/scale = Vector3(1.1486, 1, 0.747869)
 bones/41/position = Vector3(0.0170023, 0.00022532, -0.00384271)
-bones/41/rotation = Quaternion(1.94902e-08, 0.00443274, -1.35978e-07, 0.99999)
+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)
@@ -194,9 +202,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.08305, 1, 0.811625)
+bones/48/scale = Vector3(1.1486, 1, 0.747869)
 bones/50/position = Vector3(-0.0139197, 0.000225418, -0.00485518)
-bones/50/rotation = Quaternion(-1.71213e-08, 0.00539563, 5.0295e-08, 0.999985)
+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)
@@ -204,16 +212,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.261165, -0.0211874, -0.725745, 0.636112)
-bones/58/rotation = Quaternion(0.604708, 0.191834, -0.260281, 0.727861)
+bones/57/rotation = Quaternion(0.268895, -0.0322809, -0.721065, 0.637745)
+bones/58/rotation = Quaternion(0.630984, 0.202541, -0.225207, 0.714225)
 bones/58/scale = Vector3(1, 1, 1)
-bones/59/position = Vector3(1.77811e-07, 0.288399, -1.46069e-08)
-bones/59/rotation = Quaternion(0.390261, -0.347612, -0.169445, 0.835554)
+bones/59/position = Vector3(-7.64129e-08, 0.297752, 3.08703e-08)
+bones/59/rotation = Quaternion(0.397913, -0.405911, -0.168656, 0.805268)
 bones/59/scale = Vector3(1, 1, 1)
-bones/60/rotation = Quaternion(0.00108425, -0.134355, 0.00014696, 0.990933)
+bones/60/rotation = Quaternion(0.00108498, -0.128877, 0.000141008, 0.99166)
 bones/60/scale = Vector3(1, 1, 1)
-bones/61/position = Vector3(1.08387e-07, 0.0706603, -0.000154706)
-bones/61/rotation = Quaternion(-0.225993, -0.175347, 0.117731, 0.950957)
+bones/61/position = Vector3(-3.03161e-08, 0.0542367, -0.000118642)
+bones/61/rotation = Quaternion(-0.284287, -0.178054, 0.11183, 0.935399)
 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)
@@ -258,28 +266,28 @@ 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(1.0941e-07, 0.0706603, -0.000154684)
-bones/95/rotation = Quaternion(-0.780793, -0.104855, -0.0209702, 0.615571)
+bones/95/position = Vector3(5.94653e-09, 0.0542367, -0.000118721)
+bones/95/rotation = Quaternion(-0.79922, -0.10412, -0.0241452, 0.591459)
 bones/95/scale = Vector3(1, 1, 1)
-bones/96/position = Vector3(1.46994e-07, 0.288399, -6.04396e-09)
-bones/96/rotation = Quaternion(-0.532845, -0.0656312, -0.190835, 0.821797)
-bones/96/scale = Vector3(1, 1.11819, 0.999999)
+bones/96/position = Vector3(-6.99374e-08, 0.297752, 2.98403e-08)
+bones/96/rotation = Quaternion(-0.523172, -0.0881495, -0.213835, 0.820241)
+bones/96/scale = Vector3(1, 1.15828, 1)
 bones/97/position = Vector3(-0.00645471, 0.000163305, -0.00321278)
 bones/97/rotation = Quaternion(0.248427, 0.0258538, -0.267814, 0.930533)
 bones/97/scale = Vector3(1, 1, 1)
 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.427024, 0.144587, -0.0163221, 0.892457)
+bones/99/rotation = Quaternion(-0.413216, 0.135782, 0.00120566, 0.900452)
 bones/99/scale = Vector3(1, 1, 1)
-bones/100/rotation = Quaternion(0.0450653, -0.0334221, 0.574923, 0.816282)
-bones/101/rotation = Quaternion(0.0420054, 0.461217, 0.63998, 0.613139)
+bones/100/rotation = Quaternion(0.0460074, -0.0321129, 0.551221, 0.832471)
+bones/101/rotation = Quaternion(0.0244937, 0.473092, 0.64033, 0.604617)
 bones/102/position = Vector3(6.2732e-09, 0.281682, 9.00968e-08)
-bones/102/rotation = Quaternion(0.018481, 4.88051e-05, 5.16535e-05, 0.999829)
+bones/102/rotation = Quaternion(0.00924027, 4.84215e-05, 5.21287e-05, 0.999957)
 bones/102/scale = Vector3(1, 1, 1)
-bones/103/rotation = Quaternion(0.00109454, 0.00172952, -3.29654e-06, 0.999998)
+bones/103/rotation = Quaternion(0.00109409, 0.00817654, -9.00136e-06, 0.999966)
 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.389512, 0.00309177, -0.00289364, 0.921012)
+bones/104/rotation = Quaternion(-0.43103, 0.0161785, -0.0149775, 0.902068)
 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)
@@ -325,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.834877, 0.00215976, 7.8793e-05, 0.550433)
+bones/138/rotation = Quaternion(-0.847154, 0.0112961, 0.000472714, 0.531227)
 bones/138/scale = Vector3(1, 1, 1)
 bones/139/position = Vector3(3.48513e-09, 0.281682, 1.40144e-07)
-bones/139/rotation = Quaternion(-0.700105, 8.26177e-07, 6.10443e-05, 0.71404)
+bones/139/rotation = Quaternion(-0.703395, 1.26868e-06, 5.8294e-05, 0.710799)
 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.620696, -0.0407748, 0.426106, 0.656893)
+bones/142/rotation = Quaternion(-0.625904, -0.0362912, 0.432067, 0.648264)
 bones/142/scale = Vector3(1, 1, 0.999999)
-bones/143/position = Vector3(-0.0143056, 0.110086, 0.0701244)
-bones/144/position = Vector3(-0.00954582, 0.0530563, 0.104178)
-bones/145/position = Vector3(-0.0263557, 0.00026539, 0.0979084)
-bones/146/position = Vector3(0.0174251, 0.0585969, -0.127619)
-bones/147/position = Vector3(0.104937, 0.0382241, -0.0537964)
-bones/147/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/148/position = Vector3(0.108434, 0.0823447, -0.042154)
-bones/148/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/149/position = Vector3(0.0750075, 0.0658818, 0.0467315)
-bones/149/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/150/position = Vector3(0.0762718, 0.00141452, 0.0323955)
-bones/150/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/151/position = Vector3(0.034965, 0.0590627, 0.0772454)
-bones/152/position = Vector3(0.0413616, -0.00291984, 0.0730467)
-bones/153/position = Vector3(0.033464, 0.108078, 0.0525506)
-bones/153/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/154/position = Vector3(0.0611713, 0.128684, 0.0397581)
-bones/154/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/155/position = Vector3(0.0768567, 0.152561, 0.0100055)
-bones/155/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/156/position = Vector3(0.0856947, 0.155258, -0.0163064)
-bones/156/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/157/position = Vector3(0.102363, 0.119022, -0.0446631)
-bones/157/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/158/position = Vector3(0.0619547, 0.12781, -0.0668668)
-bones/158/rotation = Quaternion(0.136447, -0.208848, -0.0200199, 0.968175)
-bones/159/position = Vector3(-0.0836174, 0.0663212, -0.0861969)
-bones/159/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/160/position = Vector3(-0.0850462, 0.0979963, -0.0746168)
-bones/160/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/161/position = Vector3(-0.105628, 0.111635, 0.0221604)
-bones/161/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/162/position = Vector3(-0.112085, 0.0528835, -0.00436244)
-bones/162/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/163/position = Vector3(-0.063788, 0.0766184, 0.0944485)
-bones/164/position = Vector3(-0.094866, 0.0260332, 0.0789407)
-bones/165/position = Vector3(-0.0564352, 0.138517, 0.0533705)
-bones/165/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/166/position = Vector3(-0.0730267, 0.172243, 0.0189722)
-bones/166/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/167/position = Vector3(-0.0679613, 0.188124, -0.0190363)
-bones/167/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/168/position = Vector3(-0.0681122, 0.184627, -0.046703)
-bones/168/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/169/position = Vector3(-0.0929639, 0.14957, -0.065529)
-bones/169/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/170/position = Vector3(-0.0568873, 0.139915, -0.0754126)
-bones/170/rotation = Quaternion(0.032168, 0.0175719, -0.219528, 0.974917)
-bones/171/rotation = Quaternion(0.764735, 0.166206, -0.333177, 0.52588)
+bones/143/position = Vector3(-0.0120245, 0.110047, 0.0701072)
+bones/144/position = Vector3(0.000981249, 0.0526861, 0.106351)
+bones/145/position = Vector3(-0.00876301, -0.010239, 0.106337)
+bones/146/position = Vector3(0.00512899, 0.0498859, -0.136414)
+bones/147/position = Vector3(0.115306, 0.0310015, -0.057039)
+bones/147/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/148/position = Vector3(0.109206, 0.0842393, -0.0444784)
+bones/148/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/149/position = Vector3(0.075742, 0.0684844, 0.0329388)
+bones/149/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/150/position = Vector3(0.0938145, -0.00438454, 0.0214032)
+bones/150/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/151/position = Vector3(0.0435393, 0.0592238, 0.0746459)
+bones/152/position = Vector3(0.0556243, -0.00900486, 0.0677489)
+bones/153/position = Vector3(0.0346489, 0.108857, 0.0527445)
+bones/153/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/154/position = Vector3(0.0592772, 0.129316, 0.0410303)
+bones/154/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/155/position = Vector3(0.0757153, 0.153022, 0.0115487)
+bones/155/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/156/position = Vector3(0.0852717, 0.155553, -0.0145275)
+bones/156/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/157/position = Vector3(0.10174, 0.119468, -0.0438496)
+bones/157/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/158/position = Vector3(0.0590602, 0.128264, -0.0681166)
+bones/158/rotation = Quaternion(0.133466, -0.222118, -0.0159804, 0.96571)
+bones/159/position = Vector3(-0.100151, 0.0598834, -0.0771867)
+bones/159/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/160/position = Vector3(-0.0951764, 0.103481, -0.0673458)
+bones/160/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/161/position = Vector3(-0.107106, 0.115225, 0.0299318)
+bones/161/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/162/position = Vector3(-0.121312, 0.0525916, 0.0127061)
+bones/162/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/163/position = Vector3(-0.0576398, 0.0763561, 0.0986515)
+bones/164/position = Vector3(-0.0893115, 0.0151944, 0.0899816)
+bones/165/position = Vector3(-0.0532207, 0.140055, 0.0548069)
+bones/165/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/166/position = Vector3(-0.070474, 0.175433, 0.0194586)
+bones/166/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/167/position = Vector3(-0.0648672, 0.190986, -0.018705)
+bones/167/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/168/position = Vector3(-0.0653955, 0.187513, -0.0463702)
+bones/168/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/169/position = Vector3(-0.0923292, 0.153939, -0.0650347)
+bones/169/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/170/position = Vector3(-0.0569272, 0.142243, -0.0751503)
+bones/170/rotation = Quaternion(0.0320268, 0.0198019, -0.247388, 0.968185)
+bones/171/rotation = Quaternion(0.812878, 0.0886222, -0.296567, 0.493379)
 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.33567, -3.93718e-06, -9.66264e-07, 0.94198)
+bones/172/rotation = Quaternion(0.306748, 1.02822e-06, 1.85891e-07, 0.951791)
 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.409925, -0.0101991, 0.027923, 0.911635)
+bones/173/rotation = Quaternion(-0.398722, -0.00689852, 0.0181754, 0.916866)
 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.744023, -0.00708828, 0.00762176, 0.668073)
+bones/175/rotation = Quaternion(-0.741147, -0.00469825, 0.00492631, 0.671308)
 bones/175/scale = Vector3(1, 1, 1)
 bones/176/position = Vector3(1.15382e-08, 0.531431, 3.0748e-08)
-bones/176/rotation = Quaternion(-0.615185, -1.02763e-06, -2.04031e-06, 0.788383)
-bones/176/scale = Vector3(1, 1.02613, 1)
-bones/177/rotation = Quaternion(0.950312, 0.0114181, 0.00422199, 0.311062)
+bones/176/rotation = Quaternion(-0.627152, 2.42149e-07, 2.74197e-07, 0.778897)
+bones/176/scale = Vector3(1, 1.01919, 1)
+bones/177/rotation = Quaternion(0.950842, -0.0594234, 0.0596795, 0.298005)
 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.291475, 1.18873e-06, 3.16877e-07, 0.956578)
+bones/178/rotation = Quaternion(0.311931, 1.3173e-06, 2.44979e-07, 0.950105)
 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.505594, 0.01086, -0.119813, 0.854343)
+bones/179/rotation = Quaternion(-0.480879, 0.00643385, -0.128691, 0.867268)
 bones/179/scale = Vector3(1, 0.99999, 0.999998)
-bones/180/rotation = Quaternion(-0.46826, 1.67129e-07, 1.38111e-07, 0.883591)
+bones/180/rotation = Quaternion(-0.50324, 1.66719e-07, 1.44705e-07, 0.864147)
 bones/181/position = Vector3(2.69973e-08, 0.418112, 4.26027e-07)
-bones/181/rotation = Quaternion(-0.76886, 0.0198551, -0.0372841, 0.638021)
+bones/181/rotation = Quaternion(-0.762469, 0.0196287, -0.0407495, 0.645442)
 bones/181/scale = Vector3(1, 1, 1)
 bones/182/position = Vector3(1.89344e-08, 0.531431, -1.32203e-08)
-bones/182/rotation = Quaternion(-0.633366, 2.91568e-07, 7.41209e-07, 0.773853)
-bones/182/scale = Vector3(1, 1.01611, 1)
+bones/182/rotation = Quaternion(-0.625027, 3.82302e-07, 8.08803e-07, 0.780603)
+bones/182/scale = Vector3(1, 1.02033, 1)
 
 [node name="BoneFlipper" type="SkeletonModifier3D" parent="Model/Armature/Skeleton3D" index="0"]
 _import_path = NodePath("")
@@ -480,7 +488,7 @@ libraries = {
 &"batrix_gp_generic": ExtResource("7_oprun")
 }
 
-[node name="AnimationTree" type="AnimationTree" parent="."]
+[node name="PlayerAnimator" type="AnimationTree" parent="."]
 process_priority = 10
 process_physics_priority = 10
 root_node = NodePath("../Model")
@@ -497,6 +505,7 @@ parameters/run->idle_oneshot/request = 0
 script = ExtResource("4_adlgp")
 _hurt_sound = SubResource("AudioStreamRandomizer_fulsm")
 _hit_sounds = Array[AudioStream]([ExtResource("11_l71n6"), SubResource("AudioStreamRandomizer_wqfne"), SubResource("AudioStreamRandomizer_ke2ow")])
+_swing_sounds = SubResource("AudioStreamRandomizer_dt7fs")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)

scripts/player/player_animator.gd

@@ -3,6 +3,7 @@ extends AnimationTree
 @export_group("Audio")
 @export var _hurt_sound: AudioStream
 @export var _hit_sounds: Array[AudioStream]
+@export var _swing_sounds: AudioStream
 
 var _speed: float
 var _has_input: bool
@@ -85,10 +86,12 @@ func _run_to_idle() -> void:
 
 func _abort_oneshots() -> void:
 	set(&"parameters/hit_oneshot/request", AnimationNodeOneShot.ONE_SHOT_REQUEST_ABORT)
+	set(&"parameters/run->idle_oneshot/request", AnimationNodeOneShot.ONE_SHOT_REQUEST_ABORT)
 
 
 func _on_attack_attacked() -> void:
 	set(&"parameters/hit_oneshot/request", AnimationNodeOneShot.ONE_SHOT_REQUEST_FIRE)
+	_play_sound(_swing_sounds)
 
 
 func _on_attack_did_hit() -> void: