OSDN Git Service

[Refactor] #41053 Moved art-definition/*.h to artifact/
authorHourier <hourier@users.sourceforge.jp>
Tue, 15 Dec 2020 13:07:11 +0000 (22:07 +0900)
committerHourier <hourier@users.sourceforge.jp>
Tue, 15 Dec 2020 13:08:34 +0000 (22:08 +0900)
45 files changed:
Hengband/Hengband/Hengband.vcxproj
Hengband/Hengband/Hengband.vcxproj.filters
src/Makefile.am
src/action/activation-execution.c
src/action/movement-execution.c
src/artifact/artifact-info.c
src/artifact/fixed-art-generator.c
src/artifact/fixed-art-types.h [moved from src/art-definition/fixed-art-types.h with 100% similarity]
src/artifact/random-art-activation.c
src/artifact/random-art-effects.h [moved from src/art-definition/random-art-effects.h with 100% similarity]
src/cmd-action/cmd-attack.c
src/cmd-item/cmd-equipment.c
src/cmd-item/cmd-throw.c
src/combat/shoot.c
src/combat/slaying.c
src/effect/effect-player-resist-hurt.c
src/inventory/inventory-curse.c
src/inventory/player-inventory.c
src/io-dump/character-dump.c
src/load/item-loader.c
src/market/building-craft-fix.c
src/market/building-craft-weapon.c
src/monster-floor/special-death-switcher.c
src/object-activation/activation-others.c
src/object-activation/activation-switcher.c
src/object-enchant/activation-info-table.c
src/object-enchant/apply-magic.c
src/object-enchant/object-boost.c
src/object-enchant/vorpal-weapon.c
src/object-hook/hook-expendable.c
src/object-use/read-execution.c
src/object/object-info.c
src/object/warning.c
src/perception/identification.c
src/player-attack/attack-chaos-effect.c
src/player-attack/blood-sucking-processor.c
src/player-attack/player-attack.c
src/player/player-status-flags.c
src/player/player-status-resist.c
src/player/player-status.c
src/realm/realm-hissatsu.c
src/specific-object/bloody-moon.c
src/specific-object/death-crimson.c
src/specific-object/muramasa.c
src/view/status-first-page.c

index e93d26c..c51d87c 100644 (file)
     <ClInclude Include="..\..\src\action\travel-execution.h" />\r
     <ClInclude Include="..\..\src\action\tunnel-execution.h" />\r
     <ClInclude Include="..\..\src\action\weapon-shield.h" />\r
-    <ClInclude Include="..\..\src\art-definition\fixed-art-types.h" />\r
-    <ClInclude Include="..\..\src\art-definition\random-art-effects.h" />\r
+    <ClInclude Include="..\..\src\artifact\fixed-art-types.h" />\r
+    <ClInclude Include="..\..\src\artifact\random-art-effects.h" />\r
     <ClInclude Include="..\..\src\artifact\artifact-info.h" />\r
     <ClInclude Include="..\..\src\artifact\fixed-art-generator.h" />\r
     <ClInclude Include="..\..\src\artifact\random-art-activation.h" />\r
index a491b86..c5298cd 100644 (file)
     <ClInclude Include="..\..\src\object-enchant\activation-info-table.h">
       <Filter>object-enchant</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\art-definition\random-art-effects.h">
-      <Filter>art-definition</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster-race\race-indice-types.h">
       <Filter>monster-race</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\io\record-play-movie.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\art-definition\fixed-art-types.h">
-      <Filter>art-definition</Filter>
+    <ClInclude Include="..\..\src\artifact\fixed-art-types.h">
+      <Filter>artifact</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\artifact\random-art-effects.h">
+      <Filter>artifact</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="melee">
       <UniqueIdentifier>{642ec95b-f054-4958-a614-49ccf88cfc25}</UniqueIdentifier>
     </Filter>
-    <Filter Include="art-definition">
-      <UniqueIdentifier>{fffcb35e-069c-4a97-ab60-0010a4d5d488}</UniqueIdentifier>
-    </Filter>
     <Filter Include="monster-race">
       <UniqueIdentifier>{8de4a55f-fa83-496b-a42f-81078346c918}</UniqueIdentifier>
     </Filter>
index aeebdef..ee792d0 100644 (file)
@@ -20,18 +20,17 @@ hengband_SOURCES = \
        \
        artifact/artifact-info.c artifact/artifact-info.h \
        artifact/fixed-art-generator.c artifact/fixed-art-generator.h \
+       artifact/fixed-art-types.h \
        artifact/random-art-activation.c artifact/random-art-activation.h \
        artifact/random-art-bias-types.h \
        artifact/random-art-characteristics.c artifact/random-art-characteristics.h \
