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

status lines' "End Game"

Browse Source 
Change the generic status line location "End Game" to relevant element
name "Earth", "Air", &c.  ("Plane of <element>" might be too long if
hungry and encumbered and afflicted by conditions.  "Astral Plane" is
already specific so not affected.)
This commit is contained in:
PatR
2019-03-15 17:51:39 -07:00
parent ed55fa23f6
commit 9d67cd1597
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/fixes36.2
View File

@@ -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

15
src/botl.c
View File

@@ -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 <element> */
Strcat(buf, " ");
} else {
/* ports with more room may expand this one */
Sprintf(buf, "Dlvl:%-2d ", depth(&u.uz));
ret = 0;