Merge branch 'master' into map-renaming

Conflicts:

	monsters.xml

1 files changed, 554 insertions, 279 deletions

diff --git a/items.xml b/items.xml
index f4f3103c..e4efe7d0 100644
--- a/items.xml
+++ b/items.xml
@@ -10,6 +10,11 @@
     confused with 'weapon-type'.
 -->
 <items>
+    
+    <!-- Version of this items.xml file to ensure that account-server and
+         game-server are in-sync -->
+    <version revision="1" />
+    
     <!-- Pseudo-item hairstyles. Using negative IDs is just a temporary
          solution. I would like to use the lower ID numbers when they aren't
          required for eAthena compatibility anymore.
@@ -43,14 +48,15 @@
         <sprite gender="female">hairstyle7-male.xml</sprite><!-- haven't got one yet -->
     </item>
 
-    <!-- treating the base sprite as equipment too will be useful when we
+    <!-- Treating the base sprite as equipment too will be useful when we
          implement other playable races -->
     <item id="-100" type="racesprite">
         <sprite gender="male">player_male_base.xml</sprite>
         <sprite gender="female">player_female_base.xml</sprite>
     </item>
 
-    <!-- Temporary low weapon IDs (< 256) -->
+
+    <!-- TEMPORARY LOW WEAPON ID:S (< 256) -->
 
     <item id="30"
         weapon_type="1">
@@ -87,7 +93,7 @@
         image="use-potion-a.png|G:#ff2222"
         name="Cactus Potion"
         description="A fresh potion."
-        effect="+25 HP/+10 MP"
+        effect="+25 HP, +10 MP"
         type="usable"
         hp="25"
         weight="40"
@@ -154,7 +160,7 @@
         image="use-food-candy.png"
         name="Candy"
         description="A sugar-free candy."
-        effect="+ 5 HP"
+        effect="+5 HP"
         type="usable"
         hp="5"
         weight="10"
@@ -163,7 +169,7 @@
         image="armor-head-santahat.png"
         name="Santa Hat"
         description="Ask Santa about this hat."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="15"
         defense="2"
@@ -237,7 +243,7 @@
         image="weapon-dagger-dagger.png"
         name="Dagger"
         description="A simple Dagger."
-        effect="Damage: +15 / Range: 1"
+        effect="+15 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="1"
         weight="60"
@@ -257,7 +263,7 @@
         image="weapon-dagger-sharpknife.png"
         name="Sharp Knife"
         description="A really sharp knife Don't hurt yourself!"
-        effect="Damage: +10 / Range: 1"
+        effect="+10 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="1"
         weight="45"
@@ -274,7 +280,7 @@
         image="armor-chest-leathershirt.png"
         name="Leather Shirt"
         description="A shirt made of hardened leather."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-torso"
         weight="30"
         defense="4"
@@ -286,7 +292,7 @@
         image="armor-head-fancyhat.png"
         name="Fancy Hat"
         description="A fancy hat."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-head"
         weight="25"
         defense="5"
@@ -297,7 +303,7 @@
         image="armor-head-minershat.png"
         name="Miners Hat"
         description="A hat used by miners."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="25"
         defense="4"
@@ -325,7 +331,7 @@
         image="armor-feet-boots.png"
         name="Boots"
         description="Some robust boots, ideal for travelling."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-feet"
         weight="15"
         defense="2"
@@ -336,7 +342,7 @@
         image="weapon-arrow-iron.png"
         name="Iron Arrow"
         description="A hard arrow made of iron."
-        effect="Damage: +50"
+        effect="+50 Damage"
         type="equip-ammo"
         weight="12"
         max-per-slot="100"/>
@@ -344,7 +350,7 @@
         image="weapon-bow-shortbow.png"
         name="Short Bow"
         description="A bow for short distances."
-        effect="Damage: +50 / Range: 5"
+        effect="+50 Damage, 5 Range"
         type="equip-2hand"
         weapon_type="10"
         weapon-type="bow"
@@ -357,7 +363,7 @@
         image="armor-hands-minergloves.png"
         name="Miner Gloves"
         description="Gloves used by miners; very useful."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-arms"
         weight="10"
         defense="2"
@@ -369,7 +375,7 @@
         image="armor-hands-leathergloves.png"
         name="Leather Gloves"
         description="Gloves made of hardened leather."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-arms"
         weight="25"
         defense="3"
@@ -390,7 +396,7 @@
         image="use-food-orangecupcake.png"
         name="Orange Cupcake"
         description="A very soft orange cupcake."
-        effect="+100 HP / +10 MP"
+        effect="+100 HP, +10 MP"
         type="usable"
         hp="150"
         weight="185"
@@ -408,7 +414,7 @@
         image="weapon-dagger-shortsword.png"
         name="Short Sword"
         description="A small but sharp sword."
-        effect="Damage: +100 / Range: 1"
+        effect="+100 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="2"
         weight="1025"
@@ -476,7 +482,7 @@
         image="armor-head-standardheadband.png"
         name="Standard Headband"
         description="Just a standard headband."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="45"
         max-per-slot="1"
@@ -487,7 +493,7 @@
         image="armor-head-silkheadband.png"
         name="Silk Headband"
         description="A cool headband made of silk."
-        effect="Defense: +10"
+        effect="+10% Defense"
         type="equip-head"
         weight="20"
         defense="10"
@@ -498,7 +504,7 @@
         image="weapon-bow-forestbow.png"
         name="Forest Bow"
         description="A bow usually used to hunt."
-        effect="Damage: +65 / Range: 5"
+        effect="+65 Damage, 5 Range"
         type="equip-2hand"
         weapon_type="10"
         weight="530"
@@ -515,7 +521,7 @@
         image="armor-chest-desertshirt.png"
         name="Desert Shirt"
         description="A shirt suitable for desert trips."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="50"
         defense="6"
@@ -526,7 +532,7 @@
         image="weapon-polearm-bardiche.png"
         name="Bardiche"
         description="A Bardiche."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -535,7 +541,7 @@
         image="weapon-polearm-halberd.png"
         name="Halberd"
         description="A weapon usually carried by guards."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -544,7 +550,7 @@
         image="weapon-axe-axe.png"
         name="Axe"
         description="An axe."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="axe"
         weight="10"
@@ -553,7 +559,7 @@
         image="weapon-axe-blacksmithsaxe.png"
         name="Blacksmith's Axe"
         description="An axe usually used by blacksmiths."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="axe"
         weight="10"
@@ -642,7 +648,7 @@
         image="weapon-sword-sabre.png"
         name="Sabre"
         description="A sword with a very sharp, curved, single-edged blade."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -659,7 +665,7 @@
         image="armor-hands-wintergloves.png"
         name="Winter Gloves"
         description="Soft and warm gloves."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-arms"
         weight="15"
         defense="2"
@@ -671,7 +677,7 @@
         image="armor-chest-tnecksweater.png|W:#b0b0b0,ffffff"
         name="Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40"
         defense="6"
@@ -699,7 +705,7 @@
         image="use-potion-b.png|G:#c05000,f0a000,f0f09f"
         name="Iron Potion"
         description="Increases your attack strength."
