Merge branch 'pirate_sfx' into 'master'

Added SFX for Thug, Swashbuckler, Grenadier, Dread Pirate Marley and clone,...

See merge request legacy/clientdata!496

9 files changed, 25 insertions, 1 deletions

diff --git a/license.md b/license.md
index 08cb5ed3..36d46d60 100644
--- a/license.md
+++ b/license.md
@@ -1364,7 +1364,6 @@ File | Artists | Licenses
 `sfx/weapons/bows/bow-hit1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
 `sfx/weapons/bows/bow-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
 `sfx/weapons/gunstaff/shot.ogg` | Bird-Man, Freesound.org, Jesusalva | CC 0
-
 `sfx/weapons/knives/knife-hit1.ogg` | Cosmostrator | GPLv2
 `sfx/weapons/knives/knife-miss1.ogg` | Cosmostrator | GPLv2
 `sfx/weapons/knives/rock/rock-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1375,6 +1374,9 @@ File | Artists | Licenses
 `sfx/weapons/knives/sharpknife-miss1.ogg` | Krazyjakee | GPLv2
 `sfx/weapons/projectiles/snowball/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/weapons/projectiles/snowball/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/punch1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/punch2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/punch3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/weapons/other/halberd/halberd-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/weapons/other/halberd/halberd-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/weapons/other/halberd/halberd-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
diff --git a/monsters/monster1119_Thug.xml b/monsters/monster1119_Thug.xml
index b7b04100..9b3e8130 100644
--- a/monsters/monster1119_Thug.xml
+++ b/monsters/monster1119_Thug.xml
@@ -7,5 +7,12 @@
     <sprite>equipment/feet/boots.xml</sprite>
     <sprite>equipment/chest/tanktop.xml</sprite>
     <sprite>equipment/legs/pants.xml</sprite>
+    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="hit">weapons/punch1.ogg</sound>
+    <sound event="hit">weapons/punch2.ogg</sound>
+    <sound event="hit">weapons/punch3.ogg</sound>
+    <sound event="miss">weapons/miss1.ogg</sound>
+    <sound event="miss">weapons/miss2.ogg</sound>
+    <sound event="miss">weapons/miss3.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1120_Swashbuckler.xml b/monsters/monster1120_Swashbuckler.xml
index e19fed47..5acffb76 100644
--- a/monsters/monster1120_Swashbuckler.xml
+++ b/monsters/monster1120_Swashbuckler.xml
@@ -8,5 +8,12 @@
     <sprite>equipment/head/bandana.xml|#212121,555555</sprite>
     <sprite>equipment/feet/boots.xml|#212121,555555</sprite>
     <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound>
+    <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound>
+    <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound>
+    <sound event="miss">weapons/miss1.ogg</sound>
+    <sound event="miss">weapons/miss2.ogg</sound>
+    <sound event="miss">weapons/miss3.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1121_Grenadier.xml b/monsters/monster1121_Grenadier.xml
index 31a2b7ff..7eec61e7 100644
--- a/monsters/monster1121_Grenadier.xml
+++ b/monsters/monster1121_Grenadier.xml
@@ -8,7 +8,9 @@
     <sprite>equipment/head/piratehat.xml</sprite>
     <sprite>equipment/hands/generic.xml</sprite>
     <sprite>equipment/feet/boots.xml|#212121,444444</sprite>
+    <sound event="die">system/spawn_burst.ogg</sound>
     <sound event="hit">system/crit.ogg</sound>
+    <sound event="miss">system/crit.ogg</sound>
     <attack id="1" critical-hit-effect-id="30" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
   </monster>
 </monsters>
diff --git a/monsters/monster1122_TheDreadPirateMarley.xml b/monsters/monster1122_TheDreadPirateMarley.xml
index 26aaeb32..ddac0e84 100644
--- a/monsters/monster1122_TheDreadPirateMarley.xml
+++ b/monsters/monster1122_TheDreadPirateMarley.xml
@@ -8,6 +8,9 @@
     <sprite>equipment/head/eyepatch.xml</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
+    <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
   </monster>
 </monsters>
diff --git a/monsters/monster1123_TheDreadPirateMarley.xml b/monsters/monster1123_TheDreadPirateMarley.xml
index e2417454..939e88e0 100644
--- a/monsters/monster1123_TheDreadPirateMarley.xml
+++ b/monsters/monster1123_TheDreadPirateMarley.xml
@@ -8,6 +8,9 @@
     <sprite>equipment/head/eyepatch.xml</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
+    <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
   </monster>
 </monsters>
diff --git a/sfx/weapons/punch1.ogg b/sfx/weapons/punch1.ogg
new file mode 100644
index 00000000..66e5b5e6
--- /dev/null
+++ b/sfx/weapons/punch1.ogg
diff --git a/sfx/weapons/punch2.ogg b/sfx/weapons/punch2.ogg
new file mode 100644
index 00000000..9874debe
--- /dev/null
+++ b/sfx/weapons/punch2.ogg
diff --git a/sfx/weapons/punch3.ogg b/sfx/weapons/punch3.ogg
new file mode 100644
index 00000000..30ed0a3b
--- /dev/null
+++ b/sfx/weapons/punch3.ogg