From 94d5f752a3fbda4fe0b6d684804ec26d5f461a3e Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 16 Apr 2008 17:31:35 +0000
Subject: Merged in the differences with the client trunk data, in preparation
 of client trunk data removal (please don't modify stuff there anymore, do it
 here).

---
 graphics/items/armor-ring-agility-rough.png      |  Bin 0 -> 495 bytes
 graphics/items/armor-ring-dexterity-rough.png    |  Bin 0 -> 496 bytes
 graphics/items/armor-ring-intelligence-rough.png |  Bin 0 -> 496 bytes
 graphics/items/armor-ring-strength-rough.png     |  Bin 0 -> 522 bytes
 graphics/items/armor-ring-vitality-rough.png     |  Bin 0 -> 496 bytes
 graphics/items/armor-ring-willpower-rough.png    |  Bin 0 -> 496 bytes
 graphics/sprites/npc-test.png                    |  Bin 0 -> 27664 bytes
 graphics/sprites/npc-test.xml                    |   32 +
 graphics/sprites/npc-treasurebox.png             |  Bin 0 -> 5096 bytes
 graphics/sprites/npc-treasurebox.xml             |    9 +
 items.xml                                        | 1704 +++++++++++++++++++---
 maps/new_10-1.tmx                                |   14 +
 maps/new_11-1.tmx                                |   14 +
 monsters.xml                                     |  233 ++-
 npcs.xml                                         |   80 +
 15 files changed, 1898 insertions(+), 188 deletions(-)
 create mode 100644 graphics/items/armor-ring-agility-rough.png
 create mode 100644 graphics/items/armor-ring-dexterity-rough.png
 create mode 100644 graphics/items/armor-ring-intelligence-rough.png
 create mode 100644 graphics/items/armor-ring-strength-rough.png
 create mode 100644 graphics/items/armor-ring-vitality-rough.png
 create mode 100644 graphics/items/armor-ring-willpower-rough.png
 create mode 100644 graphics/sprites/npc-test.png
 create mode 100644 graphics/sprites/npc-test.xml
 create mode 100644 graphics/sprites/npc-treasurebox.png
 create mode 100644 graphics/sprites/npc-treasurebox.xml
 create mode 100644 npcs.xml

diff --git a/graphics/items/armor-ring-agility-rough.png b/graphics/items/armor-ring-agility-rough.png
new file mode 100644
index 00000000..ce3a3b14
Binary files /dev/null and b/graphics/items/armor-ring-agility-rough.png differ
diff --git a/graphics/items/armor-ring-dexterity-rough.png b/graphics/items/armor-ring-dexterity-rough.png
new file mode 100644
index 00000000..2ae35f49
Binary files /dev/null and b/graphics/items/armor-ring-dexterity-rough.png differ
diff --git a/graphics/items/armor-ring-intelligence-rough.png b/graphics/items/armor-ring-intelligence-rough.png
new file mode 100644
index 00000000..eabaf93e
Binary files /dev/null and b/graphics/items/armor-ring-intelligence-rough.png differ
diff --git a/graphics/items/armor-ring-strength-rough.png b/graphics/items/armor-ring-strength-rough.png
new file mode 100644
index 00000000..b860d6e3
Binary files /dev/null and b/graphics/items/armor-ring-strength-rough.png differ
diff --git a/graphics/items/armor-ring-vitality-rough.png b/graphics/items/armor-ring-vitality-rough.png
new file mode 100644
index 00000000..8577e2ff
Binary files /dev/null and b/graphics/items/armor-ring-vitality-rough.png differ
diff --git a/graphics/items/armor-ring-willpower-rough.png b/graphics/items/armor-ring-willpower-rough.png
new file mode 100644
index 00000000..1fd2b566
Binary files /dev/null and b/graphics/items/armor-ring-willpower-rough.png differ
diff --git a/graphics/sprites/npc-test.png b/graphics/sprites/npc-test.png
new file mode 100644
index 00000000..eb8f2f22
Binary files /dev/null and b/graphics/sprites/npc-test.png differ
diff --git a/graphics/sprites/npc-test.xml b/graphics/sprites/npc-test.xml
new file mode 100644
index 00000000..a221dbe6
--- /dev/null
+++ b/graphics/sprites/npc-test.xml
@@ -0,0 +1,32 @@
+<?xml version = '1.0'?>
+<sprite action="stand" name="npc" >
+  <imageset width="64" height="64" name="base" src="graphics/sprites/npc-test.png" />
+  <action imageset="base" name="stand" >
+    <animation direction="down" >
+      <frame index="0" />
+    </animation>
+    <animation direction="left" >
+      <frame index="7" />
+    </animation>
+    <animation direction="up" >
+      <frame index="14" />
+    </animation>
+    <animation direction="right" >
+      <frame index="21" />
+    </animation>
+  </action>
+  <action imageset="base" name="walk" >
+    <animation direction="down" >
+      <sequence end="6" delay="75" start="1" />
+    </animation>
+    <animation direction="left" >
+      <sequence end="13" delay="75" start="8" />
+    </animation>
+    <animation direction="up" >
+      <sequence end="20" delay="75" start="15" />
+    </animation>
+    <animation direction="right" >
+      <sequence end="27" delay="75" start="22" />
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/npc-treasurebox.png b/graphics/sprites/npc-treasurebox.png
new file mode 100644
index 00000000..09e602a8
Binary files /dev/null and b/graphics/sprites/npc-treasurebox.png differ
diff --git a/graphics/sprites/npc-treasurebox.xml b/graphics/sprites/npc-treasurebox.xml
new file mode 100644
index 00000000..e54d825a
--- /dev/null
+++ b/graphics/sprites/npc-treasurebox.xml
@@ -0,0 +1,9 @@
+<?xml version = '1.0'?>
+<sprite action="stand" name="open-treasure-npc" >
+  <imageset width="64" height="64" name="base" src="graphics/sprites/npc-treasurebox.png" />
+  <action imageset="base" name="stand" >
+    <animation stand="default" >
+      <sequence end="6" delay="75" start="0" />
+    </animation>
+  </action>
+</sprite>
diff --git a/items.xml b/items.xml
index b6603ebc..dc0ad40e 100644
--- a/items.xml
+++ b/items.xml
@@ -7,44 +7,47 @@
 
     Note that the 'attacktype' attribute isn't used anymore since version
     0.0.24, but it is kept until we stop supporting 0.0.23.
+
+    The 'weapon_type' attribute is kept for 0.0 client compatibility. Not to be
+    confused with 'weapon-type'.
 -->
 <items>
     <!-- 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 compatiblity anymore.
     -->
-    <item id="-1">
+    <item id="-1" type="hairsprite">
         <sprite gender="male">hairstyle1-male.xml</sprite>
         <sprite gender="female">hairstyle1-female.xml</sprite>
     </item>
-    <item id="-2">
+    <item id="-2" type="hairsprite">
         <sprite gender="male">hairstyle2-male.xml</sprite>
         <sprite gender="female">hairstyle2-female.xml</sprite>
     </item>
-    <item id="-3">
+    <item id="-3" type="hairsprite">
         <sprite gender="male">hairstyle3-male.xml</sprite>
         <sprite gender="female">hairstyle3-female.xml</sprite><!-- to be replaced with the animated one -->
     </item>
-    <item id="-4">
+    <item id="-4" type="hairsprite">
         <sprite gender="male">hairstyle4-male.xml</sprite>
         <sprite gender="female">hairstyle4-female.xml</sprite>
     </item>
-    <item id="-5">
+    <item id="-5" type="hairsprite">
         <sprite gender="male">hairstyle5-male.xml</sprite>
         <sprite gender="female">hairstyle5-female.xml</sprite>
     </item>
-    <item id="-6">
+    <item id="-6" type="hairsprite">
         <sprite gender="male">hairstyle6-male.xml</sprite>
         <sprite gender="female">hairstyle6-female.xml</sprite>
     </item>
-    <item id="-7">
+    <item id="-7" type="hairsprite">
         <sprite gender="male">hairstyle7-male.xml</sprite>
         <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
          implement other playable races -->
-    <item id="-100">
+    <item id="-100" type="racesprite">
         <sprite gender="male">player_male_base.xml</sprite>
         <sprite gender="female">player_female_base.xml</sprite>
     </item>
@@ -151,16 +154,22 @@
     </item>
 
     <!-- Temporary low weapon IDs (< 256) -->
-    <item id="30" weapon_type="1" attacktype="stab">
+    <item id="30"
+        weapon_type="1"
+        attacktype="stab">
         <sprite>weapon-dagger.xml</sprite>
         <sound event="strike">short-sword-miss1.ogg</sound>
         <sound event="hit">short-sword-hit1.ogg</sound>
     </item>
-    <item id="31" weapon_type="10" attacktype="bow">
+    <item id="31"
+        weapon_type="10"
+        attacktype="bow">
         <sprite>weapon-bow.xml</sprite>
         <sound event="swing">bow_shoot_1.ogg</sound>
     </item>
-    <item id="32" weapon_type="11" attacktype="swing">
+    <item id="32"
+        weapon_type="11"
+        attacktype="swing">
         <sprite>weapon-scythe.xml</sprite>
     </item>
 
@@ -168,7 +177,7 @@
         <sprite>head-tophat.xml</sprite>
     </item>
     <item id="34">
-    	<sprite>head-funkywinter.xml</sprite>
+        <sprite>head-funkywinter.xml</sprite>
     </item>
     <item id="35">
         <sprite>head-mask.xml</sprite>
@@ -183,305 +192,1626 @@
         <sprite>head-shroom.xml</sprite>
     </item>
     <item id="39">
-    	<sprite>head-warlordhelm.xml</sprite>
+        <sprite>head-warlordhelm.xml</sprite>
     </item>
-	<item id="40">
-    	<sprite>head-knighthelm.xml</sprite>
+    <item id="40">
+        <sprite>head-knighthelm.xml</sprite>
     </item>
     <item id="41">
-    	<sprite>head-infantryhelm.xml</sprite>
+        <sprite>head-infantryhelm.xml</sprite>
     </item>
     <item id="42">
-    	<sprite>head-crusadehelm.xml</sprite>
+        <sprite>head-crusadehelm.xml</sprite>
     </item>
     <item id="43">
-    	<sprite>head-cowboywhite.xml</sprite>
+        <sprite>head-cowboywhite.xml</sprite>
     </item>
     <item id="44">
-    	<sprite>head-cowboyblack.xml</sprite>
+        <sprite>head-cowboyblack.xml</sprite>
     </item>
     <item id="45">
         <sprite gender="male">chest-lightplatemailgold-male.xml</sprite>
         <sprite gender="female">chest-lightplatemailgold-female.xml</sprite>
     </item>
     <item id="46">
-    	<sprite>head-crown.xml</sprite>
+        <sprite>head-crown.xml</sprite>
     </item>
     <item id="47">
-    	<sprite>head-devcap.xml</sprite>
+        <sprite>head-devcap.xml</sprite>
     </item>
 
