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

tutorial tweaks

Browse Source 
Replace tests against tutorial_dnum with 'In_tutorial()' predicate.

Give a message when entering the tutorial (via level change mechanism).

Likewise, give a message when resuming regular play.

If player uses #quit or ^C in the tutorial, ask whether to cut the
tutorial short and resume regular play; skip "Really quit?" if the
answer is yes.  Behavior is a bit odd for ^C + yes; it just sits there
until player types something.
This commit is contained in:
PatR
2023-06-04 00:22:14 -07:00
parent 2bbfed2183
commit ee27ec97d1
6 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/end.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 end.c $NHDT-Date: 1674546299 2023/01/24 07:44:59 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.265 $ */
/* NetHack 3.7 end.c $NHDT-Date: 1685863329 2023/06/04 07:22:09 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.274 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -327,7 +327,13 @@ done1(int sig_unused UNUSED)
int
done2(void)
{
if (!paranoid_query(ParanoidQuit, "Really quit?")) {
boolean abandon_tutorial = FALSE;
if (In_tutorial(&u.uz)
&& y_n("Switch from the tutorial back to regular play?") == 'y')
abandon_tutorial = TRUE;
if (abandon_tutorial || !paranoid_query(ParanoidQuit, "Really quit?")) {
#ifndef NO_SIGNAL
(void) signal(SIGINT, (SIG_RET_TYPE) done1);
#endif
@@ -340,8 +346,13 @@ done2(void)
u.uinvulnerable = FALSE; /* avoid ctrl-C bug -dlc */
u.usleep = 0;
}
if (abandon_tutorial)
schedule_goto(&u.ucamefrom, UTOTYPE_ATSTAIRS,
"Resuming regular play", (char *) 0);
return ECMD_OK;
}
#if (defined(UNIX) || defined(VMS) || defined(LATTICE))
if (wizard) {
int c;