[Refactor] #40014 Separated smart-learn-types.h from monster.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 9de7486..270abef 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -531,6 +531,7 @@
     <ClInclude Include="..\..\src\mind\snipe-types.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-indice-types.h" />\r
     <ClInclude Include="..\..\src\monster\monster-flag-types.h" />\r
+    <ClInclude Include="..\..\src\monster\smart-learn-types.h" />\r
     <ClInclude Include="..\..\src\object-enchant\activation-info-table.h" />\r
     <ClInclude Include="..\..\src\object-enchant\dragon-breaths-table.h" />\r
     <ClInclude Include="..\..\src\object-enchant\random-art-bias-types.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 2c940a7..d8f79f0 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2692,6 +2692,9 @@
     <ClInclude Include="..\..\src\mind\snipe-types.h">
       <Filter>mind</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\monster\smart-learn-types.h">
+      <Filter>monster</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 9a121ab..88aa61c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -289,6 +289,7 @@ hengband_SOURCES = \
        monster/monster-process.c monster/monster-process.h \
        monster/monster-runaway.c monster/monster-runaway.h \
        monster/monster-safety-hiding.c monster/monster-safety-hiding.h \
+       monster/smart-learn-types.h \
        monster/monster-status.c monster/monster-status.h \
        monster/monster-sweep-grid.c monster/monster-sweep-grid.h \
        monster/monster-update.c monster/monster-update.h \

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index b439ecb..ccc994e 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -13,6 +13,7 @@
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "object/item-use-flags.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index 20d28d9..70f8a39 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -1,11 +1,11 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util/util.h"
-
 #include "io/write-diary.h"
 #include "cmd-io/cmd-dump.h"
 #include "floor/floor.h"
 #include "core/sort.h"
+#include "monster/smart-learn-types.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index ba98b05..4a427a8 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -29,6 +29,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-info.h"
+#include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index fc55c35..cba4cca 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -38,6 +38,7 @@
 #include "main/sound-definitions-table.h"
 #include "mind/snipe-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/tr-types.h"
 #include "object/item-use-flags.h"

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index 454e869..ee2cf03 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -13,6 +13,7 @@
 #include "main/music-definitions-table.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-apply-magic.h"
 #include "object-enchant/trg-types.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index 20df702..761c336 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -1,17 +1,18 @@
 #include "effect/effect-item.h"
 #include "autopick/autopick.h"
 #include "floor/floor-object.h"
-#include "perception/object-perception.h"
+#include "monster/smart-learn-types.h"
+#include "object-enchant/tr-types.h"
 #include "object/object-broken.h"
 #include "object/object-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "sv-definition/sv-other-types.h"
