Merge branch 'master' of git@gitorious.org:tmwdata/mainline

1 files changed, 113 insertions, 39 deletions

diff --git a/monsters.xml b/monsters.xml
index ace00417..d424864d 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -2,7 +2,7 @@
 <monsters>
 
     <monster id="0" name="Maggot" targetCursor="small">
-        <sprite>monster-maggot.xml</sprite>
+        <sprite>monsters/monster-maggot.xml</sprite>
         <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
         <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
         <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
@@ -51,7 +51,7 @@
     </monster>
 
     <monster id="1" name="Scorpion">
-        <sprite>monster-scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite>
+        <sprite>monsters/monster-scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite>
         <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
@@ -105,7 +105,7 @@
     </monster>
 
     <monster id="2" name="Red Scorpion">
-        <sprite>monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite>
+        <sprite>monsters/monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite>
         <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
@@ -152,7 +152,7 @@
     </monster>
 
     <monster id="3" name="Green Slime">
-        <sprite>monster-slime.xml|#72982c,ffffff</sprite>
+        <sprite>monsters/monster-slime.xml|#72982c,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="502" percent="2"/>
         <drop item="513" percent="1"/>
@@ -187,7 +187,7 @@
     </monster>
 
     <monster id="4" name="Giant Maggot" targetCursor="large">
-        <sprite>monster-maggot-giant.xml</sprite>
+        <sprite>monsters/monster-maggot-giant.xml</sprite>
         <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
         <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
         <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
@@ -215,7 +215,7 @@
     </monster>
 
     <monster id="5" name="Yellow Slime">
-        <sprite>monster-slime.xml|#b47f00,ffffff</sprite>
+        <sprite>monsters/monster-slime.xml|#b47f00,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="534" percent="2"/>
         <drop item="519" percent="1"/>
@@ -238,7 +238,7 @@
     </monster>
 
     <monster id="6" name="Red Slime">
-        <sprite>monster-slime.xml|#7e0000,ffffff</sprite>
+        <sprite>monsters/monster-slime.xml|#7e0000,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="1201" percent="3"/>
         <drop item="509" percent="1.1"/>
@@ -264,7 +264,7 @@
     </monster>
 
     <monster id="7" name="Black Scorpion">
-        <sprite>monster-scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite>
+        <sprite>monsters/monster-scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite>
         <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
@@ -289,7 +289,7 @@
     </monster>
 
     <monster id="8" name="Snake">
-        <sprite>monster-snake.xml|#664d28,a6673a,dbbc86,ffffff</sprite>
+        <sprite>monsters/monster-snake.xml|#664d28,a6673a,dbbc86,ffffff</sprite>
         <attributes
             hp="20"
             size="4"
@@ -306,7 +306,7 @@
     </monster>
 
     <monster id="9" name="Fire Goblin">
-        <sprite>monster-goblin-fire.xml</sprite>
+        <sprite>monsters/monster-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>
@@ -354,7 +354,7 @@
     </monster>
 
     <monster id="10" name="Spider">
-        <sprite>monster-spider.xml</sprite>
+        <sprite>monsters/monster-spider.xml</sprite>
         <drop item="537" percent="5"/>
         <drop item="535" percent="1"/>
         <attributes
@@ -373,7 +373,7 @@
     </monster>
 
     <monster id="11" name="Evil Mushroom">
-        <sprite>monster-mushroom-red.xml</sprite>
+        <sprite>monsters/monster-mushroom-red.xml</sprite>
         <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
         <drop item="535" percent="5"/>
         <drop item="540" percent="0.1"/>
@@ -395,7 +395,7 @@
     </monster>
 
     <monster id="12" name="Flower">
-        <sprite>monster-flower.xml</sprite>
+        <sprite>monsters/monster-flower.xml</sprite>
         <sound event="hit">monsters/flower/flower-hit1.ogg</sound>
         <sound event="hit">monsters/flower/flower-hit2.ogg</sound>
         <sound event="miss">monsters/flower/flower-miss1.ogg</sound>
@@ -429,7 +429,7 @@
     </monster>
 
     <monster id="13" name="Santa Slime">
-        <sprite>monster-slime-santa.xml</sprite>
+        <sprite>monsters/monster-slime-santa.xml</sprite>
         <drop item="512" percent="8"/>
         <drop item="513" percent="7"/>
         <drop item="514" percent="6"/>
@@ -452,7 +452,7 @@
     </monster>
 
     <monster id="14" name="Rudolph Slime">
-        <sprite>monster-slime-rudolph.xml</sprite>
+        <sprite>monsters/monster-slime-rudolph.xml</sprite>
         <drop item="504" percent="8"/>
         <drop item="506" percent="5"/>
         <drop item="508" percent="2"/>
@@ -476,7 +476,7 @@
     </monster>
 
     <monster id="15" name="Bat">
-        <sprite>monster-bat.xml</sprite>
+        <sprite>monsters/monster-bat.xml</sprite>
         <sound event="die">monsters/bat/bat-dying1.ogg</sound>
         <sound event="hit">monsters/bat/bat-hit1.ogg</sound>
         <drop item="505" percent="8"/>
