From e09dd779b9409a6511fbd0ab0d9aca5794d753d8 Mon Sep 17 00:00:00 2001
From: Andreas Habel <mail@exceptionfault.de>
Date: Wed, 5 Nov 2008 11:40:43 +0000
Subject: Added version information to item database. Gameserver reports its
 local version to account server during registration and gets notified if the
 version is up-to-date or outdated to prevent inconsistencies.

---
 items.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/items.xml b/items.xml
index f4f3103c..a536f9b7 100644
--- a/items.xml
+++ b/items.xml
@@ -10,6 +10,9 @@
     confused with 'weapon-type'.
 -->
 <items>
+    
+    <version revision="$Revision$" />
+    
     <!-- Pseudo-item hairstyles. Using negative IDs is just a temporary
          solution. I would like to use the lower ID numbers when they aren't
          required for eAthena compatibility anymore.
-- 
cgit v1.2.3-70-g09d2


From 5d11b8a0d2bb13fa7ebcb7bf4733fb3f9b1a0454 Mon Sep 17 00:00:00 2001
From: Fate <fate.tmw@googlemail.com>
Date: Fri, 7 Nov 2008 23:17:45 +0000
Subject: * Added new headgear, specifically Black Don's High Priest headgear
 and the monster skull helmet (#523)

---
 graphics/items/armor-head-highpriest-crown.png   | Bin 0 -> 1444 bytes
 graphics/items/armor-head-monster-skull-helm.png | Bin 0 -> 1956 bytes
 graphics/items/armor-head-mouboohead.png         | Bin 0 -> 1142 bytes
 graphics/sprites/head-highpriest-crown.png       | Bin 0 -> 4686 bytes
 graphics/sprites/head-highpriest-crown.xml       |   5 +
 graphics/sprites/head-monster-skull-helm.png     | Bin 0 -> 7200 bytes
 graphics/sprites/head-monster-skull-helm.xml     | 142 +++++++++++++++++++++++
 graphics/sprites/head-mouboohead.png             | Bin 0 -> 5954 bytes
 graphics/sprites/head-mouboohead.xml             |   5 +
 items.xml                                        |  32 +++++
 10 files changed, 184 insertions(+)
 create mode 100644 graphics/items/armor-head-highpriest-crown.png
 create mode 100644 graphics/items/armor-head-monster-skull-helm.png
 create mode 100644 graphics/items/armor-head-mouboohead.png
 create mode 100644 graphics/sprites/head-highpriest-crown.png
 create mode 100644 graphics/sprites/head-highpriest-crown.xml
 create mode 100644 graphics/sprites/head-monster-skull-helm.png
 create mode 100644 graphics/sprites/head-monster-skull-helm.xml
 create mode 100644 graphics/sprites/head-mouboohead.png
 create mode 100644 graphics/sprites/head-mouboohead.xml

diff --git a/graphics/items/armor-head-highpriest-crown.png b/graphics/items/armor-head-highpriest-crown.png
new file mode 100644
index 00000000..3435dc57
Binary files /dev/null and b/graphics/items/armor-head-highpriest-crown.png differ
diff --git a/graphics/items/armor-head-monster-skull-helm.png b/graphics/items/armor-head-monster-skull-helm.png
new file mode 100644
index 00000000..6476b746
Binary files /dev/null and b/graphics/items/armor-head-monster-skull-helm.png differ
diff --git a/graphics/items/armor-head-mouboohead.png b/graphics/items/armor-head-mouboohead.png
new file mode 100644
index 00000000..1ad4909c
Binary files /dev/null and b/graphics/items/armor-head-mouboohead.png differ
diff --git a/graphics/sprites/head-highpriest-crown.png b/graphics/sprites/head-highpriest-crown.png
new file mode 100644
index 00000000..d78fd662
Binary files /dev/null and b/graphics/sprites/head-highpriest-crown.png differ
diff --git a/graphics/sprites/head-highpriest-crown.xml b/graphics/sprites/head-highpriest-crown.xml
new file mode 100644
index 00000000..ab5b6b17
--- /dev/null
+++ b/graphics/sprites/head-highpriest-crown.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/head-highpriest-crown.png" width="40" height="40" />
+	<include file="head-monster-skull-helm.xml"/>
+</sprite>
diff --git a/graphics/sprites/head-monster-skull-helm.png b/graphics/sprites/head-monster-skull-helm.png
new file mode 100644
index 00000000..ca9c822e
Binary files /dev/null and b/graphics/sprites/head-monster-skull-helm.png differ
diff --git a/graphics/sprites/head-monster-skull-helm.xml b/graphics/sprites/head-monster-skull-helm.xml
new file mode 100644
index 00000000..be1445ca
--- /dev/null
+++ b/graphics/sprites/head-monster-skull-helm.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+    <imageset name="base" src="graphics/sprites/head-monster-skull-helm.png" width="40" height="40" />
+
+    <action name="stand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="0" offsetY ="-34" />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="1" offsetY ="-35"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY ="-34"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="0" offsetY ="-35"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="0" offsetY ="-34" delay="75"/>
+            <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-34" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="2" offsetY ="-35" delay="75"/>
+            <frame index="1" offsetX="2" offsetY ="-34" delay="75"/>
+            <frame index="1" offsetX="2" offsetY ="-35" delay="75"/>
+            <frame index="1" offsetX="2" offsetY ="-35" delay="75"/>
+            <frame index="1" offsetX="2" offsetY ="-34" delay="75"/>
+            <frame index="1" offsetX="2" offsetY ="-35" delay="75"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-1" offsetY ="-35" delay="75"/>
+            <frame index="2" offsetX="-1" offsetY ="-35" delay="75"/>
+            <frame index="2" offsetX="-1" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-1" offsetY ="-35" delay="75"/>
+            <frame index="2" offsetX="-1" offsetY ="-35" delay="75"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="0" offsetY ="-35" delay="75"/>
+            <frame index="3" offsetX="0" offsetY ="-34" delay="75"/>
+            <frame index="3" offsetX="0" offsetY ="-35" delay="75"/>
+            <frame index="3" offsetX="0" offsetY ="-35" delay="75"/>
+            <frame index="3" offsetX="0" offsetY ="-34" delay="75"/>
+            <frame index="3" offsetX="0" offsetY ="-35" delay="75"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="0" offsetY ="-34" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-32" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-31" delay="75" />
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="5" offsetY ="-36" delay="75" />
+            <frame index="1" offsetX="5" offsetY ="-37" delay="75" />
+            <frame index="1" offsetX="1" offsetY ="-34" delay="75" />
+            <frame index="1" offsetX="0" offsetY ="-33" delay="75" />
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-2" offsetY ="-32" delay="75"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY ="-36" delay="75"/>
+            <frame index="3" offsetX="-3" offsetY ="-37" delay="75"/>
+            <frame index="3" offsetX="0" offsetY ="-34" delay="75"/>
+            <frame index="3" offsetX="1" offsetY ="-33" delay="75"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_bow" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="0" offsetY ="-33" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-33" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-33" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-32" delay="75" />
+            <frame index="0" offsetX="0" offsetY ="-33" delay="75" />
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY ="-35" delay="75" />
+            <frame index="1" offsetX="4" offsetY ="-35" delay="75" />
+            <frame index="1" offsetX="4" offsetY ="-35" delay="75" />
+            <frame index="1" offsetX="6" offsetY ="-36" delay="75" />
+            <frame index="1" offsetX="6" offsetY ="-36" delay="75" />
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-1" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-2" offsetY ="-33" delay="75"/>
+            <frame index="2" offsetX="-2" offsetY ="-34" delay="75"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY ="-35" delay="75"/>
+            <frame index="3" offsetX="-3" offsetY ="-35" delay="75"/>
+            <frame index="3" offsetX="-3" offsetY ="-35" delay="75"/>
+            <frame index="3" offsetX="-5" offsetY ="-36" delay="75"/>
+            <frame index="3" offsetX="-5" offsetY ="-36" delay="75"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="sit" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="0" offsetY ="-22" />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="5" offsetY ="-26"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="0" offsetY ="-24"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY ="-26"/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="base">
+        <animation direction="default">
+            <frame index="4" offsetX="44" offsetY="-9"/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/head-mouboohead.png b/graphics/sprites/head-mouboohead.png
new file mode 100644
index 00000000..09b8760e
Binary files /dev/null and b/graphics/sprites/head-mouboohead.png differ
diff --git a/graphics/sprites/head-mouboohead.xml b/graphics/sprites/head-mouboohead.xml
new file mode 100644
index 00000000..a2ab344b
--- /dev/null
+++ b/graphics/sprites/head-mouboohead.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+    <imageset name="base" src="graphics/sprites/head-mouboohead.png" width="80" height="51" />
+    <include file="head-christmastree.xml"/>
+</sprite>
diff --git a/items.xml b/items.xml
index a536f9b7..e5321a72 100644
--- a/items.xml
+++ b/items.xml
@@ -2093,6 +2093,28 @@
         <sprite gender="female">chest-robe-female.xml|#ffffff</sprite>
     </item>
 
+    <item id="721"
+        image="armor-head-highpriest-crown.png"
+        name="High Priest Crown"
+        description="A golden crown with an enchanted ruby."
+        effect="Defense: +4, SP +20"
+        type="equip-head"
+        defense="4"
+        weight="60">
+        <sprite>head-highpriest-crown.xml</sprite>
+    </item>
+
+    <item id="722"
+        image="armor-head-monster-skull-helm.png"
+        name="Monster Skull Helmet"
+        description="The conserved skull of a mysterious ancient monster."
+        effect="Defense: +7, Magic Defense +20%"
+        type="equip-head"
+        defense="7"
+        weight="40">
+        <sprite>head-monster-skull-helm.xml</sprite>
+    </item>
+
     <!--
                          HERE ARE SOME UNUSED ITEM IDs
            -->
@@ -2282,6 +2304,16 @@
         <sound event="strike">short-sword-miss1.ogg</sound>
         <sound event="hit">short-sword-hit1.ogg</sound>
     </item>
+    <item id="1216"
+        image="armor-head-mouboohead.png"
+        name="Mouboo head"
+        description="A tightly fitting mouboo head."
+        effect="Defense: +1"
+        type="equip-head"
+        defense="1"
+        weight="20">
+        <sprite>head-mouboohead.xml</sprite>
+    </item>
 
     <!-- The 2XXY IDs are used for recolored items on eAthena.
         XX = item
-- 
cgit v1.2.3-70-g09d2


From a4dc707f1a6600474aaaa19165b04d9dc34d607a Mon Sep 17 00:00:00 2001
From: Fate <fate.tmw@googlemail.com>
Date: Fri, 7 Nov 2008 23:19:21 +0000
Subject: * Added missing colons in items.xml (noted by EJlol)

---
 items.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/items.xml b/items.xml
index e5321a72..b009dbe4 100644
--- a/items.xml
+++ b/items.xml
@@ -2097,7 +2097,7 @@
         image="armor-head-highpriest-crown.png"
         name="High Priest Crown"
         description="A golden crown with an enchanted ruby."
-        effect="Defense: +4, SP +20"
+        effect="Defense: +4, SP: +20"
         type="equip-head"
         defense="4"
         weight="60">
@@ -2108,7 +2108,7 @@
         image="armor-head-monster-skull-helm.png"
         name="Monster Skull Helmet"
         description="The conserved skull of a mysterious ancient monster."
-        effect="Defense: +7, Magic Defense +20%"
+        effect="Defense: +7, Magic Defense: +20%"
         type="equip-head"
         defense="7"
         weight="40">
-- 
cgit v1.2.3-70-g09d2


From acd0682247d4c295b0530922390d0e2d46f03188 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 8 Nov 2008 02:12:46 +0000
Subject: Commit Cat Ears (without icon for now)

---
 graphics/sprites/head-catears.png | Bin 0 -> 818 bytes
 graphics/sprites/head-catears.xml | 142 ++++++++++++++++++++++++++++++++++++++
 items.xml                         |  12 +++-
 3 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 graphics/sprites/head-catears.png
 create mode 100644 graphics/sprites/head-catears.xml

diff --git a/graphics/sprites/head-catears.png b/graphics/sprites/head-catears.png
new file mode 100644
index 00000000..493e2b3f
Binary files /dev/null and b/graphics/sprites/head-catears.png differ
diff --git a/graphics/sprites/head-catears.xml b/graphics/sprites/head-catears.xml
new file mode 100644
index 00000000..974f9283
--- /dev/null
+++ b/graphics/sprites/head-catears.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/head-rabbitears.png|M" width="24" height="24" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-46" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="-2" offsetY ="-47"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-49"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="2" offsetY ="-47"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75"/>
+		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-42" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-41" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="2" offsetY ="-48" delay="75" />
+		  <frame index="1" offsetX="2" offsetY ="-49" delay="75" />
+		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75" />
+		  <frame index="1" offsetX="-3" offsetY ="-45" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-47" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-1" offsetY ="-48" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-49" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
+		  <frame index="3" offsetX="3" offsetY ="-45" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
+		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
+		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-48" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-48" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-48" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-48" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-48" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-34" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="2" offsetY ="-38"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-41"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-4" offsetY ="-38"/>
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="default">
+			<frame index="4" offsetX="35" offsetY="-6"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/items.xml b/items.xml
index b009dbe4..68293851 100644
--- a/items.xml
+++ b/items.xml
@@ -2306,7 +2306,17 @@
     </item>
     <item id="1216"
         image="armor-head-mouboohead.png"
-        name="Mouboo head"
+        name="Mouboo Head"
+        description="A pair of plush cat ears. Meow!"
+        effect="Defense: +1, Agility: +3"
+        type="equip-head"
+        defense="1"
+        weight="2">
+        <sprite>head-catears.xml</sprite>
+    </item>
+    <item id="1217"
+        image="armor-head-catears.png"
+        name="cat Ears"
         description="A tightly fitting mouboo head."
         effect="Defense: +1"
         type="equip-head"
-- 
cgit v1.2.3-70-g09d2


From 816c0d2e12b5c3cd8076b30c968db795aad715a7 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 8 Nov 2008 03:04:26 +0000
Subject: Fix previous commit (patch by vargavind)

---
 items.xml | 546 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 258 insertions(+), 288 deletions(-)

diff --git a/items.xml b/items.xml
index 68293851..090c17a0 100644
--- a/items.xml
+++ b/items.xml
@@ -46,14 +46,15 @@
         <sprite gender="female">hairstyle7-male.xml</sprite><!-- haven't got one yet -->
     </item>
 
-    <!-- treating the base sprite as equipment too will be useful when we
+    <!-- Treating the base sprite as equipment too will be useful when we
          implement other playable races -->
     <item id="-100" type="racesprite">
         <sprite gender="male">player_male_base.xml</sprite>
         <sprite gender="female">player_female_base.xml</sprite>
     </item>
 
-    <!-- Temporary low weapon IDs (< 256) -->
+
+    <!-- TEMPORARY LOW WEAPON ID:S (< 256) -->
 
     <item id="30"
         weapon_type="1">
@@ -90,7 +91,7 @@
         image="use-potion-a.png|G:#ff2222"
         name="Cactus Potion"
         description="A fresh potion."
-        effect="+25 HP/+10 MP"
+        effect="+25 HP, +10 MP"
         type="usable"
         hp="25"
         weight="40"
@@ -157,7 +158,7 @@
         image="use-food-candy.png"
         name="Candy"
         description="A sugar-free candy."
-        effect="+ 5 HP"
+        effect="+5 HP"
         type="usable"
         hp="5"
         weight="10"
@@ -166,7 +167,7 @@
         image="armor-head-santahat.png"
         name="Santa Hat"
         description="Ask Santa about this hat."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="15"
         defense="2"
@@ -240,7 +241,7 @@
         image="weapon-dagger-dagger.png"
         name="Dagger"
         description="A simple Dagger."
-        effect="Damage: +15 / Range: 1"
+        effect="+15 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="1"
         weight="60"
@@ -260,7 +261,7 @@
         image="weapon-dagger-sharpknife.png"
         name="Sharp Knife"
         description="A really sharp knife Don't hurt yourself!"
-        effect="Damage: +10 / Range: 1"
+        effect="+10 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="1"
         weight="45"
@@ -277,7 +278,7 @@
         image="armor-chest-leathershirt.png"
         name="Leather Shirt"
         description="A shirt made of hardened leather."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-torso"
         weight="30"
         defense="4"
@@ -289,7 +290,7 @@
         image="armor-head-fancyhat.png"
         name="Fancy Hat"
         description="A fancy hat."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-head"
         weight="25"
         defense="5"
@@ -300,7 +301,7 @@
         image="armor-head-minershat.png"
         name="Miners Hat"
         description="A hat used by miners."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="25"
         defense="4"
@@ -328,7 +329,7 @@
         image="armor-feet-boots.png"
         name="Boots"
         description="Some robust boots, ideal for travelling."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-feet"
         weight="15"
         defense="2"
@@ -339,7 +340,7 @@
         image="weapon-arrow-iron.png"
         name="Iron Arrow"
         description="A hard arrow made of iron."
-        effect="Damage: +50"
+        effect="+50 Damage"
         type="equip-ammo"
         weight="12"
         max-per-slot="100"/>
@@ -347,7 +348,7 @@
         image="weapon-bow-shortbow.png"
         name="Short Bow"
         description="A bow for short distances."
-        effect="Damage: +50 / Range: 5"
+        effect="+50 Damage, 5 Range"
         type="equip-2hand"
         weapon_type="10"
         weapon-type="bow"
@@ -360,7 +361,7 @@
         image="armor-hands-minergloves.png"
         name="Miner Gloves"
         description="Gloves used by miners; very useful."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-arms"
         weight="10"
         defense="2"
@@ -372,7 +373,7 @@
         image="armor-hands-leathergloves.png"
         name="Leather Gloves"
         description="Gloves made of hardened leather."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-arms"
         weight="25"
         defense="3"
@@ -393,7 +394,7 @@
         image="use-food-orangecupcake.png"
         name="Orange Cupcake"
         description="A very soft orange cupcake."
-        effect="+100 HP / +10 MP"
+        effect="+100 HP, +10 MP"
         type="usable"
         hp="150"
         weight="185"
@@ -411,7 +412,7 @@
         image="weapon-dagger-shortsword.png"
         name="Short Sword"
         description="A small but sharp sword."
-        effect="Damage: +100 / Range: 1"
+        effect="+100 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="2"
         weight="1025"
@@ -479,7 +480,7 @@
         image="armor-head-standardheadband.png"
         name="Standard Headband"
         description="Just a standard headband."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="45"
         max-per-slot="1"
@@ -490,7 +491,7 @@
         image="armor-head-silkheadband.png"
         name="Silk Headband"
         description="A cool headband made of silk."
-        effect="Defense: +10"
+        effect="+10% Defense"
         type="equip-head"
         weight="20"
         defense="10"
@@ -501,7 +502,7 @@
         image="weapon-bow-forestbow.png"
         name="Forest Bow"
         description="A bow usually used to hunt."
-        effect="Damage: +65 / Range: 5"
+        effect="+65 Damage, 5 Range"
         type="equip-2hand"
         weapon_type="10"
         weight="530"
@@ -518,7 +519,7 @@
         image="armor-chest-desertshirt.png"
         name="Desert Shirt"
         description="A shirt suitable for desert trips."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="50"
         defense="6"
@@ -529,7 +530,7 @@
         image="weapon-polearm-bardiche.png"
         name="Bardiche"
         description="A Bardiche."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -538,7 +539,7 @@
         image="weapon-polearm-halberd.png"
         name="Halberd"
         description="A weapon usually carried by guards."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -547,7 +548,7 @@
         image="weapon-axe-axe.png"
         name="Axe"
         description="An axe."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="axe"
         weight="10"
@@ -556,7 +557,7 @@
         image="weapon-axe-blacksmithsaxe.png"
         name="Blacksmith's Axe"
         description="An axe usually used by blacksmiths."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="axe"
         weight="10"
@@ -645,7 +646,7 @@
         image="weapon-sword-sabre.png"
         name="Sabre"
         description="A sword with a very sharp, curved, single-edged blade."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -662,7 +663,7 @@
         image="armor-hands-wintergloves.png"
         name="Winter Gloves"
         description="Soft and warm gloves."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-arms"
         weight="15"
         defense="2"
@@ -674,7 +675,7 @@
         image="armor-chest-tnecksweater.png|W:#b0b0b0,ffffff"
         name="Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40"
         defense="6"
@@ -702,7 +703,7 @@
         image="use-potion-b.png|G:#c05000,f0a000,f0f09f"
         name="Iron Potion"
         description="Increases your attack strength."
-        effect=""
+        effect="Attack strength increase (temporary)"
         type="generic"
         weight="295"
         max-per-slot="10"/>
@@ -710,7 +711,7 @@
         image="use-potion-c.png|G:#da69e5,ffdaff"
         name="Concentration Potion"
         description="Increases your attack speed."
-        effect=""
+        effect="Attack speed increase (temporary)"
         type="generic"
         weight="295"
         max-per-slot="10"/>
@@ -726,7 +727,7 @@
         image="weapon-dagger-boneknife.png"
         name="Bone Knife"
         description="A knife masterly carved out of a bone."
-        effect="Damage: +115 / Range 1"
+        effect="+115 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="2"
         weapon-type="knife"
@@ -737,7 +738,7 @@
         image="weapon-dagger-setzer.png"
         name="Setzer"
         description="A sharp knife, named after a famous gambler."
-        effect="Damage: +110 / Range 1"
+        effect="+110 Damage, 1 Range"
         type="equip-1hand"
         weapon-type="knife"
         weight="10"
@@ -748,7 +749,7 @@
         image="weapon-sword-scimitar.png"
         name="Scimitar"
         description="A sword with a heavy, curved, single-edged blade."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -757,7 +758,7 @@
         image="weapon-sword-falchion.png"
         name="Falcion"
         description="A heavy one-handed, single-edged sword."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -766,7 +767,7 @@
         image="weapon-polearm-scorpion.png"
         name="Scorpion"
         description="A well crafted glaive."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="1"
@@ -775,7 +776,7 @@
         image="weapon-bow-desertbow.png"
         name="Desert Bow"
         description="A tonorian short bow."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="bow"
         weight="10"
@@ -784,7 +785,7 @@
         image="weapon-sword-beheader.png"
         name="Beheader"
         description="An oddly designed sword especially made for beheading enemies."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -793,7 +794,7 @@
         image="weapon-thrown-bonedarts.png"
         name="Bone Darts"
         description="Some darts made of bones."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="thrown"
         weight="10"
@@ -802,7 +803,7 @@
         image="weapon-sword-sandcutter.png"
         name="Sand Cutter"
         description="A sand cutter."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -811,7 +812,7 @@
         image="weapon-dagger-rockknive.png"
         name="Rock Knife"
         description="A knife made of stone."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="knife"
         weight="10"
@@ -820,7 +821,7 @@
         image="weapon-staff-staffoflife.png"
         name="Staff of Life"
         description="A staff that increases healing magic."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="staff"
         weight="10"
@@ -829,7 +830,7 @@
         image="weapon-staff-crescentrod.png"
         name="Crescent Rod"
         description="A crescent rod."
-        effect="Damage: +50 "
+        effect="+50 Damage, ??? Range"
         type="equip-2hand"
         weapon-type="staff"
         weight="10"
@@ -838,7 +839,7 @@
         image="weapon-staff-staffoffire.png"
         name="Staff of Fire"
         description="A staff that increases fire magic."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="staff"
         weight="10"
@@ -847,7 +848,7 @@
         image="weapon-staff-staffofice.png"
         name="Staff of Ice"
         description="A staff that increases ice magic."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="staff"
         weight="10"
@@ -856,7 +857,7 @@
         image="weapon-sword-jackal.png"
         name="Jackal"
         description="A jackal."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -865,7 +866,7 @@
         image="armor-hands-scarabarmlet.png"
         name="Scarab Armlet"
         description="A scarab armlet."
-        effect="Defense: ???"
+        effect="??? Defense"
         type="equip-arms"
         weight="10"
         max-per-slot="1"/>
@@ -873,7 +874,7 @@
         image="armor-legs-shorts.png|W:#6c858a,ffffff"
         name="Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -885,7 +886,7 @@
         image="weapon-sword-sword.png"
         name="Sword"
         description="A simple but reliable sword."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -894,7 +895,7 @@
         image="weapon-sword-bastardsword.png"
         name="Bastard Sword"
         description="A large two handed sword."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="sword"
         weight="10"
@@ -903,7 +904,7 @@
         image="weapon-sword-broadsword.png"
         name="Broad Sword"
         description="A two handed sword with a very broad blade."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="sword"
         weight="10"
@@ -912,7 +913,7 @@
         image="weapon-sword-baselard.png"
         name="Baselard"
         description="A short and powerful sword."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -921,7 +922,7 @@
         image="weapon-sword-longsword.png"
         name="Long Sword"
         description="A sword with a long and agile blade."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -930,7 +931,7 @@
         image="weapon-dagger-stiletto.png"
         name="Stiletto"
         description="A dagger with a long and thin blade."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="knife"
         weight="10"
@@ -939,7 +940,7 @@
         image="weapon-sword-rapier.png"
         name="Rapier"
         description="A light sword made for duels."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -948,7 +949,7 @@
         image="weapon-polearm-spear.png"
         name="Spear"
         description="A light spear with a wooden pole."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -957,7 +958,7 @@
         image="weapon-polearm-heavyspear.png"
         name="Heavy Spear"
         description="A heavy spear with a wooden pole."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -966,7 +967,7 @@
         image="weapon-polearm-pike.png"
         name="Pike"
         description="A light spear with an iron pole."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -975,7 +976,7 @@
         image="weapon-polearm-heavypike.png"
         name="Heavy Pike"
         description="A heavy spear with an iron pole."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -984,7 +985,7 @@
         image="weapon-polearm-dualspear.png"
         name="Dual Spear"
         description="A spear with two tops."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -993,7 +994,7 @@
         image="weapon-sword-firesword.png"
         name="Fire Sword"
         description="A magical sword enchanted with the power of fire."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -1002,7 +1003,7 @@
         image="armor-shield-britshield.png"
         name="Brit Shield"
         description="Legendary shield that is said to save queens and rule waves."
-        effect="Cooking: -50"
+        effect="-50 Cooking"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1010,7 +1011,7 @@
         image="armor-shield-steelshield.png"
         name="Steel Shield"
         description="A shield made of steel."
-        effect="Defense: +20"
+        effect="+20% Defense"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1018,7 +1019,7 @@
         image="armor-shield-woodenshield.png"
         name="Wooden Shield"
         description="A shield made of wood."
-        effect="Defense: +14"
+        effect="+14% Defense"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1026,7 +1027,7 @@
         image="armor-shield-leathershield.png"
         name="Leather Shield"
         description="A shield made of leather on a wooden frame."
-        effect="Defense: +7"
+        effect="+7% Defense"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1034,7 +1035,7 @@
         image="armor-shield-knightshield.png"
         name="Knight Shield"
         description="A high quality shield used by knights."
-        effect=""
+        effect="??? Defense"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1042,7 +1043,7 @@
         image="weapon-axe-meatcleaver.png"
         name="Meat Cleaver"
         description="A butchers tool that also makes a nice one handed battle axe."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="axe"
         weight="10"
@@ -1051,7 +1052,7 @@
         image="weapon-axe-hatchet.png"
         name="Hatchet"
         description="A short one handed axe."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="axe"
         weight="10"
@@ -1060,7 +1061,7 @@
         image="weapon-polearm-trident.png"
         name="Trident"
         description="A spear with three heads."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -1077,7 +1078,7 @@
         image="weapon-mace-club.png"
         name="Club"
         description="A primitive wooden club."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="mace"
         weight="10"
@@ -1086,7 +1087,7 @@
         image="armor-legs-shorts.png|W:#0e1d24,285f78,2c7c98,76b9ca"
         name="Jeans Shorts"
         description="Shorts made of jeans."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-legs"
         weight="30"
         defense="4"
@@ -1130,7 +1131,7 @@
         image="armor-head-pumpkinhelmet.png"
         name="Pumpkin Helmet"
         description="A helmet made out of a pumpkin."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="30"
         defense="4"
@@ -1141,7 +1142,7 @@
         image="armor-head-axehat.png"
         name="Axe Hat"
         description="A really cool joke."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="20"
         defense="4"
@@ -1152,7 +1153,7 @@
         image="armor-head-piratehat.png"
         name="Pirate Hat"
         description="A pirate hat."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="25"
         defense="4"
@@ -1163,7 +1164,7 @@
         image="armor-head-goggles.png"
         name="Goggles"
         description="Goggles designed to take care of your eyes."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="20"
         defense="2"
@@ -1174,7 +1175,7 @@
         image="armor-head-leathergoggles.png"
         name="Leather Goggles"
         description="Goggles designed for desert storms."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="25"
         defense="3"
@@ -1185,7 +1186,7 @@
         image="armor-head-circlet.png"
         name="Circlet"
         description="A nice piece of jewelry."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="35"
         defense="4"
@@ -1196,19 +1197,18 @@
         image="armor-head-eyepatch.png"
         name="Eyepatch"
         description="What really makes you a pirate."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="15"
         defense="3"
         max-per-slot="1">
-
         <sprite>item017.xml</sprite>
     </item>
     <item id="622"
         image="armor-head-bandana.png"
         name="Bandana"
         description="A striped bandana."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="15"
         defense="3"
@@ -1219,7 +1219,7 @@
         image="weapon-polearm-scythe.png"
         name="Scythe"
         description="Usually used for farming but also usable as a weapon. Slow but deadly."
-        effect="Damage: +75 / Range: 1"
+        effect="+75 Damage, 1 Range"
         type="equip-2hand"
         weapon_type="11"
         weapon-type="polearm"
@@ -1233,7 +1233,7 @@
         image="armor-chest-vnecksweater.png|W:#ffffff"
         name="V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45"
         defense="8"
@@ -1245,7 +1245,7 @@
         image="armor-chest-chainmail.png"
         name="Chainmail Shirt"
         description="A shirt made of chains. It weights a lot but offers excellent protection."
-        effect="Defense: +20"
+        effect="+20% Defense"
         type="equip-torso"
         weight="120"
         defense="12"
@@ -1257,7 +1257,7 @@
         image="armor-chest-lightplatemail.png|W:#ddeeff"
         name="Light Platemail"
         description="A light cuirass with shoulder pads made of iron. A cheap and plain but efficient armor usually worn by foot soldiers."
-        effect="Defense: +25"
+        effect="+25% Defense"
         type="equip-torso"
         weight="240"
         defense="14"
@@ -1269,7 +1269,7 @@
         image="armor-head-tophat.png"
         name="Top Hat"
         description="For the gentry of The Mana World."
-        effect="Defense: +10"
+        effect="+10% Defense"
         type="equip-head"
         weight="20"
         defense="15"
@@ -1280,7 +1280,7 @@
         image="armor-head-funkyhat.png"
         name="Funky Hat"
         description="Yawn..."
-        effect="Defense: +13"
+        effect="+13% Defense"
         type="equip-head"
         weight="20"
         defense="15"
@@ -1291,7 +1291,7 @@
         image="armor-head-mushroomhat.png"
         name="Mush Hat"
         description="Soft and fashionable."
-        effect="Defense: +10"
+        effect="+10% Defense"
         type="equip-head"
         weight="20"
         defense="15"
@@ -1302,7 +1302,7 @@
         image="armor-head-shroomhat.png"
         name="Shroom Hat"
         description="Evil and fashionable."
-        effect="Defense: +13"
+        effect="+13% Defense"
         type="equip-head"
         weight="20"
         defense="18"
@@ -1321,7 +1321,7 @@
         image="armor-legs-skirt.png|W:#e0e0e0,ffffff"
         name="Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
         defense="4"
         type="equip-legs"
         weight="30"
@@ -1332,7 +1332,7 @@
         image="armor-head-xmaself.png"
         name="Christmas Elf Hat"
         description="A hat worn by Christmas elves."
-        effect="Defense: +13"
+        effect="+13% Defense"
         defense="18"
         type="equip-head"
         weight="20"
@@ -1343,7 +1343,7 @@
         image="armor-head-mask.png"
         name="Face Mask"
         description="A wooden mask to conceal your face."
-        effect="Defense: +10"
+        effect="+10% Defense"
         defense="15"
         type="equip-head"
         weight="20"
@@ -1362,7 +1362,7 @@
         image="armor-head-warlordhelm.png"
         name="Warlord Helmet"
         description="Worn by great warriors"
-        effect="Defense: +18"
+        effect="+18% Defense"
         type="equip-head"
         defense="25"
         weight="40">
@@ -1372,7 +1372,7 @@
         image="armor-head-knighthelm.png"
         name="Knight's Helmet"
         description="Helmet with two small wings on it"
-        effect="Defense: +15"
+        effect="+15% Defense"
         type="equip-head"
         defense="20"
         weight="35">
@@ -1382,7 +1382,7 @@
         image="armor-head-infantryhelm.png"
         name="Infantry Helmet"
         description="For soldiers and guards"
-        effect="Defense: +15"
+        effect="+15% Defense"
         type="equip-head"
         defense="20"
         weight="35">
@@ -1392,7 +1392,7 @@
         image="armor-head-crusadehelm.png"
         name="Crusade Helmet"
         description="Start your own crusade"
-        effect="Defense: +18"
+        effect="+18% Defense"
         type="equip-head"
         defense="25"
         weight="40">
@@ -1416,7 +1416,7 @@
         image="armor-legs-chaps.png"
         name="Jeans Chaps"
         description="Jeans with snake skin chaps."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-legs"
         defense="6"
         weight="40">
@@ -1427,7 +1427,7 @@
         image="armor-head-cowboywhite.png"
         name="White Cowboy Hat"
         description="A white cowboy hat with a band."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-head"
         defense="6"
         weight="30">
@@ -1437,7 +1437,7 @@
         image="armor-head-cowboyblack.png"
         name="Black Cowboy Hat"
         description="A black cowboy hat with shiny buckles."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-head"
         defense="6"
         weight="30">
@@ -1447,7 +1447,7 @@
         image="armor-chest-lightplatemail.png|W:#573f10,9c8226,d3c04b,ffffff"
         name="Golden Platemail"
         description="A plate mail made from gold which can only be afforded by the richest of the richest."
-        effect="Defense: +25"
+        effect="+25% Defense"
         type="equip-torso"
         defense="25"
         weight="240">
@@ -1458,7 +1458,7 @@
         image="armor-head-crown.png"
         name="Crown"
         description="A jewel embossed crown fit for any ruler."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         defense="4"
         weight="50">
@@ -1468,7 +1468,7 @@
         image="armor-head-devcap.png|R:#9999ff"
         name="Developers Cap"
         description="A cap which identifies you as a developer."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-head"
         defense="5"
         weight="20">
@@ -1478,7 +1478,7 @@
         image="armor-ring-strength-rough.png"
         name="Rough Strength Ring"
         description="A rough strength-enhancing ring that looks as if it has been made in a hurry."
-        effect="Strength: +5"
+        effect="+5 Strength"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1487,7 +1487,7 @@
         image="armor-ring-agility-rough.png"
         name="Rough Agility Ring"
         description="A rough agility-enhancing ring that looks as if it has been made in a hurry."
-        effect="Agility: +5"
+        effect="+5 Agility"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1496,7 +1496,7 @@
         image="armor-ring-dexterity-rough.png"
         name="Rough Dexterity Ring"
         description="A rough dexterity-enhancing ring that looks as if it has been made in a hurry."
-        effect="Dexterity: +5"
+        effect="+5 Dexterity"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1505,7 +1505,7 @@
         image="armor-ring-vitality-rough.png"
         name="Rough Vitality Ring"
         description="A rough vitality-enhancing ring that looks as if it has been made in a hurry."
-        effect="Vitality: +5"
+        effect="+5 Vitality"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1514,7 +1514,7 @@
         image="armor-ring-intelligence-rough.png"
         name="Rough Intelligence Ring"
         description="A rough intelligence-enhancing ring that looks as if it has been made in a hurry."
-        effect="Intelligence: +5"
+        effect="+5 Intelligence"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1523,7 +1523,7 @@
         image="armor-ring-willpower-rough.png"
         name="Rough Willpower Ring"
         description="A rough willpower-enhancing ring that looks as if it has been made in a hurry."
-        effect="Willpower: +5"
+        effect="+5 Willpower"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1532,7 +1532,7 @@
         image="armor-head-cap.png|R:#d94800"
         name="Cap"
         description="A hat with a peak to shield your eyes from the sun."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-head"
         defense="5"
         weight="20">
@@ -1542,7 +1542,7 @@
         image="armor-feet-furboots.png"
         name="Fur Boots"
         description="A pair of warm winter boots."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-feet"
         weight="25"
         defense="3"
@@ -1553,7 +1553,7 @@
         image="armor-head-serf.png"
         name="Serf Hat"
         description="A simple hat made from cloth."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="25"
         defense="2"
@@ -1573,7 +1573,7 @@
         image="armor-chest-warlordplate.png"
         name="Warlord Plate"
         description="Strong and decorative armor."
-        effect="Defense: +27"
+        effect="+27% Defense"
         type="equip-torso"
         weight="275"
         defense="27"
@@ -1585,7 +1585,7 @@
         image="armor-chest-warlordplate.png|W:#573f10,9c8226,d3c04b,ffffff"
         name="Golden Warlord Plate"
         description="Strong and decorative armor made from gold."
-        effect="Defense: +27"
+        effect="+27% Defense"
         type="equip-torso"
         weight="275"
         defense="27"
@@ -1717,7 +1717,7 @@
         image="armor-head-gradcap.png"
         name="Graduation Cap"
         description="A traditional cap which a university student may wear upon graduating."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="20"
         defense="2"
@@ -1744,7 +1744,7 @@
         image="armor-head-nohmask.png"
         name="Noh Mask"
         description="A traditional Japanese mask worn in Noh plays."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="15"
         defense="3"
@@ -1755,7 +1755,7 @@
         image="armor-head-demonmask.png"
         name="Demon Mask"
         description="A scary mask to make you look like a demon."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="15"
         defense="3"
@@ -1769,7 +1769,6 @@
         type="generic"
         weight="1"
         max-per-slot="10"/>
-
     <item id="681"
         image="generic-herb.png|W:#0047ab"
         name="Cobalt Herb"
@@ -1777,7 +1776,6 @@
         type="generic"
         weight="1"
         max-per-slot="10"/>
-
     <item id="682"
         image="generic-herb.png|W:#ef9b0f"
         name="Gamboge Herb"
@@ -1785,7 +1783,6 @@
         type="generic"
         weight="1"
         max-per-slot="10"/>
-
     <item id="683"
         image="generic-herb.png|W:#e32636"
         name="Alizarin Herb"
@@ -1793,7 +1790,6 @@
         type="generic"
         weight="1"
         max-per-slot="10"/>
-
     <item id="684"
         image="use-potion-a.png|G:#b03678,ffffff"
         name="Tiny Healing Potion"
@@ -1803,7 +1799,6 @@
         hp="100"
         weight="5"
         max-per-slot="10"/>
-
     <item id="685"
         image="use-potion-d.png|G:#b03678,ffffff"
         name="Small Healing Potion"
@@ -1813,7 +1808,6 @@
         hp="200"
         weight="10"
         max-per-slot="10"/>
-
     <item id="686"
         image="use-potion-b.png|G:#b03678,ffffff"
         name="Medium Healing Potion"
@@ -1823,7 +1817,6 @@
         hp="400"
         weight="20"
         max-per-slot="10"/>
-
     <item id="687"
         image="use-potion-c.png|G:#b03678,ffffff"
         name="Large Healing Potion"
@@ -1833,28 +1826,26 @@
         hp="800"
         weight="40"
         max-per-slot="10"/>
-
-     <item id="688"
-         image="armor-chest-tanktop.png"
-         name="White Tank Top"
-         description="A sleeveless shirt for hot summer days."
-         effect="Defense: +2"
-         type="equip-torso"
-         weight="15">
-         <sprite gender="male">chest-tanktop-male.xml</sprite>
-         <sprite gender="female">chest-tanktop-female.xml</sprite>
-     </item>
-     <item id="689"
-         image="armor-chest-tanktop-short.png"
-         name="White Short Tank Top"
-         description="A short, sleeveless shirt for VERY hot summer days."
-         effect="Defense: +2"
-         type="equip-torso"
-         weight="15">
-         <sprite gender="male">chest-shorttanktop-male.xml</sprite>
-         <sprite gender="female">chest-shorttanktop-female.xml</sprite>
-     </item>    
-
+    <item id="688"
+        image="armor-chest-tanktop.png"
+        name="White Tank Top"
+        description="A sleeveless shirt for hot summer days."
+        effect="+2% Defense"
+        type="equip-torso"
+        weight="15">
+        <sprite gender="male">chest-tanktop-male.xml</sprite>
+        <sprite gender="female">chest-tanktop-female.xml</sprite>
+    </item>
+    <item id="689"
+        image="armor-chest-tanktop-short.png"
+        name="White Short Tank Top"
+        description="A short, sleeveless shirt for VERY hot summer days."
+        effect="+2% Defense"
+        type="equip-torso"
+        weight="15">
+        <sprite gender="male">chest-shorttanktop-male.xml</sprite>
+        <sprite gender="female">chest-shorttanktop-female.xml</sprite>
+    </item>    
     <item id="690"
         image="use-potion-d.png|G:#a50000,e03f27,eb5558"
         name="Red Dye"
@@ -1862,7 +1853,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="691"
         image="use-potion-d.png|G:#1f9c1f,89d689"
         name="Green Dye"
@@ -1870,7 +1860,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="692"
         image="use-potion-d.png|G:#4b4bbd,888af4"
         name="Dark Blue Dye"
@@ -1878,7 +1867,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="693"
         image="use-potion-d.png|G:#ccb534,f1ea8e,ffffaa"
         name="Yellow Dye"
@@ -1886,7 +1874,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="694"
         image="use-potion-d.png|G:#62aaca,a3f4f8,d5fcfb"
         name="Light Blue Dye"
@@ -1894,7 +1881,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="695"
         image="use-potion-d.png|G:#c64abd,f9a5f2,fcd0fa"
         name="Pink Dye"
@@ -1902,7 +1888,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="696"
         image="use-potion-d.png|G:#404040,c0c0c0"
         name="Black Dye"
@@ -1910,7 +1895,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="697"
         image="use-potion-d.png|G:#96370f,cc5616,f68d26,fcaa2d,fdd493"
         name="Orange Dye"
@@ -1918,7 +1902,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="698"
         image="use-potion-d.png|G:#530a7c,b362e1,ca87ef"
         name="Purple Dye"
@@ -1926,7 +1909,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="699"
         image="use-potion-d.png|G:#155515,206620,409940"
         name="Dark Green Dye"
@@ -1934,7 +1916,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="700"
         image="generic-pearl.png"
         name="Pearl"
@@ -1942,7 +1923,6 @@
         type="generic"
         weight="5"
         max-per-slot="10"/>
-
     <item id="701"
         image="generic-powder.png"
         name="Pile of Ash"
@@ -1950,7 +1930,6 @@
         type="generic"
         weight="3"
         max-per-slot="10"/>
-
     <item id="702"
         image="armor-ring-wedding.png"
         name="Wedding Ring"
@@ -1958,22 +1937,22 @@
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
-
     <item id="703"
-          image="generic-powder.png|W:#606030,b0b090,e0e0a0,ffffe0"
-          name="Sulphur Powder"
-          description="A small pile of sulphur."
-          type="generic"
-          weight="2"
-          max-per-slot="10"/>
-
+        image="generic-powder.png|W:#606030,b0b090,e0e0a0,ffffe0"
+        name="Sulphur Powder"
+        description="A small pile of sulphur."
+        type="generic"
+        weight="2"
+        max-per-slot="10"/>
     <item id="704"
-          image="generic-powder.png|W:#405060"
-          name="Iron Powder"
-          description="A pile of powdered iron."
-          type="generic"
-          weight="5"
-          max-per-slot="10"/>
+        image="generic-powder.png|W:#405060"
+        name="Iron Powder"
+        description="A pile of powdered iron."
+        type="generic"
+        weight="5"
+        max-per-slot="10"/>
+
+    <!-- PLACEHOLDER FOR ITEM 705 -->
 
     <item id="706"
         image="generic-scorpionstinger.png|W:#e0d080,fff0e0,ffffff"
@@ -1982,7 +1961,6 @@
         effect=""
         type="generic"
         weight="2"/>
-
     <item id="707"
         image="use-potion-e.png|R:#504030;G:#9e8e5e"
         name="Monster Oil Potion"
@@ -1991,7 +1969,6 @@
         type="generic"
         weight="50"
         max-per-slot="10"/>
-
     <item id="708"
         image="generic-patch-leather.png"
         name="Leather Patch"
@@ -1999,7 +1976,6 @@
         effect=""
         type="generic"
         weight="18"/>
-
     <item id="709"
         image="generic-scorpionstinger.png|W:#a08040"
         name="Black Scorpion Stinger"
@@ -2007,7 +1983,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="710"
         image="generic-snake-tongue.png|W:#e04020"
         name="Snake Tongue"
@@ -2015,7 +1990,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="711"
         image="generic-snake-tongue.png|W:#706060"
         name="Mountain Snake Tongue"
@@ -2023,7 +1997,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="712"
         image="generic-snake-tongue.png|W:#a05050,e08080"
         name="Grass Snake Tongue"
@@ -2031,7 +2004,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="713"
         image="generic-snake-tongue.png|W:#907070,d0a0a0"
         name="Cave Snake Tongue"
@@ -2039,7 +2011,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="714"
         image="use-food-snake-egg.png|W:#c0c0a0;R:#b09070;G:#b8a888"
         name="Snake Egg"
@@ -2047,7 +2018,6 @@
         effect="+30 HP"
         type="generic"
         weight="2"/>
-
     <item id="715"
         image="use-food-snake-egg.png|W:#806020;R:#604010;G:#705018"
         name="Mountain Snake Egg"
@@ -2055,7 +2025,6 @@
         effect="+40 HP"
         type="generic"
         weight="2"/>
-
     <item id="716"
         image="use-food-snake-egg.png|W:#e0e0c0;R:#80f0a0;G:#b0e8b0"
         name="Grass Snake Egg"
@@ -2063,7 +2032,6 @@
         effect="+50 HP"
         type="generic"
         weight="2"/>
-
     <item id="717"
         image="use-food-snake-egg.png|W:#c0c0c0;R:#c090c0;G:#c0a8c0"
         name="Cave Snake Egg"
@@ -2071,7 +2039,6 @@
         effect="+20 HP"
         type="generic"
         weight="2"/>
-
     <item id="718"
         image="generic-cocoon-silk.png"
         name="Silk Cocoon"
@@ -2080,11 +2047,13 @@
         type="generic"
         weight="1"/>
 
+    <!-- PLACEHOLDER FOR ITEM 719 -->
+
     <item id="720"
         image="armor-chest-robe.png|W:#ffffff"
         name="Silk Robe"
         description="A light and shimmering silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2092,38 +2061,36 @@
         <sprite gender="male">chest-robe-male.xml|#ffffff</sprite>
         <sprite gender="female">chest-robe-female.xml|#ffffff</sprite>
     </item>
-
     <item id="721"
         image="armor-head-highpriest-crown.png"
         name="High Priest Crown"
         description="A golden crown with an enchanted ruby."
-        effect="Defense: +4, SP: +20"
+        effect="+4% Defense, +20 SP"
         type="equip-head"
         defense="4"
         weight="60">
         <sprite>head-highpriest-crown.xml</sprite>
     </item>
-
     <item id="722"
         image="armor-head-monster-skull-helm.png"
         name="Monster Skull Helmet"
         description="The conserved skull of a mysterious ancient monster."
-        effect="Defense: +7, Magic Defense: +20%"
+        effect="+7% Defense, +20% Magic Defense"
         type="equip-head"
         defense="7"
         weight="40">
         <sprite>head-monster-skull-helm.xml</sprite>
     </item>
 
-    <!--
-                         HERE ARE SOME UNUSED ITEM IDs
-           -->
+
+    <!-- HERE ARE SOME UNUSED ITEM ID:S -->
+
         
     <item id="1199"
         image="weapon-arrow-arrow.png"
         name="Arrow"
         description="A standard arrow."
-        effect="Damage: +25"
+        effect="+25 Damage"
         type="equip-ammo"
         weight="8"
         max-per-slot="100"/>
@@ -2131,7 +2098,7 @@
         image="weapon-bow-bow.png"
         name="Bow"
         description="A distance weapon."
-        effect="Damage: +15 / Range: 5"
+        effect="+15 Damage, 5 Range"
         type="equip-2hand"
         weapon_type="10"
         weight="125"
@@ -2150,7 +2117,7 @@
         image="weapon-dagger-knive.png"
         name="Knife"
         description="A small knife, the perfect weapon for a beginner."
-        effect="Damage: 5 / Range: 1"
+        effect="+5 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="1"
         weight="20"
@@ -2167,7 +2134,7 @@
         image="armor-chest-cottonshirt.png"
         name="Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15"
         defense="2"
@@ -2179,7 +2146,7 @@
         image="armor-head-rangerhat.png"
         name="Ranger Hat"
         description="A leather hat traditionally worn by Rangers."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="55"
         defense="2"
@@ -2190,7 +2157,7 @@
         image="armor-head-antlerhat.png"
         name="Antler Hat"
         description="A hat with antlers sticking out of it."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="20"
         defense="4"
@@ -2201,7 +2168,7 @@
         image="armor-head-christmastree.png"
         name="Christmas Tree Hat"
         description="A hat shaped like a Christmas tree."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="25"
         defense="2"
@@ -2212,7 +2179,7 @@
         image="armor-head-santabeardhat.png"
         name="Santa Beard Hat"
         description="Now you will look just like Santa Claus!"
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-head"
         weight="30"
         defense="5"
@@ -2279,7 +2246,7 @@
         image="armor-head-bunnyears.png"
         name="Bunny Ears"
         description="A headband with plush bunny ears."
-        effect="Defense: +10"
+        effect="+10% Defense"
         type="equip-head"
         defense="10"
         weight="20">
@@ -2289,7 +2256,7 @@
         image="weapon-sword-sabre.png"
         name="Toy Sabre"
         description="A toy item, doesn't do much damage."
-        effect="Damage: +1"
+        effect="+1 Damage, 1 Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="1"
@@ -2307,22 +2274,22 @@
     <item id="1216"
         image="armor-head-mouboohead.png"
         name="Mouboo Head"
-        description="A pair of plush cat ears. Meow!"
-        effect="Defense: +1, Agility: +3"
+        description="A tightly fitting mouboo head."
+        effect="+1% Defense"
         type="equip-head"
         defense="1"
-        weight="2">
-        <sprite>head-catears.xml</sprite>
+        weight="20">
+        <sprite>head-mouboohead.xml</sprite>
     </item>
     <item id="1217"
         image="armor-head-catears.png"
-        name="cat Ears"
-        description="A tightly fitting mouboo head."
-        effect="Defense: +1"
+        name="Cat Ears"
+        description="A pair of plush cat ears. Meow!"
+        effect="+1% Defense, +3 Agility"
         type="equip-head"
         defense="1"
-        weight="20">
-        <sprite>head-mouboohead.xml</sprite>
+        weight="2">
+        <sprite>head-catears.xml</sprite>
     </item>
 
     <!-- The 2XXY IDs are used for recolored items on eAthena.
@@ -2338,7 +2305,7 @@
         image="armor-chest-cottonshirt.png|W:#441111,aa3333,dd6666"
         name="Red Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#441111,aa3333,dd6666</sprite>
@@ -2348,7 +2315,7 @@
         image="armor-chest-cottonshirt.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#115511,22aa22,99dd99</sprite>
@@ -2358,7 +2325,7 @@
         image="armor-chest-cottonshirt.png|W:#222255,6666ff"
         name="Dark Blue Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#222255,6666ff</sprite>
@@ -2368,7 +2335,7 @@
         image="armor-chest-cottonshirt.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -2378,7 +2345,7 @@
         image="armor-chest-cottonshirt.png|W:#223355,99aadd,bbccff"
         name="Light Blue Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#223355,99aadd,bbccff</sprite>
@@ -2388,7 +2355,7 @@
         image="armor-chest-cottonshirt.png|W:#552255,ff66ff,ffffff"
         name="Pink Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -2398,7 +2365,7 @@
         image="armor-chest-cottonshirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -2408,7 +2375,7 @@
         image="armor-chest-cottonshirt.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -2418,7 +2385,7 @@
         image="armor-chest-cottonshirt.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -2428,17 +2395,18 @@
         image="armor-chest-cottonshirt.png|W:#155515,206620,409940"
         name="Dark Green Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#155515,206620,409940</sprite>
         <sprite gender="female">chest-cotton-female.xml|#155515,206620,409940</sprite>
     </item>
+
     <item id="2060"
         image="armor-chest-vnecksweater.png|W:#441111,aa3333,dd6666"
         name="Red V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#441111,aa3333,dd6666</sprite>
@@ -2448,7 +2416,7 @@
         image="armor-chest-vnecksweater.png|W:#115511,22aa22,99dd99"
         name="Green V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
@@ -2458,7 +2426,7 @@
         image="armor-chest-vnecksweater.png|W:#222255,6666ff"
         name="Dark Blue V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#222255,6666ff</sprite>
@@ -2468,7 +2436,7 @@
         image="armor-chest-vnecksweater.png|W:#887722,ddcc66,ffffaa"
         name="Yellow V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -2478,7 +2446,7 @@
         image="armor-chest-vnecksweater.png|W:#223355,99aadd,bbccff"
         name="Light Blue V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#223355,99aadd,bbccff</sprite>
@@ -2488,7 +2456,7 @@
         image="armor-chest-vnecksweater.png|W:#552255,ff66ff,ffffff"
         name="Pink V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -2498,7 +2466,7 @@
         image="armor-chest-vnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -2508,7 +2476,7 @@
         image="armor-chest-vnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -2518,7 +2486,7 @@
         image="armor-chest-vnecksweater.png|W:#4f0a76,8010c0,d699f7"
         name="Purple V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -2528,17 +2496,18 @@
         image="armor-chest-vnecksweater.png|W:#155515,206620,409940"
         name="Dark Green V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#155515,206620,409940</sprite>
         <sprite gender="female">chest-vnecksweater-female.xml|#155515,206620,409940</sprite>
     </item>
+
     <item id="2070"
         image="armor-chest-tnecksweater.png|W:#441111,aa3333,dd6666"
         name="Red Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#441111,aa3333,dd6666</sprite>
@@ -2548,7 +2517,7 @@
         image="armor-chest-tnecksweater.png|W:#115511,22aa22,99dd99"
         name="Green Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
@@ -2558,7 +2527,7 @@
         image="armor-chest-tnecksweater.png|W:#222255,6666ff"
         name="Dark Blue Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#222255,6666ff</sprite>
@@ -2568,7 +2537,7 @@
         image="armor-chest-tnecksweater.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -2578,7 +2547,7 @@
         image="armor-chest-tnecksweater.png|W:#223355,99aadd,bbccff"
         name="Light Blue Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#223355,99aadd,bbccff</sprite>
@@ -2588,7 +2557,7 @@
         image="armor-chest-tnecksweater.png|W:#552255,ff66ff,ffffff"
         name="Pink Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -2598,7 +2567,7 @@
         image="armor-chest-tnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -2608,7 +2577,7 @@
         image="armor-chest-tnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -2618,7 +2587,7 @@
         image="armor-chest-tnecksweater.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -2628,17 +2597,18 @@
         image="armor-chest-tnecksweater.png|W:#155515,206620,409940"
         name="Dark Green Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#155515,206620,409940</sprite>
         <sprite gender="female">chest-tnecksweater-female.xml|#155515,206620,409940</sprite>
     </item>
+
     <item id="2080"
         image="armor-chest-robe.png|W:#441111,aa3333,dd6666"
         name="Red Silk Robe"
         description="A red silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2650,7 +2620,7 @@
         image="armor-chest-robe.png|W:#115511,22aa22,99dd99"
         name="Green Silk Robe"
         description="A green silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2662,7 +2632,7 @@
         image="armor-chest-robe.png|W:#222255,6666ff"
         name="Dark Blue Silk Robe"
         description="A dark blue silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2674,7 +2644,7 @@
         image="armor-chest-robe.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Silk Robe"
         description="A yellow silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2686,7 +2656,7 @@
         image="armor-chest-robe.png|W:#223355,99aadd,bbccff"
         name="Light Blue Silk Robe"
         description="A light blue silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2698,7 +2668,7 @@
         image="armor-chest-robe.png|W:#552255,ff66ff,ffffff"
         name="Pink Silk Robe"
         description="A pink silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2710,7 +2680,7 @@
         image="armor-chest-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Silk Robe"
         description="A black silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2722,7 +2692,7 @@
         image="armor-chest-robe.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Silk Robe"
         description="An orange silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2734,7 +2704,7 @@
         image="armor-chest-robe.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Silk Robe"
         description="A purple silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2746,7 +2716,7 @@
         image="armor-chest-robe.png|W:#155515,206620,409940"
         name="Dark Green Silk Robe"
         description="A dark green silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2759,7 +2729,7 @@
         image="armor-chest-tanktop.png|W:#441111,aa3333,dd6666" 
 	name="Red Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#441111,aa3333,dd6666</sprite>
@@ -2769,7 +2739,7 @@
         image="armor-chest-tanktop.png|W:#115511,22aa22,99dd99"
         name="Green Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#115511,22aa22,99dd99</sprite>
@@ -2779,7 +2749,7 @@
         image="armor-chest-tanktop.png|W:#222255,6666ff"
         name="Dark Blue Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#222255,6666ff</sprite>
@@ -2789,7 +2759,7 @@
         image="armor-chest-tanktop.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -2798,7 +2768,7 @@
     <item id="2094" image="armor-chest-tanktop.png|W:#223355,99aadd,bbccff"
         name="Light Blue Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#223355,99aadd,bbccff</sprite>
@@ -2807,7 +2777,7 @@
     <item id="2095" image="armor-chest-tanktop.png|W:#552255,ff66ff,ffffff"
         name="Pink Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -2817,7 +2787,7 @@
         image="armor-chest-tanktop.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -2827,7 +2797,7 @@
         image="armor-chest-tanktop.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -2836,7 +2806,7 @@
     <item id="2098" image="armor-chest-tanktop.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -2846,7 +2816,7 @@
         image="armor-chest-tanktop.png|W:#155515,206620,409940"
         name="Dark Green Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#155515,206620,409940</sprite>
@@ -2857,7 +2827,7 @@
         image="armor-legs-skirt.png|W:#a50000,e03f27,eb5558"
         name="Red Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2868,7 +2838,7 @@
         image="armor-legs-skirt.png|W:#1f9c1f,89d689"
         name="Green Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2879,7 +2849,7 @@
         image="armor-legs-skirt.png|W:#4b4bbd,888af4"
         name="Dark Blue Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2890,7 +2860,7 @@
         image="armor-legs-skirt.png|W:#ccb534,f1ea8e,ffffaa"
         name="Yellow Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2901,7 +2871,7 @@
         image="armor-legs-skirt.png|W:#62aaca,a3f4f8,d5fcfb"
         name="Light Blue Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2912,7 +2882,7 @@
         image="armor-legs-skirt.png|W:#c64abd,f9a5f2,fcd0fa"
         name="Pink Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2923,7 +2893,7 @@
         image="armor-legs-skirt.png|W:#404040,c0c0c0"
         name="Black Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2934,7 +2904,7 @@
         image="armor-legs-skirt.png|W:#96370f,cc5616,f68d26,fcaa2d,fdd493"
         name="Orange Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2945,7 +2915,7 @@
         image="armor-legs-skirt.png|W:#530a7c,b362e1,ca87ef"
         name="Purple Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2956,7 +2926,7 @@
         image="armor-legs-skirt.png|W:#155515,206620,409940"
         name="Dark Green Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2968,7 +2938,7 @@
         image="armor-legs-shorts.png|W:#441111,aa3333,dd6666"
         name="Red Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -2980,7 +2950,7 @@
         image="armor-legs-shorts.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -2992,7 +2962,7 @@
         image="armor-legs-shorts.png|W:#222255,6666ff"
         name="Dark Blue Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3004,7 +2974,7 @@
         image="armor-legs-shorts.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3016,7 +2986,7 @@
         image="armor-legs-shorts.png|W:#223355,99aadd,bbccff"
         name="Light Blue Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3028,7 +2998,7 @@
         image="armor-legs-shorts.png|W:#552255,ff66ff,ffffff"
         name="Pink Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3040,7 +3010,7 @@
         image="armor-legs-shorts.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3052,7 +3022,7 @@
         image="armor-legs-shorts.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3064,7 +3034,7 @@
         image="armor-legs-shorts.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3076,7 +3046,7 @@
         image="armor-legs-shorts.png|W:#155515,206620,409940"
         name="Dark Green Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3089,7 +3059,7 @@
         image="armor-chest-tanktop-short.png|W:#441111,aa3333,dd6666" 
 	name="Red Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#441111,aa3333,dd6666</sprite>
@@ -3099,7 +3069,7 @@
         image="armor-chest-tanktop-short.png|W:#115511,22aa22,99dd99"
         name="Green Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#115511,22aa22,99dd99</sprite>
@@ -3109,7 +3079,7 @@
         image="armor-chest-tanktop-short.png|W:#222255,6666ff"
         name="Dark Blue Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#222255,6666ff</sprite>
@@ -3119,7 +3089,7 @@
         image="armor-chest-tanktop-short.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -3128,7 +3098,7 @@
     <item id="2124" image="armor-chest-tanktop-short.png|W:#223355,99aadd,bbccff"
         name="Light Blue Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#223355,99aadd,bbccff</sprite>
@@ -3137,7 +3107,7 @@
     <item id="2125" image="armor-chest-tanktop-short.png|W:#552255,ff66ff,ffffff"
         name="Pink Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -3147,7 +3117,7 @@
         image="armor-chest-tanktop-short.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -3157,7 +3127,7 @@
         image="armor-chest-tanktop-short.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -3166,7 +3136,7 @@
     <item id="2128" image="armor-chest-tanktop-short.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -3176,7 +3146,7 @@
         image="armor-chest-tanktop-short.png|W:#155515,206620,409940"
         name="Dark Green Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#155515,206620,409940</sprite>
-- 
cgit v1.2.3-70-g09d2


From aff69fe1f536401089f0d4d72a66df162c17ba6c Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 8 Nov 2008 23:43:25 +0000
Subject: Add desert hat, cotton headband, fix cat ears

---
 graphics/items/armor-head-deserthat.png        | Bin 0 -> 583 bytes
 graphics/items/armor-head-standardheadband.png | Bin 1017 -> 963 bytes
 graphics/sprites/head-catears.xml              |   2 +-
 graphics/sprites/head-deserthat.png            | Bin 0 -> 2300 bytes
 graphics/sprites/head-deserthat.xml            | 142 +++++++++++++++
 graphics/sprites/item007.png                   | Bin 717 -> 1088 bytes
 graphics/sprites/item007.xml                   |   2 +-
 items.xml                                      | 229 ++++++++++++++++++++++++-
 8 files changed, 370 insertions(+), 5 deletions(-)
 create mode 100644 graphics/items/armor-head-deserthat.png
 create mode 100644 graphics/sprites/head-deserthat.png
 create mode 100644 graphics/sprites/head-deserthat.xml

diff --git a/graphics/items/armor-head-deserthat.png b/graphics/items/armor-head-deserthat.png
new file mode 100644
index 00000000..13270645
Binary files /dev/null and b/graphics/items/armor-head-deserthat.png differ
diff --git a/graphics/items/armor-head-standardheadband.png b/graphics/items/armor-head-standardheadband.png
index 3e501bfe..1b28e473 100644
Binary files a/graphics/items/armor-head-standardheadband.png and b/graphics/items/armor-head-standardheadband.png differ
diff --git a/graphics/sprites/head-catears.xml b/graphics/sprites/head-catears.xml
index 974f9283..525f9394 100644
--- a/graphics/sprites/head-catears.xml
+++ b/graphics/sprites/head-catears.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/head-rabbitears.png|M" width="24" height="24" />
+	<imageset name="base" src="graphics/sprites/head-catears.png|M" width="24" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/head-deserthat.png b/graphics/sprites/head-deserthat.png
new file mode 100644
index 00000000..8c61e886
Binary files /dev/null and b/graphics/sprites/head-deserthat.png differ
diff --git a/graphics/sprites/head-deserthat.xml b/graphics/sprites/head-deserthat.xml
new file mode 100644
index 00000000..6c7a94a6
--- /dev/null
+++ b/graphics/sprites/head-deserthat.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+   <imageset name="base" src="graphics/sprites/head-deserthat.png|R;W" width="32" height="35" />
+
+   <action name="stand" imageset="base">
+      <animation direction="down">
+        <frame index="0" offsetX="-1" offsetY ="-32" />
+      </animation>
+      <animation direction="left">
+        <frame index="7" offsetX="-1" offsetY ="-32"/>
+      </animation>
+      <animation direction="up">
+        <frame index="15" offsetX="-2" offsetY ="-32"/>
+      </animation>
+      <animation direction="right">
+        <frame index="22" offsetX="0" offsetY ="-32"/>
+      </animation>
+   </action>
+
+   <action name="walk" imageset="base">
+      <animation direction="down">
+        <frame index="0" offsetX="-1" offsetY ="-30" delay="75"/>
+        <frame index="1" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="2" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="3" offsetX="-1" offsetY ="-31" delay="75" />
+        <frame index="4" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="5" offsetX="-1" offsetY ="-32" delay="75" />
+      </animation>
+      <animation direction="left">
+        <frame index="8" offsetX="-1" offsetY ="-32" delay="75"/>
+        <frame index="9" offsetX="-1" offsetY ="-32" delay="75"/>
+        <frame index="10" offsetX="-1" offsetY ="-31" delay="75"/>
+        <frame index="11" offsetX="-1" offsetY ="-32" delay="75"/>
+        <frame index="12" offsetX="-1" offsetY ="-31" delay="75"/>
+        <frame index="13" offsetX="-1" offsetY ="-32" delay="75"/>
+      </animation>
+      <animation direction="up">
+        <frame index="16" offsetX="-2" offsetY ="-32" delay="75"/>
+        <frame index="17" offsetX="-2" offsetY ="-32" delay="75"/>
+        <frame index="18" offsetX="-2" offsetY ="-33" delay="75"/>
+        <frame index="19" offsetX="-2" offsetY ="-32" delay="75"/>
+        <frame index="20" offsetX="-2" offsetY ="-33" delay="75"/>
+        <frame index="21" offsetX="-2" offsetY ="-32" delay="75"/>
+      </animation>
+      <animation direction="right">
+        <frame index="23" offsetX="0" offsetY ="-32" delay="75"/>
+        <frame index="24" offsetX="0" offsetY ="-32" delay="75"/>
+        <frame index="25" offsetX="0" offsetY ="-31" delay="75"/>
+        <frame index="26" offsetX="0" offsetY ="-32" delay="75"/>
+        <frame index="27" offsetX="0" offsetY ="-31" delay="75"/>
+        <frame index="28" offsetX="0" offsetY ="-32" delay="75"/>
+      </animation>
+   </action>
+
+   <action name="attack" imageset="base">
+      <animation direction="down">
+        <frame index="1" offsetX="-1" offsetY ="-30" delay="75" />
+        <frame index="2" offsetX="-1" offsetY ="-31" delay="75" />
+        <frame index="3" offsetX="-1" offsetY ="-29" delay="75" />
+        <frame index="4" offsetX="-1" offsetY ="-26" delay="75" />
+        <end />
+      </animation>
+      <animation direction="left">
+        <frame index="8" offsetX="3" offsetY ="-33" delay="75" />
+        <frame index="9" offsetX="3" offsetY ="-34" delay="75" />
+        <frame index="10" offsetX="0" offsetY ="-32" delay="75" />
+        <frame index="11" offsetX="-1" offsetY ="-31" delay="75" />
+        <end />
+      </animation>
+      <animation direction="up">
+        <frame index="16" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="17" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="18" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="19" offsetX="-3" offsetY ="-31" delay="75"/>
+        <end />
+      </animation>
+      <animation direction="right">
+        <frame index="23" offsetX="-3" offsetY ="-33" delay="75"/>
+        <frame index="24" offsetX="-3" offsetY ="-33" delay="75"/>
+        <frame index="25" offsetX="0" offsetY ="-32" delay="75"/>
+        <frame index="26" offsetX="1" offsetY ="-31" delay="75"/>
+        <end />
+      </animation>
+   </action>
+
+   <action name="attack_bow" imageset="base">
+      <animation direction="down">
+        <frame index="1" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="2" offsetX="-1" offsetY ="-32" delay="75" />
+        <frame index="3" offsetX="-1" offsetY ="-31" delay="75" />
+        <frame index="4" offsetX="-1" offsetY ="-30" delay="75" />
+        <frame index="5" offsetX="-1" offsetY ="-32" delay="75" />
+        <end />
+      </animation>
+      <animation direction="left">
+        <frame index="8" offsetX="2" offsetY ="-32" delay="75" />
+        <frame index="9" offsetX="2" offsetY ="-32" delay="75" />
+        <frame index="10" offsetX="2" offsetY ="-32" delay="75" />
+        <frame index="11" offsetX="4" offsetY ="-33" delay="75" />
+        <frame index="12" offsetX="4" offsetY ="-33" delay="75" />
+        <end />
+      </animation>
+      <animation direction="up">
+        <frame index="16" offsetX="-2" offsetY ="-33" delay="75"/>
+        <frame index="17" offsetX="-2" offsetY ="-33" delay="75"/>
+        <frame index="18" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="19" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="20" offsetX="-3" offsetY ="-33" delay="75"/>
+        <end />
+      </animation>
+      <animation direction="right">
+        <frame index="23" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="24" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="25" offsetX="-3" offsetY ="-32" delay="75"/>
+        <frame index="26" offsetX="-5" offsetY ="-33" delay="75"/>
+        <frame index="27" offsetX="-5" offsetY ="-33" delay="75"/>
+        <end />
+      </animation>
+   </action>
+
+   <action name="sit" imageset="base">
+      <animation direction="down">
+        <frame index="0" offsetX="-1" offsetY ="-20" />
+      </animation>
+      <animation direction="left">
+        <frame index="7" offsetX="3" offsetY ="-23"/>
+      </animation>
+      <animation direction="up">
+        <frame index="15" offsetX="-1" offsetY ="-24"/>
+      </animation>
+      <animation direction="right">
+        <frame index="22" offsetX="-6" offsetY ="-23"/>
+      </animation>
+   </action>
+
+   <action name="dead" imageset="base">
+      <animation direction="default">
+         <frame index="14" offsetX="20" offsetY="-6"/>
+      </animation>
+   </action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/item007.png b/graphics/sprites/item007.png
index a8e40610..90cf228e 100644
Binary files a/graphics/sprites/item007.png and b/graphics/sprites/item007.png differ
diff --git a/graphics/sprites/item007.xml b/graphics/sprites/item007.xml
index 09e3c6c4..44c60eb7 100644
--- a/graphics/sprites/item007.xml
+++ b/graphics/sprites/item007.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item007.png" width="40" height="40" />
+	<imageset name="base" src="graphics/sprites/item007.png|W" width="40" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/items.xml b/items.xml
index 090c17a0..a6925bba 100644
--- a/items.xml
+++ b/items.xml
@@ -2081,9 +2081,29 @@
         weight="40">
         <sprite>head-monster-skull-helm.xml</sprite>
     </item>
+    <item id="723"
+        image="armor-head-deserthat.png|R:#FFFFFF"
+        name="Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFFFFF</sprite>
+    </item>
+    <item id="724"
+        image="armor-head-standardheadband.png|W:#FFFFFF"
+        name="Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFFFFF</sprite>
+    </item>
 
 
-    <!-- HERE ARE SOME UNUSED ITEM ID:S -->
+    <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
         
     <item id="1199"
@@ -3095,7 +3115,8 @@
         <sprite gender="male">chest-shorttanktop-male.xml|#887722,ddcc66,ffffaa</sprite>
         <sprite gender="female">chest-shorttanktop-female.xml|#887722,ddcc66,ffffaa</sprite>
     </item>
-    <item id="2124" image="armor-chest-tanktop-short.png|W:#223355,99aadd,bbccff"
+    <item id="2124"
+        image="armor-chest-tanktop-short.png|W:#223355,99aadd,bbccff"
         name="Light Blue Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
         effect="+2% Defense"
@@ -3104,7 +3125,8 @@
         <sprite gender="male">chest-shorttanktop-male.xml|#223355,99aadd,bbccff</sprite>
         <sprite gender="female">chest-shorttanktop-female.xml|#223355,99aadd,bbccff</sprite>
     </item>
-    <item id="2125" image="armor-chest-tanktop-short.png|W:#552255,ff66ff,ffffff"
+    <item id="2125"
+        image="armor-chest-tanktop-short.png|W:#552255,ff66ff,ffffff"
         name="Pink Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
         effect="+2% Defense"
@@ -3153,4 +3175,205 @@
         <sprite gender="female">chest-shorttanktop-female.xml|#155515,206620,409940</sprite>
     </item>
 
+    <item id="2130"
+        image="armor-head-deserthat.png|R:#FF0000"
+        name="Red Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FF0000</sprite>
+    </item>
+    <item id="2131"
+        image="armor-head-deserthat.png|R:#55FF55"
+        name="Green Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#55FF55</sprite>
+    </item>
+    <item id="2132"
+        image="armor-head-deserthat.png|R:#0000C0"
+        name="Dark Blue Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#0000C0</sprite>
+    </item>
+    <item id="2133"
+        image="armor-head-deserthat.png|R:#FFFF00"
+        name="Yellow Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFFF00</sprite>
+    </item>
+    <item id="2134"
+        image="armor-head-deserthat.png|R:#5555FF"
+        name="Light Blue Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#5555FF</sprite>
+    </item>
+    <item id="2135"
+        image="armor-head-deserthat.png|R:#FFC0C0"
+        name="Pink Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFC0C0</sprite>
+    </item>
+    <item id="2136"
+        image="armor-head-deserthat.png|R:#666666"
+        name="Black Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#666666</sprite>
+    </item>
+    <item id="2137"
+        image="armor-head-deserthat.png|R:#FFC000"
+        name="Orange Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFC000</sprite>
+    </item>
+    <item id="2138"
+        image="armor-head-deserthat.png|R:#C000FF"
+        name="Purple Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#C000FF</sprite>
+    </item>
+    <item id="2139"
+        image="armor-head-deserthat.png|R:#00C000"
+        name="Dark Green Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#00C000</sprite>
+    </item>
+
+    <item id="2140"
+        image="armor-head-standardheadband.png|W:#FF0000"
+        name="Red Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FF0000</sprite>
+    </item>
+    <item id="2141"
+        image="armor-head-standardheadband.png|W:#55FF55"
+        name="Green Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#55FF55</sprite>
+    </item>
+    <item id="2142"
+        image="armor-head-standardheadband.png|W:#0000C0"
+        name="Dark Blue Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#0000C0</sprite>
+    </item>
+    <item id="2143"
+        image="armor-head-standardheadband.png|W:#FFFF00"
+        name="Yellow Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFFF00</sprite>
+    </item>
+    <item id="2144"
+        image="armor-head-standardheadband.png|W:#5555FF"
+        name="Light Blue Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#5555FF</sprite>
+    </item>
+    <item id="2145"
+        image="armor-head-standardheadband.png|W:#FFC0C0"
+        name="Pink Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFC0C0</sprite>
+    </item>
+    <item id="2146"
+        image="armor-head-standardheadband.png|W:#666666"
+        name="Black Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#666666</sprite>
+    </item>
+    <item id="2147"
+        image="armor-head-standardheadband.png|W:#FFC000"
+        name="Orange Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFC000</sprite>
+    </item>
+    <item id="2148"
+        image="armor-head-standardheadband.png|W:#C000FF"
+        name="Purple Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#C000FF</sprite>
+    </item>
+    <item id="2149"
+        image="armor-head-standardheadband.png|W:#00C000"
+        name="Dark Green Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#00C000</sprite>
+    </item>
 </items>
-- 
cgit v1.2.3-70-g09d2


From 92f589843fc419acb051fb3d6a9a9e150f322962 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 9 Nov 2008 19:45:49 +0000
Subject: Add GM cap and robe, fix desert hat positionings

---
 graphics/items/armor-head-gmcap.png | Bin 0 -> 744 bytes
 graphics/sprites/head-deserthat.xml | 266 ++++++++++++++++++------------------
 graphics/sprites/head-gmcap.png     | Bin 0 -> 2915 bytes
 graphics/sprites/head-gmcap.xml     | 141 +++++++++++++++++++
 items.xml                           |  26 +++-
 5 files changed, 298 insertions(+), 135 deletions(-)
 create mode 100644 graphics/items/armor-head-gmcap.png
 create mode 100644 graphics/sprites/head-gmcap.png
 create mode 100644 graphics/sprites/head-gmcap.xml

diff --git a/graphics/items/armor-head-gmcap.png b/graphics/items/armor-head-gmcap.png
new file mode 100644
index 00000000..2e97a786
Binary files /dev/null and b/graphics/items/armor-head-gmcap.png differ
diff --git a/graphics/sprites/head-deserthat.xml b/graphics/sprites/head-deserthat.xml
index 6c7a94a6..0dba8b8e 100644
--- a/graphics/sprites/head-deserthat.xml
+++ b/graphics/sprites/head-deserthat.xml
@@ -1,142 +1,142 @@
 <?xml version="1.0"?>
 <sprite>
-   <imageset name="base" src="graphics/sprites/head-deserthat.png|R;W" width="32" height="35" />
+	<imageset name="base" src="graphics/sprites/head-deserthat.png" width="32" height="35" />
 
-   <action name="stand" imageset="base">
-      <animation direction="down">
-        <frame index="0" offsetX="-1" offsetY ="-32" />
-      </animation>
-      <animation direction="left">
-        <frame index="7" offsetX="-1" offsetY ="-32"/>
-      </animation>
-      <animation direction="up">
-        <frame index="15" offsetX="-2" offsetY ="-32"/>
-      </animation>
-      <animation direction="right">
-        <frame index="22" offsetX="0" offsetY ="-32"/>
-      </animation>
-   </action>
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="-1" offsetY ="-32" />
+		</animation>
+		<animation direction="left">
+		  <frame index="7" offsetX="-1" offsetY ="-32"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="15" offsetX="-2" offsetY ="-32"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="22" offsetX="0" offsetY ="-32"/>
+		</animation>
+	</action>
 
-   <action name="walk" imageset="base">
-      <animation direction="down">
-        <frame index="0" offsetX="-1" offsetY ="-30" delay="75"/>
-        <frame index="1" offsetX="-1" offsetY ="-32" delay="75" />
-        <frame index="2" offsetX="-1" offsetY ="-32" delay="75" />
-        <frame index="3" offsetX="-1" offsetY ="-31" delay="75" />
-        <frame index="4" offsetX="-1" offsetY ="-32" delay="75" />
-        <frame index="5" offsetX="-1" offsetY ="-32" delay="75" />
-      </animation>
-      <animation direction="left">
-        <frame index="8" offsetX="-1" offsetY ="-32" delay="75"/>
-        <frame index="9" offsetX="-1" offsetY ="-32" delay="75"/>
-        <frame index="10" offsetX="-1" offsetY ="-31" delay="75"/>
-        <frame index="11" offsetX="-1" offsetY ="-32" delay="75"/>
-        <frame index="12" offsetX="-1" offsetY ="-31" delay="75"/>
-        <frame index="13" offsetX="-1" offsetY ="-32" delay="75"/>
-      </animation>
-      <animation direction="up">
-        <frame index="16" offsetX="-2" offsetY ="-32" delay="75"/>
-        <frame index="17" offsetX="-2" offsetY ="-32" delay="75"/>
-        <frame index="18" offsetX="-2" offsetY ="-33" delay="75"/>
-        <frame index="19" offsetX="-2" offsetY ="-32" delay="75"/>
-        <frame index="20" offsetX="-2" offsetY ="-33" delay="75"/>
-        <frame index="21" offsetX="-2" offsetY ="-32" delay="75"/>
-      </animation>
-      <animation direction="right">
-        <frame index="23" offsetX="0" offsetY ="-32" delay="75"/>
-        <frame index="24" offsetX="0" offsetY ="-32" delay="75"/>
-        <frame index="25" offsetX="0" offsetY ="-31" delay="75"/>
-        <frame index="26" offsetX="0" offsetY ="-32" delay="75"/>
-        <frame index="27" offsetX="0" offsetY ="-31" delay="75"/>
-        <frame index="28" offsetX="0" offsetY ="-32" delay="75"/>
-      </animation>
-   </action>
+	<action name="walk" imageset="base">
+		<animation direction="down">
+		  <frame index="1" offsetX="-1" offsetY ="-31" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-32" delay="75" />
+		  <frame index="3" offsetX="-1" offsetY ="-32" delay="75" />
+		  <frame index="4" offsetX="-1" offsetY ="-31" delay="75" />
+		  <frame index="5" offsetX="-1" offsetY ="-32" delay="75" />
+		  <frame index="6" offsetX="-1" offsetY ="-32" delay="75" />
+		</animation>
+		<animation direction="left">
+		  <frame index="8" offsetX="-1" offsetY ="-32" delay="75"/>
+		  <frame index="9" offsetX="-1" offsetY ="-31" delay="75"/>
+		  <frame index="10" offsetX="-1" offsetY ="-32" delay="75"/>
+		  <frame index="11" offsetX="-1" offsetY ="-32" delay="75"/>
+		  <frame index="12" offsetX="-1" offsetY ="-31" delay="75"/>
+		  <frame index="13" offsetX="-1" offsetY ="-32" delay="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="16" offsetX="-2" offsetY ="-32" delay="75"/>
+		  <frame index="17" offsetX="-2" offsetY ="-33" delay="75"/>
+		  <frame index="18" offsetX="-2" offsetY ="-33" delay="75"/>
+		  <frame index="19" offsetX="-2" offsetY ="-32" delay="75"/>
+		  <frame index="20" offsetX="-2" offsetY ="-33" delay="75"/>
+		  <frame index="21" offsetX="-2" offsetY ="-33" delay="75"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="23" offsetX="0" offsetY ="-32" delay="75"/>
+		  <frame index="24" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="25" offsetX="0" offsetY ="-32" delay="75"/>
+		  <frame index="26" offsetX="0" offsetY ="-32" delay="75"/>
+		  <frame index="27" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="28" offsetX="0" offsetY ="-32" delay="75"/>
+		</animation>
+	</action>
 
-   <action name="attack" imageset="base">
-      <animation direction="down">
-        <frame index="1" offsetX="-1" offsetY ="-30" delay="75" />
-        <frame index="2" offsetX="-1" offsetY ="-31" delay="75" />
-        <frame index="3" offsetX="-1" offsetY ="-29" delay="75" />
-        <frame index="4" offsetX="-1" offsetY ="-26" delay="75" />
-        <end />
-      </animation>
-      <animation direction="left">
-        <frame index="8" offsetX="3" offsetY ="-33" delay="75" />
-        <frame index="9" offsetX="3" offsetY ="-34" delay="75" />
-        <frame index="10" offsetX="0" offsetY ="-32" delay="75" />
-        <frame index="11" offsetX="-1" offsetY ="-31" delay="75" />
-        <end />
-      </animation>
-      <animation direction="up">
-        <frame index="16" offsetX="-3" offsetY ="-32" delay="75"/>
-        <frame index="17" offsetX="-3" offsetY ="-32" delay="75"/>
-        <frame index="18" offsetX="-3" offsetY ="-32" delay="75"/>
-        <frame index="19" offsetX="-3" offsetY ="-31" delay="75"/>
-        <end />
-      </animation>
-      <animation direction="right">
-        <frame index="23" offsetX="-3" offsetY ="-33" delay="75"/>
-        <frame index="24" offsetX="-3" offsetY ="-33" delay="75"/>
-        <frame index="25" offsetX="0" offsetY ="-32" delay="75"/>
-        <frame index="26" offsetX="1" offsetY ="-31" delay="75"/>
-        <end />
-      </animation>
-   </action>
+	<action name="attack" imageset="base">
+		<animation direction="down">
+		  <frame index="1" offsetX="-1" offsetY ="-30" delay="75" />
+		  <frame index="2" offsetX="-1" offsetY ="-31" delay="75" />
+		  <frame index="3" offsetX="-1" offsetY ="-29" delay="75" />
+		  <frame index="4" offsetX="-1" offsetY ="-26" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="8" offsetX="3" offsetY ="-33" delay="75" />
+		  <frame index="9" offsetX="3" offsetY ="-34" delay="75" />
+		  <frame index="10" offsetX="0" offsetY ="-32" delay="75" />
+		  <frame index="11" offsetX="-1" offsetY ="-31" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="16" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="17" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="18" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="19" offsetX="-3" offsetY ="-31" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="23" offsetX="-3" offsetY ="-33" delay="75"/>
+		  <frame index="24" offsetX="-3" offsetY ="-33" delay="75"/>
+		  <frame index="25" offsetX="0" offsetY ="-32" delay="75"/>
+		  <frame index="26" offsetX="1" offsetY ="-31" delay="75"/>
+		  <end />
+		</animation>
+	</action>
 
-   <action name="attack_bow" imageset="base">
-      <animation direction="down">
-        <frame index="1" offsetX="-1" offsetY ="-32" delay="75" />
-        <frame index="2" offsetX="-1" offsetY ="-32" delay="75" />
-        <frame index="3" offsetX="-1" offsetY ="-31" delay="75" />
-        <frame index="4" offsetX="-1" offsetY ="-30" delay="75" />
-        <frame index="5" offsetX="-1" offsetY ="-32" delay="75" />
-        <end />
-      </animation>
-      <animation direction="left">
-        <frame index="8" offsetX="2" offsetY ="-32" delay="75" />
-        <frame index="9" offsetX="2" offsetY ="-32" delay="75" />
-        <frame index="10" offsetX="2" offsetY ="-32" delay="75" />
-        <frame index="11" offsetX="4" offsetY ="-33" delay="75" />
-        <frame index="12" offsetX="4" offsetY ="-33" delay="75" />
-        <end />
-      </animation>
-      <animation direction="up">
-        <frame index="16" offsetX="-2" offsetY ="-33" delay="75"/>
-        <frame index="17" offsetX="-2" offsetY ="-33" delay="75"/>
-        <frame index="18" offsetX="-3" offsetY ="-32" delay="75"/>
-        <frame index="19" offsetX="-3" offsetY ="-32" delay="75"/>
-        <frame index="20" offsetX="-3" offsetY ="-33" delay="75"/>
-        <end />
-      </animation>
-      <animation direction="right">
-        <frame index="23" offsetX="-3" offsetY ="-32" delay="75"/>
-        <frame index="24" offsetX="-3" offsetY ="-32" delay="75"/>
-        <frame index="25" offsetX="-3" offsetY ="-32" delay="75"/>
-        <frame index="26" offsetX="-5" offsetY ="-33" delay="75"/>
-        <frame index="27" offsetX="-5" offsetY ="-33" delay="75"/>
-        <end />
-      </animation>
-   </action>
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+		  <frame index="1" offsetX="-1" offsetY ="-32" delay="75" />
+		  <frame index="2" offsetX="-1" offsetY ="-32" delay="75" />
+		  <frame index="3" offsetX="-1" offsetY ="-31" delay="75" />
+		  <frame index="4" offsetX="-1" offsetY ="-30" delay="75" />
+		  <frame index="5" offsetX="-1" offsetY ="-32" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="8" offsetX="2" offsetY ="-32" delay="75" />
+		  <frame index="9" offsetX="2" offsetY ="-32" delay="75" />
+		  <frame index="10" offsetX="2" offsetY ="-32" delay="75" />
+		  <frame index="11" offsetX="4" offsetY ="-33" delay="75" />
+		  <frame index="12" offsetX="4" offsetY ="-33" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="16" offsetX="-2" offsetY ="-33" delay="75"/>
+		  <frame index="17" offsetX="-2" offsetY ="-33" delay="75"/>
+		  <frame index="18" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="19" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="20" offsetX="-3" offsetY ="-33" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="23" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="24" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="25" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="26" offsetX="-5" offsetY ="-33" delay="75"/>
+		  <frame index="27" offsetX="-5" offsetY ="-33" delay="75"/>
+		  <end />
+		</animation>
+	</action>
 
-   <action name="sit" imageset="base">
-      <animation direction="down">
-        <frame index="0" offsetX="-1" offsetY ="-20" />
-      </animation>
-      <animation direction="left">
-        <frame index="7" offsetX="3" offsetY ="-23"/>
-      </animation>
-      <animation direction="up">
-        <frame index="15" offsetX="-1" offsetY ="-24"/>
-      </animation>
-      <animation direction="right">
-        <frame index="22" offsetX="-6" offsetY ="-23"/>
-      </animation>
-   </action>
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="-1" offsetY ="-20" />
+		</animation>
+		<animation direction="left">
+		  <frame index="7" offsetX="3" offsetY ="-23"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="15" offsetX="-1" offsetY ="-24"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="22" offsetX="-6" offsetY ="-23"/>
+		</animation>
+	</action>
 
-   <action name="dead" imageset="base">
-      <animation direction="default">
-         <frame index="14" offsetX="20" offsetY="-6"/>
-      </animation>
-   </action>
+	<action name="dead" imageset="base">
+		<animation direction="default">
+			<frame index="14" offsetX="20" offsetY="-6"/>
+		</animation>
+	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/head-gmcap.png b/graphics/sprites/head-gmcap.png
new file mode 100644
index 00000000..4c006848
Binary files /dev/null and b/graphics/sprites/head-gmcap.png differ
diff --git a/graphics/sprites/head-gmcap.xml b/graphics/sprites/head-gmcap.xml
new file mode 100644
index 00000000..e79ae57c
--- /dev/null
+++ b/graphics/sprites/head-gmcap.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<sprite>
+ 	<imageset name="base" src="graphics/sprites/head-gmcap.png|R" width="28" height="19" />
+ 
+ 	<action name="stand" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-45" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="-2" offsetY ="-45"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-2" offsetY ="-45"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="2" offsetY ="-45"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="walk" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75"/>
+ 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-44" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-44" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="attack" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-43" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-41" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="2" offsetY ="-46" delay="75" />
+ 		  <frame index="1" offsetX="2" offsetY ="-47" delay="75" />
+ 		  <frame index="1" offsetX="-1" offsetY ="-44" delay="75" />
+ 		  <frame index="1" offsetX="-3" offsetY ="-43" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-43" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="-1" offsetY ="-46" delay="75"/>
+ 		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
+ 		  <frame index="3" offsetX="3" offsetY ="-43" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="attack_bow" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-43" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
+ 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
+ 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
+ 		  <frame index="1" offsetX="3" offsetY ="-46" delay="75" />
+ 		  <frame index="1" offsetX="3" offsetY ="-46" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-44" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="-3" offsetY ="-46" delay="75"/>
+ 		  <frame index="3" offsetX="-3" offsetY ="-46" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="sit" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-33" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="2" offsetY ="-36"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-1" offsetY ="-37"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="-4" offsetY ="-36"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="dead" imageset="base">
+ 		<animation direction="default">
+ 			<frame index="4" offsetX="27" offsetY="-16"/>
+ 		</animation>
+ 	</action>
+</sprite>
\ No newline at end of file
diff --git a/items.xml b/items.xml
index a6925bba..97b192e5 100644
--- a/items.xml
+++ b/items.xml
@@ -1466,12 +1466,12 @@
     </item>
     <item id="647"
         image="armor-head-devcap.png|R:#9999ff"
-        name="Developers Cap"
+        name="Developer's Cap"
         description="A cap which identifies you as a developer."
         effect="+5% Defense"
         type="equip-head"
         defense="5"
-        weight="20">
+        weight="10">
         <sprite>head-devcap.xml|#9999ff</sprite>
     </item>
     <item id="648"
@@ -2101,6 +2101,28 @@
         weight="5">
         <sprite>item007.xml|#FFFFFF</sprite>
     </item>
+    <item id="725"
+        image="armor-head-gmcap.png|R:#BF0E08"
+        name="GM's Cap"
+        description="A cap which identifies you as a GM."
+        effect="+5% Defense"
+        type="equip-head"
+        defense="5"
+        weight="10">
+        <sprite>head-gmcap.xml|#BF0E08</sprite>
+    </item>
+    <item id="726"
+        image="armor-chest-robe.png|W:#E40A0A"
+        name="GM Robe"
+        description="A light and shimmering silk robe made for GMs."
+        effect="+5% Defense"
+        type="equip-torso"
+        weight="10"
+        defense="5"
+        max-per-slot="1">
+        <sprite gender="male">chest-robe-male.xml|#E40A0A</sprite>
+        <sprite gender="female">chest-robe-female.xml|#E40A0A</sprite>
+    </item>
 
 
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
-- 
cgit v1.2.3-70-g09d2


From dcc8a41bd209be69176f4b40758e2b56fa3a01ba Mon Sep 17 00:00:00 2001
From: Fate <fate.tmw@googlemail.com>
Date: Mon, 10 Nov 2008 22:33:33 +0000
Subject: * Added Iten (item ID 727) to client item DB.

---
 graphics/items/generic-iten.png | Bin 0 -> 561 bytes
 items.xml                       |  19 ++++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 graphics/items/generic-iten.png

diff --git a/graphics/items/generic-iten.png b/graphics/items/generic-iten.png
new file mode 100644
index 00000000..c4ab8fb6
Binary files /dev/null and b/graphics/items/generic-iten.png differ
diff --git a/items.xml b/items.xml
index 97b192e5..eafe3418 100644
--- a/items.xml
+++ b/items.xml
@@ -1951,9 +1951,15 @@
         type="generic"
         weight="5"
         max-per-slot="10"/>
-
-    <!-- PLACEHOLDER FOR ITEM 705 -->
-
+    <item id="705"
+          image="use-potion-e.png|R:#f04030;G:#ee8e5e"
+          name="Magic Potion"
+          description="A dark, sirupy brew, with a smell reminiscent of manaberries."
+          effect="+10 MP"
+          type="usable"
+          mp="10"
+          weight="50"
+          max-per-slot="10"/>
     <item id="706"
         image="generic-scorpionstinger.png|W:#e0d080,fff0e0,ffffff"
         name="Golden Scorpion Stinger"
@@ -2123,6 +2129,13 @@
         <sprite gender="male">chest-robe-male.xml|#E40A0A</sprite>
         <sprite gender="female">chest-robe-female.xml|#E40A0A</sprite>
     </item>
+    <item id="727"
+        image="generic-iten.png|Wffe0f0"
+        name="Iten"
+        description="An iten."
+        effect=""
+        type="generic"
+        weight="100"/>
 
 
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
-- 
cgit v1.2.3-70-g09d2


From db627840454ccd16c2411d207be2aeb7b8e0c812 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 12 Nov 2008 01:50:59 +0000
Subject: Add icon for cat ears

---
 graphics/items/armor-head-catears.png | Bin 0 -> 510 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 graphics/items/armor-head-catears.png

diff --git a/graphics/items/armor-head-catears.png b/graphics/items/armor-head-catears.png
new file mode 100644
index 00000000..5165a42a
Binary files /dev/null and b/graphics/items/armor-head-catears.png differ
-- 
cgit v1.2.3-70-g09d2


From 89cd325407f5850f663270ece62cd8b6dc949565 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 13 Nov 2008 17:04:46 +0100
Subject: Converted DOS newlines to UNIX

---
 graphics/sprites/head-catears.xml | 284 ++++++------
 graphics/sprites/head-gmcap.xml   | 280 ++++++------
 monsters.xml                      | 918 +++++++++++++++++++-------------------
 3 files changed, 741 insertions(+), 741 deletions(-)

diff --git a/graphics/sprites/head-catears.xml b/graphics/sprites/head-catears.xml
index 525f9394..940715f9 100644
--- a/graphics/sprites/head-catears.xml
+++ b/graphics/sprites/head-catears.xml
@@ -1,142 +1,142 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/head-catears.png|M" width="24" height="24" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-46" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-47"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-49"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="2" offsetY ="-47"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-42" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-41" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-48" delay="75" />
-		  <frame index="1" offsetX="2" offsetY ="-49" delay="75" />
-		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75" />
-		  <frame index="1" offsetX="-3" offsetY ="-45" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-47" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY ="-48" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-49" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
-		  <frame index="3" offsetX="3" offsetY ="-45" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
-		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
-		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-48" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-48" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-48" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-48" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-48" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-34" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-38"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-41"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-4" offsetY ="-38"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="35" offsetY="-6"/>
-		</animation>
-	</action>
-
-</sprite>
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/head-catears.png|M" width="24" height="24" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-46" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="-2" offsetY ="-47"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-49"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="2" offsetY ="-47"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75"/>
+		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-46" delay="75" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75"/>
+		  <frame index="1" offsetX="-2" offsetY ="-47" delay="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-50" delay="75"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-47" delay="75"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-42" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-41" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="2" offsetY ="-48" delay="75" />
+		  <frame index="1" offsetX="2" offsetY ="-49" delay="75" />
+		  <frame index="1" offsetX="-2" offsetY ="-46" delay="75" />
+		  <frame index="1" offsetX="-3" offsetY ="-45" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-47" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-1" offsetY ="-48" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-49" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-46" delay="75"/>
+		  <frame index="3" offsetX="3" offsetY ="-45" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
+		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
+		  <frame index="1" offsetX="1" offsetY ="-47" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-48" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-48" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-48" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-49" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-48" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-48" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-34" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="2" offsetY ="-38"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-41"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-4" offsetY ="-38"/>
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="default">
+			<frame index="4" offsetX="35" offsetY="-6"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/head-gmcap.xml b/graphics/sprites/head-gmcap.xml
index e79ae57c..32bd578d 100644
--- a/graphics/sprites/head-gmcap.xml
+++ b/graphics/sprites/head-gmcap.xml
@@ -1,141 +1,141 @@
-<?xml version="1.0"?>
-<sprite>
- 	<imageset name="base" src="graphics/sprites/head-gmcap.png|R" width="28" height="19" />
- 
- 	<action name="stand" imageset="base">
- 		<animation direction="down">
- 		  <frame index="0" offsetX="0" offsetY ="-45" />
- 		</animation>
- 		<animation direction="left">
- 		  <frame index="1" offsetX="-2" offsetY ="-45"/>
- 		</animation>
- 		<animation direction="up">
- 		  <frame index="2" offsetX="-2" offsetY ="-45"/>
- 		</animation>
- 		<animation direction="right">
- 		  <frame index="3" offsetX="2" offsetY ="-45"/>
- 		</animation>
- 	</action>
- 
- 	<action name="walk" imageset="base">
- 		<animation direction="down">
- 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75"/>
- 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
- 		</animation>
- 		<animation direction="left">
- 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
- 		  <frame index="1" offsetX="-2" offsetY ="-44" delay="75"/>
- 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
- 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
- 		  <frame index="1" offsetX="-2" offsetY ="-44" delay="75"/>
- 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
- 		</animation>
- 		<animation direction="up">
- 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
- 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
- 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
- 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
- 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
- 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
- 		</animation>
- 		<animation direction="right">
- 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
- 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
- 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
- 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
- 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
- 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
- 		</animation>
- 	</action>
- 
- 	<action name="attack" imageset="base">
- 		<animation direction="down">
- 		  <frame index="0" offsetX="0" offsetY ="-43" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-41" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
- 		  <end />
- 		</animation>
- 		<animation direction="left">
- 		  <frame index="1" offsetX="2" offsetY ="-46" delay="75" />
- 		  <frame index="1" offsetX="2" offsetY ="-47" delay="75" />
- 		  <frame index="1" offsetX="-1" offsetY ="-44" delay="75" />
- 		  <frame index="1" offsetX="-3" offsetY ="-43" delay="75" />
- 		  <end />
- 		</animation>
- 		<animation direction="up">
- 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
- 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
- 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
- 		  <frame index="2" offsetX="-3" offsetY ="-43" delay="75"/>
- 		  <end />
- 		</animation>
- 		<animation direction="right">
- 		  <frame index="3" offsetX="-1" offsetY ="-46" delay="75"/>
- 		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
- 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
- 		  <frame index="3" offsetX="3" offsetY ="-43" delay="75"/>
- 		  <end />
- 		</animation>
- 	</action>
- 
- 	<action name="attack_bow" imageset="base">
- 		<animation direction="down">
- 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-43" delay="75" />
- 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
- 		  <end />
- 		</animation>
- 		<animation direction="left">
- 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
- 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
- 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
- 		  <frame index="1" offsetX="3" offsetY ="-46" delay="75" />
- 		  <frame index="1" offsetX="3" offsetY ="-46" delay="75" />
- 		  <end />
- 		</animation>
- 		<animation direction="up">
- 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
- 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
- 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
- 		  <frame index="2" offsetX="-3" offsetY ="-44" delay="75"/>
- 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
- 		  <end />
- 		</animation>
- 		<animation direction="right">
- 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
- 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
- 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
- 		  <frame index="3" offsetX="-3" offsetY ="-46" delay="75"/>
- 		  <frame index="3" offsetX="-3" offsetY ="-46" delay="75"/>
- 		  <end />
- 		</animation>
- 	</action>
- 
- 	<action name="sit" imageset="base">
- 		<animation direction="down">
- 		  <frame index="0" offsetX="0" offsetY ="-33" />
- 		</animation>
- 		<animation direction="left">
- 		  <frame index="1" offsetX="2" offsetY ="-36"/>
- 		</animation>
- 		<animation direction="up">
- 		  <frame index="2" offsetX="-1" offsetY ="-37"/>
- 		</animation>
- 		<animation direction="right">
- 		  <frame index="3" offsetX="-4" offsetY ="-36"/>
- 		</animation>
- 	</action>
- 
- 	<action name="dead" imageset="base">
- 		<animation direction="default">
- 			<frame index="4" offsetX="27" offsetY="-16"/>
- 		</animation>
- 	</action>
+<?xml version="1.0"?>
+<sprite>
+ 	<imageset name="base" src="graphics/sprites/head-gmcap.png|R" width="28" height="19" />
+ 
+ 	<action name="stand" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-45" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="-2" offsetY ="-45"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-2" offsetY ="-45"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="2" offsetY ="-45"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="walk" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75"/>
+ 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-45" delay="75" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-44" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-44" delay="75"/>
+ 		  <frame index="1" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-46" delay="75"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-45" delay="75"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="attack" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-43" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-41" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="2" offsetY ="-46" delay="75" />
+ 		  <frame index="1" offsetX="2" offsetY ="-47" delay="75" />
+ 		  <frame index="1" offsetX="-1" offsetY ="-44" delay="75" />
+ 		  <frame index="1" offsetX="-3" offsetY ="-43" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-43" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="-1" offsetY ="-46" delay="75"/>
+ 		  <frame index="3" offsetX="-1" offsetY ="-47" delay="75"/>
+ 		  <frame index="3" offsetX="2" offsetY ="-44" delay="75"/>
+ 		  <frame index="3" offsetX="3" offsetY ="-43" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="attack_bow" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-43" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-44" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
+ 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
+ 		  <frame index="1" offsetX="1" offsetY ="-45" delay="75" />
+ 		  <frame index="1" offsetX="3" offsetY ="-46" delay="75" />
+ 		  <frame index="1" offsetX="3" offsetY ="-46" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-2" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-44" delay="75"/>
+ 		  <frame index="2" offsetX="-3" offsetY ="-45" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="-1" offsetY ="-45" delay="75"/>
+ 		  <frame index="3" offsetX="-3" offsetY ="-46" delay="75"/>
+ 		  <frame index="3" offsetX="-3" offsetY ="-46" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="sit" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="0" offsetY ="-33" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="1" offsetX="2" offsetY ="-36"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="2" offsetX="-1" offsetY ="-37"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="3" offsetX="-4" offsetY ="-36"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="dead" imageset="base">
+ 		<animation direction="default">
+ 			<frame index="4" offsetX="27" offsetY="-16"/>
+ 		</animation>
+ 	</action>
 </sprite>
\ No newline at end of file
diff --git a/monsters.xml b/monsters.xml
index aa37b88f..9fa3c7f0 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1,459 +1,459 @@
-<monsters>
-
-    <monster id="0" name="Maggot" targetCursor="small">
-        <sprite>monster-maggot.xml</sprite>
-        <sound event="hit">maggot-hit1.ogg</sound>
-        <sound event="hit">maggot-hit2.ogg</sound>
-        <sound event="miss">maggot-miss1.ogg</sound>
-        <sound event="die">maggot-dying1.ogg</sound>
-        <drop item="505" percent="8"/>
-        <drop item="518" percent="4"/>
-        <drop item="501" percent="1.5"/>
-        <drop item="533" percent="1.5"/>
-        <drop item="502" percent="0.7"/>
-        <drop item="522" percent="0.1"/>
-        <attributes
-            hp="20"
-            size="4"
-            speed="64"
-            attack-min="10"
-            attack-delta="2"
-            attack-magic="0"
-            hit="10"
-            evade="10"
-            physical-defence="5"
-            magical-defence="0"
-            mutation="50"
-            />
-        <vulnerability element="fire" factor="1.5"/>
-        <vulnerability element="earth" factor="0.7"/>
-        <exp>10</exp>
-        <!-- average stroll- and track range-->
-        <behavior
-            aggressive="false"
-            cowardly="false"
-            track-range="5"
-            stroll-range="5"
-            attack-distance="32"
-            />
-        <attack id="1"
-            priority="1"
-            type="physical"
-            pre-delay="10"
-            aft-delay="5"
-            damage-factor="1"
-            range="32"
-            angle="10"
-            animation="attack"
-            />
-    </monster>
-
-    <monster id="1" name="Scorpion">
-        <sprite>monster-scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite>
-        <sound event="hit">scorpion-hit1.ogg</sound>
-        <sound event="hit">scorpion-hit2.ogg</sound>
-        <sound event="hit">scorpion-hit3.ogg</sound>
-        <sound event="hit">scorpion-hit4.ogg</sound>
-        <sound event="miss">scorpion-miss1.ogg</sound>
-        <drop item="507" percent="7"/>
-        <drop item="510" percent="1"/>
-        <drop item="509" percent="0.5"/>
-        <drop item="518" percent="7"/>
-        <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 comming too close. -->
-        <behavior
-            aggressive="true"
-            cowardly="false"
-            track-range="2"
-            stroll-range="1"
-            attack-distance="64"
-            />
-        <!-- slow, strong, long-range tail attack-->
-        <attack id="1"
-            priority="1"
-            type="physical"
-            pre-delay="5"
-            aft-delay="15"
-            damage-factor="3"
-            range="64"
-            angle="10"
-            particle-effect="graphics/particles/attack.particle.xml"
-            action="special1"
-            />
-        <!-- fast, weak, short-range scissor attack -->
-        <attack id="2"
-            priority="4"
-            type="physical"
-            pre-delay="3"
-            aft-delay="3"
-            damage-factor="1"
-            range="32"
-            angle="45"
-            />
-    </monster>
-
-    <monster id="2" name="Red Scorpion">
-        <sprite>monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite>
-        <sound event="hit">scorpion-hit1.ogg</sound>
-        <sound event="hit">scorpion-hit2.ogg</sound>
-        <sound event="hit">scorpion-hit3.ogg</sound>
-        <sound event="hit">scorpion-hit4.ogg</sound>
-        <sound event="miss">scorpion-miss1.ogg</sound>
-        <drop item="517" percent="20"/>
-        <drop item="509" percent="1"/>
-        <drop item="518" percent="5"/>
-        <drop item="1200" percent="0.1"/>
-        <drop item="1199" percent="7.6"/>
-        <drop item="1201" percent="5.4"/>
-        <drop item="524" percent="0.1"/>
-        <exp>50</exp>
-        <attributes
-            hp="20"
-            size="8"
-            speed="192"
-            attack-min="20"
-            attack-delta="10"
-            attack-magic="0"
-            hit="30"
-            evade="30"
-            physical-defence="5"
-            magical-defence="0"
-            />
-        <!-- also quite lazy when unprovoked but much more territorial
-        than the normal one-->
-        <behavior
-            aggressive="true"
-            cowardly="false"
-            track-range="6"
-            stroll-range="1"
-            attack-distance="64"
-            />
-        <attack id="1"
-            priority="1"
-            type="physical"
-            element="fire"
-            pre-delay="5"
-            aft-delay="10"
-            damage-factor="1"
-            range="64"
-            angle="10"
-            />
-    </monster>
-
-    <monster id="3" name="Green Slime">
-        <sprite>monster-slime.xml|#72982c,ffffff</sprite>
-        <sound event="hit">slime-hit1.ogg</sound>
-        <drop item="502" percent="2"/>
-        <drop item="513" percent="1"/>
-        <drop item="501" percent="1"/>
-        <drop item="521" percent="1"/>
-        <drop item="522" percent="1.9"/>
-        <drop item="526" percent="0.1"/>
-        <drop item="503" percent="5"/>
-        <drop item="535" percent="7.5"/>
-        <exp>60</exp>
-        <attributes
-            hp="200"
-            size="4"
-            speed="32"
-            attack-min="2"
-            attack-delta="10"
-            attack-magic="0"
-            hit="100"
-            evade="10"
-            physical-defence="0"
-            magical-defence="0"
-            />
-        <!-- Is fulfilling some unknown purpose that requires it to move around
-        a lot and leaves no time for pursing attackers -->
-        <behavior
-            aggressive="false"
-            cowardly="false"
-            track-range="4"
-            stroll-range="24"
-            attack-distance="32"
-            />
-    </monster>
-
-    <monster id="4" name="Giant Maggot" targetCursor="large">
-        <sprite>monster-maggot-giant.xml</sprite>
-        <sound event="hit">maggot-hit1.ogg</sound>
-        <sound event="hit">maggot-hit2.ogg</sound>
-        <sound event="miss">maggot-miss1.ogg</sound>
-        <sound event="die">maggot-dying1.ogg</sound>
-        <drop item="1199" percent="9"/>
-        <drop item="519" percent="1"/>
-        <drop item="518" percent="7.5"/>
-        <drop item="501" percent="50"/>
-        <drop item="502" percent="30"/>
-        <drop item="503" percent="0.1"/>
-        <drop item="526" percent="0.1"/>
-    </monster>
-
-    <monster id="5" name="Yellow Slime">
-        <sprite>monster-slime.xml|#b47f00,ffffff</sprite>
-        <sound event="hit">slime-hit1.ogg</sound>
-        <drop item="534" percent="2"/>
-        <drop item="519" percent="1"/>
-        <drop item="501" percent="3.5"/>
-        <drop item="502" percent="2.5"/>
-        <drop item="522" percent="0.1"/>
-    </monster>
-
-    <monster id="6" name="Red Slime">
-        <sprite>monster-slime.xml|#7e0000,ffffff</sprite>
-        <sound event="hit">slime-hit1.ogg</sound>
-        <drop item="1201" percent="3"/>
-        <drop item="509" percent="1.1"/>
-        <drop item="521" percent="2"/>
-        <drop item="523" percent="0.4"/>
-        <drop item="525" percent="0.8"/>
-        <drop item="535" percent="7.5"/>
-        <drop item="528" percent="2.5"/>
-        <drop item="531" percent="1.5"/>
-    </monster>
-
-    <monster id="7" name="Black Scorpion">
-        <sprite>monster-scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite>
-        <sound event="hit">scorpion-hit1.ogg</sound>
-        <sound event="hit">scorpion-hit2.ogg</sound>
-        <sound event="hit">scorpion-hit3.ogg</sound>
-        <sound event="hit">scorpion-hit4.ogg</sound>
-        <sound event="miss">scorpion-miss1.ogg</sound>
-        <drop item="523" percent="1.5"/>
-        <drop item="509" percent="1.0"/>
-        <drop item="518" percent="8"/>
-    </monster>
-
-    <monster id="8" name="Snake">
-        <sprite>monster-snake.xml|#664d28,a6673a,dbbc86,ffffff</sprite>
-    </monster>
-
-    <monster id="9" name="Fire Goblin">
-        <sprite>monster-goblin-fire.xml</sprite>
-        <sound event="hit">fire-goblin-hit1.ogg</sound>
-        <sound event="hit">fire-goblin-hit2.ogg</sound>
-        <sound event="miss">fire-goblin-miss1.ogg</sound>
-        <drop item="505" percent="8"/>
-        <drop item="501" percent="1.5"/>
-        <drop item="518" percent="8"/>
-        <drop item="502" percent="1.5"/>
-        <drop item="521" percent="0.7"/>
-        <drop item="522" percent="0.1"/>
-        <!-- behavior identical to maggot except for weaknesses and the attack which is magical and has a particle effect - change this when making up real monster stats -->
-        <attributes
-            hp="20"
-            size="4"
-            speed="64"
-            attack-min="10"
-            attack-delta="2"
-            attack-magic="0"
-            hit="10"
-            evade="10"
-            physical-defence="5"
-            magical-defence="0"
-            mutation="50"
-            />
-        <vulnerability element="fire" factor="0.5"/>
-        <vulnerability element="water" factor="2.0"/>
-        <exp>10</exp>
-        <behavior
-            aggressive="false"
-            cowardly="false"
-            track-range="5"
-            stroll-range="5"
-            attack-distance="32"
-            />
-        <attack id="1"
-            priority="1"
-            type="magical"
-            element="fire"
-            pre-delay="10"
-            aft-delay="5"
-            damage-factor="1"
-            range="32"
-            angle="10"
-            animation="attack"
-            particle-effect="graphics/particles/firegoblinbreath.particle.xml"
-            />
-    </monster>
-
-    <monster id="10" name="Spider">
-        <sprite>monster-spider.xml</sprite>
-        <drop item="537" percent="5"/>
-        <drop item="535" percent="1"/>
-    </monster>
-
-    <monster id="11" name="Evil Mushroom">
-        <sprite>monster-mushroom-red.xml</sprite>
-        <sound event="hit">shroom-hit1.ogg</sound>
-        <drop item="535" percent="5"/>
-        <drop item="540" percent="0.1"/>
-        <drop item="534" percent="1"/>
-        <drop item="566" percent="5"/>
-    </monster>
-
-    <monster id="12" name="Flower">
-        <sprite>monster-flower.xml</sprite>
-        <sound event="hit">flower-hit1.ogg</sound>
-        <sound event="hit">flower-hit2.ogg</sound>
-        <sound event="miss">flower-miss1.ogg</sound>
-        <drop item="535" percent="1"/>
-        <drop item="540" percent="0.1"/>
-        <drop item="1199" percent="1"/>
-        <drop item="526" percent="4"/>
-        <drop item="565" percent="5"/>
-    </monster>
-
-    <monster id="13" name="Santa Slime">
-        <sprite>monster-slime-santa.xml</sprite>
-        <drop item="512" percent="8"/>
-        <drop item="513" percent="7"/>
-        <drop item="514" percent="6"/>
-        <drop item="519" percent="5"/>
-        <drop item="527" percent="4"/>
-        <drop item="538" percent="5"/>
-    </monster>
-
-    <monster id="14" name="Rudolph Slime">
-        <sprite>monster-slime-rudolph.xml</sprite>
-        <drop item="504" percent="8"/>
-        <drop item="506" percent="5"/>
-        <drop item="508" percent="2"/>
-        <drop item="509" percent="3"/>
-        <drop item="510" percent="6"/>
-        <drop item="515" percent="8"/>
-        <drop item="516" percent="5"/>
-    </monster>
-
-    <monster id="15" name="Bat">
-        <sprite>monster-bat.xml</sprite>
-        <sound event="die">bat-dying1.ogg</sound>
-        <sound event="hit">bat-hit1.ogg</sound>
-        <drop item="505" percent="8"/>
-        <drop item="501" percent="1.5"/>
-        <drop item="518" percent="4"/>
-        <drop item="533" percent="1.5"/>
-        <drop item="521" percent="0.7"/>
-        <drop item="522" percent="0.1"/>
-    </monster>
-
-    <monster id="16" name="Pinkie" targetCursor="small">
-        <sprite>monster-pinkie.xml</sprite>
-        <sound event="hit">pinkie-hit1.ogg</sound>
-        <sound event="miss">pinkie-miss1.ogg</sound>
-        <drop item="614" percent="8"/>
-    </monster>
-
-    <monster id="17" name="Spiky Mushroom">
-        <sprite>monster-mushroom-spiky.xml</sprite>
-        <sound event="hit">shroom-hit1.ogg</sound>
-        <drop item="567" percent="8"/>
-        <drop item="501" percent="1.5"/>
-        <drop item="518" percent="0.5"/>
-        <drop item="613" percent="1.5"/>
-    </monster>
-
-    <monster id="18" name="Fluffy">
-        <sprite>monster-fluffy.xml</sprite>
-        <sound event="hit">fluffy-hit1.ogg</sound>
-        <sound event="hit">fluffy-hit2.ogg</sound>
-        <sound event="hit">fluffy-hit3.ogg</sound>
-        <sound event="miss">fluffy-miss1.ogg</sound>
-        <sound event="hurt">fluffy-hurt1.ogg</sound>
-        <drop item="611" percent="8"/>
-        <drop item="527" percent="1.5"/>
-        <drop item="535" percent="4"/>
-    </monster>
-
-    <monster id="19" name="Cave Snake">
-        <sprite>monster-snake-cave.xml</sprite>
-        <drop item="612" percent="8"/>
-        <drop item="610" percent="0.1"/>
-    </monster>
-
-    <monster id="20" name="Jack O">
-        <sprite>monster-ghost-pumpkin.xml</sprite>
-    </monster>
-
-    <monster id="21" name="Fire Skull">
-        <sprite>monster-skull-fire.xml</sprite>
-        <drop item="621" percent="0.1"/>
-        <drop item="540" percent="1.5"/>
-    </monster>
-
-    <monster id="22" name="Poison Skull">
-        <sprite>monster-skull-poison.xml</sprite>
-        <drop item="621" percent="0.1"/>
-        <drop item="540" percent="1.5"/>
-    </monster>
-
-    <monster id="23" name="Log Head">
-        <sprite>monster-logmonster.xml</sprite>
-        <sound event="hurt">loghead-hurt1.ogg</sound>
-        <sound event="hurt">loghead-hurt2.ogg</sound>
-        <sound event="hurt">loghead-hurt3.ogg</sound>
-        <sound event="hurt">loghead-hurt4.ogg</sound>
-        <sound event="hurt">loghead-hurt5.ogg</sound>
-        <drop item="569" percent="20"/>
-    </monster>
-
-    <monster id="24" name="Mountain Snake">
-        <sprite>monster-snake.xml|#585b39,a67c5d,dbc9a9,ffffff</sprite>
-    </monster>
-
-    <monster id="25" name="Easter Fluffy">
-        <sprite>monster-fluffy.xml</sprite>
-        <sound event="hit">fluffy-hit1.ogg</sound>
-        <sound event="hit">fluffy-hit2.ogg</sound>
-        <sound event="hit">fluffy-hit3.ogg</sound>
-        <sound event="miss">fluffy-miss1.ogg</sound>
-        <sound event="hurt">fluffy-hurt1.ogg</sound>
-    </monster>
-
-    <monster id="26" name="Mouboo">
-        <sprite>monster-mouboo.xml</sprite>
-    </monster>
-
-    <monster id="27" name="Mauve Plant">
-        <sprite>resource-plant.xml|#e0b0ff</sprite>
-    </monster>
-
-    <monster id="28" name="Cobalt Plant">
-        <sprite>resource-plant.xml|#0047ab</sprite>
-    </monster>
-
-    <monster id="29" name="Gamboge Plant">
-        <sprite>resource-plant.xml|#ef9b0f</sprite>
-    </monster>
-
-    <monster id="30" name="Alizarin Plant">
-        <sprite>resource-plant.xml|#e32636</sprite>
-    </monster>
-    
-    <monster id="31" name="Sea Slime">
-        <sprite>monster-slime.xml|#4ca1a0,ffffff</sprite>
-        <sound event="hit">slime-hit1.ogg</sound>
-    </monster>
-
-    <monster id="32" name="Grass Snake">
-        <sprite>monster-snake.xml|#205839,60a65d,80dba9,ffffff</sprite>
-    </monster>
-
-    <monster id="33" name="Silkworm">
-        <sprite>monster-silkworm.xml|#807d20,e0dac0;#c0a830</sprite>
-    </monster>
-
-</monsters>
+<monsters>
+
+    <monster id="0" name="Maggot" targetCursor="small">
+        <sprite>monster-maggot.xml</sprite>
+        <sound event="hit">maggot-hit1.ogg</sound>
+        <sound event="hit">maggot-hit2.ogg</sound>
+        <sound event="miss">maggot-miss1.ogg</sound>
+        <sound event="die">maggot-dying1.ogg</sound>
+        <drop item="505" percent="8"/>
+        <drop item="518" percent="4"/>
+        <drop item="501" percent="1.5"/>
+        <drop item="533" percent="1.5"/>
+        <drop item="502" percent="0.7"/>
+        <drop item="522" percent="0.1"/>
+        <attributes
+            hp="20"
+            size="4"
+            speed="64"
+            attack-min="10"
+            attack-delta="2"
+            attack-magic="0"
+            hit="10"
+            evade="10"
+            physical-defence="5"
+            magical-defence="0"
+            mutation="50"
+            />
+        <vulnerability element="fire" factor="1.5"/>
+        <vulnerability element="earth" factor="0.7"/>
+        <exp>10</exp>
+        <!-- average stroll- and track range-->
+        <behavior
+            aggressive="false"
+            cowardly="false"
+            track-range="5"
+            stroll-range="5"
+            attack-distance="32"
+            />
+        <attack id="1"
+            priority="1"
+            type="physical"
+            pre-delay="10"
+            aft-delay="5"
+            damage-factor="1"
+            range="32"
+            angle="10"
+            animation="attack"
+            />
+    </monster>
+
+    <monster id="1" name="Scorpion">
+        <sprite>monster-scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite>
+        <sound event="hit">scorpion-hit1.ogg</sound>
+        <sound event="hit">scorpion-hit2.ogg</sound>
+        <sound event="hit">scorpion-hit3.ogg</sound>
+        <sound event="hit">scorpion-hit4.ogg</sound>
+        <sound event="miss">scorpion-miss1.ogg</sound>
+        <drop item="507" percent="7"/>
+        <drop item="510" percent="1"/>
+        <drop item="509" percent="0.5"/>
+        <drop item="518" percent="7"/>
+        <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 comming too close. -->
+        <behavior
+            aggressive="true"
+            cowardly="false"
+            track-range="2"
+            stroll-range="1"
+            attack-distance="64"
+            />
+        <!-- slow, strong, long-range tail attack-->
+        <attack id="1"
+            priority="1"
+            type="physical"
+            pre-delay="5"
+            aft-delay="15"
+            damage-factor="3"
+            range="64"
+            angle="10"
+            particle-effect="graphics/particles/attack.particle.xml"
+            action="special1"
+            />
+        <!-- fast, weak, short-range scissor attack -->
+        <attack id="2"
+            priority="4"
+            type="physical"
+            pre-delay="3"
+            aft-delay="3"
+            damage-factor="1"
+            range="32"
+            angle="45"
+            />
+    </monster>
+
+    <monster id="2" name="Red Scorpion">
+        <sprite>monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite>
+        <sound event="hit">scorpion-hit1.ogg</sound>
+        <sound event="hit">scorpion-hit2.ogg</sound>
+        <sound event="hit">scorpion-hit3.ogg</sound>
+        <sound event="hit">scorpion-hit4.ogg</sound>
+        <sound event="miss">scorpion-miss1.ogg</sound>
+        <drop item="517" percent="20"/>
+        <drop item="509" percent="1"/>
+        <drop item="518" percent="5"/>
+        <drop item="1200" percent="0.1"/>
+        <drop item="1199" percent="7.6"/>
+        <drop item="1201" percent="5.4"/>
+        <drop item="524" percent="0.1"/>
+        <exp>50</exp>
+        <attributes
+            hp="20"
+            size="8"
+            speed="192"
+            attack-min="20"
+            attack-delta="10"
+            attack-magic="0"
+            hit="30"
+            evade="30"
+            physical-defence="5"
+            magical-defence="0"
+            />
+        <!-- also quite lazy when unprovoked but much more territorial
+        than the normal one-->
+        <behavior
+            aggressive="true"
+            cowardly="false"
+            track-range="6"
+            stroll-range="1"
+            attack-distance="64"
+            />
+        <attack id="1"
+            priority="1"
+            type="physical"
+            element="fire"
+            pre-delay="5"
+            aft-delay="10"
+            damage-factor="1"
+            range="64"
+            angle="10"
+            />
+    </monster>
+
+    <monster id="3" name="Green Slime">
+        <sprite>monster-slime.xml|#72982c,ffffff</sprite>
+        <sound event="hit">slime-hit1.ogg</sound>
+        <drop item="502" percent="2"/>
+        <drop item="513" percent="1"/>
+        <drop item="501" percent="1"/>
+        <drop item="521" percent="1"/>
+        <drop item="522" percent="1.9"/>
+        <drop item="526" percent="0.1"/>
+        <drop item="503" percent="5"/>
+        <drop item="535" percent="7.5"/>
+        <exp>60</exp>
+        <attributes
+            hp="200"
+            size="4"
+            speed="32"
+            attack-min="2"
+            attack-delta="10"
+            attack-magic="0"
+            hit="100"
+            evade="10"
+            physical-defence="0"
+            magical-defence="0"
+            />
+        <!-- Is fulfilling some unknown purpose that requires it to move around
+        a lot and leaves no time for pursing attackers -->
+        <behavior
+            aggressive="false"
+            cowardly="false"
+            track-range="4"
+            stroll-range="24"
+            attack-distance="32"
+            />
+    </monster>
+
+    <monster id="4" name="Giant Maggot" targetCursor="large">
+        <sprite>monster-maggot-giant.xml</sprite>
+        <sound event="hit">maggot-hit1.ogg</sound>
+        <sound event="hit">maggot-hit2.ogg</sound>
+        <sound event="miss">maggot-miss1.ogg</sound>
+        <sound event="die">maggot-dying1.ogg</sound>
+        <drop item="1199" percent="9"/>
+        <drop item="519" percent="1"/>
+        <drop item="518" percent="7.5"/>
+        <drop item="501" percent="50"/>
+        <drop item="502" percent="30"/>
+        <drop item="503" percent="0.1"/>
+        <drop item="526" percent="0.1"/>
+    </monster>
+
+    <monster id="5" name="Yellow Slime">
+        <sprite>monster-slime.xml|#b47f00,ffffff</sprite>
+        <sound event="hit">slime-hit1.ogg</sound>
+        <drop item="534" percent="2"/>
+        <drop item="519" percent="1"/>
+        <drop item="501" percent="3.5"/>
+        <drop item="502" percent="2.5"/>
+        <drop item="522" percent="0.1"/>
+    </monster>
+
+    <monster id="6" name="Red Slime">
+        <sprite>monster-slime.xml|#7e0000,ffffff</sprite>
+        <sound event="hit">slime-hit1.ogg</sound>
+        <drop item="1201" percent="3"/>
+        <drop item="509" percent="1.1"/>
+        <drop item="521" percent="2"/>
+        <drop item="523" percent="0.4"/>
+        <drop item="525" percent="0.8"/>
+        <drop item="535" percent="7.5"/>
+        <drop item="528" percent="2.5"/>
+        <drop item="531" percent="1.5"/>
+    </monster>
+
+    <monster id="7" name="Black Scorpion">
+        <sprite>monster-scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite>
+        <sound event="hit">scorpion-hit1.ogg</sound>
+        <sound event="hit">scorpion-hit2.ogg</sound>
+        <sound event="hit">scorpion-hit3.ogg</sound>
+        <sound event="hit">scorpion-hit4.ogg</sound>
+        <sound event="miss">scorpion-miss1.ogg</sound>
+        <drop item="523" percent="1.5"/>
+        <drop item="509" percent="1.0"/>
+        <drop item="518" percent="8"/>
+    </monster>
+
+    <monster id="8" name="Snake">
+        <sprite>monster-snake.xml|#664d28,a6673a,dbbc86,ffffff</sprite>
+    </monster>
+
+    <monster id="9" name="Fire Goblin">
+        <sprite>monster-goblin-fire.xml</sprite>
+        <sound event="hit">fire-goblin-hit1.ogg</sound>
+        <sound event="hit">fire-goblin-hit2.ogg</sound>
+        <sound event="miss">fire-goblin-miss1.ogg</sound>
+        <drop item="505" percent="8"/>
+        <drop item="501" percent="1.5"/>
+        <drop item="518" percent="8"/>
+        <drop item="502" percent="1.5"/>
+        <drop item="521" percent="0.7"/>
+        <drop item="522" percent="0.1"/>
+        <!-- behavior identical to maggot except for weaknesses and the attack which is magical and has a particle effect - change this when making up real monster stats -->
+        <attributes
+            hp="20"
+            size="4"
+            speed="64"
+            attack-min="10"
+            attack-delta="2"
+            attack-magic="0"
+            hit="10"
+            evade="10"
+            physical-defence="5"
+            magical-defence="0"
+            mutation="50"
+            />
+        <vulnerability element="fire" factor="0.5"/>
+        <vulnerability element="water" factor="2.0"/>
+        <exp>10</exp>
+        <behavior
+            aggressive="false"
+            cowardly="false"
+            track-range="5"
+            stroll-range="5"
+            attack-distance="32"
+            />
+        <attack id="1"
+            priority="1"
+            type="magical"
+            element="fire"
+            pre-delay="10"
+            aft-delay="5"
+            damage-factor="1"
+            range="32"
+            angle="10"
+            animation="attack"
+            particle-effect="graphics/particles/firegoblinbreath.particle.xml"
+            />
+    </monster>
+
+    <monster id="10" name="Spider">
+        <sprite>monster-spider.xml</sprite>
+        <drop item="537" percent="5"/>
+        <drop item="535" percent="1"/>
+    </monster>
+
+    <monster id="11" name="Evil Mushroom">
+        <sprite>monster-mushroom-red.xml</sprite>
+        <sound event="hit">shroom-hit1.ogg</sound>
+        <drop item="535" percent="5"/>
+        <drop item="540" percent="0.1"/>
+        <drop item="534" percent="1"/>
+        <drop item="566" percent="5"/>
+    </monster>
+
+    <monster id="12" name="Flower">
+        <sprite>monster-flower.xml</sprite>
+        <sound event="hit">flower-hit1.ogg</sound>
+        <sound event="hit">flower-hit2.ogg</sound>
+        <sound event="miss">flower-miss1.ogg</sound>
+        <drop item="535" percent="1"/>
+        <drop item="540" percent="0.1"/>
+        <drop item="1199" percent="1"/>
+        <drop item="526" percent="4"/>
+        <drop item="565" percent="5"/>
+    </monster>
+
+    <monster id="13" name="Santa Slime">
+        <sprite>monster-slime-santa.xml</sprite>
+        <drop item="512" percent="8"/>
+        <drop item="513" percent="7"/>
+        <drop item="514" percent="6"/>
+        <drop item="519" percent="5"/>
+        <drop item="527" percent="4"/>
+        <drop item="538" percent="5"/>
+    </monster>
+
+    <monster id="14" name="Rudolph Slime">
+        <sprite>monster-slime-rudolph.xml</sprite>
+        <drop item="504" percent="8"/>
+        <drop item="506" percent="5"/>
+        <drop item="508" percent="2"/>
+        <drop item="509" percent="3"/>
+        <drop item="510" percent="6"/>
+        <drop item="515" percent="8"/>
+        <drop item="516" percent="5"/>
+    </monster>
+
+    <monster id="15" name="Bat">
+        <sprite>monster-bat.xml</sprite>
+        <sound event="die">bat-dying1.ogg</sound>
+        <sound event="hit">bat-hit1.ogg</sound>
+        <drop item="505" percent="8"/>
+        <drop item="501" percent="1.5"/>
+        <drop item="518" percent="4"/>
+        <drop item="533" percent="1.5"/>
+        <drop item="521" percent="0.7"/>
+        <drop item="522" percent="0.1"/>
+    </monster>
+
+    <monster id="16" name="Pinkie" targetCursor="small">
+        <sprite>monster-pinkie.xml</sprite>
+        <sound event="hit">pinkie-hit1.ogg</sound>
+        <sound event="miss">pinkie-miss1.ogg</sound>
+        <drop item="614" percent="8"/>
+    </monster>
+
+    <monster id="17" name="Spiky Mushroom">
+        <sprite>monster-mushroom-spiky.xml</sprite>
+        <sound event="hit">shroom-hit1.ogg</sound>
+        <drop item="567" percent="8"/>
+        <drop item="501" percent="1.5"/>
+        <drop item="518" percent="0.5"/>
+        <drop item="613" percent="1.5"/>
+    </monster>
+
+    <monster id="18" name="Fluffy">
+        <sprite>monster-fluffy.xml</sprite>
+        <sound event="hit">fluffy-hit1.ogg</sound>
+        <sound event="hit">fluffy-hit2.ogg</sound>
+        <sound event="hit">fluffy-hit3.ogg</sound>
+        <sound event="miss">fluffy-miss1.ogg</sound>
+        <sound event="hurt">fluffy-hurt1.ogg</sound>
+        <drop item="611" percent="8"/>
+        <drop item="527" percent="1.5"/>
+        <drop item="535" percent="4"/>
+    </monster>
+
+    <monster id="19" name="Cave Snake">
+        <sprite>monster-snake-cave.xml</sprite>
+        <drop item="612" percent="8"/>
+        <drop item="610" percent="0.1"/>
+    </monster>
+
+    <monster id="20" name="Jack O">
+        <sprite>monster-ghost-pumpkin.xml</sprite>
+    </monster>
+
+    <monster id="21" name="Fire Skull">
+        <sprite>monster-skull-fire.xml</sprite>
+        <drop item="621" percent="0.1"/>
+        <drop item="540" percent="1.5"/>
+    </monster>
+
+    <monster id="22" name="Poison Skull">
+        <sprite>monster-skull-poison.xml</sprite>
+        <drop item="621" percent="0.1"/>
+        <drop item="540" percent="1.5"/>
+    </monster>
+
+    <monster id="23" name="Log Head">
+        <sprite>monster-logmonster.xml</sprite>
+        <sound event="hurt">loghead-hurt1.ogg</sound>
+        <sound event="hurt">loghead-hurt2.ogg</sound>
+        <sound event="hurt">loghead-hurt3.ogg</sound>
+        <sound event="hurt">loghead-hurt4.ogg</sound>
+        <sound event="hurt">loghead-hurt5.ogg</sound>
+        <drop item="569" percent="20"/>
+    </monster>
+
+    <monster id="24" name="Mountain Snake">
+        <sprite>monster-snake.xml|#585b39,a67c5d,dbc9a9,ffffff</sprite>
+    </monster>
+
+    <monster id="25" name="Easter Fluffy">
+        <sprite>monster-fluffy.xml</sprite>
+        <sound event="hit">fluffy-hit1.ogg</sound>
+        <sound event="hit">fluffy-hit2.ogg</sound>
+        <sound event="hit">fluffy-hit3.ogg</sound>
+        <sound event="miss">fluffy-miss1.ogg</sound>
+        <sound event="hurt">fluffy-hurt1.ogg</sound>
+    </monster>
+
+    <monster id="26" name="Mouboo">
+        <sprite>monster-mouboo.xml</sprite>
+    </monster>
+
+    <monster id="27" name="Mauve Plant">
+        <sprite>resource-plant.xml|#e0b0ff</sprite>
+    </monster>
+
+    <monster id="28" name="Cobalt Plant">
+        <sprite>resource-plant.xml|#0047ab</sprite>
+    </monster>
+
+    <monster id="29" name="Gamboge Plant">
+        <sprite>resource-plant.xml|#ef9b0f</sprite>
+    </monster>
+
+    <monster id="30" name="Alizarin Plant">
+        <sprite>resource-plant.xml|#e32636</sprite>
+    </monster>
+    
+    <monster id="31" name="Sea Slime">
+        <sprite>monster-slime.xml|#4ca1a0,ffffff</sprite>
+        <sound event="hit">slime-hit1.ogg</sound>
+    </monster>
+
+    <monster id="32" name="Grass Snake">
+        <sprite>monster-snake.xml|#205839,60a65d,80dba9,ffffff</sprite>
+    </monster>
+
+    <monster id="33" name="Silkworm">
+        <sprite>monster-silkworm.xml|#807d20,e0dac0;#c0a830</sprite>
+    </monster>
+
+</monsters>
-- 
cgit v1.2.3-70-g09d2


From 18748dd7522ae2470c09de6ad1501ec71137a9a1 Mon Sep 17 00:00:00 2001
From: Andreas Habel <mail@exceptionfault.de>
Date: Fri, 14 Nov 2008 23:08:23 +0100
Subject: Modified revision attribute to work with git

---
 items.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/items.xml b/items.xml
index eafe3418..05a425d7 100644
--- a/items.xml
+++ b/items.xml
@@ -11,7 +11,9 @@
 -->
 <items>
     
-    <version revision="$Revision$" />
+    <!-- Version of this items.xml file to ensure that account-server and
+         game-server are in-sync -->
+    <version revision="1" />
     
     <!-- Pseudo-item hairstyles. Using negative IDs is just a temporary
          solution. I would like to use the lower ID numbers when they aren't
-- 
cgit v1.2.3-70-g09d2


From 3e5e12a1250a0d578ccfe99f99264809e4f23f02 Mon Sep 17 00:00:00 2001
From: Chuck Miller <shadowmil@gmail.com>
Date: Sat, 15 Nov 2008 15:48:59 -0500
Subject: Added runes.xml which will be used for the magic system

---
 runes.xml | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 runes.xml

diff --git a/runes.xml b/runes.xml
new file mode 100644
index 00000000..39514675
--- /dev/null
+++ b/runes.xml
@@ -0,0 +1,110 @@
+<runes>
+    <effect>
+        <basic>
+
+        <rune id="0" name="Heat" element="fire" slots="1" level="0" damage="10" cost="10" />
+        <rune id="1" name="Flame" element="fire" slots="2" level="20" damage="20" cost="30" />
+        <rune id="2" name="Fire" element="fire" slots="3" level="40" damage="40" cost="100" />
+        <rune id="3" name="Hellfire" element="fire" slots="4" level="60" damage="80" cost="300" />
+
+        <rune id="4" name="Bubble" element="water" slots="1" level="0" damage="10" cost="10" />
+        <rune id="5" name="Splash" element="water" slots="2" level="20" damage="20" cost="30" />
+        <rune id="6" name="Water" element="water" slots="3" level="40" damage="40" cost="100" />
+        <rune id="7" name="Tsunami" element="water" slots="4" level="60" damage="80" cost="300" />
+
+        <rune id="8" name="Sand" element="earth" slots="1" level="0" damage="10" cost="10" />
+        <rune id="9" name="Mud" element="earth" slots="2" level="20" damage="20" cost="30" />
+        <rune id="10" name="Earth" element="earth" slots="3" level="40" damage="40" cost="100" />
+        <rune id="11" name="Stone" element="earth" slots="4" level="60" damage="80" cost="300" />
+
+        <rune id="12" name="Wind" element="air" slots="1" level="0" damage="10" cost="10" />
+        <rune id="13" name="Tornado" element="air" slots="2" level="20" damage="20" cost="30" />
+        <rune id="14" name="Air" element="air" slots="3" level="40" damage="40" cost="100" />
+        <rune id="15" name="Sonic" element="air" slots="4" level="60" damage="80" cost="300" />
+        </basic>
+        <combination>
+
+        <rune id="16" name="Spike" element="metal" rune1="0" rune2="8" />
+        <rune id="17" name="Blade" element="metal" rune1="1" rune2="9" />
+        <rune id="18" name="Metal" element="metal" rune1="2" rune2="10" />
+        <rune id="19" name="Razor" element="metal" rune1="3" rune2="11" />
+
+        <rune id="20" name="Spark" element="lighting" rune1="0" rune2="12" />
+        <rune id="21" name="Volt" element="lighting" rune1="1" rune2="13" />
+        <rune id="22" name="Lighting" element="lighting" rune1="2" rune2="14" />
+        <rune id="23" name="Thunder" element="lighting" rune1="3" rune2="15" />
+
+        <rune id="24" name="Cold" element="ice" rune1="4" rune2="12" />
+        <rune id="25" name="Frost" element="ice" rune1="5" rune2="13" />
+        <rune id="26" name="Ice" element="ice" rune1="6" rune2="14" />
+        <rune id="27" name="Blizzard" element="ice" rune1="7" rune2="15" />
+        
+        <rune id="28" name="Thorn" element="nature" rune1="8" rune2="4" />
+        <rune id="29" name="Poison" element="nature" rune1="9" rune2="5" />
+        <rune id="30" name="Nature" element="nature" rune1="10" rune2="6" />
+        <rune id="31" name="Acid" element="nature" rune1="11" rune2="7" />
+        </combination>
+        <healing>
+        <rune id="32" name="Mend" element="healing" slots="1" level="0" healing="20" cost="10" />
+        <rune id="33" name="Regeneration" element="healing" slots="2" level="20" healing="40" cost="30" />
+        <rune id="34" name="Heal" element="healing" slots="3" level="40" healing="80" cost="100" />
+        <rune id="35" name="Blessed" element="healing" slots="4" level="60" healing="160" cost="300" />
+        </healing>
+    </effect>
+    <application>
+        <rune id="0" name="" type="cast" slots="0" cost="0" function="magic.spell" />
+        <rune id="1" name="Bolt" type="target" slots="1" cost="50" function="magic.bolt" />
+        <rune id="2" name="Ray" type="cast" slots="1" cost="50" function="magic.ray" />
+        <rune id="3" name="Cone" type="cast" slots="1" cost="100" function="magic.cone" />
+        <rune id="4" name="Ball" type="target" slots="2" cost="100" function="magic.ball" />
+        <rune id="5" name="Blast" type="aoe" slots="3" cost="100" function="magic.blast" />
+        <rune id="6" name="Storm" type="aoe" slots="4" cost="200" function="magic.storm" />
+        <rune id="7" name="Nova" type="cast" slots="3" cost="100" function="magic.nova" />
+        <rune id="8" name="Inferno" type="cast" slots="4" cost="200" function="magic.inferno" />
+        <rune id="9" name="Apocalypse" type="cast" slots="5" cost="500" function="magic.apocalypse" />
+        <rune id="10" name="Soul" type="target" slots="2" cost="200" function="magic.soul">
+            <allowed element="fire" />
+            <allowed element="water" />
+            <allowed element="earth" />
+            <allowed element="air" />
+        </rune>
+        <rune id="11" name="Swiftness of Wind" 
+              type="cast" slots="3" cost="300"  
+              function="magic.swiftnessofwind" enchaments="0">
+            <allowed element="air" />
+        </rune>
+    </application>
+    <enhancement>
+        <rune id="1" slots="2" cost="50" name="Silent">
+            <allowed element="air" />
+            <disallowed type="enhancement" id="3" />
+        </rune>
+        <rune id="2" slots="4" cost="200"  name="Vampiric">
+            <allowed element="nature" />
+        </rune>
+        <rune id="3" slots="2" cost="-300" name="Illusionary">
+            <disallowed type="enhancement" id="1" />
+        </rune>
+        <rune id="4" slots="4" cost="100" name="Enforced">
+            <allowed element="fire" />
+            <allowed element="water" />
+            <allowed element="earth" />
+            <allowed element="air" />
+        </rune>
+        <rune id="5" slots="3" cost="100" name="Creeping">
+            <allowed element="fire" />
+            <allowed element="nature" />
+        </rune>
+        <rune id="6" slots="2" cost="100" name="Cursed">
+            <allowed element="metal" />
+        </rune>
+        <rune id="7" slots="3" cost="100" name="Freezing">
+            <allowed element="ice" />
+        </rune>
+        <rune id="8" slots="3" cost="100" name="Paralyzing">
+            <allowed element="lighting" />
+        </rune>
+        <rune id="9" slots="2" cost="0" name="Unstable" />
+    </enhancement>
+</runes>
+
-- 
cgit v1.2.3-70-g09d2


From 25ee846ea0af3ebbd63b91068723b591386a35c9 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Mon, 17 Nov 2008 18:16:26 +0100
Subject: Fixed colorisation of generic-iten

---
 items.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/items.xml b/items.xml
index 05a425d7..e4efe7d0 100644
--- a/items.xml
+++ b/items.xml
@@ -2132,7 +2132,7 @@
         <sprite gender="female">chest-robe-female.xml|#E40A0A</sprite>
     </item>
     <item id="727"
-        image="generic-iten.png|Wffe0f0"
+        image="generic-iten.png|W:#ffe0f0"
         name="Iten"
         description="An iten."
         effect=""
-- 
cgit v1.2.3-70-g09d2


From 95222190ee7ca774e989268717b78fcb2ecdb655 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Thu, 20 Nov 2008 17:04:43 +0100
Subject: made maggots slower and added an immobile, passive flower monster (id
 12) for easier testing of hit detection.

---
 monsters.xml | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/monsters.xml b/monsters.xml
index 9fa3c7f0..f478706a 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -14,13 +14,13 @@
         <drop item="522" percent="0.1"/>
         <attributes
             hp="20"
-            size="4"
-            speed="64"
+            size="8"
+            speed="32"
             attack-min="10"
             attack-delta="2"
             attack-magic="0"
             hit="10"
-            evade="10"
+            evade="5"
             physical-defence="5"
             magical-defence="0"
             mutation="50"
@@ -33,7 +33,7 @@
             aggressive="false"
             cowardly="false"
             track-range="5"
-            stroll-range="5"
+            stroll-range="2"
             attack-distance="32"
             />
         <attack id="1"
@@ -315,6 +315,28 @@
         <drop item="1199" percent="1"/>
         <drop item="526" percent="4"/>
         <drop item="565" percent="5"/>
+        <exp>10</exp>
+        <!-- Passive monster for testing stuff-->
+        <attributes
+            hp="2000"
+            size="8"
+            speed="0"
+            attack-min="0"
+            attack-delta="0"
+            attack-magic="0"
+            hit="0"
+            evade="0"
+            physical-defence="0"
+            magical-defence="0"
+            mutation="0"
+            />
+        <behavior
+            aggressive="false"
+            cowardly="false"
+            track-range="0"
+            stroll-range="0"
+            attack-distance="0"
+            />
     </monster>
 
     <monster id="13" name="Santa Slime">
-- 
cgit v1.2.3-70-g09d2