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

<Someone>'s potion of polymorph suggestion

Browse Source 
> Should a potion of polymorph autoidentify if the item dipped into it
> polymorphs into (as far as you know) the same item? It just seemed
> odd, choosing "Z - a wand of light" to dip into a potion, to get
> "Z - a wand of light" returned, and the potion identified.
>
> (Ideally, I'd like to see it be "Nothing seems to happen.", as for
> a failed-this-time unicorn horn.)
This commit is contained in:
nethack.allison
2002-03-06 00:22:37 +00:00
parent 51fac7ac64
commit a618b5ed03
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/potion.c
+10 -4
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)potion.c 3.4 2002/02/07 */ /* SCCS Id: @(#)potion.c 3.4 2002/03/05 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1606,6 +1606,7 @@ dodip()
pline(nothing_happens); pline(nothing_happens);
} else { } else {
boolean was_wep = FALSE, was_swapwep = FALSE, was_quiver = FALSE; boolean was_wep = FALSE, was_swapwep = FALSE, was_quiver = FALSE;
short save_otyp = obj->otyp;
/* KMH, conduct */ /* KMH, conduct */
u.uconduct.polypiles++; u.uconduct.polypiles++;
@@ -1619,9 +1620,14 @@ dodip()
else if (was_swapwep) setuswapwep(obj); else if (was_swapwep) setuswapwep(obj);
else if (was_quiver) setuqwep(obj); else if (was_quiver) setuqwep(obj);
makeknown(POT_POLYMORPH); if (obj->otyp != save_otyp) {
useup(potion); makeknown(POT_POLYMORPH);
prinv((char *)0, obj, 0L); useup(potion);
prinv((char *)0, obj, 0L);
} else {
pline("Nothing seems to happen.");
useup(potion);
}
} }
return(1); return(1);
} else if(obj->oclass == POTION_CLASS && obj->otyp != potion->otyp) { } else if(obj->oclass == POTION_CLASS && obj->otyp != potion->otyp) {