-
-    <item id="501" image="use-potion-cactusdrink.png" name="Cactus drink" description="A fresh drink." effect="+15 HP" type="0" weight="25"/>
-    <item id="502" image="use-potion-cactuspotion.png" name="Cactus potion" description="A fresh potion." effect="+25 HP/+10 MP" type="0" weight="40"/>
-    <item id="503" image="generic-casinocoins.png" name="Casino coins" description="Just some casino coins." effect="" type="0" weight="10"/>
-    <item id="504" image="use-food-decorcandy.png" name="Decor candy" description="A leftover decor candy from last Christmas." effect="" type="0" weight="20"/>
-    <item id="505" image="generic-maggotslime.png" name="Maggot slime" description="Slimy maggot slime." effect="" type="0" weight="10"/>
-    <item id="506" image="use-food-candycane.png" name="Candy cane" description="Tasty candy cane." effect="+10 HP" type="0" weight="10"/>
-    <item id="507" image="generic-scorpionstinger.png" name="Scorpion stinger" description="A poisoned scorpion stinger." effect="" type="0" weight="12"/>
-    <item id="508" image="use-food-xmascake.png" name="Xmas cake" description="A sweet xmas cake." effect="+10 HP" type="0" weight="20"/>
-    <item id="509" image="use-food-chocolatebar.png" name="Chocolate bar" description="A chocolate bar made of finest chocolate." effect="+20 HP" type="0" weight="25"/>
-    <item id="510" image="use-food-candy.png" name="Candy" description="A sugar-free candy." effect="+ 5 HP" type="0" weight="10"/>
-    <item id="511" image="armor-head-santahat.png" name="Santa hat" description="Ask Santa about this hat." effect="Defense: +2" type="0" weight="15">
+    <item id="501"
+        image="use-potion-cactusdrink.png"
+        name="Cactus drink"
+        description="A fresh drink."
+        effect="+15 HP"
+        type="usable"
+        hp="15"
+        weight="25"
+        max-per-slot="10"/>
+    <item id="502"
+        image="use-potion-cactuspotion.png"
+        name="Cactus potion"
+        description="A fresh potion."
+        effect="+25 HP/+10 MP"
+        type="usable"
+        hp="25"
+        weight="40"
+        max-per-slot="10"/>
+    <item id="503"
+        image="generic-casinocoins.png"
+        name="Casino coins"
+        description="Just some casino coins."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="504"
+        image="use-food-decorcandy.png"
+        name="Decor candy"
+        description="A leftover decor candy from last Christmas."
+        effect=""
+        type="generic"
+        weight="20"
+        max-per-slot="10"/>
+    <item id="505"
+        image="generic-maggotslime.png"
+        name="Maggot slime"
+        description="Slimy maggot slime."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="506"
+        image="use-food-candycane.png"
+        name="Candy cane"
+        description="Tasty candy cane."
+        effect="+10 HP"
+        type="usable"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="507"
+        image="generic-scorpionstinger.png"
+        name="Scorpion stinger"
+        description="A poisoned scorpion stinger."
+        effect=""
+        type="generic"
+        weight="12"
+        max-per-slot="10"/>
+    <item id="508"
+        image="use-food-xmascake.png"
+        name="Xmas cake"
+        description="A sweet xmas cake."
+        effect="+10 HP"
+        type="usable"
+        hp="10"
+        weight="20"
+        max-per-slot="10"/>
+    <item id="509"
+        image="use-food-chocolatebar.png"
+        name="Chocolate bar"
+        description="A chocolate bar made of finest chocolate."
+        effect="+20 HP"
+        type="usable"
+        hp="20"
+        weight="25"
+        max-per-slot="10"/>
+    <item id="510"
+        image="use-food-candy.png"
+        name="Candy"
+        description="A sugar-free candy."
+        effect="+ 5 HP"
+        type="usable"
+        hp="5"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="511"
+        image="armor-head-santahat.png"
+        name="Santa hat"
+        description="Ask Santa about this hat."
+        effect="Defense: +2"
+        type="equip-head"
+        weight="15"
+        defense="2"
+        max-per-slot="1"
+        >
         <sprite>item010.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="0" weight="30"/>
-    <item id="513" image="use-food-cake.png" name="Cake" description="A slice of cake." effect="+15 HP" type="0" weight="25"/>
-    <item id="514" image="use-food-xmascandycane.png" name="Xmas candy cane" description="A special xmas candy cane." effect="+10 HP" type="0" weight="15"/>
-    <item id="515" image="generic-purplepresentbox.png" name="Purple present box" description="Something mysterious inside." effect="" type="0" weight="20"/>
-    <item id="516" image="generic-bluepresentbox.png" name="Blue present box" description="Something mysterious inside." effect="" type="0" weight="20"/>
-    <item id="517" image="generic-redscorpionstinger.png" name="Red scorpion stinger" description="A highly poisoned red scorpion stinger." effect="" type="0" weight="35"/>
-    <item id="518" image="generic-bugleg.png" name="Bug leg" description="A bug's leg. Mostly used for alchemy." effect="" type="0" weight="15"/>
-    <item id="519" image="use-food-cherrycake.png" name="Cherry cake" description="A nice cherry cake." effect="+35 HP" type="0" weight="50"/>
-    <item id="520" image="use-food-easteregg.png" name="Easter egg" description="A surprise." effect="+100 HP" type="0" weight="180"/>
-    <item id="521" image="weapon-dagger-dagger.png" name="Dagger" description="A simple Dagger." effect="Damage: +15 / Range: 1" type="0" weapon_type="1" weight="60" attacktype="stab">
+    <item id="512"
+        image="use-food-gingerbreadman.png"
+        name="Ginger bread man"
+        description="A tasty ginger bread man."
+        effect="+25 HP"
+        type="usable"
+        weight="30"/>
+    <item id="513"
+        image="use-food-cake.png"
+        name="Cake"
+        description="A slice of cake."
+        effect="+15 HP"
+        type="usable"
+        weight="25"/>
+    <item id="514"
+        image="use-food-xmascandycane.png"
+        name="Xmas candy cane"
+        description="A special xmas candy cane."
+        effect="+10 HP"
+        type="usable"
+        weight="15"/>
+    <item id="515"
+        image="generic-purplepresentbox.png"
+        name="Purple present box"
+        description="Something mysterious inside."
+        effect=""
+        type="generic"
+        weight="20"/>
+    <item id="516"
+        image="generic-bluepresentbox.png"
+        name="Blue present box"
+        description="Something mysterious inside."
+        effect=""
+        type="generic"
+        weight="20"/>
+    <item id="517"
+        image="generic-redscorpionstinger.png"
+        name="Red scorpion stinger"
+        description="A highly poisoned red scorpion stinger."
+        effect=""
+        type="generic"
+        weight="35"/>
+    <item id="518"
+        image="generic-bugleg.png"
+        name="Bug leg"
+        description="A bug's leg. Mostly used for alchemy."
+        effect=""
+        type="generic"
+        weight="15"/>
+    <item id="519"
+        image="use-food-cherrycake.png"
+        name="Cherry cake"
+        description="A nice cherry cake."
+        effect="+35 HP"
+        type="usable"
+        weight="50"/>
+    <item id="520"
+        image="use-food-easteregg.png"
+        name="Easter egg"
+        description="A surprise."
+        effect="+100 HP"
+        type="usable"
+        weight="180"/>
+    <item id="521"
+        image="weapon-dagger-dagger.png"
+        name="Dagger"
+        description="A simple Dagger."
+        effect="Damage: +15 / Range: 1"
+        type="equip-1hand"
+        weapon_type="1"
+        attacktype="stab"
+        weight="60"
+        weapon-type="knife"
+        attack-min="5"
+        attack-delta="10"
+        max-per-slot="1">
         <sprite>weapon-dagger.xml</sprite>
         <sound event="strike">short-sword-miss1.ogg</sound>
         <sound event="hit">short-sword-hit1.ogg</sound>
     </item>
-    <item id="522" image="weapon-dagger-sharpknife.png" name="Sharp knife" description="A really sharp knife Don't hurt yourself!" effect="Damage: +10 / Range: 1" type="0" weapon_type="1" weight="45" attacktype="stab" view="521"/>
-    <item id="523" image="armor-chest-leathershirt.png" name="Leather shirt" description="A shirt made of harded leather." effect="Defense: +4" type="0" weight="30">
+    <item id="522"
+        image="weapon-dagger-sharpknife.png"
+        name="Sharp knife"
+        description="A really sharp knife Don't hurt yourself!"
+        effect="Damage: +10 / Range: 1"
+        type="equip-1hand"
+        weapon_type="1"
+        attacktype="stab"
+        weight="45"
+        max-per-slot="1"
+        weapon-type="knife"
+        attack-min="8"
+        attack-delta="2"
+        view="521"/>
+    <item id="523"
+        image="armor-chest-leathershirt.png"
+        name="Leather shirt"
+        description="A shirt made of harded leather."
+        effect="Defense: +4"
+        type="equip-torso"
+        weight="30"
+        defense="4"
+        max-per-slot="1">
         <sprite gender="male">chest-leather-male.xml</sprite>
         <sprite gender="female">chest-leather-female.xml</sprite>
     </item>
-    <item id="524" image="armor-head-fancyhat.png" name="Fancy hat" description="A fancy hat." effect="Defense: +5" type="0" weight="25">
+    <item id="524"
+        image="armor-head-fancyhat.png"
+        name="Fancy hat"
+        description="A fancy hat."
+        effect="Defense: +5"
+        type="equip-head"
+        weight="25"
+        defense="5"
+        max-per-slot="1"
+        >
         <sprite>item008.xml</sprite>
     </item>
-    <item id="525" image="armor-head-minershat.png" name="Miners hat" description="A hat used by miners." effect="Defense: +4" type="0" weight="25">
+    <item id="525"
+        image="armor-head-minershat.png"
+        name="Miners hat"
+        description="A hat used by miners."
+        effect="Defense: +4"
+        type="equip-head"
+        weight="25"
+        defense="4"
+        max-per-slot="1">
         <sprite>item009.xml</sprite>
     </item>
