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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-05-19 10:12:39 -04:00
parent 8e972874b2 d1ce0aac89
commit 4be2f98063
5 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/invent.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 invent.c $NHDT-Date: 1555196229 2019/04/13 22:57:09 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.253 $ */
/* NetHack 3.6 invent.c $NHDT-Date: 1558234540 2019/05/19 02:55:40 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.258 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -3569,7 +3569,8 @@ register struct obj *otmp, *obj;
if (obj->oclass == COIN_CLASS)
return TRUE;
if (obj->bypass != otmp->bypass)
if (obj->bypass != otmp->bypass
|| obj->cursed != otmp->cursed || obj->blessed != otmp->blessed)
return FALSE;
if (obj->globby)
@@ -3579,7 +3580,6 @@ register struct obj *otmp, *obj;
*/
if (obj->unpaid != otmp->unpaid || obj->spe != otmp->spe
|| obj->cursed != otmp->cursed || obj->blessed != otmp->blessed
|| obj->no_charge != otmp->no_charge || obj->obroken != otmp->obroken
|| obj->otrapped != otmp->otrapped || obj->lamplit != otmp->lamplit)
return FALSE;

2
src/shk.c
View File

@@ -4932,7 +4932,7 @@ struct obj *obj_absorber, *obj_absorbed;
amount = bp->price;
bill_dummy_object(obj_absorbed);
verbalize(
"You owe me %ld %s for my %s that %s with your%s",
"You owe me %ld %s for my %s that you %s with your%s",
amount, currency(amount), obj_typename(obj_absorbed->otyp),
ANGRY(shkp) ? "had the audacity to mix" :
"just mixed",