From dd839eb94fe957341f5f088797ccafb44d4f60e0 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 21 Nov 2007 19:43:11 +0000
Subject: Merged revisions 3705-3711,3714,3718,3721-3722,3729-3731,3735,3742
 via svnmerge from
 https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
 (dynamic recoloring of sprites and related changes)

........
  r3705 | gmelquio | 2007-11-03 10:58:25 +0100 (Sat, 03 Nov 2007) | 1 line

  Fixed double load of hair graphics.
........
  r3706 | gmelquio | 2007-11-03 22:04:51 +0100 (Sat, 03 Nov 2007) | 1 line

  Added automatic recoloring of images. Inspired by fungos' ideas (PR #41).
........
  r3707 | gmelquio | 2007-11-03 22:08:21 +0100 (Sat, 03 Nov 2007) | 1 line

  Experimented recoloring on scorpions.
........
  r3708 | gmelquio | 2007-11-04 12:52:44 +0100 (Sun, 04 Nov 2007) | 1 line

  Tightened palette handling.
........
  r3709 | gmelquio | 2007-11-04 12:54:31 +0100 (Sun, 04 Nov 2007) | 1 line

  Experimented with scorpions again.
........
  r3710 | gmelquio | 2007-11-04 16:40:37 +0100 (Sun, 04 Nov 2007) | 1 line

  Applied recoloring to hair styles.
........
  r3711 | gmelquio | 2007-11-04 17:50:37 +0100 (Sun, 04 Nov 2007) | 1 line

  Converted slimes to recoloring.
........
  r3742 | gmelquio | 2007-11-16 14:16:00 +0100 (Fri, 16 Nov 2007) | 1 line

  Sped up recoloring of transparent pixels.
........
---
 monsters.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'monsters.xml')

diff --git a/monsters.xml b/monsters.xml
index d2003816..c22fcc94 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -8,7 +8,7 @@
     </monster>
 
     <monster id="1" name="Scorpion">
-        <sprite>monster-scorpion.xml</sprite>
+        <sprite>monster-scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite>
         <sound event="hit">scorpion-hit1.ogg</sound>
         <sound event="hit">scorpion-hit2.ogg</sound>
         <sound event="hit">scorpion-hit3.ogg</sound>
@@ -17,7 +17,7 @@
     </monster>
 
     <monster id="2" name="Red Scorpion">
-        <sprite>monster-scorpion-red.xml</sprite>
+        <sprite>monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite>
         <sound event="hit">scorpion-hit1.ogg</sound>
         <sound event="hit">scorpion-hit2.ogg</sound>
         <sound event="hit">scorpion-hit3.ogg</sound>
@@ -26,7 +26,7 @@
     </monster>
 
     <monster id="3" name="Green Slime">
-        <sprite>monster-slime-green.xml</sprite>
+        <sprite>monster-slime.xml|#72982c,ffffff</sprite>
         <sound event="hit">slime-hit1.ogg</sound>
     </monster>
 
@@ -39,17 +39,17 @@
     </monster>
 
     <monster id="5" name="Yellow Slime">
-        <sprite>monster-slime-yellow.xml</sprite>
+        <sprite>monster-slime.xml|#b47f00,ffffff</sprite>
         <sound event="hit">slime-hit1.ogg</sound>
     </monster>
 
     <monster id="6" name="Red Slime">
-        <sprite>monster-slime-red.xml</sprite>
+        <sprite>monster-slime.xml|#7e0000,ffffff</sprite>
         <sound event="hit">slime-hit1.ogg</sound>
     </monster>
 
     <monster id="7" name="Black Scorpion">
-        <sprite>monster-scorpion-black.xml</sprite>
+        <sprite>monster-scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite>
         <sound event="hit">scorpion-hit1.ogg</sound>
         <sound event="hit">scorpion-hit2.ogg</sound>
         <sound event="hit">scorpion-hit3.ogg</sound>
-- 
cgit v1.2.3-60-g2f50