diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-13 15:57:55 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-13 15:57:55 +0000 |
| commit | e6525c83826d150eb2a283ce5bf23218cb75f82e (patch) | |
| tree | b16a09028c1468efa825975fb1e85a3e4d722bf5 /crawl-ref/source/beam.cc | |
| parent | 674a9e64697629cc3266564ea4f8dc7eb2616b50 (diff) | |
| download | crawl-ref-e6525c83826d150eb2a283ce5bf23218cb75f82e.tar.gz crawl-ref-e6525c83826d150eb2a283ce5bf23218cb75f82e.zip | |
* Add Cannibalism to list of forbidded actions for good gods.
* Add simple warning message (god "did not appreciate that!")
when using unID'd items that would otherwise be penalized.
* Change protection from harm to be independent of prayer.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2849 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 64c8c2d22e..6a497e9aba 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1670,8 +1670,8 @@ int mons_adjust_flavoured( monsters *monster, bolt &pbolt, simple_monster_message(monster, " is drained."); pbolt.obvious_effect = true; - if (YOU_KILL(pbolt.thrower) && pbolt.effect_known) - did_god_conduct(DID_NECROMANCY, 2 + random2(3)); + if (YOU_KILL(pbolt.thrower)) + did_god_conduct(DID_NECROMANCY, 2 + random2(3), pbolt.effect_known); if (one_chance_in(5)) { @@ -3675,10 +3675,10 @@ static int affect_monster(bolt &beam, monsters *mon) if (YOU_KILL( beam.thrower )) { if (mons_friendly( mon )) - did_god_conduct( DID_ATTACK_FRIEND, 5, mon ); + did_god_conduct( DID_ATTACK_FRIEND, 5, true, mon ); if (mons_holiness( mon ) == MH_HOLY) - did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, mon ); + did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, true, mon ); if (you.religion == GOD_BEOGH && mons_species(mon->type) == MONS_ORC && mon->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC @@ -3831,10 +3831,10 @@ static int affect_monster(bolt &beam, monsters *mon) if (YOU_KILL(beam.thrower) && hurt_final > 0) { if (mons_friendly(mon)) - did_god_conduct( DID_ATTACK_FRIEND, 5, mon ); + did_god_conduct( DID_ATTACK_FRIEND, 5, true, mon ); if (mons_holiness( mon ) == MH_HOLY) - did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, mon ); + did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, true, mon ); } if (you.religion == GOD_BEOGH && mons_species(mon->type) == MONS_ORC |