19 files changed, 92 insertions, 37 deletions
diff --git a/items/equip-2hand/_include.xml b/items/equip-2hand/_include.xml
index f8bfbbf9..68aae96d 100644
--- a/items/equip-2hand/_include.xml
+++ b/items/equip-2hand/_include.xml
@@ -1,18 +1,20 @@
 <?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/item907_FloydBook.xml"/>
+  <include name="items/equip-2hand/item0530_ShortBow.xml"/>
+  <include name="items/equip-2hand/item0545_ForestBow.xml"/>
+  <include name="items/equip-2hand/item0548_Halberd.xml"/>
+  <include name="items/equip-2hand/item0588_BastardSword.xml"/>
+  <include name="items/equip-2hand/item0594_Spear.xml"/>
+  <include name="items/equip-2hand/item0595_HeavySpear.xml"/>
+  <include name="items/equip-2hand/item0596_Pike.xml"/>
+  <include name="items/equip-2hand/item0597_HeavyPike.xml"/>
+  <include name="items/equip-2hand/item0609_ImperialBow.xml"/>
+  <include name="items/equip-2hand/item0623_Scythe.xml"/>
+  <include name="items/equip-2hand/item0758_WoodenStaff.xml"/>
+  <include name="items/equip-2hand/item0878_BansheeBow.xml"/>
+  <include name="items/equip-2hand/item0903_SlingShot.xml"/>
+  <include name="items/equip-2hand/item0906_KidBook.xml"/>
+  <include name="items/equip-2hand/item0907_FloydBook.xml"/>
+  <include name="items/equip-2hand/item1170_SweetToothStaff.xml"/>
   <include name="items/equip-2hand/item1200_Bow.xml"/>
 </items>
diff --git a/items/equip-2hand/item530_ShortBow.xml b/items/equip-2hand/item0530_ShortBow.xml
index 0defa8af..6b9cbe68 100644
--- a/items/equip-2hand/item530_ShortBow.xml
+++ b/items/equip-2hand/item0530_ShortBow.xml
@@ -1,6 +1,6 @@
 <?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">
+  <item id="530" image="equipment/weapon/bow-shortbow.png" name="Short Bow" description="A bow for short distances." effect="Weapon Level 1" type="equip-2hand" attack="50" mattack="-5" 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>
diff --git a/items/equip-2hand/item545_ForestBow.xml b/items/equip-2hand/item0545_ForestBow.xml
index 791ba3a4..890dacf4 100644
--- a/items/equip-2hand/item545_ForestBow.xml
+++ b/items/equip-2hand/item0545_ForestBow.xml
@@ -1,6 +1,6 @@
 <?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">
+  <item id="545" image="equipment/weapon/bow-forestbow.png" name="Forest Bow" description="A bow usually used for hunting." effect="Weapon Level 1" attack="70" mattack="-7" type="equip-2hand" attack-action="attack_bow" attack-range="5" weight="1200" sellProtected="true" 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>
diff --git a/items/equip-2hand/item548_Halberd.xml b/items/equip-2hand/item0548_Halberd.xml
index 5df9008f..3e3ba60c 100644
--- a/items/equip-2hand/item548_Halberd.xml
+++ b/items/equip-2hand/item0548_Halberd.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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">
     <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/item588_BastardSword.xml b/items/equip-2hand/item0588_BastardSword.xml
index 2e49acca..4584560f 100644
--- a/items/equip-2hand/item588_BastardSword.xml
+++ b/items/equip-2hand/item0588_BastardSword.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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">
     <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/item594_Spear.xml b/items/equip-2hand/item0594_Spear.xml
index 985f39e6..2dbc4b80 100644
--- a/items/equip-2hand/item594_Spear.xml
+++ b/items/equip-2hand/item0594_Spear.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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">
     <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/item595_HeavySpear.xml b/items/equip-2hand/item0595_HeavySpear.xml
index af46c51d..ac896423 100644
--- a/items/equip-2hand/item595_HeavySpear.xml
+++ b/items/equip-2hand/item0595_HeavySpear.xml
@@ -1,6 +1,6 @@
 <?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">
+  <item id="595" image="equipment/weapon/polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." effect="Weapon Level 1" attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1000" 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/item596_Pike.xml b/items/equip-2hand/item0596_Pike.xml
index 8e24ec34..c7414fda 100644
--- a/items/equip-2hand/item596_Pike.xml
+++ b/items/equip-2hand/item0596_Pike.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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">
     <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/item597_HeavyPike.xml b/items/equip-2hand/item0597_HeavyPike.xml
index 88e50e66..31cfdc9d 100644
--- a/items/equip-2hand/item597_HeavyPike.xml
+++ b/items/equip-2hand/item0597_HeavyPike.xml
@@ -1,6 +1,6 @@
 <?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">
