From 10516e8cb1e0b3328114399ffddf6685a4b16bab Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 30 Jul 2008 23:31:48 +0000 Subject: Don't discard Stoneskin when using non-conflicting transformations. [2031392] git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6736 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/transfor.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/transfor.cc') diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index 3818915442..e426c8aba9 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[] = { -- cgit v1.2.3-54-g00ecf