pull request #768 - log declined wish or genocide

Pull request from vultur-cadens:  if a wish is declined by asking
for "nothing" or "none" or "nil", log that for gamelog/livelog as a
declined wish.  Likewise when specifying monster species or class to
genocide as "none" or "nothing" or ESC, log it as declined genocide.

Closes #768
This commit is contained in:
PatR
2022-06-02 06:58:19 -07:00
2 changed files with 7 additions and 1 deletions

View File

@@ -2473,8 +2473,11 @@ do_class_genocide(void)
} while (!*buf);
/* choosing "none" preserves genocideless conduct */
if (*buf == '\033' || !strcmpi(buf, "none")
|| !strcmpi(buf, "nothing"))
|| !strcmpi(buf, "nothing")) {
livelog_printf(LL_GENOCIDE,
"declined to perform class genocide");
return;
}
class = name_to_monclass(buf, (int *) 0);
if (class == 0 && (i = name_to_mon(buf, (int *) 0)) != NON_PM)
@@ -2655,6 +2658,8 @@ do_genocide(int how)
if (!(how & REALLY) && (ptr = rndmonst()) != 0)
break; /* remaining checks don't apply */
livelog_printf(LL_GENOCIDE,
"declined to perform genocide");
return;
}

View File

@@ -5673,6 +5673,7 @@ makewish(void)
} else if (otmp == &nothing) {
/* explicitly wished for "nothing", presumably attempting
to retain wishless conduct */
livelog_printf(LL_WISH, "declined to make a wish");
return;
}