moved item category

25 files changed, 56 insertions, 53 deletions

diff --git a/items/equip-amulet/_include.xml b/items/equip-amulet/_include.xml
new file mode 100644
index 00000000..006583e5
--- /dev/null
+++ b/items/equip-amulet/_include.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <include name="items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml"/>
+  <include name="items/equip-amulet/item0830_BromenalFourLeafAmulet.xml"/>
+  <include name="items/equip-amulet/item0831_SilverFourLeafAmulet.xml"/>
+  <include name="items/equip-amulet/item0832_GoldenFourLeafAmulet.xml"/>
+  <include name="items/equip-amulet/item0908_GMAmulet.xml"/>
+  <include name="items/equip-amulet/item1227_EnchantersAmulet.xml"/>
+  <include name="items/equip-amulet/item5252_GuardianWings.xml"/>
+  <include name="items/equip-amulet/item5269_AssassinAmulet.xml"/>
+  <include name="items/equip-amulet/item5270_ManaPearl.xml"/>
+</items>
diff --git a/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
new file mode 100644
index 00000000..170cf010
--- /dev/null
+++ b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
@@ -0,0 +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"/>
+</items>
diff --git a/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
new file mode 100644
index 00000000..774fa2a9
--- /dev/null
+++ b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
@@ -0,0 +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"/>
+</items>
diff --git a/items/equip-amulet/item0831_SilverFourLeafAmulet.xml b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
new file mode 100644
index 00000000..93849ded
--- /dev/null
+++ b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
@@ -0,0 +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"/>
+</items>
diff --git a/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
new file mode 100644
index 00000000..3276f54f
--- /dev/null
+++ b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
@@ -0,0 +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"/>
+</items>
diff --git a/items/equip-amulet/item0908_GMAmulet.xml b/items/equip-amulet/item0908_GMAmulet.xml
new file mode 100644
index 00000000..c8d93eb3
--- /dev/null
+++ b/items/equip-amulet/item0908_GMAmulet.xml
@@ -0,0 +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"/>
+</items>
diff --git a/items/equip-amulet/item1227_EnchantersAmulet.xml b/items/equip-amulet/item1227_EnchantersAmulet.xml
new file mode 100644
index 00000000..aa6bacb8
--- /dev/null
+++ b/items/equip-amulet/item1227_EnchantersAmulet.xml
@@ -0,0 +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"/>
+</items>
diff --git a/items/equip-amulet/item5252_GuardianWings.xml b/items/equip-amulet/item5252_GuardianWings.xml
new file mode 100644
index 00000000..2b2d2e84
--- /dev/null
+++ b/items/equip-amulet/item5252_GuardianWings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5252" image="equipment/amulets/angelic-wings.png" name="Guardian Wings" description="Powerful guardian wings, which watches over the horizon, guarding mana." type="equip-neck" weight="1">
+    <sprite>equipment/amulets/angel-wings.xml</sprite>
+    <particlefx>graphics/particles/angel.particle.xml</particlefx>
+  </item>
+</items>
diff --git a/items/equip-amulet/item5269_AssassinAmulet.xml b/items/equip-amulet/item5269_AssassinAmulet.xml
new file mode 100644
index 00000000..6b10f6af
--- /dev/null
+++ b/items/equip-amulet/item5269_AssassinAmulet.xml
@@ -0,0 +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"/>
+</items>
diff --git a/items/equip-amulet/item5270_ManaPearl.xml b/items/equip-amulet/item5270_ManaPearl.xml
new file mode 100644
index 00000000..b25ba0be
--- /dev/null
+++ b/items/equip-amulet/item5270_ManaPearl.xml
@@ -0,0 +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">
+    <particlefx>graphics/particles/manapearl.particle.xml</particlefx>
+  </item>
+</items>
diff --git a/items/equip-charm/_include.xml b/items/equip-charm/_include.xml
index fa1cb995..ff7953a8 100644
--- a/items/equip-charm/_include.xml
+++ b/items/equip-charm/_include.xml
@@ -3,15 +3,7 @@
   <include name="items/equip-charm/item0677_HeartNecklace.xml"/>
   <include name="items/equip-charm/item0742_FourLeafClover.xml"/>
   <include name="items/equip-charm/item0749_Towel.xml"/>
