summaryrefslogtreecommitdiff
path: root/items
diff options
context:
space:
mode:
Diffstat (limited to 'items')
-rw-r--r--items/equip-1hand/item0591_LongSword.xml21
-rw-r--r--items/equip-1hand/item0867_IceGladius.xml14
-rw-r--r--items/equip-1hand/item0910_Rainerang.xml6
-rw-r--r--items/equip-2hand/item0548_Halberd.xml13
-rw-r--r--items/equip-2hand/item0588_BastardSword.xml12
-rw-r--r--items/equip-2hand/item0594_Spear.xml12
-rw-r--r--items/equip-2hand/item0596_Pike.xml13
-rw-r--r--items/equip-2hand/item0623_Scythe.xml13
-rw-r--r--items/equip-2hand/item0758_WoodenStaff.xml15
-rw-r--r--items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml2
-rw-r--r--items/equip-amulet/item0830_BromenalFourLeafAmulet.xml2
-rw-r--r--items/equip-amulet/item0831_SilverFourLeafAmulet.xml2
-rw-r--r--items/equip-amulet/item0832_GoldenFourLeafAmulet.xml2
-rw-r--r--items/equip-amulet/item0908_GMAmulet.xml2
-rw-r--r--items/equip-amulet/item1227_EnchantersAmulet.xml2
-rw-r--r--items/equip-amulet/item5252_GuardianWings.xml2
-rw-r--r--items/equip-amulet/item5269_AssassinAmulet.xml2
-rw-r--r--items/equip-amulet/item5270_ManaPearl.xml2
-rw-r--r--items/equip-head/_include.xml1
-rw-r--r--items/equip-head/item0801_PinkieHelmet.xml11
-rw-r--r--items/equip-head/item1174_CashiersShade.xml10
-rw-r--r--items/equip-head/item5129_UnderworldMask.xml4
-rw-r--r--items/equip-head/item5392_SunshroomHat.xml10
-rw-r--r--items/equip-ring/item5253_MagicRing.xml11
-rw-r--r--items/generic/_include.xml9
-rw-r--r--items/generic/item0540_EmptyBottle.xml2
-rw-r--r--items/generic/item5116_StalkerHorn.xml4
-rw-r--r--items/generic/item5116_WraithHorn.xml4
-rw-r--r--items/generic/item5375_JunglefowlFeather.xml2
-rw-r--r--items/generic/item5386_GlassShards.xml4
-rw-r--r--items/generic/item5387_Hay.xml4
-rw-r--r--items/generic/item5388_Straw.xml4
-rw-r--r--items/generic/item5389_SpeltSeeds.xml4
-rw-r--r--items/generic/item5390_MoonDust.xml4
-rw-r--r--items/generic/item5391_SunDust.xml4
-rw-r--r--items/usable/_include.xml1
-rw-r--r--items/usable/item1226_SilverBell.xml (renamed from items/generic/item1226_SilverBell.xml)2
37 files changed, 199 insertions, 33 deletions
diff --git a/items/equip-1hand/item0591_LongSword.xml b/items/equip-1hand/item0591_LongSword.xml
index f81d18ad..478042fc 100644
--- a/items/equip-1hand/item0591_LongSword.xml
+++ b/items/equip-1hand/item0591_LongSword.xml
@@ -1,7 +1,26 @@
<?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." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="10" sellProtected="true">
+ <item id="591"
+ image="equipment/weapon/sword-longsword.png"
+ name="Long Sword"
+ description="A sword with a long and agile blade."
+ type="equip-1hand"
+ attack-action="attack_chop"
+ effect="Weapon Level 2 / Perfect Hit +11%, +7% Damage / Attack Speed -11"
+ attack="149"
+ attack-range="1"
+ weight="1300"
+ req-str="31"
+ req-vit="67"
+ req-dex="59"
+ req-luk="61"
+ 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>
+ <sound event="hit">weapons/swords/longsword/longsword-hit1.ogg</sound>
+ <sound event="hit">weapons/swords/longsword/longsword-hit2.ogg</sound>
+ <sound event="miss">weapons/miss1.ogg</sound>
+ <sound event="miss">weapons/miss2.ogg</sound>
+ <sound event="miss">weapons/miss3.ogg</sound>
</item>
</items>
diff --git a/items/equip-1hand/item0867_IceGladius.xml b/items/equip-1hand/item0867_IceGladius.xml
index bc4da922..9b8ec863 100644
--- a/items/equip-1hand/item0867_IceGladius.xml
+++ b/items/equip-1hand/item0867_IceGladius.xml
@@ -1,6 +1,18 @@
<?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." effect="Weapon Level 1" attack="130" type="equip-1hand" attack-action="attack" attack-range="1" luk="1" weight="1000" sellProtected="true">
+ <item id="867"
+ image="equipment/weapon/sword-ice.png"
+ name="Ice Gladius"
+ type="equip-1hand"
+ attack-action="attack"
+ description="A sword with a shimmering blue blade."
+ effect="Weapon Level 1"
+ attack="130"
+ attack-range="1"
+ luk="1"
+ criticaldefense="5"
+ weight="1000"
+ 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>
<sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound>
diff --git a/items/equip-1hand/item0910_Rainerang.xml b/items/equip-1hand/item0910_Rainerang.xml
index 3cab482c..046ba3e6 100644
--- a/items/equip-1hand/item0910_Rainerang.xml
+++ b/items/equip-1hand/item0910_Rainerang.xml
@@ -10,7 +10,9 @@
weight="115"
missile-particle="graphics/particles/rainerang.xml"
sellProtected="true">
- <sound event="strike">weapons/bows/forest/forest-miss1.ogg</sound>
- <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
+ <sound event="hit">weapons/projectiles/rainerang/rainerang-hit1.ogg</sound>
+ <sound event="hit">weapons/projectiles/rainerang/rainerang-hit2.ogg</sound>
+ <sound event="hit">weapons/projectiles/rainerang/rainerang-hit3.ogg</sound>
+ <sound event="strike">weapons/projectiles/rainerang/rainerang-miss1.ogg</sound>
</item>
</items>
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>
diff --git a/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
index 170cf010..dbc8e72e 100644
--- a/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
+++ b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="829" image="equipment/amulets/fourleaf-amulet.png|W:#332f27,584a31,af7817,ffffff" name="Crozenite Four-Leaf Amulet" description="An amulet that brings the wearer luck where ever they go." mattack="5" type="equip-neck" luk="1" weight="10" sellProtected="true"/>
+ <item id="829" image="equipment/amulets/fourleaf-amulet.png|W:#332f27,584a31,af7817,ffffff" name="Crozenite Four-Leaf Amulet" description="An amulet that brings the wearer luck where ever they go." mattack="5" type="equip-necklace" luk="1" weight="10" sellProtected="true"/>
</items>
diff --git a/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
index 774fa2a9..53413745 100644
--- a/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
+++ b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="830" image="equipment/amulets/fourleaf-amulet.png|W:#3f2e26,644435,7c513c,ffffff" name="Bromenal Four-Leaf Amulet" description="An amulet that brings the wearer good luck where ever they go." mattack="5" type="equip-neck" luk="2" weight="10" sellProtected="true"/>
+ <item id="830" image="equipment/amulets/fourleaf-amulet.png|W:#3f2e26,644435,7c513c,ffffff" name="Bromenal Four-Leaf Amulet" description="An amulet that brings the wearer good luck where ever they go." mattack="5" type="equip-necklace" luk="2" weight="10" sellProtected="true"/>
</items>
diff --git a/items/equip-amulet/item0831_SilverFourLeafAmulet.xml b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
index 93849ded..97c0e6bf 100644
--- a/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
+++ b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="831" image="equipment/amulets/fourleaf-amulet.png|W:#272f33,384347,6f7e85,ffffff" name="Silver Four-Leaf Amulet" description="An amulet that brings the wearer great luck where ever they go." mattack="5" type="equip-neck" luk="3" weight="10" sellProtected="true"/>
+ <item id="831" image="equipment/amulets/fourleaf-amulet.png|W:#272f33,384347,6f7e85,ffffff" name="Silver Four-Leaf Amulet" description="An amulet that brings the wearer great luck where ever they go." mattack="5" type="equip-necklace" luk="3" weight="10" sellProtected="true"/>
</items>
diff --git a/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
index 3276f54f..14285fc7 100644
--- a/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
+++ b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="832" image="equipment/amulets/fourleaf-amulet.png|W:#857a4d,bc9600,fdd017,ffffff" name="Golden Four-Leaf Amulet" description="An amulet that brings the wearer excellent luck where ever they go." mattack="5" type="equip-neck" luk="4" weight="10" sellProtected="true"/>
+ <item id="832" image="equipment/amulets/fourleaf-amulet.png|W:#857a4d,bc9600,fdd017,ffffff" name="Golden Four-Leaf Amulet" description="An amulet that brings the wearer excellent luck where ever they go." mattack="5" type="equip-necklace" luk="4" weight="10" sellProtected="true"/>
</items>
diff --git a/items/equip-amulet/item0908_GMAmulet.xml b/items/equip-amulet/item0908_GMAmulet.xml
index c8d93eb3..23c57f42 100644
--- a/items/equip-amulet/item0908_GMAmulet.xml
+++ b/items/equip-amulet/item0908_GMAmulet.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="908" image="equipment/amulets/gmamulet.png" name="GM Amulet" description="An amulet for GMs during events." effect="HP Recovery Rate 200%" defense="50" criticaldefense="50" mdefense="50" flee="20" mattack="20" accuracy="50" crit="50" attkspeed="20" maxhp="31000" weight="1" type="equip-neck"/>
+ <item id="908" image="equipment/amulets/gmamulet.png" name="GM Amulet" description="An amulet for GMs during events." effect="HP Recovery Rate 200%" defense="50" criticaldefense="50" mdefense="50" flee="20" mattack="20" accuracy="50" crit="50" attkspeed="20" maxhp="31000" weight="1" type="equip-necklace"/>
</items>
diff --git a/items/equip-amulet/item1227_EnchantersAmulet.xml b/items/equip-amulet/item1227_EnchantersAmulet.xml
index aa6bacb8..c24506d5 100644
--- a/items/equip-amulet/item1227_EnchantersAmulet.xml
+++ b/items/equip-amulet/item1227_EnchantersAmulet.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="1227" image="equipment/amulets/enchanter.png" name="Enchanter's Amulet" description="An amulet made for true enchanters." effect="Hit Chance +22" type="equip-neck" weight="1"/>
+ <item id="1227" image="equipment/amulets/enchanter.png" name="Enchanter's Amulet" description="An amulet made for true enchanters." effect="Hit Chance +22" type="equip-necklace" weight="1"/>
</items>
diff --git a/items/equip-amulet/item5252_GuardianWings.xml b/items/equip-amulet/item5252_GuardianWings.xml
index a0cf9143..baa87550 100644
--- a/items/equip-amulet/item5252_GuardianWings.xml
+++ b/items/equip-amulet/item5252_GuardianWings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<items>
- <item id="5252" image="equipment/amulets/angel-wings.png" name="Guardian Wings" description="Powerful guardian wings, which watches over the horizon, guarding mana." type="equip-neck" weight="1">
+ <item id="5252" image="equipment/amulets/angel-wings.png" name="Guardian Wings" description="Powerful guardian wings, which watches over the horizon, guarding mana." type="equip-necklace" weight="1">
<sprite>equipment/amulets/angel-wings.xml</sprite>
<particlefx>graphics/particles/angel.particle.xml</particlefx>
</item>
diff --git a/items/equip-amulet/item5269_AssassinAmulet.xml b/items/equip-amulet/item5269_AssassinAmulet.xml
index 6b10f6af..dbd6c3e3 100644
--- a/items/equip-amulet/item5269_AssassinAmulet.xml
+++ b/items/equip-amulet/item5269_AssassinAmulet.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="5269" image="equipment/amulets/assassin-amulet.png" name="Assassin Amulet" description="Amulet for a master assassin. (Brawler only: Strength +2 / Dexterity +1)" effect="Double Damage +5% / Hit Chance +25" agi="1" type="equip-neck" weight="1" sellProtected="true"/>
+ <item id="5269" image="equipment/amulets/assassin-amulet.png" name="Assassin Amulet" description="Amulet for a master assassin. (Brawler only: Strength +2 / Dexterity +1)" effect="Double Damage +5% / Hit Chance +25" agi="1" type="equip-necklace" weight="1" sellProtected="true"/>
</items>
diff --git a/items/equip-amulet/item5270_ManaPearl.xml b/items/equip-amulet/item5270_ManaPearl.xml
index b25ba0be..39c232bf 100644
--- a/items/equip-amulet/item5270_ManaPearl.xml
+++ b/items/equip-amulet/item5270_ManaPearl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<items>
- <item id="5270" image="equipment/amulets/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-neck" weight="0" sellProtected="true">
+ <item id="5270" image="equipment/amulets/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-necklace" 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 d8077c1e..b211f996 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -229,4 +229,5 @@
<include name="items/equip-head/item5324_BlackWarlordHelmet.xml"/>
<include name="items/equip-head/item5325_BlackInfantryHelmet.xml"/>
<include name="items/equip-head/item5326_BlackCrusadeHelmet.xml"/>
+ <include name="items/equip-head/item5392_SunshroomHat.xml"/>
</items>
diff --git a/items/equip-head/item0801_PinkieHelmet.xml b/items/equip-head/item0801_PinkieHelmet.xml
index 00c1d8f5..1e3972d9 100644
--- a/items/equip-head/item0801_PinkieHelmet.xml
+++ b/items/equip-head/item0801_PinkieHelmet.xml
@@ -1,6 +1,15 @@
<?xml version="1.0"?>
<items>
- <item id="801" image="equipment/head/pinkie-helmet.png" name="Pinkie Helmet" description="A helmet of Pinkie warriors." mattack="-20" type="equip-head" defense="10" luk="1" weight="800" sellProtected="true">
+ <item id="801"
+ image="equipment/head/pinkie-helmet.png"
+ type="equip-head"
+ name="Pinkie Helmet"
+ description="A helmet for Pinkie warriors."
+ defense="15"
+ luk="1"
+ mattack="-30"
+ weight="800"
+ sellProtected="true">
<sprite gender="unisex">equipment/head/pinkie-helmet.xml</sprite>
<sprite gender="female">equipment/head/pinkie-helmet-female.xml</sprite>
<replace sprite="hair">
diff --git a/items/equip-head/item1174_CashiersShade.xml b/items/equip-head/item1174_CashiersShade.xml
index 555662b9..9cc11ce5 100644
--- a/items/equip-head/item1174_CashiersShade.xml
+++ b/items/equip-head/item1174_CashiersShade.xml
@@ -1,6 +1,14 @@
<?xml version="1.0"?>
<items>
- <item id="1174" image="equipment/head/cashiershade.png|W:#909090;G:#70ff1f" name="Cashiers' Shade" description="Green Shade. Helpful for counting your goldpieces." mattack="-10" type="equip-head" defense="2" weight="15" sellProtected="true">
+ <item id="1174"
+ image="equipment/head/cashiershade.png|W:#909090;G:#70ff1f"
+ name="Cashier's Shade"
+ description="Green Shade. Helpful for counting your goldpieces."
+ mattack="-10"
+ type="equip-head"
+ defense="2"
+ weight="15"
+ sellProtected="true">
<sprite gender="unisex">equipment/head/cashiershade.xml|#909090;#70ff1f</sprite>
<sprite gender="female">equipment/head/cashiershade-female.xml|#909090;#70ff1f</sprite>
</item>
diff --git a/items/equip-head/item5129_UnderworldMask.xml b/items/equip-head/item5129_UnderworldMask.xml
index 8cc029ab..b50fd80c 100644
--- a/items/equip-head/item5129_UnderworldMask.xml
+++ b/items/equip-head/item5129_UnderworldMask.xml
@@ -3,7 +3,7 @@
<item id="5129" image="equipment/head/underworld-mask.png" name="Underworld Mask" description="Surely, you don't think I jest. (Troll / Floyd only: Attack range +1 / Strength +10)" effect="0 Int" attack-range="2" dex="2" agi="3" type="equip-head" defense="5" weight="100" sellProtected="true">
<sprite gender="unisex">equipment/head/underworld-mask.xml</sprite>
<sprite gender="female">equipment/head/underworld-mask-female.xml</sprite>
- <replace sprite="hair">
+ <!-- replace sprite="hair">
<item from="-6" to="-1"/>
<item from="-7" to="-1"/>
<item from="-14" to="-1"/>
@@ -11,6 +11,6 @@
<item from="-16" to="-1"/>
<item from="-17" to="-1"/>
<item from="-19" to="-1"/>
- </replace>
+ </replace -->
</item>
</items>
diff --git a/items/equip-head/item5392_SunshroomHat.xml b/items/equip-head/item5392_SunshroomHat.xml
new file mode 100644
index 00000000..cc4c9a6c
--- /dev/null
+++ b/items/equip-head/item5392_SunshroomHat.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5392" image="equipment/head/sunshroomhat.png" name="Sunshroom Hat" description="Your head is always warm with this hat and you have light at night." type="equip-head" defense="15" mattack="5" weight="30" sellProtected="true">
+ <sprite gender="unisex">equipment/head/sunshroomhat.xml</sprite>
+ <sprite gender="female">equipment/head/sunshroomhat-female.xml</sprite>
+ <replace sprite="hair">
+ <item from="-6" to="-1"/>
+ </replace>
+ </item>
+</items>
diff --git a/items/equip-ring/item5253_MagicRing.xml b/items/equip-ring/item5253_MagicRing.xml
index b16e193e..43316a8a 100644
--- a/items/equip-ring/item5253_MagicRing.xml
+++ b/items/equip-ring/item5253_MagicRing.xml
@@ -1,5 +1,14 @@
<?xml version="1.0"?>
<items>
- <item id="5253" image="equipment/rings/magic.png" name="Magic Ring" description="A powerful ring for spellcasters." effect="#ingrav delay -20% " int="1" type="equip-ring" weight="1">
+ <item id="5253"
+ image="equipment/rings/magic.png"
+ type="equip-ring"
+ name="Magic Ring"
+ description="A powerful ring for spellcasters."
+ effect="ingrav delay -20% / Requires Naturally Flowing Magic (lvl 2)"
+ int="1"
+ level="80"
+ req-int="80"
+ weight="3">
</item>
</items>
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index f670aec9..382e2abd 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -159,7 +159,6 @@
<include name="items/generic/item1223_BigPieceofWhiteClay.xml"/>
<include name="items/generic/item1224_ScrollofPaper.xml"/>
<include name="items/generic/item1225_FireScroll.xml"/>
- <include name="items/generic/item1226_SilverBell.xml"/>
<include name="items/generic/item1228_LightCrystal.xml"/>
<include name="items/generic/item1233_CheapPlasticFangs.xml"/>
<include name="items/generic/item1234_RedChristmasOrnament.xml"/>
@@ -223,7 +222,7 @@
<include name="items/generic/item5113_Ectoplasm.xml"/>
<include name="items/generic/item5114_Urn.xml"/>
<include name="items/generic/item5115_VampireBatWing.xml"/>
- <include name="items/generic/item5116_WraithHorn.xml"/>
+ <include name="items/generic/item5116_StalkerHorn.xml"/>
<include name="items/generic/item5117_AstralCube.xml"/>
<include name="items/generic/item5118_RunestoneA.xml"/>
<include name="items/generic/item5119_RunestoneL.xml"/>
@@ -294,4 +293,10 @@
<include name="items/generic/item5381_Brick.xml"/>
<include name="items/generic/item5384_MountainCrystal.xml"/>
<include name="items/generic/item5385_BlackQuartz.xml"/>
+ <include name="items/generic/item5386_GlassShards.xml"/>
+ <include name="items/generic/item5387_Hay.xml"/>
+ <include name="items/generic/item5388_Straw.xml"/>
+ <include name="items/generic/item5389_SpeltSeeds.xml"/>
+ <include name="items/generic/item5390_MoonDust.xml"/>
+ <include name="items/generic/item5391_SunDust.xml"/>
</items>
diff --git a/items/generic/item0540_EmptyBottle.xml b/items/generic/item0540_EmptyBottle.xml
index 7168acad..31781bb7 100644
--- a/items/generic/item0540_EmptyBottle.xml
+++ b/items/generic/item0540_EmptyBottle.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="540" image="generic/bottle-empty.png" name="Empty Bottle" description="An empty bottle." type="generic" weight="1"/>
+ <item id="540" image="generic/bottle-empty.png" name="Empty Bottle" description="An empty bottle." type="generic" weight="5"/>
</items>
diff --git a/items/generic/item5116_StalkerHorn.xml b/items/generic/item5116_StalkerHorn.xml
new file mode 100644
index 00000000..02bde735
--- /dev/null
+++ b/items/generic/item5116_StalkerHorn.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5116" image="generic/wraithhorn.png" name="Stalker Horn" description="The horn from a stalker." type="generic" weight="10"/>
+</items>
diff --git a/items/generic/item5116_WraithHorn.xml b/items/generic/item5116_WraithHorn.xml
deleted file mode 100644
index ed65df51..00000000
--- a/items/generic/item5116_WraithHorn.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
- <item id="5116" image="generic/wraithhorn.png" name="Wraith Horn" description="The horn from stalker." type="generic" weight="10"/>
-</items>
diff --git a/items/generic/item5375_JunglefowlFeather.xml b/items/generic/item5375_JunglefowlFeather.xml
index b6649eac..11d5093f 100644
--- a/items/generic/item5375_JunglefowlFeather.xml
+++ b/items/generic/item5375_JunglefowlFeather.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="5375" image="generic/feather-a.png|W:#b0b080;R:#b82e2e;G:#c0c0c0;B:#ffffff;C:#fffff;Y:#b82e2e" name="Junglefoul Feather" description="A beautiful feather." type="generic" weight="1"/>
+ <item id="5375" image="generic/feather-a.png|W:#b0b080;R:#b82e2e;G:#c0c0c0;B:#ffffff;C:#fffff;Y:#b82e2e" name="Junglefowl Feather" description="A beautiful feather." type="generic" weight="1"/>
</items>
diff --git a/items/generic/item5386_GlassShards.xml b/items/generic/item5386_GlassShards.xml
new file mode 100644
index 00000000..7574de96
--- /dev/null
+++ b/items/generic/item5386_GlassShards.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5386" image="generic/glass-shards.png" name="Glass Shards" description="A pile of glass shards." type="generic" weight="5"/>
+</items>
diff --git a/items/generic/item5387_Hay.xml b/items/generic/item5387_Hay.xml
new file mode 100644
index 00000000..41497f7a
--- /dev/null
+++ b/items/generic/item5387_Hay.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5387" image="generic/hay.png" name="Hay" description="A pile of hay." type="generic" weight="11"/>
+</items>
diff --git a/items/generic/item5388_Straw.xml b/items/generic/item5388_Straw.xml
new file mode 100644
index 00000000..15c6f8be
--- /dev/null
+++ b/items/generic/item5388_Straw.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5388" image="generic/straw.png" name="Straw" description="A pile of straw." type="generic" weight="11"/>
+</items>
diff --git a/items/generic/item5389_SpeltSeeds.xml b/items/generic/item5389_SpeltSeeds.xml
new file mode 100644
index 00000000..cce7e8fa
--- /dev/null
+++ b/items/generic/item5389_SpeltSeeds.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5389" image="generic/seeds-dyable.png|Y:#a95225,cfac98,faedda;R:#2c0200,5b3825,936d49,b7947e" name="Spelt Seeds" description="Some spelt seeds." type="generic" weight="8"/>
+</items>
diff --git a/items/generic/item5390_MoonDust.xml b/items/generic/item5390_MoonDust.xml
new file mode 100644
index 00000000..4464262c
--- /dev/null
+++ b/items/generic/item5390_MoonDust.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5390" image="generic/powder.png|W:#7b7a76,9d9c98,abaaa8,babdc4,c0c7da,f4f8ff" name="Moon Dust" description="You getting sleepy on smelling this stuff." type="generic" weight="1"/>
+</items>
diff --git a/items/generic/item5391_SunDust.xml b/items/generic/item5391_SunDust.xml
new file mode 100644
index 00000000..dab7cd40
--- /dev/null
+++ b/items/generic/item5391_SunDust.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5391" image="generic/powder.png|W:#d84900,fca901,ffb400,ffff00" name="Sun Dust" description="This stuff is hot." type="generic" weight="1"/>
+</items>
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index e1902d24..b9f9ad26 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -72,6 +72,7 @@
<include name="items/usable/item0839_GrapeLollipop.xml"/>
<include name="items/usable/item0840_OrangeLollipop.xml"/>
<include name="items/usable/item1189_PollettEgg.xml"/>
+ <include name="items/usable/item1226_SilverBell.xml"/>
<include name="items/usable/item1229_CaramelApple.xml"/>
<include name="items/usable/item1230_BooberryBlueLollipop.xml"/>
<include name="items/usable/item1231_GhastlyGreenLollipop.xml"/>
diff --git a/items/generic/item1226_SilverBell.xml b/items/usable/item1226_SilverBell.xml
index 21ff07d4..2d0b837e 100644
--- a/items/generic/item1226_SilverBell.xml
+++ b/items/usable/item1226_SilverBell.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="1226" image="generic/silverbell.png" name="Silver Bell" description="A tiny bell made of silver." type="generic" weight="25"/>
+ <item id="1226" image="generic/silverbell.png" name="Silver Bell" description="A tiny bell made of silver." useButton="Ring" type="usable" weight="25"/>
</items>