From 7af795c5d6ac140a2d8ffa36c52837d19c132e95 Mon Sep 17 00:00:00 2001
From: Enchilado <crunchy@crunchy-Satellite-L300.(none)>
Date: Sun, 5 Jun 2011 20:33:23 +1000
Subject: Update the HP in items.xml for modified fruit

As per the server data changes.
---
 items.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index b84c738d..e5481ebe 100644
--- a/items.xml
+++ b/items.xml
@@ -3610,7 +3610,7 @@
         name="Blueberries"
         description="Blueberries from another world. Unusually refreshing, from a world of death."
         type="usable"
-        hp="60"
+        hp="200"
         weight="6"/>
     <item id="1249"
         image="generic/strange-coin.png"
@@ -3624,21 +3624,21 @@
         name="Pear"
         description="A pear. Taken from a tree of many fruits from a distant world."
         type="usable"
-        hp="40"
+        hp="150"
         weight="7"/>
     <item id="1251"
         image="use/food/yellow-plum.png"
         name="Yellow plum"
         description="A plum. Taken from a tree of many fruits from a distant world."
         type="usable"
-        hp="60"
+        hp="100"
         weight="10"/>
     <item id="1252"
         image="use/food/cherry.png"
         name="Cherry"
         description="A cherry. Taken from a tree of many fruits from a distant world."
         type="usable"
-        hp="40"
+        hp="50"
         weight="5"/>
     <item id="1253"
         image="use/food/apple.png|R:#B3AB77;Y:#FFC030;G:#66CC33"
-- 
cgit v1.2.3-70-g09d2


From 4645bf583f413ccf3acc4b64da8856e6cb6b06a0 Mon Sep 17 00:00:00 2001
From: Enchilado <crunchy@crunchy-Satellite-L300.(none)>
Date: Sun, 5 Jun 2011 20:41:15 +1000
Subject: Change descriptions of snail's fruit drops

Remove references to the 'other world' of the Easter event they were
created for and replace them with stuff about how tasty they are.
---
 items.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index e5481ebe..2a96084f 100644
--- a/items.xml
+++ b/items.xml
@@ -3608,7 +3608,7 @@
     <item id="1248"
         image="use/food/blueberries.png"
         name="Blueberries"
-        description="Blueberries from another world. Unusually refreshing, from a world of death."
+        description="Near to bursting with sweet juice."
         type="usable"
         hp="200"
         weight="6"/>
@@ -3622,21 +3622,21 @@
     <item id="1250"
         image="use/food/pear.png"
         name="Pear"
-        description="A pear. Taken from a tree of many fruits from a distant world."
+        description="Juicy, crunchy, and delicious."
         type="usable"
         hp="150"
         weight="7"/>
     <item id="1251"
         image="use/food/yellow-plum.png"
         name="Yellow plum"
-        description="A plum. Taken from a tree of many fruits from a distant world."
+        description="A yellow variety of plum that is both sweet and sour."
         type="usable"
         hp="100"
         weight="10"/>
     <item id="1252"
         image="use/food/cherry.png"
         name="Cherry"
-        description="A cherry. Taken from a tree of many fruits from a distant world."
+        description="A small but delectable cherry."
         type="usable"
         hp="50"
         weight="5"/>
-- 
cgit v1.2.3-70-g09d2


From 727b118e90f8ff15dff948c74b4fcf05c0599f5f Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Wed, 15 Jun 2011 10:31:40 +0200
Subject: Updated the black boots for the Rossy Quest to make them as powerful
 as the Fur Boots.

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

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index 2a96084f..a61fef80 100644
--- a/items.xml
+++ b/items.xml
@@ -2330,15 +2330,13 @@
         weight="15"
         max-per-slot="10"/>
     <item id="734"
-        image="equipment/feet/boots.png|W:#505050"
+        image="equipment/feet/boots.png|W:#1e1e1e"
         name="Black Boots"
         description="Steel toe capped boots, designed to keep your feet very well protected."
-        effect="+4% Defense"
         type="equip-feet"
-        weight="35"
-        defense="4"
-        max-per-slot="1">
-        <sprite gender="male">equipment/feet/boots-male.xml|#505050</sprite>
+        weight="25"
+        defense="3">
+        <sprite gender="male">equipment/feet/boots-male.xml|#1e1e1e</sprite>
         <sprite gender="female">equipment/feet/boots-female.xml|#505050</sprite>
     </item>
     <item id="735"
-- 
cgit v1.2.3-70-g09d2


From c017823b098458dfa0747d976e979ce6cc9c3164 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Thu, 16 Jun 2011 09:04:01 +0200
Subject: Made the black boots slightly better than fur boots for several
 reasons.

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

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index a61fef80..3e131078 100644
--- a/items.xml
+++ b/items.xml
@@ -2334,8 +2334,8 @@
         name="Black Boots"
         description="Steel toe capped boots, designed to keep your feet very well protected."
         type="equip-feet"
-        weight="25"
-        defense="3">
+        weight="35"
+        defense="4">
         <sprite gender="male">equipment/feet/boots-male.xml|#1e1e1e</sprite>
         <sprite gender="female">equipment/feet/boots-female.xml|#505050</sprite>
     </item>
-- 
cgit v1.2.3-70-g09d2


From a2eadf1942046f402dd3c12de990c97a499a5de9 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Thu, 16 Jun 2011 12:11:22 +0200
Subject: Added the wolf and made the black boots as powerful as the fur boots.

---
 graphics/sprites/monsters/wolf.png | Bin 0 -> 70200 bytes
 graphics/sprites/monsters/wolf.xml | 107 +++++++++++++++++++++++++++++++++++++
 items.xml                          |   4 +-
 monsters.xml                       |   6 +++
 4 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 graphics/sprites/monsters/wolf.png
 create mode 100644 graphics/sprites/monsters/wolf.xml

(limited to 'items.xml')

diff --git a/graphics/sprites/monsters/wolf.png b/graphics/sprites/monsters/wolf.png
new file mode 100644
index 00000000..867106e2
Binary files /dev/null and b/graphics/sprites/monsters/wolf.png differ
diff --git a/graphics/sprites/monsters/wolf.xml b/graphics/sprites/monsters/wolf.xml
new file mode 100644
index 00000000..08ad1396
--- /dev/null
+++ b/graphics/sprites/monsters/wolf.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/monsters/wolf.png|W" width="92" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="28" delay="300"/>
+		  <frame index="29" delay="300"/>
+		  <frame index="30" delay="300"/>
+		  <frame index="29" delay="300"/>
+		  <frame index="30" delay="300"/>
+		  <frame index="28" delay="300"/>
+		  <frame index="30" delay="300"/>
+		  <frame index="31" delay="500"/>
+		  <frame index="32" delay="600"/>
+		  <frame index="31" delay="400"/>
+		  <frame index="32" delay="700"/>
+		</animation>
+		<animation direction="left">
+		  <frame index="6" delay="300"/>
+		  <frame index="7" delay="300"/>
+		  <frame index="8" delay="300"/>
+		  <frame index="7" delay="300"/>
+		  <frame index="8" delay="300"/>
+		  <frame index="6" delay="300"/>
+		  <frame index="8" delay="300"/>
+		  <frame index="9" delay="500"/>
+		  <frame index="10" delay="600"/>
+		  <frame index="9" delay="400"/>
+		  <frame index="10" delay="700"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="39" delay="300"/>
+		  <frame index="40" delay="300"/>
+		  <frame index="41" delay="300"/>
+		  <frame index="40" delay="300"/>
+		  <frame index="41" delay="300"/>
+		  <frame index="39" delay="300"/>
+		  <frame index="41" delay="300"/>
+		  <frame index="42" delay="500"/>
+		  <frame index="43" delay="600"/>
+		  <frame index="42" delay="400"/>
+		  <frame index="43" delay="700"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="17" delay="300"/>
+		  <frame index="18" delay="300"/>
+		  <frame index="19" delay="300"/>
+		  <frame index="18" delay="300"/>
+		  <frame index="19" delay="300"/>
+		  <frame index="17" delay="300"/>
+		  <frame index="19" delay="300"/>
+		  <frame index="20" delay="500"/>
+		  <frame index="21" delay="600"/>
+		  <frame index="20" delay="400"/>
+		  <frame index="21" delay="700"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="22" end="27" delay="100"/>
+		</animation>
+		<animation direction="left">
+			<sequence start="0" end="5" delay="100"/>
+		</animation>
+		<animation direction="up">
+			<sequence start="33" end="38" delay="100"/>
+		</animation>
+		<animation direction="right">
+			<sequence start="11" end="16" delay="100"/>
+		</animation>
+	</action>
+
+
+	<action name="dead" imageset="base">
+		<animation direction="up">
+			<frame index="54" delay="0" />
+		</animation>
+		<animation direction="down">
+			<frame index="65" delay="0" />
+		</animation>
+		<animation direction="right">
+			<frame index="54" delay="0" />
+		</animation>
+		<animation direction="left">
+			<frame index="65" delay="0" />			
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="55" end="59" delay="85"/>
+		</animation>
+		<animation direction="left">
+			<sequence start="49" end="53" delay="85"/>
+		</animation>
+		<animation direction="up">
+			<sequence start="60" end="64" delay="85"/>
+		</animation>
+		<animation direction="right">
+			<sequence start="44" end="48" delay="85"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/items.xml b/items.xml
index 3e131078..a61fef80 100644
--- a/items.xml
+++ b/items.xml
@@ -2334,8 +2334,8 @@
         name="Black Boots"
         description="Steel toe capped boots, designed to keep your feet very well protected."
         type="equip-feet"
-        weight="35"
-        defense="4">
+        weight="25"
+        defense="3">
         <sprite gender="male">equipment/feet/boots-male.xml|#1e1e1e</sprite>
         <sprite gender="female">equipment/feet/boots-female.xml|#505050</sprite>
     </item>
diff --git a/monsters.xml b/monsters.xml
index ca174c21..689a003b 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -295,7 +295,9 @@
     </monster>
 
     <!--50 Hivespa-->
+
     <!--51 Froad-->
+
     <!--52 Troll-->
 
     <monster id="53" name="Butterfly" targetCursor="small">
@@ -480,4 +482,8 @@
         <sprite>monsters/skull-ice.xml</sprite>
     </monster>
 
+    <monster id="84" name="White Wolf">
+        <sprite>monsters/wolf.xml</sprite>
+    </monster>
+
 </monsters>
-- 
cgit v1.2.3-70-g09d2


From 3ee6f833689a775a905b38a1c3b100e974aa9171 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Sun, 26 Jun 2011 11:52:11 +0200
Subject: Added the mana potions and a light crystal. These items will be used
 later, when Thermin project will be done.

---
 graphics/items/generic/crystal.png     | Bin 0 -> 541 bytes
 graphics/items/generic/darkcrystal.png | Bin 544 -> 0 bytes
 items.xml                              |  57 ++++++++++++++++++++++++---------
 3 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 graphics/items/generic/crystal.png
 delete mode 100644 graphics/items/generic/darkcrystal.png

(limited to 'items.xml')

diff --git a/graphics/items/generic/crystal.png b/graphics/items/generic/crystal.png
new file mode 100644
index 00000000..4b4b4e9c
Binary files /dev/null and b/graphics/items/generic/crystal.png differ
diff --git a/graphics/items/generic/darkcrystal.png b/graphics/items/generic/darkcrystal.png
deleted file mode 100644
index e9936d34..00000000
Binary files a/graphics/items/generic/darkcrystal.png and /dev/null differ
diff --git a/items.xml b/items.xml
index a61fef80..d79e6304 100644
--- a/items.xml
+++ b/items.xml
@@ -1434,13 +1434,11 @@
         <sprite>equipment/head/shroom.xml</sprite>
     </item>
     <item id="631"
-        image="generic/darkcrystal.png"
+        image="generic/crystal.png|W:#252e6a,923eda,ba72ec,ffffff"
         name="Dark Crystal"
         description="A dark crystal that emits a demonic aura."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="632"
         image="equipment/legs/skirt.png|W:#A4B2B2,FFFFFF"
         name="Cotton Skirt"
@@ -1928,38 +1926,30 @@
         image="use/potions/a.png|G:#b03678,ffffff"
         name="Tiny Healing Potion"
         description="A tiny healing potion made from brewed herbs."
-        effect="+100 HP"
         type="usable"
         hp="100"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="685"
         image="use/potions/d.png|G:#b03678,ffffff"
         name="Small Healing Potion"
         description="A small healing potion made from brewed herbs."
-        effect="+200 HP"
         type="usable"
         hp="200"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="686"
         image="use/potions/b.png|G:#b03678,ffffff"
         name="Medium Healing Potion"
         description="A medium healing potion made from brewed herbs."
-        effect="+400 HP"
         type="usable"
         hp="400"
-        weight="15"
-        max-per-slot="10"/>
+        weight="15"/>
     <item id="687"
         image="use/potions/c.png|G:#b03678,ffffff"
         name="Large Healing Potion"
         description="A large healing potion made from brewed herbs."
-        effect="+800 HP"
         type="usable"
         hp="800"
-        weight="25"
-        max-per-slot="10"/>
+        weight="25"/>
     <item id="688"
         image="equipment/chest/tanktop.png|W:#A4B2B2,FFFFFF"
         name="Tank Top"
@@ -3146,6 +3136,41 @@
         effect=""
         type="generic"
         weight="5"/>
+    <item id="825"
+        image="use/potions/a.png|G:#3636b0,ffffff"
+        name="Tiny Mana Potion"
+        description="A tiny mana potion made from brewed, powerful items."
+        type="usable"
+        mp="25"
+        weight="5"
+        max-per-slot="10"/>
+    <item id="826"
+        image="use/potions/d.png|G:#3636b0,ffffff"
+        name="Small Mana Potion"
+        description="A small mana potion made from brewed, powerful items."
+        type="usable"
+        mp="50"
+        weight="10"/>
+    <item id="827"
+        image="use/potions/b.png|G:#3636b0,ffffff"
+        name="Medium Mana Potion"
+        description="A medium mana potion made from brewed, powerful items."
+        type="usable"
+        mp="100"
+        weight="15"/>
+    <item id="828"
+        image="use/potions/c.png|G:#3636b0,ffffff"
+        name="Large Mana Potion"
+        description="A large mana potion made from brewed, powerful items."
+        type="usable"
+        mp="250"
+        weight="25"/>
+    <item id="829"
+        image="generic/crystal.png|W:#ba58ff,d496ff,ffffff"
+        name="Light Crystal"
+        description="A light crystal that emits an angelic aura."
+        type="generic"
+        weight="10"/>
 
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
-- 
cgit v1.2.3-70-g09d2


From 9752e10b96aa6739e3fc36db4b6dbca07e39a998 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Sun, 26 Jun 2011 12:25:27 +0200
Subject: [Size] Mana Potions -> [Size] Mana Elixirs, to avoid misunderstanding
 with the Mana Potion connected to the Mana Seed.

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

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index d79e6304..64d90c32 100644
--- a/items.xml
+++ b/items.xml
@@ -3138,7 +3138,7 @@
         weight="5"/>
     <item id="825"
         image="use/potions/a.png|G:#3636b0,ffffff"
-        name="Tiny Mana Potion"
+        name="Tiny Mana Elixir"
         description="A tiny mana potion made from brewed, powerful items."
         type="usable"
         mp="25"
@@ -3146,21 +3146,21 @@
         max-per-slot="10"/>
     <item id="826"
         image="use/potions/d.png|G:#3636b0,ffffff"
-        name="Small Mana Potion"
+        name="Small Mana Elixir"
         description="A small mana potion made from brewed, powerful items."
         type="usable"
         mp="50"
         weight="10"/>
     <item id="827"
         image="use/potions/b.png|G:#3636b0,ffffff"
-        name="Medium Mana Potion"
+        name="Medium Mana Elixir"
         description="A medium mana potion made from brewed, powerful items."
         type="usable"
         mp="100"
         weight="15"/>
     <item id="828"
         image="use/potions/c.png|G:#3636b0,ffffff"
-        name="Large Mana Potion"
+        name="Large Mana Elixir"
         description="A large mana potion made from brewed, powerful items."
         type="usable"
         mp="250"
@@ -3172,6 +3172,8 @@
         type="generic"
         weight="10"/>
 
+    <!-- ID 230 RESERVED - "Witch Root" -->
+
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
     <item id="1198"
-- 
cgit v1.2.3-70-g09d2


From fe912d6e4ae7e490145e6c8a1c7bb254e9deaa07 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Sun, 26 Jun 2011 17:59:45 +0200
Subject: Full review of items.xml, including: - A review of some descriptions.
 - A removal of unecessary informations. - A correction and addition of all
 informations written on this page. - A complete spellcheck. - And more...

---
 items.xml | 2921 +++++++++++++++++++++++++------------------------------------
 1 file changed, 1174 insertions(+), 1747 deletions(-)

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index 64d90c32..45ff7d08 100644
--- a/items.xml
+++ b/items.xml
@@ -115,104 +115,82 @@
         image="use/potions/a.png|G:#22ff22"
         name="Cactus Drink"
         description="A fresh drink."
-        effect="+15 HP"
         type="usable"
         hp="15"
-        weight="4"
-        max-per-slot="10"/>
+        weight="4"/>
     <item id="502"
         image="use/potions/a.png|G:#ff2222"
         name="Cactus Potion"
         description="A fresh potion."
-        effect="+25 HP"
         type="usable"
         hp="25"
-        weight="7"
-        max-per-slot="10"/>
+        weight="7"/>
     <item id="503"
         image="generic/casinocoins.png"
         name="Casino Coins"
         description="Just some casino coins."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="504"
         image="use/food/decorcandy.png"
         name="Decor Candy"
         description="A leftover decor candy from last Christmas."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="505"
         image="generic/maggotslime.png"
         name="Maggot Slime"
         description="Slimy maggot slime."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="506"
         image="use/food/candycane.png"
         name="Candy Cane"
         description="Tasty candy cane."
-        effect="+5 HP"
         type="usable"
         hp="5"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="507"
         image="generic/scorpionstinger.png|W:#a08040,e0e0e0"
         name="Scorpion Stinger"
         description="A poisoned scorpion stinger."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="508"
         image="use/food/xmascake.png"
         name="Xmas Cake"
         description="A sweet xmas cake."
-        effect="+10 HP"
         type="usable"
         hp="10"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="509"
         image="use/food/chocolatebar.png|W:#441e00,b36e36"
         name="Chocolate Bar"
         description="A chocolate bar made of finest chocolate."
-        effect="+20 HP"
         type="usable"
         hp="20"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="510"
         image="use/food/candy.png"
         name="Candy"
         description="A sugar-free candy."
-        effect="+5 HP"
         type="usable"
         hp="5"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="511"
         image="equipment/head/santahat.png"
         name="Santa Hat"
         description="Ask Santa about this hat."
-        effect="+2% Defense"
+        effect="M. Attack -2"
         type="equip-head"
         weight="20"
-        defense="2"
-        max-per-slot="1">
+        defense="2">
         <sprite>equipment/head/santahat.xml</sprite>
     </item>
     <item id="512"
         image="use/food/gingerbreadman.png"
         name="Ginger Bread Man"
         description="A tasty ginger bread man."
-        effect="+25 HP"
         type="usable"
         hp="25"
         weight="1"/>
@@ -220,7 +198,6 @@
         image="use/food/cake.png"
         name="Cake"
         description="A slice of cake."
-        effect="+15 HP"
         type="usable"
         hp="15"
         weight="1"/>
@@ -228,7 +205,6 @@
         image="use/food/xmascandycane.png"
         name="Xmas Candy Cane"
         description="A special xmas candy cane."
-        effect="+10 HP"
         type="usable"
         hp="10"
         weight="1"/>
@@ -236,35 +212,30 @@
         image="generic/purplepresentbox.png"
         name="Purple Present Box"
         description="Something mysterious inside."
-        effect=""
         type="generic"
         weight="10"/>
     <item id="516"
         image="generic/bluepresentbox.png"
         name="Blue Present Box"
         description="Something mysterious inside."
-        effect=""
         type="generic"
         weight="10"/>
     <item id="517"
         image="generic/scorpionstinger.png|W:#e04040,f0f0f0"
         name="Red Scorpion Stinger"
         description="A highly poisoned red scorpion stinger."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="518"
         image="generic/bugleg.png"
         name="Bug Leg"
         description="A bug's leg. Mostly used for alchemy."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="519"
         image="use/food/cherrycake.png"
         name="Cherry Cake"
         description="A nice cherry cake."
-        effect="+35 HP"
         type="usable"
         hp="35"
         weight="1"/>
@@ -272,7 +243,6 @@
         image="use/food/easteregg.png"
         name="Easter Egg"
         description="A surprise."
-        effect="+100 HP"
         type="usable"
         hp="100"
         weight="1"/>
@@ -280,16 +250,10 @@
         image="equipment/weapon/dagger-dagger.png"
         name="Dagger"
         description="A simple dagger."
-        effect="+15 Damage, 1 Range"
+        effect="Damage +15"
         type="equip-1hand"
-        weapon_type="1"
-        weight="200"
         weapon-type="knife"
-        attack-action="attack"
-        attack-min="5"
-        attack-delta="10"
-        attack-range="32"
-        max-per-slot="1">
+        weight="200">
         <sprite>weapon-dagger.xml</sprite>
         <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
         <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
@@ -298,28 +262,20 @@
         image="equipment/weapon/dagger-sharpknife.png"
         name="Sharp Knife"
         description="A really sharp knife. Don't hurt yourself!"
-        effect="+10 Damage, 1 Range"
+        effect="Damage +10"
         type="equip-1hand"
-        weapon_type="1"
-        weight="150"
-        max-per-slot="1"
         weapon-type="knife"
-        attack-action="attack"
-        attack-min="8"
-        attack-delta="2"
-        attack-range="32"
-        view="521">
+        weight="150">
         <sound event="strike">weapons/knives/sharpknife-miss1.ogg</sound>
     </item>
     <item id="523"
         image="equipment/chest/leathershirt.png"
         name="Leather Shirt"
         description="A shirt made of hardened leather."
-        effect="+4% Defense"
+        effect="M. Attack -12"
         type="equip-torso"
-        weight="20"
         defense="4"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/chest/leather-male.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
         <sprite gender="female">equipment/chest/leather-female.xml|#412300,603100,8d4900;#ffff00</sprite>
     </item>
@@ -327,50 +283,42 @@
         image="equipment/head/fancyhat.png"
         name="Fancy Hat"
         description="A fancy hat."
-        effect="+5% Defense"
         type="equip-head"
-        weight="20"
         defense="5"
-        max-per-slot="1">
+        weight="20">
         <sprite>equipment/head/fancyhat.xml</sprite>
     </item>
     <item id="525"
         image="equipment/head/minershat.png"
         name="Miners Hat"
         description="A hat used by miners."
-        effect="+4% Defense"
+        effect="M. Attack -8"
         type="equip-head"
-        weight="40"
         defense="4"
-        max-per-slot="1">
+        weight="40">
         <sprite>equipment/head/minershat.xml</sprite>
     </item>
     <item id="526"
         image="generic/coinbag.png"
         name="Coin Bag"
         description="A bag used to hold coins."
-        effect=""
         type="generic"
-        weight="5"
-        max-per-slot="1"/>
+        weight="5"/>
     <item id="527"
         image="use/food/milk.png"
         name="Milk"
         description="A fresh litre of ice cold milk. Note: Cool people drink milk!"
-        effect="+150 HP"
         type="usable"
         hp="150"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="528"
         image="equipment/feet/boots.png|W:#4f2d29,c89078"
         name="Boots"
         description="Some robust boots, ideal for travelling."
-        effect="+2% Defense"
+        effect="M. Attack -2"
         type="equip-feet"
-        weight="80"
         defense="2"
-        max-per-slot="1">
+        weight="80">
         <sprite gender="male">equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
         <sprite gender="female">equipment/feet/boots-female.xml|#623a34,f0c2b4</sprite>
     </item>
@@ -378,35 +326,26 @@
         image="equipment/ammo/ironarrow.png"
         name="Iron Arrow"
         description="A hard arrow made of iron."
-        effect="+40 Damage"
+        effect="Damage +40"
         type="equip-ammo"
-        weight="1"
-        max-per-slot="100"/>
+        weight="1"/>
     <item id="530"
         image="equipment/weapon/bow-shortbow.png"
         name="Short Bow"
         description="A bow for short distances."
-        effect="+50 Damage, 5 Range"
+        effect="Damage +50 / Range 5"
         type="equip-2hand"
-        weapon_type="10"
         weapon-type="bow"
-        attack-action="attack_bow"
         weight="600"
-        max-per-slot="1"
-        damage-min="50"
-        damage-delta="0"
-        attack-range="160"
-        missile-particle="graphics/particles/arrow.particle.xml"
-        view="1200"/>
+        missile-particle="graphics/particles/arrow.particle.xml"/>
     <item id="531"
         image="equipment/hands/minergloves.png"
         name="Miner Gloves"
-        description="Gloves used by miners; very useful."
-        effect="+2% Defense"
+        description="Gloves used by miners, very useful."
+        effect="M. Attack -10"
         type="equip-arms"
-        weight="30"
         defense="2"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/hands/generic-male.xml|#202020,505050</sprite>
         <sprite gender="female">equipment/hands/generic-female.xml|#202020,505050</sprite>
     </item>
@@ -414,11 +353,10 @@
         image="equipment/hands/leathergloves.png"
         name="Leather Gloves"
         description="Gloves made of hardened leather."
-        effect="+4% Defense"
+        effect="M. Attack -20"
         type="equip-arms"
-        weight="20"
         defense="4"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/hands/generic-male.xml|#4e2e18,c8752f</sprite>
         <sprite gender="female">equipment/hands/generic-female.xml|#4e2e18,c8752f</sprite>
     </item>
@@ -426,548 +364,414 @@
         image="use/food/roastedmaggot.png"
         name="Roasted Maggot"
         description="A maggot roasted on fire."
-        effect="+150 HP"
         type="usable"
         hp="150"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="534"
         image="use/food/orangecupcake.png"
         name="Orange Cupcake"
         description="A very soft orange cupcake."
-        effect="+100 HP"
         type="usable"
         hp="100"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="535"
-        image="use/food/apple.png|R:#FF3600;Y:#FFC000;G:#66CC33"
+        image="use/food/apple.png|R:#ff3600;Y:#ffc000;G:#66cc33"
         name="Red Apple"
         description="A healthy red apple."
-        effect="+50 HP"
         type="usable"
         hp="50"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="536"
         image="equipment/weapon/dagger-shortsword.png"
         name="Short Sword"
         description="A small but sharp sword."
-        effect="+100 Damage, 1 Range"
+        effect="Damage +100"
         type="equip-1hand"
-        weapon_type="2"
-        weight="2000"
-        slot ="0"
         weapon-type="sword"
-        attack-action="attack"
-        attack-min="20"
-        attack-delta="30"
-        attack-range="32"
-        max-per-slot="1"
-        view="521"/>
+        weight="2000"/>
     <item id="537"
         image="generic/treasurekey.png"
         name="Treasure Key"
         description="A rusty key."
-        effect="Opens chests"
         type="generic"
-        weight="2"
-        max-per-slot="10"/>
+        weight="2"/>
     <item id="538"
         image="generic/greenpresentbox.png"
         name="Green Present Box"
         description="Something mysterious inside."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="539"
         image="use/food/beer.png"
         name="Beer"
         description="A fresh beer."
-        effect="+200 HP"
         type="usable"
         hp="200"
-        weight="10"
-        max-per-slot="10"/>
+        mp="5"
+        weight="10"/>
     <item id="540"
         image="generic/bottle-empty.png"
         name="Empty Bottle"
         description="An empty bottle."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="541"
         image="use/food/water.png"
         name="Bottle of Water"
         description="A bottle of water."
-        effect="+250 HP"
         type="usable"
         hp="250"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="542"
         image="generic/bottle-sand.png"
         name="Bottle of Sand"
         description="A bottle with sand in it."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="543"
         image="equipment/head/standardheadband.png|W:#291e16,99784c,d8bd86,ffffff"
         name="Standard Headband"
         description="A standard headband."
-        effect="+3% Defense"
+        effect="M. Attack -3"
         type="equip-head"
-        weight="10"
-        max-per-slot="1"
-        defense="3">
+        defense="3"
+        weight="10">
         <sprite>equipment/head/standardheadband.xml|#563f25,99784c,d8bd86,ffffff</sprite>
     </item>
     <item id="544"
         image="equipment/head/silkheadband.png"
         name="Silk Headband"
         description="A cool headband made of silk."
-        effect="+10% Defense"
+        effect="M. Attack -10"
         type="equip-head"
-        weight="10"
         defense="10"
-        max-per-slot="1">
+        weight="10">
         <sprite>equipment/head/silkheadband.xml</sprite>
     </item>
     <item id="545"
         image="equipment/weapon/bow-forestbow.png"
         name="Forest Bow"
         description="A bow usually used for hunting."
-        effect="+70 Damage, 5 Range"
+        effect="Damage +70 / Range 5"
         type="equip-2hand"
-        weapon_type="10"
-        weight="1200"
-        max-per-slot="1"
         weapon-type="bow"
-        attack-action="attack_bow"
-        attack-min="70"
-        attack-delta="0"
-        attack-range="160"
-        missile-particle="graphics/particles/arrow.particle.xml"
-        view="1200"/>
+        weight="1200"
+        missile-particle="graphics/particles/arrow.particle.xml"/>
     <item id="546"
         image="equipment/chest/desertshirt.png"
         name="Desert Shirt"
         description="A shirt suitable for desert trips."
-        effect="+6% Defense"
+        effect="M. Attack -18"
         type="equip-torso"
-        weight="20"
         defense="6"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/chest/leather-male.xml|#443c21,85794a,beb590,ffffff;#824035,d6a19a</sprite>
         <sprite gender="female">equipment/chest/leather-female.xml|#251e06,443c21,71653b,a0945e;#b6574a</sprite>
     </item>
     <item id="547"
         image="equipment/weapon/polearm-bardiche.png"
         name="Bardiche"
-        description="A Bardiche."
-        effect="??? Damage, ??? Range"
+        description="A bardiche."
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="polearm"
-        attack-action="attack"
-        weight="10"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="548"
         image="equipment/weapon/polearm-halberd.png"
         name="Halberd"
         description="A weapon usually carried by guards."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="polearm"
-        weight="1400"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="1400"/>
     <item id="549"
         image="equipment/weapon/axe-axe.png"
         name="Axe"
         description="An axe."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="axe"
-        attack-action="attack"
-        weight="1200"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="1200"/>
     <item id="550"
         image="equipment/weapon/axe-blacksmithsaxe.png"
         name="Blacksmith's Axe"
         description="An axe usually used by blacksmiths."
-        effect="+80 Damage, 1 Range"
+        effect="Damage +?"
         type="equip-2hand"
-		weapon_type="11"
         weapon-type="axe"
-        attack-action="attack_2hand"
-        weight="1200"
-		attack-min="20"
-        attack-delta="80"
-        attack-range="32"
-        max-per-slot="1">
-		<sprite>weapon-axe-blacksmith.xml</sprite>
-		</item>
+        weight="1200">
+	<sprite>weapon-axe-blacksmith.xml</sprite>
+	</item>
     <item id="551"
         image="generic/hint.png|W:#74e1f4"
         name="Aqua Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="552"
         image="generic/hint.png|W:#c38ec7"
         name="Magenta Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="553"
         image="generic/hint.png|W:#f0f17d"
         name="Yellow Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="554"
         image="generic/hint.png|W:#70e370"
         name="Green Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="555"
         image="generic/hint.png|W:#6ef4ea"
         name="Teal Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="556"
         image="generic/hint.png|W:#c97fe8"
         name="Purple Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="557"
         image="generic/hint.png|W:#e97180"
         name="Red Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="558"
         image="generic/hint.png|W:#7a86f4"
         name="Blue Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="559"
         image="generic/hint.png|W:#f0bd67"
         name="Orange Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="560"
         image="generic/hint.png"
         name="Grey Hint"
         description="A hint."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="561"
         image="equipment/weapon/sword-sabre.png"
         name="Sabre"
         description="A sword with a very sharp, curved, single-edged blade."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        attack-action="attack"
-        weight="300"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="300"/>
     <item id="562"
         image="use/food/chickenleg.png"
         name="Chicken Leg"
         description="A well cooked chicken leg."
-        effect="+500 HP"
         type="usable"
         hp="500"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="563"
         image="equipment/hands/basicgloves.png|W:#a0a0a0,d0d0d0,ffffff,ffffff"
         name="Winter Gloves"
         description="A pair of soft, warm gloves."
-        effect="+3% Defense"
+        effect="M. Attack -15"
         type="equip-arms"
-        weight="20"
         defense="3"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/hands/generic-male.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
         <sprite gender="female">equipment/hands/generic-female.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
     </item>
     <item id="564"
-        image="equipment/chest/tnecksweater.png|W:#A4B2B2,FFFFFF"
+        image="equipment/chest/tnecksweater.png|W:#a4b2b2,ffffff"
         name="Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm sweater."
+        effect="M. Attack -18"
         type="equip-torso"
-        weight="30"
         defense="6"
-        max-per-slot="1">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#A4B2B2,FFFFFF</sprite>
+        weight="30">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="565"
-        image="generic/petal.png|W:#EE748D,FFD8CE"
+        image="generic/petal.png|W:#ee748d,ffd8ce"
         name="Pink Petal"
         description="A petal from an evil flower."
-        effect="+50 HP"
         type="usable"
         hp="50"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="566"
         image="generic/smallmushroom.png"
         name="Small Mushroom"
         description="A mushroom."
-        effect="+50 HP"
         type="usable"
         hp="50"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="567"
         image="use/potions/b.png|G:#c05000,f0a000,f0f09f"
         name="Iron Potion"
         description="Increases your attack strength."
-        effect="Attack strength increase (temporary)"
+        effect="Attack strength increase (temporary)."
         type="usable"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="568"
         image="use/potions/c.png|G:#da69e5,ffdaff"
         name="Concentration Potion"
         description="Increases your attack speed."
-        effect="Attack speed increase (temporary)"
+        effect="Attack speed increase (temporary)."
         type="usable"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="569"
         image="generic/rawlog.png"
         name="Raw Log"
         description="A raw log."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="570"
         image="equipment/weapon/dagger-boneknife.png"
         name="Bone Knife"
         description="A knife masterly carved out of a bone."
-        effect="+115 Damage, 1 Range"
+        effect="Damage +115"
         type="equip-1hand"
-        weapon_type="2"
         weapon-type="knife"
-        attack-action="attack"
-        weight="450"
-        max-per-slot="1"
-        attack-range="32"
-        view="521"/>
+        weight="450"/>
     <item id="571"
         image="equipment/weapon/dagger-setzer.png"
         name="Setzer"
         description="A sharp knife, named after a famous gambler."
-        effect="+110 Damage, 1 Range"
+        effect="Damage +110"
         type="equip-1hand"
         weapon-type="knife"
-        attack-action="attack"
-        weight="900"
-        max-per-slot="1"
-        weapon_type="2"
-        attack-range="32"
-        view="521"/>
+        weight="900"/>
     <item id="572"
         image="equipment/weapon/sword-scimitar.png"
         name="Scimitar"
         description="A sword with a heavy, curved, single-edged blade."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        attack-action="attack"
-        weight="200"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="200"/>
     <item id="573"
         image="equipment/weapon/sword-falchion.png"
         name="Falchion"
         description="A heavy one-handed, single-edged sword."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        attack-action="attack"
-        weight="300"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="300"/>
     <item id="574"
         image="equipment/weapon/polearm-scorpion.png"
         name="Scorpion"
         description="A well crafted glaive."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="polearm"
-        attack-action="attack"
-        weight="600"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="600"/>
     <item id="575"
         image="equipment/weapon/bow-desertbow.png"
         name="Desert Bow"
         description="A tonorian short bow."
-        effect="??? Damage, ??? Range"
+        effect="Damage +? / Range ?"
         type="equip-2hand"
         weapon-type="bow"
-        attack-action="attack_bow"
         weight="1200"
-        attack-range="32"
-        missile-particle="graphics/particles/arrow.particle.xml"
-        max-per-slot="1"/>
+        missile-particle="graphics/particles/arrow.particle.xml"/>
     <item id="576"
         image="equipment/weapon/sword-beheader.png"
         name="Beheader"
         description="An oddly designed sword especially made for beheading enemies."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        attack-action="attack"
-        weight="2000"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="2000"/>
     <item id="577"
         image="equipment/ammo/bonedarts.png"
         name="Bone Darts"
         description="Darts made of bones."
-        effect="??? Damage, ??? Range"
+        effect="Damage +? / Range ?"
         type="equip-1hand"
         weapon-type="thrown"
-        attack-action="attack"
-        weight="300"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="300"/>
     <item id="578"
         image="equipment/weapon/sword-sandcutter.png"
         name="Sand Cutter"
         description="A sand cutter."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        attack-action="attack"
-        weight="1500"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="1500"/>
     <item id="579"
         image="equipment/weapon/dagger-rockknive.png"
         name="Rock Knife"
         description="A knife made of stone."
-        effect="+110 Damage, +3 Vitality"
+        effect="Damage +110"
         type="equip-1hand"
         weapon-type="knife"
-        attack-action="attack"
-        weight="500"
-        attack-range="32"
-        max-per-slot="1"/>
+        vit="3"
+        weight="500"/>
     <item id="580"
         image="equipment/weapon/staff-staffoflife.png"
         name="Staff of Life"
         description="A staff that increases healing magic."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="staff"
-        attack-action="attack"
-        weight="1500"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="1500"/>
     <item id="581"
         image="equipment/weapon/staff-crescentrod.png"
         name="Crescent Rod"
         description="A crescent rod."
-        effect="+50 Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="staff"
-        attack-action="attack"
-        weight="1500"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="1500"/>
     <item id="582"
         image="equipment/weapon/staff-staffoffire.png"
         name="Staff of Fire"
         description="A staff that increases fire magic."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="staff"
-        attack-action="attack"
-        weight="1500"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="1500"/>
     <item id="583"
         image="equipment/weapon/staff-staffofice.png"
         name="Staff of Ice"
         description="A staff that increases ice magic."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="staff"
-        attack-action="attack"
-        weight="1500"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="1500"/>
     <item id="584"
         image="equipment/weapon/sword-jackal.png"
         name="Jackal"
         description="A jackal."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        attack-action="attack"
-        weight="100"
-        attack-range="32"
-        max-per-slot="1"/>
+        weight="100"/>
     <item id="585"
         image="equipment/shield/scarabarmlet.png"
         name="Scarab Armlet"
         description="A scarab armlet."
-        effect="+0% Defense"
+        effect="M. Attack +5"
         type="equip-arms"
-        weight="200"
-        max-per-slot="1"/>
+        weight="200"/>
     <item id="586"
-        image="equipment/legs/shorts.png|W:#A4B2B2,FFFFFF"
+        image="equipment/legs/shorts.png|W:#a4b2b2,ffffff"
         name="Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        effect="M. Attack -4"
         type="equip-legs"
         weight="15"
-        defense="2"
-        max-per-slot="1">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#A4B2B2,FFFFFF</sprite>
+        defense="2">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#a4b2b2,ffffff</sprite>
     </item>
 
 
@@ -975,57 +779,48 @@
         image="equipment/weapon/sword-sword.png"
         name="Sword"
         description="A simple but reliable sword."
-        effect="+25 Damage, 1 Range"
+        effect="Damage +?"
         type="equip-1hand"
-		weapon_type="11"
         weapon-type="sword"
-		attack-action="attack_1hand"
-        weight="500"
-        attack-min="10"
-        attack-delta="25"
-        attack-range="32"
-        max-per-slot="1">
+        weight="500">
         <sprite>weapon-sword-sword.xml</sprite>
 	</item>
+
     <!--
-	<item id="588"
+    <item id="588"
         image="equipment/weapon/sword-bastardsword.png"
         name="Bastard Sword"
         description="A large two handed sword."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="sword"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="589"
         image="equipment/weapon/sword-broadsword.png"
         name="Broad Sword"
         description="A two handed sword with a very broad blade."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="sword"
-        weight="10"
-        max-per-slot="1">
+        weight="10">
         <sound event="hit">weapons/swords/broadsword-hit1.ogg</sound>
     </item>
     <item id="590"
         image="equipment/weapon/sword-baselard.png"
         name="Baselard"
         description="A short and powerful sword."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="591"
         image="equipment/weapon/sword-longsword.png"
         name="Long Sword"
         description="A sword with a long and agile blade."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        weight="10"
-        max-per-slot="1">
+        weight="10">
         <sound event="hit">weapons/swords/longsword-hit1.ogg</sound>
         <sound event="hit">weapons/swords/longsword-hit2.ogg</sound>
         <sound event="strike">weapons/swords/longsword-miss1.ogg</sound>
@@ -1034,85 +829,70 @@
         image="equipment/weapon/dagger-stiletto.png"
         name="Stiletto"
         description="A dagger with a long and thin blade."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="knife"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="593"
         image="equipment/weapon/sword-rapier.png"
         name="Rapier"
         description="A light sword made for duels."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        weight="10"
-        max-per-slot="1">
+        weight="10">
         <sound event="hit">weapons/swords/rapier-hit1.ogg</sound>
     </item>
-	-->
     <item id="594"
         image="equipment/weapon/polearm-spear.png"
         name="Spear"
         description="A light spear with a wooden pole."
-        effect="+40 Damage, 1 Range"
+        effect="Damage +?"
         type="equip-2hand"
-		weapon_type="11"
         weapon-type="polearm"
-        attack-action="attack_polearm"
-        weight="700"
-		attack-min="10"
-        attack-delta="20"
-        attack-range="32"
-        max-per-slot="1">
-		<sprite>weapon-polearm-spear.xml</sprite>
-		</item>
-    <!--
-	<item id="595"
+        weight="700">
+	<sprite>weapon-polearm-spear.xml</sprite>
+	</item>
+    <item id="595"
         image="equipment/weapon/polearm-heavyspear.png"
         name="Heavy Spear"
         description="A heavy spear with a wooden pole."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="polearm"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="596"
         image="equipment/weapon/polearm-pike.png"
         name="Pike"
         description="A light spear with an iron pole."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="polearm"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="597"
         image="equipment/weapon/polearm-heavypike.png"
         name="Heavy Pike"
         description="A heavy spear with an iron pole."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="polearm"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="598"
         image="equipment/weapon/polearm-dualspear.png"
         name="Dual Spear"
         description="A spear with two tops."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="polearm"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="599"
         image="equipment/weapon/sword-firesword.png"
         name="Fire Sword"
         description="A magical sword enchanted with the power of fire."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="sword"
-        weight="10"
-        max-per-slot="1">
+        weight="10">
         <sound event="strike">weapons/swords/firesword-miss1.ogg</sound>
     </item>
     <item id="600"
@@ -1121,99 +901,91 @@
         description="A legendary shield that is said to save queens and rule waves."
         effect="-50 Cooking"
         type="equip-shield"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     -->
 
     <item id="601"
         image="equipment/shield/steel.png"
         name="Steel Shield"
         description="A shield made of steel."
-        effect="+20% Defense"
+        effect="M. Attack -200"
+        defense="20"
         type="equip-shield"
-        weight="2500"
-        max-per-slot="1"/>
+        weight="2500"/>
     <item id="602"
         image="equipment/shield/wooden.png"
         name="Wooden Shield"
         description="A shield made of wood."
-        effect="+14% Defense"
+        effect="M. Attack -70"
+        defense="14"
         type="equip-shield"
-        weight="1500"
-        max-per-slot="1"/>
+        weight="1500"/>
     <item id="603"
         image="equipment/shield/leather.png"
         name="Leather Shield"
         description="A shield made of leather on a wooden frame."
-        effect="+7% Defense"
+        effect="M. Attack -35"
+        defense="7"
         type="equip-shield"
-        weight="1300"
-        max-per-slot="1"/>
+        weight="1300"/>
 
     <!--
     <item id="604"
         image="equipment/shield/knight.png"
         name="Knight Shield"
         description="A high quality shield used by knights."
-        effect="??? Defense"
+        defense="???"
         type="equip-shield"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="605"
         image="equipment/weapon/axe-meatcleaver.png"
         name="Meat Cleaver"
         description="A butcher's tool that also makes a nice one handed battle axe."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="axe"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="606"
         image="equipment/weapon/axe-hatchet.png"
         name="Hatchet"
         description="A short one handed axe."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="axe"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="607"
         image="equipment/weapon/polearm-trident.png"
         name="Trident"
         description="A spear with three heads."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-2hand"
         weapon-type="polearm"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="608"
         image="equipment/shield/blade.png"
         name="Blade Shield"
         description="A shield made of blades."
-        effect=""
+        defense="???"
         type="equip-shield"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     <item id="609"
         image="equipment/weapon/mace-club.png"
         name="Club"
         description="A primitive wooden club."
-        effect="??? Damage, ??? Range"
+        effect="Damage +?"
         type="equip-1hand"
         weapon-type="mace"
-        weight="10"
-        max-per-slot="1"/>
+        weight="10"/>
     -->
 
     <item id="610"
         image="equipment/legs/shorts.png|W:#255367,266c84,68b0c5,ffffff"
         name="Jeans Shorts"
         description="Shorts made of jeans."
-        effect="+4% Defense"
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="25"
         defense="4"
-        max-per-slot="1">
+        weight="25">
         <sprite gender="male">equipment/legs/shorts-male.xml|#255367,266c84,68b0c5,ffffff</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#255367,266c84,68b0c5,ffffff</sprite>
     </item>
@@ -1221,159 +993,132 @@
         image="generic/whitefur.png"
         name="White Fur"
         description="A patch of white, fluffy fur."
-        effect=""
         type="generic"
-        weight="8"
-        max-per-slot="10"/>
+        weight="8"/>
     <item id="612"
         image="generic/cavesnakelamp.png"
         name="Cave Snake Lamp"
         description="The feeler of a lamp snake that glows in the dark."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="613"
         image="generic/hardspike.png"
         name="Hard Spike"
         description="The hard spike of a slain monster."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="614"
         image="generic/pinkantennae.png"
         name="Pink Antenna"
         description="No-one knows why pinkies have these antennas on their heads."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        luk="1"
+        weight="10"/>
     <item id="615"
         image="equipment/head/pumpkinhelmet.png"
         name="Pumpkin Helmet"
         description="A helmet made out of a pumpkin."
-        effect="+4% Defense"
+        effect="M. Attack -4"
         type="equip-head"
-        weight="60"
         defense="4"
-        max-per-slot="1">
+        weight="60">
         <sprite>equipment/head/pumpkinhelmet.xml</sprite>
     </item>
     <item id="616"
         image="equipment/head/axehat.png"
         name="Axe Hat"
         description="A really cool joke."
-        effect="+4% Defense"
+        effect="M. Attack -4"
         type="equip-head"
         weight="50"
-        defense="4"
-        max-per-slot="1">
+        defense="4">
         <sprite>equipment/head/axehat.xml</sprite>
     </item>
     <item id="617"
         image="equipment/head/piratehat.png"
         name="Pirate Hat"
         description="A pirate hat."
-        effect="+4% Defense"
+        effect="M. Attack -8"
         type="equip-head"
         weight="40"
-        defense="4"
-        max-per-slot="1">
+        defense="4">
         <sprite>equipment/head/piratehat.xml</sprite>
     </item>
     <item id="618"
         image="equipment/head/goggles.png"
         name="Goggles"
         description="Goggles designed to take care of your eyes."
-        effect="+2% Defense"
         type="equip-head"
         weight="20"
-        defense="2"
-        max-per-slot="1">
+        defense="2">
         <sprite>equipment/head/goggles.xml|#787878,f7f7f7</sprite>
     </item>
     <item id="619"
         image="equipment/head/leathergoggles.png"
         name="Leather Goggles"
         description="Goggles designed for desert storms."
-        effect="+3% Defense"
         type="equip-head"
         weight="20"
-        defense="3"
-        max-per-slot="1">
+        defense="3">
         <sprite>equipment/head/goggles.xml|#783c00,ff973b</sprite>
     </item>
     <item id="620"
         image="equipment/head/circlet.png"
         name="Circlet"
         description="A nice piece of jewelry."
-        effect="+4% Defense"
+        effect="M. Attack +5"
         type="equip-head"
         weight="25"
-        defense="4"
-        max-per-slot="1">
+        defense="4">
         <sprite>equipment/head/circlet.xml</sprite>
     </item>
     <item id="621"
         image="equipment/head/eyepatch.png"
         name="Eyepatch"
         description="What really makes you a pirate."
-        effect="+3% Defense"
         type="equip-head"
         weight="5"
-        defense="3"
-        max-per-slot="1">
+        defense="3">
         <sprite>equipment/head/eyepatch.xml</sprite>
     </item>
     <item id="622"
         image="equipment/head/bandana.png"
         name="Bandana"
         description="A striped bandana."
-        effect="+3% Defense"
         type="equip-head"
         weight="20"
-        defense="3"
-        max-per-slot="1">
+        defense="3">
         <sprite>equipment/head/bandana.xml</sprite>
     </item>
     <item id="623"
         image="equipment/weapon/polearm-scythe.png"
         name="Scythe"
         description="Usually used for farming but also usable as a weapon. Slow but deadly."
-        effect="+75 Damage, 1 Range"
+        effect="Damage +75"
         type="equip-2hand"
-        weapon_type="11"
         weapon-type="polearm"
-        attack-action="attack"
-        weight="1200"
-        attack-min="0"
-        attack-delta="75"
-        attack-range="32"
-        max-per-slot="1">
+        weight="1200">
         <sprite>weapon-scythe.xml</sprite>
     </item>
     <item id="624"
-        image="equipment/chest/vnecksweater.png|W:#A4B2B2,FFFFFF"
+        image="equipment/chest/vnecksweater.png|W:#a4b2b2,ffffff"
         name="V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm sweater."
+        effect="M. Attack -24"
         type="equip-torso"
         weight="35"
-        defense="8"
-        max-per-slot="1">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#A4B2B2,FFFFFF</sprite>
+        defense="8">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="625"
         image="equipment/chest/chainmail.png"
         name="Chainmail Shirt"
         description="A shirt made of chains. It weighs a lot but offers excellent protection."
-        effect="+20% Defense"
+        effect="M. Attack -120"
         type="equip-torso"
         weight="800"
-        defense="20"
-        max-per-slot="1">
+        defense="20">
         <sprite gender="male">equipment/chest/chainmail-male.xml</sprite>
         <sprite gender="female">equipment/chest/chainmail-female.xml</sprite>
     </item>
@@ -1381,11 +1126,10 @@
         image="equipment/chest/lightplatemail.png|W:#ddeeff"
         name="Light Platemail"
         description="A light cuirass with shoulder pads made of iron, usually worn by foot soldiers."
-        effect="+25% Defense"
+        effect="M. Attack -150"
         type="equip-torso"
-        weight="1200"
         defense="25"
-        max-per-slot="1">
+        weight="1200">
         <sprite gender="male">equipment/chest/lightplatemail-male.xml|#ddeeff</sprite>
         <sprite gender="female">equipment/chest/lightplatemail-female.xml|#ddeeff</sprite>
     </item>
@@ -1393,44 +1137,38 @@
         image="equipment/head/tophat.png"
         name="Top Hat"
         description="For the gentry of The Mana World."
-        effect="+10% Defense"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
         defense="10"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/tophat.xml</sprite>
     </item>
     <item id="628"
         image="equipment/head/funkyhat.png"
         name="Funky Hat"
         description="Yawn..."
-        effect="+13% Defense"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="20"
         defense="13"
-        max-per-slot="1">
+        weight="20">
         <sprite>equipment/head/funkywinter.xml</sprite>
     </item>
     <item id="629"
         image="equipment/head/mushroomhat.png"
         name="Mush Hat"
         description="Soft and fashionable."
-        effect="+10% Defense"
         type="equip-head"
-        weight="30"
         defense="10"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/mushroom.xml</sprite>
     </item>
     <item id="630"
         image="equipment/head/shroomhat.png"
         name="Shroom Hat"
         description="Evil and fashionable."
-        effect="+13% Defense"
         type="equip-head"
-        weight="30"
         defense="13"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/shroom.xml</sprite>
     </item>
     <item id="631"
@@ -1440,51 +1178,45 @@
         type="generic"
         weight="10"/>
     <item id="632"
-        image="equipment/legs/skirt.png|W:#A4B2B2,FFFFFF"
+        image="equipment/legs/skirt.png|W:#a4b2b2,ffffff"
         name="Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="10"
-        max-per-slot="1">
-        <sprite>equipment/legs/skirt.xml|#A4B2B2,FFFFFF</sprite>
+        defense="4"
+        weight="10">
+        <sprite>equipment/legs/skirt.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="633"
         image="equipment/head/xmaself.png"
         name="Christmas Elf Hat"
         description="A hat worn by Christmas elves."
-        effect="+13% Defense"
-        defense="13"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="13"
+        weight="30">
         <sprite>equipment/head/xmaself.xml</sprite>
     </item>
     <item id="634"
         image="equipment/head/mask.png"
         name="Face Mask"
         description="A wooden mask to conceal your face."
-        effect="+10% Defense"
-        defense="10"
         type="equip-head"
-        weight="50"
-        max-per-slot="1">
+        defense="10"
+        weight="50">
         <sprite>equipment/head/mask.xml</sprite>
     </item>
     <item id="635"
         image="generic/santacookie.png"
         name="Santa Cookie"
         description="This isn't for you to eat, it is for Santa Claus!"
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1"/>
+        weight="1"/>
     <item id="636"
         image="equipment/head/warlordhelm.png"
         name="Warlord Helmet"
         description="Worn by great warriors."
-        effect="+18% Defense"
+        effect="M. Attack -36"
         type="equip-head"
         defense="18"
         weight="900">
@@ -1494,7 +1226,7 @@
         image="equipment/head/knighthelm.png"
         name="Knight's Helmet"
         description="A helmet with two small wings on it."
-        effect="+15% Defense"
+        effect="M. Attack -30"
         type="equip-head"
         defense="15"
         weight="600">
@@ -1504,7 +1236,7 @@
         image="equipment/head/infantryhelm.png"
         name="Infantry Helmet"
         description="A helmet for soldiers and guards."
-        effect="+15% Defense"
+        effect="M. Attack -30"
         type="equip-head"
         defense="15"
         weight="400">
@@ -1514,7 +1246,7 @@
         image="equipment/head/crusadehelm.png"
         name="Crusade Helmet"
         description="Start your own crusade."
-        effect="+18% Defense"
+        effect="M. Attack -36"
         type="equip-head"
         defense="18"
         weight="1300">
@@ -1524,21 +1256,19 @@
         image="generic/ironore.png"
         name="Iron Ore"
         description="A lump of iron ore."
-        effect=""
         type="generic"
         weight="40"/>
     <item id="641"
         image="generic/snakeskin.png"
         name="Snake Skin"
         description="The skin of a slain snake."
-        effect=""
         type="generic"
         weight="15"/>
     <item id="642"
         image="equipment/legs/chaps.png"
         name="Jeans Chaps"
         description="Jeans with snake skin chaps."
-        effect="+6% Defense"
+        effect="M. Attack -12"
         type="equip-legs"
         defense="6"
         weight="60">
@@ -1549,7 +1279,7 @@
         image="equipment/head/cowboywhite.png"
         name="White Cowboy Hat"
         description="A white cowboy hat with a band."
-        effect="+6% Defense"
+        effect="M. Attack -12"
         type="equip-head"
         defense="6"
         weight="30">
@@ -1559,7 +1289,7 @@
         image="equipment/head/cowboyblack.png"
         name="Black Cowboy Hat"
         description="A black cowboy hat with shiny buckles."
-        effect="+6% Defense"
+        effect="M. Attack -12"
         type="equip-head"
         defense="6"
         weight="30">
@@ -1569,7 +1299,7 @@
         image="equipment/chest/lightplatemail.png|W:#573f10,9c8226,d3c04b,ffffff"
         name="Golden Platemail"
         description="A plate mail made from gold, which only the richest of the richest can afford."
-        effect="+25% Defense"
+        effect="M. Attack -100"
         type="equip-torso"
         defense="25"
         weight="4500">
@@ -1580,7 +1310,6 @@
         image="equipment/head/crown.png"
         name="Crown"
         description="A jewel embossed crown fit for any ruler."
-        effect="+4% Defense"
         type="equip-head"
         defense="4"
         weight="240">
@@ -1590,7 +1319,7 @@
         image="equipment/head/devcap.png|R:#9999ff"
         name="Developer's Cap"
         description="A cap which identifies you as a developer."
-        effect="+5% Defense"
+        effect="M. Attack +5"
         type="equip-head"
         defense="5"
         weight="20">
@@ -1606,36 +1335,38 @@
         <sprite>equipment/head/devcap.xml|#9999ff</sprite>
     </item>
     <item id="649"
