summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-10 21:56:35 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-10 21:56:35 +0000
commite1828c21282f3db7305f9e020f6fc933dad93383 (patch)
tree88b4a7c31c2283daf4145a583463e1a2378903a2
parenta24959dec217aab9e3e2ad440801811c21cec068 (diff)
downloadcrawl-ref-e1828c21282f3db7305f9e020f6fc933dad93383.tar.gz
crawl-ref-e1828c21282f3db7305f9e020f6fc933dad93383.zip
Fixed torment not respecting lichform.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3038 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/player.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index f18ca8208f..2a9dd4cb78 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1288,7 +1288,7 @@ int player_res_electricity(bool calc_unid)
re += 1;
if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- re += 2; // mutliple levels currently meaningless
+ re += 2; // multiple levels currently meaningless
if (you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION] > 0)
re = 3;
@@ -1324,7 +1324,8 @@ bool player_control_teleport(bool calc_unid) {
int player_res_torment(bool)
{
- return (you.mutation[MUT_TORMENT_RESISTANCE]);
+ return (you.mutation[MUT_TORMENT_RESISTANCE] ||
+ you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH);
}
// funny that no races are susceptible to poisons {dlb}