[Refactor] #40457 Moved object boosting/cursing/ego/artifact-related files from objec...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 69b8062..15ed658 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -541,7 +541,7 @@
     <ClInclude Include="..\..\src\object\object2.h" />\r
     <ClInclude Include="..\..\src\object-enchant\old-ego-extra-values.h" />\r
     <ClInclude Include="..\..\src\object-enchant\special-object-flags.h" />\r
-    <ClInclude Include="..\..\src\objectt\sv-amulet-types.h" />\r
+    <ClInclude Include="..\..\src\sv-definition\sv-amulet-types.h" />\r
     <ClInclude Include="..\..\src\sv-definition\sv-armor-types.h" />\r
     <ClInclude Include="..\..\src\sv-definition\sv-bow-types.h" />\r
     <ClInclude Include="..\..\src\sv-definition\sv-digging-types.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 149f1ee..46c02c7 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2068,9 +2068,6 @@
     <ClInclude Include="..\..\src\util\util.h">
       <Filter>util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\object\tval-types.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\object\object-mark-types.h">
       <Filter>object</Filter>
     </ClInclude>
@@ -2329,9 +2326,12 @@
     <ClInclude Include="..\..\src\object-enchant\tr-types.h">
       <Filter>object-enchant</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\objectt\sv-amulet-types.h">
+    <ClInclude Include="..\..\src\sv-definition\sv-amulet-types.h">
       <Filter>sv-definition</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\tval-types.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 9c2bb96..012bc3e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -292,17 +292,13 @@ hengband_SOURCES = \
        mutation/mutation.c mutation/mutation.h \
        mutation/mutation-processor.c mutation/mutation-processor.h \
        \
-       object/artifact.c object/artifact.h \
        object/bow.c object/bow.h \
        object/chest.c object/chest.h \
        object/death-scythe.c object/death-scythe.h \
        object/object1.c object/object1.h \
        object/object2.c object/object2.h \
        object/object-appraiser.c object/object-appraiser.h \
-       object/object-boost.c object/object-boost.h \
        object/object-broken.c object/object-broken.h \
-       object/object-curse.c object/object-curse.h \
-       object/object-ego.c object/object-ego.h \
        object/object-flavor.c object/object-flavor.h \
        object/object-generator.c object/object-generator.h \
        object/object-hook.c object/object-hook.h \
@@ -311,14 +307,19 @@ hengband_SOURCES = \
        object/object-value.c object/object-value.h \
        object/lite-processor.c object/lite-processor.h \
        object/torch.c object/torch.h \
-       object/tr-types.h object/trc-types.h object/tval-types.h \
+       object/tval-types.h \
        object/warning.c object/warning.h \
-       object/item-apply-magic.h \
        object/object-mark-types.h \
        object/object-util.h \
-       object/old-ego-extra-values.h \
-       object/special-object-flags.h \
-       object/item-feeling.h object/item-use-flags.h \
+       object/item-use-flags.h \
+       \
+       object-enchant/artifact.c object-enchant/artifact.h \
+       object-enchant/object-boost.c object-enchant/object-boost.h \
+       object-enchant/object-curse.c object-enchant/object-curse.h \
+       object-enchant/object-ego.c object-enchant/object-ego.h \
+       object-enchant/tr-types.h object-enchant/trc-types.h \
+       object-enchant/item-apply-magic.h object-enchant/item-feeling.h \
+       object-enchant/old-ego-extra-values.h object-enchant/special-object-flags.h \
        \
        player/avatar.h player/avatar.c \
        player/mimic-info-table.c player/mimic-info-table.h \

diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index 70a91fe..4212b06 100644 (file)
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -8,12 +8,12 @@
 #include "autopick-methods-table.h"
 #include "autopick/autopick-util.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-wand-types.h"
 #include "player/player-move.h"

diff --git a/src/autopick/autopick-entry.c b/src/autopick/autopick-entry.c
index 7175d53..6f82ffe 100644 (file)
--- a/src/autopick/autopick-entry.c
+++ b/src/autopick/autopick-entry.c
@@ -4,14 +4,14 @@
 #include "autopick/autopick-keys-table.h"
 #include "autopick/autopick-methods-table.h"
 #include "inventory/player-inventory.h"
-#include "object/item-feeling.h"
+#include "object-enchant/item-feeling.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 
 #ifdef JP
 static char kanji_colon[] = "：";

diff --git a/src/autopick/autopick-matcher.c b/src/autopick/autopick-matcher.c
index 15ef7b1..1fef741 100644 (file)
--- a/src/autopick/autopick-matcher.c
+++ b/src/autopick/autopick-matcher.c
@@ -8,13 +8,13 @@
 #include "autopick/autopick-matcher.h"
 #include "autopick/autopick-flags-table.h"
 #include "autopick/autopick-key-flag-process.h"
