ID charge count when the player would know it (including on light sources)

Ignore-this: e300df317d157c5fe9aa78316b55a8d8

darcs-hash:20110103140727-b78f9-a5660d84cc92d4807d23514c72f2001bd7634bd9

Author: Alex Smith

doc/fixes36.0

@@ -298,6 +298,12 @@ changed to 10 to prevent this leaking information that isn't readily
 available in vanilla NetHack. (Credits: this feature was inspired by
 Vulture's, although AceHack uses different code.)
 
+Formally identifying light sources, or seeing them flicker, now makes
+their remaining burn time visible (much like charges on formally
+identified wands). Likewise, attempting to zap an empty wand marks it
+as empty, and scrolls of charging also identify the number of charges
+in the thing they charge (as a side-effect).
+
 Platform- and/or Interface-Specific New Features
 ------------------------------------------------
 

src/objects.c

@@ -581,6 +581,11 @@ OBJECT(OBJ("Amulet of Yendor",	/* note: description == name */
 		BITS(kn,mrg,chg,0,mgc,chg,0,0,0,0,0,P_NONE,mat), \
 		0, TOOL_CLASS, prob, 0, \
 		wt, cost, 0, 0, 0, 0, wt, color, mc )
+#define LIGHTSOURCE(name,desc,kn,mrg,mgc,chg,prob,wt,cost,mat,color,mc) \
+	OBJECT( OBJ(name,desc), \
+		BITS(kn,mrg,1,0,mgc,chg,0,0,0,0,0,P_NONE,mat), \
+		0, TOOL_CLASS, prob, 0, \
+		wt, cost, 0, 0, 0, 0, wt, color, mc )
 #define CONTAINER(name,desc,kn,mgc,chg,prob,wt,cost,mat,color) \
 	OBJECT( OBJ(name,desc), \
 		BITS(kn,0,chg,1,mgc,chg,0,0,0,0,0,P_NONE,mat), \
@@ -614,16 +619,16 @@ TOOL("lock pick", (char *)0,    1, 0, 0, 0,  75,  4,  20, IRON, HI_METAL,
      MCLASS_INANIMATE),
 #endif
 /* light sources */
-TOOL("tallow candle", "candle", 0, 1, 0, 0,  20,  2,  10, WAX, CLR_WHITE,
-     MCLASS_DIVINATION),
-TOOL("wax candle", "candle",    0, 1, 0, 0,   5,  2,  20, WAX, CLR_WHITE,
-     MCLASS_DIVINATION),
-TOOL("brass lantern", (char *)0,1, 0, 0, 0,  30, 30,  12, COPPER, CLR_YELLOW,
-     MCLASS_DIVINATION),
-TOOL("oil lamp", "lamp",        0, 0, 0, 0,  45, 20,  10, COPPER, CLR_YELLOW,
-     MCLASS_DIVINATION),
+LIGHTSOURCE("tallow candle", "candle", 0, 1, 0, 0,  20,  2,  10, WAX, CLR_WHITE,
+            MCLASS_DIVINATION),
+LIGHTSOURCE("wax candle", "candle",    0, 1, 0, 0,   5,  2,  20, WAX, CLR_WHITE,
+            MCLASS_DIVINATION),
+LIGHTSOURCE("brass lantern", (char *)0,1, 0, 0, 0,  30, 30,  12, COPPER, CLR_YELLOW,
+            MCLASS_DIVINATION),
+LIGHTSOURCE("oil lamp", "lamp",        0, 0, 0, 0,  45, 20,  10, COPPER, CLR_YELLOW,
+            MCLASS_DIVINATION),
 TOOL("magic lamp", "lamp",      0, 0, 1, 0,  15, 20,  50, COPPER, CLR_YELLOW,
-     MCLASS_DIVINATION),
+     MCLASS_DIVINATION), /* TOOL not LIGHTSOURCE as it never runs out */
 /* other tools */
 #ifdef TOURIST
 TOOL("expensive camera", (char *)0,

src/objnam.c

@@ -777,17 +777,29 @@ boolean with_weight;
 			Sprintf(eos(bp), " (%s candle%s%s)",
 				tmpbuf, plur(obj->spe),
 				!obj->lamplit ? " attached" : ", lit");
-			break;
 		} else if (obj->otyp == OIL_LAMP || obj->otyp == MAGIC_LAMP ||
 			obj->otyp == BRASS_LANTERN || Is_candle(obj)) {
 			if (Is_candle(obj) &&
 			    obj->age < 20L * (long)objects[obj->otyp].oc_cost)
 				Strcat(prefix, "partly used ");
 			if(obj->lamplit)
 				Strcat(bp, " (lit)");
-			break;
 		}
-		if(objects[obj->otyp].oc_charged)
+                if (ignitable(obj) && obj->known &&
+                    obj->otyp != MAGIC_LAMP && !artifact_light(obj)) {
+                	/* We need to stop and restart the timer to
+                           get the exact number of turns remaining. */
+                	boolean waslit = obj->lamplit;
+                        /* without turning off the light source itself... */
+                        obj->lamplit = 0;
+                	if (waslit)
+                            stop_timer(BURN_OBJECT, (genericptr_t) obj);
+                	Sprintf(eos(bp), " (%d:%ld)", (int)obj->recharged,
+                                obj->age); /* not spe! */
+                        if (waslit) begin_burn(obj, TRUE);
+                        break;
+                }
+		if (objects[obj->otyp].oc_charged)
 		    goto charges;
 		break;
 	case WAND_CLASS:

src/read.c

@@ -1,6 +1,6 @@
 /*	SCCS Id: @(#)read.c	3.4	2003/10/22	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 8 Aug 2010 by Alex Smith */
+/* Modified 3 Jan 2011 by Alex Smith */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
@@ -201,8 +201,13 @@ struct obj *obj;
 			(obj->known || objects[obj->otyp].oc_uname));
 	if (is_weptool(obj))	/* specific check before general tools */
 	    return FALSE;
+        /* magic lamps aren't actually chargeable, /but/ must be shown
+           in the list to avoid accidentally IDing them */
 	if (obj->oclass == TOOL_CLASS)
-	    return (boolean)(objects[obj->otyp].oc_charged);
+	    return (boolean)(objects[obj->otyp].oc_charged ||
+                             obj->otyp == BRASS_LANTERN ||
+                             obj->otyp == OIL_LAMP ||
+                             obj->otyp == MAGIC_LAMP);
 	return FALSE; /* why are weapons/armor considered charged anyway? */
 }
 
