diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-05 20:15:50 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-05 20:17:47 -0600 |
| commit | 142d889bc748bdf7f21a5b04d3693a5bc8b48d5c (patch) | |
| tree | 7cae2b42f500d532d54072b633bc47bc4195b875 | |
| parent | fe0c876c1598ee328e74c5be5102004f28972b7e (diff) | |
| download | crawl-ref-142d889bc748bdf7f21a5b04d3693a5bc8b48d5c.tar.gz crawl-ref-142d889bc748bdf7f21a5b04d3693a5bc8b48d5c.zip | |
Remove the M_EVIL flag from orc wizards.
Also, properly anger monsters that start off non-evil, but level up into
evil monsters.
| -rw-r--r-- | crawl-ref/source/mgrow.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/mgrow.cc b/crawl-ref/source/mgrow.cc index 6334387a82..3693e43dd4 100644 --- a/crawl-ref/source/mgrow.cc +++ b/crawl-ref/source/mgrow.cc @@ -9,6 +9,7 @@ #include "enum.h" #include "mgrow.h" #include "mon-util.h" +#include "monplace.h" #include "monstuff.h" #include "random.h" @@ -235,5 +236,9 @@ bool monsters::gain_exp(int exp) if (hit_dice < MAX_MONS_HD && experience >= mexplevs[hit_dice + 1]) experience = (mexplevs[hit_dice] + mexplevs[hit_dice + 1]) / 2; + // If the monster has leveled up to a monster that will be angered + // by the player, handle it properly. + player_angers_monster(this); + return (levels_gained > 0); } diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 2d0409b1ba..a58cd34c73 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -1088,7 +1088,7 @@ static monsterentry mondata[] = { { MONS_ORC_WIZARD, 'o', MAGENTA, "orc wizard", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, 600, 10, MONS_ORC, MONS_ORC, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, |