summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-30 15:48:59 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-30 15:48:59 +0000
commit9eb8b488f5f36e650c60a98a7cc0c18911a9475f (patch)
treed49a3a85ad6b62f6da7364cae24c283c90dad5b8
parente0bc630366ff8c67e18728ae1017c3135c5566d7 (diff)
downloadcrawl-ref-9eb8b488f5f36e650c60a98a7cc0c18911a9475f.tar.gz
crawl-ref-9eb8b488f5f36e650c60a98a7cc0c18911a9475f.zip
Decks of Punishment can now occur randomly (but not be gifted.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2953 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/makeitem.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index d4194e990c..c28c5c760d 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2588,13 +2588,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_WONDERS ||
+ item.sub_type == MISC_DECK_OF_PUNISHMENT) &&
!one_chance_in(5)));
// filling those silly empty boxes -- bwr
@@ -3602,8 +3602,7 @@ static void give_ammo(monsters *mon, int level,
if (xitt == MI_STONE && one_chance_in(15))
xitt = MI_SLING_BULLET;
- const int thing_created =
- items( 0, xitc, xitt, true, level, item_race );
+ const int thing_created = items(0, xitc, xitt, true, level, item_race);
if (thing_created == NON_ITEM)
return;