From 9d67cd15970d06107d5d823141eb44e8e1a287b1 Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 15 Mar 2019 17:51:39 -0700 Subject: [PATCH] status lines' "End Game" Change the generic status line location "End Game" to relevant element name "Earth", "Air", &c. ("Plane of " might be too long if hungry and encumbered and afflicted by conditions. "Astral Plane" is already specific so not affected.) --- doc/fixes36.2 | 4 +++- src/botl.c | 15 +++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/fixes36.2 b/doc/fixes36.2 index 593ed02d2..a0297e8a5 100644 --- a/doc/fixes36.2 +++ b/doc/fixes36.2 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.275 $ $NHDT-Date: 1552637574 2019/03/15 08:12:54 $ +$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.276 $ $NHDT-Date: 1552697495 2019/03/16 00:51:35 $ 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, @@ -392,6 +392,8 @@ if steed ate a mimic corpse and began masquerading as something, hero could kicking an object stack moves the topmost 1, but range calculation used the weight of the whole stack to decide how far it would move, possibly yielding "thump" result with no movement despite being a light item +status lines' dungeon location field in the elemental planes now shows Earth + or Air or Fire or Water instead of generic End Game Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository diff --git a/src/botl.c b/src/botl.c index e58f5c398..152503a10 100644 --- a/src/botl.c +++ b/src/botl.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 botl.c $NHDT-Date: 1549755174 2019/02/09 23:32:54 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.134 $ */ +/* NetHack 3.6 botl.c $NHDT-Date: 1552697495 2019/03/16 00:51:35 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.135 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2006. */ /* NetHack may be freely redistributed. See license for details. */ @@ -376,13 +376,16 @@ char *buf; int ret = 1; /* TODO: Add in dungeon name */ - if (Is_knox(&u.uz)) + if (Is_knox(&u.uz)) { Sprintf(buf, "%s ", dungeons[u.uz.dnum].dname); - else if (In_quest(&u.uz)) + } else if (In_quest(&u.uz)) { Sprintf(buf, "Home %d ", dunlev(&u.uz)); - else if (In_endgame(&u.uz)) - Sprintf(buf, Is_astralevel(&u.uz) ? "Astral Plane " : "End Game "); - else { + } else if (In_endgame(&u.uz)) { + /* [3.6.2: this used to be "Astral Plane" or generic "End Game"] */ + (void) endgamelevelname(buf, depth(&u.uz)); + (void) strsubst(buf, "Plane of ", ""); /* just keep */ + Strcat(buf, " "); + } else { /* ports with more room may expand this one */ Sprintf(buf, "Dlvl:%-2d ", depth(&u.uz)); ret = 0;