-#include "object/item-feeling.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-appraiser.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 
 /*
  * A function for Auto-picker/destroyer

diff --git a/src/autopick/autopick-registry.c b/src/autopick/autopick-registry.c
index 3ff4d84..ff05e2f 100644 (file)
--- a/src/autopick/autopick-registry.c
+++ b/src/autopick/autopick-registry.c
@@ -10,11 +10,11 @@
 #include "autopick/autopick-methods-table.h"
 #include "autopick/autopick-reader-writer.h"
 #include "io/files-util.h"
-#include "object/item-feeling.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "util/util.h"
 
 static const char autoregister_header[] = "?:$AUTOREGISTER";

diff --git a/src/autopick/autopick-util.c b/src/autopick/autopick-util.c
index 8677e0b..820d44e 100644 (file)
--- a/src/autopick/autopick-util.c
+++ b/src/autopick/autopick-util.c
@@ -1,6 +1,6 @@
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-menu-data-table.h"
-#include "object/item-feeling.h"
+#include "object-enchant/item-feeling.h"
 
 /*
  * 自動拾い/破壊設定のリストに関する変数 / List for auto-picker/destroyer entries

diff --git a/src/birth/game-play-initializer.c b/src/birth/game-play-initializer.c
index 30bb60a..d7852b4 100644 (file)
--- a/src/birth/game-play-initializer.c
+++ b/src/birth/game-play-initializer.c
@@ -4,7 +4,7 @@
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "market/arena.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-generator.h"
 #include "object/object-kind.h"
 #include "pet/pet-util.h"

diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index d1815f3..36c0728 100644 (file)
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -4,9 +4,9 @@
 #include "floor/floor-object.h"
 #include "inventory/inventory-object.h"
 #include "monster/monster-race-hook.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/item-apply-magic.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 16375b4..9857be4 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -12,7 +12,7 @@
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"
 #include "monster/monster-status.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/item-use-flags.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"

diff --git a/src/cmd-io/cmd-dump.c b/src/cmd-io/cmd-dump.c
index 96fa1c5..83a9cef 100644 (file)
--- a/src/cmd-io/cmd-dump.c
+++ b/src/cmd-io/cmd-dump.c
@@ -43,7 +43,7 @@
 #include "view/display-player.h" // 暫定。後で消す.
 #include "player/player-personalities-table.h"
 #include "dungeon/quest.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "floor/floor-town.h"
 #include "cmd-io/feeling-table.h"
 #include "locale/english.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index 42987f7..38361e8 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -16,9 +16,9 @@
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
 #include "monster/monster-status.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/item-use-flags.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "sv-definition/sv-lite-types.h"

diff --git a/src/cmd-item/cmd-activate.h b/src/cmd-item/cmd-activate.h
index fa04524..9a8220f 100644 (file)
--- a/src/cmd-item/cmd-activate.h
+++ b/src/cmd-item/cmd-activate.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 extern void do_cmd_activate(player_type *user_ptr);
 extern void exe_activate(player_type *user_ptr, INVENTORY_IDX item);

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index 332c99f..61f6cc2 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -17,7 +17,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-food-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "player/avatar.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 263be96..c362996 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -31,19 +31,19 @@
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
-#include "object/item-feeling.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-feeling.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-lite-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 #include "object/object-value.h"
 #include "player/avatar.h"
 #include "player/player-class.h"

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index 21fdaf9..91eb661 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -12,7 +12,7 @@
 #include "inventory/player-inventory.h"
 #include "io/files-util.h"
 #include "main/sound-definitions-table.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"

diff --git a/src/cmd-item/cmd-smith.c b/src/cmd-item/cmd-smith.c
index fca34a1..1e2817d 100644 (file)
--- a/src/cmd-item/cmd-smith.c
+++ b/src/cmd-item/cmd-smith.c
@@ -10,13 +10,13 @@
 #include "inventory/player-inventory.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
-#include "object/special-object-flags.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/special-object-flags.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/player-status.h"
 #include "term/gameterm.h"
 #include "util/util.h"

diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index 0649df3..652beb9 100644 (file)
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -10,7 +10,7 @@
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-staff-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"

diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c
index ccefb4f..cc86fff 100644 (file)
--- a/src/cmd-item/cmd-zaprod.c
+++ b/src/cmd-item/cmd-zaprod.c
@@ -8,7 +8,7 @@
 #include "object/object-appraiser.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-rod-types.h"
 #include "player/avatar.h"

diff --git a/src/cmd-item/cmd-zapwand.c b/src/cmd-item/cmd-zapwand.c
index 29050ca..39f9841 100644 (file)
--- a/src/cmd-item/cmd-zapwand.c
+++ b/src/cmd-item/cmd-zapwand.c
@@ -9,7 +9,7 @@
 #include "object/object-appraiser.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-wand-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 5327eb7..ce44608 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -35,7 +35,7 @@
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
 #include "monster/monster-status.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/chest.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
@@ -45,10 +45,10 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-bow-types.h"
 #include "object/torch.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "player/avatar.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"

diff --git a/src/combat/attack-chaos-effect.c b/src/combat/attack-chaos-effect.c
index fa0361c..dc4f49c 100644 (file)
--- a/src/combat/attack-chaos-effect.c
+++ b/src/combat/attack-chaos-effect.c
@@ -9,7 +9,7 @@
 #include "floor/floor.h"
 #include "monster/monster-status.h"
 #include "inventory/inventory-object.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"
 #include "realm/realm-hex.h"

diff --git a/src/combat/blood-sucking-processor.c b/src/combat/blood-sucking-processor.c
index c250f79..0315c16 100644 (file)
--- a/src/combat/blood-sucking-processor.c
+++ b/src/combat/blood-sucking-processor.c
@@ -5,7 +5,7 @@
  */
 
 #include "combat/blood-sucking-processor.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "monster/monster-race-hook.h"
 #include "player/player-effects.h"
 #include "realm/realm-hex.h"

diff --git a/src/combat/player-attack.c b/src/combat/player-attack.c
index 17de1a3..044b213 100644 (file)
--- a/src/combat/player-attack.c
+++ b/src/combat/player-attack.c
@@ -20,7 +20,7 @@
 #include "mind/surprise-attack.h"
 #include "monster/monster-status.h"
 #include "monster/monster-race-hook.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "sv-definition/sv-weapon-types.h"
@@ -30,7 +30,7 @@
 #include "realm/realm-hex.h"
 #include "spell/spells-floor.h"
 #include "world/world.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 static player_attack_type *initialize_player_attack_type(
     player_attack_type *pa_ptr, s16b hand, combat_options mode, monster_type *m_ptr, grid_type *g_ptr, bool *fear, bool *mdeath)

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 4f9591b..fc9e77f 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -11,7 +11,7 @@
 #include "monster/monster-status.h"
 #include "monster/monster.h"
 #include "mspell/monster-spell.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-broken.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
@@ -19,7 +19,7 @@
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "sv-definition/sv-bow-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-personalities-table.h"