@@ -501,7 +501,7 @@
     </monster>
 
     <monster id="16" name="Pinkie" targetCursor="small">
-        <sprite>monster-pinkie.xml</sprite>
+        <sprite>monsters/monster-pinkie.xml</sprite>
         <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound>
         <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound>
         <drop item="614" percent="8"/>
@@ -521,7 +521,7 @@
     </monster>
 
     <monster id="17" name="Spiky Mushroom">
-        <sprite>monster-mushroom-spiky.xml</sprite>
+        <sprite>monsters/monster-mushroom-spiky.xml</sprite>
         <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
         <drop item="567" percent="8"/>
         <drop item="501" percent="1.5"/>
@@ -543,7 +543,7 @@
     </monster>
 
     <monster id="18" name="Fluffy">
-        <sprite>monster-fluffy.xml</sprite>
+        <sprite>monsters/monster-fluffy.xml</sprite>
         <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound>
@@ -568,7 +568,7 @@
     </monster>
 
     <monster id="19" name="Cave Snake">
-        <sprite>monster-snake-cave.xml</sprite>
+        <sprite>monsters/monster-snake-cave.xml</sprite>
         <sound event="hit">monsters/cavesnake/cavesnake-hit1.ogg</sound>
         <drop item="612" percent="8"/>
         <drop item="610" percent="0.1"/>
@@ -588,7 +588,7 @@
     </monster>
 
     <monster id="20" name="Jack O">
-        <sprite>monster-ghost-pumpkin.xml</sprite>
+        <sprite>monsters/monster-ghost-pumpkin.xml</sprite>
         <attributes
             hp="20"
             size="4"
@@ -605,7 +605,7 @@
     </monster>
 
     <monster id="21" name="Fire Skull">
-        <sprite>monster-skull-fire.xml</sprite>
+        <sprite>monsters/monster-skull-fire.xml</sprite>
         <drop item="621" percent="0.1"/>
         <drop item="540" percent="1.5"/>
         <attributes
@@ -624,7 +624,7 @@
     </monster>
 
     <monster id="22" name="Poison Skull">
-        <sprite>monster-skull-poison.xml</sprite>
+        <sprite>monsters/monster-skull-poison.xml</sprite>
         <drop item="621" percent="0.1"/>
         <drop item="540" percent="1.5"/>
         <attributes
@@ -643,7 +643,7 @@
     </monster>
 
     <monster id="23" name="Log Head">
-        <sprite>monster-logmonster.xml</sprite>
+        <sprite>monsters/monster-logmonster.xml</sprite>
         <sound event="hurt">monsters/loghead/loghead-hurt1.ogg</sound>
         <sound event="hurt">monsters/loghead/loghead-hurt2.ogg</sound>
         <sound event="hurt">monsters/loghead/loghead-hurt3.ogg</sound>
@@ -666,7 +666,7 @@
     </monster>
 
     <monster id="24" name="Mountain Snake">
-        <sprite>monster-snake.xml|#585b39,a67c5d,dbc9a9,ffffff</sprite>
+        <sprite>monsters/monster-snake.xml|#585b39,a67c5d,dbc9a9,ffffff</sprite>
         <attributes
             hp="20"
             size="4"
@@ -683,7 +683,7 @@
     </monster>
 
     <monster id="25" name="Easter Fluffy">
-        <sprite>monster-fluffy.xml</sprite>
+        <sprite>monsters/monster-fluffy.xml</sprite>
         <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound>
@@ -705,7 +705,7 @@
     </monster>
 
     <monster id="26" name="Mouboo">
-        <sprite>monster-mouboo.xml</sprite>
+        <sprite>monsters/monster-mouboo.xml</sprite>
         <attributes
             hp="20"
             size="4"
@@ -790,7 +790,7 @@
     </monster>
     
     <monster id="31" name="Sea Slime">
-        <sprite>monster-slime.xml|#4ca1a0,ffffff</sprite>
+        <sprite>monsters/monster-slime.xml|#4ca1a0,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <attributes
             hp="20"
@@ -808,7 +808,7 @@
     </monster>
 
     <monster id="32" name="Grass Snake">
-        <sprite>monster-snake.xml|#205839,60a65d,80dba9,ffffff</sprite>
+        <sprite>monsters/monster-snake.xml|#205839,60a65d,80dba9,ffffff</sprite>
         <attributes
             hp="20"
             size="4"
@@ -825,7 +825,7 @@
     </monster>
 
     <monster id="33" name="Silkworm">
-        <sprite>monster-silkworm.xml|#807d20,e0dac0;#c0a830</sprite>
+        <sprite>monsters/monster-silkworm.xml|#807d20,e0dac0;#c0a830</sprite>
         <attributes
             hp="20"
             size="4"
@@ -842,7 +842,7 @@
     </monster>
 
     <monster id="34" name="Zombie">
-        <sprite>monster-zombie.xml</sprite>
+        <sprite>monsters/monster-zombie.xml</sprite>
         <sound event="move">monsters/zombie/zombie-move1.ogg</sound>
         <sound event="move">monsters/zombie/zombie-move2.ogg</sound>
         <sound event="hit">monsters/zombie/zombie-hit1.ogg</sound>
