From 04e68b7d32d7850c1593d0a99974ba638d91f004 Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 3 May 2021 14:10:09 -0700 Subject: [PATCH] fix pull request #498 - unseen demon "looks angry" When a potentially bribable demon lord becomes angry because the hero is wielding Excalibur or Demonbane, avoid "It looks angry" if the demon can't be seen. The pull request just suppressed the message in that situation; I've added an alternate one. Fixes #498 --- doc/fixes37.0 | 2 ++ src/minion.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/fixes37.0 b/doc/fixes37.0 index 907fcbd04..d1d2cf104 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -491,6 +491,8 @@ some rolling boulder trap feedback was inconsistent change "killed by , while {paralyzed|frozen} by " into "killed by , while {paralyzed|frozen}" if the killer caused hero's helplessness +"It looks very angry" would be given if a hero wielding Excalibur or Demonbane + offended an unseen demon lord Fixes to 3.7.0-x Problems that Were Exposed Via git Repository diff --git a/src/minion.c b/src/minion.c index 54869a8bd..faf30590c 100644 --- a/src/minion.c +++ b/src/minion.c @@ -225,7 +225,10 @@ demon_talk(register struct monst *mtmp) if (uwep && (uwep->oartifact == ART_EXCALIBUR || uwep->oartifact == ART_DEMONBANE)) { - pline("%s looks very angry.", Amonnam(mtmp)); + if (canspotmon(mtmp)) + pline("%s looks very angry.", Amonnam(mtmp)); + else + You_feel("tension building."); mtmp->mpeaceful = mtmp->mtame = 0; set_malign(mtmp); newsym(mtmp->mx, mtmp->my);