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

more #819 - magic harp

Browse Source 
The log message for commit 231bd75b7f
said that magic harp was changed to behave the same as scroll/spell
of taming, but the scroll and spell pacify an angry shopkeeper even
if the shk resists.  Change magic harp to do likewise.
This commit is contained in:
PatR
2022-07-17 16:38:39 -07:00
parent 50e98c7e36
commit 094da9b983
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/music.c
+4 -1
View File
@@ -205,7 +205,10 @@ charm_monsters(int distance)
continue; continue;
if (distu(mtmp->mx, mtmp->my) <= distance) { if (distu(mtmp->mx, mtmp->my) <= distance) {
if (!resist(mtmp, TOOL_CLASS, 0, NOTELL)) /* a shopkeeper can't be tamed but tamedog() pacifies an angry
one; do that even if mtmp resists in order to behave the same
as a non-cursed scroll of taming or spell of charm monster */
if (!resist(mtmp, TOOL_CLASS, 0, NOTELL) || mtmp->isshk)
(void) tamedog(mtmp, (struct obj *) 0); (void) tamedog(mtmp, (struct obj *) 0);
} }
} }