diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-09 12:41:07 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-09 12:41:07 -0600 |
| commit | 7d7193d1f2df18b6b5a0e0558cd5456d878df04a (patch) | |
| tree | 547d2f4eee85812536de95641df5d4c4dc67f0b4 | |
| parent | d04ebcaf6c3b9a75db6e3bdad0ff6e02e9b6f031 (diff) | |
| download | crawl-ref-7d7193d1f2df18b6b5a0e0558cd5456d878df04a.tar.gz crawl-ref-7d7193d1f2df18b6b5a0e0558cd5456d878df04a.zip | |
Adjust hell knights again.
They only get hellfire resistance now (with the fire resistance that
implies), and their spellbooks have been tweaked so that both contain
evil spells: the first has Throw Flame added as a complement to the
second's Bolt of Fire, and the second has Pain added as a complement to
the first's Pain.
Accordingly, the check for natural monsters' resisting hellfire has been
removed from monsters::is_evil().
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-spll.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/monster.cc | 9 |
3 files changed, 3 insertions, 12 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index ae37b3fe68..e3294a843d 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -3374,7 +3374,7 @@ static monsterentry mondata[] = { { MONS_HELL_KNIGHT, '@', RED, "hell knight", M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, - MR_RES_FIRE | MR_RES_HELLFIRE, + MR_RES_HELLFIRE, 550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 3, 6, 0 }, diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index a59e245575..01271160ad 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -241,8 +241,8 @@ { MST_HELL_KNIGHT_I, { - SPELL_NO_SPELL, SPELL_PAIN, + SPELL_THROW_FLAME, SPELL_HASTE, SPELL_NO_SPELL, SPELL_NO_SPELL, @@ -252,7 +252,7 @@ { MST_HELL_KNIGHT_II, { - SPELL_NO_SPELL, + SPELL_PAIN, SPELL_BOLT_OF_FIRE, SPELL_NO_SPELL, SPELL_NO_SPELL, diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index ae496d54b3..00e41f2bac 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2979,15 +2979,6 @@ bool monsters::is_evil() const if (is_unholy()) return (true); - // Assume that no natural creatures resist hellfire, except by evil - // means. - if (holiness() == MH_NATURAL) - { - const mon_resist_def res = get_mons_resists(this); - if (res.hellfire > 0) - return (true); - } - // Assume that all unknown gods (GOD_NAMELESS) are evil. if (is_priest() && (is_evil_god(god) || god == GOD_NAMELESS)) return (true); |