Merge branch 'master' of gitorious.org:+tmw-admins/tmw/tmwa-client-test

14 files changed, 124 insertions, 130 deletions

diff --git a/graphics/items/equipment/rings/rough-agility.png b/graphics/items/equipment/rings/rough-agility.png
deleted file mode 100644
index ce3a3b14..00000000
--- a/graphics/items/equipment/rings/rough-agility.png
+++ /dev/null
diff --git a/graphics/items/equipment/rings/rough-dexterity.png b/graphics/items/equipment/rings/rough-dexterity.png
deleted file mode 100644
index 2ae35f49..00000000
--- a/graphics/items/equipment/rings/rough-dexterity.png
+++ /dev/null
diff --git a/graphics/items/equipment/rings/rough-intelligence.png b/graphics/items/equipment/rings/rough-intelligence.png
deleted file mode 100644
index eabaf93e..00000000
--- a/graphics/items/equipment/rings/rough-intelligence.png
+++ /dev/null
diff --git a/graphics/items/equipment/rings/rough-strength.png b/graphics/items/equipment/rings/rough-strength.png
deleted file mode 100644
index b860d6e3..00000000
--- a/graphics/items/equipment/rings/rough-strength.png
+++ /dev/null
diff --git a/graphics/items/equipment/rings/rough-vitality.png b/graphics/items/equipment/rings/rough-vitality.png
deleted file mode 100644
index 8577e2ff..00000000
--- a/graphics/items/equipment/rings/rough-vitality.png
+++ /dev/null
diff --git a/graphics/items/equipment/rings/rough-willpower.png b/graphics/items/equipment/rings/rough-willpower.png
deleted file mode 100644
index 1fd2b566..00000000
--- a/graphics/items/equipment/rings/rough-willpower.png
+++ /dev/null
diff --git a/graphics/particles/magic.hit.evil.xml b/graphics/particles/magic.hit.evil.xml
index c0b5df22..9560df98 100644
--- a/graphics/particles/magic.hit.evil.xml
+++ b/graphics/particles/magic.hit.evil.xml
@@ -41,7 +41,7 @@
 			<property name="horizontal-angle" min="0" max="360"/>
 			<property name="power" min="0" max="4"/>
 			<property name="gravity" value="0.1"/>
-			<property name="image" value="graphics/particles/orb-medium.png#W:#000000"/>
+			<property name="image" value="graphics/particles/orb-medium.png|W:#000000"/>
 			<property name="lifetime" min="0" max="80"/>
 			<property name="output" min="60" max="80"/>
 			<property name="fade-out" value="20"/>
diff --git a/graphics/particles/magic.hit.xml b/graphics/particles/magic.hit.xml
index 427e4163..96170247 100644
--- a/graphics/particles/magic.hit.xml
+++ b/graphics/particles/magic.hit.xml
@@ -41,7 +41,7 @@
 			<property name="horizontal-angle" min="0" max="360"/>
 			<property name="power" min="0" max="3"/>
 			<property name="gravity" value="0.1"/>
-			<property name="image" value="graphics/particles/orb-medium.png#W:#000000"/>
+			<property name="image" value="graphics/particles/orb-medium.png|W:#000000"/>
 			<property name="lifetime" min="0" max="80"/>
 			<property name="output" min="40" max="60"/>
 			<property name="fade-out" value="20"/>
diff --git a/graphics/sprites/npcs/nivalis_npc.xml b/graphics/sprites/npcs/nivalis_npc.xml
index 79b76301..54129cab 100644
--- a/graphics/sprites/npcs/nivalis_npc.xml
+++ b/graphics/sprites/npcs/nivalis_npc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite variants="6" variant_offset="1">
-	<imageset name="base" src="graphics/sprites/npcs/nivalis_npcs.png" width="50" height="80" />
+	<imageset name="base" src="graphics/sprites/npcs/nivalis_npc.png" width="50" height="80" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
diff --git a/items.xml b/items.xml
index 05e42132..e959b66c 100644
--- a/items.xml
+++ b/items.xml
@@ -1599,59 +1599,66 @@
         <sprite>equipment/head/devcap.xml|#9999ff</sprite>
     </item>
     <item id="648"
