diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-30 14:44:29 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-30 14:44:29 +0000 |
| commit | e4f7febe69bf37db1f569c9d634a00c0994bd703 (patch) | |
| tree | d800bf4d5e80faf5174bf23bf48a3bbb401f0b2c | |
| parent | 65be5d6e5eab7fbd999f4fa1a1afb5885545ec28 (diff) | |
| download | crawl-ref-e4f7febe69bf37db1f569c9d634a00c0994bd703.tar.gz crawl-ref-e4f7febe69bf37db1f569c9d634a00c0994bd703.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7303 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/fight.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 17b237acfd..f0162a5e3a 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1410,7 +1410,7 @@ int melee_attack::player_apply_weapon_bonuses(int damage) if (get_equip_race(*weapon) == ISFLAG_ORCISH && you.species == SP_HILL_ORC) { - if (you.religion == GOD_BEOGH && !you.penance[GOD_BEOGH]) + if (you.religion == GOD_BEOGH && !player_under_penance()) { #ifdef DEBUG_DIAGNOSTICS const int orig_damage = damage; @@ -2736,7 +2736,7 @@ int melee_attack::player_to_hit(bool random_factor) your_to_hit += (random_factor && coinflip() ? 2 : 1); } else if (get_equip_race(*weapon) == ISFLAG_ORCISH - && you.religion == GOD_BEOGH && !you.penance[GOD_BEOGH]) + && you.religion == GOD_BEOGH && !player_under_penance()) { your_to_hit++; } diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 6239001df3..8b07494c60 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1962,7 +1962,7 @@ static int _player_armour_racial_bonus(const item_def& item) racial_bonus += 4; // an additional bonus for Beogh worshippers - if (you.religion == GOD_BEOGH && !you.penance[GOD_BEOGH]) + if (you.religion == GOD_BEOGH && !player_under_penance()) { if (you.piety >= 185) racial_bonus += racial_bonus * 9 / 4; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 2ff544d807..fb24e917ca 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -893,7 +893,7 @@ void beogh_follower_convert(monsters *monster, bool orc_hit) const int hd = monster->hit_dice; - if (you.piety >= piety_breakpoint(2) && !you.penance[GOD_BEOGH] && + if (you.piety >= piety_breakpoint(2) && !player_under_penance() && random2(you.piety / 15) + random2(4 + you.experience_level / 3) > random2(hd) + hd + random2(5)) { |