diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-12 09:49:39 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-12 09:49:39 +0000 |
| commit | bc721ca0cd58a2ffed55245d300266962cf3c123 (patch) | |
| tree | ee9cc82c7fc7c451549cf180c02a8035f51472f8 /crawl-ref/source/it_use2.cc | |
| parent | e80122a2ce9321aaa14f1c80321525fb580182dd (diff) | |
| download | crawl-ref-bc721ca0cd58a2ffed55245d300266962cf3c123.tar.gz crawl-ref-bc721ca0cd58a2ffed55245d300266962cf3c123.zip | |
* Fix compilation.
* Fix wording of stair slide chaos effect.
* Add new stimulation triggers for Xom (monsters being polymorphed,
accidentally hasted/healed, or going berserk) which has the side
effect of keeping Xom's interest up if you actually use the chaos
branded weapon he gifted you.
* Greatly reduce stimulation possible from deliberately quaffing bad
potions.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9596 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use2.cc')
| -rw-r--r-- | crawl-ref/source/it_use2.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index 5d63c851e1..43c7f51ae9 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -49,7 +49,13 @@ bool potion_effect(potion_type pot_eff, int pow, bool drank_it, bool was_known) && drank_it ? 2 : 1); // Knowingly drinking bad potions is much less amusing. - const int xom_factor = factor * (drank_it && was_known ? 2 : 1); + int xom_factor = factor; + if (drank_it && was_known) + { + xom_factor *= 2; + if (!player_in_a_dangerous_place()) + xom_factor *= 3; + } switch (pot_eff) { |