Merge branch 'spider-sfx' into 'master'

1 die, 3 hits and 5 moves. Removed scorpion sounds and replaced with spider in monsters.xml

See merge request evol/clientdata!162

11 files changed, 19 insertions, 5 deletions

diff --git a/LICENSE b/LICENSE
index 7e1b34a3..00fa8590 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1204,6 +1204,16 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     sfx/monsters/scorpion/hit3.ogg (LEGACY)                                 (CC BY-SA 3.0)        (Micksha)
     sfx/monsters/scorpion/hit4.ogg (LEGACY)                                 (CC BY-SA 3.0)        (Micksha)
     sfx/monsters/scorpion/miss1.ogg (LEGACY)                                (CC BY-SA 3.0)        (Micksha)
+### Spider
+    sfx/monsters/spider/die1.ogg (alpha)                                    (CC BY-SA 3.0)        (-)
+    sfx/monsters/spider/hit1.ogg (alpha)                                    (CC BY-SA 3.0)        (-)
+    sfx/monsters/spider/hit2.ogg (alpha)                                    (CC BY-SA 3.0)        (-)
+    sfx/monsters/spider/hit3.ogg (alpha)                                    (CC BY-SA 3.0)        (-)
+    sfx/monsters/spider/move1.ogg (alpha)                                   (CC BY-SA 3.0)        (-)
+    sfx/monsters/spider/move2.ogg (alpha)                                   (CC BY-SA 3.0)        (-)
+    sfx/monsters/spider/move3.ogg (alpha)                                   (CC BY-SA 3.0)        (-)
+    sfx/monsters/spider/move4.ogg (alpha)                                   (CC BY-SA 3.0)        (-)
+    sfx/monsters/spider/move5.ogg (alpha)                                   (CC BY-SA 3.0)        (-)
 ### Squirrel
     sfx/monsters/squirrel/hit1.ogg (LEGACY)                                 (CC BY-SA 3.0)        (Micksha)
     sfx/monsters/squirrel/hit2.ogg (LEGACY)                                 (CC BY-SA 3.0)        (Micksha)
diff --git a/monsters.xml b/monsters.xml
index ce80df7d..30fa29c0 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -255,11 +255,15 @@ event=""         Links the sfx to an action, like die, hit, hurt, miss, move or
     </monster>
     <monster id="1044" name="Spider" walkType="walk" targetCursor="small">
         <sprite>monsters/spider.xml</sprite>
-        <sound event="hit">monsters/scorpion/hit1.ogg</sound>
-        <sound event="hit">monsters/scorpion/hit2.ogg</sound>
-        <sound event="hit">monsters/scorpion/hit3.ogg</sound>
-        <sound event="hit">monsters/scorpion/hit4.ogg</sound>
-        <sound event="miss">monsters/scorpion/miss1.ogg</sound>
+        <sound event="die">monsters/spider/die1.ogg</sound>
+        <sound event="hit">monsters/spider/hit1.ogg</sound>
+        <sound event="hit">monsters/spider/hit2.ogg</sound>
+        <sound event="hit">monsters/spider/hit3.ogg</sound>
+        <sound event="move">monsters/spider/move1.ogg</sound>
+        <sound event="move">monsters/spider/move2.ogg</sound>
+        <sound event="move">monsters/spider/move3.ogg</sound>
+        <sound event="move">monsters/spider/move4.ogg</sound>
+        <sound event="move">monsters/spider/move5.ogg</sound>
     </monster>
     <monster id="1045" name="Diamond Vein" targetCursor="small">
         <sprite>monsters/vein-gem.xml</sprite>
diff --git a/sfx/monsters/spider/die1.ogg b/sfx/monsters/spider/die1.ogg
new file mode 100644
index 00000000..d6a3feeb
--- /dev/null
+++ b/sfx/monsters/spider/die1.ogg
diff --git a/sfx/monsters/spider/hit1.ogg b/sfx/monsters/spider/hit1.ogg
new file mode 100644
index 00000000..6203f0d1
--- /dev/null
+++ b/sfx/monsters/spider/hit1.ogg
diff --git a/sfx/monsters/spider/hit2.ogg b/sfx/monsters/spider/hit2.ogg
new file mode 100644
index 00000000..36b8f0d2
--- /dev/null
+++ b/sfx/monsters/spider/hit2.ogg
diff --git a/sfx/monsters/spider/hit3.ogg b/sfx/monsters/spider/hit3.ogg
new file mode 100644
index 00000000..60bd11d6
--- /dev/null
+++ b/sfx/monsters/spider/hit3.ogg
diff --git a/sfx/monsters/spider/move1.ogg b/sfx/monsters/spider/move1.ogg
new file mode 100644
index 00000000..69daeda8
--- /dev/null
+++ b/sfx/monsters/spider/move1.ogg
diff --git a/sfx/monsters/spider/move2.ogg b/sfx/monsters/spider/move2.ogg
new file mode 100644
index 00000000..e5db584c
--- /dev/null
+++ b/sfx/monsters/spider/move2.ogg
diff --git a/sfx/monsters/spider/move3.ogg b/sfx/monsters/spider/move3.ogg
new file mode 100644
index 00000000..d71714ed
--- /dev/null
+++ b/sfx/monsters/spider/move3.ogg
diff --git a/sfx/monsters/spider/move4.ogg b/sfx/monsters/spider/move4.ogg
new file mode 100644
index 00000000..6368d2f9
--- /dev/null
+++ b/sfx/monsters/spider/move4.ogg
diff --git a/sfx/monsters/spider/move5.ogg b/sfx/monsters/spider/move5.ogg
new file mode 100644
index 00000000..3f163bad
--- /dev/null
+++ b/sfx/monsters/spider/move5.ogg