[Refactor] #40581 Separated summon-types.h from spells-summon.c/h and specific summon...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 729d516..345e319 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -1082,6 +1082,7 @@
     <ClInclude Include="..\..\src\spell-realm\spells-demon.h" />\r
     <ClInclude Include="..\..\src\spell-realm\spells-nature.h" />\r
     <ClInclude Include="..\..\src\spell-realm\spells-sorcery.h" />\r
+    <ClInclude Include="..\..\src\spell\summon-types.h" />\r
     <ClInclude Include="..\..\src\status\bad-status-setter.h" />\r
     <ClInclude Include="..\..\src\status\base-status.h" />\r
     <ClInclude Include="..\..\src\status\body-improvement.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 0ec0c4e..9f2e764 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -4714,6 +4714,9 @@
     <ClInclude Include="..\..\src\monster-floor\special-death-switcher.h">
       <Filter>monster-floor</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\spell\summon-types.h">
+      <Filter>spell</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 3df32da..cf67d4f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -727,6 +727,7 @@ hengband_SOURCES = \
        spell/spells-summon.c spell/spells-summon.h \
        spell/spells-status.c spell/spells-status.h \
        spell/spell-types.h spell/spells-util.h \
+       spell/summon-types.h \
        spell/technic-info-table.c spell/technic-info-table.h \
        \
        spell-kind/blood-curse.c spell-kind/blood-curse.h \

diff --git a/src/action/mutation-execution.c b/src/action/mutation-execution.c
index 7cb38f1..039c928 100644 (file)
--- a/src/action/mutation-execution.c
+++ b/src/action/mutation-execution.c
@@ -37,7 +37,7 @@
 #include "spell-realm/spells-sorcery.h"
 #include "spell/spell-types.h"
 #include "spell/spells-status.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/element-resistance.h"
 #include "status/shape-changer.h"
 #include "system/floor-type-definition.h"

diff --git a/src/blue-magic/blue-magic-summon.c b/src/blue-magic/blue-magic-summon.c
index 3eec061..3f6ad76 100644 (file)
--- a/src/blue-magic/blue-magic-summon.c
+++ b/src/blue-magic/blue-magic-summon.c
@@ -3,6 +3,7 @@
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "view/display-messages.h"
 
 bool cast_blue_summon_kin(player_type *caster_ptr, bmc_type *bmc_ptr)

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index 13c32da..c0866d4 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -45,6 +45,7 @@
 #include "spell/spell-types.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/body-improvement.h"
 #include "status/buff-setter.h"

diff --git a/src/grid/trap.c b/src/grid/trap.c
index 6cf8c6b..0b649f8 100644 (file)
--- a/src/grid/trap.c
+++ b/src/grid/trap.c
@@ -31,7 +31,7 @@
 #include "spell-kind/spells-sight.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/spell-types.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
 #include "status/element-resistance.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index 9b807b5..3ff4d30 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -21,7 +21,7 @@
 #include "player/player-race-types.h"
 #include "spell-kind/spells-random.h"
 #include "spell-kind/spells-teleport.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/mind/mind-force-trainer.c b/src/mind/mind-force-trainer.c
index 0726803..54947b2 100644 (file)
--- a/src/mind/mind-force-trainer.c
+++ b/src/mind/mind-force-trainer.c
@@ -22,8 +22,8 @@
 #include "player/player-damage.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"
-#include "spell/spells-summon.h"
 #include "spell/spell-types.h"
+#include "spell/summon-types.h"
 #include "status/temporary-resistance.h"
 #include "system/floor-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/monster-floor/monster-generator.c b/src/monster-floor/monster-generator.c
index de73979..ca5d7fa 100644 (file)
--- a/src/monster-floor/monster-generator.c
+++ b/src/monster-floor/monster-generator.c
@@ -24,7 +24,7 @@
 #include "monster/monster-util.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/summon-checker.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "system/floor-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "util/string-processor.h"