-        effect=""
+        effect="Attack strength increase (temporary)"
         type="generic"
         weight="295"
         max-per-slot="10"/>
@@ -707,7 +713,7 @@
         image="use-potion-c.png|G:#da69e5,ffdaff"
         name="Concentration Potion"
         description="Increases your attack speed."
-        effect=""
+        effect="Attack speed increase (temporary)"
         type="generic"
         weight="295"
         max-per-slot="10"/>
@@ -723,7 +729,7 @@
         image="weapon-dagger-boneknife.png"
         name="Bone Knife"
         description="A knife masterly carved out of a bone."
-        effect="Damage: +115 / Range 1"
+        effect="+115 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="2"
         weapon-type="knife"
@@ -734,7 +740,7 @@
         image="weapon-dagger-setzer.png"
         name="Setzer"
         description="A sharp knife, named after a famous gambler."
-        effect="Damage: +110 / Range 1"
+        effect="+110 Damage, 1 Range"
         type="equip-1hand"
         weapon-type="knife"
         weight="10"
@@ -745,7 +751,7 @@
         image="weapon-sword-scimitar.png"
         name="Scimitar"
         description="A sword with a heavy, curved, single-edged blade."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -754,7 +760,7 @@
         image="weapon-sword-falchion.png"
         name="Falcion"
         description="A heavy one-handed, single-edged sword."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -763,7 +769,7 @@
         image="weapon-polearm-scorpion.png"
         name="Scorpion"
         description="A well crafted glaive."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="1"
@@ -772,7 +778,7 @@
         image="weapon-bow-desertbow.png"
         name="Desert Bow"
         description="A tonorian short bow."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="bow"
         weight="10"
@@ -781,7 +787,7 @@
         image="weapon-sword-beheader.png"
         name="Beheader"
         description="An oddly designed sword especially made for beheading enemies."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -790,7 +796,7 @@
         image="weapon-thrown-bonedarts.png"
         name="Bone Darts"
         description="Some darts made of bones."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="thrown"
         weight="10"
@@ -799,7 +805,7 @@
         image="weapon-sword-sandcutter.png"
         name="Sand Cutter"
         description="A sand cutter."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -808,7 +814,7 @@
         image="weapon-dagger-rockknive.png"
         name="Rock Knife"
         description="A knife made of stone."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="knife"
         weight="10"
@@ -817,7 +823,7 @@
         image="weapon-staff-staffoflife.png"
         name="Staff of Life"
         description="A staff that increases healing magic."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="staff"
         weight="10"
@@ -826,7 +832,7 @@
         image="weapon-staff-crescentrod.png"
         name="Crescent Rod"
         description="A crescent rod."
-        effect="Damage: +50 "
+        effect="+50 Damage, ??? Range"
         type="equip-2hand"
         weapon-type="staff"
         weight="10"
@@ -835,7 +841,7 @@
         image="weapon-staff-staffoffire.png"
         name="Staff of Fire"
         description="A staff that increases fire magic."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="staff"
         weight="10"
@@ -844,7 +850,7 @@
         image="weapon-staff-staffofice.png"
         name="Staff of Ice"
         description="A staff that increases ice magic."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="staff"
         weight="10"
@@ -853,7 +859,7 @@
         image="weapon-sword-jackal.png"
         name="Jackal"
         description="A jackal."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -862,7 +868,7 @@
         image="armor-hands-scarabarmlet.png"
         name="Scarab Armlet"
         description="A scarab armlet."
-        effect="Defense: ???"
+        effect="??? Defense"
         type="equip-arms"
         weight="10"
         max-per-slot="1"/>
@@ -870,7 +876,7 @@
         image="armor-legs-shorts.png|W:#6c858a,ffffff"
         name="Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -882,7 +888,7 @@
         image="weapon-sword-sword.png"
         name="Sword"
         description="A simple but reliable sword."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -891,7 +897,7 @@
         image="weapon-sword-bastardsword.png"
         name="Bastard Sword"
         description="A large two handed sword."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="sword"
         weight="10"
@@ -900,7 +906,7 @@
         image="weapon-sword-broadsword.png"
         name="Broad Sword"
         description="A two handed sword with a very broad blade."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="sword"
         weight="10"
@@ -909,7 +915,7 @@
         image="weapon-sword-baselard.png"
         name="Baselard"
         description="A short and powerful sword."
-        effect="Damage ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -918,7 +924,7 @@
         image="weapon-sword-longsword.png"
         name="Long Sword"
         description="A sword with a long and agile blade."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -927,7 +933,7 @@
         image="weapon-dagger-stiletto.png"
         name="Stiletto"
         description="A dagger with a long and thin blade."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="knife"
         weight="10"
@@ -936,7 +942,7 @@
         image="weapon-sword-rapier.png"
         name="Rapier"
         description="A light sword made for duels."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -945,7 +951,7 @@
         image="weapon-polearm-spear.png"
         name="Spear"
         description="A light spear with a wooden pole."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -954,7 +960,7 @@
         image="weapon-polearm-heavyspear.png"
         name="Heavy Spear"
         description="A heavy spear with a wooden pole."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -963,7 +969,7 @@
         image="weapon-polearm-pike.png"
         name="Pike"
         description="A light spear with an iron pole."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -972,7 +978,7 @@
         image="weapon-polearm-heavypike.png"
         name="Heavy Pike"
         description="A heavy spear with an iron pole."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -981,7 +987,7 @@
         image="weapon-polearm-dualspear.png"
         name="Dual Spear"
         description="A spear with two tops."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -990,7 +996,7 @@
         image="weapon-sword-firesword.png"
         name="Fire Sword"
         description="A magical sword enchanted with the power of fire."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="10"
@@ -999,7 +1005,7 @@
         image="armor-shield-britshield.png"
         name="Brit Shield"
         description="Legendary shield that is said to save queens and rule waves."
-        effect="Cooking: -50"
+        effect="-50 Cooking"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1007,7 +1013,7 @@
         image="armor-shield-steelshield.png"
         name="Steel Shield"
         description="A shield made of steel."
-        effect="Defense: +20"
+        effect="+20% Defense"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1015,7 +1021,7 @@
         image="armor-shield-woodenshield.png"
         name="Wooden Shield"
         description="A shield made of wood."
-        effect="Defense: +14"
+        effect="+14% Defense"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1023,7 +1029,7 @@
         image="armor-shield-leathershield.png"
         name="Leather Shield"
         description="A shield made of leather on a wooden frame."
-        effect="Defense: +7"
+        effect="+7% Defense"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1031,7 +1037,7 @@
         image="armor-shield-knightshield.png"
         name="Knight Shield"
         description="A high quality shield used by knights."
-        effect=""
+        effect="??? Defense"
         type="equip-shield"
         weight="10"
         max-per-slot="1"/>
@@ -1039,7 +1045,7 @@
         image="weapon-axe-meatcleaver.png"
         name="Meat Cleaver"
         description="A butchers tool that also makes a nice one handed battle axe."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="axe"
         weight="10"
@@ -1048,7 +1054,7 @@
         image="weapon-axe-hatchet.png"
         name="Hatchet"
         description="A short one handed axe."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="axe"
         weight="10"
