summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-info.cc
diff options
context:
space:
mode:
authorChris Oelmueller <chris.oelmueller@gmail.com>2014-03-23 21:39:47 +0100
committerShmuale Mark <shm.mark@gmail.com>2014-03-23 16:42:55 -0400
commitd73720f461d815076bde383013630330b2eda0d0 (patch)
tree390e58f7291d374c69686afcf072ff3211456743 /crawl-ref/source/mon-info.cc
parenta3591d85481d8c20b102bbdfb96f981a1adfd195 (diff)
downloadcrawl-ref-d73720f461d815076bde383013630330b2eda0d0.tar.gz
crawl-ref-d73720f461d815076bde383013630330b2eda0d0.zip
Fix monster_info::res_magic for the recent MR changes
Diffstat (limited to 'crawl-ref/source/mon-info.cc')
-rw-r--r--crawl-ref/source/mon-info.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc
index be6d3a50bc..8e7a4dd38a 100644
--- a/crawl-ref/source/mon-info.cc
+++ b/crawl-ref/source/mon-info.cc
@@ -1686,21 +1686,20 @@ int monster_info::res_magic() const
if (mr < 0)
mr = mons_class_hit_dice(type) * (-mr) * 4 / 3;
- // Randarts have a multiplicative effect.
- mr *= (randarts(ARTP_MAGIC) + 100);
- mr /= 100;
+ // Randarts
+ mr += 40 * randarts(ARTP_MAGIC);
// ego armour resistance
if (inv[MSLOT_ARMOUR].get()
&& get_armour_ego_type(*inv[MSLOT_ARMOUR]) == SPARM_MAGIC_RESISTANCE)
{
- mr += 30;
+ mr += 40;
}
if (inv[MSLOT_SHIELD].get()
&& get_armour_ego_type(*inv[MSLOT_SHIELD]) == SPARM_MAGIC_RESISTANCE)
{
- mr += 30;
+ mr += 40;
}
item_def *jewellery = inv[MSLOT_JEWELLERY].get();