diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 18:22:09 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 18:41:58 -0600 |
| commit | 38a73fb2e3ce4a7755f3696f233232b10129a8ef (patch) | |
| tree | 2ce718021d262d5909afc082a08d73533a251e1d /crawl-ref | |
| parent | 2508432895f2cf12d46ecff46496b0abbd834163 (diff) | |
| download | crawl-ref-38a73fb2e3ce4a7755f3696f233232b10129a8ef.tar.gz crawl-ref-38a73fb2e3ce4a7755f3696f233232b10129a8ef.zip | |
Fix inconsistencies with regard to chaotic spells.
Trigger the chaotic conduct for players that cast miasma, and mark
Fulsome Distillation as chaotic, since it can create chaotic potions.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/beam.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/spl-data.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 4f5e94ba9e..2942a600d8 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2432,6 +2432,9 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted, return (hurted); miasma_monster(monster, pbolt.whose_kill()); + + if (YOU_KILL(pbolt.thrower)) + did_god_conduct(DID_CHAOS, 2, pbolt.effect_known); } break; diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 2797627098..724d627fd9 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -886,7 +886,7 @@ { SPELL_FULSOME_DISTILLATION, "Fulsome Distillation", SPTYP_TRANSMUTATION | SPTYP_NECROMANCY, - SPFLAG_NONE, + SPFLAG_CHAOTIC, 1, 50, -1, -1, |