summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/it_use2.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-10 09:59:37 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-10 09:59:37 +0000
commitdea58872adf42144fad9d1dbdeb5f09cf4433402 (patch)
treedef840dc98ef1dc2db871ce2366f50e447c7963b /crawl-ref/source/it_use2.cc
parenta821a5c34708aff459b31f4d16d2c33ec0ca0ecd (diff)
downloadcrawl-ref-dea58872adf42144fad9d1dbdeb5f09cf4433402.tar.gz
crawl-ref-dea58872adf42144fad9d1dbdeb5f09cf4433402.zip
Applying several patches by dolorous:
* 1789774: intrinsic mutations for undead * 1790380: kobold special handling of disease * 1790723: missing periods * 1791092: Xom potion handling It's arguable whether we want such fine distinction between races. As David pointed out, small things of lesser importance might clutter the mutations screen. For now, I think transparency is good. And if it seems to much, we could remove a few. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2064 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use2.cc')
-rw-r--r--crawl-ref/source/it_use2.cc19
1 files changed, 7 insertions, 12 deletions
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index 588ea89aed..c6cac55f36 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -167,8 +167,8 @@ bool potion_effect( potion_type pot_eff, int pow )
break;
case POT_SLOWING:
- slow_player( (10 + random2(pow)) / factor );
- xom_is_stimulated(64 / factor);
+ if (slow_player((10 + random2(pow)) / factor))
+ xom_is_stimulated(64 / factor);
break;
case POT_PARALYSIS:
@@ -177,8 +177,8 @@ bool potion_effect( potion_type pot_eff, int pow )
break;
case POT_CONFUSION:
- confuse_player( (3 + random2(8)) / factor );
- xom_is_stimulated(128 / factor);
+ if (confuse_player((3 + random2(8)) / factor))
+ xom_is_stimulated(128 / factor);
break;
case POT_INVISIBILITY:
@@ -214,19 +214,14 @@ bool potion_effect( potion_type pot_eff, int pow )
case POT_DEGENERATION:
mpr("There was something very wrong with that liquid!");
- lose_stat(STAT_RANDOM, 1 + random2avg(4, 2));
- xom_is_stimulated(64);
+ if (lose_stat(STAT_RANDOM, 1 + random2avg(4, 2)))
+ xom_is_stimulated(64);
break;
// Don't generate randomly - should be rare and interesting
case POT_DECAY:
- if (you.is_undead)
- mpr( "You feel terrible." );
- else
- {
- rot_player( 10 + random2(10) );
+ if (rot_player(10 + random2(10)))
xom_is_stimulated(64);
- }
break;
case POT_WATER: