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

pull request #882 - prompting for genocide target

Browse Source 
Pull request from entrez:  genocide prompt has a short explanation
appended.  Skip that on first try, and on all tries if 'cmd_assist'
option is Off.

For class genocide, don't retry an unlimited number of times if
player supplies an empty response.  Any empty response will now
count toward the 5 chances available to supply a valid choice, as
it does with single genocide.

Fixes #882
This commit is contained in:
PatR
2022-09-28 14:48:48 -07:00
parent c88e5f2f8b 365d728be7
commit 40b16eb8c7
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/read.c
View File

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