From 60c0984b925ccd83730ab2d576a4c8a4dfac79e1 Mon Sep 17 00:00:00 2001
From: HoraK-FDF <horak-fdf@web.de>
Date: Mon, 3 Apr 2023 19:40:56 +0200
Subject: item description update and cleanup

---
 items.xml                                       | 206 ------------------------
 items/equip-1hand/_include.xml                  |   2 +
 items/equip-1hand/item571_Setzer.xml            |   2 +-
 items/equip-1hand/item578_SandCutter.xml        |   2 +-
 items/equip-1hand/item579_RockKnife.xml         |   2 +-
 items/equip-1hand/item584_Jackal.xml            |  24 +++
 items/equip-1hand/item590_DragonSword.xml       |  24 +++
 items/equip-2hand/_include.xml                  |   2 +
 items/equip-2hand/item1170_SweetToothStaff.xml  |  23 +++
 items/equip-2hand/item609_ImperialBow.xml       |  26 +++
 items/equip-ammo/_include.xml                   |   3 +
 items/equip-ammo/item5289_ArmorBreakerArrow.xml |  12 ++
 items/equip-ammo/item5290_SilverArrow.xml       |  12 ++
 items/equip-ammo/item5291_ThornArrow.xml        |  12 ++
 items/equip-charm/item5270_ManaPearl.xml        |   2 +-
 items/equip-head/_include.xml                   |   4 +
 items/equip-head/item760_OverlordsHelmet.xml    |   2 +-
 items/generic/_include.xml                      |   2 +
 items/generic/item5288_Naphthalene.xml          |  10 ++
 items/generic/item5292_SilverOre.xml            |  10 ++
 items/usable/_include.xml                       |   5 +
 items/usable/item5141_AlizarinScroll.xml        |  12 ++
 items/usable/item5142_CobaltScroll.xml          |  12 ++
 items/usable/item5143_GambogeScroll.xml         |  12 ++
 items/usable/item5144_MauveScroll.xml           |  12 ++
 items/usable/item5145_JoyplimScroll.xml         |  12 ++
 26 files changed, 236 insertions(+), 211 deletions(-)
 create mode 100644 items/equip-1hand/item584_Jackal.xml
 create mode 100644 items/equip-1hand/item590_DragonSword.xml
 create mode 100644 items/equip-2hand/item1170_SweetToothStaff.xml
 create mode 100644 items/equip-2hand/item609_ImperialBow.xml
 create mode 100644 items/equip-ammo/item5289_ArmorBreakerArrow.xml
 create mode 100644 items/equip-ammo/item5290_SilverArrow.xml
 create mode 100644 items/equip-ammo/item5291_ThornArrow.xml
 create mode 100644 items/generic/item5288_Naphthalene.xml
 create mode 100644 items/generic/item5292_SilverOre.xml
 create mode 100644 items/usable/item5141_AlizarinScroll.xml
 create mode 100644 items/usable/item5142_CobaltScroll.xml
 create mode 100644 items/usable/item5143_GambogeScroll.xml
 create mode 100644 items/usable/item5144_MauveScroll.xml
 create mode 100644 items/usable/item5145_JoyplimScroll.xml

diff --git a/items.xml b/items.xml
index 1c82c815..4d91ea9f 100644
--- a/items.xml
+++ b/items.xml
@@ -17,210 +17,4 @@
     <include name="items/equip-charm/_include.xml"/>
     <include name="items/equip-ring/_include.xml"/>
     <!-- New items may go below this line -->