diff --git a/src/combat/slaying.c b/src/combat/slaying.c
index 5f32656..1d84428 100644 (file)
--- a/src/combat/slaying.c
+++ b/src/combat/slaying.c
@@ -1,11 +1,11 @@
 #include "system/angband.h"
 #include "combat/slaying.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "realm/realm-hex.h"
 #include "mind/samurai-slaying.h"
 #include "object/object2.h"
 #include "object/torch.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief プレイヤー攻撃の種族スレイング倍率計算

diff --git a/src/combat/vorpal-weapon.c b/src/combat/vorpal-weapon.c
index 0c0becc..16c90d4 100644 (file)
--- a/src/combat/vorpal-weapon.c
+++ b/src/combat/vorpal-weapon.c
@@ -1,6 +1,6 @@
 #include "combat/vorpal-weapon.h"
 #include "io/files-util.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 
 /*!
  * @brief ヴォーパル武器で攻撃した時のメッセージ表示

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index 3bd6f39..f190812 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -5,14 +5,14 @@
 #include "realm/realm-song.h"
 #include "player/player-damage.h"
 #include "object/object-flavor.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "world/world.h"
 #include "player/player-effects.h"
 #include "floor/pattern-walk.h"
 #include "core/hp-mp-regenerator.h"
 #include "cmd-action/cmd-pet.h"
 #include "player/player-races-table.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 
 /*!
  * @brief 10ゲームターンが進行するごとにプレイヤーのHPとMPの増減処理を行う。

diff --git a/src/core/sort.c b/src/core/sort.c
index 1a43427..61b3014 100644 (file)
--- a/src/core/sort.c
+++ b/src/core/sort.c
@@ -2,7 +2,7 @@
 #include "core/sort.h"
 #include "floor/floor.h"
 #include "dungeon/quest.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "monster/monster-race.h"
 
 /*

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 2fb4134..1299935 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -50,15 +50,15 @@
 #include "main/init.h"
 #include "monster/monster-race.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
-#include "object/item-apply-magic.h"
-#include "object/object-ego.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-apply-magic.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object2.h"
 #include "sv-definition/sv-scroll-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "player/player-class.h"
 #include "player/player-race.h"
 #include "player/player-skill.h"

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index a04be45..d0169cd 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -12,8 +12,8 @@
 #include "main/music-definitions-table.h"
 #include "monster/monster-race-hook.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-apply-magic.h"
 #include "object/object-generator.h"
 #include "player/player-personalities-table.h"
 #include "player/player-status.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index 7a8f4fe..a522b6a 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -8,7 +8,7 @@
 #include "object/object-mark-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-scroll-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 

diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index e51a721..efaf8ba 100644 (file)
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -4,7 +4,7 @@
 #include "player/avatar.h"
 #include "spell/spells-diceroll.h"
 #include "monster/monster-race-hook.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 
 static void effect_monster_charm_resist(player_type *caster_ptr, effect_monster_type *em_ptr)
 {

diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c
index 7eba63e..7f8bf05 100644 (file)
--- a/src/effect/effect-monster-domination.c
+++ b/src/effect/effect-monster-domination.c
@@ -5,7 +5,7 @@
 #include "monster/monster-race-hook.h"
 #include "monster/monster-status.h"
 #include "pet/pet-fall-off.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/player-effects.h"
 #include "spell/spells-diceroll.h"
 

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 411b8e0..1c71121 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -21,7 +21,7 @@
 #include "effect/effect-characteristics.h"
 #include "spell/spells3.h"
 #include "object/object-generator.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-other-types.h"
 
 /*!

diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c
index 0bd9bb7..ad986ca 100644 (file)
--- a/src/effect/effect-player-curse.c
+++ b/src/effect/effect-player-curse.c
@@ -5,7 +5,7 @@
 #include "mind/racial-mirror-master.h"
 #include "world/world.h"
 #include "mspell/monster-spell.h"
-#include "object/object-curse.h"
+#include "object-enchant/object-curse.h"
 #include "player/player-effects.h"
 
 void effect_player_curse_1(player_type *target_ptr,

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index a5977a6..b051485 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -6,7 +6,7 @@
 #include "mind/racial-mirror-master.h"
 #include "world/world.h"
 #include "object/object-broken.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "player/player-effects.h"
 #include "mutation/mutation.h"
 #include "mspell/monster-spell.h"

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index 39da2ec..ef45a29 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -7,7 +7,7 @@
 #include "effect/effect-player-spirit.h"
 #include "mspell/monster-spell.h"
 #include "object/object-broken.h"
-#include "object/object-curse.h"
+#include "object-enchant/object-curse.h"
 #include "player/player-damage.h"
 #include "mind/racial-mirror-master.h"
 #include "inventory/inventory-damage.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 0a5ce82..79cbd1b 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -7,12 +7,12 @@
 #include "monster/monster-status.h"
 #include "monster/monster.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-ring-types.h"

diff --git a/src/floor/floor-object.c b/src/floor/floor-object.c
index f9ec85e..c9239c2 100644 (file)
--- a/src/floor/floor-object.c
+++ b/src/floor/floor-object.c
@@ -6,8 +6,8 @@
 
 #include "floor/floor-object.h"
 #include "main/sound-definitions-table.h"
-#include "object/artifact.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-apply-magic.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
@@ -15,7 +15,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "view/object-describer.h"
 #include "world/world-object.h"
 #include "world/world.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 5659490..894fc61 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -16,7 +16,7 @@
 #include "io/load.h"
 #include "util/util.h"
 
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "floor/floor-object.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index cb5440a..6db9a70 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -21,7 +21,7 @@
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "room/rooms.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index c8776cd..d567317 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -7,13 +7,13 @@
 #include "floor/floor-object.h"
 #include "grid/grid.h"
 #include "grid/trap.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-appraiser.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object1.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "player/player-effects.h"
 #include "room/rooms.h"
 #include "world/world-object.h"

diff --git a/src/grid/trap.c b/src/grid/trap.c
index 4401c70..182edd4 100644 (file)
--- a/src/grid/trap.c
+++ b/src/grid/trap.c
@@ -13,7 +13,7 @@
 #include "player/player-personalities-table.h"
 #include "spell/spells-summon.h"
 #include "dungeon/quest.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "grid/feature.h"
 #include "player/player-status.h"
 #include "grid/grid.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index 0efde9b..056a388 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -1,13 +1,13 @@
 #include "inventory/inventory-curse.h"
 #include "io/files-util.h"
-#include "object/artifact.h"
-#include "object/item-feeling.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-appraiser.h"
-#include "object/object-curse.h"
+#include "object-enchant/object-curse.h"
 #include "object/object-flavor.h"
-#include "object/special-object-flags.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/special-object-flags.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"

diff --git a/src/inventory/inventory-damage.c b/src/inventory/inventory-damage.c
index a1ecf71..d1db327 100644 (file)
--- a/src/inventory/inventory-damage.c
+++ b/src/inventory/inventory-damage.c
@@ -2,7 +2,7 @@
 #include "floor/floor.h"
 #include "inventory/inventory-object.h"
 #include "mind/racial-mirror-master.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-broken.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/inventory/simple-appraiser.c b/src/inventory/simple-appraiser.c
index f761a9d..4d3c7ef 100644 (file)
--- a/src/inventory/simple-appraiser.c
+++ b/src/inventory/simple-appraiser.c
@@ -1,11 +1,11 @@
 #include "inventory/simple-appraiser.h"
 #include "autopick/autopick.h"
 #include "inventory/player-inventory.h"
-#include "object/item-feeling.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "player/avatar.h"
 #include "player/player-move.h"
 

diff --git a/src/io/load.c b/src/io/load.c
index 4525ffe..ee9eed9 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -63,20 +63,20 @@
 #include "market/bounty.h"
 #include "monster/monster.h"
 #include "mutation/mutation.h"
-#include "object/artifact.h"
-#include "object/object-ego.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "object/object2.h"
-#include "object/old-ego-extra-values.h" // TODO v1.5.0以前のセーブファイルをロードする処理を分離する.
+#include "object-enchant/old-ego-extra-values.h" // TODO v1.5.0以前のセーブファイルをロードする処理を分離する.
 #include "object/object-value.h"
 #include "sv-definition/sv-armor-types.h"
 #include "sv-definition/sv-lite-types.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "pet/pet-util.h"
 #include "player/avatar.h"
 #include "player/patron.h"

diff --git a/src/io/save.c b/src/io/save.c
index 36f9f77..b7c8b94 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -17,7 +17,7 @@
 #include "io/load.h"
 #include "io/report.h"
 #include "system/angband-version.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "core/sort.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 9fb55e9..058c617 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -21,7 +21,7 @@
 #include "cmd-action/cmd-pet.h"
 #include "dungeon/dungeon-file.h"
 #include "floor/floor-object.h"
-#include "object/object-curse.h"
+#include "object-enchant/object-curse.h"
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"
 #include "monster/monster.h"

diff --git a/src/knowledge/knowledge-inventory.c b/src/knowledge/knowledge-inventory.c
index 06ee135..3d61dac 100644 (file)
--- a/src/knowledge/knowledge-inventory.c
+++ b/src/knowledge/knowledge-inventory.c
@@ -11,11 +11,11 @@
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-ring-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "store/store-util.h"
 
 static concptr inven_res_label = _(

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index 236171b..098b1f3 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -11,14 +11,14 @@
 #include "floor/floor.h"
 #include "io-dump/dump-util.h"
 #include "knowledge/object-group-table.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "term/gameterm.h"
 #include "view/display-main-window.h" // 暫定、後で消す.
 #include "world/world.h"

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 81d8ab6..6b556d5 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -10,11 +10,11 @@
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "system/system-variables.h" // 暫定、init_flagsのため。後で消すかも.
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/dungeon-file.h"
 #include "core/sort.h"

diff --git a/src/main/init.c b/src/main/init.c
index 4fbfc10..594c554 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -43,8 +43,8 @@
 #include "io/read-pref-file.h"
 #include "io/uid-checker.h"
 #include "market/articles-on-sale.h"
-#include "object/artifact.h"
-#include "object/object-ego.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-kind.h"
 #include "player/player-class.h"
 #include "player/player-skill.h"

diff --git a/src/market/bounty.c b/src/market/bounty.c
index 7ffe7eb..b975b22 100644 (file)
--- a/src/market/bounty.c
+++ b/src/market/bounty.c
@@ -7,7 +7,7 @@
 #include "market/bounty-prize-table.h"
 #include "market/building-util.h"
 #include "monster/monster-race-hook.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/item-apply-magic.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-kind-hook.h"

diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c
index 72ec882..873730e 100644 (file)
--- a/src/market/building-craft-fix.c
+++ b/src/market/building-craft-fix.c
@@ -3,18 +3,18 @@
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "market/building-util.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/item-use-flags.h"
-#include "object/object-boost.h"
+#include "object-enchant/object-boost.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "player/player-effects.h"
 
 /*!

diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c
index 7e1510a..563308b 100644 (file)
--- a/src/market/building-craft-weapon.c
+++ b/src/market/building-craft-weapon.c
@@ -4,13 +4,13 @@
 #include "core/stuff-handler.h"
 #include "inventory/player-inventory.h"
 #include "market/building-util.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/item-use-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "realm/realm-hex.h"
 #include "term/gameterm.h"
 #include "world/world.h"

diff --git a/src/market/building-recharger.c b/src/market/building-recharger.c
index 58b6edb..0b5e230 100644 (file)
--- a/src/market/building-recharger.c
+++ b/src/market/building-recharger.c
@@ -7,7 +7,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "spell/spells3.h"
 
 /*!

diff --git a/src/mind/samurai-slaying.c b/src/mind/samurai-slaying.c
index 1e58bf4..1675bbb 100644 (file)
--- a/src/mind/samurai-slaying.c
+++ b/src/mind/samurai-slaying.c
@@ -7,7 +7,7 @@
 #include "system/angband.h"
 #include "mind/samurai-slaying.h"
 #include "monster/monster-race-hook.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 typedef struct samurai_slaying_type {
     MULTIPLY mult;

diff --git a/src/mind/surprise-attack.c b/src/mind/surprise-attack.c
index 2aec092..0df2ea4 100644 (file)
--- a/src/mind/surprise-attack.c
+++ b/src/mind/surprise-attack.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "mind/surprise-attack.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 
 /*!
  * @brief 盗賊と忍者における不意打ち

diff --git a/src/monster/monster-object.c b/src/monster/monster-object.c
index f22c263..f087f97 100644 (file)
--- a/src/monster/monster-object.c
+++ b/src/monster/monster-object.c
@@ -9,7 +9,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
  /*!
   * @brief オブジェクトのフラグを更新する

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 3488a35..ef9e0ed 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -36,7 +36,7 @@
 #include "monster/monster-status.h"
 #include "mspell/monster-spell.h"
 #include "monster/monster-process.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 
 void decide_drop_from_monster(player_type *target_ptr, MONSTER_IDX m_idx, bool is_riding_mon);
 bool process_stealth(player_type *target_ptr, MONSTER_IDX m_idx);

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 2663334..87aa1ed 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -18,8 +18,8 @@
 #include "spell/spells2.h"
 #include "spell/spells-summon.h"
 #include "monster/monster-race-hook.h"
-#include "object/object-curse.h"
-#include "object/artifact.h"
+#include "object-enchant/object-curse.h"
+#include "object-enchant/artifact.h"
 #include "player/avatar.h"
 #include "io/files-util.h"
 #include "player/player-effects.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 9251ccc..0d6cb2d 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -27,8 +27,8 @@
 #include "spell/spells-summon.h"
 #include "player/patron.h"
 #include "dungeon/quest.h"
-#include "object/artifact.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-apply-magic.h"
 #include "player/avatar.h"
 #include "floor/floor-object.h"
 #include "floor/wild.h"

diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index 449f32e..3b91730 100644 (file)
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -11,7 +11,7 @@
 #include "monster/monster-status.h"
 #include "player/player-move.h"
 #include "player/player-personalities-table.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "spell/spells-type.h"
 #include "mspell/mspell-util.h"
 #include "realm/realm-hex.h"

diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c
index 0541a3f..d115459 100644 (file)
--- a/src/mspell/mspell-status.c
+++ b/src/mspell/mspell-status.c
@@ -13,7 +13,7 @@
 #include "monster/monster-status.h"
 #include "spell/spells-type.h"
 #include "player/player-personalities-table.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "player/player-effects.h"
 #include "mspell/mspell-damage-calculator.h"
 

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index e79ad6c..fb72ba9 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -44,7 +44,7 @@
 #include "effect/effect-characteristics.h"
 #include "dungeon/dungeon.h"
 #include "grid/grid.h"
-#include "object/object-curse.h"
+#include "object-enchant/object-curse.h"
 #include "dungeon/quest.h"
 #include "realm/realm-hex.h"
 #include "player/player-move.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 47ffd8d..cc98f51 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -30,7 +30,7 @@
 #include "player/player-damage.h"
 #include "spell/spells-status.h"
 #include "spell/spells-floor.h"
-#include "object/item-feeling.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-hook.h"
 #include "cmd/cmd-basic.h"
 #include "io/files-util.h"

diff --git a/src/object-enchant/artifact.c b/src/object-enchant/artifact.c
index 4e97c8c..9118b55 100644 (file)
--- a/src/object-enchant/artifact.c
+++ b/src/object-enchant/artifact.c
@@ -10,7 +10,7 @@
  * 2013 Deskull rearranged comment for Doxygen.
  */
 
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "cmd-item/cmd-activate.h"
 #include "cmd-item/cmd-smith.h"
 #include "floor/floor-object.h"