-  <include name="items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml"/>
-  <include name="items/equip-charm/item0830_BromenalFourLeafAmulet.xml"/>
-  <include name="items/equip-charm/item0831_SilverFourLeafAmulet.xml"/>
-  <include name="items/equip-charm/item0832_GoldenFourLeafAmulet.xml"/>
   <include name="items/equip-charm/item0865_Grimoire.xml"/>
   <include name="items/equip-charm/item0879_HeartofIsis.xml"/>
-  <include name="items/equip-charm/item0908_GMAmulet.xml"/>
-  <include name="items/equip-charm/item1227_EnchantersAmulet.xml"/>
   <include name="items/equip-charm/item1244_DarkTalisman.xml"/>
-  <include name="items/equip-charm/item5269_AssassinAmulet.xml"/>
-  <include name="items/equip-charm/item5270_ManaPearl.xml"/>
 </items>
diff --git a/items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml b/items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml
deleted file mode 100644
index 29d60d62..00000000
--- a/items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="829" image="equipment/charms/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-charm" luk="1" weight="10" sellProtected="true"/>
-</items>
diff --git a/items/equip-charm/item0830_BromenalFourLeafAmulet.xml b/items/equip-charm/item0830_BromenalFourLeafAmulet.xml
deleted file mode 100644
index 79394b97..00000000
--- a/items/equip-charm/item0830_BromenalFourLeafAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="830" image="equipment/charms/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-charm" luk="2" weight="10" sellProtected="true"/>
-</items>
diff --git a/items/equip-charm/item0831_SilverFourLeafAmulet.xml b/items/equip-charm/item0831_SilverFourLeafAmulet.xml
deleted file mode 100644
index 379d3635..00000000
--- a/items/equip-charm/item0831_SilverFourLeafAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="831" image="equipment/charms/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-charm" luk="3" weight="10" sellProtected="true"/>
-</items>
diff --git a/items/equip-charm/item0832_GoldenFourLeafAmulet.xml b/items/equip-charm/item0832_GoldenFourLeafAmulet.xml
deleted file mode 100644
index a1a5a12b..00000000
--- a/items/equip-charm/item0832_GoldenFourLeafAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="832" image="equipment/charms/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-charm" luk="4" weight="10" sellProtected="true"/>
-</items>
diff --git a/items/equip-charm/item0908_GMAmulet.xml b/items/equip-charm/item0908_GMAmulet.xml
deleted file mode 100644
index 86777263..00000000
--- a/items/equip-charm/item0908_GMAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="908" image="equipment/charms/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-charm"/>
-</items>
diff --git a/items/equip-charm/item1227_EnchantersAmulet.xml b/items/equip-charm/item1227_EnchantersAmulet.xml
deleted file mode 100644
index ba13cb75..00000000
--- a/items/equip-charm/item1227_EnchantersAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="1227" image="equipment/charms/enchanter.png" name="Enchanter's Amulet" description="An amulet made for true enchanters." effect="Hit Chance +22" type="equip-charm" weight="1"/>
-</items>
diff --git a/items/equip-charm/item1244_DarkTalisman.xml b/items/equip-charm/item1244_DarkTalisman.xml
index 647f7d80..2a002698 100644
--- a/items/equip-charm/item1244_DarkTalisman.xml
+++ b/items/equip-charm/item1244_DarkTalisman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="1244" image="equipment/charms/darktalisman.png" name="Dark Talisman" description="A small cube. It radiates unimaginable power, and is quite dizzying to look at." mattack="100" type="equip-torso" mdefense="30" sellProtected="true">
+  <item id="1244" image="equipment/charms/darktalisman.png" name="Dark Talisman" description="A small cube. It radiates unimaginable power, and is quite dizzying to look at." mattack="100" type="equip-charm" mdefense="30" sellProtected="true">
     <particlefx>graphics/particles/dark-talisman.xml</particlefx>
   </item>
 </items>
