summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/docs/changes.stone_soup2
-rw-r--r--crawl-ref/source/xom.cc6
2 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 843bc7d77b..8af2c799a3 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -91,7 +91,7 @@ Interface
* Purchases and donations are now noted.
* The database search now also prints armour base AC/EV and weapon plusses.
* Add spells and books to book/spell descriptions when searching the database.
-* Card descriptions are now searchable in the database ('?/c').
+* Ability and card descriptions are now searchable in the database ('?/').
* Allow wishing for specific fixed and randarts in wizard mode ('o' command).
* Add food item based hunger descriptions to spells.
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 4a8c257e51..d0b640863d 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -136,9 +136,11 @@ bool xom_is_nice()
return (false);
if (you.religion == GOD_XOM)
+ {
// If you.gift_timeout was 0, then Xom was BORED. He HATES that.
return (you.gift_timeout > 0 && you.piety > random2(MAX_PIETY));
- else
+ }
+ else // CARD_XOM
return coinflip();
}
@@ -221,7 +223,7 @@ void xom_tick()
simple_god_message(" is getting BORED.");
if (one_chance_in(20))
- xom_acts(xom_is_nice());
+ xom_acts(abs(you.piety - MAX_PIETY/2));
}
void xom_is_stimulated(int maxinterestingness, const std::string& message,