@@ -19,9 +19,9 @@
 #include "io/files-util.h"
 #include "monster/monster.h"
 #include "object/object-appraiser.h"
-#include "object/object-boost.h"
-#include "object/object-curse.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-boost.h"
+#include "object-enchant/object-curse.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
@@ -29,11 +29,11 @@
 #include "object/object-kind.h"
 #include "object/object1.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-armor-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-personalities-table.h"

diff --git a/src/object-enchant/object-boost.c b/src/object-enchant/object-boost.c
index fde2aa2..b30ae8e 100644 (file)
--- a/src/object-enchant/object-boost.c
+++ b/src/object-enchant/object-boost.c
@@ -1,9 +1,9 @@
 #include "system/angband.h"
 #include "floor/floor.h"
-#include "object/object-boost.h"
-#include "object/object-boost.h"
+#include "object-enchant/object-boost.h"
+#include "object-enchant/object-boost.h"
 #include "cmd-item/cmd-activate.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief 上質以上のオブジェクトに与えるための各種ボーナスを正規乱数も加えて算出する。

diff --git a/src/object-enchant/object-curse.c b/src/object-enchant/object-curse.c
index 2277362..96e2229 100644 (file)
--- a/src/object-enchant/object-curse.c
+++ b/src/object-enchant/object-curse.c
@@ -1,11 +1,11 @@
 #include "system/angband.h"
 #include "util/util.h"
