summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/xom.cc
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-18 23:39:31 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-18 23:52:19 +0100
commit7a7711583a46671b328d625dbec7ed5880e067a4 (patch)
treee5b0afe1f0b987b99c9f1e73a4fb3d05a469884e /crawl-ref/source/xom.cc
parentb2f09ceeac848937906311367ed2072255f93464 (diff)
downloadcrawl-ref-7a7711583a46671b328d625dbec7ed5880e067a4.tar.gz
crawl-ref-7a7711583a46671b328d625dbec7ed5880e067a4.zip
Fix Xom still banishing at early xp levels when bored.
Diffstat (limited to 'crawl-ref/source/xom.cc')
-rw-r--r--crawl-ref/source/xom.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index a37362e01d..fd9f6c6a40 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -3261,8 +3261,8 @@ static bool _allow_xom_banishment()
return (true);
// If Xom is bored, banishment becomes viable earlier.
- if (_xom_is_bored() && _will_not_banish())
- return (false);
+ if (_xom_is_bored())
+ return (!_will_not_banish());
// Below the minimum experience level, only fake banishment is allowed.
if (!_has_min_banishment_level())
@@ -3287,8 +3287,7 @@ static int _xom_maybe_reverts_banishment(bool debug = false)
// Sometimes Xom will immediately revert the banishment.
// Always so, if the banishment happened below the minimum exp level.
- if (!_xom_feels_nasty() && !_has_min_banishment_level()
- || x_chance_in_y(you.piety, 1000))
+ if (!_has_min_banishment_level() || x_chance_in_y(you.piety, 1000))
{
if (!debug)
{