+       artifact/random-art-effects.h \
        artifact/random-art-generator.c artifact/random-art-generator.h \
        artifact/random-art-misc.c artifact/random-art-misc.h \
        artifact/random-art-pval-investor.c artifact/random-art-pval-investor.h \
        artifact/random-art-resistance.c artifact/random-art-resistance.h \
        artifact/random-art-slay.c artifact/random-art-slay.h \
        \
-       art-definition/fixed-art-types.h \
-       art-definition/random-art-effects.h \
-       \
        autopick/autopick.c autopick/autopick.h \
        autopick/autopick-commands-table.h autopick/autopick-dirty-flags.h \
        autopick/autopick-editor-table.h autopick/autopick-flags-table.h \
index c361f5f..5701632 100644 (file)
@@ -1,6 +1,6 @@
 #include "action/activation-execution.h"
 #include "action/action-limited.h"
-#include "art-definition/random-art-effects.h"
+#include "artifact/random-art-effects.h"
 #include "artifact/artifact-info.h"
 #include "core/window-redrawer.h"
 #include "effect/spells-effect-util.h"
index ee28085..a71647b 100644 (file)
@@ -1,6 +1,6 @@
 #include "action/movement-execution.h"
 #include "action/open-close-execution.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "cmd-action/cmd-attack.h"
 #include "core/disturbance.h"
 #include "core/player-update-types.h"
index 2f8ac71..2d94789 100644 (file)
@@ -1,5 +1,5 @@
 #include "artifact/artifact-info.h"
-#include "art-definition/random-art-effects.h"
+#include "artifact/random-art-effects.h"
 #include "cmd-item/cmd-smith.h"
 #include "mind/mind-weaponsmith.h"
 #include "object-enchant/object-ego.h"
index 7bfbccf..927fadd 100644 (file)
@@ -11,7 +11,7 @@
  */
 
 #include "artifact/fixed-art-generator.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "floor/floor-object.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-curse.h"
index 0403ced..23865d3 100644 (file)
@@ -1,5 +1,5 @@
 #include "artifact/random-art-activation.h"
-#include "art-definition/random-art-effects.h"
+#include "artifact/random-art-effects.h"
 #include "artifact/random-art-bias-types.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/tr-types.h"
index 4b7dfa2..021ba23 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include "cmd-action/cmd-attack.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "combat/attack-accuracy.h"
 #include "combat/attack-criticality.h"
 #include "core/asking-player.h"
index 0cdcc5b..b384f18 100644 (file)
@@ -1,6 +1,6 @@
 #include "cmd-item/cmd-equipment.h"
 #include "action/weapon-shield.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "autopick/autopick.h"
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
index d2d6b9a..ba3b064 100644 (file)
@@ -1,7 +1,7 @@
 #include "cmd-item/cmd-throw.h"
 #include "action/throw-util.h"
 #include "action/weapon-shield.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "combat/attack-power-table.h"
 #include "combat/shoot.h"
 #include "combat/slaying.h"
index 58c118a..e41feaf 100644 (file)
@@ -1,5 +1,5 @@
 #include "combat/shoot.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
index 2bd1044..a9bcc7a 100644 (file)
@@ -1,5 +1,5 @@
 #include "combat/slaying.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/player-redraw-types.h"
 #include "mind/mind-samurai.h"
 #include "monster-race/monster-race.h"
index 8d92e10..334b951 100644 (file)
@@ -1,5 +1,5 @@
 #include "effect/effect-player-resist-hurt.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "blue-magic/blue-magic-checker.h"
 #include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
index 2d727d4..d267936 100644 (file)
@@ -1,5 +1,5 @@
 #include "inventory/inventory-curse.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/asking-player.h"
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"
index d30f837..9b75396 100644 (file)
@@ -32,7 +32,7 @@
 #include "view/display-messages.h"
 #include "world/world.h"
 #ifdef JP
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "flavor/flavor-util.h"
 #endif
 
index 0e178fa..cd4d5a4 100644 (file)
@@ -1,5 +1,5 @@
 #include "io-dump/character-dump.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "cmd-building/cmd-building.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
index 6475049..8a84fc4 100644 (file)
@@ -1,5 +1,5 @@
 #include "load/item-loader.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "game-option/runtime-arguments.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
index 9c0f6f7..f3d27cb 100644 (file)
@@ -1,5 +1,5 @@
 #include "market/building-craft-fix.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "artifact/artifact-info.h"
 #include "core/asking-player.h"
 #include "core/player-update-types.h"
index 3569f37..25b4525 100644 (file)
@@ -1,5 +1,5 @@
 #include "market/building-craft-weapon.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "combat/attack-accuracy.h"
 #include "combat/shoot.h"
 #include "core/player-update-types.h"
