From d0d359fa0f3aff3e4cf1d8e6ebe8fd3b8a1afbd9 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Fri, 2 May 2014 02:40:04 +0200
Subject: Moved plushroom and frostiana common sfx under the mushroom folder.

---
 LICENSE                           |  10 +++++-----
 monsters.xml                      |  18 ++++++++----------
 sfx/monsters/mushroom/die1.ogg    | Bin 0 -> 9723 bytes
 sfx/monsters/mushroom/die2.ogg    | Bin 0 -> 10921 bytes
 sfx/monsters/mushroom/spawn1.ogg  | Bin 0 -> 21760 bytes
 sfx/monsters/mushroom/spawn2.ogg  | Bin 0 -> 24117 bytes
 sfx/monsters/plushroom/die1.ogg   | Bin 9723 -> 0 bytes
 sfx/monsters/plushroom/die2.ogg   | Bin 10921 -> 0 bytes
 sfx/monsters/plushroom/spawn1.ogg | Bin 21760 -> 0 bytes
 sfx/monsters/plushroom/spawn2.ogg | Bin 24117 -> 0 bytes
 10 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 sfx/monsters/mushroom/die1.ogg
 create mode 100644 sfx/monsters/mushroom/die2.ogg
 create mode 100644 sfx/monsters/mushroom/spawn1.ogg
 create mode 100644 sfx/monsters/mushroom/spawn2.ogg
 delete mode 100644 sfx/monsters/plushroom/die1.ogg
 delete mode 100644 sfx/monsters/plushroom/die2.ogg
 delete mode 100644 sfx/monsters/plushroom/spawn1.ogg
 delete mode 100644 sfx/monsters/plushroom/spawn2.ogg

diff --git a/LICENSE b/LICENSE
index 69e7a51c..00ebb5a4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -319,11 +319,11 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     sfx/monsters/piou/hurt2.ogg (Ezili)                                     (CC BY-SA 3.0)        (Reid, Socapex)
     sfx/monsters/piou/miss1.ogg (Ezili)                                     (CC BY-SA 3.0)        (Reid, Socapex)
     sfx/monsters/piou/spawn1.ogg (Ezili)                                    (CC BY-SA 3.0)        (Reid, Socapex)
-### Plushroom
-    sfx/monsters/plushroom/die1.ogg (Reid)                                  (CC BY-SA 3.0)        (Alige, Socapex)
-    sfx/monsters/plushroom/die2.ogg (Reid)                                  (CC BY-SA 3.0)        (Alige, Socapex)
-    sfx/monsters/plushroom/spawn1.ogg (Reid)                                (CC BY-SA 3.0)        (Alige, Socapex)
-    sfx/monsters/plushroom/spawn2.ogg (Reid)                                (CC BY-SA 3.0)        (Alige, Socapex)
+### Mushroom
+    sfx/monsters/mushroom/die1.ogg (Reid)                                   (CC BY-SA 3.0)        (Alige, Socapex)
+    sfx/monsters/mushroom/die2.ogg (Reid)                                   (CC BY-SA 3.0)        (Alige, Socapex)
+    sfx/monsters/mushroom/spawn1.ogg (Reid)                                 (CC BY-SA 3.0)        (Alige, Socapex)
+    sfx/monsters/mushroom/spawn2.ogg (Reid)                                 (CC BY-SA 3.0)        (Alige, Socapex)
 ### Ratto
     sfx/monsters/ratto/die1.ogg (Cosmostrator)                              (CC BY-SA 3.0)        (Socapex)
     sfx/monsters/ratto/hit1.ogg (Cosmostrator)                              (CC BY-SA 3.0)        (Socapex)
diff --git a/monsters.xml b/monsters.xml
index b6248fde..75dd233f 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -92,20 +92,18 @@ event=""         Links the sfx to an action, like die, hit, hurt, miss, move or
     </monster>
     <monster id="9" name="Plushroom Field" targetCursor="large" sortOffsetY="70">
         <sprite>monsters/plushroom.xml</sprite>