diff --git a/src/monster-floor/monster-summon.c b/src/monster-floor/monster-summon.c
index 0f931ae..4f132c1 100644 (file)
--- a/src/monster-floor/monster-summon.c
+++ b/src/monster-floor/monster-summon.c
@@ -13,7 +13,7 @@
 #include "monster/monster-list.h"
 #include "monster/monster-util.h"
 #include "mspell/summon-checker.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-type-definition.h"
 

diff --git a/src/monster-floor/special-death-switcher.c b/src/monster-floor/special-death-switcher.c
index c2b71d9..e8ec3a6 100644 (file)
--- a/src/monster-floor/special-death-switcher.c
+++ b/src/monster-floor/special-death-switcher.c
@@ -30,7 +30,7 @@
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "spell/spell-types.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-weapon-types.h"

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index 3388a92..bfdc511 100644 (file)
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -56,7 +56,7 @@
 #include "player/player-move.h"
 #include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/monster/monster-util.c b/src/monster/monster-util.c
index b6c5fbe..afe9beb 100644 (file)
--- a/src/monster/monster-util.c
+++ b/src/monster/monster-util.c
@@ -13,7 +13,7 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
 #include "mspell/mspell-mask-definitions.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "system/alloc-entries.h"
 #include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index b93a0db..c4ee64b 100644 (file)
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -18,6 +18,7 @@
 #include "spell-kind/spells-launcher.h"
 #include "spell/spell-types.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "system/floor-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/mspell/specified-summon.c b/src/mspell/specified-summon.c