-        image="equipment/rings/rough-strengh.png"
-        name="Rough Strength Ring"
-        description="A rough strength-enhancing ring that looks as if it has been made in a hurry."
-        effect="+5 Strength"
-        type="equip-ring"
-        weight="1"
-        max-per-slot="1"
-        strength="5"/>
+        image="equipment/legs/trousers.png"
+        name="Trousers"
+        description="Cotton pants covering each part of your legs."
+        defense="4"
+        type="equip-legs"
+        weight="25">
+        <sprite>equipment/head/devcap.xml|#9999ff</sprite>
+    </item>
     <item id="649"
-        image="equipment/rings/rough-agility.png"
-        name="Rough Agility Ring"
-        description="A rough agility-enhancing ring that looks as if it has been made in a hurry."
-        effect="+5 Agility"
-        type="equip-ring"
-        weight="1"
-        max-per-slot="1"
-        agility="5"/>
+        image="equipment/chest/sorcerer-robe.png|W:#5E7480,F1FFFF,FFFFFF;R:#2554C7"
+        name="White Evoker's Robe (Blue)"
+        description="A blue lined white evoker's robe."
+        effect="+1 Agility"
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#5E7480,F1FFFF,FFFFFF;#2554C7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#5E7480,F1FFFF,FFFFFF;#2554C7</sprite>
+    </item>
     <item id="650"
-        image="equipment/rings/rough-dexterity.png"
-        name="Rough Dexterity Ring"
-        description="A rough dexterity-enhancing ring that looks as if it has been made in a hurry."
-        effect="+5 Dexterity"
-        type="equip-ring"
-        weight="1"
-        max-per-slot="1"
-        dexterity="5"/>
+        image="equipment/chest/sorcerer-robe.png|W:#000000;R:#2554C7"
+        name="Black Evoker's Robe (Blue)"
+        description="A blue lined black evoker's robe."
+        effect="+1 Agility"
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#000000;#2554C7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#000000;#2554C7</sprite>
+    </item>
     <item id="651"
-        image="equipment/rings/rough-vitality.png"
-        name="Rough Vitality Ring"
-        description="A rough vitality-enhancing ring that looks as if it has been made in a hurry."
-        effect="+5 Vitality"
-        type="equip-ring"
-        weight="1"
-        max-per-slot="1"
-        vitality="5"/>
+        image="equipment/chest/silk-robe.png|W:#5E7480,F1FFFF,FFFFFF"
+        name="White Wizard Robe"
+        description="A white robe made for peaceful wizards."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#5E7480,F1FFFF,FFFFFF</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#5E7480,F1FFFF,FFFFFF</sprite>
+    </item>
     <item id="652"
-        image="equipment/rings/rough-intelligence.png"
-        name="Rough Intelligence Ring"
-        description="A rough intelligence-enhancing ring that looks as if it has been made in a hurry."
-        effect="+5 Intelligence"
-        type="equip-ring"
-        weight="1"
-        max-per-slot="1"
-        intelligence="5"/>
+        image="equipment/chest/silk-robe.png|W:#000000"
+        name="Black Wizard Robe"
+        description="A black robe made for evil wizards."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#000000</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#000000</sprite>
+    </item>
     <item id="653"
-        image="equipment/rings/rough-willpower.png"
-        name="Rough Willpower Ring"
-        description="A rough willpower-enhancing ring that looks as if it has been made in a hurry."
-        effect="+5 Willpower"
-        type="equip-ring"
-        weight="1"
-        max-per-slot="1"
-        willpower="5"/>
+        image="equipment/chest/silk-robe.png|W:#804000"
+        name="Apprentice Robe"
+        description="A robe made for apprentices."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#804000</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#804000</sprite>
+    </item>
     <item id="654"
         image="equipment/head/cap.png|R:#d94800"
         name="Cap"
@@ -2943,11 +2950,10 @@
         image="equipment/chest/sorcerer-robe.png"
         name="Sorcerer Robe (Red)"
         description="A red lined sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="5"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="5">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#ffffff</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#ffffff</sprite>
     </item>