@@ -1057,7 +1063,7 @@
         image="weapon-polearm-trident.png"
         name="Trident"
         description="A spear with three heads."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-2hand"
         weapon-type="polearm"
         weight="10"
@@ -1074,7 +1080,7 @@
         image="weapon-mace-club.png"
         name="Club"
         description="A primitive wooden club."
-        effect="Damage: ???"
+        effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="mace"
         weight="10"
@@ -1083,7 +1089,7 @@
         image="armor-legs-shorts.png|W:#0e1d24,285f78,2c7c98,76b9ca"
         name="Jeans Shorts"
         description="Shorts made of jeans."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-legs"
         weight="30"
         defense="4"
@@ -1127,7 +1133,7 @@
         image="armor-head-pumpkinhelmet.png"
         name="Pumpkin Helmet"
         description="A helmet made out of a pumpkin."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="30"
         defense="4"
@@ -1138,7 +1144,7 @@
         image="armor-head-axehat.png"
         name="Axe Hat"
         description="A really cool joke."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="20"
         defense="4"
@@ -1149,7 +1155,7 @@
         image="armor-head-piratehat.png"
         name="Pirate Hat"
         description="A pirate hat."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="25"
         defense="4"
@@ -1160,7 +1166,7 @@
         image="armor-head-goggles.png"
         name="Goggles"
         description="Goggles designed to take care of your eyes."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="20"
         defense="2"
@@ -1171,7 +1177,7 @@
         image="armor-head-leathergoggles.png"
         name="Leather Goggles"
         description="Goggles designed for desert storms."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="25"
         defense="3"
@@ -1182,7 +1188,7 @@
         image="armor-head-circlet.png"
         name="Circlet"
         description="A nice piece of jewelry."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="35"
         defense="4"
@@ -1193,19 +1199,18 @@
         image="armor-head-eyepatch.png"
         name="Eyepatch"
         description="What really makes you a pirate."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="15"
         defense="3"
         max-per-slot="1">
-
         <sprite>item017.xml</sprite>
     </item>
     <item id="622"
         image="armor-head-bandana.png"
         name="Bandana"
         description="A striped bandana."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="15"
         defense="3"
@@ -1216,7 +1221,7 @@
         image="weapon-polearm-scythe.png"
         name="Scythe"
         description="Usually used for farming but also usable as a weapon. Slow but deadly."
-        effect="Damage: +75 / Range: 1"
+        effect="+75 Damage, 1 Range"
         type="equip-2hand"
         weapon_type="11"
         weapon-type="polearm"
@@ -1230,7 +1235,7 @@
         image="armor-chest-vnecksweater.png|W:#ffffff"
         name="V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45"
         defense="8"
@@ -1242,7 +1247,7 @@
         image="armor-chest-chainmail.png"
         name="Chainmail Shirt"
         description="A shirt made of chains. It weights a lot but offers excellent protection."
-        effect="Defense: +20"
+        effect="+20% Defense"
         type="equip-torso"
         weight="120"
         defense="12"
@@ -1254,7 +1259,7 @@
         image="armor-chest-lightplatemail.png|W:#ddeeff"
         name="Light Platemail"
         description="A light cuirass with shoulder pads made of iron. A cheap and plain but efficient armor usually worn by foot soldiers."
-        effect="Defense: +25"
+        effect="+25% Defense"
         type="equip-torso"
         weight="240"
         defense="14"
@@ -1266,7 +1271,7 @@
         image="armor-head-tophat.png"
         name="Top Hat"
         description="For the gentry of The Mana World."
-        effect="Defense: +10"
+        effect="+10% Defense"
         type="equip-head"
         weight="20"
         defense="15"
@@ -1277,7 +1282,7 @@
         image="armor-head-funkyhat.png"
         name="Funky Hat"
         description="Yawn..."
-        effect="Defense: +13"
+        effect="+13% Defense"
         type="equip-head"
         weight="20"
         defense="15"
@@ -1288,7 +1293,7 @@
         image="armor-head-mushroomhat.png"
         name="Mush Hat"
         description="Soft and fashionable."
-        effect="Defense: +10"
+        effect="+10% Defense"
         type="equip-head"
         weight="20"
         defense="15"
@@ -1299,7 +1304,7 @@
         image="armor-head-shroomhat.png"
         name="Shroom Hat"
         description="Evil and fashionable."
-        effect="Defense: +13"
+        effect="+13% Defense"
         type="equip-head"
         weight="20"
         defense="18"
@@ -1318,7 +1323,7 @@
         image="armor-legs-skirt.png|W:#e0e0e0,ffffff"
         name="Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
         defense="4"
         type="equip-legs"
         weight="30"
@@ -1329,7 +1334,7 @@
         image="armor-head-xmaself.png"
         name="Christmas Elf Hat"
         description="A hat worn by Christmas elves."
-        effect="Defense: +13"
+        effect="+13% Defense"
         defense="18"
         type="equip-head"
         weight="20"
@@ -1340,7 +1345,7 @@
         image="armor-head-mask.png"
         name="Face Mask"
         description="A wooden mask to conceal your face."
-        effect="Defense: +10"
+        effect="+10% Defense"
         defense="15"
         type="equip-head"
         weight="20"
@@ -1359,7 +1364,7 @@
         image="armor-head-warlordhelm.png"
         name="Warlord Helmet"
         description="Worn by great warriors"
-        effect="Defense: +18"
+        effect="+18% Defense"
         type="equip-head"
         defense="25"
         weight="40">
@@ -1369,7 +1374,7 @@
         image="armor-head-knighthelm.png"
         name="Knight's Helmet"
         description="Helmet with two small wings on it"
-        effect="Defense: +15"
+        effect="+15% Defense"
         type="equip-head"
         defense="20"
         weight="35">
@@ -1379,7 +1384,7 @@
         image="armor-head-infantryhelm.png"
         name="Infantry Helmet"
         description="For soldiers and guards"
-        effect="Defense: +15"
+        effect="+15% Defense"
         type="equip-head"
         defense="20"
         weight="35">
@@ -1389,7 +1394,7 @@
         image="armor-head-crusadehelm.png"
         name="Crusade Helmet"
         description="Start your own crusade"
-        effect="Defense: +18"
+        effect="+18% Defense"
         type="equip-head"
         defense="25"
         weight="40">
@@ -1413,7 +1418,7 @@
         image="armor-legs-chaps.png"
         name="Jeans Chaps"
         description="Jeans with snake skin chaps."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-legs"
         defense="6"
         weight="40">
@@ -1424,7 +1429,7 @@
         image="armor-head-cowboywhite.png"
         name="White Cowboy Hat"
         description="A white cowboy hat with a band."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-head"
         defense="6"
         weight="30">
@@ -1434,7 +1439,7 @@
         image="armor-head-cowboyblack.png"
         name="Black Cowboy Hat"
         description="A black cowboy hat with shiny buckles."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-head"
         defense="6"
         weight="30">
@@ -1444,7 +1449,7 @@
         image="armor-chest-lightplatemail.png|W:#573f10,9c8226,d3c04b,ffffff"
         name="Golden Platemail"
         description="A plate mail made from gold which can only be afforded by the richest of the richest."
