Merge equip-2hand

18 files changed, 240 insertions, 148 deletions

diff --git a/items.xml b/items.xml
index 2af56a3b..0cecb285 100644
--- a/items.xml
+++ b/items.xml
@@ -9,7 +9,7 @@
   <include name="items/equip-torso.xml"/>
   <include name="items/equip-feet/_include.xml"/>
   <include name="items/equip-ammo/_include.xml"/>
-  <include name="items/equip-2hand/_include.xml"/>
+  <include name="items/equip-2hand.xml"/>
   <include name="items/equip-arms/_include.xml"/>
   <include name="items/equip-legs/_include.xml"/>
   <include name="items/equip-shield/_include.xml"/>
diff --git a/items/convert.sh b/items/convert.sh
index 81b67959..9475ecf8 100755
--- a/items/convert.sh
+++ b/items/convert.sh
@@ -3,6 +3,7 @@
 TARGET="equip-2hand"
 
 cd $TARGET
+rm _include.xml
 sed -i '/xml version/d' *.xml
 sed -i '/items/d' *.xml
 echo "<?xml version=\"1.0\"?>" > ../$TARGET.xml
diff --git a/items/equip-2hand.xml b/items/equip-2hand.xml
new file mode 100644
index 00000000..4e0902ef
--- /dev/null
+++ b/items/equip-2hand.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0"?>
+<items>
+  <item id="1200"
+        image="equipment/weapon/bow-bow.png"
+        name="Bow"
+        description="A distance weapon."
+        attack="20"
+        type="equip-2hand"
+        weight="20"
+        missile-particle="graphics/particles/arrow.particle.xml"
+        attack-action="attack_bow"
+        attack-range="5">
+    <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sound event="strike">weapons/bows/bow-miss1.ogg</sound>
+    <sound event="hit">weapons/bows/bow-hit1.ogg</sound>
+  </item>
+  <item id="530"
+        image="equipment/weapon/bow-shortbow.png"
+        name="Short Bow"
+        description="A bow for short distances."
+        type="equip-2hand"
+        attack="50"
+        attack-action="attack_bow"
+        attack-range="5"
+        weight="600"
+        missile-particle="graphics/particles/arrow.particle.xml">
+    <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sound event="strike">
+    weapons/bows/short/short-miss1.ogg</sound>
+    <sound event="hit">weapons/bows/short/short-hit1.ogg</sound>
+  </item>
+  <item id="545"
+        image="equipment/weapon/bow-forestbow.png"
+        name="Forest Bow"
+        description="A bow usually used for hunting."
+        attack="70"
+        type="equip-2hand"
+        attack-action="attack_bow"
+        attack-range="5"
+        weight="1200"
+        missile-particle="graphics/particles/arrow.particle.xml">
+    <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sound event="strike">
+    weapons/bows/forest/forest-miss1.ogg</sound>
+    <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
+  </item>
+  <item id="548"
+        image="equipment/weapon/polearm-halberd.png"
+        name="Halberd"
+        description="A weapon usually carried by guards."
+        attack="1"
+        type="equip-2hand"
+        attack-action="attack_2hand"
+        attack-range="2"
+        weight="1400">
+    <sprite gender="unisex">equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sound event="hit">
+    weapons/other/halberd/halberd-hit1.ogg</sound>
+    <sound event="hit">
+    weapons/other/halberd/halberd-hit2.ogg</sound>
+    <sound event="hit">
+    weapons/other/halberd/halberd-hit3.ogg</sound>
+    <sound event="strike">
+    weapons/other/staff/staff-miss1.ogg</sound>
+    <sound event="strike">
+    weapons/other/staff/staff-miss2.ogg</sound>
+    <sound event="strike">
+    weapons/other/staff/staff-miss3.ogg</sound>
+  </item>
+  <item id="588"
+        image="equipment/weapon/sword-bastardsword.png"
+        name="Bastard Sword"
+        description="A large two handed sword."
+        attack="1"
+        type="equip-2hand"
+        attack-action="attack_2hand"
+        attack-range="2"
+        weight="10">
+    <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+  </item>
+  <item id="594"
+        image="equipment/weapon/polearm-spear.png"
+        name="Spear"
+        description="A light spear with a wooden pole."
+        attack="1"
+        type="equip-2hand"
+        attack-action="attack_spear"
+        attack-range="2"
+        weight="700">
+    <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+  </item>
+  <item id="595"
+        image="equipment/weapon/polearm-heavyspear.png"
+        name="Heavy Spear"
+        description="A heavy spear with a wooden pole."
+        attack="1"
+        type="equip-2hand"
+        attack-action="attack_spear"
+        attack-range="2"
+        weight="1000">
+    <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+  </item>
+  <item id="596"
+        image="equipment/weapon/polearm-pike.png"
+        name="Pike"
+        description="A light spear with an iron pole."
+        attack="1"
+        type="equip-2hand"
+        attack-action="attack_spear"
+        attack-range="2"
+        weight="1200">
+    <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+  </item>
+  <item id="597"
+        image="equipment/weapon/polearm-heavypike.png"
+        name="Heavy Pike"
+        description="A heavy spear with an iron pole."
+        attack="1"
+        type="equip-2hand"
+        attack-action="attack_spear"
+        attack-range="2"
+        weight="1500">
+    <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</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."
+        attack="75"
+        type="equip-2hand"
+        attack-action="attack_2hand"
+        attack-range="2"
+        weight="1200"
+        sellProtected="true">
+    <sprite gender="unisex">equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sound event="strike">
+    weapons/other/staff/staff-miss1.ogg</sound>
+    <sound event="strike">
+    weapons/other/staff/staff-miss2.ogg</sound>
+    <sound event="strike">
+    weapons/other/staff/staff-miss3.ogg</sound>
+    <sound event="hit">weapons/other/scythe/scythe-hit1.ogg</sound>
+    <sound event="hit">weapons/other/scythe/scythe-hit2.ogg</sound>
+    <sound event="hit">weapons/other/scythe/scythe-hit3.ogg</sound>
+  </item>
+  <item id="758"
+        image="equipment/weapon/staff-woodstaff.png"
+        name="Wooden Staff"
+        description="A basic wooden staff."
+        effect="Lvl 2 Wand"
+        req-int="60+"
+        attack="50"
+        mattack="10"
+        type="equip-2hand"
+        attack-action="attack_sword_stab"
+        attack-range="2"
+        weight="1000">
+    <sprite gender="unisex">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sound event="strike">
+    weapons/other/staff/staff-miss1.ogg</sound>
+    <sound event="strike">
+    weapons/other/staff/staff-miss2.ogg</sound>
+    <sound event="strike">
+    weapons/other/staff/staff-miss3.ogg</sound>
+    <sound event="hit">weapons/other/staff/staff-hit1.ogg</sound>
+    <sound event="hit">weapons/other/staff/staff-hit2.ogg</sound>
+    <sound event="hit">weapons/other/staff/staff-hit3.ogg</sound>
+  </item>
+  <item id="878"
+        image="equipment/weapon/bow-bansheebow.png"
+        name="Banshee Bow"
+        description="A bow that has been enchanted by the dark powers of a witch."
+        effect="Attack Speed +20% / Defense -40% / VIT Defense -35% / Vanishes HP by 2% of damages dealt / Walk Speed +10%"
+        type="equip-2hand"
+        req-dex="80+"
+        maxhp="-150"
+        attack-action="attack_bow"
+        attack-range="6"
+        attack="90"
+        level="90"
+        weight="900"
+        missile-particle="graphics/particles/arrow-banshee.particle.xml"
+        sellProtected="true">
+    <sprite gender="unisex">equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1</sprite>
+    <sprite gender="female">equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1</sprite>
+    <sound event="strike">
+    weapons/bows/banshee/banshee-miss1.ogg</sound>
+    <sound event="strike">
+    weapons/bows/banshee/banshee-miss2.ogg</sound>
+    <sound event="strike">
+    weapons/bows/banshee/banshee-miss3.ogg</sound>
+    <sound event="hit">
+    weapons/bows/banshee/banshee-hit1.ogg</sound>
+    <sound event="hit">
+    weapons/bows/banshee/banshee-hit2.ogg</sound>
+    <sound event="hit">
+    weapons/bows/banshee/banshee-hit3.ogg</sound>
+  </item>
+  <item id="903"
+        image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d"
+        name="Sling Shot"
+        description="In the right hands, everything is a weapon."
+        type="equip-2hand"
+        attack-action="attack_bow"
+        attack="5"
+        attack-range="3"
+        weight="10"
+        missile-particle="graphics/particles/stoneprojectile.particle.xml">
+
+    <sprite gender="unisex">equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+  </item>
+  <item id="906"
+        image="equipment/weapon/kidbook.png"
+        name="Kid Book"
+        description="A big spell book used to transform humans into Trolls."
+        attack="1"
+        type="equip-2hand"
+        weight="100"
+        missile-particle="graphics/particles/monster-troll-foefire.particle.xml"
+        sellProtected="true">
+    <replace />
+    <replace sprite="race">
+      <item to="-99054" />
+    </replace>
+  </item>
+</items>
diff --git a/items/equip-2hand/_include.xml b/items/equip-2hand/_include.xml
deleted file mode 100644
index 0b2c61f6..00000000
--- a/items/equip-2hand/_include.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <include name="items/equip-2hand/item530_ShortBow.xml"/>
-  <include name="items/equip-2hand/item545_ForestBow.xml"/>
-  <include name="items/equip-2hand/item548_Halberd.xml"/>
-  <include name="items/equip-2hand/item588_BastardSword.xml"/>
-  <include name="items/equip-2hand/item594_Spear.xml"/>
-  <include name="items/equip-2hand/item595_HeavySpear.xml"/>
-  <include name="items/equip-2hand/item596_Pike.xml"/>
-  <include name="items/equip-2hand/item597_HeavyPike.xml"/>
-  <include name="items/equip-2hand/item623_Scythe.xml"/>
-  <include name="items/equip-2hand/item758_WoodenStaff.xml"/>
-  <include name="items/equip-2hand/item878_BansheeBow.xml"/>
-  <include name="items/equip-2hand/item903_SlingShot.xml"/>
-  <include name="items/equip-2hand/item906_KidBook.xml"/>
-  <include name="items/equip-2hand/item1200_Bow.xml"/>
-</items>
diff --git a/items/equip-2hand/item1200_Bow.xml b/items/equip-2hand/item1200_Bow.xml
deleted file mode 100644
index 2e44d2e3..00000000
--- a/items/equip-2hand/item1200_Bow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="1200" image="equipment/weapon/bow-bow.png" name="Bow" description="A distance weapon." attack="20" type="equip-2hand" weight="20" missile-particle="graphics/particles/arrow.particle.xml" attack-action="attack_bow" attack-range="5">
-    <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">weapons/bows/bow-miss1.ogg</sound>
-    <sound event="hit">weapons/bows/bow-hit1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-2hand/item530_ShortBow.xml b/items/equip-2hand/item530_ShortBow.xml
deleted file mode 100644
index 0defa8af..00000000
--- a/items/equip-2hand/item530_ShortBow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="530" image="equipment/weapon/bow-shortbow.png" name="Short Bow" description="A bow for short distances." type="equip-2hand" attack="50" attack-action="attack_bow" attack-range="5" weight="600" missile-particle="graphics/particles/arrow.particle.xml">
-    <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">weapons/bows/short/short-miss1.ogg</sound>
-    <sound event="hit">weapons/bows/short/short-hit1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-2hand/item545_ForestBow.xml b/items/equip-2hand/item545_ForestBow.xml
deleted file mode 100644
index 791ba3a4..00000000
--- a/items/equip-2hand/item545_ForestBow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="545" image="equipment/weapon/bow-forestbow.png" name="Forest Bow" description="A bow usually used for hunting." attack="70" type="equip-2hand" attack-action="attack_bow" attack-range="5" weight="1200" missile-particle="graphics/particles/arrow.particle.xml">
-    <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">weapons/bows/forest/forest-miss1.ogg</sound>
-    <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-2hand/item548_Halberd.xml b/items/equip-2hand/item548_Halberd.xml
deleted file mode 100644
index 5df9008f..00000000
--- a/items/equip-2hand/item548_Halberd.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="548" image="equipment/weapon/polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1400">
-    <sprite gender="unisex">equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
-    <sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
-    <sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-2hand/item588_BastardSword.xml b/items/equip-2hand/item588_BastardSword.xml
deleted file mode 100644
index 2e49acca..00000000
--- a/items/equip-2hand/item588_BastardSword.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="588" image="equipment/weapon/sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="10">
-    <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-  </item>
-</items>
diff --git a/items/equip-2hand/item594_Spear.xml b/items/equip-2hand/item594_Spear.xml
deleted file mode 100644
index 985f39e6..00000000
--- a/items/equip-2hand/item594_Spear.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="594" image="equipment/weapon/polearm-spear.png" name="Spear" description="A light spear with a wooden pole." attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="700">
-    <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-  </item>
-</items>
diff --git a/items/equip-2hand/item595_HeavySpear.xml b/items/equip-2hand/item595_HeavySpear.xml
deleted file mode 100644
index af46c51d..00000000
--- a/items/equip-2hand/item595_HeavySpear.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="595" image="equipment/weapon/polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1000">
-    <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-  </item>
-</items>
diff --git a/items/equip-2hand/item596_Pike.xml b/items/equip-2hand/item596_Pike.xml
deleted file mode 100644
index 8e24ec34..00000000
--- a/items/equip-2hand/item596_Pike.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="596" image="equipment/weapon/polearm-pike.png" name="Pike" description="A light spear with an iron pole." attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1200">
-    <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-  </item>
-</items>
diff --git a/items/equip-2hand/item597_HeavyPike.xml b/items/equip-2hand/item597_HeavyPike.xml
deleted file mode 100644
index 88e50e66..00000000
--- a/items/equip-2hand/item597_HeavyPike.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="597" image="equipment/weapon/polearm-heavypike.png" name="Heavy Pike" description="A heavy spear with an iron pole." attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1500">
-    <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-  </item>
-</items>
diff --git a/items/equip-2hand/item623_Scythe.xml b/items/equip-2hand/item623_Scythe.xml
deleted file mode 100644
index fc1f0098..00000000
--- a/items/equip-2hand/item623_Scythe.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <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." attack="75" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1200" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
-    <sound event="hit">weapons/other/scythe/scythe-hit1.ogg</sound>
-    <sound event="hit">weapons/other/scythe/scythe-hit2.ogg</sound>
-    <sound event="hit">weapons/other/scythe/scythe-hit3.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-2hand/item758_WoodenStaff.xml b/items/equip-2hand/item758_WoodenStaff.xml
deleted file mode 100644
index 596d6b19..00000000
--- a/items/equip-2hand/item758_WoodenStaff.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="758" image="equipment/weapon/staff-woodstaff.png" name="Wooden Staff" description="A basic wooden staff." effect="Lvl 2 Wand" req-int="60+" attack="50" mattack="10" type="equip-2hand" attack-action="attack_sword_stab" attack-range="2" weight="1000">
-    <sprite gender="unisex">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
-    <sound event="hit">weapons/other/staff/staff-hit1.ogg</sound>
-    <sound event="hit">weapons/other/staff/staff-hit2.ogg</sound>
-    <sound event="hit">weapons/other/staff/staff-hit3.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-2hand/item878_BansheeBow.xml b/items/equip-2hand/item878_BansheeBow.xml
deleted file mode 100644
index b4cdf370..00000000
--- a/items/equip-2hand/item878_BansheeBow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="878" image="equipment/weapon/bow-bansheebow.png" name="Banshee Bow" description="A bow that has been enchanted by the dark powers of a witch." effect="Attack Speed +20% / Defense -40% / VIT Defense -35% / Vanishes HP by 2% of damages dealt / Walk Speed +10%" type="equip-2hand" req-dex="80+" maxhp="-150" attack-action="attack_bow" attack-range="6" attack="90" level="90" weight="900" missile-particle="graphics/particles/arrow-banshee.particle.xml" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1</sprite>
-    <sprite gender="female">equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1</sprite>
-    <sound event="strike">weapons/bows/banshee/banshee-miss1.ogg</sound>
-    <sound event="strike">weapons/bows/banshee/banshee-miss2.ogg</sound>
-    <sound event="strike">weapons/bows/banshee/banshee-miss3.ogg</sound>
-    <sound event="hit">weapons/bows/banshee/banshee-hit1.ogg</sound>
-    <sound event="hit">weapons/bows/banshee/banshee-hit2.ogg</sound>
-    <sound event="hit">weapons/bows/banshee/banshee-hit3.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-2hand/item903_SlingShot.xml b/items/equip-2hand/item903_SlingShot.xml
deleted file mode 100644
index a17ca411..00000000
--- a/items/equip-2hand/item903_SlingShot.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="903" image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d" name="Sling Shot" description="In the right hands, everything is a weapon." type="equip-2hand" attack-action="attack_bow" attack="5" attack-range="3" weight="10" missile-particle="graphics/particles/stoneprojectile.particle.xml">
-    <sprite gender="unisex">equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-  </item>
-</items>
diff --git a/items/equip-2hand/item906_KidBook.xml b/items/equip-2hand/item906_KidBook.xml
deleted file mode 100644
index ab0f4178..00000000
--- a/items/equip-2hand/item906_KidBook.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="906" image="equipment/weapon/kidbook.png" name="Kid Book" description="A big spell book used to transform humans into Trolls." attack="1" type="equip-2hand" weight="100" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" sellProtected="true">
-    <replace/>
-    <replace sprite="race">
-      <item to="-99054"/>
-    </replace>
-  </item>
-</items>