diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
| commit | 9b8362e5767b9b0fb4251c16c80669b288f06648 (patch) | |
| tree | 4b78772e1b17ce69cd877f49edf3d2a31b4d9920 /monsters.xml | |
| parent | bbed5a765c152fee8a4ed8adc78423d9737c4d46 (diff) | |
| parent | 5409675d5d3cba9f4a55ca6a783d038eb69f9ccc (diff) | |
| download | clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.gz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.bz2 clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.xz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
monsters.xml
Diffstat (limited to 'monsters.xml')
| -rw-r--r-- | monsters.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/monsters.xml b/monsters.xml index 977602e0..466d0a81 100644 --- a/monsters.xml +++ b/monsters.xml @@ -507,4 +507,24 @@ <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound> <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound> </monster> + <monster id="106" name="Angry Fire Goblin"> + <sprite>monsters/goblin-fire.xml</sprite> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> + <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> + <particlefx>graphics/particles/monster-angry-fire-goblin.particle.xml</particlefx> + <!-- The particle-effect parameter is kept for 0.5.x compatibility --> + <attack id="1" effect-id="400" particle-effect="graphics/particles/monster-goblin-firebreath.particle.xml"/> + </monster> + <monster id="107" name="Angry Sea Slime"> + <sprite>monsters/slime.xml|#4ca1a0,ffffff</sprite> + <sprite>monsters/accessories/slime-seajelly.xml|#4Ca16e,ffffff</sprite> + <particlefx>graphics/particles/monster-angry-sea-slime.particle.xml</particlefx> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + </monster> + <monster id="108" name="Angry Green Slime"> + <sprite>monsters/slime.xml|#72982c,ffffff</sprite> + <particlefx>graphics/particles/monster-angry-green-slime.particle.xml</particlefx> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + </monster> </monsters> |