From 0c141539125edc1837fb3b6e3415e2369425ae2a Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Sat, 21 Jul 2018 20:11:54 +0200
Subject: Add a bunch of items converted by Saulc and his new head base sprite

---
 graphics/sprites/equipment/head/bandana-female.xml |  65 -----
 graphics/sprites/equipment/head/bandana-male.xml   |  65 -----
 graphics/sprites/equipment/head/brimmedhat.xml     |   4 +
 graphics/sprites/equipment/head/fancyhat.xml       |  78 +----
 graphics/sprites/equipment/head/pumpkinhat.xml     |  65 -----
 items.xml                                          | 319 +++++++++++++++++++--
 6 files changed, 317 insertions(+), 279 deletions(-)

diff --git a/graphics/sprites/equipment/head/bandana-female.xml b/graphics/sprites/equipment/head/bandana-female.xml
index 88347635..a52fedd1 100644
--- a/graphics/sprites/equipment/head/bandana-female.xml
+++ b/graphics/sprites/equipment/head/bandana-female.xml
@@ -106,71 +106,6 @@ Copyright (C) 2012-2014 Evol Online -->
         </animation>
     </action>
 
-    <action name="attack_wand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-40" delay="160"/>
-            <frame index="0" offsetX="2" offsetY="-41" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-38" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-37" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="5" offsetY="-39" delay="160"/>
-            <frame index="1" offsetX="5" offsetY="-40" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetY="-36" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-37" delay="320"/>
-            <frame index="2" offsetX="-2" offsetY="-35" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-4" offsetY="-39" delay="160"/>
-            <frame index="3" offsetX="-4" offsetY="-40" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_scythe" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-41" delay="190"/>
-            <frame index="0" offsetX="2" offsetY="-38" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-37" delay="100"/>
-            <frame index="0" offsetX="2" offsetY="-38" delay="90"/>
-            <frame index="0" offsetX="2" offsetY="-41" delay="90"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-38" delay="100"/>
-            <frame index="1" offsetX="5" offsetY="-40" delay="90"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetY="-36" delay="90"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="90"/>
-            <frame index="1" offsetX="5" offsetY="-40" delay="100"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-37" delay="100"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="170"/>
-            <frame index="2" offsetX="-2" offsetY="-35" delay="90"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="190"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-4" offsetY="-38" delay="100"/>
-            <frame index="3" offsetX="-4" offsetY="-40" delay="90"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetY="-36" delay="90"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="100"/>
-            <frame index="3" offsetX="-4" offsetY="-40" delay="100"/>
-            <end />
-        </animation>
-    </action>
-
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="2" offsetY="-35"/>
diff --git a/graphics/sprites/equipment/head/bandana-male.xml b/graphics/sprites/equipment/head/bandana-male.xml
index 2ee91b24..db221fd1 100644
--- a/graphics/sprites/equipment/head/bandana-male.xml
+++ b/graphics/sprites/equipment/head/bandana-male.xml
@@ -106,71 +106,6 @@ Copyright (C) 2012-2014 Evol Online -->
         </animation>
     </action>
 
-    <action name="attack_wand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-40" delay="160"/>
-            <frame index="0" offsetX="-3" offsetY="-41" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-38" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-37" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="5" offsetY="-39" delay="160"/>
-            <frame index="1" offsetX="5" offsetY="-40" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetY="-36" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-37" delay="320"/>
-            <frame index="2" offsetX="-2" offsetY="-35" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-4" offsetY="-39" delay="160"/>
-            <frame index="3" offsetX="-4" offsetY="-40" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_scythe" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-41" delay="190"/>
-            <frame index="0" offsetX="-3" offsetY="-38" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-37" delay="100"/>
-            <frame index="0" offsetX="-3" offsetY="-38" delay="90"/>
-            <frame index="0" offsetX="-3" offsetY="-41" delay="90"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-38" delay="100"/>
-            <frame index="1" offsetX="5" offsetY="-40" delay="90"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetY="-36" delay="90"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="90"/>
-            <frame index="1" offsetX="5" offsetY="-40" delay="100"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-37" delay="100"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="170"/>
-            <frame index="2" offsetX="-2" offsetY="-35" delay="90"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="190"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-4" offsetY="-38" delay="100"/>
-            <frame index="3" offsetX="-4" offsetY="-40" delay="90"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetY="-36" delay="90"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="100"/>
-            <frame index="3" offsetX="-4" offsetY="-40" delay="100"/>
-            <end />
-        </animation>
-    </action>
-
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="-3" offsetY="-35"/>
diff --git a/graphics/sprites/equipment/head/brimmedhat.xml b/graphics/sprites/equipment/head/brimmedhat.xml
index 3bce3a6e..4ecbe157 100644
--- a/graphics/sprites/equipment/head/brimmedhat.xml
+++ b/graphics/sprites/equipment/head/brimmedhat.xml
@@ -5,8 +5,12 @@ Copyright (C) 2014 Evol Online -->
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedhat.png"
               width="27"