-        image="equipment/chest/sorcerer-robe.png|W:#5E7480,F1FFFF,FFFFFF;R:#2554C7"
+        image="equipment/chest/sorcerer-robe.png|W:#5e7480,f1ffff,ffffff;R:#2554c7"
         name="White Evoker's Robe (Blue)"
         description="A blue lined white evoker's robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="5">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#5E7480,F1FFFF,FFFFFF;#2554C7</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#5E7480,F1FFFF,FFFFFF;#2554C7</sprite>
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
     </item>
     <item id="650"
-        image="equipment/chest/sorcerer-robe.png|W:#000000;R:#2554C7"
+        image="equipment/chest/sorcerer-robe.png|W:#000000;R:#2554c7"
         name="Black Evoker's Robe (Blue)"
         description="A blue lined black evoker's robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="5">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#000000;#2554C7</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#000000;#2554C7</sprite>
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#000000;#2554c7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite>
     </item>
     <item id="651"
-        image="equipment/chest/silk-robe.png|W:#5E7480,F1FFFF,FFFFFF"
+        image="equipment/chest/silk-robe.png|W:#5e7480,f1ffff,ffffff"
         name="White Wizard Robe"
         description="A white robe made for peaceful wizards."
         defense="5"
         type="equip-torso"
         weight="5">
-        <sprite gender="male">equipment/chest/robe-male.xml|#5E7480,F1FFFF,FFFFFF</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#5E7480,F1FFFF,FFFFFF</sprite>
+        <sprite gender="male">equipment/chest/robe-male.xml|#5e7480,f1ffff,ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#5e7480,f1ffff,ffffff</sprite>
     </item>
     <item id="652"
         image="equipment/chest/silk-robe.png|W:#000000"
@@ -1661,7 +1392,6 @@
         image="equipment/head/cap.png|R:#d94800"
         name="Cap"
         description="A hat with a peak to shield your eyes from the sun."
-        effect="+5% Defense"
         type="equip-head"
         defense="5"
         weight="20">
@@ -1671,11 +1401,10 @@
         image="equipment/feet/furboots.png"
         name="Fur Boots"
         description="A pair of warm winter boots."
-        effect="+3% Defense"
+        effect="M. Attack -3"
         type="equip-feet"
         weight="50"
-        defense="3"
-        max-per-slot="1">
+        defense="3">
         <sprite gender="male">equipment/feet/furboots-male.xml</sprite>
         <sprite gender="female">equipment/feet/furboots-female.xml</sprite>
     </item>
@@ -1683,31 +1412,26 @@
         image="equipment/head/serf.png"
         name="Serf Hat"
         description="A simple hat made from cloth."
-        effect="+2% Defense"
         type="equip-head"
         weight="20"
-        defense="2"
-        max-per-slot="1">
+        defense="2">
         <sprite>equipment/head/serf.xml</sprite>
     </item>
     <item id="657"
         image="use/food/orange.png"
         name="Orange"
         description="A juicy orange."
-        effect="+60 HP"
         type="usable"
         hp="60"
-        weight="7"
-        max-per-slot="10"/>
+        weight="7"/>
     <item id="658"
         image="equipment/chest/warlordplate.png"
         name="Warlord Plate"
         description="Strong and decorative armor."
-        effect="+27% Defense"
+        effect="M. Attack -170"
         type="equip-torso"
-        weight="2600"
         defense="27"
-        max-per-slot="1">
+        weight="2600">
         <sprite gender="male">equipment/chest/warlordplate-male.xml</sprite>
         <sprite gender="female">equipment/chest/warlordplate-female.xml</sprite>
     </item>
@@ -1715,11 +1439,10 @@
         image="equipment/chest/warlordplate.png|W:#573f10,9c8226,d3c04b,ffffff"
         name="Golden Warlord Plate"
         description="Strong and decorative armor made from gold."
-        effect="+27% Defense"
+        effect="M. Attack -110"
         type="equip-torso"
-        weight="7600"
         defense="27"
-        max-per-slot="1">
+        weight="7600">
         <sprite gender="male">equipment/chest/warlordplate-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
         <sprite gender="female">equipment/chest/warlordplate-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
     </item>
@@ -1727,171 +1450,133 @@
         image="generic/fabric.png|W:#2b454d,72818c,b7c0c5,ffffff"
         name="Cotton Cloth"
         description="A piece of cotton cloth."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="661"
         image="generic/rose.png|W:#bb2222,ff8888"
         name="Red Rose"
         description="A red rose. A symbol for romantic love."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="662"
         image="generic/rose.png|W:#dddddd,ffffff"
         name="White Rose"
         description="A white rose. A symbol for everlasting love."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="663"
         image="generic/rose.png|W:#bb0022"
         name="Dark Red Rose"
         description="A dark red rose. A symbol for sad love."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="664"
         image="generic/rose.png|W:#dd88aa,ffdddd"
         name="Pink Rose"
         description="A pink rose. A symbol for innocent love."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="665"
         image="generic/rose.png|W:#dddd00,ffff00"
         name="Yellow Rose"
         description="A yellow rose. A symbol for platonic love and friendship."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="666"
         image="generic/rose.png|W:#111111,444444,555555,ffffff"
         name="Black Rose"
         description="A black rose. When you look closely at it, you see patterns within patterns, subtly changing colors, and further arrangements that almost seem designed to draw your attention in, and away from the rest of the world. Dizzy, you quickly look away."
         effect="This item cannot be used directly, but may have certain effects given the right circumstances."
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="667"
         image="generic/rose.png|W:#dd8800,ffdd00"
         name="Orange Rose"
         description="An orange rose. A symbol for friendship turning into love."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="668"
         image="generic/rose.png|W:#6666aa,ccccff"
         name="Blue Rose"
         description="An blue rose. A symbol for mystery or attaining the impossible."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="669"
         image="generic/tulip.png|W:#ddaa22,eeee44"
         name="Yellow Tulip"
         description="A yellow tulip. A symbol for hopeless love."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="670"
         image="generic/tulip.png|W:#000088,dd88ff"
         name="Purple Tulip"
         description="A purple tulip. A symbol for enchantment."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="671"
         image="generic/tulip.png|W:#882288,dd4444"
         name="Red Tulip"
         description="A red tulip. A declaration of love."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="672"
         image="generic/tulip.png|W:#8888dd,ffffff"
         name="White Tulip"
         description="A white tulip. A symbol for everlasting friendship."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="673"
         image="generic/tulip.png|W:#dd44dd,fff0f0"
         name="Pink Tulip"
         description="A pink tulip. A symbol for gratitude."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="674"
         image="generic/tulip.png|W:#aa2222,ffdd22"
         name="Orange Tulip"
         description="An orange tulip. A symbol for admiration."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="1" />
+        weight="1"/>
     <item id="675"
         image="equipment/head/gradcap.png"
         name="Graduation Cap"
         description="A traditional cap which a university student may wear upon graduating."
-        effect="+2% Defense"
         type="equip-head"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite>equipment/head/gradcap.xml</sprite>
     </item>
     <item id="676"
         image="use/food/steak.png"
         name="Steak"
         description="A tasty piece of steak."
-        effect="+250 HP"
         type="usable"
         hp="250"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="677"
         image="equipment/charms/heartnecklace.png"
         name="Heart Necklace"
         description="A gold and ruby heart necklace."
-        effect=""
         type="equip-charm"
-        weight="10"
-        max-per-slot="10"
-        intelligence="5"/>
+        weight="10"/>
     <item id="678"
         image="equipment/head/nohmask.png"
         name="Noh Mask"
         description="A traditional Japanese mask worn in Noh plays."
-        effect="+3% Defense"
+        effect="M. Attack +1"
         type="equip-head"
-        weight="18"
         defense="3"
-        max-per-slot="1">
+        weight="18">
         <sprite>equipment/head/nohmask.xml</sprite>
     </item>
     <item id="679"
         image="equipment/head/demonmask.png"
         name="Demon Mask"
         description="A scary mask to make you look like a demon."
-        effect="+3% Defense"
+        effect="M. Attack +5"
         type="equip-head"
-        weight="23"
         defense="3"
-        max-per-slot="1">
+        weight="23">
         <sprite>equipment/head/demonmask.xml</sprite>
     </item>
     <item id="680"
@@ -1899,29 +1584,25 @@
         name="Mauve Herb"
         description="An ingredient for brewing healing potions."
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="681"
         image="generic/herb.png|W:#0047ab"
         name="Cobalt Herb"
         description="An ingredient for brewing healing potions."
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="682"
         image="generic/herb.png|W:#ef9b0f"
         name="Gamboge Herb"
         description="An ingredient for brewing healing potions."
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="683"
         image="generic/herb.png|W:#e32636"
         name="Alizarin Herb"
         description="An ingredient for brewing healing potions."
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="684"
         image="use/potions/a.png|G:#b03678,ffffff"
         name="Tiny Healing Potion"
@@ -1951,201 +1632,176 @@
         hp="800"
         weight="25"/>
     <item id="688"
-        image="equipment/chest/tanktop.png|W:#A4B2B2,FFFFFF"
+        image="equipment/chest/tanktop.png|W:#a4b2b2,ffffff"
         name="Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="10">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="689"
-        image="equipment/chest/tanktop-short.png|W:#A4B2B2,FFFFFF"
+        image="equipment/chest/tanktop-short.png|W:#a4b2b2,ffffff"
         name="Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="690"
-        image="use/potions/d.png|G:#580000,A40000,C02020,ff6060"
+        image="use/potions/d.png|G:#580000,a40000,c02020,ff6060"
         name="Red Dye"
         description="A vial containing red dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="691"
         image="use/potions/d.png|G:#1f9c1f,89d689"
         name="Green Dye"
         description="A vial containing green dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="692"
         image="use/potions/d.png|G:#4b4bbd,888af4"
         name="Dark Blue Dye"
         description="A vial containing dark blue dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="693"
         image="use/potions/d.png|G:#ccb534,f1ea8e,ffffaa"
         name="Yellow Dye"
         description="A vial containing yellow dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="694"
         image="use/potions/d.png|G:#62aaca,a3f4f8,d5fcfb"
         name="Light Blue Dye"
         description="A vial containing light blue dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="695"
         image="use/potions/d.png|G:#c64abd,f9a5f2,fcd0fa"
         name="Pink Dye"
         description="A vial containing pink dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="696"
         image="use/potions/d.png|G:#404040,c0c0c0"
         name="Black Dye"
         description="A vial containing black dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="697"
         image="use/potions/d.png|G:#96370f,cc5616,f68d26,fcaa2d,fdd493"
         name="Orange Dye"
         description="A vial containing orange dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="698"
         image="use/potions/d.png|G:#530a7c,b362e1,ca87ef"
         name="Purple Dye"
         description="A vial containing purple dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="699"
         image="use/potions/d.png|G:#104010,208020,30c030"
         name="Dark Green Dye"
         description="A vial containing dark green dye."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="700"
         image="generic/pearl.png"
         name="Pearl"
         description="A pearl, round and shiny."
         type="generic"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="701"
         image="generic/powder.png"
         name="Pile of Ash"
         description="A pile of ash similar to volcanic ash."
         type="generic"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="702"
         image="equipment/rings/wedding.png"
         name="Wedding Ring"
         description="Your wedding ring."
         type="equip-ring"
-        weight="1"
-        max-per-slot="1"/>
+        weight="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"/>
+        weight="2"/>
     <item id="704"
         image="generic/powder.png|W:#405060"
         name="Iron Powder"
         description="A pile of powdered iron."
         type="generic"
-        weight="3"
-        max-per-slot="10"/>
+        weight="3"/>
     <item id="705"
         image="use/potions/e.png|R:#f04030;G:#ee8e5e"
         name="Mana 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"/>
+        weight="50"/>
     <item id="706"
         image="generic/scorpionstinger.png|W:#e0d080,fff0e0,ffffff"
         name="Golden Scorpion Stinger"
         description="A golden scorpion stinger, tipped with lethal poison."
-        effect=""
         type="generic"
         weight="2"/>
     <item id="707"
         image="use/potions/e.png|R:#504030;G:#9e8e5e"
         name="Monster Oil Potion"
         description="A dark, oily liquid with a sinister stench."
-        effect=""
         type="generic"
-        weight="50"
-        max-per-slot="10"/>
+        weight="50"/>
     <item id="708"
         image="generic/patch-leather.png"
         name="Leather Patch"
         description="A patch of tanned leather."
-        effect=""
         type="generic"
         weight="18"/>
     <item id="709"
         image="generic/scorpionstinger.png|W:#a08040"
         name="Black Scorpion Stinger"
         description="A black scorpion stinger, dripping with poison."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="710"
         image="generic/snake-tongue.png|W:#e04020"
         name="Snake Tongue"
         description="The forked tongue of a snake."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="711"
         image="generic/snake-tongue.png|W:#706060"
         name="Mountain Snake Tongue"
         description="The forked tongue of a mountain snake."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="712"
         image="generic/snake-tongue.png|W:#a05050,e08080"
         name="Grass Snake Tongue"
         description="The forked tongue of a grass snake."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="713"
         image="generic/snake-tongue.png|W:#907070,d0a0a0"
         name="Cave Snake Tongue"
         description="The forked tongue of a cave snake."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="714"
         image="use/food/snake-egg.png|W:#c0c0a0;R:#b09070;G:#b8a888"
         name="Snake Egg"
         description="An edible snake egg."
-        effect="+30 HP"
         type="usable"
         hp="30"
         weight="4"/>
@@ -2153,7 +1809,6 @@
         image="use/food/snake-egg.png|W:#806020;R:#604010;G:#705018"
         name="Mountain Snake Egg"
         description="An edible mountain snake egg."
-        effect="+40 HP"
         type="usable"
         hp="40"
         weight="4"/>
@@ -2161,7 +1816,6 @@
         image="use/food/snake-egg.png|W:#e0e0c0;R:#80f0a0;G:#b0e8b0"
         name="Grass Snake Egg"
         description="An edible grass snake egg."
-        effect="+50 HP"
         type="usable"
         hp="50"
         weight="4"/>
@@ -2169,7 +1823,6 @@
         image="use/food/snake-egg.png|W:#c0c0c0;R:#c090c0;G:#c0a8c0"
         name="Cave Snake Egg"
         description="An edible cave snake egg."
-        effect="+20 HP"
         type="usable"
         hp="20"
         weight="4"/>
@@ -2177,27 +1830,22 @@
         image="generic/silkcocoon.png"
         name="Silk Cocoon"
         description="A silkworm's cocoon."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="719"
-        image="use/food/apple.png|R:#73E600;Y:#C1F102;G:#66CC33"
+        image="use/food/apple.png|R:#73E600;Y:#c1f102;G:#66cc33"
         name="Green Apple"
         description="A healthy green apple."
-        effect="+45 HP"
         type="usable"
         hp="45"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="720"
         image="equipment/chest/silk-robe.png|W:#ffffff"
         name="Silk Robe"
         description="A light and shimmering silk robe."
-        effect="+5% Defense"
         type="equip-torso"
-        weight="5"
         defense="5"
-        max-per-slot="1">
+        weight="5">
         <sprite gender="male">equipment/chest/robe-male.xml|#ffffff</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#ffffff</sprite>
     </item>
@@ -2205,7 +1853,7 @@
         image="equipment/head/highpriest-crown.png"
         name="High Priest Crown"
         description="A golden crown with an enchanted ruby."
-        effect="+4% Defense, +20 SP"
+        effect="+20 SP"
         type="equip-head"
         defense="4"
         weight="400">
@@ -2215,91 +1863,84 @@
         image="equipment/head/monster-skull-helm.png"
         name="Monster Skull Helmet"
         description="The conserved skull of a mysterious ancient monster."
-        effect="+7% Defense, +20% Magic Defense"
+        effect="M. Attack +10 / M. Defense +20"
         type="equip-head"
         defense="7"
         weight="250">
         <sprite>equipment/head/monster-skull-helm.xml</sprite>
     </item>
     <item id="723"
-        image="equipment/head/deserthat.png|R:#FFFFFF"
+        image="equipment/head/deserthat.png|R:#ffffff"
         name="Desert Hat"
         description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
-        <sprite>equipment/head/deserthat.xml|#FFFFFF</sprite>
+        <sprite>equipment/head/deserthat.xml|#ffffff</sprite>
     </item>
     <item id="724"
-        image="equipment/head/standardheadband.png|W:#A4B2B2,FFFFFF"
+        image="equipment/head/standardheadband.png|W:#a4b2b2,ffffff"
         name="Cotton Headband"
         description="Just a cotton headband."
-        effect="+2% Defense"
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>equipment/head/standardheadband.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite>equipment/head/standardheadband.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="725"
-        image="equipment/head/gmcap.png|R:#BF0E08"
+        image="equipment/head/gmcap.png|R:#bf0e08"
         name="GM Cap"
         description="A cap which identifies you as a GM. Only GMs can wear this."
-        effect="+5% Defense"
+        effect="M. Attack +5"
         type="equip-head"
         defense="5"
         weight="20">
-        <sprite>equipment/head/gmcap.xml|#BF0E08</sprite>
+        <sprite>equipment/head/gmcap.xml|#bf0e08</sprite>
     </item>
     <item id="726"
-        image="equipment/chest/silk-robe.png|W:#E40A0A"
+        image="equipment/chest/silk-robe.png|W:#e40a0a"
         name="GM Robe"
         description="A light and shimmering silk robe made for GMs. Only GMs can wear this."
-        effect="+5% Defense"
         type="equip-torso"
         weight="40"
-        defense="5"
-        max-per-slot="1">
-        <sprite gender="male">equipment/chest/robe-male.xml|#E40A0A</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#E40A0A</sprite>
+        defense="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#e40a0a</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#e40a0a</sprite>
     </item>
     <item id="727"
         image="generic/iten.png|W:#ffe0f0"
         name="Iten"
         description="An iten."
-        effect=""
         type="generic"
         weight="8000"/>
     <item id="728"
         image="generic/wooden-mouboo.png"
         name="Mouboo Figurine"
         description="A small, wooden figurine of a mouboo."
-        effect=""
         type="generic"
         weight="9"/>
     <item id="729"
         image="generic/warped-log.png"
         name="Warped Log"
         description="A piece of wood, warped and twisted by some unnatural force."
-        effect=""
         type="generic"
         weight="8"/>
     <item id="730"
         image="generic/gemstone-a.png|W:#a0a010,ffffa0"
         name="Lifestone"
         description="A small crystal shard, warm to the touch."
-        effect=""
         type="generic"
         weight="5"/>
     <item id="731"
         image="equipment/legs/assassinpants.png"
         name="Assassin Pants"
         description="Pants for a master assassin."
-        effect="+5% Defense"
+        effect="M. Attack -5"
         type="equip-torso"
-        weight="20"
         defense="5"
-        max-per-slot="1">
+        agi="8"
+        weight="20">
         <sprite gender="male">equipment/legs/assassin-male.xml</sprite>
         <sprite gender="female">equipment/legs/assassin-female.xml</sprite>
     </item>
@@ -2307,22 +1948,20 @@
         image="generic/dry-branch.png"
         name="Druid Tree Branch"
         description="A branch cut off from the druid tree. It feels strangely leathery to the touch."
-        effect=""
         type="generic"
         weight="2"/>
     <item id="733"
         image="use/potions/e.png|R:#fff0ff;G:#d0c09f"
         name="Purification Potion"
         description="A transparent, odorless liquid that feels strangely lighter than water."
-        effect=""
         type="usable"
         mp="0"
-        weight="15"
-        max-per-slot="10"/>
+        weight="15"/>
     <item id="734"
         image="equipment/feet/boots.png|W:#1e1e1e"
         name="Black Boots"
         description="Steel toe capped boots, designed to keep your feet very well protected."
+        effect="M. Attack -10"
         type="equip-feet"
         weight="25"
         defense="3">
@@ -2330,47 +1969,43 @@
         <sprite gender="female">equipment/feet/boots-female.xml|#505050</sprite>
     </item>
     <item id="735"
-        image="equipment/feet/boots.png|W:#A4B2B2,FFFFFF"
+        image="equipment/feet/boots.png|W:#a4b2b2,ffffff"
         name="Cotton Boots"
         description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        effect="M. Attack +1"
         type="equip-head"
         defense="1"
         weight="10">
-        <sprite gender="male">equipment/feet/boots-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite gender="male">equipment/feet/boots-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="736"
-        image="use/food/bigcake.png|R:#EDE5B2,FFF7BF;G:#CCCCCC,FFFFFF"
+        image="use/food/bigcake.png|R:#ede5b2,fff7bf;G:#cccccc,ffffff"
         name="White Cake"
         description="A delicious white cake. Would go good with strawberries."
-        hp="10"
-        effect="+10 HP"
         type="usable"
+        hp="10"
         weight="10"/>
     <item id="737"
-        image="use/food/bigcake.png|R:#9E6E3B,E39D52;G:#E29F57;W:#FFD5A8"
+        image="use/food/bigcake.png|R:#9e6e3b,e39d52;G:#e29f57;W:#ffd5a8"
         name="Chocolate Cake"
         description="A scrumptious chocolate cake. Real chocolate guaranteed."
-        hp="11"
-        effect="+11 HP"
         type="usable"
+        hp="11"
         weight="10"/>
     <item id="738"
-        image="use/food/bigcake.png|R:#FED079,FFFFFF;G:#FED079,FFFFFF,FFFFFF;W:#856200,E68E00,FFA600"
+        image="use/food/bigcake.png|R:#fed079,ffffff;G:#fed079,ffffff,ffffff;W:#856200,e68e00,ffa600"
         name="Orange Cake"
         description="A tangy orange cake. Made from real oranges."
-        hp="12"
-        effect="+12 HP"
         type="usable"
+        hp="12"
         weight="10"/>
     <item id="739"
-        image="use/food/bigcake.png|R:#CCC599,FFF8ED;G:#FFBABA,FFFEFE;W:#D91A1A,FF8F8F"
+        image="use/food/bigcake.png|R:#ccc599,fff8ED;G:#ffbaba,fffefe;W:#d91a1a,ff8f8f"
         name="Apple Cake"
         description="A crisp apple cake. Real apple pieces inside!"
-        hp="12"
-        effect="+12 HP"
         type="usable"
+        hp="12"
         weight="10"/>
     <item id="740"
         image="generic/root.png"
@@ -2379,21 +2014,21 @@
         type="generic"
         weight="5"/>
     <item id="741"
-        image="equipment/hands/basicgloves.png|W:#A4B2B2,FFFFFF"
+        image="equipment/hands/basicgloves.png|W:#a4b2b2,ffffff"
         name="Cotton Gloves"
         description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="10">
-        <sprite gender="male">equipment/hands/generic-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="742"
         image="equipment/charms/clover.png"
         name="Four-Leaf Clover"
         description="A lucky four-leaf clover."
-        effect="+1 Luck"
+        effect="M. Attack +5"
         type="equip-charm"
         luck="1"
         weight="1"/>
@@ -2401,64 +2036,55 @@
         image="use/food/acorn.png"
         name="Acorn"
         description="An acorn."
-        effect="+3 HP"
         type="usable"
         hp="3"
-        weight="1"
-        max-per-slot="20"/>
+        weight="1"/>
     <item id="744"
         image="use/potions/c.png|G:#f0e0fa,da69e5"
         name="Diluted Concentration Potion"
         description="A bottle of diluted concentration potion."
-        effect="Attack speed increase (temporary)"
+        effect="Attack speed increase (temporary)."
         type="usable"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="745"
         image="use/potions/c.png|G:#ff4aff"
         name="Dark Concentration Potion"
         description="This potion smells like burnt sugar."
-        effect="Attack speed increase (temporary)"
+        effect="Attack speed increase (temporary)."
         type="usable"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="746"
         image="use/potions/e.png|R:#a0a0ff;G:#20409f"
         name="Mopox Cure Potion"
         description="A gooey brew with a vile smell, supposedly able to cure Mopox."
-        effect=""
         type="usable"
-        mp="0"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="747"
-        image="use/food/bigcake.png|R:#9E6E3B,E39D52;G:#E29F57;W:#FFD5A8"
+        image="use/food/bigcake.png|R:#9e6e3b,e39d52;G:#e29f57;W:#ffd5a8"
         name="Laced Chocolate Cake"
-        description="A scrumptious chocolate cake, with a dash of Mopox cure potion."
-        hp="11"
-        effect="+11 HP"
+        description="A scrumptious chocolate cake, with a dash of Mopox Cure Potion."
         type="usable"
+        hp="11"
         weight="10"/>
     <item id="748"
         image="use/food/orangecupcake.png"
         name="Laced Orange Cupcake"
         description="A very soft orange cupcake, laced with Mopox cure potion."
-        effect="+100 HP"
         type="usable"
         hp="100"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="749"
         image="equipment/charms/towel.png"
         name="Towel"
         description="You can dry yourself off with it if it still seems to be clean enough. - Douglas Adams"
+        effect="M. Attack +5"
         type="equip-charm"
         weight="50"/>
     <item id="750"
         image="use/potions/c.png|G:#f0f040,ffffff"
         name="Slow Poison Potion"
         description="A yellow potion with a fresh, citric scent."
-        effect="Suspends poison"
+        effect="Suspends poison."
         type="usable"
         hp="5"
         weight="10"/>
@@ -2466,22 +2092,20 @@
         image="equipment/head/pinkiehat.png"
         name="Pinkie Hat"
         description="With this, you'll fit right in with those strange pinkies."
-        effect="+1% Defense"
+        effect="M. Attack +1"
         type="equip-head"
-        weight="5"
         defense="1"
-        max-per-slot="1">
+        weight="5">
         <sprite>equipment/head/pinkiehat.xml</sprite>
     </item>
     <item id="752"
         image="equipment/head/fluffyhat.png"
         name="Fluffy Hat"
         description="Now you can wear fur on your head."
-        effect="+2% Defense"
+        effect="M. Attack -5"
         type="equip-head"
-        weight="10"
         defense="2"
-        max-per-slot="1">
+        weight="10">
         <sprite>equipment/head/fluffyhat.xml</sprite>
     </item>
     <item id="753"
@@ -2500,11 +2124,11 @@
         image="equipment/chest/assassintop.png"
         name="Assassin Shirt"
         description="Shirt for a master assassin."
-        effect="+10% Defense, +10 Agility"
+        effect="M. Attack -5"
         type="equip-torso"
-        weight="15"
         defense="10"
-        max-per-slot="1">
+        agi="10"
+        weight="15">
         <sprite gender="male">equipment/chest/assassin-male.xml</sprite>
         <sprite gender="female">equipment/chest/assassin-female.xml</sprite>
     </item>
@@ -2512,11 +2136,11 @@
         image="equipment/hands/assassingloves.png"
         name="Assassin Gloves"
         description="Gloves for a master assassin."
-        effect="+5% Defense, +5 Agility"
+        effect="M. Attack -3"
         type="equip-arms"
-        weight="9"
         defense="5"
-        max-per-slot="1">
+        agi="5"
+        weight="9">
         <sprite gender="male">equipment/hands/assassin-male.xml</sprite>
         <sprite gender="female">equipment/hands/assassin-female.xml</sprite>
     </item>
@@ -2524,11 +2148,11 @@
         image="equipment/feet/assassinboots.png"
         name="Assassin Boots"
         description="Boots for a master assassin."
-        effect="+5% Defense, +5 Agility"
+        effect="M. Attack -3"
         type="equip-feet"
-        weight="10"
         defense="5"
-        max-per-slot="1">
+        agi="5"
+        weight="10">
         <sprite gender="male">equipment/feet/assassin-boots-male.xml</sprite>
         <sprite gender="female">equipment/feet/assassin-boots-female.xml</sprite>
     </item>
@@ -2536,94 +2160,75 @@
         image="equipment/weapon/staff-woodstaff.png"
         name="Wooden Staff"
         description="A basic wooden staff."
-        effect="+50 Damage, 1 Range"
+        effect="Damage +50 / M. Attack +5"
         type="equip-2hand"
-        weapon_type="11"
         weapon-type="polearm"
-        attack-action="attack"
-        weight="1000"
-        attack-min="0"
-        attack-delta="75"
-        attack-range="32"
-        max-per-slot="1">
+        weight="1000">
         <sprite>weapon-staff.xml</sprite>
     </item>
     <item id="759"
         image="equipment/head/paladin-helm.png"
         name="Paladin's Helmet"
         description="Worn only by paladins."
-        effect="+19% Defense"
         type="equip-head"
         defense="19"
-        weight="43"
-	max-per-slot="1">
+        weight="43">
         <sprite>equipment/head/paladinhelm.xml</sprite>
     </item>
     <item id="760"
         image="equipment/head/overlord-helm.png"
         name="Overlord's Helmet"
         description="Worn by the greatest warriors."
