Merge branch 'github/fork/Ledmitz/punch_sfx' into 'master'

Altered racesprite punch sounds and altered paths.xml accordingly.

See merge request legacy/clientdata!403

7 files changed, 26 insertions, 2 deletions

diff --git a/items/racesprite/item-100_Deprecated.xml b/items/racesprite/item-100_Deprecated.xml
index cf47ca8a..288e8105 100644
--- a/items/racesprite/item-100_Deprecated.xml
+++ b/items/racesprite/item-100_Deprecated.xml
@@ -10,9 +10,13 @@
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
   <item id="-99100" type="racesprite" name="Placeholder">
     <sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">weapons/punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
 </items>
diff --git a/items/racesprite/item-101_Talpan.xml b/items/racesprite/item-101_Talpan.xml
index 5a6dab6c..94e476f8 100644
--- a/items/racesprite/item-101_Talpan.xml
+++ b/items/racesprite/item-101_Talpan.xml
@@ -10,9 +10,13 @@
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
   <item id="-99101" type="racesprite" name="Talpan">
     <sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">weapons/punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
 </items>
diff --git a/items/racesprite/item-102_Tritan.xml b/items/racesprite/item-102_Tritan.xml
index 20563c31..ca87d302 100644
--- a/items/racesprite/item-102_Tritan.xml
+++ b/items/racesprite/item-102_Tritan.xml
@@ -10,9 +10,13 @@
     <sprite gender="female">model/female.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
     <sprite gender="other">model/neutral.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
   <item id="-99102" type="racesprite" name="Tritan">
     <sprite gender="unisex">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
     <sprite gender="female">model/female.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">weapons/punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
 </items>
diff --git a/items/racesprite/item-103_Ifriton.xml b/items/racesprite/item-103_Ifriton.xml
index 5b4a2e90..ad844dc4 100644
--- a/items/racesprite/item-103_Ifriton.xml
+++ b/items/racesprite/item-103_Ifriton.xml
@@ -10,9 +10,13 @@
     <sprite gender="female">model/female.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="other">model/neutral.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
   <item id="-99103" type="racesprite" name="Ifriton">
     <sprite gender="unisex">model/male.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="female">model/female.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">weapons/punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
 </items>
diff --git a/items/racesprite/item-104_Gispaan.xml b/items/racesprite/item-104_Gispaan.xml
index db848e7c..85e8d7a5 100644
--- a/items/racesprite/item-104_Gispaan.xml
+++ b/items/racesprite/item-104_Gispaan.xml
@@ -10,9 +10,13 @@
     <sprite gender="female">model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="other">model/neutral.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
   <item id="-99104" type="racesprite" name="Gispaan">
     <sprite gender="unisex">model/male.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="female">model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">weapons/punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
 </items>
diff --git a/items/racesprite/item-105_Sparron.xml b/items/racesprite/item-105_Sparron.xml
index 6773d171..c91680ee 100644
--- a/items/racesprite/item-105_Sparron.xml
+++ b/items/racesprite/item-105_Sparron.xml
@@ -10,9 +10,13 @@
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
   <item id="-99105" type="racesprite" name="Sparron">
     <sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sound event="hit">weapons/punch.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
   </item>
 </items>
diff --git a/paths.xml b/paths.xml
index a67a3a8c..8d90be36 100644
--- a/paths.xml
+++ b/paths.xml
@@ -44,8 +44,8 @@ Also, don't forget to add the '/' path separator at the end of folder values.
   <option name="sfx" value="sfx/"/>
   <!-- option name="newQuestSfx" value="system/levelup.ogg"/ -->
   <!-- option name="completeQuestSfx" value="system/levelup.ogg"/ -->
-  <option name="attackSfxFile" value="weapons/knives/knife-hit1.ogg"/>
-  <option name="missSfxFile" value="fist-swish.ogg"/>
+  <!-- option name="attackSfxFile" value=""/ -->
+  <!-- option name="missSfxFile" value=""/ -->
   <option name="music" value="music/"/>
   <option name="wallpapers" value="graphics/images/"/>
   <option name="wallpaperFile" value="login_wallpaper.png"/>