From 034e2a61690dc435c4c24d229b345e47bbfe3676 Mon Sep 17 00:00:00 2001 From: Chris Campbell Date: Wed, 28 Jan 2015 19:50:10 +0000 Subject: [PATCH] Update descriptions for summoned monster stair use --- crawl-ref/source/describe.cc | 2 +- crawl-ref/source/mon-info.cc | 11 +---------- crawl-ref/source/mon-info.h | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index ae58f4fed7..52608af3f3 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -3987,7 +3987,7 @@ void get_monster_db_desc(const monster_info& mi, describe_info &inf, inf.body << "\n" << "This monster has been summoned, and is thus only " "temporary. Killing it yields no experience, nutrition " "or items"; - if (!stair_use && mi.is(MB_SUMMONED_NO_STAIRS)) + if (!stair_use) inf.body << ", and it is incapable of using stairs"; inf.body << ".\n"; } diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc index 72c16a7446..3cd51fbfe6 100644 --- a/crawl-ref/source/mon-info.cc +++ b/crawl-ref/source/mon-info.cc @@ -512,17 +512,8 @@ monster_info::monster_info(const monster* m, int milev) _colour = m->colour; - int stype = 0; - if (m->is_summoned(0, &stype) - && (!m->has_ench(ENCH_PHANTOM_MIRROR) || m->friendly())) - { + if (m->is_summoned()) mb.set(MB_SUMMONED); - if (stype > 0 && stype < NUM_SPELLS - && summons_are_capped(static_cast(stype))) - { - mb.set(MB_SUMMONED_NO_STAIRS); - } - } else if (m->is_perm_summoned()) mb.set(MB_PERM_SUMMON); diff --git a/crawl-ref/source/mon-info.h b/crawl-ref/source/mon-info.h index 4e04ba6aec..17fcbdae76 100644 --- a/crawl-ref/source/mon-info.h +++ b/crawl-ref/source/mon-info.h @@ -108,8 +108,8 @@ enum monster_info_flags MB_CONTROL_WINDS, #if TAG_MAJOR_VERSION == 34 MB_WIND_AIDED, -#endif MB_SUMMONED_NO_STAIRS, // Temp. summoned and capped monsters +#endif MB_SUMMONED_CAPPED, // Expiring due to summons cap MB_TOXIC_RADIANCE, MB_GRASPING_ROOTS,