@@ -221,6 +226,10 @@ int curse_bless;
 	is_cursed = curse_bless < 0;
 	is_blessed = curse_bless > 0;
 
+        /* Scrolls of charging now ID charge count, as well as doing
+           the charging, unless cursed. */
+	if (!is_cursed) obj->known = 1;
+
 	if (obj->oclass == WAND_CLASS) {
 	    /* undo any prior cancellation, even when is_cursed */
 	    if (obj->spe == -1) obj->spe = 0;
@@ -298,11 +307,10 @@ int curse_bless;
 	} else if (obj->oclass == TOOL_CLASS) {
 	    int rechrg = (int)obj->recharged;
 
-	    if (objects[obj->otyp].oc_charged) {
-		/* tools don't have a limit, but the counter used does */
-		if (rechrg < 7)	/* recharge_limit */
-		    obj->recharged++;
-	    }
+            /* tools don't have a limit, but the counter used does */
+            if (rechrg < 7)	/* recharge_limit */
+                obj->recharged++;
+
 	    switch(obj->otyp) {
 	    case BELL_OF_OPENING:
 		if (is_cursed) stripspe(obj);

src/timeout.c

@@ -1,6 +1,6 @@
 /*	SCCS Id: @(#)timeout.c	3.4	2002/12/17	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 8 Aug 2010 by Alex Smith */
+/* Modified 3 Jan 2011 by Alex Smith */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
@@ -712,7 +712,10 @@ const char *tailer;
 	    case OBJ_FLOOR:
 		You("see %s flicker%s.", an(xname(obj)), tailer);
 		break;
+            default:
+                return;
 	}
+        obj->known = 1; /* ID charge count */
 }
 
 /* Print a dimming message for brass lanterns. */
