diff options
author | Adam Borowski <kilobyte@angband.pl> | 2010-01-13 13:07:02 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2010-01-13 20:43:59 +0100 |
commit | 6b9548eb3df8a83b90f5d8ed6822b806719dd137 (patch) | |
tree | 690ddf057359bcf775b480d9b8f1bb26393e2d5d /crawl-ref/source/showsymb.cc | |
parent | 9a308a7dd9f9abb274e2024d41239c587dd7eb77 (diff) | |
download | crawl-ref-6b9548eb3df8a83b90f5d8ed6822b806719dd137.tar.gz crawl-ref-6b9548eb3df8a83b90f5d8ed6822b806719dd137.zip |
Make merged slime creatures light green, acid blobs light cyan.
You can override that, both the colour and the glyph. The code
is exceedingly hairy (the check is tripled!), thanks to glyphs
sometimes stored as character:colour, sometimes as type:colour.
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
-rw-r--r-- | crawl-ref/source/showsymb.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index 6019065d7e..36f5261c0b 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -56,6 +56,10 @@ glyph get_show_glyph(show_type object) static int _get_mons_colour(const monsters *mons) { int col = mons->colour; + + if (mons->type == MONS_SLIME_CREATURE && mons->number > 1) + col = mons_class_colour(MONS_MERGED_SLIME_CREATURE); + if (!crawl_state.arena && you.misled()) { const monsterentry* mdat = get_monster_data(mons->get_mislead_type()); @@ -141,6 +145,8 @@ glyph get_mons_glyph(const monsters *mons) if (!crawl_state.arena && you.misled()) g.ch = mons_char(mons->get_mislead_type()); + else if (mons->type == MONS_SLIME_CREATURE && mons->number > 1) + g.ch = mons_char(MONS_MERGED_SLIME_CREATURE); else g.ch = mons_char(mons->type); g.col = _get_mons_colour(mons); |