17 files changed, 26 insertions, 25 deletions
diff --git a/graphics/items/generic-4leafclover.png b/graphics/items/equipment/charms/clover.png
index ea1825ce..ea1825ce 100644
--- a/graphics/items/generic-4leafclover.png
+++ b/graphics/items/equipment/charms/clover.png
diff --git a/graphics/items/equipment/neck/enchanter.png b/graphics/items/equipment/charms/enchanter.png
index 3023715e..3023715e 100644
--- a/graphics/items/equipment/neck/enchanter.png
+++ b/graphics/items/equipment/charms/enchanter.png
diff --git a/graphics/items/generic-heartnecklace.png b/graphics/items/equipment/charms/heartnecklace.png
index c322a83d..c322a83d 100644
--- a/graphics/items/generic-heartnecklace.png
+++ b/graphics/items/equipment/charms/heartnecklace.png
diff --git a/graphics/items/equipment/neck/silverfourleaf.png b/graphics/items/equipment/charms/silverfourleaf.png
index a02c76e4..a02c76e4 100644
--- a/graphics/items/equipment/neck/silverfourleaf.png
+++ b/graphics/items/equipment/charms/silverfourleaf.png
diff --git a/graphics/items/generic-towel.png b/graphics/items/equipment/charms/towel.png
index 2c85898b..2c85898b 100644
--- a/graphics/items/generic-towel.png
+++ b/graphics/items/equipment/charms/towel.png
diff --git a/graphics/items/equipment/fingers/gem.png b/graphics/items/equipment/rings/gem.png
index 228f00e0..228f00e0 100644
--- a/graphics/items/equipment/fingers/gem.png
+++ b/graphics/items/equipment/rings/gem.png
diff --git a/graphics/items/equipment/fingers/rough-agility.png b/graphics/items/equipment/rings/rough-agility.png
index ce3a3b14..ce3a3b14 100644
--- a/graphics/items/equipment/fingers/rough-agility.png
+++ b/graphics/items/equipment/rings/rough-agility.png
diff --git a/graphics/items/equipment/fingers/rough-dexterity.png b/graphics/items/equipment/rings/rough-dexterity.png
index 2ae35f49..2ae35f49 100644
--- a/graphics/items/equipment/fingers/rough-dexterity.png
+++ b/graphics/items/equipment/rings/rough-dexterity.png
diff --git a/graphics/items/equipment/fingers/rough-intelligence.png b/graphics/items/equipment/rings/rough-intelligence.png
index eabaf93e..eabaf93e 100644
--- a/graphics/items/equipment/fingers/rough-intelligence.png
+++ b/graphics/items/equipment/rings/rough-intelligence.png
diff --git a/graphics/items/equipment/fingers/rough-strength.png b/graphics/items/equipment/rings/rough-strength.png
index b860d6e3..b860d6e3 100644
--- a/graphics/items/equipment/fingers/rough-strength.png
+++ b/graphics/items/equipment/rings/rough-strength.png
diff --git a/graphics/items/equipment/fingers/rough-vitality.png b/graphics/items/equipment/rings/rough-vitality.png
index 8577e2ff..8577e2ff 100644
--- a/graphics/items/equipment/fingers/rough-vitality.png
+++ b/graphics/items/equipment/rings/rough-vitality.png
diff --git a/graphics/items/equipment/fingers/rough-willpower.png b/graphics/items/equipment/rings/rough-willpower.png
index 1fd2b566..1fd2b566 100644
--- a/graphics/items/equipment/fingers/rough-willpower.png
+++ b/graphics/items/equipment/rings/rough-willpower.png
diff --git a/graphics/items/equipment/fingers/simple.png b/graphics/items/equipment/rings/simple.png
index 1a7b2a25..1a7b2a25 100644
--- a/graphics/items/equipment/fingers/simple.png
+++ b/graphics/items/equipment/rings/simple.png
diff --git a/graphics/items/equipment/fingers/wedding.png b/graphics/items/equipment/rings/wedding.png
index 6f74974f..6f74974f 100644
--- a/graphics/items/equipment/fingers/wedding.png
+++ b/graphics/items/equipment/rings/wedding.png
diff --git a/graphics/items/use-silverbell.png b/graphics/items/generic/silverbell.png
index d6524b66..d6524b66 100644
--- a/graphics/items/use-silverbell.png
+++ b/graphics/items/generic/silverbell.png
diff --git a/graphics/items/use-food-honey.png b/graphics/items/use/honey.png
index 8a4d5e35..8a4d5e35 100644
--- a/graphics/items/use-food-honey.png
+++ b/graphics/items/use/honey.png
diff --git a/items.xml b/items.xml
index 1f6040f9..df3c833d 100644
--- a/items.xml
+++ b/items.xml
@@ -1599,7 +1599,7 @@
         <sprite>head-devcap.xml|#9999ff</sprite>
     </item>
     <item id="648"
-        image="equipment/fingers/rough-strengh.png"
+        image="equipment/rings/rough-strengh.png"
         name="Rough Strength Ring"
         description="A rough strength-enhancing ring that looks as if it has been made in a hurry."
         effect="+5 Strength"
@@ -1608,7 +1608,7 @@
         max-per-slot="1"
         strength="5"/>
     <item id="649"
-        image="equipment/fingers/rough-agility.png"
+        image="equipment/rings/rough-agility.png"
         name="Rough Agility Ring"
         description="A rough agility-enhancing ring that looks as if it has been made in a hurry."
         effect="+5 Agility"
@@ -1617,7 +1617,7 @@
         max-per-slot="1"
         agility="5"/>
     <item id="650"