-	<item id="584"
-		image="equipment/weapon/sword-jackal.png"
-		name="Jackal"
-		description="Made to parry attacks from drakes, relic of a long forsaken war."
-		effect="HP +50 / HP Drain 5%"
-		attack="125"
-		attack-range="1"
-		defense="2"
-		str="1"
-		level="90"
-		type="equip-1hand"
-		attack-action="attack"
-		hit-effect-id="32"
-		critical-hit-effect-id="30"
-		weight="1000">
-		<sprite>equipment/weapons/jackal.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>
-		<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
-	</item>
-	<item id="590"
-		image="equipment/weapon/sword-dragon.png"
-		name="Dragon Sword"
-		description="Empowered by demure's drakes, relic of a long forsaken war."
-		effect="HP -100 / Vanish HP by 1% of damage dealt"
-		attack="141"
-		attack-range="1"
-		defense="-2"
-		str="5"
-		level="90"
-		type="equip-1hand"
-		attack-action="attack"
-		hit-effect-id="32"
-		critical-hit-effect-id="30"
-		weight="1000">
-        <sprite>equipment/weapons/dragon-sword.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>
-		<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
-	</item>
-  <item id="609"
-        image="equipment/weapon/bow-life.png"
-        name="Imperial Bow"
-        description="No one remember the emperor's name, though."
-		effect="HP Drain 4%"
-        attack="110"
-        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">
-    <sprite>equipment/weapons/bow-life.xml</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="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"
-        req-int="60+"
-        attack="50"
-        mattack="15"
-        type="equip-2hand"
-        attack-action="attack_wand"
-        attack-range="2"
-        weight="1000">
-    <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>
-
-  <item id="5141"
-        image="use/scrolls/scroll-alizarin.png"
-        name="Alizarin Scroll"
-        description="Scroll with natural power; summons a plant if read."
-        effect="Summons Alizarin Plant"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-  <item id="5142"
-        image="use/scrolls/scroll-cobalt.png"
-        name="Cobalt Scroll"
-        description="Scroll with natural power; summons a plant if read."
-        effect="Summons Cobalt Plant"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-  <item id="5143"
-        image="use/scrolls/scroll-gamboge.png"
-        name="Gamboge Scroll"
-        description="Scroll with natural power; summons a plant if read."
-        effect="Summons Gamboge Plant"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-  <item id="5144"
-        image="use/scrolls/scroll-mauve.png"
-        name="Mauve Scroll"
-        description="Scroll with natural power; summons a plant if read."
-        effect="Summons Mauve Plant"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-  <item id="5145"
-        image="use/scrolls/scroll-joy.png"
-        name="Joyplim Scroll"
-        description="A very funny scroll. Read it, and be amused!"
-        effect="Forces some Emote on players"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-
-  <item id="5280"
-        image="equipment/head/leprechaunhat.png"
-        name="Leprechaun Hat"
-        description="Have you found the gold pot yet?"
-        type="equip-head"
-        defense="5"
-        weight="20">
-    <sprite gender="unisex">equipment/head/leprechaunhat.xml</sprite>
-  </item>
-  <item id="5281"
-        image="equipment/head/party-red.png"
-        name="Party Hat (Red)"
-        description="You were invited to the celebration!"
-        type="equip-head"
-        defense="5"
-        weight="20">
-    <sprite gender="unisex">equipment/head/party-red.xml</sprite>
-  </item>
-  <item id="5282"
-        image="equipment/head/party-green.png"
-        name="Party Hat (Green)"
-        description="You were invited to the celebration!"
-        type="equip-head"
-        defense="5"
-        weight="20">
-    <sprite gender="unisex">equipment/head/party-green.xml</sprite>
-  </item>
-  <item id="5283"
-        image="equipment/head/party-blue.png"
-        name="Party Hat (Blue)"
-        description="You were invited to the celebration!"
-        type="equip-head"
-        defense="5"
-        weight="20">
-    <sprite gender="unisex">equipment/head/party-blue.xml</sprite>
-  </item>
-
-	<item id="5288"
-		image="generic/naftalin.png"
-		name="Naphthalene"
-		description="Used to produce powerful dyes and medicine, and usually produced from burning a special kind of Coal."
-		type="generic"
-		weight="1"/>
-   <item id="5289"
-		image="equipment/ammo/cursedarrow.png"
-		name="Armor Breaker Arrow"
-		description="Used against heavily armored targets."
-		effect="Critical +75"
-		type="equip-ammo"
-		attack="-150"
-		weight="2"/>
-   <item id="5290"
-		image="equipment/ammo/silverarrow.png"
-		name="Silver Arrow"
-		description="Traditionally used in holy crusades to kill undead."
-		effect="Range +2"
-		type="equip-ammo"
-		attack="65"
-		weight="1"/>
-   <item id="5291"
-		image="equipment/ammo/thornarrow.png"
-		name="Thorn Arrow"
-		description="A superior arrow which never misses."
-		effect="Critical +10 / Hit +25"
-		type="equip-ammo"
-		attack="65"
-		weight="12"/>
-  <item id="5292"
-        image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"
-        name="Silver Ore"
-        description="Can be sold for a considerable amount of money."
-        type="generic"
-        weight="40" />
-
 </items>
diff --git a/items/equip-1hand/_include.xml b/items/equip-1hand/_include.xml
index fc4e3007..f48f077d 100644
--- a/items/equip-1hand/_include.xml
+++ b/items/equip-1hand/_include.xml
@@ -9,8 +9,10 @@
   <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/item584_Jackal.xml"/>
   <include name="items/equip-1hand/item587_Sword.xml"/>
   <include name="items/equip-1hand/item591_LongSword.xml"/>
