summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/transfor.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/transfor.cc')
-rw-r--r--crawl-ref/source/transfor.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index 77a578a875..af37ccf225 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -328,8 +328,13 @@ bool transform(int pow, transformation_type which_trans, bool quiet)
return (false);
}
- //jmf: Silently discard this enchantment
- you.duration[DUR_STONESKIN] = 0;
+ // Most transformations conflict with stone skin.
+ if (which_trans != TRAN_NONE
+ && which_trans != TRAN_BLADE_HANDS
+ && which_trans != TRAN_STATUE)
+ {
+ you.duration[DUR_STONESKIN] = 0;
+ }
// We drop everything except jewellery by default.
equipment_type default_rem[] = {