From: nethack.allison <nethack.allison>
Date: Sun, 9 Mar 2003 22:24:19 +0000 (+0000)
Subject: more golem stone-to-flesh
X-Git-Tag: MOVE2GIT~2098
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=956c9727b08cad59764cdf4ae4737630bff94f1f;p=nethack

more golem stone-to-flesh
Since all golem statues are stone, make them all become flesh.
---

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 18e9013d3..5444a94d7 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -10,7 +10,7 @@ Never say "It moves only reluctantly"
 expert fireball/cone of cold could not target a monster seen only with
 	infravision or ESP
 display "lotus juice", not "lotu juice" for the fruit juice name
-statue of Stone golem hit with stone-to-flesh spell animates as flesh golem
+statue of any golem hit with stone-to-flesh spell animates as flesh golem
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/trap.c b/src/trap.c
index a8febf41e..c9f71b5c3 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -417,8 +417,8 @@ int *fail_reason;
 	    if (mon && mon->mtame && !mon->isminion)
 		wary_dog(mon, TRUE);
 	} else {
-	    /* statue of Stone golem hit with Stone-to-flesh becomes flesh golem */
-	    if (statue->corpsenm == PM_STONE_GOLEM && cause == ANIMATE_SPELL)
+	    /* statue of any golem hit with stone-to-flesh becomes flesh golem */
+	    if (is_golem(&mons[statue->corpsenm]) && cause == ANIMATE_SPELL)
 	    	mptr = &mons[PM_FLESH_GOLEM];
 	    else
 		mptr = &mons[statue->corpsenm];
@@ -454,8 +454,10 @@ int *fail_reason;
 	if (mon->m_ap_type) seemimic(mon);
 	else mon->mundetected = FALSE;
 	if ((x == u.ux && y == u.uy) || cause == ANIMATE_SPELL) {
+	    const char *comes_to_life = nonliving(mon->data) ?
+					"moves" : "comes to life"; 
 	    pline_The("statue %s!",
-		canspotmon(mon) ? "comes to life" : "disappears");
+		canspotmon(mon) ? comes_to_life : "disappears");
 		if (historic) {
 		    You_feel("guilty that the historic statue is now gone.");
 		    adjalign(-1);