+  <include name="items/equip-1hand/item590_DragonSword.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"/>
diff --git a/items/equip-1hand/item571_Setzer.xml b/items/equip-1hand/item571_Setzer.xml
index e5edf196..21720d75 100644
--- a/items/equip-1hand/item571_Setzer.xml
+++ b/items/equip-1hand/item571_Setzer.xml
@@ -1,6 +1,6 @@
 <?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">
+  <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." attack="100" type="equip-1hand" attack-action="attack" attack-range="1" 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>
diff --git a/items/equip-1hand/item578_SandCutter.xml b/items/equip-1hand/item578_SandCutter.xml
index c649281b..95730c73 100644
--- a/items/equip-1hand/item578_SandCutter.xml
+++ b/items/equip-1hand/item578_SandCutter.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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="1" 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>
diff --git a/items/equip-1hand/item579_RockKnife.xml b/items/equip-1hand/item579_RockKnife.xml
index 6087eb3e..6f98811d 100644
--- a/items/equip-1hand/item579_RockKnife.xml
+++ b/items/equip-1hand/item579_RockKnife.xml
@@ -1,6 +1,6 @@
 <?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">
+  <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="1" 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>
diff --git a/items/equip-1hand/item584_Jackal.xml b/items/equip-1hand/item584_Jackal.xml
new file mode 100644
index 00000000..68868b2c
--- /dev/null
+++ b/items/equip-1hand/item584_Jackal.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<items>
+    <item id="584"
+	image="equipment/weapon/sword-jackal.png"
+	name="Jackal"
+	description="Made to parry attacks from drakes, relic of a long forsaken war."
+	effect="HP +50 / HP Drain 5%"
+	attack="125"
+	attack-range="1"
+	defense="2"
+	str="1"
+	level="90"
+	type="equip-1hand"
+	attack-action="attack"
+	hit-effect-id="32"
+	critical-hit-effect-id="30"
+	weight="1000">
+	<sprite>equipment/weapons/jackal.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>
+	<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-1hand/item590_DragonSword.xml b/items/equip-1hand/item590_DragonSword.xml
new file mode 100644
index 00000000..2b508659
--- /dev/null
+++ b/items/equip-1hand/item590_DragonSword.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<items>
+    <item id="590"
+	image="equipment/weapon/sword-dragon.png"
+	name="Dragon Sword"
+	description="Empowered by demure's drakes, relic of a long forsaken war."
+	effect="HP -100 / Vanish HP by 1% of damage dealt"
+	attack="141"
+	attack-range="1"
+	defense="-2"
+	str="5"
+	level="90"
+	type="equip-1hand"
+	attack-action="attack"
+	hit-effect-id="32"
+	critical-hit-effect-id="30"
+	weight="1000">
+	<sprite>equipment/weapons/dragon-sword.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>
+	<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-2hand/_include.xml b/items/equip-2hand/_include.xml
index f8bfbbf9..efed8022 100644
--- a/items/equip-2hand/_include.xml
+++ b/items/equip-2hand/_include.xml
@@ -8,11 +8,13 @@
   <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/item609_ImperialBow.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/item1170_SweetToothStaff.xml"/>
   <include name="items/equip-2hand/item1200_Bow.xml"/>
 </items>
diff --git a/items/equip-2hand/item1170_SweetToothStaff.xml b/items/equip-2hand/item1170_SweetToothStaff.xml
new file mode 100644
index 00000000..eb87c0a5
--- /dev/null
+++ b/items/equip-2hand/item1170_SweetToothStaff.xml
@@ -0,0 +1,23 @@
+<?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"
+	req-int="60+"
+	attack="50"
+	mattack="15"
+	type="equip-2hand"
+	attack-action="attack_wand"
+	attack-range="2"
+	weight="1000">
+	<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/item609_ImperialBow.xml b/items/equip-2hand/item609_ImperialBow.xml
new file mode 100644
index 00000000..71246608
--- /dev/null
+++ b/items/equip-2hand/item609_ImperialBow.xml
@@ -0,0 +1,26 @@
+<?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="HP Drain 4%"
+	attack="110"
+	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">
+	<sprite>equipment/weapons/bow-life.xml</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-ammo/_include.xml b/items/equip-ammo/_include.xml
index a442407c..0dc6e656 100644
--- a/items/equip-ammo/_include.xml
+++ b/items/equip-ammo/_include.xml
@@ -6,4 +6,7 @@
   <include name="items/equip-ammo/item1199_Arrow.xml"/>
   <include name="items/equip-ammo/item1282_BoneArrows.xml"/>
   <include name="items/equip-ammo/item5260_Snowball.xml"/>
