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-09-23 01:01:34 -04:00
parent 89feb0cad0 0434437e99
commit 04526c8e20
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.3
+5 -1
View File
@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.114 $ $NHDT-Date: 1568922510 2019/09/19 19:48:30 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.115 $ $NHDT-Date: 1569189769 2019/09/22 22:02:49 $
This fixes36.3 file is here to capture information about updates in the 3.6.x This fixes36.3 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.2 in May 2019. Please note, however, lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -145,6 +145,10 @@ when rubbing a ring on a touchstone, all types of rings were treated as if
they were gems; an iron ring made a cyan streak instead of yielding they were gems; an iron ring made a cyan streak instead of yielding
"scritch, scritch" and a gold ring made a yellow streak rather than "scritch, scritch" and a gold ring made a yellow streak rather than
a golden scratch a golden scratch
zapping self with wand of opening or spell of knock to escape from a trap
reported "you're released from <trap>" rather than "from the <trap>"
zapping self with wand of opening or spell of knock to escape from a pit trap
didn't reset vision limits--only spots adjacent to pit were visible
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository
src/trap.c
+5 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 trap.c $NHDT-Date: 1545259936 2018/12/19 22:52:16 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.313 $ */ /* NetHack 3.6 trap.c $NHDT-Date: 1569189770 2019/09/22 22:02:50 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.317 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -4591,7 +4591,7 @@ boolean *noticed; /* set to true iff hero notices the effect; */
t = t_at(ishero ? u.ux : mon->mx, ishero ? u.uy : mon->my); t = t_at(ishero ? u.ux : mon->mx, ishero ? u.uy : mon->my);
if (ishero && u.utrap) { /* all u.utraptype values are holding traps */ if (ishero && u.utrap) { /* all u.utraptype values are holding traps */
which = ""; which = the_your[(!t || !t->tseen || !t->madeby_u) ? 0 : 1];
switch (u.utraptype) { switch (u.utraptype) {
case TT_LAVA: case TT_LAVA:
trapdescr = "molten lava"; trapdescr = "molten lava";
@@ -4602,6 +4602,7 @@ boolean *noticed; /* set to true iff hero notices the effect; */
break; break;
case TT_BURIEDBALL: case TT_BURIEDBALL:
trapdescr = "your anchor"; trapdescr = "your anchor";
which = "";
break; break;
case TT_BEARTRAP: case TT_BEARTRAP:
case TT_PIT: case TT_PIT:
@@ -4636,8 +4637,9 @@ boolean *noticed; /* set to true iff hero notices the effect; */
Sprintf(buf, "%s is", noit_Monnam(u.usteed)); Sprintf(buf, "%s is", noit_Monnam(u.usteed));
else else
Strcpy(buf, "You are"); Strcpy(buf, "You are");
pline("%s released from %s%s.", buf, which, trapdescr);
reset_utrap(TRUE); reset_utrap(TRUE);
vision_full_recalc = 1; /* vision limits can change (pit escape) */
pline("%s released from %s%s.", buf, which, trapdescr);
} else { } else {
if (!mon->mtrapped) if (!mon->mtrapped)
return FALSE; return FALSE;