@@ -5034,6 +5040,7 @@
         <sprite gender="male">equipment/hands/generic-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/hands/generic-female.xml|#104010,208020,30c030</sprite>
     </item>
+
     <item id="2170"
         image="equipment/legs/miniskirt.png|W:#580000,a40000,c02020,ff6060"
         name="Red Miniskirt"
@@ -5154,7 +5161,9 @@
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#104010,208020,30c030</sprite>
     </item>
+
     <!-- IDs 2180 to 2189 RESERVED -->
+
     <item id="2190"
         image="equipment/head/rabbit-ears.png|W:#580000,a40000,c02020,ff6060"
         name="Red rabbit ears"
@@ -5265,6 +5274,7 @@
         max-per-slot="1">
         <sprite>equipment/head/rabbit-ears.xml|#104010,208020,30c030</sprite>
     </item>
+
     <item id="2200"
         image="equipment/head/wizard-hat.png|W:#580000,a40000,c02020,ff6060"
         name="Red wizard hat"
@@ -5374,7 +5384,8 @@
         weight="15"
         max-per-slot="1">
         <sprite>equipment/head/wizard-hat.xml|#104010,208020,30c030</sprite>
-	</item>
+    </item>
+
     <item id="2210"
         image="equipment/head/bowler-hat.png|W:#580000,a40000,c02020,ff6060"
         name="Red bowler hat"
@@ -5485,15 +5496,15 @@
         max-per-slot="1">
         <sprite>equipment/head/bowler-hat.xml|#104010,208020,30c030</sprite>
     </item>
+
     <item id="2220"
         image="equipment/chest/sorcerer-robe.png|W:#580000,A40000,C02020,ff6060"
         name="Red Sorcerer Robe (Red)"
         description="A red lined red sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#580000,A40000,C02020,ff6060</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#580000,A40000,C02020,ff6060</sprite>
     </item>
@@ -5501,11 +5512,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#115511,22aa22,99dd99"
         name="Green Sorcerer Robe (Red)"
         description="A red lined green sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99</sprite>
     </item>
@@ -5513,11 +5523,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#222255,6666ff"
         name="Dark Blue Sorcerer Robe (Red)"
         description="A red lined dark blue sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#222255,6666ff</sprite>
     </item>
@@ -5525,11 +5534,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Sorcerer Robe (Red)"
         description="A red lined yellow sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
@@ -5537,11 +5545,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Sorcerer Robe (Red)"
         description="A red lined light blue sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
@@ -5549,11 +5556,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Sorcerer Robe (Red)"
         description="A red lined pink sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
@@ -5561,11 +5567,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Sorcerer Robe (Red)"
         description="A red lined black sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
@@ -5573,11 +5578,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Sorcerer Robe (Red)"
         description="A red lined orange sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
@@ -5585,11 +5589,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Sorcerer Robe (Red)"
         description="A red lined purple sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
@@ -5597,122 +5600,102 @@
         image="equipment/chest/sorcerer-robe.png|W:#104010,208020,30c030"
         name="Dark Green Sorcerer Robe (Red)"
         description="A red lined dark green sorcerer robe."
-        effect="+5% Defense"
-        type="equip-torso"
-        weight="30"
+        effect="+1 Agility"
         defense="5"
-        max-per-slot="1">
+        type="equip-torso"
+        weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#104010,208020,30c030</sprite>
     </item>
