Merge pull request #311 from mekolat/gender2

3rd gender, new races

19 files changed, 28 insertions, 18 deletions

diff --git a/graphics/sprites/equipment/legs/assassin-male.png b/graphics/sprites/equipment/legs/assassin.png
index a8d7aaf6..a8d7aaf6 100644
--- a/graphics/sprites/equipment/legs/assassin-male.png
+++ b/graphics/sprites/equipment/legs/assassin.png
diff --git a/graphics/sprites/equipment/legs/assassin-male.xml b/graphics/sprites/equipment/legs/assassin.xml
index 8be74e7c..66943c11 100644
--- a/graphics/sprites/equipment/legs/assassin-male.xml
+++ b/graphics/sprites/equipment/legs/assassin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/assassin-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/assassin.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/bromenallegs-male.png b/graphics/sprites/equipment/legs/bromenallegs.png
index 326b30d5..326b30d5 100644
--- a/graphics/sprites/equipment/legs/bromenallegs-male.png
+++ b/graphics/sprites/equipment/legs/bromenallegs.png
diff --git a/graphics/sprites/equipment/legs/bromenallegs-male.xml b/graphics/sprites/equipment/legs/bromenallegs.xml
index 37a8fc43..a682be3a 100644
--- a/graphics/sprites/equipment/legs/bromenallegs-male.xml
+++ b/graphics/sprites/equipment/legs/bromenallegs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/bromenallegs-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/bromenallegs.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/chaps-male.png b/graphics/sprites/equipment/legs/chaps.png
index 711355b1..711355b1 100644
--- a/graphics/sprites/equipment/legs/chaps-male.png
+++ b/graphics/sprites/equipment/legs/chaps.png
diff --git a/graphics/sprites/equipment/legs/chaps-male.xml b/graphics/sprites/equipment/legs/chaps.xml
index c25fe93f..ed0eaf81 100644
--- a/graphics/sprites/equipment/legs/chaps-male.xml
+++ b/graphics/sprites/equipment/legs/chaps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/chaps-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/chaps.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/miniskirt-male.png b/graphics/sprites/equipment/legs/miniskirt.png
index 0d6a5142..0d6a5142 100644
--- a/graphics/sprites/equipment/legs/miniskirt-male.png
+++ b/graphics/sprites/equipment/legs/miniskirt.png
diff --git a/graphics/sprites/equipment/legs/miniskirt-male.xml b/graphics/sprites/equipment/legs/miniskirt.xml
index 57303d5a..64b48eff 100644
--- a/graphics/sprites/equipment/legs/miniskirt-male.xml
+++ b/graphics/sprites/equipment/legs/miniskirt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/miniskirt-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/miniskirt.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/pants-oversized.xml b/graphics/sprites/equipment/legs/pants-oversized.xml
new file mode 100644
index 00000000..9acbedbc
--- /dev/null
+++ b/graphics/sprites/equipment/legs/pants-oversized.xml
@@ -0,0 +1,10 @@
+<?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"/>
+  <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-male.png b/graphics/sprites/equipment/legs/pants.png
index 3af6ca19..3af6ca19 100644
--- a/graphics/sprites/equipment/legs/pants-male.png
+++ b/graphics/sprites/equipment/legs/pants.png
diff --git a/graphics/sprites/equipment/legs/pants-male.xml b/graphics/sprites/equipment/legs/pants.xml
index 5ccdf808..50ee7b64 100644
--- a/graphics/sprites/equipment/legs/pants-male.xml
+++ b/graphics/sprites/equipment/legs/pants.xml
@@ -1,5 +1,5 @@
 <?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"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/pants.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/shorts-male.png b/graphics/sprites/equipment/legs/shorts.png
index 8f8e7bf0..8f8e7bf0 100644
--- a/graphics/sprites/equipment/legs/shorts-male.png
+++ b/graphics/sprites/equipment/legs/shorts.png
diff --git a/graphics/sprites/equipment/legs/shorts-male.xml b/graphics/sprites/equipment/legs/shorts.xml
index fc6d8932..683a7134 100644
--- a/graphics/sprites/equipment/legs/shorts-male.xml
+++ b/graphics/sprites/equipment/legs/shorts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/shorts-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/shorts.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/silkpants-male.png b/graphics/sprites/equipment/legs/silkpants.png
index fd46f3da..fd46f3da 100644
--- a/graphics/sprites/equipment/legs/silkpants-male.png
+++ b/graphics/sprites/equipment/legs/silkpants.png
diff --git a/graphics/sprites/equipment/legs/silkpants-male.xml b/graphics/sprites/equipment/legs/silkpants.xml
index 4b7a7634..78793ca4 100644
--- a/graphics/sprites/equipment/legs/silkpants-male.xml
+++ b/graphics/sprites/equipment/legs/silkpants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/silkpants-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/silkpants.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/skirt-male.png b/graphics/sprites/equipment/legs/skirt-male.png
deleted file mode 100644
index cb9b5397..00000000
--- a/graphics/sprites/equipment/legs/skirt-male.png
+++ /dev/null
diff --git a/graphics/sprites/equipment/legs/skirt-male.xml b/graphics/sprites/equipment/legs/skirt.xml
index befbedff..11606c5e 100644
--- a/graphics/sprites/equipment/legs/skirt-male.xml
+++ b/graphics/sprites/equipment/legs/skirt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/skirt-female.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/skirt.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/terranite-male.png b/graphics/sprites/equipment/legs/terranite.png
index 2664f78d..2664f78d 100644
--- a/graphics/sprites/equipment/legs/terranite-male.png
+++ b/graphics/sprites/equipment/legs/terranite.png
diff --git a/graphics/sprites/equipment/legs/terranite-male.xml b/graphics/sprites/equipment/legs/terranite.xml
index 8918f613..72f27002 100644
--- a/graphics/sprites/equipment/legs/terranite-male.xml
+++ b/graphics/sprites/equipment/legs/terranite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/terranite-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/terranite.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>