+<<<<<<< HEAD
               height="20"
               offsetY="-10"/>
+=======
+              height="20"/>
+>>>>>>> 12e7af060a5bf1d129d95b8d6d6ec10c88fd48df
 
     <include file="equipment/head/pumpkinhat.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/fancyhat.xml b/graphics/sprites/equipment/head/fancyhat.xml
index 3b51de02..50575a01 100644
--- a/graphics/sprites/equipment/head/fancyhat.xml
+++ b/graphics/sprites/equipment/head/fancyhat.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <!-- Authors: Alige, Reid
 Copyright (C) 2012-2013 Evol Online -->
 <sprite>
@@ -106,71 +107,6 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
-    <action name="attack_wand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-46" delay="160"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-44" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-43" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="0" offsetX="3" offsetY="-49" delay="160"/>
-            <frame index="0" offsetX="3" offsetY="-50" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-2" offsetY="-46" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="1" offsetX="-3" offsetY="-48" delay="320"/>
-            <frame index="1" offsetX="-3" offsetY="-46" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="1" offsetX="-5" offsetY="-49" delay="160"/>
-            <frame index="1" offsetX="-5" offsetY="-50" delay="80"/>
-            <frame index="1" offsetX="-2" offsetY="-47" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-46" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_scythe" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-47" delay="190"/>
-            <frame index="0" offsetX="-1" offsetY="-44" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-43" delay="100"/>
-            <frame index="0" offsetX="-1" offsetY="-44" delay="90"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="90"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="0" offsetX="2" offsetY="-48" delay="100"/>
-            <frame index="0" offsetX="3" offsetY="-50" delay="90"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
-            <frame index="0" offsetX="-2" offsetY="-46" delay="90"/>
-            <frame index="0" offsetX="-1" offsetY="-47" delay="90"/>
-            <frame index="0" offsetX="3" offsetY="-50" delay="100"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="1" offsetX="-2" offsetY="-48" delay="100"/>
-            <frame index="1" offsetX="-3" offsetY="-48" delay="170"/>
-            <frame index="1" offsetX="-3" offsetY="-46" delay="90"/>
-            <frame index="1" offsetX="-3" offsetY="-48" delay="190"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="1" offsetX="-3" offsetY="-48" delay="100"/>
-            <frame index="1" offsetX="-5" offsetY="-50" delay="90"/>
-            <frame index="1" offsetX="-2" offsetY="-47" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-46" delay="90"/>
-            <frame index="1" offsetX="-2" offsetY="-47" delay="100"/>
-            <frame index="1" offsetX="-5" offsetY="-50" delay="100"/>
-            <end />
-        </animation>
-    </action>
-
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="-1" offsetY="-41"/>
@@ -206,4 +142,16 @@ Copyright (C) 2012-2013 Evol Online -->
             <frame index="1" offsetX="38" offsetY="-3"/>
         </animation>
     </action>
+=======
+<!-- Author: Saulc
+Copyright (C) 2018 TMW2 -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/head/fancyhat.png"
+              width="32"
+              height="64"
+              offsetY="1"/>
+
+    <include file="equipment/head/headmodel-male.xml"/>
+>>>>>>> 12e7af060a5bf1d129d95b8d6d6ec10c88fd48df
 </sprite>
