save

1 files changed, 59 insertions, 59 deletions

diff --git a/items.xml b/items.xml
index 6e568669..0f40ccb6 100644
--- a/items.xml
+++ b/items.xml
@@ -1010,7 +1010,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="14"/>
 	<item id="612"
-		image="generic/clothespack.png"
+		image="generic/box/clothespack.png"
 		name="Friend Gift"
 		description="Sent by your friend. Can be open at level 5."
 		type="usable"
@@ -1076,7 +1076,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="5"
 		maxFloorOffset="12"/>
 	 <item id="701"
-		image="generic/pioufeathers.png"
+		image="generic/feather/pioufeathers.png"
 		name="Piou Feathers"
 		description="Small feathers of an innocent little piou."
 		type="generic"
@@ -1132,7 +1132,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="2"
 		maxFloorOffset="12"/>
 	<item id="710"
-		image="generic/pearl.png"
+		image="generic/gem/pearl.png"
 		name="Pearl"
 		description="A beautiful round and shiny pearl."
 		type="generic"
@@ -1153,7 +1153,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="10"
 		maxFloorOffset="9"/>
 	<item id="713"
-		image="generic/box-fish.png"
+		image="generic/box/fishbox.png"
 		name="Fish Box"
 		description="A wooden box full of fresh fish."
 		type="generic"
@@ -1166,13 +1166,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="5"/>
 	<item id="715"
-		image="generic/box-croconut.png"
+		image="generic/box/croconutbox.png"
 		name="Croconut Box"
 		description="Contains 17 croconuts."
 		type="generic"
 		weight="1400"/>
 	<item id="716"
-		image="generic/box-plushroom.png"
+		image="generic/box/plushroombox.png"
 		name="Plushroom Box"
 		description="Contains 87 plushrooms."
 		type="generic"
@@ -1185,7 +1185,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="20"
 		maxFloorOffset="12"/>
 	<item id="718"
-		image="generic/key-ship.png"
+		image="generic/key/shipkey.png"
 		name="Silver Key"
 		description="An iron key trying to pass itself as a silver one. Don't ask. Just use it!"
 		type="generic"
@@ -1241,14 +1241,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="8"
 		maxFloorOffset="7"/>
 	<item id="726"
-		image="generic/carp.png"
+		image="generic/fish/carp.png"
 		name="Common Carp"
 		description="Freshwater is commonly inhabited by these pests."
 		type="generic"
 		weight="200"
 		maxFloorOffset="9"/>
 	<item id="727"
-		image="generic/carp.png|S:#394f4d,3e4d58,607793,7b6093,6ba6a8,a47ba8,c9dec0,dec0cb,8dc7a2,dec0cb"
+		image="generic/fish/carp.png|S:#394f4d,3e4d58,607793,7b6093,6ba6a8,a47ba8,c9dec0,dec0cb,8dc7a2,dec0cb"
 		name="Grass Carp"
 		description="A smart fish, very difficult to catch."
 		type="generic"
@@ -1265,49 +1265,49 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	<!-- id 729 is free -->
 	<!-- id 730 is free -->
 	<item id="731"
-		image="generic/diamond.png"
+		image="generic/gem/diamond.png"
 		name="Diamond"
 		description="A raw diamond gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="732"
-		image="generic/ruby.png"
+		image="generic/gem/ruby.png"
 		name="Ruby"
 		description="A raw ruby gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="733"
-		image="generic/emerald.png"
+		image="generic/gem/emerald.png"
 		name="Emerald"
 		description="A raw emerald gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="734"
-		image="generic/sapphire.png"
+		image="generic/gem/sapphire.png"
 		name="Sapphire"
 		description="A raw sapphire gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="735"
-		image="generic/topaz.png"
+		image="generic/gem/topaz.png"
 		name="Topaz"
 		description="A raw topaz gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="736"
-		image="generic/amethyst.png"
+		image="generic/gem/amethyst.png"
 		name="Amethyst"
 		description="A raw amethyst gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="737"
-		image="generic/blackpearl.png"
+		image="generic/gem/blackpearl.png"
 		name="Black Pearl"
 		description="A pearl. Round, shiny and black!"
 		type="generic"
@@ -1421,14 +1421,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="2"
 		maxFloorOffset="20"/>
 	<item id="753"
-		image="generic/cavesnakelamp.png"
+		image="generic/snake/cavesnakelamp.png"
 		name="Cave Snake Lamp"
 		description="The feeler of a cave snake that glows in the dark."
 		type="generic"
 		weight="10"
 		maxFloorOffset="20"/>
 	<item id="754"
-		image="generic/closedchristmasbox.png"
+		image="generic/box/closedchristmasbox.png"
 		name="Closed Christmas Box"
 		description="A closed, but yet unwrapped box that should contain some Christmas present."
 		type="generic"
@@ -1442,14 +1442,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="40"
 		maxFloorOffset="20"/>
 	<item id="756"
