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

Don't pacify unique monsters when untrapping them from web

Browse Source
This commit is contained in:
Pasi Kallinen
2022-04-02 19:38:50 +03:00
parent 6977aef436
commit 38a6cee1ab
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes3-7-0.txt
View File

@@ -861,6 +861,7 @@ try to avoid locations with engraved Elbereth or scare monster scroll when
who are susceptible to those who are susceptible to those
be more flexible when wishing checks for artifact name matches; now allows be more flexible when wishing checks for artifact name matches; now allows
"firebrand" or "fire-brand" to yield "Fire Brand" "firebrand" or "fire-brand" to yield "Fire Brand"
exclude unique monsters from pacification when untrapped from web
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

1
src/trap.c
View File

@@ -4704,6 +4704,7 @@ reward_untrap(struct trap* ttmp, struct monst* mtmp)
if (!ttmp->madeby_u) { if (!ttmp->madeby_u) {
if (rnl(10) < 8 && !mtmp->mpeaceful && !helpless(mtmp) if (rnl(10) < 8 && !mtmp->mpeaceful && !helpless(mtmp)
&& !mtmp->mfrozen && !mindless(mtmp->data) && !mtmp->mfrozen && !mindless(mtmp->data)
&& unique_corpstat(mtmp->data)
&& mtmp->data->mlet != S_HUMAN) { && mtmp->data->mlet != S_HUMAN) {
mtmp->mpeaceful = 1; mtmp->mpeaceful = 1;
set_malign(mtmp); /* reset alignment */ set_malign(mtmp); /* reset alignment */