Merge branch 'equipment_overhaul' into 'master'

To resolve some of the pipeline errors

See merge request themanaworld/evolved/clientdata!5

14 files changed, 61 insertions, 35 deletions

diff --git a/graphics/sprites/equipment/legs/miniskirt-female.png b/graphics/sprites/equipment/legs/miniskirt-female.png
index 4e7c001a..280fb34d 100644
--- a/graphics/sprites/equipment/legs/miniskirt-female.png
+++ b/graphics/sprites/equipment/legs/miniskirt-female.png
diff --git a/graphics/sprites/equipment/legs/miniskirt-female.xml b/graphics/sprites/equipment/legs/miniskirt-female.xml
index 2081e8e6..7b7f0fbd 100644
--- a/graphics/sprites/equipment/legs/miniskirt-female.xml
+++ b/graphics/sprites/equipment/legs/miniskirt-female.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/miniskirt-female.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc
+Copyright (C) 2018 TMW2 -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/legs/miniskirt-female.png|W"
+              width="64"
+              height="64"/>
+
+    <include file="races/human.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/miniskirt.png b/graphics/sprites/equipment/legs/miniskirt.png
index 6ffc3917..a1aa8a9d 100644
--- a/graphics/sprites/equipment/legs/miniskirt.png
+++ b/graphics/sprites/equipment/legs/miniskirt.png
diff --git a/graphics/sprites/equipment/legs/miniskirt.xml b/graphics/sprites/equipment/legs/miniskirt.xml
index 64b48eff..331ece82 100644
--- a/graphics/sprites/equipment/legs/miniskirt.xml
+++ b/graphics/sprites/equipment/legs/miniskirt.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/miniskirt.png|W" width="64" height="64"/>
-  <include file="model/base.xml"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2014 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/legs/miniskirt.png|W"
+              width="64"
+              height="64"/>
+
+    <include file="races/human.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/pants-male-oversized.xml b/graphics/sprites/equipment/legs/pants-male-oversized.xml
deleted file mode 100644
index afa541c6..00000000
--- a/graphics/sprites/equipment/legs/pants-male-oversized.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/pants-male.png|W" width="64" height="64"/>
-  <action name="default" imageset="base"/>
-  <action name="stand" imageset="base">
-    <animation direction="down">
-      <frame index="0"/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/equipment/legs/pants-oversized.xml b/graphics/sprites/equipment/legs/pants-oversized.xml
index 9acbedbc..afa541c6 100644
--- a/graphics/sprites/equipment/legs/pants-oversized.xml
+++ b/graphics/sprites/equipment/legs/pants-oversized.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/pants.png|W" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/pants-male.png|W" width="64" height="64"/>
   <action name="default" imageset="base"/>
   <action name="stand" imageset="base">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/legs/shorts-female.png b/graphics/sprites/equipment/legs/shorts-female.png
index 4a8343f2..0cc0a846 100644
--- a/graphics/sprites/equipment/legs/shorts-female.png
+++ b/graphics/sprites/equipment/legs/shorts-female.png
diff --git a/graphics/sprites/equipment/legs/shorts-female.xml b/graphics/sprites/equipment/legs/shorts-female.xml
index 3658e995..986aa52b 100644
--- a/graphics/sprites/equipment/legs/shorts-female.xml
+++ b/graphics/sprites/equipment/legs/shorts-female.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/shorts-female.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2012 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/legs/shorts-female.png|S"
+              width="64"
+              height="64"/>
+
+    <include file="races/human.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/shorts.png b/graphics/sprites/equipment/legs/shorts.png
index 5f3aa504..8aea03a2 100644
--- a/graphics/sprites/equipment/legs/shorts.png
+++ b/graphics/sprites/equipment/legs/shorts.png
diff --git a/graphics/sprites/equipment/legs/shorts.xml b/graphics/sprites/equipment/legs/shorts.xml
index 683a7134..263c5d3e 100644
--- a/graphics/sprites/equipment/legs/shorts.xml
+++ b/graphics/sprites/equipment/legs/shorts.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/shorts.png|W" width="64" height="64"/>
-  <include file="model/base.xml"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2012 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/legs/shorts.png|S"
+              width="64"
+              height="64"/>
+
+    <include file="races/human.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/silkpants-female.png b/graphics/sprites/equipment/legs/silkpants-female.png
index 53609581..fede06a9 100644
--- a/graphics/sprites/equipment/legs/silkpants-female.png
+++ b/graphics/sprites/equipment/legs/silkpants-female.png
diff --git a/graphics/sprites/equipment/legs/silkpants-female.xml b/graphics/sprites/equipment/legs/silkpants-female.xml
index 8c6d88d0..4ce9c5f0 100644
--- a/graphics/sprites/equipment/legs/silkpants-female.xml
+++ b/graphics/sprites/equipment/legs/silkpants-female.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/silkpants-female.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc
+Copyright (C) 2018 TMW2 -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/legs/silkpants-female.png"
+              width="64"
+              height="64"/>
+
+    <include file="races/human.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/silkpants.png b/graphics/sprites/equipment/legs/silkpants.png
index 7cfb29ed..a9e67807 100644
--- a/graphics/sprites/equipment/legs/silkpants.png
+++ b/graphics/sprites/equipment/legs/silkpants.png
diff --git a/graphics/sprites/equipment/legs/silkpants.xml b/graphics/sprites/equipment/legs/silkpants.xml
index 78793ca4..32584d72 100644
--- a/graphics/sprites/equipment/legs/silkpants.xml
+++ b/graphics/sprites/equipment/legs/silkpants.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/silkpants.png|W" width="64" height="64"/>
-  <include file="model/base.xml"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2014 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/legs/silkpants.png|W"
+              width="64"
+              height="64"/>
+
+    <include file="races/human.xml"/>
 </sprite>