From 094da9b983a1dbbe171946a7cee32e565c59245b Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 17 Jul 2022 16:38:39 -0700 Subject: [PATCH] more #819 - magic harp The log message for commit 231bd75b7f5ddc3ef0f745a75ea3566cc4055d99 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. --- src/music.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/music.c b/src/music.c index e59470318..6827ffb68 100644 --- a/src/music.c +++ b/src/music.c @@ -205,7 +205,10 @@ charm_monsters(int distance) continue; 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); } }