-        effect="Defense: +25"
+        effect="+25% Defense"
         type="equip-torso"
         defense="25"
         weight="240">
@@ -1455,7 +1460,7 @@
         image="armor-head-crown.png"
         name="Crown"
         description="A jewel embossed crown fit for any ruler."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         defense="4"
         weight="50">
@@ -1463,19 +1468,19 @@
     </item>
     <item id="647"
         image="armor-head-devcap.png|R:#9999ff"
-        name="Developers Cap"
+        name="Developer's Cap"
         description="A cap which identifies you as a developer."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-head"
         defense="5"
-        weight="20">
+        weight="10">
         <sprite>head-devcap.xml|#9999ff</sprite>
     </item>
     <item id="648"
         image="armor-ring-strength-rough.png"
         name="Rough Strength Ring"
         description="A rough strength-enhancing ring that looks as if it has been made in a hurry."
-        effect="Strength: +5"
+        effect="+5 Strength"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1484,7 +1489,7 @@
         image="armor-ring-agility-rough.png"
         name="Rough Agility Ring"
         description="A rough agility-enhancing ring that looks as if it has been made in a hurry."
-        effect="Agility: +5"
+        effect="+5 Agility"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1493,7 +1498,7 @@
         image="armor-ring-dexterity-rough.png"
         name="Rough Dexterity Ring"
         description="A rough dexterity-enhancing ring that looks as if it has been made in a hurry."
-        effect="Dexterity: +5"
+        effect="+5 Dexterity"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1502,7 +1507,7 @@
         image="armor-ring-vitality-rough.png"
         name="Rough Vitality Ring"
         description="A rough vitality-enhancing ring that looks as if it has been made in a hurry."
-        effect="Vitality: +5"
+        effect="+5 Vitality"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1511,7 +1516,7 @@
         image="armor-ring-intelligence-rough.png"
         name="Rough Intelligence Ring"
         description="A rough intelligence-enhancing ring that looks as if it has been made in a hurry."
-        effect="Intelligence: +5"
+        effect="+5 Intelligence"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1520,7 +1525,7 @@
         image="armor-ring-willpower-rough.png"
         name="Rough Willpower Ring"
         description="A rough willpower-enhancing ring that looks as if it has been made in a hurry."
-        effect="Willpower: +5"
+        effect="+5 Willpower"
         type="equip-ring"
         weight="1"
         max-per-slot="1"
@@ -1529,7 +1534,7 @@
         image="armor-head-cap.png|R:#d94800"
         name="Cap"
         description="A hat with a peak to shield your eyes from the sun."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-head"
         defense="5"
         weight="20">
@@ -1539,7 +1544,7 @@
         image="armor-feet-furboots.png"
         name="Fur Boots"
         description="A pair of warm winter boots."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-feet"
         weight="25"
         defense="3"
@@ -1550,7 +1555,7 @@
         image="armor-head-serf.png"
         name="Serf Hat"
         description="A simple hat made from cloth."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="25"
         defense="2"
@@ -1570,7 +1575,7 @@
         image="armor-chest-warlordplate.png"
         name="Warlord Plate"
         description="Strong and decorative armor."
-        effect="Defense: +27"
+        effect="+27% Defense"
         type="equip-torso"
         weight="275"
         defense="27"
@@ -1582,7 +1587,7 @@
         image="armor-chest-warlordplate.png|W:#573f10,9c8226,d3c04b,ffffff"
         name="Golden Warlord Plate"
         description="Strong and decorative armor made from gold."
-        effect="Defense: +27"
+        effect="+27% Defense"
         type="equip-torso"
         weight="275"
         defense="27"
@@ -1714,7 +1719,7 @@
         image="armor-head-gradcap.png"
         name="Graduation Cap"
         description="A traditional cap which a university student may wear upon graduating."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="20"
         defense="2"
@@ -1741,7 +1746,7 @@
         image="armor-head-nohmask.png"
         name="Noh Mask"
         description="A traditional Japanese mask worn in Noh plays."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="15"
         defense="3"
@@ -1752,7 +1757,7 @@
         image="armor-head-demonmask.png"
         name="Demon Mask"
         description="A scary mask to make you look like a demon."
-        effect="Defense: +3"
+        effect="+3% Defense"
         type="equip-head"
         weight="15"
         defense="3"
@@ -1766,7 +1771,6 @@
         type="generic"
         weight="1"
         max-per-slot="10"/>
-
     <item id="681"
         image="generic-herb.png|W:#0047ab"
         name="Cobalt Herb"
@@ -1774,7 +1778,6 @@
         type="generic"
         weight="1"
         max-per-slot="10"/>
-
     <item id="682"
         image="generic-herb.png|W:#ef9b0f"
         name="Gamboge Herb"
@@ -1782,7 +1785,6 @@
         type="generic"
         weight="1"
         max-per-slot="10"/>
-
     <item id="683"
         image="generic-herb.png|W:#e32636"
         name="Alizarin Herb"
@@ -1790,7 +1792,6 @@
         type="generic"
         weight="1"
         max-per-slot="10"/>
-
     <item id="684"
         image="use-potion-a.png|G:#b03678,ffffff"
         name="Tiny Healing Potion"
@@ -1800,7 +1801,6 @@
         hp="100"
         weight="5"
         max-per-slot="10"/>
-
     <item id="685"
         image="use-potion-d.png|G:#b03678,ffffff"
         name="Small Healing Potion"
@@ -1810,7 +1810,6 @@
         hp="200"
         weight="10"
         max-per-slot="10"/>
-
     <item id="686"
         image="use-potion-b.png|G:#b03678,ffffff"
         name="Medium Healing Potion"
@@ -1820,7 +1819,6 @@
         hp="400"
         weight="20"
         max-per-slot="10"/>
-
     <item id="687"
         image="use-potion-c.png|G:#b03678,ffffff"
         name="Large Healing Potion"
@@ -1830,28 +1828,26 @@
         hp="800"
         weight="40"
         max-per-slot="10"/>
-
-     <item id="688"
-         image="armor-chest-tanktop.png"
-         name="White Tank Top"
-         description="A sleeveless shirt for hot summer days."
-         effect="Defense: +2"
-         type="equip-torso"
-         weight="15">
-         <sprite gender="male">chest-tanktop-male.xml</sprite>
-         <sprite gender="female">chest-tanktop-female.xml</sprite>
-     </item>
-     <item id="689"
-         image="armor-chest-tanktop-short.png"
-         name="White Short Tank Top"
-         description="A short, sleeveless shirt for VERY hot summer days."
-         effect="Defense: +2"
-         type="equip-torso"
-         weight="15">
-         <sprite gender="male">chest-shorttanktop-male.xml</sprite>
-         <sprite gender="female">chest-shorttanktop-female.xml</sprite>
-     </item>    
-
+    <item id="688"
+        image="armor-chest-tanktop.png"
+        name="White Tank Top"
+        description="A sleeveless shirt for hot summer days."
+        effect="+2% Defense"
+        type="equip-torso"
+        weight="15">
+        <sprite gender="male">chest-tanktop-male.xml</sprite>
+        <sprite gender="female">chest-tanktop-female.xml</sprite>
+    </item>
+    <item id="689"
+        image="armor-chest-tanktop-short.png"
+        name="White Short Tank Top"
+        description="A short, sleeveless shirt for VERY hot summer days."
+        effect="+2% Defense"
+        type="equip-torso"
+        weight="15">
+        <sprite gender="male">chest-shorttanktop-male.xml</sprite>
+        <sprite gender="female">chest-shorttanktop-female.xml</sprite>
+    </item>    
     <item id="690"
         image="use-potion-d.png|G:#a50000,e03f27,eb5558"
         name="Red Dye"
