From 037b6326b7b553ff7610b9ef70207aee35d9defa Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 20 Aug 2007 22:22:04 +0000 Subject: Throwing nets again. Added a number of functions that allow to differentiate between a net that currently traps a monster and one that doesn't, even if they are on the same square. This usually works but can fail if there's already a net lying on the target square. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2021 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/output.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/output.cc') diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index decafc3ccd..1ce982851a 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1466,6 +1466,15 @@ std::string status_mut_abilities() else if (!you.duration[DUR_HASTE] && you.duration[DUR_SWIFTNESS]) text += "swift, "; + if (you.disease + || you.species == SP_VAMPIRE && you.hunger_state < HS_HUNGRY) + { + text += "non-regenerating, "; + } + + if (you.attribute[ATTR_CAUGHT]) + text += "trapped, "; + const int mr = player_res_magic(); snprintf(info, INFO_SIZE, "%s resistant to magic, ", (mr < 10) ? "not" : @@ -1475,6 +1484,7 @@ std::string status_mut_abilities() (mr < 120) ? "very" : (mr < 140) ? "extremely" : "incredibly"); + text += info; // character evaluates their ability to sneak around: @@ -1493,12 +1503,6 @@ std::string status_mut_abilities() text += info; - if (you.disease - || you.species == SP_VAMPIRE && you.hunger_state < HS_HUNGRY) - { - text += "non-regenerating"; - } - switch (you.attribute[ATTR_TRANSFORMATION]) { case TRAN_SPIDER: -- cgit v1.2.3-54-g00ecf