From 21367f905b4f84c347eb38bed4e9c1c188be3999 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Fri, 1 Dec 2006 16:54:19 +0000
Subject: Monster sound effect patch

---
 graphics/sprites/player_male_base.xml |  10 +++++--
 monsters.xml                          |  52 ++++++++++++++++++++++++++--------
 sfx/CMakeLists.txt                    |  25 +++++++++++++++-
 sfx/Makefile.am                       |  33 +++++++++++++++++----
 sfx/bat-dying1.ogg                    | Bin 0 -> 7194 bytes
 sfx/bat-hit1.ogg                      | Bin 0 -> 7051 bytes
 sfx/fire-goblin-hit1.ogg              | Bin 0 -> 7067 bytes
 sfx/fire-goblin-hit2.ogg              | Bin 0 -> 7663 bytes
 sfx/fire-goblin-miss1.ogg             | Bin 0 -> 6496 bytes
 sfx/flower-hit1.ogg                   | Bin 0 -> 8893 bytes
 sfx/flower-hit2.ogg                   | Bin 0 -> 8864 bytes
 sfx/flower-miss1.ogg                  | Bin 0 -> 9202 bytes
 sfx/fluffy-hit1.ogg                   | Bin 0 -> 7186 bytes
 sfx/fluffy-hit2.ogg                   | Bin 0 -> 7654 bytes
 sfx/fluffy-hit3.ogg                   | Bin 0 -> 7665 bytes
 sfx/fluffy-hurt1.ogg                  | Bin 0 -> 7051 bytes
 sfx/fluffy-miss1.ogg                  | Bin 0 -> 7926 bytes
 sfx/knife-hit1.ogg                    | Bin 0 -> 7710 bytes
 sfx/knife-miss1.ogg                   | Bin 0 -> 7602 bytes
 sfx/scorpion-hit1.ogg                 | Bin 0 -> 7535 bytes
 sfx/scorpion-hit2.ogg                 | Bin 0 -> 7024 bytes
 sfx/scorpion-hit3.ogg                 | Bin 0 -> 7253 bytes
 sfx/scorpion-hit4.ogg                 | Bin 0 -> 7778 bytes
 sfx/scorpion-miss1.ogg                | Bin 0 -> 7658 bytes
 sfx/short-sword-hit1.ogg              | Bin 0 -> 7607 bytes
 sfx/short-sword-miss1.ogg             | Bin 0 -> 9946 bytes
 sfx/shroom-hit1.ogg                   | Bin 0 -> 7215 bytes
 sfx/slime-hit1.ogg                    | Bin 0 -> 14149 bytes
 28 files changed, 100 insertions(+), 20 deletions(-)
 create mode 100644 sfx/bat-dying1.ogg
 create mode 100644 sfx/bat-hit1.ogg
 create mode 100644 sfx/fire-goblin-hit1.ogg
 create mode 100644 sfx/fire-goblin-hit2.ogg
 create mode 100644 sfx/fire-goblin-miss1.ogg
 create mode 100644 sfx/flower-hit1.ogg
 create mode 100644 sfx/flower-hit2.ogg
 create mode 100644 sfx/flower-miss1.ogg
 create mode 100644 sfx/fluffy-hit1.ogg
 create mode 100644 sfx/fluffy-hit2.ogg
 create mode 100644 sfx/fluffy-hit3.ogg
 create mode 100644 sfx/fluffy-hurt1.ogg
 create mode 100644 sfx/fluffy-miss1.ogg
 create mode 100644 sfx/knife-hit1.ogg
 create mode 100644 sfx/knife-miss1.ogg
 create mode 100644 sfx/scorpion-hit1.ogg
 create mode 100644 sfx/scorpion-hit2.ogg
 create mode 100644 sfx/scorpion-hit3.ogg
 create mode 100644 sfx/scorpion-hit4.ogg
 create mode 100644 sfx/scorpion-miss1.ogg
 create mode 100644 sfx/short-sword-hit1.ogg
 create mode 100644 sfx/short-sword-miss1.ogg
 create mode 100644 sfx/shroom-hit1.ogg
 create mode 100644 sfx/slime-hit1.ogg

diff --git a/graphics/sprites/player_male_base.xml b/graphics/sprites/player_male_base.xml
index 3ac61ed0..5df564b9 100644
--- a/graphics/sprites/player_male_base.xml
+++ b/graphics/sprites/player_male_base.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/player_male_base.png" width="64" height="64" />
+	<imageset name="base" 
+		src=      "graphics/sprites/player_male_base.png" 
+		width=    "64" 
+		height=   "64" 
+	/>
 
