From e0788b15368ba467be23aad164a29a7fe95ffcdc Mon Sep 17 00:00:00 2001 From: Hourier Date: Sun, 7 Jun 2020 14:56:32 +0900 Subject: [PATCH] [Refactor] #40014 Separated race-indice-types.h from monster.h --- Hengband/Hengband/Hengband.vcxproj | 1 + Hengband/Hengband/Hengband.vcxproj.filters | 6 ++ src/Makefile.am | 8 +- src/autopick/autopick-util.c | 1 + src/combat/shoot.c | 1 + src/combat/slaying.c | 1 + src/core/game-play.c | 1 + src/effect/effect-monster-curse.c | 1 + src/effect/effect-monster-domination.c | 1 + src/effect/effect-monster-oldies.c | 3 +- src/effect/effect-monster-resist-hurt.c | 1 + src/effect/effect-monster.c | 1 + src/effect/effect-player-curse.c | 1 + src/effect/effect-player-oldies.c | 1 + src/effect/effect-player-resist-hurt.c | 1 + src/io/load.c | 1 + src/market/arena-info-table.c | 1 + src/market/bounty.c | 1 + src/mind/mind-ninja.c | 1 + src/monster-attack/monster-attack-describer.c | 1 + src/monster-attack/monster-attack-status.c | 1 + src/monster-race/race-indice-types.h | 143 ++++++++++++++++++++++++++ src/monster/monster-move.c | 1 + src/monster/monster-process.c | 1 + src/monster/monster-race-hook.c | 15 ++- src/monster/monster-race-hook.h | 98 +++++++++--------- src/monster/monster-runaway.c | 1 + src/monster/monster-status.c | 1 + src/monster/monster.h | 140 ------------------------- src/monster/monster1.c | 1 + src/monster/monster2.c | 1 + src/mspell/mspell-ball.c | 1 + src/mspell/mspell-breath.c | 1 + src/mspell/mspell-floor.c | 1 + src/mspell/mspell-special.c | 1 + src/mspell/mspell-summon.c | 1 + src/mspell/mspells1.c | 1 + src/mspell/mspells2.c | 1 + src/object-enchant/apply-magic-others.c | 1 + src/object/object-hook.c | 1 + src/object/warning.c | 1 + src/perception/identification.c | 1 + src/spell/process-effect.c | 1 + src/spell/spells-summon.c | 1 + src/system/h-type.h | 4 +- 45 files changed, 253 insertions(+), 201 deletions(-) create mode 100644 src/monster-race/race-indice-types.h diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index a40188e68..371a59abf 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -528,6 +528,7 @@ + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 79468294d..4ec381be4 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -2686,6 +2686,9 @@ art-definition + + monster-race + @@ -2836,6 +2839,9 @@ {fffcb35e-069c-4a97-ab60-0010a4d5d488} + + {8de4a55f-fa83-496b-a42f-81078346c918} + diff --git a/src/Makefile.am b/src/Makefile.am index 85ffeb8ab..08f5bc521 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -304,6 +304,8 @@ hengband_SOURCES = \ monster-attack/monster-attack-util.c monster-attack/monster-attack-util.h \ monster-attack/monster-eating.c monster-attack/monster-eating.h \ \ + monster-race/race-indice-types.h \ + \ mspell/monster-spell.h \ mspell/mspells1.c mspell/mspells2.c mspell/mspells3.c \ mspell/assign-monster-spell.c mspell/assign-monster-spell.h \ @@ -525,9 +527,9 @@ COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -Iart-definition -Iautopick -Ibirth -Icmd -Icmd-io -Icmd-item -Icombat \ -Icore -Idungeon -Ieffect -Ifloor -Igrid -Iinfo-reader -Iinventory -Iio \ -Iio-dump -Iknowledge -Imarket -Imelee -Imind -Imonster -Imonster-attack \ - -Imspell -Imutation -Iobject -Iobject-enchant -Ipet -Iplayer -Iplayer-attack \ - -Irealm -Iroom -Ispecific-object -Ispell -Ispell-kind -Ispell-realm \ - -Isv-definition -Isystem -Iterm -Iutil -Iview -Iwizard -Iworld + -Imonster-race -Imspell -Imutation -Iobject -Iobject-enchant -Ipet -Iplayer \ + -Iplayer-attack -Irealm -Iroom -Ispecific-object -Ispell -Ispell-kind \ + -Ispell-realm -Isv-definition -Isystem -Iterm -Iutil -Iview -Iwizard -Iworld install-exec-hook: if SET_GID diff --git a/src/autopick/autopick-util.c b/src/autopick/autopick-util.c index 820d44e84..b9f288200 100644 --- a/src/autopick/autopick-util.c +++ b/src/autopick/autopick-util.c @@ -1,5 +1,6 @@ #include "autopick/autopick-util.h" #include "autopick/autopick-menu-data-table.h" +#include "monster-race/race-indice-types.h" #include "object-enchant/item-feeling.h" /* diff --git a/src/combat/shoot.c b/src/combat/shoot.c index 1478cdfd3..f5485aa0b 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -9,6 +9,7 @@ #include "inventory/inventory-object.h" #include "io/targeting.h" #include "main/sound-definitions-table.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-status.h" #include "monster/monster.h" #include "mspell/monster-spell.h" diff --git a/src/combat/slaying.c b/src/combat/slaying.c index 1f02d4bf2..2376127b1 100644 --- a/src/combat/slaying.c +++ b/src/combat/slaying.c @@ -1,6 +1,7 @@ #include "combat/slaying.h" #include "art-definition/art-sword-types.h" #include "mind/mind-samurai.h" +#include "monster-race/race-indice-types.h" #include "object-enchant/tr-types.h" #include "object/object-flags.h" #include "realm/realm-hex-numbers.h" diff --git a/src/core/game-play.c b/src/core/game-play.c index 3baf53e2e..5f5c335b8 100644 --- a/src/core/game-play.c +++ b/src/core/game-play.c @@ -38,6 +38,7 @@ #include "io/write-diary.h" #include "market/arena-info-table.h" #include "market/bounty.h" +#include "monster-race/race-indice-types.h" #include "monster/creature.h" #include "object/object-flavor.h" #include "player/player-class.h" diff --git a/src/effect/effect-monster-curse.c b/src/effect/effect-monster-curse.c index 4116a70b2..7a292b2b1 100644 --- a/src/effect/effect-monster-curse.c +++ b/src/effect/effect-monster-curse.c @@ -1,6 +1,7 @@ #include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-curse.h" +#include "monster-race/race-indice-types.h" gf_switch_result effect_monster_curse_1(effect_monster_type *em_ptr) { diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c index 7f8bf0555..34c6a6d94 100644 --- a/src/effect/effect-monster-domination.c +++ b/src/effect/effect-monster-domination.c @@ -2,6 +2,7 @@ #include "dungeon/quest.h" #include "effect/spells-effect-util.h" #include "floor/floor.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-race-hook.h" #include "monster/monster-status.h" #include "pet/pet-fall-off.h" diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c index 01781dab2..5ef9779c1 100644 --- a/src/effect/effect-monster-oldies.c +++ b/src/effect/effect-monster-oldies.c @@ -2,8 +2,9 @@ #include "effect/effect-monster-util.h" #include "effect/effect-monster-oldies.h" #include "floor/floor.h" -#include "player/avatar.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-status.h" +#include "player/avatar.h" // Powerful monsters can resist. gf_switch_result effect_monster_old_poly(effect_monster_type *em_ptr) diff --git a/src/effect/effect-monster-resist-hurt.c b/src/effect/effect-monster-resist-hurt.c index 505810ba7..b6b9ea5da 100644 --- a/src/effect/effect-monster-resist-hurt.c +++ b/src/effect/effect-monster-resist-hurt.c @@ -1,6 +1,7 @@ #include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-resist-hurt.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-status.h" #include "spell/spells3.h" diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c index b6a7c3aed..ae024088a 100644 --- a/src/effect/effect-monster.c +++ b/src/effect/effect-monster.c @@ -11,6 +11,7 @@ #include "floor/floor-object.h" #include "io/write-diary.h" #include "main/sound-definitions-table.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-status.h" #include "object-enchant/special-object-flags.h" #include "object/object-generator.h" diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c index e78392db9..3334a72a0 100644 --- a/src/effect/effect-player-curse.c +++ b/src/effect/effect-player-curse.c @@ -3,6 +3,7 @@ #include "effect/effect-player-curse.h" #include "player/player-damage.h" #include "mind/mind-mirror-master.h" +#include "monster-race/race-indice-types.h" #include "world/world.h" #include "mspell/monster-spell.h" #include "object-enchant/object-curse.h" diff --git a/src/effect/effect-player-oldies.c b/src/effect/effect-player-oldies.c index 3e255234f..1e81d961b 100644 --- a/src/effect/effect-player-oldies.c +++ b/src/effect/effect-player-oldies.c @@ -1,6 +1,7 @@ #include "system/angband.h" #include "effect/effect-player-util.h" #include "effect/effect-player-oldies.h" +#include "monster-race/race-indice-types.h" #include "player/player-effects.h" void effect_player_old_heal(player_type *target_ptr, diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c index 593c0d3ac..d0d299602 100644 --- a/src/effect/effect-player-resist-hurt.c +++ b/src/effect/effect-player-resist-hurt.c @@ -2,6 +2,7 @@ #include "art-definition/art-sword-types.h" #include "inventory/inventory-damage.h" #include "mind/mind-mirror-master.h" +#include "monster-race/race-indice-types.h" #include "mspell/monster-spell.h" #include "mutation/mutation.h" #include "object/object-broken.h" diff --git a/src/io/load.c b/src/io/load.c index 7ab409280..e5ccf6d0a 100644 --- a/src/io/load.c +++ b/src/io/load.c @@ -62,6 +62,7 @@ #include "locale/japanese.h" #include "market/arena.h" #include "market/bounty.h" +#include "monster-race/race-indice-types.h" #include "monster/monster.h" #include "mutation/mutation.h" #include "object-enchant/artifact.h" diff --git a/src/market/arena-info-table.c b/src/market/arena-info-table.c index 11885f576..38247c0d0 100644 --- a/src/market/arena-info-table.c +++ b/src/market/arena-info-table.c @@ -1,5 +1,6 @@ #include "system/angband.h" #include "arena-info-table.h" +#include "monster-race/race-indice-types.h" #include "sv-definition/sv-amulet-types.h" #include "sv-definition/sv-food-types.h" #include "sv-definition/sv-potion-types.h" diff --git a/src/market/bounty.c b/src/market/bounty.c index 191d3efb3..4f97c0b02 100644 --- a/src/market/bounty.c +++ b/src/market/bounty.c @@ -6,6 +6,7 @@ #include "inventory/inventory-object.h" #include "market/bounty-prize-table.h" #include "market/building-util.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-race-hook.h" #include "object-enchant/apply-magic.h" #include "object-enchant/item-apply-magic.h" diff --git a/src/mind/mind-ninja.c b/src/mind/mind-ninja.c index 93bfa40b8..47582a7a8 100644 --- a/src/mind/mind-ninja.c +++ b/src/mind/mind-ninja.c @@ -5,6 +5,7 @@ #include "effect/spells-effect-util.h" #include "floor/floor-object.h" #include "io/targeting.h" +#include "monster-race/race-indice-types.h" #include "object-enchant/trc-types.h" #include "object/object-generator.h" #include "object/object-kind-hook.h" diff --git a/src/monster-attack/monster-attack-describer.c b/src/monster-attack/monster-attack-describer.c index 08468ca32..75c3f7c06 100644 --- a/src/monster-attack/monster-attack-describer.c +++ b/src/monster-attack/monster-attack-describer.c @@ -6,6 +6,7 @@ #include "monster-attack/monster-attack-describer.h" #include "monster-attack/insults-moans.h" +#include "monster-race/race-indice-types.h" #include "main/sound-definitions-table.h" static void show_jaian_song(monap_type *monap_ptr) diff --git a/src/monster-attack/monster-attack-status.c b/src/monster-attack/monster-attack-status.c index 395e520b2..64dfe55e0 100644 --- a/src/monster-attack/monster-attack-status.c +++ b/src/monster-attack/monster-attack-status.c @@ -6,6 +6,7 @@ #include "monster-attack/monster-attack-status.h" #include "mind/mind-mirror-master.h" +#include "monster-race/race-indice-types.h" #include "player/player-effects.h" void process_blind_attack(player_type *target_ptr, monap_type *monap_ptr) diff --git a/src/monster-race/race-indice-types.h b/src/monster-race/race-indice-types.h new file mode 100644 index 000000000..7d1e62c18 --- /dev/null +++ b/src/monster-race/race-indice-types.h @@ -0,0 +1,143 @@ +#pragma once + +typedef enum monster_race_type { + MON_BEGGAR = 12, + MON_LEPER = 13, + MON_LION_HEART = 19, + MON_NOV_PRIEST = 45, + MON_GRIP = 53, + MON_WOLF = 54, + MON_FANG = 55, + MON_LOUSE = 69, + MON_PIRANHA = 70, + MON_COPPER_COINS = 85, + MON_NOV_PALADIN = 97, + MON_NOV_PRIEST_G = 109, + MON_SILVER_COINS = 117, + MON_D_ELF = 122, + MON_MANES = 128, + MON_NOV_PALADIN_G = 147, + MON_PHANTOM_W = 152, + MON_WOUNDED_BEAR = 159, + MON_D_ELF_MAGE = 178, + MON_D_ELF_WARRIOR = 182, + MON_BLUE_HORROR = 189, + MON_GOLD_COINS = 195, + MON_MASTER_YEEK = 224, + MON_PRIEST = 225, + MON_D_ELF_PRIEST = 226, + MON_MITHRIL_COINS = 239, + MON_PINK_HORROR = 242, + MON_IMP = 296, + MON_LIZARD_KING = 332, + MON_WYVERN = 334, + MON_SABRE_TIGER = 339, + MON_D_ELF_LORD = 348, + MON_ARCH_VILE = 357, + MON_JADE_MONK = 370, + MON_D_ELF_WARLOCK = 375, + MON_MENELDOR = 384, + MON_PHANTOM_B = 385, + MON_D_ELF_DRUID = 400, + MON_GWAIHIR = 410, + MON_ADAMANT_COINS = 423, + MON_COLBRAN = 435, + MON_MITHRIL_GOLEM = 464, + MON_THORONDOR = 468, + MON_GHOUL_KING = 483, + MON_NINJA = 485, + MON_BICLOPS = 490, + MON_IVORY_MONK = 492, + MON_GOEMON = 505, + MON_WATER_ELEM = 512, + MON_BLOODLETTER = 523, + MON_RAAL = 557, + MON_NIGHTBLADE = 564, + MON_BARON_HELL = 609, + MON_G_C_DRAKE = 646, + MON_F_ANGEL = 652, + MON_D_ELF_SORC = 657, + MON_IRON_LICH = 666, + MON_DREADMASTER = 690, + MON_DROLEM = 691, + MON_DAWN = 693, + MON_NAZGUL = 696, + MON_SMAUG = 697, + MON_STORMBRINGER = 698, + MON_ULTRA_PALADIN = 699, + MON_G_TITAN = 702, + MON_S_TYRANNO = 705, + MON_FAFNER = 712, + MON_G_BALROG = 720, + MON_BULLGATES = 732, + MON_LORD_CHAOS = 737, + MON_NIGHTWALKER = 768, + MON_SHADOWLORD = 774, + MON_JABBERWOCK = 778, + MON_ULT_BEHOLDER = 781, + MON_SHAMBLER = 786, + MON_BLACK_REAVER = 798, + MON_UNMAKER = 815, + MON_CYBER = 816, + MON_ANGMAR = 825, + MON_WYRM_POWER = 847, + MON_JORMUNGAND = 854, + MON_SAURON = 858, + MON_UNICORN_ORD = 859, + MON_OBERON = 860, + MON_MORGOTH = 861, + MON_SERPENT = 862, + MON_ONE_RING = 864, + MON_EBONY_MONK = 870, + MON_HAGURE = 871, + MON_DIO = 878, + MON_OHMU = 879, + MON_WONG = 880, + MON_ZOMBI_SERPENT = 883, + MON_D_ELF_SHADE = 886, + MON_TROLL_KING = 894, + MON_ELF_LORD = 900, + MON_G_MASTER_MYS = 917, + MON_IE = 921, + MON_TSUCHINOKO = 926, + MON_LOCKE_CLONE = 930, + MON_CALDARM = 931, + MON_BANORLUPART = 932, + MON_BANOR = 933, + MON_LUPART = 934, + MON_KENSHIROU = 936, + MON_W_KNIGHT = 938, + MON_BIKETAL = 945, + MON_IKETA = 949, + MON_B_DEATH_SWORD = 953, + MON_YASE_HORSE = 955, + MON_HORSE = 956, + MON_BOTEI = 963, + MON_KAGE = 964, + MON_JAIAN = 967, + MON_FENGHUANG = 988, + MON_SUKE = 1001, + MON_KAKU = 1002, + MON_A_GOLD = 1010, + MON_A_SILVER = 1011, + MON_ROLENTO = 1013, + MON_RAOU = 1018, + MON_GRENADE = 1023, + MON_DEBBY = 1032, + MON_KNI_TEMPLAR = 1037, + MON_PALADIN = 1038, + MON_CHAMELEON = 1040, + MON_CHAMELEON_K = 1041, + MON_TOPAZ_MONK = 1047, + MON_M_MINDCRAFTER = 1056, + MON_ELDER_VAMPIRE = 1058, + MON_NOBORTA = 1059, + MON_MORI_TROLL = 1060, + MON_BARNEY = 1061, + MON_GROO = 1062, + MON_LOUSY = 1063, + MON_WYRM_SPACE = 1064, + MON_JIZOTAKO = 1065, + MON_TANUKI = 1067, + MON_ALIEN_JURAL = 1082, +} monster_race_type; diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c index fd69d325f..6737e6d49 100644 --- a/src/monster/monster-move.c +++ b/src/monster/monster-move.c @@ -11,6 +11,7 @@ #include "pet/pet-util.h" #include "monster/creature.h" #include "io/files-util.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-status.h" #include "player/player-move.h" #include "spell/spells-type.h" diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c index bcdea0421..785943da1 100644 --- a/src/monster/monster-process.c +++ b/src/monster/monster-process.c @@ -15,6 +15,7 @@ #include "system/angband.h" #include "util/util.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-direction.h" #include "monster/monster-move.h" #include "monster/monster-runaway.h" diff --git a/src/monster/monster-race-hook.c b/src/monster/monster-race-hook.c index 644dcc66e..f4494cb7c 100644 --- a/src/monster/monster-race-hook.c +++ b/src/monster/monster-race-hook.c @@ -1,14 +1,13 @@ -#include "system/angband.h" -#include "util/util.h" - -#include "monster/monster-race-hook.h" -#include "monster/monster.h" -#include "mspell/monster-spell.h" -#include "floor/floor.h" +#include "monster/monster-race-hook.h" #include "dungeon/dungeon.h" -#include "monster/monster-race.h" +#include "floor/floor.h" #include "monster-attack/monster-attack-effect.h" #include "monster-attack/monster-attack-types.h" +#include "monster-race/race-indice-types.h" +#include "monster/monster-race.h" +#include "monster/monster.h" +#include "mspell/monster-spell.h" +#include "util/util.h" /*! 通常pit生成時のモンスターの構成条件ID / Race index for "monster pit (clone)" */ int vault_aux_race; diff --git a/src/monster/monster-race-hook.h b/src/monster/monster-race-hook.h index de4fb84e6..2779ba06f 100644 --- a/src/monster/monster-race-hook.h +++ b/src/monster/monster-race-hook.h @@ -1,54 +1,58 @@ -extern int vault_aux_race; +#pragma once + +#include "system/angband.h" + +extern int vault_aux_race; extern char vault_aux_char; extern BIT_FLAGS vault_aux_dragon_mask4; -extern bool mon_hook_quest(MONRACE_IDX r_idx); -extern bool mon_hook_dungeon(MONRACE_IDX r_idx); -extern bool mon_hook_ocean(MONRACE_IDX r_idx); -extern bool mon_hook_shore(MONRACE_IDX r_idx); -extern bool mon_hook_waste(MONRACE_IDX r_idx); -extern bool mon_hook_town(MONRACE_IDX r_idx); -extern bool mon_hook_wood(MONRACE_IDX r_idx); -extern bool mon_hook_volcano(MONRACE_IDX r_idx); -extern bool mon_hook_wood(MONRACE_IDX r_idx); -extern bool mon_hook_volcano(MONRACE_IDX r_idx); -extern bool mon_hook_mountain(MONRACE_IDX r_idx); -extern bool mon_hook_grass(MONRACE_IDX r_idx); -extern bool mon_hook_deep_water(MONRACE_IDX r_idx); -extern bool mon_hook_shallow_water(MONRACE_IDX r_idx); -extern bool mon_hook_lava(MONRACE_IDX r_idx); -extern bool mon_hook_floor(MONRACE_IDX r_idx); +bool mon_hook_quest(MONRACE_IDX r_idx); +bool mon_hook_dungeon(MONRACE_IDX r_idx); +bool mon_hook_ocean(MONRACE_IDX r_idx); +bool mon_hook_shore(MONRACE_IDX r_idx); +bool mon_hook_waste(MONRACE_IDX r_idx); +bool mon_hook_town(MONRACE_IDX r_idx); +bool mon_hook_wood(MONRACE_IDX r_idx); +bool mon_hook_volcano(MONRACE_IDX r_idx); +bool mon_hook_wood(MONRACE_IDX r_idx); +bool mon_hook_volcano(MONRACE_IDX r_idx); +bool mon_hook_mountain(MONRACE_IDX r_idx); +bool mon_hook_grass(MONRACE_IDX r_idx); +bool mon_hook_deep_water(MONRACE_IDX r_idx); +bool mon_hook_shallow_water(MONRACE_IDX r_idx); +bool mon_hook_lava(MONRACE_IDX r_idx); +bool mon_hook_floor(MONRACE_IDX r_idx); -extern void vault_prep_clone(player_type *player_ptr); -extern void vault_prep_dragon(player_type *player_ptr); -extern void vault_prep_symbol(player_type *player_ptr); +void vault_prep_clone(player_type *player_ptr); +void vault_prep_dragon(player_type *player_ptr); +void vault_prep_symbol(player_type *player_ptr); -extern bool vault_aux_lite(MONRACE_IDX r_idx); -extern bool vault_aux_shards(MONRACE_IDX r_idx); -extern bool vault_aux_simple(MONRACE_IDX r_idx); -extern bool vault_aux_jelly(MONRACE_IDX r_idx); -extern bool vault_aux_animal(MONRACE_IDX r_idx); -extern bool vault_aux_undead(MONRACE_IDX r_idx); -extern bool vault_aux_chapel_g(MONRACE_IDX r_idx); -extern bool vault_aux_kennel(MONRACE_IDX r_idx); -extern bool vault_aux_mimic(MONRACE_IDX r_idx); -extern bool vault_aux_clone(MONRACE_IDX r_idx); -extern bool vault_aux_symbol_e(MONRACE_IDX r_idx); -extern bool vault_aux_symbol_g(MONRACE_IDX r_idx); -extern bool vault_aux_orc(MONRACE_IDX r_idx); -extern bool vault_aux_troll(MONRACE_IDX r_idx); -extern bool vault_aux_giant(MONRACE_IDX r_idx); -extern bool vault_aux_dragon(MONRACE_IDX r_idx); -extern bool vault_aux_demon(MONRACE_IDX r_idx); -extern bool vault_aux_cthulhu(MONRACE_IDX r_idx); -extern bool vault_aux_dark_elf(MONRACE_IDX r_idx); +bool vault_aux_lite(MONRACE_IDX r_idx); +bool vault_aux_shards(MONRACE_IDX r_idx); +bool vault_aux_simple(MONRACE_IDX r_idx); +bool vault_aux_jelly(MONRACE_IDX r_idx); +bool vault_aux_animal(MONRACE_IDX r_idx); +bool vault_aux_undead(MONRACE_IDX r_idx); +bool vault_aux_chapel_g(MONRACE_IDX r_idx); +bool vault_aux_kennel(MONRACE_IDX r_idx); +bool vault_aux_mimic(MONRACE_IDX r_idx); +bool vault_aux_clone(MONRACE_IDX r_idx); +bool vault_aux_symbol_e(MONRACE_IDX r_idx); +bool vault_aux_symbol_g(MONRACE_IDX r_idx); +bool vault_aux_orc(MONRACE_IDX r_idx); +bool vault_aux_troll(MONRACE_IDX r_idx); +bool vault_aux_giant(MONRACE_IDX r_idx); +bool vault_aux_dragon(MONRACE_IDX r_idx); +bool vault_aux_demon(MONRACE_IDX r_idx); +bool vault_aux_cthulhu(MONRACE_IDX r_idx); +bool vault_aux_dark_elf(MONRACE_IDX r_idx); -extern bool vault_monster_okay(MONRACE_IDX r_idx); +bool vault_monster_okay(MONRACE_IDX r_idx); -extern bool monster_living(MONRACE_IDX r_idx); -extern bool no_questor_or_bounty_uniques(MONRACE_IDX r_idx); -extern bool monster_hook_human(MONRACE_IDX r_idx); -extern bool get_nightmare(MONRACE_IDX r_idx); -extern bool monster_is_fishing_target(MONRACE_IDX r_idx); -extern bool monster_can_entry_arena(MONRACE_IDX r_idx); -extern bool item_monster_okay(MONRACE_IDX r_idx); +bool monster_living(MONRACE_IDX r_idx); +bool no_questor_or_bounty_uniques(MONRACE_IDX r_idx); +bool monster_hook_human(MONRACE_IDX r_idx); +bool get_nightmare(MONRACE_IDX r_idx); +bool monster_is_fishing_target(MONRACE_IDX r_idx); +bool monster_can_entry_arena(MONRACE_IDX r_idx); +bool item_monster_okay(MONRACE_IDX r_idx); diff --git a/src/monster/monster-runaway.c b/src/monster/monster-runaway.c index 6ca9f88fb..82bd9867c 100644 --- a/src/monster/monster-runaway.c +++ b/src/monster/monster-runaway.c @@ -6,6 +6,7 @@ #include "monster/monster-runaway.h" #include "dungeon/quest.h" +#include "monster-race/race-indice-types.h" #include "pet/pet-fall-off.h" #include "player/player-move.h" diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c index cc31fe76d..fdde40868 100644 --- a/src/monster/monster-status.c +++ b/src/monster/monster-status.c @@ -13,6 +13,7 @@ #include "io/report.h" #include "io/write-diary.h" #include "main/sound-definitions-table.h" +#include "monster-race/race-indice-types.h" #include "monster/creature.h" #include "monster/monster-process.h" #include "monster/monster-race-hook.h" diff --git a/src/monster/monster.h b/src/monster/monster.h index 00b4cb151..ea9a04690 100644 --- a/src/monster/monster.h +++ b/src/monster/monster.h @@ -129,146 +129,6 @@ typedef struct MONSTER_IDX parent_m_idx; } monster_type; -#define MON_BEGGAR 12 -#define MON_LEPER 13 -#define MON_LION_HEART 19 -#define MON_NOV_PRIEST 45 -#define MON_GRIP 53 -#define MON_WOLF 54 -#define MON_FANG 55 -#define MON_LOUSE 69 -#define MON_PIRANHA 70 -#define MON_COPPER_COINS 85 -#define MON_NOV_PALADIN 97 -#define MON_NOV_PRIEST_G 109 -#define MON_SILVER_COINS 117 -#define MON_D_ELF 122 -#define MON_MANES 128 -#define MON_NOV_PALADIN_G 147 -#define MON_PHANTOM_W 152 -#define MON_WOUNDED_BEAR 159 -#define MON_D_ELF_MAGE 178 -#define MON_D_ELF_WARRIOR 182 -#define MON_BLUE_HORROR 189 -#define MON_GOLD_COINS 195 -#define MON_MASTER_YEEK 224 -#define MON_PRIEST 225 -#define MON_D_ELF_PRIEST 226 -#define MON_MITHRIL_COINS 239 -#define MON_PINK_HORROR 242 -#define MON_IMP 296 -#define MON_LIZARD_KING 332 -#define MON_WYVERN 334 -#define MON_SABRE_TIGER 339 -#define MON_D_ELF_LORD 348 -#define MON_ARCH_VILE 357 -#define MON_JADE_MONK 370 -#define MON_D_ELF_WARLOCK 375 -#define MON_MENELDOR 384 -#define MON_PHANTOM_B 385 -#define MON_D_ELF_DRUID 400 -#define MON_GWAIHIR 410 -#define MON_ADAMANT_COINS 423 -#define MON_COLBRAN 435 -#define MON_MITHRIL_GOLEM 464 -#define MON_THORONDOR 468 -#define MON_GHOUL_KING 483 -#define MON_NINJA 485 -#define MON_BICLOPS 490 -#define MON_IVORY_MONK 492 -#define MON_GOEMON 505 -#define MON_WATER_ELEM 512 -#define MON_BLOODLETTER 523 -#define MON_RAAL 557 -#define MON_NIGHTBLADE 564 -#define MON_BARON_HELL 609 -#define MON_G_C_DRAKE 646 -#define MON_F_ANGEL 652 -#define MON_D_ELF_SORC 657 -#define MON_IRON_LICH 666 -#define MON_DREADMASTER 690 -#define MON_DROLEM 691 -#define MON_DAWN 693 -#define MON_NAZGUL 696 -#define MON_SMAUG 697 -#define MON_STORMBRINGER 698 -#define MON_ULTRA_PALADIN 699 -#define MON_G_TITAN 702 -#define MON_S_TYRANNO 705 -#define MON_FAFNER 712 -#define MON_G_BALROG 720 -#define MON_BULLGATES 732 -#define MON_LORD_CHAOS 737 -#define MON_NIGHTWALKER 768 -#define MON_SHADOWLORD 774 -#define MON_JABBERWOCK 778 -#define MON_ULT_BEHOLDER 781 -#define MON_SHAMBLER 786 -#define MON_BLACK_REAVER 798 -#define MON_UNMAKER 815 -#define MON_CYBER 816 -#define MON_ANGMAR 825 -#define MON_WYRM_POWER 847 -#define MON_JORMUNGAND 854 -#define MON_SAURON 858 -#define MON_UNICORN_ORD 859 -#define MON_OBERON 860 -#define MON_MORGOTH 861 -#define MON_SERPENT 862 -#define MON_ONE_RING 864 -#define MON_EBONY_MONK 870 -#define MON_HAGURE 871 -#define MON_DIO 878 -#define MON_OHMU 879 -#define MON_WONG 880 -#define MON_ZOMBI_SERPENT 883 -#define MON_D_ELF_SHADE 886 -#define MON_TROLL_KING 894 -#define MON_ELF_LORD 900 -#define MON_G_MASTER_MYS 917 -#define MON_IE 921 -#define MON_TSUCHINOKO 926 -#define MON_LOCKE_CLONE 930 -#define MON_CALDARM 931 -#define MON_BANORLUPART 932 -#define MON_BANOR 933 -#define MON_LUPART 934 -#define MON_KENSHIROU 936 -#define MON_W_KNIGHT 938 -#define MON_BIKETAL 945 -#define MON_IKETA 949 -#define MON_B_DEATH_SWORD 953 -#define MON_YASE_HORSE 955 -#define MON_HORSE 956 -#define MON_BOTEI 963 -#define MON_KAGE 964 -#define MON_JAIAN 967 -#define MON_FENGHUANG 988 -#define MON_SUKE 1001 -#define MON_KAKU 1002 -#define MON_A_GOLD 1010 -#define MON_A_SILVER 1011 -#define MON_ROLENTO 1013 -#define MON_RAOU 1018 -#define MON_GRENADE 1023 -#define MON_DEBBY 1032 -#define MON_KNI_TEMPLAR 1037 -#define MON_PALADIN 1038 -#define MON_CHAMELEON 1040 -#define MON_CHAMELEON_K 1041 -#define MON_TOPAZ_MONK 1047 -#define MON_M_MINDCRAFTER 1056 -#define MON_ELDER_VAMPIRE 1058 -#define MON_NOBORTA 1059 -#define MON_MORI_TROLL 1060 -#define MON_BARNEY 1061 -#define MON_GROO 1062 -#define MON_LOUSY 1063 -#define MON_WYRM_SPACE 1064 -#define MON_JIZOTAKO 1065 -#define MON_TANUKI 1067 -#define MON_ALIEN_JURAL 1082 - /* * Bit flags for the place_monster_???() (etc) */ diff --git a/src/monster/monster1.c b/src/monster/monster1.c index a0ae18f40..0bb08a5d9 100644 --- a/src/monster/monster1.c +++ b/src/monster/monster1.c @@ -31,6 +31,7 @@ #include "melee/melee-postprocess.h" #include "monster-attack/monster-attack-effect.h" #include "monster-attack/monster-attack-types.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-race-hook.h" #include "monster/monster.h" #include "mspell/monster-spell.h" diff --git a/src/monster/monster2.c b/src/monster/monster2.c index 54dd37261..24103232c 100644 --- a/src/monster/monster2.c +++ b/src/monster/monster2.c @@ -25,6 +25,7 @@ #include "io/write-diary.h" #include "main/sound-definitions-table.h" #include "monster-attack/monster-attack-types.h" +#include "monster-race/race-indice-types.h" #include "monster/creature.h" #include "monster/monster-race-hook.h" #include "monster/monster-race.h" diff --git a/src/mspell/mspell-ball.c b/src/mspell/mspell-ball.c index aa01e6c9a..b6b6ca02e 100644 --- a/src/mspell/mspell-ball.c +++ b/src/mspell/mspell-ball.c @@ -1,5 +1,6 @@ #include "system/angband.h" #include "floor/floor.h" +#include "monster-race/race-indice-types.h" #include "mspell/mspell-ball.h" #include "mspell/mspell-type.h" #include "mspell/monster-spell.h" diff --git a/src/mspell/mspell-breath.c b/src/mspell/mspell-breath.c index 90d97737e..9d26fb118 100644 --- a/src/mspell/mspell-breath.c +++ b/src/mspell/mspell-breath.c @@ -3,6 +3,7 @@ #include "mspell/monster-spell.h" #include "spell/spells-type.h" #include "main/sound-definitions-table.h" +#include "monster-race/race-indice-types.h" #include "mspell/mspell-util.h" #include "mspell/mspell-damage-calculator.h" #include "player/player-move.h" diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c index ad85dfa5a..3f7862866 100644 --- a/src/mspell/mspell-floor.c +++ b/src/mspell/mspell-floor.c @@ -7,6 +7,7 @@ #include "mspell/mspell-floor.h" #include "art-definition/art-bow-types.h" #include "effect/effect-characteristics.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-status.h" #include "mspell/monster-spell.h" #include "mspell/mspell-status.h" diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c index 4a82cc481..7a9c40316 100644 --- a/src/mspell/mspell-special.c +++ b/src/mspell/mspell-special.c @@ -8,6 +8,7 @@ #include "melee/melee-postprocess.h" #include "effect/effect-characteristics.h" #include "main/sound-definitions-table.h" +#include "monster-race/race-indice-types.h" #include "mspell/monster-spell.h" #include "mspell/mspell-util.h" #include "player/player-damage.h" diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c index d78846255..079f22973 100644 --- a/src/mspell/mspell-summon.c +++ b/src/mspell/mspell-summon.c @@ -1,5 +1,6 @@ #include "mspell/mspell-summon.h" #include "effect/effect-characteristics.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-status.h" #include "mspell/monster-spell.h" #include "mspell/mspell-util.h" diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c index 3865ed7d0..da680038b 100644 --- a/src/mspell/mspells1.c +++ b/src/mspell/mspells1.c @@ -47,6 +47,7 @@ #include "dungeon/quest.h" #include "player/player-move.h" #include "player/player-status.h" +#include "monster-race/race-indice-types.h" #include "monster/monster.h" #include "mspell/monster-spell.h" #include "spell/spells-type.h" diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c index dcd1c6689..8897a447d 100644 --- a/src/mspell/mspells2.c +++ b/src/mspell/mspells2.c @@ -19,6 +19,7 @@ #include "dungeon/quest.h" #include "player/player-move.h" #include "player/player-class.h" +#include "monster-race/race-indice-types.h" #include "monster/monster.h" #include "monster/monster-status.h" #include "mspell/monster-spell.h" diff --git a/src/object-enchant/apply-magic-others.c b/src/object-enchant/apply-magic-others.c index 8d7da79ee..a35cb7c2d 100644 --- a/src/object-enchant/apply-magic-others.c +++ b/src/object-enchant/apply-magic-others.c @@ -7,6 +7,7 @@ #include "object-enchant/apply-magic-others.h" #include "floor/floor.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-race-hook.h" #include "object-enchant/artifact.h" #include "object-enchant/object-ego.h" diff --git a/src/object/object-hook.c b/src/object/object-hook.c index 587af7799..de54fde8d 100644 --- a/src/object/object-hook.c +++ b/src/object/object-hook.c @@ -9,6 +9,7 @@ #include "art-definition/art-armor-types.h" #include "dungeon/quest.h" #include "floor/floor.h" +#include "monster-race/race-indice-types.h" #include "monster/monster.h" #include "object-enchant/artifact.h" #include "object-enchant/item-feeling.h" diff --git a/src/object/warning.c b/src/object/warning.c index d4315b0da..ebe595571 100644 --- a/src/object/warning.c +++ b/src/object/warning.c @@ -5,6 +5,7 @@ #include "grid/feature.h" #include "monster-attack/monster-attack-effect.h" #include "monster-attack/monster-attack-types.h" +#include "monster-race/race-indice-types.h" #include "monster/monster.h" #include "mspell/monster-spell.h" #include "mspell/mspell-damage-calculator.h" diff --git a/src/perception/identification.c b/src/perception/identification.c index d4aafcd31..2a38cc1b1 100644 --- a/src/perception/identification.c +++ b/src/perception/identification.c @@ -1,5 +1,6 @@ #include "perception/identification.h" #include "art-definition/art-protector-types.h" +#include "monster-race/race-indice-types.h" #include "object-enchant/artifact.h" #include "object-enchant/object-ego.h" #include "object-enchant/tr-types.h" diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c index 26ff46768..735cfb3f5 100644 --- a/src/spell/process-effect.c +++ b/src/spell/process-effect.c @@ -9,6 +9,7 @@ #include "effect/spells-effect-util.h" #include "floor/floor.h" #include "main/sound-definitions-table.h" +#include "monster-race/race-indice-types.h" #include "pet/pet-fall-off.h" #include "spell/spells-type.h" #include "spell/range-calc.h" diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c index 1daf48130..46246ddfd 100644 --- a/src/spell/spells-summon.c +++ b/src/spell/spells-summon.c @@ -3,6 +3,7 @@ #include "floor/floor.h" #include "inventory/inventory-object.h" #include "inventory/player-inventory.h" +#include "monster-race/race-indice-types.h" #include "monster/monster-status.h" #include "object/item-use-flags.h" #include "object/object-hook.h" diff --git a/src/system/h-type.h b/src/system/h-type.h index 4ed040dfa..9633e4f28 100644 --- a/src/system/h-type.h +++ b/src/system/h-type.h @@ -101,8 +101,8 @@ typedef s32b ACTION_IDX; /*!< プレイヤーが現在取っている常時行 typedef s16b BACT_IDX; /*!< 町の施設処理のID定義 */ typedef s16b BACT_RESTRICT_IDX; /*!< 町の施設処理の規制処理ID定義 */ -typedef s16b MONRACE_IDX; /*!< ゲーム中のモンスター種族ID型を定義 */ -typedef s16b MONSTER_IDX; /*!< ゲーム中のモンスター個体ID型を定義 */ +typedef s16b MONRACE_IDX; /*!< todo monster_race_typeに差し替えて消滅させる ゲーム中のモンスター種族ID型を定義 */ +typedef s16b MONSTER_IDX; /*!< todo monster_race_typeに差し替えて消滅させる ゲーム中のモンスター個体ID型を定義 */ typedef s16b DUNGEON_IDX; /*!< ゲーム中のダンジョンID型を定義 */ typedef s16b REALM_IDX; /*!< ゲーム中の魔法領域ID型を定義 */ typedef s16b ARTIFACT_IDX; /*!< ゲーム中のアーティファクトID型を定義 */ -- 2.11.0