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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2019-01-28 16:36:23 -05:00
parent fd92ecf74a 30237c73ec
commit 542019d31e
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dat/mines.des
+4 -2
View File
@@ -1,4 +1,4 @@
# NetHack 3.6 mines.des $NHDT-Date: 1432512783 2015/05/25 00:13:03 $ $NHDT-Branch: master $:$NHDT-Revision: 1.25 $ # NetHack 3.6 mines.des $NHDT-Date: 1548631704 2019/01/27 23:28:24 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.30 $
# Copyright (c) 1989-95 by Jean-Christophe Collet # Copyright (c) 1989-95 by Jean-Christophe Collet
# Copyright (c) 1991-95 by M. Stephenson # Copyright (c) 1991-95 by M. Stephenson
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
@@ -1023,8 +1023,10 @@ NON_DIGGABLE:(00,00,52,17)
NON_DIGGABLE:(53,00,74,00) NON_DIGGABLE:(53,00,74,00)
NON_DIGGABLE:(53,17,74,17) NON_DIGGABLE:(53,17,74,17)
NON_DIGGABLE:(74,01,74,16) NON_DIGGABLE:(74,01,74,16)
NON_DIGGABLE:(53,07,55,07) NON_DIGGABLE:(53,07,53,07)
NON_DIGGABLE:(58,12,58,13)
NON_DIGGABLE:(53,14,61,14) NON_DIGGABLE:(53,14,61,14)
NON_DIGGABLE:(61,15,61,16)
# The Gnome King's wine cellar. # The Gnome King's wine cellar.
# the Trespassers sign is a long-running joke # the Trespassers sign is a long-running joke
ENGRAVING:(12,03),engrave,"You are now entering the Gnome King's wine cellar." ENGRAVING:(12,03),engrave,"You are now entering the Gnome King's wine cellar."
doc/fixes36.2
+8 -10
View File
@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.235 $ $NHDT-Date: 1548209734 2019/01/23 02:15:34 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.239 $ $NHDT-Date: 1548695445 2019/01/28 17:10:45 $
This fixes36.2 file is here to capture information about updates in the 3.6.x This fixes36.2 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.1 in April 2018. Please note, however, lineage following the release of 3.6.1 in April 2018. Please note, however,
@@ -335,6 +335,8 @@ entering Ft.Ludios with a lit candle lit up the entire entry room except for
one corner spot; that corner is beyond candle radius but other spots one corner spot; that corner is beyond candle radius but other spots
even further away were being shown; force the walls to unlit in order even further away were being shown; force the walls to unlit in order
to prevent those wall spots from showing so soon to prevent those wall spots from showing so soon
a couple of short wall segments in the "Gnome King's Wine Cellar" variant of
Mines' End were diggable; one stone spot which should have been, wasn't
boulder dropped or launched by a monster onto a monster trapped in a pit and boulder dropped or launched by a monster onto a monster trapped in a pit and
killing it credited/blamed the hero and might trigger a deltrap panic killing it credited/blamed the hero and might trigger a deltrap panic
the simulation of dual weapon combat when polymorphed into a form with more the simulation of dual weapon combat when polymorphed into a form with more
@@ -350,6 +352,9 @@ various non-weapon attacks while polymorphed didn't inflict blessed or silver
hero poly'd into rope golem form could choke headless or non-breathing monsts hero poly'd into rope golem form could choke headless or non-breathing monsts
hero poly'd into creature with hug attack could hug a long worm's tail which hero poly'd into creature with hug attack could hug a long worm's tail which
rendered the whole worm immobile rendered the whole worm immobile
smudging of an engraving has been relocated to after a succesful move
and both your former location and your resulting location are
subject to the smudging
Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository
@@ -405,15 +410,8 @@ when engulfed while in a shop, dropping an item into the engulfer and then
using ':' to look at current location could cause a crash using ':' to look at current location could cause a crash
when items were on the floor just inside a shop's door where the shopkeeper when items were on the floor just inside a shop's door where the shopkeeper
doesn't buy and sell stuff, those items showed a 'for sale' price doesn't buy and sell stuff, those items showed a 'for sale' price
separate most of domove() into domove_core() and introduce a pair of global having an artifact wish be refused ("for a moment you feel <artifact> in
variables that allow for assessment of domove_core() results in your hands, but it disappears") would immediately segfault
domove() after one of the many return paths
new domove()-related global variables mentioned above also replace a couple
of booleans in rhack() that were used for similar upcoming action
identification
smudging of an engraving has been relocated and follows domove_core() and is
carried out only after a successful move attempt; your former
location and resulting location are both potentially impacted now
tty: turn off an optimization that is the suspected cause of Windows reported tty: turn off an optimization that is the suspected cause of Windows reported
partial status lines following level changes partial status lines following level changes
tty: ensure that current status fields are always copied to prior status tty: ensure that current status fields are always copied to prior status
src/objnam.c
+2 -1
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 objnam.c $NHDT-Date: 1547025168 2019/01/09 09:12:48 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.233 $ */ /* NetHack 3.6 objnam.c $NHDT-Date: 1548695445 2019/01/28 17:10:45 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.234 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -3984,6 +3984,7 @@ struct obj *no_wish;
otmp = (struct obj *) &zeroobj; otmp = (struct obj *) &zeroobj;
pline("For a moment, you feel %s in your %s, but it disappears!", pline("For a moment, you feel %s in your %s, but it disappears!",
something, makeplural(body_part(HAND))); something, makeplural(body_part(HAND)));
return otmp;
} }
if (halfeaten && otmp->oclass == FOOD_CLASS) { if (halfeaten && otmp->oclass == FOOD_CLASS) {