-	<action name="stand" imageset="base">
+	<action name   =    "stand" 
+				imageset 	 = "base"
+				>
 		<animation direction="down">
 		  <frame index="0" />
 		</animation>
diff --git a/monsters.xml b/monsters.xml
index 55c1bce8..7b744d72 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1,39 +1,52 @@
 <monsters>
    	<monster id="0" name="Maggot">
     	<sprite>monster-maggot.xml</sprite>
-       	<sound event="hit">monster-maggot-hit.ogg</sound>
-       	<sound event="miss">monster-maggot-miss.ogg</sound>
-       	<sound event="hurt">monster-maggot-hurt.ogg</sound>
-       	<sound event="die">monster-maggot-die-1.ogg</sound>
-       	<sound event="die">monster-maggot-die-2.ogg</sound>
    	</monster>
-   
+
    	<monster id="1" name="Scorpion">
-       <sprite>monster-scorpion.xml</sprite>
+        <sprite>monster-scorpion.xml</sprite>
+        <sound event="hit">scorpion-hit1.ogg</sound>
+        <sound event="hit">scorpion-hit2.ogg</sound>
+        <sound event="hit">scorpion-hit3.ogg</sound>
+        <sound event="hit">scorpion-hit4.ogg</sound>
+        <sound event="miss">scorpion-miss1.ogg</sound>
    	</monster>
-   
+
    	<monster id="2" name="Red Scorpion">
    		<sprite>monster-scorpion-red.xml</sprite>
+        <sound event="hit">scorpion-hit1.ogg</sound>
+        <sound event="hit">scorpion-hit2.ogg</sound>
+        <sound event="hit">scorpion-hit3.ogg</sound>
+        <sound event="hit">scorpion-hit4.ogg</sound>
+        <sound event="miss">scorpion-miss1.ogg</sound>
    	</monster>
-   
+
    	<monster id="3" name="Green Slime">
    		<sprite>monster-slime-green.xml</sprite>
+   		<sound event="hit">slime-hit1.ogg</sound>
    	</monster>
-   
+
 	<monster id="4" name="Giant Maggot">
 		<sprite>monster-maggot-giant.xml</sprite>
    	</monster>
-   	
+
    	<monster id="5" name="Yellow Slime">
    		<sprite>monster-slime-yellow.xml</sprite>
+   		<sound event="hit">slime-hit1.ogg</sound>
    	</monster>
 
     <monster id="6" name="Red Slime">
         <sprite>monster-slime-red.xml</sprite>
+        <sound event="hit">slime-hit1.ogg</sound>
     </monster>
 
    	<monster id="7" name="Black Scorpion">
    		<sprite>monster-scorpion-black.xml</sprite>
+   		<sound event="hit">scorpion-hit1.ogg</sound>
+        <sound event="hit">scorpion-hit2.ogg</sound>
+        <sound event="hit">scorpion-hit3.ogg</sound>
+        <sound event="hit">scorpion-hit4.ogg</sound>
+        <sound event="miss">scorpion-miss1.ogg</sound>
    	</monster>
 
    	<monster id="8" name="Snake">
@@ -42,6 +55,9 @@
 
    	<monster id="9" name="Fire Goblin">
    		<sprite>monster-goblin-fire.xml</sprite>
+   		<sound event="hit">fire-goblin-hit1.ogg</sound>
+   		<sound event="hit">fire-goblin-hit2.ogg</sound>
+   		<sound event="miss">fire-goblin-miss1.ogg</sound>
    	</monster>
 
     <monster id="10" name="Spider">
@@ -50,10 +66,14 @@
 
     <monster id="11" name="Evil Mushroom">
        <sprite>monster-mushroom-red.xml</sprite>
+       <sound event="hit">shroom-hit1.ogg</sound>
     </monster>
 
     <monster id="12" name="Flower">
        <sprite>monster-flower.xml</sprite>
+       <sound event="hit">flower-hit1.ogg</sound>
+       <sound event="hit">flower-hit2.ogg</sound>
+       <sound event="miss">flower-miss1.ogg</sound>
     </monster>
 
     <monster id="13" name="Santa Slime">
@@ -66,6 +86,8 @@
 
     <monster id="15" name="Bat">
        <sprite>monster-bat.xml</sprite>
+       <sound event="die">bat-dying1.ogg</sound>
+       <sound event="hit">bat-hit1.ogg</sound>
     </monster>
 
     <monster id="16" name="Pinkie">
@@ -74,10 +96,16 @@
 
     <monster id="17" name="Spiky Mushroom">
        <sprite>monster-mushroom-spiky.xml</sprite>
