synch with new test repo.

1 files changed, 403 insertions, 20 deletions

diff --git a/items.xml b/items.xml
index b4034571..8b1e36f9 100644
--- a/items.xml
+++ b/items.xml
@@ -68,6 +68,42 @@
         <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-potion-a.png|G:#22ff22"
@@ -560,7 +596,7 @@
         image="weapon-axe-blacksmithsaxe.png"
         name="Blacksmith's Axe"
         description="An axe usually used by blacksmiths."
-        effect="80 Damage, 1 Range"
+        effect="+80 Damage, 1 Range"
         type="equip-2hand"
 		weapon_type="11"
         weapon-type="axe"
@@ -934,7 +970,7 @@
         image="weapon-sword-sword.png"
         name="Sword"
         description="A simple but reliable sword."
-        effect="25 Damage, 1 Range"
+        effect="+25 Damage, 1 Range"
         type="equip-1hand"
 		weapon_type="11"
         weapon-type="sword"
@@ -1014,7 +1050,7 @@
         image="weapon-polearm-spear.png"
         name="Spear"
         description="A light spear with a wooden pole."
-        effect="??? Damage, ??? Range"
+        effect="+40 Damage, 1 Range"
         type="equip-2hand"
 		weapon_type="11"
         weapon-type="polearm"
@@ -2549,7 +2585,7 @@
         image="weapon-arrow-arrow.png|W:#8B4513"
         name="Terranite Arrow"
         description="A terranite arrow."
-        effect="+35 Damage"
+        effect="+50 Damage +1 range"
         type="equip-ammo"
         weight="1"
         max-per-slot="100"/>
@@ -2587,7 +2623,7 @@
         image="armor-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="+15% Defense"
+        effect=""
         type="equip-head"
         defense="15"
         weight="300">
@@ -2597,10 +2633,10 @@
         image="armor-chest-terranite.png"
         name="Terranite Chest Armor"
         description="A nice piece of armor made out of terranite ore."
-        effect="+30% Defense"
+        effect="+1 Dexterity"
         type="equip-torso"
         weight="800"
-        defense="30"
+        defense="20"
         max-per-slot="1">
         <sprite gender="male">chest-terranite-male.xml</sprite>
         <sprite gender="female">chest-terranite-female.xml</sprite>
@@ -2609,22 +2645,22 @@
         image="armor-legs-terranite.png"
         name="Terranite Legs Armor"
         description="Leggings made out of terranite."
-        effect="+8% Defense"
+        effect="+1 Agility"
         type="equip-legs"
         weight="30"
-        defense="8"
+        defense="5"
         max-per-slot="1">
         <sprite gender="male">leg-terranite-male.xml</sprite>
         <sprite gender="female">leg-terranite-female.xml</sprite>
     </item>
     <item id="769"
         image="armor-head-guyfawkes.png"
-        name="Guy Fawkes' Mask"
-        description="The famous Guy Fawkes' mask."
-        effect="+14% Defense"
+        name="Guy Fawkes Mask"
+        description="The famous Guy Fawkes mask."
+        effect="+3% Defense"
         type="equip-head"
-        weight="12"
-        defense="14"
+        weight="30"
+        defense="3"
         max-per-slot="1">
         <sprite>head-guyfawkes.xml</sprite>
     </item>
@@ -2632,10 +2668,10 @@
         image="armor-head-fairy_hat.png"
         name="Fairy Hat"
         description="The famous hat worn by Robin Hood."
-        effect="+8% Defense"
+        effect="+5% Defense"
         type="equip-head"
-        weight="18"
-        defense="8"
+        weight="20"
+        defense="5"
         max-per-slot="1">
         <sprite>head-fairy_hat.xml</sprite>
     </item>
@@ -2738,10 +2774,10 @@
         image="equipment/chest/forest-armor.png"
         name="Forest Armor"
         description="A clean and comfortable mantle with dags made for the finest stalkers."
-        effect="+6% Defense"
+        effect="+10% Defense"
         type="equip-torso"
         weight="30"
-        defense="6"
+        defense="10"
         max-per-slot="1">
         <sprite gender="male">equipment/chest/forest-armor-male.xml</sprite>
         <sprite gender="female">equipment/chest/forest-armor-female.xml</sprite>
@@ -3304,6 +3340,63 @@
         type="usable"
         weight="20"/>
 
