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

fix engraving with miscellaneous items

Browse Source 
Reported directly to devteam:  when selecting an item to engrave
with, "getobj refactor"'s stylus_ok() classified none-of-the-above
objects as not viable instead of allowing arbitrary things to
engrave in the dust or give specific can't-use-that messages like
for food.  Make the suggested fix:  change default result when
checking an inventory item for applicability from GETOBJ_EXCLUDE
to GETOBJ_DOWNPLAY.

Engrave feedback rather than getobj selection:  splash of venom
isn't necessarily wizard mode-only so don't reject attempting to
engrave with it as using an illegal object.  And remove the extra
question mark from its "poison pen" message.
This commit is contained in:
PatR
2021-08-05 12:32:30 -07:00
parent fdf0bfd8a4
commit 91ee7f28ee
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes37.0
View File

@@ -733,6 +733,7 @@ give genetic engineers teleport capability (as they had in slash'em); 'port
if an invisible hero managed to convert an unaligned altar to an aligned one if an invisible hero managed to convert an unaligned altar to an aligned one
with color enabled, altar wasn't immediately redrawn with new color with color enabled, altar wasn't immediately redrawn with new color
repair some regressions to (a)pply introduced by "getobj refactor" patch repair some regressions to (a)pply introduced by "getobj refactor" patch
getobj too: allow attempting to (E)ngrave with any item in inventory
fix ^X feedback when held typo: "unseen createure" -> "unseen creature" fix ^X feedback when held typo: "unseen createure" -> "unseen creature"
if a <foo> corpse was set to revive as a <foo> zombie and corpse was partly if a <foo> corpse was set to revive as a <foo> zombie and corpse was partly
eaten at revival time and monster <foo> is defined as providing more eaten at revival time and monster <foo> is defined as providing more

13
src/engrave.c
View File

@@ -442,7 +442,7 @@ stylus_ok(struct obj *obj)
&& (obj->otyp == TOWEL || obj->otyp == MAGIC_MARKER)) && (obj->otyp == TOWEL || obj->otyp == MAGIC_MARKER))
return GETOBJ_SUGGEST; return GETOBJ_SUGGEST;
return GETOBJ_EXCLUDE; return GETOBJ_DOWNPLAY;
} }
/* can hero engrave at all (at their location)? */ /* can hero engrave at all (at their location)? */
@@ -879,11 +879,12 @@ doengrave(void)
break; break;
case VENOM_CLASS: case VENOM_CLASS:
if (wizard) { /* this used to be ``if (wizard)'' and fall through to ILLOBJ_CLASS
pline("Writing a poison pen letter??"); for normal play, but splash of venom isn't "illegal" because it
break; could occur in normal play via wizard mode bones */
} pline("Writing a poison pen letter?");
/*FALLTHRU*/ break;
case ILLOBJ_CLASS: case ILLOBJ_CLASS:
impossible("You're engraving with an illegal object!"); impossible("You're engraving with an illegal object!");
break; break;