-    <item id="526" image="generic-coinbag.png" name="Coin bag" description="A bag used to transport coins in it. If you own it you can take more coins with you." effect="" type="0" weight="20"/>
-    <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="0" weight="300"/>
-    <item id="528" image="armor-feet-boots.png" name="Boots" description="Some robust boots, ideal for traveling." effect="Defense: +2" type="0" weight="15"/>
-    <item id="529" image="weapon-arrow-iron.png" name="Iron arrow" description="A hard arrow made of iron." effect="Damage: +50" type="0" weight="12"/>
-    <item id="530" image="weapon-bow-shortbow.png" name="Short bow" description="A bow for short distances." effect="Damage: +50 / Range: 5" type="0" weapon_type="10" weight="210" attacktype="bow" view="1200"/>
-    <item id="531" image="armor-hands-minergloves.png" name="Miner gloves" description="Gloves used by miners; very useful." effect="Defense: +2" type="0" weight="10"/>
-    <item id="532" image="armor-hands-leathergloves.png" name="Leather gloves" description="Gloves made of harded leather." effect="Defense: +3" type="0" weight="25"/>
-    <item id="533" image="use-food-roastedmaggot.png" name="Roasted maggot" description="Maggot roasted on fire." effect="+150 HP" type="0" weight="290"/>
-    <item id="534" image="use-food-orangecupcake.png" name="Orange cupcake" description="A very soft orange cupcake." effect="+100 HP / +10 MP" type="0" weight="185"/>
-    <item id="535" image="use-food-apple.png" name="Apple" description="A healthy apple." effect="+50 HP" type="0" weight="70"/>
-    <item id="536" image="weapon-dagger-shortsword.png" name="Short sword" description="A small but sharp sword." effect="Damage: +100 / Range: 1" type="0" weapon_type="2" weight="1025" slot ="0" attacktype="stab" view="521"/>
-    <item id="537" image="generic-treasurekey.png" name="Treasure key" description="A rusty key." effect="Opens Chests" type="0" weight="35"/>
-    <item id="538" image="generic-greenpresentbox.png" name="Green present box" description="Something mysterious inside." effect="" type="0" weight="25"/>
-    <item id="539" image="use-food-beer.png" name="Beer" description="A fresh beer." effect="+200 HP" type="0" weight="400"/>
-    <item id="540" image="generic-emptybottle.png" name="Empty bottle" description="An empty bottle." effect="" type="0" weight="20"/>
-    <item id="541" image="use-food-bottleofwater.png" name="Bottle of water" description="A bottle of water." effect="+250 HP" type="0" weight="495"/>
-    <item id="542" image="generic-bottleofsand.png" name="Bottle of sand" description="A bottle with sand in it." effect="" type="0" weight="365"/>
-    <item id="543" image="armor-head-standardheadband.png" name="Standard headband" description="Just a standard headband." effect="Defense: +3" type="0" weight="45">
+    <item id="526"
+        image="generic-coinbag.png"
+        name="Coin bag"
+        description="A bag used to transport coins in it. If you own it you can take more coins with you."
+        effect=""
+        type="generic"
+        weight="20"
+        max-per-slot="1"/>
+    <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="300"
+        max-per-slot="10"/>
+    <item id="528"
+        image="armor-feet-boots.png"
+        name="Boots"
+        description="Some robust boots, ideal for traveling."
+        effect="Defense: +2"
+        type="equip-feet"
+        weight="15"
+        defense="2"
+        max-per-slot="1"/>
+    <item id="529"
+        image="weapon-arrow-iron.png"
+        name="Iron arrow"
+        description="A hard arrow made of iron."
+        effect="Damage: +50"
+        type="equip-ammo"
+        weight="12"
+        max-per-slot="100"/>
+    <item id="530"
+        image="weapon-bow-shortbow.png"
+        name="Short bow"
+        description="A bow for short distances."
+        effect="Damage: +50 / Range: 5"
+        type="equip-2hand"
+        weapon_type="10"
+        weapon-type="bow"
+        weight="210"
+        max-per-slot="1"
+        attacktype="bow"
+        damage-min="50"
+        damage-delta="0"
+        view="1200"/>
+    <item id="531"
+        image="armor-hands-minergloves.png"
+        name="Miner gloves"
+        description="Gloves used by miners; very useful."
+        effect="Defense: +2"
+        type="equip-arms"
+        weight="10"
+        defense="2"
+        max-per-slot="1"/>
+    <item id="532"
+        image="armor-hands-leathergloves.png"
+        name="Leather gloves"
+        description="Gloves made of harded leather."
+        effect="Defense: +3"
+        type="equip-arms"
+        weight="25"
+        defense="3"
+        max-per-slot="1"/>
+    <item id="533"
+        image="use-food-roastedmaggot.png"
+        name="Roasted maggot"
+        description="Maggot roasted on fire."
+        effect="+150 HP"
+        type="usable"
+        hp="150"
+        weight="290"
+        max-per-slot="10"/>
+    <item id="534"
+        image="use-food-orangecupcake.png"
+        name="Orange cupcake"
+        description="A very soft orange cupcake."
+        effect="+100 HP / +10 MP"
+        type="usable"
+        hp="150"
+        weight="185"
+        max-per-slot="10"/>
+    <item id="535"
+        image="use-food-apple.png"
+        name="Apple"
+        description="A healthy apple."
+        effect="+50 HP"
+        type="usable"
+        hp="50"
+        weight="70"
+        max-per-slot="10"/>
+    <item id="536"
+        image="weapon-dagger-shortsword.png"
+        name="Short sword"
+        description="A small but sharp sword."
+        effect="Damage: +100 / Range: 1"
+        type="equip-1hand"
+        weapon_type="2"
+        weight="1025"
+        slot ="0"
+        attacktype="stab"
+        weapon-type="sword"
+        attack-min="20"
+        attack-delta="30"
+        max-per-slot="1"
+        view="521"/>
+    <item id="537"
+        image="generic-treasurekey.png"
+        name="Treasure key"
+        description="A rusty key."
+        effect="Opens Chests"
+        type="generic"
+        weight="35"
+        max-per-slot="10"/>
+    <item id="538"
+        image="generic-greenpresentbox.png"
+        name="Green present box"
+        description="Something mysterious inside."
+        effect=""
+        type="generic"
+        weight="25"
+        max-per-slot="10"/>
+    <item id="539"
+        image="use-food-beer.png"
+        name="Beer"
+        description="A fresh beer."
+        effect="+200 HP"
+        type="usable"
+        hp="200"
+        weight="400"
+        max-per-slot="10"/>
+    <item id="540"
+        image="generic-emptybottle.png"
+        name="Empty bottle"
+        description="An empty bottle."
+        effect=""
+        type="generic"
+        weight="20"
+        max-per-slot="10"/>
+    <item id="541"
+        image="use-food-bottleofwater.png"
+        name="Bottle of water"
+        description="A bottle of water."
+        effect="+250 HP"
+        type="usable"
+        hp="250"
+        weight="495"
+        max-per-slot="10"/>
+    <item id="542"
+        image="generic-bottleofsand.png"
+        name="Bottle of sand"
+        description="A bottle with sand in it."
+        effect=""
+        type="generic"
+        weight="365"
+        max-per-slot="10"/>
+    <item id="543"
+        image="armor-head-standardheadband.png"
+        name="Standard headband"
+        description="Just a standard headband."
+        effect="Defense: +3"
+        type="equip-head"
+        weight="45"
+        max-per-slot="1"
+        defense="3">
         <sprite>item007.xml</sprite>
     </item>
-    <item id="544" image="armor-head-silkheadband.png" name="Silk headband" description="A cool headband made of silk." effect="Defense: +10" type="0" weight="20">
+    <item id="544"
+        image="armor-head-silkheadband.png"
+        name="Silk headband"
+        description="A cool headband made of silk."
+        effect="Defense: +10"
+        type="equip-head"
+        weight="20"
+        defense="10"
+        max-per-slot="1">
         <sprite>item006.xml</sprite>
     </item>
-    <item id="545" image="weapon-bow-forestbow.png" name="Forest bow" description="A bow usually used to hunt." effect="Damage: +65 / Range: 5" type="0" weapon_type="10" weight="530" attacktype="bow" view="1200"/>
-    <item id="546" image="armor-chest-desertshirt.png" name="Desert shirt" description="A shirt suitable for desert trips." effect="Defense: +6" type="0" weight="50">
+    <item id="545"
+        image="weapon-bow-forestbow.png"
+        name="Forest bow"
+        description="A bow usually used to hunt."
+        effect="Damage: +65 / Range: 5"
+        type="equip-2hand"
+        weapon_type="10"
+        weight="530"
+        max-per-slot="1"
+        attacktype="bow"
+        weapon-type="bow"
+        attack-min="65"
+        attack-delta="0"
+        view="1200"/>
+    <item id="546"
+        image="armor-chest-desertshirt.png"
+        name="Desert shirt"
+        description="A shirt suitable for desert trips."
+        effect="Defense: +6"
+        type="equip-torso"
+        weight="50"
+        defense="6"
+        max-per-slot="1">
         <sprite>item002.xml</sprite>
     </item>
-    <item id="547" image="weapon-polearm-bardiche.png" name="Bardiche" description="A Bardiche." effect="Damage +100" type="0" weight="10"/>
-    <item id="548" image="weapon-polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." effect="Damage +100" type="0" weight="10"/>
-    <item id="549" image="weapon-axe-axe.png" name="Axe" description="An axe." effect="Damage +100" type="0" weight="10"/>
-    <item id="550" image="weapon-axe-blacksmithsaxe.png" name="Blacksmith's axe" description="An axe usually used by blacksmiths." effect="Damage +100" type="0" weight="10"/>
-    <item id="551" image="generic-bluehint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="552" image="generic-magentahint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="553" image="generic-yellowhint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="554" image="generic-greenhint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="555" image="generic-tealhint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="556" image="generic-purplehint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="557" image="generic-redhint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="558" image="generic-otherbluehint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="559" image="generic-orangehint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="560" image="generic-greyhint.png" name="Hint" description="A hint." effect="" type="0" weight="10"/>
-    <item id="561" image="weapon-sword-sabre.png" name="Sabre" description="A sword with a very sharp, curved, single-edged blade." effect="" type="0" weight="10"/>
-    <item id="562" image="use-food-chickenleg.png" name="Chicken leg" description="A well cooked chicken leg." effect="+500 HP" type="0" weight="10"/>
-    <item id="563" image="armor-hands-wintergloves.png" name="Winter gloves" description="Soft and warm gloves." effect="Defense: +2" type="0" weight="15"/>
-    <item id="564" image="armor-chest-tnecksweater.png" name="Turtleneck sweater" description="A soft and warm sweater." effect="Defense: +6" type="0" weight="40">
+    <item id="547"
+        image="weapon-polearm-bardiche.png"
+        name="Bardiche"
+        description="A Bardiche."
+        effect="Damage ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="548"
+        image="weapon-polearm-halberd.png"
+        name="Halberd"
+        description="A weapon usually carried by guards."
+        effect="Damage ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="549"
+        image="weapon-axe-axe.png"
+        name="Axe"
+        description="An axe."
+        effect="Damage ???"
+        type="equip-2hand"
+        weapon-type="axe"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="550"
+        image="weapon-axe-blacksmithsaxe.png"
+        name="Blacksmith's axe"
+        description="An axe usually used by blacksmiths."
+        effect="Damage ???"
+        type="equip-2hand"
+        weapon-type="axe"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="551"
+        image="generic-bluehint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="552"
+        image="generic-magentahint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="553"
+        image="generic-yellowhint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="554"
+        image="generic-greenhint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="555"
+        image="generic-tealhint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="556"
+        image="generic-purplehint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="557"
+        image="generic-redhint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="558"
+        image="generic-otherbluehint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="559"
+        image="generic-orangehint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="560"
+        image="generic-greyhint.png"
+        name="Hint"
+        description="A hint."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="561"
+        image="weapon-sword-sabre.png"
+        name="Sabre"
+        description="A sword with a very sharp, curved, single-edged blade."
+        effect="Damage ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="562"
+        image="use-food-chickenleg.png"
+        name="Chicken leg"
+        description="A well cooked chicken leg."
+        effect="+500 HP"
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="563"
+        image="armor-hands-wintergloves.png"
+        name="Winter gloves"
+        description="Soft and warm gloves."
+        effect="Defense: +2"
+        type="equip-arms"
+        weight="15"
+        defense="2"
+        max-per-slot="1"/>
+    <item id="564"
+        image="armor-chest-tnecksweater.png"
+        name="Turtleneck sweater"
+        description="A soft and warm sweater."
+        effect="Defense: +6"
+        type="equip-torso"
+        weight="40"
+        defense="6"
+        max-per-slot="1">
         <sprite gender="male">chest-tnecksweater-male.xml</sprite>
         <sprite gender="female">chest-tnecksweater-female.xml</sprite>
     </item>
