From c27f68c47819e15d09279df9146bccfb1ff56aae Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 16 May 2008 12:19:25 +0000 Subject: A few message tweaks for delayed butchering. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5076 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/delay.cc | 3 ++- crawl-ref/source/food.cc | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 7c16e684fd..efbcbe4c3c 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -372,7 +372,8 @@ void stop_delay( bool stop_stair_travel ) (multiple_corpses ? "s" : ""), weapon.c_str()); } else - mprf("You stop %s the corpse.", butcher_verb.c_str()); + mprf("You stop %s the corpse%s.", butcher_verb.c_str(), + multiple_corpses ? "s" : ""); pop_delay(); break; diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 83fb8b507b..4ec471b7a6 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -460,8 +460,10 @@ bool butchery(int which_corpse) // Shall we butcher this corpse? snprintf(info, INFO_SIZE, "%s %s?", - can_bottle_blood_from_corpse(mitm[o].plus) ? "Bottle" - : "Butcher", + (!can_bottle_blood_from_corpse(mitm[o].plus) + || you.duration[DUR_PRAYER] + && god_likes_butchery(you.religion)) ? "Butcher" + : "Bottle", mitm[o].name(DESC_NOCAP_A).c_str()); const int result = yesnoquit(info, true, 'N', true, false, @@ -489,8 +491,12 @@ bool butchery(int which_corpse) if (result == 2) // (a)ll { - if (can_bottle_blood_from_corpse(mitm[o].plus)) + if (can_bottle_blood_from_corpse(mitm[o].plus) + && (!you.duration[DUR_PRAYER] + || !god_likes_butchery(you.religion))) + { bottle_all = true; + } else butcher_all = true; } -- cgit v1.2.3-54-g00ecf