diff --git a/items/equip-charm/item5269_AssassinAmulet.xml b/items/equip-charm/item5269_AssassinAmulet.xml
deleted file mode 100644
index ec66cbdc..00000000
--- a/items/equip-charm/item5269_AssassinAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="5269" image="equipment/charms/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-charm" weight="1" sellProtected="true"/>
-</items>
diff --git a/items/equip-charm/item5270_ManaPearl.xml b/items/equip-charm/item5270_ManaPearl.xml
deleted file mode 100644
index d4e0dab7..00000000
--- a/items/equip-charm/item5270_ManaPearl.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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="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-feet/_include.xml b/items/equip-feet/_include.xml
index 1c3b6977..ad7b2328 100644
--- a/items/equip-feet/_include.xml
+++ b/items/equip-feet/_include.xml
@@ -3,6 +3,7 @@
   <include name="items/equip-feet/item0528_Boots.xml"/>
   <include name="items/equip-feet/item0655_FurBoots.xml"/>
   <include name="items/equip-feet/item0734_BlackBoots.xml"/>
+  <include name="items/equip-feet/item0735_CottonBoots.xml"/>
   <include name="items/equip-feet/item0757_AssassinBoots.xml"/>
   <include name="items/equip-feet/item0792_BromenalBoots.xml"/>
   <include name="items/equip-feet/item0876_WarlordBoots.xml"/>
diff --git a/items/equip-head/item0735_CottonBoots.xml b/items/equip-feet/item0735_CottonBoots.xml
index ed9f57d7..14aed202 100644
--- a/items/equip-head/item0735_CottonBoots.xml
+++ b/items/equip-feet/item0735_CottonBoots.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="735" image="equipment/feet/boots.png|W:#a4b2b2,ffffff" name="Cotton Boots" description="A pair of quality cotton boots." mattack="1" type="equip-head" defense="1" weight="10">
+  <item id="735" image="equipment/feet/boots.png|W:#a4b2b2,ffffff" name="Cotton Boots" description="A pair of quality cotton boots." mattack="1" type="equip-feet" defense="1" weight="10">
     <sprite gender="unisex">equipment/feet/boots.xml|#a4b2b2,ffffff</sprite>
     <sprite gender="female">equipment/feet/boots-female.xml|#a4b2b2,ffffff</sprite>
   </item>
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index 447e89b2..d8077c1e 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -37,7 +37,6 @@
   <include name="items/equip-head/item0723_DesertHat.xml"/>
   <include name="items/equip-head/item0724_CottonHeadband.xml"/>
   <include name="items/equip-head/item0725_GMCap.xml"/>
-  <include name="items/equip-head/item0735_CottonBoots.xml"/>
   <include name="items/equip-head/item0751_PinkieHat.xml"/>
   <include name="items/equip-head/item0752_FluffyHat.xml"/>
   <include name="items/equip-head/item0759_PaladinsHelmet.xml"/>
diff --git a/items/equip-ring/_include.xml b/items/equip-ring/_include.xml
index 20fc0c07..628269c4 100644
--- a/items/equip-ring/_include.xml
+++ b/items/equip-ring/_include.xml
@@ -8,7 +8,6 @@
   <include name="items/equip-ring/item4012_TopazRing.xml"/>
   <include name="items/equip-ring/item4013_AmethystRing.xml"/>
   <include name="items/equip-ring/item4014_SimpleRing.xml"/>
-  <include name="items/equip-ring/item5252_GuardianWings.xml"/>
   <include name="items/equip-ring/item5253_MagicRing.xml"/>
   <include name="items/equip-ring/item5268_AssassinRing.xml"/>
 </items>
diff --git a/items/equip-ring/item5252_GuardianWings.xml b/items/equip-ring/item5252_GuardianWings.xml
deleted file mode 100644
index dd9b9663..00000000
--- a/items/equip-ring/item5252_GuardianWings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="5252" image="equipment/rings/wedding.png" name="Guardian Wings" description="Powerful guardian wings, which watches over the horizon, guarding mana." type="equip-ring" weight="1">
-    <sprite>equipment/angel-wings.xml</sprite>
-    <particlefx>graphics/particles/angel.particle.xml</particlefx>
-  </item>
-</items>