diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2013-11-05 23:04:36 +0100 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2013-11-05 23:08:28 +0100 |
| commit | d67975441494dc54bb16b93f555ced36784074e1 (patch) | |
| tree | 5993458dfe0196e4b433f823337dd2bfb9d1721c /crawl-ref/source/traps.cc | |
| parent | a3bdc66f9e9117452ea14869c8bb3dd7c932f44b (diff) | |
| download | crawl-ref-d67975441494dc54bb16b93f555ced36784074e1.tar.gz crawl-ref-d67975441494dc54bb16b93f555ced36784074e1.zip | |
Revert "Allow D:14 shafts, make them known; try to always place one."
This reverts commit 3c177f47aa1bbf47db5dea54bdaa4f770a0220b4.
This reverts commit e1004a1d0131a735b2b9be1c87b1fd27e09bf81f.
This reverts commit 930d8ed00efae890e3899670ae87cfdc07eda236.
This reverts commit 637089748731402da6c33483b30118d2eebdcc73.
Diffstat (limited to 'crawl-ref/source/traps.cc')
| -rw-r--r-- | crawl-ref/source/traps.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 7b44e5a656..7f7b68adfb 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -1656,10 +1656,8 @@ bool is_valid_shaft_level(const level_id &place) if (!is_connected_branch(place)) return false; - // Enable shafts on D:14 again, to allow bypassing the rune lock. - // They will always be known to the player, so no accidents. --dpeg - // if (place == BRANCH_DUNGEON && you.depth == RUNE_LOCK_DEPTH) - // return false; + if (place == BRANCH_DUNGEON && you.depth == RUNE_LOCK_DEPTH) + return false; // Shafts are now allowed on the first two levels, as they have a // good chance of being detected. You'll also fall less deep. @@ -1708,8 +1706,6 @@ static level_id _generic_shaft_dest(level_pos lpos, bool known = false) int curr_depth = lid.depth; int max_depth = brdepth[lid.branch]; - if (lid.branch == BRANCH_DUNGEON and curr_depth == RUNE_LOCK_DEPTH) - max_depth = RUNE_LOCK_DEPTH + 1; if (lid.branch == BRANCH_DUNGEON and curr_depth < RUNE_LOCK_DEPTH) max_depth = RUNE_LOCK_DEPTH; |