summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mapdef.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-05-01 11:25:46 +0100
committerChris Campbell <chriscampbell89@gmail.com>2014-05-09 05:30:22 +0100
commit82f6ad17de140911205a720b336cfa36603c8532 (patch)
treeeb6e2b8bb35965eba5d38a68452f94ad20130dae /crawl-ref/source/mapdef.cc
parent9e88b4757e9ef1b02dfbbdb8e026245897608b33 (diff)
downloadcrawl-ref-82f6ad17de140911205a720b336cfa36603c8532.tar.gz
crawl-ref-82f6ad17de140911205a720b336cfa36603c8532.zip
Remove decks of dungeons and a number of now-unused cards
Decks of dungeons were no longer gifted and only generated very rarely. Most of the cards in it (as well as some cards just removed from wonders) were either uninteresting or problematic for various reasons. The removed cards are Experience, Sage, Water, Glass, Trowel, Minefield.
Diffstat (limited to 'crawl-ref/source/mapdef.cc')
-rw-r--r--crawl-ref/source/mapdef.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 0c8ba81207..62a675d329 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -4947,7 +4947,6 @@ static misc_item_type _deck_type_string_to_subtype(const string& s)
{
if (s == "escape") return MISC_DECK_OF_ESCAPE;
if (s == "destruction") return MISC_DECK_OF_DESTRUCTION;
- if (s == "dungeons") return MISC_DECK_OF_DUNGEONS;
if (s == "summoning") return MISC_DECK_OF_SUMMONING;
if (s == "summonings") return MISC_DECK_OF_SUMMONING;
if (s == "wonders") return MISC_DECK_OF_WONDERS;
@@ -4973,9 +4972,13 @@ static misc_item_type _random_deck_subtype()
if (dummy.sub_type == MISC_DECK_OF_PUNISHMENT)
continue;
+#if TAG_MAJOR_VERSION == 34
+ if (dummy.sub_type == MISC_DECK_OF_DUNGEONS)
+ continue;
+#endif
+
if ((dummy.sub_type == MISC_DECK_OF_ESCAPE
|| dummy.sub_type == MISC_DECK_OF_DESTRUCTION
- || dummy.sub_type == MISC_DECK_OF_DUNGEONS
|| dummy.sub_type == MISC_DECK_OF_SUMMONING
|| dummy.sub_type == MISC_DECK_OF_WONDERS)
&& !one_chance_in(5))