@@ -882,7 +882,7 @@
     </monster>
 
     <monster id="36" name="Squirrel">
-        <sprite>monster-squirrel.xml</sprite>
+        <sprite>monsters/monster-squirrel.xml</sprite>
         <sound event="hurt">monsters/squirrel/squirrel-hurt1.ogg</sound>
         <sound event="hurt">monsters/squirrel/squirrel-hurt2.ogg</sound>
         <sound event="die">monsters/squirrel/squirrel-die1.ogg</sound>
@@ -903,7 +903,7 @@
     </monster>
 
     <monster id="37" name="Fire Lizard">
-        <sprite>monster-lizard.xml|#673132,923F42,CD5961,E163A4,ffffff</sprite>
+        <sprite>monsters/monster-lizard.xml|#673132,923F42,CD5961,E163A4,ffffff</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>
@@ -935,7 +935,7 @@
     </monster>
 
     <monster id="38" name="Wisp">
-        <sprite>monster-wisp.xml|#aadd44,ffff66</sprite>
+        <sprite>monsters/monster-wisp.xml|#aadd44,ffff66</sprite>
 	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
@@ -970,7 +970,7 @@
     </monster>
 
     <monster id="39" name="Snail">
-        <sprite>monster-snail.xml</sprite>
+        <sprite>monsters/monster-snail.xml</sprite>
         <exp>200</exp>
         <attributes
             hp="220"
@@ -1005,7 +1005,7 @@
     </monster>
 
     <monster id="40" name="Spectre">
-        <sprite>monster-wisp.xml|#ff77dd,dd77ff</sprite>
+        <sprite>monsters/monster-wisp.xml|#ff77dd,dd77ff</sprite>
 	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
@@ -1040,7 +1040,7 @@
     </monster>
 
     <monster id="41" name="Skeleton">
-        <sprite>monster-skeleton.xml|#ffe8bf</sprite>
+        <sprite>monsters/monster-skeleton.xml|#ffe8bf</sprite>
         <!-- stats identical to maggot - change this when making up real monster stats -->
         <attributes
             hp="20"
@@ -1069,7 +1069,7 @@
     </monster>
 
     <monster id="42" name="Lady Skeleton">
-        <sprite>monster-skeleton.xml|#ffe8bf</sprite>
+        <sprite>monsters/monster-skeleton.xml|#ffe8bf</sprite>
         <sprite>hairstyle8.xml</sprite>
         <!-- stats identical to maggot - change this when making up real monster stats -->
         <attributes
@@ -1099,7 +1099,7 @@
     </monster>
 
     <monster id="43" name="Fallen">
-        <sprite>monster-skeleton.xml|#ffe8bf</sprite>
+        <sprite>monsters/monster-skeleton.xml|#ffe8bf</sprite>
         <sprite>leg-chaps-male.xml</sprite>
         <sprite>chest-warlordplate-male.xml</sprite>
         <sprite>head-warlordhelm.xml</sprite>
@@ -1129,4 +1129,78 @@
             particle-effect="graphics/particles/monster-lizard-firebreath.particle.xml"
             />
     </monster>
+
+    <!-- Snake lord 44 -->
+
+    <monster id="45" name="Poltergeist">
+        <sprite>monsters/monster-wisp.xml|#77ffdd,77ddff</sprite>
+	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
+        <exp>20</exp>
+        <attributes
+            hp="20"
+            size="8"
+            speed="192"
+            attack-min="10"
+            attack-delta="2"
+            attack-magic="0"
+            hit="10"
+            evade="10"
+            physical-defence="5"
+            magical-defence="0"
+            />
+        <!-- doesn't move much, but attacks when you are coming too close. -->
+        <behavior
+            aggressive="false"
+            cowardly="false"
+            track-range="2"
+            stroll-range="1"
+            attack-distance="64"
+            />
+        <!-- slow, strong, long-range glow attack-->
+        <attack id="1"
+            priority="1"
+            type="physical"
+            pre-delay="5"
+            aft-delay="5"
+            damage-factor="3"
+            range="64"
+            />
+    </monster>
+    <monster id="46" name="Duck" targetCursor="small">
+        <sprite>monsters/monster-duck.xml</sprite>
+        <attributes
+            hp="20"
+            size="4"
+            speed="32"
+            attack-min="10"
+            attack-delta="2"
+            attack-magic="0"
+            hit="10"
+            evade="5"
+            physical-defence="5"
+            magical-defence="0"
+            mutation="50"
+            />
+        <vulnerability element="fire" factor="1.5"/>
+        <vulnerability element="earth" factor="0.7"/>
+        <exp>0</exp>
+        <!-- average stroll- and track range-->
+        <behavior
+            aggressive="false"
+            cowardly="false"
+            track-range="5"
+            stroll-range="2"
+            attack-distance="32"
+            />
+        <attack id="1"
+            priority="1"
+            type="physical"
+            pre-delay="10"
+            aft-delay="5"
+            damage-factor="1"
+            range="32"
+            animation="attack"
+            />
+    </monster>
+
 </monsters>