diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 18:02:42 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 18:15:26 -0600 |
| commit | 0b00d0d2282f9572320a647c30d8334020fce6f6 (patch) | |
| tree | 636046cf36a2371b8623fb0779348a3a07d0fa48 /crawl-ref/source/mon-stuff.cc | |
| parent | f9f2105b119464e055df7999096593fa105ed5ea (diff) | |
| download | crawl-ref-0b00d0d2282f9572320a647c30d8334020fce6f6.tar.gz crawl-ref-0b00d0d2282f9572320a647c30d8334020fce6f6.zip | |
Split the kill-natural-unholy/evil and kill-unclean/chaotic conducts.
Diffstat (limited to 'crawl-ref/source/mon-stuff.cc')
| -rw-r--r-- | crawl-ref/source/mon-stuff.cc | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index 6ac6ef9113..4bc9c03d4a 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -1638,7 +1638,13 @@ int monster_die(monsters *monster, killer_type killer, did_god_conduct(DID_KILL_LIVING, monster->hit_dice, true, monster); - if (monster->is_unholy() || monster->is_evil()) + if (monster->is_unholy()) + { + did_god_conduct(DID_KILL_NATURAL_UNHOLY, + monster->hit_dice, true, monster); + } + + if (monster->is_evil()) { did_god_conduct(DID_KILL_NATURAL_EVIL, monster->hit_dice, true, monster); @@ -1656,7 +1662,13 @@ int monster_die(monsters *monster, killer_type killer, } // Zin hates unclean and chaotic beings. - if (monster->is_unclean() || monster->is_chaotic()) + if (monster->is_unclean()) + { + did_god_conduct(DID_KILL_UNCLEAN, + monster->hit_dice, true, monster); + } + + if (monster->is_chaotic()) { did_god_conduct(DID_KILL_CHAOTIC, monster->hit_dice, true, monster); @@ -1883,7 +1895,14 @@ int monster_die(monsters *monster, killer_type killer, notice |= did_god_conduct(DID_LIVING_KILLED_BY_SERVANT, monster->hit_dice); - if (monster->is_unholy() || monster->is_evil()) + if (monster->is_unholy()) + { + notice |= did_god_conduct( + DID_NATURAL_UNHOLY_KILLED_BY_SERVANT, + monster->hit_dice); + } + + if (monster->is_evil()) { notice |= did_god_conduct( DID_NATURAL_EVIL_KILLED_BY_SERVANT, |