Shaft traps (trap doors) [1792195] and level annotation [1769009]

added, with the shaft traps changed as per comments on SF; shafts
aren't randomly generated yet, so this doesn't change gameplay.
Changed DNGN_TRAP_III to DNGN_TRAP_NATURAL, of which trap type the
shaft traps are the only current member.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2328 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 23 insertions, 23 deletions

diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index a620777d20..d8e36f1a6c 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -115,7 +115,7 @@ Branch branches[] = {
       NULL,
       true, true, LIGHTGREY, BROWN,
       mons_standard_rare, mons_standard_level,
-      8, 'D', false },
+      8, 'D', false, false },
 
     { BRANCH_ECUMENICAL_TEMPLE, BRANCH_MAIN_DUNGEON, 1, 5, 0, 0,
       DNGN_ENTER_TEMPLE, DNGN_RETURN_FROM_TEMPLE,
@@ -123,7 +123,7 @@ Branch branches[] = {
       NULL,
       false, false, LIGHTGREY, LIGHTGREY,
       mons_standard_rare, mons_standard_level, 
-      0, 'T', false },
+      0, 'T', false, false },
 
     { BRANCH_ORCISH_MINES, BRANCH_MAIN_DUNGEON, 4, 6, 0, 0,
       DNGN_ENTER_ORCISH_MINES, DNGN_RETURN_FROM_ORCISH_MINES,
@@ -131,7 +131,7 @@ Branch branches[] = {
       NULL,
       true, false, BROWN, BROWN,
       mons_mineorc_rare, mons_mineorc_level,
-      20, 'O', false },
+      20, 'O', false, false },
 
     { BRANCH_ELVEN_HALLS, BRANCH_ORCISH_MINES, 7, 4, 0, 0,
       DNGN_ENTER_ELVEN_HALLS, DNGN_RETURN_FROM_ELVEN_HALLS,
@@ -139,7 +139,7 @@ Branch branches[] = {
       NULL,
       true, true, DARKGREY, LIGHTGREY,
       mons_hallelf_rare, mons_hallelf_level,
-      8, 'E', false },
+      8, 'E', false, true },
 
     { BRANCH_LAIR, BRANCH_MAIN_DUNGEON, 10, 8, 0, 0,
       DNGN_ENTER_LAIR, DNGN_RETURN_FROM_LAIR,
@@ -147,7 +147,7 @@ Branch branches[] = {
       NULL,
       true, false, GREEN, BROWN,
       mons_lair_rare, mons_lair_level,
-      5, 'L', false },
+      5, 'L', false, false },
 
     { BRANCH_SWAMP, BRANCH_LAIR, 5, 3, 0, 0,
       DNGN_ENTER_SWAMP, DNGN_RETURN_FROM_SWAMP,
@@ -155,7 +155,7 @@ Branch branches[] = {
       NULL,
       true, true, BROWN, BROWN,
       mons_swamp_rare, mons_swamp_level, 
-      0, 'S', false },
+      0, 'S', false, true },
     
     { BRANCH_SHOALS, BRANCH_LAIR, 5, 4, 0, 0,
       DNGN_ENTER_SHOALS, DNGN_RETURN_FROM_SHOALS,
@@ -163,7 +163,7 @@ Branch branches[] = {
       NULL,
       true, true, BROWN, BROWN,
       mons_shoals_rare, mons_shoals_level,
-      0, 'A', false },
+      0, 'A', false, true },
 
     { BRANCH_SLIME_PITS, BRANCH_LAIR, 6, 4, 0, 0,
       DNGN_ENTER_SLIME_PITS, DNGN_RETURN_FROM_SLIME_PITS,
@@ -171,7 +171,7 @@ Branch branches[] = {
       NULL,
       false, false, GREEN, LIGHTGREEN,
       mons_pitslime_rare, mons_pitslime_level,
-      5, 'M', false },
+      5, 'M', false, true },
 
     { BRANCH_SNAKE_PIT, BRANCH_LAIR, 5, 7, 0, 0,
       DNGN_ENTER_SNAKE_PIT, DNGN_RETURN_FROM_SNAKE_PIT,
@@ -179,7 +179,7 @@ Branch branches[] = {
       NULL,
       true, true, LIGHTGREEN, YELLOW,
       mons_pitsnake_rare, mons_pitsnake_level,
-      10, 'P', false },
+      10, 'P', false, true },
 
     { BRANCH_HIVE, BRANCH_MAIN_DUNGEON, 4, 15, 0, 0,
       DNGN_ENTER_HIVE, DNGN_RETURN_FROM_HIVE,
@@ -187,7 +187,7 @@ Branch branches[] = {
       "You hear a buzzing sound coming from all directions.",
       false, false, YELLOW, BROWN,
       mons_hive_rare, mons_hive_level, 
-      0, 'H', false },
+      0, 'H', false, true },
 
     { BRANCH_VAULTS, BRANCH_MAIN_DUNGEON, 8, 17, 0, 0,
       DNGN_ENTER_VAULTS, DNGN_RETURN_FROM_VAULTS,
@@ -195,7 +195,7 @@ Branch branches[] = {
       NULL,
       true, true, LIGHTGREY, BROWN,
       mons_standard_rare, mons_standard_level,
-      5, 'V', false },
+      5, 'V', false, true },
 
 
     { BRANCH_HALL_OF_BLADES, BRANCH_VAULTS, 1, 4, 0, 0,
@@ -204,7 +204,7 @@ Branch branches[] = {
       NULL,
       false, true, LIGHTGREY, LIGHTGREY,
       mons_hallblade_rare, mons_hallblade_level, 
-      0, 'B', false },
+      0, 'B', false, false },
 
     { BRANCH_CRYPT, BRANCH_VAULTS, 5, 3, 0, 0,
       DNGN_ENTER_CRYPT, DNGN_RETURN_FROM_CRYPT,
@@ -212,7 +212,7 @@ Branch branches[] = {
       NULL,
       false, true, LIGHTGREY, LIGHTGREY,
       mons_crypt_rare, mons_crypt_level,
-      5, 'C', false },
+      5, 'C', false, false },
 
     { BRANCH_TOMB, BRANCH_CRYPT, 3, 5, 0, 0,
       DNGN_ENTER_TOMB, DNGN_RETURN_FROM_TOMB,
@@ -220,7 +220,7 @@ Branch branches[] = {
       NULL,
       false, true, YELLOW, LIGHTGREY,
       mons_tomb_rare, mons_tomb_level, 
-      0, 'G', false },
+      0, 'G', false, true },
 
     { BRANCH_VESTIBULE_OF_HELL, BRANCH_MAIN_DUNGEON, 1, -1, 0, 0,
       DNGN_ENTER_HELL, NUM_FEATURES, // sentinel
@@ -228,7 +228,7 @@ Branch branches[] = {
       NULL,
       false, true, LIGHTGREY, LIGHTGREY,
       mons_standard_rare, mons_standard_level,
-      0, 'U', false },
+      0, 'U', false, false },
 
     { BRANCH_DIS, BRANCH_VESTIBULE_OF_HELL, 7, -1, 0, 0,
       DNGN_ENTER_DIS, NUM_FEATURES, // sentinel
@@ -236,7 +236,7 @@ Branch branches[] = {
       NULL,
       false, false, CYAN, CYAN,
       mons_dis_rare, mons_dis_level,
-      0, 'I', true },
+      0, 'I', true, true },
 
     { BRANCH_GEHENNA, BRANCH_VESTIBULE_OF_HELL, 7, -1, 0, 0,
       DNGN_ENTER_GEHENNA, NUM_FEATURES, // sentinel
@@ -244,7 +244,7 @@ Branch branches[] = {
       NULL,
       false, false, DARKGREY, RED,
       mons_gehenna_rare, mons_gehenna_level,
-      0, 'N', true },
+      0, 'N', true, true },
 
     { BRANCH_COCYTUS, BRANCH_VESTIBULE_OF_HELL, 7, -1, 0, 0,
       DNGN_ENTER_COCYTUS, NUM_FEATURES, // sentinel
@@ -252,7 +252,7 @@ Branch branches[] = {
       NULL,
       false, false, LIGHTBLUE, LIGHTCYAN,
       mons_cocytus_rare, mons_cocytus_level,
-      0, 'X', true },
+      0, 'X', true, true },
 
     { BRANCH_TARTARUS, BRANCH_VESTIBULE_OF_HELL, 7, -1, 0, 0,
       DNGN_ENTER_TARTARUS, NUM_FEATURES, // sentinel
@@ -260,7 +260,7 @@ Branch branches[] = {
       NULL,
       false, false, DARKGREY, DARKGREY,
       mons_tartarus_rare, mons_tartarus_level,
-      0, 'Y', true },
+      0, 'Y', true, true },
 
     { BRANCH_INFERNO, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0,
       NUM_FEATURES, NUM_FEATURES,
@@ -268,7 +268,7 @@ Branch branches[] = {
       NULL,
       false, false, BLACK, BLACK,
       NULL, NULL,
-      0, 'R', false },
+      0, 'R', false, false },
 
     { BRANCH_THE_PIT, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0,
       NUM_FEATURES, NUM_FEATURES,
@@ -276,7 +276,7 @@ Branch branches[] = {
       NULL,
       false, false, BLACK, BLACK,
       NULL, NULL,
-      0, '0', false },
+      0, '0', false, false },
 
     { BRANCH_HALL_OF_ZOT, BRANCH_MAIN_DUNGEON, 5, 27, BFLAG_HAS_ORB, 0,
       DNGN_ENTER_ZOT, DNGN_RETURN_FROM_ZOT,
@@ -284,7 +284,7 @@ Branch branches[] = {
       NULL,
       false, true, BLACK, BLACK,
       mons_hallzot_rare, mons_hallzot_level,
-      1, 'Z', false },
+      1, 'Z', false, true },
 
     { BRANCH_CAVERNS, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0,
       NUM_FEATURES, NUM_FEATURES,
@@ -292,5 +292,5 @@ Branch branches[] = {
       NULL,
       false, false, BLACK, BLACK,
       NULL, NULL,
-      0, 0, false }
+      0, 0, false, false }
 };