[Fix] カオス効果の打撃で地震の確率チェックを通ると発動したか否かに関わらず「ダンジョンが崩れ始める！」というメッセージが表示されるバグを修正

diff --git a/src/melee/melee-switcher.cpp b/src/melee/melee-switcher.cpp
index 3515ae6..713b7e2 100644 (file)
--- a/src/melee/melee-switcher.cpp
+++ b/src/melee/melee-switcher.cpp
@@ -289,8 +289,8 @@ void decide_monster_attack_effect(PlayerType *player_ptr, mam_type *mam_ptr)
         if (one_in_(250)) {
             const auto *floor_ptr = player_ptr->current_floor_ptr;
             if (floor_ptr->is_in_dungeon() && (!floor_ptr->is_in_quest() || !QuestType::is_fixed(floor_ptr->quest_number))) {
-                msg_print(_("カオスの力でダンジョンが崩れ始める！", "The dungeon tumbles by the chaotic power!"));
                 if (mam_ptr->damage > 23) {
+                    msg_print(_("カオスの力でダンジョンが崩れ始める！", "The dungeon tumbles by the chaotic power!"));
                     earthquake(player_ptr, mam_ptr->m_ptr->fy, mam_ptr->m_ptr->fx, 8, mam_ptr->m_idx);
                 }
             }

diff --git a/src/monster-attack/monster-attack-switcher.cpp b/src/monster-attack/monster-attack-switcher.cpp
index d92569d..166c8c5 100644 (file)
--- a/src/monster-attack/monster-attack-switcher.cpp
+++ b/src/monster-attack/monster-attack-switcher.cpp
@@ -565,8 +565,8 @@ void switch_monster_blow_to_player(PlayerType *player_ptr, MonsterAttackPlayer *
             monap_ptr->obvious = true;
             const auto *floor_ptr = player_ptr->current_floor_ptr;
             if (floor_ptr->is_in_dungeon() && (!floor_ptr->is_in_quest() || !QuestType::is_fixed(floor_ptr->quest_number))) {
-                msg_print(_("カオスの力でダンジョンが崩れ始める！", "The dungeon tumbles by the chaotic power!"));
                 if (monap_ptr->damage > 23 || monap_ptr->explode) {
+                    msg_print(_("カオスの力でダンジョンが崩れ始める！", "The dungeon tumbles by the chaotic power!"));
                     earthquake(player_ptr, monap_ptr->m_ptr->fy, monap_ptr->m_ptr->fx, 8, monap_ptr->m_idx);
                     break;
                 }