-    <item id="565" image="generic-petal.png" name="Petal" description="A petal from an evil flower." effect="" type="0" weight="10"/>
-    <item id="566" image="generic-smallmushroom.png" name="Small mushroom" description="A mushroom." effect="" type="0" weight="10"/>
-    <item id="567" image="use-potion-ironpotion.png" name="Iron potion" description="Increases your attack strength." effect="" type="0" weight="295"/>
-    <item id="568" image="use-potion-concentrationpotion.png" name="Concentration potion" description="Increases your attack speed." effect="" type="0" weight="295"/>
-    <item id="569" image="generic-rawlog.png" name="Raw log" description="A raw log." effect="" type="0" weight="10"/>
-    <item id="570" image="weapon-dagger-boneknife.png" name="Bone knife" description="A knife masterly carved out of a bone." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="571" image="weapon-dagger-setzer.png" name="Setzer" description="A knife named after a famous gambler." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="572" image="weapon-sword-scimitar.png" name="Scimitar" description="A sword with a heavy, curved, single-edged blade." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="573" image="weapon-sword-falchion.png" name="Falcion" description="A heavy one-handed, single-edged sword." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="574" image="weapon-polearm-scorpion.png" name="Scorpion" description="A well crafted glaive." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="575" image="weapon-bow-desertbow.png" name="Desert bow" description="A tonorian short bow." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="576" image="weapon-sword-beheader.png" name="Beheader" description="An oddly designed sword especially made for beheading enemies." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="577" image="weapon-thrown-bonedarts.png" name="Bone darts" description="Some darts made of bones." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="578" image="weapon-sword-sandcutter.png" name="Sand cutter" description="A sand cutter." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="579" image="weapon-dagger-rockknive.png" name="Rock knife" description="A knife made of stone." effect="Damage: +300 " type="0" weight="10"/>
-    <item id="580" image="weapon-staff-staffoflife.png" name="Staff of life" description="A staff that increases healing magic." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="581" image="weapon-staff-crescentrod.png" name="Crescent rod" description="A crescent rod." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="582" image="weapon-staff-staffoffire.png" name="Staff of fire" description="A staff that increases fire magic." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="583" image="weapon-staff-staffofice.png" name="Staff of ice" description="A staff that increases ice magic." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="584" image="weapon-sword-jackal.png" name="Jackal" description="A jackal." effect="Damage: +50 " type="0" weight="10"/>
-    <item id="585" image="armor-hands-scarabarmlet.png" name="Scarab Armlet" description="A scarab armlet." effect="Defense: +50 " type="0" weight="10"/>
-    <item id="586" image="armor-legs-cottonshorts.png" name="Cotton shorts" description="Shorts made of 100% cotton." effect="Defense: +2" type="0" weight="10">
+    <item id="565"
+        image="generic-petal.png"
+        name="Petal"
+        description="A petal from an evil flower."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="566"
+        image="generic-smallmushroom.png"
+        name="Small mushroom"
+        description="A mushroom."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="567"
+        image="use-potion-ironpotion.png"
+        name="Iron potion"
+        description="Increases your attack strength."
+        effect=""
+        type="generic"
+        weight="295"
+        max-per-slot="10"/>
+    <item id="568"
+        image="use-potion-concentrationpotion.png"
+        name="Concentration potion"
+        description="Increases your attack speed."
+        effect=""
+        type="generic"
+        weight="295"
+        max-per-slot="10"/>
+    <item id="569"
+        image="generic-rawlog.png"
+        name="Raw log"
+        description="A raw log."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="570"
+        image="weapon-dagger-boneknife.png"
+        name="Bone knife"
+        description="A knife masterly carved out of a bone."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="knife"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="571"
+        image="weapon-dagger-setzer.png"
+        name="Setzer"
+        description="A knife named after a famous gambler."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="knife"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="572"
+        image="weapon-sword-scimitar.png"
+        name="Scimitar"
+        description="A sword with a heavy, curved, single-edged blade."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="573"
+        image="weapon-sword-falchion.png"
+        name="Falcion"
+        description="A heavy one-handed, single-edged sword."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="574"
+        image="weapon-polearm-scorpion.png"
+        name="Scorpion"
+        description="A well crafted glaive."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="1"
+        max-per-slot="1"/>
+    <item id="575"
+        image="weapon-bow-desertbow.png"
+        name="Desert bow"
+        description="A tonorian short bow."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="bow"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="576"
+        image="weapon-sword-beheader.png"
+        name="Beheader"
+        description="An oddly designed sword especially made for beheading enemies."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="577"
+        image="weapon-thrown-bonedarts.png"
+        name="Bone darts"
+        description="Some darts made of bones."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="thrown"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="578"
+        image="weapon-sword-sandcutter.png"
+        name="Sand cutter"
+        description="A sand cutter."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="579"
+        image="weapon-dagger-rockknive.png"
+        name="Rock knife"
+        description="A knife made of stone."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="knife"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="580"
+        image="weapon-staff-staffoflife.png"
+        name="Staff of life"
+        description="A staff that increases healing magic."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="581"
+        image="weapon-staff-crescentrod.png"
+        name="Crescent rod"
+        description="A crescent rod."
+        effect="Damage: +50 "
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="582"
+        image="weapon-staff-staffoffire.png"
+        name="Staff of fire"
+        description="A staff that increases fire magic."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="583"
+        image="weapon-staff-staffofice.png"
+        name="Staff of ice"
+        description="A staff that increases ice magic."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="584"
+        image="weapon-sword-jackal.png"
+        name="Jackal"
+        description="A jackal."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="585"
+        image="armor-hands-scarabarmlet.png"
+        name="Scarab Armlet"
+        description="A scarab armlet."
+        effect="Defense: ???"
+        type="equip-arms"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="586"
+        image="armor-legs-cottonshorts.png"
+        name="Cotton shorts"
+        description="Shorts made of 100% cotton."
+        effect="Defense: +2"
+        type="equip-legs"
+        weight="10"
+        defense="2"
+        max-per-slot="1">
         <sprite gender="male">leg-cotton-male.xml</sprite>
         <sprite gender="female">leg-cotton-female.xml</sprite>
     </item>
-    <item id="587" image="weapon-sword-sword.png" name="Sword" description="A simple but reliable sword." effect="" type="0" weight="10"/>
-    <item id="588" image="weapon-sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." effect="" type="0" weight="10"/>
-    <item id="589" image="weapon-sword-broadsword.png" name="Broad Sword" description="A two handed sword with a very broad blade." effect="" type="0" weight="10"/>
-    <item id="590" image="weapon-sword-baselard.png" name="Baselard" description="A short and powerful sword." effect="" type="0" weight="10"/>
-    <item id="591" image="weapon-sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." effect="" type="0" weight="10"/>
-    <item id="592" image="weapon-dagger-stiletto.png" name="Stiletto" description="A dagger with a long and thin blade." effect="" type="0" weight="10"/>
-    <item id="593" image="weapon-sword-rapier.png" name="Rapier" description="A light sword made for duels." effect="" type="0" weight="10"/>
-    <item id="594" image="weapon-polearm-spear.png" name="Spear" description="A light spear with a wooden pole." effect="" type="0" weight="10"/>
-    <item id="595" image="weapon-polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." effect="" type="0" weight="10"/>
-    <item id="596" image="weapon-polearm-pike.png" name="Pike" description="" effect="A light spear with an iron pole." type="0" weight="10"/>
-    <item id="597" image="weapon-polearm-heavypike.png" name="Heavy Pike" description="" effect="A heavy spear with an iron pole." type="0" weight="10"/>
-    <item id="598" image="weapon-polearm-dualspear.png" name="Dual Spear" description="A spear with two tops." effect="" type="0" weight="10"/>
-    <item id="599" image="weapon-sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." effect="" type="0" weight="10"/>
-    <item id="600" image="armor-shield-britshield.png" name="Brit Shield" description="Legendary shield that is said to save queens and rule waves." effect="Cooking: -50" type="0" weight="10"/>
-    <item id="601" image="armor-shield-steelshield.png" name="Steel Shield" description="A shield made of steel." effect="" type="0" weight="10"/>
-    <item id="602" image="armor-shield-woodenshield.png" name="Wooden Shield" description="A shield made of wood." effect="" type="0" weight="10"/>
-    <item id="603" image="armor-shield-leathershield.png" name="Leather Shield" description="A shield made of leather on a wooden frame." effect="" type="0" weight="10"/>
-    <item id="604" image="armor-shield-knightshield.png" name="Knight Shield" description="A high quality shield used by knights." effect="" type="0" weight="10"/>
-    <item id="605" image="weapon-axe-meatcleaver.png" name="Meat Cleaver" description="A butchers tool that also makes a nice one handed battleaxe." effect="" type="0" weight="10"/>
-    <item id="606" image="weapon-axe-hatchet.png" name="Hatchet" description="A short one handed axe." effect="" type="0" weight="10"/>
-    <item id="607" image="weapon-polearm-trident.png" name="Trident" description="A spear with three heads." effect="" type="0" weight="10"/>
-    <item id="608" image="armor-shield-bladeshield.png" name="Blade-shield" description="A shield made of blades." effect="" type="0" weight="10"/>
-    <item id="609" image="weapon-mace-club.png" name="Club" description="A primitive wooden club." effect="" type="0" weight="10"/>
-    <item id="610" image="armor-legs-jeanshorts.png" name="Jeans shorts" description="Shorts made of jeans." effect="Defense: +4" type="0" weight="30">
+    <item id="587"
+        image="weapon-sword-sword.png"
+        name="Sword"
+        description="A simple but reliable sword."
+        effect="Damage ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="588"
+        image="weapon-sword-bastardsword.png"
+        name="Bastard Sword"
+        description="A large two handed sword."
+        effect="Damage ???"
+        type="equip-2hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="589"
+        image="weapon-sword-broadsword.png"
+        name="Broad Sword"
+        description="A two handed sword with a very broad blade."
+        effect="Damage ???"
+        type="equip-2hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="590"
+        image="weapon-sword-baselard.png"
+        name="Baselard"
+        description="A short and powerful sword."
+        effect="Damage ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="591"
+        image="weapon-sword-longsword.png"
+        name="Long Sword"
+        description="A sword with a long and agile blade."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="592"
+        image="weapon-dagger-stiletto.png"
+        name="Stiletto"
+        description="A dagger with a long and thin blade."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="knife"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="593"
+        image="weapon-sword-rapier.png"
+        name="Rapier"
+        description="A light sword made for duels."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="594"
+        image="weapon-polearm-spear.png"
+        name="Spear"
+        description="A light spear with a wooden pole."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="595"
+        image="weapon-polearm-heavyspear.png"
+        name="Heavy Spear"
+        description="A heavy spear with a wooden pole."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="596"
+        image="weapon-polearm-pike.png"
+        name="Pike"
+        description="A light spear with an iron pole."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="597"
+        image="weapon-polearm-heavypike.png"
+        name="Heavy Pike"
+        description="A heavy spear with an iron pole."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="598"
+        image="weapon-polearm-dualspear.png"
+        name="Dual Spear"
+        description="A spear with two tops."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="599"
+        image="weapon-sword-firesword.png"
+        name="Fire Sword"
+        description="A magical sword enchanted with the power of fire."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="600"
+        image="armor-shield-britshield.png"
+        name="Brit Shield"
+        description="Legendary shield that is said to save queens and rule waves."
+        effect="Cooking: -50"
+        type="equip-shield"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="601"
+        image="armor-shield-steelshield.png"
+        name="Steel Shield"
+        description="A shield made of steel."
+        effect=""
+        type="equip-shield"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="602"
+        image="armor-shield-woodenshield.png"
+        name="Wooden Shield"
+        description="A shield made of wood."
+        effect=""
+        type="equip-shield"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="603"
+        image="armor-shield-leathershield.png"
+        name="Leather Shield"
+        description="A shield made of leather on a wooden frame."
+        effect=""
+        type="equip-shield"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="604"
+        image="armor-shield-knightshield.png"
+        name="Knight Shield"
+        description="A high quality shield used by knights."
+        effect=""
+        type="equip-shield"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="605"
+        image="weapon-axe-meatcleaver.png"
+        name="Meat Cleaver"
+        description="A butchers tool that also makes a nice one handed battleaxe."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="axe"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="606"
+        image="weapon-axe-hatchet.png"
+        name="Hatchet"
+        description="A short one handed axe."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="axe"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="607"
+        image="weapon-polearm-trident.png"
+        name="Trident"
+        description="A spear with three heads."
+        effect="Damage: ???"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="608"
+        image="armor-shield-bladeshield.png"
+        name="Blade-shield"
+        description="A shield made of blades."
+        effect=""
+        type="equip-shield"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="609"
+        image="weapon-mace-club.png"
+        name="Club"
+        description="A primitive wooden club."
+        effect="Damage: ???"
+        type="equip-1hand"
+        weapon-type="mace"
+        weight="10"
+        max-per-slot="1"/>
+    <item id="610"
+        image="armor-legs-jeanshorts.png"
+        name="Jeans shorts"
+        description="Shorts made of jeans."
+        effect="Defense: +4"
+        type="equip-legs"
+        weight="30"
+        defense="4"
+        max-per-slot="1">
         <sprite gender="male">leg-jeans-male.xml</sprite>
         <sprite gender="female">leg-jeans-female.xml</sprite>
     </item>
