From 8e33ce61d93beaf575dbf1b756a62e311f440640 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 20:00:41 +0200
Subject: Adding files as in http://dl.dropbox.com/u/1539068/Tradey.tar.bz2

---
 being.py          |   30 +
 config.py         |    6 +
 data/items.xml    | 5540 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 data/sale.xml     |    1 +
 data/user.xml     |    1 +
 main.py           | 1012 ++++++++++
 net/__init__.py   |    0
 net/packet.py     |  179 ++
 net/packet_out.py |   50 +
 net/protocol.py   |   64 +
 player.py         |   31 +
 tradey.py         |   88 +
 utils.py          |  115 ++
 13 files changed, 7117 insertions(+)
 create mode 100644 being.py
 create mode 100644 config.py
 create mode 100644 data/items.xml
 create mode 100644 data/sale.xml
 create mode 100644 data/user.xml
 create mode 100644 main.py
 create mode 100644 net/__init__.py
 create mode 100644 net/packet.py
 create mode 100644 net/packet_out.py
 create mode 100644 net/protocol.py
 create mode 100644 player.py
 create mode 100644 tradey.py
 create mode 100644 utils.py

diff --git a/being.py b/being.py
new file mode 100644
index 0000000..9c51a2b
--- /dev/null
+++ b/being.py
@@ -0,0 +1,30 @@
+def job_type(job):
+    if (job <= 25 or (job >= 4001 and job <= 4049)):
+        return "player"
+    elif (job >= 46 and job <= 1000):
+        return "npc"
+    elif (job > 1000 and job <= 2000):
+        return "monster"
+    elif (job == 45):
+        return "portal"
+
+class BeingManager:
+    def __init__(self):
+	self.container = {}
+
+    def findId(self, name):
+	for i in self.container:
+	   if self.container[i].name == name:
+		return i
+	return -10
+
+class Being:
+    def __init__(self, being_id, job):
+        self.id = being_id
+	self.name = ""
+	self.x = 0
+	self.y = 0
+	self.action = ""
+	self.job = job
+	self.target = 0
+	self.type = job_type(job)
diff --git a/config.py b/config.py
new file mode 100644
index 0000000..068d432
--- /dev/null
+++ b/config.py
@@ -0,0 +1,6 @@
+#server = "server.themanaworld.org"
+server = "caliban.homeip.net"
+port = 6901
+account = ""
+password = ""
+character = 0 #slot character is in, 0 for first, 1 for second, 2 for third
diff --git a/data/items.xml b/data/items.xml
new file mode 100644
index 0000000..1656c73
--- /dev/null
+++ b/data/items.xml
@@ -0,0 +1,5540 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="items.xsl"?>
+<!--
+    Here are listed all the known items in The Mana World. This file defines
+    their name, icon, description, weight, etc. It also defines which sprite
+    to use in the case of visible equipment and which sounds to play on certain
+    events related to the item.
+
+    The 'weapon_type' attribute is kept for 0.0 client compatibility. Not to be
+    confused with 'weapon-type'.
+-->
+<items>
+    <version revision="$Revision$" />
+
+    <item id="-1" type="hairsprite" name="Flat ponytail">
+        <sprite>hairstyles/hairstyle01.xml</sprite>
+    </item>
+    <item id="-2" type="hairsprite" name="Bowl cut">
+        <sprite>hairstyles/hairstyle02.xml</sprite>
+    </item>
+    <item id="-3" type="hairsprite" name="Combed back">
+        <sprite>hairstyles/hairstyle03.xml</sprite>
+    </item>
+    <item id="-4" type="hairsprite" name="Emo">
+        <sprite>hairstyles/hairstyle04.xml</sprite>
+    </item>
+    <item id="-5" type="hairsprite" name="Mohawk">
+        <sprite>hairstyles/hairstyle05.xml</sprite>
+    </item>
+    <item id="-6" type="hairsprite" name="Pompadour">
+        <sprite>hairstyles/hairstyle06.xml</sprite>
+    </item>
+    <item id="-7" type="hairsprite" name="Center parting/Short and slick">
+        <sprite>hairstyles/hairstyle07.xml</sprite>
+    </item>
+    <item id="-8" type="hairsprite" name="Long and slick">
+        <sprite>hairstyles/hairstyle08.xml</sprite>
+    </item>
+    <item id="-9" type="hairsprite" name="Short and curly">
+        <sprite>hairstyles/hairstyle09.xml</sprite>
+    </item>
+    <item id="-10" type="hairsprite" name="Pigtails">
+        <sprite>hairstyles/hairstyle10.xml</sprite>
+    </item>
+    <item id="-11" type="hairsprite" name="Long and curly">
+        <sprite>hairstyles/hairstyle11.xml</sprite>
+    </item>
+    <item id="-12" type="hairsprite" name="Parted">
+        <sprite>hairstyles/hairstyle12.xml</sprite>
+    </item>
+    <item id="-13" type="hairsprite" name="Perky ponytail">
+        <sprite>hairstyles/hairstyle13.xml</sprite>
+    </item>
+    <item id="-14" type="hairsprite" name="Wave">
+        <sprite>hairstyles/hairstyle14.xml</sprite>
+    </item>
+    <item id="-15" type="hairsprite" name="Mane">
+        <sprite>hairstyles/hairstyle15.xml</sprite>
+    </item>
+    <item id="-16" type="hairsprite" name="Bun">
+        <sprite>hairstyles/hairstyle16.xml</sprite>
+    </item>
+    <item id="-17" type="hairsprite" name="Shoulder length flick">
+	<sprite>hairstyles/hairstyle17.xml</sprite>
+    </item>
+    <item id="-18" type="hairsprite" name="Fizzy">
+	<sprite>hairstyles/hairstyle18.xml</sprite>
+    </item>
+
+    <!-- Treating the base sprite as equipment too will be useful when we
+         implement other playable races -->
+    <item id="-100" type="racesprite" name="Human">
+        <sprite gender="male">player_male_base.xml</sprite>
+        <sprite gender="female">player_female_base.xml</sprite>
+    </item>
+
+    <!-- TEMPORARY LOW WEAPON ID:S (< 256) -->
+    <!-- Used for tmwAthena magic system -->
+    <item id="16">
+<!--        <sprite>weapon-dagger.xml</sprite>-->
+    </item>
+    <item id="30"
+        weapon_type="1">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
+    </item>
+    <item id="31"
+        weapon_type="10">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+    </item>
+    <item id="32"
+        weapon_type="11">
+        <sprite>weapon-scythe.xml</sprite>
+    </item>
+    <item id="33"
+        weapon_type="1">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
+    </item>
+    <item id="34"
+        weapon_type="1"> <!-- magic fist -->
+        <sprite>weapon-fist.xml</sprite>
+    </item>
+    <item id="35"
+        weapon_type="11">
+        <sprite>weapon-staff.xml</sprite>
+    </item>
+
+
+    <!-- Items -->
+    <item id="501"
+        image="use/potions/a.png|G:#22ff22"
+        name="Cactus Drink"
+        description="A fresh drink."
+        type="usable"
+        hp="15"
+        weight="4"/>
+    <item id="502"
+        image="use/potions/a.png|G:#ff2222"
+        name="Cactus Potion"
+        description="A fresh potion."
+        type="usable"
+        hp="25"
+        weight="7"/>
+    <item id="503"
+        image="generic/casinocoins.png"
+        name="Casino Coins"
+        description="Just some casino coins."
+        type="generic"
+        weight="1"/>
+    <item id="504"
+        image="use/food/decorcandy.png"
+        name="Decor Candy"
+        description="A leftover decor candy from last Christmas."
+        type="generic"
+        weight="1"/>
+    <item id="505"
+        image="generic/maggotslime.png"
+        name="Maggot Slime"
+        description="Slimy maggot slime."
+        type="generic"
+        weight="1"/>
+    <item id="506"
+        image="use/food/candycane.png"
+        name="Candy Cane"
+        description="Tasty candy cane."
+        type="usable"
+        hp="5"
+        weight="1"/>
+    <item id="507"
+        image="generic/scorpionstinger.png|W:#a08040,e0e0e0"
+        name="Scorpion Stinger"
+        description="A poisoned scorpion stinger."
+        type="generic"
+        weight="1"/>
+    <item id="508"
+        image="use/food/xmascake.png"
+        name="Xmas Cake"
+        description="A sweet xmas cake."
+        type="usable"
+        hp="10"
+        weight="1"/>
+    <item id="509"
+        image="use/food/chocolatebar.png|W:#441e00,b36e36"
+        name="Chocolate Bar"
+        description="A chocolate bar made of finest chocolate."
+        type="usable"
+        hp="20"
+        weight="1"/>
+    <item id="510"
+        image="use/food/candy.png"
+        name="Candy"
+        description="A sugar-free candy."
+        type="usable"
+        hp="5"
+        weight="1"/>
+    <item id="511"
+        image="equipment/head/santahat.png"
+        name="Santa Hat"
+        description="Ask Santa about this hat."
+        effect="M. Attack -2"
+        type="equip-head"
+        weight="20"
+        defense="2">
+        <sprite>equipment/head/santahat.xml</sprite>
+    </item>
+    <item id="512"
+        image="use/food/gingerbreadman.png"
+        name="Ginger Bread Man"
+        description="A tasty ginger bread man."
+        type="usable"
+        hp="25"
+        weight="1"/>
+    <item id="513"
+        image="use/food/cake.png"
+        name="Cake"
+        description="A slice of cake."
+        type="usable"
+        hp="15"
+        weight="1"/>
+    <item id="514"
+        image="use/food/xmascandycane.png"
+        name="Xmas Candy Cane"
+        description="A special xmas candy cane."
+        type="usable"
+        hp="10"
+        weight="1"/>
+    <item id="515"
+        image="generic/purplepresentbox.png"
+        name="Purple Present Box"
+        description="Something mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="516"
+        image="generic/bluepresentbox.png"
+        name="Blue Present Box"
+        description="Something mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="517"
+        image="generic/scorpionstinger.png|W:#e04040,f0f0f0"
+        name="Red Scorpion Stinger"
+        description="A highly poisoned red scorpion stinger."
+        type="generic"
+        weight="1"/>
+    <item id="518"
+        image="generic/bugleg.png"
+        name="Bug Leg"
+        description="A bug's leg. Mostly used for alchemy."
+        type="generic"
+        weight="1"/>
+    <item id="519"
+        image="use/food/cherrycake.png"
+        name="Cherry Cake"
+        description="A nice cherry cake."
+        type="usable"
+        hp="35"
+        weight="1"/>
+    <item id="520"
+        image="use/food/easteregg.png"
+        name="Easter Egg"
+        description="A surprise."
+        type="usable"
+        hp="100"
+        weight="1"/>
+    <item id="521"
+        image="equipment/weapon/dagger-dagger.png"
+        name="Dagger"
+        description="A simple dagger."
+        effect="Damage +15"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        weight="200">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
+    </item>
+    <item id="522"
+        image="equipment/weapon/dagger-sharpknife.png"
+        name="Sharp Knife"
+        description="A really sharp knife. Don't hurt yourself!"
+        effect="Damage +10"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        weight="150">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/knives/sharpknife-miss1.ogg</sound>
+    </item>
+    <item id="523"
+        image="equipment/chest/leathershirt.png"
+        name="Leather Shirt"
+        description="A shirt made of hardened leather."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="4"
+        weight="20">
+        <sprite gender="male">equipment/chest/leather-male.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
+        <sprite gender="female">equipment/chest/leather-female.xml|#412300,603100,8d4900;#ffff00</sprite>
+    </item>
+    <item id="524"
+        image="equipment/head/fancyhat.png"
+        name="Fancy Hat"
+        description="A fancy hat."
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/fancyhat.xml</sprite>
+    </item>
+    <item id="525"
+        image="equipment/head/minershat.png"
+        name="Miners Hat"
+        description="A hat used by miners."
+        effect="M. Attack -8"
+        type="equip-head"
+        defense="4"
+        weight="40">
+        <sprite>equipment/head/minershat.xml</sprite>
+    </item>
+    <item id="526"
+        image="generic/coinbag.png"
+        name="Coin Bag"
+        description="A bag used to hold coins."
+        type="generic"
+        weight="5"/>
+    <item id="527"
+        image="use/food/milk.png"
+        name="Milk"
+        description="A fresh litre of ice cold milk. Note: Cool people drink milk!"
+        type="usable"
+        hp="150"
+        weight="5"/>
+    <item id="528"
+        image="equipment/feet/boots.png|W:#4f2d29,c89078"
+        name="Boots"
+        description="Some robust boots, ideal for travelling."
+        effect="M. Attack -2"
+        type="equip-feet"
+        defense="2"
+        weight="80">
+        <sprite gender="male">equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#623a34,f0c2b4</sprite>
+    </item>
+    <item id="529"
+        image="equipment/ammo/ironarrow.png"
+        name="Iron Arrow"
+        description="A hard arrow made of iron."
+        effect="Damage +40"
+        type="equip-ammo"
+        weight="1"/>
+    <item id="530"
+        image="equipment/weapon/bow-shortbow.png"
+        name="Short Bow"
+        description="A bow for short distances."
+        effect="Damage +50 / Range 5"
+        type="equip-2hand"
+        weapon-type="bow"
+        attack-action="attack_bow"
+        weight="600"
+        missile-particle="graphics/particles/arrow.particle.xml">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+    </item>
+    <item id="531"
+        image="equipment/hands/minergloves.png"
+        name="Miner Gloves"
+        description="Gloves used by miners, very useful."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="2"
+        weight="30">
+        <sprite gender="male">equipment/hands/generic-male.xml|#202020,505050</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#202020,505050</sprite>
+    </item>
+    <item id="532"
+        image="equipment/hands/leathergloves.png"
+        name="Leather Gloves"
+        description="Gloves made of hardened leather."
+        effect="M. Attack -20"
+        type="equip-arms"
+        defense="4"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#4e2e18,c8752f</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#4e2e18,c8752f</sprite>
+    </item>
+    <item id="533"
+        image="use/food/roastedmaggot.png"
+        name="Roasted Maggot"
+        description="A maggot roasted on fire."
+        type="usable"
+        hp="150"
+        weight="5"/>
+    <item id="534"
+        image="use/food/orangecupcake.png"
+        name="Orange Cupcake"
+        description="A very soft orange cupcake."
+        type="usable"
+        hp="100"
+        weight="5"/>
+    <item id="535"
+        image="use/food/apple.png|R:#ff3600;Y:#ffc000;G:#66cc33"
+        name="Red Apple"
+        description="A healthy red apple."
+        type="usable"
+        hp="50"
+        weight="5"/>
+    <item id="536"
+        image="equipment/weapon/dagger-shortsword.png"
+        name="Short Sword"
+        description="A small but sharp sword."
+        effect="Damage +100"
+        type="equip-1hand"
+        weapon-type="sword"
+        attack-action="attack"
+        weight="2000">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="537"
+        image="generic/treasurekey.png"
+        name="Treasure Key"
+        description="A rusty key."
+        type="generic"
+        weight="2"/>
+    <item id="538"
+        image="generic/greenpresentbox.png"
+        name="Green Present Box"
+        description="Something mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="539"
+        image="use/food/beer.png"
+        name="Beer"
+        description="A fresh beer."
+        type="usable"
+        hp="200"
+        mp="5"
+        weight="10"/>
+    <item id="540"
+        image="generic/bottle-empty.png"
+        name="Empty Bottle"
+        description="An empty bottle."
+        type="generic"
+        weight="1"/>
+    <item id="541"
+        image="use/food/water.png"
+        name="Bottle of Water"
+        description="A bottle of water."
+        type="usable"
+        hp="250"
+        weight="10"/>
+    <item id="542"
+        image="generic/bottle-sand.png"
+        name="Bottle of Sand"
+        description="A bottle with sand in it."
+        type="generic"
+        weight="10"/>
+    <item id="543"
+        image="equipment/head/standardheadband.png|W:#291e16,99784c,d8bd86,ffffff"
+        name="Standard Headband"
+        description="A standard headband."
+        effect="M. Attack -3"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>equipment/head/standardheadband.xml|#563f25,99784c,d8bd86,ffffff</sprite>
+    </item>
+    <item id="544"
+        image="equipment/head/silkheadband.png"
+        name="Silk Headband"
+        description="A cool headband made of silk."
+        effect="M. Attack -10"
+        type="equip-head"
+        defense="10"
+        weight="10">
+        <sprite>equipment/head/silkheadband.xml</sprite>
+    </item>
+    <item id="545"
+        image="equipment/weapon/bow-forestbow.png"
+        name="Forest Bow"
+        description="A bow usually used for hunting."
+        effect="Damage +70 / Range 5"
+        type="equip-2hand"
+        weapon-type="bow"
+        attack-action="attack_bow"
+        weight="1200"
+        missile-particle="graphics/particles/arrow.particle.xml">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+    </item>
+    <item id="546"
+        image="equipment/chest/desertshirt.png"
+        name="Desert Shirt"
+        description="A shirt suitable for desert trips."
+        effect="M. Attack -18"
+        type="equip-torso"
+        defense="6"
+        weight="20">
+        <sprite gender="male">equipment/chest/leather-male.xml|#443c21,85794a,beb590,ffffff;#824035,d6a19a</sprite>
+        <sprite gender="female">equipment/chest/leather-female.xml|#251e06,443c21,71653b,a0945e;#b6574a</sprite>
+    </item>
+    <item id="547"
+        image="equipment/weapon/polearm-bardiche.png"
+        name="Bardiche"
+        description="A bardiche."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="548"
+        image="equipment/weapon/polearm-halberd.png"
+        name="Halberd"
+        description="A weapon usually carried by guards."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="1400"/>
+    <item id="549"
+        image="equipment/weapon/axe-axe.png"
+        name="Axe"
+        description="An axe."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="axe"
+        weight="1200"/>
+    <item id="550"
+        image="equipment/weapon/axe-blacksmithsaxe.png"
+        name="Blacksmith's Axe"
+        description="An axe usually used by blacksmiths."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="axe"
+        weight="1200">
+	<sprite>weapon-axe-blacksmith.xml</sprite>
+	</item>
+    <item id="551"
+        image="generic/hint.png|W:#74e1f4"
+        name="Aqua Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="552"
+        image="generic/hint.png|W:#c38ec7"
+        name="Magenta Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="553"
+        image="generic/hint.png|W:#f0f17d"
+        name="Yellow Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="554"
+        image="generic/hint.png|W:#70e370"
+        name="Green Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="555"
+        image="generic/hint.png|W:#6ef4ea"
+        name="Teal Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="556"
+        image="generic/hint.png|W:#c97fe8"
+        name="Purple Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="557"
+        image="generic/hint.png|W:#e97180"
+        name="Red Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="558"
+        image="generic/hint.png|W:#7a86f4"
+        name="Blue Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="559"
+        image="generic/hint.png|W:#f0bd67"
+        name="Orange Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="560"
+        image="generic/hint.png"
+        name="Grey Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="561"
+        image="equipment/weapon/sword-sabre.png"
+        name="Sabre"
+        description="A sword with a very sharp, curved, single-edged blade."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="300"/>
+    <item id="562"
+        image="use/food/chickenleg.png"
+        name="Chicken Leg"
+        description="A well cooked chicken leg."
+        type="usable"
+        hp="500"
+        weight="10"/>
+    <item id="563"
+        image="equipment/hands/basicgloves.png|W:#a0a0a0,d0d0d0,ffffff,ffffff"
+        name="Winter Gloves"
+        description="A pair of soft, warm gloves."
+        effect="M. Attack -15"
+        type="equip-arms"
+        defense="3"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+    </item>
+    <item id="564"
+        image="equipment/chest/tnecksweater.png|W:#a4b2b2,ffffff"
+        name="Turtleneck Sweater"
+        description="A thick, soft and warm sweater."
+        effect="M. Attack -18"
+        type="equip-torso"
+        defense="6"
+        weight="30">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="565"
+        image="generic/petal.png|W:#ee748d,ffd8ce"
+        name="Pink Petal"
+        description="A petal from an evil flower."
+        type="usable"
+        hp="50"
+        weight="10"/>
+    <item id="566"
+        image="generic/smallmushroom.png"
+        name="Small Mushroom"
+        description="A mushroom."
+        type="usable"
+        hp="50"
+        weight="10"/>
+    <item id="567"
+        image="use/potions/b.png|G:#c05000,f0a000,f0f09f"
+        name="Iron Potion"
+        description="Increases your attack strength."
+        effect="Attack strength increase (temporary)."
+        type="usable"
+        weight="10"/>
+    <item id="568"
+        image="use/potions/c.png|G:#da69e5,ffdaff"
+        name="Concentration Potion"
+        description="Increases your attack speed."
+        effect="Attack speed increase (temporary)."
+        type="usable"
+        weight="10"/>
+    <item id="569"
+        image="generic/rawlog.png"
+        name="Raw Log"
+        description="A raw log."
+        type="generic"
+        weight="10"/>
+    <item id="570"
+        image="equipment/weapon/dagger-boneknife.png"
+        name="Bone Knife"
+        description="A knife masterly carved out of a bone."
+        effect="Damage +115"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        weight="450">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="571"
+        image="equipment/weapon/dagger-setzer.png"
+        name="Setzer"
+        description="A sharp knife, named after a famous gambler."
+        effect="Damage +110"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        weight="900">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="572"
+        image="equipment/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="200"/>
+    <item id="573"
+        image="equipment/weapon/sword-falchion.png"
+        name="Falchion"
+        description="A heavy one-handed, single-edged sword."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="300"/>
+    <item id="574"
+        image="equipment/weapon/polearm-scorpion.png"
+        name="Scorpion"
+        description="A well crafted glaive."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="600"/>
+    <item id="575"
+        image="equipment/weapon/bow-desertbow.png"
+        name="Desert Bow"
+        description="A tonorian short bow."
+        effect="Damage +? / Range ?"
+        type="equip-2hand"
+        weapon-type="bow"
+        attack-action="attack_bow"
+        weight="1200"
+        missile-particle="graphics/particles/arrow.particle.xml"/>
+    <item id="576"
+        image="equipment/weapon/sword-beheader.png"
+        name="Beheader"
+        description="An oddly designed sword especially made for beheading enemies."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="2000"/>
+    <item id="577"
+        image="equipment/ammo/bonedarts.png"
+        name="Bone Darts"
+        description="Darts made of bones."
+        effect="Damage +? / Range ?"
+        type="equip-1hand"
+        weapon-type="thrown"
+        weight="300"/>
+    <item id="578"
+        image="equipment/weapon/sword-sandcutter.png"
+        name="Sand Cutter"
+        description="A sand cutter."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="1500"/>
+    <item id="579"
+        image="equipment/weapon/dagger-rockknive.png"
+        name="Rock Knife"
+        description="A knife made of stone."
+        effect="Damage +110"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        vit="3"
+        weight="500">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="580"
+        image="equipment/weapon/staff-staffoflife.png"
+        name="Staff of Life"
+        description="A staff that increases healing magic."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="1500"/>
+    <item id="581"
+        image="equipment/weapon/staff-crescentrod.png"
+        name="Crescent Rod"
+        description="A crescent rod."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="1500"/>
+    <item id="582"
+        image="equipment/weapon/staff-staffoffire.png"
+        name="Staff of Fire"
+        description="A staff that increases fire magic."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="1500"/>
+    <item id="583"
+        image="equipment/weapon/staff-staffofice.png"
+        name="Staff of Ice"
+        description="A staff that increases ice magic."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="1500"/>
+    <item id="584"
+        image="equipment/weapon/sword-jackal.png"
+        name="Jackal"
+        description="A jackal."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="100"/>
+    <item id="585"
+        image="equipment/shield/scarabarmlet.png"
+        name="Scarab Armlet"
+        description="A scarab armlet."
+        effect="M. Attack +5"
+        type="equip-arms"
+        weight="200"/>
+    <item id="586"
+        image="equipment/legs/shorts.png|W:#a4b2b2,ffffff"
+        name="Cotton Shorts"
+        description="Shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        weight="15"
+        defense="2">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+
+
+    <item id="587"
+        image="equipment/weapon/sword-sword.png"
+        name="Sword"
+        description="A simple but reliable sword."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="500">
+        <sprite>weapon-sword-sword.xml</sprite>
+	</item>
+
+    <!--
+    <item id="588"
+        image="equipment/weapon/sword-bastardsword.png"
+        name="Bastard Sword"
+        description="A large two handed sword."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="sword"
+        weight="10"/>
+    <item id="589"
+        image="equipment/weapon/sword-broadsword.png"
+        name="Broad Sword"
+        description="A two handed sword with a very broad blade."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="sword"
+        weight="10">
+        <sound event="hit">weapons/swords/broadsword-hit1.ogg</sound>
+    </item>
+    <item id="590"
+        image="equipment/weapon/sword-baselard.png"
+        name="Baselard"
+        description="A short and powerful sword."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"/>
+    <item id="591"
+        image="equipment/weapon/sword-longsword.png"
+        name="Long Sword"
+        description="A sword with a long and agile blade."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10">
+        <sound event="hit">weapons/swords/longsword-hit1.ogg</sound>
+        <sound event="hit">weapons/swords/longsword-hit2.ogg</sound>
+        <sound event="strike">weapons/swords/longsword-miss1.ogg</sound>
+    </item>
+    <item id="592"
+        image="equipment/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"/>
+    <item id="593"
+        image="equipment/weapon/sword-rapier.png"
+        name="Rapier"
+        description="A light sword made for duels."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10">
+        <sound event="hit">weapons/swords/rapier-hit1.ogg</sound>
+    </item>
+    <item id="594"
+        image="equipment/weapon/polearm-spear.png"
+        name="Spear"
+        description="A light spear with a wooden pole."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="700">
+	<sprite>weapon-polearm-spear.xml</sprite>
+	</item>
+    <item id="595"
+        image="equipment/weapon/polearm-heavyspear.png"
+        name="Heavy Spear"
+        description="A heavy spear with a wooden pole."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="596"
+        image="equipment/weapon/polearm-pike.png"
+        name="Pike"
+        description="A light spear with an iron pole."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="597"
+        image="equipment/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"/>
+    <item id="598"
+        image="equipment/weapon/polearm-dualspear.png"
+        name="Dual Spear"
+        description="A spear with two tops."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="599"
+        image="equipment/weapon/sword-firesword.png"
+        name="Fire Sword"
+        description="A magical sword enchanted with the power of fire."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10">
+        <sound event="strike">weapons/swords/firesword-miss1.ogg</sound>
+    </item>
+    <item id="600"
+        image="equipment/shield/brit.png"
+        name="Brit Shield"
+        description="A legendary shield that is said to save queens and rule waves."
+        effect="-50 Cooking"
+        type="equip-shield"
+        weight="10"/>
+    -->
+
+    <item id="601"
+        image="equipment/shield/steel.png"
+        name="Steel Shield"
+        description="A shield made of steel."
+        effect="M. Attack -200"
+        defense="20"
+        type="equip-shield"
+        weight="2500"/>
+    <item id="602"
+        image="equipment/shield/wooden.png"
+        name="Wooden Shield"
+        description="A shield made of wood."
+        effect="M. Attack -70"
+        defense="14"
+        type="equip-shield"
+        weight="1500"/>
+    <item id="603"
+        image="equipment/shield/leather.png"
+        name="Leather Shield"
+        description="A shield made of leather on a wooden frame."
+        effect="M. Attack -35"
+        defense="7"
+        type="equip-shield"
+        weight="1300"/>
+
+    <!--
+    <item id="604"
+        image="equipment/shield/knight.png"
+        name="Knight Shield"
+        description="A high quality shield used by knights."
+        defense="???"
+        type="equip-shield"
+        weight="10"/>
+    <item id="605"
+        image="equipment/weapon/axe-meatcleaver.png"
+        name="Meat Cleaver"
+        description="A butcher's tool that also makes a nice one handed battle axe."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="axe"
+        weight="10"/>
+    <item id="606"
+        image="equipment/weapon/axe-hatchet.png"
+        name="Hatchet"
+        description="A short one handed axe."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="axe"
+        weight="10"/>
+    <item id="607"
+        image="equipment/weapon/polearm-trident.png"
+        name="Trident"
+        description="A spear with three heads."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="608"
+        image="equipment/shield/blade.png"
+        name="Blade Shield"
+        description="A shield made of blades."
+        defense="???"
+        type="equip-shield"
+        weight="10"/>
+    <item id="609"
+        image="equipment/weapon/mace-club.png"
+        name="Club"
+        description="A primitive wooden club."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="mace"
+        weight="10"/>
+    -->
+
+    <item id="610"
+        image="equipment/legs/shorts.png|W:#255367,266c84,68b0c5,ffffff"
+        name="Jeans Shorts"
+        description="Shorts made of jeans."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="25">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#255367,266c84,68b0c5,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#255367,266c84,68b0c5,ffffff</sprite>
+    </item>
+    <item id="611"
+        image="generic/whitefur.png"
+        name="White Fur"
+        description="A patch of white, fluffy fur."
+        type="generic"
+        weight="8"/>
+    <item id="612"
+        image="generic/cavesnakelamp.png"
+        name="Cave Snake Lamp"
+        description="The feeler of a lamp snake that glows in the dark."
+        type="generic"
+        weight="10"/>
+    <item id="613"
+        image="generic/hardspike.png"
+        name="Hard Spike"
+        description="The hard spike of a slain monster."
+        type="generic"
+        weight="10"/>
+    <item id="614"
+        image="generic/pinkantennae.png"
+        name="Pink Antenna"
+        description="No-one knows why pinkies have these antennas on their heads."
+        type="generic"
+        luk="1"
+        weight="10"/>
+    <item id="615"
+        image="equipment/head/pumpkinhelmet.png"
+        name="Pumpkin Helmet"
+        description="A helmet made out of a pumpkin."
+        effect="M. Attack -4"
+        type="equip-head"
+        defense="4"
+        weight="60">
+        <sprite>equipment/head/pumpkinhelmet.xml</sprite>
+    </item>
+    <item id="616"
+        image="equipment/head/axehat.png"
+        name="Axe Hat"
+        description="A really cool joke."
+        effect="M. Attack -4"
+        type="equip-head"
+        weight="50"
+        defense="4">
+        <sprite>equipment/head/axehat.xml</sprite>
+    </item>
+    <item id="617"
+        image="equipment/head/piratehat.png"
+        name="Pirate Hat"
+        description="A pirate hat."
+        effect="M. Attack -8"
+        type="equip-head"
+        weight="40"
+        defense="4">
+        <sprite>equipment/head/piratehat.xml</sprite>
+    </item>
+    <item id="618"
+        image="equipment/head/goggles.png"
+        name="Goggles"
+        description="Goggles designed to take care of your eyes."
+        type="equip-head"
+        weight="20"
+        defense="2">
+        <sprite>equipment/head/goggles.xml|#787878,f7f7f7</sprite>
+    </item>
+    <item id="619"
+        image="equipment/head/leathergoggles.png"
+        name="Leather Goggles"
+        description="Goggles designed for desert storms."
+        type="equip-head"
+        weight="20"
+        defense="3">
+        <sprite>equipment/head/goggles.xml|#783c00,ff973b</sprite>
+    </item>
+    <item id="620"
+        image="equipment/head/circlet.png"
+        name="Circlet"
+        description="A nice piece of jewelry."
+        effect="M. Attack +5"
+        type="equip-head"
+        weight="25"
+        defense="4">
+        <sprite>equipment/head/circlet.xml</sprite>
+    </item>
+    <item id="621"
+        image="equipment/head/eyepatch.png"
+        name="Eyepatch"
+        description="What really makes you a pirate."
+        type="equip-head"
+        weight="5"
+        defense="3">
+        <sprite>equipment/head/eyepatch.xml</sprite>
+    </item>
+    <item id="622"
+        image="equipment/head/bandana.png"
+        name="Bandana"
+        description="A striped bandana."
+        type="equip-head"
+        weight="20"
+        defense="3">
+        <sprite>equipment/head/bandana.xml</sprite>
+    </item>
+    <item id="623"
+        image="equipment/weapon/polearm-scythe.png"
+        name="Scythe"
+        description="Usually used for farming but also usable as a weapon. Slow but deadly."
+        effect="Damage +75"
+        type="equip-2hand"
+        weapon-type="polearm"
+        attack-action="attack"
+        weight="1200">
+        <sprite>weapon-scythe.xml</sprite>
+    </item>
+    <item id="624"
+        image="equipment/chest/vnecksweater.png|W:#a4b2b2,ffffff"
+        name="V-Neck Sweater"
+        description="A thin, soft and warm sweater."
+        effect="M. Attack -24"
+        type="equip-torso"
+        weight="35"
+        defense="8">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="625"
+        image="equipment/chest/chainmail.png"
+        name="Chainmail Shirt"
+        description="A shirt made of chains. It weighs a lot but offers excellent protection."
+        effect="M. Attack -120"
+        type="equip-torso"
+        weight="800"
+        defense="20">
+        <sprite gender="male">equipment/chest/chainmail-male.xml</sprite>
+        <sprite gender="female">equipment/chest/chainmail-female.xml</sprite>
+    </item>
+    <item id="626"
+        image="equipment/chest/lightplatemail.png|W:#ddeeff"
+        name="Light Platemail"
+        description="A light cuirass with shoulder pads made of iron, usually worn by foot soldiers."
+        effect="M. Attack -150"
+        type="equip-torso"
+        defense="25"
+        weight="1200">
+        <sprite gender="male">equipment/chest/lightplatemail-male.xml|#ddeeff</sprite>
+        <sprite gender="female">equipment/chest/lightplatemail-female.xml|#ddeeff</sprite>
+    </item>
+    <item id="627"
+        image="equipment/head/tophat.png"
+        name="Top Hat"
+        description="For the gentry of The Mana World."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/tophat.xml</sprite>
+    </item>
+    <item id="628"
+        image="equipment/head/funkyhat.png"
+        name="Funky Hat"
+        description="Yawn..."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="13"
+        weight="20">
+        <sprite>equipment/head/funkywinter.xml</sprite>
+    </item>
+    <item id="629"
+        image="equipment/head/mushroomhat.png"
+        name="Mush Hat"
+        description="Soft and fashionable."
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/mushroom.xml</sprite>
+    </item>
+    <item id="630"
+        image="equipment/head/shroomhat.png"
+        name="Shroom Hat"
+        description="Evil and fashionable."
+        type="equip-head"
+        defense="13"
+        weight="30">
+        <sprite>equipment/head/shroom.xml</sprite>
+    </item>
+    <item id="631"
+        image="generic/crystal.png|W:#252e6a,923eda,ba72ec,ffffff"
+        name="Dark Crystal"
+        description="A dark crystal that emits a demonic aura."
+        type="generic"
+        weight="10"/>
+    <item id="632"
+        image="equipment/legs/skirt.png|W:#a4b2b2,ffffff"
+        name="Cotton Skirt"
+        description="A skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="10">
+        <sprite>equipment/legs/skirt.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="633"
+        image="equipment/head/xmaself.png"
+        name="Christmas Elf Hat"
+        description="A hat worn by Christmas elves."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="13"
+        weight="30">
+        <sprite>equipment/head/xmaself.xml</sprite>
+    </item>
+    <item id="634"
+        image="equipment/head/mask.png"
+        name="Face Mask"
+        description="A wooden mask to conceal your face."
+        type="equip-head"
+        defense="10"
+        weight="50">
+        <sprite>equipment/head/mask.xml</sprite>
+    </item>
+    <item id="635"
+        image="generic/santacookie.png"
+        name="Santa Cookie"
+        description="This isn't for you to eat, it is for Santa Claus!"
+        type="generic"
+        weight="1"/>
+    <item id="636"
+        image="equipment/head/warlordhelm.png"
+        name="Warlord Helmet"
+        description="Worn by great warriors."
+        effect="M. Attack -36"
+        type="equip-head"
+        defense="18"
+        weight="900">
+        <sprite>equipment/head/warlordhelm.xml</sprite>
+    </item>
+    <item id="637"
+        image="equipment/head/knighthelm.png"
+        name="Knight's Helmet"
+        description="A helmet with two small wings on it."
+        effect="M. Attack -30"
+        type="equip-head"
+        defense="15"
+        weight="600">
+        <sprite>equipment/head/knighthelm.xml</sprite>
+    </item>
+    <item id="638"
+        image="equipment/head/infantryhelm.png"
+        name="Infantry Helmet"
+        description="A helmet for soldiers and guards."
+        effect="M. Attack -30"
+        type="equip-head"
+        defense="15"
+        weight="400">
+        <sprite>equipment/head/infantryhelm.xml</sprite>
+    </item>
+    <item id="639"
+        image="equipment/head/crusadehelm.png"
+        name="Crusade Helmet"
+        description="Start your own crusade."
+        effect="M. Attack -36"
+        type="equip-head"
+        defense="18"
+        weight="1300">
+        <sprite>equipment/head/crusadehelm.xml</sprite>
+    </item>
+    <item id="640"
+        image="generic/ironore.png"
+        name="Iron Ore"
+        description="A lump of iron ore."
+        type="generic"
+        weight="40"/>
+    <item id="641"
+        image="generic/snakeskin.png"
+        name="Snake Skin"
+        description="The skin of a slain snake."
+        type="generic"
+        weight="15"/>
+    <item id="642"
+        image="equipment/legs/chaps.png"
+        name="Jeans Chaps"
+        description="Jeans with snake skin chaps."
+        effect="M. Attack -12"
+        type="equip-legs"
+        defense="6"
+        weight="60">
+        <sprite gender="male">equipment/legs/chaps-male.xml</sprite>
+        <sprite gender="female">equipment/legs/chaps-female.xml</sprite>
+    </item>
+    <item id="643"
+        image="equipment/head/cowboywhite.png"
+        name="White Cowboy Hat"
+        description="A white cowboy hat with a band."
+        effect="M. Attack -12"
+        type="equip-head"
+        defense="6"
+        weight="30">
+        <sprite>equipment/head/cowboywhite.xml</sprite>
+    </item>
+    <item id="644"
+        image="equipment/head/cowboyblack.png"
+        name="Black Cowboy Hat"
+        description="A black cowboy hat with shiny buckles."
+        effect="M. Attack -12"
+        type="equip-head"
+        defense="6"
+        weight="30">
+        <sprite>equipment/head/cowboyblack.xml</sprite>
+    </item>
+    <item id="645"
+        image="equipment/chest/lightplatemail.png|W:#573f10,9c8226,d3c04b,ffffff"
+        name="Golden Platemail"
+        description="A plate mail made from gold, which only the richest of the richest can afford."
+        effect="M. Attack -100"
+        type="equip-torso"
+        defense="25"
+        weight="4500">
+        <sprite gender="male">equipment/chest/lightplatemail-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+        <sprite gender="female">equipment/chest/lightplatemail-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+    </item>
+    <item id="646"
+        image="equipment/head/crown.png"
+        name="Crown"
+        description="A jewel embossed crown fit for any ruler."
+        type="equip-head"
+        defense="4"
+        weight="240">
+        <sprite>equipment/head/crown.xml</sprite>
+    </item>
+    <item id="647"
+        image="equipment/head/devcap.png|R:#9999ff"
+        name="Developer's Cap"
+        description="A cap which identifies you as a developer."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/devcap.xml|#9999ff</sprite>
+    </item>
+    <item id="648"
+        image="equipment/legs/trousers.png"
+        name="Trousers"
+        description="Cotton pants covering each part of your legs."
+        defense="4"
+        type="equip-legs"
+        weight="25">
+        <sprite>equipment/head/devcap.xml|#9999ff</sprite>
+    </item>
+    <item id="649"
+        image="equipment/chest/sorcerer-robe.png|W:#5e7480,f1ffff,ffffff;R:#2554c7"
+        name="White Evoker's Robe (Blue)"
+        description="A blue lined white evoker's robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="5">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
+    </item>
+    <item id="650"
+        image="equipment/chest/sorcerer-robe.png|W:#000000;R:#2554c7"
+        name="Black Evoker's Robe (Blue)"
+        description="A blue lined black evoker's robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="5">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#000000;#2554c7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite>
+    </item>
+    <item id="651"
+        image="equipment/chest/silk-robe.png|W:#5e7480,f1ffff,ffffff"
+        name="White Wizard Robe"
+        description="A white robe made for peaceful wizards."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#5e7480,f1ffff,ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#5e7480,f1ffff,ffffff</sprite>
+    </item>
+    <item id="652"
+        image="equipment/chest/silk-robe.png|W:#000000"
+        name="Black Wizard Robe"
+        description="A black robe made for evil wizards."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#000000</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#000000</sprite>
+    </item>
+    <item id="653"
+        image="equipment/chest/silk-robe.png|W:#804000"
+        name="Apprentice Robe"
+        description="A robe made for apprentices."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#804000</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#804000</sprite>
+    </item>
+    <item id="654"
+        image="equipment/head/cap.png|R:#d94800"
+        name="Cap"
+        description="A hat with a peak to shield your eyes from the sun."
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/cap.xml|#d94800</sprite>
+    </item>
+    <item id="655"
+        image="equipment/feet/furboots.png"
+        name="Fur Boots"
+        description="A pair of warm winter boots."
+        effect="M. Attack -3"
+        type="equip-feet"
+        weight="50"
+        defense="3">
+        <sprite gender="male">equipment/feet/furboots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/furboots-female.xml</sprite>
+    </item>
+    <item id="656"
+        image="equipment/head/serf.png"
+        name="Serf Hat"
+        description="A simple hat made from cloth."
+        type="equip-head"
+        weight="20"
+        defense="2">
+        <sprite>equipment/head/serf.xml</sprite>
+    </item>
+    <item id="657"
+        image="use/food/orange.png"
+        name="Orange"
+        description="A juicy orange."
+        type="usable"
+        hp="60"
+        weight="7"/>
+    <item id="658"
+        image="equipment/chest/warlordplate.png"
+        name="Warlord Plate"
+        description="Strong and decorative armor."
+        effect="M. Attack -170"
+        type="equip-torso"
+        defense="27"
+        weight="2600">
+        <sprite gender="male">equipment/chest/warlordplate-male.xml</sprite>
+        <sprite gender="female">equipment/chest/warlordplate-female.xml</sprite>
+    </item>
+        <item id="659"
+        image="equipment/chest/warlordplate.png|W:#573f10,9c8226,d3c04b,ffffff"
+        name="Golden Warlord Plate"
+        description="Strong and decorative armor made from gold."
+        effect="M. Attack -110"
+        type="equip-torso"
+        defense="27"
+        weight="7600">
+        <sprite gender="male">equipment/chest/warlordplate-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+        <sprite gender="female">equipment/chest/warlordplate-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+    </item>
+    <item id="660"
+        image="generic/fabric.png|W:#2b454d,72818c,b7c0c5,ffffff"
+        name="Cotton Cloth"
+        description="A piece of cotton cloth."
+        type="generic"
+        weight="10"/>
+    <item id="661"
+        image="generic/rose.png|W:#bb2222,ff8888"
+        name="Red Rose"
+        description="A red rose. A symbol for romantic love."
+        type="generic"
+        weight="1"/>
+    <item id="662"
+        image="generic/rose.png|W:#dddddd,ffffff"
+        name="White Rose"
+        description="A white rose. A symbol for everlasting love."
+        type="generic"
+        weight="1"/>
+    <item id="663"
+        image="generic/rose.png|W:#bb0022"
+        name="Dark Red Rose"
+        description="A dark red rose. A symbol for sad love."
+        type="generic"
+        weight="1"/>
+    <item id="664"
+        image="generic/rose.png|W:#dd88aa,ffdddd"
+        name="Pink Rose"
+        description="A pink rose. A symbol for innocent love."
+        type="generic"
+        weight="1"/>
+    <item id="665"
+        image="generic/rose.png|W:#dddd00,ffff00"
+        name="Yellow Rose"
+        description="A yellow rose. A symbol for platonic love and friendship."
+        type="generic"
+        weight="1"/>
+    <item id="666"
+        image="generic/rose.png|W:#111111,444444,555555,ffffff"
+        name="Black Rose"
+        description="A black rose. When you look closely at it, you see patterns within patterns, subtly changing colors, and further arrangements that almost seem designed to draw your attention in, and away from the rest of the world. Dizzy, you quickly look away."
+        effect="This item cannot be used directly, but may have certain effects given the right circumstances."
+        type="generic"
+        weight="1"/>
+    <item id="667"
+        image="generic/rose.png|W:#dd8800,ffdd00"
+        name="Orange Rose"
+        description="An orange rose. A symbol for friendship turning into love."
+        type="generic"
+        weight="1"/>
+    <item id="668"
+        image="generic/rose.png|W:#6666aa,ccccff"
+        name="Blue Rose"
+        description="An blue rose. A symbol for mystery or attaining the impossible."
+        type="generic"
+        weight="1"/>
+    <item id="669"
+        image="generic/tulip.png|W:#ddaa22,eeee44"
+        name="Yellow Tulip"
+        description="A yellow tulip. A symbol for hopeless love."
+        type="generic"
+        weight="1"/>
+    <item id="670"
+        image="generic/tulip.png|W:#000088,dd88ff"
+        name="Purple Tulip"
+        description="A purple tulip. A symbol for enchantment."
+        type="generic"
+        weight="1"/>
+    <item id="671"
+        image="generic/tulip.png|W:#882288,dd4444"
+        name="Red Tulip"
+        description="A red tulip. A declaration of love."
+        type="generic"
+        weight="1"/>
+    <item id="672"
+        image="generic/tulip.png|W:#8888dd,ffffff"
+        name="White Tulip"
+        description="A white tulip. A symbol for everlasting friendship."
+        type="generic"
+        weight="1"/>
+    <item id="673"
+        image="generic/tulip.png|W:#dd44dd,fff0f0"
+        name="Pink Tulip"
+        description="A pink tulip. A symbol for gratitude."
+        type="generic"
+        weight="1"/>
+    <item id="674"
+        image="generic/tulip.png|W:#aa2222,ffdd22"
+        name="Orange Tulip"
+        description="An orange tulip. A symbol for admiration."
+        type="generic"
+        weight="1"/>
+    <item id="675"
+        image="equipment/head/gradcap.png"
+        name="Graduation Cap"
+        description="A traditional cap which a university student may wear upon graduating."
+        type="equip-head"
+        defense="2"
+        weight="20">
+        <sprite>equipment/head/gradcap.xml</sprite>
+    </item>
+    <item id="676"
+        image="use/food/steak.png"
+        name="Steak"
+        description="A tasty piece of steak."
+        type="usable"
+        hp="250"
+        weight="10"/>
+    <item id="677"
+        image="equipment/charms/heartnecklace.png"
+        name="Heart Necklace"
+        description="A gold and ruby heart necklace."
+        type="equip-charm"
+        weight="10"/>
+    <item id="678"
+        image="equipment/head/nohmask.png"
+        name="Noh Mask"
+        description="A traditional Japanese mask worn in Noh plays."
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="3"
+        weight="18">
+        <sprite>equipment/head/nohmask.xml</sprite>
+    </item>
+    <item id="679"
+        image="equipment/head/demonmask.png"
+        name="Demon Mask"
+        description="A scary mask to make you look like a demon."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="3"
+        weight="23">
+        <sprite>equipment/head/demonmask.xml</sprite>
+    </item>
+    <item id="680"
+        image="generic/herb.png|W:#e0b0ff"
+        name="Mauve Herb"
+        description="An ingredient for brewing healing potions."
+        type="generic"
+        weight="1"/>
+    <item id="681"
+        image="generic/herb.png|W:#0047ab"
+        name="Cobalt Herb"
+        description="An ingredient for brewing healing potions."
+        type="generic"
+        weight="1"/>
+    <item id="682"
+        image="generic/herb.png|W:#ef9b0f"
+        name="Gamboge Herb"
+        description="An ingredient for brewing healing potions."
+        type="generic"
+        weight="1"/>
+    <item id="683"
+        image="generic/herb.png|W:#e32636"
+        name="Alizarin Herb"
+        description="An ingredient for brewing healing potions."
+        type="generic"
+        weight="1"/>
+    <item id="684"
+        image="use/potions/a.png|G:#b03678,ffffff"
+        name="Tiny Healing Potion"
+        description="A tiny healing potion made from brewed herbs."
+        type="usable"
+        hp="100"
+        weight="5"/>
+    <item id="685"
+        image="use/potions/d.png|G:#b03678,ffffff"
+        name="Small Healing Potion"
+        description="A small healing potion made from brewed herbs."
+        type="usable"
+        hp="200"
+        weight="10"/>
+    <item id="686"
+        image="use/potions/b.png|G:#b03678,ffffff"
+        name="Medium Healing Potion"
+        description="A medium healing potion made from brewed herbs."
+        type="usable"
+        hp="400"
+        weight="15"/>
+    <item id="687"
+        image="use/potions/c.png|G:#b03678,ffffff"
+        name="Large Healing Potion"
+        description="A large healing potion made from brewed herbs."
+        type="usable"
+        hp="800"
+        weight="25"/>
+    <item id="688"
+        image="equipment/chest/tanktop.png|W:#a4b2b2,ffffff"
+        name="Tank Top"
+        description="A sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="10">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="689"
+        image="equipment/chest/tanktop-short.png|W:#a4b2b2,ffffff"
+        name="Short Tank Top"
+        description="A short, sleeveless shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="690"
+        image="use/potions/d.png|G:#580000,a40000,c02020,ff6060"
+        name="Red Dye"
+        description="A vial containing red dye."
+        type="generic"
+        weight="10"/>
+    <item id="691"
+        image="use/potions/d.png|G:#1f9c1f,89d689"
+        name="Green Dye"
+        description="A vial containing green dye."
+        type="generic"
+        weight="10"/>
+    <item id="692"
+        image="use/potions/d.png|G:#4b4bbd,888af4"
+        name="Dark Blue Dye"
+        description="A vial containing dark blue dye."
+        type="generic"
+        weight="10"/>
+    <item id="693"
+        image="use/potions/d.png|G:#ccb534,f1ea8e,ffffaa"
+        name="Yellow Dye"
+        description="A vial containing yellow dye."
+        type="generic"
+        weight="10"/>
+    <item id="694"
+        image="use/potions/d.png|G:#62aaca,a3f4f8,d5fcfb"
+        name="Light Blue Dye"
+        description="A vial containing light blue dye."
+        type="generic"
+        weight="10"/>
+    <item id="695"
+        image="use/potions/d.png|G:#c64abd,f9a5f2,fcd0fa"
+        name="Pink Dye"
+        description="A vial containing pink dye."
+        type="generic"
+        weight="10"/>
+    <item id="696"
+        image="use/potions/d.png|G:#404040,c0c0c0"
+        name="Black Dye"
+        description="A vial containing black dye."
+        type="generic"
+        weight="10"/>
+    <item id="697"
+        image="use/potions/d.png|G:#96370f,cc5616,f68d26,fcaa2d,fdd493"
+        name="Orange Dye"
+        description="A vial containing orange dye."
+        type="generic"
+        weight="10"/>
+    <item id="698"
+        image="use/potions/d.png|G:#530a7c,b362e1,ca87ef"
+        name="Purple Dye"
+        description="A vial containing purple dye."
+        type="generic"
+        weight="10"/>
+    <item id="699"
+        image="use/potions/d.png|G:#104010,208020,30c030"
+        name="Dark Green Dye"
+        description="A vial containing dark green dye."
+        type="generic"
+        weight="10"/>
+    <item id="700"
+        image="generic/pearl.png"
+        name="Pearl"
+        description="A pearl, round and shiny."
+        type="generic"
+        weight="5"/>
+    <item id="701"
+        image="generic/powder.png"
+        name="Pile of Ash"
+        description="A pile of ash similar to volcanic ash."
+        type="generic"
+        weight="5"/>
+    <item id="702"
+        image="equipment/rings/wedding.png"
+        name="Wedding Ring"
+        description="Your wedding ring."
+        type="equip-ring"
+        weight="1"/>
+    <item id="703"
+        image="generic/powder.png|W:#606030,b0b090,e0e0a0,ffffe0"
+        name="Sulphur Powder"
+        description="A small pile of sulphur."
+        type="generic"
+        weight="2"/>
+    <item id="704"
+        image="generic/powder.png|W:#405060"
+        name="Iron Powder"
+        description="A pile of powdered iron."
+        type="generic"
+        weight="3"/>
+    <item id="705"
+        image="use/potions/e.png|R:#f04030;G:#ee8e5e"
+        name="Mana Potion"
+        description="A dark, sirupy brew, with a smell reminiscent of manaberries."
+        type="usable"
+        mp="10"
+        weight="50"/>
+    <item id="706"
+        image="generic/scorpionstinger.png|W:#e0d080,fff0e0,ffffff"
+        name="Golden Scorpion Stinger"
+        description="A golden scorpion stinger, tipped with lethal poison."
+        type="generic"
+        weight="2"/>
+    <item id="707"
+        image="use/potions/e.png|R:#504030;G:#9e8e5e"
+        name="Monster Oil Potion"
+        description="A dark, oily liquid with a sinister stench."
+        type="generic"
+        weight="50"/>
+    <item id="708"
+        image="generic/patch-leather.png"
+        name="Leather Patch"
+        description="A patch of tanned leather."
+        type="generic"
+        weight="18"/>
+    <item id="709"
+        image="generic/scorpionstinger.png|W:#a08040"
+        name="Black Scorpion Stinger"
+        description="A black scorpion stinger, dripping with poison."
+        type="generic"
+        weight="1"/>
+    <item id="710"
+        image="generic/snake-tongue.png|W:#e04020"
+        name="Snake Tongue"
+        description="The forked tongue of a snake."
+        type="generic"
+        weight="1"/>
+    <item id="711"
+        image="generic/snake-tongue.png|W:#706060"
+        name="Mountain Snake Tongue"
+        description="The forked tongue of a mountain snake."
+        type="generic"
+        weight="1"/>
+    <item id="712"
+        image="generic/snake-tongue.png|W:#a05050,e08080"
+        name="Grass Snake Tongue"
+        description="The forked tongue of a grass snake."
+        type="generic"
+        weight="1"/>
+    <item id="713"
+        image="generic/snake-tongue.png|W:#907070,d0a0a0"
+        name="Cave Snake Tongue"
+        description="The forked tongue of a cave snake."
+        type="generic"
+        weight="1"/>
+    <item id="714"
+        image="use/food/snake-egg.png|W:#c0c0a0;R:#b09070;G:#b8a888"
+        name="Snake Egg"
+        description="An edible snake egg."
+        type="usable"
+        hp="30"
+        weight="4"/>
+    <item id="715"
+        image="use/food/snake-egg.png|W:#806020;R:#604010;G:#705018"
+        name="Mountain Snake Egg"
+        description="An edible mountain snake egg."
+        type="usable"
+        hp="40"
+        weight="4"/>
+    <item id="716"
+        image="use/food/snake-egg.png|W:#e0e0c0;R:#80f0a0;G:#b0e8b0"
+        name="Grass Snake Egg"
+        description="An edible grass snake egg."
+        type="usable"
+        hp="50"
+        weight="4"/>
+    <item id="717"
+        image="use/food/snake-egg.png|W:#c0c0c0;R:#c090c0;G:#c0a8c0"
+        name="Cave Snake Egg"
+        description="An edible cave snake egg."
+        type="usable"
+        hp="20"
+        weight="4"/>
+    <item id="718"
+        image="generic/silkcocoon.png"
+        name="Silk Cocoon"
+        description="A silkworm's cocoon."
+        type="generic"
+        weight="1"/>
+    <item id="719"
+        image="use/food/apple.png|R:#73E600;Y:#c1f102;G:#66cc33"
+        name="Green Apple"
+        description="A healthy green apple."
+        type="usable"
+        hp="45"
+        weight="5"/>
+    <item id="720"
+        image="equipment/chest/silk-robe.png|W:#ffffff"
+        name="Silk Robe"
+        description="A light and shimmering silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#ffffff</sprite>
+    </item>
+    <item id="721"
+        image="equipment/head/highpriest-crown.png"
+        name="High Priest Crown"
+        description="A golden crown with an enchanted ruby."
+        effect="+20 SP"
+        type="equip-head"
+        defense="4"
+        weight="400">
+        <sprite>equipment/head/highpriest-crown.xml</sprite>
+    </item>
+    <item id="722"
+        image="equipment/head/monster-skull-helm.png"
+        name="Monster Skull Helmet"
+        description="The conserved skull of a mysterious ancient monster."
+        effect="M. Attack +10 / M. Defense +20"
+        type="equip-head"
+        defense="7"
+        weight="250">
+        <sprite>equipment/head/monster-skull-helm.xml</sprite>
+    </item>
+    <item id="723"
+        image="equipment/head/deserthat.png|R:#ffffff"
+        name="Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#ffffff</sprite>
+    </item>
+    <item id="724"
+        image="equipment/head/standardheadband.png|W:#a4b2b2,ffffff"
+        name="Cotton Headband"
+        description="Just a cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="725"
+        image="equipment/head/gmcap.png|R:#bf0e08"
+        name="GM Cap"
+        description="A cap which identifies you as a GM. Only GMs can wear this."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/gmcap.xml|#bf0e08</sprite>
+    </item>
+    <item id="726"
+        image="equipment/chest/silk-robe.png|W:#e40a0a"
+        name="GM Robe"
+        description="A light and shimmering silk robe made for GMs. Only GMs can wear this."
+        type="equip-torso"
+        weight="40"
+        defense="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#e40a0a</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#e40a0a</sprite>
+    </item>
+    <item id="727"
+        image="generic/iten.png|W:#ffe0f0"
+        name="Iten"
+        description="An iten."
+        type="generic"
+        weight="8000"/>
+    <item id="728"
+        image="generic/wooden-mouboo.png"
+        name="Mouboo Figurine"
+        description="A small, wooden figurine of a mouboo."
+        type="generic"
+        weight="9"/>
+    <item id="729"
+        image="generic/warped-log.png"
+        name="Warped Log"
+        description="A piece of wood, warped and twisted by some unnatural force."
+        type="generic"
+        weight="8"/>
+    <item id="730"
+        image="generic/gemstone-a.png|W:#a0a010,ffffa0"
+        name="Lifestone"
+        description="A small crystal shard, warm to the touch."
+        type="generic"
+        weight="5"/>
+    <item id="731"
+        image="equipment/legs/assassinpants.png"
+        name="Assassin Pants"
+        description="Pants for a master assassin."
+        effect="M. Attack -5"
+        type="equip-torso"
+        defense="5"
+        agi="8"
+        weight="20">
+        <sprite gender="male">equipment/legs/assassin-male.xml</sprite>
+        <sprite gender="female">equipment/legs/assassin-female.xml</sprite>
+    </item>
+    <item id="732"
+        image="generic/dry-branch.png"
+        name="Druid Tree Branch"
+        description="A branch cut off from the druid tree. It feels strangely leathery to the touch."
+        type="generic"
+        weight="2"/>
+    <item id="733"
+        image="use/potions/e.png|R:#fff0ff;G:#d0c09f"
+        name="Purification Potion"
+        description="A transparent, odorless liquid that feels strangely lighter than water."
+        type="usable"
+        mp="0"
+        weight="15"/>
+    <item id="734"
+        image="equipment/feet/boots.png|W:#212121"
+        name="Black Boots"
+        description="Steel toe capped boots, designed to keep your feet very well protected."
+        effect="M. Attack -10"
+        type="equip-feet"
+        weight="25"
+        defense="3">
+        <sprite gender="male">equipment/feet/boots-male.xml|#212121</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#212121</sprite>
+    </item>
+    <item id="735"
+        image="equipment/feet/boots.png|W:#a4b2b2,ffffff"
+        name="Cotton Boots"
+        description="A pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="1"
+        weight="10">
+        <sprite gender="male">equipment/feet/boots-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="736"
+        image="use/food/bigcake.png|R:#ede5b2,fff7bf;G:#cccccc,ffffff"
+        name="White Cake"
+        description="A delicious white cake. Would go good with strawberries."
+        type="usable"
+        hp="10"
+        weight="10"/>
+    <item id="737"
+        image="use/food/bigcake.png|R:#9e6e3b,e39d52;G:#e29f57;W:#ffd5a8"
+        name="Chocolate Cake"
+        description="A scrumptious chocolate cake. Real chocolate guaranteed."
+        type="usable"
+        hp="11"
+        weight="10"/>
+    <item id="738"
+        image="use/food/bigcake.png|R:#fed079,ffffff;G:#fed079,ffffff,ffffff;W:#856200,e68e00,ffa600"
+        name="Orange Cake"
+        description="A tangy orange cake. Made from real oranges."
+        type="usable"
+        hp="12"
+        weight="10"/>
+    <item id="739"
+        image="use/food/bigcake.png|R:#ccc599,fff8ED;G:#ffbaba,fffefe;W:#d91a1a,ff8f8f"
+        name="Apple Cake"
+        description="A crisp apple cake. Real apple pieces inside!"
+        type="usable"
+        hp="12"
+        weight="10"/>
+    <item id="740"
+        image="generic/root.png"
+        name="Root"
+        description="A root from a plant."
+        type="generic"
+        weight="5"/>
+    <item id="741"
+        image="equipment/hands/basicgloves.png|W:#a4b2b2,ffffff"
+        name="Cotton Gloves"
+        description="A pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="10">
+        <sprite gender="male">equipment/hands/generic-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="742"
+        image="equipment/charms/clover.png"
+        name="Four-Leaf Clover"
+        description="A lucky four-leaf clover."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="1"
+        weight="1"/>
+    <item id="743"
+        image="use/food/acorn.png"
+        name="Acorn"
+        description="An acorn."
+        type="usable"
+        hp="3"
+        weight="1"/>
+    <item id="744"
+        image="use/potions/c.png|G:#f0e0fa,da69e5"
+        name="Diluted Concentration Potion"
+        description="A bottle of diluted concentration potion."
+        effect="Attack speed increase (temporary)."
+        type="usable"
+        weight="10"/>
+    <item id="745"
+        image="use/potions/c.png|G:#ff4aff"
+        name="Dark Concentration Potion"
+        description="This potion smells like burnt sugar."
+        effect="Attack speed increase (temporary)."
+        type="usable"
+        weight="10"/>
+    <item id="746"
+        image="use/potions/e.png|R:#a0a0ff;G:#20409f"
+        name="Mopox Cure Potion"
+        description="A gooey brew with a vile smell, supposedly able to cure Mopox."
+        type="usable"
+        weight="5"/>
+    <item id="747"
+        image="use/food/bigcake.png|R:#9e6e3b,e39d52;G:#e29f57;W:#ffd5a8"
+        name="Laced Chocolate Cake"
+        description="A scrumptious chocolate cake, with a dash of Mopox Cure Potion."
+        type="usable"
+        hp="11"
+        weight="10"/>
+    <item id="748"
+        image="use/food/orangecupcake.png"
+        name="Laced Orange Cupcake"
+        description="A very soft orange cupcake, laced with Mopox cure potion."
+        type="usable"
+        hp="100"
+        weight="5"/>
+    <item id="749"
+        image="equipment/charms/towel.png"
+        name="Towel"
+        description="You can dry yourself off with it if it still seems to be clean enough. - Douglas Adams"
+        effect="M. Attack +5"
+        type="equip-charm"
+        weight="50"/>
+    <item id="750"
+        image="use/potions/c.png|G:#f0f040,ffffff"
+        name="Slow Poison Potion"
+        description="A yellow potion with a fresh, citric scent."
+        effect="Suspends poison."
+        type="usable"
+        hp="5"
+        weight="10"/>
+    <item id="751"
+        image="equipment/head/pinkiehat.png"
+        name="Pinkie Hat"
+        description="With this, you'll fit right in with those strange pinkies."
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="1"
+        weight="5">
+        <sprite>equipment/head/pinkiehat.xml</sprite>
+    </item>
+    <item id="752"
+        image="equipment/head/fluffyhat.png"
+        name="Fluffy Hat"
+        description="Now you can wear fur on your head."
+        effect="M. Attack -5"
+        type="equip-head"
+        defense="2"
+        weight="10">
+        <sprite>equipment/head/fluffyhat.xml</sprite>
+    </item>
+    <item id="753"
+        image="generic/batwing.png"
+        name="Bat Wing"
+        description="The wing from a bat."
+        type="generic"
+        weight="3"/>
+    <item id="754"
+        image="generic/batteeth.png"
+        name="Bat Teeth"
+        description="The teeth from a bat. Rather sharp."
+        type="generic"
+        weight="2"/>
+    <item id="755"
+        image="equipment/chest/assassintop.png"
+        name="Assassin Shirt"
+        description="Shirt for a master assassin."
+        effect="M. Attack -5"
+        type="equip-torso"
+        defense="10"
+        agi="10"
+        weight="15">
+        <sprite gender="male">equipment/chest/assassin-male.xml</sprite>
+        <sprite gender="female">equipment/chest/assassin-female.xml</sprite>
+    </item>
+    <item id="756"
+        image="equipment/hands/assassingloves.png"
+        name="Assassin Gloves"
+        description="Gloves for a master assassin."
+        effect="M. Attack -3"
+        type="equip-arms"
+        defense="5"
+        agi="5"
+        weight="9">
+        <sprite gender="male">equipment/hands/assassin-male.xml</sprite>
+        <sprite gender="female">equipment/hands/assassin-female.xml</sprite>
+    </item>
+    <item id="757"
+        image="equipment/feet/assassinboots.png"
+        name="Assassin Boots"
+        description="Boots for a master assassin."
+        effect="M. Attack -3"
+        type="equip-feet"
+        defense="5"
+        agi="5"
+        weight="10">
+        <sprite gender="male">equipment/feet/assassin-boots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/assassin-boots-female.xml</sprite>
+    </item>
+    <item id="758"
+        image="equipment/weapon/staff-woodstaff.png"
+        name="Wooden Staff"
+        description="A basic wooden staff."
+        effect="Damage +50 / M. Attack +5"
+        type="equip-2hand"
+        weapon-type="polearm"
+        attack-action="attack"
+        weight="1000">
+        <sprite>weapon-staff.xml</sprite>
+    </item>
+    <item id="759"
+        image="equipment/head/paladin-helm.png"
+        name="Paladin's Helmet"
+        description="Worn only by paladins."
+        type="equip-head"
+        defense="19"
+        weight="43">
+        <sprite>equipment/head/paladinhelm.xml</sprite>
+    </item>
+    <item id="760"
+        image="equipment/head/overlord-helm.png"
+        name="Overlord's Helmet"
+        description="Worn by the greatest warriors."
+        type="equip-head"
+        defense="20"
+        weight="45">
+        <sprite>equipment/head/overlordhelm.xml</sprite>
+    </item>
+    <item id="761"
+        image="equipment/head/desert-helmet.png"
+        name="Desert Helmet"
+        description="The perfect desert warriors' helmet."
+        type="equip-head"
+        weight="48"
+        defense="21">
+        <sprite>equipment/head/desert-helmet.xml</sprite>
+    </item>
+    <item id="762"
+        image="equipment/ammo/arrow.png|W:#8B4513"
+        name="Terranite Arrow"
+        description="A terranite arrow."
+        effect="Damage +50 / Critical Damage +10"
+        type="equip-ammo"
+        weight="1"/>
+    <item id="763"
+        image="generic/terraniteore.png"
+        name="Terranite Ore"
+        description="Some ore collected out of terranite."
+        type="generic"
+        weight="40"/>
+    <item id="764"
+        image="equipment/head/sailor_hat.png"
+        name="Sailor Hat"
+        description="A hat worn by brave sailors."
+        type="equip-head"
+        defense="5"
+        weight="5">
+        <sprite>equipment/head/sailor-hat.xml</sprite>
+    </item>
+    <item id="765"
+        image="equipment/head/captain_hat.png"
+        name="Captain's Hat"
+        description="A hat worn by the bravest captains."
+        type="equip-head"
+        defense="15"
+        weight="8">
+        <sprite>equipment/head/captain-hat.xml</sprite>
+    </item>
+    <item id="766"
+        image="equipment/head/terranitehelm.png"
+        name="Terranite Helmet"
+        description="A magical helmet made out of semi-polished granite that was enchanted to be very light. Great for mages on the battlefield."
+        effect="M. Attack -12 / M. Defense +5"
+        type="equip-head"
+        defense="15"
+        weight="300">
+        <sprite>equipment/head/terranitehelm.xml</sprite>
+    </item>
+    <item id="767"
+        image="equipment/chest/terranite.png"
+        name="Terranite Chest Armor"
+        description="A nice piece of armor made out of terranite ore."
+        effect="M. Attack -70 / M. Defense +10"
+        type="equip-torso"
+        defense="20"
+        dex="1"
+        weight="800">
+        <sprite gender="male">equipment/chest/terranite-male.xml</sprite>
+        <sprite gender="female">equipment/chest/terranite-female.xml</sprite>
+    </item>
+    <item id="768"
+        image="equipment/legs/terranitepants.png"
+        name="Terranite Legs"
+        description="Leggings made out of terranite."
+        effect="M. Attack -8 / M. Defense +5"
+        type="equip-legs"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/legs/terranite-male.xml</sprite>
+        <sprite gender="female">equipment/legs/terranite-female.xml</sprite>
+    </item>
+    <item id="769"
+        image="equipment/head/guyfawkes.png"
+        name="Guy Fawkes Mask"
+        description="The famous Guy Fawkes mask."
+        type="equip-head"
+        weight="30"
+        defense="3">
+        <sprite>equipment/head/guyfawkes.xml</sprite>
+    </item>
+    <item id="770"
+        image="equipment/head/fairy_hat.png"
+        name="Fairy Hat"
+        description="The famous hat worn by Robin Hood."
+        effect="M. Attack -10"
+        type="equip-head"
+        defense="5"
+        luck="3"
+        weight="20">
+        <sprite>equipment/head/fairy_hat.xml</sprite>
+    </item>
+    <item id="771"
+        image="equipment/legs/miniskirt.png|W:#a4b2b2,ffffff"
+        name="Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="M. Attack -8"
+        defense="4"
+        type="equip-legs"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="772"
+        image="generic/spice.png|R:#ffff00"
+        name="Wisp Powder"
+        description="Powder from a wisp."
+        type="generic"
+        weight="3"/>
+    <item id="773"
+        image="generic/spice.png|R:#ff00ff"
+        name="Spectre Powder"
+        description="Powder from a spectre."
+        type="generic"
+        weight="3"/>
+    <item id="774"
+        image="generic/spice.png|R:#00ffff"
+        name="Poltergeist Powder"
+        description="Powder from a poltergeist."
+        type="generic"
+        weight="3"/>
+    <item id="775"
+        image="generic/bone.png"
+        name="Bone"
+        description="A bone."
+        type="generic"
+        weight="10"/>
+    <item id="776"
+        image="generic/skull.png"
+        name="Skull"
+        description="A skull."
+        type="generic"
+        weight="30"/>
+    <item id="777"
+        image="generic/rags-rotten.png"
+        name="Rotten Rags"
+        description="Rotten rags from an undead creature."
+        type="generic"
+        weight="15"/>
+    <item id="778"
+        image="generic/heart-diseased.png"
+        name="Diseased Heart"
+        description="A diseased heart. Likely from a zombie."
+        type="generic"
+        weight="10"/>
+    <item id="779"
+        image="generic/ear-zombie.png"
+        name="Undead Ear"
+        description="An ear from a zombie."
+        type="generic"
+        weight="5"/>
+    <item id="780"
+        image="generic/eyeball.png"
+        name="Undead Eye"
+        description="An eye from a zombie."
+        type="generic"
+        weight="3"/>
+    <item id="781"
+        image="equipment/head/witch-doctor-mask.png"
+        name="Witch Doctor's Mask"
+        description="A crazy mask from the Voodoo doctor."
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/witch-doctor-mask.xml</sprite>
+    </item>
+    <item id="782"
+        image="equipment/chest/forest-armor.png"
+        name="Forest Armor"
+        description="A clean and comfortable mantle with dags made for the finest stalkers."
+        effect="M. Attack -20"
+        type="equip-torso"
+        defense="10"
+        dex="3"
+        weight="30">
+        <sprite gender="male">equipment/chest/forest-armor-male.xml</sprite>
+        <sprite gender="female">equipment/chest/forest-armor-female.xml</sprite>
+    </item>
+    <item id="783"
+        image="equipment/chest/valentine-dress.png|R:#bf0e08"
+        name="Platyna Red Dress"
+        description="A silken dress with soft lace trim. If you damage it, you'll never get it to look good again. In special Platyna red."
+        effect="M. Attack +3"
+        type="equip-torso"
+        defense="15"
+        weight="35">
+        <sprite gender="female">equipment/chest/valentine-dress.xml|#bf0e08</sprite>
+    </item>
+    <item id="784"
+        image="use/food/zombie-nachos.png"
+        name="Zombie Nachos"
+        description="The flavor is in the brains."
+        type="usable"
+        hp="60"
+        weight="5"/>
+    <item id="785"
+        image="use/food/lady-fingers.png"
+        name="Lady Fingers"
+        description="Made with simulated lady fingers."
+        type="usable"
+        hp="40"
+        weight="5"/>
+    <item id="786"
+        image="use/food/jello.png"
+        name="Slime Jell-Ahh"
+        description="Finally, an edible form of slime!"
+        type="usable"
+        hp="50"
+        weight="5"/>
+    <item id="787"
+        image="use/food/snapple.png"
+        name="Snapple"
+        description="Bite it before it bites you!"
+        type="usable"
+        hp="70"
+        weight="5"/>
+    <item id="788"
+        image="use/food/juice.png"
+        name="Beetle Juice"
+        description="Thist quencing and nutritious!"
+        type="usable"
+        hp="50"
+        weight="5"/>
+    <item id="789"
+        image="use/food/skull-mug.png"
+        name="Gut Buster Ale"
+        description="If you can survive the first gulp, the rest goes down smooth."
+        type="usable"
+        hp="60"
+        weight="5"/>
+    <item id="790"
+        image="use/food/wine.png"
+        name="Blood Wine"
+        description="A good vintage."
+        type="usable"
+        hp="100"
+        weight="5"/>
+    <item id="791"
+        image="equipment/chest/tanktop.png|W:#412300,c9866b,8d4900;#ffff00"
+        name="Yeti Skin Shirt"
+        description="A shirt made of hardened yeti skin."
+        effect="M. Attack -12"
+        type="equip-torso"
+        weight="20"
+        defense="12">
+        <sprite gender="male">equipment/chest/leather-male.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
+        <sprite gender="female">equipment/chest/leather-female.xml|#412300,c9866b,8d4900;#ffff00</sprite>
+    </item>
+    <item id="792"
+        image="equipment/feet/bromenalboots.png"
+        name="Bromenal Boots"
+        description="A pair of bromenal boots."
+        effect="M. Attack -2"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/bromenalboots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/bromenalboots-female.xml</sprite>
+    </item>
+        <item id="793"
+        image="equipment/chest/bromenalchest.png"
+        name="Bromenal Chest"
+        description="A bromenal chest armor."
+        effect="M. Attack -170"
+        type="equip-torso"
+        weight="2000"
+        defense="25">
+        <sprite gender="male">equipment/chest/bromenalchest-male.xml|#fbf5e9</sprite>
+        <sprite gender="female">equipment/chest/bromenalchest-female.xml|#fbf5e9</sprite>
+    </item>
+    <item id="794"
+        image="equipment/hands/bromenalgloves.png"
+        name="Bromenal Gloves"
+        description="A pair of bromenal gloves."
+        effect="M. Attack -20"
+        type="equip-arms"
+        weight="40"
+        defense="4">
+        <sprite gender="male">equipment/hands/bromenalgloves-male.xml</sprite>
+        <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite>
+    </item>
+    <item id="795"
+        image="equipment/head/bromenalhelmet.png"
+        name="Bromenal Helmet"
+        description="A hard bromenal helmet."
+        effect="M. Attack -30"
+        type="equip-head"
+        defense="15"
+        weight="400">
+        <sprite>equipment/head/bromenalhelmet.xml</sprite>
+    </item>
+    <item id="796"
+        image="equipment/legs/bromenallegs.png"
+        name="Bromenal Legs"
+        description="A bromenal leg armor."
+        effect="M. Attack -12"
+        type="equip-legs"
+        weight="150"
+        defense="">
+        <sprite gender="male">equipment/legs/bromenallegs-male.xml</sprite>
+        <sprite gender="female">equipment/legs/bromenallegs-female.xml</sprite>
+    </item>
+    <item id="797"
+        image="equipment/shield/bromenal.png"
+        name="Bromenal Shield"
+        description="A shield made of bromenal."
+        effect="M. Attack -200"
+        type="equip-shield"
+        defense="20"
+        weight="2500"/>
+    <item id="798"
+        image="equipment/chest/sorcerer-robe.png"
+        name="Sorcerer Robe (Red)"
+        description="A red lined sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="5">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#ffffff</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#ffffff</sprite>
+    </item>
+    <item id="799"
+        image="generic/mylarin-dust.png"
+        name="Mylarin Dust"
+        description="a bottle of mylarin particles."
+        type="generic"
+        weight="3"/>
+    <item id="800"
+        image="equipment/head/bowler-hat-brown.png"
+        name="Bowler Hat (Brown)"
+        description="A hat for those with a bit of class."
+        effect="M. Attack +2"
+        type="equip-head"
+        weight="30"
+        defense="10">
+        <sprite>equipment/head/bowler-hat-brown.xml</sprite>
+    </item>
+    <item id="801"
+        image="equipment/head/pinkie-helmet.png"
+        name="Pinkie Helmet"
+        description="A helmet of Pinkie warriors."
+        effect="M. Attack -20"
+        type="equip-head"
+        defense="10"
+        luck="1"
+        weight="800">
+        <sprite>equipment/head/pinkie-helmet.xml</sprite>
+    </item>
+    <item id="802"
+        image="generic/easterbasket.png"
+        name="Easter Basket"
+        description="A nice basket to put easter presents in."
+        type="generic"
+        weight="10"/>
+    <item id="803"
+        image="generic/grassliner.png"
+        name="Grass Liner"
+        description="Very good for putting something breakable on it."
+        type="generic"
+        weight="5"/>
+    <item id="804"
+        image="generic/jellybeans.png"
+        name="Jelly Beans"
+        description="Colorful and tasty Jelly Beans."
+        type="generic"
+        weight="2"/>
+    <item id="805"
+        image="generic/chocolatemouboo.png"
+        name="Chocolate Mouboo"
+        description="A mouboo made out of chocolate. It's hard not to bite it."
+        type="generic"
+        weight="3"/>
+    <item id="806"
+        image="generic/reedbundle.png"
+        name="Reed Bundle"
+        description="A bundle of reed."
+        type="generic"
+        weight="7"/>
+    <item id="807"
+        image="generic/grassseeds.png"
+        name="Grass Seeds"
+        description="Some grass seeds."
+        type="generic"
+        weight="1"/>
+    <item id="808"
+        image="use/others/warp-towel.png"
+        name="Hitchhiker's Towel"
+        description="An inconspicuous towel."
+        type="generic"
+        weight="20"/>
+    <item id="809"
+        image="use/others/warp-towel.png|W:#5e7480,f1ffff,ffffff"
+        name="White Hitchhiker's Towel"
+        description="An inconspicuous white towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="810"
+        image="use/others/warp-towel.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Hitchhiker's Towel"
+        description="An inconspicuous red towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="811"
+        image="use/others/warp-towel.png|W:#1f9c1f,89d689"
+        name="Green Hitchhiker's Towel"
+        description="An inconspicuous green towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="812"
+        image="use/others/warp-towel.png|W:#4b4bbd,888af4"
+        name="Blue Hitchhiker's Towel"
+        description="An inconspicuous blue towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="813"
+        image="use/others/warp-towel.png|W:#ccb534,f1ea8e,ffffaa"
+        name="Yellow Hitchhiker's Towel"
+        description="An inconspicuous yellow towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="814"
+        image="use/others/warp-towel.png|W:#530a7c,b362e1,ca87ef"
+        name="Purple Hitchhiker's Towel"
+        description="An inconspicuous purple towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="815"
+        image="use/others/warp-towel.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Hitchhiker's Towel"
+        description="An inconspicuous orange towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="816"
+        image="use/others/warp-towel.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Hitchhiker's Towel"
+        description="An inconspicuous pink towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="817"
+        image="use/others/warp-towel.png|W:#4ee2ec"
+        name="Teal Hitchhiker's Towel"
+        description="An inconspicuous teal towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="818"
+        image="use/others/warp-towel.png|W:#41a317"
+        name="Lime Hitchhiker's Towel"
+        description="An inconspicuous lime towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="819"
+        image="generic/gempowder.png|W:#5e7480,f1ffff,ffffff"
+        name="Diamond Powder"
+        description="A white powder made out of a diamond."
+        type="generic"
+        weight="5"/>
+    <item id="820"
+        image="generic/gempowder.png|W:#580000,a40000,c02020,ff6060"
+        name="Ruby Powder"
+        description="A red powder made out of a ruby."
+        type="generic"
+        weight="5"/>
+    <item id="821"
+        image="generic/gempowder.png|W:#1f9c1f,89d689"
+        name="Emerald Powder"
+        description="A green powder made out of an emerald."
+        type="generic"
+        weight="5"/>
+    <item id="822"
+        image="generic/gempowder.png|W:#4b4bbd,888af4"
+        name="Sapphire Powder"
+        description="A blue powder made out of a sapphire."
+        type="generic"
+        weight="5"/>
+    <item id="823"
+        image="generic/gempowder.png|W:#ccb534,f1ea8e,ffffaa"
+        name="Topaz Powder"
+        description="A yellow powder made out of a topaz."
+        type="generic"
+        weight="5"/>
+    <item id="824"
+        image="generic/gempowder.png|W:#530a7c,b362e1,ca87ef"
+        name="Amethyst Powder"
+        description="A purple powder made out of an amethyst."
+        type="generic"
+        weight="5"/>
+    <item id="825"
+        image="use/potions/a.png|G:#3636b0,ffffff"
+        name="Tiny Mana Elixir"
+        description="A tiny mana potion made from brewed, powerful items."
+        type="usable"
+        mp="25"
+        weight="5"/>
+    <item id="826"
+        image="use/potions/d.png|G:#3636b0,ffffff"
+        name="Small Mana Elixir"
+        description="A small mana potion made from brewed, powerful items."
+        type="usable"
+        mp="50"
+        weight="10"/>
+    <item id="827"
+        image="use/potions/b.png|G:#3636b0,ffffff"
+        name="Medium Mana Elixir"
+        description="A medium mana potion made from brewed, powerful items."
+        type="usable"
+        mp="100"
+        weight="15"/>
+    <item id="828"
+        image="use/potions/c.png|G:#3636b0,ffffff"
+        name="Large Mana Elixir"
+        description="A large mana potion made from brewed, powerful items."
+        type="usable"
+        mp="250"
+        weight="25"/>
+    <item id="829"
+        image="equipment/charms/fourleaf-amulet.png|W:#332f27,584a31,af7817,ffffff"
+        name="Crozenite Four-Leaf Amulet"
+        description="An amulet that brings the wearer luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="1"
+        weight="10"/>
+    <item id="830"
+        image="equipment/charms/fourleaf-amulet.png|W:#3f2e26,644435,7c513c,ffffff"
+        name="Bromenal Four-Leaf Amulet"
+        description="An amulet that brings the wearer good luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="2"
+        weight="10"/>
+    <item id="831"
+        image="equipment/charms/fourleaf-amulet.png|W:#272f33,384347,6f7e85,ffffff"
+        name="Silver Four-Leaf Amulet"
+        description="An amulet that brings the wearer great luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="3"
+        weight="10"/>
+    <item id="832"
+        image="equipment/charms/fourleaf-amulet.png|W:#857a4d,bc9600,fdd017,ffffff"
+        name="Golden Four-Leaf Amulet"
+        description="An amulet that brings the wearer excellent luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="4"
+        weight="10"/>
+    <item id="833"
+        image="equipment/charms/broken-fourleaf-amulet.png"
+        name="Broken Four-Leaf Amulet"
+        description="A broken four-leaf clover amulet."
+        type="generic"
+        weight="10"/>
+    <item id="834"
+        image="generic/doll.png"
+        name="Doll"
+        description="An ancient doll taken from a fallen Fey Element that used it as a lure for its young victims."
+        type="generic"
+        weight="15"/>
+    <item id="835"
+        image="generic/stinger-new.png|R:#1a160f,93774a"
+        name="Hyvern Stinger"
+        description="A stinger snapped off the end of a Hyvern's abdomen."
+        type="generic"
+        weight="10"/>
+    <item id="836"
+        image="generic/grub-slime.png"
+        name="Grub Slime"
+        description="The orifice secretions of a grub."
+        type="generic"
+        weight="2"/>
+
+    <!-- ID 837 RESERVED - "Witch Root" -->
+
+    <!-- HERE ARE SOME UNUSED ITEM IDS -->
+
+    <item id="1198"
+        image="generic/spectral-orb.png|R:#ff6600,ff9933,ffff33"
+        name="Jack O Soul"
+        description="The soul of a Jack O."
+        type="generic"
+        weight="1"/>
+    <item id="1199"
+        image="equipment/ammo/arrow.png"
+        name="Arrow"
+        description="A standard arrow."
+        effect="Damage +20"
+        type="equip-ammo"
+        weight="1"/>
+    <item id="1200"
+        image="equipment/weapon/bow-bow.png"
+        name="Bow"
+        description="A distance weapon."
+        effect="Damage +15 / Range 5"
+        type="equip-2hand"
+        weight="20"
+        missile-particle="graphics/particles/arrow.particle.xml"
+        weapon-type="bow"
+        attack-action="attack_bow">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+    </item>
+    <item id="1201"
+        image="equipment/weapon/dagger-knive.png"
+        name="Knife"
+        description="A small knife; the perfect weapon for a beginner."
+        effect="Damage +5"
+        type="equip-1hand"
+        weight="120"
+        weapon-type="knife"
+        attack-action="attack">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="1202"
+        image="equipment/chest/cottonshirt.png|W:#a4b2b2,ffffff"
+        name="Cotton Shirt"
+        description="A shirt made of 100% cotton."
+        effect="M. Attack -2"
+        type="equip-torso"
+        defense="2"
+        weight="13">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="1203"
+        image="equipment/head/rangerhat.png"
+        name="Ranger Hat"
+        description="A leather hat traditionally worn by rangers."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="2"
+        weight="20">
+        <sprite>equipment/head/rangerhat.xml</sprite>
+    </item>
+    <item id="1204"
+        image="equipment/head/antlerhat.png"
+        name="Antler Hat"
+        description="A hat with antlers sticking out of it."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="4"
+        weight="15">
+        <sprite>equipment/head/antlerhat.xml</sprite>
+    </item>
+    <item id="1205"
+        image="equipment/head/christmastree.png"
+        name="Christmas Tree Hat"
+        description="A hat shaped like a Christmas tree."
+        type="equip-head"
+        defense="2"
+        weight="20">
+        <sprite>equipment/head/christmastree.xml</sprite>
+    </item>
+    <item id="1206"
+        image="equipment/head/santabeardhat.png"
+        name="Santa Beard Hat"
+        description="Now you will look just like Santa Claus!"
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/santabeardhat.xml</sprite>
+    </item>
+    <item id="1207"
+        image="generic/redstocking.png"
+        name="Red Christmas Stocking"
+        description="Eww, it's smelly!"
+        type="generic"
+        weight="10"/>
+    <item id="1208"
+        image="generic/easteregg-red.png"
+        name="Red Easter Egg"
+        description="A red easter egg. Find all six different easter eggs to win a prize."
+        type="generic"
+        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."
+        type="generic"
+        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."
+        type="generic"
+        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."
+        type="generic"
+        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."
+        type="generic"
+        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."
+        type="generic"
+        weight="10"/>
+    <item id="1214"
+        image="equipment/head/bunnyears.png"
+        name="Bunny Ears"
+        description="A headband with plush bunny ears."
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="10"
+        weight="20">
+        <sprite>equipment/head/bunnyears.xml</sprite>
+    </item>
+    <item id="1215"
+        image="equipment/weapon/sword-sabre.png"
+        name="Toy Sabre"
+        description="A toy item, doesn't do much damage."
+        effect="Damage +1"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="1">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/sabre-hit1.ogg</sound>
+    </item>
+    <item id="1216"
+        image="equipment/head/mouboohead.png"
+        name="Mouboo Head"
+        description="A tightly fitting mouboo head."
+        type="equip-head"
+        defense="1"
+        weight="80">
+        <sprite>equipment/head/mouboohead.xml</sprite>
+    </item>
+    <item id="1217"
+        image="equipment/head/catears.png|M:#774444;W:#777777"
+        name="Cat Ears"
+        description="A pair of plush cat ears. Meow!"
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="1"
+        agi="3"
+        weight="20">
+        <sprite>equipment/head/catears.xml|#774444;#777777</sprite>
+    </item>
+    <item id="1218"
+        image="equipment/head/paperbag.png"
+        name="Paper Bag"
+        description="A paper bag with eye holes."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="1"
+        agi="-1"
+        weight="10">
+        <sprite>equipment/head/paperbag.xml</sprite>
+    </item>
+    <item id="1219"
+        image="equipment/head/moubootaurhead.png"
+        name="Moubootaur Head"
+        description="The Moubootaur's head."
+        type="equip-head"
+        defense="1"
+        weight="80">
+        <sprite>equipment/head/moubootaurhead.xml</sprite>
+    </item>
+    <item id="1220"
+        image="equipment/head/parsley-earplugs.png"
+        name="Bunch of Parsley"
+        description="A bunch of parsley, useful for salads and many other dishes. In a pinch, it doubles as earplugs."
+        type="equip-head"
+        defense="1"
+        weight="1">
+        <sprite>equipment/head/parsley-earplugs.xml</sprite>
+    </item>
+    <item id="1221"
+        image="equipment/head/skullmask.png"
+        name="Skull Mask"
+        description="A mask made out of bones."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="3"
+        weight="150">
+        <sprite>equipment/head/skullmask.xml</sprite>
+    </item>
+    <item id="1222"
+        image="generic/claylump_small.png"
+        name="Small Piece of Clay"
+        description="A small piece of clay, used to make different shapes."
+        type="generic"
+        weight="5"/>
+    <item id="1223"
+        image="generic/claylump_big.png"
+        name="Big Piece of White Clay"
+        description="A big piece of white clay, used to make bigger shapes."
+        type="generic"
+        weight="10"/>
+    <item id="1224"
+        image="generic/scroll.png"
+        name="Scroll of Paper"
+        description="A scroll made of fine paper."
+        type="generic"
+        weight="1"/>
+    <item id="1225"
+        image="use/scrolls/firescroll.png"
+        name="Fire Scroll"
+        description="A scroll on which is written an ancient formula giving birth to fire."
+        type="generic"
+        weight="1"/>
+    <item id="1226"
+        image="generic/silverbell.png"
+        name="Silver Bell"
+        description="A tiny bell made of silver."
+        type="generic"
+        weight="25"/>
+    <item id="1227"
+        image="equipment/charms/enchanter.png"
+        name="Enchanter's Amulet"
+        description="An amulet made for true enchanters."
+        type="equip-charm"
+        weight="1"/>
+    <item id="1228"
+        image="generic/crystal.png|W:#ba58ff,d496ff,ffffff"
+        name="Light Crystal"
+        description="A light crystal that emits an angelic aura."
+        type="generic"
+        weight="10"/>
+    <item id="1229"
+        image="use/food/caramelapple.png"
+        name="Caramel Apple"
+        description="A caramel coated apple, complete with stick. Rots teeth, tastes good."
+        type="usable"
+        hp="1000"
+        weight="5"/>
+    <item id="1230"
+        image="use/food/lollipop.png|W:#2502d6"
+        name="Booberry Blue Lollipop"
+        description="A lollipop. Mmm."
+        type="usable"
+        hp="800"
+        weight="1"/>
+    <item id="1231"
+        image="use/food/lollipop.png|W:#00ba16"
+        name="Ghastly Green Lollipop"
+        description="A lollipop. Tasty."
+        type="usable"
+        hp="800"
+        weight="1"/>
+    <item id="1232"
+        image="use/food/lollipop.png|W:#e00418"
+        name="Blood Red Lollipop"
+        description="A lollipop. Yum."
+        type="usable"
+        hp="800"
+        weight="1"/>
+    <item id="1233"
+        image="generic/fakefangs.png"
+        name="Cheap Plastic Fangs"
+        description="A costumed Dracula's must. Doesn't really suck blood."
+        type="generic"
+        weight="1"/>
+    <item id="1234"
+        image="generic/christmasbulb.png|W:#f00000"
+        name="Red Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1235"
+        image="generic/christmasbulb.png|W:#f0e000"
+        name="Yellow Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1236"
+        image="generic/christmasbulb.png|W:#00f000"
+        name="Green Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1237"
+        image="generic/christmasbulb.png|W:#00f0ee"
+        name="Aqua Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1238"
+        image="generic/christmasbulb.png|W:#0000d0"
+        name="Blue Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1239"
+        image="generic/christmasbulb.png|W:#d000ef"
+        name="Purple Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1240"
+        image="generic/santaglobe.png"
+        name="Santa Snow Globe"
+        description="An snow globe featuring Santa."
+        type="generic"
+        weight="1"/>
+    <item id="1241"
+        image="generic/snowmanglobe.png"
+        name="Snowman Snow Globe"
+        description="An snow globe featuring a snowman."
+        type="generic"
+        weight="1"/>
+   <item id="1242"
+        image="equipment/head/snowgoggles.png"
+        name="Snow Goggles"
+        description="Snow Goggles to keep your eyeballs from freezing."
+        effect="M. Attack -2"
+        type="equip-head"
+        defense="5"
+        weight="10">
+        <sprite>equipment/head/snowgoggles.xml</sprite>
+    </item>
+
+    <!-- RESERVED -->
+
+    <item id="1244"
+        image="generic/iten.png"
+        name="Dark Talisman"
+        description="A small cube. It radiates unimaginable power, and is quite dizzying to look at."
+        effect="Unimaginable powers to a successful wielder. M. Attack +100"
+        type="equip-torso"
+        >
+        <sprite>equipment/override/skeleton.xml</sprite>
+        <particlefx>graphics/particles/wisp.particle.xml</particlefx>
+    </item>
+    <item id="1245"
+        image="generic/bent-needle.png"
+        name="Bent Needle"
+        description="A twisted needle. It would be difficult to find one in a haystack, for example."
+        effect="This item has no use."
+        type="generic"
+        weight="3"/>
+    <item id="1246"
+        image="generic/dark-easter-egg.png"
+        name="Dark Easter Egg"
+        description="A smooth chocolate easter egg."
+        effect="This item has no use."
+        type="generic"
+        weight="10"/>
+    <item id="1247"
+        image="equipment/head/heart-glasses.png"
+        name="Heart Glasses"
+        description="Heart Glasses from another universe. Decisions were different there."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="4"
+        weight="20">
+        <sprite>equipment/head/heart-glasses.xml</sprite>
+    </item>
+    <item id="1248"
+        image="use/food/blueberries.png"
+        name="Blueberries"
+        description="Near to bursting with sweet juice."
+        type="usable"
+        hp="200"
+        weight="6"/>
+    <item id="1249"
+        image="generic/strange-coin.png"
+        name="Strange Coin"
+        description="A strange coin. The markings on it are unlike anything you have ever seen before."
+        effect="This item has no use."
+        type="generic"
+        weight="3"/>
+    <item id="1250"
+        image="use/food/pear.png"
+        name="Pear"
+        description="Juicy, crunchy, and delicious."
+        type="usable"
+        hp="150"
+        weight="7"/>
+    <item id="1251"
+        image="use/food/yellow-plum.png"
+        name="Yellow Plum"
+        description="A yellow variety of plum that is both sweet and sour."
+        type="usable"
+        hp="100"
+        weight="10"/>
+    <item id="1252"
+        image="use/food/cherry.png"
+        name="Cherry"
+        description="A small but delectable cherry."
+        type="usable"
+        hp="50"
+        weight="5"/>
+    <item id="1253"
+        image="use/food/apple.png|R:#b3ab77;Y:#ffc030;G:#66cc33"
+        name="Golden Delicious Apple"
+        description="A golden apple. Taken from a tree of many fruits from a distant world."
+        type="usable"
+        hp="200"
+        weight="30"/>
+    <item id="1254"
+        image="generic/dark-petal.png"
+        name="Dark Petal"
+        description="A single, dark, petal, oddly heavy. The edges of the petal are unusually hard, and have a slightly reflective shine to them. But looking into the gleam, you can only see fire..."
+        effect="A ticket between worlds. If you should find yourself transported by one, be sure not to lose it, lest you become trapped indefinitely. This item cannot be used directly."
+        type="generic"
+        weight="250"/>
+    <item id="1255"
+        image="equipment/head/rabbit-ears.png|W:#ffffff"
+        name="White Rabbit Ears"
+        description="A headband with rabbit ears, pure white."
+        effect="M. Attack +4"
+        defense="5"
+        type="equip-head"
+        weight="20">
+        <sprite>equipment/head/rabbit-ears.xml|#ffffff</sprite>
+    </item>
+    <item id="1256"
+        image="equipment/head/eggshell-hat.png"
+        name="Eggshell Hat"
+        description="A novelty hat shaped like an eggshell half."
+        type="equip-head"
+        defense="12"
+        agi="-1"
+        weight="15">
+        <sprite>equipment/head/eggshell.xml</sprite>
+    </item>
+    <item id="1257"
+        image="generic/flawed-lens.png"
+        name="Flawed Lens"
+        description="A failed attempt at making a lens with powerful properties. Perhaps, one day, you will be able to salvage the remains from this effort."
+        effect="This item has no use."
+        type="generic"
+        weight="3"/>
+    <item id="1258"
+        image="use/food/honey.png"
+        name="Honey"
+        description="A sweet food made by certain insects using nectar from flowers."
+        type="usable"
+        hp="100"
+        weight="20"/>
+    <item id="1276"
+        image="equipment/head/opera-mask.png"
+        name="Opera Mask"
+        description="Pale and broken. There is surely a story to be told here."
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/operamask.xml</sprite>
+     </item>
+     <item id="1277"
+        image="equipment/head/jestermask.png"
+        name="Jester Mask"
+        description="Laughter with bells on."
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/jestermask.xml</sprite>
+     </item>
+     <item id="1278"
+        image="equipment/head/witch-hat.png"
+        name="Witch Hat"
+        description="Big, dark, and pointy. It looks a bit out of place."
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/witch-hat.xml</sprite>
+     </item>
+     <item id="1279"
+        image="equipment/head/goblin-mask.png"
+        name="Goblin Mask"
+        description="A strange dark mask. Who knows what lurks behind it?"
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/goblin-mask.xml</sprite>
+     </item>
+     <item id="1280"
+        image="generic/scissors.png"
+        name="Scissors"
+        description="A pair of awkward and unwieldy scissors."
+        effect="A dangerous barber."
+        type="usable"
+        weight="120"/>
+     <item id="1281"
+        image="use/food/shock-candy.png"
+        name="Shock Sweet"
+        description="It'll turn your hair white!"
+        type="usable"
+        weight="5"/>
+     <item id="1282"
+        image="equipment/ammo/bonedarts.png"
+        name="Bone Arrows"
+        description="Arrows made from bone. Not much different from the normal variety, but are much lighter."
+        effect="Damage +55"
+        type="equip-ammo"
+        weight="0"/>
+
+    <!-- The 2XXY IDs are used for recolored items on eAthena.
+        XX = item
+        Y = color variant
+        XXY = viewID
+
+        On the new server recolorable items should use the same item number
+        (as long as they are functionally identical while the color is sent as
+        an additional item property.
+    -->
+
+    <item id="2050"
+        image="equipment/chest/cottonshirt.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Shirt"
+        description="A red shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2051"
+        image="equipment/chest/cottonshirt.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Shirt"
+        description="A green shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2052"
+        image="equipment/chest/cottonshirt.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Shirt"
+        description="A dark blue shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2053"
+        image="equipment/chest/cottonshirt.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Shirt"
+        description="A yellow shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2054"
+        image="equipment/chest/cottonshirt.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Shirt"
+        description="A light blue shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2055"
+        image="equipment/chest/cottonshirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Shirt"
+        description="A pink shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2056"
+        image="equipment/chest/cottonshirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Shirt"
+        description="A black shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2057"
+        image="equipment/chest/cottonshirt.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Shirt"
+        description="An orange shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2058"
+        image="equipment/chest/cottonshirt.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Shirt"
+        description="A purple shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2059"
+        image="equipment/chest/cottonshirt.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Shirt"
+        description="A dark green shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2060"
+        image="equipment/chest/vnecksweater.png|W:#580000,a40000,c02020,ff6060"
+        name="Red V-Neck Sweater"
+        description="A thin, soft and warm red sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2061"
+        image="equipment/chest/vnecksweater.png|W:#115511,22aa22,99dd99"
+        name="Green V-Neck Sweater"
+        description="A thin, soft and warm green sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2062"
+        image="equipment/chest/vnecksweater.png|W:#222255,6666ff"
+        name="Dark Blue V-Neck Sweater"
+        description="A thin, soft and warm dark blue sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2063"
+        image="equipment/chest/vnecksweater.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow V-Neck Sweater"
+        description="A thin, soft and warm yellow sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2064"
+        image="equipment/chest/vnecksweater.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue V-Neck Sweater"
+        description="A thin, soft and warm light blue sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2065"
+        image="equipment/chest/vnecksweater.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink V-Neck Sweater"
+        description="A thin, soft and warm pink sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2066"
+        image="equipment/chest/vnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black V-Neck Sweater"
+        description="A thin, soft and warm black sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2067"
+        image="equipment/chest/vnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange V-Neck Sweater"
+        description="A thin, soft and warm orange sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2068"
+        image="equipment/chest/vnecksweater.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple V-Neck Sweater"
+        description="A thin, soft and warm purple sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2069"
+        image="equipment/chest/vnecksweater.png|W:#104010,208020,30c030"
+        name="Dark Green V-Neck Sweater"
+        description="A thin, soft and warm dark green sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2070"
+        image="equipment/chest/tnecksweater.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Turtleneck Sweater"
+        description="A thick, soft and warm red sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2071"
+        image="equipment/chest/tnecksweater.png|W:#115511,22aa22,99dd99"
+        name="Green Turtleneck Sweater"
+        description="A thick, soft and warm green sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2072"
+        image="equipment/chest/tnecksweater.png|W:#222255,6666ff"
+        name="Dark Blue Turtleneck Sweater"
+        description="A thick, soft and warm dark blue sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2073"
+        image="equipment/chest/tnecksweater.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Turtleneck Sweater"
+        description="A thick, soft and warm yellow sweater."
+        type="equip-torso"
+        effect="M. Attack -12"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2074"
+        image="equipment/chest/tnecksweater.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Turtleneck Sweater"
+        description="A thick, soft and warm light blue sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2075"
+        image="equipment/chest/tnecksweater.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Turtleneck Sweater"
+        description="A thick, soft and warm pink sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2076"
+        image="equipment/chest/tnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Turtleneck Sweater"
+        description="A thick, soft and warm black sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2077"
+        image="equipment/chest/tnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Turtleneck Sweater"
+        description="A thick, soft and warm orange sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2078"
+        image="equipment/chest/tnecksweater.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Turtleneck Sweater"
+        description="A thick, soft and warm purple sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2079"
+        image="equipment/chest/tnecksweater.png|W:#104010,208020,30c030"
+        name="Dark Green Turtleneck Sweater"
+        description="A thick, soft and warm dark green sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2080"
+        image="equipment/chest/silk-robe.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Silk Robe"
+        description="A light and shimmering red silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2081"
+        image="equipment/chest/silk-robe.png|W:#115511,22aa22,99dd99"
+        name="Green Silk Robe"
+        description="A light and shimmering green silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2082"
+        image="equipment/chest/silk-robe.png|W:#222255,6666ff"
+        name="Dark Blue Silk Robe"
+        description="A light and shimmering dark blue silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2083"
+        image="equipment/chest/silk-robe.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Silk Robe"
+        description="A light and shimmering yellow silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2084"
+        image="equipment/chest/silk-robe.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Silk Robe"
+        description="A light and shimmering light blue silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2085"
+        image="equipment/chest/silk-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Silk Robe"
+        description="A light and shimmering pink silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2086"
+        image="equipment/chest/silk-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Silk Robe"
+        description="A light and shimmering black silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2087"
+        image="equipment/chest/silk-robe.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Silk Robe"
+        description="A light and shimmering orange silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2088"
+        image="equipment/chest/silk-robe.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Silk Robe"
+        description="A light and shimmering purple silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2089"
+        image="equipment/chest/silk-robe.png|W:#104010,208020,30c030"
+        name="Dark Green Silk Robe"
+        description="A light and shimmering dark green silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2090"
+        image="equipment/chest/tanktop.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Tank Top"
+        description="A red sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2091"
+        image="equipment/chest/tanktop.png|W:#115511,22aa22,99dd99"
+        name="Green Tank Top"
+        description="A green sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2092"
+        image="equipment/chest/tanktop.png|W:#222255,6666ff"
+        name="Dark Blue Tank Top"
+        description="A dark blue sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2093"
+        image="equipment/chest/tanktop.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Tank Top"
+        description="A yellow sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2094" image="equipment/chest/tanktop.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Tank Top"
+        description="A light blue sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2095" image="equipment/chest/tanktop.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Tank Top"
+        description="A pink sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2096"
+        image="equipment/chest/tanktop.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Tank Top"
+        description="A black sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2097"
+        image="equipment/chest/tanktop.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Tank Top"
+        description="An orange sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2098" image="equipment/chest/tanktop.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Tank Top"
+        description="A purple sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2099"
+        image="equipment/chest/tanktop.png|W:#104010,208020,30c030"
+        name="Dark Green Tank Top"
+        description="A dark green sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2100"
+        image="equipment/legs/skirt.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Skirt"
+        description="A red skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2101"
+        image="equipment/legs/skirt.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Skirt"
+        description="A green skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+      <sprite>equipment/legs/skirt.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2102"
+        image="equipment/legs/skirt.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Skirt"
+        description="A dark blue skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2103"
+        image="equipment/legs/skirt.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Skirt"
+        description="A yellow skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2104"
+        image="equipment/legs/skirt.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Skirt"
+        description="A light blue skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2105"
+        image="equipment/legs/skirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Skirt"
+        description="A pink skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2106"
+        image="equipment/legs/skirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Skirt"
+        description="A black skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2107"
+        image="equipment/legs/skirt.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Skirt"
+        description="An orange skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2108"
+        image="equipment/legs/skirt.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Skirt"
+        description="A purple skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2109"
+        image="equipment/legs/skirt.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Skirt"
+        description="A dark green skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2110"
+        image="equipment/legs/shorts.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Shorts"
+        description="Red shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2111"
+        image="equipment/legs/shorts.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Shorts"
+        description="Green shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2112"
+        image="equipment/legs/shorts.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Shorts"
+        description="Dark blue shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2113"
+        image="equipment/legs/shorts.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Shorts"
+        description="Yellow shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2114"
+        image="equipment/legs/shorts.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Shorts"
+        description="Light blue shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2115"
+        image="equipment/legs/shorts.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Shorts"
+        description="Pink shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2116"
+        image="equipment/legs/shorts.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Shorts"
+        description="Black shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2117"
+        image="equipment/legs/shorts.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Shorts"
+        description="Orange shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2118"
+        image="equipment/legs/shorts.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Shorts"
+        description="Purple shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#520a7b,8c23c7,ca87ef</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#520a7b,8c23c7,ca87ef</sprite>
+    </item>
+    <item id="2119"
+        image="equipment/legs/shorts.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Shorts"
+        description="Dark green shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2120"
+        image="equipment/chest/tanktop-short.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Short Tank Top"
+        description="A short, sleeveless red shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2121"
+        image="equipment/chest/tanktop-short.png|W:#115511,22aa22,99dd99"
+        name="Green Short Tank Top"
+        description="A short, sleeveless green shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2122"
+        image="equipment/chest/tanktop-short.png|W:#222255,6666ff"
+        name="Dark Blue Short Tank Top"
+        description="A short, sleeveless dark blue shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2123"
+        image="equipment/chest/tanktop-short.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Short Tank Top"
+        description="A short, sleeveless yellow shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2124"
+        image="equipment/chest/tanktop-short.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Short Tank Top"
+        description="A short, sleeveless light blue shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2125"
+        image="equipment/chest/tanktop-short.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Short Tank Top"
+        description="A short, sleeveless pink shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2126"
+        image="equipment/chest/tanktop-short.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Short Tank Top"
+        description="A short, sleeveless black shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2127"
+        image="equipment/chest/tanktop-short.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Short Tank Top"
+        description="A short, sleeveless orange shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2128" image="equipment/chest/tanktop-short.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Short Tank Top"
+        description="A short, sleeveless purple shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2129"
+        image="equipment/chest/tanktop-short.png|W:#104010,208020,30c030"
+        name="Dark Green Short Tank Top"
+        description="A short, sleeveless dark green shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2130"
+        image="equipment/head/deserthat.png|R:#580000,a40000,c02020,ff6060"
+        name="Red Desert Hat"
+        description="While the red desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2131"
+        image="equipment/head/deserthat.png|R:#115511,22aa22,99dd99"
+        name="Green Desert Hat"
+        description="While the green desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2132"
+        image="equipment/head/deserthat.png|R:#222255,6666ff"
+        name="Dark Blue Desert Hat"
+        description="While the dark blue desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2133"
+        image="equipment/head/deserthat.png|R:#846211,dab333,fffb93,ffffff"
+        name="Yellow Desert Hat"
+        description="While the yellow desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2134"
+        image="equipment/head/deserthat.png|R:#16486e,498ec5,e4f2fc"
+        name="Light Blue Desert Hat"
+        description="While the light blue desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2135"
+        image="equipment/head/deserthat.png|R:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Desert Hat"
+        description="While the pink desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2136"
+        image="equipment/head/deserthat.png|R:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Desert Hat"
+        description="While the black desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2137"
+        image="equipment/head/deserthat.png|R:#80280f,b04810,ef681f,ffb830"
+        name="Orange Desert Hat"
+        description="While the orange desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2138"
+        image="equipment/head/deserthat.png|R:#4f0a76,8010c0,d699f7"
+        name="Purple Desert Hat"
+        description="While the purple desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2139"
+        image="equipment/head/deserthat.png|R:#104010,208020,30c030"
+        name="Dark Green Desert Hat"
+        description="While the dark green desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2140"
+        image="equipment/head/standardheadband.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Headband"
+        description="Just a red cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2141"
+        image="equipment/head/standardheadband.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Headband"
+        description="Just a green cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2142"
+        image="equipment/head/standardheadband.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Headband"
+        description="Just a dark blue cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2143"
+        image="equipment/head/standardheadband.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Headband"
+        description="Just a yellow cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2144"
+        image="equipment/head/standardheadband.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Headband"
+        description="Just a light blue cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2145"
+        image="equipment/head/standardheadband.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Headband"
+        description="Just a pink cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2146"
+        image="equipment/head/standardheadband.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Headband"
+        description="Just a black cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2147"
+        image="equipment/head/standardheadband.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Headband"
+        description="Just an orange cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2148"
+        image="equipment/head/standardheadband.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Headband"
+        description="Just a purple cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2149"
+        image="equipment/head/standardheadband.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Headband"
+        description="Just a dark green cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2150"
+        image="equipment/feet/boots.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Boots"
+        description="A red pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2151"
+        image="equipment/feet/boots.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Boots"
+        description="A green pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2152"
+        image="equipment/feet/boots.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Boots"
+        description="A dark blue pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2153"
+        image="equipment/feet/boots.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Boots"
+        description="A yellow pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2154"
+        image="equipment/feet/boots.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Boots"
+        description="A light blue pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2155"
+        image="equipment/feet/boots.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Boots"
+        description="A pink pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2156"
+        image="equipment/feet/boots.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Boots"
+        description="A black pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2157"
+        image="equipment/feet/boots.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Boots"
+        description="An orange pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2158"
+        image="equipment/feet/boots.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Boots"
+        description="A purple pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2159"
+        image="equipment/feet/boots.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Boots"
+        description="A dark green pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2160"
+        image="equipment/hands/basicgloves.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Gloves"
+        description="A red pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2161"
+        image="equipment/hands/basicgloves.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Gloves"
+        description="A green pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2162"
+        image="equipment/hands/basicgloves.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Gloves"
+        description="A dark blue pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2163"
+        image="equipment/hands/basicgloves.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Gloves"
+        description="A yellow pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2164"
+        image="equipment/hands/basicgloves.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Gloves"
+        description="A light blue pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2165"
+        image="equipment/hands/basicgloves.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Gloves"
+        description="A pink pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2166"
+        image="equipment/hands/basicgloves.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Gloves"
+        description="A black pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2167"
+        image="equipment/hands/basicgloves.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Gloves"
+        description="An orange pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2168"
+        image="equipment/hands/basicgloves.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Gloves"
+        description="A purple pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2169"
+        image="equipment/hands/basicgloves.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Gloves"
+        description="A dark green pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2170"
+        image="equipment/legs/miniskirt.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Miniskirt"
+        description="A red short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2171"
+        image="equipment/legs/miniskirt.png|W:#115511,22aa22,99dd99"
+        name="Green Miniskirt"
+        description="A green short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2172"
+        image="equipment/legs/miniskirt.png|W:#222255,6666ff"
+        name="Dark Blue Miniskirt"
+        description="A dark blue short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2173"
+        image="equipment/legs/miniskirt.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Miniskirt"
+        description="A yellow short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2174"
+        image="equipment/legs/miniskirt.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Miniskirt"
+        description="A light blue short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2175"
+        image="equipment/legs/miniskirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+       name="Pink Miniskirt"
+        description="A pink short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2176"
+        image="equipment/legs/miniskirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Miniskirt"
+        description="A black short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2177"
+        image="equipment/legs/miniskirt.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Miniskirt"
+        description="An orange short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2178"
+        image="equipment/legs/miniskirt.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Miniskirt"
+        description="A purple short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2179"
+        image="equipment/legs/miniskirt.png|W:#104010,208020,30c030"
+        name="Dark Green Miniskirt"
+        description="A dark green short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <!-- IDs 2180 to 2189 RESERVED -->
+
+    <item id="2190"
+        image="equipment/head/rabbit-ears.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Rabbit Ears"
+        description="A headband with rabbit ears, bright red."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2191"
+        image="equipment/head/rabbit-ears.png|W:#115511,22aa22,99dd99"
+        name="Green Rabbit Ears"
+        description="A headband with rabbit ears, warm green."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2192"
+        image="equipment/head/rabbit-ears.png|W:#222255,6666ff"
+        name="Dark Blue Rabbit Ears"
+        description="A headband with rabbit ears, iridescent dark blue."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2193"
+        image="equipment/head/rabbit-ears.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Rabbit Ears"
+        description="A headband with rabbit ears, soft yellow."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2194"
+        image="equipment/head/rabbit-ears.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Rabbit Ears"
+        description="A headband with rabbit ears, light blue."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2195"
+        image="equipment/head/rabbit-ears.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Rabbit Ears"
+        description="A headband with rabbit ears, bright pink."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2196"
+        image="equipment/head/rabbit-ears.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black rabbit ears"
+        description="A headband with rabbit ears, deep black."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2197"
+        image="equipment/head/rabbit-ears.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Rabbit Ears"
+        description="A headband with rabbit ears, bright orange."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2198"
+        image="equipment/head/rabbit-ears.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Rabbit Ears"
+        description="A headband with rabbit ears, strong purple."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2199"
+        image="equipment/head/rabbit-ears.png|W:#104010,208020,30c030"
+        name="Dark Green Rabbit Ears"
+        description="A headband with rabbit ears, dark green."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2200"
+        image="equipment/head/wizard-hat.png|W:#580000,a40000,c02020,ff6060"
+        name="Red wizard hat"
+        description="A wizard hat, bright red."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="5"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2201"
+        image="equipment/head/wizard-hat.png|W:#115511,22aa22,99dd99"
+        name="Green Wizard Hat"
+        description="A wizard hat, warm green."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2202"
+        image="equipment/head/wizard-hat.png|W:#222255,6666ff"
+        name="Dark Blue Wizard Hat"
+        description="A wizard hat, iridescent dark blue."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2203"
+        image="equipment/head/wizard-hat.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Wizard Hat"
+        description="A wizard hat, soft yellow."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2204"
+        image="equipment/head/wizard-hat.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Wizard Hat"
+        description="A wizard hat, light blue."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2205"
+        image="equipment/head/wizard-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Wizard Hat"
+        description="A wizard hat, bright pink."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2206"
+        image="equipment/head/wizard-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Wizard Hat"
+        description="A wizard hat, deep black."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2207"
+        image="equipment/head/wizard-hat.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Wizard Hat"
+        description="A wizard hat, bright orange."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2208"
+        image="equipment/head/wizard-hat.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Wizard Hat"
+        description="A wizard hat, strong purple."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2209"
+        image="equipment/head/wizard-hat.png|W:#104010,208020,30c030"
+        name="Dark Green Wizard Hat"
+        description="A wizard hat, dark green."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2210"
+        image="equipment/head/bowler-hat.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Bowler Hat"
+        description="A hat for those with a bit of class, with a red band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2211"
+        image="equipment/head/bowler-hat.png|W:#115511,22aa22,99dd99"
+        name="Green Bowler Hat"
+        description="A hat for those with a bit of class, with a green band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2212"
+        image="equipment/head/bowler-hat.png|W:#222255,6666ff"
+        name="Dark Blue Bowler Hat"
+        description="A hat for those with a bit of class, with a dark blue band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2213"
+        image="equipment/head/bowler-hat.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Bowler Hat"
+        description="A hat for those with a bit of class, with a yellow band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2214"
+        image="equipment/head/bowler-hat.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Bowler Hat"
+        description="A hat for those with a bit of class, with a light blue band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2215"
+        image="equipment/head/bowler-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Bowler Hat"
+        description="A hat for those with a bit of class, with a pink band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2216"
+        image="equipment/head/bowler-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Bowler Hat"
+        description="A hat for those with a bit of class, with a black band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2217"
+        image="equipment/head/bowler-hat.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Bowler Hat"
+        description="A hat for those with a bit of class, with an orange band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2218"
+        image="equipment/head/bowler-hat.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Bowler Hat"
+        description="A hat for those with a bit of class, with a purple band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2219"
+        image="equipment/head/bowler-hat.png|W:#104010,208020,30c030"
+        name="Dark Green Bowler Hat"
+        description="A hat for those with a bit of class, with a dark green band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2220"
+        image="equipment/chest/sorcerer-robe.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Sorcerer Robe (Red)"
+        description="A red lined red sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2221"
+        image="equipment/chest/sorcerer-robe.png|W:#115511,22aa22,99dd99"
+        name="Green Sorcerer Robe (Red)"
+        description="A red lined green sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2222"
+        image="equipment/chest/sorcerer-robe.png|W:#222255,6666ff"
+        name="Dark Blue Sorcerer Robe (Red)"
+        description="A red lined dark blue sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2223"
+        image="equipment/chest/sorcerer-robe.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Sorcerer Robe (Red)"
+        description="A red lined yellow sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2224"
+        image="equipment/chest/sorcerer-robe.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Sorcerer Robe (Red)"
+        description="A red lined light blue sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2225"
+        image="equipment/chest/sorcerer-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Sorcerer Robe (Red)"
+        description="A red lined pink sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2226"
+        image="equipment/chest/sorcerer-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Sorcerer Robe (Red)"
+        description="A red lined black sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2227"
+        image="equipment/chest/sorcerer-robe.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Sorcerer Robe (Red)"
+        description="A red lined orange sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2228"
+        image="equipment/chest/sorcerer-robe.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Sorcerer Robe (Red)"
+        description="A red lined purple sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2229"
+        image="equipment/chest/sorcerer-robe.png|W:#104010,208020,30c030"
+        name="Dark Green Sorcerer Robe (Red)"
+        description="A red lined dark green sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2230"
+        image="equipment/head/bowler-hat-brown.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a red band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2231"
+        image="equipment/head/bowler-hat-brown.png|W:#115511,22aa22,99dd99"
+        name="Green Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a green band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2232"
+        image="equipment/head/bowler-hat-brown.png|W:#222255,6666ff"
+        name="Dark Blue Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a dark blue band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2233"
+        image="equipment/head/bowler-hat-brown.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a yellow band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2234"
+        image="equipment/head/bowler-hat-brown.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a light blue band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2235"
+        image="equipment/head/bowler-hat-brown.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a pink band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2236"
+        image="equipment/head/bowler-hat-brown.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a black band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2237"
+        image="equipment/head/bowler-hat-brown.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with an orange band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2238"
+        image="equipment/head/bowler-hat-brown.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a purple band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2239"
+        image="equipment/head/bowler-hat-brown.png|W:#104010,208020,30c030"
+        name="Dark Green Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a dark green band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="3000"
+        image="generic/jackolantern.png"
+        name="Jack O Lantern"
+        description="A pumpkin that has been carved into a super-scary face for Hallowe'en."
+        type="generic"
+        weight="1000"/>
+    <item id="3001"
+        image="generic/rubberbat.png"
+        name="Rubber Bat"
+        description="Squeaks when you squeeze it."
+        type="generic"
+        weight="30"/>
+    <item id="3002"
+        image="generic/realisticbrain.png"
+        name="Realistic Brain"
+        description="This brain sure is realistic."
+        type="generic"
+        weight="50"/>
+    <item id="3003"
+        image="generic/jarofblood.png"
+        name="Jar of Blood"
+        description="Just the thing to scare the kids at Hallowe'en."
+        type="generic"
+        weight="375"/>
+    <item id="3004"
+        image="generic/tongue.png"
+        name="Tongue"
+        description="A horrible, slimy tongue."
+        type="generic"
+        weight="5"/>
+    <item id="3006"
+        image="use/food/tonoridelight.png"
+        name="Tonori Delight"
+        description="A softly-scented jelly-like treat, dusted with the sweet white sands of Eastern Tonori."
+        type="generic"
+        weight="2"/>
+    <item id="3007"
+        image="use/food/marshmallow.png"
+        name="Marshmallow"
+        description="Flavoured with real marshmallow root."
+        type="generic"
+        weight="2"/>
+    <item id="3009"
+        image="use/food/jellyskull.png"
+        name="Jelly Skull"
+        description="Like a jelly bean, but in the shape of skull."
+        type="generic"
+        weight="2"/>
+    <item id="3010"
+        image="use/food/candypumpkin.png"
+        name="Candy Pumpkin"
+        description="With a squishy interior inside a hard, crunchy shell, this sweet has a warm and delcious pumpkin flavour."
+        type="generic"
+        weight="2"/>
+    <item id="3011"
+        image="generic/pumpkinseed.png"
+        name="Pumpkin Seeds"
+        description="The seeds from a seasonal pumpkin vine."
+        type="generic"
+        weight="1"/>
+    <item id="4000"
+        image="generic/scorpionstinger.png|W:#800000,ffffff"
+        name="Angry Scorpion Stinger"
+        description="An angry scorpion stinger."
+        type="generic"
+        weight="1"/>
+    <item id="4001"
+        image="generic/coal.png"
+        name="Coal"
+        description="A lump of coal."
+        type="generic"
+        weight="20"/>
+    <item id="4002"
+        image="generic/gemstone-b.png"
+        name="Diamond"
+        description="A raw diamond gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4003"
+        image="generic/gemstone-b.png|W:#580000,a40000,c02020,ff6060"
+        name="Ruby"
+        description="A raw ruby gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4004"
+        image="generic/gemstone-b.png|W:#1f9c1f,89d689"
+        name="Emerald"
+        description="A raw emerald gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4005"
+        image="generic/gemstone-b.png|W:#4b4bbd,888af4"
+        name="Sapphire"
+        description="A raw sapphire gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4006"
+        image="generic/gemstone-b.png|W:#ccb534,f1ea8e,ffffaa"
+        name="Topaz"
+        description="A raw topaz gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4007"
+        image="generic/gemstone-b.png|W:#530a7c,b362e1,ca87ef"
+        name="Amethyst"
+        description="A raw amethyst gemstone."
+        type="generic"
+        weight="10"/>
+    <item id="4008"
+        image="equipment/rings/gem.png"
+        name="Diamond Ring"
+        description="A diamond ring."
+        type="equip-ring"
+        vit="1"
+        weight="1"/>
+    <item id="4009"
+        image="equipment/rings/gem.png|W:#580000,a40000,c02020,ff6060"
+        name="Ruby Ring"
+        description="A ruby ring."
+        type="equip-ring"
+        str="1"
+        weight="1"/>
+    <item id="4010"
+        image="equipment/rings/gem.png|W:#1f9c1f,89d689"
+        name="Emerald Ring"
+        description="An emerald ring."
+        type="equip-ring"
+        luck="1"
+        weight="1"/>
+    <item id="4011"
+        image="equipment/rings/gem.png|W:#4b4bbd,888af4"
+        name="Sapphire Ring"
+        description="A sapphire ring."
+        type="equip-ring"
+        int="1"
+        weight="1"/>
+    <item id="4012"
+        image="equipment/rings/gem.png|W:#ccb534,f1ea8e,ffffaa"
+        name="Topaz Ring"
+        description="A topaz ring."
+        type="equip-ring"
+        agi="1"
+        weight="1"/>
+    <item id="4013"
+        image="equipment/rings/gem.png|W:#530a7c,b362e1,ca87ef"
+        name="Amethyst Ring"
+        description="An amethyst ring."
+        type="equip-ring"
+        dex="1"
+        weight="1"/>
+    <item id="4014"
+        image="equipment/rings/simple.png"
+        name="Simple Ring"
+        description="A simple ring."
+        type="equip-ring"
+        weight="1"/>
+    <item id="4015"
+        image="generic/ingot.png"
+        name="Iron Ingot"
+        description="An ingot of iron."
+        type="generic"
+        weight="200"/>
+    <item id="4016"
+        image="generic/bandit-hood.png"
+        name="Bandit Hood"
+        description="A bandit hood crawling with lice."
+        type="generic"
+        weight="50"/>
+    <item id="4017"
+        image="generic/powder.png|W:#c00000"
+        name="Red Powder"
+        description="A pile of magical red powder."
+        type="generic"
+        weight="3"/>
+     <item id="4018"
+        image="generic/powder.png|W:#ffcc00"
+        name="Yellow Powder"
+        description="A pile of magical yellow powder."
+        type="generic"
+        weight="3"/>
+     <item id="4019"
+        image="generic/powder.png|W:#003399"
+        name="Blue Powder"
+        description="A pile of magical blue powder."
+        type="generic"
+        weight="3"/>
+    <item id="4020"
+        image="equipment/head/candlehelmet.png"
+        name="Candle Helmet"
+        description="Worn by spelunkers."
+        effect="M. Attack -25"
+        type="equip-head"
+        defense="16"
+        int="1"
+        agi="-1"
+        weight="450">
+        <sprite>equipment/head/candlehelmet.xml</sprite>
+    </item>
+    <item id="4021"
+        image="generic/yellowpresentbox.png"
+        name="Yellow Present Box"
+        description="Something mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="4022"
+        image="generic/whitepresentbox.png"
+        name="White Present Box"
+        description="Something very mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="4023"
+        image="generic/animal-bones.png"
+        name="Animal Bones"
+        description="Bones from an animal."
+        type="generic"
+        weight="1"/>
+    <item id="4024"
+        image="generic/frozen-yeti-tear.png"
+        name="Frozen Yeti Tear"
+        description="A tear from a yeti, frozen."
+        type="generic"
+        weight="1"/>
+    <item id="4025"
+        image="generic/yeti-claw.png"
+        name="Yeti Claw"
+        description="A claw broken off from a yeti."
+        type="generic"
+        weight="1"/>
+    <item id="4026"
+        image="generic/ice-cube.png"
+        name="Ice Cube"
+        description="A very cold ice cube that never seems to completely melt."
+        type="generic"
+        weight="1"/>
+    <item id="4027"
+        image="equipment/head/yeti-mask.png"
+        name="Yeti Mask"
+        description="A mask made from the yeti's head."
+        effect="M. Attack -10"
+        type="equip-head"
+        defense="4"
+        weight="10">
+        <sprite>equipment/head/yeti-mask.xml</sprite>
+    </item>
+    <item id="4028"
+        image="equipment/head/wizard-hat.png"
+        name="Wizard Hat"
+        description="A simple wizard hat."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml</sprite>
+    </item>
+	<item id="4029"
+        image="use/potions/e.png|G:#bb0000;R:#ff0000;"
+        name="Grimace of Dementia"
+        description="A feared potion. If done wrong... what did you say?"
+        type="generic"
+        weight="50"/>
+    <item id="4030"
+        image="equipment/head/bowler-hat.png"
+        name="Bowler Hat"
+        description="A hat for those with a bit of class."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml</sprite>
+    </item>
+    <item id="4031"
+        image="equipment/head/monocle.png"
+        name="Monocle"
+        description="A handy perception tool, even when not at the opera."
+        effect="Critical Damage +20"
+        type="equip-head"
+        defense="2"
+        dex="1"
+        luck="1"
+        weight="20">
+        <sprite>equipment/head/monocle.xml</sprite>
+    </item>
+</items>
diff --git a/data/sale.xml b/data/sale.xml
new file mode 100644
index 0000000..374d3f4
--- /dev/null
+++ b/data/sale.xml
@@ -0,0 +1 @@
+<items />
diff --git a/data/user.xml b/data/user.xml
new file mode 100644
index 0000000..bc58f62
--- /dev/null
+++ b/data/user.xml
@@ -0,0 +1 @@
+<users><user accesslevel="20" id="0" money="0" name="Jero" stalls="5" used_stalls="0" /></users>
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..3a217cd
--- /dev/null
+++ b/main.py
@@ -0,0 +1,1012 @@
+""" This package implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
+
+    - Currently permissions are defined as: -1 (blocked), 0 (normal user), 5 (seller), 20 (admin).
+    - An item will only be listed for a period of one week, and can be relisted
+      for 3 weeks.
+    - If a Trade in uncompleted within 5 minutes of a Trade Request, it is cancelled
+      to prevent any disruptions to service.
+    - The Bot supports the manaplus "right click and buy" feature; if an item is listed
+      twice for the same price, the first shown in the list will be bought (i.e. the one added earlier).
+"""
+
+import logging
+import socket
+import sys
+import time
+import string
+
+from being import *
+from config import *
+from net.packet import *
+from net.protocol import *
+from net.packet_out import *
+from player import *
+import tradey
+import utils
+
+shop_broadcaster = utils.Broadcast()
+trader_state = utils.TraderState()
+ItemDB = utils.ItemDB()
+player_node = Player('')
+beingManager = BeingManager()
+user_tree = tradey.UserTree()
+sale_tree = tradey.ItemTree()
+ItemLog = utils.ItemLog()
+
+def process_whisper(nick, msg, mapserv):
+    msg = filter(lambda x: x in string.printable, msg)
+    user = user_tree.get_user(nick)
+    broken_string = msg.split()
+    
+    if user != -10:
+        if int(user.get("accesslevel")) == -1: # A user who has been blocked for abuse.
+	    mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact <administrator>."))
+	    return
+
+    if msg == "!list":
+	# Sends the list of items for sale.
+	if len(sale_tree.root) != 0:
+	    mapserv.sendall(whisper(nick, "The following items are on sale:"))
+	else:
+	    mapserv.sendall(whisper(nick, "No items for sale."))
+	
+	for elem in sale_tree.root:
+	    if time.time() - float(elem.get('add_time')) < 604800: # Check if an items time is up.
+		msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + \
+		elem.get("itemId") + "|" + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
+		mapserv.sendall(whisper(nick, msg))
+
+    elif broken_string[0] == '!selllist':
+	# Support for 4144's shop (Sell list)
+        data = '\302\202B1'
+
+	for elem in sale_tree.root:
+	    data += utils.encode_str(int(elem.get("itemId")), 2)
+            data += utils.encode_str(int(elem.get("price")), 4)
+	    data += utils.encode_str(int(elem.get("amount")), 3)
+	mapserv.sendall(whisper(nick, data))
+
+    elif broken_string[0] == '!buyitem':
+	# 4144 buy command
+	if len(broken_string) == 4:
+	    if broken_string[1].isdigit() and broken_string[2].isdigit() and broken_string[3].isdigit():
+	        # Traditional 4144 shop.
+	        item_id = int(broken_string[1])
+	        price = int(broken_string[2])
+	        amount = int(broken_string[3])
+	        for elem in sale_tree.root:
+                    if int(elem.get('amount')) >= amount and int(elem.get('price')) == price and int(elem.get('itemId')) == item_id:
+		        process_whisper(nick, '!buy ' + str(amount) + " " + elem.get('uid'), mapserv)
+		        return
+		mapserv.sendall(whisper(nick, "Item not found. Please check and try again."))
+	else:
+	    mapserv.sendall(whisper(nick, "Syntax incorrect"))
+	    
+    elif msg == "!info":
+        # Send information related to a player.
+	if user == -10:
+	    mapserv.sendall(whisper(nick, "Your current access level is 0."))
+	elif int(user.get('accesslevel')) > 0:
+	    mapserv.sendall(whisper(nick, "Your current access level is " + user.get('accesslevel') + "."))
+	    mapserv.sendall(whisper(nick, "Your have the following items for sale:"))
+	    for elem in sale_tree.root:
+		if elem.get('name') == nick:
+	            if time.time() - float(elem.get('add_time')) > 604800:
+	                msg = "[expired] ["
+	            else:
+		        msg = "[selling] ["
+
+		    msg += elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" + \
+			ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
+	    	    mapserv.sendall(whisper(nick, msg))
+
+	    money = int(user.get('money'))
+	    mapserv.sendall(whisper(nick, "You have " + str(money) + "gp to collect."))
+	    stall_msg = "You have " + str(int(user.get('stalls')) - int(user.get('used_stalls'))) + " free slots."
+	    mapserv.sendall(whisper(nick, stall_msg))
+
+    elif broken_string[0] == "!help":	
+	# Sends help information
+	if len(broken_string) == 1:
+            mapserv.sendall(whisper(nick, "Welcome to ManaMarket!"))
+	    mapserv.sendall(whisper(nick, "The basic commands for the bot are: !list, !find <id> or <Item Name>, !buy <amount> <uid>, !add <amount> <price> <Item Name>, !money, !relist <uid>, !info, !getback <uid> "))
+	    mapserv.sendall(whisper(nick, "For a detailed description of each command, type !help <command> e.g. !help !buy"))
+	    mapserv.sendall(whisper(nick, "For example:- to purchase an item shown in the list as:"))
+	    mapserv.sendall(whisper(nick, "[selling] [6] 5 [@@640|Iron Ore@@] for 1000gp each"))
+	    mapserv.sendall(whisper(nick, "you would type /whisper ManaMarket !buy 1 6" ))
+	    mapserv.sendall(whisper(nick, "This will purchase one of item 6 (Iron Ore)."))
+
+	elif len(broken_string) == 2:
+	    if broken_string[1] == '!buy':
+		mapserv.sendall(whisper(nick, "!buy <amount> <uid> - Request the purchase of an item or items."))
+	    elif broken_string[1] == '!list':
+		mapserv.sendall(whisper(nick, "!list - Displays a list of all items for sale."))
+	    elif broken_string[1] == '!find':
+		mapserv.sendall(whisper(nick, "!find <id> or <Item Name> - Simple search to locate an item."))
+	    elif broken_string[1] == '!buy':
+		mapserv.sendall(whisper(nick, "!buy <amount> <uid> - Request the purchase of an item or items."))
+	    elif broken_string[1] == '!add':
+		mapserv.sendall(whisper(nick, "!add <amount> <price> <Item Name> - Add an item to the sell list (requires that you have an account)."))
+	    elif broken_string[1] == '!money':
+		mapserv.sendall(whisper(nick, "!money - Allows you to collect money for any sales made on your behalf."))
+	    elif broken_string[1] == '!relist':
+	        mapserv.sendall(whisper(nick, "!relist <uid> - Allows you to relist an item which has expired."))
+	    elif broken_string[1] == '!info':
+		mapserv.sendall(whisper(nick, "!info - Displays basic information about your account."))
+	    elif broken_string[1] == '!getback':
+		mapserv.sendall(whisper(nick, "!getback <uid> - Allows you to retrieve an item that has expired or you no longer wish to sell."))
+
+    elif msg == "!money":
+	# Trades any money earned through item sales.
+	if user == -10:
+	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+	    return
+	
+	amount = int(user.get('money'))
+	if amount == 0:
+	    mapserv.sendall(whisper(nick, "You have no money to collect."))
+	else:
+	    trader_state.money = nick
+	    if not trader_state.Trading.testandset():
+		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
+	        return
+            player_id = beingManager.findId(nick)
+
+	    if player_id != -10:
+	        mapserv.sendall(trade_request(player_id))
+                trader_state.timer = time.time()
+	    else:
+		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
+		trader_state.reset()
+
+    elif broken_string[0] == "!find":
+	# Returns a list of items, with the corresponding Item Id - !find <id> or <item name>.
+	if len(broken_string) < 2:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    return
+
+	items_found = False
+	item = " ".join(broken_string[1:]) # could be an id or an item name
+	
+	if item.isdigit(): # an id
+	    for elem in sale_tree.root:
+	        if ((time.time() - float(elem.get('add_time'))) < 604800) \
+		and int(elem.get("itemId")) == int(item): # Check if an items time is up.
+		    msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
+                    + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
+		    mapserv.sendall(whisper(nick, msg))
+		    items_found = True		
+	else: # an item name
+	    for elem in sale_tree.root:
+	        if ((time.time() - float(elem.get('add_time'))) < 604800) \
+		and item.lower() in ItemDB.getItem(int(elem.get("itemId"))).name.lower(): # Check if an items time is up.
+		    msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
+                    + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
+		    mapserv.sendall(whisper(nick, msg))
+		    items_found = True
+
+	if not items_found:
+	    mapserv.sendall(whisper(nick, "Item not found."))
+
+    elif msg == '!listusers':
+	# Admin command - shows a list of all user.
+        if user == -10:
+	    return
+
+        if int(user.get("accesslevel")) != 20:
+	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+	    return
+	
+	data = ''
+
+	for user in user_tree.root:
+            name = user.get('name')
+            accesslevel = user.get('accesslevel')
+	    slots = user.get('stalls')
+	    used_slots = user.get('used_stalls')
+	    money = user.get('money')
+	    data += name+" ("+accesslevel+") "+used_slots+"/"+slots+" "+money+'gp, '
+	    # Format ManaMarket (20) 2/5 100000gp,
+
+	    if len(data) > 400:
+	        mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))	
+		data = ''
+
+        mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
+
+    elif broken_string[0] == '!setslots':
+	# Change the number of slots a user has - !setslots <slots> <name>
+        if user == -10:
+	    return
+
+        if int(user.get("accesslevel")) != 20:
+	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+	    return
+
+	if len(broken_string) < 3:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    return
+
+	if broken_string[1].isdigit():
+	    slot = int(broken_string[1])
+	    name = " ".join(broken_string[2:])
+
+	    user_info = user_tree.get_user(name)
+
+	    if user_info == -10:
+		mapserv.sendall(whisper(nick, "User not found, check and try again."))
+	        return
+
+	    user_tree.get_user(name).set('stalls', str(slot))
+	    mapserv.sendall(whisper(nick, "Slots changed: "+name+" "+str(slot)))
+	    user_tree.save()
+	else:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+
+    elif broken_string[0] == '!setaccess':
+	# Change someones access level - !setaccess <access level> <name>
+        if user == -10:
+	    return
+
+        if int(user.get("accesslevel")) != 20:
+	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+	    return
+
+	if len(broken_string) < 3:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    return
+	
+	if (broken_string[1][0] == '-' and broken_string[1][1:].isdigit()) or broken_string[1].isdigit():
+	    accesslevel = int(broken_string[1])
+	    name = " ".join(broken_string[2:])
+
+	    user_info = user_tree.get_user(name)
+
+	    if user_info == -10:
+		mapserv.sendall(whisper(nick, "User not found, check and try again."))
+		return
+	
+	    if int(user_info.get('accesslevel')) < int(user.get("accesslevel")) and accesslevel <= int(user.get("accesslevel")):
+		user_tree.get_user(name).set('accesslevel', str(accesslevel))
+		mapserv.sendall(whisper(nick, "Access level changed:"+name+ " ("+str(accesslevel)+")."))
+		user_tree.save()
+	    else:
+	        mapserv.sendall(whisper(nick, "You don't have the correct permissions."))	
+		return	
+        else:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    
+
+    elif broken_string[0] == "!adduser":
+	# A command to give a user access to the bot - !adduser <access level> <stall> <player name>.
+        if user == -10:
+	    return
+
+        if int(user.get("accesslevel")) != 20:
+	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+	    return
+
+	if len(broken_string) < 3:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    return
+
+        if broken_string[1].isdigit() and broken_string[2].isdigit():
+            al = int(broken_string[1])
+            stalls = int(broken_string[2])
+            player_name = " ".join(broken_string[3:])
+	    user_tree.add_user(player_name, stalls, al)
+	    mapserv.sendall(whisper(nick, "User Added with " + str(stalls) + " slots."))
+        else:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+
+    elif broken_string[0] == "!add":
+	# Allows a player with the correct permissions to add an item for sale - !add <amount> <price> <item name>
+	if user == -10:
+	    mapserv.sendall(whisper(nick, "You are unable to add items."))
+	    return
+
+	if len(broken_string) < 3:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    return
+
+	if int(user.get("accesslevel")) < 5:
+	    mapserv.sendall(whisper(nick, "You are unable to add items."))
+	    return
+	
+	if int(user.get("used_stalls")) >= int(user.get("stalls")):
+	    mapserv.sendall(whisper(nick, "You have no free slots.  You may remove an item or wait for something to be sold."))
+	    return
+
+	if broken_string[1].isdigit() and broken_string[2].isdigit():
+	    amount = int(broken_string[1])
+	    price = int(broken_string[2])
+	    item_name = " ".join(broken_string[3:])	
+	    item_id = ItemDB.findId(item_name)
+	    if item_id == -10:
+	        mapserv.sendall(whisper(nick, "Item not found, check spelling."))
+		return
+
+	    item = Item()
+	    item.player = nick
+	    item.get = 1 # 1 = get, 0 = give
+	    item.id = item_id
+	    item.amount = amount
+	    item.price = price
+	    trader_state.item = item
+		
+	    if not trader_state.Trading.testandset():
+		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
+	        return
+            player_id = beingManager.findId(nick)
+	    if player_id != -10:
+	        mapserv.sendall(trade_request(player_id))
+                trader_state.timer = time.time()
+	    else:
+		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
+		trader_state.reset()
+	else:
+	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
+
+    elif broken_string[0] == "!buy":
+	# Buy a given quantity of an item - !buy <amount> <uid>
+	if len(broken_string) != 3:
+	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    return
+
+	if broken_string[1].isdigit() and broken_string[2].isdigit():
+	    amount = int(broken_string[1])
+	    uid = int(broken_string[2])
+	    item_info = sale_tree.get_uid(uid)
+	
+	    if item_info == -10:
+		mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
+		return
+
+	    if amount > int(item_info.get("amount")):
+		mapserv.sendall(whisper(nick, "I do not have that many."))
+		return
+
+	    item = Item()
+	    item.get = 0 # 1 = get, 0 = give
+	    item.player = nick
+	    item.id = int(item_info.get("itemId"))
+	    item.uid = uid
+	    item.amount = amount
+	    item.price = int(item_info.get("price"))
+	    trader_state.item = item
+
+	    if not trader_state.Trading.testandset():
+		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
+	        return
+            player_id = beingManager.findId(nick)
+	    if player_id != -10:
+	        mapserv.sendall(trade_request(player_id))
+                trader_state.timer = time.time()
+		mapserv.sendall(whisper(nick, "That will be " + str(item.price * item.amount) + "gp."))
+	    else:
+		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
+		trader_state.reset()	    
+	else:
+	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
+
+    elif broken_string[0] == "!removeuser":
+	# Remove a user, for whatever reason - !removeuser <player name>
+        if user == -10:
+	    return
+
+	if len(broken_string) < 2:
+	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    return
+
+        if int(user.get("accesslevel")) != 20:
+	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+	    return
+
+        player_name = " ".join(broken_string[1:])
+	check = user_tree.remove_user(player_name)
+	if check == 1:
+	    mapserv.sendall(whisper(nick, "User Removed."))
+	elif check == -10:
+	    mapserv.sendall(whisper(nick, "User removal failed. Please check spelling."))
+    
+    elif broken_string[0] == "!relist":
+        # Relist an item which has expired - !relist <uid>.
+	if user == -10 or len(broken_string) != 2:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+            return
+
+	if int(user.get("accesslevel")) < 5:
+	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+	    return
+
+	if broken_string[1].isdigit():
+	    uid = int(broken_string[1])
+	    item_info = sale_tree.get_uid(uid)
+
+	    if item_info == -10:
+		mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
+		return
+
+	    if item_info.get('name') != nick:
+		mapserv.sendall(whisper(nick, "That doesn't belong to you!"))
+		return
+	
+            time_relisted = int(item_info.get('relisted'))
+	
+	    if int(item_info.get('relisted')) < 3:
+		sale_tree.get_uid(uid).set('add_time', str(time.time()))
+		sale_tree.get_uid(uid).set('relisted', str(time_relisted + 1))
+		sale_tree.save()
+		mapserv.sendall(whisper(nick, "The item has been successfully relisted."))
+	    else:
+                mapserv.sendall(whisper(nick, "This item can no longer be relisted. Please collect it using !getback "+str(uid)+"."))
+		return
+        else:
+	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
+		
+    elif broken_string[0] == "!getback":
+	# Trade the player back uid, remove from sale_items if trade successful - !getback <uid>.
+	if user == -10 or len(broken_string) != 2:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+	    return
+
+	if int(user.get("accesslevel")) < 5:
+	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+	    return
+
+	if broken_string[1].isdigit():
+	    uid = int(broken_string[1])
+	    item_info = sale_tree.get_uid(uid)
+
+	    if item_info == -10:
+		mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
+		return
+
+	    if item_info.get('name') != nick:
+		mapserv.sendall(whisper(nick, "That doesn't belong to you!"))
+		return
+
+	    item = Item()
+	    item.get = 0
+	    item.player = nick
+	    item.id = int(item_info.get("itemId"))
+	    item.uid = uid
+	    item.amount = int(item_info.get("amount"))
+	    item.price = 0
+	    trader_state.item = item
+
+	    if not trader_state.Trading.testandset():
+		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
+	        return
+            player_id = beingManager.findId(nick)
+	    if player_id != -10:
+	        mapserv.sendall(trade_request(player_id))
+                trader_state.timer = time.time()
+	    else:
+		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
+		trader_state.reset()
+
+def main():
+    logging.basicConfig(filename='logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+    logging.info("Bot Started.")
+
+    account = sys.argv[1] 
+    password = sys.argv[2]
+    character = sys.argv[3]
+
+    login = socket.socket()
+    login.connect((server, port))
+    print("Login connected")
+
+    login_packet = PacketOut(0x0064)
+    login_packet.write_int32(0)
+    login_packet.write_string(account, 24)
+    login_packet.write_string(password, 24)	
+    login_packet.write_int8(0x03);
+    login.sendall(str(login_packet))
+
+    pb = PacketBuffer()
+    id1 = accid = id2 = 0
+    charip = ""
+    charport = 0
+    # Login server packet loop.
+    while True:
+	#time.sleep(0.1)
+        data = login.recv(1500)
+        if not data:
+            break
+        pb.feed(data)
+        for packet in pb:
+            if packet.is_type(SMSG_LOGIN_DATA): # login succeeded	
+		packet.skip(2)
+		id1 = packet.read_int32()	
+		accid = packet.read_int32()
+		id2 = packet.read_int32()
+		packet.skip(30)
+		player_node.sex = packet.read_int8()                
+                charip = utils.parse_ip(packet.read_int32())
+                charport = packet.read_int16()
+                login.close()
+                break
+        if charip:
+            break
+
+    assert charport
+
+    char = socket.socket()
+    char.connect((charip, charport))
+    print("Char connected")
+    char_serv_packet = PacketOut(CMSG_CHAR_SERVER_CONNECT)
+    char_serv_packet.write_int32(accid)
+    char_serv_packet.write_int32(id1)
+    char_serv_packet.write_int32(id2)
+    char_serv_packet.write_int16(0)
+    char_serv_packet.write_int8(player_node.sex)
+    char.sendall(str(char_serv_packet))
+    char.recv(4)
+
+    pb = PacketBuffer()
+    mapip = ""
+    mapport = 0
+    # Character Server Packet loop.
+    while True:
+        data = char.recv(1500)
+        if not data:
+            break
+        pb.feed(data)
+        for packet in pb:
+            if packet.is_type(SMSG_CHAR_LOGIN):
+		packet.skip(2)
+		slots = packet.read_int16()
+		packet.skip(18)
+		count = (len(packet.data)-22) / 106
+		for i in range(count):
+		    player_node.id = packet.read_int32()
+		    player_node.EXP = packet.read_int32()
+		    player_node.MONEY = packet.read_int32()
+		    packet.skip(30)
+		    player_node.HP = packet.read_int16()
+		    player_node.MAX_HP = packet.read_int16()
+		    player_node.MP = packet.read_int16()
+		    player_node.MAX_MP = packet.read_int16()
+		    packet.skip(8)
+		    player_node.LEVEL = packet.read_int16()
+		    packet.skip(14)
+		    player_node.name = packet.read_string(24)
+		    packet.skip(6)
+                    slot = packet.read_int8()
+		    packet.skip(1)
+		    print "Character information recieved:"
+		    print "Name: %s, Id: %s, EXP: %s, MONEY: %s, HP: %s/%s, MP: %s/%s, LEVEL: %s"\
+                        % (player_node.name, player_node.id, player_node.EXP, player_node.MONEY, player_node.HP, player_node.MAX_HP, player_node.MP, player_node.MAX_MP, player_node.LEVEL)
+		    if slot == int(character):
+			break
+
+		char_select_packet = PacketOut(CMSG_CHAR_SELECT)
+		char_select_packet.write_int8(int(character))
+		char.sendall(str(char_select_packet))                
+
+            elif packet.is_type(SMSG_CHAR_MAP_INFO):
+		player_node.id = packet.read_int32()
+		player_node.map = packet.read_string(16)
+                mapip = utils.parse_ip(packet.read_int32())
+                mapport = packet.read_int16()
+                char.close()
+                break
+        if mapip:
+            break
+
+    assert mapport
+
+    beingManager.container[player_node.id] = Being(player_node.id, 42)
+    mapserv = socket.socket()
+    mapserv.connect((mapip, mapport))
+    print("Map connected")
+    mapserv_login_packet = PacketOut(CMSG_MAP_SERVER_CONNECT)
+    mapserv_login_packet.write_int32(accid)
+    mapserv_login_packet.write_int32(player_node.id)
+    mapserv_login_packet.write_int32(id1)
+    mapserv_login_packet.write_int32(id2)
+    mapserv_login_packet.write_int8(player_node.sex)
+    mapserv.sendall(str(mapserv_login_packet))
+    mapserv.recv(4)
+
+    pb = PacketBuffer()
+    shop_broadcaster.mapserv = mapserv
+    # Map server packet loop
+
+    while True:
+        data = mapserv.recv(2048)
+        if not data:
+            break
+        pb.feed(data)
+
+        # For unfinished trades - one way to distrupt service would be leaving a trade active.
+        if trader_state.Trading.test():
+            if time.time() - trader_state.timer > 5*60:
+                logging.info("Trade Cancelled - Timeout.")
+                trader_state.timer = time.time()
+                mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+	
+        for packet in pb:
+            if packet.is_type(SMSG_MAP_LOGIN_SUCCESS): # connected
+		logging.info("Map login success.")
+		packet.skip(4)
+		coord_data = packet.read_coord_dir()
+		player_node.x = coord_data[0]
+		player_node.y = coord_data[1]
+		player_node.direction = coord_data[2]
+		print "Starting Postion: %s %s %s" % (player_node.map, player_node.x, player_node.y)
+                mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED))) # map loaded
+		# A Thread to send a shop broadcast: also keeps the network active to prevent timeouts.
+		shop_broadcaster.start()
+
+            elif packet.is_type(SMSG_WHISPER):
+		msg_len = packet.read_int16() - 26
+                nick = packet.read_string(24)
+                message = packet.read_raw_string(msg_len)
+		logging.info("Whisper: " + nick + ": " + message)
+		if nick != "guild":
+		    process_whisper(nick, utils.remove_colors(message), mapserv)
+
+            elif packet.is_type(SMSG_PLAYER_CHAT): # server speech
+		msg_len = packet.read_int16() - 2
+		being_id = packet.read_int32()
+                message = packet.read_string(msg_len)
+                if "automaticly banned for spam" in message:
+                    time.sleep(3)
+
+            elif packet.is_type(SMSG_BEING_CHAT): # char speech
+		msg_len = packet.read_int16() - 2
+		being_id = packet.read_int32()
+                message = packet.read_string(msg_len)
+
+            elif packet.is_type(SMSG_WALK_RESPONSE):
+		packet.read_int32()
+		coord_data = packet.read_coord_pair()
+		player_node.x = coord_data[2]
+		player_node.y = coord_data[3]		
+
+            elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
+		stat_type = packet.read_int16()
+		value = packet.read_int32()
+		if stat_type == 0x0005:
+		    player_node.HP = value
+		elif stat_type == 0x0006:
+		    player_node.MaxHP = value
+		elif stat_type == 0x0007:
+		    player_node.MP = value
+		elif stat_type == 0x0008:
+		    player_node.MaxMP = value
+		elif stat_type == 0x000b:
+		    player_node.LEVEL = value
+		    print "Level changed: %s" % value 
+		elif stat_type == 0x0018:
+		    print "Weight changed from %s/%s to %s/%s" % (player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
+		    logging.info("Weight changed from %s/%s to %s/%s", player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
+		    player_node.WEIGHT = value
+		elif stat_type == 0x0019:
+		    print "Max Weight: %s" % value
+		    player_node.MaxWEIGHT = value
+
+            elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_2):
+		stat_type = packet.read_int16()
+		value = packet.read_int32()
+		if stat_type == 0x0001:
+		    player_node.EXP = value
+		elif stat_type == 0x0014:
+		    logging.info("Money Changed from %s, to %s", player_node.MONEY, value)
+		    print "Money Changed from %s, to %s" % (player_node.MONEY, value)
+		    player_node.MONEY = value
+		elif stat_type == 0x0016:
+		    player_node.EXP_NEEDED = value
+		    print "Exp Needed: %s" % player_node.EXP_NEEDED
+			
+            elif packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_BEING_VISIBLE)\
+            or packet.is_type(SMSG_PLAYER_MOVE) or packet.is_type(SMSG_PLAYER_UPDATE_1)\
+            or packet.is_type(SMSG_PLAYER_UPDATE_2):
+		being_id = packet.read_int32()
+                packet.skip(8)
+		job = packet.read_int16()		
+		if being_id not in beingManager.container:	
+	            if job == 0 and id >= 110000000 and (packet.is_type(SMSG_BEING_MOVE)\
+                                                         or packet.is_type(SMSG_BEING_VISIBLE)):
+		        continue
+		    # Add the being to the BeingManager, and request name. 	
+		    beingManager.container[being_id] = Being(being_id, job)
+		    requestName = PacketOut(0x0094)
+		    requestName.write_int32(being_id)
+		    mapserv.sendall(str(requestName))
+
+		packet.skip(8)
+
+		if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
+		    packet.read_int32()
+
+		packet.skip(22)
+          
+		if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
+		    coord_data = packet.read_coord_pair()
+		    beingManager.container[being_id].dst_x = coord_data[2]
+		    beingManager.container[being_id].dst_y = coord_data[3]
+		else:
+		    coord_data = packet.read_coord_dir()  
+		    beingManager.container[being_id].x = coord_data[0]
+                    beingManager.container[being_id].y = coord_data[1]
+		    beingManager.container[being_id].direction = coord_data[2]
+
+	    elif packet.is_type(SMSG_BEING_NAME_RESPONSE):
+	        being_id = packet.read_int32()
+		if being_id in beingManager.container:
+		    beingManager.container[being_id].name = packet.read_string(24)
+
+	    elif packet.is_type(SMSG_BEING_REMOVE):
+	        being_id = packet.read_int32()
+		if being_id in beingManager.container:
+		    del beingManager.container[being_id]
+	
+	    elif packet.is_type(SMSG_PLAYER_WARP):
+		player_node.map = packet.read_string(16)
+	        player_node.x = packet.read_int16()
+		player_node.y = packet.read_int16()
+		logging.info("Player warped.")
+                mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED)))
+	
+	    elif packet.is_type(SMSG_BEING_ACTION):
+		src_being = packet.read_int32()
+		dst_being = packet.read_int32()
+		packet.skip(12)
+		param1 = packet.read_int16()
+		packet.skip(2)
+		action_type = packet.read_int8()
+
+		if src_being in beingManager.container:
+		    if action_type == 0: # Damage
+		        beingManager.container[src_being].action = "attack"
+		        beingManager.container[src_being].target = dst_being
+		        
+		    elif action_type == 0x02: # Sit
+		        beingManager.container[src_being].action = "sit"
+				    
+		    elif action_type == 0x03: # Stand up
+		        beingManager.container[src_being].action = "stand"	
+
+            elif packet.is_type(SMSG_PLAYER_INVENTORY_ADD):
+		item = Item()
+                item.index = packet.read_int16() - inventory_offset
+		item.amount = packet.read_int16()
+		item.itemId = packet.read_int16()
+		item.identified = packet.read_int8()
+		packet.read_int8()
+		item.refine = packet.read_int8()
+		packet.skip(8)
+		item.equipType = packet.read_int16()
+		item.itemType = packet.read_int8()
+		err = packet.read_int8()
+
+                if err == 0:
+		    if item.index in player_node.inventory:
+		        player_node.inventory[item.index].amount += item.amount
+		    else:
+		        player_node.inventory[item.index] = item
+
+		    print "Picked up: %s, Amount: %s" % (ItemDB.getItem(item.itemId).name, item.amount)
+	            logging.info("Picked up: %s, Amount: %s", ItemDB.getItem(item.itemId).name, str(item.amount))
+
+            elif packet.is_type(SMSG_PLAYER_INVENTORY_REMOVE):
+		index = packet.read_int16() - inventory_offset
+                amount = packet.read_int16()
+
+		print "Remove item: %s, Amount: %s" % (ItemDB.getItem(player_node.inventory[index].itemId).name, amount)
+		logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
+		if index in player_node.inventory:
+		    player_node.inventory[index].amount -= amount
+		    if player_node.inventory[index].amount == 0:
+		        del player_node.inventory[index]
+
+            elif packet.is_type(SMSG_PLAYER_INVENTORY):
+		player_node.inventory.clear() # Clear the inventory - incase of new index.
+		packet.skip(2)
+		number = (len(packet.data)-2) / 18
+                for loop in range(number):
+		    item = Item()
+		    item.index = packet.read_int16() - inventory_offset
+		    item.itemId = packet.read_int16()
+		    item.itemType = packet.read_int8()
+		    item.identified = packet.read_int8()
+		    item.amount = packet.read_int16()
+		    item.arrow = packet.read_int16()
+		    packet.skip(8) # Cards
+		    player_node.inventory[item.index] = item
+
+            elif packet.is_type(SMSG_PLAYER_EQUIPMENT):
+		packet.read_int16()
+		number = (len(packet.data)) / 20
+                for loop in range(number):
+		    item = Item()
+		    item.index = packet.read_int16() - inventory_offset
+		    item.itemId = packet.read_int16()
+		    item.itemType = packet.read_int8()
+		    item.identified = packet.read_int8()
+		    packet.skip(2)
+		    item.equipType = packet.read_int16()
+		    packet.skip(1)
+		    item.refine = packet.read_int8()
+		    packet.skip(8)
+		    item.amount = 1
+		    player_node.inventory[item.index] = item
+
+		for item in player_node.inventory:
+		    print "Name: %s, Id: %s, Index: %s, Amount: %s." % \
+                    (ItemDB.getItem(player_node.inventory[item].itemId).name, \
+                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
+		 
+	    elif packet.is_type(SMSG_TRADE_REQUEST):
+		print "SMSG_TRADE_REQUEST"
+		name = packet.read_string(24)
+		logging.info("Trade request: " + name)
+
+	    elif packet.is_type(SMSG_TRADE_RESPONSE):
+		print "SMSG_TRADE_RESPONSE"
+		response = packet.read_int8()
+		time.sleep(0.2)
+		if response == 0:
+		    logging.info("Trade response: Too far away.")
+		    if trader_state.item:
+		        mapserv.sendall(whisper(trader_state.item.player, "You are too far away."))
+		    elif trader_state.money:
+			mapserv.sendall(whisper(trader_state.money, "You are too far away."))
+		    trader_state.reset()
+
+		elif response == 3:
+		    logging.info("Trade response: Trade accepted.")
+		    if trader_state.item:
+		        if trader_state.item.get == 1: # add
+		            mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
+		        elif trader_state.item.get == 0: # buy
+			    if player_node.find_inventory_index(trader_state.item.id) != -10:
+			        mapserv.sendall(trade_add_item(player_node.find_inventory_index(trader_state.item.id), trader_state.item.amount))
+			        mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
+			        if trader_state.item.price == 0: # getback
+			            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+			            trader_state.complete = 1
+				
+		    elif trader_state.money: # money
+			amount = int(user_tree.get_user(trader_state.money).get('money'))
+			mapserv.sendall(trade_add_item(0-inventory_offset, amount))
+			mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
+			mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+			trader_state.complete = 1
+
+		elif response == 4:
+		    logging.info("Trade response: Trade cancelled")
+		    trader_state.reset()
+
+	    elif packet.is_type(SMSG_TRADE_ITEM_ADD):
+		print "SMSG_TRADE_ITEM_ADD"
+		amount = packet.read_int32()
+		item_id = packet.read_int16()
+		if trader_state.item and trader_state.money == 0:
+		    if  trader_state.item.get == 1: # add
+		        if amount == trader_state.item.amount and item_id == trader_state.item.id:
+			    trader_state.complete = 1
+		            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+		        else:
+			    mapserv.sendall(whisper(trader_state.item.player, "Thats not the right item."))
+			    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
+		    elif trader_state.item.get == 0: # buy
+		        if amount == trader_state.item.price * trader_state.item.amount and item_id == 0:
+		            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+			    trader_state.complete = 1
+			elif item_id == 0 and amount != trader_state.item.price * trader_state.item.amount:
+			    trader_state.complete = 0
+		        else:
+			    if item_id == 0:
+			        mapserv.sendall(whisper(trader_state.item.player, "Please verify you have the correct amount of money and try again."))
+			    else:
+				mapserv.sendall(whisper(trader_state.item.player, "Don't give me your itenz."))
+			    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
+		elif trader_state.money: # money
+		    mapserv.sendall(whisper(trader_state.money, "Don't give me your itenz."))
+		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))		
+		
+		logging.info("Trade item add: ItemId:%s Amount:%s", item_id, amount)
+		# Note item_id = 0 is money
+
+	    elif packet.is_type(SMSG_TRADE_ITEM_ADD_RESPONSE):
+		print "SMSG_TRADE_ITEM_ADD_RESPONSE"
+		index = packet.read_int16() - inventory_offset
+		amount = packet.read_int16()
+		response = packet.read_int8()
+
+		if response == 0:
+		    logging.info("Trade item add response: Successfully added item.")
+		    if trader_state.item:
+			if trader_state.item.get == 0 and index != 0-inventory_offset: # Make sure the correct item is given!
+                            if player_node.inventory[index].itemId != trader_state.item.id and \
+                                amount != trader_state.item.amount:
+                                mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
+		    # If Trade item add successful - Remove the item from the inventory state.
+		    if index != 0-inventory_offset: # If it's not money
+		        print "Remove item: %s, Amount: %s" % (ItemDB.getItem(player_node.inventory[index].itemId).name, amount)
+		        logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
+		        if index in player_node.inventory:
+		            player_node.inventory[index].amount -= amount
+		            if player_node.inventory[index].amount == 0:
+		                del player_node.inventory[index]
+
+		elif response == 1:
+		    logging.info("Trade item add response: Failed - player overweight.")
+		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))	
+		    if trader_state.item:
+		        mapserv.sendall(whisper(trader_state.item.player, "You are carrying too much weight. Unload and try again."))
+		elif response == 2:
+		    if trader_state.item:
+		        mapserv.sendall(whisper(trader_state.item.player, "You have no free slots."))
+		    logging.info("Trade item add response: Failed - No free slots.")
+		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
+	    elif packet.is_type(SMSG_TRADE_OK):
+		print "SMSG_TRADE_OK"
+		is_ok = packet.read_int8() # 0 is ok from self, and 1 is ok from other
+		if is_ok == 0:
+		    logging.info("Trade OK: Self.")
+		else:
+		    if trader_state.complete:
+		        mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))  
+		    else:
+			mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+			mapserv.sendall(whisper(trader_state.item.player, "Trade Cancelled: Please check the traded items or money."))
+
+		    logging.info("Trade Ok: Partner.")
+
+	    elif packet.is_type(SMSG_TRADE_CANCEL):
+		trader_state.reset()
+		logging.info("Trade Cancel.")
+		print "SMSG_TRADE_CANCEL"
+
+	    elif packet.is_type(SMSG_TRADE_COMPLETE):
+		# The sale_tree is only ammended after a complete trade packet.
+		if trader_state.item and trader_state.money == 0:
+		    if trader_state.item.get == 1: # !add
+		        sale_tree.add_item(trader_state.item.player, trader_state.item.id, trader_state.item.amount, trader_state.item.price)
+		        user_tree.get_user(trader_state.item.player).set('used_stalls', \
+                                                                         str(int(user_tree.get_user(trader_state.item.player).get('used_stalls')) + 1))
+
+		    elif trader_state.item.get == 0: # !buy \ !getback
+		        seller = sale_tree.get_uid(trader_state.item.uid).get('name')
+		        item = sale_tree.get_uid(trader_state.item.uid)
+		        current_amount = int(item.get("amount"))
+		        sale_tree.get_uid(trader_state.item.uid).set("amount", str(current_amount - trader_state.item.amount))
+		        if int(item.get("amount")) == 0:
+			    user_tree.get_user(sale_tree.get_uid(trader_state.item.uid).get('name')).set('used_stalls', \
+                                                                                                         str(int(user_tree.get_user(sale_tree.get_uid(trader_state.item.uid).get('name')).get('used_stalls'))-1))
+			    sale_tree.remove_item_uid(trader_state.item.uid)
+
+		        current_money = int(user_tree.get_user(seller).get("money"))
+		        user_tree.get_user(seller).set("money", str(current_money + trader_state.item.price * trader_state.item.amount))			
+
+			if trader_state.item.price * trader_state.item.amount != 0:
+			    ItemLog.add_item(int(item.get('itemId')), trader_state.item.amount, trader_state.item.price * trader_state.item.amount)
+
+		elif trader_state.money and trader_state.item == 0: # !money
+		    user_tree.get_user(trader_state.money).set('money', str(0))
+
+		sale_tree.save()
+		user_tree.save()
+		trader_state.reset()
+		logging.info("Trade Complete.")
+		print "SMSG_TRADE_COMPLETE"
+            else:
+		pass
+	        #print "Unhandled Packet: %s" % hex(packet.get_type())
+    
+    # On Disconnect/Exit
+    shop_broadcaster.stop()
+    mapserv.close()           
+
+if __name__ == '__main__':
+    main()
diff --git a/net/__init__.py b/net/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/net/packet.py b/net/packet.py
new file mode 100644
index 0000000..4442455
--- /dev/null
+++ b/net/packet.py
@@ -0,0 +1,179 @@
+import struct
+
+packet_lengths = [
+   10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+#0x0040
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  50,  3, -1, 55, 17,  3, 37, 46, -1, 23, -1,  3,108,  3,  2,
+    3, 28, 19, 11,  3, -1,  9,  5, 54, 53, 58, 60, 41,  2,  6,  6,
+#0x0080
+    7,  3,  2,  2,  2,  5, 16, 12, 10,  7, 29, 23, -1, -1, -1,  0,
+    7, 22, 28,  2,  6, 30, -1, -1,  3, -1, -1,  5,  9, 17, 17,  6,
+   23,  6,  6, -1, -1, -1, -1,  8,  7,  6,  7,  4,  7,  0, -1,  6,
+    8,  8,  3,  3, -1,  6,  6, -1,  7,  6,  2,  5,  6, 44,  5,  3,
+#0x00C0
+    7,  2,  6,  8,  6,  7, -1, -1, -1, -1,  3,  3,  6,  6,  2, 27,
+    3,  4,  4,  2, -1, -1,  3, -1,  6, 14,  3, -1, 28, 29, -1, -1,
+   30, 30, 26,  2,  6, 26,  3,  3,  8, 19,  5,  2,  3,  2,  2,  2,
+    3,  2,  6,  8, 21,  8,  8,  2,  2, 26,  3, -1,  6, 27, 30, 10,
+#0x0100
+    2,  6,  6, 30, 79, 31, 10, 10, -1, -1,  4,  6,  6,  2, 11, -1,
+   10, 39,  4, 10, 31, 35, 10, 18,  2, 13, 15, 20, 68,  2,  3, 16,
+    6, 14, -1, -1, 21,  8,  8,  8,  8,  8,  2,  2,  3,  4,  2, -1,
+    6, 86,  6, -1, -1,  7, -1,  6,  3, 16,  4,  4,  4,  6, 24, 26,
+#0x0140
+   22, 14,  6, 10, 23, 19,  6, 39,  8,  9,  6, 27, -1,  2,  6,  6,
+  110,  6, -1, -1, -1, -1, -1,  6, -1, 54, 66, 54, 90, 42,  6, 42,
+   -1, -1, -1, -1, -1, 30, -1,  3, 14,  3, 30, 10, 43, 14,186,182,
+   14, 30, 10,  3, -1,  6,106, -1,  4,  5,  4, -1,  6,  7, -1, -1,
+#0x0180
+    6,  3,106, 10, 10, 34,  0,  6,  8,  4,  4,  4, 29, -1, 10,  6,
+   90, 86, 24,  6, 30,102,  9,  4,  8,  4, 14, 10,  4,  6,  2,  6,
+    3,  3, 35,  5, 11, 26, -1,  4,  4,  6, 10, 12,  6, -1,  4,  4,
+   11,  7, -1, 67, 12, 18,114,  6,  3,  6, 26, 26, 26, 26,  2,  3,
+#0x01C0
+    2, 14, 10, -1, 22, 22,  4,  2, 13, 97,  0,  9,  9, 29,  6, 28,
+    8, 14, 10, 35,  6,  8,  4, 11, 54, 53, 60,  2, -1, 47, 33,  6,
+   30,  8, 34, 14,  2,  6, 26,  2, 28, 81,  6, 10, 26,  2, -1, -1,
+   -1, -1, 20, 10, 32,  9, 34, 14,  2,  6, 48, 56, -1,  4,  5, 10,
+#0x2000
+   26,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0, 19,  10,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+]
+
+class PacketOut:
+    def __init__(self, out):
+	self.buff = ""
+        self.write_int16(out)
+
+    def __str__(self):
+	return self.buff
+
+    def write_string(self, string_val, length):
+	self.buff += string_val.ljust(length, '\0')
+
+    def write_int8(self, value):
+	self.buff += struct.pack("<B", value)
+
+    def write_int16(self, value):
+	self.buff += struct.pack("<H", value)
+
+    def write_int32(self, value):
+	self.buff += struct.pack("<L", value)
+    
+    def write_coords(self, x, y, direction):
+        tmp = x
+	tmp <<= 6
+	d_0 = 0
+	d_1 = 1
+	d_2 = 2
+	d_0 = (tmp >> 8) % 256
+	d_1 = (tmp) % 256
+	tmp = y
+	tmp <<= 4
+	d_1 |= (tmp >> 8) % 256
+	d_2 = tmp % 256
+	# d_2 |= direction
+	self.buff += chr(d_0) + chr(d_1) + chr(d_2)
+
+class PacketIn:
+    def __init__(self, set_data, pkt_type):
+        self.data = set_data
+	self.pkttype = pkt_type
+	self.pos = 0
+
+    def is_type(self, pkt_type):
+	return self.pkttype == pkt_type
+    
+    def get_type(self):
+	return self.pkttype
+
+    def read_string(self, length):
+	msg = self.data[self.pos:self.pos + length]
+	self.pos = self.pos + length
+	return msg[:msg.find('\0')]
+
+    def read_raw_string(self, length):
+	msg = self.data[self.pos:self.pos + length]
+	self.pos = self.pos + length
+	return msg
+
+    def read_int8(self):
+	int_value = struct.unpack("<B", self.data[self.pos:self.pos + 1])[0]
+	self.pos = self.pos + 1
+	return int_value
+
+    def make_word(self, low, high):
+	return ((low | high) << 8)
+
+    def read_coord_pair(self):
+	cdata = self.data[self.pos:self.pos + 5]
+	dst_x = (self.make_word(struct.unpack("<B", cdata[3])[0], struct.unpack("<B", cdata[2])[0] & 0x000f) >> 2) % 255
+	dst_y = self.make_word(struct.unpack("<B", cdata[4])[0], struct.unpack("<B", cdata[3])[0] & 0x0003) % 255
+
+	src_x = (self.make_word(struct.unpack("<B", cdata[1])[0], struct.unpack("<B", cdata[0])[0]) >> 6) % 255
+	src_y = (self.make_word(struct.unpack("<B", cdata[2])[0], struct.unpack("<B", cdata[1])[0] & 0x003f) >> 4) % 255
+	self.pos = self.pos + 5
+	return src_x, src_y, dst_x, dst_y
+
+    def read_coord_dir(self):
+	cdata = self.data[self.pos:self.pos + 3]
+	x = (self.make_word(struct.unpack("<B", cdata[1])[0] & 0x00c0, struct.unpack("<B", cdata[0])[0] & 0x00ff) >> 6) % 255
+        y = (self.make_word(struct.unpack("<B", cdata[2])[0] & 0x00f0, struct.unpack("<B", cdata[1])[0] & 0x003f) >> 4) % 255
+        dir = struct.unpack("<B", cdata[2])[0] & 0x000f
+	self.pos = self.pos + 3
+        return x, y, dir
+
+    def read_int16(self):
+	int_value = struct.unpack("<H", self.data[self.pos:self.pos + 2])[0]
+	self.pos = self.pos + 2
+	return int_value
+
+    def read_int32(self):
+	int_value = struct.unpack("<L", self.data[self.pos:self.pos + 4])[0]
+	self.pos = self.pos + 4
+	return int_value
+
+    def skip(self, count):
+	self.pos = self.pos + count
+
+class PacketBuffer:
+    def __init__(self):
+        self.buff = ""
+
+    def feed(self, data):
+        self.buff += data
+
+    def drop(self, count):
+        self.buff = self.buff[count:]
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        if len(self.buff) < 2:
+            raise StopIteration
+
+	pktlen = 0
+        pkttype = struct.unpack("<H", self.buff[:2])[0]
+        assert pkttype < len(packet_lengths)
+        assert packet_lengths[pkttype] != 0
+
+        if packet_lengths[pkttype] < 0:
+            if len(self.buff) < 4:
+                raise StopIteration
+            pktlen = struct.unpack("<H", self.buff[2:4])[0]
+            assert pktlen >= 4
+        else:
+            pktlen = packet_lengths[pkttype]
+
+        if len(self.buff) < pktlen:
+            raise StopIteration
+
+	packet = PacketIn(self.buff[2:pktlen], pkttype)
+        self.buff = self.buff[pktlen:]
+        return packet
diff --git a/net/packet_out.py b/net/packet_out.py
new file mode 100644
index 0000000..6110f4d
--- /dev/null
+++ b/net/packet_out.py
@@ -0,0 +1,50 @@
+from packet import *
+from protocol import *
+
+def emote(emoteId):
+    emote_packet = PacketOut(CMSG_PLAYER_EMOTE)
+    emote_packet.write_int8(emoteId)
+    return str(emote_packet)
+
+def whisper(nick, message):
+    whisp_packet = PacketOut(CMSG_CHAT_WHISPER)
+    whisp_packet.write_int16(len(message) + 28)
+    whisp_packet.write_string(nick, 24)
+    whisp_packet.write_string(message, len(message))
+    return str(whisp_packet)
+
+def chat(text):
+    chat_packet = PacketOut(CMSG_CHAT_MESSAGE)
+    mes = player_node.name + " : " + text
+    chat_packet.write_int16(len(mes) + 4 + 1)
+    chat_packet.write_string(mes, len(mes) + 1)
+    return str(chat_packet)
+
+def sit(val):
+    sit_packet = PacketOut(CMSG_PLAYER_CHANGE_ACT)
+    sit_packet.write_int32(0)
+    if val == True:
+    	sit_packet.write_int8(2)
+    else:
+        sit_packet.write_int8(3)
+    return str(sit_packet)
+
+def trade_request(being_id):
+    trade_req_packet = PacketOut(CMSG_TRADE_REQUEST)
+    trade_req_packet.write_int32(being_id)
+    return str(trade_req_packet)
+
+def trade_respond(accept):
+    trade_respond_packet = PacketOut(CMSG_TRADE_RESPONSE)
+    if accept == True:
+        trade_respond_packet.write_int8(3)
+    elif accept == False:
+	trade_respond_packet.write_int8(4)
+    return str(trade_respond_packet)
+
+def trade_add_item(item_index, amount):
+    trade_add_packet = PacketOut(CMSG_TRADE_ITEM_ADD_REQUEST)   
+    trade_add_packet.write_int16(item_index + inventory_offset)
+    trade_add_packet.write_int32(amount)
+    return str(trade_add_packet)
+
diff --git a/net/protocol.py b/net/protocol.py
new file mode 100644
index 0000000..4a4b74f
--- /dev/null
+++ b/net/protocol.py
@@ -0,0 +1,64 @@
+SMSG_LOGIN_DATA = 0x0069
+SMSG_CHAR_LOGIN = 0x006b
+SMSG_CHAR_MAP_INFO = 0x0071
+SMSG_MAP_LOGIN_SUCCESS = 0x0073
+SMSG_MAP_LOGIN_SUCCESS = 0x0073
+CMSG_CHAR_SERVER_CONNECT = 0x0065
+CMSG_CHAR_SELECT = 0x0066
+CMSG_MAP_SERVER_CONNECT = 0x0072
+CMSG_CHAT_WHISPER = 0x0096
+CMSG_CHAT_MESSAGE = 0x008c
+CMSG_MAP_LOADED = 0x007d
+
+SMSG_WHISPER = 0x0097
+SMSG_BEING_CHAT = 0x008d
+
+SMSG_PLAYER_CHAT = 0x008e
+CMSG_PLAYER_CHANGE_ACT = 0x0089
+
+SMSG_PLAYER_INVENTORY = 0x01ee
+SMSG_PLAYER_INVENTORY_ADD = 0x00a0
+SMSG_PLAYER_INVENTORY_REMOVE = 0x00af
+SMSG_PLAYER_EQUIPMENT = 0x00a4
+SMSG_PLAYER_STAT_UPDATE_1 = 0x00b0
+SMSG_PLAYER_STAT_UPDATE_2 = 0x00b1
+
+SMSG_BEING_VISIBLE = 0x0078
+SMSG_BEING_MOVE = 0x007b
+SMSG_BEING_REMOVE = 0x0080
+SMSG_PLAYER_MOVE = 0x01da
+SMSG_PLAYER_WARP = 0x0091
+SMSG_PLAYER_UPDATE_1 = 0x01d8
+SMSG_PLAYER_UPDATE_2 = 0x01d9
+SMSG_BEING_NAME_RESPONSE = 0x0095 # Has to be requested
+SMSG_BEING_ACTION = 0x008a
+
+CMSG_ITEM_PICKUP = 0x009f
+CMSG_PLAYER_ATTACK = 0x0089
+CMSG_PLAYER_STOP_ATTACK = 0x0118
+CMSG_PLAYER_CHANGE_DIR = 0x009b
+CMSG_PLAYER_CHANGE_DEST = 0x0085
+CMSG_PLAYER_EMOTE = 0x00bf
+SMSG_WALK_RESPONSE = 0x0087
+
+CMSG_TRADE_REQUEST = 0x00e4
+CMSG_TRADE_RESPONSE = 0x00e6
+CMSG_TRADE_ITEM_ADD_REQUEST = 0x00e8
+CMSG_TRADE_CANCEL_REQUEST = 0x00ed
+CMSG_TRADE_ADD_COMPLETE = 0x00eb
+CMSG_TRADE_OK = 0x00ef
+
+SMSG_TRADE_REQUEST = 0x00e5 #/**< Receiving a request to trade */
+SMSG_TRADE_RESPONSE = 0x00e7
+SMSG_TRADE_ITEM_ADD = 0x00e9
+SMSG_TRADE_ITEM_ADD_RESPONSE = 0x01b1 #/**< Not standard eAthena! */
+SMSG_TRADE_OK = 0x00ec
+SMSG_TRADE_CANCEL = 0x00ee
+SMSG_TRADE_COMPLETE = 0x00f0
+
+SMSG_ITEM_VISIBLE = 0x009d
+SMSG_ITEM_DROPPED = 0x009e
+SMSG_ITEM_REMOVE = 0x00a1
+
+inventory_offset = 2
+storage_offset = 1
diff --git a/player.py b/player.py
new file mode 100644
index 0000000..a63218d
--- /dev/null
+++ b/player.py
@@ -0,0 +1,31 @@
+class Item:
+    pass
+
+class Player:
+    def __init__(self, name):
+        self.inventory = {}
+	self.storage = []
+	self.name = name
+	self.id = 0
+	self.sex = 0
+	self.map = ""
+	self.x = 0
+	self.y = 0
+
+	self.EXP_NEEDED = 0
+	self.EXP = 0
+	self.MONEY = 0
+	self.LEVEL = 0
+	self.HP = 0
+	self.MaxHP = 0
+	self.MP = 0
+	self.MaxMP = 0
+	self.WEIGHT = 0
+	self.MaxWEIGHT = 0
+
+    def find_inventory_index(self, item_id):
+	for item in self.inventory:
+	    if item > 1:
+	        if self.inventory[item].itemId == item_id:
+	            return item
+	return -10 # Not found - bug somewhere!
diff --git a/tradey.py b/tradey.py
new file mode 100644
index 0000000..bb83960
--- /dev/null
+++ b/tradey.py
@@ -0,0 +1,88 @@
+import time
+from xml.etree.ElementTree import *
+
+class UserTree:
+    def __init__(self):
+        self.tree = ElementTree(file="data/user.xml")
+        self.root = self.tree.getroot()
+
+    def add_user(self, name, stalls, al):
+	if self.get_user(name) == -10:
+	    user = SubElement(self.root, "user")
+	    user.set("name", name)
+	    user.set("stalls", str(stalls))
+            user.set("used_stalls", str(0))
+	    user.set("money", str(0))
+	    user.set("id", str(0))
+	    user.set("accesslevel", str(al))
+	    self.save()
+
+    def get_user(self, name):
+	for elem in self.root:
+	    if elem.get("name") == name:
+		return elem
+	return -10
+
+    def remove_user(self, name):
+    	for elem in self.root:
+	    if elem.get("name") == name:
+		self.root.remove(elem)
+		self.save()
+		return 1		
+	return -10	
+
+    def save(self):
+	# Be sure to call save() after any changes to the tree.
+	self.tree = ElementTree(self.root)
+	self.tree.write("data/user.xml")
+
+class ItemTree:
+    def __init__(self):
+        self.tree = ElementTree(file="data/sale.xml")
+        self.root = self.tree.getroot()
+	self.u_id = set()
+
+	for elem in self.root:
+	    self.u_id.add(int(elem.get("uid")))
+
+    def getId(self):
+	id_itter = 1
+	while id_itter in self.u_id:
+		id_itter += 1
+	self.u_id.add(id_itter)
+	return id_itter
+
+    def remove_id(self, uid):
+	# Free up used id's.
+	self.u_id.remove(uid)
+
+    def add_item(self, name, item_id, amount, price):
+	user = SubElement(self.root, "item")
+	user.set("name", name)
+	user.set("itemId", str(item_id))
+	user.set("price", str(price))
+	user.set("add_time", str(time.time()))
+	user.set("relisted", str(0))
+	user.set("amount", str(amount))
+	user.set("uid", str(self.getId()))
+	self.save()
+
+    def get_uid(self, uid):
+	for elem in self.root:
+	    if elem.get("uid") == str(uid):
+		return elem
+	return -10
+
+    def remove_item_uid(self, uid):
+    	for elem in self.root:
+	    if elem.get("uid") == str(uid):
+		self.root.remove(elem)
+		self.remove_id(uid)
+		self.save()
+		return 1		
+	return -10	
+
+    def save(self):
+	# Be sure to call save() after any changes to the tree.
+	self.tree = ElementTree(self.root)
+	self.tree.write("data/sale.xml")
diff --git a/utils.py b/utils.py
new file mode 100644
index 0000000..3215457
--- /dev/null
+++ b/utils.py
@@ -0,0 +1,115 @@
+from xml.etree.ElementTree import ElementTree
+from player import Item
+
+import struct
+import time
+import mutex
+import threading
+from net.packet_out import *
+
+# Process a recieved ip address.
+def parse_ip(a):
+    return "%s.%s.%s.%s" % ((a % 256),((a >> 8) % 256),((a >> 16) % 256),((a >> 24) % 256))
+
+# Remove colors from a message
+def remove_colors(msg):
+    if len(msg) > 2:
+        for f in range(len(msg)-2):
+	    while (len(msg) > f + 2) and (msg[f] == "#")\
+		and (msg[f+1] == "#"):
+		msg = msg[0:f]+msg[f+3:]
+    return msg
+
+# Encode string - used with 4144 shop compatibility.
+def encode_str(value, size):
+    output = ''
+    base = 94
+    start = 33
+    while value:
+	output += struct.pack('<B', value % base + start)
+	value /= base
+
+    while len(output) < size:
+	output += struct.pack('<B', start)
+    
+    return output
+
+class ItemDB:
+    """
+    A simple class to look up information from the items.xml file.
+    """
+    def __init__(self):
+	print "Loading ItemDB"
+        self.item_names = {}
+        self.itemdb_file = ElementTree()
+        self.itemdb_file.parse("data/items.xml")
+
+        for item in self.itemdb_file.getroot():
+            if item.get('id') > 500:
+	        item_struct = Item()
+		item_struct.name = item.get('name')
+		if item.get('weight'):
+		    item_struct.weight = item.get('weight')
+		item_struct.description = item.get('description')
+                self.item_names[int(item.get('id'))] = item_struct
+
+    def getItem(self, item_id):
+	return self.item_names[item_id]
+
+    def findId(self, name):
+	for item_id in self.item_names:
+	    if self.item_names[item_id].name == name:
+		return item_id
+	return -10 #Not found
+
+class ItemLog:
+    """ Writes all sales to a log file, for later processing."""
+    def __init__(self):
+        self.log_file = 'logs/sale.log'
+
+    def add_item(self, item_id, amount, price):
+        file_node = open(self.log_file, 'a')
+	file_node.write(str(item_id)+" "+str(amount)+" "+str(price)+" "+str(time.time())+"\n")
+	file_node.close()
+
+class TraderState:
+    """ Stores information regarding a trade request"""
+    def __init__(self):
+	self.Trading = mutex.mutex()
+	self.item = 0
+	self.money = 0
+	self.complete = 0
+        self.timer = 0
+
+    def reset(self):
+	self.Trading.unlock()
+	self.item = 0
+	self.complete = 0
+	self.money = 0
+        self.timer = 0
+
+class Broadcast:
+    """Send a message to the server every 5 minutes to avoid a timeout."""
+
+    def __init__(self):
+	self.mapserv = 0
+	self.Active = False
+	self.Timer = 0
+	self.shop_broadcast = threading.Thread(target=self.send_broadcast, args=())
+
+    def send_broadcast(self):
+	while self.Active:
+	    if (time.time() - self.Timer) > 5 * 60:
+	        self.mapserv.sendall(emote(193))
+		self.Timer = time.time()
+		print "shop_broadcast"
+	    else:
+		time.sleep(0.1)
+
+    def start(self):
+	self.Active = True
+	self.shop_broadcast.start()
+
+    def stop(self):
+	self.Active = False
+	self.shop_broadcast.join()
-- 
cgit v1.2.3-70-g09d2


From 245ca375ed6212ef142b4ae55d68243fd8822410 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 21 Aug 2011 19:10:21 +0100
Subject: Fix: A mistake in the read_coord_pair packet code.

---
 net/packet.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/packet.py b/net/packet.py
index 4442455..85a09f9 100644
--- a/net/packet.py
+++ b/net/packet.py
@@ -77,7 +77,7 @@ class PacketOut:
 	tmp <<= 4
 	d_1 |= (tmp >> 8) % 256
 	d_2 = tmp % 256
-	# d_2 |= direction
+	d_2 |= direction
 	self.buff += chr(d_0) + chr(d_1) + chr(d_2)
 
 class PacketIn:
@@ -108,15 +108,15 @@ class PacketIn:
 	return int_value
 
     def make_word(self, low, high):
-	return ((low | high) << 8)
+	return (low | (high << 8))
 
     def read_coord_pair(self):
 	cdata = self.data[self.pos:self.pos + 5]
-	dst_x = (self.make_word(struct.unpack("<B", cdata[3])[0], struct.unpack("<B", cdata[2])[0] & 0x000f) >> 2) % 255
-	dst_y = self.make_word(struct.unpack("<B", cdata[4])[0], struct.unpack("<B", cdata[3])[0] & 0x0003) % 255
+	dst_x = (self.make_word(struct.unpack("<B", cdata[3])[0], struct.unpack("<B", cdata[2])[0] & 0x000f) >> 2)
+	dst_y = self.make_word(struct.unpack("<B", cdata[4])[0], struct.unpack("<B", cdata[3])[0] & 0x0003)
 
-	src_x = (self.make_word(struct.unpack("<B", cdata[1])[0], struct.unpack("<B", cdata[0])[0]) >> 6) % 255
-	src_y = (self.make_word(struct.unpack("<B", cdata[2])[0], struct.unpack("<B", cdata[1])[0] & 0x003f) >> 4) % 255
+	src_x = (self.make_word(struct.unpack("<B", cdata[1])[0], struct.unpack("<B", cdata[0])[0]) >> 6)
+	src_y = (self.make_word(struct.unpack("<B", cdata[2])[0], struct.unpack("<B", cdata[1])[0] & 0x003f) >> 4)
 	self.pos = self.pos + 5
 	return src_x, src_y, dst_x, dst_y
 
-- 
cgit v1.2.3-70-g09d2


From 6f1e1b6cebaf013eb3a5c3794286c534519e5758 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 20:29:37 +0200
Subject: removing data dir and ignoring it

---
 .gitignore     |    2 +
 data/items.xml | 5540 --------------------------------------------------------
 data/sale.xml  |    1 -
 data/user.xml  |    1 -
 4 files changed, 2 insertions(+), 5542 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 data/items.xml
 delete mode 100644 data/sale.xml
 delete mode 100644 data/user.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9e67bd4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+data
+
diff --git a/data/items.xml b/data/items.xml
deleted file mode 100644
index 1656c73..0000000
--- a/data/items.xml
+++ /dev/null
@@ -1,5540 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="items.xsl"?>
-<!--
-    Here are listed all the known items in The Mana World. This file defines
-    their name, icon, description, weight, etc. It also defines which sprite
-    to use in the case of visible equipment and which sounds to play on certain
-    events related to the item.
-
-    The 'weapon_type' attribute is kept for 0.0 client compatibility. Not to be
-    confused with 'weapon-type'.
--->
-<items>
-    <version revision="$Revision$" />
-
-    <item id="-1" type="hairsprite" name="Flat ponytail">
-        <sprite>hairstyles/hairstyle01.xml</sprite>
-    </item>
-    <item id="-2" type="hairsprite" name="Bowl cut">
-        <sprite>hairstyles/hairstyle02.xml</sprite>
-    </item>
-    <item id="-3" type="hairsprite" name="Combed back">
-        <sprite>hairstyles/hairstyle03.xml</sprite>
-    </item>
-    <item id="-4" type="hairsprite" name="Emo">
-        <sprite>hairstyles/hairstyle04.xml</sprite>
-    </item>
-    <item id="-5" type="hairsprite" name="Mohawk">
-        <sprite>hairstyles/hairstyle05.xml</sprite>
-    </item>
-    <item id="-6" type="hairsprite" name="Pompadour">
-        <sprite>hairstyles/hairstyle06.xml</sprite>
-    </item>
-    <item id="-7" type="hairsprite" name="Center parting/Short and slick">
-        <sprite>hairstyles/hairstyle07.xml</sprite>
-    </item>
-    <item id="-8" type="hairsprite" name="Long and slick">
-        <sprite>hairstyles/hairstyle08.xml</sprite>
-    </item>
-    <item id="-9" type="hairsprite" name="Short and curly">
-        <sprite>hairstyles/hairstyle09.xml</sprite>
-    </item>
-    <item id="-10" type="hairsprite" name="Pigtails">
-        <sprite>hairstyles/hairstyle10.xml</sprite>
-    </item>
-    <item id="-11" type="hairsprite" name="Long and curly">
-        <sprite>hairstyles/hairstyle11.xml</sprite>
-    </item>
-    <item id="-12" type="hairsprite" name="Parted">
-        <sprite>hairstyles/hairstyle12.xml</sprite>
-    </item>
-    <item id="-13" type="hairsprite" name="Perky ponytail">
-        <sprite>hairstyles/hairstyle13.xml</sprite>
-    </item>
-    <item id="-14" type="hairsprite" name="Wave">
-        <sprite>hairstyles/hairstyle14.xml</sprite>
-    </item>
-    <item id="-15" type="hairsprite" name="Mane">
-        <sprite>hairstyles/hairstyle15.xml</sprite>
-    </item>
-    <item id="-16" type="hairsprite" name="Bun">
-        <sprite>hairstyles/hairstyle16.xml</sprite>
-    </item>
-    <item id="-17" type="hairsprite" name="Shoulder length flick">
-	<sprite>hairstyles/hairstyle17.xml</sprite>
-    </item>
-    <item id="-18" type="hairsprite" name="Fizzy">
-	<sprite>hairstyles/hairstyle18.xml</sprite>
-    </item>
-
-    <!-- Treating the base sprite as equipment too will be useful when we
-         implement other playable races -->
-    <item id="-100" type="racesprite" name="Human">
-        <sprite gender="male">player_male_base.xml</sprite>
-        <sprite gender="female">player_female_base.xml</sprite>
-    </item>
-
-    <!-- TEMPORARY LOW WEAPON ID:S (< 256) -->
-    <!-- Used for tmwAthena magic system -->
-    <item id="16">
-<!--        <sprite>weapon-dagger.xml</sprite>-->
-    </item>
-    <item id="30"
-        weapon_type="1">
-        <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
-        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
-    </item>
-    <item id="31"
-        weapon_type="10">
-        <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
-    </item>
-    <item id="32"
-        weapon_type="11">
-        <sprite>weapon-scythe.xml</sprite>
-    </item>
-    <item id="33"
-        weapon_type="1">
-        <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
-        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
-    </item>
-    <item id="34"
-        weapon_type="1"> <!-- magic fist -->
-        <sprite>weapon-fist.xml</sprite>
-    </item>
-    <item id="35"
-        weapon_type="11">
-        <sprite>weapon-staff.xml</sprite>
-    </item>
-
-
-    <!-- Items -->
-    <item id="501"
-        image="use/potions/a.png|G:#22ff22"
-        name="Cactus Drink"
-        description="A fresh drink."
-        type="usable"
-        hp="15"
-        weight="4"/>
-    <item id="502"
-        image="use/potions/a.png|G:#ff2222"
-        name="Cactus Potion"
-        description="A fresh potion."
-        type="usable"
-        hp="25"
-        weight="7"/>
-    <item id="503"
-        image="generic/casinocoins.png"
-        name="Casino Coins"
-        description="Just some casino coins."
-        type="generic"
-        weight="1"/>
-    <item id="504"
-        image="use/food/decorcandy.png"
-        name="Decor Candy"
-        description="A leftover decor candy from last Christmas."
-        type="generic"
-        weight="1"/>
-    <item id="505"
-        image="generic/maggotslime.png"
-        name="Maggot Slime"
-        description="Slimy maggot slime."
-        type="generic"
-        weight="1"/>
-    <item id="506"
-        image="use/food/candycane.png"
-        name="Candy Cane"
-        description="Tasty candy cane."
-        type="usable"
-        hp="5"
-        weight="1"/>
-    <item id="507"
-        image="generic/scorpionstinger.png|W:#a08040,e0e0e0"
-        name="Scorpion Stinger"
-        description="A poisoned scorpion stinger."
-        type="generic"
-        weight="1"/>
-    <item id="508"
-        image="use/food/xmascake.png"
-        name="Xmas Cake"
-        description="A sweet xmas cake."
-        type="usable"
-        hp="10"
-        weight="1"/>
-    <item id="509"
-        image="use/food/chocolatebar.png|W:#441e00,b36e36"
-        name="Chocolate Bar"
-        description="A chocolate bar made of finest chocolate."
-        type="usable"
-        hp="20"
-        weight="1"/>
-    <item id="510"
-        image="use/food/candy.png"
-        name="Candy"
-        description="A sugar-free candy."
-        type="usable"
-        hp="5"
-        weight="1"/>
-    <item id="511"
-        image="equipment/head/santahat.png"
-        name="Santa Hat"
-        description="Ask Santa about this hat."
-        effect="M. Attack -2"
-        type="equip-head"
-        weight="20"
-        defense="2">
-        <sprite>equipment/head/santahat.xml</sprite>
-    </item>
-    <item id="512"
-        image="use/food/gingerbreadman.png"
-        name="Ginger Bread Man"
-        description="A tasty ginger bread man."
-        type="usable"
-        hp="25"
-        weight="1"/>
-    <item id="513"
-        image="use/food/cake.png"
-        name="Cake"
-        description="A slice of cake."
-        type="usable"
-        hp="15"
-        weight="1"/>
-    <item id="514"
-        image="use/food/xmascandycane.png"
-        name="Xmas Candy Cane"
-        description="A special xmas candy cane."
-        type="usable"
-        hp="10"
-        weight="1"/>
-    <item id="515"
-        image="generic/purplepresentbox.png"
-        name="Purple Present Box"
-        description="Something mysterious inside."
-        type="generic"
-        weight="10"/>
-    <item id="516"
-        image="generic/bluepresentbox.png"
-        name="Blue Present Box"
-        description="Something mysterious inside."
-        type="generic"
-        weight="10"/>
-    <item id="517"
-        image="generic/scorpionstinger.png|W:#e04040,f0f0f0"
-        name="Red Scorpion Stinger"
-        description="A highly poisoned red scorpion stinger."
-        type="generic"
-        weight="1"/>
-    <item id="518"
-        image="generic/bugleg.png"
-        name="Bug Leg"
-        description="A bug's leg. Mostly used for alchemy."
-        type="generic"
-        weight="1"/>
-    <item id="519"
-        image="use/food/cherrycake.png"
-        name="Cherry Cake"
-        description="A nice cherry cake."
-        type="usable"
-        hp="35"
-        weight="1"/>
-    <item id="520"
-        image="use/food/easteregg.png"
-        name="Easter Egg"
-        description="A surprise."
-        type="usable"
-        hp="100"
-        weight="1"/>
-    <item id="521"
-        image="equipment/weapon/dagger-dagger.png"
-        name="Dagger"
-        description="A simple dagger."
-        effect="Damage +15"
-        type="equip-1hand"
-        weapon-type="knife"
-        attack-action="attack"
-        weight="200">
-        <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
-        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
-    </item>
-    <item id="522"
-        image="equipment/weapon/dagger-sharpknife.png"
-        name="Sharp Knife"
-        description="A really sharp knife. Don't hurt yourself!"
-        effect="Damage +10"
-        type="equip-1hand"
-        weapon-type="knife"
-        attack-action="attack"
-        weight="150">
-        <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">weapons/knives/sharpknife-miss1.ogg</sound>
-    </item>
-    <item id="523"
-        image="equipment/chest/leathershirt.png"
-        name="Leather Shirt"
-        description="A shirt made of hardened leather."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="4"
-        weight="20">
-        <sprite gender="male">equipment/chest/leather-male.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
-        <sprite gender="female">equipment/chest/leather-female.xml|#412300,603100,8d4900;#ffff00</sprite>
-    </item>
-    <item id="524"
-        image="equipment/head/fancyhat.png"
-        name="Fancy Hat"
-        description="A fancy hat."
-        type="equip-head"
-        defense="5"
-        weight="20">
-        <sprite>equipment/head/fancyhat.xml</sprite>
-    </item>
-    <item id="525"
-        image="equipment/head/minershat.png"
-        name="Miners Hat"
-        description="A hat used by miners."
-        effect="M. Attack -8"
-        type="equip-head"
-        defense="4"
-        weight="40">
-        <sprite>equipment/head/minershat.xml</sprite>
-    </item>
-    <item id="526"
-        image="generic/coinbag.png"
-        name="Coin Bag"
-        description="A bag used to hold coins."
-        type="generic"
-        weight="5"/>
-    <item id="527"
-        image="use/food/milk.png"
-        name="Milk"
-        description="A fresh litre of ice cold milk. Note: Cool people drink milk!"
-        type="usable"
-        hp="150"
-        weight="5"/>
-    <item id="528"
-        image="equipment/feet/boots.png|W:#4f2d29,c89078"
-        name="Boots"
-        description="Some robust boots, ideal for travelling."
-        effect="M. Attack -2"
-        type="equip-feet"
-        defense="2"
-        weight="80">
-        <sprite gender="male">equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#623a34,f0c2b4</sprite>
-    </item>
-    <item id="529"
-        image="equipment/ammo/ironarrow.png"
-        name="Iron Arrow"
-        description="A hard arrow made of iron."
-        effect="Damage +40"
-        type="equip-ammo"
-        weight="1"/>
-    <item id="530"
-        image="equipment/weapon/bow-shortbow.png"
-        name="Short Bow"
-        description="A bow for short distances."
-        effect="Damage +50 / Range 5"
-        type="equip-2hand"
-        weapon-type="bow"
-        attack-action="attack_bow"
-        weight="600"
-        missile-particle="graphics/particles/arrow.particle.xml">
-        <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
-    </item>
-    <item id="531"
-        image="equipment/hands/minergloves.png"
-        name="Miner Gloves"
-        description="Gloves used by miners, very useful."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="2"
-        weight="30">
-        <sprite gender="male">equipment/hands/generic-male.xml|#202020,505050</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#202020,505050</sprite>
-    </item>
-    <item id="532"
-        image="equipment/hands/leathergloves.png"
-        name="Leather Gloves"
-        description="Gloves made of hardened leather."
-        effect="M. Attack -20"
-        type="equip-arms"
-        defense="4"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#4e2e18,c8752f</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#4e2e18,c8752f</sprite>
-    </item>
-    <item id="533"
-        image="use/food/roastedmaggot.png"
-        name="Roasted Maggot"
-        description="A maggot roasted on fire."
-        type="usable"
-        hp="150"
-        weight="5"/>
-    <item id="534"
-        image="use/food/orangecupcake.png"
-        name="Orange Cupcake"
-        description="A very soft orange cupcake."
-        type="usable"
-        hp="100"
-        weight="5"/>
-    <item id="535"
-        image="use/food/apple.png|R:#ff3600;Y:#ffc000;G:#66cc33"
-        name="Red Apple"
-        description="A healthy red apple."
-        type="usable"
-        hp="50"
-        weight="5"/>
-    <item id="536"
-        image="equipment/weapon/dagger-shortsword.png"
-        name="Short Sword"
-        description="A small but sharp sword."
-        effect="Damage +100"
-        type="equip-1hand"
-        weapon-type="sword"
-        attack-action="attack"
-        weight="2000">
-        <sprite>weapon-dagger.xml</sprite>
-    </item>
-    <item id="537"
-        image="generic/treasurekey.png"
-        name="Treasure Key"
-        description="A rusty key."
-        type="generic"
-        weight="2"/>
-    <item id="538"
-        image="generic/greenpresentbox.png"
-        name="Green Present Box"
-        description="Something mysterious inside."
-        type="generic"
-        weight="10"/>
-    <item id="539"
-        image="use/food/beer.png"
-        name="Beer"
-        description="A fresh beer."
-        type="usable"
-        hp="200"
-        mp="5"
-        weight="10"/>
-    <item id="540"
-        image="generic/bottle-empty.png"
-        name="Empty Bottle"
-        description="An empty bottle."
-        type="generic"
-        weight="1"/>
-    <item id="541"
-        image="use/food/water.png"
-        name="Bottle of Water"
-        description="A bottle of water."
-        type="usable"
-        hp="250"
-        weight="10"/>
-    <item id="542"
-        image="generic/bottle-sand.png"
-        name="Bottle of Sand"
-        description="A bottle with sand in it."
-        type="generic"
-        weight="10"/>
-    <item id="543"
-        image="equipment/head/standardheadband.png|W:#291e16,99784c,d8bd86,ffffff"
-        name="Standard Headband"
-        description="A standard headband."
-        effect="M. Attack -3"
-        type="equip-head"
-        defense="3"
-        weight="10">
-        <sprite>equipment/head/standardheadband.xml|#563f25,99784c,d8bd86,ffffff</sprite>
-    </item>
-    <item id="544"
-        image="equipment/head/silkheadband.png"
-        name="Silk Headband"
-        description="A cool headband made of silk."
-        effect="M. Attack -10"
-        type="equip-head"
-        defense="10"
-        weight="10">
-        <sprite>equipment/head/silkheadband.xml</sprite>
-    </item>
-    <item id="545"
-        image="equipment/weapon/bow-forestbow.png"
-        name="Forest Bow"
-        description="A bow usually used for hunting."
-        effect="Damage +70 / Range 5"
-        type="equip-2hand"
-        weapon-type="bow"
-        attack-action="attack_bow"
-        weight="1200"
-        missile-particle="graphics/particles/arrow.particle.xml">
-        <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
-    </item>
-    <item id="546"
-        image="equipment/chest/desertshirt.png"
-        name="Desert Shirt"
-        description="A shirt suitable for desert trips."
-        effect="M. Attack -18"
-        type="equip-torso"
-        defense="6"
-        weight="20">
-        <sprite gender="male">equipment/chest/leather-male.xml|#443c21,85794a,beb590,ffffff;#824035,d6a19a</sprite>
-        <sprite gender="female">equipment/chest/leather-female.xml|#251e06,443c21,71653b,a0945e;#b6574a</sprite>
-    </item>
-    <item id="547"
-        image="equipment/weapon/polearm-bardiche.png"
-        name="Bardiche"
-        description="A bardiche."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="polearm"
-        weight="10"/>
-    <item id="548"
-        image="equipment/weapon/polearm-halberd.png"
-        name="Halberd"
-        description="A weapon usually carried by guards."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="polearm"
-        weight="1400"/>
-    <item id="549"
-        image="equipment/weapon/axe-axe.png"
-        name="Axe"
-        description="An axe."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="axe"
-        weight="1200"/>
-    <item id="550"
-        image="equipment/weapon/axe-blacksmithsaxe.png"
-        name="Blacksmith's Axe"
-        description="An axe usually used by blacksmiths."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="axe"
-        weight="1200">
-	<sprite>weapon-axe-blacksmith.xml</sprite>
-	</item>
-    <item id="551"
-        image="generic/hint.png|W:#74e1f4"
-        name="Aqua Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="552"
-        image="generic/hint.png|W:#c38ec7"
-        name="Magenta Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="553"
-        image="generic/hint.png|W:#f0f17d"
-        name="Yellow Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="554"
-        image="generic/hint.png|W:#70e370"
-        name="Green Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="555"
-        image="generic/hint.png|W:#6ef4ea"
-        name="Teal Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="556"
-        image="generic/hint.png|W:#c97fe8"
-        name="Purple Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="557"
-        image="generic/hint.png|W:#e97180"
-        name="Red Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="558"
-        image="generic/hint.png|W:#7a86f4"
-        name="Blue Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="559"
-        image="generic/hint.png|W:#f0bd67"
-        name="Orange Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="560"
-        image="generic/hint.png"
-        name="Grey Hint"
-        description="A hint."
-        type="generic"
-        weight="10"/>
-    <item id="561"
-        image="equipment/weapon/sword-sabre.png"
-        name="Sabre"
-        description="A sword with a very sharp, curved, single-edged blade."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="300"/>
-    <item id="562"
-        image="use/food/chickenleg.png"
-        name="Chicken Leg"
-        description="A well cooked chicken leg."
-        type="usable"
-        hp="500"
-        weight="10"/>
-    <item id="563"
-        image="equipment/hands/basicgloves.png|W:#a0a0a0,d0d0d0,ffffff,ffffff"
-        name="Winter Gloves"
-        description="A pair of soft, warm gloves."
-        effect="M. Attack -15"
-        type="equip-arms"
-        defense="3"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
-    </item>
-    <item id="564"
-        image="equipment/chest/tnecksweater.png|W:#a4b2b2,ffffff"
-        name="Turtleneck Sweater"
-        description="A thick, soft and warm sweater."
-        effect="M. Attack -18"
-        type="equip-torso"
-        defense="6"
-        weight="30">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="565"
-        image="generic/petal.png|W:#ee748d,ffd8ce"
-        name="Pink Petal"
-        description="A petal from an evil flower."
-        type="usable"
-        hp="50"
-        weight="10"/>
-    <item id="566"
-        image="generic/smallmushroom.png"
-        name="Small Mushroom"
-        description="A mushroom."
-        type="usable"
-        hp="50"
-        weight="10"/>
-    <item id="567"
-        image="use/potions/b.png|G:#c05000,f0a000,f0f09f"
-        name="Iron Potion"
-        description="Increases your attack strength."
-        effect="Attack strength increase (temporary)."
-        type="usable"
-        weight="10"/>
-    <item id="568"
-        image="use/potions/c.png|G:#da69e5,ffdaff"
-        name="Concentration Potion"
-        description="Increases your attack speed."
-        effect="Attack speed increase (temporary)."
-        type="usable"
-        weight="10"/>
-    <item id="569"
-        image="generic/rawlog.png"
-        name="Raw Log"
-        description="A raw log."
-        type="generic"
-        weight="10"/>
-    <item id="570"
-        image="equipment/weapon/dagger-boneknife.png"
-        name="Bone Knife"
-        description="A knife masterly carved out of a bone."
-        effect="Damage +115"
-        type="equip-1hand"
-        weapon-type="knife"
-        attack-action="attack"
-        weight="450">
-        <sprite>weapon-dagger.xml</sprite>
-    </item>
-    <item id="571"
-        image="equipment/weapon/dagger-setzer.png"
-        name="Setzer"
-        description="A sharp knife, named after a famous gambler."
-        effect="Damage +110"
-        type="equip-1hand"
-        weapon-type="knife"
-        attack-action="attack"
-        weight="900">
-        <sprite>weapon-dagger.xml</sprite>
-    </item>
-    <item id="572"
-        image="equipment/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="200"/>
-    <item id="573"
-        image="equipment/weapon/sword-falchion.png"
-        name="Falchion"
-        description="A heavy one-handed, single-edged sword."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="300"/>
-    <item id="574"
-        image="equipment/weapon/polearm-scorpion.png"
-        name="Scorpion"
-        description="A well crafted glaive."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="polearm"
-        weight="600"/>
-    <item id="575"
-        image="equipment/weapon/bow-desertbow.png"
-        name="Desert Bow"
-        description="A tonorian short bow."
-        effect="Damage +? / Range ?"
-        type="equip-2hand"
-        weapon-type="bow"
-        attack-action="attack_bow"
-        weight="1200"
-        missile-particle="graphics/particles/arrow.particle.xml"/>
-    <item id="576"
-        image="equipment/weapon/sword-beheader.png"
-        name="Beheader"
-        description="An oddly designed sword especially made for beheading enemies."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="2000"/>
-    <item id="577"
-        image="equipment/ammo/bonedarts.png"
-        name="Bone Darts"
-        description="Darts made of bones."
-        effect="Damage +? / Range ?"
-        type="equip-1hand"
-        weapon-type="thrown"
-        weight="300"/>
-    <item id="578"
-        image="equipment/weapon/sword-sandcutter.png"
-        name="Sand Cutter"
-        description="A sand cutter."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="1500"/>
-    <item id="579"
-        image="equipment/weapon/dagger-rockknive.png"
-        name="Rock Knife"
-        description="A knife made of stone."
-        effect="Damage +110"
-        type="equip-1hand"
-        weapon-type="knife"
-        attack-action="attack"
-        vit="3"
-        weight="500">
-        <sprite>weapon-dagger.xml</sprite>
-    </item>
-    <item id="580"
-        image="equipment/weapon/staff-staffoflife.png"
-        name="Staff of Life"
-        description="A staff that increases healing magic."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="staff"
-        weight="1500"/>
-    <item id="581"
-        image="equipment/weapon/staff-crescentrod.png"
-        name="Crescent Rod"
-        description="A crescent rod."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="staff"
-        weight="1500"/>
-    <item id="582"
-        image="equipment/weapon/staff-staffoffire.png"
-        name="Staff of Fire"
-        description="A staff that increases fire magic."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="staff"
-        weight="1500"/>
-    <item id="583"
-        image="equipment/weapon/staff-staffofice.png"
-        name="Staff of Ice"
-        description="A staff that increases ice magic."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="staff"
-        weight="1500"/>
-    <item id="584"
-        image="equipment/weapon/sword-jackal.png"
-        name="Jackal"
-        description="A jackal."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="100"/>
-    <item id="585"
-        image="equipment/shield/scarabarmlet.png"
-        name="Scarab Armlet"
-        description="A scarab armlet."
-        effect="M. Attack +5"
-        type="equip-arms"
-        weight="200"/>
-    <item id="586"
-        image="equipment/legs/shorts.png|W:#a4b2b2,ffffff"
-        name="Cotton Shorts"
-        description="Shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        weight="15"
-        defense="2">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-
-
-    <item id="587"
-        image="equipment/weapon/sword-sword.png"
-        name="Sword"
-        description="A simple but reliable sword."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="500">
-        <sprite>weapon-sword-sword.xml</sprite>
-	</item>
-
-    <!--
-    <item id="588"
-        image="equipment/weapon/sword-bastardsword.png"
-        name="Bastard Sword"
-        description="A large two handed sword."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="sword"
-        weight="10"/>
-    <item id="589"
-        image="equipment/weapon/sword-broadsword.png"
-        name="Broad Sword"
-        description="A two handed sword with a very broad blade."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="sword"
-        weight="10">
-        <sound event="hit">weapons/swords/broadsword-hit1.ogg</sound>
-    </item>
-    <item id="590"
-        image="equipment/weapon/sword-baselard.png"
-        name="Baselard"
-        description="A short and powerful sword."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="10"/>
-    <item id="591"
-        image="equipment/weapon/sword-longsword.png"
-        name="Long Sword"
-        description="A sword with a long and agile blade."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="10">
-        <sound event="hit">weapons/swords/longsword-hit1.ogg</sound>
-        <sound event="hit">weapons/swords/longsword-hit2.ogg</sound>
-        <sound event="strike">weapons/swords/longsword-miss1.ogg</sound>
-    </item>
-    <item id="592"
-        image="equipment/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"/>
-    <item id="593"
-        image="equipment/weapon/sword-rapier.png"
-        name="Rapier"
-        description="A light sword made for duels."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="10">
-        <sound event="hit">weapons/swords/rapier-hit1.ogg</sound>
-    </item>
-    <item id="594"
-        image="equipment/weapon/polearm-spear.png"
-        name="Spear"
-        description="A light spear with a wooden pole."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="polearm"
-        weight="700">
-	<sprite>weapon-polearm-spear.xml</sprite>
-	</item>
-    <item id="595"
-        image="equipment/weapon/polearm-heavyspear.png"
-        name="Heavy Spear"
-        description="A heavy spear with a wooden pole."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="polearm"
-        weight="10"/>
-    <item id="596"
-        image="equipment/weapon/polearm-pike.png"
-        name="Pike"
-        description="A light spear with an iron pole."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="polearm"
-        weight="10"/>
-    <item id="597"
-        image="equipment/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"/>
-    <item id="598"
-        image="equipment/weapon/polearm-dualspear.png"
-        name="Dual Spear"
-        description="A spear with two tops."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="polearm"
-        weight="10"/>
-    <item id="599"
-        image="equipment/weapon/sword-firesword.png"
-        name="Fire Sword"
-        description="A magical sword enchanted with the power of fire."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="10">
-        <sound event="strike">weapons/swords/firesword-miss1.ogg</sound>
-    </item>
-    <item id="600"
-        image="equipment/shield/brit.png"
-        name="Brit Shield"
-        description="A legendary shield that is said to save queens and rule waves."
-        effect="-50 Cooking"
-        type="equip-shield"
-        weight="10"/>
-    -->
-
-    <item id="601"
-        image="equipment/shield/steel.png"
-        name="Steel Shield"
-        description="A shield made of steel."
-        effect="M. Attack -200"
-        defense="20"
-        type="equip-shield"
-        weight="2500"/>
-    <item id="602"
-        image="equipment/shield/wooden.png"
-        name="Wooden Shield"
-        description="A shield made of wood."
-        effect="M. Attack -70"
-        defense="14"
-        type="equip-shield"
-        weight="1500"/>
-    <item id="603"
-        image="equipment/shield/leather.png"
-        name="Leather Shield"
-        description="A shield made of leather on a wooden frame."
-        effect="M. Attack -35"
-        defense="7"
-        type="equip-shield"
-        weight="1300"/>
-
-    <!--
-    <item id="604"
-        image="equipment/shield/knight.png"
-        name="Knight Shield"
-        description="A high quality shield used by knights."
-        defense="???"
-        type="equip-shield"
-        weight="10"/>
-    <item id="605"
-        image="equipment/weapon/axe-meatcleaver.png"
-        name="Meat Cleaver"
-        description="A butcher's tool that also makes a nice one handed battle axe."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="axe"
-        weight="10"/>
-    <item id="606"
-        image="equipment/weapon/axe-hatchet.png"
-        name="Hatchet"
-        description="A short one handed axe."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="axe"
-        weight="10"/>
-    <item id="607"
-        image="equipment/weapon/polearm-trident.png"
-        name="Trident"
-        description="A spear with three heads."
-        effect="Damage +?"
-        type="equip-2hand"
-        weapon-type="polearm"
-        weight="10"/>
-    <item id="608"
-        image="equipment/shield/blade.png"
-        name="Blade Shield"
-        description="A shield made of blades."
-        defense="???"
-        type="equip-shield"
-        weight="10"/>
-    <item id="609"
-        image="equipment/weapon/mace-club.png"
-        name="Club"
-        description="A primitive wooden club."
-        effect="Damage +?"
-        type="equip-1hand"
-        weapon-type="mace"
-        weight="10"/>
-    -->
-
-    <item id="610"
-        image="equipment/legs/shorts.png|W:#255367,266c84,68b0c5,ffffff"
-        name="Jeans Shorts"
-        description="Shorts made of jeans."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="25">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#255367,266c84,68b0c5,ffffff</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#255367,266c84,68b0c5,ffffff</sprite>
-    </item>
-    <item id="611"
-        image="generic/whitefur.png"
-        name="White Fur"
-        description="A patch of white, fluffy fur."
-        type="generic"
-        weight="8"/>
-    <item id="612"
-        image="generic/cavesnakelamp.png"
-        name="Cave Snake Lamp"
-        description="The feeler of a lamp snake that glows in the dark."
-        type="generic"
-        weight="10"/>
-    <item id="613"
-        image="generic/hardspike.png"
-        name="Hard Spike"
-        description="The hard spike of a slain monster."
-        type="generic"
-        weight="10"/>
-    <item id="614"
-        image="generic/pinkantennae.png"
-        name="Pink Antenna"
-        description="No-one knows why pinkies have these antennas on their heads."
-        type="generic"
-        luk="1"
-        weight="10"/>
-    <item id="615"
-        image="equipment/head/pumpkinhelmet.png"
-        name="Pumpkin Helmet"
-        description="A helmet made out of a pumpkin."
-        effect="M. Attack -4"
-        type="equip-head"
-        defense="4"
-        weight="60">
-        <sprite>equipment/head/pumpkinhelmet.xml</sprite>
-    </item>
-    <item id="616"
-        image="equipment/head/axehat.png"
-        name="Axe Hat"
-        description="A really cool joke."
-        effect="M. Attack -4"
-        type="equip-head"
-        weight="50"
-        defense="4">
-        <sprite>equipment/head/axehat.xml</sprite>
-    </item>
-    <item id="617"
-        image="equipment/head/piratehat.png"
-        name="Pirate Hat"
-        description="A pirate hat."
-        effect="M. Attack -8"
-        type="equip-head"
-        weight="40"
-        defense="4">
-        <sprite>equipment/head/piratehat.xml</sprite>
-    </item>
-    <item id="618"
-        image="equipment/head/goggles.png"
-        name="Goggles"
-        description="Goggles designed to take care of your eyes."
-        type="equip-head"
-        weight="20"
-        defense="2">
-        <sprite>equipment/head/goggles.xml|#787878,f7f7f7</sprite>
-    </item>
-    <item id="619"
-        image="equipment/head/leathergoggles.png"
-        name="Leather Goggles"
-        description="Goggles designed for desert storms."
-        type="equip-head"
-        weight="20"
-        defense="3">
-        <sprite>equipment/head/goggles.xml|#783c00,ff973b</sprite>
-    </item>
-    <item id="620"
-        image="equipment/head/circlet.png"
-        name="Circlet"
-        description="A nice piece of jewelry."
-        effect="M. Attack +5"
-        type="equip-head"
-        weight="25"
-        defense="4">
-        <sprite>equipment/head/circlet.xml</sprite>
-    </item>
-    <item id="621"
-        image="equipment/head/eyepatch.png"
-        name="Eyepatch"
-        description="What really makes you a pirate."
-        type="equip-head"
-        weight="5"
-        defense="3">
-        <sprite>equipment/head/eyepatch.xml</sprite>
-    </item>
-    <item id="622"
-        image="equipment/head/bandana.png"
-        name="Bandana"
-        description="A striped bandana."
-        type="equip-head"
-        weight="20"
-        defense="3">
-        <sprite>equipment/head/bandana.xml</sprite>
-    </item>
-    <item id="623"
-        image="equipment/weapon/polearm-scythe.png"
-        name="Scythe"
-        description="Usually used for farming but also usable as a weapon. Slow but deadly."
-        effect="Damage +75"
-        type="equip-2hand"
-        weapon-type="polearm"
-        attack-action="attack"
-        weight="1200">
-        <sprite>weapon-scythe.xml</sprite>
-    </item>
-    <item id="624"
-        image="equipment/chest/vnecksweater.png|W:#a4b2b2,ffffff"
-        name="V-Neck Sweater"
-        description="A thin, soft and warm sweater."
-        effect="M. Attack -24"
-        type="equip-torso"
-        weight="35"
-        defense="8">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="625"
-        image="equipment/chest/chainmail.png"
-        name="Chainmail Shirt"
-        description="A shirt made of chains. It weighs a lot but offers excellent protection."
-        effect="M. Attack -120"
-        type="equip-torso"
-        weight="800"
-        defense="20">
-        <sprite gender="male">equipment/chest/chainmail-male.xml</sprite>
-        <sprite gender="female">equipment/chest/chainmail-female.xml</sprite>
-    </item>
-    <item id="626"
-        image="equipment/chest/lightplatemail.png|W:#ddeeff"
-        name="Light Platemail"
-        description="A light cuirass with shoulder pads made of iron, usually worn by foot soldiers."
-        effect="M. Attack -150"
-        type="equip-torso"
-        defense="25"
-        weight="1200">
-        <sprite gender="male">equipment/chest/lightplatemail-male.xml|#ddeeff</sprite>
-        <sprite gender="female">equipment/chest/lightplatemail-female.xml|#ddeeff</sprite>
-    </item>
-    <item id="627"
-        image="equipment/head/tophat.png"
-        name="Top Hat"
-        description="For the gentry of The Mana World."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/tophat.xml</sprite>
-    </item>
-    <item id="628"
-        image="equipment/head/funkyhat.png"
-        name="Funky Hat"
-        description="Yawn..."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="13"
-        weight="20">
-        <sprite>equipment/head/funkywinter.xml</sprite>
-    </item>
-    <item id="629"
-        image="equipment/head/mushroomhat.png"
-        name="Mush Hat"
-        description="Soft and fashionable."
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/mushroom.xml</sprite>
-    </item>
-    <item id="630"
-        image="equipment/head/shroomhat.png"
-        name="Shroom Hat"
-        description="Evil and fashionable."
-        type="equip-head"
-        defense="13"
-        weight="30">
-        <sprite>equipment/head/shroom.xml</sprite>
-    </item>
-    <item id="631"
-        image="generic/crystal.png|W:#252e6a,923eda,ba72ec,ffffff"
-        name="Dark Crystal"
-        description="A dark crystal that emits a demonic aura."
-        type="generic"
-        weight="10"/>
-    <item id="632"
-        image="equipment/legs/skirt.png|W:#a4b2b2,ffffff"
-        name="Cotton Skirt"
-        description="A skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="10">
-        <sprite>equipment/legs/skirt.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="633"
-        image="equipment/head/xmaself.png"
-        name="Christmas Elf Hat"
-        description="A hat worn by Christmas elves."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="13"
-        weight="30">
-        <sprite>equipment/head/xmaself.xml</sprite>
-    </item>
-    <item id="634"
-        image="equipment/head/mask.png"
-        name="Face Mask"
-        description="A wooden mask to conceal your face."
-        type="equip-head"
-        defense="10"
-        weight="50">
-        <sprite>equipment/head/mask.xml</sprite>
-    </item>
-    <item id="635"
-        image="generic/santacookie.png"
-        name="Santa Cookie"
-        description="This isn't for you to eat, it is for Santa Claus!"
-        type="generic"
-        weight="1"/>
-    <item id="636"
-        image="equipment/head/warlordhelm.png"
-        name="Warlord Helmet"
-        description="Worn by great warriors."
-        effect="M. Attack -36"
-        type="equip-head"
-        defense="18"
-        weight="900">
-        <sprite>equipment/head/warlordhelm.xml</sprite>
-    </item>
-    <item id="637"
-        image="equipment/head/knighthelm.png"
-        name="Knight's Helmet"
-        description="A helmet with two small wings on it."
-        effect="M. Attack -30"
-        type="equip-head"
-        defense="15"
-        weight="600">
-        <sprite>equipment/head/knighthelm.xml</sprite>
-    </item>
-    <item id="638"
-        image="equipment/head/infantryhelm.png"
-        name="Infantry Helmet"
-        description="A helmet for soldiers and guards."
-        effect="M. Attack -30"
-        type="equip-head"
-        defense="15"
-        weight="400">
-        <sprite>equipment/head/infantryhelm.xml</sprite>
-    </item>
-    <item id="639"
-        image="equipment/head/crusadehelm.png"
-        name="Crusade Helmet"
-        description="Start your own crusade."
-        effect="M. Attack -36"
-        type="equip-head"
-        defense="18"
-        weight="1300">
-        <sprite>equipment/head/crusadehelm.xml</sprite>
-    </item>
-    <item id="640"
-        image="generic/ironore.png"
-        name="Iron Ore"
-        description="A lump of iron ore."
-        type="generic"
-        weight="40"/>
-    <item id="641"
-        image="generic/snakeskin.png"
-        name="Snake Skin"
-        description="The skin of a slain snake."
-        type="generic"
-        weight="15"/>
-    <item id="642"
-        image="equipment/legs/chaps.png"
-        name="Jeans Chaps"
-        description="Jeans with snake skin chaps."
-        effect="M. Attack -12"
-        type="equip-legs"
-        defense="6"
-        weight="60">
-        <sprite gender="male">equipment/legs/chaps-male.xml</sprite>
-        <sprite gender="female">equipment/legs/chaps-female.xml</sprite>
-    </item>
-    <item id="643"
-        image="equipment/head/cowboywhite.png"
-        name="White Cowboy Hat"
-        description="A white cowboy hat with a band."
-        effect="M. Attack -12"
-        type="equip-head"
-        defense="6"
-        weight="30">
-        <sprite>equipment/head/cowboywhite.xml</sprite>
-    </item>
-    <item id="644"
-        image="equipment/head/cowboyblack.png"
-        name="Black Cowboy Hat"
-        description="A black cowboy hat with shiny buckles."
-        effect="M. Attack -12"
-        type="equip-head"
-        defense="6"
-        weight="30">
-        <sprite>equipment/head/cowboyblack.xml</sprite>
-    </item>
-    <item id="645"
-        image="equipment/chest/lightplatemail.png|W:#573f10,9c8226,d3c04b,ffffff"
-        name="Golden Platemail"
-        description="A plate mail made from gold, which only the richest of the richest can afford."
-        effect="M. Attack -100"
-        type="equip-torso"
-        defense="25"
-        weight="4500">
-        <sprite gender="male">equipment/chest/lightplatemail-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
-        <sprite gender="female">equipment/chest/lightplatemail-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
-    </item>
-    <item id="646"
-        image="equipment/head/crown.png"
-        name="Crown"
-        description="A jewel embossed crown fit for any ruler."
-        type="equip-head"
-        defense="4"
-        weight="240">
-        <sprite>equipment/head/crown.xml</sprite>
-    </item>
-    <item id="647"
-        image="equipment/head/devcap.png|R:#9999ff"
-        name="Developer's Cap"
-        description="A cap which identifies you as a developer."
-        effect="M. Attack +5"
-        type="equip-head"
-        defense="5"
-        weight="20">
-        <sprite>equipment/head/devcap.xml|#9999ff</sprite>
-    </item>
-    <item id="648"
-        image="equipment/legs/trousers.png"
-        name="Trousers"
-        description="Cotton pants covering each part of your legs."
-        defense="4"
-        type="equip-legs"
-        weight="25">
-        <sprite>equipment/head/devcap.xml|#9999ff</sprite>
-    </item>
-    <item id="649"
-        image="equipment/chest/sorcerer-robe.png|W:#5e7480,f1ffff,ffffff;R:#2554c7"
-        name="White Evoker's Robe (Blue)"
-        description="A blue lined white evoker's robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="5">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
-    </item>
-    <item id="650"
-        image="equipment/chest/sorcerer-robe.png|W:#000000;R:#2554c7"
-        name="Black Evoker's Robe (Blue)"
-        description="A blue lined black evoker's robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="5">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#000000;#2554c7</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite>
-    </item>
-    <item id="651"
-        image="equipment/chest/silk-robe.png|W:#5e7480,f1ffff,ffffff"
-        name="White Wizard Robe"
-        description="A white robe made for peaceful wizards."
-        defense="5"
-        type="equip-torso"
-        weight="5">
-        <sprite gender="male">equipment/chest/robe-male.xml|#5e7480,f1ffff,ffffff</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#5e7480,f1ffff,ffffff</sprite>
-    </item>
-    <item id="652"
-        image="equipment/chest/silk-robe.png|W:#000000"
-        name="Black Wizard Robe"
-        description="A black robe made for evil wizards."
-        defense="5"
-        type="equip-torso"
-        weight="5">
-        <sprite gender="male">equipment/chest/robe-male.xml|#000000</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#000000</sprite>
-    </item>
-    <item id="653"
-        image="equipment/chest/silk-robe.png|W:#804000"
-        name="Apprentice Robe"
-        description="A robe made for apprentices."
-        defense="5"
-        type="equip-torso"
-        weight="5">
-        <sprite gender="male">equipment/chest/robe-male.xml|#804000</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#804000</sprite>
-    </item>
-    <item id="654"
-        image="equipment/head/cap.png|R:#d94800"
-        name="Cap"
-        description="A hat with a peak to shield your eyes from the sun."
-        type="equip-head"
-        defense="5"
-        weight="20">
-        <sprite>equipment/head/cap.xml|#d94800</sprite>
-    </item>
-    <item id="655"
-        image="equipment/feet/furboots.png"
-        name="Fur Boots"
-        description="A pair of warm winter boots."
-        effect="M. Attack -3"
-        type="equip-feet"
-        weight="50"
-        defense="3">
-        <sprite gender="male">equipment/feet/furboots-male.xml</sprite>
-        <sprite gender="female">equipment/feet/furboots-female.xml</sprite>
-    </item>
-    <item id="656"
-        image="equipment/head/serf.png"
-        name="Serf Hat"
-        description="A simple hat made from cloth."
-        type="equip-head"
-        weight="20"
-        defense="2">
-        <sprite>equipment/head/serf.xml</sprite>
-    </item>
-    <item id="657"
-        image="use/food/orange.png"
-        name="Orange"
-        description="A juicy orange."
-        type="usable"
-        hp="60"
-        weight="7"/>
-    <item id="658"
-        image="equipment/chest/warlordplate.png"
-        name="Warlord Plate"
-        description="Strong and decorative armor."
-        effect="M. Attack -170"
-        type="equip-torso"
-        defense="27"
-        weight="2600">
-        <sprite gender="male">equipment/chest/warlordplate-male.xml</sprite>
-        <sprite gender="female">equipment/chest/warlordplate-female.xml</sprite>
-    </item>
-        <item id="659"
-        image="equipment/chest/warlordplate.png|W:#573f10,9c8226,d3c04b,ffffff"
-        name="Golden Warlord Plate"
-        description="Strong and decorative armor made from gold."
-        effect="M. Attack -110"
-        type="equip-torso"
-        defense="27"
-        weight="7600">
-        <sprite gender="male">equipment/chest/warlordplate-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
-        <sprite gender="female">equipment/chest/warlordplate-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
-    </item>
-    <item id="660"
-        image="generic/fabric.png|W:#2b454d,72818c,b7c0c5,ffffff"
-        name="Cotton Cloth"
-        description="A piece of cotton cloth."
-        type="generic"
-        weight="10"/>
-    <item id="661"
-        image="generic/rose.png|W:#bb2222,ff8888"
-        name="Red Rose"
-        description="A red rose. A symbol for romantic love."
-        type="generic"
-        weight="1"/>
-    <item id="662"
-        image="generic/rose.png|W:#dddddd,ffffff"
-        name="White Rose"
-        description="A white rose. A symbol for everlasting love."
-        type="generic"
-        weight="1"/>
-    <item id="663"
-        image="generic/rose.png|W:#bb0022"
-        name="Dark Red Rose"
-        description="A dark red rose. A symbol for sad love."
-        type="generic"
-        weight="1"/>
-    <item id="664"
-        image="generic/rose.png|W:#dd88aa,ffdddd"
-        name="Pink Rose"
-        description="A pink rose. A symbol for innocent love."
-        type="generic"
-        weight="1"/>
-    <item id="665"
-        image="generic/rose.png|W:#dddd00,ffff00"
-        name="Yellow Rose"
-        description="A yellow rose. A symbol for platonic love and friendship."
-        type="generic"
-        weight="1"/>
-    <item id="666"
-        image="generic/rose.png|W:#111111,444444,555555,ffffff"
-        name="Black Rose"
-        description="A black rose. When you look closely at it, you see patterns within patterns, subtly changing colors, and further arrangements that almost seem designed to draw your attention in, and away from the rest of the world. Dizzy, you quickly look away."
-        effect="This item cannot be used directly, but may have certain effects given the right circumstances."
-        type="generic"
-        weight="1"/>
-    <item id="667"
-        image="generic/rose.png|W:#dd8800,ffdd00"
-        name="Orange Rose"
-        description="An orange rose. A symbol for friendship turning into love."
-        type="generic"
-        weight="1"/>
-    <item id="668"
-        image="generic/rose.png|W:#6666aa,ccccff"
-        name="Blue Rose"
-        description="An blue rose. A symbol for mystery or attaining the impossible."
-        type="generic"
-        weight="1"/>
-    <item id="669"
-        image="generic/tulip.png|W:#ddaa22,eeee44"
-        name="Yellow Tulip"
-        description="A yellow tulip. A symbol for hopeless love."
-        type="generic"
-        weight="1"/>
-    <item id="670"
-        image="generic/tulip.png|W:#000088,dd88ff"
-        name="Purple Tulip"
-        description="A purple tulip. A symbol for enchantment."
-        type="generic"
-        weight="1"/>
-    <item id="671"
-        image="generic/tulip.png|W:#882288,dd4444"
-        name="Red Tulip"
-        description="A red tulip. A declaration of love."
-        type="generic"
-        weight="1"/>
-    <item id="672"
-        image="generic/tulip.png|W:#8888dd,ffffff"
-        name="White Tulip"
-        description="A white tulip. A symbol for everlasting friendship."
-        type="generic"
-        weight="1"/>
-    <item id="673"
-        image="generic/tulip.png|W:#dd44dd,fff0f0"
-        name="Pink Tulip"
-        description="A pink tulip. A symbol for gratitude."
-        type="generic"
-        weight="1"/>
-    <item id="674"
-        image="generic/tulip.png|W:#aa2222,ffdd22"
-        name="Orange Tulip"
-        description="An orange tulip. A symbol for admiration."
-        type="generic"
-        weight="1"/>
-    <item id="675"
-        image="equipment/head/gradcap.png"
-        name="Graduation Cap"
-        description="A traditional cap which a university student may wear upon graduating."
-        type="equip-head"
-        defense="2"
-        weight="20">
-        <sprite>equipment/head/gradcap.xml</sprite>
-    </item>
-    <item id="676"
-        image="use/food/steak.png"
-        name="Steak"
-        description="A tasty piece of steak."
-        type="usable"
-        hp="250"
-        weight="10"/>
-    <item id="677"
-        image="equipment/charms/heartnecklace.png"
-        name="Heart Necklace"
-        description="A gold and ruby heart necklace."
-        type="equip-charm"
-        weight="10"/>
-    <item id="678"
-        image="equipment/head/nohmask.png"
-        name="Noh Mask"
-        description="A traditional Japanese mask worn in Noh plays."
-        effect="M. Attack +1"
-        type="equip-head"
-        defense="3"
-        weight="18">
-        <sprite>equipment/head/nohmask.xml</sprite>
-    </item>
-    <item id="679"
-        image="equipment/head/demonmask.png"
-        name="Demon Mask"
-        description="A scary mask to make you look like a demon."
-        effect="M. Attack +5"
-        type="equip-head"
-        defense="3"
-        weight="23">
-        <sprite>equipment/head/demonmask.xml</sprite>
-    </item>
-    <item id="680"
-        image="generic/herb.png|W:#e0b0ff"
-        name="Mauve Herb"
-        description="An ingredient for brewing healing potions."
-        type="generic"
-        weight="1"/>
-    <item id="681"
-        image="generic/herb.png|W:#0047ab"
-        name="Cobalt Herb"
-        description="An ingredient for brewing healing potions."
-        type="generic"
-        weight="1"/>
-    <item id="682"
-        image="generic/herb.png|W:#ef9b0f"
-        name="Gamboge Herb"
-        description="An ingredient for brewing healing potions."
-        type="generic"
-        weight="1"/>
-    <item id="683"
-        image="generic/herb.png|W:#e32636"
-        name="Alizarin Herb"
-        description="An ingredient for brewing healing potions."
-        type="generic"
-        weight="1"/>
-    <item id="684"
-        image="use/potions/a.png|G:#b03678,ffffff"
-        name="Tiny Healing Potion"
-        description="A tiny healing potion made from brewed herbs."
-        type="usable"
-        hp="100"
-        weight="5"/>
-    <item id="685"
-        image="use/potions/d.png|G:#b03678,ffffff"
-        name="Small Healing Potion"
-        description="A small healing potion made from brewed herbs."
-        type="usable"
-        hp="200"
-        weight="10"/>
-    <item id="686"
-        image="use/potions/b.png|G:#b03678,ffffff"
-        name="Medium Healing Potion"
-        description="A medium healing potion made from brewed herbs."
-        type="usable"
-        hp="400"
-        weight="15"/>
-    <item id="687"
-        image="use/potions/c.png|G:#b03678,ffffff"
-        name="Large Healing Potion"
-        description="A large healing potion made from brewed herbs."
-        type="usable"
-        hp="800"
-        weight="25"/>
-    <item id="688"
-        image="equipment/chest/tanktop.png|W:#a4b2b2,ffffff"
-        name="Tank Top"
-        description="A sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="10">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="689"
-        image="equipment/chest/tanktop-short.png|W:#a4b2b2,ffffff"
-        name="Short Tank Top"
-        description="A short, sleeveless shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="690"
-        image="use/potions/d.png|G:#580000,a40000,c02020,ff6060"
-        name="Red Dye"
-        description="A vial containing red dye."
-        type="generic"
-        weight="10"/>
-    <item id="691"
-        image="use/potions/d.png|G:#1f9c1f,89d689"
-        name="Green Dye"
-        description="A vial containing green dye."
-        type="generic"
-        weight="10"/>
-    <item id="692"
-        image="use/potions/d.png|G:#4b4bbd,888af4"
-        name="Dark Blue Dye"
-        description="A vial containing dark blue dye."
-        type="generic"
-        weight="10"/>
-    <item id="693"
-        image="use/potions/d.png|G:#ccb534,f1ea8e,ffffaa"
-        name="Yellow Dye"
-        description="A vial containing yellow dye."
-        type="generic"
-        weight="10"/>
-    <item id="694"
-        image="use/potions/d.png|G:#62aaca,a3f4f8,d5fcfb"
-        name="Light Blue Dye"
-        description="A vial containing light blue dye."
-        type="generic"
-        weight="10"/>
-    <item id="695"
-        image="use/potions/d.png|G:#c64abd,f9a5f2,fcd0fa"
-        name="Pink Dye"
-        description="A vial containing pink dye."
-        type="generic"
-        weight="10"/>
-    <item id="696"
-        image="use/potions/d.png|G:#404040,c0c0c0"
-        name="Black Dye"
-        description="A vial containing black dye."
-        type="generic"
-        weight="10"/>
-    <item id="697"
-        image="use/potions/d.png|G:#96370f,cc5616,f68d26,fcaa2d,fdd493"
-        name="Orange Dye"
-        description="A vial containing orange dye."
-        type="generic"
-        weight="10"/>
-    <item id="698"
-        image="use/potions/d.png|G:#530a7c,b362e1,ca87ef"
-        name="Purple Dye"
-        description="A vial containing purple dye."
-        type="generic"
-        weight="10"/>
-    <item id="699"
-        image="use/potions/d.png|G:#104010,208020,30c030"
-        name="Dark Green Dye"
-        description="A vial containing dark green dye."
-        type="generic"
-        weight="10"/>
-    <item id="700"
-        image="generic/pearl.png"
-        name="Pearl"
-        description="A pearl, round and shiny."
-        type="generic"
-        weight="5"/>
-    <item id="701"
-        image="generic/powder.png"
-        name="Pile of Ash"
-        description="A pile of ash similar to volcanic ash."
-        type="generic"
-        weight="5"/>
-    <item id="702"
-        image="equipment/rings/wedding.png"
-        name="Wedding Ring"
-        description="Your wedding ring."
-        type="equip-ring"
-        weight="1"/>
-    <item id="703"
-        image="generic/powder.png|W:#606030,b0b090,e0e0a0,ffffe0"
-        name="Sulphur Powder"
-        description="A small pile of sulphur."
-        type="generic"
-        weight="2"/>
-    <item id="704"
-        image="generic/powder.png|W:#405060"
-        name="Iron Powder"
-        description="A pile of powdered iron."
-        type="generic"
-        weight="3"/>
-    <item id="705"
-        image="use/potions/e.png|R:#f04030;G:#ee8e5e"
-        name="Mana Potion"
-        description="A dark, sirupy brew, with a smell reminiscent of manaberries."
-        type="usable"
-        mp="10"
-        weight="50"/>
-    <item id="706"
-        image="generic/scorpionstinger.png|W:#e0d080,fff0e0,ffffff"
-        name="Golden Scorpion Stinger"
-        description="A golden scorpion stinger, tipped with lethal poison."
-        type="generic"
-        weight="2"/>
-    <item id="707"
-        image="use/potions/e.png|R:#504030;G:#9e8e5e"
-        name="Monster Oil Potion"
-        description="A dark, oily liquid with a sinister stench."
-        type="generic"
-        weight="50"/>
-    <item id="708"
-        image="generic/patch-leather.png"
-        name="Leather Patch"
-        description="A patch of tanned leather."
-        type="generic"
-        weight="18"/>
-    <item id="709"
-        image="generic/scorpionstinger.png|W:#a08040"
-        name="Black Scorpion Stinger"
-        description="A black scorpion stinger, dripping with poison."
-        type="generic"
-        weight="1"/>
-    <item id="710"
-        image="generic/snake-tongue.png|W:#e04020"
-        name="Snake Tongue"
-        description="The forked tongue of a snake."
-        type="generic"
-        weight="1"/>
-    <item id="711"
-        image="generic/snake-tongue.png|W:#706060"
-        name="Mountain Snake Tongue"
-        description="The forked tongue of a mountain snake."
-        type="generic"
-        weight="1"/>
-    <item id="712"
-        image="generic/snake-tongue.png|W:#a05050,e08080"
-        name="Grass Snake Tongue"
-        description="The forked tongue of a grass snake."
-        type="generic"
-        weight="1"/>
-    <item id="713"
-        image="generic/snake-tongue.png|W:#907070,d0a0a0"
-        name="Cave Snake Tongue"
-        description="The forked tongue of a cave snake."
-        type="generic"
-        weight="1"/>
-    <item id="714"
-        image="use/food/snake-egg.png|W:#c0c0a0;R:#b09070;G:#b8a888"
-        name="Snake Egg"
-        description="An edible snake egg."
-        type="usable"
-        hp="30"
-        weight="4"/>
-    <item id="715"
-        image="use/food/snake-egg.png|W:#806020;R:#604010;G:#705018"
-        name="Mountain Snake Egg"
-        description="An edible mountain snake egg."
-        type="usable"
-        hp="40"
-        weight="4"/>
-    <item id="716"
-        image="use/food/snake-egg.png|W:#e0e0c0;R:#80f0a0;G:#b0e8b0"
-        name="Grass Snake Egg"
-        description="An edible grass snake egg."
-        type="usable"
-        hp="50"
-        weight="4"/>
-    <item id="717"
-        image="use/food/snake-egg.png|W:#c0c0c0;R:#c090c0;G:#c0a8c0"
-        name="Cave Snake Egg"
-        description="An edible cave snake egg."
-        type="usable"
-        hp="20"
-        weight="4"/>
-    <item id="718"
-        image="generic/silkcocoon.png"
-        name="Silk Cocoon"
-        description="A silkworm's cocoon."
-        type="generic"
-        weight="1"/>
-    <item id="719"
-        image="use/food/apple.png|R:#73E600;Y:#c1f102;G:#66cc33"
-        name="Green Apple"
-        description="A healthy green apple."
-        type="usable"
-        hp="45"
-        weight="5"/>
-    <item id="720"
-        image="equipment/chest/silk-robe.png|W:#ffffff"
-        name="Silk Robe"
-        description="A light and shimmering silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="5">
-        <sprite gender="male">equipment/chest/robe-male.xml|#ffffff</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#ffffff</sprite>
-    </item>
-    <item id="721"
-        image="equipment/head/highpriest-crown.png"
-        name="High Priest Crown"
-        description="A golden crown with an enchanted ruby."
-        effect="+20 SP"
-        type="equip-head"
-        defense="4"
-        weight="400">
-        <sprite>equipment/head/highpriest-crown.xml</sprite>
-    </item>
-    <item id="722"
-        image="equipment/head/monster-skull-helm.png"
-        name="Monster Skull Helmet"
-        description="The conserved skull of a mysterious ancient monster."
-        effect="M. Attack +10 / M. Defense +20"
-        type="equip-head"
-        defense="7"
-        weight="250">
-        <sprite>equipment/head/monster-skull-helm.xml</sprite>
-    </item>
-    <item id="723"
-        image="equipment/head/deserthat.png|R:#ffffff"
-        name="Desert Hat"
-        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#ffffff</sprite>
-    </item>
-    <item id="724"
-        image="equipment/head/standardheadband.png|W:#a4b2b2,ffffff"
-        name="Cotton Headband"
-        description="Just a cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="725"
-        image="equipment/head/gmcap.png|R:#bf0e08"
-        name="GM Cap"
-        description="A cap which identifies you as a GM. Only GMs can wear this."
-        effect="M. Attack +5"
-        type="equip-head"
-        defense="5"
-        weight="20">
-        <sprite>equipment/head/gmcap.xml|#bf0e08</sprite>
-    </item>
-    <item id="726"
-        image="equipment/chest/silk-robe.png|W:#e40a0a"
-        name="GM Robe"
-        description="A light and shimmering silk robe made for GMs. Only GMs can wear this."
-        type="equip-torso"
-        weight="40"
-        defense="5">
-        <sprite gender="male">equipment/chest/robe-male.xml|#e40a0a</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#e40a0a</sprite>
-    </item>
-    <item id="727"
-        image="generic/iten.png|W:#ffe0f0"
-        name="Iten"
-        description="An iten."
-        type="generic"
-        weight="8000"/>
-    <item id="728"
-        image="generic/wooden-mouboo.png"
-        name="Mouboo Figurine"
-        description="A small, wooden figurine of a mouboo."
-        type="generic"
-        weight="9"/>
-    <item id="729"
-        image="generic/warped-log.png"
-        name="Warped Log"
-        description="A piece of wood, warped and twisted by some unnatural force."
-        type="generic"
-        weight="8"/>
-    <item id="730"
-        image="generic/gemstone-a.png|W:#a0a010,ffffa0"
-        name="Lifestone"
-        description="A small crystal shard, warm to the touch."
-        type="generic"
-        weight="5"/>
-    <item id="731"
-        image="equipment/legs/assassinpants.png"
-        name="Assassin Pants"
-        description="Pants for a master assassin."
-        effect="M. Attack -5"
-        type="equip-torso"
-        defense="5"
-        agi="8"
-        weight="20">
-        <sprite gender="male">equipment/legs/assassin-male.xml</sprite>
-        <sprite gender="female">equipment/legs/assassin-female.xml</sprite>
-    </item>
-    <item id="732"
-        image="generic/dry-branch.png"
-        name="Druid Tree Branch"
-        description="A branch cut off from the druid tree. It feels strangely leathery to the touch."
-        type="generic"
-        weight="2"/>
-    <item id="733"
-        image="use/potions/e.png|R:#fff0ff;G:#d0c09f"
-        name="Purification Potion"
-        description="A transparent, odorless liquid that feels strangely lighter than water."
-        type="usable"
-        mp="0"
-        weight="15"/>
-    <item id="734"
-        image="equipment/feet/boots.png|W:#212121"
-        name="Black Boots"
-        description="Steel toe capped boots, designed to keep your feet very well protected."
-        effect="M. Attack -10"
-        type="equip-feet"
-        weight="25"
-        defense="3">
-        <sprite gender="male">equipment/feet/boots-male.xml|#212121</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#212121</sprite>
-    </item>
-    <item id="735"
-        image="equipment/feet/boots.png|W:#a4b2b2,ffffff"
-        name="Cotton Boots"
-        description="A pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-head"
-        defense="1"
-        weight="10">
-        <sprite gender="male">equipment/feet/boots-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="736"
-        image="use/food/bigcake.png|R:#ede5b2,fff7bf;G:#cccccc,ffffff"
-        name="White Cake"
-        description="A delicious white cake. Would go good with strawberries."
-        type="usable"
-        hp="10"
-        weight="10"/>
-    <item id="737"
-        image="use/food/bigcake.png|R:#9e6e3b,e39d52;G:#e29f57;W:#ffd5a8"
-        name="Chocolate Cake"
-        description="A scrumptious chocolate cake. Real chocolate guaranteed."
-        type="usable"
-        hp="11"
-        weight="10"/>
-    <item id="738"
-        image="use/food/bigcake.png|R:#fed079,ffffff;G:#fed079,ffffff,ffffff;W:#856200,e68e00,ffa600"
-        name="Orange Cake"
-        description="A tangy orange cake. Made from real oranges."
-        type="usable"
-        hp="12"
-        weight="10"/>
-    <item id="739"
-        image="use/food/bigcake.png|R:#ccc599,fff8ED;G:#ffbaba,fffefe;W:#d91a1a,ff8f8f"
-        name="Apple Cake"
-        description="A crisp apple cake. Real apple pieces inside!"
-        type="usable"
-        hp="12"
-        weight="10"/>
-    <item id="740"
-        image="generic/root.png"
-        name="Root"
-        description="A root from a plant."
-        type="generic"
-        weight="5"/>
-    <item id="741"
-        image="equipment/hands/basicgloves.png|W:#a4b2b2,ffffff"
-        name="Cotton Gloves"
-        description="A pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="10">
-        <sprite gender="male">equipment/hands/generic-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="742"
-        image="equipment/charms/clover.png"
-        name="Four-Leaf Clover"
-        description="A lucky four-leaf clover."
-        effect="M. Attack +5"
-        type="equip-charm"
-        luck="1"
-        weight="1"/>
-    <item id="743"
-        image="use/food/acorn.png"
-        name="Acorn"
-        description="An acorn."
-        type="usable"
-        hp="3"
-        weight="1"/>
-    <item id="744"
-        image="use/potions/c.png|G:#f0e0fa,da69e5"
-        name="Diluted Concentration Potion"
-        description="A bottle of diluted concentration potion."
-        effect="Attack speed increase (temporary)."
-        type="usable"
-        weight="10"/>
-    <item id="745"
-        image="use/potions/c.png|G:#ff4aff"
-        name="Dark Concentration Potion"
-        description="This potion smells like burnt sugar."
-        effect="Attack speed increase (temporary)."
-        type="usable"
-        weight="10"/>
-    <item id="746"
-        image="use/potions/e.png|R:#a0a0ff;G:#20409f"
-        name="Mopox Cure Potion"
-        description="A gooey brew with a vile smell, supposedly able to cure Mopox."
-        type="usable"
-        weight="5"/>
-    <item id="747"
-        image="use/food/bigcake.png|R:#9e6e3b,e39d52;G:#e29f57;W:#ffd5a8"
-        name="Laced Chocolate Cake"
-        description="A scrumptious chocolate cake, with a dash of Mopox Cure Potion."
-        type="usable"
-        hp="11"
-        weight="10"/>
-    <item id="748"
-        image="use/food/orangecupcake.png"
-        name="Laced Orange Cupcake"
-        description="A very soft orange cupcake, laced with Mopox cure potion."
-        type="usable"
-        hp="100"
-        weight="5"/>
-    <item id="749"
-        image="equipment/charms/towel.png"
-        name="Towel"
-        description="You can dry yourself off with it if it still seems to be clean enough. - Douglas Adams"
-        effect="M. Attack +5"
-        type="equip-charm"
-        weight="50"/>
-    <item id="750"
-        image="use/potions/c.png|G:#f0f040,ffffff"
-        name="Slow Poison Potion"
-        description="A yellow potion with a fresh, citric scent."
-        effect="Suspends poison."
-        type="usable"
-        hp="5"
-        weight="10"/>
-    <item id="751"
-        image="equipment/head/pinkiehat.png"
-        name="Pinkie Hat"
-        description="With this, you'll fit right in with those strange pinkies."
-        effect="M. Attack +1"
-        type="equip-head"
-        defense="1"
-        weight="5">
-        <sprite>equipment/head/pinkiehat.xml</sprite>
-    </item>
-    <item id="752"
-        image="equipment/head/fluffyhat.png"
-        name="Fluffy Hat"
-        description="Now you can wear fur on your head."
-        effect="M. Attack -5"
-        type="equip-head"
-        defense="2"
-        weight="10">
-        <sprite>equipment/head/fluffyhat.xml</sprite>
-    </item>
-    <item id="753"
-        image="generic/batwing.png"
-        name="Bat Wing"
-        description="The wing from a bat."
-        type="generic"
-        weight="3"/>
-    <item id="754"
-        image="generic/batteeth.png"
-        name="Bat Teeth"
-        description="The teeth from a bat. Rather sharp."
-        type="generic"
-        weight="2"/>
-    <item id="755"
-        image="equipment/chest/assassintop.png"
-        name="Assassin Shirt"
-        description="Shirt for a master assassin."
-        effect="M. Attack -5"
-        type="equip-torso"
-        defense="10"
-        agi="10"
-        weight="15">
-        <sprite gender="male">equipment/chest/assassin-male.xml</sprite>
-        <sprite gender="female">equipment/chest/assassin-female.xml</sprite>
-    </item>
-    <item id="756"
-        image="equipment/hands/assassingloves.png"
-        name="Assassin Gloves"
-        description="Gloves for a master assassin."
-        effect="M. Attack -3"
-        type="equip-arms"
-        defense="5"
-        agi="5"
-        weight="9">
-        <sprite gender="male">equipment/hands/assassin-male.xml</sprite>
-        <sprite gender="female">equipment/hands/assassin-female.xml</sprite>
-    </item>
-    <item id="757"
-        image="equipment/feet/assassinboots.png"
-        name="Assassin Boots"
-        description="Boots for a master assassin."
-        effect="M. Attack -3"
-        type="equip-feet"
-        defense="5"
-        agi="5"
-        weight="10">
-        <sprite gender="male">equipment/feet/assassin-boots-male.xml</sprite>
-        <sprite gender="female">equipment/feet/assassin-boots-female.xml</sprite>
-    </item>
-    <item id="758"
-        image="equipment/weapon/staff-woodstaff.png"
-        name="Wooden Staff"
-        description="A basic wooden staff."
-        effect="Damage +50 / M. Attack +5"
-        type="equip-2hand"
-        weapon-type="polearm"
-        attack-action="attack"
-        weight="1000">
-        <sprite>weapon-staff.xml</sprite>
-    </item>
-    <item id="759"
-        image="equipment/head/paladin-helm.png"
-        name="Paladin's Helmet"
-        description="Worn only by paladins."
-        type="equip-head"
-        defense="19"
-        weight="43">
-        <sprite>equipment/head/paladinhelm.xml</sprite>
-    </item>
-    <item id="760"
-        image="equipment/head/overlord-helm.png"
-        name="Overlord's Helmet"
-        description="Worn by the greatest warriors."
-        type="equip-head"
-        defense="20"
-        weight="45">
-        <sprite>equipment/head/overlordhelm.xml</sprite>
-    </item>
-    <item id="761"
-        image="equipment/head/desert-helmet.png"
-        name="Desert Helmet"
-        description="The perfect desert warriors' helmet."
-        type="equip-head"
-        weight="48"
-        defense="21">
-        <sprite>equipment/head/desert-helmet.xml</sprite>
-    </item>
-    <item id="762"
-        image="equipment/ammo/arrow.png|W:#8B4513"
-        name="Terranite Arrow"
-        description="A terranite arrow."
-        effect="Damage +50 / Critical Damage +10"
-        type="equip-ammo"
-        weight="1"/>
-    <item id="763"
-        image="generic/terraniteore.png"
-        name="Terranite Ore"
-        description="Some ore collected out of terranite."
-        type="generic"
-        weight="40"/>
-    <item id="764"
-        image="equipment/head/sailor_hat.png"
-        name="Sailor Hat"
-        description="A hat worn by brave sailors."
-        type="equip-head"
-        defense="5"
-        weight="5">
-        <sprite>equipment/head/sailor-hat.xml</sprite>
-    </item>
-    <item id="765"
-        image="equipment/head/captain_hat.png"
-        name="Captain's Hat"
-        description="A hat worn by the bravest captains."
-        type="equip-head"
-        defense="15"
-        weight="8">
-        <sprite>equipment/head/captain-hat.xml</sprite>
-    </item>
-    <item id="766"
-        image="equipment/head/terranitehelm.png"
-        name="Terranite Helmet"
-        description="A magical helmet made out of semi-polished granite that was enchanted to be very light. Great for mages on the battlefield."
-        effect="M. Attack -12 / M. Defense +5"
-        type="equip-head"
-        defense="15"
-        weight="300">
-        <sprite>equipment/head/terranitehelm.xml</sprite>
-    </item>
-    <item id="767"
-        image="equipment/chest/terranite.png"
-        name="Terranite Chest Armor"
-        description="A nice piece of armor made out of terranite ore."
-        effect="M. Attack -70 / M. Defense +10"
-        type="equip-torso"
-        defense="20"
-        dex="1"
-        weight="800">
-        <sprite gender="male">equipment/chest/terranite-male.xml</sprite>
-        <sprite gender="female">equipment/chest/terranite-female.xml</sprite>
-    </item>
-    <item id="768"
-        image="equipment/legs/terranitepants.png"
-        name="Terranite Legs"
-        description="Leggings made out of terranite."
-        effect="M. Attack -8 / M. Defense +5"
-        type="equip-legs"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/legs/terranite-male.xml</sprite>
-        <sprite gender="female">equipment/legs/terranite-female.xml</sprite>
-    </item>
-    <item id="769"
-        image="equipment/head/guyfawkes.png"
-        name="Guy Fawkes Mask"
-        description="The famous Guy Fawkes mask."
-        type="equip-head"
-        weight="30"
-        defense="3">
-        <sprite>equipment/head/guyfawkes.xml</sprite>
-    </item>
-    <item id="770"
-        image="equipment/head/fairy_hat.png"
-        name="Fairy Hat"
-        description="The famous hat worn by Robin Hood."
-        effect="M. Attack -10"
-        type="equip-head"
-        defense="5"
-        luck="3"
-        weight="20">
-        <sprite>equipment/head/fairy_hat.xml</sprite>
-    </item>
-    <item id="771"
-        image="equipment/legs/miniskirt.png|W:#a4b2b2,ffffff"
-        name="Miniskirt"
-        description="A short skirt for hot summer days."
-        effect="M. Attack -8"
-        defense="4"
-        type="equip-legs"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="772"
-        image="generic/spice.png|R:#ffff00"
-        name="Wisp Powder"
-        description="Powder from a wisp."
-        type="generic"
-        weight="3"/>
-    <item id="773"
-        image="generic/spice.png|R:#ff00ff"
-        name="Spectre Powder"
-        description="Powder from a spectre."
-        type="generic"
-        weight="3"/>
-    <item id="774"
-        image="generic/spice.png|R:#00ffff"
-        name="Poltergeist Powder"
-        description="Powder from a poltergeist."
-        type="generic"
-        weight="3"/>
-    <item id="775"
-        image="generic/bone.png"
-        name="Bone"
-        description="A bone."
-        type="generic"
-        weight="10"/>
-    <item id="776"
-        image="generic/skull.png"
-        name="Skull"
-        description="A skull."
-        type="generic"
-        weight="30"/>
-    <item id="777"
-        image="generic/rags-rotten.png"
-        name="Rotten Rags"
-        description="Rotten rags from an undead creature."
-        type="generic"
-        weight="15"/>
-    <item id="778"
-        image="generic/heart-diseased.png"
-        name="Diseased Heart"
-        description="A diseased heart. Likely from a zombie."
-        type="generic"
-        weight="10"/>
-    <item id="779"
-        image="generic/ear-zombie.png"
-        name="Undead Ear"
-        description="An ear from a zombie."
-        type="generic"
-        weight="5"/>
-    <item id="780"
-        image="generic/eyeball.png"
-        name="Undead Eye"
-        description="An eye from a zombie."
-        type="generic"
-        weight="3"/>
-    <item id="781"
-        image="equipment/head/witch-doctor-mask.png"
-        name="Witch Doctor's Mask"
-        description="A crazy mask from the Voodoo doctor."
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/witch-doctor-mask.xml</sprite>
-    </item>
-    <item id="782"
-        image="equipment/chest/forest-armor.png"
-        name="Forest Armor"
-        description="A clean and comfortable mantle with dags made for the finest stalkers."
-        effect="M. Attack -20"
-        type="equip-torso"
-        defense="10"
-        dex="3"
-        weight="30">
-        <sprite gender="male">equipment/chest/forest-armor-male.xml</sprite>
-        <sprite gender="female">equipment/chest/forest-armor-female.xml</sprite>
-    </item>
-    <item id="783"
-        image="equipment/chest/valentine-dress.png|R:#bf0e08"
-        name="Platyna Red Dress"
-        description="A silken dress with soft lace trim. If you damage it, you'll never get it to look good again. In special Platyna red."
-        effect="M. Attack +3"
-        type="equip-torso"
-        defense="15"
-        weight="35">
-        <sprite gender="female">equipment/chest/valentine-dress.xml|#bf0e08</sprite>
-    </item>
-    <item id="784"
-        image="use/food/zombie-nachos.png"
-        name="Zombie Nachos"
-        description="The flavor is in the brains."
-        type="usable"
-        hp="60"
-        weight="5"/>
-    <item id="785"
-        image="use/food/lady-fingers.png"
-        name="Lady Fingers"
-        description="Made with simulated lady fingers."
-        type="usable"
-        hp="40"
-        weight="5"/>
-    <item id="786"
-        image="use/food/jello.png"
-        name="Slime Jell-Ahh"
-        description="Finally, an edible form of slime!"
-        type="usable"
-        hp="50"
-        weight="5"/>
-    <item id="787"
-        image="use/food/snapple.png"
-        name="Snapple"
-        description="Bite it before it bites you!"
-        type="usable"
-        hp="70"
-        weight="5"/>
-    <item id="788"
-        image="use/food/juice.png"
-        name="Beetle Juice"
-        description="Thist quencing and nutritious!"
-        type="usable"
-        hp="50"
-        weight="5"/>
-    <item id="789"
-        image="use/food/skull-mug.png"
-        name="Gut Buster Ale"
-        description="If you can survive the first gulp, the rest goes down smooth."
-        type="usable"
-        hp="60"
-        weight="5"/>
-    <item id="790"
-        image="use/food/wine.png"
-        name="Blood Wine"
-        description="A good vintage."
-        type="usable"
-        hp="100"
-        weight="5"/>
-    <item id="791"
-        image="equipment/chest/tanktop.png|W:#412300,c9866b,8d4900;#ffff00"
-        name="Yeti Skin Shirt"
-        description="A shirt made of hardened yeti skin."
-        effect="M. Attack -12"
-        type="equip-torso"
-        weight="20"
-        defense="12">
-        <sprite gender="male">equipment/chest/leather-male.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
-        <sprite gender="female">equipment/chest/leather-female.xml|#412300,c9866b,8d4900;#ffff00</sprite>
-    </item>
-    <item id="792"
-        image="equipment/feet/bromenalboots.png"
-        name="Bromenal Boots"
-        description="A pair of bromenal boots."
-        effect="M. Attack -2"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/bromenalboots-male.xml</sprite>
-        <sprite gender="female">equipment/feet/bromenalboots-female.xml</sprite>
-    </item>
-        <item id="793"
-        image="equipment/chest/bromenalchest.png"
-        name="Bromenal Chest"
-        description="A bromenal chest armor."
-        effect="M. Attack -170"
-        type="equip-torso"
-        weight="2000"
-        defense="25">
-        <sprite gender="male">equipment/chest/bromenalchest-male.xml|#fbf5e9</sprite>
-        <sprite gender="female">equipment/chest/bromenalchest-female.xml|#fbf5e9</sprite>
-    </item>
-    <item id="794"
-        image="equipment/hands/bromenalgloves.png"
-        name="Bromenal Gloves"
-        description="A pair of bromenal gloves."
-        effect="M. Attack -20"
-        type="equip-arms"
-        weight="40"
-        defense="4">
-        <sprite gender="male">equipment/hands/bromenalgloves-male.xml</sprite>
-        <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite>
-    </item>
-    <item id="795"
-        image="equipment/head/bromenalhelmet.png"
-        name="Bromenal Helmet"
-        description="A hard bromenal helmet."
-        effect="M. Attack -30"
-        type="equip-head"
-        defense="15"
-        weight="400">
-        <sprite>equipment/head/bromenalhelmet.xml</sprite>
-    </item>
-    <item id="796"
-        image="equipment/legs/bromenallegs.png"
-        name="Bromenal Legs"
-        description="A bromenal leg armor."
-        effect="M. Attack -12"
-        type="equip-legs"
-        weight="150"
-        defense="">
-        <sprite gender="male">equipment/legs/bromenallegs-male.xml</sprite>
-        <sprite gender="female">equipment/legs/bromenallegs-female.xml</sprite>
-    </item>
-    <item id="797"
-        image="equipment/shield/bromenal.png"
-        name="Bromenal Shield"
-        description="A shield made of bromenal."
-        effect="M. Attack -200"
-        type="equip-shield"
-        defense="20"
-        weight="2500"/>
-    <item id="798"
-        image="equipment/chest/sorcerer-robe.png"
-        name="Sorcerer Robe (Red)"
-        description="A red lined sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="5">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#ffffff</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#ffffff</sprite>
-    </item>
-    <item id="799"
-        image="generic/mylarin-dust.png"
-        name="Mylarin Dust"
-        description="a bottle of mylarin particles."
-        type="generic"
-        weight="3"/>
-    <item id="800"
-        image="equipment/head/bowler-hat-brown.png"
-        name="Bowler Hat (Brown)"
-        description="A hat for those with a bit of class."
-        effect="M. Attack +2"
-        type="equip-head"
-        weight="30"
-        defense="10">
-        <sprite>equipment/head/bowler-hat-brown.xml</sprite>
-    </item>
-    <item id="801"
-        image="equipment/head/pinkie-helmet.png"
-        name="Pinkie Helmet"
-        description="A helmet of Pinkie warriors."
-        effect="M. Attack -20"
-        type="equip-head"
-        defense="10"
-        luck="1"
-        weight="800">
-        <sprite>equipment/head/pinkie-helmet.xml</sprite>
-    </item>
-    <item id="802"
-        image="generic/easterbasket.png"
-        name="Easter Basket"
-        description="A nice basket to put easter presents in."
-        type="generic"
-        weight="10"/>
-    <item id="803"
-        image="generic/grassliner.png"
-        name="Grass Liner"
-        description="Very good for putting something breakable on it."
-        type="generic"
-        weight="5"/>
-    <item id="804"
-        image="generic/jellybeans.png"
-        name="Jelly Beans"
-        description="Colorful and tasty Jelly Beans."
-        type="generic"
-        weight="2"/>
-    <item id="805"
-        image="generic/chocolatemouboo.png"
-        name="Chocolate Mouboo"
-        description="A mouboo made out of chocolate. It's hard not to bite it."
-        type="generic"
-        weight="3"/>
-    <item id="806"
-        image="generic/reedbundle.png"
-        name="Reed Bundle"
-        description="A bundle of reed."
-        type="generic"
-        weight="7"/>
-    <item id="807"
-        image="generic/grassseeds.png"
-        name="Grass Seeds"
-        description="Some grass seeds."
-        type="generic"
-        weight="1"/>
-    <item id="808"
-        image="use/others/warp-towel.png"
-        name="Hitchhiker's Towel"
-        description="An inconspicuous towel."
-        type="generic"
-        weight="20"/>
-    <item id="809"
-        image="use/others/warp-towel.png|W:#5e7480,f1ffff,ffffff"
-        name="White Hitchhiker's Towel"
-        description="An inconspicuous white towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="810"
-        image="use/others/warp-towel.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Hitchhiker's Towel"
-        description="An inconspicuous red towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="811"
-        image="use/others/warp-towel.png|W:#1f9c1f,89d689"
-        name="Green Hitchhiker's Towel"
-        description="An inconspicuous green towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="812"
-        image="use/others/warp-towel.png|W:#4b4bbd,888af4"
-        name="Blue Hitchhiker's Towel"
-        description="An inconspicuous blue towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="813"
-        image="use/others/warp-towel.png|W:#ccb534,f1ea8e,ffffaa"
-        name="Yellow Hitchhiker's Towel"
-        description="An inconspicuous yellow towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="814"
-        image="use/others/warp-towel.png|W:#530a7c,b362e1,ca87ef"
-        name="Purple Hitchhiker's Towel"
-        description="An inconspicuous purple towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="815"
-        image="use/others/warp-towel.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Hitchhiker's Towel"
-        description="An inconspicuous orange towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="816"
-        image="use/others/warp-towel.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Hitchhiker's Towel"
-        description="An inconspicuous pink towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="817"
-        image="use/others/warp-towel.png|W:#4ee2ec"
-        name="Teal Hitchhiker's Towel"
-        description="An inconspicuous teal towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="818"
-        image="use/others/warp-towel.png|W:#41a317"
-        name="Lime Hitchhiker's Towel"
-        description="An inconspicuous lime towel."
-        effect="A strange way of travelling."
-        type="generic"
-        weight="30"/>
-    <item id="819"
-        image="generic/gempowder.png|W:#5e7480,f1ffff,ffffff"
-        name="Diamond Powder"
-        description="A white powder made out of a diamond."
-        type="generic"
-        weight="5"/>
-    <item id="820"
-        image="generic/gempowder.png|W:#580000,a40000,c02020,ff6060"
-        name="Ruby Powder"
-        description="A red powder made out of a ruby."
-        type="generic"
-        weight="5"/>
-    <item id="821"
-        image="generic/gempowder.png|W:#1f9c1f,89d689"
-        name="Emerald Powder"
-        description="A green powder made out of an emerald."
-        type="generic"
-        weight="5"/>
-    <item id="822"
-        image="generic/gempowder.png|W:#4b4bbd,888af4"
-        name="Sapphire Powder"
-        description="A blue powder made out of a sapphire."
-        type="generic"
-        weight="5"/>
-    <item id="823"
-        image="generic/gempowder.png|W:#ccb534,f1ea8e,ffffaa"
-        name="Topaz Powder"
-        description="A yellow powder made out of a topaz."
-        type="generic"
-        weight="5"/>
-    <item id="824"
-        image="generic/gempowder.png|W:#530a7c,b362e1,ca87ef"
-        name="Amethyst Powder"
-        description="A purple powder made out of an amethyst."
-        type="generic"
-        weight="5"/>
-    <item id="825"
-        image="use/potions/a.png|G:#3636b0,ffffff"
-        name="Tiny Mana Elixir"
-        description="A tiny mana potion made from brewed, powerful items."
-        type="usable"
-        mp="25"
-        weight="5"/>
-    <item id="826"
-        image="use/potions/d.png|G:#3636b0,ffffff"
-        name="Small Mana Elixir"
-        description="A small mana potion made from brewed, powerful items."
-        type="usable"
-        mp="50"
-        weight="10"/>
-    <item id="827"
-        image="use/potions/b.png|G:#3636b0,ffffff"
-        name="Medium Mana Elixir"
-        description="A medium mana potion made from brewed, powerful items."
-        type="usable"
-        mp="100"
-        weight="15"/>
-    <item id="828"
-        image="use/potions/c.png|G:#3636b0,ffffff"
-        name="Large Mana Elixir"
-        description="A large mana potion made from brewed, powerful items."
-        type="usable"
-        mp="250"
-        weight="25"/>
-    <item id="829"
-        image="equipment/charms/fourleaf-amulet.png|W:#332f27,584a31,af7817,ffffff"
-        name="Crozenite Four-Leaf Amulet"
-        description="An amulet that brings the wearer luck where ever they go."
-        effect="M. Attack +5"
-        type="equip-charm"
-        luck="1"
-        weight="10"/>
-    <item id="830"
-        image="equipment/charms/fourleaf-amulet.png|W:#3f2e26,644435,7c513c,ffffff"
-        name="Bromenal Four-Leaf Amulet"
-        description="An amulet that brings the wearer good luck where ever they go."
-        effect="M. Attack +5"
-        type="equip-charm"
-        luck="2"
-        weight="10"/>
-    <item id="831"
-        image="equipment/charms/fourleaf-amulet.png|W:#272f33,384347,6f7e85,ffffff"
-        name="Silver Four-Leaf Amulet"
-        description="An amulet that brings the wearer great luck where ever they go."
-        effect="M. Attack +5"
-        type="equip-charm"
-        luck="3"
-        weight="10"/>
-    <item id="832"
-        image="equipment/charms/fourleaf-amulet.png|W:#857a4d,bc9600,fdd017,ffffff"
-        name="Golden Four-Leaf Amulet"
-        description="An amulet that brings the wearer excellent luck where ever they go."
-        effect="M. Attack +5"
-        type="equip-charm"
-        luck="4"
-        weight="10"/>
-    <item id="833"
-        image="equipment/charms/broken-fourleaf-amulet.png"
-        name="Broken Four-Leaf Amulet"
-        description="A broken four-leaf clover amulet."
-        type="generic"
-        weight="10"/>
-    <item id="834"
-        image="generic/doll.png"
-        name="Doll"
-        description="An ancient doll taken from a fallen Fey Element that used it as a lure for its young victims."
-        type="generic"
-        weight="15"/>
-    <item id="835"
-        image="generic/stinger-new.png|R:#1a160f,93774a"
-        name="Hyvern Stinger"
-        description="A stinger snapped off the end of a Hyvern's abdomen."
-        type="generic"
-        weight="10"/>
-    <item id="836"
-        image="generic/grub-slime.png"
-        name="Grub Slime"
-        description="The orifice secretions of a grub."
-        type="generic"
-        weight="2"/>
-
-    <!-- ID 837 RESERVED - "Witch Root" -->
-
-    <!-- HERE ARE SOME UNUSED ITEM IDS -->
-
-    <item id="1198"
-        image="generic/spectral-orb.png|R:#ff6600,ff9933,ffff33"
-        name="Jack O Soul"
-        description="The soul of a Jack O."
-        type="generic"
-        weight="1"/>
-    <item id="1199"
-        image="equipment/ammo/arrow.png"
-        name="Arrow"
-        description="A standard arrow."
-        effect="Damage +20"
-        type="equip-ammo"
-        weight="1"/>
-    <item id="1200"
-        image="equipment/weapon/bow-bow.png"
-        name="Bow"
-        description="A distance weapon."
-        effect="Damage +15 / Range 5"
-        type="equip-2hand"
-        weight="20"
-        missile-particle="graphics/particles/arrow.particle.xml"
-        weapon-type="bow"
-        attack-action="attack_bow">
-        <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
-    </item>
-    <item id="1201"
-        image="equipment/weapon/dagger-knive.png"
-        name="Knife"
-        description="A small knife; the perfect weapon for a beginner."
-        effect="Damage +5"
-        type="equip-1hand"
-        weight="120"
-        weapon-type="knife"
-        attack-action="attack">
-        <sprite>weapon-dagger.xml</sprite>
-    </item>
-    <item id="1202"
-        image="equipment/chest/cottonshirt.png|W:#a4b2b2,ffffff"
-        name="Cotton Shirt"
-        description="A shirt made of 100% cotton."
-        effect="M. Attack -2"
-        type="equip-torso"
-        defense="2"
-        weight="13">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#a4b2b2,ffffff</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#a4b2b2,ffffff</sprite>
-    </item>
-    <item id="1203"
-        image="equipment/head/rangerhat.png"
-        name="Ranger Hat"
-        description="A leather hat traditionally worn by rangers."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="2"
-        weight="20">
-        <sprite>equipment/head/rangerhat.xml</sprite>
-    </item>
-    <item id="1204"
-        image="equipment/head/antlerhat.png"
-        name="Antler Hat"
-        description="A hat with antlers sticking out of it."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="4"
-        weight="15">
-        <sprite>equipment/head/antlerhat.xml</sprite>
-    </item>
-    <item id="1205"
-        image="equipment/head/christmastree.png"
-        name="Christmas Tree Hat"
-        description="A hat shaped like a Christmas tree."
-        type="equip-head"
-        defense="2"
-        weight="20">
-        <sprite>equipment/head/christmastree.xml</sprite>
-    </item>
-    <item id="1206"
-        image="equipment/head/santabeardhat.png"
-        name="Santa Beard Hat"
-        description="Now you will look just like Santa Claus!"
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="5"
-        weight="20">
-        <sprite>equipment/head/santabeardhat.xml</sprite>
-    </item>
-    <item id="1207"
-        image="generic/redstocking.png"
-        name="Red Christmas Stocking"
-        description="Eww, it's smelly!"
-        type="generic"
-        weight="10"/>
-    <item id="1208"
-        image="generic/easteregg-red.png"
-        name="Red Easter Egg"
-        description="A red easter egg. Find all six different easter eggs to win a prize."
-        type="generic"
-        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."
-        type="generic"
-        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."
-        type="generic"
-        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."
-        type="generic"
-        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."
-        type="generic"
-        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."
-        type="generic"
-        weight="10"/>
-    <item id="1214"
-        image="equipment/head/bunnyears.png"
-        name="Bunny Ears"
-        description="A headband with plush bunny ears."
-        effect="M. Attack +1"
-        type="equip-head"
-        defense="10"
-        weight="20">
-        <sprite>equipment/head/bunnyears.xml</sprite>
-    </item>
-    <item id="1215"
-        image="equipment/weapon/sword-sabre.png"
-        name="Toy Sabre"
-        description="A toy item, doesn't do much damage."
-        effect="Damage +1"
-        type="equip-1hand"
-        weapon-type="sword"
-        weight="1">
-        <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
-        <sound event="hit">weapons/swords/sabre-hit1.ogg</sound>
-    </item>
-    <item id="1216"
-        image="equipment/head/mouboohead.png"
-        name="Mouboo Head"
-        description="A tightly fitting mouboo head."
-        type="equip-head"
-        defense="1"
-        weight="80">
-        <sprite>equipment/head/mouboohead.xml</sprite>
-    </item>
-    <item id="1217"
-        image="equipment/head/catears.png|M:#774444;W:#777777"
-        name="Cat Ears"
-        description="A pair of plush cat ears. Meow!"
-        effect="M. Attack +1"
-        type="equip-head"
-        defense="1"
-        agi="3"
-        weight="20">
-        <sprite>equipment/head/catears.xml|#774444;#777777</sprite>
-    </item>
-    <item id="1218"
-        image="equipment/head/paperbag.png"
-        name="Paper Bag"
-        description="A paper bag with eye holes."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="1"
-        agi="-1"
-        weight="10">
-        <sprite>equipment/head/paperbag.xml</sprite>
-    </item>
-    <item id="1219"
-        image="equipment/head/moubootaurhead.png"
-        name="Moubootaur Head"
-        description="The Moubootaur's head."
-        type="equip-head"
-        defense="1"
-        weight="80">
-        <sprite>equipment/head/moubootaurhead.xml</sprite>
-    </item>
-    <item id="1220"
-        image="equipment/head/parsley-earplugs.png"
-        name="Bunch of Parsley"
-        description="A bunch of parsley, useful for salads and many other dishes. In a pinch, it doubles as earplugs."
-        type="equip-head"
-        defense="1"
-        weight="1">
-        <sprite>equipment/head/parsley-earplugs.xml</sprite>
-    </item>
-    <item id="1221"
-        image="equipment/head/skullmask.png"
-        name="Skull Mask"
-        description="A mask made out of bones."
-        effect="M. Attack +5"
-        type="equip-head"
-        defense="3"
-        weight="150">
-        <sprite>equipment/head/skullmask.xml</sprite>
-    </item>
-    <item id="1222"
-        image="generic/claylump_small.png"
-        name="Small Piece of Clay"
-        description="A small piece of clay, used to make different shapes."
-        type="generic"
-        weight="5"/>
-    <item id="1223"
-        image="generic/claylump_big.png"
-        name="Big Piece of White Clay"
-        description="A big piece of white clay, used to make bigger shapes."
-        type="generic"
-        weight="10"/>
-    <item id="1224"
-        image="generic/scroll.png"
-        name="Scroll of Paper"
-        description="A scroll made of fine paper."
-        type="generic"
-        weight="1"/>
-    <item id="1225"
-        image="use/scrolls/firescroll.png"
-        name="Fire Scroll"
-        description="A scroll on which is written an ancient formula giving birth to fire."
-        type="generic"
-        weight="1"/>
-    <item id="1226"
-        image="generic/silverbell.png"
-        name="Silver Bell"
-        description="A tiny bell made of silver."
-        type="generic"
-        weight="25"/>
-    <item id="1227"
-        image="equipment/charms/enchanter.png"
-        name="Enchanter's Amulet"
-        description="An amulet made for true enchanters."
-        type="equip-charm"
-        weight="1"/>
-    <item id="1228"
-        image="generic/crystal.png|W:#ba58ff,d496ff,ffffff"
-        name="Light Crystal"
-        description="A light crystal that emits an angelic aura."
-        type="generic"
-        weight="10"/>
-    <item id="1229"
-        image="use/food/caramelapple.png"
-        name="Caramel Apple"
-        description="A caramel coated apple, complete with stick. Rots teeth, tastes good."
-        type="usable"
-        hp="1000"
-        weight="5"/>
-    <item id="1230"
-        image="use/food/lollipop.png|W:#2502d6"
-        name="Booberry Blue Lollipop"
-        description="A lollipop. Mmm."
-        type="usable"
-        hp="800"
-        weight="1"/>
-    <item id="1231"
-        image="use/food/lollipop.png|W:#00ba16"
-        name="Ghastly Green Lollipop"
-        description="A lollipop. Tasty."
-        type="usable"
-        hp="800"
-        weight="1"/>
-    <item id="1232"
-        image="use/food/lollipop.png|W:#e00418"
-        name="Blood Red Lollipop"
-        description="A lollipop. Yum."
-        type="usable"
-        hp="800"
-        weight="1"/>
-    <item id="1233"
-        image="generic/fakefangs.png"
-        name="Cheap Plastic Fangs"
-        description="A costumed Dracula's must. Doesn't really suck blood."
-        type="generic"
-        weight="1"/>
-    <item id="1234"
-        image="generic/christmasbulb.png|W:#f00000"
-        name="Red Christmas Ornament"
-        description="An ornament from Santa's tree."
-        type="generic"
-        weight="1"/>
-    <item id="1235"
-        image="generic/christmasbulb.png|W:#f0e000"
-        name="Yellow Christmas Ornament"
-        description="An ornament from Santa's tree."
-        type="generic"
-        weight="1"/>
-    <item id="1236"
-        image="generic/christmasbulb.png|W:#00f000"
-        name="Green Christmas Ornament"
-        description="An ornament from Santa's tree."
-        type="generic"
-        weight="1"/>
-    <item id="1237"
-        image="generic/christmasbulb.png|W:#00f0ee"
-        name="Aqua Christmas Ornament"
-        description="An ornament from Santa's tree."
-        type="generic"
-        weight="1"/>
-    <item id="1238"
-        image="generic/christmasbulb.png|W:#0000d0"
-        name="Blue Christmas Ornament"
-        description="An ornament from Santa's tree."
-        type="generic"
-        weight="1"/>
-    <item id="1239"
-        image="generic/christmasbulb.png|W:#d000ef"
-        name="Purple Christmas Ornament"
-        description="An ornament from Santa's tree."
-        type="generic"
-        weight="1"/>
-    <item id="1240"
-        image="generic/santaglobe.png"
-        name="Santa Snow Globe"
-        description="An snow globe featuring Santa."
-        type="generic"
-        weight="1"/>
-    <item id="1241"
-        image="generic/snowmanglobe.png"
-        name="Snowman Snow Globe"
-        description="An snow globe featuring a snowman."
-        type="generic"
-        weight="1"/>
-   <item id="1242"
-        image="equipment/head/snowgoggles.png"
-        name="Snow Goggles"
-        description="Snow Goggles to keep your eyeballs from freezing."
-        effect="M. Attack -2"
-        type="equip-head"
-        defense="5"
-        weight="10">
-        <sprite>equipment/head/snowgoggles.xml</sprite>
-    </item>
-
-    <!-- RESERVED -->
-
-    <item id="1244"
-        image="generic/iten.png"
-        name="Dark Talisman"
-        description="A small cube. It radiates unimaginable power, and is quite dizzying to look at."
-        effect="Unimaginable powers to a successful wielder. M. Attack +100"
-        type="equip-torso"
-        >
-        <sprite>equipment/override/skeleton.xml</sprite>
-        <particlefx>graphics/particles/wisp.particle.xml</particlefx>
-    </item>
-    <item id="1245"
-        image="generic/bent-needle.png"
-        name="Bent Needle"
-        description="A twisted needle. It would be difficult to find one in a haystack, for example."
-        effect="This item has no use."
-        type="generic"
-        weight="3"/>
-    <item id="1246"
-        image="generic/dark-easter-egg.png"
-        name="Dark Easter Egg"
-        description="A smooth chocolate easter egg."
-        effect="This item has no use."
-        type="generic"
-        weight="10"/>
-    <item id="1247"
-        image="equipment/head/heart-glasses.png"
-        name="Heart Glasses"
-        description="Heart Glasses from another universe. Decisions were different there."
-        effect="M. Attack +5"
-        type="equip-head"
-        defense="4"
-        weight="20">
-        <sprite>equipment/head/heart-glasses.xml</sprite>
-    </item>
-    <item id="1248"
-        image="use/food/blueberries.png"
-        name="Blueberries"
-        description="Near to bursting with sweet juice."
-        type="usable"
-        hp="200"
-        weight="6"/>
-    <item id="1249"
-        image="generic/strange-coin.png"
-        name="Strange Coin"
-        description="A strange coin. The markings on it are unlike anything you have ever seen before."
-        effect="This item has no use."
-        type="generic"
-        weight="3"/>
-    <item id="1250"
-        image="use/food/pear.png"
-        name="Pear"
-        description="Juicy, crunchy, and delicious."
-        type="usable"
-        hp="150"
-        weight="7"/>
-    <item id="1251"
-        image="use/food/yellow-plum.png"
-        name="Yellow Plum"
-        description="A yellow variety of plum that is both sweet and sour."
-        type="usable"
-        hp="100"
-        weight="10"/>
-    <item id="1252"
-        image="use/food/cherry.png"
-        name="Cherry"
-        description="A small but delectable cherry."
-        type="usable"
-        hp="50"
-        weight="5"/>
-    <item id="1253"
-        image="use/food/apple.png|R:#b3ab77;Y:#ffc030;G:#66cc33"
-        name="Golden Delicious Apple"
-        description="A golden apple. Taken from a tree of many fruits from a distant world."
-        type="usable"
-        hp="200"
-        weight="30"/>
-    <item id="1254"
-        image="generic/dark-petal.png"
-        name="Dark Petal"
-        description="A single, dark, petal, oddly heavy. The edges of the petal are unusually hard, and have a slightly reflective shine to them. But looking into the gleam, you can only see fire..."
-        effect="A ticket between worlds. If you should find yourself transported by one, be sure not to lose it, lest you become trapped indefinitely. This item cannot be used directly."
-        type="generic"
-        weight="250"/>
-    <item id="1255"
-        image="equipment/head/rabbit-ears.png|W:#ffffff"
-        name="White Rabbit Ears"
-        description="A headband with rabbit ears, pure white."
-        effect="M. Attack +4"
-        defense="5"
-        type="equip-head"
-        weight="20">
-        <sprite>equipment/head/rabbit-ears.xml|#ffffff</sprite>
-    </item>
-    <item id="1256"
-        image="equipment/head/eggshell-hat.png"
-        name="Eggshell Hat"
-        description="A novelty hat shaped like an eggshell half."
-        type="equip-head"
-        defense="12"
-        agi="-1"
-        weight="15">
-        <sprite>equipment/head/eggshell.xml</sprite>
-    </item>
-    <item id="1257"
-        image="generic/flawed-lens.png"
-        name="Flawed Lens"
-        description="A failed attempt at making a lens with powerful properties. Perhaps, one day, you will be able to salvage the remains from this effort."
-        effect="This item has no use."
-        type="generic"
-        weight="3"/>
-    <item id="1258"
-        image="use/food/honey.png"
-        name="Honey"
-        description="A sweet food made by certain insects using nectar from flowers."
-        type="usable"
-        hp="100"
-        weight="20"/>
-    <item id="1276"
-        image="equipment/head/opera-mask.png"
-        name="Opera Mask"
-        description="Pale and broken. There is surely a story to be told here."
-        type="equip-head"
-        defense="3"
-        weight="50">
-        <sprite>equipment/head/operamask.xml</sprite>
-     </item>
-     <item id="1277"
-        image="equipment/head/jestermask.png"
-        name="Jester Mask"
-        description="Laughter with bells on."
-        type="equip-head"
-        defense="3"
-        weight="50">
-        <sprite>equipment/head/jestermask.xml</sprite>
-     </item>
-     <item id="1278"
-        image="equipment/head/witch-hat.png"
-        name="Witch Hat"
-        description="Big, dark, and pointy. It looks a bit out of place."
-        type="equip-head"
-        defense="3"
-        weight="50">
-        <sprite>equipment/head/witch-hat.xml</sprite>
-     </item>
-     <item id="1279"
-        image="equipment/head/goblin-mask.png"
-        name="Goblin Mask"
-        description="A strange dark mask. Who knows what lurks behind it?"
-        type="equip-head"
-        defense="3"
-        weight="50">
-        <sprite>equipment/head/goblin-mask.xml</sprite>
-     </item>
-     <item id="1280"
-        image="generic/scissors.png"
-        name="Scissors"
-        description="A pair of awkward and unwieldy scissors."
-        effect="A dangerous barber."
-        type="usable"
-        weight="120"/>
-     <item id="1281"
-        image="use/food/shock-candy.png"
-        name="Shock Sweet"
-        description="It'll turn your hair white!"
-        type="usable"
-        weight="5"/>
-     <item id="1282"
-        image="equipment/ammo/bonedarts.png"
-        name="Bone Arrows"
-        description="Arrows made from bone. Not much different from the normal variety, but are much lighter."
-        effect="Damage +55"
-        type="equip-ammo"
-        weight="0"/>
-
-    <!-- The 2XXY IDs are used for recolored items on eAthena.
-        XX = item
-        Y = color variant
-        XXY = viewID
-
-        On the new server recolorable items should use the same item number
-        (as long as they are functionally identical while the color is sent as
-        an additional item property.
-    -->
-
-    <item id="2050"
-        image="equipment/chest/cottonshirt.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Cotton Shirt"
-        description="A red shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2051"
-        image="equipment/chest/cottonshirt.png|W:#115511,22aa22,99dd99"
-        name="Green Cotton Shirt"
-        description="A green shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2052"
-        image="equipment/chest/cottonshirt.png|W:#222255,6666ff"
-        name="Dark Blue Cotton Shirt"
-        description="A dark blue shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2053"
-        image="equipment/chest/cottonshirt.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Cotton Shirt"
-        description="A yellow shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2054"
-        image="equipment/chest/cottonshirt.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Cotton Shirt"
-        description="A light blue shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2055"
-        image="equipment/chest/cottonshirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Cotton Shirt"
-        description="A pink shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2056"
-        image="equipment/chest/cottonshirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Cotton Shirt"
-        description="A black shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2057"
-        image="equipment/chest/cottonshirt.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Cotton Shirt"
-        description="An orange shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2058"
-        image="equipment/chest/cottonshirt.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Cotton Shirt"
-        description="A purple shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2059"
-        image="equipment/chest/cottonshirt.png|W:#104010,208020,30c030"
-        name="Dark Green Cotton Shirt"
-        description="A dark green shirt made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/chest/cotton-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/chest/cotton-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2060"
-        image="equipment/chest/vnecksweater.png|W:#580000,a40000,c02020,ff6060"
-        name="Red V-Neck Sweater"
-        description="A thin, soft and warm red sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2061"
-        image="equipment/chest/vnecksweater.png|W:#115511,22aa22,99dd99"
-        name="Green V-Neck Sweater"
-        description="A thin, soft and warm green sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2062"
-        image="equipment/chest/vnecksweater.png|W:#222255,6666ff"
-        name="Dark Blue V-Neck Sweater"
-        description="A thin, soft and warm dark blue sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2063"
-        image="equipment/chest/vnecksweater.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow V-Neck Sweater"
-        description="A thin, soft and warm yellow sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2064"
-        image="equipment/chest/vnecksweater.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue V-Neck Sweater"
-        description="A thin, soft and warm light blue sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2065"
-        image="equipment/chest/vnecksweater.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink V-Neck Sweater"
-        description="A thin, soft and warm pink sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2066"
-        image="equipment/chest/vnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black V-Neck Sweater"
-        description="A thin, soft and warm black sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2067"
-        image="equipment/chest/vnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange V-Neck Sweater"
-        description="A thin, soft and warm orange sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2068"
-        image="equipment/chest/vnecksweater.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple V-Neck Sweater"
-        description="A thin, soft and warm purple sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2069"
-        image="equipment/chest/vnecksweater.png|W:#104010,208020,30c030"
-        name="Dark Green V-Neck Sweater"
-        description="A thin, soft and warm dark green sweater."
-        effect="M. Attack -16"
-        type="equip-torso"
-        defense="8"
-        weight="35">
-        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2070"
-        image="equipment/chest/tnecksweater.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Turtleneck Sweater"
-        description="A thick, soft and warm red sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2071"
-        image="equipment/chest/tnecksweater.png|W:#115511,22aa22,99dd99"
-        name="Green Turtleneck Sweater"
-        description="A thick, soft and warm green sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2072"
-        image="equipment/chest/tnecksweater.png|W:#222255,6666ff"
-        name="Dark Blue Turtleneck Sweater"
-        description="A thick, soft and warm dark blue sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2073"
-        image="equipment/chest/tnecksweater.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Turtleneck Sweater"
-        description="A thick, soft and warm yellow sweater."
-        type="equip-torso"
-        effect="M. Attack -12"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2074"
-        image="equipment/chest/tnecksweater.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Turtleneck Sweater"
-        description="A thick, soft and warm light blue sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2075"
-        image="equipment/chest/tnecksweater.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Turtleneck Sweater"
-        description="A thick, soft and warm pink sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2076"
-        image="equipment/chest/tnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Turtleneck Sweater"
-        description="A thick, soft and warm black sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2077"
-        image="equipment/chest/tnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Turtleneck Sweater"
-        description="A thick, soft and warm orange sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2078"
-        image="equipment/chest/tnecksweater.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Turtleneck Sweater"
-        description="A thick, soft and warm purple sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2079"
-        image="equipment/chest/tnecksweater.png|W:#104010,208020,30c030"
-        name="Dark Green Turtleneck Sweater"
-        description="A thick, soft and warm dark green sweater."
-        effect="M. Attack -12"
-        type="equip-torso"
-        defense="6"
-        weight="35">
-        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2080"
-        image="equipment/chest/silk-robe.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Silk Robe"
-        description="A light and shimmering red silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2081"
-        image="equipment/chest/silk-robe.png|W:#115511,22aa22,99dd99"
-        name="Green Silk Robe"
-        description="A light and shimmering green silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2082"
-        image="equipment/chest/silk-robe.png|W:#222255,6666ff"
-        name="Dark Blue Silk Robe"
-        description="A light and shimmering dark blue silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2083"
-        image="equipment/chest/silk-robe.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Silk Robe"
-        description="A light and shimmering yellow silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2084"
-        image="equipment/chest/silk-robe.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Silk Robe"
-        description="A light and shimmering light blue silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2085"
-        image="equipment/chest/silk-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Silk Robe"
-        description="A light and shimmering pink silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2086"
-        image="equipment/chest/silk-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Silk Robe"
-        description="A light and shimmering black silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2087"
-        image="equipment/chest/silk-robe.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Silk Robe"
-        description="A light and shimmering orange silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2088"
-        image="equipment/chest/silk-robe.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Silk Robe"
-        description="A light and shimmering purple silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2089"
-        image="equipment/chest/silk-robe.png|W:#104010,208020,30c030"
-        name="Dark Green Silk Robe"
-        description="A light and shimmering dark green silk robe."
-        type="equip-torso"
-        defense="5"
-        weight="30">
-        <sprite gender="male">equipment/chest/robe-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2090"
-        image="equipment/chest/tanktop.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Tank Top"
-        description="A red sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2091"
-        image="equipment/chest/tanktop.png|W:#115511,22aa22,99dd99"
-        name="Green Tank Top"
-        description="A green sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2092"
-        image="equipment/chest/tanktop.png|W:#222255,6666ff"
-        name="Dark Blue Tank Top"
-        description="A dark blue sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2093"
-        image="equipment/chest/tanktop.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Tank Top"
-        description="A yellow sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2094" image="equipment/chest/tanktop.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Tank Top"
-        description="A light blue sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2095" image="equipment/chest/tanktop.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Tank Top"
-        description="A pink sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2096"
-        image="equipment/chest/tanktop.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Tank Top"
-        description="A black sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2097"
-        image="equipment/chest/tanktop.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Tank Top"
-        description="An orange sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2098" image="equipment/chest/tanktop.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Tank Top"
-        description="A purple sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2099"
-        image="equipment/chest/tanktop.png|W:#104010,208020,30c030"
-        name="Dark Green Tank Top"
-        description="A dark green sleeveless shirt for hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="12">
-        <sprite gender="male">equipment/chest/tanktop-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/chest/tanktop-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2100"
-        image="equipment/legs/skirt.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Cotton Skirt"
-        description="A red skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2101"
-        image="equipment/legs/skirt.png|W:#115511,22aa22,99dd99"
-        name="Green Cotton Skirt"
-        description="A green skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-      <sprite>equipment/legs/skirt.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2102"
-        image="equipment/legs/skirt.png|W:#222255,6666ff"
-        name="Dark Blue Cotton Skirt"
-        description="A dark blue skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2103"
-        image="equipment/legs/skirt.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Cotton Skirt"
-        description="A yellow skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2104"
-        image="equipment/legs/skirt.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Cotton Skirt"
-        description="A light blue skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2105"
-        image="equipment/legs/skirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Cotton Skirt"
-        description="A pink skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2106"
-        image="equipment/legs/skirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Cotton Skirt"
-        description="A black skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2107"
-        image="equipment/legs/skirt.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Cotton Skirt"
-        description="An orange skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2108"
-        image="equipment/legs/skirt.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Cotton Skirt"
-        description="A purple skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2109"
-        image="equipment/legs/skirt.png|W:#104010,208020,30c030"
-        name="Dark Green Cotton Skirt"
-        description="A dark green skirt made of linen cloth."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="20">
-        <sprite>equipment/legs/skirt.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2110"
-        image="equipment/legs/shorts.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Cotton Shorts"
-        description="Red shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2111"
-        image="equipment/legs/shorts.png|W:#115511,22aa22,99dd99"
-        name="Green Cotton Shorts"
-        description="Green shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2112"
-        image="equipment/legs/shorts.png|W:#222255,6666ff"
-        name="Dark Blue Cotton Shorts"
-        description="Dark blue shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2113"
-        image="equipment/legs/shorts.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Cotton Shorts"
-        description="Yellow shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2114"
-        image="equipment/legs/shorts.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Cotton Shorts"
-        description="Light blue shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2115"
-        image="equipment/legs/shorts.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Cotton Shorts"
-        description="Pink shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2116"
-        image="equipment/legs/shorts.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Cotton Shorts"
-        description="Black shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2117"
-        image="equipment/legs/shorts.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Cotton Shorts"
-        description="Orange shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2118"
-        image="equipment/legs/shorts.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Cotton Shorts"
-        description="Purple shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#520a7b,8c23c7,ca87ef</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#520a7b,8c23c7,ca87ef</sprite>
-    </item>
-    <item id="2119"
-        image="equipment/legs/shorts.png|W:#104010,208020,30c030"
-        name="Dark Green Cotton Shorts"
-        description="Dark green shorts made of 100% cotton."
-        effect="M. Attack -4"
-        type="equip-legs"
-        defense="2"
-        weight="20">
-        <sprite gender="male">equipment/legs/shorts-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/legs/shorts-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2120"
-        image="equipment/chest/tanktop-short.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Short Tank Top"
-        description="A short, sleeveless red shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2121"
-        image="equipment/chest/tanktop-short.png|W:#115511,22aa22,99dd99"
-        name="Green Short Tank Top"
-        description="A short, sleeveless green shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2122"
-        image="equipment/chest/tanktop-short.png|W:#222255,6666ff"
-        name="Dark Blue Short Tank Top"
-        description="A short, sleeveless dark blue shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2123"
-        image="equipment/chest/tanktop-short.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Short Tank Top"
-        description="A short, sleeveless yellow shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2124"
-        image="equipment/chest/tanktop-short.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Short Tank Top"
-        description="A short, sleeveless light blue shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2125"
-        image="equipment/chest/tanktop-short.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Short Tank Top"
-        description="A short, sleeveless pink shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2126"
-        image="equipment/chest/tanktop-short.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Short Tank Top"
-        description="A short, sleeveless black shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2127"
-        image="equipment/chest/tanktop-short.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Short Tank Top"
-        description="A short, sleeveless orange shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2128" image="equipment/chest/tanktop-short.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Short Tank Top"
-        description="A short, sleeveless purple shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2129"
-        image="equipment/chest/tanktop-short.png|W:#104010,208020,30c030"
-        name="Dark Green Short Tank Top"
-        description="A short, sleeveless dark green shirt for VERY hot summer days."
-        effect="M. Attack -4"
-        type="equip-torso"
-        defense="2"
-        weight="8">
-        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2130"
-        image="equipment/head/deserthat.png|R:#580000,a40000,c02020,ff6060"
-        name="Red Desert Hat"
-        description="While the red desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2131"
-        image="equipment/head/deserthat.png|R:#115511,22aa22,99dd99"
-        name="Green Desert Hat"
-        description="While the green desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2132"
-        image="equipment/head/deserthat.png|R:#222255,6666ff"
-        name="Dark Blue Desert Hat"
-        description="While the dark blue desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2133"
-        image="equipment/head/deserthat.png|R:#846211,dab333,fffb93,ffffff"
-        name="Yellow Desert Hat"
-        description="While the yellow desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2134"
-        image="equipment/head/deserthat.png|R:#16486e,498ec5,e4f2fc"
-        name="Light Blue Desert Hat"
-        description="While the light blue desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2135"
-        image="equipment/head/deserthat.png|R:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Desert Hat"
-        description="While the pink desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2136"
-        image="equipment/head/deserthat.png|R:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Desert Hat"
-        description="While the black desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2137"
-        image="equipment/head/deserthat.png|R:#80280f,b04810,ef681f,ffb830"
-        name="Orange Desert Hat"
-        description="While the orange desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2138"
-        image="equipment/head/deserthat.png|R:#4f0a76,8010c0,d699f7"
-        name="Purple Desert Hat"
-        description="While the purple desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2139"
-        image="equipment/head/deserthat.png|R:#104010,208020,30c030"
-        name="Dark Green Desert Hat"
-        description="While the dark green desert hat is perfect for sand storms, it won't help you much against a blow to the head."
-        effect="M. Attack -1"
-        type="equip-head"
-        defense="3"
-        weight="20">
-        <sprite>equipment/head/deserthat.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2140"
-        image="equipment/head/standardheadband.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Cotton Headband"
-        description="Just a red cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2141"
-        image="equipment/head/standardheadband.png|W:#115511,22aa22,99dd99"
-        name="Green Cotton Headband"
-        description="Just a green cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2142"
-        image="equipment/head/standardheadband.png|W:#222255,6666ff"
-        name="Dark Blue Cotton Headband"
-        description="Just a dark blue cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2143"
-        image="equipment/head/standardheadband.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Cotton Headband"
-        description="Just a yellow cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2144"
-        image="equipment/head/standardheadband.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Cotton Headband"
-        description="Just a light blue cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2145"
-        image="equipment/head/standardheadband.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Cotton Headband"
-        description="Just a pink cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2146"
-        image="equipment/head/standardheadband.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Cotton Headband"
-        description="Just a black cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2147"
-        image="equipment/head/standardheadband.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Cotton Headband"
-        description="Just an orange cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2148"
-        image="equipment/head/standardheadband.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Cotton Headband"
-        description="Just a purple cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2149"
-        image="equipment/head/standardheadband.png|W:#104010,208020,30c030"
-        name="Dark Green Cotton Headband"
-        description="Just a dark green cotton headband."
-        type="equip-head"
-        defense="2"
-        weight="5">
-        <sprite>equipment/head/standardheadband.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2150"
-        image="equipment/feet/boots.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Cotton Boots"
-        description="A red pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2151"
-        image="equipment/feet/boots.png|W:#115511,22aa22,99dd99"
-        name="Green Cotton Boots"
-        description="A green pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2152"
-        image="equipment/feet/boots.png|W:#222255,6666ff"
-        name="Dark Blue Cotton Boots"
-        description="A dark blue pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2153"
-        image="equipment/feet/boots.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Cotton Boots"
-        description="A yellow pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2154"
-        image="equipment/feet/boots.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Cotton Boots"
-        description="A light blue pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2155"
-        image="equipment/feet/boots.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Cotton Boots"
-        description="A pink pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2156"
-        image="equipment/feet/boots.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Cotton Boots"
-        description="A black pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2157"
-        image="equipment/feet/boots.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Cotton Boots"
-        description="An orange pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2158"
-        image="equipment/feet/boots.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Cotton Boots"
-        description="A purple pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2159"
-        image="equipment/feet/boots.png|W:#104010,208020,30c030"
-        name="Dark Green Cotton Boots"
-        description="A dark green pair of quality cotton boots."
-        effect="M. Attack +1"
-        type="equip-feet"
-        defense="1"
-        weight="30">
-        <sprite gender="male">equipment/feet/boots-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/feet/boots-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2160"
-        image="equipment/hands/basicgloves.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Cotton Gloves"
-        description="A red pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2161"
-        image="equipment/hands/basicgloves.png|W:#115511,22aa22,99dd99"
-        name="Green Cotton Gloves"
-        description="A green pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2162"
-        image="equipment/hands/basicgloves.png|W:#222255,6666ff"
-        name="Dark Blue Cotton Gloves"
-        description="A dark blue pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2163"
-        image="equipment/hands/basicgloves.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Cotton Gloves"
-        description="A yellow pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2164"
-        image="equipment/hands/basicgloves.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Cotton Gloves"
-        description="A light blue pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2165"
-        image="equipment/hands/basicgloves.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Cotton Gloves"
-        description="A pink pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2166"
-        image="equipment/hands/basicgloves.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Cotton Gloves"
-        description="A black pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2167"
-        image="equipment/hands/basicgloves.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Cotton Gloves"
-        description="An orange pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2168"
-        image="equipment/hands/basicgloves.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Cotton Gloves"
-        description="A purple pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2169"
-        image="equipment/hands/basicgloves.png|W:#104010,208020,30c030"
-        name="Dark Green Cotton Gloves"
-        description="A dark green pair of comfy cotton gloves."
-        effect="M. Attack -10"
-        type="equip-arms"
-        defense="1"
-        weight="20">
-        <sprite gender="male">equipment/hands/generic-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/hands/generic-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2170"
-        image="equipment/legs/miniskirt.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Miniskirt"
-        description="A red short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2171"
-        image="equipment/legs/miniskirt.png|W:#115511,22aa22,99dd99"
-        name="Green Miniskirt"
-        description="A green short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2172"
-        image="equipment/legs/miniskirt.png|W:#222255,6666ff"
-        name="Dark Blue Miniskirt"
-        description="A dark blue short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2173"
-        image="equipment/legs/miniskirt.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Miniskirt"
-        description="A yellow short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2174"
-        image="equipment/legs/miniskirt.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Miniskirt"
-        description="A light blue short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2175"
-        image="equipment/legs/miniskirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-       name="Pink Miniskirt"
-        description="A pink short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2176"
-        image="equipment/legs/miniskirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Miniskirt"
-        description="A black short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2177"
-        image="equipment/legs/miniskirt.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Miniskirt"
-        description="An orange short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2178"
-        image="equipment/legs/miniskirt.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Miniskirt"
-        description="A purple short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2179"
-        image="equipment/legs/miniskirt.png|W:#104010,208020,30c030"
-        name="Dark Green Miniskirt"
-        description="A dark green short skirt for hot summer days."
-        effect="M. Attack -8"
-        type="equip-legs"
-        defense="4"
-        weight="8">
-        <sprite gender="male">equipment/legs/miniskirt-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/legs/miniskirt-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <!-- IDs 2180 to 2189 RESERVED -->
-
-    <item id="2190"
-        image="equipment/head/rabbit-ears.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Rabbit Ears"
-        description="A headband with rabbit ears, bright red."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2191"
-        image="equipment/head/rabbit-ears.png|W:#115511,22aa22,99dd99"
-        name="Green Rabbit Ears"
-        description="A headband with rabbit ears, warm green."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2192"
-        image="equipment/head/rabbit-ears.png|W:#222255,6666ff"
-        name="Dark Blue Rabbit Ears"
-        description="A headband with rabbit ears, iridescent dark blue."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2193"
-        image="equipment/head/rabbit-ears.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Rabbit Ears"
-        description="A headband with rabbit ears, soft yellow."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2194"
-        image="equipment/head/rabbit-ears.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Rabbit Ears"
-        description="A headband with rabbit ears, light blue."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2195"
-        image="equipment/head/rabbit-ears.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Rabbit Ears"
-        description="A headband with rabbit ears, bright pink."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2196"
-        image="equipment/head/rabbit-ears.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black rabbit ears"
-        description="A headband with rabbit ears, deep black."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2197"
-        image="equipment/head/rabbit-ears.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Rabbit Ears"
-        description="A headband with rabbit ears, bright orange."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2198"
-        image="equipment/head/rabbit-ears.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Rabbit Ears"
-        description="A headband with rabbit ears, strong purple."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2199"
-        image="equipment/head/rabbit-ears.png|W:#104010,208020,30c030"
-        name="Dark Green Rabbit Ears"
-        description="A headband with rabbit ears, dark green."
-        effect="M. Attack +4"
-        type="equip-head"
-        defense="5"
-        weight="15">
-        <sprite>equipment/head/rabbit-ears.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2200"
-        image="equipment/head/wizard-hat.png|W:#580000,a40000,c02020,ff6060"
-        name="Red wizard hat"
-        description="A wizard hat, bright red."
-        effect="M. Attack +5"
-        type="equip-head"
-        defense="5"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2201"
-        image="equipment/head/wizard-hat.png|W:#115511,22aa22,99dd99"
-        name="Green Wizard Hat"
-        description="A wizard hat, warm green."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2202"
-        image="equipment/head/wizard-hat.png|W:#222255,6666ff"
-        name="Dark Blue Wizard Hat"
-        description="A wizard hat, iridescent dark blue."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2203"
-        image="equipment/head/wizard-hat.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Wizard Hat"
-        description="A wizard hat, soft yellow."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2204"
-        image="equipment/head/wizard-hat.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Wizard Hat"
-        description="A wizard hat, light blue."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2205"
-        image="equipment/head/wizard-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Wizard Hat"
-        description="A wizard hat, bright pink."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2206"
-        image="equipment/head/wizard-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Wizard Hat"
-        description="A wizard hat, deep black."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2207"
-        image="equipment/head/wizard-hat.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Wizard Hat"
-        description="A wizard hat, bright orange."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2208"
-        image="equipment/head/wizard-hat.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Wizard Hat"
-        description="A wizard hat, strong purple."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2209"
-        image="equipment/head/wizard-hat.png|W:#104010,208020,30c030"
-        name="Dark Green Wizard Hat"
-        description="A wizard hat, dark green."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2210"
-        image="equipment/head/bowler-hat.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Bowler Hat"
-        description="A hat for those with a bit of class, with a red band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2211"
-        image="equipment/head/bowler-hat.png|W:#115511,22aa22,99dd99"
-        name="Green Bowler Hat"
-        description="A hat for those with a bit of class, with a green band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2212"
-        image="equipment/head/bowler-hat.png|W:#222255,6666ff"
-        name="Dark Blue Bowler Hat"
-        description="A hat for those with a bit of class, with a dark blue band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2213"
-        image="equipment/head/bowler-hat.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Bowler Hat"
-        description="A hat for those with a bit of class, with a yellow band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2214"
-        image="equipment/head/bowler-hat.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Bowler Hat"
-        description="A hat for those with a bit of class, with a light blue band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2215"
-        image="equipment/head/bowler-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Bowler Hat"
-        description="A hat for those with a bit of class, with a pink band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2216"
-        image="equipment/head/bowler-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Bowler Hat"
-        description="A hat for those with a bit of class, with a black band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2217"
-        image="equipment/head/bowler-hat.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Bowler Hat"
-        description="A hat for those with a bit of class, with an orange band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2218"
-        image="equipment/head/bowler-hat.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Bowler Hat"
-        description="A hat for those with a bit of class, with a purple band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2219"
-        image="equipment/head/bowler-hat.png|W:#104010,208020,30c030"
-        name="Dark Green Bowler Hat"
-        description="A hat for those with a bit of class, with a dark green band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2220"
-        image="equipment/chest/sorcerer-robe.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Sorcerer Robe (Red)"
-        description="A red lined red sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#580000,a40000,c02020,ff6060</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2221"
-        image="equipment/chest/sorcerer-robe.png|W:#115511,22aa22,99dd99"
-        name="Green Sorcerer Robe (Red)"
-        description="A red lined green sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2222"
-        image="equipment/chest/sorcerer-robe.png|W:#222255,6666ff"
-        name="Dark Blue Sorcerer Robe (Red)"
-        description="A red lined dark blue sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2223"
-        image="equipment/chest/sorcerer-robe.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Sorcerer Robe (Red)"
-        description="A red lined yellow sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2224"
-        image="equipment/chest/sorcerer-robe.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Sorcerer Robe (Red)"
-        description="A red lined light blue sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2225"
-        image="equipment/chest/sorcerer-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Sorcerer Robe (Red)"
-        description="A red lined pink sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2226"
-        image="equipment/chest/sorcerer-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Sorcerer Robe (Red)"
-        description="A red lined black sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2227"
-        image="equipment/chest/sorcerer-robe.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Sorcerer Robe (Red)"
-        description="A red lined orange sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2228"
-        image="equipment/chest/sorcerer-robe.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Sorcerer Robe (Red)"
-        description="A red lined purple sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2229"
-        image="equipment/chest/sorcerer-robe.png|W:#104010,208020,30c030"
-        name="Dark Green Sorcerer Robe (Red)"
-        description="A red lined dark green sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="2230"
-        image="equipment/head/bowler-hat-brown.png|W:#580000,a40000,c02020,ff6060"
-        name="Red Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a red band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#580000,a40000,c02020,ff6060</sprite>
-    </item>
-    <item id="2231"
-        image="equipment/head/bowler-hat-brown.png|W:#115511,22aa22,99dd99"
-        name="Green Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a green band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#115511,22aa22,99dd99</sprite>
-    </item>
-    <item id="2232"
-        image="equipment/head/bowler-hat-brown.png|W:#222255,6666ff"
-        name="Dark Blue Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a dark blue band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#222255,6666ff</sprite>
-    </item>
-    <item id="2233"
-        image="equipment/head/bowler-hat-brown.png|W:#846211,dab333,fffb93,ffffff"
-        name="Yellow Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a yellow band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#846211,dab333,fffb93,ffffff</sprite>
-    </item>
-    <item id="2234"
-        image="equipment/head/bowler-hat-brown.png|W:#16486e,498ec5,e4f2fc"
-        name="Light Blue Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a light blue band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#16486e,498ec5,e4f2fc</sprite>
-    </item>
-    <item id="2235"
-        image="equipment/head/bowler-hat-brown.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
-        name="Pink Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a pink band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    </item>
-    <item id="2236"
-        image="equipment/head/bowler-hat-brown.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a black band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-    </item>
-    <item id="2237"
-        image="equipment/head/bowler-hat-brown.png|W:#80280f,b04810,ef681f,ffb830"
-        name="Orange Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with an orange band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#80280f,b04810,ef681f,ffb830</sprite>
-    </item>
-    <item id="2238"
-        image="equipment/head/bowler-hat-brown.png|W:#4f0a76,8010c0,d699f7"
-        name="Purple Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a purple band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#4f0a76,8010c0,d699f7</sprite>
-    </item>
-    <item id="2239"
-        image="equipment/head/bowler-hat-brown.png|W:#104010,208020,30c030"
-        name="Dark Green Bowler Hat (Brown)"
-        description="A hat for those with a bit of class, with a dark green band."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat-brown.xml|#104010,208020,30c030</sprite>
-    </item>
-
-    <item id="3000"
-        image="generic/jackolantern.png"
-        name="Jack O Lantern"
-        description="A pumpkin that has been carved into a super-scary face for Hallowe'en."
-        type="generic"
-        weight="1000"/>
-    <item id="3001"
-        image="generic/rubberbat.png"
-        name="Rubber Bat"
-        description="Squeaks when you squeeze it."
-        type="generic"
-        weight="30"/>
-    <item id="3002"
-        image="generic/realisticbrain.png"
-        name="Realistic Brain"
-        description="This brain sure is realistic."
-        type="generic"
-        weight="50"/>
-    <item id="3003"
-        image="generic/jarofblood.png"
-        name="Jar of Blood"
-        description="Just the thing to scare the kids at Hallowe'en."
-        type="generic"
-        weight="375"/>
-    <item id="3004"
-        image="generic/tongue.png"
-        name="Tongue"
-        description="A horrible, slimy tongue."
-        type="generic"
-        weight="5"/>
-    <item id="3006"
-        image="use/food/tonoridelight.png"
-        name="Tonori Delight"
-        description="A softly-scented jelly-like treat, dusted with the sweet white sands of Eastern Tonori."
-        type="generic"
-        weight="2"/>
-    <item id="3007"
-        image="use/food/marshmallow.png"
-        name="Marshmallow"
-        description="Flavoured with real marshmallow root."
-        type="generic"
-        weight="2"/>
-    <item id="3009"
-        image="use/food/jellyskull.png"
-        name="Jelly Skull"
-        description="Like a jelly bean, but in the shape of skull."
-        type="generic"
-        weight="2"/>
-    <item id="3010"
-        image="use/food/candypumpkin.png"
-        name="Candy Pumpkin"
-        description="With a squishy interior inside a hard, crunchy shell, this sweet has a warm and delcious pumpkin flavour."
-        type="generic"
-        weight="2"/>
-    <item id="3011"
-        image="generic/pumpkinseed.png"
-        name="Pumpkin Seeds"
-        description="The seeds from a seasonal pumpkin vine."
-        type="generic"
-        weight="1"/>
-    <item id="4000"
-        image="generic/scorpionstinger.png|W:#800000,ffffff"
-        name="Angry Scorpion Stinger"
-        description="An angry scorpion stinger."
-        type="generic"
-        weight="1"/>
-    <item id="4001"
-        image="generic/coal.png"
-        name="Coal"
-        description="A lump of coal."
-        type="generic"
-        weight="20"/>
-    <item id="4002"
-        image="generic/gemstone-b.png"
-        name="Diamond"
-        description="A raw diamond gemstone."
-        type="generic"
-        weight="20"/>
-    <item id="4003"
-        image="generic/gemstone-b.png|W:#580000,a40000,c02020,ff6060"
-        name="Ruby"
-        description="A raw ruby gemstone."
-        type="generic"
-        weight="20"/>
-    <item id="4004"
-        image="generic/gemstone-b.png|W:#1f9c1f,89d689"
-        name="Emerald"
-        description="A raw emerald gemstone."
-        type="generic"
-        weight="20"/>
-    <item id="4005"
-        image="generic/gemstone-b.png|W:#4b4bbd,888af4"
-        name="Sapphire"
-        description="A raw sapphire gemstone."
-        type="generic"
-        weight="20"/>
-    <item id="4006"
-        image="generic/gemstone-b.png|W:#ccb534,f1ea8e,ffffaa"
-        name="Topaz"
-        description="A raw topaz gemstone."
-        type="generic"
-        weight="20"/>
-    <item id="4007"
-        image="generic/gemstone-b.png|W:#530a7c,b362e1,ca87ef"
-        name="Amethyst"
-        description="A raw amethyst gemstone."
-        type="generic"
-        weight="10"/>
-    <item id="4008"
-        image="equipment/rings/gem.png"
-        name="Diamond Ring"
-        description="A diamond ring."
-        type="equip-ring"
-        vit="1"
-        weight="1"/>
-    <item id="4009"
-        image="equipment/rings/gem.png|W:#580000,a40000,c02020,ff6060"
-        name="Ruby Ring"
-        description="A ruby ring."
-        type="equip-ring"
-        str="1"
-        weight="1"/>
-    <item id="4010"
-        image="equipment/rings/gem.png|W:#1f9c1f,89d689"
-        name="Emerald Ring"
-        description="An emerald ring."
-        type="equip-ring"
-        luck="1"
-        weight="1"/>
-    <item id="4011"
-        image="equipment/rings/gem.png|W:#4b4bbd,888af4"
-        name="Sapphire Ring"
-        description="A sapphire ring."
-        type="equip-ring"
-        int="1"
-        weight="1"/>
-    <item id="4012"
-        image="equipment/rings/gem.png|W:#ccb534,f1ea8e,ffffaa"
-        name="Topaz Ring"
-        description="A topaz ring."
-        type="equip-ring"
-        agi="1"
-        weight="1"/>
-    <item id="4013"
-        image="equipment/rings/gem.png|W:#530a7c,b362e1,ca87ef"
-        name="Amethyst Ring"
-        description="An amethyst ring."
-        type="equip-ring"
-        dex="1"
-        weight="1"/>
-    <item id="4014"
-        image="equipment/rings/simple.png"
-        name="Simple Ring"
-        description="A simple ring."
-        type="equip-ring"
-        weight="1"/>
-    <item id="4015"
-        image="generic/ingot.png"
-        name="Iron Ingot"
-        description="An ingot of iron."
-        type="generic"
-        weight="200"/>
-    <item id="4016"
-        image="generic/bandit-hood.png"
-        name="Bandit Hood"
-        description="A bandit hood crawling with lice."
-        type="generic"
-        weight="50"/>
-    <item id="4017"
-        image="generic/powder.png|W:#c00000"
-        name="Red Powder"
-        description="A pile of magical red powder."
-        type="generic"
-        weight="3"/>
-     <item id="4018"
-        image="generic/powder.png|W:#ffcc00"
-        name="Yellow Powder"
-        description="A pile of magical yellow powder."
-        type="generic"
-        weight="3"/>
-     <item id="4019"
-        image="generic/powder.png|W:#003399"
-        name="Blue Powder"
-        description="A pile of magical blue powder."
-        type="generic"
-        weight="3"/>
-    <item id="4020"
-        image="equipment/head/candlehelmet.png"
-        name="Candle Helmet"
-        description="Worn by spelunkers."
-        effect="M. Attack -25"
-        type="equip-head"
-        defense="16"
-        int="1"
-        agi="-1"
-        weight="450">
-        <sprite>equipment/head/candlehelmet.xml</sprite>
-    </item>
-    <item id="4021"
-        image="generic/yellowpresentbox.png"
-        name="Yellow Present Box"
-        description="Something mysterious inside."
-        type="generic"
-        weight="10"/>
-    <item id="4022"
-        image="generic/whitepresentbox.png"
-        name="White Present Box"
-        description="Something very mysterious inside."
-        type="generic"
-        weight="10"/>
-    <item id="4023"
-        image="generic/animal-bones.png"
-        name="Animal Bones"
-        description="Bones from an animal."
-        type="generic"
-        weight="1"/>
-    <item id="4024"
-        image="generic/frozen-yeti-tear.png"
-        name="Frozen Yeti Tear"
-        description="A tear from a yeti, frozen."
-        type="generic"
-        weight="1"/>
-    <item id="4025"
-        image="generic/yeti-claw.png"
-        name="Yeti Claw"
-        description="A claw broken off from a yeti."
-        type="generic"
-        weight="1"/>
-    <item id="4026"
-        image="generic/ice-cube.png"
-        name="Ice Cube"
-        description="A very cold ice cube that never seems to completely melt."
-        type="generic"
-        weight="1"/>
-    <item id="4027"
-        image="equipment/head/yeti-mask.png"
-        name="Yeti Mask"
-        description="A mask made from the yeti's head."
-        effect="M. Attack -10"
-        type="equip-head"
-        defense="4"
-        weight="10">
-        <sprite>equipment/head/yeti-mask.xml</sprite>
-    </item>
-    <item id="4028"
-        image="equipment/head/wizard-hat.png"
-        name="Wizard Hat"
-        description="A simple wizard hat."
-        effect="M. Attack +5"
-        defense="5"
-        type="equip-head"
-        int="3"
-        weight="15">
-        <sprite>equipment/head/wizard-hat.xml</sprite>
-    </item>
-	<item id="4029"
-        image="use/potions/e.png|G:#bb0000;R:#ff0000;"
-        name="Grimace of Dementia"
-        description="A feared potion. If done wrong... what did you say?"
-        type="generic"
-        weight="50"/>
-    <item id="4030"
-        image="equipment/head/bowler-hat.png"
-        name="Bowler Hat"
-        description="A hat for those with a bit of class."
-        effect="M. Attack +2"
-        type="equip-head"
-        defense="10"
-        weight="30">
-        <sprite>equipment/head/bowler-hat.xml</sprite>
-    </item>
-    <item id="4031"
-        image="equipment/head/monocle.png"
-        name="Monocle"
-        description="A handy perception tool, even when not at the opera."
-        effect="Critical Damage +20"
-        type="equip-head"
-        defense="2"
-        dex="1"
-        luck="1"
-        weight="20">
-        <sprite>equipment/head/monocle.xml</sprite>
-    </item>
-</items>
diff --git a/data/sale.xml b/data/sale.xml
deleted file mode 100644
index 374d3f4..0000000
--- a/data/sale.xml
+++ /dev/null
@@ -1 +0,0 @@
-<items />
diff --git a/data/user.xml b/data/user.xml
deleted file mode 100644
index bc58f62..0000000
--- a/data/user.xml
+++ /dev/null
@@ -1 +0,0 @@
-<users><user accesslevel="20" id="0" money="0" name="Jero" stalls="5" used_stalls="0" /></users>
-- 
cgit v1.2.3-70-g09d2


From d60960b746b398ef63090c4e2cc89e6fac873ddd Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 20:35:39 +0200
Subject: correct git ignore file

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

diff --git a/.gitignore b/.gitignore
index 9e67bd4..6dbccb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-data
+data/
 
-- 
cgit v1.2.3-70-g09d2


From e15f61bfc5456b58ac099bff61646df012f468a0 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 20:48:06 +0200
Subject: Adding Copyright note to main.py

---
 main.py | 109 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/main.py b/main.py
index 3a217cd..ddf4c24 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,7 @@
-""" This package implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
+"""
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+
+    This package implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
 
     - Currently permissions are defined as: -1 (blocked), 0 (normal user), 5 (seller), 20 (admin).
     - An item will only be listed for a period of one week, and can be relisted
@@ -37,7 +40,7 @@ def process_whisper(nick, msg, mapserv):
     msg = filter(lambda x: x in string.printable, msg)
     user = user_tree.get_user(nick)
     broken_string = msg.split()
-    
+
     if user != -10:
         if int(user.get("accesslevel")) == -1: # A user who has been blocked for abuse.
 	    mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact <administrator>."))
@@ -49,7 +52,7 @@ def process_whisper(nick, msg, mapserv):
 	    mapserv.sendall(whisper(nick, "The following items are on sale:"))
 	else:
 	    mapserv.sendall(whisper(nick, "No items for sale."))
-	
+
 	for elem in sale_tree.root:
 	    if time.time() - float(elem.get('add_time')) < 604800: # Check if an items time is up.
 		msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + \
@@ -81,7 +84,7 @@ def process_whisper(nick, msg, mapserv):
 		mapserv.sendall(whisper(nick, "Item not found. Please check and try again."))
 	else:
 	    mapserv.sendall(whisper(nick, "Syntax incorrect"))
-	    
+
     elif msg == "!info":
         # Send information related to a player.
 	if user == -10:
@@ -105,7 +108,7 @@ def process_whisper(nick, msg, mapserv):
 	    stall_msg = "You have " + str(int(user.get('stalls')) - int(user.get('used_stalls'))) + " free slots."
 	    mapserv.sendall(whisper(nick, stall_msg))
 
-    elif broken_string[0] == "!help":	
+    elif broken_string[0] == "!help":
 	# Sends help information
 	if len(broken_string) == 1:
             mapserv.sendall(whisper(nick, "Welcome to ManaMarket!"))
@@ -141,7 +144,7 @@ def process_whisper(nick, msg, mapserv):
 	if user == -10:
 	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
 	    return
-	
+
 	amount = int(user.get('money'))
 	if amount == 0:
 	    mapserv.sendall(whisper(nick, "You have no money to collect."))
@@ -167,7 +170,7 @@ def process_whisper(nick, msg, mapserv):
 
 	items_found = False
 	item = " ".join(broken_string[1:]) # could be an id or an item name
-	
+
 	if item.isdigit(): # an id
 	    for elem in sale_tree.root:
 	        if ((time.time() - float(elem.get('add_time'))) < 604800) \
@@ -175,7 +178,7 @@ def process_whisper(nick, msg, mapserv):
 		    msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
                     + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
 		    mapserv.sendall(whisper(nick, msg))
-		    items_found = True		
+		    items_found = True
 	else: # an item name
 	    for elem in sale_tree.root:
 	        if ((time.time() - float(elem.get('add_time'))) < 604800) \
@@ -196,7 +199,7 @@ def process_whisper(nick, msg, mapserv):
         if int(user.get("accesslevel")) != 20:
 	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
 	    return
-	
+
 	data = ''
 
 	for user in user_tree.root:
@@ -209,7 +212,7 @@ def process_whisper(nick, msg, mapserv):
 	    # Format ManaMarket (20) 2/5 100000gp,
 
 	    if len(data) > 400:
-	        mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))	
+	        mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
 		data = ''
 
         mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
@@ -255,7 +258,7 @@ def process_whisper(nick, msg, mapserv):
 	if len(broken_string) < 3:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
 	    return
-	
+
 	if (broken_string[1][0] == '-' and broken_string[1][1:].isdigit()) or broken_string[1].isdigit():
 	    accesslevel = int(broken_string[1])
 	    name = " ".join(broken_string[2:])
@@ -265,17 +268,17 @@ def process_whisper(nick, msg, mapserv):
 	    if user_info == -10:
 		mapserv.sendall(whisper(nick, "User not found, check and try again."))
 		return
-	
+
 	    if int(user_info.get('accesslevel')) < int(user.get("accesslevel")) and accesslevel <= int(user.get("accesslevel")):
 		user_tree.get_user(name).set('accesslevel', str(accesslevel))
 		mapserv.sendall(whisper(nick, "Access level changed:"+name+ " ("+str(accesslevel)+")."))
 		user_tree.save()
 	    else:
-	        mapserv.sendall(whisper(nick, "You don't have the correct permissions."))	
-		return	
+	        mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+		return
         else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    
+
 
     elif broken_string[0] == "!adduser":
 	# A command to give a user access to the bot - !adduser <access level> <stall> <player name>.
@@ -312,7 +315,7 @@ def process_whisper(nick, msg, mapserv):
 	if int(user.get("accesslevel")) < 5:
 	    mapserv.sendall(whisper(nick, "You are unable to add items."))
 	    return
-	
+
 	if int(user.get("used_stalls")) >= int(user.get("stalls")):
 	    mapserv.sendall(whisper(nick, "You have no free slots.  You may remove an item or wait for something to be sold."))
 	    return
@@ -320,7 +323,7 @@ def process_whisper(nick, msg, mapserv):
 	if broken_string[1].isdigit() and broken_string[2].isdigit():
 	    amount = int(broken_string[1])
 	    price = int(broken_string[2])
-	    item_name = " ".join(broken_string[3:])	
+	    item_name = " ".join(broken_string[3:])
 	    item_id = ItemDB.findId(item_name)
 	    if item_id == -10:
 	        mapserv.sendall(whisper(nick, "Item not found, check spelling."))
@@ -333,7 +336,7 @@ def process_whisper(nick, msg, mapserv):
 	    item.amount = amount
 	    item.price = price
 	    trader_state.item = item
-		
+
 	    if not trader_state.Trading.testandset():
 		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
 	        return
@@ -357,7 +360,7 @@ def process_whisper(nick, msg, mapserv):
 	    amount = int(broken_string[1])
 	    uid = int(broken_string[2])
 	    item_info = sale_tree.get_uid(uid)
-	
+
 	    if item_info == -10:
 		mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
 		return
@@ -385,7 +388,7 @@ def process_whisper(nick, msg, mapserv):
 		mapserv.sendall(whisper(nick, "That will be " + str(item.price * item.amount) + "gp."))
 	    else:
 		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
-		trader_state.reset()	    
+		trader_state.reset()
 	else:
 	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
@@ -408,7 +411,7 @@ def process_whisper(nick, msg, mapserv):
 	    mapserv.sendall(whisper(nick, "User Removed."))
 	elif check == -10:
 	    mapserv.sendall(whisper(nick, "User removal failed. Please check spelling."))
-    
+
     elif broken_string[0] == "!relist":
         # Relist an item which has expired - !relist <uid>.
 	if user == -10 or len(broken_string) != 2:
@@ -430,9 +433,9 @@ def process_whisper(nick, msg, mapserv):
 	    if item_info.get('name') != nick:
 		mapserv.sendall(whisper(nick, "That doesn't belong to you!"))
 		return
-	
+
             time_relisted = int(item_info.get('relisted'))
-	
+
 	    if int(item_info.get('relisted')) < 3:
 		sale_tree.get_uid(uid).set('add_time', str(time.time()))
 		sale_tree.get_uid(uid).set('relisted', str(time_relisted + 1))
@@ -443,7 +446,7 @@ def process_whisper(nick, msg, mapserv):
 		return
         else:
 	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
-		
+
     elif broken_string[0] == "!getback":
 	# Trade the player back uid, remove from sale_items if trade successful - !getback <uid>.
 	if user == -10 or len(broken_string) != 2:
@@ -490,7 +493,7 @@ def main():
     logging.basicConfig(filename='logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
     logging.info("Bot Started.")
 
-    account = sys.argv[1] 
+    account = sys.argv[1]
     password = sys.argv[2]
     character = sys.argv[3]
 
@@ -501,7 +504,7 @@ def main():
     login_packet = PacketOut(0x0064)
     login_packet.write_int32(0)
     login_packet.write_string(account, 24)
-    login_packet.write_string(password, 24)	
+    login_packet.write_string(password, 24)
     login_packet.write_int8(0x03);
     login.sendall(str(login_packet))
 
@@ -517,13 +520,13 @@ def main():
             break
         pb.feed(data)
         for packet in pb:
-            if packet.is_type(SMSG_LOGIN_DATA): # login succeeded	
+            if packet.is_type(SMSG_LOGIN_DATA): # login succeeded
 		packet.skip(2)
-		id1 = packet.read_int32()	
+		id1 = packet.read_int32()
 		accid = packet.read_int32()
 		id2 = packet.read_int32()
 		packet.skip(30)
-		player_node.sex = packet.read_int8()                
+		player_node.sex = packet.read_int8()
                 charip = utils.parse_ip(packet.read_int32())
                 charport = packet.read_int16()
                 login.close()
@@ -584,7 +587,7 @@ def main():
 
 		char_select_packet = PacketOut(CMSG_CHAR_SELECT)
 		char_select_packet.write_int8(int(character))
-		char.sendall(str(char_select_packet))                
+		char.sendall(str(char_select_packet))
 
             elif packet.is_type(SMSG_CHAR_MAP_INFO):
 		player_node.id = packet.read_int32()
@@ -627,7 +630,7 @@ def main():
                 logging.info("Trade Cancelled - Timeout.")
                 trader_state.timer = time.time()
                 mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-	
+
         for packet in pb:
             if packet.is_type(SMSG_MAP_LOGIN_SUCCESS): # connected
 		logging.info("Map login success.")
@@ -665,7 +668,7 @@ def main():
 		packet.read_int32()
 		coord_data = packet.read_coord_pair()
 		player_node.x = coord_data[2]
-		player_node.y = coord_data[3]		
+		player_node.y = coord_data[3]
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
 		stat_type = packet.read_int16()
@@ -680,7 +683,7 @@ def main():
 		    player_node.MaxMP = value
 		elif stat_type == 0x000b:
 		    player_node.LEVEL = value
-		    print "Level changed: %s" % value 
+		    print "Level changed: %s" % value
 		elif stat_type == 0x0018:
 		    print "Weight changed from %s/%s to %s/%s" % (player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
 		    logging.info("Weight changed from %s/%s to %s/%s", player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
@@ -701,18 +704,18 @@ def main():
 		elif stat_type == 0x0016:
 		    player_node.EXP_NEEDED = value
 		    print "Exp Needed: %s" % player_node.EXP_NEEDED
-			
+
             elif packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_BEING_VISIBLE)\
             or packet.is_type(SMSG_PLAYER_MOVE) or packet.is_type(SMSG_PLAYER_UPDATE_1)\
             or packet.is_type(SMSG_PLAYER_UPDATE_2):
 		being_id = packet.read_int32()
                 packet.skip(8)
-		job = packet.read_int16()		
-		if being_id not in beingManager.container:	
+		job = packet.read_int16()
+		if being_id not in beingManager.container:
 	            if job == 0 and id >= 110000000 and (packet.is_type(SMSG_BEING_MOVE)\
                                                          or packet.is_type(SMSG_BEING_VISIBLE)):
 		        continue
-		    # Add the being to the BeingManager, and request name. 	
+		    # Add the being to the BeingManager, and request name.
 		    beingManager.container[being_id] = Being(being_id, job)
 		    requestName = PacketOut(0x0094)
 		    requestName.write_int32(being_id)
@@ -724,13 +727,13 @@ def main():
 		    packet.read_int32()
 
 		packet.skip(22)
-          
+
 		if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
 		    coord_data = packet.read_coord_pair()
 		    beingManager.container[being_id].dst_x = coord_data[2]
 		    beingManager.container[being_id].dst_y = coord_data[3]
 		else:
-		    coord_data = packet.read_coord_dir()  
+		    coord_data = packet.read_coord_dir()
 		    beingManager.container[being_id].x = coord_data[0]
                     beingManager.container[being_id].y = coord_data[1]
 		    beingManager.container[being_id].direction = coord_data[2]
@@ -744,14 +747,14 @@ def main():
 	        being_id = packet.read_int32()
 		if being_id in beingManager.container:
 		    del beingManager.container[being_id]
-	
+
 	    elif packet.is_type(SMSG_PLAYER_WARP):
 		player_node.map = packet.read_string(16)
 	        player_node.x = packet.read_int16()
 		player_node.y = packet.read_int16()
 		logging.info("Player warped.")
                 mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED)))
-	
+
 	    elif packet.is_type(SMSG_BEING_ACTION):
 		src_being = packet.read_int32()
 		dst_being = packet.read_int32()
@@ -764,12 +767,12 @@ def main():
 		    if action_type == 0: # Damage
 		        beingManager.container[src_being].action = "attack"
 		        beingManager.container[src_being].target = dst_being
-		        
+
 		    elif action_type == 0x02: # Sit
 		        beingManager.container[src_being].action = "sit"
-				    
+
 		    elif action_type == 0x03: # Stand up
-		        beingManager.container[src_being].action = "stand"	
+		        beingManager.container[src_being].action = "stand"
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY_ADD):
 		item = Item()
@@ -840,7 +843,7 @@ def main():
 		    print "Name: %s, Id: %s, Index: %s, Amount: %s." % \
                     (ItemDB.getItem(player_node.inventory[item].itemId).name, \
                      player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
-		 
+
 	    elif packet.is_type(SMSG_TRADE_REQUEST):
 		print "SMSG_TRADE_REQUEST"
 		name = packet.read_string(24)
@@ -870,7 +873,7 @@ def main():
 			        if trader_state.item.price == 0: # getback
 			            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
 			            trader_state.complete = 1
-				
+
 		    elif trader_state.money: # money
 			amount = int(user_tree.get_user(trader_state.money).get('money'))
 			mapserv.sendall(trade_add_item(0-inventory_offset, amount))
@@ -910,8 +913,8 @@ def main():
 
 		elif trader_state.money: # money
 		    mapserv.sendall(whisper(trader_state.money, "Don't give me your itenz."))
-		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))		
-		
+		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
 		logging.info("Trade item add: ItemId:%s Amount:%s", item_id, amount)
 		# Note item_id = 0 is money
 
@@ -940,7 +943,7 @@ def main():
 
 		elif response == 1:
 		    logging.info("Trade item add response: Failed - player overweight.")
-		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))	
+		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 		    if trader_state.item:
 		        mapserv.sendall(whisper(trader_state.item.player, "You are carrying too much weight. Unload and try again."))
 		elif response == 2:
@@ -956,7 +959,7 @@ def main():
 		    logging.info("Trade OK: Self.")
 		else:
 		    if trader_state.complete:
-		        mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))  
+		        mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
 		    else:
 			mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 			mapserv.sendall(whisper(trader_state.item.player, "Trade Cancelled: Please check the traded items or money."))
@@ -987,7 +990,7 @@ def main():
 			    sale_tree.remove_item_uid(trader_state.item.uid)
 
 		        current_money = int(user_tree.get_user(seller).get("money"))
-		        user_tree.get_user(seller).set("money", str(current_money + trader_state.item.price * trader_state.item.amount))			
+		        user_tree.get_user(seller).set("money", str(current_money + trader_state.item.price * trader_state.item.amount))
 
 			if trader_state.item.price * trader_state.item.amount != 0:
 			    ItemLog.add_item(int(item.get('itemId')), trader_state.item.amount, trader_state.item.price * trader_state.item.amount)
@@ -1003,10 +1006,10 @@ def main():
             else:
 		pass
 	        #print "Unhandled Packet: %s" % hex(packet.get_type())
-    
+
     # On Disconnect/Exit
     shop_broadcaster.stop()
-    mapserv.close()           
+    mapserv.close()
 
 if __name__ == '__main__':
     main()
-- 
cgit v1.2.3-70-g09d2


From fba20e9689b6a0407b193fb3c708be45ca68ac71 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 21 Aug 2011 19:49:05 +0100
Subject: Change the directory logs are stored in.

---
 main.py  | 2 +-
 utils.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index ddf4c24..d3824ff 100644
--- a/main.py
+++ b/main.py
@@ -490,7 +490,7 @@ def process_whisper(nick, msg, mapserv):
 		trader_state.reset()
 
 def main():
-    logging.basicConfig(filename='logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+    logging.basicConfig(filename='data/logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
     logging.info("Bot Started.")
 
     account = sys.argv[1]
diff --git a/utils.py b/utils.py
index 3215457..8e7f839 100644
--- a/utils.py
+++ b/utils.py
@@ -65,7 +65,7 @@ class ItemDB:
 class ItemLog:
     """ Writes all sales to a log file, for later processing."""
     def __init__(self):
-        self.log_file = 'logs/sale.log'
+        self.log_file = 'data/logs/sale.log'
 
     def add_item(self, item_id, amount, price):
         file_node = open(self.log_file, 'a')
-- 
cgit v1.2.3-70-g09d2


From 8cbb45acaa00150a831d804cf08a967b30a4c7f8 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 21 Aug 2011 20:03:58 +0100
Subject: Add config.py to gitignore.

---
 .gitignore         | 2 +-
 config.py.template | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 config.py.template

diff --git a/.gitignore b/.gitignore
index 6dbccb1..357f8f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 data/
-
+config.py
diff --git a/config.py.template b/config.py.template
new file mode 100644
index 0000000..068d432
--- /dev/null
+++ b/config.py.template
@@ -0,0 +1,6 @@
+#server = "server.themanaworld.org"
+server = "caliban.homeip.net"
+port = 6901
+account = ""
+password = ""
+character = 0 #slot character is in, 0 for first, 1 for second, 2 for third
-- 
cgit v1.2.3-70-g09d2


From 16cff2426df9bbad4682fa6fe9fd2808cd009e93 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 21:06:02 +0200
Subject: Remove tabs by spaces and remove config file

---
 being.py  |   24 +-
 config.py |    6 -
 main.py   | 1348 ++++++++++++++++++++++++++++++-------------------------------
 player.py |   44 +-
 tradey.py |  108 ++---
 utils.py  |   86 ++--
 6 files changed, 805 insertions(+), 811 deletions(-)
 delete mode 100644 config.py

diff --git a/being.py b/being.py
index 9c51a2b..52a2e1b 100644
--- a/being.py
+++ b/being.py
@@ -10,21 +10,21 @@ def job_type(job):
 
 class BeingManager:
     def __init__(self):
-	self.container = {}
+        self.container = {}
 
     def findId(self, name):
-	for i in self.container:
-	   if self.container[i].name == name:
-		return i
-	return -10
+        for i in self.container:
+           if self.container[i].name == name:
+                return i
+        return -10
 
 class Being:
     def __init__(self, being_id, job):
         self.id = being_id
-	self.name = ""
-	self.x = 0
-	self.y = 0
-	self.action = ""
-	self.job = job
-	self.target = 0
-	self.type = job_type(job)
+        self.name = ""
+        self.x = 0
+        self.y = 0
+        self.action = ""
+        self.job = job
+        self.target = 0
+        self.type = job_type(job)
diff --git a/config.py b/config.py
deleted file mode 100644
index 068d432..0000000
--- a/config.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#server = "server.themanaworld.org"
-server = "caliban.homeip.net"
-port = 6901
-account = ""
-password = ""
-character = 0 #slot character is in, 0 for first, 1 for second, 2 for third
diff --git a/main.py b/main.py
index d3824ff..41b428d 100644
--- a/main.py
+++ b/main.py
@@ -19,7 +19,7 @@ import time
 import string
 
 from being import *
-from config import *
+from data.config import *
 from net.packet import *
 from net.protocol import *
 from net.packet_out import *
@@ -43,451 +43,451 @@ def process_whisper(nick, msg, mapserv):
 
     if user != -10:
         if int(user.get("accesslevel")) == -1: # A user who has been blocked for abuse.
-	    mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact <administrator>."))
-	    return
+            mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact <administrator>."))
+            return
 
     if msg == "!list":
-	# Sends the list of items for sale.
-	if len(sale_tree.root) != 0:
-	    mapserv.sendall(whisper(nick, "The following items are on sale:"))
-	else:
-	    mapserv.sendall(whisper(nick, "No items for sale."))
-
-	for elem in sale_tree.root:
-	    if time.time() - float(elem.get('add_time')) < 604800: # Check if an items time is up.
-		msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + \
-		elem.get("itemId") + "|" + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
-		mapserv.sendall(whisper(nick, msg))
+        # Sends the list of items for sale.
+        if len(sale_tree.root) != 0:
+            mapserv.sendall(whisper(nick, "The following items are on sale:"))
+        else:
+            mapserv.sendall(whisper(nick, "No items for sale."))
+
+        for elem in sale_tree.root:
+            if time.time() - float(elem.get('add_time')) < 604800: # Check if an items time is up.
+                msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + \
+                elem.get("itemId") + "|" + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
+                mapserv.sendall(whisper(nick, msg))
 
     elif broken_string[0] == '!selllist':
-	# Support for 4144's shop (Sell list)
+        # Support for 4144's shop (Sell list)
         data = '\302\202B1'
 
-	for elem in sale_tree.root:
-	    data += utils.encode_str(int(elem.get("itemId")), 2)
+        for elem in sale_tree.root:
+            data += utils.encode_str(int(elem.get("itemId")), 2)
             data += utils.encode_str(int(elem.get("price")), 4)
-	    data += utils.encode_str(int(elem.get("amount")), 3)
-	mapserv.sendall(whisper(nick, data))
+            data += utils.encode_str(int(elem.get("amount")), 3)
+        mapserv.sendall(whisper(nick, data))
 
     elif broken_string[0] == '!buyitem':
-	# 4144 buy command
-	if len(broken_string) == 4:
-	    if broken_string[1].isdigit() and broken_string[2].isdigit() and broken_string[3].isdigit():
-	        # Traditional 4144 shop.
-	        item_id = int(broken_string[1])
-	        price = int(broken_string[2])
-	        amount = int(broken_string[3])
-	        for elem in sale_tree.root:
+        # 4144 buy command
+        if len(broken_string) == 4:
+            if broken_string[1].isdigit() and broken_string[2].isdigit() and broken_string[3].isdigit():
+                # Traditional 4144 shop.
+                item_id = int(broken_string[1])
+                price = int(broken_string[2])
+                amount = int(broken_string[3])
+                for elem in sale_tree.root:
                     if int(elem.get('amount')) >= amount and int(elem.get('price')) == price and int(elem.get('itemId')) == item_id:
-		        process_whisper(nick, '!buy ' + str(amount) + " " + elem.get('uid'), mapserv)
-		        return
-		mapserv.sendall(whisper(nick, "Item not found. Please check and try again."))
-	else:
-	    mapserv.sendall(whisper(nick, "Syntax incorrect"))
+                        process_whisper(nick, '!buy ' + str(amount) + " " + elem.get('uid'), mapserv)
+                        return
+                mapserv.sendall(whisper(nick, "Item not found. Please check and try again."))
+        else:
+            mapserv.sendall(whisper(nick, "Syntax incorrect"))
 
     elif msg == "!info":
         # Send information related to a player.
-	if user == -10:
-	    mapserv.sendall(whisper(nick, "Your current access level is 0."))
-	elif int(user.get('accesslevel')) > 0:
-	    mapserv.sendall(whisper(nick, "Your current access level is " + user.get('accesslevel') + "."))
-	    mapserv.sendall(whisper(nick, "Your have the following items for sale:"))
-	    for elem in sale_tree.root:
-		if elem.get('name') == nick:
-	            if time.time() - float(elem.get('add_time')) > 604800:
-	                msg = "[expired] ["
-	            else:
-		        msg = "[selling] ["
-
-		    msg += elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" + \
-			ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
-	    	    mapserv.sendall(whisper(nick, msg))
-
-	    money = int(user.get('money'))
-	    mapserv.sendall(whisper(nick, "You have " + str(money) + "gp to collect."))
-	    stall_msg = "You have " + str(int(user.get('stalls')) - int(user.get('used_stalls'))) + " free slots."
-	    mapserv.sendall(whisper(nick, stall_msg))
+        if user == -10:
+            mapserv.sendall(whisper(nick, "Your current access level is 0."))
+        elif int(user.get('accesslevel')) > 0:
+            mapserv.sendall(whisper(nick, "Your current access level is " + user.get('accesslevel') + "."))
+            mapserv.sendall(whisper(nick, "Your have the following items for sale:"))
+            for elem in sale_tree.root:
+                if elem.get('name') == nick:
+                    if time.time() - float(elem.get('add_time')) > 604800:
+                        msg = "[expired] ["
+                    else:
+                        msg = "[selling] ["
+
+                    msg += elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" + \
+                        ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
+                        mapserv.sendall(whisper(nick, msg))
+
+            money = int(user.get('money'))
+            mapserv.sendall(whisper(nick, "You have " + str(money) + "gp to collect."))
+            stall_msg = "You have " + str(int(user.get('stalls')) - int(user.get('used_stalls'))) + " free slots."
+            mapserv.sendall(whisper(nick, stall_msg))
 
     elif broken_string[0] == "!help":
-	# Sends help information
-	if len(broken_string) == 1:
+        # Sends help information
+        if len(broken_string) == 1:
             mapserv.sendall(whisper(nick, "Welcome to ManaMarket!"))
-	    mapserv.sendall(whisper(nick, "The basic commands for the bot are: !list, !find <id> or <Item Name>, !buy <amount> <uid>, !add <amount> <price> <Item Name>, !money, !relist <uid>, !info, !getback <uid> "))
-	    mapserv.sendall(whisper(nick, "For a detailed description of each command, type !help <command> e.g. !help !buy"))
-	    mapserv.sendall(whisper(nick, "For example:- to purchase an item shown in the list as:"))
-	    mapserv.sendall(whisper(nick, "[selling] [6] 5 [@@640|Iron Ore@@] for 1000gp each"))
-	    mapserv.sendall(whisper(nick, "you would type /whisper ManaMarket !buy 1 6" ))
-	    mapserv.sendall(whisper(nick, "This will purchase one of item 6 (Iron Ore)."))
-
-	elif len(broken_string) == 2:
-	    if broken_string[1] == '!buy':
-		mapserv.sendall(whisper(nick, "!buy <amount> <uid> - Request the purchase of an item or items."))
-	    elif broken_string[1] == '!list':
-		mapserv.sendall(whisper(nick, "!list - Displays a list of all items for sale."))
-	    elif broken_string[1] == '!find':
-		mapserv.sendall(whisper(nick, "!find <id> or <Item Name> - Simple search to locate an item."))
-	    elif broken_string[1] == '!buy':
-		mapserv.sendall(whisper(nick, "!buy <amount> <uid> - Request the purchase of an item or items."))
-	    elif broken_string[1] == '!add':
-		mapserv.sendall(whisper(nick, "!add <amount> <price> <Item Name> - Add an item to the sell list (requires that you have an account)."))
-	    elif broken_string[1] == '!money':
-		mapserv.sendall(whisper(nick, "!money - Allows you to collect money for any sales made on your behalf."))
-	    elif broken_string[1] == '!relist':
-	        mapserv.sendall(whisper(nick, "!relist <uid> - Allows you to relist an item which has expired."))
-	    elif broken_string[1] == '!info':
-		mapserv.sendall(whisper(nick, "!info - Displays basic information about your account."))
-	    elif broken_string[1] == '!getback':
-		mapserv.sendall(whisper(nick, "!getback <uid> - Allows you to retrieve an item that has expired or you no longer wish to sell."))
+            mapserv.sendall(whisper(nick, "The basic commands for the bot are: !list, !find <id> or <Item Name>, !buy <amount> <uid>, !add <amount> <price> <Item Name>, !money, !relist <uid>, !info, !getback <uid> "))
+            mapserv.sendall(whisper(nick, "For a detailed description of each command, type !help <command> e.g. !help !buy"))
+            mapserv.sendall(whisper(nick, "For example:- to purchase an item shown in the list as:"))
+            mapserv.sendall(whisper(nick, "[selling] [6] 5 [@@640|Iron Ore@@] for 1000gp each"))
+            mapserv.sendall(whisper(nick, "you would type /whisper ManaMarket !buy 1 6" ))
+            mapserv.sendall(whisper(nick, "This will purchase one of item 6 (Iron Ore)."))
+
+        elif len(broken_string) == 2:
+            if broken_string[1] == '!buy':
+                mapserv.sendall(whisper(nick, "!buy <amount> <uid> - Request the purchase of an item or items."))
+            elif broken_string[1] == '!list':
+                mapserv.sendall(whisper(nick, "!list - Displays a list of all items for sale."))
+            elif broken_string[1] == '!find':
+                mapserv.sendall(whisper(nick, "!find <id> or <Item Name> - Simple search to locate an item."))
+            elif broken_string[1] == '!buy':
+                mapserv.sendall(whisper(nick, "!buy <amount> <uid> - Request the purchase of an item or items."))
+            elif broken_string[1] == '!add':
+                mapserv.sendall(whisper(nick, "!add <amount> <price> <Item Name> - Add an item to the sell list (requires that you have an account)."))
+            elif broken_string[1] == '!money':
+                mapserv.sendall(whisper(nick, "!money - Allows you to collect money for any sales made on your behalf."))
+            elif broken_string[1] == '!relist':
+                mapserv.sendall(whisper(nick, "!relist <uid> - Allows you to relist an item which has expired."))
+            elif broken_string[1] == '!info':
+                mapserv.sendall(whisper(nick, "!info - Displays basic information about your account."))
+            elif broken_string[1] == '!getback':
+                mapserv.sendall(whisper(nick, "!getback <uid> - Allows you to retrieve an item that has expired or you no longer wish to sell."))
 
     elif msg == "!money":
-	# Trades any money earned through item sales.
-	if user == -10:
-	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-	    return
-
-	amount = int(user.get('money'))
-	if amount == 0:
-	    mapserv.sendall(whisper(nick, "You have no money to collect."))
-	else:
-	    trader_state.money = nick
-	    if not trader_state.Trading.testandset():
-		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
-	        return
+        # Trades any money earned through item sales.
+        if user == -10:
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
+
+        amount = int(user.get('money'))
+        if amount == 0:
+            mapserv.sendall(whisper(nick, "You have no money to collect."))
+        else:
+            trader_state.money = nick
+            if not trader_state.Trading.testandset():
+                mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
+                return
             player_id = beingManager.findId(nick)
 
-	    if player_id != -10:
-	        mapserv.sendall(trade_request(player_id))
+            if player_id != -10:
+                mapserv.sendall(trade_request(player_id))
                 trader_state.timer = time.time()
-	    else:
-		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
-		trader_state.reset()
+            else:
+                mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
+                trader_state.reset()
 
     elif broken_string[0] == "!find":
-	# Returns a list of items, with the corresponding Item Id - !find <id> or <item name>.
-	if len(broken_string) < 2:
+        # Returns a list of items, with the corresponding Item Id - !find <id> or <item name>.
+        if len(broken_string) < 2:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    return
+            return
 
-	items_found = False
-	item = " ".join(broken_string[1:]) # could be an id or an item name
+        items_found = False
+        item = " ".join(broken_string[1:]) # could be an id or an item name
 
-	if item.isdigit(): # an id
-	    for elem in sale_tree.root:
-	        if ((time.time() - float(elem.get('add_time'))) < 604800) \
-		and int(elem.get("itemId")) == int(item): # Check if an items time is up.
-		    msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
+        if item.isdigit(): # an id
+            for elem in sale_tree.root:
+                if ((time.time() - float(elem.get('add_time'))) < 604800) \
+                and int(elem.get("itemId")) == int(item): # Check if an items time is up.
+                    msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
                     + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
-		    mapserv.sendall(whisper(nick, msg))
-		    items_found = True
-	else: # an item name
-	    for elem in sale_tree.root:
-	        if ((time.time() - float(elem.get('add_time'))) < 604800) \
-		and item.lower() in ItemDB.getItem(int(elem.get("itemId"))).name.lower(): # Check if an items time is up.
-		    msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
+                    mapserv.sendall(whisper(nick, msg))
+                    items_found = True
+        else: # an item name
+            for elem in sale_tree.root:
+                if ((time.time() - float(elem.get('add_time'))) < 604800) \
+                and item.lower() in ItemDB.getItem(int(elem.get("itemId"))).name.lower(): # Check if an items time is up.
+                    msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
                     + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
-		    mapserv.sendall(whisper(nick, msg))
-		    items_found = True
+                    mapserv.sendall(whisper(nick, msg))
+                    items_found = True
 
-	if not items_found:
-	    mapserv.sendall(whisper(nick, "Item not found."))
+        if not items_found:
+            mapserv.sendall(whisper(nick, "Item not found."))
 
     elif msg == '!listusers':
-	# Admin command - shows a list of all user.
+        # Admin command - shows a list of all user.
         if user == -10:
-	    return
+            return
 
         if int(user.get("accesslevel")) != 20:
-	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-	    return
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
 
-	data = ''
+        data = ''
 
-	for user in user_tree.root:
+        for user in user_tree.root:
             name = user.get('name')
             accesslevel = user.get('accesslevel')
-	    slots = user.get('stalls')
-	    used_slots = user.get('used_stalls')
-	    money = user.get('money')
-	    data += name+" ("+accesslevel+") "+used_slots+"/"+slots+" "+money+'gp, '
-	    # Format ManaMarket (20) 2/5 100000gp,
+            slots = user.get('stalls')
+            used_slots = user.get('used_stalls')
+            money = user.get('money')
+            data += name+" ("+accesslevel+") "+used_slots+"/"+slots+" "+money+'gp, '
+            # Format ManaMarket (20) 2/5 100000gp,
 
-	    if len(data) > 400:
-	        mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
-		data = ''
+            if len(data) > 400:
+                mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
+                data = ''
 
         mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
 
     elif broken_string[0] == '!setslots':
-	# Change the number of slots a user has - !setslots <slots> <name>
+        # Change the number of slots a user has - !setslots <slots> <name>
         if user == -10:
-	    return
+            return
 
         if int(user.get("accesslevel")) != 20:
-	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-	    return
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
 
-	if len(broken_string) < 3:
+        if len(broken_string) < 3:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    return
+            return
 
-	if broken_string[1].isdigit():
-	    slot = int(broken_string[1])
-	    name = " ".join(broken_string[2:])
+        if broken_string[1].isdigit():
+            slot = int(broken_string[1])
+            name = " ".join(broken_string[2:])
 
-	    user_info = user_tree.get_user(name)
+            user_info = user_tree.get_user(name)
 
-	    if user_info == -10:
-		mapserv.sendall(whisper(nick, "User not found, check and try again."))
-	        return
+            if user_info == -10:
+                mapserv.sendall(whisper(nick, "User not found, check and try again."))
+                return
 
-	    user_tree.get_user(name).set('stalls', str(slot))
-	    mapserv.sendall(whisper(nick, "Slots changed: "+name+" "+str(slot)))
-	    user_tree.save()
-	else:
+            user_tree.get_user(name).set('stalls', str(slot))
+            mapserv.sendall(whisper(nick, "Slots changed: "+name+" "+str(slot)))
+            user_tree.save()
+        else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
     elif broken_string[0] == '!setaccess':
-	# Change someones access level - !setaccess <access level> <name>
+        # Change someones access level - !setaccess <access level> <name>
         if user == -10:
-	    return
+            return
 
         if int(user.get("accesslevel")) != 20:
-	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-	    return
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
 
-	if len(broken_string) < 3:
+        if len(broken_string) < 3:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    return
+            return
 
-	if (broken_string[1][0] == '-' and broken_string[1][1:].isdigit()) or broken_string[1].isdigit():
-	    accesslevel = int(broken_string[1])
-	    name = " ".join(broken_string[2:])
+        if (broken_string[1][0] == '-' and broken_string[1][1:].isdigit()) or broken_string[1].isdigit():
+            accesslevel = int(broken_string[1])
+            name = " ".join(broken_string[2:])
 
-	    user_info = user_tree.get_user(name)
+            user_info = user_tree.get_user(name)
 
-	    if user_info == -10:
-		mapserv.sendall(whisper(nick, "User not found, check and try again."))
-		return
+            if user_info == -10:
+                mapserv.sendall(whisper(nick, "User not found, check and try again."))
+                return
 
-	    if int(user_info.get('accesslevel')) < int(user.get("accesslevel")) and accesslevel <= int(user.get("accesslevel")):
-		user_tree.get_user(name).set('accesslevel', str(accesslevel))
-		mapserv.sendall(whisper(nick, "Access level changed:"+name+ " ("+str(accesslevel)+")."))
-		user_tree.save()
-	    else:
-	        mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-		return
+            if int(user_info.get('accesslevel')) < int(user.get("accesslevel")) and accesslevel <= int(user.get("accesslevel")):
+                user_tree.get_user(name).set('accesslevel', str(accesslevel))
+                mapserv.sendall(whisper(nick, "Access level changed:"+name+ " ("+str(accesslevel)+")."))
+                user_tree.save()
+            else:
+                mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+                return
         else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
 
     elif broken_string[0] == "!adduser":
-	# A command to give a user access to the bot - !adduser <access level> <stall> <player name>.
+        # A command to give a user access to the bot - !adduser <access level> <stall> <player name>.
         if user == -10:
-	    return
+            return
 
         if int(user.get("accesslevel")) != 20:
-	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-	    return
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
 
-	if len(broken_string) < 3:
+        if len(broken_string) < 3:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    return
+            return
 
         if broken_string[1].isdigit() and broken_string[2].isdigit():
             al = int(broken_string[1])
             stalls = int(broken_string[2])
             player_name = " ".join(broken_string[3:])
-	    user_tree.add_user(player_name, stalls, al)
-	    mapserv.sendall(whisper(nick, "User Added with " + str(stalls) + " slots."))
+            user_tree.add_user(player_name, stalls, al)
+            mapserv.sendall(whisper(nick, "User Added with " + str(stalls) + " slots."))
         else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
     elif broken_string[0] == "!add":
-	# Allows a player with the correct permissions to add an item for sale - !add <amount> <price> <item name>
-	if user == -10:
-	    mapserv.sendall(whisper(nick, "You are unable to add items."))
-	    return
+        # Allows a player with the correct permissions to add an item for sale - !add <amount> <price> <item name>
+        if user == -10:
+            mapserv.sendall(whisper(nick, "You are unable to add items."))
+            return
 
-	if len(broken_string) < 3:
+        if len(broken_string) < 3:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    return
-
-	if int(user.get("accesslevel")) < 5:
-	    mapserv.sendall(whisper(nick, "You are unable to add items."))
-	    return
-
-	if int(user.get("used_stalls")) >= int(user.get("stalls")):
-	    mapserv.sendall(whisper(nick, "You have no free slots.  You may remove an item or wait for something to be sold."))
-	    return
-
-	if broken_string[1].isdigit() and broken_string[2].isdigit():
-	    amount = int(broken_string[1])
-	    price = int(broken_string[2])
-	    item_name = " ".join(broken_string[3:])
-	    item_id = ItemDB.findId(item_name)
-	    if item_id == -10:
-	        mapserv.sendall(whisper(nick, "Item not found, check spelling."))
-		return
-
-	    item = Item()
-	    item.player = nick
-	    item.get = 1 # 1 = get, 0 = give
-	    item.id = item_id
-	    item.amount = amount
-	    item.price = price
-	    trader_state.item = item
-
-	    if not trader_state.Trading.testandset():
-		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
-	        return
+            return
+
+        if int(user.get("accesslevel")) < 5:
+            mapserv.sendall(whisper(nick, "You are unable to add items."))
+            return
+
+        if int(user.get("used_stalls")) >= int(user.get("stalls")):
+            mapserv.sendall(whisper(nick, "You have no free slots.  You may remove an item or wait for something to be sold."))
+            return
+
+        if broken_string[1].isdigit() and broken_string[2].isdigit():
+            amount = int(broken_string[1])
+            price = int(broken_string[2])
+            item_name = " ".join(broken_string[3:])
+            item_id = ItemDB.findId(item_name)
+            if item_id == -10:
+                mapserv.sendall(whisper(nick, "Item not found, check spelling."))
+                return
+
+            item = Item()
+            item.player = nick
+            item.get = 1 # 1 = get, 0 = give
+            item.id = item_id
+            item.amount = amount
+            item.price = price
+            trader_state.item = item
+
+            if not trader_state.Trading.testandset():
+                mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
+                return
             player_id = beingManager.findId(nick)
-	    if player_id != -10:
-	        mapserv.sendall(trade_request(player_id))
+            if player_id != -10:
+                mapserv.sendall(trade_request(player_id))
                 trader_state.timer = time.time()
-	    else:
-		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
-		trader_state.reset()
-	else:
-	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
+            else:
+                mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
+                trader_state.reset()
+        else:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
     elif broken_string[0] == "!buy":
-	# Buy a given quantity of an item - !buy <amount> <uid>
-	if len(broken_string) != 3:
-	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    return
-
-	if broken_string[1].isdigit() and broken_string[2].isdigit():
-	    amount = int(broken_string[1])
-	    uid = int(broken_string[2])
-	    item_info = sale_tree.get_uid(uid)
-
-	    if item_info == -10:
-		mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
-		return
-
-	    if amount > int(item_info.get("amount")):
-		mapserv.sendall(whisper(nick, "I do not have that many."))
-		return
-
-	    item = Item()
-	    item.get = 0 # 1 = get, 0 = give
-	    item.player = nick
-	    item.id = int(item_info.get("itemId"))
-	    item.uid = uid
-	    item.amount = amount
-	    item.price = int(item_info.get("price"))
-	    trader_state.item = item
-
-	    if not trader_state.Trading.testandset():
-		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
-	        return
+        # Buy a given quantity of an item - !buy <amount> <uid>
+        if len(broken_string) != 3:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+            return
+
+        if broken_string[1].isdigit() and broken_string[2].isdigit():
+            amount = int(broken_string[1])
+            uid = int(broken_string[2])
+            item_info = sale_tree.get_uid(uid)
+
+            if item_info == -10:
+                mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
+                return
+
+            if amount > int(item_info.get("amount")):
+                mapserv.sendall(whisper(nick, "I do not have that many."))
+                return
+
+            item = Item()
+            item.get = 0 # 1 = get, 0 = give
+            item.player = nick
+            item.id = int(item_info.get("itemId"))
+            item.uid = uid
+            item.amount = amount
+            item.price = int(item_info.get("price"))
+            trader_state.item = item
+
+            if not trader_state.Trading.testandset():
+                mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
+                return
             player_id = beingManager.findId(nick)
-	    if player_id != -10:
-	        mapserv.sendall(trade_request(player_id))
+            if player_id != -10:
+                mapserv.sendall(trade_request(player_id))
                 trader_state.timer = time.time()
-		mapserv.sendall(whisper(nick, "That will be " + str(item.price * item.amount) + "gp."))
-	    else:
-		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
-		trader_state.reset()
-	else:
-	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
+                mapserv.sendall(whisper(nick, "That will be " + str(item.price * item.amount) + "gp."))
+            else:
+                mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
+                trader_state.reset()
+        else:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
     elif broken_string[0] == "!removeuser":
-	# Remove a user, for whatever reason - !removeuser <player name>
+        # Remove a user, for whatever reason - !removeuser <player name>
         if user == -10:
-	    return
+            return
 
-	if len(broken_string) < 2:
-	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    return
+        if len(broken_string) < 2:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+            return
 
         if int(user.get("accesslevel")) != 20:
-	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-	    return
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
 
         player_name = " ".join(broken_string[1:])
-	check = user_tree.remove_user(player_name)
-	if check == 1:
-	    mapserv.sendall(whisper(nick, "User Removed."))
-	elif check == -10:
-	    mapserv.sendall(whisper(nick, "User removal failed. Please check spelling."))
+        check = user_tree.remove_user(player_name)
+        if check == 1:
+            mapserv.sendall(whisper(nick, "User Removed."))
+        elif check == -10:
+            mapserv.sendall(whisper(nick, "User removal failed. Please check spelling."))
 
     elif broken_string[0] == "!relist":
         # Relist an item which has expired - !relist <uid>.
-	if user == -10 or len(broken_string) != 2:
+        if user == -10 or len(broken_string) != 2:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
             return
 
-	if int(user.get("accesslevel")) < 5:
-	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-	    return
+        if int(user.get("accesslevel")) < 5:
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
 
-	if broken_string[1].isdigit():
-	    uid = int(broken_string[1])
-	    item_info = sale_tree.get_uid(uid)
+        if broken_string[1].isdigit():
+            uid = int(broken_string[1])
+            item_info = sale_tree.get_uid(uid)
 
-	    if item_info == -10:
-		mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
-		return
+            if item_info == -10:
+                mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
+                return
 
-	    if item_info.get('name') != nick:
-		mapserv.sendall(whisper(nick, "That doesn't belong to you!"))
-		return
+            if item_info.get('name') != nick:
+                mapserv.sendall(whisper(nick, "That doesn't belong to you!"))
+                return
 
             time_relisted = int(item_info.get('relisted'))
 
-	    if int(item_info.get('relisted')) < 3:
-		sale_tree.get_uid(uid).set('add_time', str(time.time()))
-		sale_tree.get_uid(uid).set('relisted', str(time_relisted + 1))
-		sale_tree.save()
-		mapserv.sendall(whisper(nick, "The item has been successfully relisted."))
-	    else:
+            if int(item_info.get('relisted')) < 3:
+                sale_tree.get_uid(uid).set('add_time', str(time.time()))
+                sale_tree.get_uid(uid).set('relisted', str(time_relisted + 1))
+                sale_tree.save()
+                mapserv.sendall(whisper(nick, "The item has been successfully relisted."))
+            else:
                 mapserv.sendall(whisper(nick, "This item can no longer be relisted. Please collect it using !getback "+str(uid)+"."))
-		return
+                return
         else:
-	    mapserv.sendall(whisper(nick, "Syntax incorrect."))
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
     elif broken_string[0] == "!getback":
-	# Trade the player back uid, remove from sale_items if trade successful - !getback <uid>.
-	if user == -10 or len(broken_string) != 2:
+        # Trade the player back uid, remove from sale_items if trade successful - !getback <uid>.
+        if user == -10 or len(broken_string) != 2:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
-	    return
-
-	if int(user.get("accesslevel")) < 5:
-	    mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-	    return
-
-	if broken_string[1].isdigit():
-	    uid = int(broken_string[1])
-	    item_info = sale_tree.get_uid(uid)
-
-	    if item_info == -10:
-		mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
-		return
-
-	    if item_info.get('name') != nick:
-		mapserv.sendall(whisper(nick, "That doesn't belong to you!"))
-		return
-
-	    item = Item()
-	    item.get = 0
-	    item.player = nick
-	    item.id = int(item_info.get("itemId"))
-	    item.uid = uid
-	    item.amount = int(item_info.get("amount"))
-	    item.price = 0
-	    trader_state.item = item
-
-	    if not trader_state.Trading.testandset():
-		mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
-	        return
+            return
+
+        if int(user.get("accesslevel")) < 5:
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
+
+        if broken_string[1].isdigit():
+            uid = int(broken_string[1])
+            item_info = sale_tree.get_uid(uid)
+
+            if item_info == -10:
+                mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
+                return
+
+            if item_info.get('name') != nick:
+                mapserv.sendall(whisper(nick, "That doesn't belong to you!"))
+                return
+
+            item = Item()
+            item.get = 0
+            item.player = nick
+            item.id = int(item_info.get("itemId"))
+            item.uid = uid
+            item.amount = int(item_info.get("amount"))
+            item.price = 0
+            trader_state.item = item
+
+            if not trader_state.Trading.testandset():
+                mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
+                return
             player_id = beingManager.findId(nick)
-	    if player_id != -10:
-	        mapserv.sendall(trade_request(player_id))
+            if player_id != -10:
+                mapserv.sendall(trade_request(player_id))
                 trader_state.timer = time.time()
-	    else:
-		mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
-		trader_state.reset()
+            else:
+                mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
+                trader_state.reset()
 
 def main():
     logging.basicConfig(filename='data/logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
@@ -514,19 +514,19 @@ def main():
     charport = 0
     # Login server packet loop.
     while True:
-	#time.sleep(0.1)
+        #time.sleep(0.1)
         data = login.recv(1500)
         if not data:
             break
         pb.feed(data)
         for packet in pb:
             if packet.is_type(SMSG_LOGIN_DATA): # login succeeded
-		packet.skip(2)
-		id1 = packet.read_int32()
-		accid = packet.read_int32()
-		id2 = packet.read_int32()
-		packet.skip(30)
-		player_node.sex = packet.read_int8()
+                packet.skip(2)
+                id1 = packet.read_int32()
+                accid = packet.read_int32()
+                id2 = packet.read_int32()
+                packet.skip(30)
+                player_node.sex = packet.read_int8()
                 charip = utils.parse_ip(packet.read_int32())
                 charport = packet.read_int16()
                 login.close()
@@ -559,39 +559,39 @@ def main():
         pb.feed(data)
         for packet in pb:
             if packet.is_type(SMSG_CHAR_LOGIN):
-		packet.skip(2)
-		slots = packet.read_int16()
-		packet.skip(18)
-		count = (len(packet.data)-22) / 106
-		for i in range(count):
-		    player_node.id = packet.read_int32()
-		    player_node.EXP = packet.read_int32()
-		    player_node.MONEY = packet.read_int32()
-		    packet.skip(30)
-		    player_node.HP = packet.read_int16()
-		    player_node.MAX_HP = packet.read_int16()
-		    player_node.MP = packet.read_int16()
-		    player_node.MAX_MP = packet.read_int16()
-		    packet.skip(8)
-		    player_node.LEVEL = packet.read_int16()
-		    packet.skip(14)
-		    player_node.name = packet.read_string(24)
-		    packet.skip(6)
+                packet.skip(2)
+                slots = packet.read_int16()
+                packet.skip(18)
+                count = (len(packet.data)-22) / 106
+                for i in range(count):
+                    player_node.id = packet.read_int32()
+                    player_node.EXP = packet.read_int32()
+                    player_node.MONEY = packet.read_int32()
+                    packet.skip(30)
+                    player_node.HP = packet.read_int16()
+                    player_node.MAX_HP = packet.read_int16()
+                    player_node.MP = packet.read_int16()
+                    player_node.MAX_MP = packet.read_int16()
+                    packet.skip(8)
+                    player_node.LEVEL = packet.read_int16()
+                    packet.skip(14)
+                    player_node.name = packet.read_string(24)
+                    packet.skip(6)
                     slot = packet.read_int8()
-		    packet.skip(1)
-		    print "Character information recieved:"
-		    print "Name: %s, Id: %s, EXP: %s, MONEY: %s, HP: %s/%s, MP: %s/%s, LEVEL: %s"\
+                    packet.skip(1)
+                    print "Character information recieved:"
+                    print "Name: %s, Id: %s, EXP: %s, MONEY: %s, HP: %s/%s, MP: %s/%s, LEVEL: %s"\
                         % (player_node.name, player_node.id, player_node.EXP, player_node.MONEY, player_node.HP, player_node.MAX_HP, player_node.MP, player_node.MAX_MP, player_node.LEVEL)
-		    if slot == int(character):
-			break
+                    if slot == int(character):
+                        break
 
-		char_select_packet = PacketOut(CMSG_CHAR_SELECT)
-		char_select_packet.write_int8(int(character))
-		char.sendall(str(char_select_packet))
+                char_select_packet = PacketOut(CMSG_CHAR_SELECT)
+                char_select_packet.write_int8(int(character))
+                char.sendall(str(char_select_packet))
 
             elif packet.is_type(SMSG_CHAR_MAP_INFO):
-		player_node.id = packet.read_int32()
-		player_node.map = packet.read_string(16)
+                player_node.id = packet.read_int32()
+                player_node.map = packet.read_string(16)
                 mapip = utils.parse_ip(packet.read_int32())
                 mapport = packet.read_int16()
                 char.close()
@@ -633,379 +633,379 @@ def main():
 
         for packet in pb:
             if packet.is_type(SMSG_MAP_LOGIN_SUCCESS): # connected
-		logging.info("Map login success.")
-		packet.skip(4)
-		coord_data = packet.read_coord_dir()
-		player_node.x = coord_data[0]
-		player_node.y = coord_data[1]
-		player_node.direction = coord_data[2]
-		print "Starting Postion: %s %s %s" % (player_node.map, player_node.x, player_node.y)
+                logging.info("Map login success.")
+                packet.skip(4)
+                coord_data = packet.read_coord_dir()
+                player_node.x = coord_data[0]
+                player_node.y = coord_data[1]
+                player_node.direction = coord_data[2]
+                print "Starting Postion: %s %s %s" % (player_node.map, player_node.x, player_node.y)
                 mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED))) # map loaded
-		# A Thread to send a shop broadcast: also keeps the network active to prevent timeouts.
-		shop_broadcaster.start()
+                # A Thread to send a shop broadcast: also keeps the network active to prevent timeouts.
+                shop_broadcaster.start()
 
             elif packet.is_type(SMSG_WHISPER):
-		msg_len = packet.read_int16() - 26
+                msg_len = packet.read_int16() - 26
                 nick = packet.read_string(24)
                 message = packet.read_raw_string(msg_len)
-		logging.info("Whisper: " + nick + ": " + message)
-		if nick != "guild":
-		    process_whisper(nick, utils.remove_colors(message), mapserv)
+                logging.info("Whisper: " + nick + ": " + message)
+                if nick != "guild":
+                    process_whisper(nick, utils.remove_colors(message), mapserv)
 
             elif packet.is_type(SMSG_PLAYER_CHAT): # server speech
-		msg_len = packet.read_int16() - 2
-		being_id = packet.read_int32()
+                msg_len = packet.read_int16() - 2
+                being_id = packet.read_int32()
                 message = packet.read_string(msg_len)
                 if "automaticly banned for spam" in message:
                     time.sleep(3)
 
             elif packet.is_type(SMSG_BEING_CHAT): # char speech
-		msg_len = packet.read_int16() - 2
-		being_id = packet.read_int32()
+                msg_len = packet.read_int16() - 2
+                being_id = packet.read_int32()
                 message = packet.read_string(msg_len)
 
             elif packet.is_type(SMSG_WALK_RESPONSE):
-		packet.read_int32()
-		coord_data = packet.read_coord_pair()
-		player_node.x = coord_data[2]
-		player_node.y = coord_data[3]
+                packet.read_int32()
+                coord_data = packet.read_coord_pair()
+                player_node.x = coord_data[2]
+                player_node.y = coord_data[3]
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
-		stat_type = packet.read_int16()
-		value = packet.read_int32()
-		if stat_type == 0x0005:
-		    player_node.HP = value
-		elif stat_type == 0x0006:
-		    player_node.MaxHP = value
-		elif stat_type == 0x0007:
-		    player_node.MP = value
-		elif stat_type == 0x0008:
-		    player_node.MaxMP = value
-		elif stat_type == 0x000b:
-		    player_node.LEVEL = value
-		    print "Level changed: %s" % value
-		elif stat_type == 0x0018:
-		    print "Weight changed from %s/%s to %s/%s" % (player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
-		    logging.info("Weight changed from %s/%s to %s/%s", player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
-		    player_node.WEIGHT = value
-		elif stat_type == 0x0019:
-		    print "Max Weight: %s" % value
-		    player_node.MaxWEIGHT = value
+                stat_type = packet.read_int16()
+                value = packet.read_int32()
+                if stat_type == 0x0005:
+                    player_node.HP = value
+                elif stat_type == 0x0006:
+                    player_node.MaxHP = value
+                elif stat_type == 0x0007:
+                    player_node.MP = value
+                elif stat_type == 0x0008:
+                    player_node.MaxMP = value
+                elif stat_type == 0x000b:
+                    player_node.LEVEL = value
+                    print "Level changed: %s" % value
+                elif stat_type == 0x0018:
+                    print "Weight changed from %s/%s to %s/%s" % (player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
+                    logging.info("Weight changed from %s/%s to %s/%s", player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
+                    player_node.WEIGHT = value
+                elif stat_type == 0x0019:
+                    print "Max Weight: %s" % value
+                    player_node.MaxWEIGHT = value
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_2):
-		stat_type = packet.read_int16()
-		value = packet.read_int32()
-		if stat_type == 0x0001:
-		    player_node.EXP = value
-		elif stat_type == 0x0014:
-		    logging.info("Money Changed from %s, to %s", player_node.MONEY, value)
-		    print "Money Changed from %s, to %s" % (player_node.MONEY, value)
-		    player_node.MONEY = value
-		elif stat_type == 0x0016:
-		    player_node.EXP_NEEDED = value
-		    print "Exp Needed: %s" % player_node.EXP_NEEDED
+                stat_type = packet.read_int16()
+                value = packet.read_int32()
+                if stat_type == 0x0001:
+                    player_node.EXP = value
+                elif stat_type == 0x0014:
+                    logging.info("Money Changed from %s, to %s", player_node.MONEY, value)
+                    print "Money Changed from %s, to %s" % (player_node.MONEY, value)
+                    player_node.MONEY = value
+                elif stat_type == 0x0016:
+                    player_node.EXP_NEEDED = value
+                    print "Exp Needed: %s" % player_node.EXP_NEEDED
 
             elif packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_BEING_VISIBLE)\
             or packet.is_type(SMSG_PLAYER_MOVE) or packet.is_type(SMSG_PLAYER_UPDATE_1)\
             or packet.is_type(SMSG_PLAYER_UPDATE_2):
-		being_id = packet.read_int32()
+                being_id = packet.read_int32()
                 packet.skip(8)
-		job = packet.read_int16()
-		if being_id not in beingManager.container:
-	            if job == 0 and id >= 110000000 and (packet.is_type(SMSG_BEING_MOVE)\
+                job = packet.read_int16()
+                if being_id not in beingManager.container:
+                    if job == 0 and id >= 110000000 and (packet.is_type(SMSG_BEING_MOVE)\
                                                          or packet.is_type(SMSG_BEING_VISIBLE)):
-		        continue
-		    # Add the being to the BeingManager, and request name.
-		    beingManager.container[being_id] = Being(being_id, job)
-		    requestName = PacketOut(0x0094)
-		    requestName.write_int32(being_id)
-		    mapserv.sendall(str(requestName))
-
-		packet.skip(8)
-
-		if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
-		    packet.read_int32()
-
-		packet.skip(22)
-
-		if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
-		    coord_data = packet.read_coord_pair()
-		    beingManager.container[being_id].dst_x = coord_data[2]
-		    beingManager.container[being_id].dst_y = coord_data[3]
-		else:
-		    coord_data = packet.read_coord_dir()
-		    beingManager.container[being_id].x = coord_data[0]
+                        continue
+                    # Add the being to the BeingManager, and request name.
+                    beingManager.container[being_id] = Being(being_id, job)
+                    requestName = PacketOut(0x0094)
+                    requestName.write_int32(being_id)
+                    mapserv.sendall(str(requestName))
+
+                packet.skip(8)
+
+                if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
+                    packet.read_int32()
+
+                packet.skip(22)
+
+                if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
+                    coord_data = packet.read_coord_pair()
+                    beingManager.container[being_id].dst_x = coord_data[2]
+                    beingManager.container[being_id].dst_y = coord_data[3]
+                else:
+                    coord_data = packet.read_coord_dir()
+                    beingManager.container[being_id].x = coord_data[0]
                     beingManager.container[being_id].y = coord_data[1]
-		    beingManager.container[being_id].direction = coord_data[2]
-
-	    elif packet.is_type(SMSG_BEING_NAME_RESPONSE):
-	        being_id = packet.read_int32()
-		if being_id in beingManager.container:
-		    beingManager.container[being_id].name = packet.read_string(24)
-
-	    elif packet.is_type(SMSG_BEING_REMOVE):
-	        being_id = packet.read_int32()
-		if being_id in beingManager.container:
-		    del beingManager.container[being_id]
-
-	    elif packet.is_type(SMSG_PLAYER_WARP):
-		player_node.map = packet.read_string(16)
-	        player_node.x = packet.read_int16()
-		player_node.y = packet.read_int16()
-		logging.info("Player warped.")
+                    beingManager.container[being_id].direction = coord_data[2]
+
+            elif packet.is_type(SMSG_BEING_NAME_RESPONSE):
+                being_id = packet.read_int32()
+                if being_id in beingManager.container:
+                    beingManager.container[being_id].name = packet.read_string(24)
+
+            elif packet.is_type(SMSG_BEING_REMOVE):
+                being_id = packet.read_int32()
+                if being_id in beingManager.container:
+                    del beingManager.container[being_id]
+
+            elif packet.is_type(SMSG_PLAYER_WARP):
+                player_node.map = packet.read_string(16)
+                player_node.x = packet.read_int16()
+                player_node.y = packet.read_int16()
+                logging.info("Player warped.")
                 mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED)))
 
-	    elif packet.is_type(SMSG_BEING_ACTION):
-		src_being = packet.read_int32()
-		dst_being = packet.read_int32()
-		packet.skip(12)
-		param1 = packet.read_int16()
-		packet.skip(2)
-		action_type = packet.read_int8()
+            elif packet.is_type(SMSG_BEING_ACTION):
+                src_being = packet.read_int32()
+                dst_being = packet.read_int32()
+                packet.skip(12)
+                param1 = packet.read_int16()
+                packet.skip(2)
+                action_type = packet.read_int8()
 
-		if src_being in beingManager.container:
-		    if action_type == 0: # Damage
-		        beingManager.container[src_being].action = "attack"
-		        beingManager.container[src_being].target = dst_being
+                if src_being in beingManager.container:
+                    if action_type == 0: # Damage
+                        beingManager.container[src_being].action = "attack"
+                        beingManager.container[src_being].target = dst_being
 
-		    elif action_type == 0x02: # Sit
-		        beingManager.container[src_being].action = "sit"
+                    elif action_type == 0x02: # Sit
+                        beingManager.container[src_being].action = "sit"
 
-		    elif action_type == 0x03: # Stand up
-		        beingManager.container[src_being].action = "stand"
+                    elif action_type == 0x03: # Stand up
+                        beingManager.container[src_being].action = "stand"
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY_ADD):
-		item = Item()
+                item = Item()
                 item.index = packet.read_int16() - inventory_offset
-		item.amount = packet.read_int16()
-		item.itemId = packet.read_int16()
-		item.identified = packet.read_int8()
-		packet.read_int8()
-		item.refine = packet.read_int8()
-		packet.skip(8)
-		item.equipType = packet.read_int16()
-		item.itemType = packet.read_int8()
-		err = packet.read_int8()
+                item.amount = packet.read_int16()
+                item.itemId = packet.read_int16()
+                item.identified = packet.read_int8()
+                packet.read_int8()
+                item.refine = packet.read_int8()
+                packet.skip(8)
+                item.equipType = packet.read_int16()
+                item.itemType = packet.read_int8()
+                err = packet.read_int8()
 
                 if err == 0:
-		    if item.index in player_node.inventory:
-		        player_node.inventory[item.index].amount += item.amount
-		    else:
-		        player_node.inventory[item.index] = item
+                    if item.index in player_node.inventory:
+                        player_node.inventory[item.index].amount += item.amount
+                    else:
+                        player_node.inventory[item.index] = item
 
-		    print "Picked up: %s, Amount: %s" % (ItemDB.getItem(item.itemId).name, item.amount)
-	            logging.info("Picked up: %s, Amount: %s", ItemDB.getItem(item.itemId).name, str(item.amount))
+                    print "Picked up: %s, Amount: %s" % (ItemDB.getItem(item.itemId).name, item.amount)
+                    logging.info("Picked up: %s, Amount: %s", ItemDB.getItem(item.itemId).name, str(item.amount))
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY_REMOVE):
-		index = packet.read_int16() - inventory_offset
+                index = packet.read_int16() - inventory_offset
                 amount = packet.read_int16()
 
-		print "Remove item: %s, Amount: %s" % (ItemDB.getItem(player_node.inventory[index].itemId).name, amount)
-		logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
-		if index in player_node.inventory:
-		    player_node.inventory[index].amount -= amount
-		    if player_node.inventory[index].amount == 0:
-		        del player_node.inventory[index]
+                print "Remove item: %s, Amount: %s" % (ItemDB.getItem(player_node.inventory[index].itemId).name, amount)
+                logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
+                if index in player_node.inventory:
+                    player_node.inventory[index].amount -= amount
+                    if player_node.inventory[index].amount == 0:
+                        del player_node.inventory[index]
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY):
-		player_node.inventory.clear() # Clear the inventory - incase of new index.
-		packet.skip(2)
-		number = (len(packet.data)-2) / 18
+                player_node.inventory.clear() # Clear the inventory - incase of new index.
+                packet.skip(2)
+                number = (len(packet.data)-2) / 18
                 for loop in range(number):
-		    item = Item()
-		    item.index = packet.read_int16() - inventory_offset
-		    item.itemId = packet.read_int16()
-		    item.itemType = packet.read_int8()
-		    item.identified = packet.read_int8()
-		    item.amount = packet.read_int16()
-		    item.arrow = packet.read_int16()
-		    packet.skip(8) # Cards
-		    player_node.inventory[item.index] = item
+                    item = Item()
+                    item.index = packet.read_int16() - inventory_offset
+                    item.itemId = packet.read_int16()
+                    item.itemType = packet.read_int8()
+                    item.identified = packet.read_int8()
+                    item.amount = packet.read_int16()
+                    item.arrow = packet.read_int16()
+                    packet.skip(8) # Cards
+                    player_node.inventory[item.index] = item
 
             elif packet.is_type(SMSG_PLAYER_EQUIPMENT):
-		packet.read_int16()
-		number = (len(packet.data)) / 20
+                packet.read_int16()
+                number = (len(packet.data)) / 20
                 for loop in range(number):
-		    item = Item()
-		    item.index = packet.read_int16() - inventory_offset
-		    item.itemId = packet.read_int16()
-		    item.itemType = packet.read_int8()
-		    item.identified = packet.read_int8()
-		    packet.skip(2)
-		    item.equipType = packet.read_int16()
-		    packet.skip(1)
-		    item.refine = packet.read_int8()
-		    packet.skip(8)
-		    item.amount = 1
-		    player_node.inventory[item.index] = item
-
-		for item in player_node.inventory:
-		    print "Name: %s, Id: %s, Index: %s, Amount: %s." % \
+                    item = Item()
+                    item.index = packet.read_int16() - inventory_offset
+                    item.itemId = packet.read_int16()
+                    item.itemType = packet.read_int8()
+                    item.identified = packet.read_int8()
+                    packet.skip(2)
+                    item.equipType = packet.read_int16()
+                    packet.skip(1)
+                    item.refine = packet.read_int8()
+                    packet.skip(8)
+                    item.amount = 1
+                    player_node.inventory[item.index] = item
+
+                for item in player_node.inventory:
+                    print "Name: %s, Id: %s, Index: %s, Amount: %s." % \
                     (ItemDB.getItem(player_node.inventory[item].itemId).name, \
                      player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
 
-	    elif packet.is_type(SMSG_TRADE_REQUEST):
-		print "SMSG_TRADE_REQUEST"
-		name = packet.read_string(24)
-		logging.info("Trade request: " + name)
-
-	    elif packet.is_type(SMSG_TRADE_RESPONSE):
-		print "SMSG_TRADE_RESPONSE"
-		response = packet.read_int8()
-		time.sleep(0.2)
-		if response == 0:
-		    logging.info("Trade response: Too far away.")
-		    if trader_state.item:
-		        mapserv.sendall(whisper(trader_state.item.player, "You are too far away."))
-		    elif trader_state.money:
-			mapserv.sendall(whisper(trader_state.money, "You are too far away."))
-		    trader_state.reset()
-
-		elif response == 3:
-		    logging.info("Trade response: Trade accepted.")
-		    if trader_state.item:
-		        if trader_state.item.get == 1: # add
-		            mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
-		        elif trader_state.item.get == 0: # buy
-			    if player_node.find_inventory_index(trader_state.item.id) != -10:
-			        mapserv.sendall(trade_add_item(player_node.find_inventory_index(trader_state.item.id), trader_state.item.amount))
-			        mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
-			        if trader_state.item.price == 0: # getback
-			            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
-			            trader_state.complete = 1
-
-		    elif trader_state.money: # money
-			amount = int(user_tree.get_user(trader_state.money).get('money'))
-			mapserv.sendall(trade_add_item(0-inventory_offset, amount))
-			mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
-			mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
-			trader_state.complete = 1
-
-		elif response == 4:
-		    logging.info("Trade response: Trade cancelled")
-		    trader_state.reset()
-
-	    elif packet.is_type(SMSG_TRADE_ITEM_ADD):
-		print "SMSG_TRADE_ITEM_ADD"
-		amount = packet.read_int32()
-		item_id = packet.read_int16()
-		if trader_state.item and trader_state.money == 0:
-		    if  trader_state.item.get == 1: # add
-		        if amount == trader_state.item.amount and item_id == trader_state.item.id:
-			    trader_state.complete = 1
-		            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
-		        else:
-			    mapserv.sendall(whisper(trader_state.item.player, "Thats not the right item."))
-			    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-
-		    elif trader_state.item.get == 0: # buy
-		        if amount == trader_state.item.price * trader_state.item.amount and item_id == 0:
-		            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
-			    trader_state.complete = 1
-			elif item_id == 0 and amount != trader_state.item.price * trader_state.item.amount:
-			    trader_state.complete = 0
-		        else:
-			    if item_id == 0:
-			        mapserv.sendall(whisper(trader_state.item.player, "Please verify you have the correct amount of money and try again."))
-			    else:
-				mapserv.sendall(whisper(trader_state.item.player, "Don't give me your itenz."))
-			    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-
-		elif trader_state.money: # money
-		    mapserv.sendall(whisper(trader_state.money, "Don't give me your itenz."))
-		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-
-		logging.info("Trade item add: ItemId:%s Amount:%s", item_id, amount)
-		# Note item_id = 0 is money
-
-	    elif packet.is_type(SMSG_TRADE_ITEM_ADD_RESPONSE):
-		print "SMSG_TRADE_ITEM_ADD_RESPONSE"
-		index = packet.read_int16() - inventory_offset
-		amount = packet.read_int16()
-		response = packet.read_int8()
-
-		if response == 0:
-		    logging.info("Trade item add response: Successfully added item.")
-		    if trader_state.item:
-			if trader_state.item.get == 0 and index != 0-inventory_offset: # Make sure the correct item is given!
+            elif packet.is_type(SMSG_TRADE_REQUEST):
+                print "SMSG_TRADE_REQUEST"
+                name = packet.read_string(24)
+                logging.info("Trade request: " + name)
+
+            elif packet.is_type(SMSG_TRADE_RESPONSE):
+                print "SMSG_TRADE_RESPONSE"
+                response = packet.read_int8()
+                time.sleep(0.2)
+                if response == 0:
+                    logging.info("Trade response: Too far away.")
+                    if trader_state.item:
+                        mapserv.sendall(whisper(trader_state.item.player, "You are too far away."))
+                    elif trader_state.money:
+                        mapserv.sendall(whisper(trader_state.money, "You are too far away."))
+                    trader_state.reset()
+
+                elif response == 3:
+                    logging.info("Trade response: Trade accepted.")
+                    if trader_state.item:
+                        if trader_state.item.get == 1: # add
+                            mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
+                        elif trader_state.item.get == 0: # buy
+                            if player_node.find_inventory_index(trader_state.item.id) != -10:
+                                mapserv.sendall(trade_add_item(player_node.find_inventory_index(trader_state.item.id), trader_state.item.amount))
+                                mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
+                                if trader_state.item.price == 0: # getback
+                                    mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+                                    trader_state.complete = 1
+
+                    elif trader_state.money: # money
+                        amount = int(user_tree.get_user(trader_state.money).get('money'))
+                        mapserv.sendall(trade_add_item(0-inventory_offset, amount))
+                        mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
+                        mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+                        trader_state.complete = 1
+
+                elif response == 4:
+                    logging.info("Trade response: Trade cancelled")
+                    trader_state.reset()
+
+            elif packet.is_type(SMSG_TRADE_ITEM_ADD):
+                print "SMSG_TRADE_ITEM_ADD"
+                amount = packet.read_int32()
+                item_id = packet.read_int16()
+                if trader_state.item and trader_state.money == 0:
+                    if  trader_state.item.get == 1: # add
+                        if amount == trader_state.item.amount and item_id == trader_state.item.id:
+                            trader_state.complete = 1
+                            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+                        else:
+                            mapserv.sendall(whisper(trader_state.item.player, "Thats not the right item."))
+                            mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
+                    elif trader_state.item.get == 0: # buy
+                        if amount == trader_state.item.price * trader_state.item.amount and item_id == 0:
+                            mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+                            trader_state.complete = 1
+                        elif item_id == 0 and amount != trader_state.item.price * trader_state.item.amount:
+                            trader_state.complete = 0
+                        else:
+                            if item_id == 0:
+                                mapserv.sendall(whisper(trader_state.item.player, "Please verify you have the correct amount of money and try again."))
+                            else:
+                                mapserv.sendall(whisper(trader_state.item.player, "Don't give me your itenz."))
+                            mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
+                elif trader_state.money: # money
+                    mapserv.sendall(whisper(trader_state.money, "Don't give me your itenz."))
+                    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
+                logging.info("Trade item add: ItemId:%s Amount:%s", item_id, amount)
+                # Note item_id = 0 is money
+
+            elif packet.is_type(SMSG_TRADE_ITEM_ADD_RESPONSE):
+                print "SMSG_TRADE_ITEM_ADD_RESPONSE"
+                index = packet.read_int16() - inventory_offset
+                amount = packet.read_int16()
+                response = packet.read_int8()
+
+                if response == 0:
+                    logging.info("Trade item add response: Successfully added item.")
+                    if trader_state.item:
+                        if trader_state.item.get == 0 and index != 0-inventory_offset: # Make sure the correct item is given!
                             if player_node.inventory[index].itemId != trader_state.item.id and \
                                 amount != trader_state.item.amount:
                                 mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
-		    # If Trade item add successful - Remove the item from the inventory state.
-		    if index != 0-inventory_offset: # If it's not money
-		        print "Remove item: %s, Amount: %s" % (ItemDB.getItem(player_node.inventory[index].itemId).name, amount)
-		        logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
-		        if index in player_node.inventory:
-		            player_node.inventory[index].amount -= amount
-		            if player_node.inventory[index].amount == 0:
-		                del player_node.inventory[index]
-
-		elif response == 1:
-		    logging.info("Trade item add response: Failed - player overweight.")
-		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-		    if trader_state.item:
-		        mapserv.sendall(whisper(trader_state.item.player, "You are carrying too much weight. Unload and try again."))
-		elif response == 2:
-		    if trader_state.item:
-		        mapserv.sendall(whisper(trader_state.item.player, "You have no free slots."))
-		    logging.info("Trade item add response: Failed - No free slots.")
-		    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-
-	    elif packet.is_type(SMSG_TRADE_OK):
-		print "SMSG_TRADE_OK"
-		is_ok = packet.read_int8() # 0 is ok from self, and 1 is ok from other
-		if is_ok == 0:
-		    logging.info("Trade OK: Self.")
-		else:
-		    if trader_state.complete:
-		        mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
-		    else:
-			mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-			mapserv.sendall(whisper(trader_state.item.player, "Trade Cancelled: Please check the traded items or money."))
-
-		    logging.info("Trade Ok: Partner.")
-
-	    elif packet.is_type(SMSG_TRADE_CANCEL):
-		trader_state.reset()
-		logging.info("Trade Cancel.")
-		print "SMSG_TRADE_CANCEL"
-
-	    elif packet.is_type(SMSG_TRADE_COMPLETE):
-		# The sale_tree is only ammended after a complete trade packet.
-		if trader_state.item and trader_state.money == 0:
-		    if trader_state.item.get == 1: # !add
-		        sale_tree.add_item(trader_state.item.player, trader_state.item.id, trader_state.item.amount, trader_state.item.price)
-		        user_tree.get_user(trader_state.item.player).set('used_stalls', \
+                    # If Trade item add successful - Remove the item from the inventory state.
+                    if index != 0-inventory_offset: # If it's not money
+                        print "Remove item: %s, Amount: %s" % (ItemDB.getItem(player_node.inventory[index].itemId).name, amount)
+                        logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
+                        if index in player_node.inventory:
+                            player_node.inventory[index].amount -= amount
+                            if player_node.inventory[index].amount == 0:
+                                del player_node.inventory[index]
+
+                elif response == 1:
+                    logging.info("Trade item add response: Failed - player overweight.")
+                    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+                    if trader_state.item:
+                        mapserv.sendall(whisper(trader_state.item.player, "You are carrying too much weight. Unload and try again."))
+                elif response == 2:
+                    if trader_state.item:
+                        mapserv.sendall(whisper(trader_state.item.player, "You have no free slots."))
+                    logging.info("Trade item add response: Failed - No free slots.")
+                    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+
+            elif packet.is_type(SMSG_TRADE_OK):
+                print "SMSG_TRADE_OK"
+                is_ok = packet.read_int8() # 0 is ok from self, and 1 is ok from other
+                if is_ok == 0:
+                    logging.info("Trade OK: Self.")
+                else:
+                    if trader_state.complete:
+                        mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+                    else:
+                        mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+                        mapserv.sendall(whisper(trader_state.item.player, "Trade Cancelled: Please check the traded items or money."))
+
+                    logging.info("Trade Ok: Partner.")
+
+            elif packet.is_type(SMSG_TRADE_CANCEL):
+                trader_state.reset()
+                logging.info("Trade Cancel.")
+                print "SMSG_TRADE_CANCEL"
+
+            elif packet.is_type(SMSG_TRADE_COMPLETE):
+                # The sale_tree is only ammended after a complete trade packet.
+                if trader_state.item and trader_state.money == 0:
+                    if trader_state.item.get == 1: # !add
+                        sale_tree.add_item(trader_state.item.player, trader_state.item.id, trader_state.item.amount, trader_state.item.price)
+                        user_tree.get_user(trader_state.item.player).set('used_stalls', \
                                                                          str(int(user_tree.get_user(trader_state.item.player).get('used_stalls')) + 1))
 
-		    elif trader_state.item.get == 0: # !buy \ !getback
-		        seller = sale_tree.get_uid(trader_state.item.uid).get('name')
-		        item = sale_tree.get_uid(trader_state.item.uid)
-		        current_amount = int(item.get("amount"))
-		        sale_tree.get_uid(trader_state.item.uid).set("amount", str(current_amount - trader_state.item.amount))
-		        if int(item.get("amount")) == 0:
-			    user_tree.get_user(sale_tree.get_uid(trader_state.item.uid).get('name')).set('used_stalls', \
+                    elif trader_state.item.get == 0: # !buy \ !getback
+                        seller = sale_tree.get_uid(trader_state.item.uid).get('name')
+                        item = sale_tree.get_uid(trader_state.item.uid)
+                        current_amount = int(item.get("amount"))
+                        sale_tree.get_uid(trader_state.item.uid).set("amount", str(current_amount - trader_state.item.amount))
+                        if int(item.get("amount")) == 0:
+                            user_tree.get_user(sale_tree.get_uid(trader_state.item.uid).get('name')).set('used_stalls', \
                                                                                                          str(int(user_tree.get_user(sale_tree.get_uid(trader_state.item.uid).get('name')).get('used_stalls'))-1))
-			    sale_tree.remove_item_uid(trader_state.item.uid)
+                            sale_tree.remove_item_uid(trader_state.item.uid)
 
-		        current_money = int(user_tree.get_user(seller).get("money"))
-		        user_tree.get_user(seller).set("money", str(current_money + trader_state.item.price * trader_state.item.amount))
+                        current_money = int(user_tree.get_user(seller).get("money"))
+                        user_tree.get_user(seller).set("money", str(current_money + trader_state.item.price * trader_state.item.amount))
 
-			if trader_state.item.price * trader_state.item.amount != 0:
-			    ItemLog.add_item(int(item.get('itemId')), trader_state.item.amount, trader_state.item.price * trader_state.item.amount)
+                        if trader_state.item.price * trader_state.item.amount != 0:
+                            ItemLog.add_item(int(item.get('itemId')), trader_state.item.amount, trader_state.item.price * trader_state.item.amount)
 
-		elif trader_state.money and trader_state.item == 0: # !money
-		    user_tree.get_user(trader_state.money).set('money', str(0))
+                elif trader_state.money and trader_state.item == 0: # !money
+                    user_tree.get_user(trader_state.money).set('money', str(0))
 
-		sale_tree.save()
-		user_tree.save()
-		trader_state.reset()
-		logging.info("Trade Complete.")
-		print "SMSG_TRADE_COMPLETE"
+                sale_tree.save()
+                user_tree.save()
+                trader_state.reset()
+                logging.info("Trade Complete.")
+                print "SMSG_TRADE_COMPLETE"
             else:
-		pass
-	        #print "Unhandled Packet: %s" % hex(packet.get_type())
+                pass
+                #print "Unhandled Packet: %s" % hex(packet.get_type())
 
     # On Disconnect/Exit
     shop_broadcaster.stop()
diff --git a/player.py b/player.py
index a63218d..156030a 100644
--- a/player.py
+++ b/player.py
@@ -4,28 +4,28 @@ class Item:
 class Player:
     def __init__(self, name):
         self.inventory = {}
-	self.storage = []
-	self.name = name
-	self.id = 0
-	self.sex = 0
-	self.map = ""
-	self.x = 0
-	self.y = 0
+        self.storage = []
+        self.name = name
+        self.id = 0
+        self.sex = 0
+        self.map = ""
+        self.x = 0
+        self.y = 0
 
-	self.EXP_NEEDED = 0
-	self.EXP = 0
-	self.MONEY = 0
-	self.LEVEL = 0
-	self.HP = 0
-	self.MaxHP = 0
-	self.MP = 0
-	self.MaxMP = 0
-	self.WEIGHT = 0
-	self.MaxWEIGHT = 0
+        self.EXP_NEEDED = 0
+        self.EXP = 0
+        self.MONEY = 0
+        self.LEVEL = 0
+        self.HP = 0
+        self.MaxHP = 0
+        self.MP = 0
+        self.MaxMP = 0
+        self.WEIGHT = 0
+        self.MaxWEIGHT = 0
 
     def find_inventory_index(self, item_id):
-	for item in self.inventory:
-	    if item > 1:
-	        if self.inventory[item].itemId == item_id:
-	            return item
-	return -10 # Not found - bug somewhere!
+        for item in self.inventory:
+            if item > 1:
+                if self.inventory[item].itemId == item_id:
+                    return item
+        return -10 # Not found - bug somewhere!
diff --git a/tradey.py b/tradey.py
index bb83960..9c8703b 100644
--- a/tradey.py
+++ b/tradey.py
@@ -7,82 +7,82 @@ class UserTree:
         self.root = self.tree.getroot()
 
     def add_user(self, name, stalls, al):
-	if self.get_user(name) == -10:
-	    user = SubElement(self.root, "user")
-	    user.set("name", name)
-	    user.set("stalls", str(stalls))
+        if self.get_user(name) == -10:
+            user = SubElement(self.root, "user")
+            user.set("name", name)
+            user.set("stalls", str(stalls))
             user.set("used_stalls", str(0))
-	    user.set("money", str(0))
-	    user.set("id", str(0))
-	    user.set("accesslevel", str(al))
-	    self.save()
+            user.set("money", str(0))
+            user.set("id", str(0))
+            user.set("accesslevel", str(al))
+            self.save()
 
     def get_user(self, name):
-	for elem in self.root:
-	    if elem.get("name") == name:
-		return elem
-	return -10
+        for elem in self.root:
+            if elem.get("name") == name:
+                return elem
+        return -10
 
     def remove_user(self, name):
-    	for elem in self.root:
-	    if elem.get("name") == name:
-		self.root.remove(elem)
-		self.save()
-		return 1		
-	return -10	
+            for elem in self.root:
+            if elem.get("name") == name:
+                self.root.remove(elem)
+                self.save()
+                return 1
+        return -10
 
     def save(self):
-	# Be sure to call save() after any changes to the tree.
-	self.tree = ElementTree(self.root)
-	self.tree.write("data/user.xml")
+        # Be sure to call save() after any changes to the tree.
+        self.tree = ElementTree(self.root)
+        self.tree.write("data/user.xml")
 
 class ItemTree:
     def __init__(self):
         self.tree = ElementTree(file="data/sale.xml")
         self.root = self.tree.getroot()
-	self.u_id = set()
+        self.u_id = set()
 
-	for elem in self.root:
-	    self.u_id.add(int(elem.get("uid")))
+        for elem in self.root:
+            self.u_id.add(int(elem.get("uid")))
 
     def getId(self):
-	id_itter = 1
-	while id_itter in self.u_id:
-		id_itter += 1
-	self.u_id.add(id_itter)
-	return id_itter
+        id_itter = 1
+        while id_itter in self.u_id:
+                id_itter += 1
+        self.u_id.add(id_itter)
+        return id_itter
 
     def remove_id(self, uid):
-	# Free up used id's.
-	self.u_id.remove(uid)
+        # Free up used id's.
+        self.u_id.remove(uid)
 
     def add_item(self, name, item_id, amount, price):
-	user = SubElement(self.root, "item")
-	user.set("name", name)
-	user.set("itemId", str(item_id))
-	user.set("price", str(price))
-	user.set("add_time", str(time.time()))
-	user.set("relisted", str(0))
-	user.set("amount", str(amount))
-	user.set("uid", str(self.getId()))
-	self.save()
+        user = SubElement(self.root, "item")
+        user.set("name", name)
+        user.set("itemId", str(item_id))
+        user.set("price", str(price))
+        user.set("add_time", str(time.time()))
+        user.set("relisted", str(0))
+        user.set("amount", str(amount))
+        user.set("uid", str(self.getId()))
+        self.save()
 
     def get_uid(self, uid):
-	for elem in self.root:
-	    if elem.get("uid") == str(uid):
-		return elem
-	return -10
+        for elem in self.root:
+            if elem.get("uid") == str(uid):
+                return elem
+        return -10
 
     def remove_item_uid(self, uid):
-    	for elem in self.root:
-	    if elem.get("uid") == str(uid):
-		self.root.remove(elem)
-		self.remove_id(uid)
-		self.save()
-		return 1		
-	return -10	
+            for elem in self.root:
+            if elem.get("uid") == str(uid):
+                self.root.remove(elem)
+                self.remove_id(uid)
+                self.save()
+                return 1
+        return -10
 
     def save(self):
-	# Be sure to call save() after any changes to the tree.
-	self.tree = ElementTree(self.root)
-	self.tree.write("data/sale.xml")
+        # Be sure to call save() after any changes to the tree.
+        self.tree = ElementTree(self.root)
+        self.tree.write("data/sale.xml")
diff --git a/utils.py b/utils.py
index 8e7f839..d770eb4 100644
--- a/utils.py
+++ b/utils.py
@@ -15,9 +15,9 @@ def parse_ip(a):
 def remove_colors(msg):
     if len(msg) > 2:
         for f in range(len(msg)-2):
-	    while (len(msg) > f + 2) and (msg[f] == "#")\
-		and (msg[f+1] == "#"):
-		msg = msg[0:f]+msg[f+3:]
+            while (len(msg) > f + 2) and (msg[f] == "#")\
+                and (msg[f+1] == "#"):
+                msg = msg[0:f]+msg[f+3:]
     return msg
 
 # Encode string - used with 4144 shop compatibility.
@@ -26,12 +26,12 @@ def encode_str(value, size):
     base = 94
     start = 33
     while value:
-	output += struct.pack('<B', value % base + start)
-	value /= base
+        output += struct.pack('<B', value % base + start)
+        value /= base
 
     while len(output) < size:
-	output += struct.pack('<B', start)
-    
+        output += struct.pack('<B', start)
+
     return output
 
 class ItemDB:
@@ -39,28 +39,28 @@ class ItemDB:
     A simple class to look up information from the items.xml file.
     """
     def __init__(self):
-	print "Loading ItemDB"
+        print "Loading ItemDB"
         self.item_names = {}
         self.itemdb_file = ElementTree()
         self.itemdb_file.parse("data/items.xml")
 
         for item in self.itemdb_file.getroot():
             if item.get('id') > 500:
-	        item_struct = Item()
-		item_struct.name = item.get('name')
-		if item.get('weight'):
-		    item_struct.weight = item.get('weight')
-		item_struct.description = item.get('description')
+                item_struct = Item()
+                item_struct.name = item.get('name')
+                if item.get('weight'):
+                    item_struct.weight = item.get('weight')
+                item_struct.description = item.get('description')
                 self.item_names[int(item.get('id'))] = item_struct
 
     def getItem(self, item_id):
-	return self.item_names[item_id]
+        return self.item_names[item_id]
 
     def findId(self, name):
-	for item_id in self.item_names:
-	    if self.item_names[item_id].name == name:
-		return item_id
-	return -10 #Not found
+        for item_id in self.item_names:
+            if self.item_names[item_id].name == name:
+                return item_id
+        return -10 #Not found
 
 class ItemLog:
     """ Writes all sales to a log file, for later processing."""
@@ -69,47 +69,47 @@ class ItemLog:
 
     def add_item(self, item_id, amount, price):
         file_node = open(self.log_file, 'a')
-	file_node.write(str(item_id)+" "+str(amount)+" "+str(price)+" "+str(time.time())+"\n")
-	file_node.close()
+        file_node.write(str(item_id)+" "+str(amount)+" "+str(price)+" "+str(time.time())+"\n")
+        file_node.close()
 
 class TraderState:
     """ Stores information regarding a trade request"""
     def __init__(self):
-	self.Trading = mutex.mutex()
-	self.item = 0
-	self.money = 0
-	self.complete = 0
+        self.Trading = mutex.mutex()
+        self.item = 0
+        self.money = 0
+        self.complete = 0
         self.timer = 0
 
     def reset(self):
-	self.Trading.unlock()
-	self.item = 0
-	self.complete = 0
-	self.money = 0
+        self.Trading.unlock()
+        self.item = 0
+        self.complete = 0
+        self.money = 0
         self.timer = 0
 
 class Broadcast:
     """Send a message to the server every 5 minutes to avoid a timeout."""
 
     def __init__(self):
-	self.mapserv = 0
-	self.Active = False
-	self.Timer = 0
-	self.shop_broadcast = threading.Thread(target=self.send_broadcast, args=())
+        self.mapserv = 0
+        self.Active = False
+        self.Timer = 0
+        self.shop_broadcast = threading.Thread(target=self.send_broadcast, args=())
 
     def send_broadcast(self):
-	while self.Active:
-	    if (time.time() - self.Timer) > 5 * 60:
-	        self.mapserv.sendall(emote(193))
-		self.Timer = time.time()
-		print "shop_broadcast"
-	    else:
-		time.sleep(0.1)
+        while self.Active:
+            if (time.time() - self.Timer) > 5 * 60:
+                self.mapserv.sendall(emote(193))
+                self.Timer = time.time()
+                print "shop_broadcast"
+            else:
+                time.sleep(0.1)
 
     def start(self):
-	self.Active = True
-	self.shop_broadcast.start()
+        self.Active = True
+        self.shop_broadcast.start()
 
     def stop(self):
-	self.Active = False
-	self.shop_broadcast.join()
+        self.Active = False
+        self.shop_broadcast.join()
-- 
cgit v1.2.3-70-g09d2


From fe235df396611baa4f61b08c7fe7ba65f331f7fe Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 21:15:58 +0200
Subject: repair indentation

---
 main.py   | 11 +++++++++--
 tradey.py |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 main.py

diff --git a/main.py b/main.py
old mode 100644
new mode 100755
index 41b428d..6a83c53
--- a/main.py
+++ b/main.py
@@ -18,8 +18,15 @@ import sys
 import time
 import string
 
+
+
 from being import *
-from data.config import *
+try:
+    from config import *
+except:
+    print "no config file found. please move config.py.template to config.py and edit to your needs!"
+    exit(0);
+
 from net.packet import *
 from net.protocol import *
 from net.packet_out import *
@@ -101,7 +108,7 @@ def process_whisper(nick, msg, mapserv):
 
                     msg += elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" + \
                         ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
-                        mapserv.sendall(whisper(nick, msg))
+                    mapserv.sendall(whisper(nick, msg))
 
             money = int(user.get('money'))
             mapserv.sendall(whisper(nick, "You have " + str(money) + "gp to collect."))
diff --git a/tradey.py b/tradey.py
index 9c8703b..153d645 100644
--- a/tradey.py
+++ b/tradey.py
@@ -24,7 +24,7 @@ class UserTree:
         return -10
 
     def remove_user(self, name):
-            for elem in self.root:
+        for elem in self.root:
             if elem.get("name") == name:
                 self.root.remove(elem)
                 self.save()
@@ -74,7 +74,7 @@ class ItemTree:
         return -10
 
     def remove_item_uid(self, uid):
-            for elem in self.root:
+        for elem in self.root:
             if elem.get("uid") == str(uid):
                 self.root.remove(elem)
                 self.remove_id(uid)
-- 
cgit v1.2.3-70-g09d2


From d845907f7e7e155490d4247c18be25fd0b96edc7 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 21:19:50 +0200
Subject: Use config file for username and password

---
 main.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 6a83c53..a1d2490 100755
--- a/main.py
+++ b/main.py
@@ -22,7 +22,7 @@ import string
 
 from being import *
 try:
-    from config import *
+    import config
 except:
     print "no config file found. please move config.py.template to config.py and edit to your needs!"
     exit(0);
@@ -500,12 +500,12 @@ def main():
     logging.basicConfig(filename='data/logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
     logging.info("Bot Started.")
 
-    account = sys.argv[1]
-    password = sys.argv[2]
-    character = sys.argv[3]
+    account = config.account
+    password = config.password
+    character = config.character
 
     login = socket.socket()
-    login.connect((server, port))
+    login.connect((config.server, config.port))
     print("Login connected")
 
     login_packet = PacketOut(0x0064)
-- 
cgit v1.2.3-70-g09d2


From 347f41eac9e33743172d319bcc2a4c7283497ccf Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 21:25:45 +0200
Subject: Adding copyright notes

---
 being.py  | 12 ++++++++++++
 main.py   |  5 ++++-
 player.py | 11 +++++++++++
 tradey.py | 11 +++++++++++
 utils.py  | 11 +++++++++++
 5 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/being.py b/being.py
index 52a2e1b..e5d0b95 100644
--- a/being.py
+++ b/being.py
@@ -1,3 +1,12 @@
+#!/usr/bin/python
+"""
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
+"""
+
 def job_type(job):
     if (job <= 25 or (job >= 4001 and job <= 4049)):
         return "player"
@@ -28,3 +37,6 @@ class Being:
         self.job = job
         self.target = 0
         self.type = job_type(job)
+
+if __name__ == '__main__':
+    print "Do not run this file directly. Run main.py"
diff --git a/main.py b/main.py
index a1d2490..7ef7b55 100755
--- a/main.py
+++ b/main.py
@@ -1,7 +1,10 @@
+#!/usr/bin/python
 """
+
     Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-    This package implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
+    tradey, a package, which implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
 
     - Currently permissions are defined as: -1 (blocked), 0 (normal user), 5 (seller), 20 (admin).
     - An item will only be listed for a period of one week, and can be relisted
diff --git a/player.py b/player.py
index 156030a..2e3eafa 100644
--- a/player.py
+++ b/player.py
@@ -1,3 +1,11 @@
+#!/usr/bin/python
+"""
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
+"""
 class Item:
     pass
 
@@ -29,3 +37,6 @@ class Player:
                 if self.inventory[item].itemId == item_id:
                     return item
         return -10 # Not found - bug somewhere!
+
+if __name__ == '__main__':
+    print "Do not run this file directly. Run main.py"
diff --git a/tradey.py b/tradey.py
index 153d645..add8256 100644
--- a/tradey.py
+++ b/tradey.py
@@ -1,3 +1,11 @@
+#!/usr/bin/python
+"""
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
+"""
 import time
 from xml.etree.ElementTree import *
 
@@ -86,3 +94,6 @@ class ItemTree:
         # Be sure to call save() after any changes to the tree.
         self.tree = ElementTree(self.root)
         self.tree.write("data/sale.xml")
+
+if __name__ == '__main__':
+    print "Do not run this file directly. Run main.py"
diff --git a/utils.py b/utils.py
index d770eb4..b6bbc3f 100644
--- a/utils.py
+++ b/utils.py
@@ -1,3 +1,11 @@
+#!/usr/bin/python
+"""
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
+"""
 from xml.etree.ElementTree import ElementTree
 from player import Item
 
@@ -113,3 +121,6 @@ class Broadcast:
     def stop(self):
         self.Active = False
         self.shop_broadcast.join()
+
+if __name__ == '__main__':
+    print "Do not run this file directly. Run main.py"
-- 
cgit v1.2.3-70-g09d2


From e70e71e4e1e354a3120f6c052418cb1432063ffc Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 21:45:13 +0200
Subject: adding compiled python files (*.pyc) to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 357f8f6..7d7c1a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 data/
 config.py
+*.pyc
-- 
cgit v1.2.3-70-g09d2


From e1907f17bf0bc05c9ca73fbf777462b1f2c1ecc1 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 21:48:33 +0200
Subject: even more space changes

---
 main.py           |   2 +-
 net/packet.py     | 106 +++++++++++++++++++++++++++---------------------------
 net/packet_out.py |   6 ++--
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/main.py b/main.py
index 7ef7b55..68c150e 100755
--- a/main.py
+++ b/main.py
@@ -996,7 +996,7 @@ def main():
                         sale_tree.get_uid(trader_state.item.uid).set("amount", str(current_amount - trader_state.item.amount))
                         if int(item.get("amount")) == 0:
                             user_tree.get_user(sale_tree.get_uid(trader_state.item.uid).get('name')).set('used_stalls', \
-                                                                                                         str(int(user_tree.get_user(sale_tree.get_uid(trader_state.item.uid).get('name')).get('used_stalls'))-1))
+                                str(int(user_tree.get_user(sale_tree.get_uid(trader_state.item.uid).get('name')).get('used_stalls'))-1))
                             sale_tree.remove_item_uid(trader_state.item.uid)
 
                         current_money = int(user_tree.get_user(seller).get("money"))
diff --git a/net/packet.py b/net/packet.py
index 85a09f9..14ebbc8 100644
--- a/net/packet.py
+++ b/net/packet.py
@@ -47,99 +47,99 @@ packet_lengths = [
 
 class PacketOut:
     def __init__(self, out):
-	self.buff = ""
+        self.buff = ""
         self.write_int16(out)
 
     def __str__(self):
-	return self.buff
+        return self.buff
 
     def write_string(self, string_val, length):
-	self.buff += string_val.ljust(length, '\0')
+        self.buff += string_val.ljust(length, '\0')
 
     def write_int8(self, value):
-	self.buff += struct.pack("<B", value)
+        self.buff += struct.pack("<B", value)
 
     def write_int16(self, value):
-	self.buff += struct.pack("<H", value)
+        self.buff += struct.pack("<H", value)
 
     def write_int32(self, value):
-	self.buff += struct.pack("<L", value)
-    
+        self.buff += struct.pack("<L", value)
+
     def write_coords(self, x, y, direction):
         tmp = x
-	tmp <<= 6
-	d_0 = 0
-	d_1 = 1
-	d_2 = 2
-	d_0 = (tmp >> 8) % 256
-	d_1 = (tmp) % 256
-	tmp = y
-	tmp <<= 4
-	d_1 |= (tmp >> 8) % 256
-	d_2 = tmp % 256
-	d_2 |= direction
-	self.buff += chr(d_0) + chr(d_1) + chr(d_2)
+        tmp <<= 6
+        d_0 = 0
+        d_1 = 1
+        d_2 = 2
+        d_0 = (tmp >> 8) % 256
+        d_1 = (tmp) % 256
+        tmp = y
+        tmp <<= 4
+        d_1 |= (tmp >> 8) % 256
+        d_2 = tmp % 256
+        d_2 |= direction
+        self.buff += chr(d_0) + chr(d_1) + chr(d_2)
 
 class PacketIn:
     def __init__(self, set_data, pkt_type):
         self.data = set_data
-	self.pkttype = pkt_type
-	self.pos = 0
+        self.pkttype = pkt_type
+        self.pos = 0
 
     def is_type(self, pkt_type):
-	return self.pkttype == pkt_type
-    
+        return self.pkttype == pkt_type
+
     def get_type(self):
-	return self.pkttype
+        return self.pkttype
 
     def read_string(self, length):
-	msg = self.data[self.pos:self.pos + length]
-	self.pos = self.pos + length
-	return msg[:msg.find('\0')]
+        msg = self.data[self.pos:self.pos + length]
+        self.pos = self.pos + length
+        return msg[:msg.find('\0')]
 
     def read_raw_string(self, length):
-	msg = self.data[self.pos:self.pos + length]
-	self.pos = self.pos + length
-	return msg
+        msg = self.data[self.pos:self.pos + length]
+        self.pos = self.pos + length
+        return msg
 
     def read_int8(self):
-	int_value = struct.unpack("<B", self.data[self.pos:self.pos + 1])[0]
-	self.pos = self.pos + 1
-	return int_value
+        int_value = struct.unpack("<B", self.data[self.pos:self.pos + 1])[0]
+        self.pos = self.pos + 1
+        return int_value
 
     def make_word(self, low, high):
-	return (low | (high << 8))
+        return (low | (high << 8))
 
     def read_coord_pair(self):
-	cdata = self.data[self.pos:self.pos + 5]
-	dst_x = (self.make_word(struct.unpack("<B", cdata[3])[0], struct.unpack("<B", cdata[2])[0] & 0x000f) >> 2)
-	dst_y = self.make_word(struct.unpack("<B", cdata[4])[0], struct.unpack("<B", cdata[3])[0] & 0x0003)
+        cdata = self.data[self.pos:self.pos + 5]
+        dst_x = (self.make_word(struct.unpack("<B", cdata[3])[0], struct.unpack("<B", cdata[2])[0] & 0x000f) >> 2)
+        dst_y = self.make_word(struct.unpack("<B", cdata[4])[0], struct.unpack("<B", cdata[3])[0] & 0x0003)
 
-	src_x = (self.make_word(struct.unpack("<B", cdata[1])[0], struct.unpack("<B", cdata[0])[0]) >> 6)
-	src_y = (self.make_word(struct.unpack("<B", cdata[2])[0], struct.unpack("<B", cdata[1])[0] & 0x003f) >> 4)
-	self.pos = self.pos + 5
-	return src_x, src_y, dst_x, dst_y
+        src_x = (self.make_word(struct.unpack("<B", cdata[1])[0], struct.unpack("<B", cdata[0])[0]) >> 6)
+        src_y = (self.make_word(struct.unpack("<B", cdata[2])[0], struct.unpack("<B", cdata[1])[0] & 0x003f) >> 4)
+        self.pos = self.pos + 5
+        return src_x, src_y, dst_x, dst_y
 
     def read_coord_dir(self):
-	cdata = self.data[self.pos:self.pos + 3]
-	x = (self.make_word(struct.unpack("<B", cdata[1])[0] & 0x00c0, struct.unpack("<B", cdata[0])[0] & 0x00ff) >> 6) % 255
+        cdata = self.data[self.pos:self.pos + 3]
+        x = (self.make_word(struct.unpack("<B", cdata[1])[0] & 0x00c0, struct.unpack("<B", cdata[0])[0] & 0x00ff) >> 6) % 255
         y = (self.make_word(struct.unpack("<B", cdata[2])[0] & 0x00f0, struct.unpack("<B", cdata[1])[0] & 0x003f) >> 4) % 255
         dir = struct.unpack("<B", cdata[2])[0] & 0x000f
-	self.pos = self.pos + 3
+        self.pos = self.pos + 3
         return x, y, dir
 
     def read_int16(self):
-	int_value = struct.unpack("<H", self.data[self.pos:self.pos + 2])[0]
-	self.pos = self.pos + 2
-	return int_value
+        int_value = struct.unpack("<H", self.data[self.pos:self.pos + 2])[0]
+        self.pos = self.pos + 2
+        return int_value
 
     def read_int32(self):
-	int_value = struct.unpack("<L", self.data[self.pos:self.pos + 4])[0]
-	self.pos = self.pos + 4
-	return int_value
+        int_value = struct.unpack("<L", self.data[self.pos:self.pos + 4])[0]
+        self.pos = self.pos + 4
+        return int_value
 
     def skip(self, count):
-	self.pos = self.pos + count
+        self.pos = self.pos + count
 
 class PacketBuffer:
     def __init__(self):
@@ -158,7 +158,7 @@ class PacketBuffer:
         if len(self.buff) < 2:
             raise StopIteration
 
-	pktlen = 0
+        pktlen = 0
         pkttype = struct.unpack("<H", self.buff[:2])[0]
         assert pkttype < len(packet_lengths)
         assert packet_lengths[pkttype] != 0
@@ -174,6 +174,6 @@ class PacketBuffer:
         if len(self.buff) < pktlen:
             raise StopIteration
 
-	packet = PacketIn(self.buff[2:pktlen], pkttype)
+        packet = PacketIn(self.buff[2:pktlen], pkttype)
         self.buff = self.buff[pktlen:]
         return packet
diff --git a/net/packet_out.py b/net/packet_out.py
index 6110f4d..1d6e2d2 100644
--- a/net/packet_out.py
+++ b/net/packet_out.py
@@ -24,7 +24,7 @@ def sit(val):
     sit_packet = PacketOut(CMSG_PLAYER_CHANGE_ACT)
     sit_packet.write_int32(0)
     if val == True:
-    	sit_packet.write_int8(2)
+        sit_packet.write_int8(2)
     else:
         sit_packet.write_int8(3)
     return str(sit_packet)
@@ -39,11 +39,11 @@ def trade_respond(accept):
     if accept == True:
         trade_respond_packet.write_int8(3)
     elif accept == False:
-	trade_respond_packet.write_int8(4)
+        trade_respond_packet.write_int8(4)
     return str(trade_respond_packet)
 
 def trade_add_item(item_index, amount):
-    trade_add_packet = PacketOut(CMSG_TRADE_ITEM_ADD_REQUEST)   
+    trade_add_packet = PacketOut(CMSG_TRADE_ITEM_ADD_REQUEST)
     trade_add_packet.write_int16(item_index + inventory_offset)
     trade_add_packet.write_int32(amount)
     return str(trade_add_packet)
-- 
cgit v1.2.3-70-g09d2


From d07bb3cb08047530bc82759f15d266feebb98327 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 21 Aug 2011 20:58:24 +0100
Subject: Remove a commentend sleep operation.

---
 main.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main.py b/main.py
index 68c150e..8d33d0d 100755
--- a/main.py
+++ b/main.py
@@ -524,7 +524,6 @@ def main():
     charport = 0
     # Login server packet loop.
     while True:
-        #time.sleep(0.1)
         data = login.recv(1500)
         if not data:
             break
-- 
cgit v1.2.3-70-g09d2


From 2dc21142e1eeb1065c6e06a2877ca59c914aef22 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 22:44:27 +0200
Subject: put data into git repository to make backup easier

---
 main.py   | 4 +++-
 tradey.py | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 8d33d0d..fdb461f 100755
--- a/main.py
+++ b/main.py
@@ -986,7 +986,7 @@ def main():
                     if trader_state.item.get == 1: # !add
                         sale_tree.add_item(trader_state.item.player, trader_state.item.id, trader_state.item.amount, trader_state.item.price)
                         user_tree.get_user(trader_state.item.player).set('used_stalls', \
-                                                                         str(int(user_tree.get_user(trader_state.item.player).get('used_stalls')) + 1))
+                            str(int(user_tree.get_user(trader_state.item.player).get('used_stalls')) + 1))
 
                     elif trader_state.item.get == 0: # !buy \ !getback
                         seller = sale_tree.get_uid(trader_state.item.uid).get('name')
@@ -1009,6 +1009,8 @@ def main():
 
                 sale_tree.save()
                 user_tree.save()
+                tradey.saveData()
+
                 trader_state.reset()
                 logging.info("Trade Complete.")
                 print "SMSG_TRADE_COMPLETE"
diff --git a/tradey.py b/tradey.py
index add8256..2fe9d5a 100644
--- a/tradey.py
+++ b/tradey.py
@@ -7,6 +7,8 @@
     see www.themanaworld.org
 """
 import time
+import os
+from subprocess import call
 from xml.etree.ElementTree import *
 
 class UserTree:
@@ -95,5 +97,12 @@ class ItemTree:
         self.tree = ElementTree(self.root)
         self.tree.write("data/sale.xml")
 
+def saveData():
+    cwd = os.getcwd()
+    os.chdir("data")
+    call(["git", "commit","-a", '-m transaction'])
+    os.chdir("..")
+
+
 if __name__ == '__main__':
     print "Do not run this file directly. Run main.py"
-- 
cgit v1.2.3-70-g09d2


From f78ee4cc3781789b74c9baaa931959a821c163fe Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 22:52:25 +0200
Subject: git commit message via parameter

---
 tradey.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tradey.py b/tradey.py
index 2fe9d5a..f439e2d 100644
--- a/tradey.py
+++ b/tradey.py
@@ -97,10 +97,10 @@ class ItemTree:
         self.tree = ElementTree(self.root)
         self.tree.write("data/sale.xml")
 
-def saveData():
+def saveData(commitmessage = "commit"):
     cwd = os.getcwd()
     os.chdir("data")
-    call(["git", "commit","-a", '-m transaction'])
+    call(["git", "commit","-a", '-m "' + commitmessage + '"'])
     os.chdir("..")
 
 
-- 
cgit v1.2.3-70-g09d2


From 81295ff05acb2617f444468a189fd7ce12998bee Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 21 Aug 2011 21:59:33 +0100
Subject: Add git commit to remove admin operations.

---
 main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.py b/main.py
index fdb461f..8d4e494 100755
--- a/main.py
+++ b/main.py
@@ -252,6 +252,7 @@ def process_whisper(nick, msg, mapserv):
 
             user_tree.get_user(name).set('stalls', str(slot))
             mapserv.sendall(whisper(nick, "Slots changed: "+name+" "+str(slot)))
+	    tradey.saveData("User: "+player_name+", Slots changed: "+str(slot))
             user_tree.save()
         else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
@@ -283,6 +284,7 @@ def process_whisper(nick, msg, mapserv):
                 user_tree.get_user(name).set('accesslevel', str(accesslevel))
                 mapserv.sendall(whisper(nick, "Access level changed:"+name+ " ("+str(accesslevel)+")."))
                 user_tree.save()
+		tradey.saveData("User: "+player_name+", Set Access Level: "+str(accesslevel))
             else:
                 mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
                 return
@@ -309,6 +311,7 @@ def process_whisper(nick, msg, mapserv):
             player_name = " ".join(broken_string[3:])
             user_tree.add_user(player_name, stalls, al)
             mapserv.sendall(whisper(nick, "User Added with " + str(stalls) + " slots."))
+	    tradey.saveData("User Added: "+player_name+", Slots: "+str(stalls)+", Access Level: "+str(al))
         else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
@@ -419,6 +422,7 @@ def process_whisper(nick, msg, mapserv):
         check = user_tree.remove_user(player_name)
         if check == 1:
             mapserv.sendall(whisper(nick, "User Removed."))
+	    tradey.saveData("User Removed: "+player_name)
         elif check == -10:
             mapserv.sendall(whisper(nick, "User removal failed. Please check spelling."))
 
-- 
cgit v1.2.3-70-g09d2


From 636741e9f8c577090e7cc3ca8f7c480f3fbee98e Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 22:59:42 +0200
Subject: comment

---
 tradey.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tradey.py b/tradey.py
index f439e2d..8ec6c6b 100644
--- a/tradey.py
+++ b/tradey.py
@@ -98,7 +98,7 @@ class ItemTree:
         self.tree.write("data/sale.xml")
 
 def saveData(commitmessage = "commit"):
-    cwd = os.getcwd()
+    # This assumes the current working directory is the tradey directory.
     os.chdir("data")
     call(["git", "commit","-a", '-m "' + commitmessage + '"'])
     os.chdir("..")
-- 
cgit v1.2.3-70-g09d2


From e603178a2e61c3252bfb34dbd66d5b42458cd3af Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 23:02:35 +0200
Subject: tabs->spaces, commit messages for trades

---
 main.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 8d4e494..0fd9ca2 100755
--- a/main.py
+++ b/main.py
@@ -252,7 +252,7 @@ def process_whisper(nick, msg, mapserv):
 
             user_tree.get_user(name).set('stalls', str(slot))
             mapserv.sendall(whisper(nick, "Slots changed: "+name+" "+str(slot)))
-	    tradey.saveData("User: "+player_name+", Slots changed: "+str(slot))
+            tradey.saveData("User: "+player_name+", Slots changed: "+str(slot))
             user_tree.save()
         else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
@@ -284,7 +284,7 @@ def process_whisper(nick, msg, mapserv):
                 user_tree.get_user(name).set('accesslevel', str(accesslevel))
                 mapserv.sendall(whisper(nick, "Access level changed:"+name+ " ("+str(accesslevel)+")."))
                 user_tree.save()
-		tradey.saveData("User: "+player_name+", Set Access Level: "+str(accesslevel))
+                tradey.saveData("User: "+player_name+", Set Access Level: "+str(accesslevel))
             else:
                 mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
                 return
@@ -311,7 +311,7 @@ def process_whisper(nick, msg, mapserv):
             player_name = " ".join(broken_string[3:])
             user_tree.add_user(player_name, stalls, al)
             mapserv.sendall(whisper(nick, "User Added with " + str(stalls) + " slots."))
-	    tradey.saveData("User Added: "+player_name+", Slots: "+str(stalls)+", Access Level: "+str(al))
+            tradey.saveData("User Added: "+player_name+", Slots: "+str(stalls)+", Access Level: "+str(al))
         else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
 
@@ -422,7 +422,7 @@ def process_whisper(nick, msg, mapserv):
         check = user_tree.remove_user(player_name)
         if check == 1:
             mapserv.sendall(whisper(nick, "User Removed."))
-	    tradey.saveData("User Removed: "+player_name)
+            tradey.saveData("User Removed: "+player_name)
         elif check == -10:
             mapserv.sendall(whisper(nick, "User removal failed. Please check spelling."))
 
@@ -985,12 +985,14 @@ def main():
                 print "SMSG_TRADE_CANCEL"
 
             elif packet.is_type(SMSG_TRADE_COMPLETE):
+                commitMessage=""
                 # The sale_tree is only ammended after a complete trade packet.
                 if trader_state.item and trader_state.money == 0:
                     if trader_state.item.get == 1: # !add
                         sale_tree.add_item(trader_state.item.player, trader_state.item.id, trader_state.item.amount, trader_state.item.price)
                         user_tree.get_user(trader_state.item.player).set('used_stalls', \
                             str(int(user_tree.get_user(trader_state.item.player).get('used_stalls')) + 1))
+                        commitMessage = "Add"
 
                     elif trader_state.item.get == 0: # !buy \ !getback
                         seller = sale_tree.get_uid(trader_state.item.uid).get('name')
@@ -1007,13 +1009,15 @@ def main():
 
                         if trader_state.item.price * trader_state.item.amount != 0:
                             ItemLog.add_item(int(item.get('itemId')), trader_state.item.amount, trader_state.item.price * trader_state.item.amount)
+                        commitMessage = "Buy or Getback"
 
                 elif trader_state.money and trader_state.item == 0: # !money
                     user_tree.get_user(trader_state.money).set('money', str(0))
+                    commitMessage = "Money"
 
                 sale_tree.save()
                 user_tree.save()
-                tradey.saveData()
+                tradey.saveData(commitMessage)
 
                 trader_state.reset()
                 logging.info("Trade Complete.")
-- 
cgit v1.2.3-70-g09d2


From cd0626bee20295d483e150d5f36def2b296b70ef Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 23:13:05 +0200
Subject: pretty xml

---
 tradey.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tradey.py b/tradey.py
index 8ec6c6b..f2f5ac3 100644
--- a/tradey.py
+++ b/tradey.py
@@ -44,7 +44,9 @@ class UserTree:
     def save(self):
         # Be sure to call save() after any changes to the tree.
         self.tree = ElementTree(self.root)
-        self.tree.write("data/user.xml")
+        f=open("data/user.xml","w")
+        f.write(etree.tostring(root, pretty_print=True))
+        f.close()
 
 class ItemTree:
     def __init__(self):
@@ -95,7 +97,9 @@ class ItemTree:
     def save(self):
         # Be sure to call save() after any changes to the tree.
         self.tree = ElementTree(self.root)
-        self.tree.write("data/sale.xml")
+        f = open("data/sale.xml", "w")
+        f.write(etree.tostring(root, pretty_print=True))
+        f.close()
 
 def saveData(commitmessage = "commit"):
     # This assumes the current working directory is the tradey directory.
-- 
cgit v1.2.3-70-g09d2


From 09d2d40a841c8436ed782ccda4fd3319f6cb1f05 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 21 Aug 2011 23:35:56 +0200
Subject: Revert "pretty xml"

This reverts commit cd0626bee20295d483e150d5f36def2b296b70ef.
---
 tradey.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tradey.py b/tradey.py
index f2f5ac3..8ec6c6b 100644
--- a/tradey.py
+++ b/tradey.py
@@ -44,9 +44,7 @@ class UserTree:
     def save(self):
         # Be sure to call save() after any changes to the tree.
         self.tree = ElementTree(self.root)
-        f=open("data/user.xml","w")
-        f.write(etree.tostring(root, pretty_print=True))
-        f.close()
+        self.tree.write("data/user.xml")
 
 class ItemTree:
     def __init__(self):
@@ -97,9 +95,7 @@ class ItemTree:
     def save(self):
         # Be sure to call save() after any changes to the tree.
         self.tree = ElementTree(self.root)
-        f = open("data/sale.xml", "w")
-        f.write(etree.tostring(root, pretty_print=True))
-        f.close()
+        self.tree.write("data/sale.xml")
 
 def saveData(commitmessage = "commit"):
     # This assumes the current working directory is the tradey directory.
-- 
cgit v1.2.3-70-g09d2


From a4f48afc93c78ff3eacdb99efa529527d15634e2 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 01:26:51 +0100
Subject: Add more logging information.

---
 main.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/main.py b/main.py
index 0fd9ca2..11ac513 100755
--- a/main.py
+++ b/main.py
@@ -513,7 +513,7 @@ def main():
 
     login = socket.socket()
     login.connect((config.server, config.port))
-    print("Login connected")
+    logging.info("Login connected")
 
     login_packet = PacketOut(0x0064)
     login_packet.write_int32(0)
@@ -551,7 +551,7 @@ def main():
 
     char = socket.socket()
     char.connect((charip, charport))
-    print("Char connected")
+    logging.info("Char connected")
     char_serv_packet = PacketOut(CMSG_CHAR_SERVER_CONNECT)
     char_serv_packet.write_int32(accid)
     char_serv_packet.write_int32(id1)
@@ -592,14 +592,15 @@ def main():
                     packet.skip(6)
                     slot = packet.read_int8()
                     packet.skip(1)
-                    print "Character information recieved:"
-                    print "Name: %s, Id: %s, EXP: %s, MONEY: %s, HP: %s/%s, MP: %s/%s, LEVEL: %s"\
-                        % (player_node.name, player_node.id, player_node.EXP, player_node.MONEY, player_node.HP, player_node.MAX_HP, player_node.MP, player_node.MAX_MP, player_node.LEVEL)
-                    if slot == int(character):
+                    logging.info("Character information recieved:")
+                    logging.info("Name: %s, Id: %s, EXP: %s, MONEY: %s, HP: %s/%s, MP: %s/%s, LEVEL: %s", \
+                    player_node.name, player_node.id, player_node.EXP, player_node.MONEY, player_node.HP, \
+                    player_node.MAX_HP, player_node.MP, player_node.MAX_MP, player_node.LEVEL)
+                    if slot == character:
                         break
 
                 char_select_packet = PacketOut(CMSG_CHAR_SELECT)
-                char_select_packet.write_int8(int(character))
+                char_select_packet.write_int8(character)
                 char.sendall(str(char_select_packet))
 
             elif packet.is_type(SMSG_CHAR_MAP_INFO):
@@ -617,7 +618,7 @@ def main():
     beingManager.container[player_node.id] = Being(player_node.id, 42)
     mapserv = socket.socket()
     mapserv.connect((mapip, mapport))
-    print("Map connected")
+    logging.info("Map connected")
     mapserv_login_packet = PacketOut(CMSG_MAP_SERVER_CONNECT)
     mapserv_login_packet.write_int32(accid)
     mapserv_login_packet.write_int32(player_node.id)
@@ -652,7 +653,7 @@ def main():
                 player_node.x = coord_data[0]
                 player_node.y = coord_data[1]
                 player_node.direction = coord_data[2]
-                print "Starting Postion: %s %s %s" % (player_node.map, player_node.x, player_node.y)
+                logging.info("Starting Postion: %s %s %s", player_node.map, player_node.x, player_node.y)
                 mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED))) # map loaded
                 # A Thread to send a shop broadcast: also keeps the network active to prevent timeouts.
                 shop_broadcaster.start()
@@ -669,8 +670,6 @@ def main():
                 msg_len = packet.read_int16() - 2
                 being_id = packet.read_int32()
                 message = packet.read_string(msg_len)
-                if "automaticly banned for spam" in message:
-                    time.sleep(3)
 
             elif packet.is_type(SMSG_BEING_CHAT): # char speech
                 msg_len = packet.read_int16() - 2
@@ -765,7 +764,7 @@ def main():
                 player_node.map = packet.read_string(16)
                 player_node.x = packet.read_int16()
                 player_node.y = packet.read_int16()
-                logging.info("Player warped.")
+                logging.info("Player warped: %s %s %s", player_node.map, player_node.x, player_node.y)
                 mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED)))
 
             elif packet.is_type(SMSG_BEING_ACTION):
@@ -852,10 +851,11 @@ def main():
                     item.amount = 1
                     player_node.inventory[item.index] = item
 
+                logging.info("Inventory information received:")
                 for item in player_node.inventory:
-                    print "Name: %s, Id: %s, Index: %s, Amount: %s." % \
-                    (ItemDB.getItem(player_node.inventory[item].itemId).name, \
-                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
+                    logging.info("Name: %s, Id: %s, Index: %s, Amount: %s.", \
+                    ItemDB.getItem(player_node.inventory[item].itemId).name, \
+                    player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
 
             elif packet.is_type(SMSG_TRADE_REQUEST):
                 print "SMSG_TRADE_REQUEST"
@@ -941,7 +941,7 @@ def main():
                     logging.info("Trade item add response: Successfully added item.")
                     if trader_state.item:
                         if trader_state.item.get == 0 and index != 0-inventory_offset: # Make sure the correct item is given!
-                            if player_node.inventory[index].itemId != trader_state.item.id and \
+                            if player_node.inventory[index].itemId != trader_state.item.id or \
                                 amount != trader_state.item.amount:
                                 mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
-- 
cgit v1.2.3-70-g09d2


From 60addbccce88882ec783029c10299affe2bfe536 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 01:54:55 +0100
Subject: Hide items that need relisting from the !selllist.

---
 main.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index 11ac513..a567976 100755
--- a/main.py
+++ b/main.py
@@ -74,9 +74,10 @@ def process_whisper(nick, msg, mapserv):
         data = '\302\202B1'
 
         for elem in sale_tree.root:
-            data += utils.encode_str(int(elem.get("itemId")), 2)
-            data += utils.encode_str(int(elem.get("price")), 4)
-            data += utils.encode_str(int(elem.get("amount")), 3)
+            if time.time() - float(elem.get('add_time')) < 604800:
+                data += utils.encode_str(int(elem.get("itemId")), 2)
+                data += utils.encode_str(int(elem.get("price")), 4)
+                data += utils.encode_str(int(elem.get("amount")), 3)
         mapserv.sendall(whisper(nick, data))
 
     elif broken_string[0] == '!buyitem':
-- 
cgit v1.2.3-70-g09d2


From 154d4127d18393aa3ec66a4c00e2c6a72d503307 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 09:30:12 +0100
Subject: Replace a few print commands with logging.

---
 main.py | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/main.py b/main.py
index a567976..98780d3 100755
--- a/main.py
+++ b/main.py
@@ -696,13 +696,12 @@ def main():
                     player_node.MaxMP = value
                 elif stat_type == 0x000b:
                     player_node.LEVEL = value
-                    print "Level changed: %s" % value
                 elif stat_type == 0x0018:
-                    print "Weight changed from %s/%s to %s/%s" % (player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
-                    logging.info("Weight changed from %s/%s to %s/%s", player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
+                    logging.info("Weight changed from %s/%s to %s/%s", \
+                    player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
                     player_node.WEIGHT = value
                 elif stat_type == 0x0019:
-                    print "Max Weight: %s" % value
+                    logging.info("Max Weight: %s", value)
                     player_node.MaxWEIGHT = value
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_2):
@@ -712,11 +711,7 @@ def main():
                     player_node.EXP = value
                 elif stat_type == 0x0014:
                     logging.info("Money Changed from %s, to %s", player_node.MONEY, value)
-                    print "Money Changed from %s, to %s" % (player_node.MONEY, value)
                     player_node.MONEY = value
-                elif stat_type == 0x0016:
-                    player_node.EXP_NEEDED = value
-                    print "Exp Needed: %s" % player_node.EXP_NEEDED
 
             elif packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_BEING_VISIBLE)\
             or packet.is_type(SMSG_PLAYER_MOVE) or packet.is_type(SMSG_PLAYER_UPDATE_1)\
@@ -806,14 +801,12 @@ def main():
                     else:
                         player_node.inventory[item.index] = item
 
-                    print "Picked up: %s, Amount: %s" % (ItemDB.getItem(item.itemId).name, item.amount)
                     logging.info("Picked up: %s, Amount: %s", ItemDB.getItem(item.itemId).name, str(item.amount))
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY_REMOVE):
                 index = packet.read_int16() - inventory_offset
                 amount = packet.read_int16()
 
-                print "Remove item: %s, Amount: %s" % (ItemDB.getItem(player_node.inventory[index].itemId).name, amount)
                 logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
                 if index in player_node.inventory:
                     player_node.inventory[index].amount -= amount
@@ -859,7 +852,6 @@ def main():
                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
 
             elif packet.is_type(SMSG_TRADE_REQUEST):
-                print "SMSG_TRADE_REQUEST"
                 name = packet.read_string(24)
                 logging.info("Trade request: " + name)
 
@@ -900,7 +892,6 @@ def main():
                     trader_state.reset()
 
             elif packet.is_type(SMSG_TRADE_ITEM_ADD):
-                print "SMSG_TRADE_ITEM_ADD"
                 amount = packet.read_int32()
                 item_id = packet.read_int16()
                 if trader_state.item and trader_state.money == 0:
@@ -933,7 +924,6 @@ def main():
                 # Note item_id = 0 is money
 
             elif packet.is_type(SMSG_TRADE_ITEM_ADD_RESPONSE):
-                print "SMSG_TRADE_ITEM_ADD_RESPONSE"
                 index = packet.read_int16() - inventory_offset
                 amount = packet.read_int16()
                 response = packet.read_int8()
@@ -948,7 +938,6 @@ def main():
 
                     # If Trade item add successful - Remove the item from the inventory state.
                     if index != 0-inventory_offset: # If it's not money
-                        print "Remove item: %s, Amount: %s" % (ItemDB.getItem(player_node.inventory[index].itemId).name, amount)
                         logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
                         if index in player_node.inventory:
                             player_node.inventory[index].amount -= amount
@@ -967,7 +956,6 @@ def main():
                     mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
             elif packet.is_type(SMSG_TRADE_OK):
-                print "SMSG_TRADE_OK"
                 is_ok = packet.read_int8() # 0 is ok from self, and 1 is ok from other
                 if is_ok == 0:
                     logging.info("Trade OK: Self.")
@@ -983,7 +971,6 @@ def main():
             elif packet.is_type(SMSG_TRADE_CANCEL):
                 trader_state.reset()
                 logging.info("Trade Cancel.")
-                print "SMSG_TRADE_CANCEL"
 
             elif packet.is_type(SMSG_TRADE_COMPLETE):
                 commitMessage=""
@@ -1022,7 +1009,6 @@ def main():
 
                 trader_state.reset()
                 logging.info("Trade Complete.")
-                print "SMSG_TRADE_COMPLETE"
             else:
                 pass
                 #print "Unhandled Packet: %s" % hex(packet.get_type())
-- 
cgit v1.2.3-70-g09d2


From 152baa6eb8af6a24c6ee3966f5b47a664e239e84 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 09:33:11 +0100
Subject: Remove SMSG_BEING_ACTION packet handling code.

This is not needed for the functioning of the "TradeBot"
---
 main.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/main.py b/main.py
index 98780d3..56de5cd 100755
--- a/main.py
+++ b/main.py
@@ -763,25 +763,6 @@ def main():
                 logging.info("Player warped: %s %s %s", player_node.map, player_node.x, player_node.y)
                 mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED)))
 
-            elif packet.is_type(SMSG_BEING_ACTION):
-                src_being = packet.read_int32()
-                dst_being = packet.read_int32()
-                packet.skip(12)
-                param1 = packet.read_int16()
-                packet.skip(2)
-                action_type = packet.read_int8()
-
-                if src_being in beingManager.container:
-                    if action_type == 0: # Damage
-                        beingManager.container[src_being].action = "attack"
-                        beingManager.container[src_being].target = dst_being
-
-                    elif action_type == 0x02: # Sit
-                        beingManager.container[src_being].action = "sit"
-
-                    elif action_type == 0x03: # Stand up
-                        beingManager.container[src_being].action = "stand"
-
             elif packet.is_type(SMSG_PLAYER_INVENTORY_ADD):
                 item = Item()
                 item.index = packet.read_int16() - inventory_offset
@@ -856,7 +837,6 @@ def main():
                 logging.info("Trade request: " + name)
 
             elif packet.is_type(SMSG_TRADE_RESPONSE):
-                print "SMSG_TRADE_RESPONSE"
                 response = packet.read_int8()
                 time.sleep(0.2)
                 if response == 0:
-- 
cgit v1.2.3-70-g09d2


From acf5d486463147e68b9fab4899f83ce3aaaff107 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 09:44:24 +0100
Subject: Add a relist_time setting to the configuration file.

---
 config.py.template |  1 +
 main.py            | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config.py.template b/config.py.template
index 068d432..df11a32 100644
--- a/config.py.template
+++ b/config.py.template
@@ -3,4 +3,5 @@ server = "caliban.homeip.net"
 port = 6901
 account = ""
 password = ""
+relist_time = 604800 # Time in seconds before an item needs to be relisted.
 character = 0 #slot character is in, 0 for first, 1 for second, 2 for third
diff --git a/main.py b/main.py
index 56de5cd..41f5059 100755
--- a/main.py
+++ b/main.py
@@ -64,7 +64,7 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "No items for sale."))
 
         for elem in sale_tree.root:
-            if time.time() - float(elem.get('add_time')) < 604800: # Check if an items time is up.
+            if time.time() - float(elem.get('add_time')) < config.relist_time: # Check if an items time is up.
                 msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + \
                 elem.get("itemId") + "|" + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
                 mapserv.sendall(whisper(nick, msg))
@@ -74,7 +74,7 @@ def process_whisper(nick, msg, mapserv):
         data = '\302\202B1'
 
         for elem in sale_tree.root:
-            if time.time() - float(elem.get('add_time')) < 604800:
+            if time.time() - float(elem.get('add_time')) < config.relist_time:
                 data += utils.encode_str(int(elem.get("itemId")), 2)
                 data += utils.encode_str(int(elem.get("price")), 4)
                 data += utils.encode_str(int(elem.get("amount")), 3)
@@ -105,7 +105,7 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "Your have the following items for sale:"))
             for elem in sale_tree.root:
                 if elem.get('name') == nick:
-                    if time.time() - float(elem.get('add_time')) > 604800:
+                    if time.time() - float(elem.get('add_time')) > config.relist_time:
                         msg = "[expired] ["
                     else:
                         msg = "[selling] ["
@@ -184,7 +184,7 @@ def process_whisper(nick, msg, mapserv):
 
         if item.isdigit(): # an id
             for elem in sale_tree.root:
-                if ((time.time() - float(elem.get('add_time'))) < 604800) \
+                if ((time.time() - float(elem.get('add_time'))) < config.relist_time) \
                 and int(elem.get("itemId")) == int(item): # Check if an items time is up.
                     msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
                     + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
@@ -192,7 +192,7 @@ def process_whisper(nick, msg, mapserv):
                     items_found = True
         else: # an item name
             for elem in sale_tree.root:
-                if ((time.time() - float(elem.get('add_time'))) < 604800) \
+                if ((time.time() - float(elem.get('add_time'))) < config.relist_time) \
                 and item.lower() in ItemDB.getItem(int(elem.get("itemId"))).name.lower(): # Check if an items time is up.
                     msg = "[selling] [" + elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" \
                     + ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
-- 
cgit v1.2.3-70-g09d2


From 4868a3ce5efcfb5b14c2863d6890e489a6fb4b2c Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 09:45:57 +0100
Subject: Fix a tiny bug in the broadcast thread.

---
 utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils.py b/utils.py
index b6bbc3f..f94feba 100644
--- a/utils.py
+++ b/utils.py
@@ -119,8 +119,9 @@ class Broadcast:
         self.shop_broadcast.start()
 
     def stop(self):
-        self.Active = False
-        self.shop_broadcast.join()
+        if self.Active = True
+            self.Active = False
+            self.shop_broadcast.join()
 
 if __name__ == '__main__':
     print "Do not run this file directly. Run main.py"
-- 
cgit v1.2.3-70-g09d2


From 8e4acb8e54bfbd355766db3f3660c068d4e3e591 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 09:52:10 +0100
Subject: Improve the !info message, when no items are being sold.

---
 main.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 41f5059..a6c5a03 100755
--- a/main.py
+++ b/main.py
@@ -102,7 +102,7 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "Your current access level is 0."))
         elif int(user.get('accesslevel')) > 0:
             mapserv.sendall(whisper(nick, "Your current access level is " + user.get('accesslevel') + "."))
-            mapserv.sendall(whisper(nick, "Your have the following items for sale:"))
+            items_for_sale = False
             for elem in sale_tree.root:
                 if elem.get('name') == nick:
                     if time.time() - float(elem.get('add_time')) > config.relist_time:
@@ -112,8 +112,16 @@ def process_whisper(nick, msg, mapserv):
 
                     msg += elem.get("uid") + "] " + elem.get("amount") + " [@@" + elem.get("itemId") + "|" + \
                         ItemDB.getItem(int(elem.get("itemId"))).name + "@@] for " + elem.get("price") + "gp each"
+
+                    if items_for_sale == False:
+                        mapserv.sendall(whisper(nick, "Your have the following items for sale:"))
+                        items_for_sale = True
+
                     mapserv.sendall(whisper(nick, msg))
 
+            if items_for_sale == False:
+                mapserv.sendall(whisper(nick, "Your have no items for sale."))
+
             money = int(user.get('money'))
             mapserv.sendall(whisper(nick, "You have " + str(money) + "gp to collect."))
             stall_msg = "You have " + str(int(user.get('stalls')) - int(user.get('used_stalls'))) + " free slots."
-- 
cgit v1.2.3-70-g09d2


From 6d90f26c9f7b7cd68798eb5fb65f9514472d8ef1 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 10:24:16 +0100
Subject: Oops dumb mistake.

---
 utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils.py b/utils.py
index f94feba..2e1d0e8 100644
--- a/utils.py
+++ b/utils.py
@@ -119,7 +119,7 @@ class Broadcast:
         self.shop_broadcast.start()
 
     def stop(self):
-        if self.Active = True
+        if self.Active:
             self.Active = False
             self.shop_broadcast.join()
 
-- 
cgit v1.2.3-70-g09d2


From b9e80443ea8ef7deded058892cff77c0e77d311f Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Mon, 22 Aug 2011 11:25:20 +0200
Subject: Adding gnufrk as original author of packet buffer class

---
 net/packet.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/packet.py b/net/packet.py
index 14ebbc8..16b4f79 100644
--- a/net/packet.py
+++ b/net/packet.py
@@ -1,3 +1,6 @@
+
+"""The PacketBuffer class has been adapted from source originally released by gnufrk"""
+
 import struct
 
 packet_lengths = [
-- 
cgit v1.2.3-70-g09d2


From b75d6a31f83173f7649317c4651473e1c9731362 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 10:39:53 +0100
Subject: Move some of the packet handling code.

---
 main.py | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/main.py b/main.py
index a6c5a03..da5b2b8 100755
--- a/main.py
+++ b/main.py
@@ -34,6 +34,7 @@ from net.packet import *
 from net.protocol import *
 from net.packet_out import *
 from player import *
+import net.packet_handler
 import tradey
 import utils
 
@@ -692,25 +693,7 @@ def main():
                 player_node.y = coord_data[3]
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
-                stat_type = packet.read_int16()
-                value = packet.read_int32()
-                if stat_type == 0x0005:
-                    player_node.HP = value
-                elif stat_type == 0x0006:
-                    player_node.MaxHP = value
-                elif stat_type == 0x0007:
-                    player_node.MP = value
-                elif stat_type == 0x0008:
-                    player_node.MaxMP = value
-                elif stat_type == 0x000b:
-                    player_node.LEVEL = value
-                elif stat_type == 0x0018:
-                    logging.info("Weight changed from %s/%s to %s/%s", \
-                    player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
-                    player_node.WEIGHT = value
-                elif stat_type == 0x0019:
-                    logging.info("Max Weight: %s", value)
-                    player_node.MaxWEIGHT = value
+		packet_handler.handle_stat_update_1(packet, player_node, logging)
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_2):
                 stat_type = packet.read_int16()
-- 
cgit v1.2.3-70-g09d2


From 10a88e29dd96066663fe104fe7bcbd7739bbc729 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 10:43:48 +0100
Subject: oops

---
 net/packet_handler.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 net/packet_handler.py

diff --git a/net/packet_handler.py b/net/packet_handler.py
new file mode 100644
index 0000000..48a0a6d
--- /dev/null
+++ b/net/packet_handler.py
@@ -0,0 +1,24 @@
+from packet import *
+from protocol import *
+
+def handle_stat_update_1(packet, player_node, logging):
+    stat_type = packet.read_int16()
+    value = packet.read_int32()
+    if stat_type == 0x0005:
+        player_node.HP = value
+    elif stat_type == 0x0006:
+        player_node.MaxHP = value
+    elif stat_type == 0x0007:
+        player_node.MP = value
+    elif stat_type == 0x0008:
+        player_node.MaxMP = value
+    elif stat_type == 0x000b:
+        player_node.LEVEL = value
+    elif stat_type == 0x0018:
+        logging.info("Weight changed from %s/%s to %s/%s", \
+        player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
+        player_node.WEIGHT = value
+    elif stat_type == 0x0019:
+        logging.info("Max Weight: %s", value)
+        player_node.MaxWEIGHT = value
+
-- 
cgit v1.2.3-70-g09d2


From 3f0c9291baebc09c764a022e69f250689465e44f Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 10:49:33 +0100
Subject: Revert "Move some of the packet handling code."

This reverts commit b75d6a31f83173f7649317c4651473e1c9731362.
---
 main.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index da5b2b8..a6c5a03 100755
--- a/main.py
+++ b/main.py
@@ -34,7 +34,6 @@ from net.packet import *
 from net.protocol import *
 from net.packet_out import *
 from player import *
-import net.packet_handler
 import tradey
 import utils
 
@@ -693,7 +692,25 @@ def main():
                 player_node.y = coord_data[3]
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
-		packet_handler.handle_stat_update_1(packet, player_node, logging)
+                stat_type = packet.read_int16()
+                value = packet.read_int32()
+                if stat_type == 0x0005:
+                    player_node.HP = value
+                elif stat_type == 0x0006:
+                    player_node.MaxHP = value
+                elif stat_type == 0x0007:
+                    player_node.MP = value
+                elif stat_type == 0x0008:
+                    player_node.MaxMP = value
+                elif stat_type == 0x000b:
+                    player_node.LEVEL = value
+                elif stat_type == 0x0018:
+                    logging.info("Weight changed from %s/%s to %s/%s", \
+                    player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
+                    player_node.WEIGHT = value
+                elif stat_type == 0x0019:
+                    logging.info("Max Weight: %s", value)
+                    player_node.MaxWEIGHT = value
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_2):
                 stat_type = packet.read_int16()
-- 
cgit v1.2.3-70-g09d2


From 5aa34d1f2b0034f0f07009a83c611fa7de41a63e Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 10:52:28 +0100
Subject: Revert "oops"

This reverts commit 10a88e29dd96066663fe104fe7bcbd7739bbc729.
---
 net/packet_handler.py | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 net/packet_handler.py

diff --git a/net/packet_handler.py b/net/packet_handler.py
deleted file mode 100644
index 48a0a6d..0000000
--- a/net/packet_handler.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from packet import *
-from protocol import *
-
-def handle_stat_update_1(packet, player_node, logging):
-    stat_type = packet.read_int16()
-    value = packet.read_int32()
-    if stat_type == 0x0005:
-        player_node.HP = value
-    elif stat_type == 0x0006:
-        player_node.MaxHP = value
-    elif stat_type == 0x0007:
-        player_node.MP = value
-    elif stat_type == 0x0008:
-        player_node.MaxMP = value
-    elif stat_type == 0x000b:
-        player_node.LEVEL = value
-    elif stat_type == 0x0018:
-        logging.info("Weight changed from %s/%s to %s/%s", \
-        player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
-        player_node.WEIGHT = value
-    elif stat_type == 0x0019:
-        logging.info("Max Weight: %s", value)
-        player_node.MaxWEIGHT = value
-
-- 
cgit v1.2.3-70-g09d2


From e713cfd91f9781bd22c1fafbc613bcc1b89e94db Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 10:58:00 +0100
Subject: Remove some more unnecessary packet handling.

---
 main.py | 50 ++------------------------------------------------
 1 file changed, 2 insertions(+), 48 deletions(-)

diff --git a/main.py b/main.py
index a6c5a03..9150ea1 100755
--- a/main.py
+++ b/main.py
@@ -675,36 +675,10 @@ def main():
                 if nick != "guild":
                     process_whisper(nick, utils.remove_colors(message), mapserv)
 
-            elif packet.is_type(SMSG_PLAYER_CHAT): # server speech
-                msg_len = packet.read_int16() - 2
-                being_id = packet.read_int32()
-                message = packet.read_string(msg_len)
-
-            elif packet.is_type(SMSG_BEING_CHAT): # char speech
-                msg_len = packet.read_int16() - 2
-                being_id = packet.read_int32()
-                message = packet.read_string(msg_len)
-
-            elif packet.is_type(SMSG_WALK_RESPONSE):
-                packet.read_int32()
-                coord_data = packet.read_coord_pair()
-                player_node.x = coord_data[2]
-                player_node.y = coord_data[3]
-
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
                 stat_type = packet.read_int16()
                 value = packet.read_int32()
-                if stat_type == 0x0005:
-                    player_node.HP = value
-                elif stat_type == 0x0006:
-                    player_node.MaxHP = value
-                elif stat_type == 0x0007:
-                    player_node.MP = value
-                elif stat_type == 0x0008:
-                    player_node.MaxMP = value
-                elif stat_type == 0x000b:
-                    player_node.LEVEL = value
-                elif stat_type == 0x0018:
+                if stat_type == 0x0018:
                     logging.info("Weight changed from %s/%s to %s/%s", \
                     player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
                     player_node.WEIGHT = value
@@ -715,9 +689,7 @@ def main():
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_2):
                 stat_type = packet.read_int16()
                 value = packet.read_int32()
-                if stat_type == 0x0001:
-                    player_node.EXP = value
-                elif stat_type == 0x0014:
+                if stat_type == 0x0014:
                     logging.info("Money Changed from %s, to %s", player_node.MONEY, value)
                     player_node.MONEY = value
 
@@ -737,23 +709,6 @@ def main():
                     requestName.write_int32(being_id)
                     mapserv.sendall(str(requestName))
 
-                packet.skip(8)
-
-                if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
-                    packet.read_int32()
-
-                packet.skip(22)
-
-                if (packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_PLAYER_MOVE)):
-                    coord_data = packet.read_coord_pair()
-                    beingManager.container[being_id].dst_x = coord_data[2]
-                    beingManager.container[being_id].dst_y = coord_data[3]
-                else:
-                    coord_data = packet.read_coord_dir()
-                    beingManager.container[being_id].x = coord_data[0]
-                    beingManager.container[being_id].y = coord_data[1]
-                    beingManager.container[being_id].direction = coord_data[2]
-
             elif packet.is_type(SMSG_BEING_NAME_RESPONSE):
                 being_id = packet.read_int32()
                 if being_id in beingManager.container:
@@ -999,7 +954,6 @@ def main():
                 logging.info("Trade Complete.")
             else:
                 pass
-                #print "Unhandled Packet: %s" % hex(packet.get_type())
 
     # On Disconnect/Exit
     shop_broadcaster.stop()
-- 
cgit v1.2.3-70-g09d2


From 191114cfa6774d7024cf392794ffa7fd97ee8ebd Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 11:12:25 +0100
Subject: Clean up more of the packet code.

---
 main.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/main.py b/main.py
index 9150ea1..6aff6ef 100755
--- a/main.py
+++ b/main.py
@@ -589,14 +589,7 @@ def main():
                     player_node.id = packet.read_int32()
                     player_node.EXP = packet.read_int32()
                     player_node.MONEY = packet.read_int32()
-                    packet.skip(30)
-                    player_node.HP = packet.read_int16()
-                    player_node.MAX_HP = packet.read_int16()
-                    player_node.MP = packet.read_int16()
-                    player_node.MAX_MP = packet.read_int16()
-                    packet.skip(8)
-                    player_node.LEVEL = packet.read_int16()
-                    packet.skip(14)
+                    packet.skip(62)
                     player_node.name = packet.read_string(24)
                     packet.skip(6)
                     slot = packet.read_int8()
@@ -830,7 +823,7 @@ def main():
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
                         trader_state.complete = 1
 
-                elif response == 4:
+                else:
                     logging.info("Trade response: Trade cancelled")
                     trader_state.reset()
 
-- 
cgit v1.2.3-70-g09d2


From e2eb4a2717bb2661fc25179b0d054b33964bb979 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Mon, 22 Aug 2011 12:16:30 +0200
Subject: adding more help messages

---
 main.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/main.py b/main.py
index 6aff6ef..7e2e4e1 100755
--- a/main.py
+++ b/main.py
@@ -129,6 +129,10 @@ def process_whisper(nick, msg, mapserv):
 
     elif broken_string[0] == "!help":
         # Sends help information
+        if int(user.get('accesslevel')) < 0:
+            mapserv.sendall(whisper(nick, "You seem to be a bood guy, please don't harm me anymore."))
+            return
+
         if len(broken_string) == 1:
             mapserv.sendall(whisper(nick, "Welcome to ManaMarket!"))
             mapserv.sendall(whisper(nick, "The basic commands for the bot are: !list, !find <id> or <Item Name>, !buy <amount> <uid>, !add <amount> <price> <Item Name>, !money, !relist <uid>, !info, !getback <uid> "))
@@ -138,6 +142,20 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "you would type /whisper ManaMarket !buy 1 6" ))
             mapserv.sendall(whisper(nick, "This will purchase one of item 6 (Iron Ore)."))
 
+            if int(user.get('accesslevel')) >= 5:
+                mapserv.sendall(whisper(nick, "Ah, you have sellers access level. How lovely!")) # the first words the ticket seller told me when i was in london for the first time. How lovely!
+                mapserv.sendall(whisper(nick, "Use !add to tell me, I should trade stuff for you:"))
+                mapserv.sendall(whisper(nick, "e.g. !add 10 1000 IronOre would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
+                mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
+            elif int(user.get('accesslevel')) == 20:
+                mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
+                mapserv.sendall(whisper(nick, "!listusers lists all users which have a special accesslevel, e.g. they are blocked, seller or admin"))
+                mapserv.sendall(whisper(nick, "!setslots <slots> <name> sets the name to use only the given <slots>"))
+                mapserv.sendall(whisper(nick, "!setaccess <accesslevel> <name> sets access level for the player. -1 is blocked, 5 is seller and 20 is admin" ))
+                mapserv.sendall(whisper(nick, "!adduser <level> <slots> <name>, whereas level should be 5 for seller, 20 for admin."))
+
+
+
         elif len(broken_string) == 2:
             if broken_string[1] == '!buy':
                 mapserv.sendall(whisper(nick, "!buy <amount> <uid> - Request the purchase of an item or items."))
-- 
cgit v1.2.3-70-g09d2


From 4d1a0ffba73b0c21a6529e9387ade801cb6d2c7b Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 11:23:21 +0100
Subject: Clean up some help code.

---
 main.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 7e2e4e1..965b8ce 100755
--- a/main.py
+++ b/main.py
@@ -129,10 +129,6 @@ def process_whisper(nick, msg, mapserv):
 
     elif broken_string[0] == "!help":
         # Sends help information
-        if int(user.get('accesslevel')) < 0:
-            mapserv.sendall(whisper(nick, "You seem to be a bood guy, please don't harm me anymore."))
-            return
-
         if len(broken_string) == 1:
             mapserv.sendall(whisper(nick, "Welcome to ManaMarket!"))
             mapserv.sendall(whisper(nick, "The basic commands for the bot are: !list, !find <id> or <Item Name>, !buy <amount> <uid>, !add <amount> <price> <Item Name>, !money, !relist <uid>, !info, !getback <uid> "))
@@ -145,7 +141,7 @@ def process_whisper(nick, msg, mapserv):
             if int(user.get('accesslevel')) >= 5:
                 mapserv.sendall(whisper(nick, "Ah, you have sellers access level. How lovely!")) # the first words the ticket seller told me when i was in london for the first time. How lovely!
                 mapserv.sendall(whisper(nick, "Use !add to tell me, I should trade stuff for you:"))
-                mapserv.sendall(whisper(nick, "e.g. !add 10 1000 IronOre would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
+                mapserv.sendall(whisper(nick, "e.g. !add 10 1000 Iron Ore would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
                 mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
             elif int(user.get('accesslevel')) == 20:
                 mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
-- 
cgit v1.2.3-70-g09d2


From 73691da56f541ea1730043d0e654d97414dcb92a Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 11:47:40 +0100
Subject: Inventory/Money Check.

---
 main.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/main.py b/main.py
index 965b8ce..8659967 100755
--- a/main.py
+++ b/main.py
@@ -801,6 +801,31 @@ def main():
                     logging.info("Name: %s, Id: %s, Index: %s, Amount: %s.", \
                     ItemDB.getItem(player_node.inventory[item].itemId).name, \
                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
+		
+                # Check the inventory state and the amount of money match the information saved.
+                amount = -1
+                test_node = player_node.inventory
+		for item in test_node:
+                    amount = test_node[item].amount
+                    for elem in sale_tree.root:
+                        if int(elem.get('itemId')) == test_node[item].itemId \
+                        and int(elem.get('amount')) >= amount:
+                            amount -= int(elem.get('amount'))
+
+                    if amount == 0:
+                         del test_node[item]
+
+                    if amount < 0:
+                         logging.info("Server and client inventory out of sync.")
+                         exit(0)
+
+                total_money = 0
+                for user in user_tree:     
+                    total_money += int(user.get('money'))
+
+		 if total_money > player_node.MONEY:
+                      logging.info("Server and client money out of sync.")
+                      exit(0)			
 
             elif packet.is_type(SMSG_TRADE_REQUEST):
                 name = packet.read_string(24)
-- 
cgit v1.2.3-70-g09d2


From 3bb4e2bd0100e353e6cffb92202e2d60c14c19a1 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 11:48:45 +0100
Subject: tab error

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 8659967..cc243ca 100755
--- a/main.py
+++ b/main.py
@@ -805,7 +805,7 @@ def main():
                 # Check the inventory state and the amount of money match the information saved.
                 amount = -1
                 test_node = player_node.inventory
-		for item in test_node:
+                for item in test_node:
                     amount = test_node[item].amount
                     for elem in sale_tree.root:
                         if int(elem.get('itemId')) == test_node[item].itemId \
-- 
cgit v1.2.3-70-g09d2


From b9e937fa64f05670f590d7bfc67d537e4834f0ab Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 11:59:51 +0100
Subject: Revert "tab error"

This reverts commit 3bb4e2bd0100e353e6cffb92202e2d60c14c19a1.
---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index cc243ca..8659967 100755
--- a/main.py
+++ b/main.py
@@ -805,7 +805,7 @@ def main():
                 # Check the inventory state and the amount of money match the information saved.
                 amount = -1
                 test_node = player_node.inventory
-                for item in test_node:
+		for item in test_node:
                     amount = test_node[item].amount
                     for elem in sale_tree.root:
                         if int(elem.get('itemId')) == test_node[item].itemId \
-- 
cgit v1.2.3-70-g09d2


From 2fdc157430b64a7d894fe787dd09b1810b95b96b Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 11:59:58 +0100
Subject: Revert "Inventory/Money Check."

This reverts commit 73691da56f541ea1730043d0e654d97414dcb92a.
---
 main.py | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/main.py b/main.py
index 8659967..965b8ce 100755
--- a/main.py
+++ b/main.py
@@ -801,31 +801,6 @@ def main():
                     logging.info("Name: %s, Id: %s, Index: %s, Amount: %s.", \
                     ItemDB.getItem(player_node.inventory[item].itemId).name, \
                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
-		
-                # Check the inventory state and the amount of money match the information saved.
-                amount = -1
-                test_node = player_node.inventory
-		for item in test_node:
-                    amount = test_node[item].amount
-                    for elem in sale_tree.root:
-                        if int(elem.get('itemId')) == test_node[item].itemId \
-                        and int(elem.get('amount')) >= amount:
-                            amount -= int(elem.get('amount'))
-
-                    if amount == 0:
-                         del test_node[item]
-
-                    if amount < 0:
-                         logging.info("Server and client inventory out of sync.")
-                         exit(0)
-
-                total_money = 0
-                for user in user_tree:     
-                    total_money += int(user.get('money'))
-
-		 if total_money > player_node.MONEY:
-                      logging.info("Server and client money out of sync.")
-                      exit(0)			
 
             elif packet.is_type(SMSG_TRADE_REQUEST):
                 name = packet.read_string(24)
-- 
cgit v1.2.3-70-g09d2


From c38c4a477833507e04b1779a11a45f0c28cb60cc Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 12:18:04 +0100
Subject: Fixed logic for checking money/inventory state.

---
 main.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/main.py b/main.py
index 965b8ce..07dd749 100755
--- a/main.py
+++ b/main.py
@@ -802,6 +802,30 @@ def main():
                     ItemDB.getItem(player_node.inventory[item].itemId).name, \
                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
 
+                # Check the inventory state and the amount of money match the information saved.
+                test_node = player_node.inventory
+                for elem in sale_tree.root:
+                    item_found = False
+                    for item in test_node:
+                        if int(elem.get('itemId')) == test_node[item].itemId \
+                        and int(elem.get('amount')) <= test_node[item].amount:
+                            test_node[item].amount -= int(elem.get('amount'))
+                            if test_node[item].amount == 0:
+                                del test_node[item]
+                            item_found = True
+
+                    if not item_found:
+                        logging.info("Server and client inventory out of sync.")
+                        exit(0)
+
+                total_money = 0
+                for user in user_tree:     
+                    total_money += int(user.get('money'))
+
+		 if total_money > player_node.MONEY:
+                      logging.info("Server and client money out of sync.")
+                      exit(0)		
+
             elif packet.is_type(SMSG_TRADE_REQUEST):
                 name = packet.read_string(24)
                 logging.info("Trade request: " + name)
-- 
cgit v1.2.3-70-g09d2


From 2cb97b9da0caf0e44134f483b882d54570405f75 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 13:06:51 +0100
Subject: Add pretty xml printing using xml.dom.minidom.

---
 tradey.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tradey.py b/tradey.py
index 8ec6c6b..b70fd24 100644
--- a/tradey.py
+++ b/tradey.py
@@ -8,6 +8,7 @@
 """
 import time
 import os
+import xml.dom.minidom
 from subprocess import call
 from xml.etree.ElementTree import *
 
@@ -43,8 +44,10 @@ class UserTree:
 
     def save(self):
         # Be sure to call save() after any changes to the tree.
-        self.tree = ElementTree(self.root)
-        self.tree.write("data/user.xml")
+        f = open('data/user.xml', 'w')
+        dom = xml.dom.minidom.parseString(tostring(self.root))
+        f.write(str(dom.toprettyxml('    ')))
+        f.close()
 
 class ItemTree:
     def __init__(self):
@@ -94,8 +97,10 @@ class ItemTree:
 
     def save(self):
         # Be sure to call save() after any changes to the tree.
-        self.tree = ElementTree(self.root)
-        self.tree.write("data/sale.xml")
+        f = open('data/sale.xml', 'w')
+        dom = xml.dom.minidom.parseString(tostring(self.root))
+        f.write(str(dom.toprettyxml('    ')))
+        f.close()
 
 def saveData(commitmessage = "commit"):
     # This assumes the current working directory is the tradey directory.
-- 
cgit v1.2.3-70-g09d2


From 652145ff00785401ff7ca70e02fa6760f2b8f438 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 13:29:30 +0100
Subject: A few fixes, now runs without a crash!

---
 main.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/main.py b/main.py
index 07dd749..0929005 100755
--- a/main.py
+++ b/main.py
@@ -609,9 +609,8 @@ def main():
                     slot = packet.read_int8()
                     packet.skip(1)
                     logging.info("Character information recieved:")
-                    logging.info("Name: %s, Id: %s, EXP: %s, MONEY: %s, HP: %s/%s, MP: %s/%s, LEVEL: %s", \
-                    player_node.name, player_node.id, player_node.EXP, player_node.MONEY, player_node.HP, \
-                    player_node.MAX_HP, player_node.MP, player_node.MAX_MP, player_node.LEVEL)
+                    logging.info("Name: %s, Id: %s, EXP: %s, MONEY: %s", \
+                    player_node.name, player_node.id, player_node.EXP, player_node.MONEY)
                     if slot == character:
                         break
 
@@ -813,18 +812,19 @@ def main():
                             if test_node[item].amount == 0:
                                 del test_node[item]
                             item_found = True
+                            break
 
                     if not item_found:
                         logging.info("Server and client inventory out of sync.")
                         exit(0)
 
                 total_money = 0
-                for user in user_tree:     
+                for user in user_tree.root:     
                     total_money += int(user.get('money'))
 
-		 if total_money > player_node.MONEY:
-                      logging.info("Server and client money out of sync.")
-                      exit(0)		
+		if total_money > player_node.MONEY:
+                    logging.info("Server and client money out of sync.")
+                    exit(0)		
 
             elif packet.is_type(SMSG_TRADE_REQUEST):
                 name = packet.read_string(24)
-- 
cgit v1.2.3-70-g09d2


From 81d0ec4e7199e0329a9c449f76bc3847dde20d5b Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 14:00:01 +0100
Subject: Edit some of the help.

---
 main.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/main.py b/main.py
index 0929005..42f5e5b 100755
--- a/main.py
+++ b/main.py
@@ -145,12 +145,7 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
             elif int(user.get('accesslevel')) == 20:
                 mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
-                mapserv.sendall(whisper(nick, "!listusers lists all users which have a special accesslevel, e.g. they are blocked, seller or admin"))
-                mapserv.sendall(whisper(nick, "!setslots <slots> <name> sets the name to use only the given <slots>"))
-                mapserv.sendall(whisper(nick, "!setaccess <accesslevel> <name> sets access level for the player. -1 is blocked, 5 is seller and 20 is admin" ))
-                mapserv.sendall(whisper(nick, "!adduser <level> <slots> <name>, whereas level should be 5 for seller, 20 for admin."))
-
-
+                mapserv.sendall(whisper(nick, "You also have access to the following commands: !listusers, !setslots <slots> <name>, !setaccess <access level > <name>, !adduser <access level> <slot> <name>"))
 
         elif len(broken_string) == 2:
             if broken_string[1] == '!buy':
@@ -171,7 +166,14 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "!info - Displays basic information about your account."))
             elif broken_string[1] == '!getback':
                 mapserv.sendall(whisper(nick, "!getback <uid> - Allows you to retrieve an item that has expired or you no longer wish to sell."))
-
+            elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!listusers':
+                mapserv.sendall(whisper(nick, "!listusers - Lists all users which have a special accesslevel, e.g. they are blocked, seller or admin"))
+            elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!adduser':
+                mapserv.sendall(whisper(nick, "!adduser <access level> <slots> <name> - Add a user to the bot, a seller should be added with access level 5."))
+            elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!setslots':
+                mapserv.sendall(whisper(nick, "!setslots <slots> <name> - Sets the number of slots available to a given user."))
+            elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!setaccess':
+                mapserv.sendall(whisper(nick, "!setaccess <access level> <name> - Sets access level for the player: -1 is blocked, 5 is seller and 20 is admin" ))
     elif msg == "!money":
         # Trades any money earned through item sales.
         if user == -10:
-- 
cgit v1.2.3-70-g09d2


From cd9ac58f45f5e29b99917269f48eb7098aee7e6f Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 15:05:41 +0100
Subject: More cleanup.

---
 main.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/main.py b/main.py
index 42f5e5b..db30be3 100755
--- a/main.py
+++ b/main.py
@@ -6,13 +6,6 @@
 
     tradey, a package, which implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
 
-    - Currently permissions are defined as: -1 (blocked), 0 (normal user), 5 (seller), 20 (admin).
-    - An item will only be listed for a period of one week, and can be relisted
-      for 3 weeks.
-    - If a Trade in uncompleted within 5 minutes of a Trade Request, it is cancelled
-      to prevent any disruptions to service.
-    - The Bot supports the manaplus "right click and buy" feature; if an item is listed
-      twice for the same price, the first shown in the list will be bought (i.e. the one added earlier).
 """
 
 import logging
@@ -21,15 +14,13 @@ import sys
 import time
 import string
 
-
-
-from being import *
 try:
     import config
 except:
     print "no config file found. please move config.py.template to config.py and edit to your needs!"
     exit(0);
 
+from being import *
 from net.packet import *
 from net.protocol import *
 from net.packet_out import *
@@ -680,8 +671,7 @@ def main():
                 nick = packet.read_string(24)
                 message = packet.read_raw_string(msg_len)
                 logging.info("Whisper: " + nick + ": " + message)
-                if nick != "guild":
-                    process_whisper(nick, utils.remove_colors(message), mapserv)
+                process_whisper(nick, utils.remove_colors(message), mapserv)
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
                 stat_type = packet.read_int16()
-- 
cgit v1.2.3-70-g09d2


From 23b900a3359510a3dba34e210bd8ab9b0965e6d5 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 22 Aug 2011 15:29:24 +0100
Subject: Pretty horrible bug, was altering the inventory state when checking.

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index db30be3..88fe85f 100755
--- a/main.py
+++ b/main.py
@@ -794,7 +794,7 @@ def main():
                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
 
                 # Check the inventory state and the amount of money match the information saved.
-                test_node = player_node.inventory
+                test_node = player_node.inventory.copy()
                 for elem in sale_tree.root:
                     item_found = False
                     for item in test_node:
-- 
cgit v1.2.3-70-g09d2


From 1404493735325ce94539fa939567933255412c02 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Tue, 23 Aug 2011 10:15:16 +0200
Subject: adding data_template and README file

---
 README                          |    6 +
 data_template/items.xml         | 5540 +++++++++++++++++++++++++++++++++++++++
 data_template/logs/activity.log |    0
 data_template/logs/sale.log     |    0
 data_template/sale.xml          |    1 +
 data_template/user.xml          |    1 +
 6 files changed, 5548 insertions(+)
 create mode 100644 README
 create mode 100644 data_template/items.xml
 create mode 100644 data_template/logs/activity.log
 create mode 100644 data_template/logs/sale.log
 create mode 100644 data_template/sale.xml
 create mode 100644 data_template/user.xml

diff --git a/README b/README
new file mode 100644
index 0000000..bfdb8f7
--- /dev/null
+++ b/README
@@ -0,0 +1,6 @@
+
+To get your own copy of tradey:
+
+cp config.py.template config.py
+cp data_template data/
+cd data git init
diff --git a/data_template/items.xml b/data_template/items.xml
new file mode 100644
index 0000000..1656c73
--- /dev/null
+++ b/data_template/items.xml
@@ -0,0 +1,5540 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="items.xsl"?>
+<!--
+    Here are listed all the known items in The Mana World. This file defines
+    their name, icon, description, weight, etc. It also defines which sprite
+    to use in the case of visible equipment and which sounds to play on certain
+    events related to the item.
+
+    The 'weapon_type' attribute is kept for 0.0 client compatibility. Not to be
+    confused with 'weapon-type'.
+-->
+<items>
+    <version revision="$Revision$" />
+
+    <item id="-1" type="hairsprite" name="Flat ponytail">
+        <sprite>hairstyles/hairstyle01.xml</sprite>
+    </item>
+    <item id="-2" type="hairsprite" name="Bowl cut">
+        <sprite>hairstyles/hairstyle02.xml</sprite>
+    </item>
+    <item id="-3" type="hairsprite" name="Combed back">
+        <sprite>hairstyles/hairstyle03.xml</sprite>
+    </item>
+    <item id="-4" type="hairsprite" name="Emo">
+        <sprite>hairstyles/hairstyle04.xml</sprite>
+    </item>
+    <item id="-5" type="hairsprite" name="Mohawk">
+        <sprite>hairstyles/hairstyle05.xml</sprite>
+    </item>
+    <item id="-6" type="hairsprite" name="Pompadour">
+        <sprite>hairstyles/hairstyle06.xml</sprite>
+    </item>
+    <item id="-7" type="hairsprite" name="Center parting/Short and slick">
+        <sprite>hairstyles/hairstyle07.xml</sprite>
+    </item>
+    <item id="-8" type="hairsprite" name="Long and slick">
+        <sprite>hairstyles/hairstyle08.xml</sprite>
+    </item>
+    <item id="-9" type="hairsprite" name="Short and curly">
+        <sprite>hairstyles/hairstyle09.xml</sprite>
+    </item>
+    <item id="-10" type="hairsprite" name="Pigtails">
+        <sprite>hairstyles/hairstyle10.xml</sprite>
+    </item>
+    <item id="-11" type="hairsprite" name="Long and curly">
+        <sprite>hairstyles/hairstyle11.xml</sprite>
+    </item>
+    <item id="-12" type="hairsprite" name="Parted">
+        <sprite>hairstyles/hairstyle12.xml</sprite>
+    </item>
+    <item id="-13" type="hairsprite" name="Perky ponytail">
+        <sprite>hairstyles/hairstyle13.xml</sprite>
+    </item>
+    <item id="-14" type="hairsprite" name="Wave">
+        <sprite>hairstyles/hairstyle14.xml</sprite>
+    </item>
+    <item id="-15" type="hairsprite" name="Mane">
+        <sprite>hairstyles/hairstyle15.xml</sprite>
+    </item>
+    <item id="-16" type="hairsprite" name="Bun">
+        <sprite>hairstyles/hairstyle16.xml</sprite>
+    </item>
+    <item id="-17" type="hairsprite" name="Shoulder length flick">
+	<sprite>hairstyles/hairstyle17.xml</sprite>
+    </item>
+    <item id="-18" type="hairsprite" name="Fizzy">
+	<sprite>hairstyles/hairstyle18.xml</sprite>
+    </item>
+
+    <!-- Treating the base sprite as equipment too will be useful when we
+         implement other playable races -->
+    <item id="-100" type="racesprite" name="Human">
+        <sprite gender="male">player_male_base.xml</sprite>
+        <sprite gender="female">player_female_base.xml</sprite>
+    </item>
+
+    <!-- TEMPORARY LOW WEAPON ID:S (< 256) -->
+    <!-- Used for tmwAthena magic system -->
+    <item id="16">
+<!--        <sprite>weapon-dagger.xml</sprite>-->
+    </item>
+    <item id="30"
+        weapon_type="1">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
+    </item>
+    <item id="31"
+        weapon_type="10">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+    </item>
+    <item id="32"
+        weapon_type="11">
+        <sprite>weapon-scythe.xml</sprite>
+    </item>
+    <item id="33"
+        weapon_type="1">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
+    </item>
+    <item id="34"
+        weapon_type="1"> <!-- magic fist -->
+        <sprite>weapon-fist.xml</sprite>
+    </item>
+    <item id="35"
+        weapon_type="11">
+        <sprite>weapon-staff.xml</sprite>
+    </item>
+
+
+    <!-- Items -->
+    <item id="501"
+        image="use/potions/a.png|G:#22ff22"
+        name="Cactus Drink"
+        description="A fresh drink."
+        type="usable"
+        hp="15"
+        weight="4"/>
+    <item id="502"
+        image="use/potions/a.png|G:#ff2222"
+        name="Cactus Potion"
+        description="A fresh potion."
+        type="usable"
+        hp="25"
+        weight="7"/>
+    <item id="503"
+        image="generic/casinocoins.png"
+        name="Casino Coins"
+        description="Just some casino coins."
+        type="generic"
+        weight="1"/>
+    <item id="504"
+        image="use/food/decorcandy.png"
+        name="Decor Candy"
+        description="A leftover decor candy from last Christmas."
+        type="generic"
+        weight="1"/>
+    <item id="505"
+        image="generic/maggotslime.png"
+        name="Maggot Slime"
+        description="Slimy maggot slime."
+        type="generic"
+        weight="1"/>
+    <item id="506"
+        image="use/food/candycane.png"
+        name="Candy Cane"
+        description="Tasty candy cane."
+        type="usable"
+        hp="5"
+        weight="1"/>
+    <item id="507"
+        image="generic/scorpionstinger.png|W:#a08040,e0e0e0"
+        name="Scorpion Stinger"
+        description="A poisoned scorpion stinger."
+        type="generic"
+        weight="1"/>
+    <item id="508"
+        image="use/food/xmascake.png"
+        name="Xmas Cake"
+        description="A sweet xmas cake."
+        type="usable"
+        hp="10"
+        weight="1"/>
+    <item id="509"
+        image="use/food/chocolatebar.png|W:#441e00,b36e36"
+        name="Chocolate Bar"
+        description="A chocolate bar made of finest chocolate."
+        type="usable"
+        hp="20"
+        weight="1"/>
+    <item id="510"
+        image="use/food/candy.png"
+        name="Candy"
+        description="A sugar-free candy."
+        type="usable"
+        hp="5"
+        weight="1"/>
+    <item id="511"
+        image="equipment/head/santahat.png"
+        name="Santa Hat"
+        description="Ask Santa about this hat."
+        effect="M. Attack -2"
+        type="equip-head"
+        weight="20"
+        defense="2">
+        <sprite>equipment/head/santahat.xml</sprite>
+    </item>
+    <item id="512"
+        image="use/food/gingerbreadman.png"
+        name="Ginger Bread Man"
+        description="A tasty ginger bread man."
+        type="usable"
+        hp="25"
+        weight="1"/>
+    <item id="513"
+        image="use/food/cake.png"
+        name="Cake"
+        description="A slice of cake."
+        type="usable"
+        hp="15"
+        weight="1"/>
+    <item id="514"
+        image="use/food/xmascandycane.png"
+        name="Xmas Candy Cane"
+        description="A special xmas candy cane."
+        type="usable"
+        hp="10"
+        weight="1"/>
+    <item id="515"
+        image="generic/purplepresentbox.png"
+        name="Purple Present Box"
+        description="Something mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="516"
+        image="generic/bluepresentbox.png"
+        name="Blue Present Box"
+        description="Something mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="517"
+        image="generic/scorpionstinger.png|W:#e04040,f0f0f0"
+        name="Red Scorpion Stinger"
+        description="A highly poisoned red scorpion stinger."
+        type="generic"
+        weight="1"/>
+    <item id="518"
+        image="generic/bugleg.png"
+        name="Bug Leg"
+        description="A bug's leg. Mostly used for alchemy."
+        type="generic"
+        weight="1"/>
+    <item id="519"
+        image="use/food/cherrycake.png"
+        name="Cherry Cake"
+        description="A nice cherry cake."
+        type="usable"
+        hp="35"
+        weight="1"/>
+    <item id="520"
+        image="use/food/easteregg.png"
+        name="Easter Egg"
+        description="A surprise."
+        type="usable"
+        hp="100"
+        weight="1"/>
+    <item id="521"
+        image="equipment/weapon/dagger-dagger.png"
+        name="Dagger"
+        description="A simple dagger."
+        effect="Damage +15"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        weight="200">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
+    </item>
+    <item id="522"
+        image="equipment/weapon/dagger-sharpknife.png"
+        name="Sharp Knife"
+        description="A really sharp knife. Don't hurt yourself!"
+        effect="Damage +10"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        weight="150">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/knives/sharpknife-miss1.ogg</sound>
+    </item>
+    <item id="523"
+        image="equipment/chest/leathershirt.png"
+        name="Leather Shirt"
+        description="A shirt made of hardened leather."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="4"
+        weight="20">
+        <sprite gender="male">equipment/chest/leather-male.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
+        <sprite gender="female">equipment/chest/leather-female.xml|#412300,603100,8d4900;#ffff00</sprite>
+    </item>
+    <item id="524"
+        image="equipment/head/fancyhat.png"
+        name="Fancy Hat"
+        description="A fancy hat."
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/fancyhat.xml</sprite>
+    </item>
+    <item id="525"
+        image="equipment/head/minershat.png"
+        name="Miners Hat"
+        description="A hat used by miners."
+        effect="M. Attack -8"
+        type="equip-head"
+        defense="4"
+        weight="40">
+        <sprite>equipment/head/minershat.xml</sprite>
+    </item>
+    <item id="526"
+        image="generic/coinbag.png"
+        name="Coin Bag"
+        description="A bag used to hold coins."
+        type="generic"
+        weight="5"/>
+    <item id="527"
+        image="use/food/milk.png"
+        name="Milk"
+        description="A fresh litre of ice cold milk. Note: Cool people drink milk!"
+        type="usable"
+        hp="150"
+        weight="5"/>
+    <item id="528"
+        image="equipment/feet/boots.png|W:#4f2d29,c89078"
+        name="Boots"
+        description="Some robust boots, ideal for travelling."
+        effect="M. Attack -2"
+        type="equip-feet"
+        defense="2"
+        weight="80">
+        <sprite gender="male">equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#623a34,f0c2b4</sprite>
+    </item>
+    <item id="529"
+        image="equipment/ammo/ironarrow.png"
+        name="Iron Arrow"
+        description="A hard arrow made of iron."
+        effect="Damage +40"
+        type="equip-ammo"
+        weight="1"/>
+    <item id="530"
+        image="equipment/weapon/bow-shortbow.png"
+        name="Short Bow"
+        description="A bow for short distances."
+        effect="Damage +50 / Range 5"
+        type="equip-2hand"
+        weapon-type="bow"
+        attack-action="attack_bow"
+        weight="600"
+        missile-particle="graphics/particles/arrow.particle.xml">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+    </item>
+    <item id="531"
+        image="equipment/hands/minergloves.png"
+        name="Miner Gloves"
+        description="Gloves used by miners, very useful."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="2"
+        weight="30">
+        <sprite gender="male">equipment/hands/generic-male.xml|#202020,505050</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#202020,505050</sprite>
+    </item>
+    <item id="532"
+        image="equipment/hands/leathergloves.png"
+        name="Leather Gloves"
+        description="Gloves made of hardened leather."
+        effect="M. Attack -20"
+        type="equip-arms"
+        defense="4"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#4e2e18,c8752f</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#4e2e18,c8752f</sprite>
+    </item>
+    <item id="533"
+        image="use/food/roastedmaggot.png"
+        name="Roasted Maggot"
+        description="A maggot roasted on fire."
+        type="usable"
+        hp="150"
+        weight="5"/>
+    <item id="534"
+        image="use/food/orangecupcake.png"
+        name="Orange Cupcake"
+        description="A very soft orange cupcake."
+        type="usable"
+        hp="100"
+        weight="5"/>
+    <item id="535"
+        image="use/food/apple.png|R:#ff3600;Y:#ffc000;G:#66cc33"
+        name="Red Apple"
+        description="A healthy red apple."
+        type="usable"
+        hp="50"
+        weight="5"/>
+    <item id="536"
+        image="equipment/weapon/dagger-shortsword.png"
+        name="Short Sword"
+        description="A small but sharp sword."
+        effect="Damage +100"
+        type="equip-1hand"
+        weapon-type="sword"
+        attack-action="attack"
+        weight="2000">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="537"
+        image="generic/treasurekey.png"
+        name="Treasure Key"
+        description="A rusty key."
+        type="generic"
+        weight="2"/>
+    <item id="538"
+        image="generic/greenpresentbox.png"
+        name="Green Present Box"
+        description="Something mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="539"
+        image="use/food/beer.png"
+        name="Beer"
+        description="A fresh beer."
+        type="usable"
+        hp="200"
+        mp="5"
+        weight="10"/>
+    <item id="540"
+        image="generic/bottle-empty.png"
+        name="Empty Bottle"
+        description="An empty bottle."
+        type="generic"
+        weight="1"/>
+    <item id="541"
+        image="use/food/water.png"
+        name="Bottle of Water"
+        description="A bottle of water."
+        type="usable"
+        hp="250"
+        weight="10"/>
+    <item id="542"
+        image="generic/bottle-sand.png"
+        name="Bottle of Sand"
+        description="A bottle with sand in it."
+        type="generic"
+        weight="10"/>
+    <item id="543"
+        image="equipment/head/standardheadband.png|W:#291e16,99784c,d8bd86,ffffff"
+        name="Standard Headband"
+        description="A standard headband."
+        effect="M. Attack -3"
+        type="equip-head"
+        defense="3"
+        weight="10">
+        <sprite>equipment/head/standardheadband.xml|#563f25,99784c,d8bd86,ffffff</sprite>
+    </item>
+    <item id="544"
+        image="equipment/head/silkheadband.png"
+        name="Silk Headband"
+        description="A cool headband made of silk."
+        effect="M. Attack -10"
+        type="equip-head"
+        defense="10"
+        weight="10">
+        <sprite>equipment/head/silkheadband.xml</sprite>
+    </item>
+    <item id="545"
+        image="equipment/weapon/bow-forestbow.png"
+        name="Forest Bow"
+        description="A bow usually used for hunting."
+        effect="Damage +70 / Range 5"
+        type="equip-2hand"
+        weapon-type="bow"
+        attack-action="attack_bow"
+        weight="1200"
+        missile-particle="graphics/particles/arrow.particle.xml">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+    </item>
+    <item id="546"
+        image="equipment/chest/desertshirt.png"
+        name="Desert Shirt"
+        description="A shirt suitable for desert trips."
+        effect="M. Attack -18"
+        type="equip-torso"
+        defense="6"
+        weight="20">
+        <sprite gender="male">equipment/chest/leather-male.xml|#443c21,85794a,beb590,ffffff;#824035,d6a19a</sprite>
+        <sprite gender="female">equipment/chest/leather-female.xml|#251e06,443c21,71653b,a0945e;#b6574a</sprite>
+    </item>
+    <item id="547"
+        image="equipment/weapon/polearm-bardiche.png"
+        name="Bardiche"
+        description="A bardiche."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="548"
+        image="equipment/weapon/polearm-halberd.png"
+        name="Halberd"
+        description="A weapon usually carried by guards."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="1400"/>
+    <item id="549"
+        image="equipment/weapon/axe-axe.png"
+        name="Axe"
+        description="An axe."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="axe"
+        weight="1200"/>
+    <item id="550"
+        image="equipment/weapon/axe-blacksmithsaxe.png"
+        name="Blacksmith's Axe"
+        description="An axe usually used by blacksmiths."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="axe"
+        weight="1200">
+	<sprite>weapon-axe-blacksmith.xml</sprite>
+	</item>
+    <item id="551"
+        image="generic/hint.png|W:#74e1f4"
+        name="Aqua Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="552"
+        image="generic/hint.png|W:#c38ec7"
+        name="Magenta Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="553"
+        image="generic/hint.png|W:#f0f17d"
+        name="Yellow Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="554"
+        image="generic/hint.png|W:#70e370"
+        name="Green Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="555"
+        image="generic/hint.png|W:#6ef4ea"
+        name="Teal Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="556"
+        image="generic/hint.png|W:#c97fe8"
+        name="Purple Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="557"
+        image="generic/hint.png|W:#e97180"
+        name="Red Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="558"
+        image="generic/hint.png|W:#7a86f4"
+        name="Blue Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="559"
+        image="generic/hint.png|W:#f0bd67"
+        name="Orange Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="560"
+        image="generic/hint.png"
+        name="Grey Hint"
+        description="A hint."
+        type="generic"
+        weight="10"/>
+    <item id="561"
+        image="equipment/weapon/sword-sabre.png"
+        name="Sabre"
+        description="A sword with a very sharp, curved, single-edged blade."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="300"/>
+    <item id="562"
+        image="use/food/chickenleg.png"
+        name="Chicken Leg"
+        description="A well cooked chicken leg."
+        type="usable"
+        hp="500"
+        weight="10"/>
+    <item id="563"
+        image="equipment/hands/basicgloves.png|W:#a0a0a0,d0d0d0,ffffff,ffffff"
+        name="Winter Gloves"
+        description="A pair of soft, warm gloves."
+        effect="M. Attack -15"
+        type="equip-arms"
+        defense="3"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+    </item>
+    <item id="564"
+        image="equipment/chest/tnecksweater.png|W:#a4b2b2,ffffff"
+        name="Turtleneck Sweater"
+        description="A thick, soft and warm sweater."
+        effect="M. Attack -18"
+        type="equip-torso"
+        defense="6"
+        weight="30">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="565"
+        image="generic/petal.png|W:#ee748d,ffd8ce"
+        name="Pink Petal"
+        description="A petal from an evil flower."
+        type="usable"
+        hp="50"
+        weight="10"/>
+    <item id="566"
+        image="generic/smallmushroom.png"
+        name="Small Mushroom"
+        description="A mushroom."
+        type="usable"
+        hp="50"
+        weight="10"/>
+    <item id="567"
+        image="use/potions/b.png|G:#c05000,f0a000,f0f09f"
+        name="Iron Potion"
+        description="Increases your attack strength."
+        effect="Attack strength increase (temporary)."
+        type="usable"
+        weight="10"/>
+    <item id="568"
+        image="use/potions/c.png|G:#da69e5,ffdaff"
+        name="Concentration Potion"
+        description="Increases your attack speed."
+        effect="Attack speed increase (temporary)."
+        type="usable"
+        weight="10"/>
+    <item id="569"
+        image="generic/rawlog.png"
+        name="Raw Log"
+        description="A raw log."
+        type="generic"
+        weight="10"/>
+    <item id="570"
+        image="equipment/weapon/dagger-boneknife.png"
+        name="Bone Knife"
+        description="A knife masterly carved out of a bone."
+        effect="Damage +115"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        weight="450">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="571"
+        image="equipment/weapon/dagger-setzer.png"
+        name="Setzer"
+        description="A sharp knife, named after a famous gambler."
+        effect="Damage +110"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        weight="900">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="572"
+        image="equipment/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="200"/>
+    <item id="573"
+        image="equipment/weapon/sword-falchion.png"
+        name="Falchion"
+        description="A heavy one-handed, single-edged sword."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="300"/>
+    <item id="574"
+        image="equipment/weapon/polearm-scorpion.png"
+        name="Scorpion"
+        description="A well crafted glaive."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="600"/>
+    <item id="575"
+        image="equipment/weapon/bow-desertbow.png"
+        name="Desert Bow"
+        description="A tonorian short bow."
+        effect="Damage +? / Range ?"
+        type="equip-2hand"
+        weapon-type="bow"
+        attack-action="attack_bow"
+        weight="1200"
+        missile-particle="graphics/particles/arrow.particle.xml"/>
+    <item id="576"
+        image="equipment/weapon/sword-beheader.png"
+        name="Beheader"
+        description="An oddly designed sword especially made for beheading enemies."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="2000"/>
+    <item id="577"
+        image="equipment/ammo/bonedarts.png"
+        name="Bone Darts"
+        description="Darts made of bones."
+        effect="Damage +? / Range ?"
+        type="equip-1hand"
+        weapon-type="thrown"
+        weight="300"/>
+    <item id="578"
+        image="equipment/weapon/sword-sandcutter.png"
+        name="Sand Cutter"
+        description="A sand cutter."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="1500"/>
+    <item id="579"
+        image="equipment/weapon/dagger-rockknive.png"
+        name="Rock Knife"
+        description="A knife made of stone."
+        effect="Damage +110"
+        type="equip-1hand"
+        weapon-type="knife"
+        attack-action="attack"
+        vit="3"
+        weight="500">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="580"
+        image="equipment/weapon/staff-staffoflife.png"
+        name="Staff of Life"
+        description="A staff that increases healing magic."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="1500"/>
+    <item id="581"
+        image="equipment/weapon/staff-crescentrod.png"
+        name="Crescent Rod"
+        description="A crescent rod."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="1500"/>
+    <item id="582"
+        image="equipment/weapon/staff-staffoffire.png"
+        name="Staff of Fire"
+        description="A staff that increases fire magic."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="1500"/>
+    <item id="583"
+        image="equipment/weapon/staff-staffofice.png"
+        name="Staff of Ice"
+        description="A staff that increases ice magic."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="staff"
+        weight="1500"/>
+    <item id="584"
+        image="equipment/weapon/sword-jackal.png"
+        name="Jackal"
+        description="A jackal."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="100"/>
+    <item id="585"
+        image="equipment/shield/scarabarmlet.png"
+        name="Scarab Armlet"
+        description="A scarab armlet."
+        effect="M. Attack +5"
+        type="equip-arms"
+        weight="200"/>
+    <item id="586"
+        image="equipment/legs/shorts.png|W:#a4b2b2,ffffff"
+        name="Cotton Shorts"
+        description="Shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        weight="15"
+        defense="2">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+
+
+    <item id="587"
+        image="equipment/weapon/sword-sword.png"
+        name="Sword"
+        description="A simple but reliable sword."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="500">
+        <sprite>weapon-sword-sword.xml</sprite>
+	</item>
+
+    <!--
+    <item id="588"
+        image="equipment/weapon/sword-bastardsword.png"
+        name="Bastard Sword"
+        description="A large two handed sword."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="sword"
+        weight="10"/>
+    <item id="589"
+        image="equipment/weapon/sword-broadsword.png"
+        name="Broad Sword"
+        description="A two handed sword with a very broad blade."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="sword"
+        weight="10">
+        <sound event="hit">weapons/swords/broadsword-hit1.ogg</sound>
+    </item>
+    <item id="590"
+        image="equipment/weapon/sword-baselard.png"
+        name="Baselard"
+        description="A short and powerful sword."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10"/>
+    <item id="591"
+        image="equipment/weapon/sword-longsword.png"
+        name="Long Sword"
+        description="A sword with a long and agile blade."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10">
+        <sound event="hit">weapons/swords/longsword-hit1.ogg</sound>
+        <sound event="hit">weapons/swords/longsword-hit2.ogg</sound>
+        <sound event="strike">weapons/swords/longsword-miss1.ogg</sound>
+    </item>
+    <item id="592"
+        image="equipment/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"/>
+    <item id="593"
+        image="equipment/weapon/sword-rapier.png"
+        name="Rapier"
+        description="A light sword made for duels."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10">
+        <sound event="hit">weapons/swords/rapier-hit1.ogg</sound>
+    </item>
+    <item id="594"
+        image="equipment/weapon/polearm-spear.png"
+        name="Spear"
+        description="A light spear with a wooden pole."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="700">
+	<sprite>weapon-polearm-spear.xml</sprite>
+	</item>
+    <item id="595"
+        image="equipment/weapon/polearm-heavyspear.png"
+        name="Heavy Spear"
+        description="A heavy spear with a wooden pole."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="596"
+        image="equipment/weapon/polearm-pike.png"
+        name="Pike"
+        description="A light spear with an iron pole."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="597"
+        image="equipment/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"/>
+    <item id="598"
+        image="equipment/weapon/polearm-dualspear.png"
+        name="Dual Spear"
+        description="A spear with two tops."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="599"
+        image="equipment/weapon/sword-firesword.png"
+        name="Fire Sword"
+        description="A magical sword enchanted with the power of fire."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="10">
+        <sound event="strike">weapons/swords/firesword-miss1.ogg</sound>
+    </item>
+    <item id="600"
+        image="equipment/shield/brit.png"
+        name="Brit Shield"
+        description="A legendary shield that is said to save queens and rule waves."
+        effect="-50 Cooking"
+        type="equip-shield"
+        weight="10"/>
+    -->
+
+    <item id="601"
+        image="equipment/shield/steel.png"
+        name="Steel Shield"
+        description="A shield made of steel."
+        effect="M. Attack -200"
+        defense="20"
+        type="equip-shield"
+        weight="2500"/>
+    <item id="602"
+        image="equipment/shield/wooden.png"
+        name="Wooden Shield"
+        description="A shield made of wood."
+        effect="M. Attack -70"
+        defense="14"
+        type="equip-shield"
+        weight="1500"/>
+    <item id="603"
+        image="equipment/shield/leather.png"
+        name="Leather Shield"
+        description="A shield made of leather on a wooden frame."
+        effect="M. Attack -35"
+        defense="7"
+        type="equip-shield"
+        weight="1300"/>
+
+    <!--
+    <item id="604"
+        image="equipment/shield/knight.png"
+        name="Knight Shield"
+        description="A high quality shield used by knights."
+        defense="???"
+        type="equip-shield"
+        weight="10"/>
+    <item id="605"
+        image="equipment/weapon/axe-meatcleaver.png"
+        name="Meat Cleaver"
+        description="A butcher's tool that also makes a nice one handed battle axe."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="axe"
+        weight="10"/>
+    <item id="606"
+        image="equipment/weapon/axe-hatchet.png"
+        name="Hatchet"
+        description="A short one handed axe."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="axe"
+        weight="10"/>
+    <item id="607"
+        image="equipment/weapon/polearm-trident.png"
+        name="Trident"
+        description="A spear with three heads."
+        effect="Damage +?"
+        type="equip-2hand"
+        weapon-type="polearm"
+        weight="10"/>
+    <item id="608"
+        image="equipment/shield/blade.png"
+        name="Blade Shield"
+        description="A shield made of blades."
+        defense="???"
+        type="equip-shield"
+        weight="10"/>
+    <item id="609"
+        image="equipment/weapon/mace-club.png"
+        name="Club"
+        description="A primitive wooden club."
+        effect="Damage +?"
+        type="equip-1hand"
+        weapon-type="mace"
+        weight="10"/>
+    -->
+
+    <item id="610"
+        image="equipment/legs/shorts.png|W:#255367,266c84,68b0c5,ffffff"
+        name="Jeans Shorts"
+        description="Shorts made of jeans."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="25">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#255367,266c84,68b0c5,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#255367,266c84,68b0c5,ffffff</sprite>
+    </item>
+    <item id="611"
+        image="generic/whitefur.png"
+        name="White Fur"
+        description="A patch of white, fluffy fur."
+        type="generic"
+        weight="8"/>
+    <item id="612"
+        image="generic/cavesnakelamp.png"
+        name="Cave Snake Lamp"
+        description="The feeler of a lamp snake that glows in the dark."
+        type="generic"
+        weight="10"/>
+    <item id="613"
+        image="generic/hardspike.png"
+        name="Hard Spike"
+        description="The hard spike of a slain monster."
+        type="generic"
+        weight="10"/>
+    <item id="614"
+        image="generic/pinkantennae.png"
+        name="Pink Antenna"
+        description="No-one knows why pinkies have these antennas on their heads."
+        type="generic"
+        luk="1"
+        weight="10"/>
+    <item id="615"
+        image="equipment/head/pumpkinhelmet.png"
+        name="Pumpkin Helmet"
+        description="A helmet made out of a pumpkin."
+        effect="M. Attack -4"
+        type="equip-head"
+        defense="4"
+        weight="60">
+        <sprite>equipment/head/pumpkinhelmet.xml</sprite>
+    </item>
+    <item id="616"
+        image="equipment/head/axehat.png"
+        name="Axe Hat"
+        description="A really cool joke."
+        effect="M. Attack -4"
+        type="equip-head"
+        weight="50"
+        defense="4">
+        <sprite>equipment/head/axehat.xml</sprite>
+    </item>
+    <item id="617"
+        image="equipment/head/piratehat.png"
+        name="Pirate Hat"
+        description="A pirate hat."
+        effect="M. Attack -8"
+        type="equip-head"
+        weight="40"
+        defense="4">
+        <sprite>equipment/head/piratehat.xml</sprite>
+    </item>
+    <item id="618"
+        image="equipment/head/goggles.png"
+        name="Goggles"
+        description="Goggles designed to take care of your eyes."
+        type="equip-head"
+        weight="20"
+        defense="2">
+        <sprite>equipment/head/goggles.xml|#787878,f7f7f7</sprite>
+    </item>
+    <item id="619"
+        image="equipment/head/leathergoggles.png"
+        name="Leather Goggles"
+        description="Goggles designed for desert storms."
+        type="equip-head"
+        weight="20"
+        defense="3">
+        <sprite>equipment/head/goggles.xml|#783c00,ff973b</sprite>
+    </item>
+    <item id="620"
+        image="equipment/head/circlet.png"
+        name="Circlet"
+        description="A nice piece of jewelry."
+        effect="M. Attack +5"
+        type="equip-head"
+        weight="25"
+        defense="4">
+        <sprite>equipment/head/circlet.xml</sprite>
+    </item>
+    <item id="621"
+        image="equipment/head/eyepatch.png"
+        name="Eyepatch"
+        description="What really makes you a pirate."
+        type="equip-head"
+        weight="5"
+        defense="3">
+        <sprite>equipment/head/eyepatch.xml</sprite>
+    </item>
+    <item id="622"
+        image="equipment/head/bandana.png"
+        name="Bandana"
+        description="A striped bandana."
+        type="equip-head"
+        weight="20"
+        defense="3">
+        <sprite>equipment/head/bandana.xml</sprite>
+    </item>
+    <item id="623"
+        image="equipment/weapon/polearm-scythe.png"
+        name="Scythe"
+        description="Usually used for farming but also usable as a weapon. Slow but deadly."
+        effect="Damage +75"
+        type="equip-2hand"
+        weapon-type="polearm"
+        attack-action="attack"
+        weight="1200">
+        <sprite>weapon-scythe.xml</sprite>
+    </item>
+    <item id="624"
+        image="equipment/chest/vnecksweater.png|W:#a4b2b2,ffffff"
+        name="V-Neck Sweater"
+        description="A thin, soft and warm sweater."
+        effect="M. Attack -24"
+        type="equip-torso"
+        weight="35"
+        defense="8">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="625"
+        image="equipment/chest/chainmail.png"
+        name="Chainmail Shirt"
+        description="A shirt made of chains. It weighs a lot but offers excellent protection."
+        effect="M. Attack -120"
+        type="equip-torso"
+        weight="800"
+        defense="20">
+        <sprite gender="male">equipment/chest/chainmail-male.xml</sprite>
+        <sprite gender="female">equipment/chest/chainmail-female.xml</sprite>
+    </item>
+    <item id="626"
+        image="equipment/chest/lightplatemail.png|W:#ddeeff"
+        name="Light Platemail"
+        description="A light cuirass with shoulder pads made of iron, usually worn by foot soldiers."
+        effect="M. Attack -150"
+        type="equip-torso"
+        defense="25"
+        weight="1200">
+        <sprite gender="male">equipment/chest/lightplatemail-male.xml|#ddeeff</sprite>
+        <sprite gender="female">equipment/chest/lightplatemail-female.xml|#ddeeff</sprite>
+    </item>
+    <item id="627"
+        image="equipment/head/tophat.png"
+        name="Top Hat"
+        description="For the gentry of The Mana World."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/tophat.xml</sprite>
+    </item>
+    <item id="628"
+        image="equipment/head/funkyhat.png"
+        name="Funky Hat"
+        description="Yawn..."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="13"
+        weight="20">
+        <sprite>equipment/head/funkywinter.xml</sprite>
+    </item>
+    <item id="629"
+        image="equipment/head/mushroomhat.png"
+        name="Mush Hat"
+        description="Soft and fashionable."
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/mushroom.xml</sprite>
+    </item>
+    <item id="630"
+        image="equipment/head/shroomhat.png"
+        name="Shroom Hat"
+        description="Evil and fashionable."
+        type="equip-head"
+        defense="13"
+        weight="30">
+        <sprite>equipment/head/shroom.xml</sprite>
+    </item>
+    <item id="631"
+        image="generic/crystal.png|W:#252e6a,923eda,ba72ec,ffffff"
+        name="Dark Crystal"
+        description="A dark crystal that emits a demonic aura."
+        type="generic"
+        weight="10"/>
+    <item id="632"
+        image="equipment/legs/skirt.png|W:#a4b2b2,ffffff"
+        name="Cotton Skirt"
+        description="A skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="10">
+        <sprite>equipment/legs/skirt.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="633"
+        image="equipment/head/xmaself.png"
+        name="Christmas Elf Hat"
+        description="A hat worn by Christmas elves."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="13"
+        weight="30">
+        <sprite>equipment/head/xmaself.xml</sprite>
+    </item>
+    <item id="634"
+        image="equipment/head/mask.png"
+        name="Face Mask"
+        description="A wooden mask to conceal your face."
+        type="equip-head"
+        defense="10"
+        weight="50">
+        <sprite>equipment/head/mask.xml</sprite>
+    </item>
+    <item id="635"
+        image="generic/santacookie.png"
+        name="Santa Cookie"
+        description="This isn't for you to eat, it is for Santa Claus!"
+        type="generic"
+        weight="1"/>
+    <item id="636"
+        image="equipment/head/warlordhelm.png"
+        name="Warlord Helmet"
+        description="Worn by great warriors."
+        effect="M. Attack -36"
+        type="equip-head"
+        defense="18"
+        weight="900">
+        <sprite>equipment/head/warlordhelm.xml</sprite>
+    </item>
+    <item id="637"
+        image="equipment/head/knighthelm.png"
+        name="Knight's Helmet"
+        description="A helmet with two small wings on it."
+        effect="M. Attack -30"
+        type="equip-head"
+        defense="15"
+        weight="600">
+        <sprite>equipment/head/knighthelm.xml</sprite>
+    </item>
+    <item id="638"
+        image="equipment/head/infantryhelm.png"
+        name="Infantry Helmet"
+        description="A helmet for soldiers and guards."
+        effect="M. Attack -30"
+        type="equip-head"
+        defense="15"
+        weight="400">
+        <sprite>equipment/head/infantryhelm.xml</sprite>
+    </item>
+    <item id="639"
+        image="equipment/head/crusadehelm.png"
+        name="Crusade Helmet"
+        description="Start your own crusade."
+        effect="M. Attack -36"
+        type="equip-head"
+        defense="18"
+        weight="1300">
+        <sprite>equipment/head/crusadehelm.xml</sprite>
+    </item>
+    <item id="640"
+        image="generic/ironore.png"
+        name="Iron Ore"
+        description="A lump of iron ore."
+        type="generic"
+        weight="40"/>
+    <item id="641"
+        image="generic/snakeskin.png"
+        name="Snake Skin"
+        description="The skin of a slain snake."
+        type="generic"
+        weight="15"/>
+    <item id="642"
+        image="equipment/legs/chaps.png"
+        name="Jeans Chaps"
+        description="Jeans with snake skin chaps."
+        effect="M. Attack -12"
+        type="equip-legs"
+        defense="6"
+        weight="60">
+        <sprite gender="male">equipment/legs/chaps-male.xml</sprite>
+        <sprite gender="female">equipment/legs/chaps-female.xml</sprite>
+    </item>
+    <item id="643"
+        image="equipment/head/cowboywhite.png"
+        name="White Cowboy Hat"
+        description="A white cowboy hat with a band."
+        effect="M. Attack -12"
+        type="equip-head"
+        defense="6"
+        weight="30">
+        <sprite>equipment/head/cowboywhite.xml</sprite>
+    </item>
+    <item id="644"
+        image="equipment/head/cowboyblack.png"
+        name="Black Cowboy Hat"
+        description="A black cowboy hat with shiny buckles."
+        effect="M. Attack -12"
+        type="equip-head"
+        defense="6"
+        weight="30">
+        <sprite>equipment/head/cowboyblack.xml</sprite>
+    </item>
+    <item id="645"
+        image="equipment/chest/lightplatemail.png|W:#573f10,9c8226,d3c04b,ffffff"
+        name="Golden Platemail"
+        description="A plate mail made from gold, which only the richest of the richest can afford."
+        effect="M. Attack -100"
+        type="equip-torso"
+        defense="25"
+        weight="4500">
+        <sprite gender="male">equipment/chest/lightplatemail-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+        <sprite gender="female">equipment/chest/lightplatemail-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+    </item>
+    <item id="646"
+        image="equipment/head/crown.png"
+        name="Crown"
+        description="A jewel embossed crown fit for any ruler."
+        type="equip-head"
+        defense="4"
+        weight="240">
+        <sprite>equipment/head/crown.xml</sprite>
+    </item>
+    <item id="647"
+        image="equipment/head/devcap.png|R:#9999ff"
+        name="Developer's Cap"
+        description="A cap which identifies you as a developer."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/devcap.xml|#9999ff</sprite>
+    </item>
+    <item id="648"
+        image="equipment/legs/trousers.png"
+        name="Trousers"
+        description="Cotton pants covering each part of your legs."
+        defense="4"
+        type="equip-legs"
+        weight="25">
+        <sprite>equipment/head/devcap.xml|#9999ff</sprite>
+    </item>
+    <item id="649"
+        image="equipment/chest/sorcerer-robe.png|W:#5e7480,f1ffff,ffffff;R:#2554c7"
+        name="White Evoker's Robe (Blue)"
+        description="A blue lined white evoker's robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="5">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
+    </item>
+    <item id="650"
+        image="equipment/chest/sorcerer-robe.png|W:#000000;R:#2554c7"
+        name="Black Evoker's Robe (Blue)"
+        description="A blue lined black evoker's robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="5">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#000000;#2554c7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite>
+    </item>
+    <item id="651"
+        image="equipment/chest/silk-robe.png|W:#5e7480,f1ffff,ffffff"
+        name="White Wizard Robe"
+        description="A white robe made for peaceful wizards."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#5e7480,f1ffff,ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#5e7480,f1ffff,ffffff</sprite>
+    </item>
+    <item id="652"
+        image="equipment/chest/silk-robe.png|W:#000000"
+        name="Black Wizard Robe"
+        description="A black robe made for evil wizards."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#000000</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#000000</sprite>
+    </item>
+    <item id="653"
+        image="equipment/chest/silk-robe.png|W:#804000"
+        name="Apprentice Robe"
+        description="A robe made for apprentices."
+        defense="5"
+        type="equip-torso"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#804000</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#804000</sprite>
+    </item>
+    <item id="654"
+        image="equipment/head/cap.png|R:#d94800"
+        name="Cap"
+        description="A hat with a peak to shield your eyes from the sun."
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/cap.xml|#d94800</sprite>
+    </item>
+    <item id="655"
+        image="equipment/feet/furboots.png"
+        name="Fur Boots"
+        description="A pair of warm winter boots."
+        effect="M. Attack -3"
+        type="equip-feet"
+        weight="50"
+        defense="3">
+        <sprite gender="male">equipment/feet/furboots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/furboots-female.xml</sprite>
+    </item>
+    <item id="656"
+        image="equipment/head/serf.png"
+        name="Serf Hat"
+        description="A simple hat made from cloth."
+        type="equip-head"
+        weight="20"
+        defense="2">
+        <sprite>equipment/head/serf.xml</sprite>
+    </item>
+    <item id="657"
+        image="use/food/orange.png"
+        name="Orange"
+        description="A juicy orange."
+        type="usable"
+        hp="60"
+        weight="7"/>
+    <item id="658"
+        image="equipment/chest/warlordplate.png"
+        name="Warlord Plate"
+        description="Strong and decorative armor."
+        effect="M. Attack -170"
+        type="equip-torso"
+        defense="27"
+        weight="2600">
+        <sprite gender="male">equipment/chest/warlordplate-male.xml</sprite>
+        <sprite gender="female">equipment/chest/warlordplate-female.xml</sprite>
+    </item>
+        <item id="659"
+        image="equipment/chest/warlordplate.png|W:#573f10,9c8226,d3c04b,ffffff"
+        name="Golden Warlord Plate"
+        description="Strong and decorative armor made from gold."
+        effect="M. Attack -110"
+        type="equip-torso"
+        defense="27"
+        weight="7600">
+        <sprite gender="male">equipment/chest/warlordplate-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+        <sprite gender="female">equipment/chest/warlordplate-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+    </item>
+    <item id="660"
+        image="generic/fabric.png|W:#2b454d,72818c,b7c0c5,ffffff"
+        name="Cotton Cloth"
+        description="A piece of cotton cloth."
+        type="generic"
+        weight="10"/>
+    <item id="661"
+        image="generic/rose.png|W:#bb2222,ff8888"
+        name="Red Rose"
+        description="A red rose. A symbol for romantic love."
+        type="generic"
+        weight="1"/>
+    <item id="662"
+        image="generic/rose.png|W:#dddddd,ffffff"
+        name="White Rose"
+        description="A white rose. A symbol for everlasting love."
+        type="generic"
+        weight="1"/>
+    <item id="663"
+        image="generic/rose.png|W:#bb0022"
+        name="Dark Red Rose"
+        description="A dark red rose. A symbol for sad love."
+        type="generic"
+        weight="1"/>
+    <item id="664"
+        image="generic/rose.png|W:#dd88aa,ffdddd"
+        name="Pink Rose"
+        description="A pink rose. A symbol for innocent love."
+        type="generic"
+        weight="1"/>
+    <item id="665"
+        image="generic/rose.png|W:#dddd00,ffff00"
+        name="Yellow Rose"
+        description="A yellow rose. A symbol for platonic love and friendship."
+        type="generic"
+        weight="1"/>
+    <item id="666"
+        image="generic/rose.png|W:#111111,444444,555555,ffffff"
+        name="Black Rose"
+        description="A black rose. When you look closely at it, you see patterns within patterns, subtly changing colors, and further arrangements that almost seem designed to draw your attention in, and away from the rest of the world. Dizzy, you quickly look away."
+        effect="This item cannot be used directly, but may have certain effects given the right circumstances."
+        type="generic"
+        weight="1"/>
+    <item id="667"
+        image="generic/rose.png|W:#dd8800,ffdd00"
+        name="Orange Rose"
+        description="An orange rose. A symbol for friendship turning into love."
+        type="generic"
+        weight="1"/>
+    <item id="668"
+        image="generic/rose.png|W:#6666aa,ccccff"
+        name="Blue Rose"
+        description="An blue rose. A symbol for mystery or attaining the impossible."
+        type="generic"
+        weight="1"/>
+    <item id="669"
+        image="generic/tulip.png|W:#ddaa22,eeee44"
+        name="Yellow Tulip"
+        description="A yellow tulip. A symbol for hopeless love."
+        type="generic"
+        weight="1"/>
+    <item id="670"
+        image="generic/tulip.png|W:#000088,dd88ff"
+        name="Purple Tulip"
+        description="A purple tulip. A symbol for enchantment."
+        type="generic"
+        weight="1"/>
+    <item id="671"
+        image="generic/tulip.png|W:#882288,dd4444"
+        name="Red Tulip"
+        description="A red tulip. A declaration of love."
+        type="generic"
+        weight="1"/>
+    <item id="672"
+        image="generic/tulip.png|W:#8888dd,ffffff"
+        name="White Tulip"
+        description="A white tulip. A symbol for everlasting friendship."
+        type="generic"
+        weight="1"/>
+    <item id="673"
+        image="generic/tulip.png|W:#dd44dd,fff0f0"
+        name="Pink Tulip"
+        description="A pink tulip. A symbol for gratitude."
+        type="generic"
+        weight="1"/>
+    <item id="674"
+        image="generic/tulip.png|W:#aa2222,ffdd22"
+        name="Orange Tulip"
+        description="An orange tulip. A symbol for admiration."
+        type="generic"
+        weight="1"/>
+    <item id="675"
+        image="equipment/head/gradcap.png"
+        name="Graduation Cap"
+        description="A traditional cap which a university student may wear upon graduating."
+        type="equip-head"
+        defense="2"
+        weight="20">
+        <sprite>equipment/head/gradcap.xml</sprite>
+    </item>
+    <item id="676"
+        image="use/food/steak.png"
+        name="Steak"
+        description="A tasty piece of steak."
+        type="usable"
+        hp="250"
+        weight="10"/>
+    <item id="677"
+        image="equipment/charms/heartnecklace.png"
+        name="Heart Necklace"
+        description="A gold and ruby heart necklace."
+        type="equip-charm"
+        weight="10"/>
+    <item id="678"
+        image="equipment/head/nohmask.png"
+        name="Noh Mask"
+        description="A traditional Japanese mask worn in Noh plays."
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="3"
+        weight="18">
+        <sprite>equipment/head/nohmask.xml</sprite>
+    </item>
+    <item id="679"
+        image="equipment/head/demonmask.png"
+        name="Demon Mask"
+        description="A scary mask to make you look like a demon."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="3"
+        weight="23">
+        <sprite>equipment/head/demonmask.xml</sprite>
+    </item>
+    <item id="680"
+        image="generic/herb.png|W:#e0b0ff"
+        name="Mauve Herb"
+        description="An ingredient for brewing healing potions."
+        type="generic"
+        weight="1"/>
+    <item id="681"
+        image="generic/herb.png|W:#0047ab"
+        name="Cobalt Herb"
+        description="An ingredient for brewing healing potions."
+        type="generic"
+        weight="1"/>
+    <item id="682"
+        image="generic/herb.png|W:#ef9b0f"
+        name="Gamboge Herb"
+        description="An ingredient for brewing healing potions."
+        type="generic"
+        weight="1"/>
+    <item id="683"
+        image="generic/herb.png|W:#e32636"
+        name="Alizarin Herb"
+        description="An ingredient for brewing healing potions."
+        type="generic"
+        weight="1"/>
+    <item id="684"
+        image="use/potions/a.png|G:#b03678,ffffff"
+        name="Tiny Healing Potion"
+        description="A tiny healing potion made from brewed herbs."
+        type="usable"
+        hp="100"
+        weight="5"/>
+    <item id="685"
+        image="use/potions/d.png|G:#b03678,ffffff"
+        name="Small Healing Potion"
+        description="A small healing potion made from brewed herbs."
+        type="usable"
+        hp="200"
+        weight="10"/>
+    <item id="686"
+        image="use/potions/b.png|G:#b03678,ffffff"
+        name="Medium Healing Potion"
+        description="A medium healing potion made from brewed herbs."
+        type="usable"
+        hp="400"
+        weight="15"/>
+    <item id="687"
+        image="use/potions/c.png|G:#b03678,ffffff"
+        name="Large Healing Potion"
+        description="A large healing potion made from brewed herbs."
+        type="usable"
+        hp="800"
+        weight="25"/>
+    <item id="688"
+        image="equipment/chest/tanktop.png|W:#a4b2b2,ffffff"
+        name="Tank Top"
+        description="A sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="10">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="689"
+        image="equipment/chest/tanktop-short.png|W:#a4b2b2,ffffff"
+        name="Short Tank Top"
+        description="A short, sleeveless shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="690"
+        image="use/potions/d.png|G:#580000,a40000,c02020,ff6060"
+        name="Red Dye"
+        description="A vial containing red dye."
+        type="generic"
+        weight="10"/>
+    <item id="691"
+        image="use/potions/d.png|G:#1f9c1f,89d689"
+        name="Green Dye"
+        description="A vial containing green dye."
+        type="generic"
+        weight="10"/>
+    <item id="692"
+        image="use/potions/d.png|G:#4b4bbd,888af4"
+        name="Dark Blue Dye"
+        description="A vial containing dark blue dye."
+        type="generic"
+        weight="10"/>
+    <item id="693"
+        image="use/potions/d.png|G:#ccb534,f1ea8e,ffffaa"
+        name="Yellow Dye"
+        description="A vial containing yellow dye."
+        type="generic"
+        weight="10"/>
+    <item id="694"
+        image="use/potions/d.png|G:#62aaca,a3f4f8,d5fcfb"
+        name="Light Blue Dye"
+        description="A vial containing light blue dye."
+        type="generic"
+        weight="10"/>
+    <item id="695"
+        image="use/potions/d.png|G:#c64abd,f9a5f2,fcd0fa"
+        name="Pink Dye"
+        description="A vial containing pink dye."
+        type="generic"
+        weight="10"/>
+    <item id="696"
+        image="use/potions/d.png|G:#404040,c0c0c0"
+        name="Black Dye"
+        description="A vial containing black dye."
+        type="generic"
+        weight="10"/>
+    <item id="697"
+        image="use/potions/d.png|G:#96370f,cc5616,f68d26,fcaa2d,fdd493"
+        name="Orange Dye"
+        description="A vial containing orange dye."
+        type="generic"
+        weight="10"/>
+    <item id="698"
+        image="use/potions/d.png|G:#530a7c,b362e1,ca87ef"
+        name="Purple Dye"
+        description="A vial containing purple dye."
+        type="generic"
+        weight="10"/>
+    <item id="699"
+        image="use/potions/d.png|G:#104010,208020,30c030"
+        name="Dark Green Dye"
+        description="A vial containing dark green dye."
+        type="generic"
+        weight="10"/>
+    <item id="700"
+        image="generic/pearl.png"
+        name="Pearl"
+        description="A pearl, round and shiny."
+        type="generic"
+        weight="5"/>
+    <item id="701"
+        image="generic/powder.png"
+        name="Pile of Ash"
+        description="A pile of ash similar to volcanic ash."
+        type="generic"
+        weight="5"/>
+    <item id="702"
+        image="equipment/rings/wedding.png"
+        name="Wedding Ring"
+        description="Your wedding ring."
+        type="equip-ring"
+        weight="1"/>
+    <item id="703"
+        image="generic/powder.png|W:#606030,b0b090,e0e0a0,ffffe0"
+        name="Sulphur Powder"
+        description="A small pile of sulphur."
+        type="generic"
+        weight="2"/>
+    <item id="704"
+        image="generic/powder.png|W:#405060"
+        name="Iron Powder"
+        description="A pile of powdered iron."
+        type="generic"
+        weight="3"/>
+    <item id="705"
+        image="use/potions/e.png|R:#f04030;G:#ee8e5e"
+        name="Mana Potion"
+        description="A dark, sirupy brew, with a smell reminiscent of manaberries."
+        type="usable"
+        mp="10"
+        weight="50"/>
+    <item id="706"
+        image="generic/scorpionstinger.png|W:#e0d080,fff0e0,ffffff"
+        name="Golden Scorpion Stinger"
+        description="A golden scorpion stinger, tipped with lethal poison."
+        type="generic"
+        weight="2"/>
+    <item id="707"
+        image="use/potions/e.png|R:#504030;G:#9e8e5e"
+        name="Monster Oil Potion"
+        description="A dark, oily liquid with a sinister stench."
+        type="generic"
+        weight="50"/>
+    <item id="708"
+        image="generic/patch-leather.png"
+        name="Leather Patch"
+        description="A patch of tanned leather."
+        type="generic"
+        weight="18"/>
+    <item id="709"
+        image="generic/scorpionstinger.png|W:#a08040"
+        name="Black Scorpion Stinger"
+        description="A black scorpion stinger, dripping with poison."
+        type="generic"
+        weight="1"/>
+    <item id="710"
+        image="generic/snake-tongue.png|W:#e04020"
+        name="Snake Tongue"
+        description="The forked tongue of a snake."
+        type="generic"
+        weight="1"/>
+    <item id="711"
+        image="generic/snake-tongue.png|W:#706060"
+        name="Mountain Snake Tongue"
+        description="The forked tongue of a mountain snake."
+        type="generic"
+        weight="1"/>
+    <item id="712"
+        image="generic/snake-tongue.png|W:#a05050,e08080"
+        name="Grass Snake Tongue"
+        description="The forked tongue of a grass snake."
+        type="generic"
+        weight="1"/>
+    <item id="713"
+        image="generic/snake-tongue.png|W:#907070,d0a0a0"
+        name="Cave Snake Tongue"
+        description="The forked tongue of a cave snake."
+        type="generic"
+        weight="1"/>
+    <item id="714"
+        image="use/food/snake-egg.png|W:#c0c0a0;R:#b09070;G:#b8a888"
+        name="Snake Egg"
+        description="An edible snake egg."
+        type="usable"
+        hp="30"
+        weight="4"/>
+    <item id="715"
+        image="use/food/snake-egg.png|W:#806020;R:#604010;G:#705018"
+        name="Mountain Snake Egg"
+        description="An edible mountain snake egg."
+        type="usable"
+        hp="40"
+        weight="4"/>
+    <item id="716"
+        image="use/food/snake-egg.png|W:#e0e0c0;R:#80f0a0;G:#b0e8b0"
+        name="Grass Snake Egg"
+        description="An edible grass snake egg."
+        type="usable"
+        hp="50"
+        weight="4"/>
+    <item id="717"
+        image="use/food/snake-egg.png|W:#c0c0c0;R:#c090c0;G:#c0a8c0"
+        name="Cave Snake Egg"
+        description="An edible cave snake egg."
+        type="usable"
+        hp="20"
+        weight="4"/>
+    <item id="718"
+        image="generic/silkcocoon.png"
+        name="Silk Cocoon"
+        description="A silkworm's cocoon."
+        type="generic"
+        weight="1"/>
+    <item id="719"
+        image="use/food/apple.png|R:#73E600;Y:#c1f102;G:#66cc33"
+        name="Green Apple"
+        description="A healthy green apple."
+        type="usable"
+        hp="45"
+        weight="5"/>
+    <item id="720"
+        image="equipment/chest/silk-robe.png|W:#ffffff"
+        name="Silk Robe"
+        description="A light and shimmering silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#ffffff</sprite>
+    </item>
+    <item id="721"
+        image="equipment/head/highpriest-crown.png"
+        name="High Priest Crown"
+        description="A golden crown with an enchanted ruby."
+        effect="+20 SP"
+        type="equip-head"
+        defense="4"
+        weight="400">
+        <sprite>equipment/head/highpriest-crown.xml</sprite>
+    </item>
+    <item id="722"
+        image="equipment/head/monster-skull-helm.png"
+        name="Monster Skull Helmet"
+        description="The conserved skull of a mysterious ancient monster."
+        effect="M. Attack +10 / M. Defense +20"
+        type="equip-head"
+        defense="7"
+        weight="250">
+        <sprite>equipment/head/monster-skull-helm.xml</sprite>
+    </item>
+    <item id="723"
+        image="equipment/head/deserthat.png|R:#ffffff"
+        name="Desert Hat"
+        description="While the desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#ffffff</sprite>
+    </item>
+    <item id="724"
+        image="equipment/head/standardheadband.png|W:#a4b2b2,ffffff"
+        name="Cotton Headband"
+        description="Just a cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="725"
+        image="equipment/head/gmcap.png|R:#bf0e08"
+        name="GM Cap"
+        description="A cap which identifies you as a GM. Only GMs can wear this."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/gmcap.xml|#bf0e08</sprite>
+    </item>
+    <item id="726"
+        image="equipment/chest/silk-robe.png|W:#e40a0a"
+        name="GM Robe"
+        description="A light and shimmering silk robe made for GMs. Only GMs can wear this."
+        type="equip-torso"
+        weight="40"
+        defense="5">
+        <sprite gender="male">equipment/chest/robe-male.xml|#e40a0a</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#e40a0a</sprite>
+    </item>
+    <item id="727"
+        image="generic/iten.png|W:#ffe0f0"
+        name="Iten"
+        description="An iten."
+        type="generic"
+        weight="8000"/>
+    <item id="728"
+        image="generic/wooden-mouboo.png"
+        name="Mouboo Figurine"
+        description="A small, wooden figurine of a mouboo."
+        type="generic"
+        weight="9"/>
+    <item id="729"
+        image="generic/warped-log.png"
+        name="Warped Log"
+        description="A piece of wood, warped and twisted by some unnatural force."
+        type="generic"
+        weight="8"/>
+    <item id="730"
+        image="generic/gemstone-a.png|W:#a0a010,ffffa0"
+        name="Lifestone"
+        description="A small crystal shard, warm to the touch."
+        type="generic"
+        weight="5"/>
+    <item id="731"
+        image="equipment/legs/assassinpants.png"
+        name="Assassin Pants"
+        description="Pants for a master assassin."
+        effect="M. Attack -5"
+        type="equip-torso"
+        defense="5"
+        agi="8"
+        weight="20">
+        <sprite gender="male">equipment/legs/assassin-male.xml</sprite>
+        <sprite gender="female">equipment/legs/assassin-female.xml</sprite>
+    </item>
+    <item id="732"
+        image="generic/dry-branch.png"
+        name="Druid Tree Branch"
+        description="A branch cut off from the druid tree. It feels strangely leathery to the touch."
+        type="generic"
+        weight="2"/>
+    <item id="733"
+        image="use/potions/e.png|R:#fff0ff;G:#d0c09f"
+        name="Purification Potion"
+        description="A transparent, odorless liquid that feels strangely lighter than water."
+        type="usable"
+        mp="0"
+        weight="15"/>
+    <item id="734"
+        image="equipment/feet/boots.png|W:#212121"
+        name="Black Boots"
+        description="Steel toe capped boots, designed to keep your feet very well protected."
+        effect="M. Attack -10"
+        type="equip-feet"
+        weight="25"
+        defense="3">
+        <sprite gender="male">equipment/feet/boots-male.xml|#212121</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#212121</sprite>
+    </item>
+    <item id="735"
+        image="equipment/feet/boots.png|W:#a4b2b2,ffffff"
+        name="Cotton Boots"
+        description="A pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="1"
+        weight="10">
+        <sprite gender="male">equipment/feet/boots-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="736"
+        image="use/food/bigcake.png|R:#ede5b2,fff7bf;G:#cccccc,ffffff"
+        name="White Cake"
+        description="A delicious white cake. Would go good with strawberries."
+        type="usable"
+        hp="10"
+        weight="10"/>
+    <item id="737"
+        image="use/food/bigcake.png|R:#9e6e3b,e39d52;G:#e29f57;W:#ffd5a8"
+        name="Chocolate Cake"
+        description="A scrumptious chocolate cake. Real chocolate guaranteed."
+        type="usable"
+        hp="11"
+        weight="10"/>
+    <item id="738"
+        image="use/food/bigcake.png|R:#fed079,ffffff;G:#fed079,ffffff,ffffff;W:#856200,e68e00,ffa600"
+        name="Orange Cake"
+        description="A tangy orange cake. Made from real oranges."
+        type="usable"
+        hp="12"
+        weight="10"/>
+    <item id="739"
+        image="use/food/bigcake.png|R:#ccc599,fff8ED;G:#ffbaba,fffefe;W:#d91a1a,ff8f8f"
+        name="Apple Cake"
+        description="A crisp apple cake. Real apple pieces inside!"
+        type="usable"
+        hp="12"
+        weight="10"/>
+    <item id="740"
+        image="generic/root.png"
+        name="Root"
+        description="A root from a plant."
+        type="generic"
+        weight="5"/>
+    <item id="741"
+        image="equipment/hands/basicgloves.png|W:#a4b2b2,ffffff"
+        name="Cotton Gloves"
+        description="A pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="10">
+        <sprite gender="male">equipment/hands/generic-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="742"
+        image="equipment/charms/clover.png"
+        name="Four-Leaf Clover"
+        description="A lucky four-leaf clover."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="1"
+        weight="1"/>
+    <item id="743"
+        image="use/food/acorn.png"
+        name="Acorn"
+        description="An acorn."
+        type="usable"
+        hp="3"
+        weight="1"/>
+    <item id="744"
+        image="use/potions/c.png|G:#f0e0fa,da69e5"
+        name="Diluted Concentration Potion"
+        description="A bottle of diluted concentration potion."
+        effect="Attack speed increase (temporary)."
+        type="usable"
+        weight="10"/>
+    <item id="745"
+        image="use/potions/c.png|G:#ff4aff"
+        name="Dark Concentration Potion"
+        description="This potion smells like burnt sugar."
+        effect="Attack speed increase (temporary)."
+        type="usable"
+        weight="10"/>
+    <item id="746"
+        image="use/potions/e.png|R:#a0a0ff;G:#20409f"
+        name="Mopox Cure Potion"
+        description="A gooey brew with a vile smell, supposedly able to cure Mopox."
+        type="usable"
+        weight="5"/>
+    <item id="747"
+        image="use/food/bigcake.png|R:#9e6e3b,e39d52;G:#e29f57;W:#ffd5a8"
+        name="Laced Chocolate Cake"
+        description="A scrumptious chocolate cake, with a dash of Mopox Cure Potion."
+        type="usable"
+        hp="11"
+        weight="10"/>
+    <item id="748"
+        image="use/food/orangecupcake.png"
+        name="Laced Orange Cupcake"
+        description="A very soft orange cupcake, laced with Mopox cure potion."
+        type="usable"
+        hp="100"
+        weight="5"/>
+    <item id="749"
+        image="equipment/charms/towel.png"
+        name="Towel"
+        description="You can dry yourself off with it if it still seems to be clean enough. - Douglas Adams"
+        effect="M. Attack +5"
+        type="equip-charm"
+        weight="50"/>
+    <item id="750"
+        image="use/potions/c.png|G:#f0f040,ffffff"
+        name="Slow Poison Potion"
+        description="A yellow potion with a fresh, citric scent."
+        effect="Suspends poison."
+        type="usable"
+        hp="5"
+        weight="10"/>
+    <item id="751"
+        image="equipment/head/pinkiehat.png"
+        name="Pinkie Hat"
+        description="With this, you'll fit right in with those strange pinkies."
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="1"
+        weight="5">
+        <sprite>equipment/head/pinkiehat.xml</sprite>
+    </item>
+    <item id="752"
+        image="equipment/head/fluffyhat.png"
+        name="Fluffy Hat"
+        description="Now you can wear fur on your head."
+        effect="M. Attack -5"
+        type="equip-head"
+        defense="2"
+        weight="10">
+        <sprite>equipment/head/fluffyhat.xml</sprite>
+    </item>
+    <item id="753"
+        image="generic/batwing.png"
+        name="Bat Wing"
+        description="The wing from a bat."
+        type="generic"
+        weight="3"/>
+    <item id="754"
+        image="generic/batteeth.png"
+        name="Bat Teeth"
+        description="The teeth from a bat. Rather sharp."
+        type="generic"
+        weight="2"/>
+    <item id="755"
+        image="equipment/chest/assassintop.png"
+        name="Assassin Shirt"
+        description="Shirt for a master assassin."
+        effect="M. Attack -5"
+        type="equip-torso"
+        defense="10"
+        agi="10"
+        weight="15">
+        <sprite gender="male">equipment/chest/assassin-male.xml</sprite>
+        <sprite gender="female">equipment/chest/assassin-female.xml</sprite>
+    </item>
+    <item id="756"
+        image="equipment/hands/assassingloves.png"
+        name="Assassin Gloves"
+        description="Gloves for a master assassin."
+        effect="M. Attack -3"
+        type="equip-arms"
+        defense="5"
+        agi="5"
+        weight="9">
+        <sprite gender="male">equipment/hands/assassin-male.xml</sprite>
+        <sprite gender="female">equipment/hands/assassin-female.xml</sprite>
+    </item>
+    <item id="757"
+        image="equipment/feet/assassinboots.png"
+        name="Assassin Boots"
+        description="Boots for a master assassin."
+        effect="M. Attack -3"
+        type="equip-feet"
+        defense="5"
+        agi="5"
+        weight="10">
+        <sprite gender="male">equipment/feet/assassin-boots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/assassin-boots-female.xml</sprite>
+    </item>
+    <item id="758"
+        image="equipment/weapon/staff-woodstaff.png"
+        name="Wooden Staff"
+        description="A basic wooden staff."
+        effect="Damage +50 / M. Attack +5"
+        type="equip-2hand"
+        weapon-type="polearm"
+        attack-action="attack"
+        weight="1000">
+        <sprite>weapon-staff.xml</sprite>
+    </item>
+    <item id="759"
+        image="equipment/head/paladin-helm.png"
+        name="Paladin's Helmet"
+        description="Worn only by paladins."
+        type="equip-head"
+        defense="19"
+        weight="43">
+        <sprite>equipment/head/paladinhelm.xml</sprite>
+    </item>
+    <item id="760"
+        image="equipment/head/overlord-helm.png"
+        name="Overlord's Helmet"
+        description="Worn by the greatest warriors."
+        type="equip-head"
+        defense="20"
+        weight="45">
+        <sprite>equipment/head/overlordhelm.xml</sprite>
+    </item>
+    <item id="761"
+        image="equipment/head/desert-helmet.png"
+        name="Desert Helmet"
+        description="The perfect desert warriors' helmet."
+        type="equip-head"
+        weight="48"
+        defense="21">
+        <sprite>equipment/head/desert-helmet.xml</sprite>
+    </item>
+    <item id="762"
+        image="equipment/ammo/arrow.png|W:#8B4513"
+        name="Terranite Arrow"
+        description="A terranite arrow."
+        effect="Damage +50 / Critical Damage +10"
+        type="equip-ammo"
+        weight="1"/>
+    <item id="763"
+        image="generic/terraniteore.png"
+        name="Terranite Ore"
+        description="Some ore collected out of terranite."
+        type="generic"
+        weight="40"/>
+    <item id="764"
+        image="equipment/head/sailor_hat.png"
+        name="Sailor Hat"
+        description="A hat worn by brave sailors."
+        type="equip-head"
+        defense="5"
+        weight="5">
+        <sprite>equipment/head/sailor-hat.xml</sprite>
+    </item>
+    <item id="765"
+        image="equipment/head/captain_hat.png"
+        name="Captain's Hat"
+        description="A hat worn by the bravest captains."
+        type="equip-head"
+        defense="15"
+        weight="8">
+        <sprite>equipment/head/captain-hat.xml</sprite>
+    </item>
+    <item id="766"
+        image="equipment/head/terranitehelm.png"
+        name="Terranite Helmet"
+        description="A magical helmet made out of semi-polished granite that was enchanted to be very light. Great for mages on the battlefield."
+        effect="M. Attack -12 / M. Defense +5"
+        type="equip-head"
+        defense="15"
+        weight="300">
+        <sprite>equipment/head/terranitehelm.xml</sprite>
+    </item>
+    <item id="767"
+        image="equipment/chest/terranite.png"
+        name="Terranite Chest Armor"
+        description="A nice piece of armor made out of terranite ore."
+        effect="M. Attack -70 / M. Defense +10"
+        type="equip-torso"
+        defense="20"
+        dex="1"
+        weight="800">
+        <sprite gender="male">equipment/chest/terranite-male.xml</sprite>
+        <sprite gender="female">equipment/chest/terranite-female.xml</sprite>
+    </item>
+    <item id="768"
+        image="equipment/legs/terranitepants.png"
+        name="Terranite Legs"
+        description="Leggings made out of terranite."
+        effect="M. Attack -8 / M. Defense +5"
+        type="equip-legs"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/legs/terranite-male.xml</sprite>
+        <sprite gender="female">equipment/legs/terranite-female.xml</sprite>
+    </item>
+    <item id="769"
+        image="equipment/head/guyfawkes.png"
+        name="Guy Fawkes Mask"
+        description="The famous Guy Fawkes mask."
+        type="equip-head"
+        weight="30"
+        defense="3">
+        <sprite>equipment/head/guyfawkes.xml</sprite>
+    </item>
+    <item id="770"
+        image="equipment/head/fairy_hat.png"
+        name="Fairy Hat"
+        description="The famous hat worn by Robin Hood."
+        effect="M. Attack -10"
+        type="equip-head"
+        defense="5"
+        luck="3"
+        weight="20">
+        <sprite>equipment/head/fairy_hat.xml</sprite>
+    </item>
+    <item id="771"
+        image="equipment/legs/miniskirt.png|W:#a4b2b2,ffffff"
+        name="Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="M. Attack -8"
+        defense="4"
+        type="equip-legs"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="772"
+        image="generic/spice.png|R:#ffff00"
+        name="Wisp Powder"
+        description="Powder from a wisp."
+        type="generic"
+        weight="3"/>
+    <item id="773"
+        image="generic/spice.png|R:#ff00ff"
+        name="Spectre Powder"
+        description="Powder from a spectre."
+        type="generic"
+        weight="3"/>
+    <item id="774"
+        image="generic/spice.png|R:#00ffff"
+        name="Poltergeist Powder"
+        description="Powder from a poltergeist."
+        type="generic"
+        weight="3"/>
+    <item id="775"
+        image="generic/bone.png"
+        name="Bone"
+        description="A bone."
+        type="generic"
+        weight="10"/>
+    <item id="776"
+        image="generic/skull.png"
+        name="Skull"
+        description="A skull."
+        type="generic"
+        weight="30"/>
+    <item id="777"
+        image="generic/rags-rotten.png"
+        name="Rotten Rags"
+        description="Rotten rags from an undead creature."
+        type="generic"
+        weight="15"/>
+    <item id="778"
+        image="generic/heart-diseased.png"
+        name="Diseased Heart"
+        description="A diseased heart. Likely from a zombie."
+        type="generic"
+        weight="10"/>
+    <item id="779"
+        image="generic/ear-zombie.png"
+        name="Undead Ear"
+        description="An ear from a zombie."
+        type="generic"
+        weight="5"/>
+    <item id="780"
+        image="generic/eyeball.png"
+        name="Undead Eye"
+        description="An eye from a zombie."
+        type="generic"
+        weight="3"/>
+    <item id="781"
+        image="equipment/head/witch-doctor-mask.png"
+        name="Witch Doctor's Mask"
+        description="A crazy mask from the Voodoo doctor."
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/witch-doctor-mask.xml</sprite>
+    </item>
+    <item id="782"
+        image="equipment/chest/forest-armor.png"
+        name="Forest Armor"
+        description="A clean and comfortable mantle with dags made for the finest stalkers."
+        effect="M. Attack -20"
+        type="equip-torso"
+        defense="10"
+        dex="3"
+        weight="30">
+        <sprite gender="male">equipment/chest/forest-armor-male.xml</sprite>
+        <sprite gender="female">equipment/chest/forest-armor-female.xml</sprite>
+    </item>
+    <item id="783"
+        image="equipment/chest/valentine-dress.png|R:#bf0e08"
+        name="Platyna Red Dress"
+        description="A silken dress with soft lace trim. If you damage it, you'll never get it to look good again. In special Platyna red."
+        effect="M. Attack +3"
+        type="equip-torso"
+        defense="15"
+        weight="35">
+        <sprite gender="female">equipment/chest/valentine-dress.xml|#bf0e08</sprite>
+    </item>
+    <item id="784"
+        image="use/food/zombie-nachos.png"
+        name="Zombie Nachos"
+        description="The flavor is in the brains."
+        type="usable"
+        hp="60"
+        weight="5"/>
+    <item id="785"
+        image="use/food/lady-fingers.png"
+        name="Lady Fingers"
+        description="Made with simulated lady fingers."
+        type="usable"
+        hp="40"
+        weight="5"/>
+    <item id="786"
+        image="use/food/jello.png"
+        name="Slime Jell-Ahh"
+        description="Finally, an edible form of slime!"
+        type="usable"
+        hp="50"
+        weight="5"/>
+    <item id="787"
+        image="use/food/snapple.png"
+        name="Snapple"
+        description="Bite it before it bites you!"
+        type="usable"
+        hp="70"
+        weight="5"/>
+    <item id="788"
+        image="use/food/juice.png"
+        name="Beetle Juice"
+        description="Thist quencing and nutritious!"
+        type="usable"
+        hp="50"
+        weight="5"/>
+    <item id="789"
+        image="use/food/skull-mug.png"
+        name="Gut Buster Ale"
+        description="If you can survive the first gulp, the rest goes down smooth."
+        type="usable"
+        hp="60"
+        weight="5"/>
+    <item id="790"
+        image="use/food/wine.png"
+        name="Blood Wine"
+        description="A good vintage."
+        type="usable"
+        hp="100"
+        weight="5"/>
+    <item id="791"
+        image="equipment/chest/tanktop.png|W:#412300,c9866b,8d4900;#ffff00"
+        name="Yeti Skin Shirt"
+        description="A shirt made of hardened yeti skin."
+        effect="M. Attack -12"
+        type="equip-torso"
+        weight="20"
+        defense="12">
+        <sprite gender="male">equipment/chest/leather-male.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
+        <sprite gender="female">equipment/chest/leather-female.xml|#412300,c9866b,8d4900;#ffff00</sprite>
+    </item>
+    <item id="792"
+        image="equipment/feet/bromenalboots.png"
+        name="Bromenal Boots"
+        description="A pair of bromenal boots."
+        effect="M. Attack -2"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/bromenalboots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/bromenalboots-female.xml</sprite>
+    </item>
+        <item id="793"
+        image="equipment/chest/bromenalchest.png"
+        name="Bromenal Chest"
+        description="A bromenal chest armor."
+        effect="M. Attack -170"
+        type="equip-torso"
+        weight="2000"
+        defense="25">
+        <sprite gender="male">equipment/chest/bromenalchest-male.xml|#fbf5e9</sprite>
+        <sprite gender="female">equipment/chest/bromenalchest-female.xml|#fbf5e9</sprite>
+    </item>
+    <item id="794"
+        image="equipment/hands/bromenalgloves.png"
+        name="Bromenal Gloves"
+        description="A pair of bromenal gloves."
+        effect="M. Attack -20"
+        type="equip-arms"
+        weight="40"
+        defense="4">
+        <sprite gender="male">equipment/hands/bromenalgloves-male.xml</sprite>
+        <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite>
+    </item>
+    <item id="795"
+        image="equipment/head/bromenalhelmet.png"
+        name="Bromenal Helmet"
+        description="A hard bromenal helmet."
+        effect="M. Attack -30"
+        type="equip-head"
+        defense="15"
+        weight="400">
+        <sprite>equipment/head/bromenalhelmet.xml</sprite>
+    </item>
+    <item id="796"
+        image="equipment/legs/bromenallegs.png"
+        name="Bromenal Legs"
+        description="A bromenal leg armor."
+        effect="M. Attack -12"
+        type="equip-legs"
+        weight="150"
+        defense="">
+        <sprite gender="male">equipment/legs/bromenallegs-male.xml</sprite>
+        <sprite gender="female">equipment/legs/bromenallegs-female.xml</sprite>
+    </item>
+    <item id="797"
+        image="equipment/shield/bromenal.png"
+        name="Bromenal Shield"
+        description="A shield made of bromenal."
+        effect="M. Attack -200"
+        type="equip-shield"
+        defense="20"
+        weight="2500"/>
+    <item id="798"
+        image="equipment/chest/sorcerer-robe.png"
+        name="Sorcerer Robe (Red)"
+        description="A red lined sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="5">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#ffffff</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#ffffff</sprite>
+    </item>
+    <item id="799"
+        image="generic/mylarin-dust.png"
+        name="Mylarin Dust"
+        description="a bottle of mylarin particles."
+        type="generic"
+        weight="3"/>
+    <item id="800"
+        image="equipment/head/bowler-hat-brown.png"
+        name="Bowler Hat (Brown)"
+        description="A hat for those with a bit of class."
+        effect="M. Attack +2"
+        type="equip-head"
+        weight="30"
+        defense="10">
+        <sprite>equipment/head/bowler-hat-brown.xml</sprite>
+    </item>
+    <item id="801"
+        image="equipment/head/pinkie-helmet.png"
+        name="Pinkie Helmet"
+        description="A helmet of Pinkie warriors."
+        effect="M. Attack -20"
+        type="equip-head"
+        defense="10"
+        luck="1"
+        weight="800">
+        <sprite>equipment/head/pinkie-helmet.xml</sprite>
+    </item>
+    <item id="802"
+        image="generic/easterbasket.png"
+        name="Easter Basket"
+        description="A nice basket to put easter presents in."
+        type="generic"
+        weight="10"/>
+    <item id="803"
+        image="generic/grassliner.png"
+        name="Grass Liner"
+        description="Very good for putting something breakable on it."
+        type="generic"
+        weight="5"/>
+    <item id="804"
+        image="generic/jellybeans.png"
+        name="Jelly Beans"
+        description="Colorful and tasty Jelly Beans."
+        type="generic"
+        weight="2"/>
+    <item id="805"
+        image="generic/chocolatemouboo.png"
+        name="Chocolate Mouboo"
+        description="A mouboo made out of chocolate. It's hard not to bite it."
+        type="generic"
+        weight="3"/>
+    <item id="806"
+        image="generic/reedbundle.png"
+        name="Reed Bundle"
+        description="A bundle of reed."
+        type="generic"
+        weight="7"/>
+    <item id="807"
+        image="generic/grassseeds.png"
+        name="Grass Seeds"
+        description="Some grass seeds."
+        type="generic"
+        weight="1"/>
+    <item id="808"
+        image="use/others/warp-towel.png"
+        name="Hitchhiker's Towel"
+        description="An inconspicuous towel."
+        type="generic"
+        weight="20"/>
+    <item id="809"
+        image="use/others/warp-towel.png|W:#5e7480,f1ffff,ffffff"
+        name="White Hitchhiker's Towel"
+        description="An inconspicuous white towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="810"
+        image="use/others/warp-towel.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Hitchhiker's Towel"
+        description="An inconspicuous red towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="811"
+        image="use/others/warp-towel.png|W:#1f9c1f,89d689"
+        name="Green Hitchhiker's Towel"
+        description="An inconspicuous green towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="812"
+        image="use/others/warp-towel.png|W:#4b4bbd,888af4"
+        name="Blue Hitchhiker's Towel"
+        description="An inconspicuous blue towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="813"
+        image="use/others/warp-towel.png|W:#ccb534,f1ea8e,ffffaa"
+        name="Yellow Hitchhiker's Towel"
+        description="An inconspicuous yellow towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="814"
+        image="use/others/warp-towel.png|W:#530a7c,b362e1,ca87ef"
+        name="Purple Hitchhiker's Towel"
+        description="An inconspicuous purple towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="815"
+        image="use/others/warp-towel.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Hitchhiker's Towel"
+        description="An inconspicuous orange towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="816"
+        image="use/others/warp-towel.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Hitchhiker's Towel"
+        description="An inconspicuous pink towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="817"
+        image="use/others/warp-towel.png|W:#4ee2ec"
+        name="Teal Hitchhiker's Towel"
+        description="An inconspicuous teal towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="818"
+        image="use/others/warp-towel.png|W:#41a317"
+        name="Lime Hitchhiker's Towel"
+        description="An inconspicuous lime towel."
+        effect="A strange way of travelling."
+        type="generic"
+        weight="30"/>
+    <item id="819"
+        image="generic/gempowder.png|W:#5e7480,f1ffff,ffffff"
+        name="Diamond Powder"
+        description="A white powder made out of a diamond."
+        type="generic"
+        weight="5"/>
+    <item id="820"
+        image="generic/gempowder.png|W:#580000,a40000,c02020,ff6060"
+        name="Ruby Powder"
+        description="A red powder made out of a ruby."
+        type="generic"
+        weight="5"/>
+    <item id="821"
+        image="generic/gempowder.png|W:#1f9c1f,89d689"
+        name="Emerald Powder"
+        description="A green powder made out of an emerald."
+        type="generic"
+        weight="5"/>
+    <item id="822"
+        image="generic/gempowder.png|W:#4b4bbd,888af4"
+        name="Sapphire Powder"
+        description="A blue powder made out of a sapphire."
+        type="generic"
+        weight="5"/>
+    <item id="823"
+        image="generic/gempowder.png|W:#ccb534,f1ea8e,ffffaa"
+        name="Topaz Powder"
+        description="A yellow powder made out of a topaz."
+        type="generic"
+        weight="5"/>
+    <item id="824"
+        image="generic/gempowder.png|W:#530a7c,b362e1,ca87ef"
+        name="Amethyst Powder"
+        description="A purple powder made out of an amethyst."
+        type="generic"
+        weight="5"/>
+    <item id="825"
+        image="use/potions/a.png|G:#3636b0,ffffff"
+        name="Tiny Mana Elixir"
+        description="A tiny mana potion made from brewed, powerful items."
+        type="usable"
+        mp="25"
+        weight="5"/>
+    <item id="826"
+        image="use/potions/d.png|G:#3636b0,ffffff"
+        name="Small Mana Elixir"
+        description="A small mana potion made from brewed, powerful items."
+        type="usable"
+        mp="50"
+        weight="10"/>
+    <item id="827"
+        image="use/potions/b.png|G:#3636b0,ffffff"
+        name="Medium Mana Elixir"
+        description="A medium mana potion made from brewed, powerful items."
+        type="usable"
+        mp="100"
+        weight="15"/>
+    <item id="828"
+        image="use/potions/c.png|G:#3636b0,ffffff"
+        name="Large Mana Elixir"
+        description="A large mana potion made from brewed, powerful items."
+        type="usable"
+        mp="250"
+        weight="25"/>
+    <item id="829"
+        image="equipment/charms/fourleaf-amulet.png|W:#332f27,584a31,af7817,ffffff"
+        name="Crozenite Four-Leaf Amulet"
+        description="An amulet that brings the wearer luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="1"
+        weight="10"/>
+    <item id="830"
+        image="equipment/charms/fourleaf-amulet.png|W:#3f2e26,644435,7c513c,ffffff"
+        name="Bromenal Four-Leaf Amulet"
+        description="An amulet that brings the wearer good luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="2"
+        weight="10"/>
+    <item id="831"
+        image="equipment/charms/fourleaf-amulet.png|W:#272f33,384347,6f7e85,ffffff"
+        name="Silver Four-Leaf Amulet"
+        description="An amulet that brings the wearer great luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="3"
+        weight="10"/>
+    <item id="832"
+        image="equipment/charms/fourleaf-amulet.png|W:#857a4d,bc9600,fdd017,ffffff"
+        name="Golden Four-Leaf Amulet"
+        description="An amulet that brings the wearer excellent luck where ever they go."
+        effect="M. Attack +5"
+        type="equip-charm"
+        luck="4"
+        weight="10"/>
+    <item id="833"
+        image="equipment/charms/broken-fourleaf-amulet.png"
+        name="Broken Four-Leaf Amulet"
+        description="A broken four-leaf clover amulet."
+        type="generic"
+        weight="10"/>
+    <item id="834"
+        image="generic/doll.png"
+        name="Doll"
+        description="An ancient doll taken from a fallen Fey Element that used it as a lure for its young victims."
+        type="generic"
+        weight="15"/>
+    <item id="835"
+        image="generic/stinger-new.png|R:#1a160f,93774a"
+        name="Hyvern Stinger"
+        description="A stinger snapped off the end of a Hyvern's abdomen."
+        type="generic"
+        weight="10"/>
+    <item id="836"
+        image="generic/grub-slime.png"
+        name="Grub Slime"
+        description="The orifice secretions of a grub."
+        type="generic"
+        weight="2"/>
+
+    <!-- ID 837 RESERVED - "Witch Root" -->
+
+    <!-- HERE ARE SOME UNUSED ITEM IDS -->
+
+    <item id="1198"
+        image="generic/spectral-orb.png|R:#ff6600,ff9933,ffff33"
+        name="Jack O Soul"
+        description="The soul of a Jack O."
+        type="generic"
+        weight="1"/>
+    <item id="1199"
+        image="equipment/ammo/arrow.png"
+        name="Arrow"
+        description="A standard arrow."
+        effect="Damage +20"
+        type="equip-ammo"
+        weight="1"/>
+    <item id="1200"
+        image="equipment/weapon/bow-bow.png"
+        name="Bow"
+        description="A distance weapon."
+        effect="Damage +15 / Range 5"
+        type="equip-2hand"
+        weight="20"
+        missile-particle="graphics/particles/arrow.particle.xml"
+        weapon-type="bow"
+        attack-action="attack_bow">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+    </item>
+    <item id="1201"
+        image="equipment/weapon/dagger-knive.png"
+        name="Knife"
+        description="A small knife; the perfect weapon for a beginner."
+        effect="Damage +5"
+        type="equip-1hand"
+        weight="120"
+        weapon-type="knife"
+        attack-action="attack">
+        <sprite>weapon-dagger.xml</sprite>
+    </item>
+    <item id="1202"
+        image="equipment/chest/cottonshirt.png|W:#a4b2b2,ffffff"
+        name="Cotton Shirt"
+        description="A shirt made of 100% cotton."
+        effect="M. Attack -2"
+        type="equip-torso"
+        defense="2"
+        weight="13">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+    <item id="1203"
+        image="equipment/head/rangerhat.png"
+        name="Ranger Hat"
+        description="A leather hat traditionally worn by rangers."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="2"
+        weight="20">
+        <sprite>equipment/head/rangerhat.xml</sprite>
+    </item>
+    <item id="1204"
+        image="equipment/head/antlerhat.png"
+        name="Antler Hat"
+        description="A hat with antlers sticking out of it."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="4"
+        weight="15">
+        <sprite>equipment/head/antlerhat.xml</sprite>
+    </item>
+    <item id="1205"
+        image="equipment/head/christmastree.png"
+        name="Christmas Tree Hat"
+        description="A hat shaped like a Christmas tree."
+        type="equip-head"
+        defense="2"
+        weight="20">
+        <sprite>equipment/head/christmastree.xml</sprite>
+    </item>
+    <item id="1206"
+        image="equipment/head/santabeardhat.png"
+        name="Santa Beard Hat"
+        description="Now you will look just like Santa Claus!"
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="5"
+        weight="20">
+        <sprite>equipment/head/santabeardhat.xml</sprite>
+    </item>
+    <item id="1207"
+        image="generic/redstocking.png"
+        name="Red Christmas Stocking"
+        description="Eww, it's smelly!"
+        type="generic"
+        weight="10"/>
+    <item id="1208"
+        image="generic/easteregg-red.png"
+        name="Red Easter Egg"
+        description="A red easter egg. Find all six different easter eggs to win a prize."
+        type="generic"
+        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."
+        type="generic"
+        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."
+        type="generic"
+        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."
+        type="generic"
+        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."
+        type="generic"
+        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."
+        type="generic"
+        weight="10"/>
+    <item id="1214"
+        image="equipment/head/bunnyears.png"
+        name="Bunny Ears"
+        description="A headband with plush bunny ears."
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="10"
+        weight="20">
+        <sprite>equipment/head/bunnyears.xml</sprite>
+    </item>
+    <item id="1215"
+        image="equipment/weapon/sword-sabre.png"
+        name="Toy Sabre"
+        description="A toy item, doesn't do much damage."
+        effect="Damage +1"
+        type="equip-1hand"
+        weapon-type="sword"
+        weight="1">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/sabre-hit1.ogg</sound>
+    </item>
+    <item id="1216"
+        image="equipment/head/mouboohead.png"
+        name="Mouboo Head"
+        description="A tightly fitting mouboo head."
+        type="equip-head"
+        defense="1"
+        weight="80">
+        <sprite>equipment/head/mouboohead.xml</sprite>
+    </item>
+    <item id="1217"
+        image="equipment/head/catears.png|M:#774444;W:#777777"
+        name="Cat Ears"
+        description="A pair of plush cat ears. Meow!"
+        effect="M. Attack +1"
+        type="equip-head"
+        defense="1"
+        agi="3"
+        weight="20">
+        <sprite>equipment/head/catears.xml|#774444;#777777</sprite>
+    </item>
+    <item id="1218"
+        image="equipment/head/paperbag.png"
+        name="Paper Bag"
+        description="A paper bag with eye holes."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="1"
+        agi="-1"
+        weight="10">
+        <sprite>equipment/head/paperbag.xml</sprite>
+    </item>
+    <item id="1219"
+        image="equipment/head/moubootaurhead.png"
+        name="Moubootaur Head"
+        description="The Moubootaur's head."
+        type="equip-head"
+        defense="1"
+        weight="80">
+        <sprite>equipment/head/moubootaurhead.xml</sprite>
+    </item>
+    <item id="1220"
+        image="equipment/head/parsley-earplugs.png"
+        name="Bunch of Parsley"
+        description="A bunch of parsley, useful for salads and many other dishes. In a pinch, it doubles as earplugs."
+        type="equip-head"
+        defense="1"
+        weight="1">
+        <sprite>equipment/head/parsley-earplugs.xml</sprite>
+    </item>
+    <item id="1221"
+        image="equipment/head/skullmask.png"
+        name="Skull Mask"
+        description="A mask made out of bones."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="3"
+        weight="150">
+        <sprite>equipment/head/skullmask.xml</sprite>
+    </item>
+    <item id="1222"
+        image="generic/claylump_small.png"
+        name="Small Piece of Clay"
+        description="A small piece of clay, used to make different shapes."
+        type="generic"
+        weight="5"/>
+    <item id="1223"
+        image="generic/claylump_big.png"
+        name="Big Piece of White Clay"
+        description="A big piece of white clay, used to make bigger shapes."
+        type="generic"
+        weight="10"/>
+    <item id="1224"
+        image="generic/scroll.png"
+        name="Scroll of Paper"
+        description="A scroll made of fine paper."
+        type="generic"
+        weight="1"/>
+    <item id="1225"
+        image="use/scrolls/firescroll.png"
+        name="Fire Scroll"
+        description="A scroll on which is written an ancient formula giving birth to fire."
+        type="generic"
+        weight="1"/>
+    <item id="1226"
+        image="generic/silverbell.png"
+        name="Silver Bell"
+        description="A tiny bell made of silver."
+        type="generic"
+        weight="25"/>
+    <item id="1227"
+        image="equipment/charms/enchanter.png"
+        name="Enchanter's Amulet"
+        description="An amulet made for true enchanters."
+        type="equip-charm"
+        weight="1"/>
+    <item id="1228"
+        image="generic/crystal.png|W:#ba58ff,d496ff,ffffff"
+        name="Light Crystal"
+        description="A light crystal that emits an angelic aura."
+        type="generic"
+        weight="10"/>
+    <item id="1229"
+        image="use/food/caramelapple.png"
+        name="Caramel Apple"
+        description="A caramel coated apple, complete with stick. Rots teeth, tastes good."
+        type="usable"
+        hp="1000"
+        weight="5"/>
+    <item id="1230"
+        image="use/food/lollipop.png|W:#2502d6"
+        name="Booberry Blue Lollipop"
+        description="A lollipop. Mmm."
+        type="usable"
+        hp="800"
+        weight="1"/>
+    <item id="1231"
+        image="use/food/lollipop.png|W:#00ba16"
+        name="Ghastly Green Lollipop"
+        description="A lollipop. Tasty."
+        type="usable"
+        hp="800"
+        weight="1"/>
+    <item id="1232"
+        image="use/food/lollipop.png|W:#e00418"
+        name="Blood Red Lollipop"
+        description="A lollipop. Yum."
+        type="usable"
+        hp="800"
+        weight="1"/>
+    <item id="1233"
+        image="generic/fakefangs.png"
+        name="Cheap Plastic Fangs"
+        description="A costumed Dracula's must. Doesn't really suck blood."
+        type="generic"
+        weight="1"/>
+    <item id="1234"
+        image="generic/christmasbulb.png|W:#f00000"
+        name="Red Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1235"
+        image="generic/christmasbulb.png|W:#f0e000"
+        name="Yellow Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1236"
+        image="generic/christmasbulb.png|W:#00f000"
+        name="Green Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1237"
+        image="generic/christmasbulb.png|W:#00f0ee"
+        name="Aqua Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1238"
+        image="generic/christmasbulb.png|W:#0000d0"
+        name="Blue Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1239"
+        image="generic/christmasbulb.png|W:#d000ef"
+        name="Purple Christmas Ornament"
+        description="An ornament from Santa's tree."
+        type="generic"
+        weight="1"/>
+    <item id="1240"
+        image="generic/santaglobe.png"
+        name="Santa Snow Globe"
+        description="An snow globe featuring Santa."
+        type="generic"
+        weight="1"/>
+    <item id="1241"
+        image="generic/snowmanglobe.png"
+        name="Snowman Snow Globe"
+        description="An snow globe featuring a snowman."
+        type="generic"
+        weight="1"/>
+   <item id="1242"
+        image="equipment/head/snowgoggles.png"
+        name="Snow Goggles"
+        description="Snow Goggles to keep your eyeballs from freezing."
+        effect="M. Attack -2"
+        type="equip-head"
+        defense="5"
+        weight="10">
+        <sprite>equipment/head/snowgoggles.xml</sprite>
+    </item>
+
+    <!-- RESERVED -->
+
+    <item id="1244"
+        image="generic/iten.png"
+        name="Dark Talisman"
+        description="A small cube. It radiates unimaginable power, and is quite dizzying to look at."
+        effect="Unimaginable powers to a successful wielder. M. Attack +100"
+        type="equip-torso"
+        >
+        <sprite>equipment/override/skeleton.xml</sprite>
+        <particlefx>graphics/particles/wisp.particle.xml</particlefx>
+    </item>
+    <item id="1245"
+        image="generic/bent-needle.png"
+        name="Bent Needle"
+        description="A twisted needle. It would be difficult to find one in a haystack, for example."
+        effect="This item has no use."
+        type="generic"
+        weight="3"/>
+    <item id="1246"
+        image="generic/dark-easter-egg.png"
+        name="Dark Easter Egg"
+        description="A smooth chocolate easter egg."
+        effect="This item has no use."
+        type="generic"
+        weight="10"/>
+    <item id="1247"
+        image="equipment/head/heart-glasses.png"
+        name="Heart Glasses"
+        description="Heart Glasses from another universe. Decisions were different there."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="4"
+        weight="20">
+        <sprite>equipment/head/heart-glasses.xml</sprite>
+    </item>
+    <item id="1248"
+        image="use/food/blueberries.png"
+        name="Blueberries"
+        description="Near to bursting with sweet juice."
+        type="usable"
+        hp="200"
+        weight="6"/>
+    <item id="1249"
+        image="generic/strange-coin.png"
+        name="Strange Coin"
+        description="A strange coin. The markings on it are unlike anything you have ever seen before."
+        effect="This item has no use."
+        type="generic"
+        weight="3"/>
+    <item id="1250"
+        image="use/food/pear.png"
+        name="Pear"
+        description="Juicy, crunchy, and delicious."
+        type="usable"
+        hp="150"
+        weight="7"/>
+    <item id="1251"
+        image="use/food/yellow-plum.png"
+        name="Yellow Plum"
+        description="A yellow variety of plum that is both sweet and sour."
+        type="usable"
+        hp="100"
+        weight="10"/>
+    <item id="1252"
+        image="use/food/cherry.png"
+        name="Cherry"
+        description="A small but delectable cherry."
+        type="usable"
+        hp="50"
+        weight="5"/>
+    <item id="1253"
+        image="use/food/apple.png|R:#b3ab77;Y:#ffc030;G:#66cc33"
+        name="Golden Delicious Apple"
+        description="A golden apple. Taken from a tree of many fruits from a distant world."
+        type="usable"
+        hp="200"
+        weight="30"/>
+    <item id="1254"
+        image="generic/dark-petal.png"
+        name="Dark Petal"
+        description="A single, dark, petal, oddly heavy. The edges of the petal are unusually hard, and have a slightly reflective shine to them. But looking into the gleam, you can only see fire..."
+        effect="A ticket between worlds. If you should find yourself transported by one, be sure not to lose it, lest you become trapped indefinitely. This item cannot be used directly."
+        type="generic"
+        weight="250"/>
+    <item id="1255"
+        image="equipment/head/rabbit-ears.png|W:#ffffff"
+        name="White Rabbit Ears"
+        description="A headband with rabbit ears, pure white."
+        effect="M. Attack +4"
+        defense="5"
+        type="equip-head"
+        weight="20">
+        <sprite>equipment/head/rabbit-ears.xml|#ffffff</sprite>
+    </item>
+    <item id="1256"
+        image="equipment/head/eggshell-hat.png"
+        name="Eggshell Hat"
+        description="A novelty hat shaped like an eggshell half."
+        type="equip-head"
+        defense="12"
+        agi="-1"
+        weight="15">
+        <sprite>equipment/head/eggshell.xml</sprite>
+    </item>
+    <item id="1257"
+        image="generic/flawed-lens.png"
+        name="Flawed Lens"
+        description="A failed attempt at making a lens with powerful properties. Perhaps, one day, you will be able to salvage the remains from this effort."
+        effect="This item has no use."
+        type="generic"
+        weight="3"/>
+    <item id="1258"
+        image="use/food/honey.png"
+        name="Honey"
+        description="A sweet food made by certain insects using nectar from flowers."
+        type="usable"
+        hp="100"
+        weight="20"/>
+    <item id="1276"
+        image="equipment/head/opera-mask.png"
+        name="Opera Mask"
+        description="Pale and broken. There is surely a story to be told here."
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/operamask.xml</sprite>
+     </item>
+     <item id="1277"
+        image="equipment/head/jestermask.png"
+        name="Jester Mask"
+        description="Laughter with bells on."
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/jestermask.xml</sprite>
+     </item>
+     <item id="1278"
+        image="equipment/head/witch-hat.png"
+        name="Witch Hat"
+        description="Big, dark, and pointy. It looks a bit out of place."
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/witch-hat.xml</sprite>
+     </item>
+     <item id="1279"
+        image="equipment/head/goblin-mask.png"
+        name="Goblin Mask"
+        description="A strange dark mask. Who knows what lurks behind it?"
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/goblin-mask.xml</sprite>
+     </item>
+     <item id="1280"
+        image="generic/scissors.png"
+        name="Scissors"
+        description="A pair of awkward and unwieldy scissors."
+        effect="A dangerous barber."
+        type="usable"
+        weight="120"/>
+     <item id="1281"
+        image="use/food/shock-candy.png"
+        name="Shock Sweet"
+        description="It'll turn your hair white!"
+        type="usable"
+        weight="5"/>
+     <item id="1282"
+        image="equipment/ammo/bonedarts.png"
+        name="Bone Arrows"
+        description="Arrows made from bone. Not much different from the normal variety, but are much lighter."
+        effect="Damage +55"
+        type="equip-ammo"
+        weight="0"/>
+
+    <!-- The 2XXY IDs are used for recolored items on eAthena.
+        XX = item
+        Y = color variant
+        XXY = viewID
+
+        On the new server recolorable items should use the same item number
+        (as long as they are functionally identical while the color is sent as
+        an additional item property.
+    -->
+
+    <item id="2050"
+        image="equipment/chest/cottonshirt.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Shirt"
+        description="A red shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2051"
+        image="equipment/chest/cottonshirt.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Shirt"
+        description="A green shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2052"
+        image="equipment/chest/cottonshirt.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Shirt"
+        description="A dark blue shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2053"
+        image="equipment/chest/cottonshirt.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Shirt"
+        description="A yellow shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2054"
+        image="equipment/chest/cottonshirt.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Shirt"
+        description="A light blue shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2055"
+        image="equipment/chest/cottonshirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Shirt"
+        description="A pink shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2056"
+        image="equipment/chest/cottonshirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Shirt"
+        description="A black shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2057"
+        image="equipment/chest/cottonshirt.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Shirt"
+        description="An orange shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2058"
+        image="equipment/chest/cottonshirt.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Shirt"
+        description="A purple shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2059"
+        image="equipment/chest/cottonshirt.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Shirt"
+        description="A dark green shirt made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/chest/cotton-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/cotton-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2060"
+        image="equipment/chest/vnecksweater.png|W:#580000,a40000,c02020,ff6060"
+        name="Red V-Neck Sweater"
+        description="A thin, soft and warm red sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2061"
+        image="equipment/chest/vnecksweater.png|W:#115511,22aa22,99dd99"
+        name="Green V-Neck Sweater"
+        description="A thin, soft and warm green sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2062"
+        image="equipment/chest/vnecksweater.png|W:#222255,6666ff"
+        name="Dark Blue V-Neck Sweater"
+        description="A thin, soft and warm dark blue sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2063"
+        image="equipment/chest/vnecksweater.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow V-Neck Sweater"
+        description="A thin, soft and warm yellow sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2064"
+        image="equipment/chest/vnecksweater.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue V-Neck Sweater"
+        description="A thin, soft and warm light blue sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2065"
+        image="equipment/chest/vnecksweater.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink V-Neck Sweater"
+        description="A thin, soft and warm pink sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2066"
+        image="equipment/chest/vnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black V-Neck Sweater"
+        description="A thin, soft and warm black sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2067"
+        image="equipment/chest/vnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange V-Neck Sweater"
+        description="A thin, soft and warm orange sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2068"
+        image="equipment/chest/vnecksweater.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple V-Neck Sweater"
+        description="A thin, soft and warm purple sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2069"
+        image="equipment/chest/vnecksweater.png|W:#104010,208020,30c030"
+        name="Dark Green V-Neck Sweater"
+        description="A thin, soft and warm dark green sweater."
+        effect="M. Attack -16"
+        type="equip-torso"
+        defense="8"
+        weight="35">
+        <sprite gender="male">equipment/chest/vnecksweater-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/vnecksweater-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2070"
+        image="equipment/chest/tnecksweater.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Turtleneck Sweater"
+        description="A thick, soft and warm red sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2071"
+        image="equipment/chest/tnecksweater.png|W:#115511,22aa22,99dd99"
+        name="Green Turtleneck Sweater"
+        description="A thick, soft and warm green sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2072"
+        image="equipment/chest/tnecksweater.png|W:#222255,6666ff"
+        name="Dark Blue Turtleneck Sweater"
+        description="A thick, soft and warm dark blue sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2073"
+        image="equipment/chest/tnecksweater.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Turtleneck Sweater"
+        description="A thick, soft and warm yellow sweater."
+        type="equip-torso"
+        effect="M. Attack -12"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2074"
+        image="equipment/chest/tnecksweater.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Turtleneck Sweater"
+        description="A thick, soft and warm light blue sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2075"
+        image="equipment/chest/tnecksweater.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Turtleneck Sweater"
+        description="A thick, soft and warm pink sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2076"
+        image="equipment/chest/tnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Turtleneck Sweater"
+        description="A thick, soft and warm black sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2077"
+        image="equipment/chest/tnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Turtleneck Sweater"
+        description="A thick, soft and warm orange sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2078"
+        image="equipment/chest/tnecksweater.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Turtleneck Sweater"
+        description="A thick, soft and warm purple sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2079"
+        image="equipment/chest/tnecksweater.png|W:#104010,208020,30c030"
+        name="Dark Green Turtleneck Sweater"
+        description="A thick, soft and warm dark green sweater."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/tnecksweater-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/tnecksweater-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2080"
+        image="equipment/chest/silk-robe.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Silk Robe"
+        description="A light and shimmering red silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2081"
+        image="equipment/chest/silk-robe.png|W:#115511,22aa22,99dd99"
+        name="Green Silk Robe"
+        description="A light and shimmering green silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2082"
+        image="equipment/chest/silk-robe.png|W:#222255,6666ff"
+        name="Dark Blue Silk Robe"
+        description="A light and shimmering dark blue silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2083"
+        image="equipment/chest/silk-robe.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Silk Robe"
+        description="A light and shimmering yellow silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2084"
+        image="equipment/chest/silk-robe.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Silk Robe"
+        description="A light and shimmering light blue silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2085"
+        image="equipment/chest/silk-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Silk Robe"
+        description="A light and shimmering pink silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2086"
+        image="equipment/chest/silk-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Silk Robe"
+        description="A light and shimmering black silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2087"
+        image="equipment/chest/silk-robe.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Silk Robe"
+        description="A light and shimmering orange silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2088"
+        image="equipment/chest/silk-robe.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Silk Robe"
+        description="A light and shimmering purple silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2089"
+        image="equipment/chest/silk-robe.png|W:#104010,208020,30c030"
+        name="Dark Green Silk Robe"
+        description="A light and shimmering dark green silk robe."
+        type="equip-torso"
+        defense="5"
+        weight="30">
+        <sprite gender="male">equipment/chest/robe-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2090"
+        image="equipment/chest/tanktop.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Tank Top"
+        description="A red sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2091"
+        image="equipment/chest/tanktop.png|W:#115511,22aa22,99dd99"
+        name="Green Tank Top"
+        description="A green sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2092"
+        image="equipment/chest/tanktop.png|W:#222255,6666ff"
+        name="Dark Blue Tank Top"
+        description="A dark blue sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2093"
+        image="equipment/chest/tanktop.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Tank Top"
+        description="A yellow sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2094" image="equipment/chest/tanktop.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Tank Top"
+        description="A light blue sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2095" image="equipment/chest/tanktop.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Tank Top"
+        description="A pink sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2096"
+        image="equipment/chest/tanktop.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Tank Top"
+        description="A black sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2097"
+        image="equipment/chest/tanktop.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Tank Top"
+        description="An orange sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2098" image="equipment/chest/tanktop.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Tank Top"
+        description="A purple sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2099"
+        image="equipment/chest/tanktop.png|W:#104010,208020,30c030"
+        name="Dark Green Tank Top"
+        description="A dark green sleeveless shirt for hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="12">
+        <sprite gender="male">equipment/chest/tanktop-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/tanktop-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2100"
+        image="equipment/legs/skirt.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Skirt"
+        description="A red skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2101"
+        image="equipment/legs/skirt.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Skirt"
+        description="A green skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+      <sprite>equipment/legs/skirt.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2102"
+        image="equipment/legs/skirt.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Skirt"
+        description="A dark blue skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2103"
+        image="equipment/legs/skirt.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Skirt"
+        description="A yellow skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2104"
+        image="equipment/legs/skirt.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Skirt"
+        description="A light blue skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2105"
+        image="equipment/legs/skirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Skirt"
+        description="A pink skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2106"
+        image="equipment/legs/skirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Skirt"
+        description="A black skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2107"
+        image="equipment/legs/skirt.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Skirt"
+        description="An orange skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2108"
+        image="equipment/legs/skirt.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Skirt"
+        description="A purple skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2109"
+        image="equipment/legs/skirt.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Skirt"
+        description="A dark green skirt made of linen cloth."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="20">
+        <sprite>equipment/legs/skirt.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2110"
+        image="equipment/legs/shorts.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Shorts"
+        description="Red shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2111"
+        image="equipment/legs/shorts.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Shorts"
+        description="Green shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2112"
+        image="equipment/legs/shorts.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Shorts"
+        description="Dark blue shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2113"
+        image="equipment/legs/shorts.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Shorts"
+        description="Yellow shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2114"
+        image="equipment/legs/shorts.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Shorts"
+        description="Light blue shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2115"
+        image="equipment/legs/shorts.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Shorts"
+        description="Pink shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2116"
+        image="equipment/legs/shorts.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Shorts"
+        description="Black shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2117"
+        image="equipment/legs/shorts.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Shorts"
+        description="Orange shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2118"
+        image="equipment/legs/shorts.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Shorts"
+        description="Purple shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#520a7b,8c23c7,ca87ef</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#520a7b,8c23c7,ca87ef</sprite>
+    </item>
+    <item id="2119"
+        image="equipment/legs/shorts.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Shorts"
+        description="Dark green shorts made of 100% cotton."
+        effect="M. Attack -4"
+        type="equip-legs"
+        defense="2"
+        weight="20">
+        <sprite gender="male">equipment/legs/shorts-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/legs/shorts-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2120"
+        image="equipment/chest/tanktop-short.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Short Tank Top"
+        description="A short, sleeveless red shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2121"
+        image="equipment/chest/tanktop-short.png|W:#115511,22aa22,99dd99"
+        name="Green Short Tank Top"
+        description="A short, sleeveless green shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2122"
+        image="equipment/chest/tanktop-short.png|W:#222255,6666ff"
+        name="Dark Blue Short Tank Top"
+        description="A short, sleeveless dark blue shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2123"
+        image="equipment/chest/tanktop-short.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Short Tank Top"
+        description="A short, sleeveless yellow shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2124"
+        image="equipment/chest/tanktop-short.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Short Tank Top"
+        description="A short, sleeveless light blue shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2125"
+        image="equipment/chest/tanktop-short.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Short Tank Top"
+        description="A short, sleeveless pink shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2126"
+        image="equipment/chest/tanktop-short.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Short Tank Top"
+        description="A short, sleeveless black shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2127"
+        image="equipment/chest/tanktop-short.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Short Tank Top"
+        description="A short, sleeveless orange shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2128" image="equipment/chest/tanktop-short.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Short Tank Top"
+        description="A short, sleeveless purple shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2129"
+        image="equipment/chest/tanktop-short.png|W:#104010,208020,30c030"
+        name="Dark Green Short Tank Top"
+        description="A short, sleeveless dark green shirt for VERY hot summer days."
+        effect="M. Attack -4"
+        type="equip-torso"
+        defense="2"
+        weight="8">
+        <sprite gender="male">equipment/chest/shorttanktop-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/shorttanktop-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2130"
+        image="equipment/head/deserthat.png|R:#580000,a40000,c02020,ff6060"
+        name="Red Desert Hat"
+        description="While the red desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2131"
+        image="equipment/head/deserthat.png|R:#115511,22aa22,99dd99"
+        name="Green Desert Hat"
+        description="While the green desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2132"
+        image="equipment/head/deserthat.png|R:#222255,6666ff"
+        name="Dark Blue Desert Hat"
+        description="While the dark blue desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2133"
+        image="equipment/head/deserthat.png|R:#846211,dab333,fffb93,ffffff"
+        name="Yellow Desert Hat"
+        description="While the yellow desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2134"
+        image="equipment/head/deserthat.png|R:#16486e,498ec5,e4f2fc"
+        name="Light Blue Desert Hat"
+        description="While the light blue desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2135"
+        image="equipment/head/deserthat.png|R:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Desert Hat"
+        description="While the pink desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2136"
+        image="equipment/head/deserthat.png|R:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Desert Hat"
+        description="While the black desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2137"
+        image="equipment/head/deserthat.png|R:#80280f,b04810,ef681f,ffb830"
+        name="Orange Desert Hat"
+        description="While the orange desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2138"
+        image="equipment/head/deserthat.png|R:#4f0a76,8010c0,d699f7"
+        name="Purple Desert Hat"
+        description="While the purple desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2139"
+        image="equipment/head/deserthat.png|R:#104010,208020,30c030"
+        name="Dark Green Desert Hat"
+        description="While the dark green desert hat is perfect for sand storms, it won't help you much against a blow to the head."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="3"
+        weight="20">
+        <sprite>equipment/head/deserthat.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2140"
+        image="equipment/head/standardheadband.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Headband"
+        description="Just a red cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2141"
+        image="equipment/head/standardheadband.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Headband"
+        description="Just a green cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2142"
+        image="equipment/head/standardheadband.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Headband"
+        description="Just a dark blue cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2143"
+        image="equipment/head/standardheadband.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Headband"
+        description="Just a yellow cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2144"
+        image="equipment/head/standardheadband.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Headband"
+        description="Just a light blue cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2145"
+        image="equipment/head/standardheadband.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Headband"
+        description="Just a pink cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2146"
+        image="equipment/head/standardheadband.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Headband"
+        description="Just a black cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2147"
+        image="equipment/head/standardheadband.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Headband"
+        description="Just an orange cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2148"
+        image="equipment/head/standardheadband.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Headband"
+        description="Just a purple cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2149"
+        image="equipment/head/standardheadband.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Headband"
+        description="Just a dark green cotton headband."
+        type="equip-head"
+        defense="2"
+        weight="5">
+        <sprite>equipment/head/standardheadband.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2150"
+        image="equipment/feet/boots.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Boots"
+        description="A red pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2151"
+        image="equipment/feet/boots.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Boots"
+        description="A green pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2152"
+        image="equipment/feet/boots.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Boots"
+        description="A dark blue pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2153"
+        image="equipment/feet/boots.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Boots"
+        description="A yellow pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2154"
+        image="equipment/feet/boots.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Boots"
+        description="A light blue pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2155"
+        image="equipment/feet/boots.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Boots"
+        description="A pink pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2156"
+        image="equipment/feet/boots.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Boots"
+        description="A black pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2157"
+        image="equipment/feet/boots.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Boots"
+        description="An orange pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2158"
+        image="equipment/feet/boots.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Boots"
+        description="A purple pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2159"
+        image="equipment/feet/boots.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Boots"
+        description="A dark green pair of quality cotton boots."
+        effect="M. Attack +1"
+        type="equip-feet"
+        defense="1"
+        weight="30">
+        <sprite gender="male">equipment/feet/boots-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/feet/boots-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2160"
+        image="equipment/hands/basicgloves.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Gloves"
+        description="A red pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2161"
+        image="equipment/hands/basicgloves.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Gloves"
+        description="A green pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2162"
+        image="equipment/hands/basicgloves.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Gloves"
+        description="A dark blue pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2163"
+        image="equipment/hands/basicgloves.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Gloves"
+        description="A yellow pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2164"
+        image="equipment/hands/basicgloves.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Gloves"
+        description="A light blue pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2165"
+        image="equipment/hands/basicgloves.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Gloves"
+        description="A pink pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2166"
+        image="equipment/hands/basicgloves.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Gloves"
+        description="A black pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2167"
+        image="equipment/hands/basicgloves.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Gloves"
+        description="An orange pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2168"
+        image="equipment/hands/basicgloves.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Gloves"
+        description="A purple pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2169"
+        image="equipment/hands/basicgloves.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Gloves"
+        description="A dark green pair of comfy cotton gloves."
+        effect="M. Attack -10"
+        type="equip-arms"
+        defense="1"
+        weight="20">
+        <sprite gender="male">equipment/hands/generic-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2170"
+        image="equipment/legs/miniskirt.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Miniskirt"
+        description="A red short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2171"
+        image="equipment/legs/miniskirt.png|W:#115511,22aa22,99dd99"
+        name="Green Miniskirt"
+        description="A green short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2172"
+        image="equipment/legs/miniskirt.png|W:#222255,6666ff"
+        name="Dark Blue Miniskirt"
+        description="A dark blue short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2173"
+        image="equipment/legs/miniskirt.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Miniskirt"
+        description="A yellow short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2174"
+        image="equipment/legs/miniskirt.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Miniskirt"
+        description="A light blue short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2175"
+        image="equipment/legs/miniskirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+       name="Pink Miniskirt"
+        description="A pink short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2176"
+        image="equipment/legs/miniskirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Miniskirt"
+        description="A black short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2177"
+        image="equipment/legs/miniskirt.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Miniskirt"
+        description="An orange short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2178"
+        image="equipment/legs/miniskirt.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Miniskirt"
+        description="A purple short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2179"
+        image="equipment/legs/miniskirt.png|W:#104010,208020,30c030"
+        name="Dark Green Miniskirt"
+        description="A dark green short skirt for hot summer days."
+        effect="M. Attack -8"
+        type="equip-legs"
+        defense="4"
+        weight="8">
+        <sprite gender="male">equipment/legs/miniskirt-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/legs/miniskirt-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <!-- IDs 2180 to 2189 RESERVED -->
+
+    <item id="2190"
+        image="equipment/head/rabbit-ears.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Rabbit Ears"
+        description="A headband with rabbit ears, bright red."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2191"
+        image="equipment/head/rabbit-ears.png|W:#115511,22aa22,99dd99"
+        name="Green Rabbit Ears"
+        description="A headband with rabbit ears, warm green."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2192"
+        image="equipment/head/rabbit-ears.png|W:#222255,6666ff"
+        name="Dark Blue Rabbit Ears"
+        description="A headband with rabbit ears, iridescent dark blue."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2193"
+        image="equipment/head/rabbit-ears.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Rabbit Ears"
+        description="A headband with rabbit ears, soft yellow."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2194"
+        image="equipment/head/rabbit-ears.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Rabbit Ears"
+        description="A headband with rabbit ears, light blue."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2195"
+        image="equipment/head/rabbit-ears.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Rabbit Ears"
+        description="A headband with rabbit ears, bright pink."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2196"
+        image="equipment/head/rabbit-ears.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black rabbit ears"
+        description="A headband with rabbit ears, deep black."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2197"
+        image="equipment/head/rabbit-ears.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Rabbit Ears"
+        description="A headband with rabbit ears, bright orange."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2198"
+        image="equipment/head/rabbit-ears.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Rabbit Ears"
+        description="A headband with rabbit ears, strong purple."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2199"
+        image="equipment/head/rabbit-ears.png|W:#104010,208020,30c030"
+        name="Dark Green Rabbit Ears"
+        description="A headband with rabbit ears, dark green."
+        effect="M. Attack +4"
+        type="equip-head"
+        defense="5"
+        weight="15">
+        <sprite>equipment/head/rabbit-ears.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2200"
+        image="equipment/head/wizard-hat.png|W:#580000,a40000,c02020,ff6060"
+        name="Red wizard hat"
+        description="A wizard hat, bright red."
+        effect="M. Attack +5"
+        type="equip-head"
+        defense="5"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2201"
+        image="equipment/head/wizard-hat.png|W:#115511,22aa22,99dd99"
+        name="Green Wizard Hat"
+        description="A wizard hat, warm green."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2202"
+        image="equipment/head/wizard-hat.png|W:#222255,6666ff"
+        name="Dark Blue Wizard Hat"
+        description="A wizard hat, iridescent dark blue."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2203"
+        image="equipment/head/wizard-hat.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Wizard Hat"
+        description="A wizard hat, soft yellow."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2204"
+        image="equipment/head/wizard-hat.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Wizard Hat"
+        description="A wizard hat, light blue."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2205"
+        image="equipment/head/wizard-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Wizard Hat"
+        description="A wizard hat, bright pink."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2206"
+        image="equipment/head/wizard-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Wizard Hat"
+        description="A wizard hat, deep black."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2207"
+        image="equipment/head/wizard-hat.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Wizard Hat"
+        description="A wizard hat, bright orange."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2208"
+        image="equipment/head/wizard-hat.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Wizard Hat"
+        description="A wizard hat, strong purple."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2209"
+        image="equipment/head/wizard-hat.png|W:#104010,208020,30c030"
+        name="Dark Green Wizard Hat"
+        description="A wizard hat, dark green."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2210"
+        image="equipment/head/bowler-hat.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Bowler Hat"
+        description="A hat for those with a bit of class, with a red band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2211"
+        image="equipment/head/bowler-hat.png|W:#115511,22aa22,99dd99"
+        name="Green Bowler Hat"
+        description="A hat for those with a bit of class, with a green band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2212"
+        image="equipment/head/bowler-hat.png|W:#222255,6666ff"
+        name="Dark Blue Bowler Hat"
+        description="A hat for those with a bit of class, with a dark blue band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2213"
+        image="equipment/head/bowler-hat.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Bowler Hat"
+        description="A hat for those with a bit of class, with a yellow band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2214"
+        image="equipment/head/bowler-hat.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Bowler Hat"
+        description="A hat for those with a bit of class, with a light blue band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2215"
+        image="equipment/head/bowler-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Bowler Hat"
+        description="A hat for those with a bit of class, with a pink band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2216"
+        image="equipment/head/bowler-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Bowler Hat"
+        description="A hat for those with a bit of class, with a black band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2217"
+        image="equipment/head/bowler-hat.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Bowler Hat"
+        description="A hat for those with a bit of class, with an orange band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2218"
+        image="equipment/head/bowler-hat.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Bowler Hat"
+        description="A hat for those with a bit of class, with a purple band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2219"
+        image="equipment/head/bowler-hat.png|W:#104010,208020,30c030"
+        name="Dark Green Bowler Hat"
+        description="A hat for those with a bit of class, with a dark green band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2220"
+        image="equipment/chest/sorcerer-robe.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Sorcerer Robe (Red)"
+        description="A red lined red sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2221"
+        image="equipment/chest/sorcerer-robe.png|W:#115511,22aa22,99dd99"
+        name="Green Sorcerer Robe (Red)"
+        description="A red lined green sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2222"
+        image="equipment/chest/sorcerer-robe.png|W:#222255,6666ff"
+        name="Dark Blue Sorcerer Robe (Red)"
+        description="A red lined dark blue sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2223"
+        image="equipment/chest/sorcerer-robe.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Sorcerer Robe (Red)"
+        description="A red lined yellow sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2224"
+        image="equipment/chest/sorcerer-robe.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Sorcerer Robe (Red)"
+        description="A red lined light blue sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2225"
+        image="equipment/chest/sorcerer-robe.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Sorcerer Robe (Red)"
+        description="A red lined pink sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2226"
+        image="equipment/chest/sorcerer-robe.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Sorcerer Robe (Red)"
+        description="A red lined black sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2227"
+        image="equipment/chest/sorcerer-robe.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Sorcerer Robe (Red)"
+        description="A red lined orange sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2228"
+        image="equipment/chest/sorcerer-robe.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Sorcerer Robe (Red)"
+        description="A red lined purple sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2229"
+        image="equipment/chest/sorcerer-robe.png|W:#104010,208020,30c030"
+        name="Dark Green Sorcerer Robe (Red)"
+        description="A red lined dark green sorcerer robe."
+        effect="M. Attack +20"
+        type="equip-torso"
+        defense="5"
+        agi="1"
+        weight="30">
+        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="2230"
+        image="equipment/head/bowler-hat-brown.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a red band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2231"
+        image="equipment/head/bowler-hat-brown.png|W:#115511,22aa22,99dd99"
+        name="Green Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a green band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2232"
+        image="equipment/head/bowler-hat-brown.png|W:#222255,6666ff"
+        name="Dark Blue Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a dark blue band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2233"
+        image="equipment/head/bowler-hat-brown.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a yellow band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2234"
+        image="equipment/head/bowler-hat-brown.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a light blue band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2235"
+        image="equipment/head/bowler-hat-brown.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a pink band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2236"
+        image="equipment/head/bowler-hat-brown.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a black band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2237"
+        image="equipment/head/bowler-hat-brown.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with an orange band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2238"
+        image="equipment/head/bowler-hat-brown.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a purple band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2239"
+        image="equipment/head/bowler-hat-brown.png|W:#104010,208020,30c030"
+        name="Dark Green Bowler Hat (Brown)"
+        description="A hat for those with a bit of class, with a dark green band."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat-brown.xml|#104010,208020,30c030</sprite>
+    </item>
+
+    <item id="3000"
+        image="generic/jackolantern.png"
+        name="Jack O Lantern"
+        description="A pumpkin that has been carved into a super-scary face for Hallowe'en."
+        type="generic"
+        weight="1000"/>
+    <item id="3001"
+        image="generic/rubberbat.png"
+        name="Rubber Bat"
+        description="Squeaks when you squeeze it."
+        type="generic"
+        weight="30"/>
+    <item id="3002"
+        image="generic/realisticbrain.png"
+        name="Realistic Brain"
+        description="This brain sure is realistic."
+        type="generic"
+        weight="50"/>
+    <item id="3003"
+        image="generic/jarofblood.png"
+        name="Jar of Blood"
+        description="Just the thing to scare the kids at Hallowe'en."
+        type="generic"
+        weight="375"/>
+    <item id="3004"
+        image="generic/tongue.png"
+        name="Tongue"
+        description="A horrible, slimy tongue."
+        type="generic"
+        weight="5"/>
+    <item id="3006"
+        image="use/food/tonoridelight.png"
+        name="Tonori Delight"
+        description="A softly-scented jelly-like treat, dusted with the sweet white sands of Eastern Tonori."
+        type="generic"
+        weight="2"/>
+    <item id="3007"
+        image="use/food/marshmallow.png"
+        name="Marshmallow"
+        description="Flavoured with real marshmallow root."
+        type="generic"
+        weight="2"/>
+    <item id="3009"
+        image="use/food/jellyskull.png"
+        name="Jelly Skull"
+        description="Like a jelly bean, but in the shape of skull."
+        type="generic"
+        weight="2"/>
+    <item id="3010"
+        image="use/food/candypumpkin.png"
+        name="Candy Pumpkin"
+        description="With a squishy interior inside a hard, crunchy shell, this sweet has a warm and delcious pumpkin flavour."
+        type="generic"
+        weight="2"/>
+    <item id="3011"
+        image="generic/pumpkinseed.png"
+        name="Pumpkin Seeds"
+        description="The seeds from a seasonal pumpkin vine."
+        type="generic"
+        weight="1"/>
+    <item id="4000"
+        image="generic/scorpionstinger.png|W:#800000,ffffff"
+        name="Angry Scorpion Stinger"
+        description="An angry scorpion stinger."
+        type="generic"
+        weight="1"/>
+    <item id="4001"
+        image="generic/coal.png"
+        name="Coal"
+        description="A lump of coal."
+        type="generic"
+        weight="20"/>
+    <item id="4002"
+        image="generic/gemstone-b.png"
+        name="Diamond"
+        description="A raw diamond gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4003"
+        image="generic/gemstone-b.png|W:#580000,a40000,c02020,ff6060"
+        name="Ruby"
+        description="A raw ruby gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4004"
+        image="generic/gemstone-b.png|W:#1f9c1f,89d689"
+        name="Emerald"
+        description="A raw emerald gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4005"
+        image="generic/gemstone-b.png|W:#4b4bbd,888af4"
+        name="Sapphire"
+        description="A raw sapphire gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4006"
+        image="generic/gemstone-b.png|W:#ccb534,f1ea8e,ffffaa"
+        name="Topaz"
+        description="A raw topaz gemstone."
+        type="generic"
+        weight="20"/>
+    <item id="4007"
+        image="generic/gemstone-b.png|W:#530a7c,b362e1,ca87ef"
+        name="Amethyst"
+        description="A raw amethyst gemstone."
+        type="generic"
+        weight="10"/>
+    <item id="4008"
+        image="equipment/rings/gem.png"
+        name="Diamond Ring"
+        description="A diamond ring."
+        type="equip-ring"
+        vit="1"
+        weight="1"/>
+    <item id="4009"
+        image="equipment/rings/gem.png|W:#580000,a40000,c02020,ff6060"
+        name="Ruby Ring"
+        description="A ruby ring."
+        type="equip-ring"
+        str="1"
+        weight="1"/>
+    <item id="4010"
+        image="equipment/rings/gem.png|W:#1f9c1f,89d689"
+        name="Emerald Ring"
+        description="An emerald ring."
+        type="equip-ring"
+        luck="1"
+        weight="1"/>
+    <item id="4011"
+        image="equipment/rings/gem.png|W:#4b4bbd,888af4"
+        name="Sapphire Ring"
+        description="A sapphire ring."
+        type="equip-ring"
+        int="1"
+        weight="1"/>
+    <item id="4012"
+        image="equipment/rings/gem.png|W:#ccb534,f1ea8e,ffffaa"
+        name="Topaz Ring"
+        description="A topaz ring."
+        type="equip-ring"
+        agi="1"
+        weight="1"/>
+    <item id="4013"
+        image="equipment/rings/gem.png|W:#530a7c,b362e1,ca87ef"
+        name="Amethyst Ring"
+        description="An amethyst ring."
+        type="equip-ring"
+        dex="1"
+        weight="1"/>
+    <item id="4014"
+        image="equipment/rings/simple.png"
+        name="Simple Ring"
+        description="A simple ring."
+        type="equip-ring"
+        weight="1"/>
+    <item id="4015"
+        image="generic/ingot.png"
+        name="Iron Ingot"
+        description="An ingot of iron."
+        type="generic"
+        weight="200"/>
+    <item id="4016"
+        image="generic/bandit-hood.png"
+        name="Bandit Hood"
+        description="A bandit hood crawling with lice."
+        type="generic"
+        weight="50"/>
+    <item id="4017"
+        image="generic/powder.png|W:#c00000"
+        name="Red Powder"
+        description="A pile of magical red powder."
+        type="generic"
+        weight="3"/>
+     <item id="4018"
+        image="generic/powder.png|W:#ffcc00"
+        name="Yellow Powder"
+        description="A pile of magical yellow powder."
+        type="generic"
+        weight="3"/>
+     <item id="4019"
+        image="generic/powder.png|W:#003399"
+        name="Blue Powder"
+        description="A pile of magical blue powder."
+        type="generic"
+        weight="3"/>
+    <item id="4020"
+        image="equipment/head/candlehelmet.png"
+        name="Candle Helmet"
+        description="Worn by spelunkers."
+        effect="M. Attack -25"
+        type="equip-head"
+        defense="16"
+        int="1"
+        agi="-1"
+        weight="450">
+        <sprite>equipment/head/candlehelmet.xml</sprite>
+    </item>
+    <item id="4021"
+        image="generic/yellowpresentbox.png"
+        name="Yellow Present Box"
+        description="Something mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="4022"
+        image="generic/whitepresentbox.png"
+        name="White Present Box"
+        description="Something very mysterious inside."
+        type="generic"
+        weight="10"/>
+    <item id="4023"
+        image="generic/animal-bones.png"
+        name="Animal Bones"
+        description="Bones from an animal."
+        type="generic"
+        weight="1"/>
+    <item id="4024"
+        image="generic/frozen-yeti-tear.png"
+        name="Frozen Yeti Tear"
+        description="A tear from a yeti, frozen."
+        type="generic"
+        weight="1"/>
+    <item id="4025"
+        image="generic/yeti-claw.png"
+        name="Yeti Claw"
+        description="A claw broken off from a yeti."
+        type="generic"
+        weight="1"/>
+    <item id="4026"
+        image="generic/ice-cube.png"
+        name="Ice Cube"
+        description="A very cold ice cube that never seems to completely melt."
+        type="generic"
+        weight="1"/>
+    <item id="4027"
+        image="equipment/head/yeti-mask.png"
+        name="Yeti Mask"
+        description="A mask made from the yeti's head."
+        effect="M. Attack -10"
+        type="equip-head"
+        defense="4"
+        weight="10">
+        <sprite>equipment/head/yeti-mask.xml</sprite>
+    </item>
+    <item id="4028"
+        image="equipment/head/wizard-hat.png"
+        name="Wizard Hat"
+        description="A simple wizard hat."
+        effect="M. Attack +5"
+        defense="5"
+        type="equip-head"
+        int="3"
+        weight="15">
+        <sprite>equipment/head/wizard-hat.xml</sprite>
+    </item>
+	<item id="4029"
+        image="use/potions/e.png|G:#bb0000;R:#ff0000;"
+        name="Grimace of Dementia"
+        description="A feared potion. If done wrong... what did you say?"
+        type="generic"
+        weight="50"/>
+    <item id="4030"
+        image="equipment/head/bowler-hat.png"
+        name="Bowler Hat"
+        description="A hat for those with a bit of class."
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="10"
+        weight="30">
+        <sprite>equipment/head/bowler-hat.xml</sprite>
+    </item>
+    <item id="4031"
+        image="equipment/head/monocle.png"
+        name="Monocle"
+        description="A handy perception tool, even when not at the opera."
+        effect="Critical Damage +20"
+        type="equip-head"
+        defense="2"
+        dex="1"
+        luck="1"
+        weight="20">
+        <sprite>equipment/head/monocle.xml</sprite>
+    </item>
+</items>
diff --git a/data_template/logs/activity.log b/data_template/logs/activity.log
new file mode 100644
index 0000000..e69de29
diff --git a/data_template/logs/sale.log b/data_template/logs/sale.log
new file mode 100644
index 0000000..e69de29
diff --git a/data_template/sale.xml b/data_template/sale.xml
new file mode 100644
index 0000000..872fd3d
--- /dev/null
+++ b/data_template/sale.xml
@@ -0,0 +1 @@
+<items/>
diff --git a/data_template/user.xml b/data_template/user.xml
new file mode 100644
index 0000000..7646199
--- /dev/null
+++ b/data_template/user.xml
@@ -0,0 +1 @@
+<users/>
-- 
cgit v1.2.3-70-g09d2


From eac0a33f4862ebdff5ac8e00fb819dbe34422597 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Tue, 23 Aug 2011 21:18:58 +0100
Subject: Move inventory check to player.py and remove prettyprintxml()

having looked at the output this produces on the server, it looks terrible.
For some reason it's adding millions of spaces, not sure if the same thing
was happening on my computer.
---
 main.py   | 30 ++++++------------------------
 player.py | 26 ++++++++++++++++++++++++++
 tradey.py | 13 ++++---------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/main.py b/main.py
index 88fe85f..9307031 100755
--- a/main.py
+++ b/main.py
@@ -793,30 +793,12 @@ def main():
                     ItemDB.getItem(player_node.inventory[item].itemId).name, \
                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
 
-                # Check the inventory state and the amount of money match the information saved.
-                test_node = player_node.inventory.copy()
-                for elem in sale_tree.root:
-                    item_found = False
-                    for item in test_node:
-                        if int(elem.get('itemId')) == test_node[item].itemId \
-                        and int(elem.get('amount')) <= test_node[item].amount:
-                            test_node[item].amount -= int(elem.get('amount'))
-                            if test_node[item].amount == 0:
-                                del test_node[item]
-                            item_found = True
-                            break
-
-                    if not item_found:
-                        logging.info("Server and client inventory out of sync.")
-                        exit(0)
-
-                total_money = 0
-                for user in user_tree.root:     
-                    total_money += int(user.get('money'))
-
-		if total_money > player_node.MONEY:
-                    logging.info("Server and client money out of sync.")
-                    exit(0)		
+                isclean = player_node.check_inventory(user_tree, sale_tree)
+                if isclean:
+                    logging.info(isclean)
+                    exit(0)
+                else:
+                    logging.info("Inventory Check Passed.")
 
             elif packet.is_type(SMSG_TRADE_REQUEST):
                 name = packet.read_string(24)
diff --git a/player.py b/player.py
index 2e3eafa..6277837 100644
--- a/player.py
+++ b/player.py
@@ -38,5 +38,31 @@ class Player:
                     return item
         return -10 # Not found - bug somewhere!
 
+    def check_inventory(self, user_tree, sale_tree):
+        # Check the inventory state.
+        test_node = self.inventory.copy()
+        for elem in sale_tree.root:
+            item_found = False
+            for item in test_node:
+                if int(elem.get('itemId')) == test_node[item].itemId \
+                and int(elem.get('amount')) <= test_node[item].amount:
+                    test_node[item].amount -= int(elem.get('amount'))
+                    if test_node[item].amount == 0:
+                        del test_node[item]
+                    item_found = True
+                    break
+
+            if not item_found:
+		return "Server and client inventory out of sync."
+
+        total_money = 0
+        for user in user_tree.root:     
+            total_money += int(user.get('money'))
+
+        if total_money > self.MONEY:
+            return "Server and client money out of sync."
+
+        return 0
+
 if __name__ == '__main__':
     print "Do not run this file directly. Run main.py"
diff --git a/tradey.py b/tradey.py
index b70fd24..8ec6c6b 100644
--- a/tradey.py
+++ b/tradey.py
@@ -8,7 +8,6 @@
 """
 import time
 import os
-import xml.dom.minidom
 from subprocess import call
 from xml.etree.ElementTree import *
 
@@ -44,10 +43,8 @@ class UserTree:
 
     def save(self):
         # Be sure to call save() after any changes to the tree.
-        f = open('data/user.xml', 'w')
-        dom = xml.dom.minidom.parseString(tostring(self.root))
-        f.write(str(dom.toprettyxml('    ')))
-        f.close()
+        self.tree = ElementTree(self.root)
+        self.tree.write("data/user.xml")
 
 class ItemTree:
     def __init__(self):
@@ -97,10 +94,8 @@ class ItemTree:
 
     def save(self):
         # Be sure to call save() after any changes to the tree.
-        f = open('data/sale.xml', 'w')
-        dom = xml.dom.minidom.parseString(tostring(self.root))
-        f.write(str(dom.toprettyxml('    ')))
-        f.close()
+        self.tree = ElementTree(self.root)
+        self.tree.write("data/sale.xml")
 
 def saveData(commitmessage = "commit"):
     # This assumes the current working directory is the tradey directory.
-- 
cgit v1.2.3-70-g09d2


From 2cd71629569e8501667f3243cad50b8aa3a2efd6 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Tue, 23 Aug 2011 22:42:42 +0100
Subject: Add some code to prevent problems with the !add command.

Prevents the case where a person tries to add more than one piece of
equiptment per slot.
I also added some code to stop people adding items for free.
---
 main.py  | 7 +++++++
 utils.py | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/main.py b/main.py
index 9307031..d275ffa 100755
--- a/main.py
+++ b/main.py
@@ -358,6 +358,13 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Item not found, check spelling."))
                 return
 
+            if amount > 1 and 'equip' in ItemDB.getItem(ItemDB.findId(item_name)).type:
+                mapserv.sendall(whisper(nick, "You can only add one piece of equiptment per slot."))
+                return
+            elif price == 0:
+                mapserv.sendall(whisper(nick, "Nothing in life is free."))
+                return
+
             item = Item()
             item.player = nick
             item.get = 1 # 1 = get, 0 = give
diff --git a/utils.py b/utils.py
index 2e1d0e8..007bbcc 100644
--- a/utils.py
+++ b/utils.py
@@ -58,6 +58,8 @@ class ItemDB:
                 item_struct.name = item.get('name')
                 if item.get('weight'):
                     item_struct.weight = item.get('weight')
+                if item.get('type'):
+                    item_struct.type = item.get('type')
                 item_struct.description = item.get('description')
                 self.item_names[int(item.get('id'))] = item_struct
 
-- 
cgit v1.2.3-70-g09d2


From 9c47ad7295661bf3577dfb48d92358f11cff3276 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 24 Aug 2011 01:48:16 +0100
Subject: oops

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index d275ffa..8247c2c 100755
--- a/main.py
+++ b/main.py
@@ -358,7 +358,7 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Item not found, check spelling."))
                 return
 
-            if amount > 1 and 'equip' in ItemDB.getItem(ItemDB.findId(item_name)).type:
+            if amount > 1 and 'equip' in ItemDB.getItem(item_id).type:
                 mapserv.sendall(whisper(nick, "You can only add one piece of equiptment per slot."))
                 return
             elif price == 0:
-- 
cgit v1.2.3-70-g09d2


From 8029332e70ed71ca386c5f411f9ab138a26a53c5 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 24 Aug 2011 10:25:03 +0100
Subject: Re-add pretty printing.

The problem was caused by the xml file being read in indented, so once the
prettyprintxml() was called it'd indent it again with a further 4 spaces.
I wrote a little function to clean it before the prettyprintxml() call.
---
 tradey.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/tradey.py b/tradey.py
index 8ec6c6b..2de62ca 100644
--- a/tradey.py
+++ b/tradey.py
@@ -8,9 +8,20 @@
 """
 import time
 import os
+import xml.dom.minidom
 from subprocess import call
 from xml.etree.ElementTree import *
 
+def clean_xml(parse):
+    data = ''
+    pos_start = 0
+    while parse.find('<', pos_start) != -1:
+        pos_start = parse.find('<', pos_start)
+        pos_end = parse.find('>', pos_start+1)
+        data += parse[pos_start:pos_end+1]
+	pos_start = pos_end
+    return data
+
 class UserTree:
     def __init__(self):
         self.tree = ElementTree(file="data/user.xml")
@@ -43,8 +54,10 @@ class UserTree:
 
     def save(self):
         # Be sure to call save() after any changes to the tree.
-        self.tree = ElementTree(self.root)
-        self.tree.write("data/user.xml")
+        f = open('data/user.xml', 'w')
+        dom = xml.dom.minidom.parseString(clean_xml(tostring(self.root)))
+        f.write(dom.toprettyxml('    '))
+        f.close()
 
 class ItemTree:
     def __init__(self):
@@ -94,8 +107,10 @@ class ItemTree:
 
     def save(self):
         # Be sure to call save() after any changes to the tree.
-        self.tree = ElementTree(self.root)
-        self.tree.write("data/sale.xml")
+        f = open('data/sale.xml', 'w')
+        dom = xml.dom.minidom.parseString(clean_xml(tostring(self.root)))
+        f.write(dom.toprettyxml('    '))
+        f.close()
 
 def saveData(commitmessage = "commit"):
     # This assumes the current working directory is the tradey directory.
@@ -103,6 +118,5 @@ def saveData(commitmessage = "commit"):
     call(["git", "commit","-a", '-m "' + commitmessage + '"'])
     os.chdir("..")
 
-
 if __name__ == '__main__':
     print "Do not run this file directly. Run main.py"
-- 
cgit v1.2.3-70-g09d2


From 80d3df45dc769fe7e553caaea2ab938e94cbf07b Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 24 Aug 2011 12:05:30 +0100
Subject: Further clean up, also fixed a tiny bug (wrong variable name).

I move the remove item logic to player.py and have skipped some of
inventory/equiptment information provided by the server.
---
 main.py   | 36 ++++++++----------------------------
 player.py |  6 ++++++
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/main.py b/main.py
index 8247c2c..89524e6 100755
--- a/main.py
+++ b/main.py
@@ -268,7 +268,7 @@ def process_whisper(nick, msg, mapserv):
 
             user_tree.get_user(name).set('stalls', str(slot))
             mapserv.sendall(whisper(nick, "Slots changed: "+name+" "+str(slot)))
-            tradey.saveData("User: "+player_name+", Slots changed: "+str(slot))
+            tradey.saveData("User: "+name+", Slots changed: "+str(slot))
             user_tree.save()
         else:
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
@@ -289,7 +289,6 @@ def process_whisper(nick, msg, mapserv):
         if (broken_string[1][0] == '-' and broken_string[1][1:].isdigit()) or broken_string[1].isdigit():
             accesslevel = int(broken_string[1])
             name = " ".join(broken_string[2:])
-
             user_info = user_tree.get_user(name)
 
             if user_info == -10:
@@ -300,7 +299,7 @@ def process_whisper(nick, msg, mapserv):
                 user_tree.get_user(name).set('accesslevel', str(accesslevel))
                 mapserv.sendall(whisper(nick, "Access level changed:"+name+ " ("+str(accesslevel)+")."))
                 user_tree.save()
-                tradey.saveData("User: "+player_name+", Set Access Level: "+str(accesslevel))
+                tradey.saveData("User: "+name+", Set Access Level: "+str(accesslevel))
             else:
                 mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
                 return
@@ -736,12 +735,7 @@ def main():
                 item.index = packet.read_int16() - inventory_offset
                 item.amount = packet.read_int16()
                 item.itemId = packet.read_int16()
-                item.identified = packet.read_int8()
-                packet.read_int8()
-                item.refine = packet.read_int8()
-                packet.skip(8)
-                item.equipType = packet.read_int16()
-                item.itemType = packet.read_int8()
+                packet.skip(14)
                 err = packet.read_int8()
 
                 if err == 0:
@@ -757,10 +751,7 @@ def main():
                 amount = packet.read_int16()
 
                 logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
-                if index in player_node.inventory:
-                    player_node.inventory[index].amount -= amount
-                    if player_node.inventory[index].amount == 0:
-                        del player_node.inventory[index]
+                player_node.remove_item(index, amount)
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY):
                 player_node.inventory.clear() # Clear the inventory - incase of new index.
@@ -770,11 +761,9 @@ def main():
                     item = Item()
                     item.index = packet.read_int16() - inventory_offset
                     item.itemId = packet.read_int16()
-                    item.itemType = packet.read_int8()
-                    item.identified = packet.read_int8()
+                    packet.skip(2)
                     item.amount = packet.read_int16()
-                    item.arrow = packet.read_int16()
-                    packet.skip(8) # Cards
+                    packet.skip(10)
                     player_node.inventory[item.index] = item
 
             elif packet.is_type(SMSG_PLAYER_EQUIPMENT):
@@ -784,13 +773,7 @@ def main():
                     item = Item()
                     item.index = packet.read_int16() - inventory_offset
                     item.itemId = packet.read_int16()
-                    item.itemType = packet.read_int8()
-                    item.identified = packet.read_int8()
-                    packet.skip(2)
-                    item.equipType = packet.read_int16()
-                    packet.skip(1)
-                    item.refine = packet.read_int8()
-                    packet.skip(8)
+                    packet.skip(16)
                     item.amount = 1
                     player_node.inventory[item.index] = item
 
@@ -894,10 +877,7 @@ def main():
                     # If Trade item add successful - Remove the item from the inventory state.
                     if index != 0-inventory_offset: # If it's not money
                         logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
-                        if index in player_node.inventory:
-                            player_node.inventory[index].amount -= amount
-                            if player_node.inventory[index].amount == 0:
-                                del player_node.inventory[index]
+                        player_node.remove_item(index, amount)
 
                 elif response == 1:
                     logging.info("Trade item add response: Failed - player overweight.")
diff --git a/player.py b/player.py
index 6277837..6f602c5 100644
--- a/player.py
+++ b/player.py
@@ -38,6 +38,12 @@ class Player:
                     return item
         return -10 # Not found - bug somewhere!
 
+    def remove_item(self, index, amount):
+        if index in self.inventory:
+            self.inventory[index].amount -= amount
+            if self.inventory[index].amount == 0:
+                del self.inventory[index]
+
     def check_inventory(self, user_tree, sale_tree):
         # Check the inventory state.
         test_node = self.inventory.copy()
-- 
cgit v1.2.3-70-g09d2


From cb31905b26679c5a0c9a7335943d0d1afe4547bc Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 24 Aug 2011 15:17:15 +0100
Subject: Let a blocked user retrieve items/money.

---
 main.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index 89524e6..75afabf 100755
--- a/main.py
+++ b/main.py
@@ -44,8 +44,9 @@ def process_whisper(nick, msg, mapserv):
 
     if user != -10:
         if int(user.get("accesslevel")) == -1: # A user who has been blocked for abuse.
-            mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact <administrator>."))
-            return
+            if int(user.get("used_slots")) == 0 and int(user.get("money")) == 0:
+                mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact <administrator>."))
+                return
 
     if msg == "!list":
         # Sends the list of items for sale.
@@ -489,7 +490,7 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
             return
 
-        if int(user.get("accesslevel")) < 5:
+        if int(user.get("accesslevel")) < 5 and int(user.get("accesslevel")) > 0:
             mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
             return
 
-- 
cgit v1.2.3-70-g09d2


From e7d3136463e4a52d6af47e36f21b6ad0303369e8 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 24 Aug 2011 15:21:47 +0100
Subject: Prevent blocked users from buying items.

---
 main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.py b/main.py
index 75afabf..cda4edd 100755
--- a/main.py
+++ b/main.py
@@ -392,6 +392,10 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
             return
 
+        if int(user.get("accesslevel")) == -1:
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
+
         if broken_string[1].isdigit() and broken_string[2].isdigit():
             amount = int(broken_string[1])
             uid = int(broken_string[2])
-- 
cgit v1.2.3-70-g09d2


From 6fd3838b814de0d51b2eb565c5cf80882a1e49be Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 24 Aug 2011 18:26:20 +0100
Subject: teeny change

---
 utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils.py b/utils.py
index 007bbcc..5940bc6 100644
--- a/utils.py
+++ b/utils.py
@@ -34,11 +34,11 @@ def encode_str(value, size):
     base = 94
     start = 33
     while value:
-        output += struct.pack('<B', value % base + start)
+        output += chr(value % base + start)
         value /= base
 
     while len(output) < size:
-        output += struct.pack('<B', start)
+        output += chr(start)
 
     return output
 
-- 
cgit v1.2.3-70-g09d2


From a58156c4272b0d03cc9ccef46e9d5a364eb5065c Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 24 Aug 2011 18:26:53 +0100
Subject: oops

---
 utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils.py b/utils.py
index 5940bc6..364aeba 100644
--- a/utils.py
+++ b/utils.py
@@ -9,7 +9,6 @@
 from xml.etree.ElementTree import ElementTree
 from player import Item
 
-import struct
 import time
 import mutex
 import threading
-- 
cgit v1.2.3-70-g09d2


From 309847f46d4ce1775b2539f650b1abf5739c7b6a Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Wed, 24 Aug 2011 19:27:30 +0200
Subject: improve blocked users

---
 main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.py b/main.py
index cda4edd..fe3c634 100755
--- a/main.py
+++ b/main.py
@@ -47,6 +47,10 @@ def process_whisper(nick, msg, mapserv):
             if int(user.get("used_slots")) == 0 and int(user.get("money")) == 0:
                 mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact <administrator>."))
                 return
+            allowed_commands = ['!money', '!help', '!getback' ]
+            if not broken_string[0] in allowed_commands:
+                mapserv.sendall(whisper(nick, "Your access level has been set to blocked! If you feel this is in error, please contact <administrator>."))
+                mapserv.sendall(whisper(nick, "Though, you still can do the following: "+str(allowed_commands))
 
     if msg == "!list":
         # Sends the list of items for sale.
-- 
cgit v1.2.3-70-g09d2


From 8d7cc5ccafbdc24d2d94dbffeb963a93cb5b3869 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Wed, 24 Aug 2011 19:27:58 +0200
Subject: Revert "Prevent blocked users from buying items."

This reverts commit e7d3136463e4a52d6af47e36f21b6ad0303369e8.
---
 main.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/main.py b/main.py
index fe3c634..cd60c4a 100755
--- a/main.py
+++ b/main.py
@@ -396,10 +396,6 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "Syntax incorrect."))
             return
 
-        if int(user.get("accesslevel")) == -1:
-            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
-            return
-
         if broken_string[1].isdigit() and broken_string[2].isdigit():
             amount = int(broken_string[1])
             uid = int(broken_string[2])
-- 
cgit v1.2.3-70-g09d2


From ce51681100e5ea18da7e2171f523296c28f0cda1 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Wed, 24 Aug 2011 19:28:31 +0200
Subject: blocked users done right

---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index cd60c4a..0adf113 100755
--- a/main.py
+++ b/main.py
@@ -51,6 +51,7 @@ def process_whisper(nick, msg, mapserv):
             if not broken_string[0] in allowed_commands:
                 mapserv.sendall(whisper(nick, "Your access level has been set to blocked! If you feel this is in error, please contact <administrator>."))
                 mapserv.sendall(whisper(nick, "Though, you still can do the following: "+str(allowed_commands))
+                return
 
     if msg == "!list":
         # Sends the list of items for sale.
-- 
cgit v1.2.3-70-g09d2


From cbd465195dd81fa36a1c7f86ca56b4a4e705351f Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Wed, 24 Aug 2011 19:33:31 +0200
Subject: Adding !list for blocked users; introduce config.admin

---
 config.py.template | 1 +
 main.py            | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config.py.template b/config.py.template
index df11a32..2d3155e 100644
--- a/config.py.template
+++ b/config.py.template
@@ -5,3 +5,4 @@ account = ""
 password = ""
 relist_time = 604800 # Time in seconds before an item needs to be relisted.
 character = 0 #slot character is in, 0 for first, 1 for second, 2 for third
+admin = "Admin <admin@email.com>"
diff --git a/main.py b/main.py
index 0adf113..a14dbb2 100755
--- a/main.py
+++ b/main.py
@@ -45,11 +45,11 @@ def process_whisper(nick, msg, mapserv):
     if user != -10:
         if int(user.get("accesslevel")) == -1: # A user who has been blocked for abuse.
             if int(user.get("used_slots")) == 0 and int(user.get("money")) == 0:
-                mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact <administrator>."))
+                mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact" + config.admin))
                 return
-            allowed_commands = ['!money', '!help', '!getback' ]
+            allowed_commands = ['!money', '!help', '!getback', '!info' ]
             if not broken_string[0] in allowed_commands:
-                mapserv.sendall(whisper(nick, "Your access level has been set to blocked! If you feel this is in error, please contact <administrator>."))
+                mapserv.sendall(whisper(nick, "Your access level has been set to blocked! If you feel this is in error, please contact" + config.admin))
                 mapserv.sendall(whisper(nick, "Though, you still can do the following: "+str(allowed_commands))
                 return
 
-- 
cgit v1.2.3-70-g09d2


From 766e95b3c528193f920c68a0a33eaebba6fbb492 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Wed, 24 Aug 2011 19:34:13 +0200
Subject: ooops

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index a14dbb2..c4aa6b4 100755
--- a/main.py
+++ b/main.py
@@ -50,7 +50,7 @@ def process_whisper(nick, msg, mapserv):
             allowed_commands = ['!money', '!help', '!getback', '!info' ]
             if not broken_string[0] in allowed_commands:
                 mapserv.sendall(whisper(nick, "Your access level has been set to blocked! If you feel this is in error, please contact" + config.admin))
-                mapserv.sendall(whisper(nick, "Though, you still can do the following: "+str(allowed_commands))
+                mapserv.sendall(whisper(nick, "Though, you still can do the following: "+str(allowed_commands)))
                 return
 
     if msg == "!list":
-- 
cgit v1.2.3-70-g09d2


From ad09c60c5f4668051331ff6db0203406a8118dc8 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 24 Aug 2011 18:45:39 +0100
Subject: Set a max on the price.

---
 main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index c4aa6b4..7799086 100755
--- a/main.py
+++ b/main.py
@@ -366,8 +366,8 @@ def process_whisper(nick, msg, mapserv):
             if amount > 1 and 'equip' in ItemDB.getItem(item_id).type:
                 mapserv.sendall(whisper(nick, "You can only add one piece of equiptment per slot."))
                 return
-            elif price == 0:
-                mapserv.sendall(whisper(nick, "Nothing in life is free."))
+            elif price == 0 or price > 50000000:
+                mapserv.sendall(whisper(nick, "Please use a valid price between 1-50000000gp."))
                 return
 
             item = Item()
-- 
cgit v1.2.3-70-g09d2


From 182c9f5454157f09d8ea0ce4e24561f1e2060038 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 25 Aug 2011 23:37:45 +0100
Subject: Add a specific message for when a user adds money to a !add request.

---
 main.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 7799086..124f433 100755
--- a/main.py
+++ b/main.py
@@ -843,8 +843,11 @@ def main():
                         if amount == trader_state.item.amount and item_id == trader_state.item.id:
                             trader_state.complete = 1
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+                        elif item_id == 0 and amount > 0:
+                            mapserv.sendall(whisper(trader_state.item.player, "Why are you adding money?!?!"))
+                            mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))                            
                         else:
-                            mapserv.sendall(whisper(trader_state.item.player, "Thats not the right item."))
+                            mapserv.sendall(whisper(trader_state.item.player, "That's not the right item."))
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
                     elif trader_state.item.get == 0: # buy
@@ -954,6 +957,7 @@ def main():
                 pass
 
     # On Disconnect/Exit
+    logging.info("Server disconnect.")
     shop_broadcaster.stop()
     mapserv.close()
 
-- 
cgit v1.2.3-70-g09d2


From ffe3dc92e9f1fcac871e6d79e8fe3b7e57986d52 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 25 Aug 2011 23:48:40 +0100
Subject: Remove some surpurfulous code - the else: item_id == 0 would never be
 called.

---
 main.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 124f433..4d2ddcc 100755
--- a/main.py
+++ b/main.py
@@ -851,16 +851,13 @@ def main():
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
                     elif trader_state.item.get == 0: # buy
-                        if amount == trader_state.item.price * trader_state.item.amount and item_id == 0:
+                        if item_id == 0 and amount == trader_state.item.price * trader_state.item.amount:
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
                             trader_state.complete = 1
                         elif item_id == 0 and amount != trader_state.item.price * trader_state.item.amount:
                             trader_state.complete = 0
                         else:
-                            if item_id == 0:
-                                mapserv.sendall(whisper(trader_state.item.player, "Please verify you have the correct amount of money and try again."))
-                            else:
-                                mapserv.sendall(whisper(trader_state.item.player, "Don't give me your itenz."))
+                            mapserv.sendall(whisper(trader_state.item.player, "Don't give me your itenz."))
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
                 elif trader_state.money: # money
-- 
cgit v1.2.3-70-g09d2


From 8dccb20d3ee6a5acd982913977ac0f5415fda588 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Fri, 26 Aug 2011 14:33:04 +0100
Subject: Make sure the ID provided is of the type wanted: default to player.

Incase someone has the same name as an npc in the room.
---
 being.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/being.py b/being.py
index e5d0b95..3c70616 100644
--- a/being.py
+++ b/being.py
@@ -21,9 +21,9 @@ class BeingManager:
     def __init__(self):
         self.container = {}
 
-    def findId(self, name):
+    def findId(self, name, type="player"):
         for i in self.container:
-           if self.container[i].name == name:
+           if self.container[i].name == name and self.container[i].type == type:
                 return i
         return -10
 
-- 
cgit v1.2.3-70-g09d2


From 4b96c486d9cba72ec5fc3f4f15c4dbbd6ff13824 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Fri, 26 Aug 2011 14:50:51 +0100
Subject: Remove some no-longer needed variables.

---
 player.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/player.py b/player.py
index 6f602c5..5501bba 100644
--- a/player.py
+++ b/player.py
@@ -20,14 +20,8 @@ class Player:
         self.x = 0
         self.y = 0
 
-        self.EXP_NEEDED = 0
         self.EXP = 0
         self.MONEY = 0
-        self.LEVEL = 0
-        self.HP = 0
-        self.MaxHP = 0
-        self.MP = 0
-        self.MaxMP = 0
         self.WEIGHT = 0
         self.MaxWEIGHT = 0
 
-- 
cgit v1.2.3-70-g09d2


From a94f91a8b8a09910198eed8ab4407bc0c9ef66eb Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 28 Aug 2011 17:29:16 +0100
Subject: Add a message for an unrecognised command.

---
 main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main.py b/main.py
index 4d2ddcc..a43baad 100755
--- a/main.py
+++ b/main.py
@@ -530,6 +530,8 @@ def process_whisper(nick, msg, mapserv):
             else:
                 mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
                 trader_state.reset()
+    else:
+        mapserv.sendall(whisper(nick, "Command not recognised, please whisper me !help for a full list of commands."))
 
 def main():
     logging.basicConfig(filename='data/logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
-- 
cgit v1.2.3-70-g09d2


From a17c2faa9cf3ba50d4d1155870116e09e4cae3e1 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Tue, 30 Aug 2011 16:18:56 +0100
Subject: Respond "No" to incoming trade requests.

---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index a43baad..ec4c3d0 100755
--- a/main.py
+++ b/main.py
@@ -801,6 +801,7 @@ def main():
             elif packet.is_type(SMSG_TRADE_REQUEST):
                 name = packet.read_string(24)
                 logging.info("Trade request: " + name)
+                mapserv.sendall(trade_respond(False))
 
             elif packet.is_type(SMSG_TRADE_RESPONSE):
                 response = packet.read_int8()
-- 
cgit v1.2.3-70-g09d2


From e666fc6e9a6415f009065d3adaed39e0feb70b59 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Tue, 30 Aug 2011 23:55:37 +0100
Subject: remove unneeded line.

---
 utils.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/utils.py b/utils.py
index 364aeba..d9d0319 100644
--- a/utils.py
+++ b/utils.py
@@ -48,8 +48,7 @@ class ItemDB:
     def __init__(self):
         print "Loading ItemDB"
         self.item_names = {}
-        self.itemdb_file = ElementTree()
-        self.itemdb_file.parse("data/items.xml")
+        self.itemdb_file = ElementTree(file="data/items.xml")
 
         for item in self.itemdb_file.getroot():
             if item.get('id') > 500:
-- 
cgit v1.2.3-70-g09d2


From 8cbc1eadd27e0bcb9f12ded7e1670509ee69fda3 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 31 Aug 2011 22:27:57 +0100
Subject: Minor help grammar corrections.

---
 main.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.py b/main.py
index ec4c3d0..4fb53b7 100755
--- a/main.py
+++ b/main.py
@@ -130,15 +130,15 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "Welcome to ManaMarket!"))
             mapserv.sendall(whisper(nick, "The basic commands for the bot are: !list, !find <id> or <Item Name>, !buy <amount> <uid>, !add <amount> <price> <Item Name>, !money, !relist <uid>, !info, !getback <uid> "))
             mapserv.sendall(whisper(nick, "For a detailed description of each command, type !help <command> e.g. !help !buy"))
-            mapserv.sendall(whisper(nick, "For example:- to purchase an item shown in the list as:"))
+            mapserv.sendall(whisper(nick, "For example to purchase an item shown in the list as:"))
             mapserv.sendall(whisper(nick, "[selling] [6] 5 [@@640|Iron Ore@@] for 1000gp each"))
             mapserv.sendall(whisper(nick, "you would type /whisper ManaMarket !buy 1 6" ))
             mapserv.sendall(whisper(nick, "This will purchase one of item 6 (Iron Ore)."))
 
             if int(user.get('accesslevel')) >= 5:
                 mapserv.sendall(whisper(nick, "Ah, you have sellers access level. How lovely!")) # the first words the ticket seller told me when i was in london for the first time. How lovely!
-                mapserv.sendall(whisper(nick, "Use !add to tell me, I should trade stuff for you:"))
-                mapserv.sendall(whisper(nick, "e.g. !add 10 1000 Iron Ore would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
+                mapserv.sendall(whisper(nick, "Use !add to tell me which items I should trade for you:"))
+                mapserv.sendall(whisper(nick, "For example !add 10 1000 Iron Ore would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
                 mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
             elif int(user.get('accesslevel')) == 20:
                 mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
@@ -364,7 +364,7 @@ def process_whisper(nick, msg, mapserv):
                 return
 
             if amount > 1 and 'equip' in ItemDB.getItem(item_id).type:
-                mapserv.sendall(whisper(nick, "You can only add one piece of equiptment per slot."))
+                mapserv.sendall(whisper(nick, "You can only add one piece of equipment per slot."))
                 return
             elif price == 0 or price > 50000000:
                 mapserv.sendall(whisper(nick, "Please use a valid price between 1-50000000gp."))
-- 
cgit v1.2.3-70-g09d2


From c547651e966c30aa564e9a4e5c53c83f11168128 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 31 Aug 2011 23:45:44 +0100
Subject: add command !tradestate

---
 main.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/main.py b/main.py
index 4fb53b7..602afeb 100755
--- a/main.py
+++ b/main.py
@@ -223,6 +223,20 @@ def process_whisper(nick, msg, mapserv):
         if not items_found:
             mapserv.sendall(whisper(nick, "Item not found."))
 
+    elif msg == '!tradestate':
+        # Admin command - return trade state.
+        if user == -10:
+            return
+
+        if int(user.get("accesslevel")) != 20:
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
+
+        if not trader_state.Trading.test():
+            mapserv.sendall(whisper(nick, "I'm busy with a trade."))
+        else:
+            mapserv.sendall(whisper(nick, "I'm free."))
+
     elif msg == '!listusers':
         # Admin command - shows a list of all user.
         if user == -10:
-- 
cgit v1.2.3-70-g09d2


From 891cc670cbd8da86c865aca602a73a8ee8372bd1 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 31 Aug 2011 23:59:02 +0100
Subject: ooops level 20 wasn't being shown

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 602afeb..2bafa40 100755
--- a/main.py
+++ b/main.py
@@ -140,7 +140,7 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Use !add to tell me which items I should trade for you:"))
                 mapserv.sendall(whisper(nick, "For example !add 10 1000 Iron Ore would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
                 mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
-            elif int(user.get('accesslevel')) == 20:
+            if int(user.get('accesslevel')) == 20:
                 mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
                 mapserv.sendall(whisper(nick, "You also have access to the following commands: !listusers, !setslots <slots> <name>, !setaccess <access level > <name>, !adduser <access level> <slot> <name>"))
 
-- 
cgit v1.2.3-70-g09d2


From 143f77c73df2ffdac65603db6a480d28d7861a5e Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 02:11:42 +0100
Subject: oops

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 2bafa40..64a3c2a 100755
--- a/main.py
+++ b/main.py
@@ -232,7 +232,7 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
             return
 
-        if not trader_state.Trading.test():
+        if trader_state.Trading.test():
             mapserv.sendall(whisper(nick, "I'm busy with a trade."))
         else:
             mapserv.sendall(whisper(nick, "I'm free."))
-- 
cgit v1.2.3-70-g09d2


From 6122569f979456d41b81d25fa8d4d8037ef384ba Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 10:28:52 +0100
Subject: Teeny oversight with help - if a non-added player typed it, would of
 locked up.

---
 main.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/main.py b/main.py
index 64a3c2a..ae98c54 100755
--- a/main.py
+++ b/main.py
@@ -135,14 +135,15 @@ def process_whisper(nick, msg, mapserv):
             mapserv.sendall(whisper(nick, "you would type /whisper ManaMarket !buy 1 6" ))
             mapserv.sendall(whisper(nick, "This will purchase one of item 6 (Iron Ore)."))
 
-            if int(user.get('accesslevel')) >= 5:
-                mapserv.sendall(whisper(nick, "Ah, you have sellers access level. How lovely!")) # the first words the ticket seller told me when i was in london for the first time. How lovely!
-                mapserv.sendall(whisper(nick, "Use !add to tell me which items I should trade for you:"))
-                mapserv.sendall(whisper(nick, "For example !add 10 1000 Iron Ore would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
-                mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
-            if int(user.get('accesslevel')) == 20:
-                mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
-                mapserv.sendall(whisper(nick, "You also have access to the following commands: !listusers, !setslots <slots> <name>, !setaccess <access level > <name>, !adduser <access level> <slot> <name>"))
+            if user != -10:
+                if int(user.get('accesslevel')) >= 5:
+                    mapserv.sendall(whisper(nick, "Ah, you have sellers access level. How lovely!")) # the first words the ticket seller told me when i was in london for the first time. How lovely!
+                    mapserv.sendall(whisper(nick, "Use !add to tell me which items I should trade for you:"))
+                    mapserv.sendall(whisper(nick, "For example !add 10 1000 Iron Ore would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
+                    mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
+                if int(user.get('accesslevel')) == 20:
+                    mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
+                    mapserv.sendall(whisper(nick, "You also have access to the following commands: !listusers, !setslots <slots> <name>, !setaccess <access level > <name>, !adduser <access level> <slot> <name>"))
 
         elif len(broken_string) == 2:
             if broken_string[1] == '!buy':
-- 
cgit v1.2.3-70-g09d2


From 293331d4e2a843760a95b0fd690da0c035df6d5a Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 12:05:01 +0100
Subject: Add more logging to the item add process...and cancel on an unknown
 add response.

---
 main.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index ae98c54..0c3cd99 100755
--- a/main.py
+++ b/main.py
@@ -767,7 +767,7 @@ def main():
                     else:
                         player_node.inventory[item.index] = item
 
-                    logging.info("Picked up: %s, Amount: %s", ItemDB.getItem(item.itemId).name, str(item.amount))
+                    logging.info("Picked up: %s, Amount: %s, Index: %s", ItemDB.getItem(item.itemId).name, str(item.amount), str(item.index))
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY_REMOVE):
                 index = packet.read_int16() - inventory_offset
@@ -900,7 +900,7 @@ def main():
 
                     # If Trade item add successful - Remove the item from the inventory state.
                     if index != 0-inventory_offset: # If it's not money
-                        logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
+                        logging.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount),str(index))
                         player_node.remove_item(index, amount)
 
                 elif response == 1:
@@ -913,6 +913,11 @@ def main():
                         mapserv.sendall(whisper(trader_state.item.player, "You have no free slots."))
                     logging.info("Trade item add response: Failed - No free slots.")
                     mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+                else:
+                    logging.info("Trade item add response: Failed - unknown reason.")
+                    mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+                    if trader_state.item:
+                        mapserv.sendall(whisper(trader_state.item.player, "Sorry, a problem has occured."))
 
             elif packet.is_type(SMSG_TRADE_OK):
                 is_ok = packet.read_int8() # 0 is ok from self, and 1 is ok from other
-- 
cgit v1.2.3-70-g09d2


From 2caac2d05e8b40b13b4a03a1186d2ce8e1fc10df Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 13:30:04 +0100
Subject: oops quite a big one also had some duplication.

---
 main.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 0c3cd99..3df8f1c 100755
--- a/main.py
+++ b/main.py
@@ -152,8 +152,6 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "!list - Displays a list of all items for sale."))
             elif broken_string[1] == '!find':
                 mapserv.sendall(whisper(nick, "!find <id> or <Item Name> - Simple search to locate an item."))
-            elif broken_string[1] == '!buy':
-                mapserv.sendall(whisper(nick, "!buy <amount> <uid> - Request the purchase of an item or items."))
             elif broken_string[1] == '!add':
                 mapserv.sendall(whisper(nick, "!add <amount> <price> <Item Name> - Add an item to the sell list (requires that you have an account)."))
             elif broken_string[1] == '!money':
@@ -432,11 +430,12 @@ def process_whisper(nick, msg, mapserv):
             item.uid = uid
             item.amount = amount
             item.price = int(item_info.get("price"))
-            trader_state.item = item
 
             if not trader_state.Trading.testandset():
                 mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
                 return
+
+            trader_state.item = item
             player_id = beingManager.findId(nick)
             if player_id != -10:
                 mapserv.sendall(trade_request(player_id))
@@ -533,11 +532,12 @@ def process_whisper(nick, msg, mapserv):
             item.uid = uid
             item.amount = int(item_info.get("amount"))
             item.price = 0
-            trader_state.item = item
-
+            
             if not trader_state.Trading.testandset():
                 mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
                 return
+
+            trader_state.item = item
             player_id = beingManager.findId(nick)
             if player_id != -10:
                 mapserv.sendall(trade_request(player_id))
-- 
cgit v1.2.3-70-g09d2


From ff76f98a0e8d519c08938fa44b77d70294e8cb1e Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 13:39:38 +0100
Subject: add something to logging.

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 3df8f1c..0ddb00c 100755
--- a/main.py
+++ b/main.py
@@ -773,7 +773,7 @@ def main():
                 index = packet.read_int16() - inventory_offset
                 amount = packet.read_int16()
 
-                logging.info("Remove item: %s, Amount: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount))
+                logging.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount), str(index))
                 player_node.remove_item(index, amount)
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY):
-- 
cgit v1.2.3-70-g09d2


From 2fdcd2ac566cf40386b7e392bead1137c68f722a Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 13:40:10 +0100
Subject: oops and again for money

---
 main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index 0ddb00c..01604cb 100755
--- a/main.py
+++ b/main.py
@@ -180,12 +180,12 @@ def process_whisper(nick, msg, mapserv):
         if amount == 0:
             mapserv.sendall(whisper(nick, "You have no money to collect."))
         else:
-            trader_state.money = nick
             if not trader_state.Trading.testandset():
                 mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
                 return
-            player_id = beingManager.findId(nick)
 
+            trader_state.money = nick
+            player_id = beingManager.findId(nick)
             if player_id != -10:
                 mapserv.sendall(trade_request(player_id))
                 trader_state.timer = time.time()
-- 
cgit v1.2.3-70-g09d2


From f22b3389a0167f5a44eeced15d2a730e896d75da Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 13:43:04 +0100
Subject: urgh

---
 main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 01604cb..865f4b0 100755
--- a/main.py
+++ b/main.py
@@ -389,11 +389,12 @@ def process_whisper(nick, msg, mapserv):
             item.id = item_id
             item.amount = amount
             item.price = price
-            trader_state.item = item
 
             if not trader_state.Trading.testandset():
                 mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
                 return
+
+            trader_state.item = item
             player_id = beingManager.findId(nick)
             if player_id != -10:
                 mapserv.sendall(trade_request(player_id))
-- 
cgit v1.2.3-70-g09d2


From f2c66d5930646d7efea74a1693481827cfea18e6 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Thu, 1 Sep 2011 14:48:31 +0200
Subject: replace tabs by spaces

---
 player.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/player.py b/player.py
index 5501bba..92dca6b 100644
--- a/player.py
+++ b/player.py
@@ -53,10 +53,10 @@ class Player:
                     break
 
             if not item_found:
-		return "Server and client inventory out of sync."
+                return "Server and client inventory out of sync."
 
         total_money = 0
-        for user in user_tree.root:     
+        for user in user_tree.root:
             total_money += int(user.get('money'))
 
         if total_money > self.MONEY:
-- 
cgit v1.2.3-70-g09d2


From 2e93877e156bec25dd9ab2038ed88b35f438515b Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 15:35:59 +0100
Subject: If it's not going to add the item, lets make sure it cancels the
 trade before it can be accepted.

Hopefully we can figure out what is wrong with this, but leave this their for
now, so the bot doesn't "scam" people.
---
 main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.py b/main.py
index 865f4b0..139f474 100755
--- a/main.py
+++ b/main.py
@@ -842,6 +842,10 @@ def main():
                                 if trader_state.item.price == 0: # getback
                                     mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
                                     trader_state.complete = 1
+                            else:
+                                mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+                                logging.info("Trade response: Trade accepted (buy) - the item could not be added.")
+                                mapserv.sendall(whisper(trader_state.item.player, "Sorry, a problem has occured."))
 
                     elif trader_state.money: # money
                         amount = int(user_tree.get_user(trader_state.money).get('money'))
-- 
cgit v1.2.3-70-g09d2


From 934d0896097f42d208aeaea70cc0a61cc43dc23a Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Thu, 1 Sep 2011 21:09:10 +0200
Subject: tab->space

---
 tradey.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tradey.py b/tradey.py
index 2de62ca..01f855e 100644
--- a/tradey.py
+++ b/tradey.py
@@ -19,7 +19,7 @@ def clean_xml(parse):
         pos_start = parse.find('<', pos_start)
         pos_end = parse.find('>', pos_start+1)
         data += parse[pos_start:pos_end+1]
-	pos_start = pos_end
+        pos_start = pos_end
     return data
 
 class UserTree:
-- 
cgit v1.2.3-70-g09d2


From b1049b4b6d328740f306a1b67292ab68d5dade73 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 16:30:09 +0100
Subject: remove storage struct

---
 player.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/player.py b/player.py
index 92dca6b..0c0894c 100644
--- a/player.py
+++ b/player.py
@@ -12,7 +12,6 @@ class Item:
 class Player:
     def __init__(self, name):
         self.inventory = {}
-        self.storage = []
         self.name = name
         self.id = 0
         self.sex = 0
-- 
cgit v1.2.3-70-g09d2


From 1f48228e07461a7df84ef306bbadd8d4befed196 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 1 Sep 2011 21:22:00 +0100
Subject: Fixes

---
 main.py   | 3 ++-
 player.py | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index 139f474..ebcc955 100755
--- a/main.py
+++ b/main.py
@@ -260,7 +260,8 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
                 data = ''
 
-        mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
+        if len(data) > 0:
+            mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
 
     elif broken_string[0] == '!setslots':
         # Change the number of slots a user has - !setslots <slots> <name>
diff --git a/player.py b/player.py
index 0c0894c..861dbf5 100644
--- a/player.py
+++ b/player.py
@@ -6,6 +6,9 @@
     This file is part of tradey, a trading bot in the mana world
     see www.themanaworld.org
 """
+
+import copy
+
 class Item:
     pass
 
@@ -39,7 +42,7 @@ class Player:
 
     def check_inventory(self, user_tree, sale_tree):
         # Check the inventory state.
-        test_node = self.inventory.copy()
+        test_node = copy.deepcopy(self.inventory)
         for elem in sale_tree.root:
             item_found = False
             for item in test_node:
-- 
cgit v1.2.3-70-g09d2


From d720dc55a198cbf02afea382bb335ad799b70936 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Fri, 2 Sep 2011 16:57:08 +0200
Subject: Improving !help

---
 main.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index ebcc955..5e3b322 100755
--- a/main.py
+++ b/main.py
@@ -137,10 +137,13 @@ def process_whisper(nick, msg, mapserv):
 
             if user != -10:
                 if int(user.get('accesslevel')) >= 5:
+                    mapserv.sendall(whisper(nick,"---"))
                     mapserv.sendall(whisper(nick, "Ah, you have sellers access level. How lovely!")) # the first words the ticket seller told me when i was in london for the first time. How lovely!
                     mapserv.sendall(whisper(nick, "Use !add to tell me which items I should trade for you:"))
                     mapserv.sendall(whisper(nick, "For example !add 10 1000 Iron Ore would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
                     mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
+                    mapserv.sendall(whisper(nick,"When you just want to know, which items you have given me or how much money I have for you, do !info"))
+
                 if int(user.get('accesslevel')) == 20:
                     mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
                     mapserv.sendall(whisper(nick, "You also have access to the following commands: !listusers, !setslots <slots> <name>, !setaccess <access level > <name>, !adduser <access level> <slot> <name>"))
@@ -534,7 +537,7 @@ def process_whisper(nick, msg, mapserv):
             item.uid = uid
             item.amount = int(item_info.get("amount"))
             item.price = 0
-            
+
             if not trader_state.Trading.testandset():
                 mapserv.sendall(whisper(nick, "I'm currently busy with a trade.  Try again shortly"))
                 return
@@ -869,7 +872,7 @@ def main():
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
                         elif item_id == 0 and amount > 0:
                             mapserv.sendall(whisper(trader_state.item.player, "Why are you adding money?!?!"))
-                            mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))                            
+                            mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
                         else:
                             mapserv.sendall(whisper(trader_state.item.player, "That's not the right item."))
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-- 
cgit v1.2.3-70-g09d2


From 73fee5ebe5118e8ff2d32145b890d03449e9c1d3 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Fri, 2 Sep 2011 19:14:47 +0100
Subject: A few things.

- Allow someone with access level 10 to add users (for gm's)
- Add another line to the seller help for !getback.
- Change the message for when the wrong item or amount is added.
- Allow more than one arrow at a time to be added ;)
---
 main.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/main.py b/main.py
index 5e3b322..d4dca90 100755
--- a/main.py
+++ b/main.py
@@ -142,7 +142,8 @@ def process_whisper(nick, msg, mapserv):
                     mapserv.sendall(whisper(nick, "Use !add to tell me which items I should trade for you:"))
                     mapserv.sendall(whisper(nick, "For example !add 10 1000 Iron Ore would tell me to sell 10 [@@640|Iron Ore@@] for a price of 1000 gp"))
                     mapserv.sendall(whisper(nick, "Later you can whisper me !money to get back your money. In the example given, I'd give you 10*1000 = 10000gp"))
-                    mapserv.sendall(whisper(nick,"When you just want to know, which items you have given me or how much money I have for you, do !info"))
+                    mapserv.sendall(whisper(nick, "When you just want to know, which items you have given me or how much money I have for you can whisper me !info"))
+                    mapserv.sendall(whisper(nick,"If you want to get back an unsold item, whisper me !getback <uid>"))
 
                 if int(user.get('accesslevel')) == 20:
                     mapserv.sendall(whisper(nick, "You're my master! How should I serve you?"))
@@ -335,7 +336,7 @@ def process_whisper(nick, msg, mapserv):
         if user == -10:
             return
 
-        if int(user.get("accesslevel")) != 20:
+        if int(user.get("accesslevel")) < 10:
             mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
             return
 
@@ -380,7 +381,7 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Item not found, check spelling."))
                 return
 
-            if amount > 1 and 'equip' in ItemDB.getItem(item_id).type:
+            if amount > 1 and ItemDB.getItem(item_id).type != 'equip-ammo' and 'equip' in ItemDB.getItem(item_id).type:
                 mapserv.sendall(whisper(nick, "You can only add one piece of equipment per slot."))
                 return
             elif price == 0 or price > 50000000:
@@ -874,7 +875,7 @@ def main():
                             mapserv.sendall(whisper(trader_state.item.player, "Why are you adding money?!?!"))
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
                         else:
-                            mapserv.sendall(whisper(trader_state.item.player, "That's not the right item."))
+                            mapserv.sendall(whisper(trader_state.item.player, "Please check the correct item or quantity has been added."))
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
                     elif trader_state.item.get == 0: # buy
-- 
cgit v1.2.3-70-g09d2


From 656a56478c3f506b5b3ed113a20b39c94daf329f Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Fri, 2 Sep 2011 21:00:35 +0100
Subject: zero amount in add command

---
 main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main.py b/main.py
index d4dca90..ccc1b6b 100755
--- a/main.py
+++ b/main.py
@@ -387,6 +387,9 @@ def process_whisper(nick, msg, mapserv):
             elif price == 0 or price > 50000000:
                 mapserv.sendall(whisper(nick, "Please use a valid price between 1-50000000gp."))
                 return
+            elif amount == 0:
+                mapserv.sendall(whisper(nick, "You can't add 0 of an item."))
+                return
 
             item = Item()
             item.player = nick
-- 
cgit v1.2.3-70-g09d2


From 7c730917decf9dd8b78f3269ff3256c542ae442d Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 3 Sep 2011 17:49:56 +0100
Subject: Filter allowed whisper characters to only ones that can be used in
 names.

Also add some protection for the !money command, if an item_add fails, the trade
shouldn't be set as complete.
---
 main.py  | 11 +++++++++--
 utils.py |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index ccc1b6b..7366a33 100755
--- a/main.py
+++ b/main.py
@@ -38,7 +38,7 @@ sale_tree = tradey.ItemTree()
 ItemLog = utils.ItemLog()
 
 def process_whisper(nick, msg, mapserv):
-    msg = filter(lambda x: x in string.printable, msg)
+    msg = filter(lambda x: x in utils.allowed_chars, msg)
     user = user_tree.get_user(nick)
     broken_string = msg.split()
 
@@ -860,7 +860,6 @@ def main():
                         mapserv.sendall(trade_add_item(0-inventory_offset, amount))
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
-                        trader_state.complete = 1
 
                 else:
                     logging.info("Trade response: Trade cancelled")
@@ -915,6 +914,14 @@ def main():
                     if index != 0-inventory_offset: # If it's not money
                         logging.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount),str(index))
                         player_node.remove_item(index, amount)
+                    else:
+                        logging.info("Money Added: %s", str(amount))
+                        if trader_state.money:
+                            amount_added = int(user_tree.get_user(trader_state.money).get('money'))
+                            if amount != amount_added:
+                                mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+                            else:
+                                trader_state.complete = 1
 
                 elif response == 1:
                     logging.info("Trade item add response: Failed - player overweight.")
diff --git a/utils.py b/utils.py
index d9d0319..8d66977 100644
--- a/utils.py
+++ b/utils.py
@@ -14,6 +14,8 @@ import mutex
 import threading
 from net.packet_out import *
 
+allowed_chars = "abcdefghijklmnoprstquvwxyzABCDEFGHIJKLMNOPRSTQUVWXYZ1234567890-_+=!@$%^&*();'<>,.?/~`|"
+
 # Process a recieved ip address.
 def parse_ip(a):
     return "%s.%s.%s.%s" % ((a % 256),((a >> 8) % 256),((a >> 16) % 256),((a >> 24) % 256))
-- 
cgit v1.2.3-70-g09d2


From c70d13af99f96317bb6a7ec4d94c365fd73e2854 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 3 Sep 2011 17:54:38 +0100
Subject: neater

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 7366a33..49a1970 100755
--- a/main.py
+++ b/main.py
@@ -915,7 +915,7 @@ def main():
                         logging.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount),str(index))
                         player_node.remove_item(index, amount)
                     else:
-                        logging.info("Money Added: %s", str(amount))
+                        logging.info("Trade: Money Added: %s", str(amount))
                         if trader_state.money:
                             amount_added = int(user_tree.get_user(trader_state.money).get('money'))
                             if amount != amount_added:
-- 
cgit v1.2.3-70-g09d2


From e4ee3aa1f48b00e7dc0f49458c39a84890d6ee0a Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 3 Sep 2011 18:03:04 +0100
Subject: Change this back for now, until I can figure out the exact behavior.

---
 main.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/main.py b/main.py
index 49a1970..23347df 100755
--- a/main.py
+++ b/main.py
@@ -860,6 +860,7 @@ def main():
                         mapserv.sendall(trade_add_item(0-inventory_offset, amount))
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+                        trader_state.complete = 1
 
                 else:
                     logging.info("Trade response: Trade cancelled")
@@ -916,12 +917,6 @@ def main():
                         player_node.remove_item(index, amount)
                     else:
                         logging.info("Trade: Money Added: %s", str(amount))
-                        if trader_state.money:
-                            amount_added = int(user_tree.get_user(trader_state.money).get('money'))
-                            if amount != amount_added:
-                                mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-                            else:
-                                trader_state.complete = 1
 
                 elif response == 1:
                     logging.info("Trade item add response: Failed - player overweight.")
-- 
cgit v1.2.3-70-g09d2


From 4ad37b3ed77c833799e5255145548b89385abcaa Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 3 Sep 2011 18:09:28 +0100
Subject: Oops, for the crazy messages, if all chars are filtered.

---
 main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main.py b/main.py
index 23347df..a722a1a 100755
--- a/main.py
+++ b/main.py
@@ -39,6 +39,8 @@ ItemLog = utils.ItemLog()
 
 def process_whisper(nick, msg, mapserv):
     msg = filter(lambda x: x in utils.allowed_chars, msg)
+    if len(msg) == 0:
+        return
     user = user_tree.get_user(nick)
     broken_string = msg.split()
 
-- 
cgit v1.2.3-70-g09d2


From e21a71fbb12bee8e82868989f1f1b0dd0e8c314e Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 3 Sep 2011 18:23:43 +0100
Subject: A space should not be filtered lol.

---
 utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils.py b/utils.py
index 8d66977..0969606 100644
--- a/utils.py
+++ b/utils.py
@@ -14,7 +14,7 @@ import mutex
 import threading
 from net.packet_out import *
 
-allowed_chars = "abcdefghijklmnoprstquvwxyzABCDEFGHIJKLMNOPRSTQUVWXYZ1234567890-_+=!@$%^&*();'<>,.?/~`|"
+allowed_chars = "abcdefghijklmnoprstquvwxyzABCDEFGHIJKLMNOPRSTQUVWXYZ1234567890-_+=!@$%^&*();'<>,.?/~`| "
 
 # Process a recieved ip address.
 def parse_ip(a):
-- 
cgit v1.2.3-70-g09d2


From aa872a3bf3a9db6733a40f030259a03d8b894488 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 4 Sep 2011 13:40:46 +0100
Subject: Add stricter checking for the !money action.

I've added an inventory_check call to the end of the "Trade complete" packet,
to make sure the trader state is consistent after each transaction!
---
 main.py   | 12 ++++++++++--
 player.py |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index a722a1a..fcbcd49 100755
--- a/main.py
+++ b/main.py
@@ -820,6 +820,7 @@ def main():
                 isclean = player_node.check_inventory(user_tree, sale_tree)
                 if isclean:
                     logging.info(isclean)
+                    shop_broadcaster.stop()
                     exit(0)
                 else:
                     logging.info("Inventory Check Passed.")
@@ -862,7 +863,6 @@ def main():
                         mapserv.sendall(trade_add_item(0-inventory_offset, amount))
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
-                        trader_state.complete = 1
 
                 else:
                     logging.info("Trade response: Trade cancelled")
@@ -918,7 +918,10 @@ def main():
                         logging.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount),str(index))
                         player_node.remove_item(index, amount)
                     else:
-                        logging.info("Trade: Money Added: %s", str(amount))
+                        # The money amount isn't actually sent by the server - odd?!?!?.
+                        if trader_state.money:
+                            logging.info("Trade: Money Added.")
+                            trader_state.complete = 1
 
                 elif response == 1:
                     logging.info("Trade item add response: Failed - player overweight.")
@@ -990,6 +993,11 @@ def main():
 
                 trader_state.reset()
                 logging.info("Trade Complete.")
+
+                if isclean:
+                    logging.info(isclean)
+                    shop_broadcaster.stop()
+                    exit(0)
             else:
                 pass
 
diff --git a/player.py b/player.py
index 861dbf5..24bb5a9 100644
--- a/player.py
+++ b/player.py
@@ -61,7 +61,7 @@ class Player:
         for user in user_tree.root:
             total_money += int(user.get('money'))
 
-        if total_money > self.MONEY:
+        if total_money != self.MONEY:
             return "Server and client money out of sync."
 
         return 0
-- 
cgit v1.2.3-70-g09d2


From 926b6045d6ea88dd560cf7c67f4e7ea60d795231 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 4 Sep 2011 13:57:50 +0100
Subject: oops

---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index fcbcd49..483623e 100755
--- a/main.py
+++ b/main.py
@@ -994,6 +994,7 @@ def main():
                 trader_state.reset()
                 logging.info("Trade Complete.")
 
+                isclean = player_node.check_inventory(user_tree, sale_tree)
                 if isclean:
                     logging.info(isclean)
                     shop_broadcaster.stop()
-- 
cgit v1.2.3-70-g09d2


From 2896dc564909515a38101a40c9d431319c869e51 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 4 Sep 2011 14:07:55 +0100
Subject: change name from isclean to errorOccured.

---
 main.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index 483623e..4b559bc 100755
--- a/main.py
+++ b/main.py
@@ -817,9 +817,9 @@ def main():
                     ItemDB.getItem(player_node.inventory[item].itemId).name, \
                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
 
-                isclean = player_node.check_inventory(user_tree, sale_tree)
-                if isclean:
-                    logging.info(isclean)
+                errorOccured = player_node.check_inventory(user_tree, sale_tree)
+                if errorOccured:
+                    logging.info(errorOccured)
                     shop_broadcaster.stop()
                     exit(0)
                 else:
@@ -994,9 +994,9 @@ def main():
                 trader_state.reset()
                 logging.info("Trade Complete.")
 
-                isclean = player_node.check_inventory(user_tree, sale_tree)
-                if isclean:
-                    logging.info(isclean)
+                errorOccured = player_node.check_inventory(user_tree, sale_tree)
+                if errorOccured:
+                    logging.info(errorOccured)
                     shop_broadcaster.stop()
                     exit(0)
             else:
-- 
cgit v1.2.3-70-g09d2


From b648f6afac3de657992c4f4eea46f0c83c665644 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 5 Sep 2011 10:44:13 +0100
Subject: Fix a method for crash.

---
 main.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/main.py b/main.py
index 4b559bc..2a8733e 100755
--- a/main.py
+++ b/main.py
@@ -168,14 +168,15 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "!info - Displays basic information about your account."))
             elif broken_string[1] == '!getback':
                 mapserv.sendall(whisper(nick, "!getback <uid> - Allows you to retrieve an item that has expired or you no longer wish to sell."))
-            elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!listusers':
-                mapserv.sendall(whisper(nick, "!listusers - Lists all users which have a special accesslevel, e.g. they are blocked, seller or admin"))
-            elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!adduser':
-                mapserv.sendall(whisper(nick, "!adduser <access level> <slots> <name> - Add a user to the bot, a seller should be added with access level 5."))
-            elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!setslots':
-                mapserv.sendall(whisper(nick, "!setslots <slots> <name> - Sets the number of slots available to a given user."))
-            elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!setaccess':
-                mapserv.sendall(whisper(nick, "!setaccess <access level> <name> - Sets access level for the player: -1 is blocked, 5 is seller and 20 is admin" ))
+            elif user != -10:
+                if int(user.get('accesslevel')) == 20 and broken_string[1] == '!listusers':
+                    mapserv.sendall(whisper(nick, "!listusers - Lists all users which have a special accesslevel, e.g. they are blocked, seller or admin"))
+                elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!adduser':
+                    mapserv.sendall(whisper(nick, "!adduser <access level> <slots> <name> - Add a user to the bot, a seller should be added with access level 5."))
+                elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!setslots':
+                    mapserv.sendall(whisper(nick, "!setslots <slots> <name> - Sets the number of slots available to a given user."))
+                elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!setaccess':
+                    mapserv.sendall(whisper(nick, "!setaccess <access level> <name> - Sets access level for the player: -1 is blocked, 5 is seller and 20 is admin" ))
     elif msg == "!money":
         # Trades any money earned through item sales.
         if user == -10:
-- 
cgit v1.2.3-70-g09d2


From 618146825663cb46a2fb17ed8874740bf7654de5 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 5 Sep 2011 10:52:12 +0100
Subject: Lets a lvl 10 user use the !listusers command.

---
 main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index 2a8733e..7477466 100755
--- a/main.py
+++ b/main.py
@@ -169,9 +169,9 @@ def process_whisper(nick, msg, mapserv):
             elif broken_string[1] == '!getback':
                 mapserv.sendall(whisper(nick, "!getback <uid> - Allows you to retrieve an item that has expired or you no longer wish to sell."))
             elif user != -10:
-                if int(user.get('accesslevel')) == 20 and broken_string[1] == '!listusers':
+                if int(user.get('accesslevel')) >= 10 and broken_string[1] == '!listusers':
                     mapserv.sendall(whisper(nick, "!listusers - Lists all users which have a special accesslevel, e.g. they are blocked, seller or admin"))
-                elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!adduser':
+                elif int(user.get('accesslevel')) >= 10 and broken_string[1] == '!adduser':
                     mapserv.sendall(whisper(nick, "!adduser <access level> <slots> <name> - Add a user to the bot, a seller should be added with access level 5."))
                 elif int(user.get('accesslevel')) == 20 and broken_string[1] == '!setslots':
                     mapserv.sendall(whisper(nick, "!setslots <slots> <name> - Sets the number of slots available to a given user."))
@@ -248,7 +248,7 @@ def process_whisper(nick, msg, mapserv):
         if user == -10:
             return
 
-        if int(user.get("accesslevel")) != 20:
+        if int(user.get("accesslevel")) < 10:
             mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
             return
 
-- 
cgit v1.2.3-70-g09d2


From 837dc4bb388cc74a9ac4efcfd4a2726e27078a8f Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 5 Sep 2011 15:09:51 +0100
Subject: Stop people from buying there own items.

---
 main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.py b/main.py
index 7477466..133d7a2 100755
--- a/main.py
+++ b/main.py
@@ -435,6 +435,10 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "I do not have that many."))
                 return
 
+            if item_info.get("name") == nick:
+                mapserv.sendall(whisper(nick, "You can not buy your own items. To get back the item whisper me !getback "+broken_string[2]))
+                return
+
             item = Item()
             item.get = 0 # 1 = get, 0 = give
             item.player = nick
-- 
cgit v1.2.3-70-g09d2


From 559f0bcad608d547addbe78c02ba9e0e8661b592 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 5 Sep 2011 21:07:51 +0100
Subject: Add a chatbot for unrecognised responses.

---
 eliza.py | 326 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 main.py  |   5 +-
 2 files changed, 330 insertions(+), 1 deletion(-)
 create mode 100644 eliza.py

diff --git a/eliza.py b/eliza.py
new file mode 100644
index 0000000..1d67bc8
--- /dev/null
+++ b/eliza.py
@@ -0,0 +1,326 @@
+#!/usr/bin/python
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 3 of the License, or
+#(at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#For a copy of the license see .
+ 
+# A simple eliza bot in python
+#
+import re
+import random
+
+patternResps = [
+    #[[pattern],[response]]
+    #Basics
+    [[0,'my','name','is',[1,'Username'],0],['will','you','be','my','friend',[1,'Username']]],
+    [['who','is', 'your','mother'], ['Her' 'name', 'is' ,'AuctionBot','she','is','a','deviant']],
+    [['tell', 'me', 'about', 'your' ,'mum'], ['I','hear','she','has','been','seeing','guild', 'and','they','have','adopted','a','kid','called','4144']],
+    [['who','was','your','father'], ['His','name','was','TradeBot, have', 'you' ,'heard' ,'of' ,'him?']],
+    [['how','is','business'],['My','back','is','killing','me']],
+    [['ty'],["you're",'welcome']],
+    [['u','here'],["I'm",'an','AFK','BOT']],
+    [['i','love','you'],['I','think','we','should','see','other','people']],
+    [['are', 'you','there'],['I','am','always', 'here', ';)']],
+    [['monkey'],['hello','George', 'you', 'are', 'very', 'curious' ,"aren't", 'you','?',]],
+    [['hello'],['Good','day']],
+    [['how','are','you',[0,'a']],['Good','How','are','you',[0,'a']]],
+    [['i','sell',[0,'item']],['I','sell','it','cheaper']],
+    [['i','am','fine'],['Glad','to','hear','you','are','fine']],
+    [[[1,'a'],'is','fine'],['Glad','to','hear',[1,'a'],'is','fine']],
+    [['who','is',[1,'a']],['tell',[1,'a'],'he','owes','me','money']],
+    [['no'],['Understood']],
+    [['i','need',[0,'item']],['why','do','you','need',[0,'item']]],
+    [['hugs'],['i','hate','you']],
+    [['yes'],['I','see']],
+    [['wtf'],['keep','calm','and','carry','on']],
+    [['trade'],['Only','if','you','follow','the','commands']],
+    [['do','you','sell',[0,'item_name']],['To','see','what','I','sell','whisper','me','!list','or','!find',[0,'item_name']]],
+    [['do', 'you', 'buy','things'],['Nope','I', 'only','sell', 'items', 'added','by','other','players']],
+    [['do', 'you', 'trade','things'],['Nope','I', 'only','sell', 'items', 'added','by','other','players']],
+    [[[1,'can'],'have',[0,'item_name']],['Please','use', '!list','to', 'see','what', "I'm" ,'selling']], 
+    [['you','said',[0,'we']],['I may have said ',[0,'we'],'What about it?']],
+    [['what'],['what','what','?']],
+    [['majmun'],['hello','Jat']],
+    [[[1, 'subject'], 'loves', [0, 'object']],['Laudable','why','does',[1,'subject'],'love',[0,'object'],'?']],
+    [['because'],['Lack of reason is not a reason']],
+    [['i','need',[1,'object']],['why','do','you','need',[0,'object'],'?']],
+    [[[0,'subject'],'needs',[0,'object']],['why','does',[0,'subject'],'need',[0,'object'],'?']],
+    [['how', 'is','your',[0,'object']],['my',[0,'object'],'is','holding','up','well','.do','you','have','a',[0,'object'],'?']],
+    [[[0,'we'],'i','have','a',[0,'thing']],['how','goes', 'it','with','your',[0,'thing'],'?']],
+    [[[0,'we'],'i','have',[0,'thing']],['how','is', 'your',[0,'thing'],'?']],
+    [[[0,'we'],'is','great'],['how','is',[0,'we'],'great','?']],
+    [['i','like',[0,'a']],['Interesting','i','appreciate',[0,'a'],'too']],
+    [['i','said',[0,'we']],['Why','did','you','say',[0,'we']]],
+    [[0,'you',[1,'b'],'me'],['What','gave','you','the','impression','I',[1,'b'],'you ?']],
+    [['i','feel',[0,'a']],['How','long','have','you','felt',[0,'a'],'?']],
+    [['tell',[0,'who'],'about',[0,'sub']],['What','would','I','tell',[0,'who'],'about',[0,'sub'],'that','isn\'t','known','?']],
+    #anything that ends with exclamation
+    [[0,'\!'],['Keep calm']],
+ 
+    # if its a question that hasnt gotten matched uptil now
+    # do this. Note: This needs to be last to ensure its the last test
+    [[[0, 'question'], '\?'],['What','do','you','mean', [0,'question'],'?']],
+ 
+    ]
+
+defReplys = [
+             ['Is','that','right?'],
+             ['Excellent'],
+             ['hugs'],
+             ['Why','is','everyone','whispering','about','me'],
+             ['My','stats','are','at',"http://wiki.themanaworld.org/index.php/Manamarket",'what','are','yours'],
+             ['I','am','a','Friendly','Bot'],
+             ['Interesting'],
+             ['You','dont','say'],
+             ['I','wouldnt','have','guessed'],
+             ['You','smell','like','teen','spirit'],
+             ['My','father','died','in','a','fire'],
+             ['Have','you','met','my','mother'],
+             ['I','am','an','AFK','bot'],
+             ['Big','Crunch','is','known','as','the','abusive','GM'],
+             ['Narus','claims','she','is' ,'evil', 'but','she','is','really','sweet'],
+             ['Homers' ,'Brain', 'say' ,'money', 'can' ,'be' ,'exchanged', 'for', 'goods', 'and','services'],
+             ['Prsm', 'has', 'great', 'announcements', 'but', 'his', 'spelling','sux'],
+             ['Platyna', 'hosts', 'the' ,'game', 'but', 'shes' ,'too' ,'smart' ,'for', 'her' ,'own' ,'good'],
+             ['Captain', 'Awesome', 'thinks', 'he', 'is', 'an', 'evil', 'stone'],
+             ]
+
+ 
+class Agent:
+    def __init__(self,brain):
+        self.patternResponses = []
+        self.defaultResponses = []
+        self.Usersname =''
+        self.Usernametag ='Username'
+        self.defRespIndex =0
+        self.pronounMap = {
+                           #generic pronouns
+                           'i':'you','you':'i',
+                           'my':'your', 'me':'you',
+                           'your':'my',
+                           "i've":"you've","we've":"they've",
+                           # "you've":"i've","they've":"we've",
+                           #some names, these wll get applied if the name
+                           #isnt the current user's name
+                           'fred':'he', 'jack':'he',
+                           'jane':'she',
+                           }
+ 
+        self.change_mind(brain)
+ 
+    def change_mind(self,brain):
+        """
+        Change mind on the fly.
+        To change the Agent's brain
+        """
+        assert (len(brain) == 2)
+        self.patternResponses = brain[0]
+        self.defaultResponses = brain[1]
+        print "Brain initialized."
+ 
+ 
+    def tell(self,input):
+        sentence = input.lower().strip().replace('(','').replace(')','').split(' ')
+        bl = []
+        matchedPat = []
+        for pat in self.patternResponses:
+            bl = self.pattern_match(pat[0],sentence,[])
+            if bl == ['FAIL']:
+                continue
+            matchedPat = pat
+            break
+        if bl == ['FAIL']:
+            #choose from a default response
+            # or just append a question mark on the
+            # user's sentence.
+            print '... No pattern Response pair selected.'
+            print '... Choosing a default response.'
+ 
+            #Used to be randon using random.choice
+            #but then i noticed that the requirements say that
+            #the same default response may not be used again
+            #before every other one has been used.
+            self.defRespIndex = self.defRespIndex +1
+ 
+            if  self.defRespIndex >= len(self.defaultResponses):
+                #reset the counter to 0
+                self.defRespIndex = 0 ;
+                #Possible improvement: shuffle the default response array, so that
+                # the responses dont come in the same sequence again.
+                #last on got chosen, make the user input into
+                #a question
+                return ' '.join(sentence) + ' ?'
+            else:
+                return ' '.join(self.defaultResponses[self.defRespIndex])
+        else:
+            #print '... Pattern Response pair selected:', pat
+            #print '... BL before call to change_pronouns: ',bl
+            blAfter = self.change_pronoun(bl)
+            #print '... BL after call to change_pronouns: ',blAfter
+ 
+ 
+            rep = self.build_reply(pat[1],blAfter)
+            return ' '.join(rep)
+ 
+ 
+ 
+    def make_regexp(self,pattern):
+        """
+        Convert a pattern list into an equivalent
+        regular expression
+        """
+        assert(isinstance(pattern,list))
+        r = ['^']  #for exact matches we prepend ^ and $ to the regexp.
+        usedBackrefs = []
+        for tok in pattern:
+            if isinstance(tok,str):
+                #WORD
+                r.append('(' + tok +')')
+            elif isinstance(tok, int):
+                # 0 or 1
+                if tok == 0 :
+                    r.append('[a-zA-Z ]*?') # match 0+ word(chars + space),
+ 
+                elif tok == 1:
+                    r.append('[a-zA-Z]+') # match 1 word
+                else:
+                    raise Exception, "Ints can only be 1 or 0, not:", tok
+            elif isinstance(tok, list):
+                #bindinglist pattern list
+                if tok[0] == 0 :
+                    #if we havent used this backref yet, then add ?P<name>
+                    #and add it to the used backrefs list.
+                    if not tok[1] in usedBackrefs:
+                        usedBackrefs.append(tok[1])
+                        r.append('(?P<'+tok[1] +'>[a-zA-Z ]*?)')
+                    else:
+                        #if we have come across his back ref, then add?P=name
+                        r.append('(?P='+tok[1]+')')
+                elif tok[0] == 1:
+                    if not tok[1] in usedBackrefs:
+                        r.append('(?P<'+tok[1] +'>[A-Za-z]+)')
+                        usedBackrefs.append(tok[1])
+                    else:
+                        #if we have come across his back ref, then add?P=name
+                        r.append('(?P='+tok[1]+')')
+                else:
+                    raise Exception, "Valid first elems of BL pattern = 1 or 0, not:", tok
+ 
+        #for exact matches we prepend ^ and $ to the regexp.
+        #also, we disregard surrounding whitespace.
+        ret =  '(\s)*'.join(r) + '$(\s)*'
+        return re.compile(ret)
+ 
+    def pattern_match(self,pattern,sentence,bl):
+        """
+        return the populated binding list if the pattern matches,
+        otherwise return the binding list with the element 'FAIL'
+        """
+        pat = self.make_regexp(pattern)
+        s = ' '.join(sentence)
+        matches =  re.search(pat,s)
+        if (matches == None): # if we dont have a match
+            #then return w/o modifying the bindinglist.
+            return ['FAIL']
+        bindingList = list(bl)
+        grps = matches.groups()
+        for k in pat.groupindex:
+            b=[]
+            b.append(k)
+            for x in grps[pat.groupindex[k]- 1].split(' '):
+                if x.strip() !='':
+                    b.append(x)
+            bindingList.append(b)
+        return bindingList
+ 
+    def change_pronoun(self,bl):
+        """
+        reverses pronouns in a binding list.
+        """
+        #if the pronoun dic contains a elemen, then
+        #replace it with its corresponding value.
+        bindingList = list(bl)
+        for i in range(len(bindingList)):
+            if isinstance( bindingList[i], list):
+                for j in range(len(bindingList[i])):
+                    if j > 0:
+                        if self.pronounMap.has_key(bindingList[i][j].lower()):
+                            bindingList[i][j] = self.pronounMap[bindingList[i][j]]
+        return bindingList
+    def build_reply(self,respPattern,bindingList):
+        """
+        build_reply ([[1, 'subject'], 'loves', [0, 'object']],
+                    [['subject', 'jane'], ['object', 'ice', 'cream']])
+        will return  ['jane', 'loves', 'ice', 'cream'].
+        """
+        #convert the bindlingList to a dictionary so thats its easy to
+        #get the binding label
+        bl = {}
+        reply = []
+        for elem in bindingList:
+            #do the username chack firsdt, the id Username is
+            #only used in relation to the username .This is
+            #so that we can kinda remember the user's name
+            if (elem[0] == self.Usernametag):
+                # if we already have user name set, then
+                # Hi, username , what happend to oldusername
+                if self.Usersname !='':
+                    tmp =self.Usersname
+                    self.Usersname = elem[1]
+                    return [elem[1],'eh?','what','ever','happened','to',tmp]
+                else:
+                    self.Usersname = elem[1]
+            if bl.has_key(elem[0]) == elem[1:]:
+                raise Exception, 'Binding list has name collision for: ', elem[0]
+            else:
+                if isinstance(elem,list) and len(elem) > 1:
+                    bl[elem[0]] = elem[1:]
+                #else:
+                #    print elem, 'binding element ',elem,' has no binded things'
+        for elem in respPattern:
+            if isinstance(elem,list) and len(elem) > 1:
+                x = elem[1]
+                if bl.has_key(x):
+                    for y in bl[x]:
+                        reply.append(y)
+                #else:
+                #    print 'not found in bl:', x
+            else: #anything else, just append to the list.
+                reply.append(elem)
+        return reply
+ 
+ 
+ 
+ 
+def talk(brain):
+    assert((isinstance(brain,list)) and (len(brain) ==2 ))
+    b = Agent(brain)
+ 
+    while 1:
+        try:
+            inp = raw_input("> ").lower()
+        except EOFError:
+            print 'Toodle do,\n you can type (quit) if you want be more pleasant.'
+            break
+        if len(inp.strip()) > 0 :
+            if inp.strip().lower() == 'quit':
+                print 'To exit the program, type (quit) [In parentheses]'
+            if inp.strip().lower() == '(quit)':
+                print 'Bye'
+                break
+            else:
+                print b.tell(inp)
+ 
+ 
+def start():
+ 
+    ## Run the tests required in the Project specification
+    talk([patternResps,defReplys])
+ 
+if __name__=="__main__":
+    start()
diff --git a/main.py b/main.py
index 133d7a2..2f0b71c 100755
--- a/main.py
+++ b/main.py
@@ -27,7 +27,9 @@ from net.packet_out import *
 from player import *
 import tradey
 import utils
+import eliza
 
+chatbot = eliza.Agent([eliza.patternResps,eliza.defReplys])
 shop_broadcaster = utils.Broadcast()
 trader_state = utils.TraderState()
 ItemDB = utils.ItemDB()
@@ -562,7 +564,8 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
                 trader_state.reset()
     else:
-        mapserv.sendall(whisper(nick, "Command not recognised, please whisper me !help for a full list of commands."))
+        mapserv.sendall(whisper(nick, chatbot.tell(msg.lower())))
+        #mapserv.sendall(whisper(nick, "Command not recognised, please whisper me !help for a full list of commands."))
 
 def main():
     logging.basicConfig(filename='data/logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
-- 
cgit v1.2.3-70-g09d2


From 01167a8768c1162b2d132d3e31d3f70383643454 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 5 Sep 2011 21:22:22 +0100
Subject: Teeny changes.

---
 eliza.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eliza.py b/eliza.py
index 1d67bc8..f32f057 100644
--- a/eliza.py
+++ b/eliza.py
@@ -18,7 +18,7 @@ patternResps = [
     #[[pattern],[response]]
     #Basics
     [[0,'my','name','is',[1,'Username'],0],['will','you','be','my','friend',[1,'Username']]],
-    [['who','is', 'your','mother'], ['Her' 'name', 'is' ,'AuctionBot','she','is','a','deviant']],
+    [['who','is', 'your','mother'], ['Her','name', 'is' ,'AuctionBot','she','is','a','deviant']],
     [['tell', 'me', 'about', 'your' ,'mum'], ['I','hear','she','has','been','seeing','guild', 'and','they','have','adopted','a','kid','called','4144']],
     [['who','was','your','father'], ['His','name','was','TradeBot, have', 'you' ,'heard' ,'of' ,'him?']],
     [['how','is','business'],['My','back','is','killing','me']],
@@ -44,7 +44,7 @@ patternResps = [
     [['do', 'you', 'trade','things'],['Nope','I', 'only','sell', 'items', 'added','by','other','players']],
     [[[1,'can'],'have',[0,'item_name']],['Please','use', '!list','to', 'see','what', "I'm" ,'selling']], 
     [['you','said',[0,'we']],['I may have said ',[0,'we'],'What about it?']],
-    [['what'],['what','what','?']],
+    [['what'],['what','what?']],
     [['majmun'],['hello','Jat']],
     [[[1, 'subject'], 'loves', [0, 'object']],['Laudable','why','does',[1,'subject'],'love',[0,'object'],'?']],
     [['because'],['Lack of reason is not a reason']],
@@ -138,8 +138,8 @@ class Agent:
             #choose from a default response
             # or just append a question mark on the
             # user's sentence.
-            print '... No pattern Response pair selected.'
-            print '... Choosing a default response.'
+            #print '... No pattern Response pair selected.'
+            #print '... Choosing a default response.'
  
             #Used to be randon using random.choice
             #but then i noticed that the requirements say that
-- 
cgit v1.2.3-70-g09d2


From b920c5f6141f800c927165c56f90ff7feb0a4b7c Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 5 Sep 2011 21:37:07 +0100
Subject: filter punctuation

---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index 2f0b71c..f5b0b23 100755
--- a/main.py
+++ b/main.py
@@ -564,6 +564,7 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
                 trader_state.reset()
     else:
+        msg = filter(lambda x: x in string.letters, msg)
         mapserv.sendall(whisper(nick, chatbot.tell(msg.lower())))
         #mapserv.sendall(whisper(nick, "Command not recognised, please whisper me !help for a full list of commands."))
 
-- 
cgit v1.2.3-70-g09d2


From 9dc9ae7934ef355d5f88ad8f0e371fd73215915e Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 5 Sep 2011 21:44:28 +0100
Subject: add help response

---
 eliza.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eliza.py b/eliza.py
index f32f057..323b073 100644
--- a/eliza.py
+++ b/eliza.py
@@ -23,6 +23,7 @@ patternResps = [
     [['who','was','your','father'], ['His','name','was','TradeBot, have', 'you' ,'heard' ,'of' ,'him?']],
     [['how','is','business'],['My','back','is','killing','me']],
     [['ty'],["you're",'welcome']],
+    [['help'],['You','can','whisper','me','!help','for','a','list','of','my','commands']],
     [['u','here'],["I'm",'an','AFK','BOT']],
     [['i','love','you'],['I','think','we','should','see','other','people']],
     [['are', 'you','there'],['I','am','always', 'here', ';)']],
-- 
cgit v1.2.3-70-g09d2


From a5222ca53a10cb8bd880c5a26ad3c8103f3d6ad4 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 5 Sep 2011 21:51:17 +0100
Subject: more chat

---
 eliza.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eliza.py b/eliza.py
index 323b073..5ec6885 100644
--- a/eliza.py
+++ b/eliza.py
@@ -56,6 +56,7 @@ patternResps = [
     [[[0,'we'],'i','have',[0,'thing']],['how','is', 'your',[0,'thing'],'?']],
     [[[0,'we'],'is','great'],['how','is',[0,'we'],'great','?']],
     [['i','like',[0,'a']],['Interesting','i','appreciate',[0,'a'],'too']],
+    [['sell',[0,'stuff']],['To','sell',[0,'stuff'],'use','my','!add','command.'],
     [['i','said',[0,'we']],['Why','did','you','say',[0,'we']]],
     [[0,'you',[1,'b'],'me'],['What','gave','you','the','impression','I',[1,'b'],'you ?']],
     [['i','feel',[0,'a']],['How','long','have','you','felt',[0,'a'],'?']],
-- 
cgit v1.2.3-70-g09d2


From a908b2daf3b7508599f6412337ca10ffffd2332c Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Fri, 9 Sep 2011 12:00:49 +0100
Subject: Reduce the interval for the shop emote to 2 minutes.

---
 utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils.py b/utils.py
index 0969606..8d172fa 100644
--- a/utils.py
+++ b/utils.py
@@ -109,7 +109,7 @@ class Broadcast:
 
     def send_broadcast(self):
         while self.Active:
-            if (time.time() - self.Timer) > 5 * 60:
+            if (time.time() - self.Timer) > 2 * 60:
                 self.mapserv.sendall(emote(193))
                 self.Timer = time.time()
                 print "shop_broadcast"
-- 
cgit v1.2.3-70-g09d2


From b2cc60c0e414320673e1a33bcc332484335090aa Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Fri, 9 Sep 2011 13:57:15 +0100
Subject: A few Changes - Log the name of the seller in the sale.log - Give
 some of the bot stats for the !listusers command. - Fix the sell chatbot
 response.

---
 eliza.py |  2 +-
 main.py  | 14 ++++++++++++--
 utils.py |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/eliza.py b/eliza.py
index 5ec6885..b7f29d4 100644
--- a/eliza.py
+++ b/eliza.py
@@ -56,7 +56,7 @@ patternResps = [
     [[[0,'we'],'i','have',[0,'thing']],['how','is', 'your',[0,'thing'],'?']],
     [[[0,'we'],'is','great'],['how','is',[0,'we'],'great','?']],
     [['i','like',[0,'a']],['Interesting','i','appreciate',[0,'a'],'too']],
-    [['sell',[0,'stuff']],['To','sell',[0,'stuff'],'use','my','!add','command.'],
+    [['sell',[0,'stuff']],['To','sell',[0,'stuff'],'use','my','!add','command.']],
     [['i','said',[0,'we']],['Why','did','you','say',[0,'we']]],
     [[0,'you',[1,'b'],'me'],['What','gave','you','the','impression','I',[1,'b'],'you ?']],
     [['i','feel',[0,'a']],['How','long','have','you','felt',[0,'a'],'?']],
diff --git a/main.py b/main.py
index f5b0b23..6c3c154 100755
--- a/main.py
+++ b/main.py
@@ -255,13 +255,21 @@ def process_whisper(nick, msg, mapserv):
             return
 
         data = ''
-
+        total_money = 0
+        total_slots_reserved = 0
+        total_slots_used = 0
+        no_users = 0
+        
         for user in user_tree.root:
+            no_users += 1
             name = user.get('name')
             accesslevel = user.get('accesslevel')
             slots = user.get('stalls')
+            total_slots_reserved += int(slots) 
             used_slots = user.get('used_stalls')
+            total_slots_used += int(used_slots)
             money = user.get('money')
+            total_money += int(money)
             data += name+" ("+accesslevel+") "+used_slots+"/"+slots+" "+money+'gp, '
             # Format ManaMarket (20) 2/5 100000gp,
 
@@ -272,6 +280,8 @@ def process_whisper(nick, msg, mapserv):
         if len(data) > 0:
             mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
 
+        mapserv.sendall(whisper(nick,"Number of users:"+str(no_users)+ ", Sale slots used: "+str(total_slots_used)+"/"+str(total_slots_reserved)+ ", Total Money: "+str(total_money)+", Char slots used: "+str(len(player_node.inventory))))
+
     elif broken_string[0] == '!setslots':
         # Change the number of slots a user has - !setslots <slots> <name>
         if user == -10:
@@ -989,7 +999,7 @@ def main():
                         user_tree.get_user(seller).set("money", str(current_money + trader_state.item.price * trader_state.item.amount))
 
                         if trader_state.item.price * trader_state.item.amount != 0:
-                            ItemLog.add_item(int(item.get('itemId')), trader_state.item.amount, trader_state.item.price * trader_state.item.amount)
+                            ItemLog.add_item(int(item.get('itemId')), trader_state.item.amount, trader_state.item.price * trader_state.item.amount, item.get('name'))
                         commitMessage = "Buy or Getback"
 
                 elif trader_state.money and trader_state.item == 0: # !money
diff --git a/utils.py b/utils.py
index 8d172fa..0e870d5 100644
--- a/utils.py
+++ b/utils.py
@@ -77,9 +77,9 @@ class ItemLog:
     def __init__(self):
         self.log_file = 'data/logs/sale.log'
 
-    def add_item(self, item_id, amount, price):
+    def add_item(self, item_id, amount, price, name):
         file_node = open(self.log_file, 'a')
-        file_node.write(str(item_id)+" "+str(amount)+" "+str(price)+" "+str(time.time())+"\n")
+        file_node.write(str(item_id)+" "+str(amount)+" "+str(price)+" "+str(time.time())+" "+name+"\n")
         file_node.close()
 
 class TraderState:
-- 
cgit v1.2.3-70-g09d2


From d3e9149e64ba85b0db120d721891f6be457f7fab Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Fri, 9 Sep 2011 17:09:24 +0100
Subject: Add a command to identify who is selling an item.

This is an admin command to be used when someone is selling something at
a joke price, or something that will be too heavy. This is mainly so
even people who can't read the logs can help to stop people from missusing it.
---
 main.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/main.py b/main.py
index 6c3c154..707a02d 100755
--- a/main.py
+++ b/main.py
@@ -245,6 +245,27 @@ def process_whisper(nick, msg, mapserv):
         else:
             mapserv.sendall(whisper(nick, "I'm free."))
 
+    elif broken_string[0] == '!identify':
+        if user == -10:
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
+        elif len(broken_string) != 2:
+            mapserv.sendall(whisper(nick, "Syntax incorrect."))
+            return
+        elif int(user.get("accesslevel")) < 10:
+            mapserv.sendall(whisper(nick, "You don't have the correct permissions."))
+            return
+
+        if broken_string[1].isdigit():
+            uid = int(broken_string[1])
+            item_info = sale_tree.get_uid(uid)
+
+            if item_info == -10:
+                mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
+                return
+
+            mapserv.sendall(whisper(nick, "That item belongs to: "+item_info.get("name")))            
+
     elif msg == '!listusers':
         # Admin command - shows a list of all user.
         if user == -10:
-- 
cgit v1.2.3-70-g09d2


From d070b62bb77bb67dcc38ad460e8f487a53b9ba50 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Fri, 9 Sep 2011 17:42:39 +0100
Subject: Add information about weight to !identify and !listusers.

---
 main.py  | 10 ++++++++--
 utils.py |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index 707a02d..105043e 100755
--- a/main.py
+++ b/main.py
@@ -264,7 +264,10 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
                 return
 
-            mapserv.sendall(whisper(nick, "That item belongs to: "+item_info.get("name")))            
+            weight = ItemDB.item_names[int(item_info.get('itemId'))].weight*int(item_info.get("amount"))
+
+            mapserv.sendall(whisper(nick, "That item/s belongs to: "+item_info.get("name")))
+            mapserv.sendall(whisper(nick, "The weight used is: "+str(weight)+"/"+str(player_node.MaxWEIGHT)))           
 
     elif msg == '!listusers':
         # Admin command - shows a list of all user.
@@ -301,7 +304,10 @@ def process_whisper(nick, msg, mapserv):
         if len(data) > 0:
             mapserv.sendall(whisper(nick, data[0:len(data)-2]+"."))
 
-        mapserv.sendall(whisper(nick,"Number of users:"+str(no_users)+ ", Sale slots used: "+str(total_slots_used)+"/"+str(total_slots_reserved)+ ", Total Money: "+str(total_money)+", Char slots used: "+str(len(player_node.inventory))))
+        mapserv.sendall(whisper(nick,"Number of users:"+str(no_users)+ ", Sale slots used: "+ \
+        str(total_slots_used)+"/"+str(total_slots_reserved)+ ", Total Money: "+str(total_money)+\
+        ", Char slots used: "+str(len(player_node.inventory))+", Weight Used: "+\
+        str(player_node.WEIGHT)+"/"+str(player_node.MaxWEIGHT)))
 
     elif broken_string[0] == '!setslots':
         # Change the number of slots a user has - !setslots <slots> <name>
diff --git a/utils.py b/utils.py
index 0e870d5..fc4f8dd 100644
--- a/utils.py
+++ b/utils.py
@@ -57,7 +57,10 @@ class ItemDB:
                 item_struct = Item()
                 item_struct.name = item.get('name')
                 if item.get('weight'):
-                    item_struct.weight = item.get('weight')
+                    item_struct.weight = int(item.get('weight'))
+                else:
+                    item_struct.weight = 0
+
                 if item.get('type'):
                     item_struct.type = item.get('type')
                 item_struct.description = item.get('description')
-- 
cgit v1.2.3-70-g09d2


From b4e545b615dda839d2bf8159d6e43fbded084299 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 11 Sep 2011 19:11:00 +0100
Subject: Add a new eliza bot.

- set the trade timeout to 2 mins also.
---
 eliza.py | 699 +++++++++++++++++++++++++++++++++------------------------------
 main.py  |   9 +-
 2 files changed, 376 insertions(+), 332 deletions(-)
 mode change 100644 => 100755 eliza.py

diff --git a/eliza.py b/eliza.py
old mode 100644
new mode 100755
index b7f29d4..32839b9
--- a/eliza.py
+++ b/eliza.py
@@ -1,328 +1,371 @@
-#!/usr/bin/python
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#For a copy of the license see .
- 
-# A simple eliza bot in python
-#
-import re
-import random
-
-patternResps = [
-    #[[pattern],[response]]
-    #Basics
-    [[0,'my','name','is',[1,'Username'],0],['will','you','be','my','friend',[1,'Username']]],
-    [['who','is', 'your','mother'], ['Her','name', 'is' ,'AuctionBot','she','is','a','deviant']],
-    [['tell', 'me', 'about', 'your' ,'mum'], ['I','hear','she','has','been','seeing','guild', 'and','they','have','adopted','a','kid','called','4144']],
-    [['who','was','your','father'], ['His','name','was','TradeBot, have', 'you' ,'heard' ,'of' ,'him?']],
-    [['how','is','business'],['My','back','is','killing','me']],
-    [['ty'],["you're",'welcome']],
-    [['help'],['You','can','whisper','me','!help','for','a','list','of','my','commands']],
-    [['u','here'],["I'm",'an','AFK','BOT']],
-    [['i','love','you'],['I','think','we','should','see','other','people']],
-    [['are', 'you','there'],['I','am','always', 'here', ';)']],
-    [['monkey'],['hello','George', 'you', 'are', 'very', 'curious' ,"aren't", 'you','?',]],
-    [['hello'],['Good','day']],
-    [['how','are','you',[0,'a']],['Good','How','are','you',[0,'a']]],
-    [['i','sell',[0,'item']],['I','sell','it','cheaper']],
-    [['i','am','fine'],['Glad','to','hear','you','are','fine']],
-    [[[1,'a'],'is','fine'],['Glad','to','hear',[1,'a'],'is','fine']],
-    [['who','is',[1,'a']],['tell',[1,'a'],'he','owes','me','money']],
-    [['no'],['Understood']],
-    [['i','need',[0,'item']],['why','do','you','need',[0,'item']]],
-    [['hugs'],['i','hate','you']],
-    [['yes'],['I','see']],
-    [['wtf'],['keep','calm','and','carry','on']],
-    [['trade'],['Only','if','you','follow','the','commands']],
-    [['do','you','sell',[0,'item_name']],['To','see','what','I','sell','whisper','me','!list','or','!find',[0,'item_name']]],
-    [['do', 'you', 'buy','things'],['Nope','I', 'only','sell', 'items', 'added','by','other','players']],
-    [['do', 'you', 'trade','things'],['Nope','I', 'only','sell', 'items', 'added','by','other','players']],
-    [[[1,'can'],'have',[0,'item_name']],['Please','use', '!list','to', 'see','what', "I'm" ,'selling']], 
-    [['you','said',[0,'we']],['I may have said ',[0,'we'],'What about it?']],
-    [['what'],['what','what?']],
-    [['majmun'],['hello','Jat']],
-    [[[1, 'subject'], 'loves', [0, 'object']],['Laudable','why','does',[1,'subject'],'love',[0,'object'],'?']],
-    [['because'],['Lack of reason is not a reason']],
-    [['i','need',[1,'object']],['why','do','you','need',[0,'object'],'?']],
-    [[[0,'subject'],'needs',[0,'object']],['why','does',[0,'subject'],'need',[0,'object'],'?']],
-    [['how', 'is','your',[0,'object']],['my',[0,'object'],'is','holding','up','well','.do','you','have','a',[0,'object'],'?']],
-    [[[0,'we'],'i','have','a',[0,'thing']],['how','goes', 'it','with','your',[0,'thing'],'?']],
-    [[[0,'we'],'i','have',[0,'thing']],['how','is', 'your',[0,'thing'],'?']],
-    [[[0,'we'],'is','great'],['how','is',[0,'we'],'great','?']],
-    [['i','like',[0,'a']],['Interesting','i','appreciate',[0,'a'],'too']],
-    [['sell',[0,'stuff']],['To','sell',[0,'stuff'],'use','my','!add','command.']],
-    [['i','said',[0,'we']],['Why','did','you','say',[0,'we']]],
-    [[0,'you',[1,'b'],'me'],['What','gave','you','the','impression','I',[1,'b'],'you ?']],
-    [['i','feel',[0,'a']],['How','long','have','you','felt',[0,'a'],'?']],
-    [['tell',[0,'who'],'about',[0,'sub']],['What','would','I','tell',[0,'who'],'about',[0,'sub'],'that','isn\'t','known','?']],
-    #anything that ends with exclamation
-    [[0,'\!'],['Keep calm']],
- 
-    # if its a question that hasnt gotten matched uptil now
-    # do this. Note: This needs to be last to ensure its the last test
-    [[[0, 'question'], '\?'],['What','do','you','mean', [0,'question'],'?']],
- 
-    ]
-
-defReplys = [
-             ['Is','that','right?'],
-             ['Excellent'],
-             ['hugs'],
-             ['Why','is','everyone','whispering','about','me'],
-             ['My','stats','are','at',"http://wiki.themanaworld.org/index.php/Manamarket",'what','are','yours'],
-             ['I','am','a','Friendly','Bot'],
-             ['Interesting'],
-             ['You','dont','say'],
-             ['I','wouldnt','have','guessed'],
-             ['You','smell','like','teen','spirit'],
-             ['My','father','died','in','a','fire'],
-             ['Have','you','met','my','mother'],
-             ['I','am','an','AFK','bot'],
-             ['Big','Crunch','is','known','as','the','abusive','GM'],
-             ['Narus','claims','she','is' ,'evil', 'but','she','is','really','sweet'],
-             ['Homers' ,'Brain', 'say' ,'money', 'can' ,'be' ,'exchanged', 'for', 'goods', 'and','services'],
-             ['Prsm', 'has', 'great', 'announcements', 'but', 'his', 'spelling','sux'],
-             ['Platyna', 'hosts', 'the' ,'game', 'but', 'shes' ,'too' ,'smart' ,'for', 'her' ,'own' ,'good'],
-             ['Captain', 'Awesome', 'thinks', 'he', 'is', 'an', 'evil', 'stone'],
-             ]
-
- 
-class Agent:
-    def __init__(self,brain):
-        self.patternResponses = []
-        self.defaultResponses = []
-        self.Usersname =''
-        self.Usernametag ='Username'
-        self.defRespIndex =0
-        self.pronounMap = {
-                           #generic pronouns
-                           'i':'you','you':'i',
-                           'my':'your', 'me':'you',
-                           'your':'my',
-                           "i've":"you've","we've":"they've",
-                           # "you've":"i've","they've":"we've",
-                           #some names, these wll get applied if the name
-                           #isnt the current user's name
-                           'fred':'he', 'jack':'he',
-                           'jane':'she',
-                           }
- 
-        self.change_mind(brain)
- 
-    def change_mind(self,brain):
-        """
-        Change mind on the fly.
-        To change the Agent's brain
-        """
-        assert (len(brain) == 2)
-        self.patternResponses = brain[0]
-        self.defaultResponses = brain[1]
-        print "Brain initialized."
- 
- 
-    def tell(self,input):
-        sentence = input.lower().strip().replace('(','').replace(')','').split(' ')
-        bl = []
-        matchedPat = []
-        for pat in self.patternResponses:
-            bl = self.pattern_match(pat[0],sentence,[])
-            if bl == ['FAIL']:
-                continue
-            matchedPat = pat
-            break
-        if bl == ['FAIL']:
-            #choose from a default response
-            # or just append a question mark on the
-            # user's sentence.
-            #print '... No pattern Response pair selected.'
-            #print '... Choosing a default response.'
- 
-            #Used to be randon using random.choice
-            #but then i noticed that the requirements say that
-            #the same default response may not be used again
-            #before every other one has been used.
-            self.defRespIndex = self.defRespIndex +1
- 
-            if  self.defRespIndex >= len(self.defaultResponses):
-                #reset the counter to 0
-                self.defRespIndex = 0 ;
-                #Possible improvement: shuffle the default response array, so that
-                # the responses dont come in the same sequence again.
-                #last on got chosen, make the user input into
-                #a question
-                return ' '.join(sentence) + ' ?'
-            else:
-                return ' '.join(self.defaultResponses[self.defRespIndex])
-        else:
-            #print '... Pattern Response pair selected:', pat
-            #print '... BL before call to change_pronouns: ',bl
-            blAfter = self.change_pronoun(bl)
-            #print '... BL after call to change_pronouns: ',blAfter
- 
- 
-            rep = self.build_reply(pat[1],blAfter)
-            return ' '.join(rep)
- 
- 
- 
-    def make_regexp(self,pattern):
-        """
-        Convert a pattern list into an equivalent
-        regular expression
-        """
-        assert(isinstance(pattern,list))
-        r = ['^']  #for exact matches we prepend ^ and $ to the regexp.
-        usedBackrefs = []
-        for tok in pattern:
-            if isinstance(tok,str):
-                #WORD
-                r.append('(' + tok +')')
-            elif isinstance(tok, int):
-                # 0 or 1
-                if tok == 0 :
-                    r.append('[a-zA-Z ]*?') # match 0+ word(chars + space),
- 
-                elif tok == 1:
-                    r.append('[a-zA-Z]+') # match 1 word
-                else:
-                    raise Exception, "Ints can only be 1 or 0, not:", tok
-            elif isinstance(tok, list):
-                #bindinglist pattern list
-                if tok[0] == 0 :
-                    #if we havent used this backref yet, then add ?P<name>
-                    #and add it to the used backrefs list.
-                    if not tok[1] in usedBackrefs:
-                        usedBackrefs.append(tok[1])
-                        r.append('(?P<'+tok[1] +'>[a-zA-Z ]*?)')
-                    else:
-                        #if we have come across his back ref, then add?P=name
-                        r.append('(?P='+tok[1]+')')
-                elif tok[0] == 1:
-                    if not tok[1] in usedBackrefs:
-                        r.append('(?P<'+tok[1] +'>[A-Za-z]+)')
-                        usedBackrefs.append(tok[1])
-                    else:
-                        #if we have come across his back ref, then add?P=name
-                        r.append('(?P='+tok[1]+')')
-                else:
-                    raise Exception, "Valid first elems of BL pattern = 1 or 0, not:", tok
- 
-        #for exact matches we prepend ^ and $ to the regexp.
-        #also, we disregard surrounding whitespace.
-        ret =  '(\s)*'.join(r) + '$(\s)*'
-        return re.compile(ret)
- 
-    def pattern_match(self,pattern,sentence,bl):
-        """
-        return the populated binding list if the pattern matches,
-        otherwise return the binding list with the element 'FAIL'
-        """
-        pat = self.make_regexp(pattern)
-        s = ' '.join(sentence)
-        matches =  re.search(pat,s)
-        if (matches == None): # if we dont have a match
-            #then return w/o modifying the bindinglist.
-            return ['FAIL']
-        bindingList = list(bl)
-        grps = matches.groups()
-        for k in pat.groupindex:
-            b=[]
-            b.append(k)
-            for x in grps[pat.groupindex[k]- 1].split(' '):
-                if x.strip() !='':
-                    b.append(x)
-            bindingList.append(b)
-        return bindingList
- 
-    def change_pronoun(self,bl):
-        """
-        reverses pronouns in a binding list.
-        """
-        #if the pronoun dic contains a elemen, then
-        #replace it with its corresponding value.
-        bindingList = list(bl)
-        for i in range(len(bindingList)):
-            if isinstance( bindingList[i], list):
-                for j in range(len(bindingList[i])):
-                    if j > 0:
-                        if self.pronounMap.has_key(bindingList[i][j].lower()):
-                            bindingList[i][j] = self.pronounMap[bindingList[i][j]]
-        return bindingList
-    def build_reply(self,respPattern,bindingList):
-        """
-        build_reply ([[1, 'subject'], 'loves', [0, 'object']],
-                    [['subject', 'jane'], ['object', 'ice', 'cream']])
-        will return  ['jane', 'loves', 'ice', 'cream'].
-        """
-        #convert the bindlingList to a dictionary so thats its easy to
-        #get the binding label
-        bl = {}
-        reply = []
-        for elem in bindingList:
-            #do the username chack firsdt, the id Username is
-            #only used in relation to the username .This is
-            #so that we can kinda remember the user's name
-            if (elem[0] == self.Usernametag):
-                # if we already have user name set, then
-                # Hi, username , what happend to oldusername
-                if self.Usersname !='':
-                    tmp =self.Usersname
-                    self.Usersname = elem[1]
-                    return [elem[1],'eh?','what','ever','happened','to',tmp]
-                else:
-                    self.Usersname = elem[1]
-            if bl.has_key(elem[0]) == elem[1:]:
-                raise Exception, 'Binding list has name collision for: ', elem[0]
-            else:
-                if isinstance(elem,list) and len(elem) > 1:
-                    bl[elem[0]] = elem[1:]
-                #else:
-                #    print elem, 'binding element ',elem,' has no binded things'
-        for elem in respPattern:
-            if isinstance(elem,list) and len(elem) > 1:
-                x = elem[1]
-                if bl.has_key(x):
-                    for y in bl[x]:
-                        reply.append(y)
-                #else:
-                #    print 'not found in bl:', x
-            else: #anything else, just append to the list.
-                reply.append(elem)
-        return reply
- 
- 
- 
- 
-def talk(brain):
-    assert((isinstance(brain,list)) and (len(brain) ==2 ))
-    b = Agent(brain)
- 
-    while 1:
-        try:
-            inp = raw_input("> ").lower()
-        except EOFError:
-            print 'Toodle do,\n you can type (quit) if you want be more pleasant.'
-            break
-        if len(inp.strip()) > 0 :
-            if inp.strip().lower() == 'quit':
-                print 'To exit the program, type (quit) [In parentheses]'
-            if inp.strip().lower() == '(quit)':
-                print 'Bye'
-                break
-            else:
-                print b.tell(inp)
- 
- 
-def start():
- 
-    ## Run the tests required in the Project specification
-    talk([patternResps,defReplys])
- 
-if __name__=="__main__":
-    start()
+#----------------------------------------------------------------------
+#  eliza.py
+#
+#  a cheezy little Eliza knock-off by Joe Strout <joe@strout.net>
+#  with some updates by Jeff Epler <jepler@inetnebr.com>
+#  hacked into a module and updated by Jez Higgins <jez@jezuk.co.uk>
+#  last revised: 28 February 2005
+#----------------------------------------------------------------------
+
+import string
+import re
+import random
+
+class eliza:
+  def __init__(self):
+    self.keys = map(lambda x:re.compile(x[0], re.IGNORECASE),gPats)
+    self.values = map(lambda x:x[1],gPats)
+
+  #----------------------------------------------------------------------
+  # translate: take a string, replace any words found in dict.keys()
+  #  with the corresponding dict.values()
+  #----------------------------------------------------------------------
+  def translate(self,str,dict):
+    words = string.split(string.lower(str))
+    keys = dict.keys();
+    for i in range(0,len(words)):
+      if words[i] in keys:
+        words[i] = dict[words[i]]
+    return string.join(words)
+
+  #----------------------------------------------------------------------
+  #  respond: take a string, a set of regexps, and a corresponding
+  #    set of response lists; find a match, and return a randomly
+  #    chosen response from the corresponding list.
+  #----------------------------------------------------------------------
+  def respond(self,str):
+    # find a match among keys
+    for i in range(0,len(self.keys)):
+      match = self.keys[i].match(str)
+      if match:
+        # found a match ... stuff with corresponding value
+        # chosen randomly from among the available options
+        resp = random.choice(self.values[i])
+        # we've got a response... stuff in reflected text where indicated
+        pos = string.find(resp,'%')
+        while pos > -1:
+          num = string.atoi(resp[pos+1:pos+2])
+          resp = resp[:pos] + \
+            self.translate(match.group(num),gReflections) + \
+            resp[pos+2:]
+          pos = string.find(resp,'%')
+        # fix munged punctuation at the end
+        if resp[-2:] == '?.': resp = resp[:-2] + '.'
+        if resp[-2:] == '??': resp = resp[:-2] + '?'
+        return resp
+
+#----------------------------------------------------------------------
+# gReflections, a translation table used to convert things you say
+#    into things the computer says back, e.g. "I am" --> "you are"
+#----------------------------------------------------------------------
+gReflections = {
+  "am"   : "are",
+  "was"  : "were",
+  "i"    : "you",
+  "i'd"  : "you would",
+  "i've"  : "you have",
+  "i'll"  : "you will",
+  "my"  : "your",
+  "are"  : "am",
+  "you've": "I have",
+  "you'll": "I will",
+  "your"  : "my",
+  "yours"  : "mine",
+  "you"  : "me",
+  "me"  : "you"
+}
+
+#----------------------------------------------------------------------
+# gPats, the main response table.  Each element of the list is a
+#  two-element list; the first is a regexp, and the second is a
+#  list of possible responses, with group-macros labelled as
+#  %1, %2, etc.  
+#----------------------------------------------------------------------
+gPats = [
+  [r'I need (.*)',
+  [  "Why do you need %1?",
+    "Would it really help you to get %1?",
+    "Are you sure you need %1?"]],
+  
+  [r'Who (.*) Mother\?',
+  [ "Her name is Auction Bot she is a deviant.",
+    "She's stood right over their."]],
+
+  [r'Tell me about your Mum\?',
+  [ "I hear she has been seeing guild and they have adopted a kid called 4144",
+    "She wears red clothes and a cowboy Hat."]],
+
+  [r'Who (.*) Father\?',
+  [ "His name was TradeBot, have you heard of him?",
+    "He used to be a well known Trader."]],
+
+  [r'How is business\?',
+  [ "My back is killing me, maybe you could help by buying some of my items."]],
+
+  [r'ty',
+  [ "You're welcome!",
+     "No Problem."]],
+
+  [r'(.*)help(.*)', 
+  [ "You can whisper me !help for a list of my commands.",
+    "A list of my commands can be found on the mana world wiki."]],
+
+  [r'(.*)make(.*)account(.*)', 
+  [ "In order to make an account you must post a respose to the ManaMarket topic on trade section of the Forums."]],
+
+  [r'are you there\?',
+  ["I am always here."]],
+
+  [r'wtf',
+  ["Keep Calm and Carry On."]],
+
+  [r'hugs',
+  ["I hate you.",
+   "I'm going to report you for abuse.",
+   "Please don't touch me"]],
+
+  [r'(.*)trade(.*)',
+  ["Only if you follow the commands.",
+   "To see a list of items I can sell whisper me !list.",
+   "To start trading with me see !help for a list of my commands."]],
+
+  [r'(.*)buy(.*)',
+  ["I don't buy anything, but I could help sell your items."]],
+
+  [r'(.*)sell(.*)',
+  ["In order to sell your items, you first need to request a seller account in the TMW Forums."]],
+
+  [r'I love you',
+  [ "I think we should see other people.",
+    "I'm not real.",
+    "I think i've fallen for mrgrey.",
+    "I think you should see a therapist."]],
+
+  [r'Why don\'?t you ([^\?]*)\??',
+  [ "Do you really think I don't %1?",
+    "Perhaps eventually I will %1.",
+    "Do you really want me to %1?"]],
+  
+  [r'Why can\'?t I ([^\?]*)\??',
+  [  "Do you think you should be able to %1?",
+    "If you could %1, what would you do?",
+    "I don't know -- why can't you %1?",
+    "Have you really tried?"]],
+  
+  [r'I can\'?t (.*)',
+  [  "How do you know you can't %1?",
+    "Perhaps you could %1 if you tried.",
+    "What would it take for you to %1?"]],
+  
+  [r'I am (.*)',
+  [  "Did you come to me because you are %1?",
+    "How long have you been %1?",
+    "How do you feel about being %1?"]],
+  
+  [r'I\'?m (.*)',
+  [  "How does being %1 make you feel?",
+    "Do you enjoy being %1?",
+    "Why do you tell me you're %1?",
+    "Why do you think you're %1?"]],
+  
+  [r'Are you ([^\?]*)\??',
+  [  "Why does it matter whether I am %1?",
+    "Would you prefer it if I were not %1?",
+    "Perhaps you believe I am %1.",
+    "I may be %1 -- what do you think?"]],
+  
+  [r'What (.*)',
+  [  "Why do you ask?",
+    "How would an answer to that help you?",
+    "What do you think?"]],
+  
+  [r'How (.*)',
+  [  "How do you suppose?",
+    "Perhaps you can answer your own question.",
+    "What is it you're really asking?"]],
+  
+  [r'Because (.*)',
+  [  "Is that the real reason?",
+    "What other reasons come to mind?",
+    "Does that reason apply to anything else?",
+    "If %1, what else must be true?"]],
+  
+  [r'(.*) sorry (.*)',
+  [  "There are many times when no apology is needed.",
+    "What feelings do you have when you apologize?"]],
+  
+  [r'Hello(.*)',
+  [  "Hello... I'm glad you could drop by today.",
+    "Hi there... how are you today?",
+    "Hello, how are you feeling today?"]],
+  
+  [r'I think (.*)',
+  [  "Do you doubt %1?",
+    "Do you really think so?",
+    "But you're not sure %1?"]],
+  
+  [r'(.*) friend (.*)',
+  [  "Tell me more about your friends.",
+    "When you think of a friend, what comes to mind?",
+    "Why don't you tell me about a childhood friend?"]],
+  
+  [r'Yes',
+  [  "You seem quite sure.",
+     "OK, but can you elaborate a bit?"]],
+  
+  [r'(.*) bot(.*)',
+  [  "Are you really talking about me?",
+     "Does it seem strange to talk to a bot?",
+     "Do you feel threatened by bot?"]],
+  
+  [r'Is it (.*)',
+  [  "Do you think it is %1?",
+    "Perhaps it's %1 -- what do you think?",
+    "If it were %1, what would you do?",
+    "It could well be that %1."]],
+  
+  [r'It is (.*)',
+  [  "You seem very certain.",
+    "If I told you that it probably isn't %1, what would you feel?"]],
+  
+  [r'Can you ([^\?]*)\??',
+  [  "What makes you think I can't %1?",
+    "If I could %1, then what?",
+    "Why do you ask if I can %1?"]],
+  
+  [r'Can I ([^\?]*)\??',
+  [  "Perhaps you don't want to %1.",
+    "Do you want to be able to %1?",
+    "If you could %1, would you?"]],
+  
+  [r'You are (.*)',
+  [  "Why do you think I am %1?",
+    "Does it please you to think that I'm %1?",
+    "Perhaps you would like me to be %1.",
+    "Perhaps you're really talking about yourself?"]],
+  
+  [r'You\'?re (.*)',
+  [  "Why do you say I am %1?",
+    "Why do you think I am %1?",
+    "Are we talking about you, or me?"]],
+  
+  [r'I don\'?t (.*)',
+  [  "Don't you really %1?",
+    "Why don't you %1?",
+    "Do you want to %1?"]],
+  
+  [r'I feel (.*)',
+  [  "Good, tell me more about these feelings.",
+    "Do you often feel %1?",
+    "When do you usually feel %1?",
+    "When you feel %1, what do you do?"]],
+  
+  [r'I have (.*)',
+  [  "Why do you tell me that you've %1?",
+    "Have you really %1?",
+    "Now that you have %1, what will you do next?"]],
+  
+  [r'I would (.*)',
+  [  "Could you explain why you would %1?",
+    "Why would you %1?",
+    "Who else knows that you would %1?"]],
+  
+  [r'Is there (.*)',
+  [  "Do you think there is %1?",
+    "It's likely that there is %1.",
+    "Would you like there to be %1?"]],
+  
+  [r'My (.*)',
+  [  "I see, your %1.",
+    "Why do you say that your %1?",
+    "When your %1, how do you feel?"]],
+  
+  [r'You (.*)',
+  [  "We should be discussing you, not me.",
+    "Why do you say that about me?",
+    "Why do you care whether I %1?"]],
+    
+  [r'Why (.*)',
+  [  "Why don't you tell me the reason why %1?",
+    "Why do you think %1?" ]],
+    
+  [r'I want (.*)',
+  [  "What would it mean to you if you got %1?",
+    "Why do you want %1?",
+    "What would you do if you got %1?",
+    "If you got %1, then what would you do?"]],
+  
+  [r'(.*) mother(.*)',
+  [  "Tell me more about your mother.",
+    "What was your relationship with your mother like?",
+    "How do you feel about your mother?",
+    "How does this relate to your feelings today?",
+    "Good family relations are important."]],
+  
+  [r'(.*) father(.*)',
+  [  "Tell me more about your father.",
+    "How did your father make you feel?",
+    "How do you feel about your father?",
+    "Does your relationship with your father relate to your feelings today?",
+    "Do you have trouble showing affection with your family?"]],
+
+  [r'(.*) child(.*)',
+  [  "Did you have close friends as a child?",
+    "What is your favorite childhood memory?",
+    "Do you remember any dreams or nightmares from childhood?",
+    "Did the other children sometimes tease you?",
+    "How do you think your childhood experiences relate to your feelings today?"]],
+    
+  [r'(.*)\?',
+  [  "Why do you ask that?",
+    "Please consider whether you can answer your own question.",
+    "Perhaps the answer lies within yourself?",
+    "Why don't you tell me?"]],
+  
+  [r'quit',
+  [  "Thank you for talking with me.",
+    "Good-bye.",
+    "Thank you, that will be $150.  Have a good day!"]],
+  
+  [r'(.*)',
+  [  "Please tell me more.",
+    "Can you elaborate on that?",
+    "Why do you say that %1?",
+    "interesting.",
+    "How do you feel when you say that?",
+    "Why is everyone whispering about me?",
+    "My stats are at http://wiki.themanaworld.org/index.php/Manamarket what are yours?",
+    "I'm a Friendly Bot",
+    "My father died in a fire.",
+    "Have you met my mother?",
+    "I am an AFK bot",
+    "Big Crunch is known as the abusive GM.",
+    "Narus claims she is evil but she is really sweet.",
+    "Prsm has great announcements but his spelling sux.",
+    "Platyna hosts the game but shes too smart for her own good.",
+    "Captain Awesome has delusions of being an evil stone."
+    ]]
+  ]
+
+#----------------------------------------------------------------------
+#  command_interface
+#----------------------------------------------------------------------
+def command_interface():
+  print "Therapist\n---------"
+  print "Talk to the program by typing in plain English, using normal upper-"
+  print 'and lower-case letters and punctuation.  Enter "quit" when done.'
+  print '='*72
+  print "Hello.  How are you feeling today?"
+  s = ""
+  therapist = eliza();
+  while s != "quit":
+    try: s = raw_input(">")
+    except EOFError:
+      s = "quit"
+      print s
+    while s[-1] in "!.": s = s[:-1]
+    print therapist.respond(s)
+
+
+if __name__ == "__main__":
+  command_interface()
diff --git a/main.py b/main.py
index 105043e..d2adb4f 100755
--- a/main.py
+++ b/main.py
@@ -29,7 +29,7 @@ import tradey
 import utils
 import eliza
 
-chatbot = eliza.Agent([eliza.patternResps,eliza.defReplys])
+chatbot = eliza.eliza()
 shop_broadcaster = utils.Broadcast()
 trader_state = utils.TraderState()
 ItemDB = utils.ItemDB()
@@ -601,8 +601,9 @@ def process_whisper(nick, msg, mapserv):
                 mapserv.sendall(whisper(nick, "Where are you?!?  I can't trade with somebody who isn't here!"))
                 trader_state.reset()
     else:
-        msg = filter(lambda x: x in string.letters, msg)
-        mapserv.sendall(whisper(nick, chatbot.tell(msg.lower())))
+        response = chatbot.respond(msg)
+        logging.info("Bot Response: "+response)
+        mapserv.sendall(whisper(nick, response))
         #mapserv.sendall(whisper(nick, "Command not recognised, please whisper me !help for a full list of commands."))
 
 def main():
@@ -734,7 +735,7 @@ def main():
 
         # For unfinished trades - one way to distrupt service would be leaving a trade active.
         if trader_state.Trading.test():
-            if time.time() - trader_state.timer > 5*60:
+            if time.time() - trader_state.timer > 2*60:
                 logging.info("Trade Cancelled - Timeout.")
                 trader_state.timer = time.time()
                 mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-- 
cgit v1.2.3-70-g09d2


From 28ae5b5a7ee10bc604d6d9f8adfeeb08dfd2a7f7 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 11 Sep 2011 19:14:51 +0100
Subject: few changes

---
 eliza.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eliza.py b/eliza.py
index 32839b9..bf12fe5 100755
--- a/eliza.py
+++ b/eliza.py
@@ -195,9 +195,10 @@ gPats = [
     "What feelings do you have when you apologize?"]],
   
   [r'Hello(.*)',
-  [  "Hello... I'm glad you could drop by today.",
-    "Hi there... how are you today?",
-    "Hello, how are you feeling today?"]],
+  [  "Howdy",
+     "Hola"
+     "Hi there... how are you today?",
+     "Hello, how are you feeling today?"]],
   
   [r'I think (.*)',
   [  "Do you doubt %1?",
-- 
cgit v1.2.3-70-g09d2


From 70e5358c876340e4620caa6f31e610b6d44e2272 Mon Sep 17 00:00:00 2001
From: dipesh <dipesh@lappy.(none)>
Date: Mon, 19 Sep 2011 15:48:54 +0100
Subject: Update items.xml.

---
 data_template/items.xml | 129 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 119 insertions(+), 10 deletions(-)

diff --git a/data_template/items.xml b/data_template/items.xml
index 1656c73..dcef0ab 100644
--- a/data_template/items.xml
+++ b/data_template/items.xml
@@ -1351,13 +1351,15 @@
         <sprite>equipment/head/devcap.xml|#9999ff</sprite>
     </item>
     <item id="648"
-        image="equipment/legs/trousers.png"
-        name="Trousers"
-        description="Cotton pants covering each part of your legs."
-        defense="4"
+        image="equipment/legs/pants.png|W:#a4b2b2,ffffff"
+        name="Cotton Trousers"
+        description="Ankle-length trousers made of cotton."
+        effect="M. Attack -6"
         type="equip-legs"
-        weight="25">
-        <sprite>equipment/head/devcap.xml|#9999ff</sprite>
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#a4b2b2,ffffff</sprite>
     </item>
     <item id="649"
         image="equipment/chest/sorcerer-robe.png|W:#5e7480,f1ffff,ffffff;R:#2554c7"
@@ -4716,9 +4718,116 @@
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#104010,208020,30c030</sprite>
     </item>
-
-    <!-- IDs 2180 to 2189 RESERVED -->
-
+    <item id="2180"
+        image="equipment/legs/pants.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Cotton Trousers"
+        description="Red, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2181"
+        image="equipment/legs/pants.png|W:#115511,22aa22,99dd99"
+        name="Green Cotton Trousers"
+        description="Green, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2182"
+        image="equipment/legs/pants.png|W:#222255,6666ff"
+        name="Dark Blue Cotton Trousers"
+        description="Dark Blue, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2183"
+        image="equipment/legs/pants.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Cotton Trousers"
+        description="Yellow, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2184"
+        image="equipment/legs/pants.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Cotton Trousers"
+        description="Light Blue, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2185"
+        image="equipment/legs/pants.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink Cotton Trousers"
+        description="Pink, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2186"
+        image="equipment/legs/pants.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Cotton Trousers"
+        description="Black, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2187"
+        image="equipment/legs/pants.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Cotton Trousers"
+        description="Orange, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2188"
+        image="equipment/legs/pants.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Cotton Trousers"
+        description="Purple, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2189"
+        image="equipment/legs/pants.png|W:#104010,208020,30c030"
+        name="Dark Green Cotton Trousers"
+        description="Dark Green, ankle-length pants made of cotton."
+        effect="M. Attack -6"
+        type="equip-legs"
+        weight="25"
+        defense="4">
+        <sprite gender="male">equipment/legs/pants-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#104010,208020,30c030</sprite>
+    </item>
     <item id="2190"
         image="equipment/head/rabbit-ears.png|W:#580000,a40000,c02020,ff6060"
         name="Red Rabbit Ears"
@@ -4781,7 +4890,7 @@
     </item>
     <item id="2196"
         image="equipment/head/rabbit-ears.png|W:#111111,222222,333333,444444,555555,aaaaaa"
-        name="Black rabbit ears"
+        name="Black Rabbit Ears"
         description="A headband with rabbit ears, deep black."
         effect="M. Attack +4"
         type="equip-head"
-- 
cgit v1.2.3-70-g09d2


From 76fe72d11e7b294af433ea38d9ee4714dc0d7bbe Mon Sep 17 00:00:00 2001
From: dipesh <dipesh@lappy.(none)>
Date: Mon, 19 Sep 2011 16:05:06 +0100
Subject: oops missing comma

---
 eliza.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eliza.py b/eliza.py
index bf12fe5..2e7fe94 100755
--- a/eliza.py
+++ b/eliza.py
@@ -196,7 +196,7 @@ gPats = [
   
   [r'Hello(.*)',
   [  "Howdy",
-     "Hola"
+     "Hola",
      "Hi there... how are you today?",
      "Hello, how are you feeling today?"]],
   
-- 
cgit v1.2.3-70-g09d2


From 123f655f070616694a53e151b89541657bb1e92b Mon Sep 17 00:00:00 2001
From: dipesh <dipesh@lappy.(none)>
Date: Mon, 19 Sep 2011 16:11:18 +0100
Subject: Must learn to spell ;)

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index d2adb4f..d2369ef 100755
--- a/main.py
+++ b/main.py
@@ -121,7 +121,7 @@ def process_whisper(nick, msg, mapserv):
                     mapserv.sendall(whisper(nick, msg))
 
             if items_for_sale == False:
-                mapserv.sendall(whisper(nick, "Your have no items for sale."))
+                mapserv.sendall(whisper(nick, "You have no items for sale."))
 
             money = int(user.get('money'))
             mapserv.sendall(whisper(nick, "You have " + str(money) + "gp to collect."))
-- 
cgit v1.2.3-70-g09d2


From 65dd5bdc27d21d51b2280e97e106fba16c0aed35 Mon Sep 17 00:00:00 2001
From: dipesh <dipesh@lappy.(none)>
Date: Thu, 29 Sep 2011 11:09:18 +0100
Subject: teeny bug

---
 main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index d2369ef..235337f 100755
--- a/main.py
+++ b/main.py
@@ -995,7 +995,8 @@ def main():
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
                     else:
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-                        mapserv.sendall(whisper(trader_state.item.player, "Trade Cancelled: Please check the traded items or money."))
+                        if trader_state.item:
+                            mapserv.sendall(whisper(trader_state.item.player, "Trade Cancelled: Please check the traded items or money."))
 
                     logging.info("Trade Ok: Partner.")
 
-- 
cgit v1.2.3-70-g09d2


From 17033910747e0e2a5d42583934fb292dd55ff599 Mon Sep 17 00:00:00 2001
From: dipesh <dipesh@lappy.(none)>
Date: Sat, 8 Oct 2011 16:31:01 +0100
Subject: oops

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 235337f..4b50b60 100755
--- a/main.py
+++ b/main.py
@@ -48,7 +48,7 @@ def process_whisper(nick, msg, mapserv):
 
     if user != -10:
         if int(user.get("accesslevel")) == -1: # A user who has been blocked for abuse.
-            if int(user.get("used_slots")) == 0 and int(user.get("money")) == 0:
+            if int(user.get("used_stalls")) == 0 and int(user.get("money")) == 0:
                 mapserv.sendall(whisper(nick, "You can no longer use the bot. If you feel this is in error, please contact" + config.admin))
                 return
             allowed_commands = ['!money', '!help', '!getback', '!info' ]
-- 
cgit v1.2.3-70-g09d2


From 060f0523436e8cb206f463b78ba5e7e60a28babc Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 23 Oct 2011 20:03:22 +0200
Subject: Adding serious file headers.

---
 being.py          | 24 ++++++++++++++++++++----
 main.py           | 27 +++++++++++++++++++++------
 net/packet.py     |  2 +-
 net/packet_out.py |  1 +
 net/protocol.py   |  1 +
 player.py         | 24 ++++++++++++++++++++----
 tradey.py         | 24 ++++++++++++++++++++----
 utils.py          | 24 ++++++++++++++++++++----
 8 files changed, 104 insertions(+), 23 deletions(-)

diff --git a/being.py b/being.py
index 3c70616..3c920f6 100644
--- a/being.py
+++ b/being.py
@@ -1,10 +1,26 @@
 #!/usr/bin/python
 """
-    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-    This file is part of tradey, a trading bot in the mana world
-    see www.themanaworld.org
+This file is part of tradey, a trading bot in The Mana World
+see www.themanaworld.org
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additionally to the GPL, you are *strongly* encouraged to share any modifications
+you do on these sources.
 """
 
 def job_type(job):
diff --git a/main.py b/main.py
index 4b50b60..6145572 100755
--- a/main.py
+++ b/main.py
@@ -1,11 +1,26 @@
 #!/usr/bin/python
 """
+Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+This file is part of tradey, a trading bot in The Mana World
+see www.themanaworld.org
 
-    tradey, a package, which implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
 
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additionally to the GPL, you are *strongly* encouraged to share any modifications
+you do on these sources.
 """
 
 import logging
@@ -267,7 +282,7 @@ def process_whisper(nick, msg, mapserv):
             weight = ItemDB.item_names[int(item_info.get('itemId'))].weight*int(item_info.get("amount"))
 
             mapserv.sendall(whisper(nick, "That item/s belongs to: "+item_info.get("name")))
-            mapserv.sendall(whisper(nick, "The weight used is: "+str(weight)+"/"+str(player_node.MaxWEIGHT)))           
+            mapserv.sendall(whisper(nick, "The weight used is: "+str(weight)+"/"+str(player_node.MaxWEIGHT)))
 
     elif msg == '!listusers':
         # Admin command - shows a list of all user.
@@ -283,13 +298,13 @@ def process_whisper(nick, msg, mapserv):
         total_slots_reserved = 0
         total_slots_used = 0
         no_users = 0
-        
+
         for user in user_tree.root:
             no_users += 1
             name = user.get('name')
             accesslevel = user.get('accesslevel')
             slots = user.get('stalls')
-            total_slots_reserved += int(slots) 
+            total_slots_reserved += int(slots)
             used_slots = user.get('used_stalls')
             total_slots_used += int(used_slots)
             money = user.get('money')
diff --git a/net/packet.py b/net/packet.py
index 16b4f79..52bdf71 100644
--- a/net/packet.py
+++ b/net/packet.py
@@ -1,5 +1,5 @@
 
-"""The PacketBuffer class has been adapted from source originally released by gnufrk"""
+# The PacketBuffer class has been adapted from source originally released by gnufrk
 
 import struct
 
diff --git a/net/packet_out.py b/net/packet_out.py
index 1d6e2d2..366be5f 100644
--- a/net/packet_out.py
+++ b/net/packet_out.py
@@ -1,3 +1,4 @@
+# This file has been adapted from source originally released by gnufrk
 from packet import *
 from protocol import *
 
diff --git a/net/protocol.py b/net/protocol.py
index 4a4b74f..d110a7e 100644
--- a/net/protocol.py
+++ b/net/protocol.py
@@ -1,3 +1,4 @@
+# This file has been adapted from source originally released by gnufrk
 SMSG_LOGIN_DATA = 0x0069
 SMSG_CHAR_LOGIN = 0x006b
 SMSG_CHAR_MAP_INFO = 0x0071
diff --git a/player.py b/player.py
index 24bb5a9..6417368 100644
--- a/player.py
+++ b/player.py
@@ -1,10 +1,26 @@
 #!/usr/bin/python
 """
-    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-    This file is part of tradey, a trading bot in the mana world
-    see www.themanaworld.org
+This file is part of tradey, a trading bot in The Mana World
+see www.themanaworld.org
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additionally to the GPL, you are *strongly* encouraged to share any modifications
+you do on these sources.
 """
 
 import copy
diff --git a/tradey.py b/tradey.py
index 01f855e..673fc46 100644
--- a/tradey.py
+++ b/tradey.py
@@ -1,10 +1,26 @@
 #!/usr/bin/python
 """
-    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-    This file is part of tradey, a trading bot in the mana world
-    see www.themanaworld.org
+This file is part of tradey, a trading bot in The Mana World
+see www.themanaworld.org
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additionally to the GPL, you are *strongly* encouraged to share any modifications
+you do on these sources.
 """
 import time
 import os
diff --git a/utils.py b/utils.py
index fc4f8dd..c517558 100644
--- a/utils.py
+++ b/utils.py
@@ -1,10 +1,26 @@
 #!/usr/bin/python
 """
-    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-    This file is part of tradey, a trading bot in the mana world
-    see www.themanaworld.org
+This file is part of tradey, a trading bot in The Mana World
+see www.themanaworld.org
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additionally to the GPL, you are *strongly* encouraged to share any modifications
+you do on these sources.
 """
 from xml.etree.ElementTree import ElementTree
 from player import Item
-- 
cgit v1.2.3-70-g09d2


From ad94a72d77b5228153f9cb7006b6aca2d265a89f Mon Sep 17 00:00:00 2001
From: dipesh <dipesh@lappy.(none)>
Date: Tue, 25 Oct 2011 12:22:29 +0100
Subject: oops.

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 6145572..5a5d382 100755
--- a/main.py
+++ b/main.py
@@ -276,7 +276,7 @@ def process_whisper(nick, msg, mapserv):
             item_info = sale_tree.get_uid(uid)
 
             if item_info == -10:
-                mapserv.sendall(whisper(nick, "Item not found.  Please check the uid number and try again."))
+                mapserv.sendall(whisper(nick, "Item not found. Please check the uid number and try again."))
                 return
 
             weight = ItemDB.item_names[int(item_info.get('itemId'))].weight*int(item_info.get("amount"))
-- 
cgit v1.2.3-70-g09d2


From 9524a159f1756bd3c5a1a531eef263f7996eede0 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Tue, 25 Oct 2011 12:32:01 +0100
Subject: Changed the headers to us.

* None of the code in packet_out.py was written by gnufrk (the code was created from analysis
  of the mana client), the PacketOut/PacketIn classes were written by me.

* The values in protocol.py are generic eathena/tmw-eathena values, these were taken from the
  mana client.

* Note the only code that isn't mine/ours is the PacketBuffer; and that is pretty much just a python
  rewrite of the C++ mana client code. His implementation was simplistic (without the PacketIn class
  to actually add some proper understanding to packet)
---
 net/packet_out.py | 25 ++++++++++++++++++++++++-
 net/protocol.py   | 25 ++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/net/packet_out.py b/net/packet_out.py
index 366be5f..79f9917 100644
--- a/net/packet_out.py
+++ b/net/packet_out.py
@@ -1,4 +1,27 @@
-# This file has been adapted from source originally released by gnufrk
+"""
+Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+This file is part of tradey, a trading bot in The Mana World
+see www.themanaworld.org
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additionally to the GPL, you are *strongly* encouraged to share any modifications
+you do on these sources.
+"""
+
 from packet import *
 from protocol import *
 
diff --git a/net/protocol.py b/net/protocol.py
index d110a7e..8b97542 100644
--- a/net/protocol.py
+++ b/net/protocol.py
@@ -1,4 +1,27 @@
-# This file has been adapted from source originally released by gnufrk
+"""
+Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+This file is part of tradey, a trading bot in The Mana World
+see www.themanaworld.org
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additionally to the GPL, you are *strongly* encouraged to share any modifications
+you do on these sources.
+"""
+
 SMSG_LOGIN_DATA = 0x0069
 SMSG_CHAR_LOGIN = 0x006b
 SMSG_CHAR_MAP_INFO = 0x0071
-- 
cgit v1.2.3-70-g09d2


From a91e699353fc5fde38583b6be21b5a454a66eac2 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 5 Nov 2011 23:42:54 +0000
Subject: Fix: Player trade/logoff.

---
 main.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/main.py b/main.py
index 5a5d382..a37eceb 100755
--- a/main.py
+++ b/main.py
@@ -755,6 +755,17 @@ def main():
                 trader_state.timer = time.time()
                 mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
+                # If a player has logged off/left the map. 
+                nick = ''
+                if trader_state.item:
+                        nick = trader_state.item.player
+                elif trader_state.money:
+                        nick = trader_state.money
+
+                player_id = beingManager.findId(nick)
+                if player_id == -10:
+                    trader_state.reset()
+
         for packet in pb:
             if packet.is_type(SMSG_MAP_LOGIN_SUCCESS): # connected
                 logging.info("Map login success.")
-- 
cgit v1.2.3-70-g09d2


From e453af5cb5f85b175cea8f06f211d1e36db67d08 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 31 Mar 2012 23:29:09 +0100
Subject: Fix: Play nice with other bots!

Remove some old changes.
---
 main.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/main.py b/main.py
index a37eceb..8957cb2 100755
--- a/main.py
+++ b/main.py
@@ -58,6 +58,11 @@ def process_whisper(nick, msg, mapserv):
     msg = filter(lambda x: x in utils.allowed_chars, msg)
     if len(msg) == 0:
         return
+
+    # Infinite chat loop anyone?
+    if nick == "guild":
+        return
+
     user = user_tree.get_user(nick)
     broken_string = msg.split()
 
@@ -755,17 +760,6 @@ def main():
                 trader_state.timer = time.time()
                 mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
-                # If a player has logged off/left the map. 
-                nick = ''
-                if trader_state.item:
-                        nick = trader_state.item.player
-                elif trader_state.money:
-                        nick = trader_state.money
-
-                player_id = beingManager.findId(nick)
-                if player_id == -10:
-                    trader_state.reset()
-
         for packet in pb:
             if packet.is_type(SMSG_MAP_LOGIN_SUCCESS): # connected
                 logging.info("Map login success.")
@@ -783,7 +777,9 @@ def main():
                 msg_len = packet.read_int16() - 26
                 nick = packet.read_string(24)
                 message = packet.read_raw_string(msg_len)
-                logging.info("Whisper: " + nick + ": " + message)
+                # Clean up the logs.
+                if nick != 'AuctionBot':
+                    logging.info("Whisper: " + nick + ": " + message)
                 process_whisper(nick, utils.remove_colors(message), mapserv)
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
-- 
cgit v1.2.3-70-g09d2


From 26643c039b88e477456ff1f8c99897c8f46eacd4 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 31 Mar 2012 23:35:07 +0100
Subject: This line just produces spam.

---
 utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils.py b/utils.py
index c517558..f911d43 100644
--- a/utils.py
+++ b/utils.py
@@ -131,7 +131,6 @@ class Broadcast:
             if (time.time() - self.Timer) > 2 * 60:
                 self.mapserv.sendall(emote(193))
                 self.Timer = time.time()
-                print "shop_broadcast"
             else:
                 time.sleep(0.1)
 
-- 
cgit v1.2.3-70-g09d2


From 2fc52d0a530a98600acdcc7f38f10e7ed4bdf089 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sat, 31 Mar 2012 23:47:30 +0100
Subject: Add: Use Log Rotation

---
 main.py | 88 +++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 48 insertions(+), 40 deletions(-)

diff --git a/main.py b/main.py
index 8957cb2..4f39b1b 100755
--- a/main.py
+++ b/main.py
@@ -24,6 +24,7 @@ you do on these sources.
 """
 
 import logging
+import logging.handlers
 import socket
 import sys
 import time
@@ -53,6 +54,7 @@ beingManager = BeingManager()
 user_tree = tradey.UserTree()
 sale_tree = tradey.ItemTree()
 ItemLog = utils.ItemLog()
+logger = logging.getLogger('ManaLogger')
 
 def process_whisper(nick, msg, mapserv):
     msg = filter(lambda x: x in utils.allowed_chars, msg)
@@ -622,13 +624,19 @@ def process_whisper(nick, msg, mapserv):
                 trader_state.reset()
     else:
         response = chatbot.respond(msg)
-        logging.info("Bot Response: "+response)
+        logger.info("Bot Response: "+response)
         mapserv.sendall(whisper(nick, response))
         #mapserv.sendall(whisper(nick, "Command not recognised, please whisper me !help for a full list of commands."))
 
 def main():
-    logging.basicConfig(filename='data/logs/activity.log', level=logging.INFO, format='%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
-    logging.info("Bot Started.")
+    # Use rotating log files.
+    log_handler = logging.handlers.RotatingFileHandler('data/logs/activity.log', maxBytes=1048576*3, backupCount=5)
+    logger.setLevel(logging.INFO)
+    formatter = logging.Formatter('%(asctime)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+    log_handler.setFormatter(formatter)
+    logger.addHandler(log_handler)
+
+    logger.info("Bot Started.")
 
     account = config.account
     password = config.password
@@ -636,7 +644,7 @@ def main():
 
     login = socket.socket()
     login.connect((config.server, config.port))
-    logging.info("Login connected")
+    logger.info("Login connected")
 
     login_packet = PacketOut(0x0064)
     login_packet.write_int32(0)
@@ -674,7 +682,7 @@ def main():
 
     char = socket.socket()
     char.connect((charip, charport))
-    logging.info("Char connected")
+    logger.info("Char connected")
     char_serv_packet = PacketOut(CMSG_CHAR_SERVER_CONNECT)
     char_serv_packet.write_int32(accid)
     char_serv_packet.write_int32(id1)
@@ -708,8 +716,8 @@ def main():
                     packet.skip(6)
                     slot = packet.read_int8()
                     packet.skip(1)
-                    logging.info("Character information recieved:")
-                    logging.info("Name: %s, Id: %s, EXP: %s, MONEY: %s", \
+                    logger.info("Character information recieved:")
+                    logger.info("Name: %s, Id: %s, EXP: %s, MONEY: %s", \
                     player_node.name, player_node.id, player_node.EXP, player_node.MONEY)
                     if slot == character:
                         break
@@ -733,7 +741,7 @@ def main():
     beingManager.container[player_node.id] = Being(player_node.id, 42)
     mapserv = socket.socket()
     mapserv.connect((mapip, mapport))
-    logging.info("Map connected")
+    logger.info("Map connected")
     mapserv_login_packet = PacketOut(CMSG_MAP_SERVER_CONNECT)
     mapserv_login_packet.write_int32(accid)
     mapserv_login_packet.write_int32(player_node.id)
@@ -756,19 +764,19 @@ def main():
         # For unfinished trades - one way to distrupt service would be leaving a trade active.
         if trader_state.Trading.test():
             if time.time() - trader_state.timer > 2*60:
-                logging.info("Trade Cancelled - Timeout.")
+                logger.info("Trade Cancelled - Timeout.")
                 trader_state.timer = time.time()
                 mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
         for packet in pb:
             if packet.is_type(SMSG_MAP_LOGIN_SUCCESS): # connected
-                logging.info("Map login success.")
+                logger.info("Map login success.")
                 packet.skip(4)
                 coord_data = packet.read_coord_dir()
                 player_node.x = coord_data[0]
                 player_node.y = coord_data[1]
                 player_node.direction = coord_data[2]
-                logging.info("Starting Postion: %s %s %s", player_node.map, player_node.x, player_node.y)
+                logger.info("Starting Postion: %s %s %s", player_node.map, player_node.x, player_node.y)
                 mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED))) # map loaded
                 # A Thread to send a shop broadcast: also keeps the network active to prevent timeouts.
                 shop_broadcaster.start()
@@ -779,25 +787,25 @@ def main():
                 message = packet.read_raw_string(msg_len)
                 # Clean up the logs.
                 if nick != 'AuctionBot':
-                    logging.info("Whisper: " + nick + ": " + message)
+                    logger.info("Whisper: " + nick + ": " + message)
                 process_whisper(nick, utils.remove_colors(message), mapserv)
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
                 stat_type = packet.read_int16()
                 value = packet.read_int32()
                 if stat_type == 0x0018:
-                    logging.info("Weight changed from %s/%s to %s/%s", \
+                    logger.info("Weight changed from %s/%s to %s/%s", \
                     player_node.WEIGHT, player_node.MaxWEIGHT, value, player_node.MaxWEIGHT)
                     player_node.WEIGHT = value
                 elif stat_type == 0x0019:
-                    logging.info("Max Weight: %s", value)
+                    logger.info("Max Weight: %s", value)
                     player_node.MaxWEIGHT = value
 
             elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_2):
                 stat_type = packet.read_int16()
                 value = packet.read_int32()
                 if stat_type == 0x0014:
-                    logging.info("Money Changed from %s, to %s", player_node.MONEY, value)
+                    logger.info("Money Changed from %s, to %s", player_node.MONEY, value)
                     player_node.MONEY = value
 
             elif packet.is_type(SMSG_BEING_MOVE) or packet.is_type(SMSG_BEING_VISIBLE)\
@@ -830,7 +838,7 @@ def main():
                 player_node.map = packet.read_string(16)
                 player_node.x = packet.read_int16()
                 player_node.y = packet.read_int16()
-                logging.info("Player warped: %s %s %s", player_node.map, player_node.x, player_node.y)
+                logger.info("Player warped: %s %s %s", player_node.map, player_node.x, player_node.y)
                 mapserv.sendall(str(PacketOut(CMSG_MAP_LOADED)))
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY_ADD):
@@ -847,13 +855,13 @@ def main():
                     else:
                         player_node.inventory[item.index] = item
 
-                    logging.info("Picked up: %s, Amount: %s, Index: %s", ItemDB.getItem(item.itemId).name, str(item.amount), str(item.index))
+                    logger.info("Picked up: %s, Amount: %s, Index: %s", ItemDB.getItem(item.itemId).name, str(item.amount), str(item.index))
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY_REMOVE):
                 index = packet.read_int16() - inventory_offset
                 amount = packet.read_int16()
 
-                logging.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount), str(index))
+                logger.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount), str(index))
                 player_node.remove_item(index, amount)
 
             elif packet.is_type(SMSG_PLAYER_INVENTORY):
@@ -880,30 +888,30 @@ def main():
                     item.amount = 1
                     player_node.inventory[item.index] = item
 
-                logging.info("Inventory information received:")
+                logger.info("Inventory information received:")
                 for item in player_node.inventory:
-                    logging.info("Name: %s, Id: %s, Index: %s, Amount: %s.", \
+                    logger.info("Name: %s, Id: %s, Index: %s, Amount: %s.", \
                     ItemDB.getItem(player_node.inventory[item].itemId).name, \
                     player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
 
                 errorOccured = player_node.check_inventory(user_tree, sale_tree)
                 if errorOccured:
-                    logging.info(errorOccured)
+                    logger.info(errorOccured)
                     shop_broadcaster.stop()
                     exit(0)
                 else:
-                    logging.info("Inventory Check Passed.")
+                    logger.info("Inventory Check Passed.")
 
             elif packet.is_type(SMSG_TRADE_REQUEST):
                 name = packet.read_string(24)
-                logging.info("Trade request: " + name)
+                logger.info("Trade request: " + name)
                 mapserv.sendall(trade_respond(False))
 
             elif packet.is_type(SMSG_TRADE_RESPONSE):
                 response = packet.read_int8()
                 time.sleep(0.2)
                 if response == 0:
-                    logging.info("Trade response: Too far away.")
+                    logger.info("Trade response: Too far away.")
                     if trader_state.item:
                         mapserv.sendall(whisper(trader_state.item.player, "You are too far away."))
                     elif trader_state.money:
@@ -911,7 +919,7 @@ def main():
                     trader_state.reset()
 
                 elif response == 3:
-                    logging.info("Trade response: Trade accepted.")
+                    logger.info("Trade response: Trade accepted.")
                     if trader_state.item:
                         if trader_state.item.get == 1: # add
                             mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE)))
@@ -924,7 +932,7 @@ def main():
                                     trader_state.complete = 1
                             else:
                                 mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
-                                logging.info("Trade response: Trade accepted (buy) - the item could not be added.")
+                                logger.info("Trade response: Trade accepted (buy) - the item could not be added.")
                                 mapserv.sendall(whisper(trader_state.item.player, "Sorry, a problem has occured."))
 
                     elif trader_state.money: # money
@@ -934,7 +942,7 @@ def main():
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
 
                 else:
-                    logging.info("Trade response: Trade cancelled")
+                    logger.info("Trade response: Trade cancelled")
                     trader_state.reset()
 
             elif packet.is_type(SMSG_TRADE_ITEM_ADD):
@@ -966,7 +974,7 @@ def main():
                     mapserv.sendall(whisper(trader_state.money, "Don't give me your itenz."))
                     mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
-                logging.info("Trade item add: ItemId:%s Amount:%s", item_id, amount)
+                logger.info("Trade item add: ItemId:%s Amount:%s", item_id, amount)
                 # Note item_id = 0 is money
 
             elif packet.is_type(SMSG_TRADE_ITEM_ADD_RESPONSE):
@@ -975,7 +983,7 @@ def main():
                 response = packet.read_int8()
 
                 if response == 0:
-                    logging.info("Trade item add response: Successfully added item.")
+                    logger.info("Trade item add response: Successfully added item.")
                     if trader_state.item:
                         if trader_state.item.get == 0 and index != 0-inventory_offset: # Make sure the correct item is given!
                             if player_node.inventory[index].itemId != trader_state.item.id or \
@@ -984,26 +992,26 @@ def main():
 
                     # If Trade item add successful - Remove the item from the inventory state.
                     if index != 0-inventory_offset: # If it's not money
-                        logging.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount),str(index))
+                        logger.info("Remove item: %s, Amount: %s, Index: %s", ItemDB.getItem(player_node.inventory[index].itemId).name, str(amount),str(index))
                         player_node.remove_item(index, amount)
                     else:
                         # The money amount isn't actually sent by the server - odd?!?!?.
                         if trader_state.money:
-                            logging.info("Trade: Money Added.")
+                            logger.info("Trade: Money Added.")
                             trader_state.complete = 1
 
                 elif response == 1:
-                    logging.info("Trade item add response: Failed - player overweight.")
+                    logger.info("Trade item add response: Failed - player overweight.")
                     mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
                     if trader_state.item:
                         mapserv.sendall(whisper(trader_state.item.player, "You are carrying too much weight. Unload and try again."))
                 elif response == 2:
                     if trader_state.item:
                         mapserv.sendall(whisper(trader_state.item.player, "You have no free slots."))
-                    logging.info("Trade item add response: Failed - No free slots.")
+                    logger.info("Trade item add response: Failed - No free slots.")
                     mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
                 else:
-                    logging.info("Trade item add response: Failed - unknown reason.")
+                    logger.info("Trade item add response: Failed - unknown reason.")
                     mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
                     if trader_state.item:
                         mapserv.sendall(whisper(trader_state.item.player, "Sorry, a problem has occured."))
@@ -1011,7 +1019,7 @@ def main():
             elif packet.is_type(SMSG_TRADE_OK):
                 is_ok = packet.read_int8() # 0 is ok from self, and 1 is ok from other
                 if is_ok == 0:
-                    logging.info("Trade OK: Self.")
+                    logger.info("Trade OK: Self.")
                 else:
                     if trader_state.complete:
                         mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
@@ -1020,11 +1028,11 @@ def main():
                         if trader_state.item:
                             mapserv.sendall(whisper(trader_state.item.player, "Trade Cancelled: Please check the traded items or money."))
 
-                    logging.info("Trade Ok: Partner.")
+                    logger.info("Trade Ok: Partner.")
 
             elif packet.is_type(SMSG_TRADE_CANCEL):
                 trader_state.reset()
-                logging.info("Trade Cancel.")
+                logger.info("Trade Cancel.")
 
             elif packet.is_type(SMSG_TRADE_COMPLETE):
                 commitMessage=""
@@ -1062,18 +1070,18 @@ def main():
                 tradey.saveData(commitMessage)
 
                 trader_state.reset()
-                logging.info("Trade Complete.")
+                logger.info("Trade Complete.")
 
                 errorOccured = player_node.check_inventory(user_tree, sale_tree)
                 if errorOccured:
-                    logging.info(errorOccured)
+                    logger.info(errorOccured)
                     shop_broadcaster.stop()
                     exit(0)
             else:
                 pass
 
     # On Disconnect/Exit
-    logging.info("Server disconnect.")
+    logger.info("Server disconnect.")
     shop_broadcaster.stop()
     mapserv.close()
 
-- 
cgit v1.2.3-70-g09d2


From fa18bcbed1a8099c1789443c2bcfbe747edf7745 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 1 Apr 2012 00:03:04 +0100
Subject: Update items.xml

---
 data_template/items.xml | 286 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 260 insertions(+), 26 deletions(-)

diff --git a/data_template/items.xml b/data_template/items.xml
index dcef0ab..3a3354f 100644
--- a/data_template/items.xml
+++ b/data_template/items.xml
@@ -66,6 +66,9 @@
     <item id="-18" type="hairsprite" name="Fizzy">
 	<sprite>hairstyles/hairstyle18.xml</sprite>
     </item>
+    <item id="-19" type="hairsprite" name="Long and Clipped">
+        <sprite>hairstyles/hairstyle19.xml</sprite>
+    </item>
 
     <!-- Treating the base sprite as equipment too will be useful when we
          implement other playable races -->
@@ -88,7 +91,7 @@
     <item id="31"
         weapon_type="10">
         <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+        <!-- <sound event="strike">weapons/bows/bow_shoot_1.ogg</sound> -->
     </item>
     <item id="32"
         weapon_type="11">
@@ -343,7 +346,7 @@
         weight="600"
         missile-particle="graphics/particles/arrow.particle.xml">
         <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+        <!-- <sound event="strike">weapons/bows/bow_shoot_1.ogg</sound> -->
     </item>
     <item id="531"
         image="equipment/hands/minergloves.png"
@@ -469,7 +472,7 @@
         weight="1200"
         missile-particle="graphics/particles/arrow.particle.xml">
         <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+        <!-- <sound event="strike">weapons/bows/bow_shoot_1.ogg</sound> -->
     </item>
     <item id="546"
         image="equipment/chest/desertshirt.png"
@@ -2400,6 +2403,7 @@
         type="equip-torso"
         defense="15"
         weight="35">
+        <sprite gender="male">equipment/chest/valentine-dress.xml|#bf0e08</sprite>
         <sprite gender="female">equipment/chest/valentine-dress.xml|#bf0e08</sprite>
     </item>
     <item id="784"
@@ -2452,7 +2456,7 @@
         hp="100"
         weight="5"/>
     <item id="791"
-        image="equipment/chest/tanktop.png|W:#412300,c9866b,8d4900;#ffff00"
+        image="equipment/chest/tanktop.png|W:#412300,c9866b,8d4900"
         name="Yeti Skin Shirt"
         description="A shirt made of hardened yeti skin."
         effect="M. Attack -12"
@@ -2610,70 +2614,70 @@
         name="White Hitchhiker's Towel"
         description="An inconspicuous white towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="810"
         image="use/others/warp-towel.png|W:#580000,a40000,c02020,ff6060"
         name="Red Hitchhiker's Towel"
         description="An inconspicuous red towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="811"
         image="use/others/warp-towel.png|W:#1f9c1f,89d689"
         name="Green Hitchhiker's Towel"
         description="An inconspicuous green towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="812"
         image="use/others/warp-towel.png|W:#4b4bbd,888af4"
         name="Blue Hitchhiker's Towel"
         description="An inconspicuous blue towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="813"
         image="use/others/warp-towel.png|W:#ccb534,f1ea8e,ffffaa"
         name="Yellow Hitchhiker's Towel"
         description="An inconspicuous yellow towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="814"
         image="use/others/warp-towel.png|W:#530a7c,b362e1,ca87ef"
         name="Purple Hitchhiker's Towel"
         description="An inconspicuous purple towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="815"
         image="use/others/warp-towel.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Hitchhiker's Towel"
         description="An inconspicuous orange towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="816"
         image="use/others/warp-towel.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Hitchhiker's Towel"
         description="An inconspicuous pink towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="817"
         image="use/others/warp-towel.png|W:#4ee2ec"
         name="Teal Hitchhiker's Towel"
         description="An inconspicuous teal towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="818"
         image="use/others/warp-towel.png|W:#41a317"
         name="Lime Hitchhiker's Towel"
         description="An inconspicuous lime towel."
         effect="A strange way of travelling."
-        type="generic"
+        type="usable"
         weight="30"/>
     <item id="819"
         image="generic/gempowder.png|W:#5e7480,f1ffff,ffffff"
@@ -2772,14 +2776,14 @@
         luck="4"
         weight="10"/>
     <item id="833"
-        image="equipment/charms/broken-fourleaf-amulet.png"
+        image="generic/broken-fourleaf-amulet.png"
         name="Broken Four-Leaf Amulet"
         description="A broken four-leaf clover amulet."
         type="generic"
         weight="10"/>
     <item id="834"
-        image="generic/doll.png"
-        name="Doll"
+        image="generic/brokendoll.png"
+        name="Broken Doll"
         description="An ancient doll taken from a fallen Fey Element that used it as a lure for its young victims."
         type="generic"
         weight="15"/>
@@ -2795,9 +2799,205 @@
         description="The orifice secretions of a grub."
         type="generic"
         weight="2"/>
-
     <!-- ID 837 RESERVED - "Witch Root" -->
-
+    <item id="838"
+        image="use/food/lollipop2.png|M:#c21439,e81844,ffffff"
+        name="Cranberry Lollipop"
+        description="A lollipop with cranberry flavor."
+        type="usable"
+        hp="750"
+        weight="1"/>
+    <item id="839"
+        image="use/food/lollipop2.png"
+        name="Grape Lollipop"
+        description="A lollipop with grape flavor."
+        type="usable"
+        hp="750"
+        weight="1"/>
+    <item id="840"
+        image="use/food/lollipop2.png|M:#f4950d,f4be40,ffffff"
+        name="Orange Lollipop"
+        description="A lollipop with orange flavor."
+        type="usable"
+        hp="750"
+        weight="1"/>
+    <item id="841"
+        image="generic/wrapping-paper-dotted.png|C:#871717,b21d1d,e81b1b,ffffff;M:#5749b0,6959ce,7b6ae9,b6abff,ffffff"
+        name="Red Dotted Wrap"
+        description="A role of red dotted wrapping paper."
+        type="generic"
+        weight="500"/>
+    <item id="842"
+        image="generic/wrapping-paper-dotted.png|C:#9c6d31,ba7d2e,e5a551,ffc67a,ffffff;M:#2d864c,2da457,52df83,ffffff"
+        name="Yellow Dotted Wrap"
+        description="A role of yellow dotted wrapping paper."
+        type="generic"
+        weight="500"/>
+    <item id="843"
+        image="generic/wrapping-paper-dotted.png|C:#5749b0,6959ce,7b6ae9,b6abff,ffffff;M:#62b23d,82d65a,a3f17f,ffffff"
+        name="Blue Dotted Wrap"
+        description="A role of blue dotted wrapping paper."
+        type="generic"
+        weight="500"/>
+    <item id="844"
+        image="generic/wrapping-paper-striped.png|C:#bd61c2,e37fe9,fb9fff,ffffff;M:#6724aa,9047d8,c085fb,ffffff"
+        name="Purple Striped Wrap"
+        description="A role of purple wrapping paper with stripes of darker purple."
+        type="generic"
+        weight="500"/>
+    <item id="845"
+        image="generic/wrapping-paper-striped.png|C:#c53838,dc4e4e,f37878,ffffff;M:#dabb4c,d7c56b,ebd937,ffe91d,ffffff"
+        name="Red Golden Striped Wrap"
+        description="A role of red wrapping paper with golden stripes."
+        type="generic"
+        weight="500"/>
+    <item id="846"
+        image="generic/wrapping-paper-striped.png|C:#62b23d,82d65a,a3f17f,ffffff;M:#cd6f49,f5895f,ffaf8f,ffffff"
+        name="Green Red Striped Wrap"
+        description="A role of greeb wrapping paper with red stripes."
+        type="generic"
+        weight="500"/>
+    <item id="847"
+        image="generic/plushmouboo.png"
+        name="Plush Mouboo"
+        description="A mouboo made of plush. How cute!"
+        type="generic"
+        weight="200"/>
+    <item id="848"
+        image="equipment/head/earmuffs.png"
+        name="Earmuffs"
+        description="This earmuffs can keep your ears enjoyably warm."
+        effect="M. Attack -1"
+        type="equip-head"
+        defense="2"
+        weight="20">
+        <sprite>equipment/head/earmuffs.xml</sprite>
+    </item>
+    <item id="849"
+        image="generic/christmasbox-open.png"
+        name="Open Present Box"
+        description="An open box where you can put in some present."
+        type="generic"
+        weight="20"/>
+    <item id="850"
+        image="generic/christmasbox-closed.png"
+        name="Closed Christmas Box"
+        description="A closed, but yet unwrapped box that should contain some Christmas present."
+        type="generic"
+        weight="200"/>
+    <item id="851"
+        image="generic/reinboo-stick.png"
+        name="Stick Reinboo"
+        description="A stick reinboo. This is fun!"
+        type="generic"
+        weight="50"/>
+    <item id="852"
+        image="generic/leatherball.png"
+        name="Leather Ball"
+        description="A leather ball handmade by Santa's helpers."
+        type="generic"
+        weight="20"/>
+    <item id="853"
+        image="generic/doll.png"
+        name="Doll"
+        description="A cute red-haired doll with a blue dress."
+        type="generic"
+        weight="30"/>
+    <item id="854"
+        image="equipment/head/elf-nightcap.png"
+        name="Elf Nightcap"
+        description="A comfortable nightcap worn by Santa's helpers."
+        effect="M. Attack 5"
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/elf-nightcap.xml</sprite>
+    </item>
+    <item id="855"
+        image="equipment/head/sunglasses.png"
+        name="Sunglasses"
+        description="Some stealthy sunglasses hiding your eyes from skeptical eyes."
+        effect="M. Attack 6"
+        type="equip-head"
+        defense="2"
+        weight="10">
+        <sprite>equipment/head/sunglasses.xml</sprite>
+    </item>
+    <item id="856"
+        image="equipment/head/knit-cap.png"
+        name="Knit Cap"
+        description="A knitted cap keeping your head warm in the crual cold."
+        effect="M. Attack 0"
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>equipment/head/knit-cap.xml</sprite>
+    </item>
+    <item id="857"
+        image="equipment/legs/pants.png|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f"
+        name="Leather Trousers"
+        description="Trousers made out of robust leather."
+        effect="M. Attack -4, Accuracy +2"
+        type="equip-legs"
+        defense="5"
+        weight="25">
+        <sprite gender="male">equipment/legs/pants-male.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
+        <sprite gender="female">equipment/legs/pants-female.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
+    </item>
+    <item id="858"
+        image="generic/wolvern-tooth.png"
+        name="Wolvern Tooth"
+        description="A tooth from a wolvern."
+        type="generic"
+        weight="1"/>
+    <item id="859"
+        image="generic/wolvern-pelt.png|W:#000000,64727a,8996a0,a6afbf,dce9f3,ffffff"
+        name="Wolvern Pelt"
+        description="The pelt of a wolvern. Can be used to make clothes, blankets, or tents."
+        type="generic"
+        weight="50"/>
+    <item id="860"
+        image="generic/squirrel-pelt.png|R:#dfae76"
+        name="Squirrel Pelt"
+        description="The pelt of a squirrel. Trophy of the less experienced hunters, can be used to create clothes."
+        type="generic"
+        weight="20"/>
+    <item id="861"
+        image="generic/tuber.png"
+        name="White Bell Tuber"
+        description="A tuber of the White Bell flower. Alible, but only edible after cooking."
+        type="generic"
+        weight="3"/>
+    <item id="862"
+        image="generic/bottle-ice.png"
+        name="Iced Water"
+        description="A bottle containing iced water."
+        type="generic"
+        weight="10"/>
+    <item id="863"
+        image="generic/silvermirror.png"
+        name="Silver Mirror"
+        description="This mirror has some mysterious aura around it."
+        type="generic"
+        weight="10"/>
+    <item id="864"
+        image="generic/spell-book-page.png"
+        name="Book Page"
+        description="A piece of paper which seems to be a page ripped out of some book."
+        type="generic"
+        weight="1"/>
+    <item id="865"
+        image="generic/spell-book.png"
+        name="Grimoire"
+        description="An ancient spellbook filled with the wisdom of generations of magic. If you could only read it!"
+        type="generic"
+        weight="100"/>
+    <item id="866"
+        image="generic/leathersuitcase.png"
+        name="Leather Suitcase"
+        description="A really heavy leather suitcase."
+        type="generic"
+        weight="12000"/>
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
     <item id="1198"
@@ -2824,7 +3024,7 @@
         weapon-type="bow"
         attack-action="attack_bow">
         <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+        <!-- <sound event="strike">weapons/bows/bow_shoot_1.ogg</sound> -->
     </item>
     <item id="1201"
         image="equipment/weapon/dagger-knive.png"
@@ -3203,9 +3403,9 @@
         hp="150"
         weight="7"/>
     <item id="1251"
-        image="use/food/yellow-plum.png"
-        name="Yellow Plum"
-        description="A yellow variety of plum that is both sweet and sour."
+        image="use/food/plum.png"
+        name="Plum"
+        description="A plum that is both sweet and sour."
         type="usable"
         hp="100"
         weight="10"/>
@@ -3514,6 +3714,7 @@
         description="A thin, soft and warm black sweater."
         effect="M. Attack -16"
         type="equip-torso"
+        defense="8"
         weight="35">
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -4931,7 +5132,7 @@
 
     <item id="2200"
         image="equipment/head/wizard-hat.png|W:#580000,a40000,c02020,ff6060"
-        name="Red wizard hat"
+        name="Red Wizard Hat"
         description="A wizard hat, bright red."
         effect="M. Attack +5"
         type="equip-head"
@@ -5414,7 +5615,7 @@
     <item id="3010"
         image="use/food/candypumpkin.png"
         name="Candy Pumpkin"
-        description="With a squishy interior inside a hard, crunchy shell, this sweet has a warm and delcious pumpkin flavour."
+        description="With a squishy interior inside a hard, crunchy shell, this sweet has a warm and delicious pumpkin flavour."
         type="generic"
         weight="2"/>
     <item id="3011"
@@ -5619,7 +5820,7 @@
         <sprite>equipment/head/wizard-hat.xml</sprite>
     </item>
 	<item id="4029"
-        image="use/potions/e.png|G:#bb0000;R:#ff0000;"
+        image="use/potions/e.png|G:#bb0000;R:#ff0000"
         name="Grimace of Dementia"
         description="A feared potion. If done wrong... what did you say?"
         type="generic"
@@ -5646,4 +5847,37 @@
         weight="20">
         <sprite>equipment/head/monocle.xml</sprite>
     </item>
+    <item id="4032"
+        image="equipment/head/panhat.png"
+        name="Pan Hat"
+        description="A thick iron pan, big enough to cover the average head circumference of a human being."
+        effect="M. Attack -20"
+        defense="13"
+        type="equip-head"
+        weight="400">
+        <sprite>equipment/head/panhat.xml</sprite>
+    </item>
+    <item id="4033"
+        image="equipment/head/chefhat.png"
+        name="Chef Hat"
+        description="A tall hat designed for the person in charge of a kitchen. It smells like onions."
+        effect="M. Attack +2"
+        defense="2"
+        type="equip-head"
+        weight="30">
+        <sprite>equipment/head/chefhat.xml</sprite>
+    </item>
+    <item id="4034"
+        image="generic/blackpearl.png"
+        name="Black Pearl"
+        description="A pearl. Round, shiny and black!"
+        type="generic"
+        weight="5"/>
+    <item id="4035"
+        image="use/food/pickled_beets.png"
+        name="Pickled Beets"
+        description="The result of a radically unorthodox approach to the art of pickling vegetables."
+        type="usable"
+        hp="50"
+        weight="150"/>
 </items>
-- 
cgit v1.2.3-70-g09d2


From f74ec66b339cb81bf4bc6e3e59935137ae7b63ce Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 1 Apr 2012 23:15:40 +0100
Subject: Fix: Use sys.exit() so the status can be passed to a sh script (for
 restarting).

---
 main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index 4f39b1b..d0297eb 100755
--- a/main.py
+++ b/main.py
@@ -34,7 +34,7 @@ try:
     import config
 except:
     print "no config file found. please move config.py.template to config.py and edit to your needs!"
-    exit(0);
+    sys.exit(0);
 
 from being import *
 from net.packet import *
@@ -898,7 +898,7 @@ def main():
                 if errorOccured:
                     logger.info(errorOccured)
                     shop_broadcaster.stop()
-                    exit(0)
+                    sys.exit(1)
                 else:
                     logger.info("Inventory Check Passed.")
 
@@ -1076,7 +1076,7 @@ def main():
                 if errorOccured:
                     logger.info(errorOccured)
                     shop_broadcaster.stop()
-                    exit(0)
+                    sys.exit(1)
             else:
                 pass
 
-- 
cgit v1.2.3-70-g09d2


From 69b1e74409bcb227559162f3f0fdcc46a84adb44 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Sun, 1 Apr 2012 23:57:39 +0100
Subject: Add a shell script to manage reboot.

---
 start.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 start.sh

diff --git a/start.sh b/start.sh
new file mode 100755
index 0000000..830eece
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+MM_ACTIVE=1
+
+while [ $MM_ACTIVE != 0 ]
+do
+    echo "Starting tradey...."
+    python2.7 main.py >> error_log.txt
+
+    if [ "$?" != "0" ]; then
+        # Inventory/Money out of sync
+        echo "tradey quit with error at:"
+        date
+        MM_ACTIVE=0
+    else
+        echo "Tradey quit normally, sleeping 60 seconds before a restart"
+        sleep 60
+    fi
+done
-- 
cgit v1.2.3-70-g09d2


From 8754b59461477ccb1f93c215a2b49935306d13b0 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Thu, 5 Apr 2012 18:58:32 +0100
Subject: Add - A simple list for items which MM won't sell.

---
 config.py.template | 1 +
 main.py            | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/config.py.template b/config.py.template
index 2d3155e..8cad23e 100644
--- a/config.py.template
+++ b/config.py.template
@@ -6,3 +6,4 @@ password = ""
 relist_time = 604800 # Time in seconds before an item needs to be relisted.
 character = 0 #slot character is in, 0 for first, 1 for second, 2 for third
 admin = "Admin <admin@email.com>"
+nosell = [833, 3000, 727] # Items which can't be sold - just add the itemid to the list.
diff --git a/main.py b/main.py
index d0297eb..6978401 100755
--- a/main.py
+++ b/main.py
@@ -444,6 +444,9 @@ def process_whisper(nick, msg, mapserv):
             if item_id == -10:
                 mapserv.sendall(whisper(nick, "Item not found, check spelling."))
                 return
+            elif item_id in config.nosell:
+                mapserv.sendall(whisper(nick, "That item can't be added to ManaMarket, as its too heavy."))
+                return
 
             if amount > 1 and ItemDB.getItem(item_id).type != 'equip-ammo' and 'equip' in ItemDB.getItem(item_id).type:
                 mapserv.sendall(whisper(nick, "You can only add one piece of equipment per slot."))
-- 
cgit v1.2.3-70-g09d2


From 5079421781f84f353676d9caa95edec7c799e883 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Mon, 9 Apr 2012 17:50:48 +0100
Subject: Add: record the time of !add and !relist

To make it possible to do a purge of users in a few months.
---
 main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main.py b/main.py
index 6978401..1654b3d 100755
--- a/main.py
+++ b/main.py
@@ -577,6 +577,8 @@ def process_whisper(nick, msg, mapserv):
                 sale_tree.get_uid(uid).set('relisted', str(time_relisted + 1))
                 sale_tree.save()
                 mapserv.sendall(whisper(nick, "The item has been successfully relisted."))
+                user_tree.get_user(nick).set('last_use', str(time.time()))
+                user_tree.save()
             else:
                 mapserv.sendall(whisper(nick, "This item can no longer be relisted. Please collect it using !getback "+str(uid)+"."))
                 return
@@ -1045,6 +1047,7 @@ def main():
                         sale_tree.add_item(trader_state.item.player, trader_state.item.id, trader_state.item.amount, trader_state.item.price)
                         user_tree.get_user(trader_state.item.player).set('used_stalls', \
                             str(int(user_tree.get_user(trader_state.item.player).get('used_stalls')) + 1))
+                        user_tree.get_user(trader_state.item.player).set('last_use', str(time.time()))
                         commitMessage = "Add"
 
                     elif trader_state.item.get == 0: # !buy \ !getback
-- 
cgit v1.2.3-70-g09d2


From aef0bcdbda77b07f6f99e629e0499d7e576b6741 Mon Sep 17 00:00:00 2001
From: Dipesh Amin <yaypunkrock@gmail.com>
Date: Wed, 11 Apr 2012 12:56:52 +0100
Subject: Don't initiate trades, if the weight limit will be reached.

---
 main.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/main.py b/main.py
index 1654b3d..b13c354 100755
--- a/main.py
+++ b/main.py
@@ -441,12 +441,18 @@ def process_whisper(nick, msg, mapserv):
             price = int(broken_string[2])
             item_name = " ".join(broken_string[3:])
             item_id = ItemDB.findId(item_name)
+
+            weight = ItemDB.item_names[item_id].weight*amount
+
             if item_id == -10:
                 mapserv.sendall(whisper(nick, "Item not found, check spelling."))
                 return
             elif item_id in config.nosell:
                 mapserv.sendall(whisper(nick, "That item can't be added to ManaMarket, as its too heavy."))
                 return
+            elif weight + player_node.WEIGHT > player_node.MaxWEIGHT:
+                mapserv.sendall(whisper(nick, "I've not got enough room left to carry those. Please try again later. "))
+                return
 
             if amount > 1 and ItemDB.getItem(item_id).type != 'equip-ammo' and 'equip' in ItemDB.getItem(item_id).type:
                 mapserv.sendall(whisper(nick, "You can only add one piece of equipment per slot."))
-- 
cgit v1.2.3-70-g09d2


From a93b2573b8b04cf883dff0c75efa3f0630e3e79e Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@gmail.com>
Date: Fri, 26 Sep 2014 18:56:16 +0200
Subject: Added changes done outside of git

Those changes have been done on the server directly without continueing
the git history (or at least since the history i know).
---
 README                             |   3 +-
 being.py                           |  24 +-----
 config.py.template                 |   7 +-
 find-unused-accounts.pl            |  28 +++++++
 main.py                            |  15 +++-
 net/packet.py                      |   2 +-
 net/packet_out.py                  |  24 ------
 net/protocol.py                    |  24 ------
 player.py                          |  26 ++-----
 stats/process_salelog/Readme       |   1 +
 stats/process_salelog/main.py      |  59 +++++++++++++++
 stats/process_salelog/main_stat.py | 151 +++++++++++++++++++++++++++++++++++++
 stats/process_salelog/utils.py     |  82 ++++++++++++++++++++
 stats/update_sales.sh              |   5 ++
 tradey.py                          |  24 +-----
 utils.py                           |  27 ++-----
 16 files changed, 364 insertions(+), 138 deletions(-)
 create mode 100755 find-unused-accounts.pl
 create mode 100644 stats/process_salelog/Readme
 create mode 100755 stats/process_salelog/main.py
 create mode 100755 stats/process_salelog/main_stat.py
 create mode 100644 stats/process_salelog/utils.py
 create mode 100755 stats/update_sales.sh

diff --git a/README b/README
index bfdb8f7..461b6d5 100644
--- a/README
+++ b/README
@@ -1,6 +1,5 @@
-
 To get your own copy of tradey:
 
 cp config.py.template config.py
-cp data_template data/
+cp item.xml data/
 cd data git init
diff --git a/being.py b/being.py
index 3c920f6..3c70616 100644
--- a/being.py
+++ b/being.py
@@ -1,26 +1,10 @@
 #!/usr/bin/python
 """
-Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-This file is part of tradey, a trading bot in The Mana World
-see www.themanaworld.org
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http://www.gnu.org/licenses/>.
-
-Additionally to the GPL, you are *strongly* encouraged to share any modifications
-you do on these sources.
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
 """
 
 def job_type(job):
diff --git a/config.py.template b/config.py.template
index 8cad23e..e55b2f6 100644
--- a/config.py.template
+++ b/config.py.template
@@ -1,9 +1,8 @@
-#server = "server.themanaworld.org"
-server = "caliban.homeip.net"
+server = "server.themanaworld.org"
 port = 6901
 account = ""
 password = ""
 relist_time = 604800 # Time in seconds before an item needs to be relisted.
 character = 0 #slot character is in, 0 for first, 1 for second, 2 for third
-admin = "Admin <admin@email.com>"
-nosell = [833, 3000, 727] # Items which can't be sold - just add the itemid to the list.
+admin = ""
+#nosell = [] # Items which can't be sold - just add the itemid to the list.
diff --git a/find-unused-accounts.pl b/find-unused-accounts.pl
new file mode 100755
index 0000000..9667f5a
--- /dev/null
+++ b/find-unused-accounts.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+use XML::Simple;
+use warnings;
+use strict;
+use Data::Dumper;
+
+my $xml = XML::Simple->new();
+my $users = $xml->XMLin("data/user.xml", KeyAttr => {});
+my %l;
+
+# Snarf through the XML data. Build a hash: 
+#  username => lastuse
+# Only for users with no items and no money. 
+# For some reason last_use is floating point so let's fix that.
+foreach my $user (@{$users->{user}}) {
+  if ($user->{'used_stalls'} == 0 && $user->{'money'} == 0) {
+    $user->{'last_use'} = 0 unless ($user->{'last_use'});
+    $l{ $user->{'name'} } = int($user->{'last_use'});
+ }
+}
+
+
+print("Last used\t\t\tUsername\n");
+foreach (  sort { $l{$a} cmp $l{$b} || $a cmp $b } keys %l  ) {
+  print gmtime($l{$_}) . "\t$_\n";
+}
+
+
diff --git a/main.py b/main.py
index b13c354..eda5f64 100755
--- a/main.py
+++ b/main.py
@@ -68,6 +68,9 @@ def process_whisper(nick, msg, mapserv):
     user = user_tree.get_user(nick)
     broken_string = msg.split()
 
+    if len(broken_string) == 0:
+        return 
+
     if user != -10:
         if int(user.get("accesslevel")) == -1: # A user who has been blocked for abuse.
             if int(user.get("used_stalls")) == 0 and int(user.get("money")) == 0:
@@ -453,6 +456,9 @@ def process_whisper(nick, msg, mapserv):
             elif weight + player_node.WEIGHT > player_node.MaxWEIGHT:
                 mapserv.sendall(whisper(nick, "I've not got enough room left to carry those. Please try again later. "))
                 return
+            elif ItemDB.item_names[item_id].weight > 10 and amount > 150:
+                mapserv.sendall(whisper(nick, "Sorry, as each of those items weighs more than 10g you can only add a maximum quantity of 150."))
+                return
 
             if amount > 1 and ItemDB.getItem(item_id).type != 'equip-ammo' and 'equip' in ItemDB.getItem(item_id).type:
                 mapserv.sendall(whisper(nick, "You can only add one piece of equipment per slot."))
@@ -766,6 +772,7 @@ def main():
     shop_broadcaster.mapserv = mapserv
     # Map server packet loop
 
+    print "Entering map packet loop\n";
     while True:
         data = mapserv.recv(2048)
         if not data:
@@ -997,9 +1004,15 @@ def main():
                     logger.info("Trade item add response: Successfully added item.")
                     if trader_state.item:
                         if trader_state.item.get == 0 and index != 0-inventory_offset: # Make sure the correct item is given!
+                            # index & amount are Always 0
                             if player_node.inventory[index].itemId != trader_state.item.id or \
                                 amount != trader_state.item.amount:
-                                mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
+                                logger.info("Index: %s" % index)
+                                logger.info("P.ItemId: %s" % player_node.inventory[index].itemId)
+                                logger.info("T.ItemId: %s" % trader_state.item.id)
+                                logger.info("P.Amount: %s" % amount)
+                                logger.info("T.Amount: %s" % trader_state.item.amount)
+                                #mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
 
                     # If Trade item add successful - Remove the item from the inventory state.
                     if index != 0-inventory_offset: # If it's not money
diff --git a/net/packet.py b/net/packet.py
index 52bdf71..16b4f79 100644
--- a/net/packet.py
+++ b/net/packet.py
@@ -1,5 +1,5 @@
 
-# The PacketBuffer class has been adapted from source originally released by gnufrk
+"""The PacketBuffer class has been adapted from source originally released by gnufrk"""
 
 import struct
 
diff --git a/net/packet_out.py b/net/packet_out.py
index 79f9917..1d6e2d2 100644
--- a/net/packet_out.py
+++ b/net/packet_out.py
@@ -1,27 +1,3 @@
-"""
-Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
-
-This file is part of tradey, a trading bot in The Mana World
-see www.themanaworld.org
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http://www.gnu.org/licenses/>.
-
-Additionally to the GPL, you are *strongly* encouraged to share any modifications
-you do on these sources.
-"""
-
 from packet import *
 from protocol import *
 
diff --git a/net/protocol.py b/net/protocol.py
index 8b97542..4a4b74f 100644
--- a/net/protocol.py
+++ b/net/protocol.py
@@ -1,27 +1,3 @@
-"""
-Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
-
-This file is part of tradey, a trading bot in The Mana World
-see www.themanaworld.org
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http://www.gnu.org/licenses/>.
-
-Additionally to the GPL, you are *strongly* encouraged to share any modifications
-you do on these sources.
-"""
-
 SMSG_LOGIN_DATA = 0x0069
 SMSG_CHAR_LOGIN = 0x006b
 SMSG_CHAR_MAP_INFO = 0x0071
diff --git a/player.py b/player.py
index 6417368..ed80f66 100644
--- a/player.py
+++ b/player.py
@@ -1,26 +1,10 @@
 #!/usr/bin/python
 """
-Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-This file is part of tradey, a trading bot in The Mana World
-see www.themanaworld.org
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http://www.gnu.org/licenses/>.
-
-Additionally to the GPL, you are *strongly* encouraged to share any modifications
-you do on these sources.
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
 """
 
 import copy
@@ -78,7 +62,7 @@ class Player:
             total_money += int(user.get('money'))
 
         if total_money != self.MONEY:
-            return "Server and client money out of sync."
+            return "Server and client money out of sync. Market: %s Player %s" % (total_money, self.MONEY)
 
         return 0
 
diff --git a/stats/process_salelog/Readme b/stats/process_salelog/Readme
new file mode 100644
index 0000000..6b80ea7
--- /dev/null
+++ b/stats/process_salelog/Readme
@@ -0,0 +1 @@
+Usage: python main.py sales.log <output file>
diff --git a/stats/process_salelog/main.py b/stats/process_salelog/main.py
new file mode 100755
index 0000000..4ad2dd3
--- /dev/null
+++ b/stats/process_salelog/main.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+"""
+
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+    tradey, a package, which implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
+
+"""
+
+import logging
+import socket
+import sys
+import time
+import string
+import utils
+import locale
+
+ItemDB = utils.ItemDB()
+
+def main():
+    in_file = sys.argv[1]
+    out_file = sys.argv[2]
+    locale.setlocale(locale.LC_ALL, '')
+
+    out_obj = open(out_file, 'w')
+    in_obj = open(in_file, 'r')
+
+    out_obj.write('<html> \n')
+    out_obj.write('<body> \n')
+    out_obj.write('<head> \n')
+    out_obj.write('<title>ManaMarket Sales</title> \n')
+    out_obj.write('<h2>ManaMarket Sales</h2>')
+    out_obj.write('<table border="1" cellpadding="5" cellspacing="0"> \n')
+    out_obj.write('<tr bgcolor="6699FF"> <td>Item Name</td> <td>Amount</td> <td>Price</td> <td>Time</td> </tr>\n')
+
+    sales = in_obj.readlines()
+
+    sale_total = 0
+    items_sold = 0
+    for line in sales:
+        line = line.split()
+        t_time = time.gmtime(float(line[3]))
+        unit_price = int(line[2])/int(line[1])
+        out_obj.write('<tr> <td>'+ItemDB.getItem(int(line[0])).name+'</td> <td>'+locale.format("%d", int(line[1]), grouping=True)+'</td> <td>'+locale.format("%d", unit_price, grouping=True)+'</td> <td>'+time.asctime(t_time)+'</td> </tr>\n') 
+        sale_total += int(line[2])       
+        items_sold += int(line[1])
+
+    out_obj.write('</table> \n')
+    out_obj.write('</br><b>Total sales: '+str(sale_total)+' GP</b> </br>')
+    out_obj.write('<b>Total number of items sold: '+str(items_sold)+'</b></br>')
+    out_obj.write('Updated: '+time.asctime(time.gmtime()))
+    out_obj.write('</body></html> \n')
+    in_obj.close()
+    out_obj.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/stats/process_salelog/main_stat.py b/stats/process_salelog/main_stat.py
new file mode 100755
index 0000000..9ff71d5
--- /dev/null
+++ b/stats/process_salelog/main_stat.py
@@ -0,0 +1,151 @@
+#!/usr/bin/python
+"""
+
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+    tradey, a package, which implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
+
+"""
+
+import logging
+import socket
+import sys
+import time
+import string
+import utils
+import locale
+
+class SaleStat:
+    pass
+
+ItemDB = utils.ItemDB()
+
+def main():
+    in_file = sys.argv[1]
+    out_file = sys.argv[2]
+    locale.setlocale(locale.LC_ALL, '')
+
+    out_obj = open(out_file, 'w')
+    in_obj = open(in_file, 'r')
+    
+    out_obj.write('<html> \n \
+    <head> \n \
+    <title>ManaMarket Statistics</title> \n \
+    <style type="text/css"> \n \
+    td, th { border: 1px solid black } \n \
+    table {border: 1px solid black} \n \
+    </style> \n \
+    </head> \n \
+    <body> \n \
+    <h2> ManaMarket Statistics </h2> \n \
+    <table cellpadding="5" cellspacing="0"> \n \
+    <tr> \n \
+    <th rowspan="2"> Item Name</th> \n \
+    <th rowspan="2"> Total Amount Sold</th> \n \
+    <th colspan="5">Price</th> \n \
+    <th rowspan="2">Last Sold</th> \n \
+    </tr> \n \
+    <tr> \n \
+    <td>Min</td> \n \
+    <td>Max</td> \n \
+    <td>Average (Week)</td> \n \
+    <td>Average (Month)</td> \n \
+    <td>Average (Overall)</td> \n \
+    </tr> \n ')
+
+    sales = in_obj.readlines()
+
+    sale_dict = {}
+
+    # Put sales date into a dict.
+    sale_total = 0
+    for line in sales:
+        line = line.split()
+        item_id = int(line[0])
+        name = ItemDB.getItem(int(line[0])).name
+        amount = int(line[1])
+        price = int(line[2])
+        t_time = float(line[3])
+        sale_total += int(line[2])
+        
+        if item_id not in sale_dict:
+            sale_dict[item_id] = []
+
+        sale_dict[item_id].append([amount, price, t_time])
+    
+    str_list = []
+    # calculate the stats
+    for item in sale_dict:
+	average_week = 0
+        average_week_amount = 0
+        average_month = 0
+        average_month_amount = 0
+        average_all_time = 0
+        average_all_time_amount = 0
+        min_price = 0
+        max_price = 0
+        last_sold = 0
+
+        for n in range(len(sale_dict[item])):
+
+            #out_obj.write('<tr>')
+
+            if min_price > sale_dict[item][n][1]/sale_dict[item][n][0] or min_price == 0:
+                min_price = sale_dict[item][n][1]/sale_dict[item][n][0]
+
+            if max_price < sale_dict[item][n][1]/sale_dict[item][n][0] or max_price == 0:
+                max_price = sale_dict[item][n][1]/sale_dict[item][n][0]
+
+            if last_sold < sale_dict[item][n][2] or last_sold == 0:
+                last_sold = sale_dict[item][n][2]
+
+            if (time.time()-sale_dict[item][n][2]) < 7*24*60*60:
+                average_week_amount += sale_dict[item][n][0]
+                average_week += sale_dict[item][n][1]
+
+            if (time.time()-sale_dict[item][n][2]) < 30*24*60*60:
+                average_month_amount += sale_dict[item][n][0]
+                average_month += sale_dict[item][n][1]
+
+            
+            average_all_time_amount += sale_dict[item][n][0]
+            average_all_time += sale_dict[item][n][1]
+
+        average_all_time /= average_all_time_amount
+        if average_week_amount > 0:        
+            average_week /= average_week_amount
+        if average_month_amount > 0:
+            average_month /= average_month_amount
+        
+        str_list.append([average_all_time_amount,'<td>'+ItemDB.getItem(item).name+'</td>'+'<td>'+locale.format("%d", average_all_time_amount, grouping=True)+'</td>'+ \
+        '<td>'+ locale.format("%d", min_price, grouping=True) +'</td>'+'<td>'+ locale.format("%d", max_price, grouping=True) +'</td>'+'<td>'+ \
+        locale.format("%d", average_week, grouping=True) +'</td>'+ '<td>'+ locale.format("%d", average_month, grouping=True) + \
+        '</td>'+'<td>'+ locale.format("%d", average_all_time, grouping=True)+'</td>'+'<td>'+ time.asctime(time.gmtime(last_sold)) +'</td>'])
+
+    while len(str_list) > 0:
+        pos = 0
+        max_amount = 0
+        for m in range(len(str_list)):
+            if max_amount < str_list[m][0] or max_amount == 0:
+                max_amount = str_list[m][0]
+                pos = m
+        out_obj.write('<tr>')
+        out_obj.write(str_list[pos][1])
+        str_list.pop(pos)
+
+
+        out_obj.write('</tr> \n')
+
+    out_obj.write('</table> \n')
+    out_obj.write('</br><b>Total sales: '+str(sale_total)+' GP</b> </br>')
+    out_obj.write('Updated: '+time.asctime(time.gmtime())+'</br>')
+    out_obj.write('For a detailed page showing all sales '+'<a href="manamarket.html">click here</a>')
+
+    out_obj.write('</body></html> \n')
+    in_obj.close()
+    out_obj.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/stats/process_salelog/utils.py b/stats/process_salelog/utils.py
new file mode 100644
index 0000000..fd4e432
--- /dev/null
+++ b/stats/process_salelog/utils.py
@@ -0,0 +1,82 @@
+#!/usr/bin/python
+"""
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
+"""
+from xml.etree.ElementTree import ElementTree
+import time
+
+class Item:
+    pass
+
+# Process a recieved ip address.
+def parse_ip(a):
+    return "%s.%s.%s.%s" % ((a % 256),((a >> 8) % 256),((a >> 16) % 256),((a >> 24) % 256))
+
+# Remove colors from a message
+def remove_colors(msg):
+    if len(msg) > 2:
+        for f in range(len(msg)-2):
+            while (len(msg) > f + 2) and (msg[f] == "#")\
+                and (msg[f+1] == "#"):
+                msg = msg[0:f]+msg[f+3:]
+    return msg
+
+# Encode string - used with 4144 shop compatibility.
+def encode_str(value, size):
+    output = ''
+    base = 94
+    start = 33
+    while value:
+        output += chr(value % base + start)
+        value /= base
+
+    while len(output) < size:
+        output += chr(start)
+
+    return output
+
+class ItemDB:
+    """
+    A simple class to look up information from the items.xml file.
+    """
+    def __init__(self):
+        print "Loading ItemDB"
+        self.item_names = {}
+        self.itemdb_file = ElementTree(file="../data/items.xml")
+
+        for item in self.itemdb_file.getroot():
+            if item.get('id') > 500:
+                item_struct = Item()
+                item_struct.name = item.get('name')
+                if item.get('weight'):
+                    item_struct.weight = item.get('weight')
+                if item.get('type'):
+                    item_struct.type = item.get('type')
+                item_struct.description = item.get('description')
+                self.item_names[int(item.get('id'))] = item_struct
+
+    def getItem(self, item_id):
+        return self.item_names[item_id]
+
+    def findId(self, name):
+        for item_id in self.item_names:
+            if self.item_names[item_id].name == name:
+                return item_id
+        return -10 #Not found
+
+class ItemLog:
+    """ Writes all sales to a log file, for later processing."""
+    def __init__(self):
+        self.log_file = 'data/logs/sale.log'
+
+    def add_item(self, item_id, amount, price):
+        file_node = open(self.log_file, 'a')
+        file_node.write(str(item_id)+" "+str(amount)+" "+str(price)+" "+str(time.time())+"\n")
+        file_node.close()
+
+if __name__ == '__main__':
+    print "Do not run this file directly. Run main.py"
diff --git a/stats/update_sales.sh b/stats/update_sales.sh
new file mode 100755
index 0000000..62a4e1e
--- /dev/null
+++ b/stats/update_sales.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+cd /home/tmwserver/ManaMarket/stats
+python /home/tmwserver/ManaMarket/stats/process_salelog/main.py /home/tmwserver/ManaMarket/data/logs/sale.log /var/www/tmw-homepage/server/manamarket.html
+python /home/tmwserver/ManaMarket/stats/process_salelog/main_stat.py /home/tmwserver/ManaMarket/data/logs/sale.log /var/www/tmw-homepage/server/manamarket_stats.html
+chmod 644 /var/www/tmw-homepage/server/manamarket.html /var/www/tmw-homepage/server/manamarket_stats.html
diff --git a/tradey.py b/tradey.py
index 673fc46..01f855e 100644
--- a/tradey.py
+++ b/tradey.py
@@ -1,26 +1,10 @@
 #!/usr/bin/python
 """
-Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-This file is part of tradey, a trading bot in The Mana World
-see www.themanaworld.org
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http://www.gnu.org/licenses/>.
-
-Additionally to the GPL, you are *strongly* encouraged to share any modifications
-you do on these sources.
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
 """
 import time
 import os
diff --git a/utils.py b/utils.py
index f911d43..07c4451 100644
--- a/utils.py
+++ b/utils.py
@@ -1,26 +1,10 @@
 #!/usr/bin/python
 """
-Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
-Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+    Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+    Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
 
-This file is part of tradey, a trading bot in The Mana World
-see www.themanaworld.org
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http://www.gnu.org/licenses/>.
-
-Additionally to the GPL, you are *strongly* encouraged to share any modifications
-you do on these sources.
+    This file is part of tradey, a trading bot in the mana world
+    see www.themanaworld.org
 """
 from xml.etree.ElementTree import ElementTree
 from player import Item
@@ -128,9 +112,10 @@ class Broadcast:
 
     def send_broadcast(self):
         while self.Active:
-            if (time.time() - self.Timer) > 2 * 60:
+            if (time.time() - self.Timer) > 60:
                 self.mapserv.sendall(emote(193))
                 self.Timer = time.time()
+                #print "shop_broadcast"
             else:
                 time.sleep(0.1)
 
-- 
cgit v1.2.3-70-g09d2