diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 16:20:41 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 16:20:41 +0530 |
| commit | cccb371a91d0fb0f1f1008bc1eff23e48418114a (patch) | |
| tree | 22469055ccb5365502d51fb488a7a81fb15692b5 /crawl-ref | |
| parent | d85ce5fca3ae674e2437783a358dfc3eecd38a3c (diff) | |
| download | crawl-ref-cccb371a91d0fb0f1f1008bc1eff23e48418114a.tar.gz crawl-ref-cccb371a91d0fb0f1f1008bc1eff23e48418114a.zip | |
s/merfolk gladiator/merfolk impaler/
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/enum.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-gear.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/mon-pick.cc | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 4d8acfc69a..4a37b027b6 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1821,7 +1821,7 @@ enum monster_type // (int) menv[].type MONS_BALLISTOMYCETE, // 200 // Shoals guardians - MONS_MERFOLK_GLADIATOR, + MONS_MERFOLK_IMPALER, MONS_MERFOLK_AQUAMANCER, //jmf: end new monsters diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 7dcf33e759..5f8822a84b 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -1119,7 +1119,7 @@ static monsterentry mondata[] = { }, { - MONS_MERFOLK_GLADIATOR, 'm', LIGHTBLUE, "merfolk gladiator", + MONS_MERFOLK_IMPALER, 'm', LIGHTBLUE, "merfolk impaler", M_WARM_BLOOD, MR_NO_FLAGS, 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3, diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc index e0a9f54e8a..a012972cc3 100644 --- a/crawl-ref/source/mon-gear.cc +++ b/crawl-ref/source/mon-gear.cc @@ -590,7 +590,7 @@ static item_make_species_type _give_weapon(monsters *mon, int level, } break; - case MONS_MERFOLK_GLADIATOR: + case MONS_MERFOLK_IMPALER: item_race = MAKE_ITEM_NO_RACE; item.base_type = OBJ_WEAPONS; // Weapon types are not strictly sorted by quality. This is intentional. @@ -1057,7 +1057,7 @@ static void _give_ammo(monsters *mon, int level, qty = random_range(4, 7); break; - case MONS_MERFOLK_GLADIATOR: + case MONS_MERFOLK_IMPALER: // Gladiators rarely get javelins. if (one_chance_in(4)) { @@ -1381,7 +1381,7 @@ void give_armour(monsters *mon, int level) break; } - case MONS_MERFOLK_GLADIATOR: + case MONS_MERFOLK_IMPALER: item_race = MAKE_ITEM_NO_RACE; item.base_type = OBJ_ARMOUR; item.sub_type = random_choose_weighted(100, ARM_ROBE, diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index 084d643d55..01df392e72 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -1721,7 +1721,7 @@ int mons_shoals_level(int mcls) case MONS_CYCLOPS: // will have a sheep band case MONS_SIREN: case MONS_HARPY: - case MONS_MERFOLK_GLADIATOR: + case MONS_MERFOLK_IMPALER: case MONS_MERFOLK_AQUAMANCER: mlev += 3; break; @@ -1756,7 +1756,7 @@ int mons_shoals_rare(int mcls) return 50; case MONS_MERMAID: - case MONS_MERFOLK_GLADIATOR: + case MONS_MERFOLK_IMPALER: return 40; case MONS_HIPPOGRIFF: |