+
     <item id="2230"
         image="equipment/head/bowler-hat-brown.png|W:#580000,a40000,c02020,ff6060"
         name="Red bowler hat (brown)"
         description="A hat for those with a bit of class, with a red band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2231"
         image="equipment/head/bowler-hat-brown.png|W:#115511,22aa22,99dd99"
         name="Green bowler hat (brown)"
         description="A hat for those with a bit of class, with a green band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2232"
         image="equipment/head/bowler-hat-brown.png|W:#222255,6666ff"
         name="Dark blue bowler hat (brown)"
         description="A hat for those with a bit of class, with a dark blue band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#222255,6666ff</sprite>
     </item>
     <item id="2233"
         image="equipment/head/bowler-hat-brown.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow bowler hat (brown)"
         description="A hat for those with a bit of class, with a yellow band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2234"
         image="equipment/head/bowler-hat-brown.png|W:#16486e,498ec5,e4f2fc"
         name="Light blue bowler hat (brown)"
         description="A hat for those with a bit of class, with a light blue band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2235"
         image="equipment/head/bowler-hat-brown.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink bowler hat (brown)"
         description="A hat for those with a bit of class, with a pink band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2236"
         image="equipment/head/bowler-hat-brown.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black bowler hat (brown)"
         description="A hat for those with a bit of class, with a black band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2237"
         image="equipment/head/bowler-hat-brown.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange bowler hat (brown)"
         description="A hat for those with a bit of class, with an orange band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2238"
         image="equipment/head/bowler-hat-brown.png|W:#4f0a76,8010c0,d699f7"
         name="Purple bowler hat (brown)"
         description="A hat for those with a bit of class, with a purple band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2239"
         image="equipment/head/bowler-hat-brown.png|W:#104010,208020,30c030"
         name="Dark green bowler hat (brown)"
         description="A hat for those with a bit of class, with a dark green band."
-        effect=""
         defense="10"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#104010,208020,30c030</sprite>
     </item>
 
diff --git a/maps/019-1.tmx b/maps/019-1.tmx
index 51030d7c..7ff7299d 100644
--- a/maps/019-1.tmx
+++ b/maps/019-1.tmx
@@ -48,7 +48,7 @@
    H4sIAAAAAAAAA+3db06DMBgHYPSkXkU9gX92APUE6gWlCUTSDMago4U+T9IvZB8a8tv7lm3tmgYAAAAAAAAAAADYi8fcEwAAAAAAgBt6zj0BAABIIPy+46mxvgWAtUJP1U+55KMdX7knQfG+2/Hb/K/Vzw31hj4nMEVOrre0vub+fCXuGfrE7bnHzHUpK8P3r1wBAADQc14LAAAcW+7vmHPxrAMAwN5YwwKwFT0HgK3oOUAKagmQQq21pIR9xVPn2eSe21CtGQle2vHajbfMc6Fc4Syzz24402xczbUkCGcP/XTDGURMKWGNAsC+6BdASmoKkJKaAqSkpjCXrAApqSlASmoKkJKaAgAA1G7Ovrwt9+xdMx/PdOuF+z3nf2lPG8xljYf78WvvjdykMnbvSsxIvP9umJFzeYmvx7mRneX6ul5aRtaIMzSVnXO5iXtdzdk6Yj5iU3kZ61X9PRm+tta9+UfPxxJ9Lsb6GXULuZANAAAAAAAAAAAAYA9Od7lnAACwH3+Tf/uxABQBAA==
   </data>
  </layer>
