summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ng-init.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-04-03 21:37:12 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-04-03 21:37:12 +0200
commit2f186193e81e2b0bfa6ab956a2cfa1bfc88590c6 (patch)
tree87490a90104a8c7e018e570b2a818c6743a8ca68 /crawl-ref/source/ng-init.cc
parent23770cd32bacfed3216d624cfed1e222ee6d78d0 (diff)
downloadcrawl-ref-2f186193e81e2b0bfa6ab956a2cfa1bfc88590c6.tar.gz
crawl-ref-2f186193e81e2b0bfa6ab956a2cfa1bfc88590c6.zip
Guarantee Spider, to let it see more testing.
The other three branches compete for a single slot.
Diffstat (limited to 'crawl-ref/source/ng-init.cc')
-rw-r--r--crawl-ref/source/ng-init.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/ng-init.cc b/crawl-ref/source/ng-init.cc
index e77ec4af1d..69df5bd505 100644
--- a/crawl-ref/source/ng-init.cc
+++ b/crawl-ref/source/ng-init.cc
@@ -68,6 +68,7 @@ void initialise_branch_depths()
b->startdepth = random_range(b->mindepth, b->maxdepth);
}
+#if 0
// You will get one of Shoals/Swamp and one of Spider/Snake.
// This way you get one "water" branch and one "poison" branch.
const branch_type disabled_branch[] =
@@ -75,6 +76,13 @@ void initialise_branch_depths()
random_choose(BRANCH_SWAMP, BRANCH_SHOALS, -1),
random_choose(BRANCH_SNAKE_PIT, BRANCH_SPIDER_NEST, -1),
};
+#else
+ // For the time being, let's make Spider guaranteed.
+ branch_type disabled_branch[2];
+ disabled_branch[0] = random_choose(BRANCH_SWAMP, BRANCH_SHOALS, BRANCH_SNAKE_PIT, -1);
+ do disabled_branch[1] = random_choose(BRANCH_SWAMP, BRANCH_SHOALS, BRANCH_SNAKE_PIT, -1);
+ while (disabled_branch[0] == disabled_branch[1]);
+#endif
for (unsigned int i = 0; i < ARRAYSZ(disabled_branch); ++i)
{