1 files changed, 15 insertions, 28 deletions
diff --git a/items/equip-2hand.xml b/items/equip-2hand.xml
index 29ed505e..9031d428 100644
--- a/items/equip-2hand.xml
+++ b/items/equip-2hand.xml
@@ -11,7 +11,6 @@
         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>
@@ -26,7 +25,6 @@
         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>
@@ -41,7 +39,6 @@
         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>
@@ -51,11 +48,10 @@
         description="A weapon usually carried by guards."
         attack="1"
         type="equip-2hand"
-        attack-action="attack_2hand"
+        attack-action="attack_chop_long"
         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>
+    <sprite gender="unisex">equipment/weapons/halberd.xml</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>
@@ -69,11 +65,10 @@
         description="A large two handed sword."
         attack="1"
         type="equip-2hand"
-        attack-action="attack_2hand"
+        attack-action="attack_chop"
         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"
@@ -81,11 +76,10 @@
         description="A light spear with a wooden pole."
         attack="1"
         type="equip-2hand"
-        attack-action="attack_spear"
+        attack-action="attack"
         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>
+    <sprite gender="unisex">equipment/weapons/staff.xml</sprite>
   </item>
   <item id="595"
         image="equipment/weapon/polearm-heavyspear.png"
@@ -93,11 +87,10 @@
         description="A heavy spear with a wooden pole."
         attack="1"
         type="equip-2hand"
-        attack-action="attack_spear"
+        attack-action="attack"
         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>
+    <sprite gender="unisex">equipment/weapons/staff.xml</sprite>
   </item>
   <item id="596"
         image="equipment/weapon/polearm-pike.png"
@@ -105,11 +98,10 @@
         description="A light spear with an iron pole."
         attack="1"
         type="equip-2hand"
-        attack-action="attack_spear"
+        attack-action="attack"
         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>
+    <sprite gender="unisex">equipment/weapons/staff.xml</sprite>
   </item>
   <item id="597"
         image="equipment/weapon/polearm-heavypike.png"
@@ -117,11 +109,10 @@
         description="A heavy spear with an iron pole."
         attack="1"
         type="equip-2hand"
-        attack-action="attack_spear"
+        attack-action="attack"
         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>
+    <sprite gender="unisex">equipment/weapons/staff.xml</sprite>
   </item>
   <item id="623"
         image="equipment/weapon/polearm-scythe.png"
@@ -129,12 +120,11 @@
         description="Usually used for farming but also usable as a weapon. Slow but deadly."
         attack="75"
         type="equip-2hand"
-        attack-action="attack_2hand"
+        attack-action="attack_scythe"
         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>
+    <sprite gender="unisex">equipment/weapons/scythe.xml</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>
@@ -151,11 +141,10 @@
         attack="50"
         mattack="10"
         type="equip-2hand"
-        attack-action="attack_sword_stab"
+        attack-action="attack_wand"
         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>
+    <sprite gender="unisex">equipment/weapons/staff.xml</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>
@@ -179,7 +168,6 @@
         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>
@@ -199,7 +187,6 @@
         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"