summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/showsymb.cc
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2009-12-24 20:34:29 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2009-12-24 21:17:11 +1000
commit9fcc7c41761ea968d0da075f2974a8908a2ef19b (patch)
tree85c8495c846722906b4832ba3d5de430532d95f6 /crawl-ref/source/showsymb.cc
parentbcc249f77c1459b75b7a4f96b018a15569e675b3 (diff)
downloadcrawl-ref-9fcc7c41761ea968d0da075f2974a8908a2ef19b.tar.gz
crawl-ref-9fcc7c41761ea968d0da075f2974a8908a2ef19b.zip
New (rakshasa) unique: Mara, Lord of Ilusions.
This re-uses several ideas from the Emerald Eye FR, and implements the spell "Mislead": this grants the "Misled" status effect to the player, and causes on-level monsters to appear (glyph, name and tile) to be other monsters. Only their appearance is changed. Healing potions and rain remove this status effect. Mara also has a beefed-up version of the Rakshasa clone spell: it instead creates an "exact" clone (slightly altered spells list, and non-unique status for his clones). Only two will ever be created at once. Finally, he has the spell "Summon Player Ghost". This spell creates a ghost of the player (though marked as a summon, meaning that it (shouldn't) register a milestone, though it will be treated as a self-ghost kill) that is hostile. Only one of these should be existant at any one point in time. I'm pretty sure that I haven't broken anything, but would definitely appreciate someone sanity-checking this commit. Known minor issue: Kirke's summon ugly things being cast while having the Misled status causes them to show up with no glyph.
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
-rw-r--r--crawl-ref/source/showsymb.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc
index 1d3c4e7dae..50a6272d41 100644
--- a/crawl-ref/source/showsymb.cc
+++ b/crawl-ref/source/showsymb.cc
@@ -56,6 +56,11 @@ glyph get_show_glyph(show_type object)
static int _get_mons_colour(const monsters *mons)
{
int col = mons->colour;
+ if (!crawl_state.arena && you.misled())
+ {
+ const monsterentry* mdat = get_monster_data(mons->get_mislead_type());
+ col = mdat->colour;
+ }
if (mons->berserk())
col = RED;
@@ -125,7 +130,11 @@ glyph get_item_glyph(const item_def *item)
glyph get_mons_glyph(const monsters *mons)
{
glyph g;
- g.ch = mons_char(mons->type);
+
+ if (!crawl_state.arena && you.misled())
+ g.ch = mons_char(mons->get_mislead_type());
+ else
+ g.ch = mons_char(mons->type);
g.col = _get_mons_colour(mons);
return (g);
}