index c45eac1..b73c3d5 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include "monster-floor/special-death-switcher.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "artifact/fixed-art-generator.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
index 89fb6eb..13ac3bc 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include "object-activation/activation-others.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "cmd-io/cmd-save.h"
 #include "core/asking-player.h"
 #include "core/hp-mp-processor.h"
index 2a251eb..e38b633 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include "object-activation/activation-switcher.h"
-#include "art-definition/random-art-effects.h"
+#include "artifact/random-art-effects.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "object-activation/activation-bolt-ball.h"
index 447aded..deb151f 100644 (file)
@@ -1,5 +1,5 @@
 #include "object-enchant/activation-info-table.h"
-#include "art-definition/random-art-effects.h"
+#include "artifact/random-art-effects.h"
 
 /*!
  * @brief アイテムの発動効果テーブル /
index 25b24d9..1217034 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 #include "object-enchant/apply-magic.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "artifact/fixed-art-generator.h"
 #include "dungeon/dungeon.h"
 #include "mutation/mutation-flag-types.h"
index 95a8f20..28136ba 100644 (file)
@@ -1,5 +1,5 @@
 #include "object-enchant/object-boost.h"
-#include "art-definition/random-art-effects.h"
+#include "artifact/random-art-effects.h"
 #include "object-enchant/tr-types.h"
 #include "system/floor-type-definition.h"
 #include "system/object-type-definition.h"
index 3ecd0c2..5c7fe14 100644 (file)
@@ -1,5 +1,5 @@
 #include "object-enchant/vorpal-weapon.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "inventory/inventory-slot-types.h"
 #include "io/files-util.h"
 #include "monster-race/monster-race.h"
index 321be27..2a17ee1 100644 (file)
@@ -1,5 +1,5 @@
 #include "object-hook/hook-expendable.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "monster-race/monster-race.h"
index 9fdba6d..ef93be3 100644 (file)
@@ -7,7 +7,7 @@
 
 #include "object-use/read-execution.h"
 #include "action/action-limited.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/show-file.h"
index 700006e..e627255 100644 (file)
@@ -11,8 +11,8 @@
  */
 
 #include "object/object-info.h"
-#include "art-definition/fixed-art-types.h"
-#include "art-definition/random-art-effects.h"
+#include "artifact/fixed-art-types.h"
+#include "artifact/random-art-effects.h"
 #include "artifact/artifact-info.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"
index dba5b91..e68633b 100644 (file)
@@ -1,5 +1,5 @@
 #include "object/warning.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/asking-player.h"
 #include "core/disturbance.h"
 #include "dungeon/dungeon-flag-types.h"
index 4f0bd9d..3389023 100644 (file)
@@ -1,5 +1,5 @@
 #include "perception/identification.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "game-option/special-options.h"
index d438b49..0250056 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 #include "player-attack/attack-chaos-effect.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/player-redraw-types.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
index 669c818..0e3c11a 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include "player-attack/blood-sucking-processor.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/hp-mp-processor.h"
 #include "game-option/cheat-options.h"
 #include "inventory/inventory-slot-types.h"
index f363e15..137f83a 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include "player-attack/player-attack.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "cmd-action/cmd-attack.h"
 #include "combat/attack-accuracy.h"
 #include "combat/attack-criticality.h"
index cb052a5..d0ce917 100644 (file)
@@ -1,5 +1,5 @@
 #include "player/player-status-flags.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "grid/grid.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"
index bea0f47..dadbf15 100644 (file)
@@ -1,5 +1,5 @@
 #include "player/player-status-resist.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "grid/grid.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"
index 8cbde00..0f8f178 100644 (file)
@@ -1,5 +1,5 @@
 #include "player/player-status.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick.h"
 #include "cmd-action/cmd-pet.h"
index 67e6d3f..e35cac3 100644 (file)
@@ -1,5 +1,5 @@
 #include "realm/realm-hissatsu.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "cmd-action/cmd-attack.h"
 #include "cmd-action/cmd-spell.h"
 #include "cmd-item/cmd-throw.h"
index 7990c54..3177cda 100644 (file)
@@ -1,5 +1,5 @@
 #include "specific-object/bloody-moon.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/player-update-types.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/tr-types.h"
index f02822a..0c9b9c0 100644 (file)
@@ -1,5 +1,5 @@
 #include "specific-object/death-crimson.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
 #include "floor/geometry.h"
index 8615b95..138553e 100644 (file)
@@ -1,5 +1,5 @@
 #include "specific-object/muramasa.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "core/asking-player.h"
 #include "spell/spells-object.h"
 #include "status/base-status.h"
index 2efc0d9..49b28e9 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 #include "view/status-first-page.h"
-#include "art-definition/fixed-art-types.h"
+#include "artifact/fixed-art-types.h"
 #include "combat/attack-power-table.h"
 #include "combat/shoot.h"
 #include "display-util.h"