-#include "object/item-feeling.h"
-#include "object/object-curse.h"
+#include "object-enchant/item-feeling.h"
+#include "object-enchant/object-curse.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 
 #define MAX_CURSE 18
 #define TRC_SPECIAL_MASK (TRC_TY_CURSE | TRC_AGGRAVATE)

diff --git a/src/object-enchant/object-ego.c b/src/object-enchant/object-ego.c
index c977c16..bbf6bc8 100644 (file)
--- a/src/object-enchant/object-ego.c
+++ b/src/object-enchant/object-ego.c
@@ -4,7 +4,7 @@
  * @author deskull
  * @details Ego-Item indexes (see "lib/edit/e_info.txt")
  */
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 
 /*
  * The ego-item arrays

diff --git a/src/object/chest.c b/src/object/chest.c
index c9671ce..623749a 100644 (file)
--- a/src/object/chest.c
+++ b/src/object/chest.c
@@ -4,7 +4,7 @@
 #include "grid/grid.h"
 #include "grid/trap.h"
 #include "main/sound-definitions-table.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/item-apply-magic.h"
 #include "object/object-appraiser.h"
 #include "object/object-generator.h"
 #include "sv-definition/sv-other-types.h"

diff --git a/src/object/death-scythe.c b/src/object/death-scythe.c
index 73eb844..a68b636 100644 (file)
--- a/src/object/death-scythe.c
+++ b/src/object/death-scythe.c
@@ -13,7 +13,7 @@
 #include "core/stuff-handler.h"
 #include "combat/attack-criticality.h"
 #include "object/object1.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief 死の大鎌ダメージが跳ね返ってきた時の、種族ごとのダメージ倍率を返す

diff --git a/src/object/lite-processor.c b/src/object/lite-processor.c
index 61c02e6..0d7da63 100644 (file)
--- a/src/object/lite-processor.c
+++ b/src/object/lite-processor.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "object/lite-processor.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-hook.h"
 #include "sv-definition/sv-lite-types.h"
 #include "player/player-move.h"

diff --git a/src/object/object-appraiser.c b/src/object/object-appraiser.c
index 9a7f3c4..6d21b49 100644 (file)
--- a/src/object/object-appraiser.c
+++ b/src/object/object-appraiser.c
@@ -1,12 +1,12 @@
 #include "object/object-appraiser.h"
 #include "io/write-diary.h"
-#include "object/artifact.h"
-#include "object/item-feeling.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h" // 暫定、このファイルへ引っ越す.
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 
 /*!
  * @brief オブジェクトを鑑定済にする /

diff --git a/src/object/object-broken.c b/src/object/object-broken.c
index 34aca5e..ef891d8 100644 (file)
--- a/src/object/object-broken.c
+++ b/src/object/object-broken.c
@@ -9,7 +9,7 @@
 #include "object/object-kind.h"
 #include "object/object2.h"
 #include "sv-definition/sv-potion-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "spell/process-effect.h"
 #include "spell/spells-type.h"
 

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index 9a0aae3..061f244 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -16,15 +16,15 @@
 #include "io/files-util.h"
 #include "locale/japanese.h"
 #include "monster/monster-race.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-food-types.h"
 #include "sv-definition/sv-lite-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "player/player-class.h"
 #include "player/player-status.h"
 #include "shoot.h"

diff --git a/src/object/object-generator.c b/src/object/object-generator.c
index beb8482..9827e63 100644 (file)
--- a/src/object/object-generator.c
+++ b/src/object/object-generator.c
@@ -1,9 +1,9 @@
 #include "object/object-generator.h"
-#include "object/artifact.h"
-#include "object/object-curse.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/object-curse.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
-#include "object/trc-types.h"
+#include "object-enchant/special-object-flags.h"
+#include "object-enchant/trc-types.h"
 
 /*!
  * @brief オブジェクトを初期化する

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 041b2de..faaab99 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -8,17 +8,17 @@
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
-#include "object/item-feeling.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-appraiser.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-armor-types.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"
 #include "player/player-races-table.h"

diff --git a/src/object/object-value.c b/src/object/object-value.c
index 4039a47..557a2af 100644 (file)
--- a/src/object/object-value.c
+++ b/src/object/object-value.c
@@ -1,14 +1,14 @@
 #include "object/object-value.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-appraiser.h"
 #include "object/object-broken.h"
-#include "object/object-curse.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-curse.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object1.h"
 #include "object/object2.h" // 暫定、相互参照している.
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 
 /*!
  * @brief 未鑑定なベースアイテムの基本価格を返す /

diff --git a/src/object/object1.c b/src/object/object1.c
index 316433d..27b199f 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -20,21 +20,21 @@
 #include "io/files-util.h"
 #include "io/read-pref-file.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-apply-magic.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-ring-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/player-class.h"
 #include "player/player-move.h"
 #include "system/system-variables.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 7484160..9b853d6 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -20,13 +20,13 @@
 #include "main/sound-definitions-table.h"
 #include "monster/monster-race-hook.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
-#include "object/item-apply-magic.h"
-#include "object/item-feeling.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-apply-magic.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-appraiser.h" // 暫定、相互参照している.
-#include "object/object-boost.h"
-#include "object/object-curse.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-boost.h"
+#include "object-enchant/object-curse.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
@@ -34,7 +34,7 @@
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "object/object-value.h" // 暫定、相互参照している.
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-armor-types.h"
 #include "sv-definition/sv-lite-types.h"
@@ -42,7 +42,7 @@
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-ring-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"

diff --git a/src/object/torch.c b/src/object/torch.c
index a182a8c..ca74e22 100644 (file)
--- a/src/object/torch.c
+++ b/src/object/torch.c
@@ -1,6 +1,6 @@
 #include "object/torch.h"
 #include "sv-definition/sv-lite-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief 投擲時たいまつに投げやすい/焼棄/アンデッドスレイの特別効果を返す。

diff --git a/src/object/warning.c b/src/object/warning.c
index 389e095..a3aeb66 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -2,7 +2,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "player/player-move.h"
 #include "grid/feature.h"
 #include "floor/floor.h"
@@ -20,7 +20,7 @@
 #include "mspell/mspell-damage-calculator.h"
 #include "player/player-races-table.h"
 #include "combat/monster-attack-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief 警告を放つアイテムを選択する /

diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c
index 99887ac..445fab3 100644 (file)
--- a/src/player/digestion-processor.c
+++ b/src/player/digestion-processor.c
@@ -6,7 +6,7 @@
 #include "player/player-effects.h"
 #include "monster/creature.h"
 #include "player/player-move.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 
 /*!
  * @brief 10ゲームターンが進行するごとにプレイヤーの腹を減らす

diff --git a/src/player/patron.c b/src/player/patron.c
index 71a1151..a943323 100644 (file)
--- a/src/player/patron.c
+++ b/src/player/patron.c
@@ -5,12 +5,12 @@
 #include "cmd-io/cmd-dump.h"
 #include "player/patron.h"
 #include "cmd-action/cmd-pet.h"
-#include "object/object-curse.h"
+#include "object-enchant/object-curse.h"
 #include "object/object-flavor.h"
 #include "monster/monster-race-hook.h"
 #include "object/object-kind-hook.h"
 #include "mutation/mutation.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-races-table.h"

diff --git a/src/player/permanent-resistances.c b/src/player/permanent-resistances.c
index 2f0c0f8..d845f3e 100644 (file)
--- a/src/player/permanent-resistances.c
+++ b/src/player/permanent-resistances.c
@@ -1,7 +1,7 @@
 #include "permanent-resistances.h"
 #include "player/player-personalities-table.h"
 #include "player/player-races-table.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief プレーヤーの職業による耐性フラグを返す

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 30d513b..b77afc1 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -13,7 +13,7 @@
 #include "market/arena-info-table.h"
 #include "realm/realm-song.h"
 #include "floor/floor.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-broken.h"
@@ -34,7 +34,7 @@
 #include "io/files-util.h"
 #include "inventory/inventory-damage.h"
 #include "mind/racial-mirror-master.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
 * @brief 酸攻撃による装備のAC劣化処理 /

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 46b7117..9c9db46 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -33,16 +33,16 @@
 #include "monster/monster-status.h"
 #include "mspell/monster-spell.h"
 #include "mutation/mutation.h"
-#include "object/artifact.h"
-#include "object/item-feeling.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-armor-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-weapon-types.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index e15d60b..5d888c0 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -158,12 +158,12 @@
 #include "monster/monster-status.h"
 #include "monster/monster.h"
 #include "mspell/monster-spell.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "object/warning.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 3484c46..a228cdd 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -26,18 +26,18 @@
 #include "monster/monster-status.h"
 #include "monster/monster.h"
 #include "mutation/mutation.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/bow.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
 #include "object/object1.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "pet/pet-util.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"

diff --git a/src/player/race-resistances.c b/src/player/race-resistances.c
index 6f08e20..b543ca1 100644 (file)
--- a/src/player/race-resistances.c
+++ b/src/player/race-resistances.c
@@ -1,7 +1,7 @@
 #include "race-resistances.h"
 #include "player/player-races-table.h"
 #include "object/object1.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief プレイヤーの種族による免疫フラグを返す

diff --git a/src/player/selfinfo.c b/src/player/selfinfo.c
index 2a06f58..c2d1344 100644 (file)
--- a/src/player/selfinfo.c
+++ b/src/player/selfinfo.c
@@ -25,8 +25,8 @@
 #include "realm/realm-hex.h"
 #include "realm/realm-song.h"
 #include "object/object1.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 
 /*!
  * @brief 自己分析処理(Nethackからのアイデア) / self-knowledge... idea from nethack.

diff --git a/src/player/temporary-resistances.c b/src/player/temporary-resistances.c
index 00a57a8..56650cd 100644 (file)
--- a/src/player/temporary-resistances.c
+++ b/src/player/temporary-resistances.c
@@ -2,7 +2,7 @@
 #include "realm/realm-hex.h"
 #include "realm/realm-song.h"
 #include "player/player-races-table.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief プレイヤーの一時的魔法効果による耐性を返す

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index ce0940a..348c97c 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -23,7 +23,7 @@
 #include "cmd-item/cmd-quaff.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "object/object-curse.h"
+#include "object-enchant/object-curse.h"
 #include "spell/spells-status.h"
 #include "spell/technic-info-table.h"
 #include "player/player-status.h"
@@ -44,8 +44,8 @@
 #include "spell/process-effect.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "object/item-use-flags.h"
 
 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index dafa63e..1ba1cb0 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -7,7 +7,7 @@
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "monster/monster-race-hook.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "monster/monster.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
@@ -29,7 +29,7 @@
 #include "spell/spells-detection.h"
 #include "combat/combat-options-type.h"
 #include "cmd-action/cmd-attack.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
 * @brief 剣術の各処理を行う

diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index ab8c6f5..3e7492d 100644 (file)
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -6,7 +6,7 @@
 #include "room/rooms.h"
 #include "monster/monster.h"
 #include "monster/monster-race-hook.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/item-apply-magic.h"
 #include "object/object-kind-hook.h"
 #include "object/object2.h"
 #include "grid/feature.h"

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 9c04024..3e8080d 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -14,7 +14,7 @@
 #include "floor/geometry.h"
 #include "floor/wild.h"
 #include "store/store-util.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/item-apply-magic.h"
 
 /*
  * The vault generation arrays

diff --git a/src/room/rooms.c b/src/room/rooms.c
index 03e1956..6d8c7d7 100644 (file)
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -56,7 +56,7 @@
 #include "grid/trap.h"
 
 #include "monster/monster.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/item-apply-magic.h"
 
  /*!
   * 各部屋タイプの生成比定義

diff --git a/src/spell/spells-floor.c b/src/spell/spells-floor.c
index d7f12ef..8a13727 100644 (file)
--- a/src/spell/spells-floor.c
+++ b/src/spell/spells-floor.c
@@ -17,12 +17,12 @@
 #include "grid/grid.h"
 #include "io/write-diary.h"
 #include "monster/monster-status.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 6a9c892..e9b38b2 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -13,28 +13,28 @@
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "io/targeting.h"
-#include "object/artifact.h"
-#include "object/item-apply-magic.h"
-#include "object/item-feeling.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-apply-magic.h"
+#include "object-enchant/item-feeling.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
-#include "object/object-boost.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-boost.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-scroll-types.h"
 #include "sv-definition/sv-staff-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 3da499e..7ae2edd 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -35,7 +35,7 @@
 #include "monster/monster-race.h"
 #include "monster/monster-status.h"
 #include "mutation/mutation.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
@@ -43,7 +43,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-mark-types.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-food-types.h"
 #include "pet/pet-fall-off.h"
 #include "pet/pet-util.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 6ce0b55..0f4995b 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -41,21 +41,21 @@
 #include "monster/monster-process.h"
 #include "monster/monster-status.h"
 #include "mspell/monster-spell.h"
-#include "object/artifact.h"
-#include "object/item-feeling.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-feeling.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
-#include "object/object-boost.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-boost.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
-#include "object/special-object-flags.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/special-object-flags.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"

diff --git a/src/store/rumor.c b/src/store/rumor.c
index c42f0a6..b188a61 100644 (file)
--- a/src/store/rumor.c
+++ b/src/store/rumor.c
@@ -5,11 +5,11 @@
 #include "io/files-util.h"
 #include "io/tokenizer.h"
 #include "monster/monster-race.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "util/util.h"
 #include "world/world.h"
 

diff --git a/src/store/store-util.c b/src/store/store-util.c
index 531742b..e69ad7d 100644 (file)
--- a/src/store/store-util.c
+++ b/src/store/store-util.c
@@ -5,20 +5,20 @@
  */
 
 #include "store/store-util.h"
