diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-06 10:50:46 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-06 10:50:46 +0000 |
| commit | ad1ea33511379e75b2141b34eb316e76db05f057 (patch) | |
| tree | ac900dbe3e8bedb42f341562e298856958ca73ae /crawl-ref/source | |
| parent | f98faaf4a0a5c3caf5f8fe1b57ccf065bf1d959c (diff) | |
| download | crawl-ref-ad1ea33511379e75b2141b34eb316e76db05f057.tar.gz crawl-ref-ad1ea33511379e75b2141b34eb316e76db05f057.zip | |
Fix 2037845: unstackedness was overriding finishing a deck.
(Arguably a feature, but I like it better this way.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6780 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/decks.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index f3889e35ae..f12aa58726 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1260,7 +1260,7 @@ void evoke_deck( item_def& deck ) // Nemelex likes gamblers. if (!no_brownie) { - brownie_points = 1; + brownie_points++; if (one_chance_in(3)) brownie_points++; } diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 80b1f47f6b..807c31bf37 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2633,12 +2633,11 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, piety_change = level; ret = true; - // For a stacked deck, 0% chance of card countdown decrement - // drawing a card which doesn't use up the deck, and 40% - // on a card which does. For a non-stacked deck, an - // average 50% of decrement for drawing a card which doesn't - // use up the deck, and 80% on a card which does use up the - // deck. + // level == 0: stacked, deck not used up + // level == 1: used up or nonstacked + // level == 2: used up and nonstacked + // and there's a 1/3 chance of an additional bonus point + // for nonstacked cards. int chance = 0; switch (level) { |