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

Show genocide prompt help iff 'cmdassist' enabled

Browse Source 
The "[type the name]" prompt seems appropriate for handling via
cmdassist, so experienced players who don't need the help can hide it.
I also added a corresponding help note for the class genocide prompt.
This commit is contained in:
Michael Meyer
2022-09-27 21:08:30 -04:00
committed by PatR
parent fc7a2a9869
commit 365d728be7
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/read.c
View File

@@ -2463,7 +2463,7 @@ do_class_genocide(void)
{ {
int i, j, immunecnt, gonecnt, goodcnt, class, feel_dead = 0; int i, j, immunecnt, gonecnt, goodcnt, class, feel_dead = 0;
int ll_done = 0; int ll_done = 0;
char buf[BUFSZ] = DUMMY; char buf[BUFSZ] = DUMMY, promptbuf[QBUFSZ];
boolean gameover = FALSE; /* true iff killed self */ boolean gameover = FALSE; /* true iff killed self */
for (j = 0;; j++) { for (j = 0;; j++) {
@@ -2471,7 +2471,10 @@ do_class_genocide(void)
pline1(thats_enough_tries); pline1(thats_enough_tries);
return; return;
} }
getlin("What class of monsters do you wish to genocide?", buf); Strcpy(promptbuf, "What class of monsters do you want to genocide?");
if (iflags.cmdassist && j > 0)
Strcat(promptbuf, " [type the symbol representing a class]");
getlin(promptbuf, buf);
(void) mungspaces(buf); (void) mungspaces(buf);
/* choosing "none" preserves genocideless conduct */ /* choosing "none" preserves genocideless conduct */
if (*buf == '\033' || !strcmpi(buf, "none") if (*buf == '\033' || !strcmpi(buf, "none")
@@ -2629,7 +2632,7 @@ do_genocide(int how)
/* 3 = forced genocide of player */ /* 3 = forced genocide of player */
/* 5 (4 | 1) = normal genocide from throne */ /* 5 (4 | 1) = normal genocide from throne */
{ {
char buf[BUFSZ] = DUMMY; char buf[BUFSZ] = DUMMY, promptbuf[QBUFSZ];
register int i, killplayer = 0; register int i, killplayer = 0;
register int mndx; register int mndx;
register struct permonst *ptr; register struct permonst *ptr;
@@ -2650,8 +2653,10 @@ do_genocide(int how)
pline1(thats_enough_tries); pline1(thats_enough_tries);
return; return;
} }
getlin("What monster do you want to genocide? [type the name]", Strcpy(promptbuf, "What monster do you want to genocide?");
buf); if (iflags.cmdassist && i > 0)
Strcat(promptbuf, " [type the name of a monster]");
getlin(promptbuf, buf);
(void) mungspaces(buf); (void) mungspaces(buf);
/* choosing "none" preserves genocideless conduct */ /* choosing "none" preserves genocideless conduct */
if (*buf == '\033' || !strcmpi(buf, "none") if (*buf == '\033' || !strcmpi(buf, "none")