-		image="generic/cryptkey.png"
+		image="generic/key/cryptkey.png"
 		name="Crypt Key"
 		description="You feel as if the Skeleton Key is staring at you."
 		type="generic"
 		weight="2"
 		maxFloorOffset="20"/>
 	<item id="757"
-		image="generic/darkpetal.png"
+		image="generic/herb/darkpetal.png"
 		name="Dark Petal"
 		description="A single, dark, petal, oddly heavy. The edges of the petal are unusually hard, and have a slightly reflective shine to them. But looking into the gleam, you can only see fire."
 		type="generic"
@@ -1477,14 +1477,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="761"
-		image="generic/cobaltherb.png"
+		image="generic/herb/cobaltherb.png"
 		name="Cobalt Herb"
 		description="An ingredient for brewing healing potions."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="762"
-		image="generic/snakeskin.png"
+		image="generic/snake/snakeskin.png"
 		name="Snake Skin"
 		description="The skin of a slain snake."
 		type="generic"
@@ -1526,14 +1526,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="10"
 		maxFloorOffset="20"/>
 	<item id="768"
-		image="generic/gambogeherb.png"
+		image="generic/herb/gambogeherb.png"
 		name="Gamboge Herb"
 		description="An ingredient for brewing healing potions."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="769"
-		image="generic/mauveherb.png"
+		image="generic/herb/mauveherb.png"
 		name="Mauve Herb"
 		description="An ingredient for brewing healing potions."
 		type="generic"
@@ -1597,7 +1597,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="5"
 		maxFloorOffset="20"/>
 	<item id="778"
-		image="generic/scorpionstinger.png"
+		image="generic/scorpion/scorpionstinger.png"
 		name="Scorpion Stinger"
 		description="A poisoned scorpion stinger."
 		type="generic"
@@ -1618,7 +1618,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="781"
-		image="generic/treasurekey.png"
+		image="generic/key/treasurekey.png"
 		name="Treasure Key"
 		description="A rusty key."
 		type="generic"
@@ -1646,7 +1646,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="785"
-		image="generic/pearl.png|W:#581a1a,a41111,c03a3a,ff6060"
+		image="generic/gem/pearl.png|W:#581a1a,a41111,c03a3a,ff6060"
 		name="Lava Mana Pearl"
 		description="A strange lava pearl that did not burn you."
 		type="generic"
@@ -1732,21 +1732,21 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="798"
-		image="generic/lazuriteshard.png"
+		image="generic/gem/lazuriteshard.png"
 		name="Lazurite Shard"
 		description="A small shard of Lazurite, with little magic catalysis properties."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="799"
-		image="generic/lazuritecrystal.png"
+		image="generic/gem/lazuritecrystal.png"
 		name="Lazurite Crystal"
 		description="A crystal of Lazurite, with magic catalysis properties."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="800"
-		image="generic/lazuriteheart.png"
+		image="generic/gem/lazuriteheart.png"
 		name="Lazurite Heart"
 		description="A large crystal of Lazurite, with powerful magic catalysis properties."
 		type="generic"
@@ -1781,7 +1781,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="805"
-		image="generic/openedchristmasbox.png"
+		image="generic/box/openedchristmasbox.png"
 		name="Opened Christmas Box"
 		description="What was inside?"
 		type="generic"
@@ -1795,7 +1795,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="807"
-		image="generic/petal.png"
+		image="generic/herb/petal.png"
 		name="Petal"
 		description="This lovely petal was picked from a flower."
 		type="generic"
@@ -1809,7 +1809,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="4"
 		maxFloorOffset="20"/>
 	<item id="809"
-		image="generic/presentbox.png"
+		image="generic/box/presentbox.png"
 		name="Present Box"
 		description="What does it contain."
 		type="generic"
@@ -1865,7 +1865,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="817"
-		image="generic/key-ship.png"
+		image="generic/key/shipkey.png"
 		name="Saxso Key"
 		description="Used to unlock something."
 		type="generic"
@@ -1873,7 +1873,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="818"
-		image="generic/bluemanapearl.png"
+		image="generic/gem/bluemanapearl.png"
 		name="Blue Mana Pearl"
 		description="A pure pearl of Mana."
 		type="generic"
@@ -1889,14 +1889,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="820"
-		image="generic/darkcrystal.png"
+		image="generic/gem/darkcrystal.png"
 		name="Dark Crystal"
 		description="Dark as the night."
 		type="generic"
 		weight="10"
 		maxFloorOffset="20"/>
 	<item id="821"
-		image="generic/sunnycrystal.png"
+		image="genericgem//sunnycrystal.png"
 		name="Sunny Crystal"
 		description="Shines as bright as the sun."
 		type="generic"
@@ -1917,7 +1917,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="10"
 		maxFloorOffset="20"/>
 	<item id="824"
-		image="generic/lightgreendiamond.png"
+		image="generic/gem/lightgreendiamond.png"
 		name="Light Green Diamond"
 		description="A light green diamond."
 		type="generic"
