nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Accurately track which items have been discovered, even if not #named

Browse Source 
This fixes a couple of bugs: a long-standing bug in which writing a
scroll by label could fail even if you've already seen a scroll with
that label (due to the game not tracking whether or not you've seen a
scroll if it doesn't have a name); and a somewhat newer bug in which
spellbooks auto-identified by Wizard knowledge were marked as having
been encountered (rather than as known but not encountered).

Breaks save file compatibility, but not bones files.
This commit is contained in:
Alex Smith
2025-11-25 22:42:38 +00:00
parent 10a5e67478
commit 8c29b20010
38 changed files with 155 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/muse.c
View File

@@ -207,7 +207,7 @@ mplayhorn(
? "nearby" : "in the distance");
unknow_object(otmp); /* hero loses info when unseen obj is used */
} else if (self) {
otmp->dknown = 1;
observe_object(otmp);
objnamp = xname(otmp);
if (strlen(objnamp) >= QBUFSZ)
objnamp = simpleonames(otmp);
@@ -216,7 +216,7 @@ mplayhorn(
pline("%s!", monverbself(mtmp, Monnam(mtmp), "play", objbuf));
makeknown(otmp->otyp); /* (wands handle this slightly differently) */
} else {
otmp->dknown = 1;
observe_object(otmp);
objnamp = xname(otmp);
if (strlen(objnamp) >= QBUFSZ)
objnamp = simpleonames(otmp);
@@ -242,7 +242,7 @@ mreadmsg(struct monst *mtmp, struct obj *otmp)
if (!vismon && Deaf)
return; /* no feedback */
otmp->dknown = 1; /* seeing or hearing scroll read reveals its label */
observe_object(otmp); /* seeing/hearing scroll read reveals its label */
Strcpy(onambuf, singular(otmp, vismon ? doname : ansimpleoname));
if (vismon) {
@@ -291,7 +291,7 @@ staticfn void
mquaffmsg(struct monst *mtmp, struct obj *otmp)
{
if (canseemon(mtmp)) {
otmp->dknown = 1;
observe_object(otmp);
pline_mon(mtmp, "%s drinks %s!", Monnam(mtmp), singular(otmp, doname));
} else if (!Deaf) {
Soundeffect(se_mon_chugging_potion, 25);
@@ -1967,7 +1967,7 @@ use_offensive(struct monst *mtmp)
* are not objects. Also set dknown in mthrowu.c.
*/
if (cansee(mtmp->mx, mtmp->my)) {
otmp->dknown = 1;
observe_object(otmp);
pline_mon(mtmp, "%s hurls %s!",
Monnam(mtmp), singular(otmp, doname));
}
@@ -3129,7 +3129,7 @@ muse_unslime(
vis |= canseemon(mon); /* burning potion may improve visibility */
if (vis) {
if (!Unaware)
obj->dknown = 1; /* hero is watching mon drink obj */
observe_object(obj); /* hero is watching mon drink obj */
pline("%s quaffs a burning %s",
saw_lit ? upstart(strcpy(Pronoun, mhe(mon))) : Monnam(mon),
simpleonames(obj));