From 62c271f21b2aecb926a7ed0ed465cb6404bcddb5 Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 13 Dec 2019 14:01:28 -0800 Subject: [PATCH 1/4] polymorphed steed phrasing When you ride your steed into a polymorph trap and it changes into a creature that can still wear the saddle, the message is |You have to adjust youself in the saddle on . which sounds as if the game is telling the player that he or she needs to do something. Simplify it to |You adjust yourself in the saddle on . --- src/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/trap.c b/src/trap.c index 51436d47a..941025654 100644 --- a/src/trap.c +++ b/src/trap.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 trap.c $NHDT-Date: 1569189770 2019/09/22 22:02:50 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.317 $ */ +/* NetHack 3.6 trap.c $NHDT-Date: 1576274483 2019/12/13 22:01:23 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.325 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1639,7 +1639,7 @@ struct obj *otmp; SUPPRESS_SADDLE, FALSE)); if (mdat != steed->data) (void) strsubst(buf, "your ", "your new "); - You("have to adjust yourself in the saddle on %s.", buf); + You("adjust yourself in the saddle on %s.", buf); } } steedhit = TRUE; From f8fbe4e9893955fbbae7382249f55e6482aaba41 Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 13 Dec 2019 15:58:56 -0800 Subject: [PATCH 2/4] allow teleport onto the vibrating square Cherry-pick 3.7.0's 4a3d5f95d9e724a77cb94ff885b333c8c1c70b0d (github pull request #252). Slightly tricky because the fix entry nowgoes into a different file. fixes37.0 will need fixing up. --- doc/fixes36.4 | 3 ++- src/teleport.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/fixes36.4 b/doc/fixes36.4 index 5865224cc..c49854d28 100644 --- a/doc/fixes36.4 +++ b/doc/fixes36.4 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.0 $ $NHDT-Date: 1575665952 2019/12/06 20:59:12 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.2 $ $NHDT-Date: 1576281514 2019/12/13 23:58:34 $ This fixes36.4 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.3 in December 2019. Hypothetical version @@ -10,6 +10,7 @@ GDBPATH and GREPPATH from sysconf or -D... on compilation command line were being processed even if PANICTRACE was disabled but only being freed at end of game when that was enabled fix the article used in the message when your steed encounters a polymorph trap +alloc teleporting onto the vibrating square dozen-ish assorted spelling/typo fixes in messages and source comments diff --git a/src/teleport.c b/src/teleport.c index ab1e67c65..23af60aa2 100644 --- a/src/teleport.c +++ b/src/teleport.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 teleport.c $NHDT-Date: 1575245091 2019/12/02 00:04:51 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.94 $ */ +/* NetHack 3.6 teleport.c $NHDT-Date: 1576281515 2019/12/13 23:58:35 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.95 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */ /* NetHack may be freely redistributed. See license for details. */ @@ -263,8 +263,13 @@ teleok(x, y, trapok) register int x, y; boolean trapok; { - if (!trapok && t_at(x, y)) - return FALSE; + if (!trapok) { + /* allow teleportation onto vibrating square, it's not a real trap */ + struct trap *trap = t_at(x, y); + + if (trap && trap->ttyp != VIBRATING_SQUARE) + return FALSE; + } if (!goodpos(x, y, &youmonst, 0)) return FALSE; if (!tele_jump_ok(u.ux, u.uy, x, y)) From 84bdff69767df06bb64b2445a7c228b2f7d83e38 Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 5 Dec 2019 02:33:47 -0800 Subject: [PATCH 3/4] kinda/sorta fix github issue #246 Cherry-pick 3.7.0's 565e020573d56afb3eefafa4e8975d24b677c80d. Again, conflict because the fixes entry goes into a different file. When picking up from floor or removing from container fails because there aren't any inventory slots available, pickup/take-out stops. But the message |Your knapsack can't accomodate any more items. is inaccurate if there is gold beyond the stopping point. Actually continuing in order to pickup/take-out gold would require substantial changes, but varying the message to be |Your knapsack can't accomodate any more items (except gold). when stopping is a one line fix. The parenthesized remark is only added if there is actually some gold after the current object and is given regardless of whether autopickup happens to be targetting it. Fixes #246 --- doc/fixes36.4 | 5 ++++- src/pickup.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/fixes36.4 b/doc/fixes36.4 index c49854d28..d42e88c86 100644 --- a/doc/fixes36.4 +++ b/doc/fixes36.4 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.2 $ $NHDT-Date: 1576281514 2019/12/13 23:58:34 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.3 $ $NHDT-Date: 1576282492 2019/12/14 00:14:52 $ This fixes36.4 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.3 in December 2019. Hypothetical version @@ -11,6 +11,9 @@ GDBPATH and GREPPATH from sysconf or -D... on compilation command line were at end of game when that was enabled fix the article used in the message when your steed encounters a polymorph trap alloc teleporting onto the vibrating square +message "your knapsack can't accomodate any more items" when picking stuff up + or removing such from container was inaccurate if there was some gold + pending; vary the message rather than add more convoluted pickup code dozen-ish assorted spelling/typo fixes in messages and source comments diff --git a/src/pickup.c b/src/pickup.c index cd0fd118b..76f35aa8b 100644 --- a/src/pickup.c +++ b/src/pickup.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 pickup.c $NHDT-Date: 1570566381 2019/10/08 20:26:21 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.235 $ */ +/* NetHack 3.6 pickup.c $NHDT-Date: 1576282488 2019/12/14 00:14:48 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.237 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1424,7 +1424,14 @@ boolean telekinesis; /* [exception for gold coins will have to change if silver/copper ones ever get implemented] */ && inv_cnt(FALSE) >= 52 && !merge_choice(invent, obj)) { - Your("knapsack cannot accommodate any more items."); + /* if there is some gold here (and we haven't already skipped it), + we aren't limited by the 52 item limit for it, but caller and + "grandcaller" aren't prepared to skip stuff and then pickup + just gold, so the best we can do here is vary the message */ + Your("knapsack cannot accommodate any more items%s.", + /* floor follows by nexthere, otherwise container so by nobj */ + nxtobj(obj, GOLD_PIECE, (boolean) (obj->where == OBJ_FLOOR)) + ? " (except gold)" : ""); result = -1; /* nothing lifted */ } else { result = 1; From c0b74f6ba42292cbff4ae7cfadc22c55bea9c0ba Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 13 Dec 2019 17:39:39 -0800 Subject: [PATCH 4/4] fixes typo --- doc/fixes36.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/fixes36.4 b/doc/fixes36.4 index d42e88c86..8d466e096 100644 --- a/doc/fixes36.4 +++ b/doc/fixes36.4 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.3 $ $NHDT-Date: 1576282492 2019/12/14 00:14:52 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.4 $ $NHDT-Date: 1576287569 2019/12/14 01:39:29 $ This fixes36.4 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.3 in December 2019. Hypothetical version @@ -10,7 +10,7 @@ GDBPATH and GREPPATH from sysconf or -D... on compilation command line were being processed even if PANICTRACE was disabled but only being freed at end of game when that was enabled fix the article used in the message when your steed encounters a polymorph trap -alloc teleporting onto the vibrating square +allow teleporting onto the vibrating square message "your knapsack can't accomodate any more items" when picking stuff up or removing such from container was inaccurate if there was some gold pending; vary the message rather than add more convoluted pickup code