diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-14 21:45:56 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-14 21:45:56 +0000 |
| commit | 1fecaefacbf77dd4056af43da0824fadb3164943 (patch) | |
| tree | 6e818eef793bc8b48cd25d90bfc8cb945c7c5034 | |
| parent | 5945e728fb8d65f4bf0bf90ab9979b7809db6350 (diff) | |
| download | crawl-ref-1fecaefacbf77dd4056af43da0824fadb3164943.tar.gz crawl-ref-1fecaefacbf77dd4056af43da0824fadb3164943.zip | |
Decks of punishment are no longer randomly generated.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6932 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/effects.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 656bd8f9b5..154efed495 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1385,7 +1385,8 @@ static int _find_acquirement_subtype(object_class_type class_wanted, while (type_wanted == MISC_HORN_OF_GERYON || type_wanted == MISC_RUNE_OF_ZOT || type_wanted == MISC_CRYSTAL_BALL_OF_FIXATION - || type_wanted == MISC_EMPTY_EBONY_CASKET); + || type_wanted == MISC_EMPTY_EBONY_CASKET + || type_wanted == MISC_DECK_OF_PUNISHMENT); break; default: break; diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index a4af7327f5..72ce0001a1 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2662,13 +2662,13 @@ static void _generate_misc_item(item_def& item, int force_type, int item_race) // never randomly generated (item.sub_type == MISC_RUNE_OF_ZOT || item.sub_type == MISC_HORN_OF_GERYON + || item.sub_type == MISC_DECK_OF_PUNISHMENT // pure decks are rare in the dungeon || (item.sub_type == MISC_DECK_OF_ESCAPE || item.sub_type == MISC_DECK_OF_DESTRUCTION || item.sub_type == MISC_DECK_OF_DUNGEONS || item.sub_type == MISC_DECK_OF_SUMMONING - || item.sub_type == MISC_DECK_OF_WONDERS - || item.sub_type == MISC_DECK_OF_PUNISHMENT) + || item.sub_type == MISC_DECK_OF_WONDERS) && !one_chance_in(5)); // filling those silly empty boxes -- bwr |