0006465: No prompt before drinking blood when worshipping a good god.

Viewing Issue Advanced Details [ Jump to Notes ] [ Wiki ]

[ View Simple ] [ Issue History ] [ Print ]

Tags

No tags attached.

6465_patch1.patch [^] (513 bytes) 2013-09-25 08:15 [Show Content] [Hide Content]

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index f5826d8..7ca7fa6 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2174,6 +2174,13 @@ void drink(int slot)
         return;
     }
 
+    if (is_good_god(you.religion) &&
+            !yesno("Really drink that potion of blood?", false, 'n'))
+    {
+        mpr("Okay, then.");
+        return;
+    }
+
     zin_recite_interrupt();
 
     // The "> 1" part is to reduce the amount of times that Xom is

Relationships

Notes
(0024087) Naruni (reporter) 2013-09-25 08:16	Added a yesno prompt that triggers when worshiping a good god and attempting to drink a blood potion. Master 45a2003d0

(0024110) neil (administrator) 2013-09-29 03:18	Fixed in trunk (0.14-a0-46-gc437711) and beta (0.13-b1-8-g93e7b36). Based on Naruni's patch, but with several tweaks (don't fire for non-blood potions or for unknown potions, use canned_msg).

Issue History
Date Modified	Username	Field	Change
2012-12-23 21:14	elliptic	New Issue
2013-09-25 08:15	Naruni	File Added: 6465_patch1.patch
2013-09-25 08:16	Naruni	Note Added: 0024087
2013-09-29 03:18	neil	Note Added: 0024110
2013-09-29 03:18	neil	Status	new => resolved
2013-09-29 03:18	neil	Fixed in Branch	=> 0.13 development branch
2013-09-29 03:18	neil	Resolution	open => done
2013-09-29 03:18	neil	Assigned To	=> neil

Mantis 1.1.8[^]