2handed weapons have def + other corrections

Added defense in description and other corrections vs DB. Note that some items are still unobtainable and need DB changes before changing here and adding to game. Also made description format more legible without the need to horizontally scroll.

****

6 files changed, 72 insertions, 6 deletions

diff --git a/items/equip-2hand/item0548_Halberd.xml b/items/equip-2hand/item0548_Halberd.xml
index 3e3ba60c..63459c0f 100644
--- a/items/equip-2hand/item0548_Halberd.xml
+++ b/items/equip-2hand/item0548_Halberd.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0"?>
 <items>
-  <item id="548" image="equipment/weapon/polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." effect="Weapon Level 2" attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1400" sellProtected="true">
+  <item id="548"
+        image="equipment/weapon/polearm-halberd.png"
+        name="Halberd"
+        description="A weapon usually carried by guards."
+        effect="Weapon Level 2"
+        attack="250"
+        type="equip-2hand"
+        attack-action="attack_2hand"
+        attack-range="2"
+        defense="10"
+        weight="1400"
+        sellProtected="true">
     <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>
diff --git a/items/equip-2hand/item0588_BastardSword.xml b/items/equip-2hand/item0588_BastardSword.xml
index 4584560f..cd596241 100644
--- a/items/equip-2hand/item0588_BastardSword.xml
+++ b/items/equip-2hand/item0588_BastardSword.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <items>
-  <item id="588" image="equipment/weapon/sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." effect="Weapon Level 1" attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="10" sellProtected="true">
+  <item id="588"
+        image="equipment/weapon/sword-bastardsword.png"
+        name="Bastard Sword"
+        description="A large two handed sword."
+        effect="Weapon Level 1"
+        attack="150"
+        type="equip-2hand"
+        attack-action="attack_2hand"
+        attack-range="1"
+        weight="1500"
+        sellProtected="true">
     <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>
diff --git a/items/equip-2hand/item0594_Spear.xml b/items/equip-2hand/item0594_Spear.xml
index 2dbc4b80..2bca4833 100644
--- a/items/equip-2hand/item0594_Spear.xml
+++ b/items/equip-2hand/item0594_Spear.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <items>
-  <item id="594" image="equipment/weapon/polearm-spear.png" name="Spear" description="A light spear with a wooden pole." effect="Weapon Level 1" attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="1" weight="700" sellProtected="true">
+  <item id="594"
+        image="equipment/weapon/polearm-spear.png"
+        name="Spear"
+        description="A light spear with a wooden pole."
+        effect="Weapon Level 1"
+        attack="110"
+        type="equip-2hand"
+        attack-action="attack_spear"
+        attack-range="1"
+        weight="200"
+        sellProtected="true">
     <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>
diff --git a/items/equip-2hand/item0596_Pike.xml b/items/equip-2hand/item0596_Pike.xml
index c7414fda..ac6027fd 100644
--- a/items/equip-2hand/item0596_Pike.xml
+++ b/items/equip-2hand/item0596_Pike.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0"?>
 <items>
-  <item id="596" image="equipment/weapon/polearm-pike.png" name="Pike" description="A light spear with an iron pole." effect="Weapon Level 2" attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1200" sellProtected="true">
+  <item id="596"
+        image="equipment/weapon/polearm-pike.png"
+        name="Pike"
+        description="A light spear with an iron pole."
+        effect="Weapon Level 2"
+        attack="170"
+        type="equip-2hand"
+        attack-action="attack_spear"
+        attack-range="2"
+        defense="8"
+        weight="1200"
+        sellProtected="true">
     <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>
diff --git a/items/equip-2hand/item0623_Scythe.xml b/items/equip-2hand/item0623_Scythe.xml
index 37b11e3c..5f29134c 100644
--- a/items/equip-2hand/item0623_Scythe.xml
+++ b/items/equip-2hand/item0623_Scythe.xml
@@ -1,6 +1,17 @@
 <?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." effect="Weapon Level 2" attack="100" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1200" sellProtected="true">
+  <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."
+        effect="Weapon Level 2"
+        attack="120"
+        type="equip-2hand"
+        attack-action="attack_2hand"
+        attack-range="2"
+        defense="5"
+        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>
diff --git a/items/equip-2hand/item0758_WoodenStaff.xml b/items/equip-2hand/item0758_WoodenStaff.xml
index a0ca7e78..137e622b 100644
--- a/items/equip-2hand/item0758_WoodenStaff.xml
+++ b/items/equip-2hand/item0758_WoodenStaff.xml
@@ -1,6 +1,19 @@
 <?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 / Weapon Level 1" req-int="60+" attack="50" mattack="10" type="equip-2hand" attack-action="attack_sword_stab" attack-range="2" weight="1000" sellProtected="true">
+  <item id="758"
+        image="equipment/weapon/staff-woodstaff.png"
+        name="Wooden Staff"
+        description="A basic wooden staff."
+        effect="Lvl 2 Wand / Weapon Level 1"
+        req-int="60+"
+        attack="50"
+        mattack="10"
+        type="equip-2hand"
+        attack-action="attack_sword_stab"
+        attack-range="2"
+        defense="3"
+        weight="800"
+        sellProtected="true">
     <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>