diff options
| -rw-r--r-- | LICENSE | 10 | ||||
| -rw-r--r-- | monsters.xml | 18 | ||||
| -rw-r--r-- | sfx/monsters/mushroom/die1.ogg (renamed from sfx/monsters/plushroom/die1.ogg) | bin | 9723 -> 9723 bytes | |||
| -rw-r--r-- | sfx/monsters/mushroom/die2.ogg (renamed from sfx/monsters/plushroom/die2.ogg) | bin | 10921 -> 10921 bytes | |||
| -rw-r--r-- | sfx/monsters/mushroom/spawn1.ogg (renamed from sfx/monsters/plushroom/spawn1.ogg) | bin | 21760 -> 21760 bytes | |||
| -rw-r--r-- | sfx/monsters/mushroom/spawn2.ogg (renamed from sfx/monsters/plushroom/spawn2.ogg) | bin | 24117 -> 24117 bytes |
6 files changed, 13 insertions, 15 deletions
@@ -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/plushroom/die1.ogg b/sfx/monsters/mushroom/die1.ogg Binary files differindex 02d46596..02d46596 100644 --- a/sfx/monsters/plushroom/die1.ogg +++ b/sfx/monsters/mushroom/die1.ogg diff --git a/sfx/monsters/plushroom/die2.ogg b/sfx/monsters/mushroom/die2.ogg Binary files differindex f870fbf4..f870fbf4 100644 --- a/sfx/monsters/plushroom/die2.ogg +++ b/sfx/monsters/mushroom/die2.ogg diff --git a/sfx/monsters/plushroom/spawn1.ogg b/sfx/monsters/mushroom/spawn1.ogg Binary files differindex 6247879f..6247879f 100644 --- a/sfx/monsters/plushroom/spawn1.ogg +++ b/sfx/monsters/mushroom/spawn1.ogg diff --git a/sfx/monsters/plushroom/spawn2.ogg b/sfx/monsters/mushroom/spawn2.ogg Binary files differindex a46cecf1..a46cecf1 100644 --- a/sfx/monsters/plushroom/spawn2.ogg +++ b/sfx/monsters/mushroom/spawn2.ogg |