diff --git a/graphics/sprites/equipment/head/pumpkinhat.xml b/graphics/sprites/equipment/head/pumpkinhat.xml
index 2657f8bb..8f9e0871 100644
--- a/graphics/sprites/equipment/head/pumpkinhat.xml
+++ b/graphics/sprites/equipment/head/pumpkinhat.xml
@@ -106,71 +106,6 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
-    <action name="attack_wand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-35" delay="160"/>
-            <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-33" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-32" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-38" delay="160"/>
-            <frame index="1" offsetX="3" offsetY="-39" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="1" offsetX="-2" offsetY="-35" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-3" offsetY="-36" delay="320"/>
-            <frame index="2" offsetX="-3" offsetY="-34" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-38" delay="160"/>
-            <frame index="3" offsetX="-3" offsetY="-39" delay="80"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <frame index="3" offsetX="1" offsetY="-35" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_scythe" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-36" delay="190"/>
-            <frame index="0" offsetX="-1" offsetY="-33" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-32" delay="100"/>
-            <frame index="0" offsetX="-1" offsetY="-33" delay="90"/>
-            <frame index="0" offsetX="-1" offsetY="-36" delay="90"/>
-            <end/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="2" offsetY="-37" delay="100"/>
-            <frame index="1" offsetX="3" offsetY="-39" delay="90"/>
-            <frame index="1" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="1" offsetX="-2" offsetY="-35" delay="90"/>
-            <frame index="1" offsetX="-1" offsetY="-36" delay="90"/>
-            <frame index="1" offsetX="3" offsetY="-39" delay="100"/>
-            <end/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
-            <frame index="2" offsetX="-3" offsetY="-36" delay="170"/>
-            <frame index="2" offsetX="-3" offsetY="-34" delay="90"/>
-            <frame index="2" offsetX="-3" offsetY="-36" delay="190"/>
-            <end/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-37" delay="100"/>
-            <frame index="3" offsetX="-3" offsetY="-39" delay="90"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <frame index="3" offsetX="1" offsetY="-35" delay="90"/>
-            <frame index="3" offsetY="-36" delay="100"/>
-            <frame index="3" offsetX="-3" offsetY="-39" delay="100"/>
-            <end/>
-        </animation>
-    </action>
-
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="-1" offsetY="-30"/>
diff --git a/items.xml b/items.xml
index eb06328f..002c7bf6 100644
--- a/items.xml
+++ b/items.xml
@@ -995,6 +995,17 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sprite gender="unisex">equipment/chest/silkrobe-male.xml</sprite>
         <sprite gender="female">equipment/chest/silkrobe-female.xml</sprite>
     </item>
+    <item id="1308"
+        image="equipment/chest/warlordplate.png"
+        name="Warlord Plate"
+        description="Strong and decorative armor."
+        defense="450"
+        level="20"
+        type="equip-torso"
+        weight="1500">
+        <sprite gender="unisex">equipment/chest/warlordplate-male.xml</sprite>
+        <sprite gender="female">equipment/chest/warlordplate-female.xml</sprite>
+    </item>
     <!-- Boots -->
     <item id="1800"
         image="equipment/feet/boots.png|S:#3c3c3c,40332d,4d4d4d,5e4a3d,686868,705740,919191,a1825d,b6b6b6,b59767,dfdfdf,dbbf88"
@@ -1008,6 +1019,19 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sprite gender="unisex">equipment/feet/boots-male.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
         <sprite gender="female">equipment/feet/boots-female.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
     </item>
+    <item id="1801"
+        image="equipment/feet/cottonboots.png|W"
+        name="%Color% Cotton Boots"
+        description="A pair of %color% quality cotton boots."
+        defense="1202"
+        level="14"
+        type="equip-feet"
+        weight="35"
+        color="simple"
+        maxFloorOffset="8">
+        <sprite gender="unisex">equipment/feet/boots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/cottonboots-female.xml</sprite>
+    </item>
 
     <!-- Gloves -->
     <item id="2000"
