diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-26 20:09:32 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-26 20:09:32 +0000 |
| commit | 91bee6e2a1d508dc4775d26ccd96512a0a4746ec (patch) | |
| tree | dd1e4adc73fc29f9ba154f332a41eef5f233b695 /crawl-ref/source/religion.cc | |
| parent | 465871755bd7d529892441aad7bb1d730ef92113 (diff) | |
| download | crawl-ref-91bee6e2a1d508dc4775d26ccd96512a0a4746ec.tar.gz crawl-ref-91bee6e2a1d508dc4775d26ccd96512a0a4746ec.zip | |
Simplify more.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7023 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 808d75c252..d476560ba6 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -714,14 +714,14 @@ void dec_penance(god_type god, int val) you.penance[god] = 0; // TSO's halo is once more available. - if (god == GOD_SHINING_ONE && you.religion == GOD_SHINING_ONE + if (god == GOD_SHINING_ONE && you.religion == god && you.piety >= piety_breakpoint(0)) { mpr("Your divine halo returns!"); } // Orcish bonuses are now once more effective. - if (god == GOD_BEOGH && you.religion == GOD_BEOGH) + if (god == GOD_BEOGH && you.religion == god) you.redraw_armour_class = true; // When you've worked through all your penance, you get @@ -3791,7 +3791,7 @@ static bool _yredelemnul_retribution() { simple_god_message("'s anger turns toward you for a moment.", god); - if (coinflip() && you.religion == god) + if (you.religion == god && coinflip()) _yred_slaves_abandon_you(); else MiscastEffect(&you, -god, SPTYP_NECROMANCY, @@ -5569,9 +5569,10 @@ void god_pitch(god_type which_god) // hostile. if (is_good_god(you.religion) && _evil_beings_attitude_change()) mpr("Your evil allies forsake you.", MSGCH_MONSTER_ENCHANT); + if (you.religion == GOD_ZIN && _chaotic_beings_attitude_change()) mpr("Your chaotic allies forsake you.", MSGCH_MONSTER_ENCHANT); - if (you.religion == GOD_TROG && _magic_users_attitude_change()) + else if (you.religion == GOD_TROG && _magic_users_attitude_change()) mpr("Your magic-using allies forsake you.", MSGCH_MONSTER_ENCHANT); if (you.religion == GOD_ELYVILON) |