summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/describe.cc17
-rw-r--r--crawl-ref/source/output.cc7
-rw-r--r--crawl-ref/source/player.cc7
3 files changed, 27 insertions, 4 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 47c8d42f66..b4ef97cf18 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2732,6 +2732,23 @@ static std::string _monster_stat_description(const monsters& mon)
// Magic resistance at MAG_IMMUNE.
if (mons_immune_magic(&mon))
result << pronoun << " is immune to magical enchantments.$";
+ else // How resistant is it? Same scale as the player.
+ {
+ const int mr = mon.res_magic();
+ if (mr >= 10)
+ {
+ result << pronoun << make_stringf(" is %s resistant to magic.$",
+ (mr < 30) ? "slightly" :
+ (mr < 60) ? "somewhat" :
+ (mr < 90) ? "quite" :
+ (mr < 120) ? "very" :
+ (mr < 150) ? "extremely" :
+ (mr < 190) ? "extraordinarily" :
+ (mr < 240) ? "incredibly" :
+ (mr < 300) ? "uncannily"
+ : "almost entirely");
+ }
+ }
if (mons_class_flag(mon.type, M_STATIONARY))
result << pronoun << " cannot move.$";
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index ad90622cca..6b02f7d1e1 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2287,8 +2287,11 @@ std::string _status_mut_abilities()
(mr < 60) ? "somewhat" :
(mr < 90) ? "quite" :
(mr < 120) ? "very" :
- (mr < 140) ? "extremely"
- : "incredibly");
+ (mr < 150) ? "extremely" :
+ (mr < 190) ? "extraordinarily" :
+ (mr < 240) ? "incredibly" :
+ (mr < 300) ? "uncannily"
+ : "almost entirely");
status.push_back(info);
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index ab351092fe..e69dc3c94d 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3798,8 +3798,11 @@ void display_char_status()
(mr < 60) ? "somewhat" :
(mr < 90) ? "quite" :
(mr < 120) ? "very" :
- (mr < 140) ? "extremely"
- : "incredibly");
+ (mr < 150) ? "extremely" :
+ (mr < 190) ? "extraordinarily" :
+ (mr < 240) ? "incredibly" :
+ (mr < 300) ? "uncannily"
+ : "almost entirely");
// character evaluates their ability to sneak around:
const int ustealth = check_stealth();