-#include "sv-definition/sv-scroll-types.h"
-#include "object-enchant/tr-types.h"
+#include "perception/object-perception.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-scroll-types.h"
 
 /*!
  * @brief 汎用的なビーム/ボルト/ボール系によるアイテムオブジェクトへの効果処理 / Handle a beam/bolt/ball causing damage to a monster.

diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index 20f7e8c..fea6652 100644 (file)
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -6,6 +6,7 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"
 #include "player/avatar.h"

diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index 5ef9779..405e89f 100644 (file)
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 
 // Powerful monsters can resist.

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index ae02408..a360efa 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -13,6 +13,7 @@
 #include "main/sound-definitions-table.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"

diff --git a/src/floor/fixed-map-generator.c b/src/floor/fixed-map-generator.c
index 08df649..574905a 100644 (file)
--- a/src/floor/fixed-map-generator.c
+++ b/src/floor/fixed-map-generator.c
@@ -8,6 +8,7 @@
 #include "info-reader/general-parser.h"
 #include "info-reader/random-grid-effect-types.h"
 #include "io/tokenizer.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/apply-magic.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-apply-magic.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 1cc904f..960c166 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -6,6 +6,7 @@
 #include "grid/grid.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "perception/object-perception.h"
 #include "object-enchant/object-ego.h"
 #include "object/object-hook.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index b25515f..8597aca 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -35,6 +35,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/artifact.h"
 #include "object/object-hook.h"
 #include "pet/pet-util.h"

diff --git a/src/floor/wild.c b/src/floor/wild.c
index 0be4743..8e56bdd 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -23,6 +23,7 @@
 #include "main/init.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
 #include "realm/realm-names-table.h"

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index 495a34e..1bdd1ea 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -13,6 +13,7 @@
 #include "main/init.h"
 #include "market/arena-info-table.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "object/object-flavor.h"
 #include "object/object-info.h"
 #include "pet/pet-util.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index c241fe4..5bb02d3 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -29,6 +29,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/object-curse.h"
 #include "object/object-flavor.h"
 #include "object/object-kind-hook.h"

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 348dab2..750f2de 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -14,6 +14,7 @@
 #include "knowledge/monster-group-table.h"
 #include "locale/english.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "term/term-color-types.h"
 #include "view/display-main-window.h" // 暫定、後で消す.
 #include "world/world.h"

diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c
index ca3ee17..8c93d2e 100644 (file)
--- a/src/melee/melee-postprocess.c
+++ b/src/melee/melee-postprocess.c
@@ -17,6 +17,7 @@
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-class.h"

diff --git a/src/mind/mind-cavalry.c b/src/mind/mind-cavalry.c
index 0506a10..725a34b 100644 (file)
--- a/src/mind/mind-cavalry.c
+++ b/src/mind/mind-cavalry.c
@@ -7,6 +7,7 @@
 #include "mind/mind-cavalry.h"
 #include "cmd-action/cmd-pet.h"
 #include "floor/floor.h"
+#include "monster/smart-learn-types.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-skill.h"
 

diff --git a/src/monster-attack/monster-attack-player.c b/src/monster-attack/monster-attack-player.c
index fe2d79c..9788148 100644 (file)
--- a/src/monster-attack/monster-attack-player.c
+++ b/src/monster-attack/monster-attack-player.c
@@ -22,6 +22,7 @@
 #include "mind/mind-ninja.h"
 #include "mind/mind-samurai.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "pet/pet-fall-off.h"
 #include "object/object-hook.h"
 #include "player/player-damage.h"

diff --git a/src/monster/monster-direction.c b/src/monster/monster-direction.c
index 9922072..19736d1 100644 (file)
--- a/src/monster/monster-direction.c
+++ b/src/monster/monster-direction.c
@@ -9,6 +9,7 @@
 #include "monster/monster-sweep-grid.h"
 #include "monster/monster-util.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "pet/pet-util.h"
 #include "spell/range-calc.h"
 

diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c
index b0b398d..1d5bb9f 100644 (file)
--- a/src/monster/monster-move.c
+++ b/src/monster/monster-move.c
@@ -14,6 +14,7 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "player/player-move.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"

diff --git a/src/monster/monster-object.c b/src/monster/monster-object.c
index 89b3961..7c520c2 100644 (file)
--- a/src/monster/monster-object.c
+++ b/src/monster/monster-object.c
@@ -6,6 +6,7 @@
 
 #include "monster/monster-object.h"
 #include "floor/floor-object.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 2ed2a13..835bef9 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -29,6 +29,7 @@
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"
 #include "monster/quantum-effect.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"

diff --git a/src/monster/monster-runaway.c b/src/monster/monster-runaway.c
index 82bd986..67ebf95 100644 (file)
--- a/src/monster/monster-runaway.c
+++ b/src/monster/monster-runaway.c
@@ -7,6 +7,7 @@
 #include "monster/monster-runaway.h"
 #include "dungeon/quest.h"
 #include "monster-race/race-indice-types.h"
+#include "monster/smart-learn-types.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-move.h"
 

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 14217f3..c2eb17d 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -3,8 +3,6 @@
 #include "autopick/autopick-pref-processor.h"
 #include "cmd-io/cmd-dump.h"
 #include "cmd/cmd-draw.h"
-#include "monster-attack/monster-attack-effect.h"
-#include "monster-attack/monster-attack-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
@@ -13,12 +11,15 @@
 #include "io/report.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
+#include "monster-attack/monster-attack-effect.h"
+#include "monster-attack/monster-attack-types.h"
+#include "monster-race/monster-race-hook.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/creature.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-process.h"
-#include "monster-race/monster-race-hook.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/object-curse.h"
 #include "player/avatar.h"

diff --git a/src/monster/monster-sweep-grid.c b/src/monster/monster-sweep-grid.c
index 579356b..6028979 100644 (file)
--- a/src/monster/monster-sweep-grid.c
+++ b/src/monster/monster-sweep-grid.c
@@ -8,6 +8,7 @@
 #include "floor/floor.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-safety-hiding.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 
  /*!

diff --git a/src/monster/monster.h b/src/monster/monster.h
index f9ce81a..a908e30 100644 (file)
--- a/src/monster/monster.h
+++ b/src/monster/monster.h
@@ -68,39 +68,6 @@ typedef struct monster_type {
 
        /* TODO: クローン、ペット、有効化は意義が異なるので別変数に切り離すこと。save/loadのバージョン更新が面倒そうだけど */
        BIT_FLAGS smart; /*!< Field for "smart_learn" - Some bit-flags for the "smart" field */
