From 2f4194a97fbe9e92b75688dae0511f51f73d7430 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 27 Jul 2009 13:48:58 +0000 Subject: Make sure that Xom and chaos weapons can only turn monsters with natural holiness into shapeshifters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10429 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/fight.cc | 12 +++++++----- crawl-ref/source/xom.cc | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 8f83f9570f..f6c7291ece 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2264,6 +2264,8 @@ void melee_attack::chaos_affects_defender() { const bool mon = defender->atype() == ACT_MONSTER; const bool immune = mon && mons_immune_magic(defender_as_monster()); + const bool is_natural = mon && mons_holiness(defender_as_monster()) + == MH_NATURAL; const bool is_shifter = mon && mons_is_shapeshifter(defender_as_monster()); const bool can_clone = mon && !mons_is_holy(defender_as_monster()) && mons_clonable(defender_as_monster(), true); @@ -2271,11 +2273,11 @@ void melee_attack::chaos_affects_defender() && !immune); const bool can_rage = defender->can_go_berserk(); - int clone_chance = can_clone ? 1 : 0; - int poly_chance = can_poly ? 1 : 0; - int poly_up_chance = can_poly && mon ? 1 : 0; - int shifter_chance = can_poly && mon ? 1 : 0; - int rage_chance = can_rage ? 10 : 0; + int clone_chance = can_clone ? 1 : 0; + int poly_chance = can_poly ? 1 : 0; + int poly_up_chance = can_poly && mon ? 1 : 0; + int shifter_chance = can_poly && is_natural && mon ? 1 : 0; + int rage_chance = can_rage ? 10 : 0; int miscast_chance = 10; // Already a shifter? diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index b3ab56009a..f29625bfd1 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1303,7 +1303,8 @@ static bool _xom_polymorph_nearby_monster(bool helpful) bool see_old = you.can_see(mon); std::string old_name = mon->full_name(DESC_PLAIN); - if (one_chance_in(8) && !mons_is_shapeshifter(mon)) + if (one_chance_in(8) && !mons_is_shapeshifter(mon) + && mons_holiness(mon) == MH_NATURAL) { mon->add_ench(one_chance_in(3) ? ENCH_GLOWING_SHAPESHIFTER : ENCH_SHAPESHIFTER); -- cgit v1.2.3-54-g00ecf