index e171e9a..93e5174 100644 (file)
--- a/src/mspell/specified-summon.c
+++ b/src/mspell/specified-summon.c
@@ -12,7 +12,7 @@
 #include "mspell/mspell-util.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell/spell-types.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "view/display-messages.h"
 
 /*!

diff --git a/src/mspell/summon-checker.c b/src/mspell/summon-checker.c
index 4935901..2d3d99a 100644 (file)
--- a/src/mspell/summon-checker.c
+++ b/src/mspell/summon-checker.c
@@ -10,7 +10,7 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-util.h"
 #include "player/player-race.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "util/string-processor.h"
 
 /*!
@@ -146,6 +146,10 @@ bool check_summon_specific(player_type *player_ptr, MONRACE_IDX summoner_idx, MO
         is_match = (r_idx == MON_BLUE_HORROR);
         break;
     }
+    case SUMMON_TOTEM_MOAI: {
+        is_match = r_idx == MON_TOTEM_MOAI;
+        break;
+    }
     case SUMMON_ELEMENTAL: {
         is_match = (r_ptr->d_char == 'E');
         break;

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index ecdb0ff..8657e19 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -27,7 +27,7 @@
 #include "spell-kind/spells-world.h"
 #include "spell-realm/spells-hex.h"
 #include "spell/spell-types.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
 #include "status/body-improvement.h"

diff --git a/src/object-activation/activation-switcher.c b/src/object-activation/activation-switcher.c
index 3cfbb49..b1fd025 100644 (file)
--- a/src/object-activation/activation-switcher.c
+++ b/src/object-activation/activation-switcher.c
@@ -28,6 +28,7 @@
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/body-improvement.h"
 #include "status/buff-setter.h"

diff --git a/src/object-use/read-execution.c b/src/object-use/read-execution.c
index 18d8ba4..0d0e661 100644 (file)
--- a/src/object-use/read-execution.c
+++ b/src/object-use/read-execution.c
@@ -47,6 +47,7 @@
 #include "spell/spell-types.h"
 #include "spell/spells-object.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/body-improvement.h"
 #include "status/buff-setter.h"

diff --git a/src/player/patron.c b/src/player/patron.c
index 06c63a4..13d2b15 100644 (file)
--- a/src/player/patron.c
+++ b/src/player/patron.c
@@ -26,6 +26,7 @@
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/base-status.h"
 #include "status/experience.h"
 #include "status/shape-changer.h"

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index 7fbc126..e4ce2bb 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -17,7 +17,7 @@
 #include "spell/spell-types.h"
 #include "spell/spells-diceroll.h"
 #include "spell/spells-status.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/element-resistance.h"
 #include "status/sight-setter.h"

diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c
index f753303..a2e5687 100644 (file)
--- a/src/realm/realm-craft.c
+++ b/src/realm/realm-craft.c
@@ -12,7 +12,7 @@
 #include "spell/range-calc.h"
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/body-improvement.h"
 #include "status/buff-setter.h"
 #include "status/element-resistance.h"

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index ed7f5ab..8a0f0a5 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -21,7 +21,7 @@
 #include "spell/spells-diceroll.h"
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/body-improvement.h"
 #include "status/buff-setter.h"

diff --git a/src/realm/realm-demon.c b/src/realm/realm-demon.c
index a195efd..1c4241f 100644 (file)
--- a/src/realm/realm-demon.c
+++ b/src/realm/realm-demon.c
@@ -17,6 +17,7 @@
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/buff-setter.h"
 #include "status/element-resistance.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index b038f17..eee8b5d 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -30,7 +30,7 @@
 #include "spell/spells-diceroll.h"
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
-#include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/buff-setter.h"
 #include "status/element-resistance.h"

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 44b3b07..4414ebe 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -19,6 +19,7 @@
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/sight-setter.h"
 #include "target/target-checker.h"
 #include "target/target-getter.h"

diff --git a/src/specific-object/chest.c b/src/specific-object/chest.c
index 9e94659..c72740f 100644 (file)
--- a/src/specific-object/chest.c
+++ b/src/specific-object/chest.c
@@ -16,6 +16,7 @@
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-sight.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "spell/spell-types.h"
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"

diff --git a/src/spell-kind/spells-random.c b/src/spell-kind/spells-random.c
index 8f3a5d8..8ec9d33 100644 (file)
--- a/src/spell-kind/spells-random.c
+++ b/src/spell-kind/spells-random.c
@@ -27,6 +27,7 @@
 #include "spell/spells-diceroll.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
 #include "status/experience.h"

diff --git a/src/spell-realm/spells-trump.c b/src/spell-realm/spells-trump.c
index d512e13..82cff63 100644 (file)
--- a/src/spell-realm/spells-trump.c
+++ b/src/spell-realm/spells-trump.c
@@ -13,6 +13,7 @@
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
+#include "spell/summon-types.h"
 #include "status/base-status.h"
 #include "status/buff-setter.h"
 #include "status/experience.h"

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index 8ca5ca1..1a359fe 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -25,6 +25,7 @@
 #include "spell-kind/spells-specific-bolt.h"
 #include "spell/spells-status.h"
 #include "spell/spell-types.h"
+#include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "sv-definition/sv-other-types.h"
 #include "system/floor-type-definition.h"

diff --git a/src/spell/spells-summon.h b/src/spell/spells-summon.h
index e8ff63d..d49f6dc 100644 (file)
--- a/src/spell/spells-summon.h
+++ b/src/spell/spells-summon.h
@@ -2,58 +2,6 @@
 
 #include "system/angband.h"
 
-/*
- * summon_specificで取り扱われる、召喚の種別定義 / Legal restrictions for "summon_specific()"
- */
-#define SUMMON_ANT                  11 /*!< 召喚タイプ: アリ */
-#define SUMMON_SPIDER               12 /*!< 召喚タイプ: 蜘蛛 */
-#define SUMMON_HOUND                13 /*!< 召喚タイプ: ハウンド */
-#define SUMMON_HYDRA                14 /*!< 召喚タイプ: ヒドラ */
-#define SUMMON_ANGEL                15 /*!< 召喚タイプ: 天使 */
-#define SUMMON_DEMON                16 /*!< 召喚タイプ: 悪魔 */
-#define SUMMON_UNDEAD               17 /*!< 召喚タイプ: アンデッド */
-#define SUMMON_DRAGON               18 /*!< 召喚タイプ: ドラゴン */
-#define SUMMON_HI_UNDEAD            21 /*!< 召喚タイプ: 強力なアンデッド */
-#define SUMMON_HI_DRAGON            22 /*!< 召喚タイプ: 古代ドラゴン */
-#define SUMMON_HI_DEMON             23 /*!< 召喚タイプ: 上級デーモン */
-#define SUMMON_AMBERITES            31 /*!< 召喚タイプ: アンバーの王族 */
-#define SUMMON_UNIQUE               32 /*!< 召喚タイプ: ユニーク */
-#define SUMMON_MOLD                 33 /*!< 召喚タイプ: カビ */
-#define SUMMON_BAT                  34 /*!< 召喚タイプ: コウモリ */
-#define SUMMON_QUYLTHULG            35 /*!< 召喚タイプ: クイルスルグ */
-#define SUMMON_XXX1                 36 /*!< 召喚タイプ: 未使用 */
-#define SUMMON_COIN_MIMIC           37 /*!< 召喚タイプ: クリーピング・コイン */
-#define SUMMON_MIMIC                38 /*!< 召喚タイプ: ミミック */
-#define SUMMON_CYBER                39 /*!< 召喚タイプ: サイバーデーモン */
-#define SUMMON_KIN                  40 /*!< 召喚タイプ: 召喚者の同族 */
-#define SUMMON_DAWN                 41 /*!< 召喚タイプ: 暁の戦士 */
-#define SUMMON_ANIMAL               42 /*!< 召喚タイプ: 自然界の動物 */
-#define SUMMON_ANIMAL_RANGER        43 /*!< 召喚タイプ: レンジャー向け自然界の動物 */
- /*#define SUMMON_HI_UNDEAD_NO_UNIQUES 44*/
- /*#define SUMMON_HI_DRAGON_NO_UNIQUES 45*/
- /*#define SUMMON_NO_UNIQUES           46*/
-#define SUMMON_PHANTOM              47 /*!< 召喚タイプ: ゴースト */
-/*#define SUMMON_ELEMENTAL_NO_UNIQUES 48*/
-#define SUMMON_BLUE_HORROR          49 /*!< 召喚タイプ: ブルー・ホラー */
-#define SUMMON_LIVING               50 /*!< 召喚タイプ: 生命のあるモンスター */
-#define SUMMON_HI_DRAGON_LIVING     51 /*!< 召喚タイプ: 生命のある古代ドラゴン */
-#define SUMMON_GOLEM                52 /*!< 召喚タイプ: ゴーレム */
-#define SUMMON_ELEMENTAL            53 /*!< 召喚タイプ: エレメンタル */
-#define SUMMON_VORTEX               54 /*!< 召喚タイプ: ボルテックス */
-#define SUMMON_HYBRID               55 /*!< 召喚タイプ: 混合生物 */
-#define SUMMON_BIRD                 56 /*!< 召喚タイプ: 鳥 */
-/*#define SUMMON_AQUATIC_NO_UNIQUES   57*/
-#define SUMMON_KAMIKAZE             58 /*!< 召喚タイプ: 自爆モンスター */
-#define SUMMON_KAMIKAZE_LIVING      59 /*!< 召喚タイプ: 生命のある自爆モンスター */
-#define SUMMON_MANES                60 /*!< 召喚タイプ: 古代の死霊 */
-#define SUMMON_LOUSE                61 /*!< 召喚タイプ: シラミ */
-#define SUMMON_GUARDIANS            62 /*!< 召喚タイプ: ダンジョンの主 */
-#define SUMMON_KNIGHTS              63 /*!< 召喚タイプ: 聖戦用騎士系モンスター */
-#define SUMMON_EAGLES               64 /*!< 召喚タイプ: 鷲系モンスター */
-#define SUMMON_PIRANHAS             65 /*!< 召喚タイプ: ピラニア・トラップ用 */
-#define SUMMON_ARMAGE_GOOD          66 /*!< 召喚タイプ: ハルマゲドン・トラップ用天使陣営 */
-#define SUMMON_ARMAGE_EVIL          67 /*!< 召喚タイプ: ハルマゲドン・トラップ用悪魔陣営 */
-
 bool trump_summoning(player_type *caster_ptr, int num, bool pet, POSITION y, POSITION x, DEPTH lev, int type, BIT_FLAGS mode);
 bool cast_summon_demon(player_type *creature_ptr, int power);
 bool cast_summon_undead(player_type *creature_ptr, int power);

