From ec3266539a40191dea8860ad72477e847e5e0ab5 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Tue, 5 Jan 2016 13:01:16 -0500
Subject: prepare for new races, fix random things

update colors

fix race ids and names

add new tritan styles

various fixes

add female equipment

equip-head

equip-1hand

equip-2hand

equip-arms

equip-feet

equip-legs

equip-torso

add female model once again

manaplus being dumb (no fallback support)

make Rouge use the bra item

use male model as base model

otherwise the neutral tank top shows on some npcs

fix pirates

fix hairstyles for char creation (class 0)

Fix F hairstyle 8 and 12

Fix Errant reds in N back

FIX more headstyles
---
 monsters/monster1119_Thug.xml                 | 1 +
 monsters/monster1120_Swashbuckler.xml         | 1 +
 monsters/monster1121_Grenadier.xml            | 1 +
 monsters/monster1122_TheDreadPirateMarley.xml | 1 +
 monsters/monster1123_TheDreadPirateMarley.xml | 1 +
 5 files changed, 5 insertions(+)

(limited to 'monsters')

diff --git a/monsters/monster1119_Thug.xml b/monsters/monster1119_Thug.xml
index 715d47b9..b7b04100 100644
--- a/monsters/monster1119_Thug.xml
+++ b/monsters/monster1119_Thug.xml
@@ -2,6 +2,7 @@
 <monsters offset="0">
   <monster id="1119" name="Thug">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
     <sprite>equipment/head/sailor-hat.xml</sprite>
     <sprite>equipment/feet/boots.xml</sprite>
     <sprite>equipment/chest/tanktop.xml</sprite>
diff --git a/monsters/monster1120_Swashbuckler.xml b/monsters/monster1120_Swashbuckler.xml
index 2b3ea6f7..e19fed47 100644
--- a/monsters/monster1120_Swashbuckler.xml
+++ b/monsters/monster1120_Swashbuckler.xml
@@ -2,6 +2,7 @@
 <monsters offset="0">
   <monster id="1120" name="Swashbuckler">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
     <sprite>equipment/chest/vnecksweater.xml</sprite>
     <sprite>equipment/legs/pants.xml|#212121,555555</sprite>
     <sprite>equipment/head/bandana.xml|#212121,555555</sprite>
diff --git a/monsters/monster1121_Grenadier.xml b/monsters/monster1121_Grenadier.xml
index 5a438845..18b2acd6 100644
--- a/monsters/monster1121_Grenadier.xml
+++ b/monsters/monster1121_Grenadier.xml
@@ -2,6 +2,7 @@
 <monsters offset="0">
   <monster id="1121" name="Grenadier">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
     <sprite>equipment/chest/sorcerer-robe.xml|#5178a0,1a294c;#d5b02c</sprite>
     <sprite>equipment/legs/pants.xml|#5178a0,1a294c</sprite>
     <sprite>equipment/head/piratehat.xml</sprite>
diff --git a/monsters/monster1122_TheDreadPirateMarley.xml b/monsters/monster1122_TheDreadPirateMarley.xml
index c2c99fa8..26aaeb32 100644
--- a/monsters/monster1122_TheDreadPirateMarley.xml
+++ b/monsters/monster1122_TheDreadPirateMarley.xml
@@ -2,6 +2,7 @@
 <monsters offset="0">
   <monster id="1122" name="The Dread Pirate Marley">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
     <sprite>equipment/chest/assassin.xml</sprite>
     <sprite>equipment/legs/assassin.xml</sprite>
     <sprite>equipment/head/eyepatch.xml</sprite>
diff --git a/monsters/monster1123_TheDreadPirateMarley.xml b/monsters/monster1123_TheDreadPirateMarley.xml
index 621e6ed6..e2417454 100644
--- a/monsters/monster1123_TheDreadPirateMarley.xml
+++ b/monsters/monster1123_TheDreadPirateMarley.xml
@@ -2,6 +2,7 @@
 <monsters offset="0">
   <monster id="1123" name="The Dread Pirate Marley">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
     <sprite>equipment/chest/assassin.xml</sprite>
     <sprite>equipment/legs/assassin.xml</sprite>
     <sprite>equipment/head/eyepatch.xml</sprite>
-- 
cgit v1.2.3-60-g2f50