From 2dae184b0ff91e21f8d6ec0b693592c27b3cd2f0 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 8 Jul 2018 17:16:25 -0300
Subject: SFX fixes, still need to test fairies, and this means server-data
 patch coming.

---
 monsters.xml                     |  46 +++++++++++++++++++++++----------------
 sfx/monsters/fairy/fada-die1.ogg | Bin 0 -> 10545 bytes
 sfx/monsters/fairy/fada-die2.ogg | Bin 0 -> 7962 bytes
 sfx/monsters/flower/hit1.ogg     | Bin 0 -> 7651 bytes
 sfx/monsters/flower/hit2.ogg     | Bin 0 -> 7714 bytes
 sfx/monsters/flower/miss.ogg     | Bin 0 -> 8017 bytes
 6 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 sfx/monsters/fairy/fada-die1.ogg
 create mode 100644 sfx/monsters/fairy/fada-die2.ogg
 create mode 100644 sfx/monsters/flower/hit1.ogg
 create mode 100644 sfx/monsters/flower/hit2.ogg
 create mode 100644 sfx/monsters/flower/miss.ogg

diff --git a/monsters.xml b/monsters.xml
index b31ae7f5..5d216fab 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -346,6 +346,9 @@ event=""		 Links the sfx to an action, like die, hit, hurt, miss, move or spawn.
 	</monster>
 	<monster id="1067" name="Fire Goblin" targetCursor="medium">
 		<sprite>monsters/firegoblin.xml</sprite>
+    <sound event="hit">monsters/firegoblin/firegoblinhit.ogg</sound>
+    <sound event="hit">monsters/firegoblin/firegoblinhit2.ogg</sound>
+    <sound event="miss">monsters/firegoblin/firegoblinmiss.ogg</sound>
 	</monster>
 	<monster id="1068" name="Mana Ghost" targetCursor="medium">
 		<sprite>monsters/managhost.xml</sprite>
@@ -799,18 +802,18 @@ event=""		 Links the sfx to an action, like die, hit, hurt, miss, move or spawn.
   </monster>
   <monster id="1176" name="Wicked Mushroom">
     <sprite>monsters/mushroom-wicked.xml</sprite>
-    <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
+    <sound event="hit">monsters/shroom/shroomhit.ogg</sound>
   </monster>
   <monster id="1177" name="Bluepar" targetCursor="small">
     <sprite>monsters/bluepar.xml</sprite>
-    <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound>
-    <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound>
+    <sound event="hit">monsters/pinkie/pinkiehit.ogg</sound>
+    <sound event="miss">monsters/pinkie/pinkiemiss.ogg</sound>
   </monster>
   <monster id="1178" name="Black Slime">
     <sprite>monsters/slime.xml|#494949,ffffff</sprite>
     <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
   </monster>
-  <monster id="1179" name="Fafi Dragon" targetCursor="big">
+  <monster id="1179" name="Fafi Dragon" targetCursor="large">
     <sprite>monsters/dragon.xml</sprite>
   </monster>
   <monster id="1180" name="Chocolate Slime">
@@ -824,33 +827,38 @@ event=""		 Links the sfx to an action, like die, hit, hurt, miss, move or spawn.
 
   <monster id="1182" name="Earth Fairy">
     <sprite>monsters/fairy.xml|#ff9e00</sprite>
-    <sound event="hit">fire-goblin-hit1.ogg</sound>
-    <sound event="miss">flower-miss1.ogg</sound>
-    <sound event="die">fada-die1.ogg</sound>
+    <sound event="hit">monsters/firegoblin/firegoblinhit.ogg</sound>
+    <sound event="miss">monster/flower/miss.ogg</sound>
+    <sound event="die">monster/fairy/fada-die1.ogg</sound>
+    <sound event="die">monster/fairy/fada-die2.ogg</sound>
   </monster>
   <monster id="1183" name="Fire Fairy">
     <sprite>monsters/fairy.xml|#ff0000</sprite>
-    <sound event="hit">fire-goblin-hit1.ogg</sound>
-    <sound event="miss">flower-miss1.ogg</sound>
-    <sound event="die">fada-die2.ogg</sound>
+    <sound event="hit">monsters/firegoblin/firegoblinhit.ogg</sound>
+    <sound event="miss">monster/flower/miss.ogg</sound>
+    <sound event="die">monster/fairy/fada-die1.ogg</sound>
+    <sound event="die">monster/fairy/fada-die2.ogg</sound>
   </monster>
   <monster id="1184" name="Water Fairy">
     <sprite>monsters/fairy.xml|#0000ff</sprite>
-    <sound event="hit">fire-goblin-hit1.ogg</sound>
-    <sound event="miss">flower-miss1.ogg</sound>
-    <sound event="die">fada-die1.ogg</sound>
+    <sound event="hit">monsters/firegoblin/firegoblinhit.ogg</sound>
+    <sound event="miss">monster/flower/miss.ogg</sound>
+    <sound event="die">monster/fairy/fada-die1.ogg</sound>
+    <sound event="die">monster/fairy/fada-die2.ogg</sound>
   </monster>
   <monster id="1185" name="Wind Fairy">
     <sprite>monsters/fairy.xml|#ffffff</sprite>
-    <sound event="hit">fire-goblin-hit1.ogg</sound>
-    <sound event="miss">flower-miss1.ogg</sound>
-    <sound event="die">fada-die1.ogg</sound>
+    <sound event="hit">monsters/firegoblin/firegoblinhit.ogg</sound>
+    <sound event="miss">monster/flower/miss.ogg</sound>
+    <sound event="die">monster/fairy/fada-die1.ogg</sound>
+    <sound event="die">monster/fairy/fada-die2.ogg</sound>
   </monster>
   <monster id="1186" name="Poison Fairy">
     <sprite>monsters/fairy.xml</sprite>
-    <sound event="hit">fire-goblin-hit1.ogg</sound>
-    <sound event="miss">flower-miss1.ogg</sound>
-    <sound event="die">fada-die1.ogg</sound>
+    <sound event="hit">monsters/firegoblin/firegoblinhit.ogg</sound>
+    <sound event="miss">monster/flower/miss.ogg</sound>
+    <sound event="die">monster/fairy/fada-die1.ogg</sound>
+    <sound event="die">monster/fairy/fada-die2.ogg</sound>
   </monster>
 
   <!-- Resume -->
diff --git a/sfx/monsters/fairy/fada-die1.ogg b/sfx/monsters/fairy/fada-die1.ogg
new file mode 100644
index 00000000..40ebd2f4
Binary files /dev/null and b/sfx/monsters/fairy/fada-die1.ogg differ
diff --git a/sfx/monsters/fairy/fada-die2.ogg b/sfx/monsters/fairy/fada-die2.ogg
new file mode 100644
index 00000000..bd344719
Binary files /dev/null and b/sfx/monsters/fairy/fada-die2.ogg differ
diff --git a/sfx/monsters/flower/hit1.ogg b/sfx/monsters/flower/hit1.ogg
new file mode 100644
index 00000000..d6841972
Binary files /dev/null and b/sfx/monsters/flower/hit1.ogg differ
diff --git a/sfx/monsters/flower/hit2.ogg b/sfx/monsters/flower/hit2.ogg
new file mode 100644
index 00000000..b3ee420d
Binary files /dev/null and b/sfx/monsters/flower/hit2.ogg differ
diff --git a/sfx/monsters/flower/miss.ogg b/sfx/monsters/flower/miss.ogg
new file mode 100644
index 00000000..d5d913f0
Binary files /dev/null and b/sfx/monsters/flower/miss.ogg differ
-- 
cgit v1.2.3-70-g09d2