From 361c9481bd37fc56fbbaac0d34c9e5c82af0b931 Mon Sep 17 00:00:00 2001 From: haranp Date: Sat, 7 Apr 2007 11:10:16 +0000 Subject: Preliminary refactoring in dungeon creation code. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1255 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/branch.cc | 56 ++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 22 deletions(-) (limited to 'crawl-ref/source/branch.cc') diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index a6178217de..b0fcfe9c0e 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -12,7 +12,7 @@ Branch branches[] = { NUM_FEATURES, NUM_FEATURES, // sentinel values "Dungeon", "the Dungeon", "D", NULL, - LIGHTGREY, BROWN, + true, true, LIGHTGREY, BROWN, mons_standard_rare, mons_standard_level, NULL, 8, 'D' }, @@ -21,14 +21,15 @@ Branch branches[] = { DNGN_ENTER_TEMPLE, DNGN_RETURN_FROM_TEMPLE, "Temple", "the Ecumenical Temple", "Temple", NULL, - LIGHTGREY, LIGHTGREY, mons_standard_rare, mons_standard_level, NULL, + false, false, LIGHTGREY, LIGHTGREY, + mons_standard_rare, mons_standard_level, NULL, 0, 'T' }, { BRANCH_ORCISH_MINES, BRANCH_MAIN_DUNGEON, 4, 6, DNGN_ENTER_ORCISH_MINES, DNGN_RETURN_FROM_ORCISH_MINES, "Orcish Mines", "the Orcish Mines", "Orc", NULL, - BROWN, BROWN, + true, false, BROWN, BROWN, mons_mineorc_rare, mons_mineorc_level, NULL, 20, 'O' }, @@ -36,49 +37,56 @@ Branch branches[] = { DNGN_ENTER_ELVEN_HALLS, DNGN_RETURN_FROM_ELVEN_HALLS, "Elven Halls", "the Elven Halls", "Elf", NULL, - DARKGREY, LIGHTGREY, mons_hallelf_rare, mons_hallelf_level, NULL, + true, true, DARKGREY, LIGHTGREY, + mons_hallelf_rare, mons_hallelf_level, NULL, 8, 'E' }, { BRANCH_LAIR, BRANCH_MAIN_DUNGEON, 10, 8, DNGN_ENTER_LAIR, DNGN_RETURN_FROM_LAIR, "Lair", "the Lair of Beasts", "Lair", NULL, - GREEN, BROWN, mons_lair_rare, mons_lair_level, NULL, + true, false, GREEN, BROWN, + mons_lair_rare, mons_lair_level, NULL, 5, 'L' }, { BRANCH_SWAMP, BRANCH_LAIR, 5, 3, DNGN_ENTER_SWAMP, DNGN_RETURN_FROM_SWAMP, "Swamp", "the Swamp", "Swamp", NULL, - BROWN, BROWN, mons_swamp_rare, mons_swamp_level, NULL, + true, true, BROWN, BROWN, + mons_swamp_rare, mons_swamp_level, NULL, 0, 'S' }, { BRANCH_SLIME_PITS, BRANCH_LAIR, 6, 4, DNGN_ENTER_SLIME_PITS, DNGN_RETURN_FROM_SLIME_PITS, "Slime Pits", "the Pits of Slime", "Slime", NULL, - GREEN, LIGHTGREEN, mons_pitslime_rare, mons_pitslime_level, NULL, + false, false, GREEN, LIGHTGREEN, + mons_pitslime_rare, mons_pitslime_level, NULL, 5, 'M' }, { BRANCH_SNAKE_PIT, BRANCH_LAIR, 5, 7, DNGN_ENTER_SNAKE_PIT, DNGN_RETURN_FROM_SNAKE_PIT, "Snake Pit", "the Snake Pit", "Snake", NULL, - LIGHTGREEN, YELLOW, mons_pitsnake_rare, mons_pitsnake_level, NULL, + true, true, LIGHTGREEN, YELLOW, + mons_pitsnake_rare, mons_pitsnake_level, NULL, 10, 'P' }, { BRANCH_HIVE, BRANCH_MAIN_DUNGEON, 4, 15, DNGN_ENTER_HIVE, DNGN_RETURN_FROM_HIVE, "Hive", "the Hive", "Hive", "You hear a buzzing sound coming from all directions.", - YELLOW, BROWN, mons_hive_rare, mons_hive_level, NULL, + false, false, YELLOW, BROWN, + mons_hive_rare, mons_hive_level, NULL, 0, 'H' }, { BRANCH_VAULTS, BRANCH_MAIN_DUNGEON, 8, 17, DNGN_ENTER_VAULTS, DNGN_RETURN_FROM_VAULTS, "Vaults", "the Vaults", "Vault", NULL, - LIGHTGREY, BROWN, mons_standard_rare, mons_standard_level, NULL, + true, true, LIGHTGREY, BROWN, + mons_standard_rare, mons_standard_level, NULL, 5, 'V' }, @@ -86,28 +94,31 @@ Branch branches[] = { DNGN_ENTER_HALL_OF_BLADES, DNGN_RETURN_FROM_HALL_OF_BLADES, "Hall of Blades", "the Hall of Blades", "Blade", NULL, - LIGHTGREY, LIGHTGREY, mons_hallblade_rare, mons_hallblade_level, NULL, + false, true, LIGHTGREY, LIGHTGREY, + mons_hallblade_rare, mons_hallblade_level, NULL, 0, 'B' }, { BRANCH_CRYPT, BRANCH_VAULTS, 5, 3, DNGN_ENTER_CRYPT, DNGN_RETURN_FROM_CRYPT, "Crypt", "the Crypt", "Crypt", NULL, - LIGHTGREY, LIGHTGREY, mons_crypt_rare, mons_crypt_level, NULL, + false, true, LIGHTGREY, LIGHTGREY, + mons_crypt_rare, mons_crypt_level, NULL, 5, 'C' }, { BRANCH_TOMB, BRANCH_CRYPT, 3, 5, DNGN_ENTER_TOMB, DNGN_RETURN_FROM_TOMB, "Tomb", "the Tomb of the Ancients", "Tomb", NULL, - YELLOW, LIGHTGREY, mons_tomb_rare, mons_tomb_level, NULL, + false, true, YELLOW, LIGHTGREY, + mons_tomb_rare, mons_tomb_level, NULL, 0, 'G' }, { BRANCH_VESTIBULE_OF_HELL, BRANCH_MAIN_DUNGEON, 1, -1, DNGN_ENTER_HELL, NUM_FEATURES, // sentinel "Hell", "The Vestibule of Hell", "Hell", NULL, - LIGHTGREY, LIGHTGREY, + false, true, LIGHTGREY, LIGHTGREY, mons_standard_rare, mons_standard_level, NULL, 0, 'U' }, @@ -116,7 +127,7 @@ Branch branches[] = { DNGN_ENTER_DIS, NUM_FEATURES, // sentinel "Dis", "the Iron City of Dis", "Dis", NULL, - CYAN, CYAN, + false, false, CYAN, CYAN, mons_dis_rare, mons_dis_level, NULL, 0, 'I' }, @@ -125,7 +136,7 @@ Branch branches[] = { DNGN_ENTER_GEHENNA, NUM_FEATURES, // sentinel "Gehenna", "Gehenna", "Geh", NULL, - DARKGREY, RED, + false, false, DARKGREY, RED, mons_gehenna_rare, mons_gehenna_level, NULL, 0, 'N' }, @@ -134,7 +145,7 @@ Branch branches[] = { DNGN_ENTER_COCYTUS, NUM_FEATURES, // sentinel "Cocytus", "Cocytus", "Coc", NULL, - LIGHTBLUE, LIGHTCYAN, + false, false, LIGHTBLUE, LIGHTCYAN, mons_cocytus_rare, mons_cocytus_level, NULL, 0, 'X' }, @@ -143,7 +154,7 @@ Branch branches[] = { DNGN_ENTER_TARTARUS, NUM_FEATURES, // sentinel "Tartarus", "Tartarus", "Tar", NULL, - DARKGREY, DARKGREY, + false, false, DARKGREY, DARKGREY, mons_tartarus_rare, mons_tartarus_level, NULL, 0, 'Y' }, @@ -152,7 +163,7 @@ Branch branches[] = { NUM_FEATURES, NUM_FEATURES, NULL, NULL, NULL, NULL, - BLACK, BLACK, + false, false, BLACK, BLACK, NULL, NULL, NULL, 0, 'R' }, @@ -161,7 +172,7 @@ Branch branches[] = { NUM_FEATURES, NUM_FEATURES, NULL, NULL, NULL, NULL, - BLACK, BLACK, + false, false, BLACK, BLACK, NULL, NULL, NULL, 0, '0' }, @@ -170,14 +181,15 @@ Branch branches[] = { DNGN_ENTER_ZOT, DNGN_RETURN_FROM_ZOT, "Zot", "the Realm of Zot", "Zot", NULL, - BLACK, BLACK, mons_hallzot_rare, mons_hallzot_level, NULL, + false, true, BLACK, BLACK, + mons_hallzot_rare, mons_hallzot_level, NULL, 1, 'Z' }, { BRANCH_CAVERNS, BRANCH_MAIN_DUNGEON, -1, -1, NUM_FEATURES, NUM_FEATURES, NULL, NULL, NULL, NULL, - BLACK, BLACK, + false, false, BLACK, BLACK, NULL, NULL, NULL, 0, 0 } -- cgit v1.2.3-54-g00ecf