@@ -1046,6 +1070,31 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sprite gender="unisex">equipment/hands/armbands-male.xml|#663d38,4b6167,8f5c52,708892,ad7c65,a5bebf,d9c9b2,a5bebf</sprite>
         <sprite gender="female">equipment/hands/armbands-female.xml|#663d38,4b6167,8f5c52,708892,ad7c65,a5bebf,d9c9b2,a5bebf</sprite>
     </item>
+    <item id="2003"
+        image="equipment/hands/cottongloves.png|W"
+        name="%Color% Cotton Gloves"
+        description="A pair of comfy, %color% cotton gloves."
+        defense="10"
+        level="10"
+        type="equip-arms"
+        weight="60"
+        colors="simple"
+        maxFloorOffset="16">
+        <sprite gender="unisex">equipment/hands/cottongloves-male.xml</sprite>
+        <sprite gender="female">equipment/hands/cottongloves-female.xml</sprite>
+    </item>
+    <item id="2004"
+        image="equipment/hands/leathergloves.png"
+        name="Leather Gloves"
+        description="Gloves made of hardened leather."
+        defense="20"
+        level="20"
+        type="equip-arms"
+        weight="140"
+        maxFloorOffset="16">
+        <sprite gender="unisex">equipment/hands/cottongloves-male.xml|#4e2e18,c8752f</sprite>
+        <sprite gender="female">equipment/hands/cottongloves-female.xml|#4e2e18,c8752f</sprite>
+    </item>
 
     <!-- Pants -->
     <item id="2200"
@@ -1064,7 +1113,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/legs/trousers.png"
         name="Brown Trousers"
         description="Classic trousers ornated with some fluffy fur."
-        defense="140"
+        defense="80"
         level="5"
         type="equip-legs"
         weight="35"
@@ -1072,6 +1121,55 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sprite gender="unisex">equipment/legs/trousers-male.xml</sprite>
         <sprite gender="female">equipment/legs/trousers-female.xml</sprite>
     </item>
+    <item id="2202"
+        image="equipment/legs/jeanschaps.png"
+        name="Jeans Chaps"
+        description="Jeans with snake skin chaps."
+        defense="240"
+        level="12"
+        type="equip-legs"
+        weight="360"
+        maxFloorOffset="8">
+        <sprite gender="unisex">equipment/legs/jeanschaps-male.xml</sprite>
+        <sprite gender="female">equipment/legs/jeanschaps-female.xml</sprite>
+    </item>
+    <item id="2203"
+        image="equipment/legs/silkpants.png|W"
+        name="%Color% Cashmere Pants"
+        description="A very light fancy pair of %Color% cashmere trousers."
+        defense="80"
+        level="17"
+        type="equip-legs"
+        weight="20"
+        colors="vneck"
+        iconColors="vneckS"
+        maxFloorOffset="8">
+        <sprite gender="unisex">equipment/legs/silkpants-male.xml</sprite>
+    </item>
+    <item id="2204"
+        image="equipment/legs/cottonskirt.png|W"
+        name="%Color% Cotton Skirt"
+        description="A %color% skirt made of simple cotton."
+        defense="20"
+        level="5"
+        type="equip-legs"
+        weight="15"
+        color="simple"
+        maxFloorOffset="8">
+        <sprite gender="unisex">equipment/legs/cottonskirt-male.xml</sprite>
+    </item>
+    <item id="2205"
+        image="equipment/legs/leathertrousers.png"
+        name="Leather Trousers"
+        description="A common pair of pants made from leather."
+        defense="160"
+        level="15"
+        type="equip-legs"
+        weight="280"
+        maxFloorOffset="8">
+        <sprite gender="unisex">equipment/legs/cottontrousers-male.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
+        <sprite gender="female">equipment/legs/cottontrousers-female.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
+    </item>
 
     <!-- Wings
     <item id="2500"
@@ -1103,9 +1201,27 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         defense="50"
         level="5"
         type="equip-shield"
-        weight="100">
+        weight="1000">
         <sprite>equipment/shields/leathershield.xml</sprite>
     </item>