-        effect="+20% Defense"
         type="equip-head"
         defense="20"
-        weight="45"
-	max-per-slot="1">
+        weight="45">
         <sprite>equipment/head/overlordhelm.xml</sprite>
     </item>
     <item id="761"
         image="equipment/head/desert-helmet.png"
         name="Desert Helmet"
         description="The perfect desert warriors' helmet."
-        effect="+21% Defense"
         type="equip-head"
         weight="48"
-        defense="21"
-        max-per-slot="1">
+        defense="21">
         <sprite>equipment/head/desert-helmet.xml</sprite>
     </item>
     <item id="762"
         image="equipment/ammo/arrow.png|W:#8B4513"
         name="Terranite Arrow"
         description="A terranite arrow."
-        effect="+50 Damage +10 Critical"
+        effect="Damage +50 / Critical Damage +10"
         type="equip-ammo"
-        weight="1"
-        max-per-slot="100"/>
+        weight="1"/>
     <item id="763"
         image="generic/terraniteore.png"
         name="Terranite Ore"
         description="Some ore collected out of terranite."
-        effect=""
         type="generic"
-        weight="40"
-        max-per-slot="10"/>
+        weight="40"/>
     <item id="764"
         image="equipment/head/sailor_hat.png"
         name="Sailor Hat"
         description="A hat worn by brave sailors."
-        effect="+5% Defense"
         type="equip-head"
-        weight="5"
         defense="5"
-        max-per-slot="1">
+        weight="5">
         <sprite>equipment/head/sailor-hat.xml</sprite>
     </item>
     <item id="765"
         image="equipment/head/captain_hat.png"
         name="Captain's Hat"
         description="A hat worn by the bravest captains."
-        effect="+15% Defense"
         type="equip-head"
-        weight="8"
         defense="15"
-        max-per-slot="1">
+        weight="8">
         <sprite>equipment/head/captain-hat.xml</sprite>
     </item>
     <item id="766"
         image="equipment/head/terranitehelm.png"
         name="Terranite Helmet"
         description="A magical helmet made out of semi-polished granite that was enchanted to be very light. Great for mages on the battlefield."
-        effect=""
+        effect="M. Attack -12 / M. Defense +5"
         type="equip-head"
         defense="15"
         weight="300">
@@ -2633,11 +2238,11 @@
         image="equipment/chest/terranite.png"
         name="Terranite Chest Armor"
         description="A nice piece of armor made out of terranite ore."
-        effect="+1 Dexterity"
+        effect="M. Attack -70 / M. Defense +10"
         type="equip-torso"
-        weight="800"
         defense="20"
-        max-per-slot="1">
+        dex="1"
+        weight="800">
         <sprite gender="male">equipment/chest/terranite-male.xml</sprite>
         <sprite gender="female">equipment/chest/terranite-female.xml</sprite>
     </item>
@@ -2645,11 +2250,11 @@
         image="equipment/legs/terranitepants.png"
         name="Terranite Legs"
         description="Leggings made out of terranite."
-        effect="+1 Agility"
+        effect="M. Attack -8 / M. Defense +5"
         type="equip-legs"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        agi="1"
+        weight="30">
         <sprite gender="male">equipment/legs/terranite-male.xml</sprite>
         <sprite gender="female">equipment/legs/terranite-female.xml</sprite>
     </item>
@@ -2657,222 +2262,183 @@
         image="equipment/head/guyfawkes.png"
         name="Guy Fawkes Mask"
         description="The famous Guy Fawkes mask."
-        effect="+3% Defense"
         type="equip-head"
         weight="30"
-        defense="3"
-        max-per-slot="1">
+        defense="3">
         <sprite>equipment/head/guyfawkes.xml</sprite>
     </item>
     <item id="770"
         image="equipment/head/fairy_hat.png"
         name="Fairy Hat"
         description="The famous hat worn by Robin Hood."
-        effect="+5% Defense"
+        effect="M. Attack -10"
         type="equip-head"
-        weight="20"
         defense="5"
-        max-per-slot="1">
+        luck="3"
+        weight="20">
         <sprite>equipment/head/fairy_hat.xml</sprite>
     </item>
     <item id="771"
         image="equipment/legs/miniskirt.png|W:#a4b2b2,ffffff"
         name="Miniskirt"
         description="A short skirt for hot summer days."
-        effect="+4% Defense"
+        effect="M. Attack -8"
         defense="4"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#a4b2b2,ffffff</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="772"
-        image="generic/spice.png|R:#FFFF00"
+        image="generic/spice.png|R:#ffff00"
         name="Wisp Powder"
         description="Powder from a wisp."
-        effect=""
         type="generic"
-        weight="3"
-        max-per-slot="30"/>
+        weight="3"/>
     <item id="773"
-        image="generic/spice.png|R:#FF00FF"
+        image="generic/spice.png|R:#ff00ff"
         name="Spectre Powder"
         description="Powder from a spectre."
-        effect=""
         type="generic"
-        weight="3"
-        max-per-slot="30"/>
+        weight="3"/>
     <item id="774"
-        image="generic/spice.png|R:#00FFFF"
+        image="generic/spice.png|R:#00ffff"
         name="Poltergeist Powder"
         description="Powder from a poltergeist."
-        effect=""
         type="generic"
-        weight="3"
-        max-per-slot="30"/>
+        weight="3"/>
     <item id="775"
         image="generic/bone.png"
         name="Bone"
         description="A bone."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="5"/>
+        weight="10"/>
     <item id="776"
         image="generic/skull.png"
         name="Skull"
         description="A skull."
-        effect=""
         type="generic"
-        weight="30"
-        max-per-slot="2"/>
+        weight="30"/>
     <item id="777"
         image="generic/rags-rotten.png"
         name="Rotten Rags"
         description="Rotten rags from an undead creature."
-        effect=""
         type="generic"
-        weight="15"
-        max-per-slot="40"/>
+        weight="15"/>
     <item id="778"
         image="generic/heart-diseased.png"
         name="Diseased Heart"
         description="A diseased heart. Likely from a zombie."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="15"/>
+        weight="10"/>
     <item id="779"
         image="generic/ear-zombie.png"
         name="Undead Ear"
         description="An ear from a zombie."
-        effect=""
         type="generic"
-        weight="5"
-        max-per-slot="25"/>
+        weight="5"/>
     <item id="780"
         image="generic/eyeball.png"
         name="Undead Eye"
         description="An eye from a zombie."
-        effect=""
         type="generic"
-        weight="3"
-        max-per-slot="20"/>
+        weight="3"/>
     <item id="781"
         image="equipment/head/witch-doctor-mask.png"
         name="Witch Doctor's Mask"
         description="A crazy mask from the Voodoo doctor."
-        effect="+3% Defense"
-        defense="3"
         type="equip-head"
-        weight="20"
-        max-per-slot="1">
+        defense="3"
+        weight="20">
         <sprite>equipment/head/witch-doctor-mask.xml</sprite>
     </item>
     <item id="782"
         image="equipment/chest/forest-armor.png"
         name="Forest Armor"
         description="A clean and comfortable mantle with dags made for the finest stalkers."
-        effect="+10% Defense"
+        effect="M. Attack -20"
         type="equip-torso"
-        weight="30"
         defense="10"
-        max-per-slot="1">
+        dex="3"
+        weight="30">
         <sprite gender="male">equipment/chest/forest-armor-male.xml</sprite>
         <sprite gender="female">equipment/chest/forest-armor-female.xml</sprite>
     </item>
     <item id="783"
-        image="equipment/chest/valentine-dress.png|R:#BF0E08"
+        image="equipment/chest/valentine-dress.png|R:#bf0e08"
         name="Platyna Red Dress"
         description="A silken dress with soft lace trim. If you damage it, you'll never get it to look good again. In special Platyna red."
-        effect="Defense: +15"
+        effect="M. Attack +3"
         type="equip-torso"
-        weight="35"
         defense="15"
-        max-per-slot="1">
-        <sprite gender="female">equipment/chest/valentine-dress.xml|#BF0E08</sprite>
+        weight="35">
+        <sprite gender="female">equipment/chest/valentine-dress.xml|#bf0e08</sprite>
     </item>
     <item id="784"
         image="use/food/zombie-nachos.png"
         name="Zombie Nachos"
         description="The flavor is in the brains."
-        effect="+60 HP"
         type="usable"
         hp="60"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="785"
         image="use/food/lady-fingers.png"
         name="Lady Fingers"
         description="Made with simulated lady fingers."
-        effect="+40 HP"
         type="usable"
         hp="40"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="786"
         image="use/food/jello.png"
         name="Slime Jell-Ahh"
         description="Finally, an edible form of slime!"
-        effect="+50 HP"
         type="usable"
         hp="50"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="787"
         image="use/food/snapple.png"
         name="Snapple"
         description="Bite it before it bites you!"
-        effect="+70 HP"
         type="usable"
         hp="70"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="788"
         image="use/food/juice.png"
         name="Beetle Juice"
         description="Thist quencing and nutritious!"
-        effect="+50 HP"
         type="usable"
         hp="50"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="789"
         image="use/food/skull-mug.png"
         name="Gut Buster Ale"
         description="If you can survive the first gulp, the rest goes down smooth."
-        effect="+60 HP"
         type="usable"
         hp="60"
-        weight="5"
-        max-per-slot="10"/>
-	<item id="790"
+        weight="5"/>
+    <item id="790"
         image="use/food/wine.png"
         name="Blood Wine"
         description="A good vintage."
-        effect="+100 HP"
         type="usable"
         hp="100"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="791"
         image="equipment/chest/tanktop.png|W:#412300,c9866b,8d4900;#ffff00"
         name="Yeti Skin Shirt"
         description="A shirt made of hardened yeti skin."
-        effect=""
+        effect="M. Attack -12"
         type="equip-torso"
         weight="20"
-        defense="12"
-        max-per-slot="1">
+        defense="12">
         <sprite gender="male">equipment/chest/leather-male.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
         <sprite gender="female">equipment/chest/leather-female.xml|#412300,c9866b,8d4900;#ffff00</sprite>
     </item>
     <item id="792"
         image="equipment/feet/brassboots.png"
         name="Brass Plate Boots"
-        description="A pair of brass plate boots"
-        effect=""
+        description="A pair of brass plate boots."
+        effect="M. Attack -2"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -2882,47 +2448,43 @@
         <item id="793"
         image="equipment/chest/brassplate.png"
         name="Brass Plate Chest"
-        description="brass plate chest armor"
-        effect=""
+        description="A brass plate chest armor."
+        effect="M. Attack -170"
         type="equip-torso"
         weight="2000"
-        defense="25"
-        max-per-slot="1">
-        <sprite gender="male">equipment/chest/brassplate-male.xml|#FBF5E9</sprite>
-        <sprite gender="female">equipment/chest/brassplate-female.xml|#FBF5E9</sprite>
+        defense="25">
+        <sprite gender="male">equipment/chest/brassplate-male.xml|#fbf5e9</sprite>
+        <sprite gender="female">equipment/chest/brassplate-female.xml|#fbf5e9</sprite>
     </item>
     <item id="794"
         image="equipment/hands/brassgloves.png"
         name="Brass Plate Gloves"
-        description="A pair of brass plate gloves"
-        effect=""
+        description="A pair of brass gloves."
+        effect="M. Attack -20"
         type="equip-arms"
         weight="40"
-        defense="4"
-        max-per-slot="1">
+        defense="4">
         <sprite gender="male">equipment/hands/brassgloves-male.xml</sprite>
         <sprite gender="female">equipment/hands/brassgloves-female.xml</sprite>
     </item>
     <item id="795"
         image="equipment/head/brasshelmet.png"
         name="Brass Plate Helmet"
-        description="brass plate helmet"
-        effect=""
+        description="A hard brass plate helmet."
+        effect="M. Attack -30"
         type="equip-head"
         defense="15"
-        weight="400"
-        max-per-slot="1">
+        weight="400">
         <sprite>equipment/head/brasshelmet.xml</sprite>
     </item>
     <item id="796"
         image="equipment/legs/brasspants.png"
         name="Brass Plate Legs"
-        description="brass plate leg armor"
-        effect=""
+        description="A brass plate leg armor."
+        effect="M. Attack -12"
         type="equip-legs"
         weight="150"
-        defense=""
-        max-per-slot="1">
+        defense="">
         <sprite gender="male">equipment/legs/brasspants-male.xml</sprite>
         <sprite gender="female">equipment/legs/brasspants-female.xml</sprite>
     </item>
@@ -2930,17 +2492,18 @@
         image="equipment/shield/brass.png"
         name="Brass Shield"
         description="A shield made of brass."
-        effect="+20% Defense"
+        effect="M. Attack -200"
         type="equip-shield"
-        weight="2500"
-        max-per-slot="1"/>
+        defense="20"
+        weight="2500"/>
     <item id="798"
         image="equipment/chest/sorcerer-robe.png"
         name="Sorcerer Robe (Red)"
         description="A red lined sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="5">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#ffffff</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#ffffff</sprite>
@@ -2949,90 +2512,80 @@
         image="generic/mylarin-dust.png"
         name="Mylarin Dust"
         description="a bottle of mylarin particles."
-        effect=""
         type="generic"
         weight="3"/>
     <item id="800"
         image="equipment/head/bowler-hat-brown.png"
         name="Bowler Hat (Brown)"
         description="A hat for those with a bit of class."
-        effect=""
+        effect="M. Attack +2"
         type="equip-head"
         weight="30"
-        defense="10"
-        max-per-slot="1">
+        defense="10">
         <sprite>equipment/head/bowler-hat-brown.xml</sprite>
     </item>
     <item id="801"
         image="equipment/head/pinkie-helmet.png"
         name="Pinkie Helmet"
         description="A helmet of Pinkie warriors."
-        effect="+1 Luck"
+        effect="M. Attack -20"
         type="equip-head"
-        weight="800"
         defense="10"
-        max-per-slot="1">
+        luck="1"
+        weight="800">
         <sprite>equipment/head/pinkie-helmet.xml</sprite>
     </item>
-
     <item id="802"
         image="generic/easterbasket.png"
         name="Easter Basket"
         description="A nice basket to put easter presents in."
-        effect=""
         type="generic"
         weight="10"/>
     <item id="803"
         image="generic/grassliner.png"
         name="Grass Liner"
         description="Very good for putting something breakable on it."
-        effect=""
         type="generic"
         weight="5"/>
     <item id="804"
         image="generic/jellybeans.png"
         name="Jelly Beans"
         description="Colorful and tasty Jelly Beans."
-        effect=""
         type="generic"
         weight="2"/>
     <item id="805"
         image="generic/chocolatemouboo.png"
         name="Chocolate Mouboo"
         description="A mouboo made out of chocolate. It's hard not to bite it."
-        effect=""
         type="generic"
         weight="3"/>
     <item id="806"
         image="generic/reedbundle.png"
         name="Reed Bundle"
         description="A bundle of reed."
-        effect=""
         type="generic"
         weight="7"/>
     <item id="807"
         image="generic/grassseeds.png"
         name="Grass Seeds"
         description="Some grass seeds."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="808"
         image="use/others/warp-towel.png"
         name="Hitchhiker's Towel"
         description="An inconspicuous towel."
-        effect=""
         type="generic"
         weight="20"/>
     <item id="809"
-        image="use/others/warp-towel.png|W:#5E7480,F1FFFF,FFFFFF"
+        image="use/others/warp-towel.png|W:#5e7480,f1ffff,ffffff"
         name="White Hitchhiker's Towel"
         description="An inconspicuous white towel."
         effect="A strange way of travelling."
         type="generic"
         weight="30"/>
     <item id="810"
-        image="use/others/warp-towel.png|W:#580000,A40000,C02020,ff6060"
+        image="use/others/warp-towel.png|W:#580000,a40000,c02020,ff6060"
         name="Red Hitchhiker's Towel"
         description="An inconspicuous red towel."
         effect="A strange way of travelling."
@@ -3081,59 +2634,53 @@
         type="generic"
         weight="30"/>
     <item id="817"
-        image="use/others/warp-towel.png|W:#4EE2EC"
+        image="use/others/warp-towel.png|W:#4ee2ec"
         name="Teal Hitchhiker's Towel"
         description="An inconspicuous teal towel."
         effect="A strange way of travelling."
         type="generic"
         weight="30"/>
     <item id="818"
-        image="use/others/warp-towel.png|W:#41A317"
+        image="use/others/warp-towel.png|W:#41a317"
         name="Lime Hitchhiker's Towel"
         description="An inconspicuous lime towel."
         effect="A strange way of travelling."
         type="generic"
         weight="30"/>
     <item id="819"
-        image="generic/gempowder.png|W:#5E7480,F1FFFF,FFFFFF"
+        image="generic/gempowder.png|W:#5e7480,f1ffff,ffffff"
         name="Diamond Powder"
         description="A white powder made out of a diamond."
-        effect=""
         type="generic"
         weight="5"/>
     <item id="820"
-        image="generic/gempowder.png|W:#580000,A40000,C02020,ff6060"
+        image="generic/gempowder.png|W:#580000,a40000,c02020,ff6060"
         name="Ruby Powder"
         description="A red powder made out of a ruby."
-        effect=""
         type="generic"
         weight="5"/>
     <item id="821"
         image="generic/gempowder.png|W:#1f9c1f,89d689"
         name="Emerald Powder"
         description="A green powder made out of an emerald."
-        effect=""
         type="generic"
         weight="5"/>
     <item id="822"
         image="generic/gempowder.png|W:#4b4bbd,888af4"
         name="Sapphire Powder"
         description="A blue powder made out of a sapphire."
-        effect=""
         type="generic"
         weight="5"/>
     <item id="823"
         image="generic/gempowder.png|W:#ccb534,f1ea8e,ffffaa"
         name="Topaz Powder"
         description="A yellow powder made out of a topaz."
-        effect=""
         type="generic"
         weight="5"/>
     <item id="824"
         image="generic/gempowder.png|W:#530a7c,b362e1,ca87ef"
         name="Amethyst Powder"
         description="A purple powder made out of an amethyst."
-        effect=""
         type="generic"
         weight="5"/>
     <item id="825"
@@ -3142,8 +2689,7 @@
         description="A tiny mana potion made from brewed, powerful items."
         type="usable"
         mp="25"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="826"
         image="use/potions/d.png|G:#3636b0,ffffff"
         name="Small Mana Elixir"
@@ -3177,35 +2723,27 @@
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
     <item id="1198"
-        image="generic/spectral-orb.png|R:#FF6600,FF9933,FFFF33"
+        image="generic/spectral-orb.png|R:#ff6600,ff9933,ffff33"
         name="Jack O Soul"
         description="The soul of a Jack O."
-        effect=""
         type="generic"
         weight="1"/>
     <item id="1199"
         image="equipment/ammo/arrow.png"
         name="Arrow"
         description="A standard arrow."
-        effect="+20 Damage"
+        effect="Damage +20"
         type="equip-ammo"
-        weight="1"
-        max-per-slot="100"/>
+        weight="1"/>
     <item id="1200"
         image="equipment/weapon/bow-bow.png"
         name="Bow"
         description="A distance weapon."
-        effect="+15 Damage, 5 Range"
+        effect="Damage +15 / Range 5"
         type="equip-2hand"
-        weapon_type="10"
         weight="20"
-        attack-min="15"
-        attack-delta="0"
-        attack-range="160"
         missile-particle="graphics/particles/arrow.particle.xml"
-        weapon-type="bow"
-        attack-action="attack_bow"
-        max-per-slot="1">
+        weapon-type="bow">
         <sprite>weapon-bow.xml</sprite>
         <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
     </item>
@@ -3213,134 +2751,107 @@
         image="equipment/weapon/dagger-knive.png"
         name="Knife"
         description="A small knife; the perfect weapon for a beginner."
-        effect="+5 Damage, 1 Range"
+        effect="Damage +5"
         type="equip-1hand"
-        weapon_type="1"
         weight="120"
-        attack-min="0"
-        attack-delta="5"
-        attack-range="32"
-        max-per-slot="1"
-        weapon-type="knife"
-        attack-action="attack"
-        view="521"/>
+        weapon-type="knife"/>
     <item id="1202"
-        image="equipment/chest/cottonshirt.png|W:#A4B2B2,FFFFFF"
+        image="equipment/chest/cottonshirt.png|W:#a4b2b2,ffffff"
         name="Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        effect="M. Attack -2"
         type="equip-torso"
-        weight="13"
         defense="2"
-        max-per-slot="1">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#A4B2B2,FFFFFF</sprite>
+        weight="13">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="1203"
         image="equipment/head/rangerhat.png"
         name="Ranger Hat"
         description="A leather hat traditionally worn by rangers."
-        effect="+2% Defense"
+        effect="M. Attack -1"
         type="equip-head"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite>equipment/head/rangerhat.xml</sprite>
     </item>
     <item id="1204"
         image="equipment/head/antlerhat.png"
         name="Antler Hat"
         description="A hat with antlers sticking out of it."
-        effect="+4% Defense"
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
         defense="4"
-        max-per-slot="1">
+        weight="15">
         <sprite>equipment/head/antlerhat.xml</sprite>
     </item>
     <item id="1205"
         image="equipment/head/christmastree.png"
         name="Christmas Tree Hat"
         description="A hat shaped like a Christmas tree."
-        effect="+2% Defense"
         type="equip-head"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite>equipment/head/christmastree.xml</sprite>
     </item>
     <item id="1206"
         image="equipment/head/santabeardhat.png"
         name="Santa Beard Hat"
         description="Now you will look just like Santa Claus!"
-        effect="+5% Defense"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="20"
         defense="5"
-        max-per-slot="1">
+        weight="20">
         <sprite>equipment/head/santabeardhat.xml</sprite>
     </item>
     <item id="1207"
         image="generic/redstocking.png"
         name="Red Christmas Stocking"
         description="Eww, it's smelly!"
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="1208"
         image="generic/easteregg-red.png"
         name="Red Easter Egg"
         description="A red easter egg. Find all six different easter eggs to win a prize."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="1209"
         image="generic/easteregg-green.png"
         name="Green Easter Egg"
         description="A green easter egg. Find all six different easter eggs to win a prize."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="1210"
         image="generic/easteregg-blue.png"
         name="Blue Easter Egg"
         description="A blue easter egg. Find all six different easter eggs to win a prize."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="1211"
         image="generic/easteregg-yellow.png"
         name="Yellow Easter Egg"
         description="A yellow easter egg. Find all six different easter eggs to win a prize."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="1212"
         image="generic/easteregg-pink.png"
         name="Pink Easter Egg"
         description="A pink easter egg. Find all six different easter eggs to win a prize."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="1213"
         image="generic/easteregg-teal.png"
         name="Teal Easter Egg"
         description="A teal easter egg. Find all six different easter eggs to win a prize."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="1214"
         image="equipment/head/bunnyears.png"
         name="Bunny Ears"
         description="A headband with plush bunny ears."
-        effect="+10% Defense"
+        effect="M. Attack +1"
         type="equip-head"
         defense="10"
         weight="20">
@@ -3350,15 +2861,10 @@
         image="equipment/weapon/sword-sabre.png"
         name="Toy Sabre"
         description="A toy item, doesn't do much damage."
-        effect="+1 Damage, 1 Range"
+        effect="Damage +1"
         type="equip-1hand"
         weapon-type="sword"
-        attack-action="attack"
-        weight="1"
-        attack-min="0"
-        attack-delta="1"
-        attack-range="32"
-        max-per-slot="1">
+        weight="1">
         <sprite>weapon-dagger.xml</sprite>
         <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
         <sound event="hit">weapons/swords/sabre-hit1.ogg</sound>
@@ -3367,7 +2873,6 @@
         image="equipment/head/mouboohead.png"
         name="Mouboo Head"
         description="A tightly fitting mouboo head."
-        effect="+1% Defense"
         type="equip-head"
         defense="1"
         weight="80">
@@ -3377,9 +2882,10 @@
         image="equipment/head/catears.png|M:#774444;W:#777777"
         name="Cat Ears"
         description="A pair of plush cat ears. Meow!"
-        effect="+1% Defense, +3 Agility"
+        effect="M. Attack +1"
         type="equip-head"
         defense="1"
+        agi="3"
         weight="20">
         <sprite>equipment/head/catears.xml|#774444;#777777</sprite>
     </item>
@@ -3387,9 +2893,10 @@
         image="equipment/head/paperbag.png"
         name="Paper Bag"
         description="A paper bag with eye holes."
-        effect="+1% Defense, -1 Agility"
+        effect="M. Attack -1"
         type="equip-head"
         defense="1"
+        agi="-1"
         weight="10">
         <sprite>equipment/head/paperbag.xml</sprite>
     </item>
@@ -3397,7 +2904,6 @@
         image="equipment/head/moubootaurhead.png"
         name="Moubootaur Head"
         description="The Moubootaur's head."
-        effect="+1% Defense"
         type="equip-head"
         defense="1"
         weight="80">
@@ -3407,7 +2913,6 @@
         image="equipment/head/parsley-earplugs.png"
         name="Bunch of Parsley"
         description="A bunch of parsley, useful for salads and many other dishes. In a pinch, it doubles as earplugs."
-        effect="+1% Defense"
         type="equip-head"
         defense="1"
         weight="1">
@@ -3417,9 +2922,9 @@
         image="equipment/head/skullmask.png"
         name="Skull Mask"
         description="A mask made out of bones."
-        effect="+3% Defense"
+        effect="M. Attack +5"
         type="equip-head"
-        defense="2"
+        defense="3"
         weight="150">
         <sprite>equipment/head/skullmask.xml</sprite>
     </item>
@@ -3427,180 +2932,144 @@
         image="generic/claylump_small.png"
         name="Small Piece of Clay"
         description="A small piece of clay, used to make different shapes."
-        effect=""
         type="generic"
-        weight="5"
-        max-per-slot="10"/>
+        weight="5"/>
     <item id="1223"
         image="generic/claylump_big.png"
         name="Big Piece of White Clay"
         description="A big piece of white clay, used to make bigger shapes."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="5"/>
+        weight="10"/>
     <item id="1224"
         image="generic/scroll.png"
         name="Scroll of Paper"
         description="A scroll made of fine paper."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="1225"
         image="use/scrolls/firescroll.png"
         name="Fire Scroll"
         description="A scroll on which is written an ancient formula giving birth to fire."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="1226"
         image="generic/silverbell.png"
         name="Silver Bell"
         description="A tiny bell made of silver."
         type="generic"
-        weight="25"
-        max-per-slot="3"/>
+        weight="25"/>
     <item id="1227"
         image="equipment/charms/enchanter.png"
         name="Enchanter's Amulet"
         description="An amulet made for true enchanters."
-        effect="+5 Intelligence"
         type="equip-charm"
-        weight="1"
-        max-per-slot="1"
-        intelligence="5"/>
+        weight="1"/>
     <item id="1228"
         image="equipment/charms/silverfourleaf.png"
         name="Silver Four-Leaf Amulet"
         description="An amulet made for people bringing luck wherever they go."
-        effect="+5 Luck"
         type="equip-charm"
-        weight="1"
-        max-per-slot="1"
-        luck="5"/>
-
+        weight="1"/>
     <item id="1229"
         image="use/food/caramelapple.png"
         name="Caramel Apple"
         description="A caramel coated apple, complete with stick. Rots teeth, tastes good."
         type="usable"
-        effect="+1000 HP"
         hp="1000"
-        weight="5"
-        max-per-slot="200"/>
-
+        weight="5"/>
     <item id="1230"
         image="use/food/lollipop.png|W:#2502d6"
         name="Booberry Blue Lollipop"
         description="A lollipop. Mmm."
         type="usable"
-        effect="+800 HP"
         hp="800"
-        weight="1"
-        max-per-slot="200"/>
-
+        weight="1"/>
     <item id="1231"
         image="use/food/lollipop.png|W:#00ba16"
         name="Ghastly Green Lollipop"
         description="A lollipop. Tasty."
         type="usable"
-        effect="+800 HP"
         hp="800"
-        weight="1"
-        max-per-slot="200"/>
-
+        weight="1"/>
     <item id="1232"
         image="use/food/lollipop.png|W:#e00418"
         name="Blood Red Lollipop"
         description="A lollipop. Yum."
         type="usable"
-        effect="+800 HP"
         hp="800"
-        weight="1"
-        max-per-slot="200"/>
-
+        weight="1"/>
     <item id="1233"
         image="generic/fakefangs.png"
         name="Cheap Plastic Fangs"
         description="A costumed Dracula's must. Doesn't really suck blood."
         type="generic"
-        weight="1"
-        max-per-slot="100"/>
-
+        weight="1"/>
     <item id="1234"