+       <sound event="hit">shroom-hit1.ogg</sound>
     </monster>
 
     <monster id="18" name="Fluffy">
        <sprite>monster-fluffy.xml</sprite>
+       <sound event="hit">fluffy-hit1.ogg</sound>
+       <sound event="hit">fluffy-hit2.ogg</sound>
+       <sound event="hit">fluffy-hit3.ogg</sound>
+       <sound event="miss">fluffy-miss1.ogg</sound>
+       <sound event="hurt">fluffy-hurt1.ogg</sound>
     </monster>
 
     <monster id="19" name="Cave Snake">
@@ -95,5 +123,5 @@
     <monster id="22" name="Poison Skull">
         <sprite>monster-skull-poison.xml</sprite>
     </monster>
-   
+
 </monsters>
\ No newline at end of file
diff --git a/sfx/CMakeLists.txt b/sfx/CMakeLists.txt
index 5edc9983..3ae4c385 100644
--- a/sfx/CMakeLists.txt
+++ b/sfx/CMakeLists.txt
@@ -1,7 +1,30 @@
 SET(FILES
+    bat-hit1.ogg
     bow_shoot_1.ogg
+    fire-goblin-hit1.ogg
+    fire-goblin-hit2.ogg
+    fire-goblin-miss1.ogg
     fist-swish.ogg
+    flower-hit1.ogg
+    flower-hit2.ogg
+    flower-miss1.ogg
+    fluffy-hit1.ogg
+    fluffy-hit2.ogg
+    fluffy-hit3.ogg
+    fluffy-hurt1.ogg
+    fluffy-miss1.ogg
+    knife-hit1.ogg
+    knife-miss1.ogg
     levelup.ogg
+    scorpion-hit1.ogg
+    scorpion-hit2.ogg
+    scorpion-hit3.ogg
+    scorpion-hit4.ogg
+    scorpion-miss1.ogg
+    short-sword-hit1.ogg
+    short-sword-miss1.ogg
+    shroom-hit1.ogg
+    slime-hit1.ogg
     )
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/sfx)
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/sfx)
\ No newline at end of file
diff --git a/sfx/Makefile.am b/sfx/Makefile.am
index 74a1d3ea..f7461f2b 100644
--- a/sfx/Makefile.am
+++ b/sfx/Makefile.am
@@ -1,10 +1,33 @@
 
 sfxdir = $(pkgdatadir)/data/sfx
 
-sfx_DATA =			\
-	bow_shoot_1.ogg		\
-	fist-swish.ogg		\
-	levelup.ogg
+sfx_DATA =					\
+    bat-hit1.ogg			\
+    bow_shoot_1.ogg			\
+    fire-goblin-hit1.ogg	\
+    fire-goblin-hit2.ogg	\
+    fire-goblin-miss1.ogg	\
+    fist-swish.ogg			\
+    flower-hit1.ogg			\
+    flower-hit2.ogg			\
+    flower-miss1.ogg		\
+    fluffy-hit1.ogg			\
+    fluffy-hit2.ogg			\
+    fluffy-hit3.ogg			\
+    fluffy-hurt1.ogg		\
+    fluffy-miss1.ogg		\
+    knife-hit1.ogg			\
+    knife-miss1.ogg			\
+    levelup.ogg				\
+    scorpion-hit1.ogg		\
+    scorpion-hit2.ogg		\
+    scorpion-hit3.ogg		\
+    scorpion-hit4.ogg		\
+    scorpion-miss1.ogg		\
+    short-sword-hit1.ogg	\
+    short-sword-miss1.ogg	\
+    shroom-hit1.ogg			\
+    slime-hit1.ogg
 
 EXTRA_DIST =			\
