diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-31 11:31:12 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-31 11:31:12 +0000 |
| commit | 73dc1653606b47a684cd2764dcd6af31405c6215 (patch) | |
| tree | 2df7871c388a4cf82d8dd32982a21457032bac6f /crawl-ref/source/religion.cc | |
| parent | 73674fd6eb60d1701ad7a356c7710ba915a7e963 (diff) | |
| download | crawl-ref-73dc1653606b47a684cd2764dcd6af31405c6215.tar.gz crawl-ref-73dc1653606b47a684cd2764dcd6af31405c6215.zip | |
dec_penance() now happens after the godly wrath, not before. Fixes
1819735.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2702 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 3934a834d7..9f335dae56 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -406,9 +406,7 @@ void dec_penance(god_type god, int val) // bonuses now once more effective if ( god == GOD_BEOGH && you.religion == GOD_BEOGH) - { - you.redraw_armour_class = 1; - } + you.redraw_armour_class = true; } else you.penance[god] -= val; @@ -2593,16 +2591,9 @@ void divine_retribution( god_type god ) god_acting gdact(god, true); - // Just the thought of retribution (getting this far) mollifies - // the god by at least a point... the punishment might reduce - // penance further. - dec_penance( god, 1 + random2(3) ); - - bool do_more = true; - + bool do_more = true; switch (god) { - // One in ten chance that Xom might do something good... case GOD_XOM: xom_acts(one_chance_in(10), abs(you.piety - 100)); break; case GOD_SHINING_ONE: do_more = tso_retribution(); break; @@ -2643,6 +2634,10 @@ void divine_retribution( god_type god ) } } } + + // Just the thought of retribution mollifies the god by at least a + // point...the punishment might have reduced penance further. + dec_penance( god, 1 + random2(3) ); } // upon excommunication, (now ex) Beogh adepts lose their orcish followers |