diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-27 12:45:04 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-27 12:45:04 +0000 |
| commit | 94848c66c068cd05415f1b1c0eaae21531c29061 (patch) | |
| tree | 39921f09b6c3df7df0c3ac412b24099c233e0d4d /crawl-ref/source | |
| parent | 5006d9b274c850a3af4768439c23af0827f55077 (diff) | |
| download | crawl-ref-94848c66c068cd05415f1b1c0eaae21531c29061.tar.gz crawl-ref-94848c66c068cd05415f1b1c0eaae21531c29061.zip | |
Made Xom more random, reduced chance of bad effects at low amusement levels.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2625 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/religion.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/xom.cc | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 36f7e98406..48fa354a65 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3507,10 +3507,7 @@ void handle_god_time(void) if (one_chance_in(20)) { - // If you.gift_timeout was == 0, then Xom was BORED. - // He HATES that. - xom_acts(you.gift_timeout > 0 && you.piety > 100, - abs(you.piety - 100)); + xom_acts(abs(you.piety - 100)); } break; } diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 233dabf504..40d1ca8389 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -121,7 +121,9 @@ const char *describe_xom_favour() bool xom_is_nice() { - return (you.gift_timeout > 0 && you.piety > 100); + // If you.gift_timeout was == 0, then Xom was BORED. + // He HATES that. + return (you.gift_timeout > 0 && you.piety > 100) || coinflip(); } static const char* xom_message_arrays[NUM_XOM_MESSAGE_TYPES][6] = @@ -900,7 +902,7 @@ void xom_acts(bool niceness, int sever) } } - if (niceness) + if (niceness && !one_chance_in(5)) { // Good stuff. while (!xom_is_good(sever)) |