-        <sound event="die">monsters/plushroom/die1.ogg</sound>
-        <sound event="die">monsters/plushroom/die2.ogg</sound>
-        <sound event="spawn">monsters/plushroom/spawn1.ogg</sound>
-        <sound event="spawn">monsters/plushroom/spawn2.ogg</sound>
+        <sound event="die">monsters/mushroom/die1.ogg</sound>
+        <sound event="die">monsters/mushroom/die2.ogg</sound>
+        <sound event="spawn">monsters/mushroom/spawn1.ogg</sound>
+        <sound event="spawn">monsters/mushroom/spawn2.ogg</sound>
     </monster>
     <monster id="10" name="Frostiana" targetCursor="small">
         <sprite>monsters/frostiana.xml</sprite>
-        <sound event="die">monsters/frostiana/die1.ogg</sound>
-        <sound event="die">monsters/frostiana/die2.ogg</sound>
+        <sound event="die">monsters/mushroom/die1.ogg</sound>
+        <sound event="die">monsters/mushroom/die2.ogg</sound>
         <sound event="hit">monsters/frostiana/hit1.ogg</sound>
         <sound event="hit">monsters/frostiana/hit2.ogg</sound>
-        <sound event="hurt">monsters/frostiana/hurt1.ogg</sound>
-        <sound event="hurt">monsters/frostiana/hurt2.ogg</sound>
-        <sound event="spawn">monsters/frostiana/spawn1.ogg</sound>
-        <sound event="spawn">monsters/frostiana/spawn2.ogg</sound>
+        <sound event="spawn">monsters/mushroom/spawn1.ogg</sound>
+        <sound event="spawn">monsters/mushroom/spawn2.ogg</sound>
     </monster>
 </monsters>
diff --git a/sfx/monsters/mushroom/die1.ogg b/sfx/monsters/mushroom/die1.ogg
new file mode 100644
index 00000000..02d46596
Binary files /dev/null and b/sfx/monsters/mushroom/die1.ogg differ
diff --git a/sfx/monsters/mushroom/die2.ogg b/sfx/monsters/mushroom/die2.ogg
new file mode 100644
index 00000000..f870fbf4
Binary files /dev/null and b/sfx/monsters/mushroom/die2.ogg differ
diff --git a/sfx/monsters/mushroom/spawn1.ogg b/sfx/monsters/mushroom/spawn1.ogg
new file mode 100644
index 00000000..6247879f
Binary files /dev/null and b/sfx/monsters/mushroom/spawn1.ogg differ
diff --git a/sfx/monsters/mushroom/spawn2.ogg b/sfx/monsters/mushroom/spawn2.ogg
new file mode 100644
index 00000000..a46cecf1
Binary files /dev/null and b/sfx/monsters/mushroom/spawn2.ogg differ
diff --git a/sfx/monsters/plushroom/die1.ogg b/sfx/monsters/plushroom/die1.ogg
deleted file mode 100644
index 02d46596..00000000
Binary files a/sfx/monsters/plushroom/die1.ogg and /dev/null differ
diff --git a/sfx/monsters/plushroom/die2.ogg b/sfx/monsters/plushroom/die2.ogg
deleted file mode 100644
index f870fbf4..00000000
Binary files a/sfx/monsters/plushroom/die2.ogg and /dev/null differ
diff --git a/sfx/monsters/plushroom/spawn1.ogg b/sfx/monsters/plushroom/spawn1.ogg
deleted file mode 100644
index 6247879f..00000000
Binary files a/sfx/monsters/plushroom/spawn1.ogg and /dev/null differ
diff --git a/sfx/monsters/plushroom/spawn2.ogg b/sfx/monsters/plushroom/spawn2.ogg
deleted file mode 100644
index a46cecf1..00000000
Binary files a/sfx/monsters/plushroom/spawn2.ogg and /dev/null differ
-- 
cgit v1.2.3-70-g09d2