- <layer name="Collision" width="138" height="128" visible="0">
+ <layer name="Collision" width="138" height="128">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+2UQW7kMAwEs1/I/x8b5LDYgdaySYtiU1I1UEAy1tgSu8bff76+vgEAAAAAAAAAAAAAAAAAAAAAAAAAAADgWNqo9wM1wROwgCdgAU/2YlafeFIPaw9vUs0TvBvvI9qREXeiPRndz+lYZ9Ze730vypWoLr1R91GVWbH61evGsibzPJ497Er0HEfXrBR1dxU9addfff/unrs58ht1dxU98c7rlKj7U3vSXvf+f/f5bi6pO1R64p2R99pOUXeY7YnVH8+7Y6dYfhO70jtrxPw+P9/dod+ou1R74u17Nyes51F3meXJrDnu5Eyb9uzqPqt4stu7whvP+3QHMuZZMb1Z9N4Lvf979717zmp45hm9Vp2R2Vytufueuufq75KKeTObz896f0c8szKjs1Zk5BzeuVju/7RG3bHKlZU9GX1m729ciXUsIpn7sPZvvc/qvD2jMpn7uHqO59nqfhWenBTeJ+d2/yaj81L3iye5uZrbm3fyqpD/8zQbz+zU/eLJ/Dy9O6w+7QD5lycXvDNTd4sn89Obj2du6m5xJDdv3ynqfnEkJ6OzUneMHzk52ZNsZ051VN3tSo6086qYWftS97uSI+28Toq64xXcODHtnNV948gaUXeOI/Wj7hxP1oi6czxZI+rOT/Fk1X3/Rt33SZ6sHHXf+LJG1D3jR/2ou8aPNaLuHE90sc5W3Te+aHOKJ3gzFssM1Z2e4snV3qqc5+mZln2pO9/Fk6tUOc8bB96epQre2fz9W5EVPLHuR937DEeuzqXIip6MnkXpxZtZKvqw7KGqJ6NnUBM5n+xU8cSyx6fr1YmYQYU+1Il6J1eG5EfdOZ7UjbrnlV1RP7/NzL2oO17ZE3Uyz6/uGFf8UcxA3S+evItlFpGzUfeb6Upv3efnit/oyHezfjvqbrNdscyiap48n+mLulelJ09zv1szM+0zr/bTWzPDE3Wn2a5cXY+eaWQsvka64bn/Dng7uOvB8t3IWO7d2/tdz6P72ZXRzHTB85zP61drrZ9F7HFH7uZ9N4uouUbc465/z/W7s13do7eXXfH28DTTmfF43K6Ndvw0VyonYo+9s846v7rPEz2ZkZnvmfaeO0HmRN0rnsQlagZX91D3iie10pululeFI9V8rPhbUHep9iXbyYxOZkXdo8qVTB/VPURE3WG2J9lOZro6ukfvmt045ZzRMzvJEXgPjgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKzBD4iIs+0AFAEA
   </data>
@@ -96,5 +96,13 @@
     <property name="dest_y" value="3120"/>
    </properties>
   </object>
+  <object name="Fluffy" type="spawn" x="0" y="0">
+   <properties>
+    <property name="eA_death" value="30000"/>
+    <property name="eA_spawn" value="100000"/>
+    <property name="max_beings" value="100"/>
+    <property name="monster_id" value="18"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/027-1.tmx b/maps/027-1.tmx
index a27b3ae0..bdf8f6bf 100644
--- a/maps/027-1.tmx
+++ b/maps/027-1.tmx
@@ -65,7 +65,7 @@
  </layer>
  <layer name="Ground 2" width="150" height="120">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <layer name="Fringe" width="150" height="120">
diff --git a/maps/027-2.tmx b/maps/027-2.tmx
index 471d4458..8f0fdb19 100644
--- a/maps/027-2.tmx
+++ b/maps/027-2.tmx
@@ -31,7 +31,7 @@
  </layer>
  <layer name="Fringe" width="150" height="130">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3dyW7TQBgAYEcggVhOIJAoLc/GI/AInFr1BaC8ANDlTKHqA7BzZefKfmZnRm2kaBTHE9eJneT7pF+WnYn9H0bjycw4LgoAAAAAAAAAAAAAmnQhxMW2k6ATTk3xWjemeC0mb7PtBOi0Y72iON5rO4sDu20nQGPOhTp1viP16k7bCTBR2g3qehBiK8T+lK63mWzLPgdIXQ2x2nYSzJ1rRXm92guxfhjTuk/WoZ/fPdeL8nq1EeLWYXSd3xiL50WI020nQad9qPmdpWbTWFhrIW62nQRQ2+22E2CkdP3BqPUIsa+/U5T3+eNn95tIioWymmzTz7anmAuwWNbGPA4AiyYdM98pKVf1WzEadX91710sg2PmVb8Ht45wHeNRQI645iSOZ3Z5XQyzJb2nuR/RhH69in3u7cI6UprRb5/6fW71iqbE52Fi/2q1MG/MdMU6t1aMbs9yygAAAAAAAAAAAAAAAAAAAN1zJsTZIcf3pp0IrXsW4nnFsSchng7sPwzxKMTj5HuXQywP7I/6f37m15VeUbwL2/fJ8cFjK6HMm7B9O/D5yxCvQrxOvhf/12Cc/9WP5e+NUZ7Z8S3E94pjX0J8Hdj/GOJTiM+Z10jbO+bf3xD/Ko79DvFnYP9HiJ8hfmVeI23voAlpe5djuXewXek1nQ3zIm3vciwd1qdL6hUAAAAAYzqRUebkxLOg69J1BznzeTllhq2VqJKe19zi/MiZz8spM2ytRJn+u0bT85pbnB8583k5ZYatlRj32nXmFmnfsHcdp/N5w94Xk5aJ57mblEnXReS8Dyk9b525RWZDU+/H2sgoo39Fk/SvmKR+f2o/2Yej0L8CmpCOn5Y97xVVjYmuN5UUM6fqua2y572iccZEmW1NP6836nmvOmOizKY4dtnk+7BHPe817Pkx5lNsr3bbTgIAAAAAAAAAAAAAAAAAAAAAYMH8Bynu90awMAEA
