diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-02 10:30:56 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-02 10:30:56 -0600 |
| commit | d50bd43ba9936c27f4f90ecd324d14cb52c9f381 (patch) | |
| tree | 92620e7ac4c6f325fdbc632f647d824e892de2a1 /crawl-ref/source/monster.cc | |
| parent | 3ab78a4e4ec698d72a9cb7e1b23ffa3f6751e880 (diff) | |
| download | crawl-ref-d50bd43ba9936c27f4f90ecd324d14cb52c9f381.tar.gz crawl-ref-d50bd43ba9936c27f4f90ecd324d14cb52c9f381.zip | |
Merge a few bits of Eino's chaotic_experiment branch that make sense
with the current code:
1. Death oozes eating silver and holy wrath items take damage instead of
gaining hp.
2. Mark monsters with Summon Ugly Thing chaotic.
Also, until the issue of transformations' being chaotic or not is worked
out, don't mark any players as chaotic.
Diffstat (limited to 'crawl-ref/source/monster.cc')
| -rw-r--r-- | crawl-ref/source/monster.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 374135686e..ac7cfbecf2 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2784,8 +2784,11 @@ bool monsters::is_chaotic() const if (mons_is_shapeshifter(this)) return (true); - if (has_spell(SPELL_POLYMORPH_OTHER)) + if (has_spell(SPELL_POLYMORPH_OTHER) + || has_spell(SPELL_SUMMON_UGLY_THING)) + { return (true); + } if (has_attack_flavour(AF_MUTATE) || has_attack_flavour(AF_ROT) |