-    <item id="611" image="generic-whitefur.png" name="White fur" description="A patch of white, fluffy fur." effect="" type="0" weight="10"/>
-    <item id="612" image="generic-cavesnakelamp.png" name="Cave snake lamp" description="Feeler of a lamp snake that glows in the dark." effect="" type="0" weight="10"/>
-    <item id="613" image="generic-hardspike.png" name="Hard spike" description="The hard spike of a slain monster." effect="" type="0" weight="10"/>
-    <item id="614" image="generic-pinkantennae.png" name="Pink antennae" description="No-one knows why violets got these antennaes." effect="" type="0" weight="10"/>
-    <item id="615" image="armor-head-pumpkinhelmet.png" name="Pumpkin helmet" description="A helmet made out of a pumpkin." effect="Defense: +4" type="0" weight="30">
+    <item id="611"
+        image="generic-whitefur.png"
+        name="White fur"
+        description="A patch of white, fluffy fur."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="612"
+        image="generic-cavesnakelamp.png"
+        name="Cave snake lamp"
+        description="Feeler of a lamp snake that glows in the dark."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="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"/>
+    <item id="614"
+        image="generic-pinkantennae.png"
+        name="Pink antennae"
+        description="No-one knows why violets got these antennaes."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="615"
+        image="armor-head-pumpkinhelmet.png"
+        name="Pumpkin helmet"
+        description="A helmet made out of a pumpkin."
+        effect="Defense: +4"
+        type="equip-head"
+        weight="30"
+        defense="4"
+        max-per-slot="1">
         <sprite>item011.xml</sprite>
     </item>
-    <item id="616" image="armor-head-axehat.png" name="Axe hat" description="A really cool joke." effect="Defense: +4" type="0" weight="20">
+    <item id="616"
+        image="armor-head-axehat.png"
+        name="Axe hat"
+        description="A really cool joke."
+        effect="Defense: +4"
+        type="equip-head"
+        weight="20"
+        defense="4"
+        max-per-slot="1">
         <sprite>item012.xml</sprite>
     </item>
-    <item id="617" image="armor-head-piratehat.png" name="Pirate hat" description="A pirate hat." effect="Defense: +4" type="0" weight="25">
+    <item id="617"
+        image="armor-head-piratehat.png"
+        name="Pirate hat"
+        description="A pirate hat."
+        effect="Defense: +4"
+        type="equip-head"
+        weight="25"
+        defense="4"
+        max-per-slot="1">
         <sprite>item013.xml</sprite>
     </item>
-    <item id="618" image="armor-head-goggles.png" name="Goggles" description="Goggles designed to take care of your eyes." effect="Defense: +2" type="0" weight="20">
+    <item id="618"
+        image="armor-head-goggles.png"
+        name="Goggles"
+        description="Goggles designed to take care of your eyes."
+        effect="Defense: +2"
+        type="equip-head"
+        weight="20"
+        defense="2"
+        max-per-slot="1">
         <sprite>item014.xml</sprite>
     </item>
-    <item id="619" image="armor-head-leathergoggles.png" name="Leather goggles" description="Goggles designed for desert storms." effect="Defense: +3" type="0" weight="25">
+    <item id="619"
+        image="armor-head-leathergoggles.png"
+        name="Leather goggles"
+        description="Goggles designed for desert storms."
+        effect="Defense: +3"
+        type="equip-head"
+        weight="25"
+        defense="3"
+        max-per-slot="1">
         <sprite>item015.xml</sprite>
     </item>
-    <item id="620" image="armor-head-circlet.png" name="Circlet" description="A nice piece of jewelry." effect="Defense: +4" type="0" weight="35">
+    <item id="620"
+        image="armor-head-circlet.png"
+        name="Circlet"
+        description="A nice piece of jewelry."
+        effect="Defense: +4"
+        type="equip-head"
+        weight="35"
+        defense="4"
+        max-per-slot="1">
         <sprite>item016.xml</sprite>
     </item>
-    <item id="621" image="armor-head-eyepatch.png" name="Eyepatch" description="What really makes you a pirate." effect="Defense: +3" type="0" weight="15">
+    <item id="621"
+        image="armor-head-eyepatch.png"
+        name="Eyepatch"
+        description="What really makes you a pirate."
+        effect="Defense: +3"
+        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" type="0" weight="15">
+    <item id="622"
+        image="armor-head-bandana.png"
+        name="Bandana"
+        description="A striped bandana."
+        effect="Defense: +3"
+        type="equip-head"
+        weight="15"
+        defense="3"
+        max-per-slot="1">
         <sprite>item018.xml</sprite>
     </item>
-    <item id="623" image="weapon-polearm-scythe.png" name="Scythe" description="Usually used for farming but also useable as a weapon. Slow but deadly." effect="Damage: +75 / Range: 1" type="0" weapon_type="11" weight="400" attacktype="swing">
+    <item id="623"
+        image="weapon-polearm-scythe.png"
+        name="Scythe"
+        description="Usually used for farming but also useable as a weapon. Slow but deadly."
+        effect="Damage: +75 / Range: 1"
+        type="equip-2hand"
+        attacktype="swing"
+        weapon_type="11"
+        weapon-type="polearm"
+        weight="400"
+        attack-min="0"
+        attack-delta="75"
+        max-per-slot="1">
         <sprite>weapon-scythe.xml</sprite>
     </item>
-    <item id="624" image="armor-chest-vnecksweater.png" name="V-neck Sweater" description="A soft and warm sweater." effect="Defense: +8" type="0" weight="45">
+    <item id="624"
+        image="armor-chest-vnecksweater.png"
+        name="V-neck Sweater"
+        description="A soft and warm sweater."
+        effect="Defense: +8"
+        type="equip-torso"
+        weight="45"
+        defense="8"
+        max-per-slot="1">
         <sprite gender="male">chest-vnecksweater-male.xml</sprite>
         <sprite gender="female">chest-vnecksweater-female.xml</sprite>
     </item>
-    <item id="625" 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" type="0" weight="120">
+    <item id="625"
+        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"
+        type="equip-torso"
+        weight="120"
+        defense="12"
+        max-per-slot="1">
         <sprite gender="male">chest-chainmail-male.xml</sprite>
         <sprite gender="female">chest-chainmail-female.xml</sprite>
     </item>
-    <item id="626" image="armor-chest-lightplatemail.png" 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" type="0" weight="240">
+    <item id="626"
+        image="armor-chest-lightplatemail.png"
+        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"
+        type="equip-torso"
+        weight="240"
+        defense="14"
+        max-per-slot="1">
         <sprite gender="male">chest-lightplatemail-male.xml</sprite>
         <sprite gender="female">chest-lightplatemail-female.xml</sprite>
     </item>
-    <item id="627" image="armor-head-tophat.png" name="Top hat" description="For the gentry of The Mana World." effect="Defense: +15" type="0" weight="20">
+    <item id="627"
+        image="armor-head-tophat.png"
+        name="Top hat"
+        description="For the gentry of The Mana World."
+        effect="Defense: +15"
+        type="equip-head"
+        weight="20"
+        defense="15"
+        max-per-slot="1">
         <sprite>head-tophat.xml</sprite>
     </item>
-    <item id="628" image="armor-head-funkyhat.png" name="Funky hat" description="Yawn..." effect="Defense: +18" type="0" weight="20">
+    <item id="628"
+        image="armor-head-funkyhat.png"
+        name="Funky hat"
+        description="Yawn..."
+        effect="Defense: +18"
+        type="equip-head"
+        weight="20"
+        defense="15"
+        max-per-slot="1">
         <sprite>head-funkywinter.xml</sprite>
     </item>
-    <item id="629" image="armor-head-mushroomhat.png" name="Mush hat" description="Soft and fashionable." effect="Defense: +15" type="0" weight="20">
+    <item id="629"
+        image="armor-head-mushroomhat.png"
+        name="Mush hat"
+        description="Soft and fashionable."
+        effect="Defense: +15"
+        type="equip-head"
+        weight="20"
+        defense="15"
+        max-per-slot="1">
         <sprite>head-mushroom.xml</sprite>
     </item>
-    <item id="630" image="armor-head-shroomhat.png" name="Shroom hat" description="Evil and fashionable." effect="Defense: +18" type="0" weight="20">
+    <item id="630"
+        image="armor-head-shroomhat.png"
+        name="Shroom hat"
+        description="Evil and fashionable."
+        effect="Defense: +18"
+        type="equip-head"
+        weight="20"
+        defense="18"
+        max-per-slot="1">
         <sprite>head-shroom.xml</sprite>
     </item>
-    <item id="631" image="generic-darkcrystal.png" name="Dark Crystal" description="A dark crystal that emits a demonic aura." effect="" type="0" weight="10" slot="0"/>
-    <item id="632" image="armor-legs-skirt.png" name="Skirt" description="A light-blue skirt made of linen cloth." effect="Defense: +4" type="0" weight="30">
+    <item id="631"
+        image="generic-darkcrystal.png"
+        name="Dark Crystal"
+        description="A dark crystal that emits a demonic aura."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="632"
+        image="armor-legs-skirt.png"
+        name="Skirt"
+        description="A light-blue skirt made of linen cloth."
+        effect="Defense: +4"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
         <sprite>leg-skirt.xml</sprite>
     </item>
