From a6c420be6e737920f553883436c9e68ec2f36cac Mon Sep 17 00:00:00 2001
From: Ledmitz <smoothshifter@tuta.io>
Date: Wed, 16 Sep 2020 21:29:59 +0000
Subject: Added sounds for chiza, generic weapon misses and altered
 managuardian and slayer to use them

---
 items/misc/item1700_magicblade.xml    |   3 +++
 license.md                            |   6 ++++++
 monsters/monster1138_ManaGuardian.xml |   3 +++
 monsters/monster1143_ManaSlayer.xml   |   5 +++++
 sfx/magic/chiza1.ogg                  | Bin 0 -> 14069 bytes
 sfx/magic/chiza2.ogg                  | Bin 0 -> 13614 bytes
 sfx/magic/chiza3.ogg                  | Bin 0 -> 13350 bytes
 sfx/weapons/miss1.ogg                 | Bin 0 -> 10036 bytes
 sfx/weapons/miss2.ogg                 | Bin 0 -> 9926 bytes
 sfx/weapons/miss3.ogg                 | Bin 0 -> 9657 bytes
 10 files changed, 17 insertions(+)
 create mode 100644 sfx/magic/chiza1.ogg
 create mode 100644 sfx/magic/chiza2.ogg
 create mode 100644 sfx/magic/chiza3.ogg
 create mode 100644 sfx/weapons/miss1.ogg
 create mode 100644 sfx/weapons/miss2.ogg
 create mode 100644 sfx/weapons/miss3.ogg

diff --git a/items/misc/item1700_magicblade.xml b/items/misc/item1700_magicblade.xml
index 6c55157a..7d557464 100644
--- a/items/misc/item1700_magicblade.xml
+++ b/items/misc/item1700_magicblade.xml
@@ -8,5 +8,8 @@
   </its:rules>
   <item id="1700" name="Magic Blade" attack-action="attack" attack-range="1" missile-particle="graphics/particles/magic.darkred.xml">
     <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="hit">magic/chiza1.ogg</sound>
+    <sound event="hit">magic/chiza2.ogg</sound>
+    <sound event="hit">magic/chiza3.ogg</sound>
   </item>
 </items>
diff --git a/license.md b/license.md
index 87e8ecc2..c9575d52 100644
--- a/license.md
+++ b/license.md
@@ -1128,6 +1128,9 @@ File | Artists | Licenses
 `sfx/env/env-riverflow1.ogg` | Dariuna | GPLv2
 `sfx/env/env-waterfall1.ogg` | Dariuna | GPLv2
 `sfx/env/fart.ogg` | unknown | CC0
+`sfx/magic/chiza1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/chiza2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/chiza3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/kaflosh.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/monsters/bat/bat-dying1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/bat/bat-hit1.ogg` | Cosmostrator | GPLv2
@@ -1185,6 +1188,9 @@ File | Artists | Licenses
 `sfx/system/levelup.ogg` | Cosmostrator | GPLv2
 `sfx/system/ship-bell2.ogg` | unknown | (public domain)
 `sfx/system/warning.ogg` | Jesusalva | (public domain)
+`sfx/weapons/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/miss3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/weapons/bows/bow_shoot_1.ogg` | Cosmostrator | GPLv2
 `sfx/weapons/knives/knife-hit1.ogg` | Cosmostrator | GPLv2
 `sfx/weapons/knives/knife-miss1.ogg` | Cosmostrator | GPLv2
diff --git a/monsters/monster1138_ManaGuardian.xml b/monsters/monster1138_ManaGuardian.xml
index e7e7650f..c4d6b8a8 100644
--- a/monsters/monster1138_ManaGuardian.xml
+++ b/monsters/monster1138_ManaGuardian.xml
@@ -11,5 +11,8 @@
     <sprite>equipment/head/aureole.xml</sprite>
     <particlefx>graphics/particles/angel.particle.xml</particlefx>
     <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/>
+    <sound event="hit">magic/confringo1.ogg</sound>
+    <sound event="hit">magic/confringo2.ogg</sound>
+    <sound event="hit">magic/confringo3.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1143_ManaSlayer.xml b/monsters/monster1143_ManaSlayer.xml
index d06dd2a0..10549b51 100644
--- a/monsters/monster1143_ManaSlayer.xml
+++ b/monsters/monster1143_ManaSlayer.xml
@@ -11,5 +11,10 @@
     <sprite>equipment/head/aureole.xml</sprite>
     <sprite>equipment/weapons/sandcutter.xml</sprite>
     <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/>
+    <sound event="hit">weapons/knives/knife-rock-hit1.ogg</sound>
+    <sound event="hit">weapons/knives/knife-rock-hit2.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/sfx/magic/chiza1.ogg b/sfx/magic/chiza1.ogg
new file mode 100644
index 00000000..e8a7a254
Binary files /dev/null and b/sfx/magic/chiza1.ogg differ
diff --git a/sfx/magic/chiza2.ogg b/sfx/magic/chiza2.ogg
new file mode 100644
index 00000000..6cef4b67
Binary files /dev/null and b/sfx/magic/chiza2.ogg differ
diff --git a/sfx/magic/chiza3.ogg b/sfx/magic/chiza3.ogg
new file mode 100644
index 00000000..0db8a02d
Binary files /dev/null and b/sfx/magic/chiza3.ogg differ
diff --git a/sfx/weapons/miss1.ogg b/sfx/weapons/miss1.ogg
new file mode 100644
index 00000000..722a9868
Binary files /dev/null and b/sfx/weapons/miss1.ogg differ
diff --git a/sfx/weapons/miss2.ogg b/sfx/weapons/miss2.ogg
new file mode 100644
index 00000000..916a3704
Binary files /dev/null and b/sfx/weapons/miss2.ogg differ
diff --git a/sfx/weapons/miss3.ogg b/sfx/weapons/miss3.ogg
new file mode 100644
index 00000000..c90026a5
Binary files /dev/null and b/sfx/weapons/miss3.ogg differ
-- 
cgit v1.2.3-60-g2f50