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/beam.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/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index dae307097d..22f2ca83b4 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3975,7 +3975,18 @@ void bolt::update_hurt_or_helped(monsters *mon) if (nasty_to(mon)) foe_info.hurt++; else if (nice_to(mon)) + { foe_info.helped++; + // Accidentally helped a foe. + if (!is_tracer && !effect_known) + { + int interest = 128; + if (flavour == BEAM_INVISIBILITY && can_see_invis) + interest = 32; + + xom_is_stimulated(interest); + } + } } else { @@ -4586,8 +4597,8 @@ bool bolt::has_saving_throw() const case BEAM_HEALING: case BEAM_INVISIBILITY: case BEAM_DISPEL_UNDEAD: - case BEAM_ENSLAVE_SOUL: // it has a different saving throw - case BEAM_ENSLAVE_DEMON: // it has a different saving throw + case BEAM_ENSLAVE_SOUL: // has a different saving throw + case BEAM_ENSLAVE_DEMON: // ditto rc = false; break; default: |