diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-20 11:53:32 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-20 11:53:32 +0000 |
commit | 3219115e22de903dd8795fc40e101d6c05ab3291 (patch) | |
tree | 998408bc17a1bc94ea8157b19530cc1ce6712c04 /crawl-ref/source/xom.cc | |
parent | c8057b4430d1a552899846255def3e5d627f2472 (diff) | |
download | crawl-ref-3219115e22de903dd8795fc40e101d6c05ab3291.tar.gz crawl-ref-3219115e22de903dd8795fc40e101d6c05ab3291.zip |
* Change size restrictions for banded, splint, plate and crystal plate
mail to [SIZE_SMALL, SIZE_MEDIUM] like for the other mails.
(Fixes 2695530.)
* There's a 50% chance of Xom being amused about former playthings dying.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9522 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/xom.cc')
-rw-r--r-- | crawl-ref/source/xom.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 9f86c9368a..3d06a03eba 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -2182,6 +2182,8 @@ void xom_check_destroyed_item(const item_def& item, int cause) void xom_death_message() { - if (you.religion == GOD_XOM) - god_speaks(GOD_XOM, _get_xom_speech("laughter").c_str()); + if (you.religion != GOD_XOM && (!you.worshipped[GOD_XOM] || coinflip())) + return; + + god_speaks(GOD_XOM, _get_xom_speech("laughter").c_str()); } |