summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/xom.cc
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-19 21:35:32 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-19 21:35:32 +0100
commit747eee0fa57dbd7e6155a0e79ce644fe5c3ef391 (patch)
treee8a416dd56ae6f91de1c0c143c72a066bc01e96d /crawl-ref/source/xom.cc
parent2268822945c278572539b945c6e7f656991b0bd7 (diff)
downloadcrawl-ref-747eee0fa57dbd7e6155a0e79ce644fe5c3ef391.tar.gz
crawl-ref-747eee0fa57dbd7e6155a0e79ce644fe5c3ef391.zip
Raise minimum xp level for Xom's animated weapon event.
Under penance, this is always allowed.
Diffstat (limited to 'crawl-ref/source/xom.cc')
-rw-r--r--crawl-ref/source/xom.cc16
1 files changed, 14 insertions, 2 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 0c56cbac40..a2c7a4d227 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -3163,6 +3163,17 @@ static int _xom_draining_torment_effect(int sever, bool debug = false)
return (rc);
}
+static bool _has_min_animated_weapon_level()
+{
+ if (you.penance[GOD_XOM])
+ return (true);
+
+ if (_xom_is_bored())
+ return (you.max_level >= 4);
+
+ return (you.max_level >= 7);
+}
+
static int _xom_summon_hostiles(int sever, bool debug = false)
{
bool rc = false;
@@ -3170,8 +3181,9 @@ static int _xom_summon_hostiles(int sever, bool debug = false)
int result = XOM_DID_NOTHING;
- // Nasty, but fun. Only allow for xp >= 4.
- if (player_weapon_wielded() && you.max_level >= 4 && one_chance_in(4))
+ // Nasty, but fun.
+ if (player_weapon_wielded() && _has_min_animated_weapon_level()
+ && one_chance_in(4))
{
if (debug)
return (XOM_BAD_ANIMATE_WPN);