@@ -1859,7 +1855,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="691"
         image="use-potion-d.png|G:#1f9c1f,89d689"
         name="Green Dye"
@@ -1867,7 +1862,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="692"
         image="use-potion-d.png|G:#4b4bbd,888af4"
         name="Dark Blue Dye"
@@ -1875,7 +1869,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="693"
         image="use-potion-d.png|G:#ccb534,f1ea8e,ffffaa"
         name="Yellow Dye"
@@ -1883,7 +1876,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="694"
         image="use-potion-d.png|G:#62aaca,a3f4f8,d5fcfb"
         name="Light Blue Dye"
@@ -1891,7 +1883,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="695"
         image="use-potion-d.png|G:#c64abd,f9a5f2,fcd0fa"
         name="Pink Dye"
@@ -1899,7 +1890,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="696"
         image="use-potion-d.png|G:#404040,c0c0c0"
         name="Black Dye"
@@ -1907,7 +1897,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="697"
         image="use-potion-d.png|G:#96370f,cc5616,f68d26,fcaa2d,fdd493"
         name="Orange Dye"
@@ -1915,7 +1904,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="698"
         image="use-potion-d.png|G:#530a7c,b362e1,ca87ef"
         name="Purple Dye"
@@ -1923,7 +1911,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="699"
         image="use-potion-d.png|G:#155515,206620,409940"
         name="Dark Green Dye"
@@ -1931,7 +1918,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-
     <item id="700"
         image="generic-pearl.png"
         name="Pearl"
@@ -1939,7 +1925,6 @@
         type="generic"
         weight="5"
         max-per-slot="10"/>
-
     <item id="701"
         image="generic-powder.png"
         name="Pile of Ash"
@@ -1947,7 +1932,6 @@
         type="generic"
         weight="3"
         max-per-slot="10"/>
-
     <item id="702"
         image="armor-ring-wedding.png"
         name="Wedding Ring"
@@ -1955,23 +1939,29 @@
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
-
     <item id="703"
-          image="generic-powder.png|W:#606030,b0b090,e0e0a0,ffffe0"
-          name="Sulphur Powder"
-          description="A small pile of sulphur."
-          type="generic"
-          weight="2"
-          max-per-slot="10"/>
-
+        image="generic-powder.png|W:#606030,b0b090,e0e0a0,ffffe0"
+        name="Sulphur Powder"
+        description="A small pile of sulphur."
+        type="generic"
+        weight="2"
+        max-per-slot="10"/>
     <item id="704"
-          image="generic-powder.png|W:#405060"
-          name="Iron Powder"
-          description="A pile of powdered iron."
-          type="generic"
-          weight="5"
+        image="generic-powder.png|W:#405060"
+        name="Iron Powder"
+        description="A pile of powdered iron."
+        type="generic"
+        weight="5"
+        max-per-slot="10"/>
+    <item id="705"
+          image="use-potion-e.png|R:#f04030;G:#ee8e5e"
+          name="Magic Potion"
+          description="A dark, sirupy brew, with a smell reminiscent of manaberries."
+          effect="+10 MP"
+          type="usable"
+          mp="10"
+          weight="50"
           max-per-slot="10"/>
-
     <item id="706"
         image="generic-scorpionstinger.png|W:#e0d080,fff0e0,ffffff"
         name="Golden Scorpion Stinger"
@@ -1979,7 +1969,6 @@
         effect=""
         type="generic"
         weight="2"/>
-
     <item id="707"
         image="use-potion-e.png|R:#504030;G:#9e8e5e"
         name="Monster Oil Potion"
@@ -1988,7 +1977,6 @@
         type="generic"
         weight="50"
         max-per-slot="10"/>
-
     <item id="708"
         image="generic-patch-leather.png"
         name="Leather Patch"
@@ -1996,7 +1984,6 @@
         effect=""
         type="generic"
         weight="18"/>
-
     <item id="709"
         image="generic-scorpionstinger.png|W:#a08040"
         name="Black Scorpion Stinger"
@@ -2004,7 +1991,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="710"
         image="generic-snake-tongue.png|W:#e04020"
         name="Snake Tongue"
@@ -2012,7 +1998,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="711"
         image="generic-snake-tongue.png|W:#706060"
         name="Mountain Snake Tongue"
@@ -2020,7 +2005,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="712"
         image="generic-snake-tongue.png|W:#a05050,e08080"
         name="Grass Snake Tongue"
@@ -2028,7 +2012,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="713"
         image="generic-snake-tongue.png|W:#907070,d0a0a0"
         name="Cave Snake Tongue"
@@ -2036,7 +2019,6 @@
         effect=""
         type="generic"
         weight="1"/>
-
     <item id="714"
         image="use-food-snake-egg.png|W:#c0c0a0;R:#b09070;G:#b8a888"
         name="Snake Egg"
@@ -2044,7 +2026,6 @@
         effect="+30 HP"
         type="generic"
         weight="2"/>
-
     <item id="715"
         image="use-food-snake-egg.png|W:#806020;R:#604010;G:#705018"
         name="Mountain Snake Egg"
@@ -2052,7 +2033,6 @@
         effect="+40 HP"
         type="generic"
         weight="2"/>
-
     <item id="716"
         image="use-food-snake-egg.png|W:#e0e0c0;R:#80f0a0;G:#b0e8b0"
         name="Grass Snake Egg"
@@ -2060,7 +2040,6 @@
         effect="+50 HP"
         type="generic"
         weight="2"/>
-
     <item id="717"
         image="use-food-snake-egg.png|W:#c0c0c0;R:#c090c0;G:#c0a8c0"
         name="Cave Snake Egg"
@@ -2068,7 +2047,6 @@
         effect="+20 HP"
         type="generic"
         weight="2"/>
-
     <item id="718"
         image="generic-cocoon-silk.png"
         name="Silk Cocoon"
@@ -2077,11 +2055,13 @@
         type="generic"
         weight="1"/>
 
+    <!-- PLACEHOLDER FOR ITEM 719 -->
+
     <item id="720"
         image="armor-chest-robe.png|W:#ffffff"
         name="Silk Robe"
         description="A light and shimmering silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2089,16 +2069,85 @@
         <sprite gender="male">chest-robe-male.xml|#ffffff</sprite>
         <sprite gender="female">chest-robe-female.xml|#ffffff</sprite>
     </item>
