diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-09 14:55:40 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-09 14:55:40 +0000 |
commit | 523f4a0a5478fe3146086a980afa5a8f8ff3d052 (patch) | |
tree | 8edcb3caf9df66bc6beec9558dba60da3b9b5a4f /crawl-ref/source/branch.cc | |
parent | 7dfc7ccd3de424f1aab582578aabe0cdfa2f9504 (diff) | |
download | crawl-ref-523f4a0a5478fe3146086a980afa5a8f8ff3d052.tar.gz crawl-ref-523f4a0a5478fe3146086a980afa5a8f8ff3d052.zip |
Interlevel travel tweaks:
* ^P at branch prompt selects the parent branch of the branch you're in (or
the main dungeon if you're in the main dungeon).
* The depth prompt is always shown, even for single-level branches. This may
need to be rolled back if it's too annoying.
* At the depth prompt, you can use < to go one level above the default
(navigating up into the parent branch if necessary) and > to go one level
below the default (never navigating into deeper branches). - or p or ^P will
change the default to the level closest to the current default in the parent
branch.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1437 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/branch.cc')
-rw-r--r-- | crawl-ref/source/branch.cc | 55 |
1 files changed, 23 insertions, 32 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index d9b71afd1d..298431f866 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -20,8 +20,7 @@ Branch branches[] = { NULL, true, true, LIGHTGREY, BROWN, mons_standard_rare, mons_standard_level, - 8, 'D' - }, + 8, 'D', false }, { BRANCH_ECUMENICAL_TEMPLE, BRANCH_MAIN_DUNGEON, 1, 5, DNGN_ENTER_TEMPLE, DNGN_RETURN_FROM_TEMPLE, @@ -29,7 +28,7 @@ Branch branches[] = { NULL, false, false, LIGHTGREY, LIGHTGREY, mons_standard_rare, mons_standard_level, - 0, 'T' }, + 0, 'T', false }, { BRANCH_ORCISH_MINES, BRANCH_MAIN_DUNGEON, 4, 6, DNGN_ENTER_ORCISH_MINES, DNGN_RETURN_FROM_ORCISH_MINES, @@ -37,7 +36,7 @@ Branch branches[] = { NULL, true, false, BROWN, BROWN, mons_mineorc_rare, mons_mineorc_level, - 20, 'O' }, + 20, 'O', false }, { BRANCH_ELVEN_HALLS, BRANCH_ORCISH_MINES, 7, 4, DNGN_ENTER_ELVEN_HALLS, DNGN_RETURN_FROM_ELVEN_HALLS, @@ -45,7 +44,7 @@ Branch branches[] = { NULL, true, true, DARKGREY, LIGHTGREY, mons_hallelf_rare, mons_hallelf_level, - 8, 'E' }, + 8, 'E', false }, { BRANCH_LAIR, BRANCH_MAIN_DUNGEON, 10, 8, DNGN_ENTER_LAIR, DNGN_RETURN_FROM_LAIR, @@ -53,7 +52,7 @@ Branch branches[] = { NULL, true, false, GREEN, BROWN, mons_lair_rare, mons_lair_level, - 5, 'L' }, + 5, 'L', false }, { BRANCH_SWAMP, BRANCH_LAIR, 5, 3, DNGN_ENTER_SWAMP, DNGN_RETURN_FROM_SWAMP, @@ -61,7 +60,7 @@ Branch branches[] = { NULL, true, true, BROWN, BROWN, mons_swamp_rare, mons_swamp_level, - 0, 'S' }, + 0, 'S', false }, { BRANCH_SHOALS, BRANCH_LAIR, 5, 4, DNGN_ENTER_SHOALS, DNGN_RETURN_FROM_SHOALS, @@ -69,7 +68,7 @@ Branch branches[] = { NULL, true, true, BROWN, BROWN, mons_shoals_rare, mons_shoals_level, - 0, 'A' }, + 0, 'A', false }, { BRANCH_SLIME_PITS, BRANCH_LAIR, 6, 4, DNGN_ENTER_SLIME_PITS, DNGN_RETURN_FROM_SLIME_PITS, @@ -77,7 +76,7 @@ Branch branches[] = { NULL, false, false, GREEN, LIGHTGREEN, mons_pitslime_rare, mons_pitslime_level, - 5, 'M' }, + 5, 'M', false }, { BRANCH_SNAKE_PIT, BRANCH_LAIR, 5, 7, DNGN_ENTER_SNAKE_PIT, DNGN_RETURN_FROM_SNAKE_PIT, @@ -85,7 +84,7 @@ Branch branches[] = { NULL, true, true, LIGHTGREEN, YELLOW, mons_pitsnake_rare, mons_pitsnake_level, - 10, 'P' }, + 10, 'P', false }, { BRANCH_HIVE, BRANCH_MAIN_DUNGEON, 4, 15, DNGN_ENTER_HIVE, DNGN_RETURN_FROM_HIVE, @@ -93,7 +92,7 @@ Branch branches[] = { "You hear a buzzing sound coming from all directions.", false, false, YELLOW, BROWN, mons_hive_rare, mons_hive_level, - 0, 'H' }, + 0, 'H', false }, { BRANCH_VAULTS, BRANCH_MAIN_DUNGEON, 8, 17, DNGN_ENTER_VAULTS, DNGN_RETURN_FROM_VAULTS, @@ -101,7 +100,7 @@ Branch branches[] = { NULL, true, true, LIGHTGREY, BROWN, mons_standard_rare, mons_standard_level, - 5, 'V' }, + 5, 'V', false }, { BRANCH_HALL_OF_BLADES, BRANCH_VAULTS, 1, 4, @@ -110,7 +109,7 @@ Branch branches[] = { NULL, false, true, LIGHTGREY, LIGHTGREY, mons_hallblade_rare, mons_hallblade_level, - 0, 'B' }, + 0, 'B', false }, { BRANCH_CRYPT, BRANCH_VAULTS, 5, 3, DNGN_ENTER_CRYPT, DNGN_RETURN_FROM_CRYPT, @@ -118,7 +117,7 @@ Branch branches[] = { NULL, false, true, LIGHTGREY, LIGHTGREY, mons_crypt_rare, mons_crypt_level, - 5, 'C' }, + 5, 'C', false }, { BRANCH_TOMB, BRANCH_CRYPT, 3, 5, DNGN_ENTER_TOMB, DNGN_RETURN_FROM_TOMB, @@ -126,7 +125,7 @@ Branch branches[] = { NULL, false, true, YELLOW, LIGHTGREY, mons_tomb_rare, mons_tomb_level, - 0, 'G' }, + 0, 'G', false }, { BRANCH_VESTIBULE_OF_HELL, BRANCH_MAIN_DUNGEON, 1, -1, DNGN_ENTER_HELL, NUM_FEATURES, // sentinel @@ -134,8 +133,7 @@ Branch branches[] = { NULL, false, true, LIGHTGREY, LIGHTGREY, mons_standard_rare, mons_standard_level, - 0, 'U' - }, + 0, 'U', false }, { BRANCH_DIS, BRANCH_VESTIBULE_OF_HELL, 7, -1, DNGN_ENTER_DIS, NUM_FEATURES, // sentinel @@ -143,8 +141,7 @@ Branch branches[] = { NULL, false, false, CYAN, CYAN, mons_dis_rare, mons_dis_level, - 0, 'I' - }, + 0, 'I', true }, { BRANCH_GEHENNA, BRANCH_VESTIBULE_OF_HELL, 7, -1, DNGN_ENTER_GEHENNA, NUM_FEATURES, // sentinel @@ -152,8 +149,7 @@ Branch branches[] = { NULL, false, false, DARKGREY, RED, mons_gehenna_rare, mons_gehenna_level, - 0, 'N' - }, + 0, 'N', true }, { BRANCH_COCYTUS, BRANCH_VESTIBULE_OF_HELL, 7, -1, DNGN_ENTER_COCYTUS, NUM_FEATURES, // sentinel @@ -161,8 +157,7 @@ Branch branches[] = { NULL, false, false, LIGHTBLUE, LIGHTCYAN, mons_cocytus_rare, mons_cocytus_level, - 0, 'X' - }, + 0, 'X', true }, { BRANCH_TARTARUS, BRANCH_VESTIBULE_OF_HELL, 7, -1, DNGN_ENTER_TARTARUS, NUM_FEATURES, // sentinel @@ -170,8 +165,7 @@ Branch branches[] = { NULL, false, false, DARKGREY, DARKGREY, mons_tartarus_rare, mons_tartarus_level, - 0, 'Y' - }, + 0, 'Y', true }, { BRANCH_INFERNO, BRANCH_MAIN_DUNGEON, -1, -1, NUM_FEATURES, NUM_FEATURES, @@ -179,8 +173,7 @@ Branch branches[] = { NULL, false, false, BLACK, BLACK, NULL, NULL, - 0, 'R' - }, + 0, 'R', false }, { BRANCH_THE_PIT, BRANCH_MAIN_DUNGEON, -1, -1, NUM_FEATURES, NUM_FEATURES, @@ -188,8 +181,7 @@ Branch branches[] = { NULL, false, false, BLACK, BLACK, NULL, NULL, - 0, '0' - }, + 0, '0', false }, { BRANCH_HALL_OF_ZOT, BRANCH_MAIN_DUNGEON, 5, 27, DNGN_ENTER_ZOT, DNGN_RETURN_FROM_ZOT, @@ -197,7 +189,7 @@ Branch branches[] = { NULL, false, true, BLACK, BLACK, mons_hallzot_rare, mons_hallzot_level, - 1, 'Z' }, + 1, 'Z', false }, { BRANCH_CAVERNS, BRANCH_MAIN_DUNGEON, -1, -1, NUM_FEATURES, NUM_FEATURES, @@ -205,6 +197,5 @@ Branch branches[] = { NULL, false, false, BLACK, BLACK, NULL, NULL, - 0, 0 - } + 0, 0, false } }; |