diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-07 22:24:48 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-07 22:24:48 -0600 |
| commit | 4915a3d61f5c92669121713d4744fb60036dac2f (patch) | |
| tree | 5a35d090d5b236da9dfca1c4e5ab8ab09aac32a1 /crawl-ref/source/monstuff.cc | |
| parent | 6b3f882a81bae89affecdcba5e24df1fb51e8cf4 (diff) | |
| download | crawl-ref-4915a3d61f5c92669121713d4744fb60036dac2f.tar.gz crawl-ref-4915a3d61f5c92669121713d4744fb60036dac2f.zip | |
Remove mons_is_holy(), as it's redundant.
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 24ef2ba386..a9eccfda1d 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1612,10 +1612,9 @@ int monster_die(monsters *monster, killer_type killer, monster->hit_dice, true, monster); } - // Holy kills are always noticed. - if (targ_holy == MH_HOLY) + if (mons_is_slime(monster)) { - did_god_conduct(DID_KILL_HOLY, monster->hit_dice, + did_god_conduct(DID_KILL_SLIME, monster->hit_dice, true, monster); } @@ -1625,16 +1624,17 @@ int monster_die(monsters *monster, killer_type killer, true, monster); } - if (mons_is_slime(monster)) + // Cheibriados hates fast monsters. + if (mons_is_fast(monster)) { - did_god_conduct(DID_KILL_SLIME, monster->hit_dice, + did_god_conduct(DID_KILL_FAST, monster->hit_dice, true, monster); } - // Cheibriados hates fast monsters - if (mons_is_fast(monster)) + // Holy kills are always noticed. + if (targ_holy == MH_HOLY) { - did_god_conduct(DID_KILL_FAST, monster->hit_dice, + did_god_conduct(DID_KILL_HOLY, monster->hit_dice, true, monster); } } @@ -1900,13 +1900,13 @@ int monster_die(monsters *monster, killer_type killer, } } - // Randomly bless the follower who killed. if (you.religion == GOD_BEOGH && random2(you.piety) >= piety_breakpoint(2) && !player_under_penance() && !one_chance_in(3) && !invalid_monster_index(killer_index)) { + // Randomly bless the follower who killed. bless_follower(killer_mon); } } @@ -3897,7 +3897,8 @@ std::string summoned_poof_msg(const monsters* monster, bool plural) msg = "degenerate%s into a cloud of primal chaos"; } - if (mons_is_holy(monster) && summon_type != SPELL_SHADOW_CREATURES + if (monster->holiness() == MH_HOLY + && summon_type != SPELL_SHADOW_CREATURES && summon_type != MON_SUMM_CHAOS) { msg = "dissolve%s into sparkling lights"; |