-    <item id="633" image="armor-head-xmaself.png" name="Christmas elf hat" description="A hat worn by christmas elfs." effect="Defense: +18" type="0" weight="20">
+    <item id="633"
+        image="armor-head-xmaself.png"
+        name="Christmas elf hat"
+        description="A hat worn by christmas elfs."
+        effect="Defense: +18"
+        defense="18"
+        type="equip-head"
+        weight="20"
+        max-per-slot="1">
         <sprite>head-xmaself.xml</sprite>
     </item>
-    <item id="634" image="armor-head-mask.png" name="Face Mask" description="A wooden mask to conceal your face." effect="Defense: +15" type="0" weight="20">
+    <item id="634"
+        image="armor-head-mask.png"
+        name="Face Mask"
+        description="A wooden mask to conceal your face."
+        effect="Defense: +15"
+        defense="15"
+        type="equip-head"
+        weight="20"
+        max-per-slot="1">
         <sprite>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 Clause." effect="" type="0" weight="1" slot="0"/>
-
-    <item id="636" image="armor-head-warlordhelm.png" name="A Warlord Helmet" description="Worn by great warriors" effect="Defense: +25" type="0" weight="40">
+    <item id="635"
+        image="generic-santacookie.png"
+        name="Santa Cookie"
+        description="This isn't for you to eat. It is for Santa Clause."
+        effect=""
+        type="generic"
+        weight="1"
+        max-per-slot="1"/>
+    <item id="636"
+        image="armor-head-warlordhelm.png"
+        name="A Warlord Helmet"
+        description="Worn by great warriors"
+        effect="Defense: +25"
+        type="equip-head"
+        defense="25"
+        weight="40">
         <sprite>head-warlordhelm.xml</sprite>
     </item>
-    <item id="637" image="armor-head-knighthelm.png" name="A Knight's Helmet" description="Helmet with two small wings on it" effect="Defense: +20" type="0" weight="35">
+    <item id="637"
+        image="armor-head-knighthelm.png"
+        name="A Knight's Helmet"
+        description="Helmet with two small wings on it"
+        effect="Defense: +20"
+        type="equip-head"
+        defense="20"
+        weight="35">
         <sprite>head-knighthelm.xml</sprite>
     </item>
-    <item id="638" image="armor-head-infantryhelm.png" name="A Infantry Helmet" description="For soldiers and guards" effect="Defense: +20" type="0" weight="35">
+    <item id="638"
+        image="armor-head-infantryhelm.png"
+        name="A Infantry Helmet"
+        description="For soldiers and guards"
+        effect="Defense: +20"
+        type="equip-head"
+        defense="20"
+        weight="35">
         <sprite>head-infantryhelm.xml</sprite>
     </item>
-    <item id="639" image="armor-head-crusadehelm.png" name="A Crusade Helmet" description="Start your own crusade" effect="Defense: +25" type="0" weight="40">
+    <item id="639"
+        image="armor-head-crusadehelm.png"
+        name="A Crusade Helmet"
+        description="Start your own crusade"
+        effect="Defense: +25"
+        type="equip-head"
+        defense="25"
+        weight="40">
         <sprite>head-crusadehelm.xml</sprite>
     </item>
-    <item id="640" image="generic-ironore.png" name="Iron Ore" description="A lump of Iron Ore." effect="" type="0" weight="40"/>
-    <item id="641" image="generic-snakeskin.png" name="Snake Skin" description="The skin of a slain snake." effect="" type="0" weight="20"/>
-    <item id="642" image="armor-legs-chaps.png" name="Jeans Chaps" description="Jeans with snake skin chaps." effect="Defense: +6" type="0" weight="40">
+    <item id="640"
+        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="20"/>
+    <item id="642"
+        image="armor-legs-chaps.png"
+        name="Jeans Chaps"
+        description="Jeans with snake skin chaps."
+        effect="Defense: +6"
+        type="equip-legs"
+        defense="6"
+        weight="40">
         <sprite gender="male">leg-chaps-male.xml</sprite>
         <sprite gender="female">leg-chaps-female.xml</sprite>
     </item>
-    <item id="643" image="armor-head-cowboywhite.png" name="White Cowboy Hat" description="A white cowboy hat with a band." effect="Defense: +6" type="0" weight="30">
+    <item id="643"
+        image="armor-head-cowboywhite.png"
+        name="White Cowboy Hat"
+        description="A white cowboy hat with a band."
+        effect="Defense: +6"
+        type="equip-head"
+        defense="6"
+        weight="30">
         <sprite>head-cowboywhite.xml</sprite>
     </item>
-    <item id="644" image="armor-head-cowboyblack.png" name="Black Cowboy Hat" description="A black cowboy hat with shinny buckles." effect="Defense: +6" type="0" weight="30">
+    <item id="644"
+        image="armor-head-cowboyblack.png"
+        name="Black Cowboy Hat"
+        description="A black cowboy hat with shinny buckles."
+        effect="Defense: +6"
+        type="equip-head"
+        defense="6"
+        weight="30">
         <sprite>head-cowboyblack.xml</sprite>
     </item>
-    <item id="645" image="armor-chest-lightplatemailgold.png" name="Golden Platemail" description="A plate mail made from gold which can only be afforded by the richest of the richest." effect="Defense: +25" type="0" weight="240">
+    <item id="645"
+        image="armor-chest-lightplatemailgold.png"
+        name="Golden Platemail"
+        description="A plate mail made from gold which can only be afforded by the richest of the richest."
+        effect="Defense: +25"
+        type="equip-torso"
+        defense="25"
+        weight="240">
         <sprite gender="male">chest-lightplatemailgold-male.xml</sprite>
         <sprite gender="female">chest-lightplatemailgold-female.xml</sprite>
     </item>
-    <item id="646" image="armor-head-crown.png" name="Crown" description="A jewel embossed crown fit for any ruler." effect="Defense: +4" type="0" weight="50">
+    <item id="646"
+        image="armor-head-crown.png"
+        name="Crown"
+        description="A jewel embossed crown fit for any ruler."
+        effect="Defense: +4"
+        type="equip-head"
+        defense="4"
+        weight="50">
         <sprite>head-crown.xml</sprite>
     </item>
-    <item id="647" image="armor-head-cap.png" name="Developers Cap" description="A cap which identifies you as a developer." effect="Defense: +5" type="0" weight="20">
+    <item id="647"
+        image="armor-head-cap.png"
+        name="Developers Cap"
+        description="A cap which identifies you as a developer."
+        effect="Defense: +5"
+        type="equip-head"
+        defense="5"
+        weight="20">
         <sprite>head-devcap.xml</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"
+        type="equip-ring"
+        weight="1"
+        max-per-slot="1"
+        strength="5"
+        />
+    <item id="649"
+        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"
+        type="equip-ring"
+        weight="1"
+        max-per-slot="1"
+        agility="5"
+        />
+    <item id="650"
+        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"
+        type="equip-ring"
+        weight="1"
+        max-per-slot="1"
+        dexterity="5"
+        />
+    <item id="651"
+        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"
+        type="equip-ring"
+        weight="1"
+        max-per-slot="1"
+        vitality="5"
+        />
+    <item id="652"
+        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"
+        type="equip-ring"
+        weight="1"
+        max-per-slot="1"
+        intelligence="5"
+        />
+    <item id="653"
+        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"
+        type="equip-ring"
+        weight="1"
+        max-per-slot="1"
+        willpower="5"
+        />
 
-    <item id="1199" image="weapon-arrow-arrow.png" name="Arrow" description="A standard arrow." effect="Damage: +25" type="0" weight="8"/>
-    <item id="1200" image="weapon-bow-bow.png" name="Bow" description="A distance weapon." effect="Damage: +15 / Range: 5" type="0" weapon_type="10" weight="125" attacktype="bow">
+    <item id="1199"
+        image="weapon-arrow-arrow.png"
+        name="Arrow"
+        description="A standard arrow."
+        effect="Damage: +25"
+        type="generic"
+        weight="8"
+        max-per-slot="100"/>
+    <item id="1200"
+        image="weapon-bow-bow.png"
+        name="Bow"
+        description="A distance weapon."
+        effect="Damage: +15 / Range: 5"
+        type="equip-2hand"
+        weapon_type="10"
+        weight="125"
+        attack-min="15"
+        attack-delta="0"
+        weapon-type="bow"
+        max-per-slot="1"
+        attacktype="bow">
         <sprite>weapon-bow.xml</sprite>
         <sound event="swing">bow_shoot_1.ogg</sound>
     </item>
-    <item id="1201" image="weapon-dagger-knive.png" name="Knife" description="A small knife, the perfect weapon for a beginner." effect="Damage: 5 / Range: 1" type="0" weapon_type="1" weight="20" attacktype="stab" view="521"/>
-    <item id="1202" image="armor-chest-cottonshirt.png" name="Cotton shirt" description="A shirt made of 100% cotton." effect="Defense: +2" type="0" weight="15">
+    <item id="1201"
+        image="weapon-dagger-knive.png"
+        name="Knife"
+        description="A small knife, the perfect weapon for a beginner."
+        effect="Damage: 5 / Range: 1"
+        type="equip-1hand"
+        weapon_type="1"
+        attacktype="stab"
+        weight="20"
+        attack-min="0"
+        attack-delta="5"
+        max-per-slot="1"
+        weapon-type="knife"
+        view="521"/>
+    <item id="1202"
+        image="armor-chest-cottonshirt.png"
+        name="Cotton shirt"
+        description="A shirt made of 100% cotton."
+        effect="Defense: +2"
+        type="equip-torso"
+        weight="15"
+        defense="2"
+        max-per-slot="1">
         <sprite gender="male">chest-cotton-male.xml</sprite>
         <sprite gender="female">chest-cotton-female.xml</sprite>
     </item>
-    <item id="1203" image="armor-head-rangerhat.png" name="Ranger hat" description="A leather hat traditionally worn by Rangers." effect="Defense: +2" type="0" weight="55">
+    <item id="1203"
+        image="armor-head-rangerhat.png"
+        name="Ranger hat"
+        description="A leather hat traditionally worn by Rangers."
+        effect="Defense: +2"
+        type="equip-head"
+        weight="55"
+        defense="2"
+        max-per-slot="1">
         <sprite>head-rangerhat.xml</sprite>
     </item>
-    <item id="1204" image="armor-head-antlerhat.png" name="Antler hat" description="A hat with antlers sticking out of it." effect="Defense: +4" type="0" weight="20">
+    <item id="1204"
+        image="armor-head-antlerhat.png"
+        name="Antler hat"
+        description="A hat with antlers sticking out of it."
+        effect="Defense: +4"
+        type="equip-head"
+        weight="20"
+        defense="4"
+        max-per-slot="1">
         <sprite>head-antlerhat.xml</sprite>
     </item>