-#include "object/item-apply-magic.h"
-#include "object/item-feeling.h"
+#include "object-enchant/item-apply-magic.h"
+#include "object-enchant/item-feeling.h"
 #include "object/object-appraiser.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-potion-types.h"
 #include "sv-definition/sv-scroll-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 int cur_store_num = 0;
 store_type *st_ptr = NULL;

diff --git a/src/store/store.c b/src/store/store.c
index cb4c63b..85018b4 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -42,7 +42,7 @@
 #include "main/sound-definitions-table.h"
 #include "market/gold-magnification-table.h"
 #include "mind/mind.h"
-#include "object/item-feeling.h"
+#include "object-enchant/item-feeling.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
@@ -51,7 +51,7 @@
 #include "object/object-kind.h"
 #include "object/object-value.h"
 #include "object/object2.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"

diff --git a/src/view/display-characteristic.c b/src/view/display-characteristic.c
index e6cfa50..1fafcc2 100644 (file)
--- a/src/view/display-characteristic.c
+++ b/src/view/display-characteristic.c
@@ -9,9 +9,9 @@
 #include "player/permanent-resistances.h"
 #include "player/temporary-resistances.h"
 #include "player/race-resistances.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "object/object-flavor.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 
 typedef struct {
        BIT_FLAGS player_flags[TR_FLAG_SIZE];

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 545c3e8..f6d6397 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -31,7 +31,7 @@
 #include "io/targeting.h"
 #include "market/arena-info-table.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"

diff --git a/src/view/display-player-middle.c b/src/view/display-player-middle.c
index 1978d1c..bd540b8 100644 (file)
--- a/src/view/display-player-middle.c
+++ b/src/view/display-player-middle.c
@@ -1,7 +1,7 @@
 #include "view/display-player-middle.h"
 #include "floor/floor.h"
 #include "object/object-appraiser.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-bow-types.h"
 #include "player/player-effects.h"
 #include "player/player-races-table.h"

diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c
index b25985b..a98a8a4 100644 (file)
--- a/src/view/display-player-stat-info.c
+++ b/src/view/display-player-stat-info.c
@@ -14,7 +14,7 @@
 #include "player/permanent-resistances.h"
 #include "player/player-races-table.h"
 #include "object/object1.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 
 /*!
  * @brief プレーヤーのパラメータ基礎値 (腕力等)を18以下になるようにして返す

diff --git a/src/view/object-describer.c b/src/view/object-describer.c
index 49e9c90..1b2920d 100644 (file)
--- a/src/view/object-describer.c
+++ b/src/view/object-describer.c
@@ -3,7 +3,7 @@
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "spell/spells3.h"
 #include "term/gameterm.h"
 

diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index 7b74dae..06ddea9 100644 (file)
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -9,12 +9,12 @@
 #include "combat/attack-power-table.h"
 #include "combat/shoot.h"
 #include "display-util.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-appraiser.h"
 #include "object/object1.h"
-#include "object/special-object-flags.h"
+#include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "object/tr-types.h"
+#include "object-enchant/tr-types.h"
 #include "term/gameterm.h"
 
 static TERM_COLOR likert_color = TERM_WHITE;

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 22e7c11..4a77a8e 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -33,8 +33,8 @@
 #include "monster/monster-status.h"
 #include "mspell/monster-spell.h"
 #include "mutation/mutation.h"
-#include "object/artifact.h"
-#include "object/item-apply-magic.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/item-apply-magic.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
@@ -43,7 +43,7 @@
 #include "object/object-kind.h"
 #include "object/object-value.h"
 #include "object/object2.h"
-#include "object/trc-types.h"
+#include "object-enchant/trc-types.h"
 #include "player/patron.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index 7e98ada..3c313ed 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -15,17 +15,17 @@
 #include "floor/floor-town.h"
 #include "io/files-util.h"
 #include "monster/monster.h"
-#include "object/artifact.h"
+#include "object-enchant/artifact.h"
 #include "object/object-appraiser.h"
-#include "object/object-ego.h"
+#include "object-enchant/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
-#include "object/special-object-flags.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
+#include "object-enchant/special-object-flags.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "store/store-util.h"
 #include "store/store.h"
 #include "system/angband-version.h"