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

portal feedback from #wizwhere

Browse Source 
The #wizwhere command (formerly ^O) has given the location of the
invocation position when on the relevant level for ages.  It was
extended in 3.6.0 to give magic portal location when on the any
of the four elemental plane levels.  Extend it again to show the
location of any magic portal when on a level which has one (so an
extra line of feedback at end of ^O output for quest entry, quest
home, Ft.Ludios entry once that's been assigned, and Ft.Ludios).
This commit is contained in:
PatR
2018-04-09 14:12:43 -07:00
parent 44eed82d41
commit f9f7eb9633
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/dungeon.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 dungeon.c $NHDT-Date: 1523232258 2018/04/09 00:04:18 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.86 $ */
/* NetHack 3.6 dungeon.c $NHDT-Date: 1523308357 2018/04/09 21:12:37 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.87 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -966,7 +966,7 @@ init_dungeons()
instead of 0, so adjust the start point to shift endgame up */
if (dunlevs_in_dungeon(&x->dlevel) > 1 - dungeons[i].depth_start)
dungeons[i].depth_start -= 1;
/* TO DO: strip "dummy" out all the way here,
/* TODO: strip "dummy" out all the way here,
so that it's hidden from <ctrl/O> feedback. */
}
@@ -1848,8 +1848,8 @@ xchar *rdgn;
branch *br;
anything any;
struct lchoice lchoices;
winid win = create_nhwindow(NHW_MENU);
if (bymenu) {
start_menu(win);
lchoices.idx = 0;
@@ -1952,26 +1952,35 @@ xchar *rdgn;
Sprintf(buf, "Invocation position @ (%d,%d), hero @ (%d,%d)",
inv_pos.x, inv_pos.y, u.ux, u.uy);
putstr(win, 0, buf);
}
/*
* The following is based on the assumption that the inter-level portals
* created by the level compiler (not the dungeon compiler) only exist
* one per level (currently true, of course).
*/
else if (Is_earthlevel(&u.uz) || Is_waterlevel(&u.uz)
|| Is_firelevel(&u.uz) || Is_airlevel(&u.uz)) {
} else {
struct trap *trap;
/* if current level has a magic portal, report its location;
this assumes that there is at most one magic portal on any
given level; quest and ft.ludios have pairs (one in main
dungeon matched with one in the corresponding branch), the
elemental planes have singletons (connection to next plane) */
*buf = '\0';
for (trap = ftrap; trap; trap = trap->ntrap)
if (trap->ttyp == MAGIC_PORTAL)
break;
putstr(win, 0, "");
if (trap)
Sprintf(buf, "Portal @ (%d,%d), hero @ (%d,%d)", trap->tx,
trap->ty, u.ux, u.uy);
else
Sprintf(buf, "No portal found.");
putstr(win, 0, buf);
Sprintf(buf, "Portal @ (%d,%d), hero @ (%d,%d)",
trap->tx, trap->ty, u.ux, u.uy);
/* only report "no portal found" when actually expecting a portal */
else if (Is_earthlevel(&u.uz) || Is_waterlevel(&u.uz)
|| Is_firelevel(&u.uz) || Is_airlevel(&u.uz)
|| Is_qstart(&u.uz) || at_dgn_entrance("The Quest")
|| Is_knox(&u.uz))
Strcpy(buf, "No portal found.");
/* only give output if we found a portal or expected one and didn't */
if (*buf) {
putstr(win, 0, "");
putstr(win, 0, buf);
}
}
display_nhwindow(win, TRUE);