From eb35aeaf1c639f7b575f75f15dfff72b02fbee34 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 8 Oct 2009 06:53:21 -0500 Subject: Attempt to make the new (very) ugly thing tiles map to their colors properly. --- crawl-ref/source/rltiles/dc-mon.txt | 10 +++ .../source/rltiles/dc-mon/demons/ugly_thing.png | Bin 0 -> 673 bytes .../source/rltiles/dc-mon/demons/ugly_thing1.png | Bin 0 -> 729 bytes .../source/rltiles/dc-mon/demons/ugly_thing2.png | Bin 0 -> 665 bytes .../source/rltiles/dc-mon/demons/ugly_thing3.png | Bin 0 -> 746 bytes .../source/rltiles/dc-mon/demons/ugly_thing4.png | Bin 0 -> 723 bytes .../source/rltiles/dc-mon/demons/ugly_thing5.png | Bin 0 -> 762 bytes .../rltiles/dc-mon/demons/ugly_thing_brown.png | Bin 723 -> 0 bytes .../rltiles/dc-mon/demons/ugly_thing_cyan.png | Bin 729 -> 0 bytes .../rltiles/dc-mon/demons/ugly_thing_green.png | Bin 673 -> 0 bytes .../rltiles/dc-mon/demons/ugly_thing_lightgrey.png | Bin 762 -> 0 bytes .../rltiles/dc-mon/demons/ugly_thing_magenta.png | Bin 746 -> 0 bytes .../rltiles/dc-mon/demons/ugly_thing_red.png | Bin 665 -> 0 bytes .../rltiles/dc-mon/demons/very_ugly_thing.png | Bin 0 -> 675 bytes .../rltiles/dc-mon/demons/very_ugly_thing1.png | Bin 0 -> 745 bytes .../rltiles/dc-mon/demons/very_ugly_thing2.png | Bin 0 -> 670 bytes .../rltiles/dc-mon/demons/very_ugly_thing3.png | Bin 0 -> 750 bytes .../rltiles/dc-mon/demons/very_ugly_thing4.png | Bin 0 -> 732 bytes .../rltiles/dc-mon/demons/very_ugly_thing5.png | Bin 0 -> 781 bytes .../dc-mon/demons/very_ugly_thing_brown.png | Bin 732 -> 0 bytes .../rltiles/dc-mon/demons/very_ugly_thing_cyan.png | Bin 745 -> 0 bytes .../dc-mon/demons/very_ugly_thing_green.png | Bin 675 -> 0 bytes .../dc-mon/demons/very_ugly_thing_lightgrey.png | Bin 781 -> 0 bytes .../dc-mon/demons/very_ugly_thing_magenta.png | Bin 750 -> 0 bytes .../rltiles/dc-mon/demons/very_ugly_thing_red.png | Bin 670 -> 0 bytes crawl-ref/source/tilepick.cc | 70 ++++++++++++++------- 26 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing1.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing2.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing3.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing4.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing5.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_brown.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_cyan.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_green.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_lightgrey.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_magenta.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_red.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing1.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing2.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing3.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing4.png create mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing5.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_brown.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_cyan.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_green.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_lightgrey.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_magenta.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_red.png diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index fb3a3bdf6c..db6e461449 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -246,7 +246,17 @@ tentacled_monstrosity MONS_TENTACLED_MONSTROSITY ## Ugly things ('u') ugly_thing MONS_UGLY_THING +ugly_thing1 +ugly_thing2 +ugly_thing3 +ugly_thing4 +ugly_thing5 very_ugly_thing MONS_VERY_UGLY_THING +very_ugly_thing1 +very_ugly_thing2 +very_ugly_thing3 +very_ugly_thing4 +very_ugly_thing5 ## Small abominations ('x') unseen_horror MONS_UNSEEN_HORROR diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png new file mode 100644 index 0000000000..6e5b95c44f Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing1.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing1.png new file mode 100644 index 0000000000..305277b447 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing1.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing2.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing2.png new file mode 100644 index 0000000000..75dbcd03cd Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing2.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing3.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing3.png new file mode 100644 index 0000000000..ff8efcfcfe Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing3.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing4.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing4.png new file mode 100644 index 0000000000..1d11697db8 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing4.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing5.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing5.png new file mode 100644 index 0000000000..6af6df9b77 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing5.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_brown.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_brown.png deleted file mode 100644 index 1d11697db8..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_brown.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_cyan.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_cyan.png deleted file mode 100644 index 305277b447..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_cyan.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_green.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_green.png deleted file mode 100644 index 6e5b95c44f..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_green.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_lightgrey.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_lightgrey.png deleted file mode 100644 index 6af6df9b77..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_lightgrey.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_magenta.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_magenta.png deleted file mode 100644 index ff8efcfcfe..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_magenta.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_red.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_red.png deleted file mode 100644 index 75dbcd03cd..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing_red.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png new file mode 100644 index 0000000000..e023613478 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing1.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing1.png new file mode 100644 index 0000000000..0befea9e54 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing1.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing2.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing2.png new file mode 100644 index 0000000000..7d2befab0b Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing2.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing3.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing3.png new file mode 100644 index 0000000000..b5547a9a59 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing3.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing4.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing4.png new file mode 100644 index 0000000000..6fd88c6ece Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing4.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing5.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing5.png new file mode 100644 index 0000000000..fda82f5a40 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing5.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_brown.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_brown.png deleted file mode 100644 index 6fd88c6ece..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_brown.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_cyan.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_cyan.png deleted file mode 100644 index 0befea9e54..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_cyan.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_green.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_green.png deleted file mode 100644 index e023613478..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_green.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_lightgrey.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_lightgrey.png deleted file mode 100644 index fda82f5a40..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_lightgrey.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_magenta.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_magenta.png deleted file mode 100644 index b5547a9a59..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_magenta.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_red.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_red.png deleted file mode 100644 index 7d2befab0b..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing_red.png and /dev/null differ diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index c6957f0972..ccb6bf102c 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -115,6 +115,30 @@ static int _bow_offset(const monsters *mon) } } +static int _ugly_thing_colour_offset(const monsters *mon) +{ + if (mon->type != MONS_UGLY_THING && mon->type != MONS_VERY_UGLY_THING) + return (0); + + switch (make_low_colour(mon->colour)) + { + case GREEN: + return (0); + case CYAN: + return (1); + case RED: + return (2); + case MAGENTA: + return (3); + case BROWN: + return (4); + case LIGHTGREY: + return (5); + default: + return (0); + } +} + int tileidx_monster_base(const monsters *mon, bool detected) { bool in_water = grid_is_water(grd(mon->pos())); @@ -352,9 +376,9 @@ int tileidx_monster_base(const monsters *mon, bool detected) // ugly things ('u') case MONS_UGLY_THING: - return TILEP_MONS_UGLY_THING; + return TILEP_MONS_UGLY_THING + _ugly_thing_colour_offset(mon); case MONS_VERY_UGLY_THING: - return TILEP_MONS_VERY_UGLY_THING; + return TILEP_MONS_VERY_UGLY_THING + _ugly_thing_colour_offset(mon); // vortices ('v') case MONS_FIRE_VORTEX: @@ -671,7 +695,7 @@ int tileidx_monster_base(const monsters *mon, bool detected) // large abominations ('X') case MONS_ABOMINATION_LARGE: - return TILEP_MONS_ABOMINATION_LARGE + ((mon->colour)%7); + return TILEP_MONS_ABOMINATION_LARGE + ((mon->colour) % 7); case MONS_TENTACLED_MONSTROSITY: return TILEP_MONS_TENTACLED_MONSTROSITY; case MONS_ORB_GUARDIAN: @@ -3044,32 +3068,32 @@ static int _draconian_colour(int race, int level) { switch (race) { - case MONS_DRACONIAN: return 0; - case MONS_BLACK_DRACONIAN: return 1; - case MONS_YELLOW_DRACONIAN: return 2; - case MONS_GREEN_DRACONIAN: return 4; - case MONS_MOTTLED_DRACONIAN:return 5; - case MONS_PALE_DRACONIAN: return 6; - case MONS_PURPLE_DRACONIAN: return 7; - case MONS_RED_DRACONIAN: return 8; - case MONS_WHITE_DRACONIAN: return 9; + case MONS_DRACONIAN: return (0); + case MONS_BLACK_DRACONIAN: return (1); + case MONS_YELLOW_DRACONIAN: return (2); + case MONS_GREEN_DRACONIAN: return (4); + case MONS_MOTTLED_DRACONIAN:return (5); + case MONS_PALE_DRACONIAN: return (6); + case MONS_PURPLE_DRACONIAN: return (7); + case MONS_RED_DRACONIAN: return (8); + case MONS_WHITE_DRACONIAN: return (9); } } if (level < 7) - return 0; + return (0); switch (race) { - case SP_BLACK_DRACONIAN: return 1; - case SP_YELLOW_DRACONIAN: return 2; - case SP_GREY_DRACONIAN: return 3; - case SP_GREEN_DRACONIAN: return 4; - case SP_MOTTLED_DRACONIAN: return 5; - case SP_PALE_DRACONIAN: return 6; - case SP_PURPLE_DRACONIAN: return 7; - case SP_RED_DRACONIAN: return 8; - case SP_WHITE_DRACONIAN: return 9; + case SP_BLACK_DRACONIAN: return (1); + case SP_YELLOW_DRACONIAN: return (2); + case SP_GREY_DRACONIAN: return (3); + case SP_GREEN_DRACONIAN: return (4); + case SP_MOTTLED_DRACONIAN: return (5); + case SP_PALE_DRACONIAN: return (6); + case SP_PURPLE_DRACONIAN: return (7); + case SP_RED_DRACONIAN: return (8); + case SP_WHITE_DRACONIAN: return (9); } - return 0; + return (0); } int get_gender_from_tile(int parts[]) -- cgit v1.2.3-54-g00ecf