summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/skill_menu.cc
diff options
context:
space:
mode:
authorDracoOmega <draco_omega@live.com>2013-07-06 22:29:18 -0230
committerDracoOmega <draco_omega@live.com>2013-07-06 22:48:15 -0230
commite1c0d72385d960bda792c6e3a37b5f9e3476c349 (patch)
tree206f846c280c9da94573c1f6acfbc61fd6b256ef /crawl-ref/source/skill_menu.cc
parente250b60d2c6a7470c8a4d2e56ea69e5e00b86ade (diff)
downloadcrawl-ref-e1c0d72385d960bda792c6e3a37b5f9e3476c349.tar.gz
crawl-ref-e1c0d72385d960bda792c6e3a37b5f9e3476c349.zip
Correct a message on the skill screen when you have drained skills
Diffstat (limited to 'crawl-ref/source/skill_menu.cc')
-rw-r--r--crawl-ref/source/skill_menu.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/crawl-ref/source/skill_menu.cc b/crawl-ref/source/skill_menu.cc
index 785de642cc..54d43f9382 100644
--- a/crawl-ref/source/skill_menu.cc
+++ b/crawl-ref/source/skill_menu.cc
@@ -394,7 +394,7 @@ void SkillMenuEntry::set_level()
else
level = you.skill(m_sk, 10, real);
- if (mastered())
+ if (mastered() && !you.attribute[ATTR_XP_DRAIN])
m_level->set_text(make_stringf("%d", level / 10));
else
m_level->set_text(make_stringf("%4.1f", level / 10.0));
@@ -559,8 +559,14 @@ string SkillMenuSwitch::get_help()
}
else
{
- return "Skills reduced by the power of Ashenzari are in "
- "<magenta>magenta</magenta>. ";
+ vector<string> causes;
+ if (you.attribute[ATTR_XP_DRAIN])
+ causes.push_back("draining");
+ if (you.penance[GOD_ASHENZARI])
+ causes.push_back("the power of Ashenzari");
+ return "Skills reduced by "
+ + comma_separated_line(causes.begin(), causes.end())
+ + " are in <magenta>magenta</magenta>. ";
}
case SKM_VIEW_TRAINING:
if (skm.is_set(SKMF_SIMPLE))