+   H4sIAAAAAAAAA+3dyW7TQBgAYEcggVhOIIooLc/GI/AInFr1BaC8ANDlTKHqA7BzZefKfmZnRk2kaBTHjuvETvx90i/L9tiew2g8mSXOMgAAAAAAAAAAAADqdCHEUtOZoBVOzfBZN2b4LKZvq+kM0GrHell2vNd0Lg7tNZ0BanMulKnzLSlXd5rOAFOl3qCqByG2QxzM6HlbyTbvPEDqaoi1pjPBwrmW5Zer/RAb/ZjVe7IK7fz2uZ7ll6vNELf60XZ+Y3TPixCnm84Erfah4jXL9Wajs9ZD3Gw6E0Blt5vOAGOl8w/GzUeIbf3dLL/NH8/dryNTdMpask3P7cwwL0C3rE94HAC6Ju0z381JV/RbMRr3fvXu7ZbhPvOi34PbR3iO/iigjDjnJPZntnleDPMlfad5H1GHQbmKbe6dzDxS6jGonwZtbuWKusT1MLF9tZYZN2a2Yplbz8bXZ2XSAAAAAAAAAAAAAAAAAAAA7XMmxNkRx/dnnREa9yzE84JjT0I8Hdp/GOJRiMfJdZdDrAztj/t/fhbXlV6WvQvb98nx4WOrIc2bsH07dP5liFchXifXxf81mOR/9WP6exOkZ358C/G94NiXEF+H9j+G+BTic8lnpPUdi+9viH8Fx36H+DO0/yPEzxC/Sj4jre/KWOodbi/2JryQzkjruzJW+uVpVbkiR1rflbHcL0+XlCsAAAAAJnSiRJqTU88FbZfOOygznlcmzai5EkXS+xpbXBxlxvPKpBk1VyLP4Fuj6X2rjC3STmXG88qkGTVXYtJnVxlbpHmjvnWcjueN+l5Mmibe526SJp0XUeZ7SOl9q4wtMh/q+j7WZok02lfUSfuKaRq0pw6SfTgK7SugDmn/ad56r6ioT3Sjrkwxd4rWbeWt94om6RNlvtW9Xm/ceq8qfaLMp9h3Wef3sMet9xq1fozFFOurvaYzAQAAAAAAAAAAAAAAAAAAAADQMf8BxsoGY7AwAQA=
   </data>
  </layer>
  <layer name="Over" width="150" height="130">
diff --git a/monsters.xml b/monsters.xml
index bb73c6c5..91299602 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 The Mana World Development Team
   See here for documentation: http://doc.manasource.org/monsters.xml
 -->
@@ -357,6 +356,10 @@
     <monster id="63" name="Bandit Lord">
     <sprite>monsters/monster-bandit-lord.xml</sprite>
     <sprite>monsters/weapon-bow.xml</sprite>
+    <attack id ="1"
+            missile-particle="graphics/particles/arrow.particle.xml"
+            action="attack"
+            />
     </monster>
     <monster id="64" name="Vampire Bat">
         <sprite>monsters/monster-vampire-bat.xml</sprite>