+    <item id="721"
+        image="armor-head-highpriest-crown.png"
+        name="High Priest Crown"
+        description="A golden crown with an enchanted ruby."
+        effect="+4% Defense, +20 SP"
+        type="equip-head"
+        defense="4"
+        weight="60">
+        <sprite>head-highpriest-crown.xml</sprite>
+    </item>
+    <item id="722"
+        image="armor-head-monster-skull-helm.png"
+        name="Monster Skull Helmet"
+        description="The conserved skull of a mysterious ancient monster."
+        effect="+7% Defense, +20% Magic Defense"
+        type="equip-head"
+        defense="7"
+        weight="40">
+        <sprite>head-monster-skull-helm.xml</sprite>
+    </item>
+    <item id="723"
+        image="armor-head-deserthat.png|R:#FFFFFF"
+        name="Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFFFFF</sprite>
+    </item>
+    <item id="724"
+        image="armor-head-standardheadband.png|W:#FFFFFF"
+        name="Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFFFFF</sprite>
+    </item>
+    <item id="725"
+        image="armor-head-gmcap.png|R:#BF0E08"
+        name="GM's Cap"
+        description="A cap which identifies you as a GM."
+        effect="+5% Defense"
+        type="equip-head"
+        defense="5"
+        weight="10">
+        <sprite>head-gmcap.xml|#BF0E08</sprite>
+    </item>
+    <item id="726"
+        image="armor-chest-robe.png|W:#E40A0A"
+        name="GM Robe"
+        description="A light and shimmering silk robe made for GMs."
+        effect="+5% Defense"
+        type="equip-torso"
+        weight="10"
+        defense="5"
+        max-per-slot="1">
+        <sprite gender="male">chest-robe-male.xml|#E40A0A</sprite>
+        <sprite gender="female">chest-robe-female.xml|#E40A0A</sprite>
+    </item>
+    <item id="727"
+        image="generic-iten.png|W:#ffe0f0"
+        name="Iten"
+        description="An iten."
+        effect=""
+        type="generic"
+        weight="100"/>
+
+
+    <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
-    <!--
-                         HERE ARE SOME UNUSED ITEM IDs
-           -->
         
     <item id="1199"
         image="weapon-arrow-arrow.png"
         name="Arrow"
         description="A standard arrow."
-        effect="Damage: +25"
+        effect="+25 Damage"
         type="equip-ammo"
         weight="8"
         max-per-slot="100"/>
@@ -2106,7 +2155,7 @@
         image="weapon-bow-bow.png"
         name="Bow"
         description="A distance weapon."
-        effect="Damage: +15 / Range: 5"
+        effect="+15 Damage, 5 Range"
         type="equip-2hand"
         weapon_type="10"
         weight="125"
@@ -2125,7 +2174,7 @@
         image="weapon-dagger-knive.png"
         name="Knife"
         description="A small knife, the perfect weapon for a beginner."
-        effect="Damage: 5 / Range: 1"
+        effect="+5 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="1"
         weight="20"
@@ -2142,7 +2191,7 @@
         image="armor-chest-cottonshirt.png"
         name="Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15"
         defense="2"
@@ -2154,7 +2203,7 @@
         image="armor-head-rangerhat.png"
         name="Ranger Hat"
         description="A leather hat traditionally worn by Rangers."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="55"
         defense="2"
@@ -2165,7 +2214,7 @@
         image="armor-head-antlerhat.png"
         name="Antler Hat"
         description="A hat with antlers sticking out of it."
-        effect="Defense: +4"
+        effect="+4% Defense"
         type="equip-head"
         weight="20"
         defense="4"
@@ -2176,7 +2225,7 @@
         image="armor-head-christmastree.png"
         name="Christmas Tree Hat"
         description="A hat shaped like a Christmas tree."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-head"
         weight="25"
         defense="2"
@@ -2187,7 +2236,7 @@
         image="armor-head-santabeardhat.png"
         name="Santa Beard Hat"
         description="Now you will look just like Santa Claus!"
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-head"
         weight="30"
         defense="5"
@@ -2254,7 +2303,7 @@
         image="armor-head-bunnyears.png"
         name="Bunny Ears"
         description="A headband with plush bunny ears."
-        effect="Defense: +10"
+        effect="+10% Defense"
         type="equip-head"
         defense="10"
         weight="20">
@@ -2264,7 +2313,7 @@
         image="weapon-sword-sabre.png"
         name="Toy Sabre"
         description="A toy item, doesn't do much damage."
-        effect="Damage: +1"
+        effect="+1 Damage, 1 Range"
         type="equip-1hand"
         weapon-type="sword"
         weight="1"
@@ -2279,6 +2328,26 @@
         <sound event="strike">short-sword-miss1.ogg</sound>
         <sound event="hit">short-sword-hit1.ogg</sound>
     </item>
+    <item id="1216"
+        image="armor-head-mouboohead.png"
+        name="Mouboo Head"
+        description="A tightly fitting mouboo head."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="1"
+        weight="20">
+        <sprite>head-mouboohead.xml</sprite>
+    </item>
+    <item id="1217"
+        image="armor-head-catears.png"
+        name="Cat Ears"
+        description="A pair of plush cat ears. Meow!"
+        effect="+1% Defense, +3 Agility"
+        type="equip-head"
+        defense="1"
+        weight="2">
+        <sprite>head-catears.xml</sprite>
+    </item>
 
     <!-- The 2XXY IDs are used for recolored items on eAthena.
         XX = item
@@ -2293,7 +2362,7 @@
         image="armor-chest-cottonshirt.png|W:#441111,aa3333,dd6666"
         name="Red Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#441111,aa3333,dd6666</sprite>
@@ -2303,7 +2372,7 @@
         image="armor-chest-cottonshirt.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#115511,22aa22,99dd99</sprite>
@@ -2313,7 +2382,7 @@
         image="armor-chest-cottonshirt.png|W:#222255,6666ff"
         name="Dark Blue Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#222255,6666ff</sprite>
@@ -2323,7 +2392,7 @@
         image="armor-chest-cottonshirt.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -2333,7 +2402,7 @@
         image="armor-chest-cottonshirt.png|W:#223355,99aadd,bbccff"
         name="Light Blue Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#223355,99aadd,bbccff</sprite>
@@ -2343,7 +2412,7 @@
         image="armor-chest-cottonshirt.png|W:#552255,ff66ff,ffffff"
         name="Pink Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -2353,7 +2422,7 @@
         image="armor-chest-cottonshirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -2363,7 +2432,7 @@
         image="armor-chest-cottonshirt.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -2373,7 +2442,7 @@
         image="armor-chest-cottonshirt.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -2383,17 +2452,18 @@
         image="armor-chest-cottonshirt.png|W:#155515,206620,409940"
         name="Dark Green Cotton Shirt"
         description="A shirt made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-cotton-male.xml|#155515,206620,409940</sprite>
         <sprite gender="female">chest-cotton-female.xml|#155515,206620,409940</sprite>
     </item>
+
     <item id="2060"
         image="armor-chest-vnecksweater.png|W:#441111,aa3333,dd6666"
         name="Red V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#441111,aa3333,dd6666</sprite>
@@ -2403,7 +2473,7 @@
         image="armor-chest-vnecksweater.png|W:#115511,22aa22,99dd99"
         name="Green V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
@@ -2413,7 +2483,7 @@
         image="armor-chest-vnecksweater.png|W:#222255,6666ff"
         name="Dark Blue V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#222255,6666ff</sprite>