+  <include name="items/equip-ammo/item5289_ArmorBreakerArrow.xml"/>
+  <include name="items/equip-ammo/item5290_SilverArrow.xml"/>
+  <include name="items/equip-ammo/item5291_ThornArrow.xml"/>
 </items>
diff --git a/items/equip-ammo/item5289_ArmorBreakerArrow.xml b/items/equip-ammo/item5289_ArmorBreakerArrow.xml
new file mode 100644
index 00000000..4345b202
--- /dev/null
+++ b/items/equip-ammo/item5289_ArmorBreakerArrow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+   <item id="5289"
+	image="equipment/ammo/cursedarrow.png"
+	name="Armor Breaker Arrow"
+	description="Used against heavily armored targets."
+	effect="Critical +75"
+	type="equip-ammo"
+	attack="-150"
+	weight="2"
+    />
+</items>
diff --git a/items/equip-ammo/item5290_SilverArrow.xml b/items/equip-ammo/item5290_SilverArrow.xml
new file mode 100644
index 00000000..ceba8f26
--- /dev/null
+++ b/items/equip-ammo/item5290_SilverArrow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+   <item id="5290"
+	image="equipment/ammo/silverarrow.png"
+	name="Silver Arrow"
+	description="Traditionally used in holy crusades to kill undead."
+	effect="Range +2"
+	type="equip-ammo"
+	attack="65"
+	weight="1"
+    />
+</items>
diff --git a/items/equip-ammo/item5291_ThornArrow.xml b/items/equip-ammo/item5291_ThornArrow.xml
new file mode 100644
index 00000000..7b6aa1e5
--- /dev/null
+++ b/items/equip-ammo/item5291_ThornArrow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+   <item id="5291"
+	image="equipment/ammo/thornarrow.png"
+	name="Thorn Arrow"
+	description="A superior arrow which never misses."
+	effect="Critical +10 / Hit +25"
+	type="equip-ammo"
+	attack="65"
+	weight="12"
+    />
+</items>
diff --git a/items/equip-charm/item5270_ManaPearl.xml b/items/equip-charm/item5270_ManaPearl.xml
index 04daab60..d4e0dab7 100644
--- a/items/equip-charm/item5270_ManaPearl.xml
+++ b/items/equip-charm/item5270_ManaPearl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5270" image="equipment/charms/manapearl.png" name="Mana Pearl" description="This pearl resonates with a natural mana flow and channels some power from the Mana Seed to the user." int="1" mattack="11" mdefense="11" maxmp="55" type="equip-charm" weight="0" sellProtected="true">
+  <item id="5270" image="equipment/charms/manapearl.png" name="Mana Pearl" description="This pearl resonates with a natural mana flow and channels some power from the Mana Seed to the user." int="1" mattack="22" mdefense="22" maxmp="55" effect="SP Recovery Rate +33%" type="equip-charm" weight="0" sellProtected="true">
     <particlefx>graphics/particles/manapearl.particle.xml</particlefx>
   </item>
 </items>
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index f592b50b..c1e2e310 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -221,5 +221,9 @@
   <include name="items/equip-head/item5264_BlueWolfHelmet.xml"/>
   <include name="items/equip-head/item5266_CloverHat.xml"/>
   <include name="items/equip-head/item5267_AssassinMask.xml"/>
+  <include name="items/equip-head/item5280_LeprechaunHat.xml"/>
+  <include name="items/equip-head/item5281_PartyHatRed.xml"/>
+  <include name="items/equip-head/item5282_PartyHatGreen.xml"/>
+  <include name="items/equip-head/item5283_PartyHatBlue.xml"/>
   <include name="items/equip-head/item5287_CorsairHat.xml"/>
 </items>
diff --git a/items/equip-head/item760_OverlordsHelmet.xml b/items/equip-head/item760_OverlordsHelmet.xml
index d80588ad..1f5c73b6 100644
--- a/items/equip-head/item760_OverlordsHelmet.xml
+++ b/items/equip-head/item760_OverlordsHelmet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="760" image="equipment/head/overlord-helm.png" name="Overlord's Helmet" description="Worn by the greatest warriors." mattack="-60" type="equip-head" defense="49" weight="4000" sellProtected="true">
+  <item id="760" image="equipment/head/overlord-helm.png" name="Overlord's Helmet" description="Worn by the greatest warriors." type="equip-head" defense="44" mattack="-60" mdefense="-60" effect="Walk Speed Cap 150 / All Stats -2" flee="-20" weight="4000" sellProtected="true">
     <sprite gender="unisex">equipment/head/overlordhelm.xml</sprite>
     <sprite gender="female">equipment/head/overlordhelm-female.xml</sprite>
     <replace sprite="hair">
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index 8b450b61..2cee170a 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -251,4 +251,6 @@
   <include name="items/generic/item5256_PVPCoin.xml"/>
   <include name="items/generic/item5265_LoveLetter.xml"/>
   <include name="items/generic/item5279_Carrot.xml"/>
