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

fix #H4072 - alchemy bugs

Browse Source 
The 3.6.0 feature of dipping only a subset when attempting to dip a large
stack of potions into another potion (other than water) was calculating
the size of the subset poorly.  Dipping 9 non-magic potions would always
dip the whole stack, but attempting to dip 10 would split the stack and
dip 2..9, so manually splitting off 9 in advance let the player always
get maximum yield.  This anomaly didn't extend to dipping magic potions,
where dipping 2 always dipped "all" 2 and attempting to dip 3..N dipped
2..min(N,9) regardless of N.  Also, the decision about whether what you
were dipping was magic was based on the potion being dipped even though
most alchemy formulas yield the same outcome when dipping magic potion
into non-magic or vice versa.

Change the splitting calculation to yield 3..min(N,8) for magic and 7..N
for non-magic, with no extra threshold that can produce anomalies in the
result.  Also, the determination of magic vs non-magic is based on the
outcome rather than either of the inputs--unless the outcome is random,
in which case it will be treated as magic if either of the input potions
is magic.
This commit is contained in:
PatR
2015-12-20 17:17:48 -08:00
parent 40ad82ed77
commit b66b5ee6c3
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/fixes36.1
View File

@@ -48,6 +48,8 @@ sceptre of might database entry word change
avoid "spellbook of novel" on discoveries list after object ID of novel
add novel to discoveries list after reading one
putting gold into hero-owned container on shop floor gave free credit
stack splitting for dipping large quantities of potions was done poorly
dipping fruit juice into enlightenment gave different result than the inverse
Platform- and/or Interface-Specific Fixes

39
src/potion.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 potion.c $NHDT-Date: 1449977945 2015/12/13 03:39:05 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.122 $ */
/* NetHack 3.6 potion.c $NHDT-Date: 1450660662 2015/12/21 01:17:42 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.123 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1725,6 +1725,7 @@ register struct obj *o1, *o2;
switch (o2->otyp) {
case POT_SICKNESS:
return POT_SICKNESS;
case POT_ENLIGHTENMENT:
case POT_SPEED:
return POT_BOOZE;
case POT_GAIN_LEVEL:
@@ -1746,7 +1747,7 @@ register struct obj *o1, *o2;
break;
}
return 0;
return STRANGE_OBJECT;
}
/* #dip command */
@@ -1859,19 +1860,25 @@ dodip()
potion->in_use = FALSE; /* didn't go poof */
return 1;
} else if (obj->oclass == POTION_CLASS && obj->otyp != potion->otyp) {
long amt = obj->quan;
int amt = (int) obj->quan;
boolean magic;
Strcpy(qbuf, "The");
if (amt > (objects[potion->otyp].oc_magic ? 2L : 9L)) {
mixture = mixtype(obj, potion);
magic = (mixture != STRANGE_OBJECT) ? objects[mixture].oc_magic
: (objects[obj->otyp].oc_magic || objects[potion->otyp].oc_magic);
Strcpy(qbuf, "The"); /* assume full stack */
if (amt > (magic ? 3 : 7)) {
/* trying to dip multiple potions will usually affect only a
subset; pick an amount between 2 and min(N,9), inclusive */
amt -= 1L;
do {
amt = (long) rnd((int) amt);
} while (amt >= 9L);
amt += 1L;
if (amt < obj->quan) {
obj = splitobj(obj, amt);
subset; pick an amount between 3 and 8, inclusive, for magic
potion result, between 7 and N for non-magic */
if (magic)
amt = rnd(min(amt, 8) - (3 - 1)) + (3 - 1); /* 1..6 + 2 */
else
amt = rnd(amt - (7 - 1)) + (7 - 1); /* 1..(N-6) + 6 */
if ((long) amt < obj->quan) {
obj = splitobj(obj, (long) amt);
Sprintf(qbuf, "%ld of the", obj->quan);
}
}
@@ -1894,7 +1901,7 @@ dodip()
potionbreathe(obj);
useupall(obj);
useup(potion);
losehp((int) (amt + rnd(9)), /* not physical damage */
losehp(amt + rnd(9), /* not physical damage */
"alchemic blast", KILLED_BY_AN);
return 1;
}
@@ -1903,7 +1910,7 @@ dodip()
if (Blind || Hallucination)
obj->dknown = 0;
if ((mixture = mixtype(obj, potion)) != 0) {
if (mixture != STRANGE_OBJECT) {
obj->otyp = mixture;
} else {
switch (obj->odiluted ? 1 : rnd(8)) {
@@ -2065,7 +2072,7 @@ more_dips:
potion->in_use = FALSE; /* didn't go poof */
if ((obj->otyp == UNICORN_HORN || obj->otyp == AMETHYST)
&& (mixture = mixtype(obj, potion)) != 0) {
&& (mixture = mixtype(obj, potion)) != STRANGE_OBJECT) {
char oldbuf[BUFSZ], newbuf[BUFSZ];
short old_otyp = potion->otyp;
boolean old_dknown = FALSE;