-    <item id="1205" image="armor-head-christmastree.png" name="Christmas tree hat" description="A hat shaped like a Christmas tree." effect="Defense: +2" type="0" weight="25">
+    <item id="1205"
+        image="armor-head-christmastree.png"
+        name="Christmas tree hat"
+        description="A hat shaped like a Christmas tree."
+        effect="Defense: +2"
+        type="equip-head"
+        weight="25"
+        defense="2"
+        max-per-slot="1">
         <sprite>head-christmastree.xml</sprite>
     </item>
-    <item id="1206" image="armor-head-santabeardhat.png" name="Santa beard hat" description="Now you will look just like Santa Claus!" effect="Defense: +5" type="0" weight="30">
+    <item id="1206"
+        image="armor-head-santabeardhat.png"
+        name="Santa beard hat"
+        description="Now you will look just like Santa Claus!"
+        effect="Defense: +5"
+        type="equip-head"
+        weight="30"
+        defense="5"
+        max-per-slot="1">
         <sprite>head-santabeardhat.xml</sprite>
     </item>
-    <item id="1207" image="generic-redstocking.png" name="Red Christmas stocking" description="Eww, it's smelly!" effect="" type="0" weight="20"/>
-    <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="0" 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="0" 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="0" 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="0" 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="0" 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="0" weight="10"/>
-    <item id="1214" image="armor-head-bunnyears.png" name="Bunny Ears" description="A headband with plush bunny ears." effect="Defense: +10" type="0" weight="20">
+    <item id="1207"
+        image="generic-redstocking.png"
+        name="Red Christmas stocking"
+        description="Eww, it's smelly!"
+        effect=""
+        type="generic"
+        weight="20"
+        max-per-slot="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"/>
+    <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"/>
+    <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"/>
+    <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"/>
+    <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"/>
+    <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"/>
+    <item id="1214"
+        image="armor-head-bunnyears.png"
+        name="Bunny Ears"
+        description="A headband with plush bunny ears."
+        effect="Defense: +10"
+        type="equip-head"
+        defense="10"
+        weight="20">
         <sprite>head-bunnyears.xml</sprite>
     </item>
-</items>
\ No newline at end of file
+</items>
diff --git a/maps/new_10-1.tmx b/maps/new_10-1.tmx
index cba0fc7e..62c353d7 100644
--- a/maps/new_10-1.tmx
+++ b/maps/new_10-1.tmx
@@ -52,5 +52,19 @@
     </property>
    </properties>
   </object>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="592"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="592"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="624"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="624"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="624"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="624"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="656"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="656"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="656"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="656"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="1968" y="688"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="688"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="688"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="688"/>
  </objectgroup>
 </map>
diff --git a/maps/new_11-1.tmx b/maps/new_11-1.tmx
index 6d4bca5b..15d53d14 100644
--- a/maps/new_11-1.tmx
+++ b/maps/new_11-1.tmx
@@ -130,5 +130,19 @@
     </property>
    </properties>
   </object>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4016"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4016"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4048"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4048"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4048"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="4048"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4080"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4080"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4080"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="4080"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="1968" y="4112"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4112"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4112"/>
+  <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4112"/>
  </objectgroup>
 </map>
diff --git a/monsters.xml b/monsters.xml
index 4721dc57..73c53f37 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1,10 +1,51 @@
 <monsters>
+
     <monster id="0" name="Maggot" targetCursor="small">
         <sprite>monster-maggot.xml</sprite>
         <sound event="hit">maggot-hit1.ogg</sound>
         <sound event="hit">maggot-hit2.ogg</sound>
         <sound event="miss">maggot-miss1.ogg</sound>
         <sound event="die">maggot-dying1.ogg</sound>
+        <drop item="505" percent="8"/>
+        <drop item="518" percent="4"/>
+        <drop item="501" percent="1.5"/>
+        <drop item="533" percent="1.5"/>
+        <drop item="502" percent="0.7"/>
+        <drop item="522" percent="0.1"/>
+        <attributes
+            hp="20"
+            size="4"
+            speed="64"
+            attack-min="10"
+            attack-delta="2"
+            attack-magic="0"
+            hit="10"
+            evade="10"
+            physical-defence="5"
+            magical-defence="0"
+            mutation="50"
+            />
+        <vulnerability element="fire" factor="1.5"/>
+        <vulnerability element="earth" factor="0.7"/>
+        <exp>10</exp>
+        <!-- average stroll- and track range-->
+        <behavior
+            aggressive="false"
+            cowardly="false"
+            track-range="5"
+            stroll-range="5"
+            attack-distance="32"
+            />
+        <attack id="1"
+            priority="1"
+            type="physical"
+            pre-delay="10"
+            aft-delay="5"
+            damage-factor="1"
+            range="32"
+            angle="10"
+            animation="attack"
+            />
     </monster>
 
     <monster id="1" name="Scorpion">
@@ -14,6 +55,53 @@
         <sound event="hit">scorpion-hit3.ogg</sound>
         <sound event="hit">scorpion-hit4.ogg</sound>
         <sound event="miss">scorpion-miss1.ogg</sound>
+        <drop item="507" percent="7"/>
+        <drop item="510" percent="1"/>
+        <drop item="509" percent="0.5"/>
+        <drop item="518" percent="7"/>
+        <exp>20</exp>
+        <attributes
+            hp="20"
+            size="8"
+            speed="192"
+            attack-min="10"
+            attack-delta="2"
+            attack-magic="0"
+            hit="10"
+            evade="10"
+            physical-defence="5"
+            magical-defence="0"
+            />
+        <!-- doesn't move much, but attacks when you are comming too close. -->
+        <behavior
+            aggressive="true"
+            cowardly="false"
+            track-range="2"
+            stroll-range="1"
+            attack-distance="64"
+            />
+        <!-- slow, strong, long-range tail attack-->
+        <attack id="1"
+            priority="1"
+            type="physical"
+            pre-delay="5"
+            aft-delay="15"
+            damage-factor="3"
+            range="64"
+            angle="1"
+            particle-effect="graphics/particles/attack.particle.xml"
+            action="special1"
+            />
+        <!-- fast, weak, short-range scissor attack -->
+        <attack id="2"
+            priority="4"
+            type="physical"
+            pre-delay="3"
+            aft-delay="3"
+            damage-factor="1"
+            range="32"
+            angle="45"
+            />
     </monster>
 
     <monster id="2" name="Red Scorpion">
@@ -23,11 +111,80 @@
         <sound event="hit">scorpion-hit3.ogg</sound>
         <sound event="hit">scorpion-hit4.ogg</sound>
         <sound event="miss">scorpion-miss1.ogg</sound>
+        <drop item="517" percent="20"/>
+        <drop item="509" percent="1"/>
+        <drop item="518" percent="5"/>
+        <drop item="1200" percent="0.1"/>
+        <drop item="1199" percent="7.6"/>
+        <drop item="1201" percent="5.4"/>
+        <drop item="524" percent="0.1"/>
+        <exp>50</exp>
+        <attributes
+            hp="20"
+            size="8"
+            speed="192"
+            attack-min="20"
+            attack-delta="10"
+            attack-magic="0"
+            hit="30"
+            evade="30"
+            physical-defence="5"
+            magical-defence="0"
+            />
+        <!-- also quite lazy when unprovoked but much more territorial
+        than the normal one-->
+        <behavior
+            aggressive="true"
+            cowardly="false"
+            track-range="6"
+            stroll-range="1"
+            attack-distance="64"
+            />
+        <attack id="1"
+            priority="1"
+            type="physical"
+            element="fire"
+            pre-delay="5"
+            aft-delay="10"
+            damage-factor="1"
+            range="64"
+            angle="10"
+            />
     </monster>
 
     <monster id="3" name="Green Slime">
         <sprite>monster-slime.xml|#72982c,ffffff</sprite>
         <sound event="hit">slime-hit1.ogg</sound>
+        <drop item="502" percent="2"/>
+        <drop item="513" percent="1"/>
+        <drop item="501" percent="1"/>
+        <drop item="521" percent="1"/>
+        <drop item="522" percent="1.9"/>
+        <drop item="526" percent="0.1"/>
+        <drop item="503" percent="5"/>
+        <drop item="535" percent="7.5"/>
+        <exp>60</exp>
+        <attributes
+            hp="200"
+            size="4"
+            speed="32"
+            attack-min="2"
+            attack-delta="10"
+            attack-magic="0"
+            hit="100"
+            evade="10"
+            physical-defence="0"
+            magical-defence="0"
+            />
+        <!-- Is fulfilling some unknown purpose that requires it to move around
+        a lot and leaves no time for pursing attackers -->
+        <behavior
+            aggressive="false"
+            cowardly="false"
+            track-range="4"
+            stroll-range="24"
+            attack-distance="32"
+            />
     </monster>
 
     <monster id="4" name="Giant Maggot" targetCursor="large">
@@ -36,16 +193,36 @@
         <sound event="hit">maggot-hit2.ogg</sound>
         <sound event="miss">maggot-miss1.ogg</sound>
         <sound event="die">maggot-dying1.ogg</sound>
+        <drop item="1199" percent="9"/>
+        <drop item="519" percent="1"/>
+        <drop item="518" percent="7.5"/>
+        <drop item="501" percent="50"/>
+        <drop item="502" percent="30"/>
+        <drop item="503" percent="0.1"/>
+        <drop item="526" percent="0.1"/>
     </monster>
 
     <monster id="5" name="Yellow Slime">
         <sprite>monster-slime.xml|#b47f00,ffffff</sprite>
         <sound event="hit">slime-hit1.ogg</sound>
+        <drop item="534" percent="2"/>
+        <drop item="519" percent="1"/>
+        <drop item="501" percent="3.5"/>
+        <drop item="502" percent="2.5"/>
+        <drop item="522" percent="0.1"/>
     </monster>
 
     <monster id="6" name="Red Slime">
         <sprite>monster-slime.xml|#7e0000,ffffff</sprite>
         <sound event="hit">slime-hit1.ogg</sound>
+        <drop item="1201" percent="3"/>
+        <drop item="509" percent="1.1"/>
+        <drop item="521" percent="2"/>
+        <drop item="523" percent="0.4"/>
+        <drop item="525" percent="0.8"/>
+        <drop item="535" percent="7.5"/>
+        <drop item="528" percent="2.5"/>
+        <drop item="531" percent="1.5"/>
     </monster>
 
     <monster id="7" name="Black Scorpion">
@@ -55,6 +232,9 @@
         <sound event="hit">scorpion-hit3.ogg</sound>
         <sound event="hit">scorpion-hit4.ogg</sound>
         <sound event="miss">scorpion-miss1.ogg</sound>
+        <drop item="523" percent="1.5"/>
+        <drop item="509" percent="1.0"/>
+        <drop item="518" percent="8"/>
     </monster>
 
     <monster id="8" name="Snake">
@@ -66,15 +246,27 @@
         <sound event="hit">fire-goblin-hit1.ogg</sound>
         <sound event="hit">fire-goblin-hit2.ogg</sound>
         <sound event="miss">fire-goblin-miss1.ogg</sound>
+        <drop item="505" percent="8"/>
+        <drop item="501" percent="1.5"/>
+        <drop item="518" percent="8"/>
+        <drop item="502" percent="1.5"/>
+        <drop item="521" percent="0.7"/>
+        <drop item="522" percent="0.1"/>
     </monster>
 
     <monster id="10" name="Spider">
         <sprite>monster-spider.xml</sprite>
