diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-30 13:51:13 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-30 13:51:13 +0000 |
| commit | 22900fa9c835abb6adf971489dda2670ffe07ad0 (patch) | |
| tree | 4b585881bc36d1f1e67213fc75abe64221350ea1 | |
| parent | a93986dd689d32f36eba42418ae0ef0fe2f9c1bf (diff) | |
| download | crawl-ref-22900fa9c835abb6adf971489dda2670ffe07ad0.tar.gz crawl-ref-22900fa9c835abb6adf971489dda2670ffe07ad0.zip | |
Restrict Polyphemus to the Shoals, and make sharks not appear in the
Swamp (randomly on water levels with a lot of water, is okay).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8032 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 3342bf40fe..ed876851e6 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -3239,6 +3239,7 @@ static bool _make_room(int sx,int sy,int ex,int ey,int max_doors, int doorlevel) static monster_type _pick_unique(int lev) { + // Doesn't include Polyphemus who only appears in the Shoals. int which_unique = ((lev > 19) ? random_range(MONS_LOUISE, MONS_BORIS) : (lev > 16) ? random_range(MONS_ERICA, MONS_FRANCES) : @@ -3395,13 +3396,17 @@ static void _place_aquatic_monsters(int level_number, char level_type) } } - if (level_number >= 9 && one_chance_in(4)) + // Don't place sharks in the Swamp. + if (!player_in_branch(BRANCH_SWAMP) + && level_number >= 9 && one_chance_in(4)) + { swimming_things[3] = MONS_SHARK; + } if (level_number >= 25 && one_chance_in(5)) swimming_things[0] = MONS_WATER_ELEMENTAL; - if (player_in_branch( BRANCH_COCYTUS )) + if (player_in_branch(BRANCH_COCYTUS)) swimming_things[3] = MONS_WATER_ELEMENTAL; _place_monster_vector(swimming_things, level_number, diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 06727e4dca..46d7faa90a 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1875,8 +1875,8 @@ enum monster_type // (int) menv[].type MONS_NORRIS, MONS_FREDERICK, MONS_MARGERY, - MONS_POLYPHEMUS, // 310 - MONS_BORIS, + MONS_BORIS, // 310 + MONS_POLYPHEMUS, // BCR - end second batch of uniques. MONS_DRACONIAN, diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 7ee41d7e46..92de347981 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -4295,6 +4295,8 @@ static void _vulnerability_scroll() mon.add_ench(lowered_mr); // Annoying but not enough to turn friendlies against you. + // XXX: This will turn allies of int >= I_NORMAL hostile. + // Not intended? behaviour_event(&mon, ME_ANNOY, MHITYOU); } } |