From: nethack.rankin <nethack.rankin>
Date: Sun, 4 Dec 2005 05:03:52 +0000 (+0000)
Subject: spheres vs objects
X-Git-Tag: MOVE2GIT~1192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbab68a4bb0abfa23e695d48bd17806c85e5974f;p=nethack

spheres vs objects

     Another one from <email deleted>:  freezing spheres have the NOTAKE
attribute but flaming and shocking spheres don't.  That means that tame
critters of the latter two types will pick up and drop things.  I only saw
it happen with single gold pieces in my limited testing; I guess they're
really weak.

     This one sounds sort of familiar; I think it might have been reported
before.  The fix is so trivial I don't know why it didn't happen.
---

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index ce7cf491c..8c8b5e079 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -165,6 +165,7 @@ tombstone's reason for death from kicking an object could include so much
 several quest messages were worded inappropriately if the hero was blind
 a samurai quest guardian message used "ninja" where "ronin" was intended
 revive from fainting if vault guard or bribe-demanding demon approaches
+tame flaming spheres and shocking spheres shouldn't pick up items
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/monst.c b/src/monst.c
index daf6b840c..0685ff81c 100644
--- a/src/monst.c
+++ b/src/monst.c
@@ -340,14 +340,14 @@ NEARDATA struct permonst mons[] = {
 	A(ATTK(AT_EXPL, AD_FIRE, 4, 6), NO_ATTK, NO_ATTK,
 	    NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(10, 10, 0, MS_SILENT, MZ_SMALL), MR_FIRE, MR_FIRE,
-	M1_FLY|M1_BREATHLESS|M1_NOLIMBS|M1_NOHEAD|M1_MINDLESS,
+	M1_FLY|M1_BREATHLESS|M1_NOLIMBS|M1_NOHEAD|M1_MINDLESS|M1_NOTAKE,
 	M2_HOSTILE|M2_NEUTER, M3_INFRAVISIBLE, CLR_RED),
     MON("shocking sphere", S_EYE, 
 	LVL(6, 13, 4, 0, 0), (G_NOCORPSE|G_GENO|2),
 	A(ATTK(AT_EXPL, AD_ELEC, 4, 6), NO_ATTK, NO_ATTK,
 	  NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(10, 10, 0, MS_SILENT, MZ_SMALL), MR_ELEC, MR_ELEC,
-	M1_FLY|M1_BREATHLESS|M1_NOLIMBS|M1_NOHEAD|M1_MINDLESS,
+	M1_FLY|M1_BREATHLESS|M1_NOLIMBS|M1_NOHEAD|M1_MINDLESS|M1_NOTAKE,
 	M2_HOSTILE|M2_NEUTER, M3_INFRAVISIBLE, HI_ZAP),
 #if 0		/* not yet implemented */
     MON("beholder", S_EYE,