From dd839eb94fe957341f5f088797ccafb44d4f60e0 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer 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. ........ --- graphics/sprites/hairstyle0.xml | 6 ++ graphics/sprites/hairstyle1-female.png | Bin 8751 -> 0 bytes graphics/sprites/hairstyle1-female.xml | 143 ---------------------------- graphics/sprites/hairstyle1-male.png | Bin 8751 -> 0 bytes graphics/sprites/hairstyle1-male.xml | 143 ---------------------------- graphics/sprites/hairstyle1.png | Bin 0 -> 1884 bytes graphics/sprites/hairstyle1.xml | 143 ++++++++++++++++++++++++++++ graphics/sprites/hairstyle2-female.png | Bin 7134 -> 0 bytes graphics/sprites/hairstyle2-female.xml | 143 ---------------------------- graphics/sprites/hairstyle2-male.png | Bin 7134 -> 0 bytes graphics/sprites/hairstyle2-male.xml | 143 ---------------------------- graphics/sprites/hairstyle2.png | Bin 0 -> 1097 bytes graphics/sprites/hairstyle2.xml | 143 ++++++++++++++++++++++++++++ graphics/sprites/hairstyle3-female.png | Bin 7537 -> 0 bytes graphics/sprites/hairstyle3-female.xml | 143 ---------------------------- graphics/sprites/hairstyle3-male.png | Bin 7537 -> 0 bytes graphics/sprites/hairstyle3-male.xml | 143 ---------------------------- graphics/sprites/hairstyle3.png | Bin 0 -> 1190 bytes graphics/sprites/hairstyle3.xml | 143 ++++++++++++++++++++++++++++ graphics/sprites/hairstyle4-female.png | Bin 9083 -> 0 bytes graphics/sprites/hairstyle4-female.xml | 143 ---------------------------- graphics/sprites/hairstyle4-male.png | Bin 9083 -> 0 bytes graphics/sprites/hairstyle4-male.xml | 143 ---------------------------- graphics/sprites/hairstyle4.png | Bin 0 -> 1388 bytes graphics/sprites/hairstyle4.xml | 143 ++++++++++++++++++++++++++++ graphics/sprites/hairstyle5-female.png | Bin 13798 -> 0 bytes graphics/sprites/hairstyle5-female.xml | 142 --------------------------- graphics/sprites/hairstyle5-male.png | Bin 13798 -> 0 bytes graphics/sprites/hairstyle5-male.xml | 142 --------------------------- graphics/sprites/hairstyle5.png | Bin 0 -> 1890 bytes graphics/sprites/hairstyle5.xml | 142 +++++++++++++++++++++++++++ graphics/sprites/hairstyle6-female.png | Bin 7797 -> 0 bytes graphics/sprites/hairstyle6-female.xml | 139 --------------------------- graphics/sprites/hairstyle6-male.png | Bin 7797 -> 0 bytes graphics/sprites/hairstyle6-male.xml | 139 --------------------------- graphics/sprites/hairstyle6.png | Bin 0 -> 1205 bytes graphics/sprites/hairstyle6.xml | 139 +++++++++++++++++++++++++++ graphics/sprites/hairstyle7-female.png | Bin 7071 -> 0 bytes graphics/sprites/hairstyle7-female.xml | 143 ---------------------------- graphics/sprites/hairstyle7-male.png | Bin 7071 -> 0 bytes graphics/sprites/hairstyle7-male.xml | 143 ---------------------------- graphics/sprites/hairstyle7.png | Bin 0 -> 1089 bytes graphics/sprites/hairstyle7.xml | 143 ++++++++++++++++++++++++++++ graphics/sprites/monster-scorpion-black.png | Bin 10609 -> 0 bytes graphics/sprites/monster-scorpion-black.xml | 70 -------------- graphics/sprites/monster-scorpion-red.png | Bin 11096 -> 0 bytes graphics/sprites/monster-scorpion-red.xml | 70 -------------- graphics/sprites/monster-scorpion.png | Bin 10572 -> 7855 bytes graphics/sprites/monster-scorpion.xml | 4 +- graphics/sprites/monster-slime-green.png | Bin 6861 -> 0 bytes graphics/sprites/monster-slime-green.xml | 70 -------------- graphics/sprites/monster-slime-red.png | Bin 6051 -> 0 bytes graphics/sprites/monster-slime-red.xml | 70 -------------- graphics/sprites/monster-slime-yellow.png | Bin 6350 -> 0 bytes graphics/sprites/monster-slime-yellow.xml | 70 -------------- graphics/sprites/monster-slime.png | Bin 0 -> 3344 bytes graphics/sprites/monster-slime.xml | 70 ++++++++++++++ monsters.xml | 12 +-- 58 files changed, 1080 insertions(+), 2350 deletions(-) create mode 100644 graphics/sprites/hairstyle0.xml delete mode 100644 graphics/sprites/hairstyle1-female.png delete mode 100644 graphics/sprites/hairstyle1-female.xml delete mode 100644 graphics/sprites/hairstyle1-male.png delete mode 100644 graphics/sprites/hairstyle1-male.xml create mode 100644 graphics/sprites/hairstyle1.png create mode 100644 graphics/sprites/hairstyle1.xml delete mode 100644 graphics/sprites/hairstyle2-female.png delete mode 100644 graphics/sprites/hairstyle2-female.xml delete mode 100644 graphics/sprites/hairstyle2-male.png delete mode 100644 graphics/sprites/hairstyle2-male.xml create mode 100644 graphics/sprites/hairstyle2.png create mode 100644 graphics/sprites/hairstyle2.xml delete mode 100644 graphics/sprites/hairstyle3-female.png delete mode 100644 graphics/sprites/hairstyle3-female.xml delete mode 100644 graphics/sprites/hairstyle3-male.png delete mode 100644 graphics/sprites/hairstyle3-male.xml create mode 100644 graphics/sprites/hairstyle3.png create mode 100644 graphics/sprites/hairstyle3.xml delete mode 100644 graphics/sprites/hairstyle4-female.png delete mode 100644 graphics/sprites/hairstyle4-female.xml delete mode 100644 graphics/sprites/hairstyle4-male.png delete mode 100644 graphics/sprites/hairstyle4-male.xml create mode 100644 graphics/sprites/hairstyle4.png create mode 100644 graphics/sprites/hairstyle4.xml delete mode 100644 graphics/sprites/hairstyle5-female.png delete mode 100644 graphics/sprites/hairstyle5-female.xml delete mode 100644 graphics/sprites/hairstyle5-male.png delete mode 100644 graphics/sprites/hairstyle5-male.xml create mode 100644 graphics/sprites/hairstyle5.png create mode 100644 graphics/sprites/hairstyle5.xml delete mode 100644 graphics/sprites/hairstyle6-female.png delete mode 100644 graphics/sprites/hairstyle6-female.xml delete mode 100644 graphics/sprites/hairstyle6-male.png delete mode 100644 graphics/sprites/hairstyle6-male.xml create mode 100644 graphics/sprites/hairstyle6.png create mode 100644 graphics/sprites/hairstyle6.xml delete mode 100644 graphics/sprites/hairstyle7-female.png delete mode 100644 graphics/sprites/hairstyle7-female.xml delete mode 100644 graphics/sprites/hairstyle7-male.png delete mode 100644 graphics/sprites/hairstyle7-male.xml create mode 100644 graphics/sprites/hairstyle7.png create mode 100644 graphics/sprites/hairstyle7.xml delete mode 100644 graphics/sprites/monster-scorpion-black.png delete mode 100644 graphics/sprites/monster-scorpion-black.xml delete mode 100644 graphics/sprites/monster-scorpion-red.png delete mode 100644 graphics/sprites/monster-scorpion-red.xml delete mode 100644 graphics/sprites/monster-slime-green.png delete mode 100644 graphics/sprites/monster-slime-green.xml delete mode 100644 graphics/sprites/monster-slime-red.png delete mode 100644 graphics/sprites/monster-slime-red.xml delete mode 100644 graphics/sprites/monster-slime-yellow.png delete mode 100644 graphics/sprites/monster-slime-yellow.xml create mode 100644 graphics/sprites/monster-slime.png create mode 100644 graphics/sprites/monster-slime.xml diff --git a/graphics/sprites/hairstyle0.xml b/graphics/sprites/hairstyle0.xml new file mode 100644 index 00000000..e60f3237 --- /dev/null +++ b/graphics/sprites/hairstyle0.xml @@ -0,0 +1,6 @@ + + + + diff --git a/graphics/sprites/hairstyle1-female.png b/graphics/sprites/hairstyle1-female.png deleted file mode 100644 index eefedb7a..00000000 Binary files a/graphics/sprites/hairstyle1-female.png and /dev/null differ diff --git a/graphics/sprites/hairstyle1-female.xml b/graphics/sprites/hairstyle1-female.xml deleted file mode 100644 index cd1cac9b..00000000 --- a/graphics/sprites/hairstyle1-female.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle1-male.png b/graphics/sprites/hairstyle1-male.png deleted file mode 100644 index eefedb7a..00000000 Binary files a/graphics/sprites/hairstyle1-male.png and /dev/null differ diff --git a/graphics/sprites/hairstyle1-male.xml b/graphics/sprites/hairstyle1-male.xml deleted file mode 100644 index 2c6f7d6d..00000000 --- a/graphics/sprites/hairstyle1-male.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle1.png b/graphics/sprites/hairstyle1.png new file mode 100644 index 00000000..5c11da78 Binary files /dev/null and b/graphics/sprites/hairstyle1.png differ diff --git a/graphics/sprites/hairstyle1.xml b/graphics/sprites/hairstyle1.xml new file mode 100644 index 00000000..bbb78129 --- /dev/null +++ b/graphics/sprites/hairstyle1.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/hairstyle2-female.png b/graphics/sprites/hairstyle2-female.png deleted file mode 100644 index d461bfdc..00000000 Binary files a/graphics/sprites/hairstyle2-female.png and /dev/null differ diff --git a/graphics/sprites/hairstyle2-female.xml b/graphics/sprites/hairstyle2-female.xml deleted file mode 100644 index 61379600..00000000 --- a/graphics/sprites/hairstyle2-female.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle2-male.png b/graphics/sprites/hairstyle2-male.png deleted file mode 100644 index d461bfdc..00000000 Binary files a/graphics/sprites/hairstyle2-male.png and /dev/null differ diff --git a/graphics/sprites/hairstyle2-male.xml b/graphics/sprites/hairstyle2-male.xml deleted file mode 100644 index f089ecaa..00000000 --- a/graphics/sprites/hairstyle2-male.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle2.png b/graphics/sprites/hairstyle2.png new file mode 100644 index 00000000..88647424 Binary files /dev/null and b/graphics/sprites/hairstyle2.png differ diff --git a/graphics/sprites/hairstyle2.xml b/graphics/sprites/hairstyle2.xml new file mode 100644 index 00000000..2900cf59 --- /dev/null +++ b/graphics/sprites/hairstyle2.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/hairstyle3-female.png b/graphics/sprites/hairstyle3-female.png deleted file mode 100644 index 4ba85190..00000000 Binary files a/graphics/sprites/hairstyle3-female.png and /dev/null differ diff --git a/graphics/sprites/hairstyle3-female.xml b/graphics/sprites/hairstyle3-female.xml deleted file mode 100644 index 4e29bd00..00000000 --- a/graphics/sprites/hairstyle3-female.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle3-male.png b/graphics/sprites/hairstyle3-male.png deleted file mode 100644 index 4ba85190..00000000 Binary files a/graphics/sprites/hairstyle3-male.png and /dev/null differ diff --git a/graphics/sprites/hairstyle3-male.xml b/graphics/sprites/hairstyle3-male.xml deleted file mode 100644 index 4a20adc7..00000000 --- a/graphics/sprites/hairstyle3-male.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle3.png b/graphics/sprites/hairstyle3.png new file mode 100644 index 00000000..6f9e3fc2 Binary files /dev/null and b/graphics/sprites/hairstyle3.png differ diff --git a/graphics/sprites/hairstyle3.xml b/graphics/sprites/hairstyle3.xml new file mode 100644 index 00000000..5287c631 --- /dev/null +++ b/graphics/sprites/hairstyle3.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/hairstyle4-female.png b/graphics/sprites/hairstyle4-female.png deleted file mode 100644 index a1b51b73..00000000 Binary files a/graphics/sprites/hairstyle4-female.png and /dev/null differ diff --git a/graphics/sprites/hairstyle4-female.xml b/graphics/sprites/hairstyle4-female.xml deleted file mode 100644 index 8e28609d..00000000 --- a/graphics/sprites/hairstyle4-female.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle4-male.png b/graphics/sprites/hairstyle4-male.png deleted file mode 100644 index a1b51b73..00000000 Binary files a/graphics/sprites/hairstyle4-male.png and /dev/null differ diff --git a/graphics/sprites/hairstyle4-male.xml b/graphics/sprites/hairstyle4-male.xml deleted file mode 100644 index 6ca33e65..00000000 --- a/graphics/sprites/hairstyle4-male.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle4.png b/graphics/sprites/hairstyle4.png new file mode 100644 index 00000000..2772e4f0 Binary files /dev/null and b/graphics/sprites/hairstyle4.png differ diff --git a/graphics/sprites/hairstyle4.xml b/graphics/sprites/hairstyle4.xml new file mode 100644 index 00000000..65a72b90 --- /dev/null +++ b/graphics/sprites/hairstyle4.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/hairstyle5-female.png b/graphics/sprites/hairstyle5-female.png deleted file mode 100644 index 6de8ef99..00000000 Binary files a/graphics/sprites/hairstyle5-female.png and /dev/null differ diff --git a/graphics/sprites/hairstyle5-female.xml b/graphics/sprites/hairstyle5-female.xml deleted file mode 100644 index ff6da039..00000000 --- a/graphics/sprites/hairstyle5-female.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle5-male.png b/graphics/sprites/hairstyle5-male.png deleted file mode 100644 index 6de8ef99..00000000 Binary files a/graphics/sprites/hairstyle5-male.png and /dev/null differ diff --git a/graphics/sprites/hairstyle5-male.xml b/graphics/sprites/hairstyle5-male.xml deleted file mode 100644 index a5e4d3e5..00000000 --- a/graphics/sprites/hairstyle5-male.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle5.png b/graphics/sprites/hairstyle5.png new file mode 100644 index 00000000..b347fdde Binary files /dev/null and b/graphics/sprites/hairstyle5.png differ diff --git a/graphics/sprites/hairstyle5.xml b/graphics/sprites/hairstyle5.xml new file mode 100644 index 00000000..e776c53a --- /dev/null +++ b/graphics/sprites/hairstyle5.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/hairstyle6-female.png b/graphics/sprites/hairstyle6-female.png deleted file mode 100644 index 3aca995e..00000000 Binary files a/graphics/sprites/hairstyle6-female.png and /dev/null differ diff --git a/graphics/sprites/hairstyle6-female.xml b/graphics/sprites/hairstyle6-female.xml deleted file mode 100644 index e9699ffd..00000000 --- a/graphics/sprites/hairstyle6-female.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle6-male.png b/graphics/sprites/hairstyle6-male.png deleted file mode 100644 index 3aca995e..00000000 Binary files a/graphics/sprites/hairstyle6-male.png and /dev/null differ diff --git a/graphics/sprites/hairstyle6-male.xml b/graphics/sprites/hairstyle6-male.xml deleted file mode 100644 index 9a92cd41..00000000 --- a/graphics/sprites/hairstyle6-male.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle6.png b/graphics/sprites/hairstyle6.png new file mode 100644 index 00000000..a8949624 Binary files /dev/null and b/graphics/sprites/hairstyle6.png differ diff --git a/graphics/sprites/hairstyle6.xml b/graphics/sprites/hairstyle6.xml new file mode 100644 index 00000000..fe66ebe7 --- /dev/null +++ b/graphics/sprites/hairstyle6.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/hairstyle7-female.png b/graphics/sprites/hairstyle7-female.png deleted file mode 100644 index 9088888e..00000000 Binary files a/graphics/sprites/hairstyle7-female.png and /dev/null differ diff --git a/graphics/sprites/hairstyle7-female.xml b/graphics/sprites/hairstyle7-female.xml deleted file mode 100644 index dcdb00ce..00000000 --- a/graphics/sprites/hairstyle7-female.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle7-male.png b/graphics/sprites/hairstyle7-male.png deleted file mode 100644 index 9088888e..00000000 Binary files a/graphics/sprites/hairstyle7-male.png and /dev/null differ diff --git a/graphics/sprites/hairstyle7-male.xml b/graphics/sprites/hairstyle7-male.xml deleted file mode 100644 index 25f53911..00000000 --- a/graphics/sprites/hairstyle7-male.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/hairstyle7.png b/graphics/sprites/hairstyle7.png new file mode 100644 index 00000000..ccfdf31c Binary files /dev/null and b/graphics/sprites/hairstyle7.png differ diff --git a/graphics/sprites/hairstyle7.xml b/graphics/sprites/hairstyle7.xml new file mode 100644 index 00000000..fa36cdde --- /dev/null +++ b/graphics/sprites/hairstyle7.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monster-scorpion-black.png b/graphics/sprites/monster-scorpion-black.png deleted file mode 100644 index 2a6f7925..00000000 Binary files a/graphics/sprites/monster-scorpion-black.png and /dev/null differ diff --git a/graphics/sprites/monster-scorpion-black.xml b/graphics/sprites/monster-scorpion-black.xml deleted file mode 100644 index a710b2ef..00000000 --- a/graphics/sprites/monster-scorpion-black.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/monster-scorpion-red.png b/graphics/sprites/monster-scorpion-red.png deleted file mode 100644 index b11237ac..00000000 Binary files a/graphics/sprites/monster-scorpion-red.png and /dev/null differ diff --git a/graphics/sprites/monster-scorpion-red.xml b/graphics/sprites/monster-scorpion-red.xml deleted file mode 100644 index e89a1d47..00000000 --- a/graphics/sprites/monster-scorpion-red.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/monster-scorpion.png b/graphics/sprites/monster-scorpion.png index b26b68e5..0bd693fd 100644 Binary files a/graphics/sprites/monster-scorpion.png and b/graphics/sprites/monster-scorpion.png differ diff --git a/graphics/sprites/monster-scorpion.xml b/graphics/sprites/monster-scorpion.xml index 9d93a09d..1ebe540d 100644 --- a/graphics/sprites/monster-scorpion.xml +++ b/graphics/sprites/monster-scorpion.xml @@ -1,7 +1,7 @@ - + @@ -67,4 +67,4 @@ - \ No newline at end of file + diff --git a/graphics/sprites/monster-slime-green.png b/graphics/sprites/monster-slime-green.png deleted file mode 100644 index fe03f928..00000000 Binary files a/graphics/sprites/monster-slime-green.png and /dev/null differ diff --git a/graphics/sprites/monster-slime-green.xml b/graphics/sprites/monster-slime-green.xml deleted file mode 100644 index fdca7696..00000000 --- a/graphics/sprites/monster-slime-green.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/monster-slime-red.png b/graphics/sprites/monster-slime-red.png deleted file mode 100644 index db5fea86..00000000 Binary files a/graphics/sprites/monster-slime-red.png and /dev/null differ diff --git a/graphics/sprites/monster-slime-red.xml b/graphics/sprites/monster-slime-red.xml deleted file mode 100644 index 46983a3e..00000000 --- a/graphics/sprites/monster-slime-red.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/monster-slime-yellow.png b/graphics/sprites/monster-slime-yellow.png deleted file mode 100644 index 667d5523..00000000 Binary files a/graphics/sprites/monster-slime-yellow.png and /dev/null differ diff --git a/graphics/sprites/monster-slime-yellow.xml b/graphics/sprites/monster-slime-yellow.xml deleted file mode 100644 index cda7fbbf..00000000 --- a/graphics/sprites/monster-slime-yellow.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/monster-slime.png b/graphics/sprites/monster-slime.png new file mode 100644 index 00000000..877b4a44 Binary files /dev/null and b/graphics/sprites/monster-slime.png differ diff --git a/graphics/sprites/monster-slime.xml b/graphics/sprites/monster-slime.xml new file mode 100644 index 00000000..8bb0fa39 --- /dev/null +++ b/graphics/sprites/monster-slime.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/monsters.xml b/monsters.xml index d2003816..c22fcc94 100644 --- a/monsters.xml +++ b/monsters.xml @@ -8,7 +8,7 @@ - monster-scorpion.xml + monster-scorpion.xml|#4d422d,826242,d8c282,ffffff scorpion-hit1.ogg scorpion-hit2.ogg scorpion-hit3.ogg @@ -17,7 +17,7 @@ - monster-scorpion-red.xml + monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff scorpion-hit1.ogg scorpion-hit2.ogg scorpion-hit3.ogg @@ -26,7 +26,7 @@ - monster-slime-green.xml + monster-slime.xml|#72982c,ffffff slime-hit1.ogg @@ -39,17 +39,17 @@ - monster-slime-yellow.xml + monster-slime.xml|#b47f00,ffffff slime-hit1.ogg - monster-slime-red.xml + monster-slime.xml|#7e0000,ffffff slime-hit1.ogg - monster-scorpion-black.xml + monster-scorpion.xml|#0d1313,435a5a,879999,ffffff scorpion-hit1.ogg scorpion-hit2.ogg scorpion-hit3.ogg -- cgit v1.2.3-60-g2f50