diff options
| -rw-r--r-- | crawl-ref/source/enum.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-gear.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-pick.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-spll.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index bf570798f1..4d8acfc69a 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1822,7 +1822,7 @@ enum monster_type // (int) menv[].type // Shoals guardians MONS_MERFOLK_GLADIATOR, - MONS_MERFOLK_ELEMENTALIST, + MONS_MERFOLK_AQUAMANCER, //jmf: end new monsters MONS_WHITE_IMP = 220, // 220 @@ -2325,7 +2325,7 @@ enum mon_spellbook_type MST_HAROLD, MST_MARA, MST_MARA_FAKE, - MST_MERFOLK_ELEMENTALIST, + MST_MERFOLK_AQUAMANCER, MST_TEST_SPAWNER = 200, NUM_MSTYPES, diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 574a1b916d..7dcf33e759 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -1132,13 +1132,13 @@ static monsterentry mondata[] = { }, { - MONS_MERFOLK_ELEMENTALIST, 'm', LIGHTGREEN, "merfolk elementalist", + MONS_MERFOLK_AQUAMANCER, 'm', LIGHTGREEN, "merfolk aquamancer", M_WARM_BLOOD | M_SPELLCASTER | M_ACTUAL_SPELLS, MR_RES_COLD, 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 15, 3, 3, 0 }, - 0, 12, MST_MERFOLK_ELEMENTALIST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + 0, 12, MST_MERFOLK_AQUAMANCER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM }, diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc index c1a4dace95..e0a9f54e8a 100644 --- a/crawl-ref/source/mon-gear.cc +++ b/crawl-ref/source/mon-gear.cc @@ -412,7 +412,7 @@ static item_make_species_type _give_weapon(monsters *mon, int level, item.sub_type = WPN_LONGBOW; break; - case MONS_MERFOLK_ELEMENTALIST: + case MONS_MERFOLK_AQUAMANCER: item_race = MAKE_ITEM_NO_RACE; item.base_type = OBJ_WEAPONS; item.sub_type = WPN_SABRE; @@ -1497,7 +1497,7 @@ void give_armour(monsters *mon, int level) case MONS_WIZARD: case MONS_ILSUIW: case MONS_MARA: - case MONS_MERFOLK_ELEMENTALIST: + case MONS_MERFOLK_AQUAMANCER: if (item_race == MAKE_ITEM_RANDOM_RACE) item_race = MAKE_ITEM_NO_RACE; item.base_type = OBJ_ARMOUR; diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index a79945b990..084d643d55 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -1722,7 +1722,7 @@ int mons_shoals_level(int mcls) case MONS_SIREN: case MONS_HARPY: case MONS_MERFOLK_GLADIATOR: - case MONS_MERFOLK_ELEMENTALIST: + case MONS_MERFOLK_AQUAMANCER: mlev += 3; break; @@ -1767,7 +1767,7 @@ int mons_shoals_rare(int mcls) case MONS_SIREN: case MONS_YAKTAUR: - case MONS_MERFOLK_ELEMENTALIST: + case MONS_MERFOLK_AQUAMANCER: return 25; case MONS_CYCLOPS: diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index 76c561e352..2137cbbacb 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -1319,7 +1319,7 @@ } }, - { MST_MERFOLK_ELEMENTALIST, + { MST_MERFOLK_AQUAMANCER, { SPELL_PRIMAL_WAVE, SPELL_BOLT_OF_COLD, |