-        image="equipment/fingers/rough-dexterity.png"
+        image="equipment/rings/rough-dexterity.png"
         name="Rough Dexterity Ring"
         description="A rough dexterity-enhancing ring that looks as if it has been made in a hurry."
         effect="+5 Dexterity"
@@ -1626,7 +1626,7 @@
         max-per-slot="1"
         dexterity="5"/>
     <item id="651"
-        image="equipment/fingers/rough-vitality.png"
+        image="equipment/rings/rough-vitality.png"
         name="Rough Vitality Ring"
         description="A rough vitality-enhancing ring that looks as if it has been made in a hurry."
         effect="+5 Vitality"
@@ -1635,7 +1635,7 @@
         max-per-slot="1"
         vitality="5"/>
     <item id="652"
-        image="equipment/fingers/rough-intelligence.png"
+        image="equipment/rings/rough-intelligence.png"
         name="Rough Intelligence Ring"
         description="A rough intelligence-enhancing ring that looks as if it has been made in a hurry."
         effect="+5 Intelligence"
@@ -1644,7 +1644,7 @@
         max-per-slot="1"
         intelligence="5"/>
     <item id="653"
-        image="equipment/fingers/rough-willpower.png"
+        image="equipment/rings/rough-willpower.png"
         name="Rough Willpower Ring"
         description="A rough willpower-enhancing ring that looks as if it has been made in a hurry."
         effect="+5 Willpower"
@@ -1859,13 +1859,14 @@
         weight="10"
         max-per-slot="10"/>
     <item id="677"
-        image="generic-heartnecklace.png"
+        image="equipment/charms/heartnecklace.png"
         name="Heart Necklace"
         description="A gold and ruby heart necklace."
         effect=""
-        type="generic"
+        type="equip-charm"
         weight="10"
-        max-per-slot="10"/>
+        max-per-slot="10"
+        intelligence="5"/>
     <item id="678"
         image="armor-head-nohmask.png"
         name="Noh Mask"
@@ -2057,7 +2058,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="702"
-        image="equipment/fingers/wedding.png"
+        image="equipment/rings/wedding.png"
         name="Wedding Ring"
         description="Your wedding ring."
         type="equip-ring"
@@ -2394,7 +2395,7 @@
         <sprite gender="female">hands-gloves-generic-female.xml|#A4B2B2,FFFFFF</sprite>
     </item>
     <item id="742"
-        image="generic-4leafclover.png"
+        image="equipment/charms/clover.png"
         name="Four-Leaf Clover"
         description="A lucky four-leaf clover."
         effect="+1 Luck"
@@ -2453,7 +2454,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="749"
-        image="generic-towel.png"
+        image="equipment/charms/towel.png"
         name="Towel"
         description="You can dry yourself off with it if it still seems to be clean enough. - Douglas Adams"
         type="equip-charm"
@@ -3424,27 +3425,27 @@
         weight="1"
         max-per-slot="10"/>
     <item id="1226"
-        image="use-silverbell.png"
+        image="generic/silverbell.png"
         name="Silver Bell"
         description="A tiny bell made of silver."
         type="generic"
         weight="25"
         max-per-slot="3"/>
     <item id="1227"
-        image="neck/enchanter.png"
+        image="equipment/charms/enchanter.png"
         name="Enchanter's Amulet"
         description="An amulet made for true enchanters."
         effect="+5 Intelligence"
-        type="equip-neck"
+        type="equip-charm"
         weight="1"
         max-per-slot="1"
         intelligence="5"/>
     <item id="1228"
-        image="neck/silverfourleaf.png"
+        image="equipment/charms/silverfourleaf.png"
         name="Silver Four-Leaf Amulet"
         description="An amulet made for people bringing luck wherever they go."
         effect="+5 Luck"
-        type="equip-neck"
+        type="equip-charm"
         weight="1"
         max-per-slot="1"
         luck="5"/>
@@ -3681,7 +3682,7 @@
         type="generic"
         weight="3"/>
     <item id="1258"
-        image="use-food-honey.png"
+        image="use/honey.png"
         name="Honey"
         description="A sweet food made by certain insects using nectar from flowers."
         effect="+100 HP"
@@ -5828,49 +5829,49 @@
         type="generic"
         weight="10"/>
     <item id="4008"
-        image="equipment/fingers/gem.png"
+        image="equipment/rings/gem.png"
         name="Diamond Ring"
         description="A diamond ring, +1 Vitality."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4009"
-        image="equipment/fingers/gem.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/rings/gem.png|W:#580000,A40000,C02020,ff6060"
         name="Ruby Ring"
         description="A ruby ring, +1 Strength."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4010"
-        image="equipment/fingers/gem.png|W:#1f9c1f,89d689"
+        image="equipment/rings/gem.png|W:#1f9c1f,89d689"
         name="Emerald Ring"
         description="An emerald ring, +1 Luck."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4011"
-        image="equipment/fingers/gem.png|W:#4b4bbd,888af4"
+        image="equipment/rings/gem.png|W:#4b4bbd,888af4"
         name="Sapphire Ring"
         description="A sapphire ring, +1 Intelligence."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4012"
-        image="equipment/fingers/gem.png|W:#ccb534,f1ea8e,ffffaa"
+        image="equipment/rings/gem.png|W:#ccb534,f1ea8e,ffffaa"
         name="Topaz Ring"
         description="A topaz ring, +1 Agility."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4013"
-        image="equipment/fingers/gem.png|W:#530a7c,b362e1,ca87ef"
+        image="equipment/rings/gem.png|W:#530a7c,b362e1,ca87ef"
         name="Amethyst Ring"
         description="An amethyst ring, +1 Dexterity."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4014"
-        image="equipment/fingers/simple.png"
+        image="equipment/rings/simple.png"
         name="Simple Ring"
         description="A simple ring."
         type="equip-ring"