diff options
| -rw-r--r-- | crawl-ref/source/mgrow.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 35 |
2 files changed, 24 insertions, 18 deletions
diff --git a/crawl-ref/source/mgrow.cc b/crawl-ref/source/mgrow.cc index 679f2643aa..57b3edc0cf 100644 --- a/crawl-ref/source/mgrow.cc +++ b/crawl-ref/source/mgrow.cc @@ -42,7 +42,7 @@ static const monster_level_up mon_grow[] = monster_level_up(MONS_ANT_LARVA, MONS_GIANT_ANT), monster_level_up(MONS_KILLER_BEE_LARVA, MONS_KILLER_BEE), - + monster_level_up(MONS_CENTAUR, MONS_CENTAUR_WARRIOR), monster_level_up(MONS_YAKTAUR, MONS_YAKTAUR_CAPTAIN), @@ -52,10 +52,13 @@ static const monster_level_up mon_grow[] = monster_level_up(MONS_DEEP_ELF_SOLDIER, MONS_DEEP_ELF_FIGHTER), monster_level_up(MONS_DEEP_ELF_FIGHTER, MONS_DEEP_ELF_KNIGHT), - // deep elf magi can become either conjurers or summoners. + // deep elf magi can become either summoners or conjurers. monster_level_up(MONS_DEEP_ELF_MAGE, MONS_DEEP_ELF_SUMMONER, 500), monster_level_up(MONS_DEEP_ELF_MAGE, MONS_DEEP_ELF_CONJURER), + monster_level_up(MONS_DEEP_ELF_PRIEST, MONS_DEEP_ELF_HIGH_PRIEST), + monster_level_up(MONS_DEEP_ELF_SUMMONER, MONS_DEEP_ELF_DEMONOLOGIST), + monster_level_up(MONS_DEEP_ELF_CONJURER, MONS_DEEP_ELF_SORCERER), }; mons_experience_levels::mons_experience_levels() diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 73e55e6ddf..637afcf3c4 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -389,7 +389,7 @@ { MONS_DRACONIAN_SHIFTER, 'd', LIGHTCYAN, "draconian shifter", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_EVIL | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -422,8 +422,7 @@ { MONS_DRACONIAN_SCORCHER, 'd', LIGHTRED, "draconian scorcher", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_EVIL - | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_EVIL | M_SPEAKS, MR_RES_FIRE | MR_RES_HELLFIRE, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -503,7 +502,7 @@ { MONS_DEEP_ELF_MAGE, 'e', MAGENTA, "deep elf mage", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, M_SPEAKS, MR_NO_FLAGS, 450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -514,7 +513,7 @@ { MONS_DEEP_ELF_SUMMONER, 'e', BROWN, "deep elf summoner", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL | M_SPEAKS, MR_NO_FLAGS, 450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -525,7 +524,7 @@ { MONS_DEEP_ELF_CONJURER, 'e', BLUE, "deep elf conjurer", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL | M_SPEAKS, MR_NO_FLAGS, 450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -570,8 +569,7 @@ { MONS_DEEP_ELF_ANNIHILATOR, 'e', LIGHTBLUE, "deep elf annihilator", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL - | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_SPEAKS, MR_NO_FLAGS, 450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -1647,7 +1645,7 @@ { MONS_ETTIN, 'C', BROWN, "ettin", - M_WARM_BLOOD | M_EVIL | M_TWOWEAPON | M_SPEAKS, + M_WARM_BLOOD | M_TWOWEAPON | M_EVIL | M_SPEAKS, 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 }, @@ -2357,7 +2355,8 @@ { MONS_OGRE_MAGE, 'O', MAGENTA, "ogre-mage", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_EVIL + | M_SPEAKS, MR_NO_FLAGS, 0, 16, MONS_OGRE, MONS_OGRE, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -2953,7 +2952,7 @@ { MONS_WIZARD, '@', MAGENTA, "wizard", - M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, 550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -3940,7 +3939,8 @@ { MONS_JOSEPHINE, '@', WHITE, "Josephine", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_EVIL | + M_UNIQUE, MR_NO_FLAGS, 0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 11}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -3951,7 +3951,8 @@ { MONS_HAROLD, '@', LIGHTGREEN, "Harold", - M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE, + M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD + | M_UNIQUE, MR_NO_FLAGS, 0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -3973,7 +3974,8 @@ { MONS_JOZEF, '@', LIGHTMAGENTA, "Jozef", - M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE, + M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD + | M_UNIQUE, MR_NO_FLAGS, 0, 15, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -4006,7 +4008,8 @@ { MONS_LOUISE, '@', BLUE, "Louise", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_EVIL | + M_UNIQUE, MR_NO_FLAGS, 0, 15, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -4054,7 +4057,7 @@ { MONS_WAYNE, '@', YELLOW, "Wayne", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD - | M_SEE_INVIS | M_UNIQUE, + | M_SEE_INVIS | M_EVIL | M_UNIQUE, MR_NO_FLAGS, 0, 12, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, |