Unify equip-1hand

20 files changed, 275 insertions, 176 deletions

diff --git a/items.xml b/items.xml
index 1df25d6f..2af56a3b 100644
--- a/items.xml
+++ b/items.xml
@@ -5,7 +5,7 @@
   <include name="items/usable/_include.xml"/>
   <include name="items/generic/_include.xml"/>
   <include name="items/equip-head/_include.xml"/>
-  <include name="items/equip-1hand/_include.xml"/>
+  <include name="items/equip-1hand.xml"/>
   <include name="items/equip-torso.xml"/>
   <include name="items/equip-feet/_include.xml"/>
   <include name="items/equip-ammo/_include.xml"/>
diff --git a/items/equip-1hand.xml b/items/equip-1hand.xml
new file mode 100644
index 00000000..8d8cdeea
--- /dev/null
+++ b/items/equip-1hand.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0"?>
+<items>
+  <item id="1171"
+        image="equipment/weapon/wand.png"
+        name="Wand"
+        description="A basic magic wand."
+        effect="Lvl 1 Wand"
+        req-int="5+"
+        attack="1"
+        mattack="5"
+        type="equip-1hand"
+        attack-action="attack"
+        attack-range="3"
+        weight="100">
+    <sprite gender="unisex">equipment/weapons/wand.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+  </item>
+  <item id="1201"
+        image="equipment/weapon/dagger-knive.png"
+        name="Knife"
+        description="A small knife; the perfect weapon for a beginner."
+        attack="5"
+        type="equip-1hand"
+        weight="120"
+        attack-action="attack"
+        attack-range="2">
+    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
+    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
+  </item>
+  <item id="1215"
+        image="equipment/weapon/sword-sabre.png"
+        name="Toy Sabre"
+        description="A toy item, doesn't do much damage."
+        attack="1"
+        type="equip-1hand"
+        attack-action="attack"
+        attack-range="2"
+        weight="1"
+        sellProtected="true">
+    <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+  </item>
+  <item id="521"
+        image="equipment/weapon/dagger-dagger.png"
+        name="Dagger"
+        description="A simple dagger."
+        type="equip-1hand"
+        attack-action="attack"
+        attack="15"
+        attack-range="2"
+        weight="200">
+    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
+    <sound event="hit">weapons/knives/knife-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!"
+        attack="10"
+        type="equip-1hand"
+        attack-action="attack"
+        attack-range="2"
+        weight="150">
+    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
+    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
+  </item>
+  <item id="5261"
+        image="equipment/weapon/xmas-slingshot-icon.png"
+        name="Candy-Caned Anti-Grinch-Rifle 2020"
+        description="The best way to shoot snowballs."
+        type="equip-2hand"
+        attack-action="attack_bow"
+        attack="20"
+        attack-range="3"
+        weight="10"
+        critical-hit-effect-id="55"
+        missile-particle="graphics/particles/snowball.particle.xml">
+        
+    <sprite gender="unisex">equipment/weapons/xmas-bow-slingshot.xml</sprite>
+    <sprite gender="female">equipment/weapons/xmas-bow-slingshot.xml</sprite>
+    <sound event="hit">
+    weapons/projectiles/snowball/hit1.ogg</sound>
+    <sound event="miss">
+    weapons/projectiles/snowball/miss1.ogg</sound>
+  </item>
+  <item id="536"
+        image="equipment/weapon/dagger-shortsword.png"
+        name="Short Sword"
+        description="A small but sharp sword."
+        type="equip-1hand"
+        attack="100"
+        attack-action="attack"
+        attack-range="2"
+        weight="2000">
+    <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
+    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
+  </item>
+  <item id="549"
+        image="equipment/weapon/axe-axe.png"
+        name="Axe"
+        description="An axe."
+        attack="1"
+        type="equip-1hand"
+        attack-action="attack_chop"
+        attack-range="2"
+        weight="1200">
+    <sprite gender="unisex">equipment/weapons/axe-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/axe-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+  </item>
+  <item id="570"
+        image="equipment/weapon/dagger-boneknife.png"
+        name="Bone Knife"
+        description="A knife masterly carved out of a bone."
+        attack="115"
+        type="equip-1hand"
+        attack-action="attack"
+        attack-range="2"
+        weight="450">
+    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
+    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
+  </item>
+  <item id="571"
+        image="equipment/weapon/dagger-setzer.png"
+        name="Setzer"
+        description="A sharp knife, named after a famous gambler."
+        attack="110"
+        type="equip-1hand"
+        attack-action="attack"
+        attack-range="2"
+        weight="900"
+        sellProtected="true">
+    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="hit">
+    weapons/knives/setzer/setzer-hit1.ogg</sound>
+    <sound event="hit">
+    weapons/knives/setzer/setzer-hit2.ogg</sound>
+    <sound event="hit">
+    weapons/knives/setzer/setzer-hit3.ogg</sound>
+    <sound event="strike">weapons/miss1.ogg</sound>
+    <sound event="strike">weapons/miss2.ogg</sound>
+    <sound event="strike">weapons/miss3.ogg</sound>
+  </item>
+  <item id="576"
+        image="equipment/weapon/sword-beheader.png"
+        name="Beheader"
+        description="The only sword capable of beheading a Terranite."
+        effect="Double Damage +50% / No bow / 0 Int"
+        criticalattack="-25"
+        hit="-20"
+        type="equip-1hand"
+        attack="999"
+        attack-action="attack"
+        attack-range="2"
+        weight="2000"
+        sellProtected="true">
+    <sprite gender="unisex">equipment/weapons/beheader.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>
+    <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="578"
+        image="equipment/weapon/sword-sandcutter.png"
+        name="Sand Cutter"
+        description="An ancient longsword with moon-shaped blade, frequently used by desert night warriors."
+        effect="Double Damage +5%"
+        attack="140"
+        level="80"
+        type="equip-1hand"
+        attack-action="attack"
+        attack-range="2"
+        weight="1500"
+        sellProtected="true">
+    <sprite gender="unisex">equipment/weapons/sandcutter.xml</sprite>
+    <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound>
+    <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound>
+    <sound event="miss">weapons/swords/sword-miss1.ogg</sound>
+  </item>
+  <item id="579"
+        image="equipment/weapon/dagger-rockknive.png"
+        name="Rock Knife"
+        description="A knife made of stone."
+        attack="110"
+        type="equip-1hand"
+        attack-action="attack"
+        attack-range="2"
+        vit="3"
+        weight="500"
+        sellProtected="true">
+    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="strike">weapons/miss1.ogg</sound>
+    <sound event="strike">weapons/miss2.ogg</sound>
+    <sound event="strike">weapons/miss3.ogg</sound>
+    <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound>
+    <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound>
+  </item>
+  <item id="587"
+        image="equipment/weapon/sword-sword.png"
+        name="Sword"
+        description="A simple but reliable sword."
+        attack="1"
+        type="equip-1hand"
+        attack-action="attack_chop"
+        attack-range="2"
+        weight="200">
+    <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="591"
+        image="equipment/weapon/sword-longsword.png"
+        name="Long Sword"
+        description="A sword with a long and agile blade."
+        attack="1"
+        type="equip-1hand"
+        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="599"
+        image="equipment/weapon/sword-firesword.png"
+        name="Fire Sword"
+        description="A magical sword enchanted with the power of fire."
+        attack="1"
+        type="equip-1hand"
+        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="867"
+        image="equipment/weapon/sword-ice.png"
+        name="Ice Gladius"
+        description="A sword with a shimmering blue blade."
+        attack="110"
+        type="equip-1hand"
+        attack-action="attack"
+        attack-range="2"
+        luk="1"
+        weight="1000">
+    <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sound event="hit">
+    weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound>
+    <sound event="hit">
+    weapons/swords/ice_gladius/ice_gladius-hit2.ogg</sound>
+    <sound event="hit">
+    weapons/swords/ice_gladius/ice_gladius-hit3.ogg</sound>
+    <sound event="hit">
+    weapons/swords/ice_gladius/ice_gladius-hit4.ogg</sound>
+    <sound event="hit">
+    weapons/swords/ice_gladius/ice_gladius-hit5.ogg</sound>
+    <sound event="strike">weapons/swords/sword-miss1.ogg</sound>
+  </item>
+</items>
diff --git a/items/equip-1hand/_include.xml b/items/equip-1hand/_include.xml
deleted file mode 100644
index 096bd749..00000000
--- a/items/equip-1hand/_include.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <include name="items/equip-1hand/item521_Dagger.xml"/>
-  <include name="items/equip-1hand/item522_SharpKnife.xml"/>
-  <include name="items/equip-1hand/item536_ShortSword.xml"/>
-  <include name="items/equip-1hand/item549_Axe.xml"/>
-  <include name="items/equip-1hand/item570_BoneKnife.xml"/>
-  <include name="items/equip-1hand/item571_Setzer.xml"/>
-  <include name="items/equip-1hand/item576_Beheader.xml"/>
-  <include name="items/equip-1hand/item578_SandCutter.xml"/>
-  <include name="items/equip-1hand/item579_RockKnife.xml"/>
-  <include name="items/equip-1hand/item587_Sword.xml"/>
-  <include name="items/equip-1hand/item591_LongSword.xml"/>
-  <include name="items/equip-1hand/item599_FireSword.xml"/>
-  <include name="items/equip-1hand/item867_IceGladius.xml"/>
-  <include name="items/equip-1hand/item1171_Wand.xml"/>
-  <include name="items/equip-1hand/item1201_Knife.xml"/>
-  <include name="items/equip-1hand/item1215_ToySabre.xml"/>
-  <include name="items/equip-1hand/item5261_Launcher.xml"/>
-</items>
diff --git a/items/equip-1hand/item1171_Wand.xml b/items/equip-1hand/item1171_Wand.xml
deleted file mode 100644
index 86e25608..00000000
--- a/items/equip-1hand/item1171_Wand.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="1171" image="equipment/weapon/wand.png" name="Wand" description="A basic magic wand." effect="Lvl 1 Wand" req-int="5+" attack="1" mattack="5" type="equip-1hand" attack-action="attack" attack-range="3" weight="100">
-    <sprite gender="unisex">equipment/weapons/wand.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-  </item>
-</items>
diff --git a/items/equip-1hand/item1201_Knife.xml b/items/equip-1hand/item1201_Knife.xml
deleted file mode 100644
index 033ab28c..00000000
--- a/items/equip-1hand/item1201_Knife.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="1201" image="equipment/weapon/dagger-knive.png" name="Knife" description="A small knife; the perfect weapon for a beginner." attack="5" type="equip-1hand" weight="120" attack-action="attack" attack-range="2">
-    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
-    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item1215_ToySabre.xml b/items/equip-1hand/item1215_ToySabre.xml
deleted file mode 100644
index 4b1de188..00000000
--- a/items/equip-1hand/item1215_ToySabre.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="1215" image="equipment/weapon/sword-sabre.png" name="Toy Sabre" description="A toy item, doesn't do much damage." attack="1" type="equip-1hand" attack-action="attack" attack-range="2" weight="1" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-  </item>
-</items>
diff --git a/items/equip-1hand/item521_Dagger.xml b/items/equip-1hand/item521_Dagger.xml
deleted file mode 100644
index 3de9a3af..00000000
--- a/items/equip-1hand/item521_Dagger.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="521" image="equipment/weapon/dagger-dagger.png" name="Dagger" description="A simple dagger." type="equip-1hand" attack-action="attack" attack="15" attack-range="2" weight="200">
-    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
-    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item522_SharpKnife.xml b/items/equip-1hand/item522_SharpKnife.xml
deleted file mode 100644
index 451d4872..00000000
--- a/items/equip-1hand/item522_SharpKnife.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="522" image="equipment/weapon/dagger-sharpknife.png" name="Sharp Knife" description="A really sharp knife. Don't hurt yourself!" attack="10" type="equip-1hand" attack-action="attack" attack-range="2" weight="150">
-    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
-    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item5261_Launcher.xml b/items/equip-1hand/item5261_Launcher.xml
deleted file mode 100644
index e141f40e..00000000
--- a/items/equip-1hand/item5261_Launcher.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="5261" image="equipment/weapon/xmas-slingshot-icon.png" name="Candy-Caned Anti-Grinch-Rifle 2020" description="The best way to shoot snowballs." type="equip-2hand" attack-action="attack_bow" attack="20" attack-range="3" weight="10" critical-hit-effect-id="55" missile-particle="graphics/particles/snowball.particle.xml">
-    <sprite gender="unisex">equipment/weapons/xmas-bow-slingshot.xml</sprite>
-    <sprite gender="female">equipment/weapons/xmas-bow-slingshot.xml</sprite>
-    <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound>
-    <sound event="miss">weapons/projectiles/snowball/miss1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item536_ShortSword.xml b/items/equip-1hand/item536_ShortSword.xml
deleted file mode 100644
index a799c66e..00000000
--- a/items/equip-1hand/item536_ShortSword.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="536" image="equipment/weapon/dagger-shortsword.png" name="Short Sword" description="A small but sharp sword." type="equip-1hand" attack="100" attack-action="attack" attack-range="2" weight="2000">
-    <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
-    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item549_Axe.xml b/items/equip-1hand/item549_Axe.xml
deleted file mode 100644
index 6937ca2e..00000000
--- a/items/equip-1hand/item549_Axe.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="549" image="equipment/weapon/axe-axe.png" name="Axe" description="An axe." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="1200">
-    <sprite gender="unisex">equipment/weapons/axe-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/axe-chop-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-1hand/item570_BoneKnife.xml b/items/equip-1hand/item570_BoneKnife.xml
deleted file mode 100644
index 1301cc12..00000000
--- a/items/equip-1hand/item570_BoneKnife.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="570" image="equipment/weapon/dagger-boneknife.png" name="Bone Knife" description="A knife masterly carved out of a bone." attack="115" type="equip-1hand" attack-action="attack" attack-range="2" weight="450">
-    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
-    <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item571_Setzer.xml b/items/equip-1hand/item571_Setzer.xml
deleted file mode 100644
index e5edf196..00000000
--- a/items/equip-1hand/item571_Setzer.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" weight="900" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound>
-    <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound>
-    <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound>
-    <sound event="strike">weapons/miss1.ogg</sound>
-    <sound event="strike">weapons/miss2.ogg</sound>
-    <sound event="strike">weapons/miss3.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item576_Beheader.xml b/items/equip-1hand/item576_Beheader.xml
deleted file mode 100644
index 77fd2292..00000000
--- a/items/equip-1hand/item576_Beheader.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="576" image="equipment/weapon/sword-beheader.png" name="Beheader" description="The only sword capable of beheading a Terranite." effect="Double Damage +50% / No bow / 0 Int" criticalattack="-25" hit="-20" type="equip-1hand" attack="999" attack-action="attack" attack-range="2" weight="2000" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/beheader.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>
-    <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-1hand/item578_SandCutter.xml b/items/equip-1hand/item578_SandCutter.xml
deleted file mode 100644
index c649281b..00000000
--- a/items/equip-1hand/item578_SandCutter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="578" image="equipment/weapon/sword-sandcutter.png" name="Sand Cutter" description="An ancient longsword with moon-shaped blade, frequently used by desert night warriors." effect="Double Damage +5%" attack="140" level="80" type="equip-1hand" attack-action="attack" attack-range="2" weight="1500" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/sandcutter.xml</sprite>
-    <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound>
-    <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound>
-    <sound event="miss">weapons/swords/sword-miss1.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item579_RockKnife.xml b/items/equip-1hand/item579_RockKnife.xml
deleted file mode 100644
index 6087eb3e..00000000
--- a/items/equip-1hand/item579_RockKnife.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="579" image="equipment/weapon/dagger-rockknive.png" name="Rock Knife" description="A knife made of stone." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" vit="3" weight="500" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="strike">weapons/miss1.ogg</sound>
-    <sound event="strike">weapons/miss2.ogg</sound>
-    <sound event="strike">weapons/miss3.ogg</sound>
-    <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound>
-    <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound>
-  </item>
-</items>
diff --git a/items/equip-1hand/item587_Sword.xml b/items/equip-1hand/item587_Sword.xml
deleted file mode 100644
index 184ccbe9..00000000
--- a/items/equip-1hand/item587_Sword.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="587" image="equipment/weapon/sword-sword.png" name="Sword" description="A simple but reliable sword." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="200">
-    <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-1hand/item591_LongSword.xml b/items/equip-1hand/item591_LongSword.xml
deleted file mode 100644
index 6d69692c..00000000
--- a/items/equip-1hand/item591_LongSword.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="591" image="equipment/weapon/sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." attack="1" type="equip-1hand" 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>
-</items>
diff --git a/items/equip-1hand/item599_FireSword.xml b/items/equip-1hand/item599_FireSword.xml
deleted file mode 100644
index b42c0e4e..00000000
--- a/items/equip-1hand/item599_FireSword.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="599" image="equipment/weapon/sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." attack="1" type="equip-1hand" 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>
-</items>
diff --git a/items/equip-1hand/item867_IceGladius.xml b/items/equip-1hand/item867_IceGladius.xml
deleted file mode 100644
index 5d66ecfe..00000000
--- a/items/equip-1hand/item867_IceGladius.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="867" image="equipment/weapon/sword-ice.png" name="Ice Gladius" description="A sword with a shimmering blue blade." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" luk="1" weight="1000">
-    <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound>
-    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit2.ogg</sound>
-    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit3.ogg</sound>
-    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit4.ogg</sound>
-    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit5.ogg</sound>
-    <sound event="strike">weapons/swords/sword-miss1.ogg</sound>
-  </item>
-</items>