gloves' spritesheets are now in the good folder.

10 files changed, 41 insertions, 41 deletions

diff --git a/graphics/sprites/hands-gloves-assassin-female.png b/graphics/sprites/equipment/hands/assassin-female.png
index 738a0707..738a0707 100644
--- a/graphics/sprites/hands-gloves-assassin-female.png
+++ b/graphics/sprites/equipment/hands/assassin-female.png
diff --git a/graphics/sprites/equipment/hands/assassin-female.xml b/graphics/sprites/equipment/hands/assassin-female.xml
new file mode 100644
index 00000000..2d2a2224
--- /dev/null
+++ b/graphics/sprites/equipment/hands/assassin-female.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/hands/assassin-female.png" width="64" height="64" />
+
+	<include file="equipment/hands/generic-female.xml" />
+
+</sprite>
diff --git a/graphics/sprites/hands-gloves-assassin-male.png b/graphics/sprites/equipment/hands/assassin-male.png
index aaedd5dd..aaedd5dd 100644
--- a/graphics/sprites/hands-gloves-assassin-male.png
+++ b/graphics/sprites/equipment/hands/assassin-male.png
diff --git a/graphics/sprites/hands-gloves-assassin-male.xml b/graphics/sprites/equipment/hands/assassin-male.xml
index b1d8ce80..0a075b5a 100644
--- a/graphics/sprites/hands-gloves-assassin-male.xml
+++ b/graphics/sprites/equipment/hands/assassin-male.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/hands-gloves-assassin-male.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/hands/assassin-male.png" width="64" height="64" />
 
 	<include file="hands-gloves-generic-male.xml" />
 
diff --git a/graphics/sprites/hands-gloves-generic-female.png b/graphics/sprites/equipment/hands/generic-female.png
index 1fd9fbda..1fd9fbda 100644
--- a/graphics/sprites/hands-gloves-generic-female.png
+++ b/graphics/sprites/equipment/hands/generic-female.png
diff --git a/graphics/sprites/hands-gloves-generic-male.xml b/graphics/sprites/equipment/hands/generic-female.xml
index b70f7b16..07fbbb13 100644
--- a/graphics/sprites/hands-gloves-generic-male.xml
+++ b/graphics/sprites/equipment/hands/generic-female.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/hands-gloves-generic-male.png|W" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/hands/generic-female.png|W" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/hands-gloves-generic-male.png b/graphics/sprites/equipment/hands/generic-male.png
index 168a1307..168a1307 100644
--- a/graphics/sprites/hands-gloves-generic-male.png
+++ b/graphics/sprites/equipment/hands/generic-male.png
diff --git a/graphics/sprites/hands-gloves-generic-female.xml b/graphics/sprites/equipment/hands/generic-male.xml
index 0aae5dc5..1defce1b 100644
--- a/graphics/sprites/hands-gloves-generic-female.xml
+++ b/graphics/sprites/equipment/hands/generic-male.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/hands-gloves-generic-female.png|W" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/hands/generic-male.png|W" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/hands-gloves-assassin-female.xml b/graphics/sprites/hands-gloves-assassin-female.xml
deleted file mode 100644
index 20188859..00000000
--- a/graphics/sprites/hands-gloves-assassin-female.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/hands-gloves-assassin-female.png" width="64" height="64" />
-
-	<include file="hands-gloves-generic-female.xml" />
-
-</sprite>
diff --git a/items.xml b/items.xml
index 2f3feefc..2eb0324f 100644
--- a/items.xml
+++ b/items.xml
@@ -407,8 +407,8 @@
         weight="30"
         defense="2"
         max-per-slot="1">
-        <sprite gender="male">hands-gloves-generic/male.xml|#202020,505050</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#202020,505050</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#202020,505050</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#202020,505050</sprite>
     </item>
     <item id="532"
         image="equipment/hands/leathergloves.png"
@@ -419,8 +419,8 @@
         weight="20"
         defense="4"
         max-per-slot="1">
-        <sprite gender="male">hands-gloves-generic/male.xml|#4e2e18,c8752f</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#4e2e18,c8752f</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#4e2e18,c8752f</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#4e2e18,c8752f</sprite>
     </item>
     <item id="533"
         image="use/food/roastedmaggot.png"
@@ -722,8 +722,8 @@
         weight="20"
         defense="3"
         max-per-slot="1">
-        <sprite gender="male">hands-gloves-generic/male.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
     </item>
     <item id="564"
         image="equipment/chest/tnecksweater.png|W:#A4B2B2,FFFFFF"
@@ -2391,8 +2391,8 @@
         type="equip-arms"
         defense="1"
         weight="10">
-        <sprite gender="male">hands-gloves-generic/male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#A4B2B2,FFFFFF</sprite>
     </item>
     <item id="742"
         image="equipment/charms/clover.png"
@@ -2522,8 +2522,8 @@
         weight="9"
         defense="5"
         max-per-slot="1">
-        <sprite gender="male">hands-gloves-assassin-male.xml</sprite>
-        <sprite gender="female">hands-gloves-assassin-female.xml</sprite>
+        <sprite gender="male">equipment/hands/assassin-male.xml</sprite>
+        <sprite gender="female">equipment/hands/assassin-female.xml</sprite>
     </item>
     <item id="757"
         image="equipment/feet/assassinboots.png"
@@ -4932,8 +4932,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#580000,A40000,C02020,ff6060</sprite>
     </item>
     <item id="2161"
         image="equipment/hands/basicgloves.png|W:#115511,22aa22,99dd99"
@@ -4943,8 +4943,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2162"
         image="equipment/hands/basicgloves.png|W:#222255,6666ff"
@@ -4954,8 +4954,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#222255,6666ff</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#222255,6666ff</sprite>
     </item>
     <item id="2163"
         image="equipment/hands/basicgloves.png|W:#846211,dab333,fffb93,ffffff"
@@ -4965,8 +4965,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2164"
         image="equipment/hands/basicgloves.png|W:#16486e,498ec5,e4f2fc"
@@ -4976,8 +4976,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2165"
         image="equipment/hands/basicgloves.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
@@ -4987,8 +4987,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2166"
         image="equipment/hands/basicgloves.png|W:#111111,222222,333333,444444,555555,aaaaaa"
@@ -4998,8 +4998,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2167"
         image="equipment/hands/basicgloves.png|W:#80280f,b04810,ef681f,ffb830"
@@ -5009,8 +5009,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2168"
         image="equipment/hands/basicgloves.png|W:#4f0a76,8010c0,d699f7"
@@ -5020,8 +5020,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2169"
         image="equipment/hands/basicgloves.png|W:#104010,208020,30c030"
@@ -5031,8 +5031,8 @@
         type="equip-arms"
         defense="1"
         weight="20">
-        <sprite gender="male">hands-gloves-generic/male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">hands-gloves-generic/female.xml|#104010,208020,30c030</sprite>
+        <sprite gender="male">equipment/hands/generic-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/hands/generic-female.xml|#104010,208020,30c030</sprite>
     </item>
     <item id="2170"
         image="equipment/legs/miniskirt.png|W:#580000,a40000,c02020,ff6060"