-        image="generic/christmasbulb.png|W:#F00000"
+        image="generic/christmasbulb.png|W:#f00000"
         name="Red Christmas Ornament"
         description="An ornament from Santa's tree."
         type="generic"
         weight="1"/>
-
     <item id="1235"
-        image="generic/christmasbulb.png|W:#F0E000"
+        image="generic/christmasbulb.png|W:#f0e000"
         name="Yellow Christmas Ornament"
         description="An ornament from Santa's tree."
         type="generic"
         weight="1"/>
-
     <item id="1236"
-        image="generic/christmasbulb.png|W:#00F000"
+        image="generic/christmasbulb.png|W:#00f000"
         name="Green Christmas Ornament"
         description="An ornament from Santa's tree."
         type="generic"
         weight="1"/>
-
     <item id="1237"
-        image="generic/christmasbulb.png|W:#00F0EE"
+        image="generic/christmasbulb.png|W:#00f0ee"
         name="Aqua Christmas Ornament"
         description="An ornament from Santa's tree."
         type="generic"
         weight="1"/>
-
     <item id="1238"
-        image="generic/christmasbulb.png|W:#0000D0"
+        image="generic/christmasbulb.png|W:#0000d0"
         name="Blue Christmas Ornament"
         description="An ornament from Santa's tree."
         type="generic"
         weight="1"/>
-
     <item id="1239"
-        image="generic/christmasbulb.png|W:#D000EF"
+        image="generic/christmasbulb.png|W:#d000ef"
         name="Purple Christmas Ornament"
         description="An ornament from Santa's tree."
         type="generic"
         weight="1"/>
-
     <item id="1240"
         image="generic/santaglobe.png"
         name="Santa Snow Globe"
         description="An snow globe featuring Santa."
         type="generic"
         weight="1"/>
-
     <item id="1241"
         image="generic/snowmanglobe.png"
         name="Snowman Snow Globe"
         description="An snow globe featuring a snowman."
         type="generic"
         weight="1"/>
-
    <item id="1242"
         image="equipment/head/snowgoggles.png"
         name="Snow Goggles"
         description="Snow Goggles to keep your eyeballs from freezing."
-        effect="+5% Defense"
+        effect="M. Attack -2"
         type="equip-head"
         defense="5"
         weight="10">
         <sprite>equipment/head/snowgoggles.xml</sprite>
     </item>
+
     <!-- RESERVED -->
+
     <item id="1244"
         image="generic/iten.png"
         name="Dark Talisman"
         description="A small cube. It radiates unimaginable power, and is quite dizzying to look at."
-        effect="Unimaginable powers to a successful wielder."
+        effect="Unimaginable powers to a successful wielder. M. Attack +100"
         type="equip-torso"
         >
         <sprite>equipment/override/skeleton.xml</sprite>
@@ -3615,7 +3084,7 @@
         weight="3"/>
     <item id="1246"
         image="generic/dark-easter-egg.png"
-        name="Dark easter egg"
+        name="Dark Easter Egg"
         description="A smooth chocolate easter egg."
         effect="This item has no use."
         type="generic"
@@ -3624,9 +3093,9 @@
         image="equipment/head/heart-glasses.png"
         name="Heart Glasses"
         description="Heart Glasses from another universe. Decisions were different there."
-        effect="+4% Defense"
+        effect="M. Attack +5"
         type="equip-head"
-        defense="8"
+        defense="4"
         weight="20">
         <sprite>equipment/head/heart-glasses.xml</sprite>
     </item>
@@ -3639,7 +3108,7 @@
         weight="6"/>
     <item id="1249"
         image="generic/strange-coin.png"
-        name="Strange coin"
+        name="Strange Coin"
         description="A strange coin. The markings on it are unlike anything you have ever seen before."
         effect="This item has no use."
         type="generic"
@@ -3653,7 +3122,7 @@
         weight="7"/>
     <item id="1251"
         image="use/food/yellow-plum.png"
-        name="Yellow plum"
+        name="Yellow Plum"
         description="A yellow variety of plum that is both sweet and sour."
         type="usable"
         hp="100"
@@ -3666,10 +3135,9 @@
         hp="50"
         weight="5"/>
     <item id="1253"
-        image="use/food/apple.png|R:#B3AB77;Y:#FFC030;G:#66CC33"
-        name="Golden delicious apple"
+        image="use/food/apple.png|R:#b3ab77;Y:#ffc030;G:#66cc33"
+        name="Golden Delicious Apple"
         description="A golden apple. Taken from a tree of many fruits from a distant world."
-        effect="+200 HP"
         type="usable"
         hp="200"
         weight="30"/>
@@ -3679,31 +3147,30 @@
         description="A single, dark, petal, oddly heavy. The edges of the petal are unusually hard, and have a slightly reflective shine to them. But looking into the gleam, you can only see fire..."
         effect="A ticket between worlds. If you should find yourself transported by one, be sure not to lose it, lest you become trapped indefinitely. This item cannot be used directly."
         type="generic"
-        weight="250"
-    />
+        weight="250"/>
     <item id="1255"
-        image="equipment/head/rabbit-ears.png|W:#FFFFFF"
-        name="White rabbit ears"
+        image="equipment/head/rabbit-ears.png|W:#ffffff"
+        name="White Rabbit Ears"
         description="A headband with rabbit ears, pure white."
-        effect="+5% Defense"
+        effect="M. Attack +4"
         defense="5"
         type="equip-head"
         weight="20">
-        <sprite>equipment/head/rabbit-ears.xml|#FFFFFF</sprite>
+        <sprite>equipment/head/rabbit-ears.xml|#ffffff</sprite>
     </item>
     <item id="1256"
         image="equipment/head/eggshell-hat.png"
-        name="Eggshell hat"
+        name="Eggshell Hat"
         description="A novelty hat shaped like an eggshell half."
-        effect="+12% Defence, -1 Agility"
-        defense="12"
         type="equip-head"
+        defense="12"
+        agi="-1"
         weight="15">
         <sprite>equipment/head/eggshell.xml</sprite>
     </item>
     <item id="1257"
         image="generic/flawed-lens.png"
-        name="Flawed lens"
+        name="Flawed Lens"
         description="A failed attempt at making a lens with powerful properties. Perhaps, one day, you will be able to salvage the remains from this effort."
         effect="This item has no use."
         type="generic"
@@ -3712,12 +3179,9 @@
         image="use/food/honey.png"
         name="Honey"
         description="A sweet food made by certain insects using nectar from flowers."
-        effect="+100 HP"
         type="usable"
+        hp="100"
         weight="20"/>
-
-    <!-- Halloween 2010 -->
-
     <item id="1276"
         image="equipment/head/opera-mask.png"
         name="Opera Mask"
@@ -3758,6 +3222,7 @@
         image="generic/scissors.png"
         name="Scissors"
         description="A pair of awkward and unwieldy scissors."
+        effect="A dangerous barber."
         type="usable"
         weight="120"/>
      <item id="1281"
@@ -3770,11 +3235,10 @@
         image="equipment/ammo/bonedarts.png"
         name="Bone Arrows"
         description="Arrows made from bone. Not much different from the normal variety, but are much lighter."
-        effect="+55 Damage"
+        effect="Damage +55"
         type="equip-ammo"
         weight="0"/>
 
-
     <!-- The 2XXY IDs are used for recolored items on eAthena.
         XX = item
         Y = color variant