@@ -734,7 +737,10 @@ struct obj *obj;
 		pline("%s lantern is getting dim.",
 		    s_suffix(Monnam(obj->ocarry)));
 		break;
+            default:
+                return;
 	}
+        obj->known = 1; /* ID charge count */
 }
 
 /*
@@ -836,10 +842,12 @@ long timeout;
 				    case OBJ_MINVENT:
 					pline("%s %s seems about to go out.",
 					    whose, xname(obj));
+                                        obj->known = 1;
 					break;
 				    case OBJ_FLOOR:
 					You("see %s about to go out.",
 					    an(xname(obj)));
+                                        obj->known = 1;
 					break;
 				}
 			    }
@@ -858,13 +866,15 @@ long timeout;
 				    else
 					pline("%s %s has gone out.",
 					    whose, xname(obj));
+                                    obj->known = 1;
 				    break;
 				case OBJ_FLOOR:
 				    if (obj->otyp == BRASS_LANTERN)
 					You("see a lantern run out of power.");
 				    else
 					You("see %s go out.",
 					    an(xname(obj)));
+                                    obj->known = 1;
 				    break;
 			    }
 			}
@@ -898,12 +908,14 @@ long timeout;
 					whose,
 					menorah ? "candelabrum's " : "",
 					many ? "s are" : " is");
+                                    obj->known = 1;
 				    break;
 				case OBJ_FLOOR:
 				    You("see %scandle%s getting short.",
 					    menorah ? "a candelabrum's " :
 						many ? "some " : "a ",
 					    many ? "s" : "");
+                                    obj->known = 1;
 				    break;
 			    }
 			break;
@@ -920,13 +932,15 @@ long timeout;
 					    many ? "s'" : "'s",
 					    many ? "s" : "",
 					    many ? "" : "s");
+                                    obj->known = 1;
 				    break;
 				case OBJ_FLOOR:
 				    You("see %scandle%s flame%s flicker low!",
 					    menorah ? "a candelabrum's " :
 						many ? "some " : "a ",
 					    many ? "s'" : "'s",
 					    many ? "s" : "");
+                                    obj->known = 1;
 				    break;
 			    }
 			break;
@@ -941,7 +955,7 @@ long timeout;
 					pline("%s candelabrum's flame%s.",
 					    whose,
 					    many ? "s die" : " dies");
-					break;
+                                        break;
 				    case OBJ_FLOOR:
 					You("see a candelabrum's flame%s die.",
 						many ? "s" : "");
@@ -1169,7 +1183,9 @@ cleanup_burn(arg, expire_time)
 {
     struct obj *obj = (struct obj *)arg;
     if (!obj->lamplit) {
-	impossible("cleanup_burn: obj %s not lit", xname(obj));
+        /* This happens when updating charge count for inventory
+           purposes. We don't turn the light source off in that case. */
+        obj->age += expire_time - monstermoves;
 	return;
     }
 

src/zap.c

@@ -1,6 +1,6 @@
 /*	SCCS Id: @(#)zap.c	3.4	2003/08/24	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 23 Dec 2010 by Alex Smith */
+/* Modified 3 Jan 2011 by Alex Smith */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
@@ -1765,8 +1765,11 @@ int
 zappable(wand)
 register struct obj *wand;
 {
-	if(wand->spe < 0 || (wand->spe == 0 && rn2(121)))
+	if(wand->spe < 0 || (wand->spe == 0 && rn2(121))) {
+        	You("feel an absence of magical power.");
+		wand->known = 1; /* show it as :0 */
 		return 0;
+        }
 	if(wand->spe == 0)
 		You("wrest one last charge from the worn-out wand.");
 	wand->spe--;
@@ -1848,7 +1851,7 @@ dozap()
 	check_unpaid(obj);
 
 	/* zappable addition done by GAN 11/03/86 */
-	if(!zappable(obj)) pline("%s",nothing_happens);
+	if(!zappable(obj)) {} /* zappable now prints the message itself */
 	else if(obj->cursed && !rn2(100)) {
 		backfire(obj);	/* the wand blows up in your face! */
 		exercise(A_STR, FALSE);