diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-07 15:06:00 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-07 15:06:00 +0000 |
| commit | 60d8e93b1adada2500c8f282bc31dd04b17b0935 (patch) | |
| tree | 4d19cffddfc4d11d7ab0e27e58fa0b701bd65f1e /crawl-ref/source/religion.cc | |
| parent | 3df5b1d3140e461c40fa88ab4f80554b9912372c (diff) | |
| download | crawl-ref-60d8e93b1adada2500c8f282bc31dd04b17b0935.tar.gz crawl-ref-60d8e93b1adada2500c8f282bc31dd04b17b0935.zip | |
Apply Haran's commits 6773 and 6777-6784 to 0.4.
* Fix 2037104: amulet of Controlled Flight not autoIDing.
* Fix 2038973: explosive tracers leaking information about invisible
monsters.
* Fix 2039217: check shield status for non-weapons before wielding
* Fix 2039734: non-Spriggan transmuters being cheated on UC
* Fix 2037845: unstackedness was overriding finishing a deck
* Fix 2038476: semicontrolled blink.
* Fix 2038962: casting Divine Shield wasn't refreshing AC.
* Fix 2038651: real/fake rakshasa identity being leaked in descriptions.
* Fix 2035976: doubled inscriptions in equipped items in dump.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6792 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 7268981d02..9b5cb0d13d 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2637,12 +2637,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) { |