From 8e6f0b9972661f6e73e809b55274c0cd4e40528b Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 19 Nov 2009 21:36:23 -0600 Subject: Properly ignore all conducts when a god makes you cast a spell. --- crawl-ref/source/spl-cast.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/spl-cast.cc') diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 2c648db20f..c60ead6174 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -930,20 +930,16 @@ static void _spellcasting_side_effects(spell_type spell, bool idonly = false) if (!_spell_is_utility_spell(spell) && !crawl_state.is_god_acting()) did_god_conduct(DID_SPELL_NONUTILITY, 10 + spell_difficulty(spell)); - if (is_holy_spell(spell)) + if (is_holy_spell(spell) && !crawl_state.is_god_acting()) did_god_conduct(DID_HOLY, 10 + spell_difficulty(spell)); - if (is_unholy_spell(spell) - && !you.banished - && !crawl_state.is_god_acting()) - { + if (is_unholy_spell(spell) && !crawl_state.is_god_acting()) did_god_conduct(DID_UNHOLY, 10 + spell_difficulty(spell)); - } - if (is_unclean_spell(spell)) + if (is_unclean_spell(spell) && !crawl_state.is_god_acting()) did_god_conduct(DID_UNCLEAN, 10 + spell_difficulty(spell)); - if (is_chaotic_spell(spell)) + if (is_chaotic_spell(spell) && !crawl_state.is_god_acting()) did_god_conduct(DID_CHAOS, 10 + spell_difficulty(spell)); // Linley says: Condensation Shield needs some disadvantages to keep -- cgit v1.2.3-54-g00ecf