-#define SM_RES_ACID             0x00000001 /*!< モンスターの学習フラグ: プレイヤーに酸耐性あり */
-#define SM_RES_ELEC             0x00000002 /*!< モンスターの学習フラグ: プレイヤーに電撃耐性あり */
-#define SM_RES_FIRE             0x00000004 /*!< モンスターの学習フラグ: プレイヤーに火炎耐性あり */
-#define SM_RES_COLD             0x00000008 /*!< モンスターの学習フラグ: プレイヤーに冷気耐性あり */
-#define SM_RES_POIS             0x00000010 /*!< モンスターの学習フラグ: プレイヤーに毒耐性あり */
-#define SM_RES_NETH             0x00000020 /*!< モンスターの学習フラグ: プレイヤーに地獄耐性あり */
-#define SM_RES_LITE             0x00000040 /*!< モンスターの学習フラグ: プレイヤーに閃光耐性あり */
-#define SM_RES_DARK             0x00000080 /*!< モンスターの学習フラグ: プレイヤーに暗黒耐性あり */
-#define SM_RES_FEAR             0x00000100 /*!< モンスターの学習フラグ: プレイヤーに恐怖耐性あり */
-#define SM_RES_CONF             0x00000200 /*!< モンスターの学習フラグ: プレイヤーに混乱耐性あり */
-#define SM_RES_CHAOS            0x00000400 /*!< モンスターの学習フラグ: プレイヤーにカオス耐性あり */
-#define SM_RES_DISEN            0x00000800 /*!< モンスターの学習フラグ: プレイヤーに劣化耐性あり */
-#define SM_RES_BLIND            0x00001000 /*!< モンスターの学習フラグ: プレイヤーに盲目耐性あり */
-#define SM_RES_NEXUS            0x00002000 /*!< モンスターの学習フラグ: プレイヤーに因果混乱耐性あり */
-#define SM_RES_SOUND            0x00004000 /*!< モンスターの学習フラグ: プレイヤーに轟音耐性あり */
-#define SM_RES_SHARD            0x00008000 /*!< モンスターの学習フラグ: プレイヤーに破片耐性あり */
-#define SM_OPP_ACID             0x00010000 /*!< モンスターの学習フラグ: プレイヤーに二重酸耐性あり */
-#define SM_OPP_ELEC             0x00020000 /*!< モンスターの学習フラグ: プレイヤーに二重電撃耐性あり */
-#define SM_OPP_FIRE             0x00040000 /*!< モンスターの学習フラグ: プレイヤーに二重火炎耐性あり */
-#define SM_OPP_COLD             0x00080000 /*!< モンスターの学習フラグ: プレイヤーに二重冷気耐性あり */
-#define SM_OPP_POIS             0x00100000 /*!< モンスターの学習フラグ: プレイヤーに二重毒耐性あり */
-#define SM_OPP_XXX1             0x00200000 /*!< 未使用 / (unused) */
-#define SM_CLONED               0x00400000 /*!< クローンである / Cloned */
-#define SM_PET                  0x00800000 /*!< ペットである / Pet */
-#define SM_IMM_ACID             0x01000000 /*!< モンスターの学習フラグ: プレイヤーに酸免疫あり */
-#define SM_IMM_ELEC             0x02000000 /*!< モンスターの学習フラグ: プレイヤーに電撃免疫あり */
-#define SM_IMM_FIRE             0x04000000 /*!< モンスターの学習フラグ: プレイヤーに火炎免疫あり */
-#define SM_IMM_COLD             0x08000000 /*!< モンスターの学習フラグ: プレイヤーに冷気免疫あり */
-#define SM_FRIENDLY             0x10000000 /*!< 友好的である / Friendly */
-#define SM_IMM_REFLECT          0x20000000 /*!< モンスターの学習フラグ: プレイヤーに反射あり */
-#define SM_IMM_FREE             0x40000000 /*!< モンスターの学習フラグ: プレイヤーに麻痺耐性あり */
-#define SM_IMM_MANA             0x80000000 /*!< モンスターの学習フラグ: プレイヤーにMPがない */
-
        MONSTER_IDX parent_m_idx;
 } monster_type;
 

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 95120b5..6395492 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -35,6 +35,7 @@
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index b01bfaa..be03993 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -32,6 +32,7 @@
 #include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"

diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c
index c0099af..2d82295 100644 (file)
--- a/src/monster/quantum-effect.c
+++ b/src/monster/quantum-effect.c
@@ -1,5 +1,6 @@
 #include "quantum-effect.h"
 #include "floor/floor.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/assign-monster-spell.h"
 #include "mspell/monster-spell.h"
 #include "spell-kind/spells-teleport.h"

diff --git a/src/monster/smart-learn-types.h b/src/monster/smart-learn-types.h
new file mode 100644 (file)
index 0000000..b7896a0
--- /dev/null
+++ b/src/monster/smart-learn-types.h
@@ -0,0 +1,36 @@
+#pragma once
+
+typedef enum smart_learn_type {
+       SM_RES_ACID = 0x00000001, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\8e_\91Ï\90«\82 \82è */
+    SM_RES_ELEC = 0x00000002, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\93d\8c\82\91Ï\90«\82 \82è */
+    SM_RES_FIRE = 0x00000004, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\89Î\89\8a\91Ï\90«\82 \82è */
+    SM_RES_COLD = 0x00000008, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\97â\8bC\91Ï\90«\82 \82è */
+    SM_RES_POIS = 0x00000010, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\93Å\91Ï\90«\82 \82è */
+    SM_RES_NETH = 0x00000020, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\92n\8d\96\91Ï\90«\82 \82è */
+    SM_RES_LITE = 0x00000040, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\91M\8cõ\91Ï\90«\82 \82è */
+    SM_RES_DARK = 0x00000080, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\88Ã\8d\95\91Ï\90«\82 \82è */
+    SM_RES_FEAR = 0x00000100, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\8b°\95|\91Ï\90«\82 \82è */
+    SM_RES_CONF = 0x00000200, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\8d¬\97\90\91Ï\90«\82 \82è */
+    SM_RES_CHAOS = 0x00000400, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\83J\83I\83X\91Ï\90«\82 \82è */
+    SM_RES_DISEN = 0x00000800, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\97ò\89»\91Ï\90«\82 \82è */
+    SM_RES_BLIND = 0x00001000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\96Ó\96Ú\91Ï\90«\82 \82è */
+    SM_RES_NEXUS = 0x00002000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\88ö\89Ê\8d¬\97\90\91Ï\90«\82 \82è */
+    SM_RES_SOUND = 0x00004000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\8d\8c\89¹\91Ï\90«\82 \82è */
+    SM_RES_SHARD = 0x00008000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\94j\95Ð\91Ï\90«\82 \82è */
+    SM_OPP_ACID = 0x00010000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\93ñ\8fd\8e_\91Ï\90«\82 \82è */
+    SM_OPP_ELEC = 0x00020000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\93ñ\8fd\93d\8c\82\91Ï\90«\82 \82è */
+    SM_OPP_FIRE = 0x00040000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\93ñ\8fd\89Î\89\8a\91Ï\90«\82 \82è */
+    SM_OPP_COLD = 0x00080000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\93ñ\8fd\97â\8bC\91Ï\90«\82 \82è */
+    SM_OPP_POIS = 0x00100000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\93ñ\8fd\93Å\91Ï\90«\82 \82è */
+    SM_OPP_XXX1 = 0x00200000, /*!< \96¢\8eg\97p / (unused) */
+    SM_CLONED = 0x00400000, /*!< \83N\83\8d\81[\83\93\82Å\82 \82é / Cloned */
+    SM_PET = 0x00800000, /*!< \83y\83b\83g\82Å\82 \82é / Pet */
+    SM_IMM_ACID = 0x01000000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\8e_\96Æ\89u\82 \82è */
+    SM_IMM_ELEC = 0x02000000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\93d\8c\82\96Æ\89u\82 \82è */
+    SM_IMM_FIRE = 0x04000000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\89Î\89\8a\96Æ\89u\82 \82è */
+    SM_IMM_COLD = 0x08000000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\97â\8bC\96Æ\89u\82 \82è */
+    SM_FRIENDLY = 0x10000000, /*!< \97F\8dD\93I\82Å\82 \82é / Friendly */
+    SM_IMM_REFLECT = 0x20000000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\94½\8eË\82 \82è */
+    SM_IMM_FREE = 0x40000000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82É\96\83á\83\91Ï\90«\82 \82è */
+    SM_IMM_MANA = 0x80000000, /*!< \83\82\83\93\83X\83^\81[\82Ì\8aw\8fK\83t\83\89\83O: \83v\83\8c\83C\83\84\81[\82ÉMP\82ª\82È\82¢ */
+} smart_learn_type;

diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index 9229aaa..b2f80ff 100644 (file)
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -10,6 +10,7 @@
 #include "mind/drs-types.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-status.h"
 #include "mspell/mspell-util.h"

diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index 079f229..60151a2 100644 (file)
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -2,6 +2,7 @@
 #include "effect/effect-characteristics.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-util.h"
 #include "player/player-move.h"

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index 2b5286f..99cfbfa 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -50,6 +50,7 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "spell/spells-type.h"
 #include "world/world.h"

diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c
index 8897a44..9a054cc 100644 (file)
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -11,26 +11,27 @@
  */
 
 #include "system/angband.h"
-#include "util/util.h"
-#include "main/sound-definitions-table.h"
-#include "pet/pet-util.h"
+#include "dungeon/dungeon.h"
+#include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "grid/grid.h"
-#include "dungeon/quest.h"
-#include "player/player-move.h"
-#include "player/player-class.h"
+#include "main/sound-definitions-table.h"
 #include "monster-race/race-indice-types.h"
-#include "monster/monster.h"
 #include "monster/monster-status.h"
+#include "monster/monster.h"
+#include "monster/smart-learn-types.h"
+#include "mspell/assign-monster-spell.h"
 #include "mspell/monster-spell.h"
+#include "pet/pet-util.h"
+#include "player/player-class.h"
+#include "player/player-move.h"
 #include "spell-kind/spells-teleport.h"
