From 95d2c023017ffdf78a3b706d58b0dcb8cd0ddea1 Mon Sep 17 00:00:00 2001 From: Deskull <61610939+sikabane-works@users.noreply.github.com> Date: Mon, 12 Apr 2021 20:45:01 +0900 Subject: [PATCH] =?utf8?q?[Fix]=20=E8=A6=8B=E3=81=88=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=AA=E3=81=84=E3=83=A2=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=BC?= =?utf8?q?=E3=81=AE=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E3=83=A1=E3=83=83?= =?utf8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=8C=E4=B8=8D=E8=87=AA=E7=84=B6?= =?utf8?q?=E3=81=AB=E6=B5=81=E3=82=8C=E3=82=8B=E3=80=82=20/=20Unnatural=20?= =?utf8?q?message=20by=20damage=20of=20unseen=20monsters.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/effect/effect-monster.cpp | 2 +- src/monster/monster-describer.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/effect/effect-monster.cpp b/src/effect/effect-monster.cpp index 508d9c5d8..4a80268c2 100644 --- a/src/effect/effect-monster.cpp +++ b/src/effect/effect-monster.cpp @@ -492,7 +492,7 @@ static void effect_damage_gives_bad_status(player_type *caster_ptr, effect_monst { int tmp_damage = em_ptr->dam; em_ptr->dam = mon_damage_mod(caster_ptr, em_ptr->m_ptr, em_ptr->dam, (bool)(em_ptr->effect_type == GF_PSY_SPEAR)); - if ((tmp_damage > 0) && (em_ptr->dam == 0)) + if ((tmp_damage > 0) && (em_ptr->dam == 0) && em_ptr->seen) em_ptr->note = _("はダメージを受けていない。", " is unharmed."); if (em_ptr->dam > em_ptr->m_ptr->hp) diff --git a/src/monster/monster-describer.cpp b/src/monster/monster-describer.cpp index 7df730c42..fffcdc91c 100644 --- a/src/monster/monster-describer.cpp +++ b/src/monster/monster-describer.cpp @@ -256,10 +256,13 @@ void message_pain(player_type *player_ptr, MONSTER_IDX m_idx, HIT_POINT dam) GAME_TEXT m_name[MAX_NLEN]; + monster_desc(player_ptr, m_name, m_ptr, 0); if (dam == 0) { - msg_format(_("%^sはダメージを受けていない。", "%^s is unharmed."), m_name); + if (m_ptr->ml) { + msg_format(_("%^sはダメージを受けていない。", "%^s is unharmed."), m_name); + } return; } -- 2.11.0