@@ -3784,22 +3248,25 @@
         (as long as they are functionally identical while the color is sent as
         an additional item property.
     -->
+
     <item id="2050"
-        image="equipment/chest/cottonshirt.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/chest/cottonshirt.png|W:#580000,a40000,c02020,ff6060"
         name="Red Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A red shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/chest/cotton-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2051"
         image="equipment/chest/cottonshirt.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A green shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#115511,22aa22,99dd99</sprite>
@@ -3807,9 +3274,10 @@
     <item id="2052"
         image="equipment/chest/cottonshirt.png|W:#222255,6666ff"
         name="Dark Blue Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A dark blue shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#222255,6666ff</sprite>
@@ -3817,9 +3285,10 @@
     <item id="2053"
         image="equipment/chest/cottonshirt.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A yellow shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#846211,dab333,fffb93,ffffff</sprite>
@@ -3827,9 +3296,10 @@
     <item id="2054"
         image="equipment/chest/cottonshirt.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A light blue shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#16486e,498ec5,e4f2fc</sprite>
@@ -3837,9 +3307,10 @@
     <item id="2055"
         image="equipment/chest/cottonshirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A pink shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
@@ -3847,9 +3318,10 @@
     <item id="2056"
         image="equipment/chest/cottonshirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A black shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -3857,9 +3329,10 @@
     <item id="2057"
         image="equipment/chest/cottonshirt.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="An orange shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -3867,9 +3340,10 @@
     <item id="2058"
         image="equipment/chest/cottonshirt.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A purple shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -3877,30 +3351,33 @@
     <item id="2059"
         image="equipment/chest/cottonshirt.png|W:#104010,208020,30c030"
         name="Dark Green Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="+2% Defense"
+        description="A dark green shirt made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="20">
         <sprite gender="male">equipment/chest/cotton-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2060"
-        image="equipment/chest/vnecksweater.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/chest/vnecksweater.png|W:#580000,a40000,c02020,ff6060"
         name="Red V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm red sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2061"
         image="equipment/chest/vnecksweater.png|W:#115511,22aa22,99dd99"
         name="Green V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm green sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#115511,22aa22,99dd99</sprite>
@@ -3908,9 +3385,10 @@
     <item id="2062"
         image="equipment/chest/vnecksweater.png|W:#222255,6666ff"
         name="Dark Blue V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm dark blue sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#222255,6666ff</sprite>
@@ -3918,9 +3396,10 @@
     <item id="2063"
         image="equipment/chest/vnecksweater.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm yellow sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#846211,dab333,fffb93,ffffff</sprite>
@@ -3928,9 +3407,10 @@
     <item id="2064"
         image="equipment/chest/vnecksweater.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm light blue sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#16486e,498ec5,e4f2fc</sprite>
@@ -3938,9 +3418,10 @@
     <item id="2065"
         image="equipment/chest/vnecksweater.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm pink sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
@@ -3948,8 +3429,8 @@
     <item id="2066"
         image="equipment/chest/vnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm black sweater."
+        effect="M. Attack -16"
         type="equip-torso"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -3958,9 +3439,10 @@
     <item id="2067"
         image="equipment/chest/vnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm orange sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -3968,9 +3450,10 @@
     <item id="2068"
         image="equipment/chest/vnecksweater.png|W:#4f0a76,8010c0,d699f7"
         name="Purple V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm purple sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -3978,30 +3461,33 @@
     <item id="2069"
         image="equipment/chest/vnecksweater.png|W:#104010,208020,30c030"
         name="Dark Green V-Neck Sweater"
-        description="A soft, warm sweater."
-        effect="+8% Defense"
+        description="A thin, soft and warm dark green sweater."
+        effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2070"
-        image="equipment/chest/tnecksweater.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/chest/tnecksweater.png|W:#580000,a40000,c02020,ff6060"
         name="Red Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm red sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2071"
         image="equipment/chest/tnecksweater.png|W:#115511,22aa22,99dd99"
         name="Green Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm green sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#115511,22aa22,99dd99</sprite>
@@ -4009,9 +3495,10 @@
     <item id="2072"
         image="equipment/chest/tnecksweater.png|W:#222255,6666ff"
         name="Dark Blue Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm dark blue sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#222255,6666ff</sprite>
@@ -4019,9 +3506,10 @@
     <item id="2073"
         image="equipment/chest/tnecksweater.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm yellow sweater."
         type="equip-torso"
+        effect="M. Attack -12"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#846211,dab333,fffb93,ffffff</sprite>
@@ -4029,9 +3517,10 @@
     <item id="2074"
         image="equipment/chest/tnecksweater.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm light blue sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#16486e,498ec5,e4f2fc</sprite>
@@ -4039,9 +3528,10 @@
     <item id="2075"
         image="equipment/chest/tnecksweater.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm pink sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
@@ -4049,9 +3539,10 @@
     <item id="2076"
         image="equipment/chest/tnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm black sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -4059,9 +3550,10 @@
     <item id="2077"
         image="equipment/chest/tnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm orange sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -4069,9 +3561,10 @@
     <item id="2078"
         image="equipment/chest/tnecksweater.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm purple sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -4079,151 +3572,134 @@
     <item id="2079"
         image="equipment/chest/tnecksweater.png|W:#104010,208020,30c030"
         name="Dark Green Turtleneck Sweater"
-        description="A soft, warm sweater."
-        effect="+6% Defense"
+        description="A thick, soft and warm dark green sweater."
+        effect="M. Attack -12"
         type="equip-torso"
+        defense="6"
         weight="35">
         <sprite gender="male">equipment/chest/tnecksweater-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/chest/tnecksweater-female.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2080"
-        image="equipment/chest/silk-robe.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/chest/silk-robe.png|W:#580000,a40000,c02020,ff6060"
         name="Red Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering red silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
-        <sprite gender="male">equipment/chest/robe-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2081"
         image="equipment/chest/silk-robe.png|W:#115511,22aa22,99dd99"
         name="Green Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering green silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2082"
         image="equipment/chest/silk-robe.png|W:#222255,6666ff"
         name="Dark Blue Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering dark blue silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#222255,6666ff</sprite>
     </item>
     <item id="2083"
         image="equipment/chest/silk-robe.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering yellow silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2084"
         image="equipment/chest/silk-robe.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering light blue silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2085"
         image="equipment/chest/silk-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering pink silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2086"
         image="equipment/chest/silk-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering black silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2087"
         image="equipment/chest/silk-robe.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering orange silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2088"
         image="equipment/chest/silk-robe.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering purple silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2089"
         image="equipment/chest/silk-robe.png|W:#104010,208020,30c030"
         name="Dark Green Silk Robe"
-        description="A light and shimmering silk robe."
-        effect="+5% Defense"
+        description="A light and shimmering dark green silk robe."
         type="equip-torso"
-        weight="30"
         defense="5"
-        max-per-slot="1">
+        weight="30">
         <sprite gender="male">equipment/chest/robe-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/chest/robe-female.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2090"
-        image="equipment/chest/tanktop.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/chest/tanktop.png|W:#580000,a40000,c02020,ff6060"
         name="Red Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A red sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2091"
         image="equipment/chest/tanktop.png|W:#115511,22aa22,99dd99"
         name="Green Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A green sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#115511,22aa22,99dd99</sprite>
@@ -4231,9 +3707,10 @@
     <item id="2092"
         image="equipment/chest/tanktop.png|W:#222255,6666ff"
         name="Dark Blue Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A dark blue sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#222255,6666ff</sprite>
@@ -4241,27 +3718,30 @@
     <item id="2093"
         image="equipment/chest/tanktop.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A yellow sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2094" image="equipment/chest/tanktop.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A light blue sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2095" image="equipment/chest/tanktop.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A pink sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
@@ -4269,9 +3749,10 @@
     <item id="2096"
         image="equipment/chest/tanktop.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A black sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -4279,18 +3760,20 @@
     <item id="2097"
         image="equipment/chest/tanktop.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="An orange sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2098" image="equipment/chest/tanktop.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A purple sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -4298,262 +3781,245 @@
     <item id="2099"
         image="equipment/chest/tanktop.png|W:#104010,208020,30c030"
         name="Dark Green Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="+2% Defense"
+        description="A dark green sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="12">
         <sprite gender="male">equipment/chest/tanktop-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2100"
-        image="equipment/legs/skirt.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/legs/skirt.png|W:#580000,a40000,c02020,ff6060"
         name="Red Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A red skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
-        <sprite>equipment/legs/skirt.xml|#580000,A40000,C02020,ff6060</sprite>
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2101"
         image="equipment/legs/skirt.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A green skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
       <sprite>equipment/legs/skirt.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2102"
         image="equipment/legs/skirt.png|W:#222255,6666ff"
         name="Dark Blue Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A dark blue skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
         <sprite>equipment/legs/skirt.xml|#222255,6666ff</sprite>
     </item>
     <item id="2103"
         image="equipment/legs/skirt.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A yellow skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
         <sprite>equipment/legs/skirt.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2104"
         image="equipment/legs/skirt.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A light blue skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
         <sprite>equipment/legs/skirt.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2105"
         image="equipment/legs/skirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A pink skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
         <sprite>equipment/legs/skirt.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2106"
         image="equipment/legs/skirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A black skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
         <sprite>equipment/legs/skirt.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2107"
         image="equipment/legs/skirt.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="An orange skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
         <sprite>equipment/legs/skirt.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2108"
         image="equipment/legs/skirt.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A purple skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
         <sprite>equipment/legs/skirt.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2109"
         image="equipment/legs/skirt.png|W:#104010,208020,30c030"
         name="Dark Green Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="+4% Defense"
-        defense="4"
+        description="A dark green skirt made of linen cloth."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="20"
-        max-per-slot="1">
+        defense="4"
+        weight="20">
         <sprite>equipment/legs/skirt.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2110"
-        image="equipment/legs/shorts.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/legs/shorts.png|W:#580000,a40000,c02020,ff6060"
         name="Red Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Red shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2111"
         image="equipment/legs/shorts.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Green shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2112"
         image="equipment/legs/shorts.png|W:#222255,6666ff"
         name="Dark Blue Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Dark blue shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#222255,6666ff</sprite>
     </item>
     <item id="2113"
         image="equipment/legs/shorts.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Yellow shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2114"
         image="equipment/legs/shorts.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Light blue shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2115"
         image="equipment/legs/shorts.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Pink shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2116"
         image="equipment/legs/shorts.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Black shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2117"
         image="equipment/legs/shorts.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Orange shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2118"
         image="equipment/legs/shorts.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Purple shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#520a7b,8c23c7,ca87ef</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#520a7b,8c23c7,ca87ef</sprite>
     </item>
     <item id="2119"
         image="equipment/legs/shorts.png|W:#104010,208020,30c030"
         name="Dark Green Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="+2% Defense"
+        description="Dark green shorts made of 100% cotton."
+        effect="M. Attack -4"
         type="equip-legs"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        weight="20">
         <sprite gender="male">equipment/legs/shorts-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2120"
-        image="equipment/chest/tanktop-short.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/chest/tanktop-short.png|W:#580000,a40000,c02020,ff6060"
         name="Red Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        description="A short, sleeveless red shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2121"
         image="equipment/chest/tanktop-short.png|W:#115511,22aa22,99dd99"
         name="Green Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        description="A short, sleeveless green shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#115511,22aa22,99dd99</sprite>
@@ -4561,9 +4027,10 @@
     <item id="2122"
         image="equipment/chest/tanktop-short.png|W:#222255,6666ff"
         name="Dark Blue Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        description="A short, sleeveless dark blue shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#222255,6666ff</sprite>
@@ -4571,9 +4038,10 @@
     <item id="2123"
         image="equipment/chest/tanktop-short.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        description="A short, sleeveless yellow shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
@@ -4581,9 +4049,10 @@
     <item id="2124"
         image="equipment/chest/tanktop-short.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        description="A short, sleeveless light blue shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#16486e,498ec5,e4f2fc</sprite>
@@ -4591,9 +4060,10 @@
     <item id="2125"
         image="equipment/chest/tanktop-short.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        description="A short, sleeveless pink shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
@@ -4601,9 +4071,10 @@
     <item id="2126"
         image="equipment/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="+2% Defense"
+        description="A short, sleeveless black shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -4611,18 +4082,20 @@
     <item id="2127"
         image="equipment/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="+2% Defense"
+        description="A short, sleeveless orange shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2128" image="equipment/chest/tanktop-short.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        description="A short, sleeveless purple shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -4630,29 +4103,30 @@
     <item id="2129"
         image="equipment/chest/tanktop-short.png|W:#104010,208020,30c030"
         name="Dark Green Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="+2% Defense"
+        description="A short, sleeveless dark green shirt for VERY hot summer days."
+        effect="M. Attack -4"
         type="equip-torso"
+        defense="2"
         weight="8">
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2130"
-        image="equipment/head/deserthat.png|R:#580000,A40000,C02020,ff6060"
+        image="equipment/head/deserthat.png|R:#580000,a40000,c02020,ff6060"
         name="Red Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the red desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
-        <sprite>equipment/head/deserthat.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite>equipment/head/deserthat.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2131"
         image="equipment/head/deserthat.png|R:#115511,22aa22,99dd99"
         name="Green Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the green desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4661,8 +4135,8 @@
     <item id="2132"
         image="equipment/head/deserthat.png|R:#222255,6666ff"
         name="Dark Blue Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the dark blue desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4671,8 +4145,8 @@
     <item id="2133"
         image="equipment/head/deserthat.png|R:#846211,dab333,fffb93,ffffff"
         name="Yellow Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the yellow desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4681,8 +4155,8 @@
     <item id="2134"
         image="equipment/head/deserthat.png|R:#16486e,498ec5,e4f2fc"
         name="Light Blue Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the light blue desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4691,8 +4165,8 @@
     <item id="2135"
         image="equipment/head/deserthat.png|R:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the pink desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4701,8 +4175,8 @@
     <item id="2136"
         image="equipment/head/deserthat.png|R:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the black desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4711,8 +4185,8 @@
     <item id="2137"
         image="equipment/head/deserthat.png|R:#80280f,b04810,ef681f,ffb830"
         name="Orange Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the orange desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4721,8 +4195,8 @@
     <item id="2138"
         image="equipment/head/deserthat.png|R:#4f0a76,8010c0,d699f7"
         name="Purple Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the purple desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4731,8 +4205,8 @@
     <item id="2139"
         image="equipment/head/deserthat.png|R:#104010,208020,30c030"
         name="Dark Green Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="+3% Defense"
+        description="While the dark green desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
         type="equip-head"
         defense="3"
         weight="20">
@@ -4740,20 +4214,18 @@
     </item>
 
     <item id="2140"
-        image="equipment/head/standardheadband.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/head/standardheadband.png|W:#580000,a40000,c02020,ff6060"
         name="Red Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a red cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>equipment/head/standardheadband.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite>equipment/head/standardheadband.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2141"
         image="equipment/head/standardheadband.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a green cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4762,8 +4234,7 @@
     <item id="2142"
         image="equipment/head/standardheadband.png|W:#222255,6666ff"
         name="Dark Blue Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a dark blue cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4772,8 +4243,7 @@
     <item id="2143"
         image="equipment/head/standardheadband.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a yellow cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4782,8 +4252,7 @@
     <item id="2144"
         image="equipment/head/standardheadband.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a light blue cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4792,8 +4261,7 @@
     <item id="2145"
         image="equipment/head/standardheadband.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a pink cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4802,8 +4270,7 @@
     <item id="2146"
         image="equipment/head/standardheadband.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a black cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4812,8 +4279,7 @@
     <item id="2147"
         image="equipment/head/standardheadband.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just an orange cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4822,8 +4288,7 @@
     <item id="2148"
         image="equipment/head/standardheadband.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a purple cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4832,8 +4297,7 @@
     <item id="2149"
         image="equipment/head/standardheadband.png|W:#104010,208020,30c030"
         name="Dark Green Cotton Headband"
-        description="Just a cotton headband."
-        effect="+2% Defense"
+        description="Just a dark green cotton headband."
         type="equip-head"
         defense="2"
         weight="5">
@@ -4841,21 +4305,21 @@
     </item>
 
     <item id="2150"
-        image="equipment/feet/boots.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/feet/boots.png|W:#580000,a40000,c02020,ff6060"
         name="Red Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A red pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/feet/boots-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2151"
         image="equipment/feet/boots.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A green pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4865,8 +4329,8 @@
     <item id="2152"
         image="equipment/feet/boots.png|W:#222255,6666ff"
         name="Dark Blue Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A dark blue pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4876,8 +4340,8 @@
     <item id="2153"
         image="equipment/feet/boots.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A yellow pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4887,8 +4351,8 @@
     <item id="2154"
         image="equipment/feet/boots.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A light blue pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4898,8 +4362,8 @@
     <item id="2155"
         image="equipment/feet/boots.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A pink pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4909,8 +4373,8 @@
     <item id="2156"
         image="equipment/feet/boots.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A black pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4920,8 +4384,8 @@
     <item id="2157"
         image="equipment/feet/boots.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="An orange pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4931,8 +4395,8 @@
     <item id="2158"
         image="equipment/feet/boots.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A purple pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4942,8 +4406,8 @@
     <item id="2159"
         image="equipment/feet/boots.png|W:#104010,208020,30c030"
         name="Dark Green Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="+1% Defense"
+        description="A dark green pair of quality cotton boots."
+        effect="M. Attack +1"
         type="equip-feet"
         defense="1"
         weight="30">
@@ -4952,21 +4416,21 @@
     </item>
 
     <item id="2160"
-        image="equipment/hands/basicgloves.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/hands/basicgloves.png|W:#580000,a40000,c02020,ff6060"
         name="Red Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A red pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2161"
         image="equipment/hands/basicgloves.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A green pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -4976,8 +4440,8 @@
     <item id="2162"
         image="equipment/hands/basicgloves.png|W:#222255,6666ff"
         name="Dark Blue Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A dark blue pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -4987,8 +4451,8 @@
     <item id="2163"
         image="equipment/hands/basicgloves.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A yellow pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -4998,8 +4462,8 @@
     <item id="2164"
         image="equipment/hands/basicgloves.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A light blue pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -5009,8 +4473,8 @@
     <item id="2165"
         image="equipment/hands/basicgloves.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A pink pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -5020,8 +4484,8 @@
     <item id="2166"
         image="equipment/hands/basicgloves.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A black pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -5031,8 +4495,8 @@
     <item id="2167"
         image="equipment/hands/basicgloves.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="An orange pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -5042,8 +4506,8 @@
     <item id="2168"
         image="equipment/hands/basicgloves.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A purple pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -5053,8 +4517,8 @@
     <item id="2169"
         image="equipment/hands/basicgloves.png|W:#104010,208020,30c030"
         name="Dark Green Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="+1% Defense"
+        description="A dark green pair of comfy cotton gloves."
+        effect="M. Attack -10"
         type="equip-arms"
         defense="1"
         weight="20">
@@ -5065,120 +4529,110 @@
     <item id="2170"
         image="equipment/legs/miniskirt.png|W:#580000,a40000,c02020,ff6060"
         name="Red Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="A red short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#580000,a40000,c02020,ff6060</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2171"
         image="equipment/legs/miniskirt.png|W:#115511,22aa22,99dd99"
         name="Green Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="A green short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2172"
         image="equipment/legs/miniskirt.png|W:#222255,6666ff"
         name="Dark Blue Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="A dark blue short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#222255,6666ff</sprite>
     </item>
     <item id="2173"
         image="equipment/legs/miniskirt.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="A yellow short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2174"
         image="equipment/legs/miniskirt.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="A light blue short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2175"
         image="equipment/legs/miniskirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
        name="Pink Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="A pink short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2176"
         image="equipment/legs/miniskirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
+        description="A black short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
         defense="4"
-       type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2177"
         image="equipment/legs/miniskirt.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="An orange short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2178"
         image="equipment/legs/miniskirt.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="A purple short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2179"
         image="equipment/legs/miniskirt.png|W:#104010,208020,30c030"
         name="Dark Green Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="+4% Defense"
-        defense="4"
+        description="A dark green short skirt for hot summer days."
+        effect="M. Attack -8"
         type="equip-legs"
-        weight="8"
-        max-per-slot="1">
+        defense="4"
+        weight="8">
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#104010,208020,30c030</sprite>
     </item>
@@ -5187,112 +4641,102 @@
 
     <item id="2190"
         image="equipment/head/rabbit-ears.png|W:#580000,a40000,c02020,ff6060"
-        name="Red rabbit ears"
+        name="Red Rabbit Ears"
         description="A headband with rabbit ears, bright red."
-        effect="+5% Defense"
-        defense="5"
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2191"
         image="equipment/head/rabbit-ears.png|W:#115511,22aa22,99dd99"
-        name="Green rabbit ears"
-        description="A headband with rabbit ears, a warm green."
-        effect="+5% Defense"
-        defense="5"
+        name="Green Rabbit Ears"
+        description="A headband with rabbit ears, warm green."
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2192"
         image="equipment/head/rabbit-ears.png|W:#222255,6666ff"
-        name="Dark blue rabbit ears"
+        name="Dark Blue Rabbit Ears"
         description="A headband with rabbit ears, iridescent dark blue."
-        effect="+5% Defense"
-        defense="5"
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#222255,6666ff</sprite>
     </item>
     <item id="2193"
         image="equipment/head/rabbit-ears.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow rabbit ears"
-        description="A headband with rabbit ears, a soft yellow."
-        effect="+5% Defense"
-        defense="5"
+        name="Yellow Rabbit Ears"
+        description="A headband with rabbit ears, soft yellow."
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2194"
         image="equipment/head/rabbit-ears.png|W:#16486e,498ec5,e4f2fc"
-        name="Light blue rabbit ears"
-        description="A headband with rabbit ears, a light blue."
-        effect="+5% Defense"
-        defense="5"
+        name="Light Blue Rabbit Ears"
+        description="A headband with rabbit ears, light blue."
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2195"
         image="equipment/head/rabbit-ears.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink rabbit ears"
+        name="Pink Rabbit Ears"
         description="A headband with rabbit ears, bright pink."
-        effect="+5% Defense"
-        defense="5"
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2196"
         image="equipment/head/rabbit-ears.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black rabbit ears"
-        description="A headband with rabbit ears, a deep black."
-        effect="+5% Defense"
-        defense="5"
+        description="A headband with rabbit ears, deep black."
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2197"
         image="equipment/head/rabbit-ears.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange rabbit ears"
+        name="Orange Rabbit Ears"
         description="A headband with rabbit ears, bright orange."
-        effect="+5% Defense"
-        defense="5"
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2198"
         image="equipment/head/rabbit-ears.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple rabbit ears"
-        description="A headband with rabbit ears, a strong purple."
-        effect="+5% Defense"
-        defense="5"
+        name="Purple Rabbit Ears"
+        description="A headband with rabbit ears, strong purple."
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2199"
         image="equipment/head/rabbit-ears.png|W:#104010,208020,30c030"
-        name="Dark green rabbit ears"
+        name="Dark Green Rabbit Ears"
         description="A headband with rabbit ears, dark green."
-        effect="+5% Defense"
-        defense="5"
+        effect="M. Attack +4"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        weight="15">
         <sprite>equipment/head/rabbit-ears.xml|#104010,208020,30c030</sprite>
     </item>
 
@@ -5300,242 +4744,234 @@
         image="equipment/head/wizard-hat.png|W:#580000,a40000,c02020,ff6060"
         name="Red wizard hat"
         description="A wizard hat, bright red."
-        effect="+3 Intelligence"
-        defense="5"
+        effect="M. Attack +5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        defense="5"
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2201"
         image="equipment/head/wizard-hat.png|W:#115511,22aa22,99dd99"
-        name="Green wizard hat"
+        name="Green Wizard Hat"
         description="A wizard hat, warm green."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2202"
         image="equipment/head/wizard-hat.png|W:#222255,6666ff"
-        name="Dark blue wizard hat"
+        name="Dark Blue Wizard Hat"
         description="A wizard hat, iridescent dark blue."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#222255,6666ff</sprite>
     </item>
     <item id="2203"
         image="equipment/head/wizard-hat.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow wizard hat"
+        name="Yellow Wizard Hat"
         description="A wizard hat, soft yellow."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2204"
         image="equipment/head/wizard-hat.png|W:#16486e,498ec5,e4f2fc"
-        name="Light blue wizard hat"
+        name="Light Blue Wizard Hat"
         description="A wizard hat, light blue."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2205"
         image="equipment/head/wizard-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink wizard hat"
+        name="Pink Wizard Hat"
         description="A wizard hat, bright pink."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2206"
         image="equipment/head/wizard-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black wizard hat"
+        name="Black Wizard Hat"
         description="A wizard hat, deep black."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2207"
         image="equipment/head/wizard-hat.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange wizard hat"
+        name="Orange Wizard Hat"
         description="A wizard hat, bright orange."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2208"
         image="equipment/head/wizard-hat.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple wizard hat"
+        name="Purple Wizard Hat"
         description="A wizard hat, strong purple."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2209"
         image="equipment/head/wizard-hat.png|W:#104010,208020,30c030"
-        name="Dark green wizard hat"
+        name="Dark Green Wizard Hat"
         description="A wizard hat, dark green."
-        effect="+3 Intelligence"
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2210"
         image="equipment/head/bowler-hat.png|W:#580000,a40000,c02020,ff6060"
-        name="Red bowler hat"
+        name="Red Bowler Hat"
         description="A hat for those with a bit of class, with a red band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2211"
         image="equipment/head/bowler-hat.png|W:#115511,22aa22,99dd99"
-        name="Green bowler hat"
+        name="Green Bowler Hat"
         description="A hat for those with a bit of class, with a green band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2212"
         image="equipment/head/bowler-hat.png|W:#222255,6666ff"
-        name="Dark blue bowler hat"
+        name="Dark Blue Bowler Hat"
         description="A hat for those with a bit of class, with a dark blue band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#222255,6666ff</sprite>
     </item>
     <item id="2213"
         image="equipment/head/bowler-hat.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow bowler hat"
+        name="Yellow Bowler Hat"
         description="A hat for those with a bit of class, with a yellow band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2214"
         image="equipment/head/bowler-hat.png|W:#16486e,498ec5,e4f2fc"
-        name="Light blue bowler hat"
+        name="Light Blue Bowler Hat"
         description="A hat for those with a bit of class, with a light blue band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2215"
         image="equipment/head/bowler-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink bowler hat"
+        name="Pink Bowler Hat"
         description="A hat for those with a bit of class, with a pink band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2216"
         image="equipment/head/bowler-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black bowler hat"
+        name="Black Bowler Hat"
         description="A hat for those with a bit of class, with a black band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2217"
         image="equipment/head/bowler-hat.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange bowler hat"
+        name="Orange Bowler Hat"
         description="A hat for those with a bit of class, with an orange band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2218"
         image="equipment/head/bowler-hat.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple bowler hat"
+        name="Purple Bowler Hat"
         description="A hat for those with a bit of class, with a purple band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2219"
         image="equipment/head/bowler-hat.png|W:#104010,208020,30c030"
-        name="Dark green bowler hat"
+        name="Dark Green Bowler Hat"
         description="A hat for those with a bit of class, with a dark green band."
-        effect=""
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
-        max-per-slot="1">
+        defense="10"
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2220"
-        image="equipment/chest/sorcerer-robe.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/chest/sorcerer-robe.png|W:#580000,a40000,c02020,ff6060"
         name="Red Sorcerer Robe (Red)"
         description="A red lined red sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2221"
         image="equipment/chest/sorcerer-robe.png|W:#115511,22aa22,99dd99"
         name="Green Sorcerer Robe (Red)"
         description="A red lined green sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#115511,22aa22,99dd99</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99</sprite>
@@ -5544,9 +4980,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#222255,6666ff"
         name="Dark Blue Sorcerer Robe (Red)"
         description="A red lined dark blue sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#222255,6666ff</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#222255,6666ff</sprite>
@@ -5555,9 +4992,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Sorcerer Robe (Red)"
         description="A red lined yellow sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
@@ -5566,9 +5004,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Sorcerer Robe (Red)"
         description="A red lined light blue sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
@@ -5577,9 +5016,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Sorcerer Robe (Red)"
         description="A red lined pink sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
@@ -5588,9 +5028,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Sorcerer Robe (Red)"
         description="A red lined black sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -5599,9 +5040,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Sorcerer Robe (Red)"
         description="A red lined orange sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -5610,9 +5052,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Sorcerer Robe (Red)"
         description="A red lined purple sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -5621,9 +5064,10 @@
         image="equipment/chest/sorcerer-robe.png|W:#104010,208020,30c030"
         name="Dark Green Sorcerer Robe (Red)"
         description="A red lined dark green sorcerer robe."
-        effect="+1 Agility"
-        defense="5"
+        effect="M. Attack +20"
         type="equip-torso"
+        defense="5"
+        agi="1"
         weight="30">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#104010,208020,30c030</sprite>
@@ -5631,98 +5075,108 @@
 
     <item id="2230"
         image="equipment/head/bowler-hat-brown.png|W:#580000,a40000,c02020,ff6060"
-        name="Red bowler hat (brown)"
+        name="Red Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a red band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#580000,a40000,c02020,ff6060</sprite>
     </item>
     <item id="2231"
         image="equipment/head/bowler-hat-brown.png|W:#115511,22aa22,99dd99"
-        name="Green bowler hat (brown)"
+        name="Green Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a green band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2232"
         image="equipment/head/bowler-hat-brown.png|W:#222255,6666ff"
-        name="Dark blue bowler hat (brown)"
+        name="Dark Blue Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a dark blue band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#222255,6666ff</sprite>
     </item>
     <item id="2233"
         image="equipment/head/bowler-hat-brown.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow bowler hat (brown)"
+        name="Yellow Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a yellow band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2234"
         image="equipment/head/bowler-hat-brown.png|W:#16486e,498ec5,e4f2fc"
-        name="Light blue bowler hat (brown)"
+        name="Light Blue Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a light blue band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2235"
         image="equipment/head/bowler-hat-brown.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink bowler hat (brown)"
+        name="Pink Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a pink band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2236"
         image="equipment/head/bowler-hat-brown.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black bowler hat (brown)"
+        name="Black Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a black band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2237"
         image="equipment/head/bowler-hat-brown.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange bowler hat (brown)"
+        name="Orange Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with an orange band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2238"
         image="equipment/head/bowler-hat-brown.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple bowler hat (brown)"
+        name="Purple Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a purple band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2239"
         image="equipment/head/bowler-hat-brown.png|W:#104010,208020,30c030"
-        name="Dark green bowler hat (brown)"
+        name="Dark Green Bowler Hat (Brown)"
         description="A hat for those with a bit of class, with a dark green band."
-        defense="10"
+        effect="M. Attack +2"
         type="equip-head"
+        defense="10"
         weight="30">
         <sprite>equipment/head/bowler-hat-brown.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="3000"
         image="generic/jackolantern.png"
-        name="Jack-o-Lantern"
+        name="Jack O Lantern"
         description="A pumpkin that has been carved into a super-scary face for Hallowe'en."
         type="generic"
         weight="1000"/>
@@ -5784,26 +5238,22 @@
         image="generic/scorpionstinger.png|W:#800000,ffffff"
         name="Angry Scorpion Stinger"
         description="An angry scorpion stinger."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="4001"
         image="generic/coal.png"
         name="Coal"
         description="A lump of coal."
-        effect=""
         type="generic"
         weight="20"/>
     <item id="4002"
         image="generic/gemstone-b.png"
         name="Diamond"
         description="A raw diamond gemstone."
-        effect=""
         type="generic"
         weight="20"/>
     <item id="4003"
-        image="generic/gemstone-b.png|W:#580000,A40000,C02020,ff6060"
+        image="generic/gemstone-b.png|W:#580000,a40000,c02020,ff6060"
         name="Ruby"
         description="A raw ruby gemstone."
         type="generic"
@@ -5835,199 +5285,176 @@
     <item id="4008"
         image="equipment/rings/gem.png"
         name="Diamond Ring"
-        description="A diamond ring, +1 Vitality."
+        description="A diamond ring."
         type="equip-ring"
-        weight="1"
-        max-per-slot="1"/>
+        vit="1"
+        weight="1"/>
     <item id="4009"
-        image="equipment/rings/gem.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/rings/gem.png|W:#580000,a40000,c02020,ff6060"
         name="Ruby Ring"
-        description="A ruby ring, +1 Strength."
+        description="A ruby ring."
         type="equip-ring"
-        weight="1"
-        max-per-slot="1"/>
+        str="1"
+        weight="1"/>
     <item id="4010"
         image="equipment/rings/gem.png|W:#1f9c1f,89d689"
         name="Emerald Ring"
-        description="An emerald ring, +1 Luck."
+        description="An emerald ring."
         type="equip-ring"
-        weight="1"
-        max-per-slot="1"/>
+        luck="1"
+        weight="1"/>
     <item id="4011"
         image="equipment/rings/gem.png|W:#4b4bbd,888af4"
         name="Sapphire Ring"
-        description="A sapphire ring, +1 Intelligence."
+        description="A sapphire ring."
         type="equip-ring"
-        weight="1"
-        max-per-slot="1"/>
+        int="1"
+        weight="1"/>
     <item id="4012"
         image="equipment/rings/gem.png|W:#ccb534,f1ea8e,ffffaa"
         name="Topaz Ring"
-        description="A topaz ring, +1 Agility."
+        description="A topaz ring."
         type="equip-ring"
-        weight="1"
-        max-per-slot="1"/>
+        agi="1"
+        weight="1"/>
     <item id="4013"
         image="equipment/rings/gem.png|W:#530a7c,b362e1,ca87ef"
         name="Amethyst Ring"
-        description="An amethyst ring, +1 Dexterity."
+        description="An amethyst ring."
         type="equip-ring"
-        weight="1"
-        max-per-slot="1"/>
+        dex="1"
+        weight="1"/>
     <item id="4014"
         image="equipment/rings/simple.png"
         name="Simple Ring"
         description="A simple ring."
         type="equip-ring"
-        weight="1"
-        max-per-slot="1"/>
+        weight="1"/>
     <item id="4015"
         image="generic/ingot.png"
         name="Iron Ingot"
         description="An ingot of iron."
-        effect=""
         type="generic"
         weight="200"/>
     <item id="4016"
         image="generic/bandit-hood.png"
         name="Bandit Hood"
         description="A bandit hood crawling with lice."
-        effect=""
         type="generic"
         weight="50"/>
     <item id="4017"
         image="generic/powder.png|W:#c00000"
         name="Red Powder"
         description="A pile of magical red powder."
-        effect=""
         type="generic"
-        weight="3"
-        max-per-slot="10"/>
+        weight="3"/>
      <item id="4018"
         image="generic/powder.png|W:#ffcc00"
         name="Yellow Powder"
         description="A pile of magical yellow powder."
-        effect=""
         type="generic"
-        weight="3"
-        max-per-slot="10"/>
+        weight="3"/>
      <item id="4019"
         image="generic/powder.png|W:#003399"
         name="Blue Powder"
         description="A pile of magical blue powder."
-        effect=""
         type="generic"
-        weight="3"
-        max-per-slot="10"/>
+        weight="3"/>
     <item id="4020"
         image="equipment/head/candlehelmet.png"
         name="Candle Helmet"
         description="Worn by spelunkers."
-        effect="+16% Defense, -1 Agility, +1 Intelligence"
+        effect="M. Attack -25"
         type="equip-head"
         defense="16"
-        weight="450"
-	max-per-slot="1">
+        int="1"
+        agi="-1"
+        weight="450">
         <sprite>equipment/head/candlehelmet.xml</sprite>
     </item>
     <item id="4021"
         image="generic/yellowpresentbox.png"
         name="Yellow Present Box"
-        description="Something mysterious inside?"
-        effect=""
+        description="Something mysterious inside."
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="4022"
         image="generic/whitepresentbox.png"
         name="White Present Box"
         description="Something very mysterious inside."
-        effect=""
         type="generic"
-        weight="10"
-        max-per-slot="10"/>
+        weight="10"/>
     <item id="4023"
         image="generic/animal-bones.png"
         name="Animal Bones"
         description="Bones from an animal."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="4024"
         image="generic/frozen-yeti-tear.png"
         name="Frozen Yeti Tear"
         description="A tear from a yeti, frozen."
-        effect=""
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="4025"
         image="generic/yeti-claw.png"
         name="Yeti Claw"
-        description="A claw broken off from a yeti"
-        effect=""
+        description="A claw broken off from a yeti."
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="4026"
         image="generic/ice-cube.png"
         name="Ice Cube"
-        description="Very cold ice cube that never seems to completely melt."
-        effect=""
+        description="A very cold ice cube that never seems to completely melt."
         type="generic"
-        weight="1"
-        max-per-slot="10"/>
+        weight="1"/>
     <item id="4027"
         image="equipment/head/yeti-mask.png"
         name="Yeti Mask"
         description="A mask made from the yeti's head."
-        effect=""
+        effect="M. Attack -10"
         type="equip-head"
         defense="4"
-        weight="10"
-	max-per-slot="1">
+        weight="10">
         <sprite>equipment/head/yeti-mask.xml</sprite>
     </item>
     <item id="4028"
         image="equipment/head/wizard-hat.png"
-        name="Wizard hat"
-        description="A wizard hat."
-        effect="+3 Intelligence"
+        name="Wizard Hat"
+        description="A simple wizard hat."
+        effect="M. Attack +5"
         defense="5"
         type="equip-head"
-        weight="15"
-        max-per-slot="1">
+        int="3"
+        weight="15">
         <sprite>equipment/head/wizard-hat.xml</sprite>
     </item>
 	<item id="4029"
-        image="use/potions/e.png|G:#BB0000;R:#FF0000;"
+        image="use/potions/e.png|G:#bb0000;R:#ff0000;"
         name="Grimace of Dementia"
         description="A feared potion. If done wrong... what did you say?"
-        effect=""
         type="generic"
-        weight="50"
-        max-per-slot="10"/>
+        weight="50"/>
     <item id="4030"
         image="equipment/head/bowler-hat.png"
         name="Bowler Hat"
         description="A hat for those with a bit of class."
-        effect=""
+        effect="M. Attack +2"
         type="equip-head"
-        weight="30"
         defense="10"
-        max-per-slot="1">
+        weight="30">
         <sprite>equipment/head/bowler-hat.xml</sprite>
     </item>
     <item id="4031"
         image="equipment/head/monocle.png"
         name="Monocle"
         description="A handy perception tool, even when not at the opera."
-        effect="+20 Critical Damage, +1 Dexterity, +1 Luck"
+        effect="Critical Damage +20"
         type="equip-head"
-        weight="20"
         defense="2"
-        max-per-slot="1">
+        dex="1"
+        luck="1"
+        weight="20">
         <sprite>equipment/head/monocle.xml</sprite>
     </item>
 </items>
-- 
cgit v1.2.3-70-g09d2


From 3a8a86851d6651976a8c4c2fb0407d4357e7cd38 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Mon, 27 Jun 2011 12:22:06 +0200
Subject: Added new four-leaf amulets for the  labyrinth project.

---
 .../items/equipment/charms/fourleaf-amulet.png     | Bin 0 -> 812 bytes
 graphics/items/equipment/charms/silverfourleaf.png | Bin 822 -> 0 bytes
 items.xml                                          |  52 +++++++++++++++++----
 3 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 graphics/items/equipment/charms/fourleaf-amulet.png
 delete mode 100644 graphics/items/equipment/charms/silverfourleaf.png

(limited to 'items.xml')

diff --git a/graphics/items/equipment/charms/fourleaf-amulet.png b/graphics/items/equipment/charms/fourleaf-amulet.png
new file mode 100644
index 00000000..22b77296
Binary files /dev/null and b/graphics/items/equipment/charms/fourleaf-amulet.png differ
diff --git a/graphics/items/equipment/charms/silverfourleaf.png b/graphics/items/equipment/charms/silverfourleaf.png
deleted file mode 100644
index a02c76e4..00000000
Binary files a/graphics/items/equipment/charms/silverfourleaf.png and /dev/null differ
diff --git a/items.xml b/items.xml
index 45ff7d08..3c0bf27d 100644
--- a/items.xml
+++ b/items.xml
@@ -2712,13 +2712,45 @@
         mp="250"
         weight="25"/>
     <item id="829"
-        image="generic/crystal.png|W:#ba58ff,d496ff,ffffff"
-        name="Light Crystal"
-        description="A light crystal that emits an angelic aura."
-        type="generic"
+        image="equipment/charms/fourleaf-amulet.png|W:#332f27,584a31,af7817,ffffff"
+        name="Crozenite Four-Leaf Amulet"
+        description="An amulet that brings the wearer luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="1"
+        weight="10"/>
+    <item id="830"
+        image="equipment/charms/fourleaf-amulet.png|W:#3f2e26,644435,7c513c,ffffff"
+        name="Bromenal Four-Leaf Amulet"
+        description="An amulet that brings the wearer good luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="2"
+        weight="10"/>
+    <item id="831"
+        image="equipment/charms/fourleaf-amulet.png|W:#272f33,384347,6f7e85,ffffff"
+        name="Silver Four-Leaf Amulet"
+        description="An amulet that brings the wearer great luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="3"
+        weight="10"/>
+    <item id="832"
+        image="equipment/charms/fourleaf-amulet.png|W:#857a4d,bc9600,fdd017,ffffff"
+        name="Golden Four-Leaf Amulet"
+        description="An amulet that brings the wearer excellent luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="4"
+        weight="10"/>
+    <item id="833"
+        image="equipment/charms/broken-fourleaf-amulet.png"
+        name="Broken Four-Leaf Amulet"
+        description="A broken four-leaf clover amulet."
+        type="equip-charm"
         weight="10"/>
 
-    <!-- ID 230 RESERVED - "Witch Root" -->
+    <!-- ID 834 RESERVED - "Witch Root" -->
 
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
@@ -2965,11 +2997,11 @@
         type="equip-charm"
         weight="1"/>
     <item id="1228"
-        image="equipment/charms/silverfourleaf.png"
-        name="Silver Four-Leaf Amulet"
-        description="An amulet made for people bringing luck wherever they go."
-        type="equip-charm"
-        weight="1"/>
+        image="generic/crystal.png|W:#ba58ff,d496ff,ffffff"
+        name="Light Crystal"
+        description="A light crystal that emits an angelic aura."
+        type="generic"
+        weight="10"/>
     <item id="1229"
         image="use/food/caramelapple.png"
         name="Caramel Apple"
-- 
cgit v1.2.3-70-g09d2


From cfb574d496e5f8b14eb6de2febe8afea17e54b69 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Fri, 1 Jul 2011 14:21:16 +0200
Subject: Added the mob drops for the rossy quest. The grub-slime.png icon is
 still missing though. Some maps were also fixed. Moreover, Flyvern became
 Hyvern. In addition, the brass armors became bromenal armors, however their
 sprites and icons kept the same name with "brass" in them.

---
 graphics/items/generic/doll.png        | Bin 0 -> 3494 bytes
 graphics/items/generic/stinger-new.png | Bin 0 -> 386 bytes
 items.xml                              |  46 +++++++++++++++++++++++----------
 maps/025-3.tmx                         |   2 +-
 maps/025-4.tmx                         |   4 +--
 monsters.xml                           |   2 +-
 6 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 graphics/items/generic/doll.png
 create mode 100644 graphics/items/generic/stinger-new.png

(limited to 'items.xml')

diff --git a/graphics/items/generic/doll.png b/graphics/items/generic/doll.png
new file mode 100644
index 00000000..1da8fb59
Binary files /dev/null and b/graphics/items/generic/doll.png differ
diff --git a/graphics/items/generic/stinger-new.png b/graphics/items/generic/stinger-new.png
new file mode 100644
index 00000000..53f4eb8b
Binary files /dev/null and b/graphics/items/generic/stinger-new.png differ
diff --git a/items.xml b/items.xml
index 3c0bf27d..c75bb134 100644
--- a/items.xml
+++ b/items.xml
@@ -2436,8 +2436,8 @@
     </item>
     <item id="792"
         image="equipment/feet/brassboots.png"
-        name="Brass Plate Boots"
-        description="A pair of brass plate boots."
+        name="Bromenal Boots"
+        description="A pair of bromenal boots."
         effect="M. Attack -2"
         type="equip-feet"
         defense="1"
@@ -2447,8 +2447,8 @@
     </item>
         <item id="793"
         image="equipment/chest/brassplate.png"
-        name="Brass Plate Chest"
-        description="A brass plate chest armor."
+        name="Bromenal Chest"
+        description="A bromenal chest armor."
         effect="M. Attack -170"
         type="equip-torso"
         weight="2000"
@@ -2458,8 +2458,8 @@
     </item>
     <item id="794"
         image="equipment/hands/brassgloves.png"
-        name="Brass Plate Gloves"
-        description="A pair of brass gloves."
+        name="Bromenal Gloves"
+        description="A pair of bromenal gloves."
         effect="M. Attack -20"
         type="equip-arms"
         weight="40"
@@ -2469,8 +2469,8 @@
     </item>
     <item id="795"
         image="equipment/head/brasshelmet.png"
-        name="Brass Plate Helmet"
-        description="A hard brass plate helmet."
+        name="Bromenal Helmet"
+        description="A hard bromenal helmet."
         effect="M. Attack -30"
         type="equip-head"
         defense="15"
@@ -2479,8 +2479,8 @@
     </item>
     <item id="796"
         image="equipment/legs/brasspants.png"
-        name="Brass Plate Legs"
-        description="A brass plate leg armor."
+        name="Bromenal Legs"
+        description="A bromenal leg armor."
         effect="M. Attack -12"
         type="equip-legs"
         weight="150"
@@ -2490,8 +2490,8 @@
     </item>
     <item id="797"
         image="equipment/shield/brass.png"
-        name="Brass Shield"
-        description="A shield made of brass."
+        name="Bromenal Shield"
+        description="A shield made of bromenal."
         effect="M. Attack -200"
         type="equip-shield"
         defense="20"
@@ -2747,10 +2747,28 @@
         image="equipment/charms/broken-fourleaf-amulet.png"
         name="Broken Four-Leaf Amulet"
         description="A broken four-leaf clover amulet."
-        type="equip-charm"
+        type="generic"
+        weight="10"/>
+    <item id="834"
+        image="generic/doll.png"
+        name="Doll"
+        description="An ancient doll taken from a fallen Fey Element that used it as a lure for its young victims."
+        type="generic"
+        weight="15"/>
+    <item id="835"
+        image="generic/stinger-new.png|R:#1a160f,93774a"
+        name="Hyvern Stinger"
+        description="A stinger snapped off the end of a Hyvern's abdomen."
+        type="generic"
         weight="10"/>
+    <item id="836"
+        image="generic/grub-slime.png"
+        name="Grub Slime"
+        description="The orifice secretions of a grub."
+        type="generic"
+        weight="2"/>
 
-    <!-- ID 834 RESERVED - "Witch Root" -->
+    <!-- ID 837 RESERVED - "Witch Root" -->
 
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
diff --git a/maps/025-3.tmx b/maps/025-3.tmx
index d3e4bbba..661c6d99 100644
--- a/maps/025-3.tmx
+++ b/maps/025-3.tmx
@@ -35,7 +35,7 @@
    H4sIAAAAAAAAA+3dW27UMBQGYA/iIvqKqgLvFWIL7IMNgVApsBNYCLxzKRtgBVxeSaVGSmcyM+40iROf75P81Fb1NH9OHMdxUwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmM6bO6V7AAD9Tpr2uGlPSncEAKAw9+4AAIzJHByRyT5AHGo+QBxqPkAcaj4AANTFGB8gDjWfqGQfIA41n6hkH4ZnnwEAGMZJ6Q4AALPQ7nOc08x1ASzHen0Hls9cznx8bdq3pn0/sP1o2sXkvYZxfVyl9GlVuhfAEhnj1OFX6Q5AAXJPRHKfzxinHnJPRHKfR60vY6w5drknIrlnat11LKXWIco9Eck9wLguxzhHpTsBE9qW+dJjfTa192COyeHav2FOnXcOlNUeq671dyIhipelO8CG36uU/lytsc/ZM639nr/Nz/yrbG3++ruOudfNvjrfdXrLfjG8u02O7x2wR+D95mceVLC3YDfrTMd4fFNte3XW9nmG5J70uqelO3Bl3/Gw9oxoZJ6auQYDxHLbtbD75jsp4/MqpS875uT3fR1qdNFk/meQ3O+be3yYzL8BDKkdE7/a0V5P8Ptz1wYCcDtnzXj7XdPeN+1D0849+yeI406DKHbl3txKTIeuHV+SnHpf8+evyRDHKMr6KOMcWjVlvm/Oskvu63OTml/jO0I55++Sc1/jMRtKxHHpTdZqLTn3AAzDPM7yOYZEl5N97+tTI3WfqIx7iEz2iUrtJzLZBwAAAAAo60WQPQkBAAAAAOBQ3uFlSu2+StbaE0VNe19CDpkf3vpe6X3NdZUl6RsPrueceVJrYDi13htv21tbfY+tb49t41hqse1+bR/nANGZ06CU3NxNMU8xt/Og75pGfUpm7Tht/k8d89zUbj33fe2Sc4ExbHumOLac3G/732qegbJUt8n9NrLP3I2R+5Jcc8hRW+4hx9i5785JqsPMhXpPRFPnXs1nDsbK/a552CnnPc210ucy06ed9jwZ5wDUyr4hME9DvXtvfM+c7LrvnHq/iX17MThv5umQ49L3nuIclMg8MczxWHvfhDFs258AlmzXWGeO9b2EEu87MK31+m4dDrXq1rGjZP1Zn7M7Kb1t2rlnGNXIXXsTOffU56aZf1SmmzCoXRl/lq6vRzst1EcYk/EMXGddGvQz508t9q0F8zyHCOQcIAbPLgEAAAAAAAAAAAAAAAAAgKX5DwTrLVcQNAIA
   </data>
  </layer>
- <layer name="Collision" width="190" height="190" visible="0">
+ <layer name="Collision" width="190" height="190">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+2W0W7dOAwFi/30fnmxDxcwDFsSRUqHtOYAgyY3MUWR46B///vz5y8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICRp6h7AljNW9R9AaxgNOo+Yd/u7z97e2b0DPU9e/e1Rn0P0Dpgrd/6eYX77uwXcu9/VSrcW71L+Jbz9+y+9+iz6n3Cd52/Ztdd8f47PO2MPMfq/f0ZyOM5GY9njuq9nw7RRr3/EyE5ovbgNEiuqH04DZIrah9OguSK2odTIPmiduIUvpQv3gfw/tSoHfkqWZO5N0XUnnwNUidqV74GqRW1L1+B1IvamS9A6kbtTmW+lPudqtzR26Paoap8JV+/XytqhyrylXz9fr2oPaqIOtY+Ru+x424Z5veL2qOKZNuX9fffvJ/93YpRO1SRXXsZ3ddMnZG6M+9IpXdB7VFFIudu3cO9Ru+Mt3Nn3xtLz5mjdqgqK+fd+r2ZWq1ner2OfNbrKWvUDlVkxYxbz0bVtP7uaC+tc1Zn9gy1QxXxzFiZFXfrnZc1aocqMjPj1ve7s8L7p2et9XbNRe1PVWbmnCkrvH87J2PU/lRlZs6Kuc/sPDJ4/x1m56yYu2XnUY607p0laocqMjvnp7mvyr3+yDvQqzXrvXd2K6J2qCKzc36ae3R+Nb29Rs1H5X3vLLVDFYnYw2oPRuq//XzVfHZ634ran4p4Zvz0efQu3urv9KJVN0PUDlXDO+Onz6N38VZ/tued3u96L9QeVWN2xq3ZR+/irb6158g5/T7b5XUraoeq4Zlzb+aR+7if1du71Q1P8L4enjm3Zh69j3u90b2PuuEJ3tfDM+fW3KP3MVtv1A3P/dXeqx2qRsSse59n8r5VY+b+T18rovaoGrMzfpv39bPonVjrWT2JmsPuqB2qSPT8r3uI3kuvnrXXLN5796B2qBrR2e29t9dI71ufrY7ao0pYZzk6/+uz0Xu511Pnzfvd/aldqoR1lqPzvz4bvZd7PXXwvh7WWY7O//ps9F7u9a5nWvqLSque+r1U+5WN2ZmNPnd9PnoH93rq4H0dIubVevZaI3oH93rW3p969UTtfWsnas+yMTLD2XqVvI+IyvvW/dR+ZcU6yxXej5z39txT/fv5b/eLDt7nZ3aWEd5Hx+u9d1bW855+NnPmzN+K07Fkhfez74KlltX769ervY/YD96v9X+2jnX2nvOtft69f/r66fte3Vbvb5+v2IvlrNOZme8K79++j/L+2tv969bvWWr2nvfex/Ks2qvsWPa70vsZRzJ7P+ti6xy8z+/9aM2Zn62O92yvk6M1o547kahd9uY8Uj9Lep5a6jw9G+nvTA8nY433namUnvce/1v1Rn/HeibMe+/J03m9PhR9Xs9ufe+t2/P87XesZ0E+7zPH433vXf79O/rez+5N7VdWdmb1edH1Pd6/1Yvy1vv86ezM7vNm8zYf7+xGn1mxN7Vn2dgZvLefj/c1Xb/PvkJWej/yLN7jvSJRc2y9N9bzvVE7lwFVRvZtqbXqPtGzte4A7/N4//Tc7D4jUs371lk7onYuEyvmOPKcNyudv9df7f2uqF3LxIoZjjzrTaT3O2aK9/mInttInUz5svdqtyrgmaF1F+rsnNvvPEXUTlXAM8PWz5/qqKOYmSJqpyrgmeHv59d/n567fh8dS81d81P5fj0fYt6BN4et3kVnpubXvb9G7VQVRmf59LXluah4auI9WN2/znVmB1Hx3K/3Gd6fyegcZ3bR+3y0rrUHr/cjvUV5750xxLkfsdO3+i3/erUsZ7f6sM6jd8ZMZs/t1YB5/yO8H9nvyjOtPe303nu+2pMv4t3pbFZ4/1ZT5b1lB94akMP7p73O+DZ6lrWnTN7fa6udOIG3OXuT0fvRPjzvx0gd0NPbz2yute+fRcfrZES93hmQi1WZ9d7rsPddbdWw1FbvFfb6ft379d/716vP3f3svQ7kYleU3s+cEzkf9Y5B4/xv99d/71/vOL9371WzUe8ZNM7fHXjy4ctR7xr0jr2dn6G3lVHv/HQy7P7UqHd/Kupk6EEZ9f5PJEOufWTpSRG1C6eQJaoeM83g/6h9OIUsufeUudeVUftwAmRPLLNWO3ECrZkTXdRefJnerEd2Q9ZE7caX6c2Z+BL19wfw/i27+32aU8QePHXAPvPq3u8O3temNetIJ76Q1TtYfQ6MzTzai+rB+++g2v/MmepE3Lk3C7UPJ6Daf2QvOxNxx97d1U6cxsp9R/ezI6vu1Lur2oMT2emApadefyuyY647zob5/ah7munZm5Xz3HE21GbWA7yHyng8UHnvjXrmoCHKgyj3ZnuJOBvOIWr3nrzVUZwPZxC1+7c6u7wfPQv34epLRA2195bzRr3nnfgWo3u31hs5azQR9/Kc5+kDdPQ8VPa1ynvvmddzcb4Oo3/HsvWYyftVPcB+p+6/k7FHvIdd+83co2IeWWYEa3ebtWdmBCv3qu77qf+d81HfG9bstcq+d/RVYQ7g32kV55UzUvcEa/bKftvzUfcEa/bKbp/npO4BYveJ62NzUvcAe3f69m7wvkBlWv/HuX6G9/BV3v6vz997OJEnv3Eevs7V8VbUfQJEYI26X4AIcB4Az+FccB5OBO8BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAS/wCy1A8MEDQCAA==
   </data>
diff --git a/maps/025-4.tmx b/maps/025-4.tmx
index c3df4143..2c1bc0fd 100644
--- a/maps/025-4.tmx
+++ b/maps/025-4.tmx
@@ -32,12 +32,12 @@
  </layer>
  <layer name="Over" width="200" height="240">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3dW27bRhQGYNpv8WOLIu4Cgq7UsI0mS+gKknYDyeIqQiFC0yRFSsPbOd8H8CWCA5Kan3PhaKaqAAAAAAAAAAAAAAAAAAAAAAAA4vl6V1Xf7rY+C9in76ds/JAP6PXvKRv/JcrH0/3WZ8CRqD9gWIb640vw62O6P7c+gR36Rz4o6OPpeNz6JFbWrWPUOXRlzMWQus6JlhFti7PHn8fU+yEX/T4Hy0cJ0crK44Qjgr+V5UVFywXXi9auatO2GPZ8X1Uvp+PVO7JRWca7srQtWN7HrU8A2Iy2RSxD7efSfYdM7W9ya8a4jHWRwdz3XU2/e2r/W5+DTObkQzaIYE4dMrf+gAjMK4Jxc94JQ1a3ZKQZyzWeS2RT5k2YSwHAVOZQAAAAAAAAAAAAAADEZK9LAAAAltSs85JtPaVs1wuwJ1/vquqb9V2h1/dTNn7IB0m116DUXoezoX22MmSkxDPB2rbxlPpO7WFHNCX2D5IL4BJ7lQEAAACUYe4UDDN3CoYtmQ/vAACY4whzTDLMsWScMjDO/aGUqeNcR+tzLJmRo92LjNZ8Rh61PGSrR7KuxbGlo2ajUbqsHP1+ZLL0cyJKWSjxTD3C2ATvLZWRKNloi9L2mNuOyt7uKn3tEbNxjfZvkh82Phdud0tGMq058DjxkIl4pn733YOcMj0Xmef5vqpeTsdrsL1xsvc3rhG1LAC5GaMEAFiPvjgAAAAci748USnTAFxLHQLrMgeLSNQhMK5URtQdRFVi/3aITnsLxllrAIAlWHsAAAAAAAAAAAAAAGC/nsz1ZoL6t8h+ownv1dmo9/j+UFmXFS4Zy4m1YOBMfQKX1TmREWAObU2OoGkHtg/1HQAAAACwd92xTeOaQM17fdbS7LWlvMFbzfz2mjmJudmT8JfmXjz0fHaUfs0SeW7uS/f/3VMdu8R5mE/29rvvy8WQdl7m/N3RtOvSWqbrzqadhejf8S31yLXPjCgiZ8MYzm269UU2kbPR6JvfnfVZOPV5Mdb3msIeyUR0ay44Lvv3DpMLyEOfk2v19cd4L0PfHOAa+mPANbStAPIyhgXlaVsBAJSjbQXAHH5XDu/JBZkN7RFpXiacmasMwLXMVQYAAAAAAAAAAADYj759CNt79XU/t+4Y2fzRc9Qeez5v/l1WiK7Zf7IvH1MOiKTbVrolG/JBRLfkYagNpr1FJCUzoj4hmtK5+Ot0fFr1CmB56g0YtmQ+rM3H0S2RD7kgCu0rGCYfcNZ9N1iTD/il9LiufBCJfMBb7fGkpfLxoYoxz6S5V0c9/1Ky7RGyVC7UJ0SyRjZ+X+1qoKy1s7HlfsFrtZGivQ/NvMezegOG/VatV2/s4Zm6dB2S+VkbQV/5KJ2RrPWGbMRVKiN92dhbuck+Vsu4sfJxS06OkI2GjHCtqRmp8/CpdXTtNRsN7/0YcqlcNGW+m5V2JsbsPRttt2Qk23vlTKaWi7E6os+RstHoWy9yykFspdsYR8wGXHIpI0/3w59FbmM8n6775XS8jlz/1vSh1qGNcVwyAuOWzIh287AjtDE4U4/AuNIZUXcQTYlxyb3MKYWlmCMA5bTH6h82PhdYy9SxepkAoI+xegAAAAAAAAAAAABgyP/bvynaAO4CAA==
+   H4sIAAAAAAAAA+3dW27bRhQGYNpv9WOLIu4CgrYLNWyjyRK6gqTdQLK4SlCI0jRJkdTwds73AfNSIwUpzc+5cDRTVQAAAAAAAAAAAAAAAAAAAAAAAPF8uauqr3dbXwXs07dTNr7LB3T655SNfxPl4+l+6yvgSLQf0C9D+/E5+P0x3m9bX8AO/S0fFPThVB63voiVtdsYbQ5tGXPR59zmRMuIvsXF448y9vOQi26fguWjhGh15XFEieAvdXlR0XLBfNH6VU36Fv2e76vq5VRevSMblGW+K0vfguV92PoCgM3oW8TS138uPXbI1P8mt3qOy1wXGUx931WPu8eOv405yGRKPmSDCKa0IVPbD4jAuiIYNuWdMGR1S0bquVzzuUQ2Zt2EtRQAjGUNBQAAAAAAAAAAAABATM66BAAAYEn1Pi/Z9lPKdr8Ae/Llrqq+2t8VOn07ZeO7fJBUcw9K/XW46DtnK0NGSjwT7G0bT6nv1Bl2RFPi/CC5AK5xVhkAAABAGdZOQT9rp6DfkvnwDgCAKY6wxiTDGkuGqQPDfD6UMnae62hjjiUzcrTPIqM1n5FHrQ/Z2pGse3Fs6ajZqJWuK0f/PDJZ+jkRpS6UeKYeYW6C95bKSJRsNEXpe0ztR2Xvd5W+94jZmKP5m+SHja+F292SkUx7DjyOLDIRz9jvvl3IKdNzkWme76vq5VReg52Nk328MUfUugDkZo4SAGA9xuIAAABwLMbyRKVOAzCXNgTWZQ0WkWhDYFipjGg7iKrE+e0Qnf4WDLPXAABLsPcAAAAAAAAAAAAAAMB+PVnrzQjn3yL7jSa8d87G+Yzvnyr7ssI1QzmxFwxcaE/gunNOZASYQl+TI6j7gc2ivQMAAAAA9q49t2leEzjzXp+11GdtqW/wVr2+/cyaxNycSfi/+rN46PjbUcY1S+S5/lza/989tbFLXIf1ZG+/+65c9GnmZcq/O5pmW3qW6b6zaWYh+nd8Szsy95kRReRsmMO5Tbu9yCZyNmpd67uzPgvHPi+Gxl5jOCOZiG7NBcfl/N5+cgF5GHMyV9d4jPcyjM0B5jAeA+bQtwLIyxwWlKdvBQBQjr4VAFP4XTm8Jxdk1ndGpHWZcGGtMgBzWasMAAAAAAAAAAAAsB9d5xA2z+pr/92+Y2Tza0epzwF4aP33qpIVcqjPn+zKx5gCkbT7SrdkQz6I6JY89PXB9LeIpGRGtCdEUzoXv5/Kx1XvAJbxx4/yZ6XdgCFL5sPefBzdEvmQC6LQv4J+8gEXpd8NygfRlJ7XlQ8ikQ94q+5XlexPtUuUdSb1Z3XU6y8l2xkhS+VCe0Ika2Tjl9XuBspaOxtbnhe8Vh8p2vvQzGc8azeg38/Veu3GHp6pS7chmZ+1EXTVj9IZydpuyEZcpTLSlY291Zvsc7UMG6oft+TkCNmoyQhzjc3IOQ8fG6Vtr9moee9Hn2v1oq7z7aw0MzFk79louiUj2d4rZzK2Xgy1EV2OlI1a136RYwqxle5jHDEbcM21jDzd9/8tch/j+XTfL6fyOnD/WzOGWoc+xnHJCAxbMiP6zf2O0MfgQjsCw0pnRNtBNCXmJfeyphSWYo0AlNOcq3/Y+FpgLWPn6mUCgC7m6gEAAAAAAAAAAACAPv8BNmBJEgDuAgA=
   </data>
  </layer>
  <layer name="Collision" width="200" height="240">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3bjYocOQyF0bCPnidflmWg4vhPtuwr25/hkEx3VbWvLDEJzPz+59ev3wAAAAAAAAAAAAAAAAAAAAAA4BnpUu8HiIT5AMq+c8F8AH/i+wfwt9ZS7w+IhBkB/tczA8wHXpL+P7z1byvmAy/Jfb9ozQf/zsIrar3eMzvq/WO/l8691u/pa7XvK7e6Pd9ov7xSs1rP5/5eW+osq2pQuka9b2WtZq85Ras3av1xQ7+08tyef7ROvdeq972qP77vpX/P1eCkWvSub67e62/Uqk/p61tq47XUObyyjtZEnS1qX5xemxeye6/cM9UZI9dMnUVRB/W+VWd9ei121u3nGeocO+uh3qPinHvrcnqdvOum3v+O+qj3sOKcPc7+hd54OXtvfdR7UJ7zzFJnVtRQvUesO9uZOXixV17I+IrdS513V03Ve4DfWTIbQFmpl5kNwKf3mQ/cbOVSZwNmMRtAXa3Hc1/X7mE+cCPvpc4DrMB8AHXMBDCGOQDKmA8AAAAAAAAAAAAAAAAAAAAAAHCb1u/b8bt47+D3Mn3q8Up9XvI9y1d7Ic2R5nmxJi9bsdSZvOvhUTN1Lvj0gsdS5/KsiWft1Nkw3ge1s5xZ6pyztbHWz1pbxGPta6+lzm2tz0z9bqnFi6zn57XUua31Ga3dTbV4UXpGrfMbPftTe8KzFq0aIZaR82udbe/zTumLHUudEf5n7/Fcdf7RGnnUUZ0LY2fvcaY39UbP/keWOhfs5+51njf1RE+OkaXOBfu5e53nTT3Rk2NlLRHn3L/nN3OmN/XFiqXOBP9z93i2OrN3nUbrqc6EuXOfPdtbesSSoefak7K/bmZ5PE+d36NGo/nVuTB/9tbzrV17ao9YajGy1Pkwd/aWc72xP1bXQp0Pc2e/eqlr4FWb0fvVOVHvgdZZjvbLDb0xmuOmGrxMvdT5vWqTu6f3Oeqctczq/aipljr3jvr0PkudsTeren9R67JiqTPvqE/vM9X5RnKq9xq1Lj01u7G2tSwjWSPVYmap935CjV6pp2fuCPXo3e/NZ7rj7HuXOmO0OkXOMJNZfUYnnP3tNTu1FiN7PClflPpRr/F6Rdpv6T3r65EyRj136hS/DrV9WXOckDfC2b9Ym1K91Huwnqn1vHuvV+dUowZn1mTlfKizRUI9zmRdlnvV2YBZzAdQt2I+1JkAL6PzUbtXnQnwsmKpMwFeenqc+cCrmA+gbMV8MCe4BfMBlK1c6mzALO85YD5wG+YDKGM+gDrmAyjzXuo8gDfmA6hjNoA25gKoYz6AOcwFUMZ8AAAAAAAAAAAAIIefQwDy+Fkd4G/8LBvwN37WE8j79n86D8wIXja61PsGVhudC+YDt/Ja6hxeuX/eK12j3jf0PZL2wm3z4bXUObC3T76vte5J71dnsWZlPjDTM5b71Dlmcs4sdS6s75VS/1iepc7Uu8eVS50TPn3ifd6Re2Om1y2vj9YOccz0R+u56mwemb2WOjP8esXaQ6XnqrON1MGavad26myY7wvLeZeuS5+rzuZZh5mlzoa9/VC6P32+OuOuevTWDOeo9blHD5zUEzuWOiPoiUjZT6kF+nqkp2+svaXO2Mq8c6mz1+oxWkP1/k/vEXVWZfbotRjp9RMy7egZSy/VrlVnK2Vt7Xlm1WoajWWPp2RaXaOZZa356XktS527txaWmqn3H7VfLPer89XyjuYfWercM1lb96tzra5ZKXvudWvt1fm8eqRWp957o2S21qL1nNvsON/oNfRauedGrUW6D8/ct8jlfK0Gs70xUp8I9RzNOJP7NB5nfZORfhn9jNOyvtonr+ae7ZnZzzgpKz3yZuZaHb5/3tYXrUzp68zHm5lLdbi5H3qyMR8oub0Paqt13fc9dQ5o3D4fuYy5nK3ZUWeA1s09MDsfwM09UVo919xcF+A/1nlgPvASy3yk76n3DqzWOx+te4Bbjfw7ivnAK3qXep+AAvMBlI0s9Z6BXZgNoIz5AMqYC6CMuQDqmAmgjdkAypgPAAAAAAAAAAAAAAAAAMBOtd8N+P7Jz0njNV5LnQPwUvo+UXo9fb/0DOB0tTkYWT/3qnMBs0r9XXrPMh+5ZwKnKM1D+rXHfDArOJHHPLTmI32+OjPQo9S/zMddSmfRuke972g1y703Oye9nxlBa/8nZbGcZc896hzKuo3U1Fr36PXuydDKEy1bbm8953TCee3sh95esa7odbbksNyjzmU9w5771Hmi1M5a295nqTOv7p/S9Sfk++45ei517UZq2/MsdeaZ7Na+U2f0PMOo+RS1867t91nqzDPZRu4/MWe6/8j5dtUv18NeK/dstd0rcs6Revzcoz7HXbVb2TOlZ0fJvmPdmlHdw8zHub2jzFraw8z+I+TaXcMdPZM+P/fZEfqnN8fI/Sfki5rlhfkofc18xMoXMctL85F+FvOhyzf6DHXf7qzhbM9YVu2zVflL++zZvzVzhGw9OXtrcLveWnms3OdGyj+aIX2/dk+0bLUeqGV8RS73ipV+pjq3tY9KOSzXR8yVu771DPV5qeo42jOzZ6A2m6Xn2qjZRvpAnUlZx9G+Ga1/FJY83z97s0fLk16Tnk/UXBHqOdo7tTqeUFvvdVKW3BlFzqeu50i9W89WZ1zVW9Z6RMyQnlP0fFFq2rqu95nqbKv7K1rOFct69jfqPfPW6zfXMXqmVl97LXXOSDVOa5L+/aUaRs+1a6lzqlG3c+1Y6oyRUZ/4an3NfKyvvXoP6DunFUudC/Dy08/MB5Bn6XtmA6+yfo9gLvAiy/cL5gOvYSaAPswBUMZ8AAAAAAAAAAAAAAAAAAAAAMj5F9SmKf8A7gIA
+   H4sIAAAAAAAAA+3bgW4lJwyF4VUffZ+8qqpIs7MD2GA4Bn6kT5vcOzPhGLtJpeT3P79+/QYAAAAAAAAAAAAAAAAAAAAAANd4L/V+gEyYD6DsORfMB/Anvn8Af2st9f6ATJgR4H+WGWA+cJP3/4e3frZiPnCTr+8Xrfng5yzcotbrltlR7x/r3XTutX5/v1b7vnKq0/P19sstNav1/NfHtaXOMqsGpWvU+1bWavSaXbR6o9YfJ/RLK8/p+XvrZL1Wve9Z/fF87/3xVw12qoV1PXNZrz9Rqz6lz0+pTdRS54jK2lsTdbasfbF7bW7IHr2+nqnOmLlm6iyKOqj3rTrr3Wuxsm4/z1DnWFkP9R4V52yty+51iq6bev8r6qPew4xzjjj7G3rj5uzW+qj3oDznkaXOrKiheo+Yd7Yjc3Bjr9yQ8Rarlzrvqpqq94C4s2Q2gLJSLzMbQEzvMx842cylzgaMYjaAulqPf31eu4f5wImilzoPMAPzAdQxE0Af5gAoYz4AAAAAAAAAAAAAAAAAAAAAAMBpWn9vx9/i3YO/y4ypxy31ucnzLG/thXeOd54ba3KzGUudKboeETVT50JML0Qsda7ImkTWTp0N/X1QO8uRpc45Whtv/by1RT7evo5a6tze+ozU75Ra3Mh7flFLndtbn97anVSLG73PqHV+vWe/a09E1qJVI+TSc36ts7U+b5e+WLHUGRF/9hHPVefvrVFEHdW50Hf2EWd6Um9Y9t+z1LngP/eo8zypJyw5epY6F/znHnWeJ/WEJcfMWiLPuT/Pb+RMT+qLGUudCfHnHvFsdeboOvXWU50JY+c+eran9Igng+XanbLfbmRFPE+dP6JGvfnVuTB+9t7zrV27a494atGz1Pkwdvaecz2xP2bXQp0PY2c/e6lrEFWb3vvVOVHvgdZZ9vbLCb3Rm+OkGtxMvdT5o2rzdY/1Oeqctczq/aipljr3ivpYn6XOaM2q3l/WusxY6swr6mN9pjpfT071XrPWxVKzE2tby9KTNVMtRpZ67zvU6JZ6RubOUA/rfk8+0xVnb13qjNnqlDnDSGb1Ge1w9qfXbNda9Oxxp3xZ6ke9+uuVab+l97yvZ8qY9dypU/461PblzbFD3gxnf2NtSvVS78F7pt7ztl6vzqlGDfasycz5UGfLhHrsybs896qzAaOYD6BuxnyoMwFReuejdq86ExBlxlJnAqJYepz5wK2YD6BsxnwwJzgF8wGUzVzqbMCo6DlgPnAa5gMoYz6AOuYDKIte6jxANOYDqGM2gDbmAqhjPoAxzAVQxnwAAAAAAAAAAADgC7+HAHzjd3WAv/G7bMDf+F1P4Nuz/9/zwIzgZr1LvW9gtt65YD5wqqilzhGV++e90jXqfUPfI+9eOG0+opY6B9b2yfO11j3v+9VZvFmZD4z0jOc+dY6RnCNLnQvze6XUP55nqTNZ9zhzqXMipk+izztzb4z0uuf13tohj5H+aD1XnS0ic9RSZ0Zcr3h7qPRcdbaeOnizW2qnzobxvvCcd+m693PV2SLrMLLU2bC2H0r3v5+vzriqHtaaYR+1Po/ogZ16YsVSZwQ9kSn7LrWArUcsfePtLXXGVuaVS529Vo/eGqr3v3uPqLMqs2evRU+v75BpRc94eql2rTpbKWtrzyOrVtNsPHvcJdPsGo0sb813z+tZ6tzWWnhqpt5/1n7x3K/OV8vbm79nqXOPZG3dr841u2al7F+ve2uvzhfVI7U6We/Nktlbi9ZzTrPifLPXMGp9PTdrLd77iMx9iq+ct9VgtDd66pOhnr0ZR3LvJuKsT9LTL71fY7est/bJrblHe2b0a+yUlR65M3OtDs9/T+uLVqb368zHnZlLdTi5HyzZmA+UnN4HtdW67vmeOgc0Tp+Pr4xfOVuzo84ArZN7YHQ+gJN7orQs15xcF+A/3nlgPnATz3y831PvHZjNOh+te4BT9fwcxXzgFtal3iegwHwAZT1LvWdgFWYDKGM+gDLmAihjLoA6ZgJoYzaAMuYDAAAAAAAAAAAAAAAAALBS7W8Dnv/ye9K4TdRS5wCilL5PlF5/v196BrC72hxY56N0DbCzUn/X3rPOx9czgV2U+vn9vne17lXnBqxWzMf7eerMgIX1v/fMx95KZ9G6R73vTDWbsSznlElr/ztlKWXyntMOGWfXraem3rpnr7clQytPtmxfe7Oc0w7ntbIfrL3iXdnr7MnhuUedy3uGlvvUebLUzltb67PUmWf3T+n6HfI995w9l7p2PbW1PEudeSS7t+/UGSPPMGs+Re2ia/t8ljrzSLae+3fM+d5/5nyr6vfVw1Hr69lqq1fmnD31+LlHfY6rardqPt6vZ8i+Yp2aUd3DivmYUcNstV29MuQbyZ3xDFfUcEXPvJ//9bUz9I81R8/9O+TLmuWG+Sh9znzkypcxy+nz8VVbda1H9n7KfPQ+Q923K2s42jOeVfvaqvylfVr2782cIZslp7UGp7PWKmJ9fd1M+XszvN+v3ZMtW60Hahlv8ZV7xnp/TXVubx+Vcniuz5jr6/rWM9Tnpapjb8+MnoHaaBbLtVmz9fSBOpOyjr1901v/LDx5nv9as2fL877mfT5Zc2WoZ2/v1Oq4Q22j105Zvs4ocz51PXvq3Xq2OuOs3vLWI2OG9zllz5elpq3rrM9UZ5vdX9lyzljesz+R9cxbr59cx+yZWn0dtdQ5M9X4XZP3xzfVMHuuVUudU4267WvFUmfMjPrkV+tr5mN+7dV7gO2cZix1LiDKTz8zH8A3T98zG7iV93sEc4Ebeb5fMB+4DTMB2DAHQBnzAQAAAAAAAAAAAAAAAAAAAODLv/IQeegA7gIA
   </data>
  </layer>
  <objectgroup name="Objects" width="200" height="240">
diff --git a/monsters.xml b/monsters.xml
index f11c408f..085fdb34 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -487,7 +487,7 @@
         <sprite>monsters/larvespa.xml|#211b0e,5c3e20,a68d42;#667C26</sprite>
     </monster>
 
-    <monster id="86" name="Flyvern" targetCursor="small">
+    <monster id="86" name="Hyvern">
         <sprite>monsters/vespa.xml|#1a160f,93774a;#DEBFBF,BBA2A2</sprite>
     </monster>
 
-- 
cgit v1.2.3-70-g09d2


From 12a215c6f6610424fa2bd1c00f4eb54f2e75c661 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Sat, 2 Jul 2011 13:11:10 +0200
Subject: Brass armors were renamed to Bromenal armors.

---
 graphics/items/equipment/chest/brassplate.png      | Bin 1378 -> 0 bytes
 graphics/items/equipment/chest/bromenalchest.png   | Bin 0 -> 1378 bytes
 graphics/items/equipment/feet/brassboots.png       | Bin 458 -> 0 bytes
 graphics/items/equipment/feet/bromenalboots.png    | Bin 0 -> 458 bytes
 graphics/items/equipment/hands/brassgloves.png     | Bin 1076 -> 0 bytes
 graphics/items/equipment/hands/bromenalgloves.png  | Bin 0 -> 1076 bytes
 graphics/items/equipment/head/brasshelmet.png      | Bin 1043 -> 0 bytes
 graphics/items/equipment/head/bromenalhelmet.png   | Bin 0 -> 1043 bytes
 graphics/items/equipment/legs/brasspants.png       | Bin 1104 -> 0 bytes
 graphics/items/equipment/legs/bromenallegs.png     | Bin 0 -> 1104 bytes
 graphics/items/equipment/shield/brass.png          | Bin 1331 -> 0 bytes
 graphics/items/equipment/shield/bromenal.png       | Bin 0 -> 1331 bytes
 .../sprites/equipment/chest/brassplate-female.png  | Bin 43740 -> 0 bytes
 .../sprites/equipment/chest/brassplate-female.xml  | 104 -----------------
 .../sprites/equipment/chest/brassplate-male.png    | Bin 34187 -> 0 bytes
 .../sprites/equipment/chest/brassplate-male.xml    | 104 -----------------
 .../equipment/chest/bromenalchest-female.png       | Bin 0 -> 43740 bytes
 .../equipment/chest/bromenalchest-female.xml       | 104 +++++++++++++++++
 .../sprites/equipment/chest/bromenalchest-male.png | Bin 0 -> 34187 bytes
 .../sprites/equipment/chest/bromenalchest-male.xml | 104 +++++++++++++++++
 .../sprites/equipment/feet/brassboots-female.png   | Bin 21614 -> 0 bytes
 .../sprites/equipment/feet/brassboots-female.xml   | 104 -----------------
 .../sprites/equipment/feet/brassboots-male.png     | Bin 21713 -> 0 bytes
 .../sprites/equipment/feet/brassboots-male.xml     | 104 -----------------
 .../equipment/feet/bromenalboots-female.png        | Bin 0 -> 21614 bytes
 .../equipment/feet/bromenalboots-female.xml        | 104 +++++++++++++++++
 .../sprites/equipment/feet/bromenalboots-male.png  | Bin 0 -> 21713 bytes
 .../sprites/equipment/feet/bromenalboots-male.xml  | 104 +++++++++++++++++
 .../sprites/equipment/hands/brassgloves-female.png | Bin 10726 -> 0 bytes
 .../sprites/equipment/hands/brassgloves-female.xml | 104 -----------------
 .../sprites/equipment/hands/brassgloves-male.png   | Bin 10835 -> 0 bytes
 .../sprites/equipment/hands/brassgloves-male.xml   | 104 -----------------
 .../equipment/hands/bromenalgloves-female.png      | Bin 0 -> 10726 bytes
 .../equipment/hands/bromenalgloves-female.xml      | 104 +++++++++++++++++
 .../equipment/hands/bromenalgloves-male.png        | Bin 0 -> 10835 bytes
 .../equipment/hands/bromenalgloves-male.xml        | 104 +++++++++++++++++
 graphics/sprites/equipment/head/brasshelmet.png    | Bin 3854 -> 0 bytes
 graphics/sprites/equipment/head/brasshelmet.xml    | 124 ---------------------
 graphics/sprites/equipment/head/bromenalhelmet.png | Bin 0 -> 3854 bytes
 graphics/sprites/equipment/head/bromenalhelmet.xml | 124 +++++++++++++++++++++
 .../sprites/equipment/legs/brasspants-female.png   | Bin 51963 -> 0 bytes
 .../sprites/equipment/legs/brasspants-female.xml   | 104 -----------------
 .../sprites/equipment/legs/brasspants-male.png     | Bin 44940 -> 0 bytes
 .../sprites/equipment/legs/brasspants-male.xml     | 104 -----------------
 .../sprites/equipment/legs/bromenallegs-female.png | Bin 0 -> 51963 bytes
 .../sprites/equipment/legs/bromenallegs-female.xml | 104 +++++++++++++++++
 .../sprites/equipment/legs/bromenallegs-male.png   | Bin 0 -> 44940 bytes
 .../sprites/equipment/legs/bromenallegs-male.xml   | 104 +++++++++++++++++
 items.xml                                          |  30 ++---
 49 files changed, 971 insertions(+), 971 deletions(-)
 delete mode 100644 graphics/items/equipment/chest/brassplate.png
 create mode 100644 graphics/items/equipment/chest/bromenalchest.png
 delete mode 100644 graphics/items/equipment/feet/brassboots.png
 create mode 100644 graphics/items/equipment/feet/bromenalboots.png
 delete mode 100644 graphics/items/equipment/hands/brassgloves.png
 create mode 100644 graphics/items/equipment/hands/bromenalgloves.png
 delete mode 100644 graphics/items/equipment/head/brasshelmet.png
 create mode 100644 graphics/items/equipment/head/bromenalhelmet.png
 delete mode 100644 graphics/items/equipment/legs/brasspants.png
 create mode 100644 graphics/items/equipment/legs/bromenallegs.png
 delete mode 100644 graphics/items/equipment/shield/brass.png
 create mode 100644 graphics/items/equipment/shield/bromenal.png
 delete mode 100644 graphics/sprites/equipment/chest/brassplate-female.png
 delete mode 100644 graphics/sprites/equipment/chest/brassplate-female.xml
 delete mode 100644 graphics/sprites/equipment/chest/brassplate-male.png
 delete mode 100644 graphics/sprites/equipment/chest/brassplate-male.xml
 create mode 100644 graphics/sprites/equipment/chest/bromenalchest-female.png
 create mode 100644 graphics/sprites/equipment/chest/bromenalchest-female.xml
 create mode 100644 graphics/sprites/equipment/chest/bromenalchest-male.png
 create mode 100644 graphics/sprites/equipment/chest/bromenalchest-male.xml
 delete mode 100644 graphics/sprites/equipment/feet/brassboots-female.png
 delete mode 100644 graphics/sprites/equipment/feet/brassboots-female.xml
 delete mode 100644 graphics/sprites/equipment/feet/brassboots-male.png
 delete mode 100644 graphics/sprites/equipment/feet/brassboots-male.xml
 create mode 100644 graphics/sprites/equipment/feet/bromenalboots-female.png
 create mode 100644 graphics/sprites/equipment/feet/bromenalboots-female.xml
 create mode 100644 graphics/sprites/equipment/feet/bromenalboots-male.png
 create mode 100644 graphics/sprites/equipment/feet/bromenalboots-male.xml
 delete mode 100644 graphics/sprites/equipment/hands/brassgloves-female.png
 delete mode 100644 graphics/sprites/equipment/hands/brassgloves-female.xml
 delete mode 100644 graphics/sprites/equipment/hands/brassgloves-male.png
 delete mode 100644 graphics/sprites/equipment/hands/brassgloves-male.xml
 create mode 100644 graphics/sprites/equipment/hands/bromenalgloves-female.png
 create mode 100644 graphics/sprites/equipment/hands/bromenalgloves-female.xml
 create mode 100644 graphics/sprites/equipment/hands/bromenalgloves-male.png
 create mode 100644 graphics/sprites/equipment/hands/bromenalgloves-male.xml
 delete mode 100644 graphics/sprites/equipment/head/brasshelmet.png
 delete mode 100644 graphics/sprites/equipment/head/brasshelmet.xml
 create mode 100644 graphics/sprites/equipment/head/bromenalhelmet.png
 create mode 100644 graphics/sprites/equipment/head/bromenalhelmet.xml
 delete mode 100644 graphics/sprites/equipment/legs/brasspants-female.png
 delete mode 100644 graphics/sprites/equipment/legs/brasspants-female.xml
 delete mode 100644 graphics/sprites/equipment/legs/brasspants-male.png
 delete mode 100644 graphics/sprites/equipment/legs/brasspants-male.xml
 create mode 100644 graphics/sprites/equipment/legs/bromenallegs-female.png
 create mode 100644 graphics/sprites/equipment/legs/bromenallegs-female.xml
 create mode 100644 graphics/sprites/equipment/legs/bromenallegs-male.png
 create mode 100644 graphics/sprites/equipment/legs/bromenallegs-male.xml

(limited to 'items.xml')

diff --git a/graphics/items/equipment/chest/brassplate.png b/graphics/items/equipment/chest/brassplate.png
deleted file mode 100644
index b521d2a5..00000000
Binary files a/graphics/items/equipment/chest/brassplate.png and /dev/null differ
diff --git a/graphics/items/equipment/chest/bromenalchest.png b/graphics/items/equipment/chest/bromenalchest.png
new file mode 100644
index 00000000..b521d2a5
Binary files /dev/null and b/graphics/items/equipment/chest/bromenalchest.png differ
diff --git a/graphics/items/equipment/feet/brassboots.png b/graphics/items/equipment/feet/brassboots.png
deleted file mode 100644
index 20748fb0..00000000
Binary files a/graphics/items/equipment/feet/brassboots.png and /dev/null differ
diff --git a/graphics/items/equipment/feet/bromenalboots.png b/graphics/items/equipment/feet/bromenalboots.png
new file mode 100644
index 00000000..20748fb0
Binary files /dev/null and b/graphics/items/equipment/feet/bromenalboots.png differ
diff --git a/graphics/items/equipment/hands/brassgloves.png b/graphics/items/equipment/hands/brassgloves.png
deleted file mode 100644
index d47cc57c..00000000
Binary files a/graphics/items/equipment/hands/brassgloves.png and /dev/null differ
diff --git a/graphics/items/equipment/hands/bromenalgloves.png b/graphics/items/equipment/hands/bromenalgloves.png
new file mode 100644
index 00000000..d47cc57c
Binary files /dev/null and b/graphics/items/equipment/hands/bromenalgloves.png differ
diff --git a/graphics/items/equipment/head/brasshelmet.png b/graphics/items/equipment/head/brasshelmet.png
deleted file mode 100644
index 0b8514df..00000000
Binary files a/graphics/items/equipment/head/brasshelmet.png and /dev/null differ
diff --git a/graphics/items/equipment/head/bromenalhelmet.png b/graphics/items/equipment/head/bromenalhelmet.png
new file mode 100644
index 00000000..0b8514df
Binary files /dev/null and b/graphics/items/equipment/head/bromenalhelmet.png differ
diff --git a/graphics/items/equipment/legs/brasspants.png b/graphics/items/equipment/legs/brasspants.png
deleted file mode 100644
index 9d552bd2..00000000
Binary files a/graphics/items/equipment/legs/brasspants.png and /dev/null differ
diff --git a/graphics/items/equipment/legs/bromenallegs.png b/graphics/items/equipment/legs/bromenallegs.png
new file mode 100644
index 00000000..9d552bd2
Binary files /dev/null and b/graphics/items/equipment/legs/bromenallegs.png differ
diff --git a/graphics/items/equipment/shield/brass.png b/graphics/items/equipment/shield/brass.png
deleted file mode 100644
index 5753148a..00000000
Binary files a/graphics/items/equipment/shield/brass.png and /dev/null differ
diff --git a/graphics/items/equipment/shield/bromenal.png b/graphics/items/equipment/shield/bromenal.png
new file mode 100644
index 00000000..5753148a
Binary files /dev/null and b/graphics/items/equipment/shield/bromenal.png differ
diff --git a/graphics/sprites/equipment/chest/brassplate-female.png b/graphics/sprites/equipment/chest/brassplate-female.png
deleted file mode 100644
index 7035c735..00000000
Binary files a/graphics/sprites/equipment/chest/brassplate-female.png and /dev/null differ
diff --git a/graphics/sprites/equipment/chest/brassplate-female.xml b/graphics/sprites/equipment/chest/brassplate-female.xml
deleted file mode 100644
index da984634..00000000
--- a/graphics/sprites/equipment/chest/brassplate-female.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/chest/brassplate-female.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/chest/brassplate-male.png b/graphics/sprites/equipment/chest/brassplate-male.png
deleted file mode 100644
index 49394f2e..00000000
Binary files a/graphics/sprites/equipment/chest/brassplate-male.png and /dev/null differ
diff --git a/graphics/sprites/equipment/chest/brassplate-male.xml b/graphics/sprites/equipment/chest/brassplate-male.xml
deleted file mode 100644
index d4400a4f..00000000
--- a/graphics/sprites/equipment/chest/brassplate-male.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/chest/brassplate-male.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/chest/bromenalchest-female.png b/graphics/sprites/equipment/chest/bromenalchest-female.png
new file mode 100644
index 00000000..7035c735
Binary files /dev/null and b/graphics/sprites/equipment/chest/bromenalchest-female.png differ
diff --git a/graphics/sprites/equipment/chest/bromenalchest-female.xml b/graphics/sprites/equipment/chest/bromenalchest-female.xml
new file mode 100644
index 00000000..20b94c37
--- /dev/null
+++ b/graphics/sprites/equipment/chest/bromenalchest-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-female.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/chest/bromenalchest-male.png b/graphics/sprites/equipment/chest/bromenalchest-male.png
new file mode 100644
index 00000000..49394f2e
Binary files /dev/null and b/graphics/sprites/equipment/chest/bromenalchest-male.png differ
diff --git a/graphics/sprites/equipment/chest/bromenalchest-male.xml b/graphics/sprites/equipment/chest/bromenalchest-male.xml
new file mode 100644
index 00000000..dac81aca
--- /dev/null
+++ b/graphics/sprites/equipment/chest/bromenalchest-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-male.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/feet/brassboots-female.png b/graphics/sprites/equipment/feet/brassboots-female.png
deleted file mode 100644
index 6e084914..00000000
Binary files a/graphics/sprites/equipment/feet/brassboots-female.png and /dev/null differ
diff --git a/graphics/sprites/equipment/feet/brassboots-female.xml b/graphics/sprites/equipment/feet/brassboots-female.xml
deleted file mode 100644
index eee14b80..00000000
--- a/graphics/sprites/equipment/feet/brassboots-female.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/feet/brassboots-female.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/feet/brassboots-male.png b/graphics/sprites/equipment/feet/brassboots-male.png
deleted file mode 100644
index 7086470d..00000000
Binary files a/graphics/sprites/equipment/feet/brassboots-male.png and /dev/null differ
diff --git a/graphics/sprites/equipment/feet/brassboots-male.xml b/graphics/sprites/equipment/feet/brassboots-male.xml
deleted file mode 100644
index ada5bedf..00000000
--- a/graphics/sprites/equipment/feet/brassboots-male.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/feet/brassboots-male.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/feet/bromenalboots-female.png b/graphics/sprites/equipment/feet/bromenalboots-female.png
new file mode 100644
index 00000000..6e084914
Binary files /dev/null and b/graphics/sprites/equipment/feet/bromenalboots-female.png differ
diff --git a/graphics/sprites/equipment/feet/bromenalboots-female.xml b/graphics/sprites/equipment/feet/bromenalboots-female.xml
new file mode 100644
index 00000000..3a2cc633
--- /dev/null
+++ b/graphics/sprites/equipment/feet/bromenalboots-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/feet/bromenalboots-female.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/feet/bromenalboots-male.png b/graphics/sprites/equipment/feet/bromenalboots-male.png
new file mode 100644
index 00000000..7086470d
Binary files /dev/null and b/graphics/sprites/equipment/feet/bromenalboots-male.png differ
diff --git a/graphics/sprites/equipment/feet/bromenalboots-male.xml b/graphics/sprites/equipment/feet/bromenalboots-male.xml
new file mode 100644
index 00000000..35749913
--- /dev/null
+++ b/graphics/sprites/equipment/feet/bromenalboots-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/feet/bromenalboots-male.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/hands/brassgloves-female.png b/graphics/sprites/equipment/hands/brassgloves-female.png
deleted file mode 100644
index ef4e19d5..00000000
Binary files a/graphics/sprites/equipment/hands/brassgloves-female.png and /dev/null differ
diff --git a/graphics/sprites/equipment/hands/brassgloves-female.xml b/graphics/sprites/equipment/hands/brassgloves-female.xml
deleted file mode 100644
index b4f3551c..00000000
--- a/graphics/sprites/equipment/hands/brassgloves-female.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/hands/brassgloves-female.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/hands/brassgloves-male.png b/graphics/sprites/equipment/hands/brassgloves-male.png
deleted file mode 100644
index b5379063..00000000
Binary files a/graphics/sprites/equipment/hands/brassgloves-male.png and /dev/null differ
diff --git a/graphics/sprites/equipment/hands/brassgloves-male.xml b/graphics/sprites/equipment/hands/brassgloves-male.xml
deleted file mode 100644
index 958e5191..00000000
--- a/graphics/sprites/equipment/hands/brassgloves-male.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/hands/brassgloves-male.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/hands/bromenalgloves-female.png b/graphics/sprites/equipment/hands/bromenalgloves-female.png
new file mode 100644
index 00000000..ef4e19d5
Binary files /dev/null and b/graphics/sprites/equipment/hands/bromenalgloves-female.png differ
diff --git a/graphics/sprites/equipment/hands/bromenalgloves-female.xml b/graphics/sprites/equipment/hands/bromenalgloves-female.xml
new file mode 100644
index 00000000..03ce3e5a
--- /dev/null
+++ b/graphics/sprites/equipment/hands/bromenalgloves-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/hands/bromenalgloves-female.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/hands/bromenalgloves-male.png b/graphics/sprites/equipment/hands/bromenalgloves-male.png
new file mode 100644
index 00000000..b5379063
Binary files /dev/null and b/graphics/sprites/equipment/hands/bromenalgloves-male.png differ
diff --git a/graphics/sprites/equipment/hands/bromenalgloves-male.xml b/graphics/sprites/equipment/hands/bromenalgloves-male.xml
new file mode 100644
index 00000000..0d39eb09
--- /dev/null
+++ b/graphics/sprites/equipment/hands/bromenalgloves-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/hands/bromenalgloves-male.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/head/brasshelmet.png b/graphics/sprites/equipment/head/brasshelmet.png
deleted file mode 100644
index 555ea093..00000000
Binary files a/graphics/sprites/equipment/head/brasshelmet.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/brasshelmet.xml b/graphics/sprites/equipment/head/brasshelmet.xml
deleted file mode 100644
index 7f05ebf2..00000000
--- a/graphics/sprites/equipment/head/brasshelmet.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/brasshelmet.png" width="27" height="19"/>
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-42"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY ="-42"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-42"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="2" offsetY ="-42"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-42" delay="150"/>
-		  <frame index="0" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-42" delay="150"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-42" delay="75"/>
-		  <frame index="1" offsetX="4" offsetY ="-41" delay="75"/>
-		  <frame index="1" offsetX="4" offsetY ="-42" delay="150"/>
-		  <frame index="1" offsetX="4" offsetY ="-41" delay="75"/>
-		  <frame index="1" offsetX="4" offsetY ="-42" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-42" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-43" delay="150"/>
-		  <frame index="2" offsetX="-2" offsetY ="-42" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-43" delay="150"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="2" offsetY ="-42" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-42" delay="150"/>
-		  <frame index="3" offsetX="2" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-42" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-40" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-38" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="7" offsetY ="-43" delay="75"/>
-		  <frame index="1" offsetX="7" offsetY ="-44" delay="75"/>
-		  <frame index="1" offsetX="3" offsetY ="-41" delay="75"/>
-		  <frame index="1" offsetX="2" offsetY ="-40" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY ="-42" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-39" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-2" offsetY ="-43" delay="75"/>
-		  <frame index="3" offsetX="-2" offsetY ="-44" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-40" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-41" delay="225"/>
-		  <frame index="0" offsetX="-1" offsetY ="-40" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="6" offsetY ="-42" delay="225"/>
-		  <frame index="1" offsetX="8" offsetY ="-43" delay="150"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-42" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-41" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-42" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY ="-42" delay="225"/>
-		  <frame index="3" offsetX="-3" offsetY ="-43" delay="150"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-30"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="7" offsetY ="-33"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-34"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-4" offsetY ="-33"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="31" offsetY="-8"/>
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/head/bromenalhelmet.png b/graphics/sprites/equipment/head/bromenalhelmet.png
new file mode 100644
index 00000000..555ea093
Binary files /dev/null and b/graphics/sprites/equipment/head/bromenalhelmet.png differ
diff --git a/graphics/sprites/equipment/head/bromenalhelmet.xml b/graphics/sprites/equipment/head/bromenalhelmet.xml
new file mode 100644
index 00000000..d234fe8c
--- /dev/null
+++ b/graphics/sprites/equipment/head/bromenalhelmet.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/equipment/head/bromenalhelmet.png" width="27" height="19"/>
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="-1" offsetY ="-42"/>
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="3" offsetY ="-42"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-42"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="2" offsetY ="-42"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="-1" offsetY ="-41" delay="75"/>
+		  <frame index="0" offsetX="-1" offsetY ="-42" delay="150"/>
+		  <frame index="0" offsetX="-1" offsetY ="-41" delay="75"/>
+		  <frame index="0" offsetX="-1" offsetY ="-42" delay="150"/>
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="4" offsetY ="-42" delay="75"/>
+		  <frame index="1" offsetX="4" offsetY ="-41" delay="75"/>
+		  <frame index="1" offsetX="4" offsetY ="-42" delay="150"/>
+		  <frame index="1" offsetX="4" offsetY ="-41" delay="75"/>
+		  <frame index="1" offsetX="4" offsetY ="-42" delay="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-42" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-43" delay="150"/>
+		  <frame index="2" offsetX="-2" offsetY ="-42" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-43" delay="150"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="2" offsetY ="-42" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-41" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-42" delay="150"/>
+		  <frame index="3" offsetX="2" offsetY ="-41" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-42" delay="75"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="-1" offsetY ="-40" delay="75"/>
+		  <frame index="0" offsetX="-1" offsetY ="-41" delay="75"/>
+		  <frame index="0" offsetX="-1" offsetY ="-38" delay="75"/>
+		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="7" offsetY ="-43" delay="75"/>
+		  <frame index="1" offsetX="7" offsetY ="-44" delay="75"/>
+		  <frame index="1" offsetX="3" offsetY ="-41" delay="75"/>
+		  <frame index="1" offsetX="2" offsetY ="-40" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-3" offsetY ="-42" delay="225"/>
+		  <frame index="2" offsetX="-3" offsetY ="-39" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-2" offsetY ="-43" delay="75"/>
+		  <frame index="3" offsetX="-2" offsetY ="-44" delay="75"/>
+		  <frame index="3" offsetX="1" offsetY ="-41" delay="75"/>
+		  <frame index="3" offsetX="2" offsetY ="-40" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="-1" offsetY ="-41" delay="225"/>
+		  <frame index="0" offsetX="-1" offsetY ="-40" delay="75"/>
+		  <frame index="0" offsetX="-1" offsetY ="-41" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="6" offsetY ="-42" delay="225"/>
+		  <frame index="1" offsetX="8" offsetY ="-43" delay="150"/>
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-42" delay="225"/>
+		  <frame index="2" offsetX="-3" offsetY ="-41" delay="75"/>
+		  <frame index="2" offsetX="-3" offsetY ="-42" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-1" offsetY ="-42" delay="225"/>
+		  <frame index="3" offsetX="-3" offsetY ="-43" delay="150"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="-1" offsetY ="-30"/>
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="7" offsetY ="-33"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-34"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-4" offsetY ="-33"/>
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="default">
+			<frame index="4" offsetX="31" offsetY="-8"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/legs/brasspants-female.png b/graphics/sprites/equipment/legs/brasspants-female.png
deleted file mode 100644
index e100059f..00000000
Binary files a/graphics/sprites/equipment/legs/brasspants-female.png and /dev/null differ
diff --git a/graphics/sprites/equipment/legs/brasspants-female.xml b/graphics/sprites/equipment/legs/brasspants-female.xml
deleted file mode 100644
index 1d20c292..00000000
--- a/graphics/sprites/equipment/legs/brasspants-female.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/legs/brasspants-female.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/legs/brasspants-male.png b/graphics/sprites/equipment/legs/brasspants-male.png
deleted file mode 100644
index ee682d84..00000000
Binary files a/graphics/sprites/equipment/legs/brasspants-male.png and /dev/null differ
diff --git a/graphics/sprites/equipment/legs/brasspants-male.xml b/graphics/sprites/equipment/legs/brasspants-male.xml
deleted file mode 100644
index 2f08d96a..00000000
--- a/graphics/sprites/equipment/legs/brasspants-male.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/legs/brasspants-male.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/legs/bromenallegs-female.png b/graphics/sprites/equipment/legs/bromenallegs-female.png
new file mode 100644
index 00000000..e100059f
Binary files /dev/null and b/graphics/sprites/equipment/legs/bromenallegs-female.png differ
diff --git a/graphics/sprites/equipment/legs/bromenallegs-female.xml b/graphics/sprites/equipment/legs/bromenallegs-female.xml
new file mode 100644
index 00000000..7b814c7c
--- /dev/null
+++ b/graphics/sprites/equipment/legs/bromenallegs-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/legs/bromenallegs-female.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/legs/bromenallegs-male.png b/graphics/sprites/equipment/legs/bromenallegs-male.png
new file mode 100644
index 00000000..ee682d84
Binary files /dev/null and b/graphics/sprites/equipment/legs/bromenallegs-male.png differ
diff --git a/graphics/sprites/equipment/legs/bromenallegs-male.xml b/graphics/sprites/equipment/legs/bromenallegs-male.xml
new file mode 100644
index 00000000..049a2280
--- /dev/null
+++ b/graphics/sprites/equipment/legs/bromenallegs-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/legs/bromenallegs-male.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/items.xml b/items.xml
index c75bb134..dbc4cef5 100644
--- a/items.xml
+++ b/items.xml
@@ -2435,61 +2435,61 @@
         <sprite gender="female">equipment/chest/leather-female.xml|#412300,c9866b,8d4900;#ffff00</sprite>
     </item>
     <item id="792"
-        image="equipment/feet/brassboots.png"
+        image="equipment/feet/bromenalboots.png"
         name="Bromenal Boots"
         description="A pair of bromenal boots."
         effect="M. Attack -2"
         type="equip-feet"
         defense="1"
         weight="30">
-        <sprite gender="male">equipment/feet/brassboots-male.xml</sprite>
-        <sprite gender="female">equipment/feet/brassboots-female.xml</sprite>
+        <sprite gender="male">equipment/feet/bromenalboots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/bromenalboots-female.xml</sprite>
     </item>
         <item id="793"
-        image="equipment/chest/brassplate.png"
+        image="equipment/chest/bromenalchest.png"
         name="Bromenal Chest"
         description="A bromenal chest armor."
         effect="M. Attack -170"
         type="equip-torso"
         weight="2000"
         defense="25">
-        <sprite gender="male">equipment/chest/brassplate-male.xml|#fbf5e9</sprite>
-        <sprite gender="female">equipment/chest/brassplate-female.xml|#fbf5e9</sprite>
+        <sprite gender="male">equipment/chest/bromenalchest-male.xml|#fbf5e9</sprite>
+        <sprite gender="female">equipment/chest/bromenalchest-female.xml|#fbf5e9</sprite>
     </item>
     <item id="794"
-        image="equipment/hands/brassgloves.png"
+        image="equipment/hands/bromenalgloves.png"
         name="Bromenal Gloves"
         description="A pair of bromenal gloves."
         effect="M. Attack -20"
         type="equip-arms"
         weight="40"
         defense="4">
-        <sprite gender="male">equipment/hands/brassgloves-male.xml</sprite>
-        <sprite gender="female">equipment/hands/brassgloves-female.xml</sprite>
+        <sprite gender="male">equipment/hands/bromenalgloves-male.xml</sprite>
+        <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite>
     </item>
     <item id="795"
-        image="equipment/head/brasshelmet.png"
+        image="equipment/head/bromenalhelmet.png"
         name="Bromenal Helmet"
         description="A hard bromenal helmet."
         effect="M. Attack -30"
         type="equip-head"
         defense="15"
         weight="400">
-        <sprite>equipment/head/brasshelmet.xml</sprite>
+        <sprite>equipment/head/bromenalhelmet.xml</sprite>
     </item>
     <item id="796"
-        image="equipment/legs/brasspants.png"
+        image="equipment/legs/bromenallegs.png"
         name="Bromenal Legs"
         description="A bromenal leg armor."
         effect="M. Attack -12"
         type="equip-legs"
         weight="150"
         defense="">
-        <sprite gender="male">equipment/legs/brasspants-male.xml</sprite>
-        <sprite gender="female">equipment/legs/brasspants-female.xml</sprite>
+        <sprite gender="male">equipment/legs/bromenallegs-male.xml</sprite>
+        <sprite gender="female">equipment/legs/bromenallegs-female.xml</sprite>
     </item>
     <item id="797"
-        image="equipment/shield/brass.png"
+        image="equipment/shield/bromenal.png"
         name="Bromenal Shield"
         description="A shield made of bromenal."
         effect="M. Attack -200"
-- 
cgit v1.2.3-70-g09d2