@@ -1962,21 +1962,21 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="830"
-		image="generic/cavesnaketongue.png"
+		image="generic/snake/cavesnaketongue.png"
 		name="Cave Snake Tongue"
 		description="It is not kind to show tongues to people, you know."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="831"
-		image="generic/redscorpionstinger.png"
+		image="generic/scorpion/redscorpionstinger.png"
 		name="Red Scorpion Stinger"
 		description="It stings!"
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="832"
-		image="generic/blackscorpionstinger.png"
+		image="generic/scorpion/blackscorpionstinger.png"
 		name="Black Scorpion Stinger"
 		description="It stings a lot!"
 		type="generic"
@@ -2011,7 +2011,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="6"
 		maxFloorOffset="20"/>
 	 <item id="837"
-		image="generic/duckfeather.png"
+		image="generic/feather/duckfeather.png"
 		name="Duck Feathers"
 		description="Small feathers of an angry Duck."
 		type="generic"
@@ -2025,19 +2025,19 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="1"/>
 	 <item id="839"
-		image="generic/roach.png"
+		image="generic/fish/roach.png"
 		name="Roach"
 		description="A small fish."
 		type="generic"
 		weight="80"/>
 	 <item id="840"
-		image="generic/tench.png"
+		image="generic/fish/tench.png"
 		name="Tench"
 		description="A tench found in pond."
 		type="generic"
 		weight="120"/>
 	 <item id="841"
-		image="generic/gemstone.png|W:#a0a010,ffffa0"
+		image="generic/gem/gemstone.png|W:#a0a010,ffffa0"
 		name="Lifestone"
 		description="A small stone with some life power on it. Not very useful."
 		type="generic"
@@ -2186,7 +2186,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="12"/>
 	<item id="864"
-		image="generic/box-aquada.png"
+		image="generic/box/aquadabox.png"
 		name="Aquada Box"
 		description="Contains 50 aquadas."
 		type="generic"
@@ -2219,13 +2219,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="15"/>
 	<item id="869"
-		image="generic/redscorpionclaw.png"
+		image="generic/scorpion/redscorpionclaw.png"
 		name="Red Scorpion claw"
 		description="Not appetizing."
 		type="generic"
 		weight="20"/>
 	<item id="870"
-		image="generic/blackscorpionclaw.png"
+		image="generic/scorpion/blackscorpionclaw.png"
 		name="Black Scorpion claw"
 		description="It moves and pinches without its body."
 		type="generic"
@@ -2269,20 +2269,20 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="70"/>
 	<item id="877"
-		image="generic/manapioufeathers.png"
+		image="generic/feather/manapioufeathers.png"
 		name="Mana Piou Feathers"
 		description="Small magic feathers of a little magic piou."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="878"
-		image="generic/black-mamba-skin.png"
+		image="generic/snake/blackmambaskin.png"
 		name="Black Mamba Skin"
 		description="The skin of a slain black mamba."
 		type="generic"
 		weight="22"/>
 	<item id="879"
-		image="generic/snaketongue.png|W:#0a0a0a,e02020"
+		image="generic/snake/snaketongue.png|W:#0a0a0a,e02020"
 		name="Black Mamba Tongue"
 		description="The forked tongue of a black mamba."
 		type="generic"
@@ -2294,14 +2294,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="19"/>
 	<item id="881"
-		image="generic/alizarinherb.png"
+		image="generic/herb/alizarinherb.png"
 		name="Alizarin Herb"
 		description="An ingredient for brewing healing potions."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="882"
-		image="generic/herb.png|W:#332636"
+		image="generic/herb/herb.png|W:#332636"
 		name="Shadow Herb"
 		description="An ingredient for brewing poison potions."
 		type="generic"
@@ -5817,7 +5817,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="4"/>
 	<!-- TEST RING CARD -->
 	<item id="5031"
-		image="generic/diamond.png"
+		image="generic/gem/diamond.png"
 		name="Polished Diamond"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5826,7 +5826,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="2"
 		weight="4"/>
 	<item id="5032"
-		image="generic/ruby.png"
+		image="generic/gem/ruby.png"
 		name="Polished Ruby"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5835,7 +5835,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="3"
 		weight="4"/>
 	<item id="5033"
-		image="generic/amethyst.png"
+		image="generic/gem/amethyst.png"
 		name="Polished Amethyst"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5844,7 +5844,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="4"
 		weight="4"/>
 	<item id="5034"
-		image="generic/sapphire.png"
+		image="generic/gem/sapphire.png"
 		name="Polished Sapphire"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5853,7 +5853,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="5"
 		weight="4"/>
 	<item id="5035"
-		image="generic/topaz.png"
+		image="generic/gem/topaz.png"
 		name="Polished Topaz"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5862,7 +5862,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="6"
 		weight="4"/>
 	<item id="5036"
-		image="generic/emerald.png"
+		image="generic/gem/emerald.png"
 		name="Polished Emerald"
 		useButton="Insert"
 		description="A polished gemstone."