+    <item id="2702"
+        image="equipment/shields/woodenshield.png"
+        name="Wooden Shield"
+        description="A shield made of wood."
+        defense="72"
+        level="12"
+        type="equip-shield"
+        weight="2450">
+    </item>
+    <item id="2703"
+        image="equipment/shields/steelshield.png"
+        name="Steel Shield"
+        description="A shield made of steel."
+        defense="200"
+        level="20"
+        type="equip-shield"
+        weight="5500">
+    </item>
 
     <!-- Head Gears -->
     <item id="2900"
@@ -1204,6 +1320,108 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
             <item from="-15" to="-19"/>
         </replace>
     </item>
+    <item id="2906"
+        image="equipment/head/infantryhelmet.png"
+        name="infantry Helmet"
+        description="A helmet for soldiers and guards."
+        defense="160"
+        level="12"
+        type="equip-head"
+        weight="400">
+        <sprite>equipment/head/infantryhelmet.xml</sprite>
+        <replace sprite="hair">
+    <item from="-5" to="-4"/>
+    <item from="-14" to="-9"/>
+    <item from="-15" to="-19"/>
+        </replace>
+    </item>
+    <item id="2907"
+        image="equipment/head/candlehelmet.png"
+        name="Candle Helmet"
+        description="Worn by spelunkers."
+        defense="180"
+        level="16"
+        type="equip-head"
+        weight="500">
+        <sprite>equipment/head/candlehelmet.xml</sprite>
+        <replace sprite="hair"/>
+    </item>
+    <item id="2908"
+        image="equipment/head/warlordhelmet.png"
+        name="Warlord Helmet"
+        description="Worn by great warriors!"
+        defense="340"
+        level="24"
+        type="equip-head"
+        weight="1000">
+        <sprite>equipment/head/warlordhelmet.xml</sprite>
+        <replace sprite="hair"/>
+    </item>
+    <item id="2909"
+        image="equipment/head/axehat.png"
+        name="Axe Hat"
+        description="A really cool joke, but not very helpful."
+        defense="12"
+        level="5"
+        type="equip-head"
+        weight="50">
+        <sprite>equipment/head/axehat.xml</sprite>
+    </item>
+    <item id="2910"
+        image="equipment/head/pinkiehat.png"
+        name="Pinkie Hat"
+        description="With this, you'll fit right in with those strange pinkies."
+        defense="7"
+        level="10"
+        type="equip-head"
+        weight="5">
+        <sprite>equipment/head/pinkiehat.xml</sprite>
+    </item>
+    <item id="2911"
+        image="equipment/head/tophat.png"
+        name="Top Hat"
+        description="For the gentry of The Mana World, and other worlds."
+        defense="50"
+        level="17"
+        type="equip-head"
+        weight="40">
+        <sprite>equipment/head/tophat.xml</sprite>
+        <replace sprite="hair">
+    <item from="-5" to="-4"/>
+    <item from="-14" to="-9"/>
+    <item from="-15" to="-19"/>
+        </replace>
+    </item>
+    <item id="2912"
+        image="equipment/head/bowlerhat.png"
+        name="Bowler Hat"
+        description="A hat for those with a bit of class."
+        defense="40"
+        level="15"
+        type="equip-head"
+        weight="30">
+        <sprite>equipment/head/bowlerhat.xml</sprite>
+        <replace sprite="hair">
+    <item from="-5" to="-4"/>
+    <item from="-14" to="-9"/>
+    <item from="-15" to="-19"/>
+        </replace>
+    </item>
+    <item id="2913"
+        image="equipment/head/fairyhat.png"
+        name="Fairy Hat"
+        description="Worn by people that are living and hunting in the woods."
+        defense="25"
+        level="10"
+        type="equip-head"
+        weight="5">
+        <sprite>equipment/head/fairyhat.xml</sprite>
+        <replace sprite="hair">
+    <item from="-5" to="-4"/>
+    <item from="-14" to="-9"/>
+    <item from="-15" to="-19"/>
+        </replace>
+    </item>
 
     <!-- Neck Armors -->
     <item id="3200"
@@ -1290,18 +1508,6 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
         <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
     </item>