+  <item id="597" image="equipment/weapon/polearm-heavypike.png" name="Heavy Pike" description="A heavy spear with an iron pole." effect="Weapon Level 1" attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1500" 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/item0609_ImperialBow.xml b/items/equip-2hand/item0609_ImperialBow.xml
new file mode 100644
index 00000000..6ea71da1
--- /dev/null
+++ b/items/equip-2hand/item0609_ImperialBow.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<items>
+    <item id="609"
+	image="equipment/weapon/bow-life.png"
+	name="Imperial Bow"
+	description="No one remembers the emperor's name, though."
+	effect="Attack Speed +10% / HP Drain 4% / Weapon Level 1"
+	attack="110"
+	mattack="-9"
+	criticaldefense="10"
+	flee="10"
+	req-dex="80+"
+	level="90"
+	type="equip-2hand"
+	weight="900"
+	missile-particle="graphics/particles/arrow.particle.xml"
+	attack-action="attack_bow"
+	attack-range="6"
+	sellProtected="true">
+	<sprite>equipment/weapons/bow-life.xml</sprite>
+	<sound event="hit">weapons/bows/imperial/imperial-hit1.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit2.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit3.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit4.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit5.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit6.ogg</sound>
+	<sound event="miss">weapons/bows/imperial/imperial-miss1.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-2hand/item623_Scythe.xml b/items/equip-2hand/item0623_Scythe.xml
index fc1f0098..37b11e3c 100644
--- a/items/equip-2hand/item623_Scythe.xml
+++ b/items/equip-2hand/item0623_Scythe.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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">
     <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/item758_WoodenStaff.xml b/items/equip-2hand/item0758_WoodenStaff.xml
index 596d6b19..a0ca7e78 100644
--- a/items/equip-2hand/item758_WoodenStaff.xml
+++ b/items/equip-2hand/item0758_WoodenStaff.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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">
     <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>
diff --git a/items/equip-2hand/item878_BansheeBow.xml b/items/equip-2hand/item0878_BansheeBow.xml
index 3d5aec60..d6d57e0c 100644
--- a/items/equip-2hand/item878_BansheeBow.xml
+++ b/items/equip-2hand/item0878_BansheeBow.xml
@@ -1,6 +1,6 @@
 <?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" mattack="-9" attack-action="attack_bow" attack-range="6" attack="140" level="90" weight="900" missile-particle="graphics/particles/arrow-banshee.particle.xml" sellProtected="true">
+  <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% / Weapon Level 1" type="equip-2hand" req-dex="80+" maxhp="-150" attack-action="attack_bow" attack-range="6" attack="140" mattack="-9" 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>
diff --git a/items/equip-2hand/item903_SlingShot.xml b/items/equip-2hand/item0903_SlingShot.xml
index a17ca411..f625fef8 100644
--- a/items/equip-2hand/item903_SlingShot.xml
+++ b/items/equip-2hand/item0903_SlingShot.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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." effect="Weapon Level 1" type="equip-2hand" attack-action="attack_bow" attack="5" attack-range="4" 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>
diff --git a/items/equip-2hand/item906_KidBook.xml b/items/equip-2hand/item0906_KidBook.xml
index ab0f4178..a6f7cbe7 100644
--- a/items/equip-2hand/item906_KidBook.xml
+++ b/items/equip-2hand/item0906_KidBook.xml
@@ -1,6 +1,6 @@
 <?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">
+  <item id="906" image="equipment/weapon/kidbook.png" name="Kid Book" description="A big spell book used to transform humans into Trolls." effect="Weapon Level 1" attack="1" attack-range="3" type="equip-2hand" weight="100" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" sellProtected="true">
     <replace/>
     <replace sprite="race">
       <item to="-99054"/>
diff --git a/items/equip-2hand/item0907_FloydBook.xml b/items/equip-2hand/item0907_FloydBook.xml
new file mode 100644
index 00000000..21b0acb0
--- /dev/null
+++ b/items/equip-2hand/item0907_FloydBook.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<items>
+  <item id="907" image="equipment/weapon/floydbook.png" name="Book of Floyd" description="Beep boop. Boop beep?" effect="Weapon Level 1" level="135" attack="1" attack-range="3" type="equip-2hand" weight="100" missile-particle="graphics/particles/monster-goblin-firebreath.particle.xml" sellProtected="true">
+    <replace/>
+    <replace sprite="race">
+      <item to="-99168"/>
+    </replace>
+  </item>
+</items>
diff --git a/items/equip-2hand/item1170_SweetToothStaff.xml b/items/equip-2hand/item1170_SweetToothStaff.xml
new file mode 100644
index 00000000..c2a60f8e
--- /dev/null
+++ b/items/equip-2hand/item1170_SweetToothStaff.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<items>
+    <item id="1170"
+	image="equipment/weapon/staff-woodstaff.png"
+	name="Sweet Tooth Staff"
+	description="Turning gore into cake which recovers your MP, it is the Grandmaster's favorite staff."
+	effect="Lvl 2 Wand / 5% MP Recovery when a monster is killed / Weapon Level 1"
+	req-int="60+"
+	attack="50"
+	mattack="15"
+	type="equip-2hand"
+	attack-action="attack_wand"
+	attack-range="2"
+	weight="1000"
+	sellProtected="true">
+	<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>
+	<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/item1200_Bow.xml b/items/equip-2hand/item1200_Bow.xml
index 2e44d2e3..02d1e593 100644
--- a/items/equip-2hand/item1200_Bow.xml
+++ b/items/equip-2hand/item1200_Bow.xml
@@ -1,6 +1,6 @@
 <?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">
+  <item id="1200" image="equipment/weapon/bow-bow.png" name="Bow" description="A distance weapon." effect="Weapon Level 1" attack="20" mattack="-2" 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>
diff --git a/items/equip-2hand/item907_FloydBook.xml b/items/equip-2hand/item907_FloydBook.xml
deleted file mode 100644
index 6fefdb88..00000000
--- a/items/equip-2hand/item907_FloydBook.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="907" image="equipment/weapon/floydbook.png" name="Book of Floyd" description="Beep boop. Boop beep?" level="135" type="equip-arms" weight="100" missile-particle="graphics/particles/monster-goblin-firebreath.particle.xml" sellProtected="true">
-    <replace/>
-    <replace sprite="race">
-      <item to="-99168"/>
-    </replace>
-  </item>
-</items>