-#include "spell/spells-type.h"
+#include "spell-realm/spells-hex.h"
 #include "spell/range-calc.h"
-#include "dungeon/dungeon.h"
-#include "world/world.h"
+#include "spell/spells-type.h"
+#include "util/util.h"
 #include "view/display-main-window.h"
-#include "mspell/assign-monster-spell.h"
-#include "spell-realm/spells-hex.h"
+#include "world/world.h"
 
  /*!
   * @brief モンスターが敵対モンスターにビームを当てること可能かを判定する /

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 3a60222..9515093 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -24,6 +24,7 @@
 #include "mind/mind-warrior.h"
 #include "mind/racial-vampire.h"
 #include "monster/monster-flag-types.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/item-feeling.h"
 #include "object/object-hook.h"
 #include "player/avatar.h"

diff --git a/src/object/warning.c b/src/object/warning.c
index ebe5955..7c63c4f 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -7,6 +7,7 @@
 #include "monster-attack/monster-attack-types.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index c11d637..9897953 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -159,6 +159,7 @@
 #include "main/sound-definitions-table.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index fd7290e..42a126c 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -27,6 +27,7 @@
 #include "monster-race/monster-race.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "mutation/mutation.h"
 #include "object-enchant/object-ego.h"
 #include "object-enchant/special-object-flags.h"

diff --git a/src/spell-kind/earthquake.c b/src/spell-kind/earthquake.c
index 38996a6..e6d4780 100644 (file)
--- a/src/spell-kind/earthquake.c
+++ b/src/spell-kind/earthquake.c
@@ -6,6 +6,7 @@
 #include "floor/floor.h"
 #include "io/write-diary.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index 39b6d54..aa03642 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -18,12 +18,13 @@
 #include "grid/grid.h"
 #include "io/write-diary.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/artifact.h"
-#include "perception/object-perception.h"
+#include "object-enchant/special-object-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "object-enchant/special-object-flags.h"
+#include "perception/object-perception.h"
 #include "player/player-effects.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/process-effect.h"

diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index 99589c0..e7f0069 100644 (file)
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -5,6 +5,7 @@
 #include "io/write-diary.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "view/display-main-window.h"

diff --git a/src/spell-kind/spells-pet.c b/src/spell-kind/spells-pet.c
index a33632c..a65e00a 100644 (file)
--- a/src/spell-kind/spells-pet.c
+++ b/src/spell-kind/spells-pet.c
@@ -2,6 +2,7 @@
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "io/write-diary.h"
+#include "monster/smart-learn-types.h"
 #include "spell/process-effect.h"
 #include "spell/spells-type.h"
 

diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c
index 796001a..9111a7e 100644 (file)
--- a/src/spell-kind/spells-sight.c
+++ b/src/spell-kind/spells-sight.c
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 #include "spell/process-effect.h"
 #include "spell/spells-type.h"

diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c
index 84d9c4e..4d4fd7e 100644 (file)
--- a/src/spell-kind/spells-teleport.c
+++ b/src/spell-kind/spells-teleport.c
@@ -16,6 +16,7 @@
 #include "main/sound-definitions-table.h"
 #include "monster/creature.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
 #include "object/object-hook.h"

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index 46246dd..df461f1 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -5,6 +5,7 @@
 #include "inventory/player-inventory.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "object/item-use-flags.h"
 #include "object/object-hook.h"
 #include "player/avatar.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index b535c22..9d2391e 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -39,6 +39,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-process.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-feeling.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 580cd4f..4ad4145 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -32,6 +32,7 @@
 #include "market/arena-info-table.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster.h"
+#include "monster/smart-learn-types.h"
 #include "object/object-flavor.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index ea9d2eb..7ab97ab 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -31,6 +31,7 @@
 #include "io/write-diary.h"
 #include "market/arena.h"
 #include "monster/monster-status.h"
+#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mutation/mutation.h"
 #include "object-enchant/apply-magic.h"