diff options
| -rw-r--r-- | crawl-ref/source/mon-data.h | 6 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 54046d17b8..19f6723d69 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -162,7 +162,7 @@ { MONS_ETTIN, 'C', BROWN, "ettin", - M_WARM_BLOOD | M_EVIL, + M_WARM_BLOOD | M_EVIL | M_TWOWEAPON, MR_NO_FLAGS, 0, 10, MONS_HILL_GIANT, MONS_ETTIN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 18}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK }, @@ -461,7 +461,7 @@ // that they wield two weapons... I'm raising their xp modifier. -- bwr { MONS_TWO_HEADED_OGRE, 'O', LIGHTRED, "two-headed ogre", - M_WARM_BLOOD | M_EVIL, + M_WARM_BLOOD | M_EVIL | M_TWOWEAPON, MR_NO_FLAGS, 1500, 15, MONS_OGRE, MONS_TWO_HEADED_OGRE, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK }, @@ -2544,7 +2544,7 @@ { MONS_DEEP_ELF_BLADEMASTER, 'e', LIGHTCYAN, "deep elf blademaster", - M_WARM_BLOOD | M_FIGHTER, + M_WARM_BLOOD | M_FIGHTER | M_TWOWEAPON, MR_NO_FLAGS, 450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK }, diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 0d6b99075c..f08669745c 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1727,8 +1727,7 @@ bool mons_aligned(int m1, int m2) bool mons_wields_two_weapons(monster_type m) { - return (m == MONS_TWO_HEADED_OGRE || m == MONS_ETTIN - || m == MONS_DEEP_ELF_BLADEMASTER); + return mons_class_flag(m, M_TWOWEAPON); } bool mons_wields_two_weapons(const monsters *m) diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 3c39e81179..df9fe62f34 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -118,6 +118,8 @@ enum mons_class_flags M_WALL_SHIELDED = (1<<24), // Shielded from attacks if in wall + M_TWOWEAPON = (1<<25), // wields two weapons at once + M_SPECIAL_ABILITY = (1<<26), // XXX: eventually make these spells? M_NO_SKELETON = (1<<29), // boneless corpses |