+        <drop item="537" percent="5"/>
+        <drop item="535" percent="1"/>
     </monster>
 
     <monster id="11" name="Evil Mushroom">
         <sprite>monster-mushroom-red.xml</sprite>
         <sound event="hit">shroom-hit1.ogg</sound>
+        <drop item="535" percent="5"/>
+        <drop item="540" percent="0.1"/>
+        <drop item="534" percent="1"/>
+        <drop item="566" percent="5"/>
     </monster>
 
     <monster id="12" name="Flower">
@@ -82,31 +274,60 @@
         <sound event="hit">flower-hit1.ogg</sound>
         <sound event="hit">flower-hit2.ogg</sound>
         <sound event="miss">flower-miss1.ogg</sound>
+        <drop item="535" percent="1"/>
+        <drop item="540" percent="0.1"/>
+        <drop item="1199" percent="1"/>
+        <drop item="526" percent="4"/>
+        <drop item="565" percent="5"/>
     </monster>
 
     <monster id="13" name="Santa Slime">
         <sprite>monster-slime-santa.xml</sprite>
+        <drop item="512" percent="8"/>
+        <drop item="513" percent="7"/>
+        <drop item="514" percent="6"/>
+        <drop item="519" percent="5"/>
+        <drop item="527" percent="4"/>
+        <drop item="538" percent="5"/>
     </monster>
 
     <monster id="14" name="Rudolph Slime">
         <sprite>monster-slime-rudolph.xml</sprite>
+        <drop item="504" percent="8"/>
+        <drop item="506" percent="5"/>
+        <drop item="508" percent="2"/>
+        <drop item="509" percent="3"/>
+        <drop item="510" percent="6"/>
+        <drop item="515" percent="8"/>
+        <drop item="516" percent="5"/>
     </monster>
 
     <monster id="15" name="Bat">
         <sprite>monster-bat.xml</sprite>
         <sound event="die">bat-dying1.ogg</sound>
         <sound event="hit">bat-hit1.ogg</sound>
+        <drop item="505" percent="8"/>
+        <drop item="501" percent="1.5"/>
+        <drop item="518" percent="4"/>
+        <drop item="533" percent="1.5"/>
+        <drop item="521" percent="0.7"/>
+        <drop item="522" percent="0.1"/>
     </monster>
 
     <monster id="16" name="Pinkie" targetCursor="small">
         <sprite>monster-pinkie.xml</sprite>
         <sound event="hit">pinkie-hit1.ogg</sound>
         <sound event="miss">pinkie-miss1.ogg</sound>
+        <drop item="614" percent="8"/>
     </monster>
 
     <monster id="17" name="Spiky Mushroom">
         <sprite>monster-mushroom-spiky.xml</sprite>
         <sound event="hit">shroom-hit1.ogg</sound>
+        <drop item="567" percent="8"/>
+        <drop item="501" percent="1.5"/>
+        <drop item="518" percent="0.5"/>
+        <drop item="613" percent="1.5"/>
     </monster>
 
     <monster id="18" name="Fluffy">
@@ -116,10 +337,15 @@
         <sound event="hit">fluffy-hit3.ogg</sound>
         <sound event="miss">fluffy-miss1.ogg</sound>
         <sound event="hurt">fluffy-hurt1.ogg</sound>
+        <drop item="611" percent="8"/>
+        <drop item="527" percent="1.5"/>
+        <drop item="535" percent="4"/>
     </monster>
 
     <monster id="19" name="Cave Snake">
         <sprite>monster-snake-cave.xml</sprite>
+        <drop item="612" percent="8"/>
+        <drop item="610" percent="0.1"/>
     </monster>
 
     <monster id="20" name="Pumpkin Ghost">
@@ -128,10 +354,14 @@
 
     <monster id="21" name="Fire Skull">
         <sprite>monster-skull-fire.xml</sprite>
+        <drop item="621" percent="0.1"/>
+        <drop item="540" percent="1.5"/>
     </monster>
 
     <monster id="22" name="Poison Skull">
         <sprite>monster-skull-poison.xml</sprite>
+        <drop item="621" percent="0.1"/>
+        <drop item="540" percent="1.5"/>
     </monster>
 
     <monster id="23" name="Log Head">
@@ -141,6 +371,7 @@
         <sound event="hurt">loghead-hurt3.ogg</sound>
         <sound event="hurt">loghead-hurt4.ogg</sound>
         <sound event="hurt">loghead-hurt5.ogg</sound>
+        <drop item="569" percent="20"/>
     </monster>
 
     <monster id="24" name="Mountain Snake">
@@ -156,4 +387,4 @@
         <sound event="hurt">fluffy-hurt1.ogg</sound>
     </monster>
 
-</monsters>
\ No newline at end of file
+</monsters>
diff --git a/npcs.xml b/npcs.xml
new file mode 100644
index 00000000..72b7b2e7
--- /dev/null
+++ b/npcs.xml
@@ -0,0 +1,80 @@
+<!--
+    This file maps the NPC appearance IDs the server is sending to the spritesheet(s).
+
+    Note that it is possible to give an NPC multiple sprites. In this case the
+    sprites are drawn in order of declaration.
+
+    IDs 101-199 should be used for unanimated NPCs (100 is added for 0.0 client compatibility)
+-->
+<npcs>
+ <npc id="101"><sprite variant="1">npc.xml</sprite></npc><!-- Fat guy with scissors -->
+ <npc id="102"><sprite variant="2">npc.xml</sprite></npc><!-- Oriental trader -->
+ <npc id="103"><sprite variant="3">npc.xml</sprite></npc><!-- Boy with white hair -->
+ <npc id="104"><sprite variant="4">npc.xml</sprite></npc><!-- Guy in black cloak -->
+ <npc id="105"><sprite variant="5">npc.xml</sprite></npc><!-- Soldier with sword -->
+ <npc id="106"><sprite variant="6">npc.xml</sprite></npc><!-- Santa Clause -->
+ <npc id="107"><sprite variant="7">npc.xml</sprite></npc><!-- Girl with pink hair and blue top -->
+ <npc id="108"><sprite variant="8">npc.xml</sprite></npc><!-- Scholar guy with glasses -->
+ <npc id="109"><sprite variant="9">npc.xml</sprite></npc><!-- Woman with green hair and pink dress -->
+ <npc id="110"><sprite variant="10">npc.xml</sprite></npc><!-- Miner -->
+ <npc id="111"><sprite variant="11">npc.xml</sprite></npc><!-- Soldier with spear -->
+ <npc id="112"><sprite variant="12">npc.xml</sprite></npc><!-- Treasure chest -->
+ <npc id="113"><sprite variant="13">npc.xml</sprite></npc><!-- Barkeeper -->
+ <npc id="114"><sprite variant="14">npc.xml</sprite></npc><!-- Gnome with hat -->
+ <npc id="115"><sprite variant="15">npc.xml</sprite></npc><!-- Little blue-haired girl -->
+ <npc id="116"><sprite variant="16">npc.xml</sprite></npc><!-- Guy with red hair and green cloak -->
+ <npc id="117"><sprite variant="17">npc.xml</sprite></npc><!-- Old geezer with rod -->
+ <npc id="118"><sprite variant="18">npc.xml</sprite></npc><!-- Boy with brown hair -->
+ <npc id="119"><sprite variant="19">npc.xml</sprite></npc><!-- Nurse without hat -->
+ <npc id="120"><sprite variant="20">npc.xml</sprite></npc><!-- Nurse with hat -->
+ <npc id="121"><sprite variant="21">npc.xml</sprite></npc><!-- Guy with brown hair in plain clothes -->
+ <npc id="122"><sprite variant="22">npc.xml</sprite></npc><!-- Soldier -->
+ <npc id="123"><sprite variant="23">npc.xml</sprite></npc><!-- Soldier with sword and shield -->
+ <npc id="124"><sprite variant="24">npc.xml</sprite></npc><!-- Soldier with sword, shield and helmet -->
+ <npc id="125"><sprite variant="25">npc.xml</sprite></npc><!-- Guy with black hair in plain clothes -->
+ <npc id="126"><sprite variant="26">npc.xml</sprite></npc><!-- Guy with black clothes -->
+ <npc id="127"><sprite variant="27">npc.xml</sprite></npc><!-- Guy with black clothes and axe -->
+ <npc id="128"><sprite variant="28">npc.xml</sprite></npc><!-- empty (Invisible NPC) -->
+ <npc id="129"><sprite variant="29">npc.xml</sprite></npc><!-- Nomad, standing -->
+ <npc id="130"><sprite variant="30">npc.xml</sprite></npc><!-- Snowman -->
+ <npc id="131"><sprite variant="31">npc.xml</sprite></npc><!-- Paperboy (wtf? how does this one fit in a fantasy game?) -->
+ <npc id="132"><sprite variant="32">npc.xml</sprite></npc><!-- Nomad, sitting -->
+ <npc id="133"><sprite variant="33">npc.xml</sprite></npc><!-- Nomad, sitting with pipe -->
+ <npc id="134"><sprite variant="34">npc.xml</sprite></npc><!-- Captain Kirk -->
+ <npc id="135"><sprite variant="35">npc.xml</sprite></npc><!-- Mr. Spock -->
+ <npc id="136"><sprite variant="36">npc.xml</sprite></npc><!-- Guy with sword over shoulder -->
+ <npc id="137"><sprite variant="37">npc.xml</sprite></npc><!-- Creepy surgeon guy -->
+ <npc id="138"><sprite variant="38">npc.xml</sprite></npc><!-- Metrosexual guy with pink jacket on stool -->
+ <npc id="139"><sprite variant="39">npc.xml</sprite></npc><!-- Zombie pirate captain-->
+ <npc id="140"><sprite variant="40">npc.xml</sprite></npc><!-- Girl in playboy bunny costume -->
+ <npc id="141"><sprite variant="41">npc.xml</sprite></npc><!-- Woman with green dress and apron -->
+ <npc id="142"><sprite variant="42">npc.xml</sprite></npc><!-- Lumberjack -->
+ <npc id="143"><sprite variant="43">npc.xml</sprite></npc><!-- Farmer -->
+ <npc id="144"><sprite variant="44">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="145"><sprite variant="45">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="146"><sprite variant="46">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="147"><sprite variant="47">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="148"><sprite variant="48">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="149"><sprite variant="49">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="150"><sprite variant="50">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="151"><sprite variant="51">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="152"><sprite variant="52">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="153"><sprite variant="53">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="154"><sprite variant="54">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="155"><sprite variant="55">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+ <npc id="156"><sprite variant="56">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
+
+ <npc id="200">
+ 	<sprite>npc-test.xml</sprite>
+ </npc>
+ <npc id="201">
+ 	<!-- This entry demonstrates that an NPC can be constructed from multiple preexisting
+ 	spritesets. While using the default player sprite and normal player equipment can save
+ 	time it is usually better to create a new NPC as one graphic from scratch. -->
+ 	<sprite>player_female_base.xml</sprite>
+ 	<sprite>leg-jeans-female.xml</sprite>
+ 	<sprite>hairstyle4-female.xml|#bb2222,ffee33</sprite>
+ </npc>
+
+
+</npcs>
-- 
cgit v1.2.3-60-g2f50