diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-21 17:49:24 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-21 17:49:24 +0000 |
| commit | 0a930fa79787f0e7f4b4ab2f4e223b58b58690c7 (patch) | |
| tree | 7f8b16f8378873a9564c98a8e8e1104923aed5cd /crawl-ref/source/beam.cc | |
| parent | a8a6b89f6b751da432faa31b9be145ec8532294f (diff) | |
| download | crawl-ref-0a930fa79787f0e7f4b4ab2f4e223b58b58690c7.tar.gz crawl-ref-0a930fa79787f0e7f4b4ab2f4e223b58b58690c7.zip | |
Make Zin dislike when the player takes an action that makes an already
existing mutagenic glow stronger (piety loss, no penalty). At the same
time go easier on the "eat souled being" misbehaviour: increased piety
loss, but give penance only for eating very intelligent monsters, so that
eating goblins and the like is an option again. (Cannibalism is checked
first, and has worse effects.)
Also fix restriction for items offered for ?recharging.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3789 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index be7e5602c4..7e637a96cf 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3325,7 +3325,7 @@ static int affect_player( bolt &beam ) case BEAM_HASTE: potion_effect( POT_SPEED, beam.ench_power ); - contaminate_player( 1 ); + contaminate_player( 1, beam.effect_known ); beam.obvious_effect = true; nasty = false; nice = true; @@ -3350,7 +3350,7 @@ static int affect_player( bolt &beam ) case BEAM_INVISIBILITY: potion_effect( POT_INVISIBILITY, beam.ench_power ); - contaminate_player( 1 + random2(2) ); + contaminate_player( 1 + random2(2), beam.effect_known ); beam.obvious_effect = true; nasty = false; nice = true; @@ -3932,8 +3932,8 @@ static int affect_monster(bolt &beam, monsters *mon) if (YOU_KILL(beam.thrower) && hurt_final > 0) { const bool okay = - beam.aux_source == "reading a scroll of immolation" - && !beam.effect_known; + (beam.aux_source == "reading a scroll of immolation" + && !beam.effect_known); if (is_sanctuary(mon->x, mon->y) || is_sanctuary(you.x_pos, you.y_pos)) @@ -4164,7 +4164,10 @@ static int affect_monster_enchantment(bolt &beam, monsters *mon) beam.obvious_effect = true; if (YOU_KILL(beam.thrower)) - did_god_conduct(DID_DELIBERATE_MUTATING, 2 + random2(3), beam.effect_known); + { + did_god_conduct(DID_DELIBERATE_MUTATING, 2 + random2(3), + beam.effect_known); + } return (MON_AFFECTED); } |