From 55772ba95bacafb30770fcddf422da5cdc8038d9 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 3 Aug 2007 20:51:16 +0000 Subject: First part of godly changes. Ely now has "Destroy Weapon" ability, and Trog "Burn Books". The latter is very powerful as it explicitly allows burning monsters, which is cool but might be too strong. I couldn't think of a rationale for Trog not to allow this, though. Also, all killings are now accepted without prayer, and sacrifice-loving gods won't acccept rotten corpses anymore. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1959 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/monstuff.cc | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'crawl-ref/source/monstuff.cc') diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index dfe32abfe5..79b63d9752 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -557,30 +557,27 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) // Only affects monsters friendly when created. if (!created_friendly) { - if (you.duration[DUR_PRAYER]) - { - if (mons_holiness(monster) == MH_NATURAL) - did_god_conduct(DID_DEDICATED_KILL_LIVING, - monster->hit_dice); + if (mons_holiness(monster) == MH_NATURAL) + did_god_conduct(DID_KILL_LIVING, + monster->hit_dice); - if (mons_holiness(monster) == MH_UNDEAD) - did_god_conduct(DID_DEDICATED_KILL_UNDEAD, - monster->hit_dice); + if (mons_holiness(monster) == MH_UNDEAD) + did_god_conduct(DID_KILL_UNDEAD, + monster->hit_dice); - if (mons_holiness(monster) == MH_DEMONIC) - did_god_conduct(DID_DEDICATED_KILL_DEMON, - monster->hit_dice); + if (mons_holiness(monster) == MH_DEMONIC) + did_god_conduct(DID_KILL_DEMON, + monster->hit_dice); - //jmf: Trog hates wizards - if (mons_is_magic_user(monster)) - did_god_conduct(DID_DEDICATED_KILL_WIZARD, - monster->hit_dice); + //jmf: Trog hates wizards + if (mons_is_magic_user(monster)) + did_god_conduct(DID_KILL_WIZARD, + monster->hit_dice); - //jmf: maybe someone hates priests? - if (mons_class_flag(monster->type, M_PRIEST)) - did_god_conduct(DID_DEDICATED_KILL_PRIEST, - monster->hit_dice); - } + //Beogh hates priests + if (mons_class_flag(monster->type, M_PRIEST)) + did_god_conduct(DID_KILL_PRIEST, + monster->hit_dice); if (mons_holiness(monster) == MH_HOLY) did_god_conduct(DID_KILL_ANGEL, monster->hit_dice); -- cgit v1.2.3-54-g00ecf