diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-22 10:01:35 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-22 10:01:35 +0000 |
commit | d473edf767361c19d6938c48ebd518f7d68824c1 (patch) | |
tree | 23ebe65e4e8df543a0160c3158e2c3524b16d3cc /crawl-ref/source/output.cc | |
parent | 8f6c276eff93a39b5b0cc19d1e62423bafcd5347 (diff) | |
download | crawl-ref-d473edf767361c19d6938c48ebd518f7d68824c1.tar.gz crawl-ref-d473edf767361c19d6938c48ebd518f7d68824c1.zip |
Fix bug 2325392: Ring of Flames interface problems. Whether stepping into
a potentially damaging cloud prompts or not now takes into consideration
temporary resistances and immunties, where before it only took into account
permanent ones.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7535 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/output.cc')
-rw-r--r-- | crawl-ref/source/output.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index a35276a8a9..39b0fb8c9e 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -677,6 +677,12 @@ static void _get_status_lights(std::vector<status_light>& out) out.push_back(status_light(color, "Sage")); } + if (you.duration[DUR_FIRE_SHIELD]) + { + int color = _dur_colour( BLUE, (you.duration[DUR_FIRE_SHIELD] <= 5) ); + out.push_back(status_light(color, "RoF")); + } + if (you.duration[DUR_SURE_BLADE]) { out.push_back(status_light(BLUE, "Blade")); @@ -2190,6 +2196,9 @@ std::string _status_mut_abilities() if (you.duration[DUR_MAGIC_SHIELD]) text += "shielded, "; + if (you.duration[DUR_FIRE_SHIELD]) + text += "immune to fire clouds, "; + if (you.duration[DUR_POISONING]) { text += (you.duration[DUR_POISONING] > 10) ? "extremely" : |