diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 21:36:23 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 21:36:23 -0600 |
| commit | 8e6f0b9972661f6e73e809b55274c0cd4e40528b (patch) | |
| tree | bac64a7d696ffd48ad67b34e75754ff9ddd82318 /crawl-ref/source/spl-cast.cc | |
| parent | e8ecec817a2acf54ebf022dfbbd0f6460cc2544a (diff) | |
| download | crawl-ref-8e6f0b9972661f6e73e809b55274c0cd4e40528b.tar.gz crawl-ref-8e6f0b9972661f6e73e809b55274c0cd4e40528b.zip | |
Properly ignore all conducts when a god makes you cast a spell.
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 12 |
1 files changed, 4 insertions, 8 deletions
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 |