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

Livelog declined wishes and (non-cursed) genocides

Browse Source
This commit is contained in:
vultur-cadens
2022-05-20 21:32:08 -07:00
committed by PatR
parent 8848a81990
commit 53f782dcd6
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/read.c
View File

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

1
src/zap.c
View File

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