Remove Hall of Blades

The complaints against the branch are well documented, mostly stating
Dancing Weapons are awful enemies and the Hall of Blades is filled with
them.

13 files changed, 50 insertions, 220 deletions

diff --git a/crawl-ref/source/branch-data.h b/crawl-ref/source/branch-data.h
index 4a454589da..d2e7dfaab7 100644
--- a/crawl-ref/source/branch-data.h
+++ b/crawl-ref/source/branch-data.h
@@ -109,7 +109,7 @@ const Branch branches[NUM_BRANCHES] =
       NULL,
       true, LIGHTGREY, BROWN,
       'V', true, 0 },
-
+#if TAG_MAJOR_VERSION == 34
     { BRANCH_BLADE, BRANCH_VAULTS, 3, 4, 1, 21,
       BFLAG_NO_ITEMS, 0,
       DNGN_ENTER_BLADE, DNGN_RETURN_FROM_BLADE,
@@ -117,6 +117,7 @@ const Branch branches[NUM_BRANCHES] =
       NULL,
       true, LIGHTGREY, BROWN,
       'B', false, -7 },
+#endif
 
     { BRANCH_CRYPT, BRANCH_VAULTS, 2, 3, 3, 19,
       0, 0,
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index 1a3cd7180f..d4477564a5 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -78,7 +78,8 @@ bool branch_is_unfinished(branch_type branch)
 {
 #if TAG_MAJOR_VERSION == 34
     if (branch == BRANCH_DWARF
-        || branch == BRANCH_FOREST)
+        || branch == BRANCH_FOREST
+        || branch == BRANCH_BLADE)
     {
         return true;
     }
diff --git a/crawl-ref/source/dat/des/branches/blade.des b/crawl-ref/source/dat/des/branches/blade.des
index 00d9d0885a..c04329d824 100644
--- a/crawl-ref/source/dat/des/branches/blade.des
+++ b/crawl-ref/source/dat/des/branches/blade.des
@@ -1,5 +1,9 @@
 ##############################################################################
 # The Hall of Blades
+#
+# This file is here for save compatibility reasons, and should be removed when
+# TAG_MAJOR_VERSION >= 35. (i.e, it is only necessary if the TAG_MAJOR_VERSION
+# is 34)
 ##############################################################################
 # Guarantee two rare base types with a brand
 {{
@@ -31,191 +35,6 @@ end
 
 }}
 
-######################################
-# Entry vaults
-
-NAME:     vaults_mumra_blade_bloodbath
-TAGS:     vaults_entry_blade allow_dup no_item_gen
-KFEAT:    O = enter_hall_of_blades
-SUBST:    1 = ..'
-SUBST:    2 = .''
-SUBST:    3 = .'''
-KPROP:    ' = bloody
-SUBST:    ' = ...'
-KITEM:    ' = short sword / long sword / morningstar / mace / scimitar / dagger / bardiche / battleaxe / war axe
-MAP
-xx...xxx1..xx
-x.1...x11...x
-..11..121....
-..1222222..11
-...223332221.
-x..23333322.x
-xx2233O332.xx
-x122333332..x
-11122333222..
-....222.211..
-....11...11..
-x...1.x...11x
-xx..1xxx..1xx
-ENDMAP
-
-NAME:     vaults_mumra_blade_sword
-TAGS:     vaults_entry_blade allow_dup no_item_gen
-KFEAT:    O = enter_hall_of_blades
-SUBST:    : : ''-
-SUBST:    ' : ll.
-FTILE:    - = floor_hall
-SUBST:    . : ..W
-MAP
-     :
-    ':'
-    ':'
-    ':'
-    ':'
-   '':''
-   '':''
-   '':''
-   '':''
------O-----
- ....-....
-    .-.
-    .-.
-    .-.
-     -
-ENDMAP
-
-# Based on vaults_rooms_7_spin_blade_pillars
-NAME:     vaults_blade_entry_pillars
-TAGS:     vaults_entry_blade allow_dup no_monster_gen
-SUBST:    y : x...
-SUBST:    1 = 1.
-MONS:     place:Blade:1
-KFEAT:    O = enter_hall_of_blades
-FTILE:    cxyO1. = floor_hall
-MAP
-xy...yx
-y..c..y
-..1.1..
-.c.O.c.
-..1.1..
-y..c..y
-xy...yx
-ENDMAP
-
-# Based on vaults_room_7_spin_blade_grunt
-NAME:     vaults_blade_entry_basic_grunt
-TAGS:     vaults_entry_blade allow_dup no_item_gen no_monster_gen
-NSUBST:   1 = 2:1 / *:.
-MONS:     dancing weapon
-KFEAT:    O = enter_hall_of_blades
-MAP
-.......
-.1...1.
-.......
-...O...
-.......
-.1...1.
-.......
-ENDMAP
-
-NAME: nicolae_vaults_blade_pointy_end
-TAGS: vaults_entry_blade allow_dup no_monster_gen
-KFEAT: O = enter_hall_of_blades
-KMONS: 01 = dancing weapon
-FTILE: .O1 = floor_hall
-MAP
-xxxx
-xO.xxx
-x....xxx
-xx.1...xxx
- x.......xx
- xx..1.....
-  x........
-  xx...1...
-   x.......
-   xx....1.
-    x......
-ENDMAP
-
-NAME: nicolae_vaults_blade_hurt_lockers
-TAGS: vaults_entry_blade allow_dup no_monster_gen vaults_orient_w
-SHUFFLE: Aa/Bb/Dd, TG
-SUBST: BD = x, bd = 1, A = +, a = ., T : T., G : G.
-KFEAT: O = enter_hall_of_blades
-KMONS: 1 = dancing weapon
-FTILE: O' = floor_hall
-MAP
-xx..+aA''cxx
-x..Gxxx''ccx
-...Txxx'''cx
-....+bB''Ocx
-...Txxx'''cx
-x..Gxxx''ccx
-xx..+dD''cxx
-ENDMAP
-
-NAME: nicolae_vaults_blade_armed_guards
-TAGS: vaults_entry_blade allow_dup no_monster_gen
-KMONS: 1 = vault guard ; battleaxe | broad axe | flail | glaive | great mace | \
-   halberd | hand axe | long sword | morningstar | scimitar | short sword | \
-   trident | war axe . chain mail | plate armour . \
-   large shield | shield w:20 | nothing w:60
-KFEAT: O = enter_hall_of_blades
-MAP
-xxx...xxx
-x...c...x
-x.c.c.c.x
-...1.1...
-.cc.O.cc.
-...1.1...
-x.c.c.c.x
-x...c...x
-xxx...xxx
-ENDMAP
-
-NAME: nicolae_vaults_blade_crossed_weapons
-TAGS: vaults_entry_blade allow_dup no_monster_gen
-NSUBST: O = O / .
-KFEAT: O = enter_hall_of_blades
-KMONS: 1 = dancing weapon ; long sword
-FTILE: .O1 = floor_hall
-MAP
-...............
-.v.v.......v.v.
-..v...vOv...v..
-.v.v..vvv..v.v.
-....v..c..v....
-.....1.c.1.....
-..vv..OcO..vv..
-..OvcccccccvO..
-..vv..OcO..vv..
-.....1.c.1.....
-....v..c..v....
-.v.v..vvv..v.v.
-..v...vOv...v..
-.v.v.......v.v.
-...............
-ENDMAP
-
-NAME:   vaults_nooodl_blade_preview
-TAGS:   vaults_entry_blade allow_dup no_item_gen no_monster_gen
-SUBST:  C : cc.
-NSUBST: 1 = 2:1 / *:.
-MONS:   place:Blade:1
-KFEAT:  O = enter_hall_of_blades
-MAP
-ccccccccccccccc
-cCCCCCCCCCCCCCc
-c.............c
-c.c1.c1.1c.1c.c
-+......O......+
-c.c1.c1.1c.1c.c
-c.............c
-cCCCCCCCCCCCCCc
-ccccccccccccccc
-ENDMAP
-
-######################################
 # Main layout
 
 NAME:    hall_of_blades
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index bc4a1ace1f..23abb55bfe 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -3096,6 +3096,8 @@ static string _base_feature_desc(dungeon_feature_type grid, trap_type trap)
 #if TAG_MAJOR_VERSION == 34
     case DNGN_ENTER_DWARF:
         return "staircase to the Dwarven Hall";
+    case DNGN_ENTER_BLADE:
+        return "staircase to the Hall of Blades";
 #endif
     case DNGN_ENTER_ORC:
         return "staircase to the Orcish Mines";
@@ -3107,8 +3109,6 @@ static string _base_feature_desc(dungeon_feature_type grid, trap_type trap)
         return "gate to the Vaults";
     case DNGN_ENTER_CRYPT:
         return "staircase to the Crypt";
-    case DNGN_ENTER_BLADE:
-        return "staircase to the Hall of Blades";
     case DNGN_ENTER_ZOT:
         return "gate to the Realm of Zot";
     case DNGN_ENTER_TEMPLE:
@@ -3175,8 +3175,8 @@ static string _base_feature_desc(dungeon_feature_type grid, trap_type trap)
     case DNGN_RETURN_FROM_SPIDER:
         return "crawl-hole back to the Lair";
     case DNGN_RETURN_FROM_CRYPT:
-    case DNGN_RETURN_FROM_BLADE:
 #if TAG_MAJOR_VERSION == 34
+    case DNGN_RETURN_FROM_BLADE:
     case DNGN_RETURN_FROM_FOREST:
 #endif
         return "staircase back to the Vaults";
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index cbaaae7d47..00ca154904 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -849,6 +849,7 @@ static bool _is_upwards_exit_stair(const coord_def &c)
     case DNGN_EXIT_HELL:
 #if TAG_MAJOR_VERSION == 34
     case DNGN_RETURN_FROM_DWARF:
+    case DNGN_RETURN_FROM_BLADE:
     case DNGN_RETURN_FROM_FOREST:
 #endif
     case DNGN_RETURN_FROM_ORC:
@@ -856,7 +857,6 @@ static bool _is_upwards_exit_stair(const coord_def &c)
     case DNGN_RETURN_FROM_SLIME:
     case DNGN_RETURN_FROM_VAULTS:
     case DNGN_RETURN_FROM_CRYPT:
-    case DNGN_RETURN_FROM_BLADE:
     case DNGN_RETURN_FROM_ZOT:
     case DNGN_RETURN_FROM_TEMPLE:
     case DNGN_RETURN_FROM_SNAKE:
@@ -895,6 +895,7 @@ static bool _is_exit_stair(const coord_def &c)
     case DNGN_EXIT_HELL:
 #if TAG_MAJOR_VERSION == 34
     case DNGN_RETURN_FROM_DWARF:
+    case DNGN_RETURN_FROM_BLADE:
     case DNGN_RETURN_FROM_FOREST:
 #endif
     case DNGN_RETURN_FROM_ORC:
@@ -902,7 +903,6 @@ static bool _is_exit_stair(const coord_def &c)
     case DNGN_RETURN_FROM_SLIME:
     case DNGN_RETURN_FROM_VAULTS:
     case DNGN_RETURN_FROM_CRYPT:
-    case DNGN_RETURN_FROM_BLADE:
     case DNGN_RETURN_FROM_ZOT:
     case DNGN_RETURN_FROM_TEMPLE:
     case DNGN_RETURN_FROM_SNAKE:
@@ -5561,10 +5561,6 @@ static dungeon_feature_type _pick_an_altar()
                                          0);
             break;
 
-        case BRANCH_BLADE:
-            god = GOD_OKAWARU;
-            break;
-
         case BRANCH_ELF: // magic gods
             god = random_choose(GOD_VEHUMET, GOD_SIF_MUNA, GOD_XOM,
                                 GOD_MAKHLEB, -1);
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 1fb11a4fa3..e4e6b9c822 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -567,7 +567,9 @@ enum branch_type                // you.where_are_you
     BRANCH_SPIDER,
     BRANCH_SLIME,
     BRANCH_VAULTS,
+#if TAG_MAJOR_VERSION == 34
     BRANCH_BLADE,
+#endif
     BRANCH_CRYPT,
     BRANCH_TOMB,
 #if TAG_MAJOR_VERSION > 34
@@ -1428,7 +1430,9 @@ enum dungeon_feature_type
     DNGN_ENTER_SLIME,
     DNGN_ENTER_VAULTS,
     DNGN_ENTER_CRYPT,
+#if TAG_MAJOR_VERSION == 34
     DNGN_ENTER_BLADE,
+#endif
     DNGN_ENTER_ZOT,
     DNGN_ENTER_TEMPLE,
     DNGN_ENTER_SNAKE,
@@ -1454,7 +1458,9 @@ enum dungeon_feature_type
     DNGN_RETURN_FROM_SLIME,
     DNGN_RETURN_FROM_VAULTS,
     DNGN_RETURN_FROM_CRYPT,
+#if TAG_MAJOR_VERSION == 34
     DNGN_RETURN_FROM_BLADE,
+#endif
     DNGN_RETURN_FROM_ZOT,
     DNGN_RETURN_FROM_TEMPLE,
     DNGN_RETURN_FROM_SNAKE,
diff --git a/crawl-ref/source/mon-pick-data.h b/crawl-ref/source/mon-pick-data.h
index 390a6fa1cd..24a95fd4c0 100644
--- a/crawl-ref/source/mon-pick-data.h
+++ b/crawl-ref/source/mon-pick-data.h
@@ -195,7 +195,6 @@ static const pop_entry pop_elf[] =
   {  6,  7,   10, UP,   MONS_DEEP_ELF_MASTER_ARCHER },
   { 0,0,0,FLAT,MONS_0 }
 };
-
 #if TAG_MAJOR_VERSION == 34
 static const pop_entry pop_dwarf[] =
 { // Dwarven Hall
@@ -214,6 +213,12 @@ static const pop_entry pop_dwarf[] =
   {  1,  1,    8, FLAT, MONS_PHANTASMAL_WARRIOR },
   { 0,0,0,FLAT,MONS_0 }
 };
+
+static const pop_entry pop_blade[] =
+{ // Hall of Blades
+  {  1,  1, 1000, FLAT, MONS_DANCING_WEAPON },
+  { 0,0,0,FLAT,MONS_0 }
+};
 #endif
 
 static const pop_entry pop_lair[] =
@@ -473,12 +478,6 @@ static const pop_entry pop_vaults[] =
   { 0,0,0,FLAT,MONS_0 }
 };
 
-static const pop_entry pop_blade[] =
-{ // Hall of Blades
-  {  1,  1, 1000, FLAT, MONS_DANCING_WEAPON },
-  { 0,0,0,FLAT,MONS_0 }
-};
-
 static const pop_entry pop_crypt[] =
 { // Crypt
   {  2,  7,  145, SEMI, MONS_EIDOLON },
@@ -1139,7 +1138,9 @@ static const struct { const pop_entry *pop; int count; } population[] =
     POP(spider),
     POP(slime),
     POP(vaults),
+#if TAG_MAJOR_VERSION == 34
     POP(blade),
+#endif
     POP(crypt),
     POP(tomb),
 #if TAG_MAJOR_VERSION > 34
@@ -1247,7 +1248,9 @@ static const struct { const pop_entry *pop; int count; } population_zombie[] =
     POP(spider),
     POP(slime),
     POP(vaults),
+#if TAG_MAJOR_VERSION == 34
     POP(blade),
+#endif
     POP(generic_late_zombie),
     POP(generic_late_zombie),
 #if TAG_MAJOR_VERSION > 34
@@ -1357,7 +1360,9 @@ static const struct { const pop_entry *pop; int count; } population_water[] =
     POP(water_generic),
     POP(water_generic),
     POP(water_generic),
+#if TAG_MAJOR_VERSION == 34
     POP(water_generic),
+#endif
     POP(water_generic),
     POP(water_generic),
 #if TAG_MAJOR_VERSION > 34
@@ -1459,7 +1464,9 @@ static const struct { const pop_entry *pop; int count; } population_lava[] =
     POP(lava_generic),
     POP(lava_generic),
     POP(lava_generic),
+#if TAG_MAJOR_VERSION == 34
     POP(lava_generic),
+#endif
     POP(lava_generic),
     POP(lava_generic),
 #if TAG_MAJOR_VERSION > 34
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 453cbf0976..0a622bc688 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -865,9 +865,6 @@ bool mons_is_native_in_branch(const monster* mons,
     case BRANCH_SPIDER:
         return mons_genus(mons->type) == MONS_SPIDER;
 
-    case BRANCH_BLADE:
-        return mons->type == MONS_DANCING_WEAPON;
-
     case BRANCH_ABYSS:
         return mons_is_abyssal_only(mons->type)
                || mons->type == MONS_ABOMINATION_LARGE
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 426fad2e3e..de694fb88b 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -159,13 +159,14 @@ bool feat_is_travelable_stair(dungeon_feature_type feat)
     case DNGN_RETURN_FROM_DWARF:
     case DNGN_ENTER_FOREST:
     case DNGN_RETURN_FROM_FOREST:
+    case DNGN_ENTER_BLADE:
+    case DNGN_RETURN_FROM_BLADE:
 #endif
     case DNGN_ENTER_ORC:
     case DNGN_ENTER_LAIR:
     case DNGN_ENTER_SLIME:
     case DNGN_ENTER_VAULTS:
     case DNGN_ENTER_CRYPT:
-    case DNGN_ENTER_BLADE:
     case DNGN_ENTER_ZOT:
     case DNGN_ENTER_TEMPLE:
     case DNGN_ENTER_SNAKE:
@@ -180,7 +181,6 @@ bool feat_is_travelable_stair(dungeon_feature_type feat)
     case DNGN_RETURN_FROM_SLIME:
     case DNGN_RETURN_FROM_VAULTS:
     case DNGN_RETURN_FROM_CRYPT:
-    case DNGN_RETURN_FROM_BLADE:
     case DNGN_RETURN_FROM_ZOT:
     case DNGN_RETURN_FROM_TEMPLE:
     case DNGN_RETURN_FROM_SNAKE:
@@ -1552,7 +1552,10 @@ static const char *dngn_feature_names[] =
 #endif
 "enter_orcish_mines", "enter_lair",
 "enter_slime_pits", "enter_vaults", "enter_crypt",
-"enter_hall_of_blades", "enter_zot", "enter_temple",
+#if TAG_MAJOR_VERSION == 34
+"enter_hall_of_blades",
+#endif
+"enter_zot", "enter_temple",
 "enter_snake_pit", "enter_elven_halls", "enter_tomb",
 "enter_swamp", "enter_shoals", "enter_spider_nest",
 #if TAG_MAJOR_VERSION == 34
@@ -1566,7 +1569,10 @@ static const char *dngn_feature_names[] =
 "return_from_orcish_mines",
 "return_from_lair", "return_from_slime_pits",
 "return_from_vaults", "return_from_crypt",
-"return_from_hall_of_blades", "return_from_zot",
+#if TAG_MAJOR_VERSION == 34
+"return_from_hall_of_blades",
+#endif
+"return_from_zot",
 "return_from_temple", "return_from_snake_pit",
 "return_from_elven_halls", "return_from_tomb",
 "return_from_swamp", "return_from_shoals", "return_from_spider_nest",
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index a7149635cc..2e7ef5e95b 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -293,9 +293,9 @@ static tileidx_t _tileidx_feature_base(dungeon_feature_type feat)
 #if TAG_MAJOR_VERSION == 34
     case DNGN_ENTER_DWARF:
     case DNGN_ENTER_FOREST:
-#endif
     case DNGN_ENTER_BLADE:
         return TILE_DNGN_ENTER;
+#endif
     case DNGN_ENTER_TEMPLE:
         return TILE_DNGN_ENTER_TEMPLE;
     case DNGN_ENTER_ORC:
@@ -349,9 +349,9 @@ static tileidx_t _tileidx_feature_base(dungeon_feature_type feat)
 #if TAG_MAJOR_VERSION == 34
     case DNGN_RETURN_FROM_DWARF:
     case DNGN_RETURN_FROM_FOREST:
-#endif
     case DNGN_RETURN_FROM_BLADE:
         return TILE_DNGN_RETURN;
+#endif
     case DNGN_RETURN_FROM_TEMPLE:
         return TILE_DNGN_EXIT_TEMPLE;
     case DNGN_RETURN_FROM_ORC:
diff --git a/crawl-ref/source/tileview.cc b/crawl-ref/source/tileview.cc
index c9d59a9740..8dbbcb92cc 100644
--- a/crawl-ref/source/tileview.cc
+++ b/crawl-ref/source/tileview.cc
@@ -108,8 +108,10 @@ void tile_default_flv(branch_type br, tile_flavour &flv)
         return;
 #endif
 
-    case BRANCH_ELF:
+#if TAG_MAJOR_VERSION == 34
     case BRANCH_BLADE:
+#endif
+    case BRANCH_ELF:
         flv.wall  = TILE_WALL_HALL;
         flv.floor = TILE_FLOOR_HALL;
         return;
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc
index 3118bd1dc6..0d6132e292 100644
--- a/crawl-ref/source/viewmap.cc
+++ b/crawl-ref/source/viewmap.cc
@@ -173,13 +173,13 @@ bool is_feature(ucs_t feature, const coord_def& where)
 #if TAG_MAJOR_VERSION == 34
         case DNGN_RETURN_FROM_DWARF:
         case DNGN_RETURN_FROM_FOREST:
+        case DNGN_RETURN_FROM_BLADE:
 #endif
         case DNGN_RETURN_FROM_ORC:
         case DNGN_RETURN_FROM_LAIR:
         case DNGN_RETURN_FROM_SLIME:
         case DNGN_RETURN_FROM_VAULTS:
         case DNGN_RETURN_FROM_CRYPT:
-        case DNGN_RETURN_FROM_BLADE:
         case DNGN_RETURN_FROM_TEMPLE:
         case DNGN_RETURN_FROM_SNAKE:
         case DNGN_RETURN_FROM_ELF:
@@ -205,13 +205,13 @@ bool is_feature(ucs_t feature, const coord_def& where)
 #if TAG_MAJOR_VERSION == 34
         case DNGN_ENTER_DWARF:
         case DNGN_ENTER_FOREST:
+        case DNGN_ENTER_BLADE:
 #endif
         case DNGN_ENTER_ORC:
         case DNGN_ENTER_LAIR:
         case DNGN_ENTER_SLIME:
         case DNGN_ENTER_VAULTS:
         case DNGN_ENTER_CRYPT:
-        case DNGN_ENTER_BLADE:
         case DNGN_ENTER_TEMPLE:
         case DNGN_ENTER_SNAKE:
         case DNGN_ENTER_ELF:
diff --git a/crawl-ref/source/zotdef.cc b/crawl-ref/source/zotdef.cc
index db0ff95c63..12edf06833 100644
--- a/crawl-ref/source/zotdef.cc
+++ b/crawl-ref/source/zotdef.cc
@@ -80,8 +80,6 @@ static bool _is_branch_fitting(branch_type pb, int wavenum)
         return wavenum > 15;                 // 3.2K-
     case BRANCH_SLIME:
         return wavenum > 20 && coinflip();   // 4K-
-    case BRANCH_BLADE:
-        return wavenum > 30;                 // 6K-
     case BRANCH_TOMB:
         return wavenum > 30 && coinflip();   // 6K-
     case BRANCH_DIS:                         // 8K-
@@ -704,9 +702,6 @@ void zotdef_set_wave()
     case 3:
     {
         branch_type b = _zotdef_random_branch();
-        // HoB branch waves v. rare before 10K turns
-        if (b == BRANCH_BLADE && you.num_turns / ZOTDEF_CYCLE_LENGTH < 50)
-            b = _zotdef_random_branch();
         _zotdef_set_branch_wave(b, power);
         break;
     }