[Refactor] #37353 generate_encounter を wild.c 内変数に整理．加えて悪夢モードの真夜中時は襲撃と同じ生成が発生するよう仕様変更．

[hengband/hengband.git] / src / player-effects.c

diff --git a/src/player-effects.c b/src/player-effects.c
index adb263e..4196a66 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -16,6 +16,7 @@
 #include "util.h"
 
 #include "artifact.h"
+#include "cmd-dump.h"
 #include "floor.h"
 #include "bldg.h"
 #include "birth.h"
@@ -25,6 +26,7 @@
 #include "avatar.h"
 #include "spells-status.h"
 #include "realm-hex.h"
+#include "object-ego.h"
 #include "object-hook.h"
 #include "wild.h"
 #include "spells-floor.h"
@@ -32,13 +34,56 @@
 #include "player-class.h"
 #include "player-move.h"
 #include "player-effects.h"
+#include "player-race.h"
 #include "player-class.h"
+#include "player-personality.h"
+#include "player-sex.h"
 #include "monster-status.h"
 #include "snipe.h"
 #include "files.h"
 #include "monster-spell.h"
 #include "world.h"
 #include "objectkind.h"
+#include "autopick.h"
+#include "save.h"
+#include "report.h"
+
+ /*!
+  * @brief 修行僧の構え能力テーブル
+  */
+const kamae kamae_shurui[MAX_KAMAE] =
+{
+#ifdef JP
+       {"玄武", 25, ""},
+       {"白虎", 30, ""},
+       {"青竜", 35, ""},
+       {"朱雀", 40, ""},
+#else
+       {"Genbu", 25, "(Black Tortoise) "},
+       {"Byakko", 30, "(White Tiger) "},
+       {"Seiryuu", 35, "(Blue Dragon) "},
+       {"Suzaku", 40, "(Red Phoenix) "},
+#endif
+};
+
+/*!
+ * @brief 剣術家の構え能力テーブル
+ */
+const kamae kata_shurui[MAX_KATA] =
+{
+#ifdef JP
+       {"居合", 25, ""},
+       {"風塵", 30, ""},
+       {"降鬼", 35, ""},
+       {"無想", 40, ""},
+#else
+       {"Iai", 25, ""},
+       {"Huujin", 30, ""},
+       {"Kouki", 35, ""},
+       {"Musou", 40, ""},
+#endif
+};
+
 
 /*!
  * @brief プレイヤーの継続行動を設定する。
@@ -3130,7 +3175,7 @@ bool set_food(TIME_EFFECT v)
 
                if (p_ptr->wild_mode && (new_aux < 2))
                {
-                       change_wild_mode();
+                       change_wild_mode(FALSE);
                }
 
                /* Change */
@@ -4197,7 +4242,7 @@ int take_hit(int damage_type, HIT_POINT damage, concptr hit_from, int monspell)
        }
        if (p_ptr->wild_mode && !p_ptr->leaving && (p_ptr->chp < MAX(warning, p_ptr->mhp/5)))
        {
-               change_wild_mode();
+               change_wild_mode(FALSE);
        }
        return damage;
 }