+    <!-- Halloween 2010 -->
+
+    <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="armor-head-jestermask.png"
+        name="Jester Mask"
+        description="Laughter with bells on."
+        type="equip-head"
+        defense="3"
+        weight="50">
+        <sprite>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."
+        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="weapon-thrown-bonedarts.png"
+        name="Bone Arrows"
+        description="Arrows made from bone. Not much different from the normal variety, but are much lighter."
+        type="equip-ammo"
+        weight="0"/>
+
 
     <!-- The 2XXY IDs are used for recolored items on eAthena.
         XX = item
@@ -4814,7 +4907,7 @@
     <item id="2199"
         image="equipment/head/rabbit-ears.png|W:#104010,208020,30c030"
         name="Dark green rabbit ears"
-        description="A headband with rabbit ears, pure white."
+        description="A headband with rabbit ears, dark green."
         effect="+5% Defense"
         defense="5"
         type="equip-head"
@@ -4822,6 +4915,116 @@
         max-per-slot="1">
         <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2208"
+        image="equipment/head/wizard-hat|W:#4f0a76,8010c0,d699f7"
+        name="Purple wizard hat"
+        description="A wizard hat, strong purple."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <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="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#104010,208020,30c030</sprite>
+    </item>
     <item id="4000"
         image="generic-scorpionstinger.png|W:#800000,ffffff"
         name="Angry Scorpion Stinger"
@@ -4930,4 +5133,184 @@
         effect=""
         type="generic"
         weight="200"/>
+    <item id="4016"
+        image="generic-bandit-hood.png"
+        name="Bandit Hood"
+        description="A bandit hood crawling with lice."
+        effect=""
+        type="generic"
+        weight="50"/>
+    <item id="4017"
+        image="generic-powder.png|W:#c00000"
+        name="Red Powder"
+        description="A pile of magical red powder."
+        effect=""
+        type="generic"
+        weight="3"
+        max-per-slot="10"/>
+     <item id="4018"
+        image="generic-powder.png|W:#ffcc00"
+        name="Yellow Powder"
+        description="A pile of magical yellow powder."
+        effect=""
+        type="generic"
+        weight="3"
+        max-per-slot="10"/>
+     <item id="4019"
+        image="generic-powder.png|W:#003399"
+        name="Blue Powder"
+        description="A pile of magical blue powder."
+        effect=""
+        type="generic"
+        weight="3"
+        max-per-slot="10"/>
+    <item id="4020"
+        image="armor-head-candlehelmet.png"
+        name="Candle Helmet"
+        description="Worn by spelunkers."
+        effect="+16% Defense, -1 Agility, +1 Intelligence"
+        type="equip-head"
+        defense="16"
+        weight="450"
+	max-per-slot="1">
+        <sprite>head-candlehelmet.xml</sprite>
+    </item>
+    <item id="4021"
+        image="generic-yellowpresentbox.png"
+        name="Yellow Present Box"
+        description="Something mysterious inside?"
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4022"
+        image="generic-whitepresentbox.png"
+        name="White Present Box"
+        description="Something very mysterious inside."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4022"
+        image="generic-whitepresentbox.png"
+        name="White Present Box"
+        description="Something mysterious inside."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4023"
+        image="generic-animal-bones.png"
+        name="Animal Bones"
+        description="Bones from an animal."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4024"
+        image="generic-frozen-yeti-tear.png"
+        name="Frozen Yeti Tear"
+        description="A tear from a yeti, frozen."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4025"
+        image="generic-yeti-claw.png"
+        name="Yeti Claw"
+        description="A claw broken off from a yeti"
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4026"
+        image="generic-ice-cube.png"
+        name="Ice Cube"
+        description="Very cold ice cube that never seems to completely melt."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4027"
+        image="equipment/head/yeti-mask.png"
+        name="Yeti Mask"
+        description="A mask made from the yeti's head."
+        effect="+ 4% Defense"
+        type="equip-head"
+        defense="4"
+        weight="10"
+	max-per-slot="1">
+        <sprite>equipment/head/yeti-mask.xml</sprite>
+    </item>
+    <item id="4028"
+        image="equipment/head/wizard-hat.png"
+        name="Wizard hat"
+        description="A wizard hat."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml</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="generic-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="generic-marshmallow.png"
+        name="Marshmallow"
+        description="Flavoured with real marshmallow root."
+        type="generic"
+        weight="2"/>
+    <item id="3009"
+        image="generic-jellyskull.png"
+        name="Jelly Skull"
+        description="Like a jelly bean, but in the shape of skull."
+        type="generic"
+        weight="2"/>
+    <item id="3010"
+        image="generic-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"/>
 </items>