diff --git a/src/spell/summon-types.h b/src/spell/summon-types.h
new file mode 100644 (file)
index 0000000..e850be1
--- /dev/null
+++ b/src/spell/summon-types.h
@@ -0,0 +1,49 @@
+#pragma once
+
+/* summon_specific\82Å\8eæ\82è\88µ\82í\82ê\82é\81A\8f¢\8a«\82Ì\8eí\95Ê\92è\8b` / Legal restrictions for "summon_specific()" */
+typedef enum summon_type {
+       SUMMON_ANT = 11,  /*!< \8f¢\8a«\83^\83C\83v: \83A\83\8a */
+    SUMMON_SPIDER = 12, /*!< \8f¢\8a«\83^\83C\83v: \92wå\81 */
+    SUMMON_HOUND = 13, /*!< \8f¢\8a«\83^\83C\83v: \83n\83E\83\93\83h */
+    SUMMON_HYDRA = 14, /*!< \8f¢\8a«\83^\83C\83v: \83q\83h\83\89 */
+    SUMMON_ANGEL = 15, /*!< \8f¢\8a«\83^\83C\83v: \93V\8eg */
+    SUMMON_DEMON = 16, /*!< \8f¢\8a«\83^\83C\83v: \88«\96\82 */
+    SUMMON_UNDEAD = 17, /*!< \8f¢\8a«\83^\83C\83v: \83A\83\93\83f\83b\83h */
+    SUMMON_DRAGON = 18, /*!< \8f¢\8a«\83^\83C\83v: \83h\83\89\83S\83\93 */
+    SUMMON_HI_UNDEAD = 21, /*!< \8f¢\8a«\83^\83C\83v: \8b­\97Í\82È\83A\83\93\83f\83b\83h */
+    SUMMON_HI_DRAGON = 22, /*!< \8f¢\8a«\83^\83C\83v: \8cÃ\91ã\83h\83\89\83S\83\93 */
+    SUMMON_HI_DEMON = 23, /*!< \8f¢\8a«\83^\83C\83v: \8fã\8b\89\83f\81[\83\82\83\93 */
+    SUMMON_AMBERITES = 31, /*!< \8f¢\8a«\83^\83C\83v: \83A\83\93\83o\81[\82Ì\89¤\91° */
+    SUMMON_UNIQUE = 32, /*!< \8f¢\8a«\83^\83C\83v: \83\86\83j\81[\83N */
+    SUMMON_MOLD = 33, /*!< \8f¢\8a«\83^\83C\83v: \83J\83r */
+    SUMMON_BAT = 34, /*!< \8f¢\8a«\83^\83C\83v: \83R\83E\83\82\83\8a */
+    SUMMON_QUYLTHULG = 35, /*!< \8f¢\8a«\83^\83C\83v: \83N\83C\83\8b\83X\83\8b\83O */
+    SUMMON_XXX1 = 36, /*!< \8f¢\8a«\83^\83C\83v: \96¢\8eg\97p */
+    SUMMON_COIN_MIMIC = 37, /*!< \8f¢\8a«\83^\83C\83v: \83N\83\8a\81[\83s\83\93\83O\81E\83R\83C\83\93 */
+    SUMMON_MIMIC = 38, /*!< \8f¢\8a«\83^\83C\83v: \83~\83~\83b\83N */
+    SUMMON_CYBER = 39, /*!< \8f¢\8a«\83^\83C\83v: \83T\83C\83o\81[\83f\81[\83\82\83\93 */
+    SUMMON_KIN = 40, /*!< \8f¢\8a«\83^\83C\83v: \8f¢\8a«\8eÒ\82Ì\93¯\91° */
+    SUMMON_DAWN = 41, /*!< \8f¢\8a«\83^\83C\83v: \8bÅ\82Ì\90í\8em */
+    SUMMON_ANIMAL = 42, /*!< \8f¢\8a«\83^\83C\83v: \8e©\91R\8aE\82Ì\93®\95¨ */
+    SUMMON_ANIMAL_RANGER = 43, /*!< \8f¢\8a«\83^\83C\83v: \83\8c\83\93\83W\83\83\81[\8cü\82¯\8e©\91R\8aE\82Ì\93®\95¨ */
+    SUMMON_PHANTOM = 47, /*!< \8f¢\8a«\83^\83C\83v: \83S\81[\83X\83g */
+    SUMMON_BLUE_HORROR = 49, /*!< \8f¢\8a«\83^\83C\83v: \83u\83\8b\81[\81E\83z\83\89\81[ */
+    SUMMON_TOTEM_MOAI = 48, /*!< \8f¢\8a«\83^\83C\83v: \83g\81[\83e\83\80\83\82\83A\83C */
+    SUMMON_LIVING = 50, /*!< \8f¢\8a«\83^\83C\83v: \90¶\96½\82Ì\82 \82é\83\82\83\93\83X\83^\81[ */
+    SUMMON_HI_DRAGON_LIVING = 51, /*!< \8f¢\8a«\83^\83C\83v: \90¶\96½\82Ì\82 \82é\8cÃ\91ã\83h\83\89\83S\83\93 */
+    SUMMON_GOLEM = 52, /*!< \8f¢\8a«\83^\83C\83v: \83S\81[\83\8c\83\80 */
+    SUMMON_ELEMENTAL = 53, /*!< \8f¢\8a«\83^\83C\83v: \83G\83\8c\83\81\83\93\83^\83\8b */
+    SUMMON_VORTEX = 54, /*!< \8f¢\8a«\83^\83C\83v: \83{\83\8b\83e\83b\83N\83X */
+    SUMMON_HYBRID = 55, /*!< \8f¢\8a«\83^\83C\83v: \8d¬\8d\87\90¶\95¨ */
+    SUMMON_BIRD = 56, /*!< \8f¢\8a«\83^\83C\83v: \92¹ */
+    SUMMON_KAMIKAZE = 58, /*!< \8f¢\8a«\83^\83C\83v: \8e©\94\9a\83\82\83\93\83X\83^\81[ */
+    SUMMON_KAMIKAZE_LIVING = 59, /*!< \8f¢\8a«\83^\83C\83v: \90¶\96½\82Ì\82 \82é\8e©\94\9a\83\82\83\93\83X\83^\81[ */
+    SUMMON_MANES = 60, /*!< \8f¢\8a«\83^\83C\83v: \8cÃ\91ã\82Ì\8e\80\97ì */
+    SUMMON_LOUSE = 61, /*!< \8f¢\8a«\83^\83C\83v: \83V\83\89\83~ */
+    SUMMON_GUARDIANS = 62, /*!< \8f¢\8a«\83^\83C\83v: \83_\83\93\83W\83\87\83\93\82Ì\8eå */
+    SUMMON_KNIGHTS = 63, /*!< \8f¢\8a«\83^\83C\83v: \90¹\90í\97p\8bR\8em\8cn\83\82\83\93\83X\83^\81[ */
+    SUMMON_EAGLES = 64, /*!< \8f¢\8a«\83^\83C\83v: \98h\8cn\83\82\83\93\83X\83^\81[ */
+    SUMMON_PIRANHAS = 65, /*!< \8f¢\8a«\83^\83C\83v: \83s\83\89\83j\83A\81E\83g\83\89\83b\83v\97p */
+    SUMMON_ARMAGE_GOOD = 66, /*!< \8f¢\8a«\83^\83C\83v: \83n\83\8b\83}\83Q\83h\83\93\81E\83g\83\89\83b\83v\97p\93V\8eg\90w\89c */
+    SUMMON_ARMAGE_EVIL = 67, /*!< \8f¢\8a«\83^\83C\83v: \83n\83\8b\83}\83Q\83h\83\93\81E\83g\83\89\83b\83v\97p\88«\96\82\90w\89c */
+} summon_type;