[delete] 未使用ファイルを削除

[hengband/hengband.git] / src / player / eldritch-horror.c

diff --git a/src/player/eldritch-horror.c b/src/player/eldritch-horror.c
index 65bc886..2a756c8 100644 (file)
--- a/src/player/eldritch-horror.c
+++ b/src/player/eldritch-horror.c
@@ -5,26 +5,32 @@
  */
 
 #include "player/eldritch-horror.h"
+#include "core/player-update-types.h"
 #include "core/stuff-handler.h"
-#include "floor/floor.h"
-#include "locale/vowel-checker.h"
+#include "monster-race/monster-race-hook.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
-#include "monster-race/monster-race-hook.h"
 #include "monster/horror-descriptions.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-info.h"
 #include "monster/monster-list.h"
 #include "monster/monster-util.h"
 #include "monster/smart-learn-types.h"
-#include "status/bad-status-setter.h"
-#include "player/player-effects.h"
-#include "player/player-status.h"
+#include "mutation/mutation-flag-types.h"
 #include "player/mimic-info-table.h"
+#include "player/player-status-flags.h"
+#include "player/player-status.h"
+#include "status/bad-status-setter.h"
+#include "status/base-status.h"
+#include "system/floor-type-definition.h"
 #include "view/display-messages.h"
 #include "world/world.h"
+#ifdef JP
+#else
+#include "locale/english.h"
+#endif
 
 /*!
  * @brief エルドリッチホラーの形容詞種別を決める
@@ -125,12 +131,13 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
         }
 
         see_eldritch_horror(m_name, r_ptr);
-        if (is_specific_player_race(creature_ptr, RACE_IMP) || is_specific_player_race(creature_ptr, RACE_BALROG) || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON)
-            || current_world_ptr->wizard)
+        if (is_specific_player_race(creature_ptr, RACE_IMP) || is_specific_player_race(creature_ptr, RACE_BALROG)
+            || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON) || current_world_ptr->wizard)
             return;
 
-        if (is_specific_player_race(creature_ptr, RACE_SKELETON) || is_specific_player_race(creature_ptr, RACE_ZOMBIE) || is_specific_player_race(creature_ptr, RACE_VAMPIRE)
-            || is_specific_player_race(creature_ptr, RACE_SPECTRE) || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_UNDEAD)) {
+        if (is_specific_player_race(creature_ptr, RACE_SKELETON) || is_specific_player_race(creature_ptr, RACE_ZOMBIE)
+            || is_specific_player_race(creature_ptr, RACE_VAMPIRE) || is_specific_player_race(creature_ptr, RACE_SPECTRE)
+            || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_UNDEAD)) {
             if (saving_throw(25 + creature_ptr->lev))
                 return;
         }
@@ -139,7 +146,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
         GAME_TEXT m_name[MAX_NLEN];
         concptr desc;
         get_mon_num_prep(creature_ptr, get_nightmare, NULL);
-        r_ptr = &r_info[get_mon_num(creature_ptr, MAX_DEPTH, 0)];
+        r_ptr = &r_info[get_mon_num(creature_ptr, 0, MAX_DEPTH, 0)];
         power = r_ptr->level + 10;
         desc = r_name + r_ptr->name;
         get_mon_num_prep(creature_ptr, NULL, NULL);
@@ -229,7 +236,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
         break;
     }
     case 2: {
-        if (!(creature_ptr->muta2 & MUT2_COWARDICE) && !creature_ptr->resist_fear) {
+        if (!(creature_ptr->muta2 & MUT2_COWARDICE) && !has_resist_fear(creature_ptr)) {
             msg_print(_("あなたはパラノイアになった！", "You become paranoid!"));
             if (creature_ptr->muta3 & MUT3_FEARLESS) {
                 msg_print(_("あなたはもう恐れ知らずではなくなった。", "You are no longer fearless."));
@@ -242,7 +249,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
         break;
     }
     case 3: {
-        if (!(creature_ptr->muta2 & MUT2_HALLU) && !creature_ptr->resist_chaos) {
+        if (!(creature_ptr->muta2 & MUT2_HALLU) && !has_resist_chaos(creature_ptr)) {
             msg_print(_("幻覚をひき起こす精神錯乱に陥った！", "You are afflicted by a hallucinatory insanity!"));
             creature_ptr->muta2 |= MUT2_HALLU;
         }
@@ -250,7 +257,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
         break;
     }
     case 4: {
-        if (!(creature_ptr->muta2 & MUT2_BERS_RAGE) && !creature_ptr->resist_conf) {
+        if (!(creature_ptr->muta2 & MUT2_BERS_RAGE) && !has_resist_conf(creature_ptr)) {
             msg_print(_("激烈な感情の発作におそわれるようになった！", "You become subject to fits of berserk rage!"));
             creature_ptr->muta2 |= MUT2_BERS_RAGE;
         }
@@ -265,11 +272,11 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
     case 10:
     case 11:
     case 12: {
-        if (!creature_ptr->resist_conf) {
+        if (!has_resist_conf(creature_ptr)) {
             (void)set_confused(creature_ptr, creature_ptr->confused + randint0(4) + 4);
         }
 
-        if (!creature_ptr->resist_chaos && one_in_(3)) {
+        if (!has_resist_chaos(creature_ptr) && one_in_(3)) {
             (void)set_image(creature_ptr, creature_ptr->image + randint0(250) + 150);
         }
 
@@ -280,13 +287,13 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
     case 13:
     case 14:
     case 15: {
-        if (!creature_ptr->resist_conf) {
+        if (!has_resist_conf(creature_ptr)) {
             (void)set_confused(creature_ptr, creature_ptr->confused + randint0(4) + 4);
         }
         if (!creature_ptr->free_act) {
             (void)set_paralyzed(creature_ptr, creature_ptr->paralyzed + randint0(4) + 4);
         }
-        if (!creature_ptr->resist_chaos) {
+        if (!has_resist_chaos(creature_ptr)) {
             (void)set_image(creature_ptr, creature_ptr->image + randint0(250) + 150);
         }
 
@@ -321,4 +328,4 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
 
     creature_ptr->update |= PU_BONUS;
     handle_stuff(creature_ptr);
-}
+}
\ No newline at end of file