summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/output.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-11 13:38:28 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-11 13:38:28 +0000
commitebc2cb26f221bbce6a2cf5cbd3ce250af75e914f (patch)
tree8d64cd38054d2b584c5ad8849ee42b936475783f /crawl-ref/source/output.cc
parent89adf4610b5206a5f42187ee90cd01e54583f5d9 (diff)
downloadcrawl-ref-ebc2cb26f221bbce6a2cf5cbd3ce250af75e914f.tar.gz
crawl-ref-ebc2cb26f221bbce6a2cf5cbd3ce250af75e914f.zip
After discussion with dpeg, added a Scroll of Antimagic,
taking probability (equal to ?oHolyWord) from the ?oPaper. Effects apply to all creatures within LOS, including you, with no magic resistance check: - Remove all magical enchantments (e.g. Haste, but not Poison) - Cut magic resistance in half for 40 turns. (This does not affect magic-immunes.) Balance testing, etc., needed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7211 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/output.cc')
-rw-r--r--crawl-ref/source/output.cc15
1 files changed, 13 insertions, 2 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 27c83fefda..fd97e6a5ec 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -596,8 +596,10 @@ static void _get_status_lights(std::vector<status_light>& out)
if (you.duration[DUR_REPEL_UNDEAD])
{
- int color = _dur_colour( LIGHTGREY, (you.duration[DUR_REPEL_UNDEAD] <= 4) );
- out.push_back(status_light(color, "Holy"));
+ int colour = _dur_colour(LIGHTGREY,
+ (you.duration[DUR_REPEL_UNDEAD] <= 4));
+
+ out.push_back(status_light(colour, "Holy"));
}
if (you.duration[DUR_TELEPORT])
@@ -686,6 +688,11 @@ static void _get_status_lights(std::vector<status_light>& out)
out.push_back(status_light(RED, "Conf"));
}
+ if (you.duration[DUR_LOWERED_MR])
+ {
+ out.push_back(status_light(RED, "-MR"));
+ }
+
if (you.duration[DUR_BEHELD])
{
out.push_back(status_light(RED, "Bhld"));
@@ -2117,6 +2124,10 @@ std::string _status_mut_abilities()
// if (you.duration[DUR_CONTROL_TELEPORT])
// text += "control teleport, ";
+// MR output already says so
+// if (you.duration[DUR_LOWERED_MR])
+// text += "vulnerable to magic, ";
+
if (you.duration[DUR_DEATH_CHANNEL])
text += "death channel, ";