summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-13 09:07:44 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-13 09:07:44 +0000
commitc92159fe7f003977dee3ea4d16a18176f6435435 (patch)
tree26584944300881e655f6c80f1b6c5dfff966bc1f /crawl-ref/source/player.cc
parent43c3f753a994754337bcae92e498a1f5b6463a83 (diff)
downloadcrawl-ref-c92159fe7f003977dee3ea4d16a18176f6435435.tar.gz
crawl-ref-c92159fe7f003977dee3ea4d16a18176f6435435.zip
Implemented Erik's randart-MR-is-multiplicative idea.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1294 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index cbc7009116..89ec76be60 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -801,14 +801,16 @@ int player_res_magic(void)
break;
}
+ /* randarts - multiplicative effect */
+ rm *= (scan_randarts(RAP_MAGIC) + 100);
+ rm /= 100;
+
/* armour */
rm += 30 * player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_MAGIC_RESISTANCE );
/* rings of magic resistance */
rm += 40 * player_equip( EQ_RINGS, RING_PROTECTION_FROM_MAGIC );
- /* randarts */
- rm += scan_randarts(RAP_MAGIC);
/* Enchantment skill */
rm += 2 * you.skills[SK_ENCHANTMENTS];