summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/acquire.cc
diff options
context:
space:
mode:
authorreaverb <reaverb.Crawl@gmail.com>2014-06-05 03:33:25 -0400
committerreaverb <reaverb.Crawl@gmail.com>2014-06-05 03:34:03 -0400
commitfea44c3dc8e891ce0d88ceb56119ac38a3575356 (patch)
tree8de28c9416f5c0ecec7f6ee95299758272d9289f /crawl-ref/source/acquire.cc
parent8540c5e9ecd837fadfadf96ebff76ea620a68ded (diff)
downloadcrawl-ref-fea44c3dc8e891ce0d88ceb56119ac38a3575356.tar.gz
crawl-ref-fea44c3dc8e891ce0d88ceb56119ac38a3575356.zip
Enforce 80-char rule in misc acquirement
Diffstat (limited to 'crawl-ref/source/acquire.cc')
-rw-r--r--crawl-ref/source/acquire.cc40
1 files changed, 20 insertions, 20 deletions
diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index 9db6833482..8dd4993a7b 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -652,26 +652,26 @@ static int _acquirement_staff_subtype(const has_vector& already_has)
static int _acquirement_misc_subtype()
{
// Total weight if none have been seen is 100.
- int result = random_choose_weighted( // Decks given lowest weight.
- 2, MISC_DECK_OF_WONDERS,
- 3, MISC_DECK_OF_CHANGES,
- 3, MISC_DECK_OF_DEFENCE,
- // The player might want
- // multiple of these.
- (you.seen_misc[MISC_LAMP_OF_FIRE] ? 8 : 15), MISC_LAMP_OF_FIRE,
- (you.seen_misc[MISC_PHIAL_OF_FLOODS] ? 8 : 15), MISC_PHIAL_OF_FLOODS,
- (you.seen_misc[MISC_FAN_OF_GALES] ? 8 : 15), MISC_FAN_OF_GALES,
- (you.seen_misc[MISC_STONE_OF_TREMORS] ? 8 : 15), MISC_STONE_OF_TREMORS,
- // These have charges, so
- // give them a constant
- // weight.
- 8, MISC_BOX_OF_BEASTS,
- 8, MISC_SACK_OF_SPIDERS,
- // The player never needs
- // more than one.
- (you.seen_misc[MISC_DISC_OF_STORMS] ? 0 : 8), MISC_DISC_OF_STORMS,
- (you.seen_misc[MISC_LANTERN_OF_SHADOWS] ? 0 : 8), MISC_LANTERN_OF_SHADOWS,
- 0);
+ int result = random_choose_weighted( // Decks given lowest weight.
+ 2, MISC_DECK_OF_WONDERS,
+ 3, MISC_DECK_OF_CHANGES,
+ 3, MISC_DECK_OF_DEFENCE,
+ // The player might want
+ // multiple of these.
+ (you.seen_misc[MISC_LAMP_OF_FIRE] ? 8 : 15), MISC_LAMP_OF_FIRE,
+ (you.seen_misc[MISC_PHIAL_OF_FLOODS] ? 8 : 15), MISC_PHIAL_OF_FLOODS,
+ (you.seen_misc[MISC_FAN_OF_GALES] ? 8 : 15), MISC_FAN_OF_GALES,
+ (you.seen_misc[MISC_STONE_OF_TREMORS] ? 8 : 15), MISC_STONE_OF_TREMORS,
+ // These have charges, so
+ // give them a constant
+ // weight.
+ 8, MISC_BOX_OF_BEASTS,
+ 8, MISC_SACK_OF_SPIDERS,
+ // The player never needs
+ // more than one.
+ (you.seen_misc[MISC_DISC_OF_STORMS] ? 0 : 8), MISC_DISC_OF_STORMS,
+ (you.seen_misc[MISC_LANTERN_OF_SHADOWS] ? 0 : 8), MISC_LANTERN_OF_SHADOWS,
+ 0);
// Give a crystal ball based on both evocations and either spellcasting or
// invocations if we haven't seen one.