From 5575ae2b4e56f21fbaf90e591b9e96623c902cb2 Mon Sep 17 00:00:00 2001 From: haranp Date: Fri, 27 Apr 2007 15:37:54 +0000 Subject: s/island/shoal/ git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1383 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/branch.cc | 8 ++++---- crawl-ref/source/direct.cc | 6 +++--- crawl-ref/source/dungeon.cc | 14 +++++++------- crawl-ref/source/enum.h | 8 ++++---- crawl-ref/source/itemname.cc | 2 +- crawl-ref/source/items.cc | 6 +++--- crawl-ref/source/makeitem.cc | 2 +- crawl-ref/source/mon-pick.cc | 6 +++--- crawl-ref/source/mon-pick.h | 4 ++-- crawl-ref/source/monplace.cc | 2 +- crawl-ref/source/newgame.cc | 4 ++-- crawl-ref/source/travel.cc | 8 ++++---- crawl-ref/source/view.cc | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 000dcbb74e..d9b71afd1d 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -63,12 +63,12 @@ Branch branches[] = { mons_swamp_rare, mons_swamp_level, 0, 'S' }, - { BRANCH_ISLANDS, BRANCH_LAIR, 5, 4, - DNGN_ENTER_ISLANDS, DNGN_RETURN_FROM_ISLANDS, - "Islands", "the Islands", "Isle", + { BRANCH_SHOALS, BRANCH_LAIR, 5, 4, + DNGN_ENTER_SHOALS, DNGN_RETURN_FROM_SHOALS, + "Shoals", "the Shoals", "Shoal", NULL, true, true, BROWN, BROWN, - mons_islands_rare, mons_islands_level, + mons_shoals_rare, mons_shoals_level, 0, 'A' }, { BRANCH_SLIME_PITS, BRANCH_LAIR, 6, 4, diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index c1a9a4b633..e3a72439f0 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -1272,8 +1272,8 @@ std::string feature_description(int grid) return ("A staircase to the Tomb."); case DNGN_ENTER_SWAMP: return ("A staircase to the Swamp."); - case DNGN_ENTER_ISLANDS: - return ("A staircase to the Islands."); + case DNGN_ENTER_SHOALS: + return ("A staircase to the Shoals."); case DNGN_RETURN_FROM_ORCISH_MINES: case DNGN_RETURN_FROM_HIVE: case DNGN_RETURN_FROM_LAIR: @@ -1283,7 +1283,7 @@ std::string feature_description(int grid) case DNGN_RETURN_FROM_SLIME_PITS: case DNGN_RETURN_FROM_SNAKE_PIT: case DNGN_RETURN_FROM_SWAMP: - case DNGN_RETURN_FROM_ISLANDS: + case DNGN_RETURN_FROM_SHOALS: return ("A staircase back to the Lair."); case DNGN_RETURN_FROM_CRYPT: case DNGN_RETURN_FROM_HALL_OF_BLADES: diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 18817f5a9d..81402b0549 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -99,7 +99,7 @@ static void place_branch_entrances(int dlevel, char level_type); static void place_special_minivaults(int level_number, int level_type); static void place_traps( int level_number ); static void prepare_swamp(); -static void prepare_islands(); +static void prepare_shoals(); static void prepare_water( int level_number ); static void check_doors(); static void hide_doors(); @@ -392,7 +392,7 @@ static void build_layout_skeleton(int level_number, int level_type, { // do 'normal' building. Well, except for the swamp. if (!player_in_branch(BRANCH_SWAMP) && - !player_in_branch(BRANCH_ISLANDS)) + !player_in_branch(BRANCH_SHOALS)) skip_build = builder_normal(level_number, level_type, sr); if (skip_build == BUILD_CONTINUE) @@ -538,8 +538,8 @@ static void build_dungeon_level(int level_number, int level_type) // time to make the swamp {dlb}: if (player_in_branch( BRANCH_SWAMP )) prepare_swamp(); - else if (player_in_branch(BRANCH_ISLANDS)) - prepare_islands(); + else if (player_in_branch(BRANCH_SHOALS)) + prepare_shoals(); place_branch_entrances( level_number, level_type ); @@ -574,7 +574,7 @@ static void build_dungeon_level(int level_number, int level_type) if (!player_in_branch(BRANCH_COCYTUS) && !player_in_branch(BRANCH_SWAMP) && - !player_in_branch(BRANCH_ISLANDS)) + !player_in_branch(BRANCH_SHOALS)) prepare_water( level_number ); } // end builder() @@ -750,7 +750,7 @@ static void place_base_islands(int margin, int num_islands, int estradius, } } -static void prepare_islands() +static void prepare_shoals() { // dpeg's algorithm. // We could have just used spotty_level() and changed rock to @@ -853,7 +853,7 @@ static void prepare_islands() // Put a rune in the centre of another island { int item_made = items( 1, OBJ_MISCELLANY, MISC_RUNE_OF_ZOT, true, - 0, RUNE_ISLANDS ); + 0, RUNE_SHOALS ); if (item_made != NON_ITEM && item_made != -1) { mitm[item_made].x = centres[1].x; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 80046dc70b..faca4e9a64 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -462,7 +462,7 @@ enum branch_type // you.where_are_you BRANCH_ELVEN_HALLS, BRANCH_LAIR, BRANCH_SWAMP, - BRANCH_ISLANDS, + BRANCH_SHOALS, BRANCH_SLIME_PITS, BRANCH_SNAKE_PIT, BRANCH_HIVE, @@ -1018,7 +1018,7 @@ enum dungeon_feature_type DNGN_ENTER_ELVEN_HALLS, // 120 DNGN_ENTER_TOMB, DNGN_ENTER_SWAMP, // 122 - DNGN_ENTER_ISLANDS, + DNGN_ENTER_SHOALS, DNGN_ENTER_RESERVED_2, DNGN_ENTER_RESERVED_3, DNGN_ENTER_RESERVED_4, // 126 @@ -1036,7 +1036,7 @@ enum dungeon_feature_type DNGN_RETURN_FROM_ELVEN_HALLS, // 140 DNGN_RETURN_FROM_TOMB, DNGN_RETURN_FROM_SWAMP, // 142 - DNGN_RETURN_FROM_ISLANDS, + DNGN_RETURN_FROM_SHOALS, DNGN_RETURN_RESERVED_2, DNGN_RETURN_RESERVED_3, DNGN_RETURN_RESERVED_4, // 146 @@ -2844,7 +2844,7 @@ enum rune_type RUNE_ELVEN_HALLS = BRANCH_ELVEN_HALLS, // unused RUNE_TOMB = BRANCH_TOMB, RUNE_SWAMP = BRANCH_SWAMP, - RUNE_ISLANDS = BRANCH_ISLANDS, + RUNE_SHOALS = BRANCH_SHOALS, // Runes 50 and 51 are for Pandemonium (general demon) and the Abyss RUNE_DEMONIC = 50, diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 783eb8b4ec..3132b1669a 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -660,7 +660,7 @@ static const char* rune_type_name(int p) case RUNE_ELVEN_HALLS: return "elven"; case RUNE_TOMB: return "golden"; case RUNE_SWAMP: return "decaying"; - case RUNE_ISLANDS: return "liquid"; + case RUNE_SHOALS: return "liquid"; // pandemonium and abyss runes: case RUNE_DEMONIC: return "demonic"; diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 6a7a5098cc..2922877e12 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -612,8 +612,8 @@ static void describe_floor() { case DNGN_ENTER_SWAMP: mpr("There is a staircase to the Swamp here."); break; - case DNGN_ENTER_ISLANDS: - mpr("There is a staircase to the Islands here."); + case DNGN_ENTER_SHOALS: + mpr("There is a staircase to the Shoals here."); break; case DNGN_RETURN_FROM_ORCISH_MINES: case DNGN_RETURN_FROM_HIVE: @@ -625,7 +625,7 @@ static void describe_floor() { case DNGN_RETURN_FROM_SLIME_PITS: case DNGN_RETURN_FROM_SNAKE_PIT: case DNGN_RETURN_FROM_SWAMP: - case DNGN_RETURN_FROM_ISLANDS: + case DNGN_RETURN_FROM_SHOALS: mpr("There is a staircase back to the Lair here."); break; case DNGN_RETURN_FROM_CRYPT: diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 16af19d86e..00fcc33fe1 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -783,7 +783,7 @@ void item_colour( item_def &item ) item.colour = BROWN; break; - case RUNE_ISLANDS: + case RUNE_SHOALS: item.colour = BLUE; // liquid // These two are hardly unique, but since colour isn't used for diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index 0de6fbd684..e2c10ccacc 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -1874,9 +1874,9 @@ int mons_tomb_rare(int mcls) } } // end mons_tomb_rare() -int mons_islands_level(int mcls) +int mons_shoals_level(int mcls) { - int mlev = absdungeon_depth(BRANCH_ISLANDS, 1); + int mlev = absdungeon_depth(BRANCH_SHOALS, 1); switch (mcls) { case MONS_BUTTERFLY: @@ -1915,7 +1915,7 @@ int mons_islands_level(int mcls) return mlev; } -int mons_islands_rare(int mcls) +int mons_shoals_rare(int mcls) { switch (mcls) { diff --git a/crawl-ref/source/mon-pick.h b/crawl-ref/source/mon-pick.h index b04f8f3cea..0bbdf1d536 100644 --- a/crawl-ref/source/mon-pick.h +++ b/crawl-ref/source/mon-pick.h @@ -75,8 +75,8 @@ int mons_standard_level(int mcls); int mons_standard_rare(int mcls); int mons_swamp_level(int mcls); int mons_swamp_rare(int mcls); -int mons_islands_level(int mcls); -int mons_islands_rare(int mcls); +int mons_shoals_level(int mcls); +int mons_shoals_rare(int mcls); int mons_tartarus_level(int mcls); int mons_tartarus_rare(int mcls); int mons_tomb_level(int mcls); diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 3f68a4783b..2d309f82a3 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -853,7 +853,7 @@ static band_type choose_band( int mon_type, int power, int &band_size ) band_size = 2 + random2(3); break; case MONS_CYCLOPS: - if ( one_chance_in(5) || player_in_branch(BRANCH_ISLANDS) ) + if ( one_chance_in(5) || player_in_branch(BRANCH_SHOALS) ) { band = BAND_SHEEP; // Odyssey reference band_size = 2 + random2(3); diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 47a6e58fb6..6a7d6e0bcf 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -357,12 +357,12 @@ static void initialise_branch_depths() if ( coinflip() ) { branches[BRANCH_SWAMP].startdepth = random_range(2, 7); - branches[BRANCH_ISLANDS].startdepth = -1; + branches[BRANCH_SHOALS].startdepth = -1; } else { branches[BRANCH_SWAMP].startdepth = -1; - branches[BRANCH_ISLANDS].startdepth = random_range(2, 7); + branches[BRANCH_SHOALS].startdepth = random_range(2, 7); } branches[BRANCH_SNAKE_PIT].startdepth = random_range(3, 8); branches[BRANCH_VAULTS].startdepth = random_range(14, 19); diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index ed0801e971..d7e665402f 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -521,7 +521,7 @@ void initialise_travel() traversable_terrain[DNGN_ENTER_ELVEN_HALLS] = traversable_terrain[DNGN_ENTER_TOMB] = traversable_terrain[DNGN_ENTER_SWAMP] = - traversable_terrain[DNGN_ENTER_ISLANDS] = + traversable_terrain[DNGN_ENTER_SHOALS] = traversable_terrain[DNGN_RETURN_FROM_ORCISH_MINES] = traversable_terrain[DNGN_RETURN_FROM_HIVE] = traversable_terrain[DNGN_RETURN_FROM_LAIR] = @@ -535,7 +535,7 @@ void initialise_travel() traversable_terrain[DNGN_RETURN_FROM_ELVEN_HALLS] = traversable_terrain[DNGN_RETURN_FROM_TOMB] = traversable_terrain[DNGN_RETURN_FROM_SWAMP] = - traversable_terrain[DNGN_RETURN_FROM_ISLANDS] = + traversable_terrain[DNGN_RETURN_FROM_SHOALS] = traversable_terrain[DNGN_ALTAR_ZIN] = traversable_terrain[DNGN_ALTAR_SHINING_ONE] = traversable_terrain[DNGN_ALTAR_KIKUBAAQUDGHA] = @@ -645,7 +645,7 @@ bool is_travelable_stair(unsigned gridc) case DNGN_ENTER_ELVEN_HALLS: case DNGN_ENTER_TOMB: case DNGN_ENTER_SWAMP: - case DNGN_ENTER_ISLANDS: + case DNGN_ENTER_SHOALS: case DNGN_RETURN_FROM_ORCISH_MINES: case DNGN_RETURN_FROM_HIVE: case DNGN_RETURN_FROM_LAIR: @@ -659,7 +659,7 @@ bool is_travelable_stair(unsigned gridc) case DNGN_RETURN_FROM_ELVEN_HALLS: case DNGN_RETURN_FROM_TOMB: case DNGN_RETURN_FROM_SWAMP: - case DNGN_RETURN_FROM_ISLANDS: + case DNGN_RETURN_FROM_SHOALS: return true; default: return false; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index ebea95ee04..5207d3efed 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -1850,7 +1850,7 @@ bool is_feature(int feature, int x, int y) case DNGN_RETURN_FROM_ELVEN_HALLS: case DNGN_RETURN_FROM_TOMB: case DNGN_RETURN_FROM_SWAMP: - case DNGN_RETURN_FROM_ISLANDS: + case DNGN_RETURN_FROM_SHOALS: return true; default: return false; @@ -1874,7 +1874,7 @@ bool is_feature(int feature, int x, int y) case DNGN_ENTER_ELVEN_HALLS: case DNGN_ENTER_TOMB: case DNGN_ENTER_SWAMP: - case DNGN_ENTER_ISLANDS: + case DNGN_ENTER_SHOALS: return true; default: return false; @@ -3022,7 +3022,7 @@ void init_feature_table( void ) case DNGN_ENTER_ELVEN_HALLS: case DNGN_ENTER_TOMB: case DNGN_ENTER_SWAMP: - case DNGN_ENTER_ISLANDS: + case DNGN_ENTER_SHOALS: case DNGN_ENTER_RESERVED_2: case DNGN_ENTER_RESERVED_3: case DNGN_ENTER_RESERVED_4: @@ -3053,7 +3053,7 @@ void init_feature_table( void ) case DNGN_RETURN_FROM_ELVEN_HALLS: case DNGN_RETURN_FROM_TOMB: case DNGN_RETURN_FROM_SWAMP: - case DNGN_RETURN_FROM_ISLANDS: + case DNGN_RETURN_FROM_SHOALS: case DNGN_RETURN_RESERVED_2: case DNGN_RETURN_RESERVED_3: case DNGN_RETURN_RESERVED_4: -- cgit v1.2.3-54-g00ecf