diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-24 13:56:29 -0500 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-24 13:56:29 -0500 |
commit | 4f153c59882bb115f43a677a85c9448dc0dafa8e (patch) | |
tree | b2a2340de733c99b1d5fda623536c02d24f90244 /crawl-ref/source/spl-cast.cc | |
parent | 1de3f0a488030ac3c1508b840ee55756fa13b84f (diff) | |
download | crawl-ref-4f153c59882bb115f43a677a85c9448dc0dafa8e.tar.gz crawl-ref-4f153c59882bb115f43a677a85c9448dc0dafa8e.zip |
Various religion-related fixes: Update the player's title when gaining
or losing piety or penance, so that Invocations-based titles are handled
properly; don't display Zin's message about mutagenic glow if the player
isn't glowing; and have Zin treat all chaotic spells consistently.
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index f436f3c059..1bf3891cb3 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -939,7 +939,7 @@ 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 (spell_typematch(spell, SPTYP_HOLY)) + if (is_holy_spell(spell)) did_god_conduct(DID_HOLY, 10 + spell_difficulty(spell)); // Self-banishment gets a special exemption - you're there to spread @@ -951,6 +951,9 @@ static void _spellcasting_side_effects(spell_type spell, bool idonly = false) did_god_conduct(DID_UNHOLY, 10 + spell_difficulty(spell)); } + if (is_chaotic_spell(spell)) + did_god_conduct(DID_CHAOS, 10 + spell_difficulty(spell)); + // Linley says: Condensation Shield needs some disadvantages to keep // it from being a no-brainer... this isn't much, but its a start -- bwr if (spell_typematch(spell, SPTYP_FIRE)) |