@@ -2423,7 +2493,7 @@
         image="armor-chest-vnecksweater.png|W:#887722,ddcc66,ffffaa"
         name="Yellow V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -2433,7 +2503,7 @@
         image="armor-chest-vnecksweater.png|W:#223355,99aadd,bbccff"
         name="Light Blue V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#223355,99aadd,bbccff</sprite>
@@ -2443,7 +2513,7 @@
         image="armor-chest-vnecksweater.png|W:#552255,ff66ff,ffffff"
         name="Pink V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -2453,7 +2523,7 @@
         image="armor-chest-vnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -2463,7 +2533,7 @@
         image="armor-chest-vnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -2473,7 +2543,7 @@
         image="armor-chest-vnecksweater.png|W:#4f0a76,8010c0,d699f7"
         name="Purple V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -2483,17 +2553,18 @@
         image="armor-chest-vnecksweater.png|W:#155515,206620,409940"
         name="Dark Green V-Neck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +8"
+        effect="+8% Defense"
         type="equip-torso"
         weight="45">
         <sprite gender="male">chest-vnecksweater-male.xml|#155515,206620,409940</sprite>
         <sprite gender="female">chest-vnecksweater-female.xml|#155515,206620,409940</sprite>
     </item>
+
     <item id="2070"
         image="armor-chest-tnecksweater.png|W:#441111,aa3333,dd6666"
         name="Red Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#441111,aa3333,dd6666</sprite>
@@ -2503,7 +2574,7 @@
         image="armor-chest-tnecksweater.png|W:#115511,22aa22,99dd99"
         name="Green Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
@@ -2513,7 +2584,7 @@
         image="armor-chest-tnecksweater.png|W:#222255,6666ff"
         name="Dark Blue Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#222255,6666ff</sprite>
@@ -2523,7 +2594,7 @@
         image="armor-chest-tnecksweater.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -2533,7 +2604,7 @@
         image="armor-chest-tnecksweater.png|W:#223355,99aadd,bbccff"
         name="Light Blue Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#223355,99aadd,bbccff</sprite>
@@ -2543,7 +2614,7 @@
         image="armor-chest-tnecksweater.png|W:#552255,ff66ff,ffffff"
         name="Pink Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -2553,7 +2624,7 @@
         image="armor-chest-tnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -2563,7 +2634,7 @@
         image="armor-chest-tnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -2573,7 +2644,7 @@
         image="armor-chest-tnecksweater.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -2583,17 +2654,18 @@
         image="armor-chest-tnecksweater.png|W:#155515,206620,409940"
         name="Dark Green Turtleneck Sweater"
         description="A soft and warm sweater."
-        effect="Defense: +6"
+        effect="+6% Defense"
         type="equip-torso"
         weight="40">
         <sprite gender="male">chest-tnecksweater-male.xml|#155515,206620,409940</sprite>
         <sprite gender="female">chest-tnecksweater-female.xml|#155515,206620,409940</sprite>
     </item>
+
     <item id="2080"
         image="armor-chest-robe.png|W:#441111,aa3333,dd6666"
         name="Red Silk Robe"
         description="A red silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2605,7 +2677,7 @@
         image="armor-chest-robe.png|W:#115511,22aa22,99dd99"
         name="Green Silk Robe"
         description="A green silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2617,7 +2689,7 @@
         image="armor-chest-robe.png|W:#222255,6666ff"
         name="Dark Blue Silk Robe"
         description="A dark blue silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2629,7 +2701,7 @@
         image="armor-chest-robe.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Silk Robe"
         description="A yellow silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2641,7 +2713,7 @@
         image="armor-chest-robe.png|W:#223355,99aadd,bbccff"
         name="Light Blue Silk Robe"
         description="A light blue silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2653,7 +2725,7 @@
         image="armor-chest-robe.png|W:#552255,ff66ff,ffffff"
         name="Pink Silk Robe"
         description="A pink silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2665,7 +2737,7 @@
         image="armor-chest-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Silk Robe"
         description="A black silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2677,7 +2749,7 @@
         image="armor-chest-robe.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Silk Robe"
         description="An orange silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2689,7 +2761,7 @@
         image="armor-chest-robe.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Silk Robe"
         description="A purple silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2701,7 +2773,7 @@
         image="armor-chest-robe.png|W:#155515,206620,409940"
         name="Dark Green Silk Robe"
         description="A dark green silk robe."
-        effect="Defense: +5"
+        effect="+5% Defense"
         type="equip-torso"
         weight="10"
         defense="5"
@@ -2714,7 +2786,7 @@
         image="armor-chest-tanktop.png|W:#441111,aa3333,dd6666" 
 	name="Red Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#441111,aa3333,dd6666</sprite>
@@ -2724,7 +2796,7 @@
         image="armor-chest-tanktop.png|W:#115511,22aa22,99dd99"
         name="Green Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#115511,22aa22,99dd99</sprite>
@@ -2734,7 +2806,7 @@
         image="armor-chest-tanktop.png|W:#222255,6666ff"
         name="Dark Blue Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#222255,6666ff</sprite>
@@ -2744,7 +2816,7 @@
         image="armor-chest-tanktop.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#887722,ddcc66,ffffaa</sprite>
@@ -2753,7 +2825,7 @@
     <item id="2094" image="armor-chest-tanktop.png|W:#223355,99aadd,bbccff"
         name="Light Blue Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#223355,99aadd,bbccff</sprite>
@@ -2762,7 +2834,7 @@
     <item id="2095" image="armor-chest-tanktop.png|W:#552255,ff66ff,ffffff"
         name="Pink Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -2772,7 +2844,7 @@
         image="armor-chest-tanktop.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -2782,7 +2854,7 @@
         image="armor-chest-tanktop.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -2791,7 +2863,7 @@
     <item id="2098" image="armor-chest-tanktop.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -2801,7 +2873,7 @@
         image="armor-chest-tanktop.png|W:#155515,206620,409940"
         name="Dark Green Tank Top"
         description="A sleeveless shirt for hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-tanktop-male.xml|#155515,206620,409940</sprite>
@@ -2812,7 +2884,7 @@
         image="armor-legs-skirt.png|W:#a50000,e03f27,eb5558"
         name="Red Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2823,7 +2895,7 @@
         image="armor-legs-skirt.png|W:#1f9c1f,89d689"
         name="Green Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2834,7 +2906,7 @@
         image="armor-legs-skirt.png|W:#4b4bbd,888af4"
         name="Dark Blue Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2845,7 +2917,7 @@
         image="armor-legs-skirt.png|W:#ccb534,f1ea8e,ffffaa"
         name="Yellow Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2856,7 +2928,7 @@
         image="armor-legs-skirt.png|W:#62aaca,a3f4f8,d5fcfb"
         name="Light Blue Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2867,7 +2939,7 @@
         image="armor-legs-skirt.png|W:#c64abd,f9a5f2,fcd0fa"
         name="Pink Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2878,7 +2950,7 @@
         image="armor-legs-skirt.png|W:#404040,c0c0c0"
         name="Black Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2889,7 +2961,7 @@
         image="armor-legs-skirt.png|W:#96370f,cc5616,f68d26,fcaa2d,fdd493"
         name="Orange Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2900,7 +2972,7 @@
         image="armor-legs-skirt.png|W:#530a7c,b362e1,ca87ef"
         name="Purple Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2911,7 +2983,7 @@
         image="armor-legs-skirt.png|W:#155515,206620,409940"
         name="Dark Green Cotton Skirt"
         description="A skirt made of linen cloth."