-	$(sfx_DATA)
+	$(sfx_DATA)
\ No newline at end of file
diff --git a/sfx/bat-dying1.ogg b/sfx/bat-dying1.ogg
new file mode 100644
index 00000000..e208814d
Binary files /dev/null and b/sfx/bat-dying1.ogg differ
diff --git a/sfx/bat-hit1.ogg b/sfx/bat-hit1.ogg
new file mode 100644
index 00000000..9e66fe12
Binary files /dev/null and b/sfx/bat-hit1.ogg differ
diff --git a/sfx/fire-goblin-hit1.ogg b/sfx/fire-goblin-hit1.ogg
new file mode 100644
index 00000000..d1cd2eaf
Binary files /dev/null and b/sfx/fire-goblin-hit1.ogg differ
diff --git a/sfx/fire-goblin-hit2.ogg b/sfx/fire-goblin-hit2.ogg
new file mode 100644
index 00000000..4858e9b2
Binary files /dev/null and b/sfx/fire-goblin-hit2.ogg differ
diff --git a/sfx/fire-goblin-miss1.ogg b/sfx/fire-goblin-miss1.ogg
new file mode 100644
index 00000000..0d866e22
Binary files /dev/null and b/sfx/fire-goblin-miss1.ogg differ
diff --git a/sfx/flower-hit1.ogg b/sfx/flower-hit1.ogg
new file mode 100644
index 00000000..05e79459
Binary files /dev/null and b/sfx/flower-hit1.ogg differ
diff --git a/sfx/flower-hit2.ogg b/sfx/flower-hit2.ogg
new file mode 100644
index 00000000..e71ae663
Binary files /dev/null and b/sfx/flower-hit2.ogg differ
diff --git a/sfx/flower-miss1.ogg b/sfx/flower-miss1.ogg
new file mode 100644
index 00000000..6b35642b
Binary files /dev/null and b/sfx/flower-miss1.ogg differ
diff --git a/sfx/fluffy-hit1.ogg b/sfx/fluffy-hit1.ogg
new file mode 100644
index 00000000..5d75b5db
Binary files /dev/null and b/sfx/fluffy-hit1.ogg differ
diff --git a/sfx/fluffy-hit2.ogg b/sfx/fluffy-hit2.ogg
new file mode 100644
index 00000000..ebd965b3
Binary files /dev/null and b/sfx/fluffy-hit2.ogg differ
diff --git a/sfx/fluffy-hit3.ogg b/sfx/fluffy-hit3.ogg
new file mode 100644
index 00000000..9125e139
Binary files /dev/null and b/sfx/fluffy-hit3.ogg differ
diff --git a/sfx/fluffy-hurt1.ogg b/sfx/fluffy-hurt1.ogg
new file mode 100644
index 00000000..9e66fe12
Binary files /dev/null and b/sfx/fluffy-hurt1.ogg differ
diff --git a/sfx/fluffy-miss1.ogg b/sfx/fluffy-miss1.ogg
new file mode 100644
index 00000000..65babec5
Binary files /dev/null and b/sfx/fluffy-miss1.ogg differ
diff --git a/sfx/knife-hit1.ogg b/sfx/knife-hit1.ogg
new file mode 100644
index 00000000..6978b832
Binary files /dev/null and b/sfx/knife-hit1.ogg differ
diff --git a/sfx/knife-miss1.ogg b/sfx/knife-miss1.ogg
new file mode 100644
index 00000000..5a8f3143
Binary files /dev/null and b/sfx/knife-miss1.ogg differ
diff --git a/sfx/scorpion-hit1.ogg b/sfx/scorpion-hit1.ogg
new file mode 100644
index 00000000..fbba78ec
Binary files /dev/null and b/sfx/scorpion-hit1.ogg differ
diff --git a/sfx/scorpion-hit2.ogg b/sfx/scorpion-hit2.ogg
new file mode 100644
index 00000000..1f6b51d1
Binary files /dev/null and b/sfx/scorpion-hit2.ogg differ
diff --git a/sfx/scorpion-hit3.ogg b/sfx/scorpion-hit3.ogg
new file mode 100644
index 00000000..860b9045
Binary files /dev/null and b/sfx/scorpion-hit3.ogg differ
diff --git a/sfx/scorpion-hit4.ogg b/sfx/scorpion-hit4.ogg
new file mode 100644
index 00000000..2ba47751
Binary files /dev/null and b/sfx/scorpion-hit4.ogg differ
diff --git a/sfx/scorpion-miss1.ogg b/sfx/scorpion-miss1.ogg
new file mode 100644
index 00000000..c79c60f4
Binary files /dev/null and b/sfx/scorpion-miss1.ogg differ
diff --git a/sfx/short-sword-hit1.ogg b/sfx/short-sword-hit1.ogg
new file mode 100644
index 00000000..8b74fd4d
Binary files /dev/null and b/sfx/short-sword-hit1.ogg differ
diff --git a/sfx/short-sword-miss1.ogg b/sfx/short-sword-miss1.ogg
new file mode 100644
index 00000000..47c52814
Binary files /dev/null and b/sfx/short-sword-miss1.ogg differ
diff --git a/sfx/shroom-hit1.ogg b/sfx/shroom-hit1.ogg
new file mode 100644
index 00000000..52d495fe
Binary files /dev/null and b/sfx/shroom-hit1.ogg differ
diff --git a/sfx/slime-hit1.ogg b/sfx/slime-hit1.ogg
new file mode 100644
index 00000000..2e779c7d
Binary files /dev/null and b/sfx/slime-hit1.ogg differ
-- 
cgit v1.2.3-60-g2f50