From: cohrs <cohrs>
Date: Fri, 24 Oct 2003 05:58:39 +0000 (+0000)
Subject: stone to flesh bit
X-Git-Tag: MOVE2GIT~1645
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25d9778b6424e7ff94773060356b167d9b092a06;p=nethack

stone to flesh bit
<Someone> suggested and I agree (mostly, if you're a Monk poly'd to a
strict carnivore, I think it should still smell delicious):
> "You smell the odor of meat." (if herbivorous)
> "You smell a delicious smell." (otherwise)
> I think that if your character is a monk or still veg(itari)an, you should
> also get the first message. Even if you're not intentionally vegitarian,
> the first message is still appropriate.
---

diff --git a/doc/fixes34.3 b/doc/fixes34.3
index 70adbbf9e..be7db5dbe 100644
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -80,6 +80,7 @@ when polymorphed into a quantum mechanic on a no teleport level and swallowed,
 	no feedback was given when you teleported the swallower away
 allow Conflict-resistant monsters to respond to conflict attacks rather than
 	sitting there and taking the attacks until they die
+prefer herbivorous stone-to-flesh message when hero is a vegitarian
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/zap.c b/src/zap.c
index 63589ae24..0a3bd88e5 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -1665,7 +1665,8 @@ makecorpse:			if (mons[obj->corpsenm].geno &
 			obj = poly_obj(obj, MEATBALL);
 smell:
 			if (herbivorous(youmonst.data) &&
-				!carnivorous(youmonst.data))
+			    (!carnivorous(youmonst.data) ||
+			     Role_if(PM_MONK) || !u.uconduct.unvegetarian))
 			    Norep("You smell the odor of meat.");
 			else
 			    Norep("You smell a delicious smell.");