-        effect="Defense: +4"
+        effect="+4% Defense"
 	defense="4"
         type="equip-legs"
         weight="30"
@@ -2923,7 +2995,7 @@
         image="armor-legs-shorts.png|W:#441111,aa3333,dd6666"
         name="Red Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -2935,7 +3007,7 @@
         image="armor-legs-shorts.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -2947,7 +3019,7 @@
         image="armor-legs-shorts.png|W:#222255,6666ff"
         name="Dark Blue Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -2959,7 +3031,7 @@
         image="armor-legs-shorts.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -2971,7 +3043,7 @@
         image="armor-legs-shorts.png|W:#223355,99aadd,bbccff"
         name="Light Blue Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -2983,7 +3055,7 @@
         image="armor-legs-shorts.png|W:#552255,ff66ff,ffffff"
         name="Pink Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -2995,7 +3067,7 @@
         image="armor-legs-shorts.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3007,7 +3079,7 @@
         image="armor-legs-shorts.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3019,7 +3091,7 @@
         image="armor-legs-shorts.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3031,7 +3103,7 @@
         image="armor-legs-shorts.png|W:#155515,206620,409940"
         name="Dark Green Cotton Shorts"
         description="Shorts made of 100% cotton."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-legs"
         weight="10"
         defense="2"
@@ -3044,7 +3116,7 @@
         image="armor-chest-tanktop-short.png|W:#441111,aa3333,dd6666" 
 	name="Red Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#441111,aa3333,dd6666</sprite>
@@ -3054,7 +3126,7 @@
         image="armor-chest-tanktop-short.png|W:#115511,22aa22,99dd99"
         name="Green Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#115511,22aa22,99dd99</sprite>
@@ -3064,7 +3136,7 @@
         image="armor-chest-tanktop-short.png|W:#222255,6666ff"
         name="Dark Blue Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#222255,6666ff</sprite>
@@ -3074,25 +3146,27 @@
         image="armor-chest-tanktop-short.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#887722,ddcc66,ffffaa</sprite>
         <sprite gender="female">chest-shorttanktop-female.xml|#887722,ddcc66,ffffaa</sprite>
     </item>
-    <item id="2124" image="armor-chest-tanktop-short.png|W:#223355,99aadd,bbccff"
+    <item id="2124"
+        image="armor-chest-tanktop-short.png|W:#223355,99aadd,bbccff"
         name="Light Blue Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#223355,99aadd,bbccff</sprite>
         <sprite gender="female">chest-shorttanktop-female.xml|#223355,99aadd,bbccff</sprite>
     </item>
-    <item id="2125" image="armor-chest-tanktop-short.png|W:#552255,ff66ff,ffffff"
+    <item id="2125"
+        image="armor-chest-tanktop-short.png|W:#552255,ff66ff,ffffff"
         name="Pink Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#552255,ff66ff,ffffff</sprite>
@@ -3102,7 +3176,7 @@
         image="armor-chest-tanktop-short.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -3112,7 +3186,7 @@
         image="armor-chest-tanktop-short.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
@@ -3121,7 +3195,7 @@
     <item id="2128" image="armor-chest-tanktop-short.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
@@ -3131,11 +3205,212 @@
         image="armor-chest-tanktop-short.png|W:#155515,206620,409940"
         name="Dark Green Short Tank Top"
         description="A short, sleeveless shirt for VERY hot summer days."
-        effect="Defense: +2"
+        effect="+2% Defense"
         type="equip-torso"
         weight="15">
         <sprite gender="male">chest-shorttanktop-male.xml|#155515,206620,409940</sprite>
         <sprite gender="female">chest-shorttanktop-female.xml|#155515,206620,409940</sprite>
     </item>
 
+    <item id="2130"
+        image="armor-head-deserthat.png|R:#FF0000"
+        name="Red Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FF0000</sprite>
+    </item>
+    <item id="2131"
+        image="armor-head-deserthat.png|R:#55FF55"
+        name="Green Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#55FF55</sprite>
+    </item>
+    <item id="2132"
+        image="armor-head-deserthat.png|R:#0000C0"
+        name="Dark Blue Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#0000C0</sprite>
+    </item>
+    <item id="2133"
+        image="armor-head-deserthat.png|R:#FFFF00"
+        name="Yellow Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFFF00</sprite>
+    </item>
+    <item id="2134"
+        image="armor-head-deserthat.png|R:#5555FF"
+        name="Light Blue Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#5555FF</sprite>
+    </item>
+    <item id="2135"
+        image="armor-head-deserthat.png|R:#FFC0C0"
+        name="Pink Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFC0C0</sprite>
+    </item>
+    <item id="2136"
+        image="armor-head-deserthat.png|R:#666666"
+        name="Black Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#666666</sprite>
+    </item>
+    <item id="2137"
+        image="armor-head-deserthat.png|R:#FFC000"
+        name="Orange Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#FFC000</sprite>
+    </item>
+    <item id="2138"
+        image="armor-head-deserthat.png|R:#C000FF"
+        name="Purple Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#C000FF</sprite>
+    </item>
+    <item id="2139"
+        image="armor-head-deserthat.png|R:#00C000"
+        name="Dark Green Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't do you little against a physical blow to the head."
+        effect="+3% Defense"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>head-deserthat.xml|#00C000</sprite>
+    </item>
+
+    <item id="2140"
+        image="armor-head-standardheadband.png|W:#FF0000"
+        name="Red Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FF0000</sprite>
+    </item>
+    <item id="2141"
+        image="armor-head-standardheadband.png|W:#55FF55"
+        name="Green Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#55FF55</sprite>
+    </item>
+    <item id="2142"
+        image="armor-head-standardheadband.png|W:#0000C0"
+        name="Dark Blue Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#0000C0</sprite>
+    </item>
+    <item id="2143"
+        image="armor-head-standardheadband.png|W:#FFFF00"
+        name="Yellow Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFFF00</sprite>
+    </item>
+    <item id="2144"
+        image="armor-head-standardheadband.png|W:#5555FF"
+        name="Light Blue Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#5555FF</sprite>
+    </item>
+    <item id="2145"
+        image="armor-head-standardheadband.png|W:#FFC0C0"
+        name="Pink Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFC0C0</sprite>
+    </item>
+    <item id="2146"
+        image="armor-head-standardheadband.png|W:#666666"
+        name="Black Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#666666</sprite>
+    </item>
+    <item id="2147"
+        image="armor-head-standardheadband.png|W:#FFC000"
+        name="Orange Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#FFC000</sprite>
+    </item>
+    <item id="2148"
+        image="armor-head-standardheadband.png|W:#C000FF"
+        name="Purple Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#C000FF</sprite>
+    </item>
+    <item id="2149"
+        image="armor-head-standardheadband.png|W:#00C000"
+        name="Dark Green Cotton Headband"
+        description="Just a cotton headband."
+        effect="+1% Defense"
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>item007.xml|#00C000</sprite>
+    </item>
 </items>