From 83efefc37d8a81fc2fbc97b1ab0580ffe1c168ce Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Mon, 28 Sep 2009 08:24:56 -0500 Subject: Apply caotto's patches in [2868303]: Put toadstool spawning/dying messages in runrest_ignore, and mark evil items in the player's inventory as disliked by Feawn. --- crawl-ref/settings/init.txt | 2 ++ crawl-ref/source/religion.cc | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'crawl-ref') diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt index 4206f804df..463e80b9ba 100644 --- a/crawl-ref/settings/init.txt +++ b/crawl-ref/settings/init.txt @@ -183,6 +183,8 @@ runrest_ignore_message = disappears in a puff of smoke runrest_ignore_message = engulfed in a cloud of smoke runrest_ignore_message = safely over a trap runrest_ignore_message = You feel.*sick +runrest_ignore_message = A.*toadstool withers and dies +runrest_ignore_message = toadstools? grows runrest_ignore_poison = 2:30 runrest_ignore_monster = butterfly:1 # runrest_ignore_monster = swamp worm:3 diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 4d48b3635c..b2c8bbd7a4 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -4065,6 +4065,11 @@ bool god_hates_item_handling(const item_def &item) return (true); break; + case GOD_FEAWN: + if (item_type_known(item) && is_evil_item(item)) + return (true); + break; + case GOD_SHINING_ONE: { if (!item_type_known(item)) -- cgit v1.2.3-54-g00ecf