diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2010-01-08 18:58:01 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2010-01-08 18:58:26 +1000 |
| commit | 1f8eaa7055fd9bddf12b37f1c258106185c34969 (patch) | |
| tree | 9bfb7f923087ab82b9f96026aca9d75314aa17fb | |
| parent | 1e193cb797ba5696c952ba05420220339e60a668 (diff) | |
| download | crawl-ref-1f8eaa7055fd9bddf12b37f1c258106185c34969.tar.gz crawl-ref-1f8eaa7055fd9bddf12b37f1c258106185c34969.zip | |
Mara's summoned ghosts are "illusions".
| -rw-r--r-- | crawl-ref/source/describe.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/directn.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/monster.cc | 7 |
3 files changed, 16 insertions, 3 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 622eb684e3..4baee51699 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2916,7 +2916,10 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf, } case MONS_PLAYER_GHOST: - inf.body << "The apparition of " << get_ghost_description(mons) << ".$"; + if (mons.is_summoned()) + inf.body << "An illusion of " << get_ghost_description(mons) << ".$"; + else + inf.body << "The apparition of " << get_ghost_description(mons) << ".$"; break; case MONS_PANDEMONIUM_DEMON: diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 8e17763165..7104d98cb3 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -3235,7 +3235,12 @@ std::string get_monster_equipment_desc(const monsters *mon, bool full_desc, else if (mon->type == MONS_PANDEMONIUM_DEMON) str += "pandemonium demon"; else if (mon->type == MONS_PLAYER_GHOST) - str += "ghost"; + { + if (mon->is_summoned()) + str += "illusion"; + else + str += "ghost"; + } else str += "mimic"; } diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index d01d713bff..4667599a33 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2087,7 +2087,12 @@ static std::string _str_monam(const monsters& mon, description_level_type desc, return (get_monster_data(type)->name); if (type == MONS_PLAYER_GHOST) - return (apostrophise(mon.mname) + " ghost"); + { + if (mon.is_summoned()) + return (apostrophise(mon.mname) + " illusion"); + else + return (apostrophise(mon.mname) + " ghost"); + } // Some monsters might want the name of a different creature. monster_type nametype = type; |