-    <item id="3510"
-        image="equipment/weapons/pickaxe.png"
-        name="Pickaxe"
-        description="A common pickaxe, not so good for battle but suitable for mining."
-        attack="200"
-        attack-range="1"
-        level="15"
-        type="equip-2hand"
-        attack-action="attack"
-        weight="250">
-        <sprite>equipment/weapons/pickaxe.xml</sprite>
-    </item>
     <item id="3505"
         image="equipment/weapons/wand.png"
         name="Training Wand"
@@ -1330,7 +1536,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/scythe.png"
         name="Scythe"
         description="A farmer's scythe, not new but still deadly."
-        attack="2000"
+        attack="1000"
         attack-range="2"
         level="15"
         type="equip-2hand"
@@ -1340,6 +1546,47 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sound event="hit">weapons/scythe/hit1.ogg</sound>
         <sound event="miss">weapons/scythe/miss1.ogg</sound>
     </item>
+    <item id="3508"
+        image="equipment/weapons/dagger.png"
+        name="Dagger"
+        description="Use to stab."
+        attack="350"
+        attack-range="1"
+        level="15"
+        type="equip-1hand"
+        attack-action="attack"
+        weight="350">
+        <sprite>equipment/weapons/knife.xml</sprite>
+        <sound event="hit">weapons/knife/hit1.ogg</sound>
+        <sound event="miss">weapons/knife/miss1.ogg</sound>
+    </item>
+     <item id="3509"
+        image="equipment/weapons/setzer.png"
+        name="Setzer"
+        description="A knife named after a famous gambler."
+        attack="600"
+        attack-range="1"
+        level="20"
+        type="equip-1hand"
+        attack-action="attack"
+        weight="250">
+        <sprite>equipment/weapons/piouslayer.xml</sprite>
+        <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+        <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+    </item>
+    <item id="3510"
+        image="equipment/weapons/pickaxe.png"
+        name="Pickaxe"
+        description="A common pickaxe, not so good for battle but suitable for mining."
+        attack="200"
+        attack-range="1"
+        level="15"
+        type="equip-2hand"
+        attack-action="attack"
+        weight="250">
+        <sprite>equipment/weapons/pickaxe.xml</sprite>
+    </item>
+
 
     <!-- Pets -->
     <item id="4000"
@@ -1642,11 +1889,11 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         maxFloorOffset="15"/>
     <!-- Bows -->
     <item id="6000"
-        image="equipment/weapons/woodenbow.png"
-        name="Wooden Bow"
+        image="equipment/weapons/trainingbow.png"
+        name="Training Bow"
         description="For bow training. Does not seem much reliable."
         attack="70"
-        attack-range="5"
+        attack-range="4"
         missile-particle="graphics/particles/training-arrow.xml"
         missile-z="32"
         missile-lifetime="500"
@@ -1655,7 +1902,41 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         level="5"
         type="equip-2hand"
         attack-action="attack_bow"
-        weight="12">
+        weight="120">
+        <sprite>equipment/weapons/woodenbow.xml</sprite>
+    </item>
+    <item id="6001"
+        image="equipment/weapons/shortbow.png"
+        name="Short Bow"
+        description="The shortest of them all, and almost a knife, but the only which hits at point-blank range."
+        attack="100"
+        attack-range="5"
+        missile-particle="graphics/particles/training-arrow.xml"
+        missile-z="32"
+        missile-lifetime="500"
+        missile-speed="6"
+        missile-diedistance="3"
+        level="15"
+        type="equip-2hand"
+        attack-action="attack_bow"
+        weight="260">
+        <sprite>equipment/weapons/woodenbow.xml</sprite>
+    </item>
+    <item id="6002"
+        image="equipment/weapons/forestbow.png"
+        name="Forest Bow"
+        description="A big bow, to hunt monsters in the forest."
+        attack="150"
+        attack-range="5"
+        missile-particle="graphics/particles/training-arrow.xml"
+        missile-z="32"
+        missile-lifetime="500"
+        missile-speed="6"
+        missile-diedistance="3"
+        level="20"
+        type="equip-2hand"
+        attack-action="attack_bow"
+        weight="480">
         <sprite>equipment/weapons/woodenbow.xml</sprite>
     </item>
 
-- 
cgit v1.2.3-70-g09d2