+  <include name="items/generic/item5288_Naphthalene.xml"/>
+  <include name="items/generic/item5292_SilverOre.xml"/>
 </items>
diff --git a/items/generic/item5288_Naphthalene.xml b/items/generic/item5288_Naphthalene.xml
new file mode 100644
index 00000000..ae4e3f89
--- /dev/null
+++ b/items/generic/item5288_Naphthalene.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5288"
+	image="generic/naftalin.png"
+	name="Naphthalene"
+	description="Used to produce powerful dyes and medicine, and usually produced from burning a special kind of Coal."
+	type="generic"
+	weight="1"
+    />
+</items>
diff --git a/items/generic/item5292_SilverOre.xml b/items/generic/item5292_SilverOre.xml
new file mode 100644
index 00000000..34dc56ec
--- /dev/null
+++ b/items/generic/item5292_SilverOre.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5292"
+	image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"
+	name="Silver Ore"
+	description="Can be sold for a considerable amount of money."
+	type="generic"
+	weight="40"
+    />
+</items>
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index a2b7283d..ee6e3f41 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -91,6 +91,11 @@
   <include name="items/usable/item3010_CandyPumpkin.xml"/>
   <include name="items/usable/item4035_PickledBeets.xml"/>
   <include name="items/usable/item4036_RoastedAcorn.xml"/>
+  <include name="items/usable/item5141_AlizarinScroll.xml"/>
+  <include name="items/usable/item5142_CobaltScroll.xml"/>
+  <include name="items/usable/item5143_GambogeScroll.xml"/>
+  <include name="items/usable/item5144_MauveScroll.xml"/>
+  <include name="items/usable/item5145_JoyplimScroll.xml"/>
   <include name="items/usable/item5210_GrassFedTofu.xml"/>
   <include name="items/usable/item5213_VeganWater.xml"/>
   <include name="items/usable/item5214_LactoseFreeAcorn.xml"/>
diff --git a/items/usable/item5141_AlizarinScroll.xml b/items/usable/item5141_AlizarinScroll.xml
new file mode 100644
index 00000000..6336ce0e
--- /dev/null
+++ b/items/usable/item5141_AlizarinScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5141"
+	image="use/scrolls/scroll-alizarin.png"
+	name="Alizarin Scroll"
+	description="Scroll with natural power; summons a plant if read."
+	effect="Summons Alizarin Plant"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5142_CobaltScroll.xml b/items/usable/item5142_CobaltScroll.xml
new file mode 100644
index 00000000..00db9044
--- /dev/null
+++ b/items/usable/item5142_CobaltScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5142"
+	image="use/scrolls/scroll-cobalt.png"
+	name="Cobalt Scroll"
+	description="Scroll with natural power; summons a plant if read."
+	effect="Summons Cobalt Plant"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5143_GambogeScroll.xml b/items/usable/item5143_GambogeScroll.xml
new file mode 100644
index 00000000..57274572
--- /dev/null
+++ b/items/usable/item5143_GambogeScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5143"
+	image="use/scrolls/scroll-gamboge.png"
+	name="Gamboge Scroll"
+	description="Scroll with natural power; summons a plant if read."
+	effect="Summons Gamboge Plant"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5144_MauveScroll.xml b/items/usable/item5144_MauveScroll.xml
new file mode 100644
index 00000000..6fa1edfc
--- /dev/null
+++ b/items/usable/item5144_MauveScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5144"
+	image="use/scrolls/scroll-mauve.png"
+	name="Mauve Scroll"
+	description="Scroll with natural power; summons a plant if read."
+	effect="Summons Mauve Plant"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5145_JoyplimScroll.xml b/items/usable/item5145_JoyplimScroll.xml
new file mode 100644
index 00000000..73952f8b
--- /dev/null
+++ b/items/usable/item5145_JoyplimScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5145"
+	image="use/scrolls/scroll-joy.png"
+	name="Joyplim Scroll"
+	description="A very funny scroll. Read it, and be amused!"
+	effect="Forces some Emote on players"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
-- 
cgit v1.2.3-60-g2f50