[Refactor] rbm_type を enum class 化しつつ RaceBlowMethodType に改名。

[hengbandforosx/hengbandosx.git] / src / info-reader / race-info-tokens-table.h

diff --git a/src/info-reader/race-info-tokens-table.h b/src/info-reader/race-info-tokens-table.h
index a5c35e6..fa3b576 100644 (file)
--- a/src/info-reader/race-info-tokens-table.h
+++ b/src/info-reader/race-info-tokens-table.h
@@ -2,31 +2,31 @@
 
 #include "monster-attack/monster-attack-effect.h"
 #include "monster-attack/monster-attack-types.h"
+#include "monster-race/monster-aura-types.h"
+#include "monster-race/race-ability-flags.h"
+#include "monster-race/race-flags1.h"
+#include "monster-race/race-flags2.h"
+#include "monster-race/race-flags3.h"
+#include "monster-race/race-flags7.h"
+#include "monster-race/race-flags8.h"
+#include "monster-race/race-flags9.h"
+#include "monster-race/race-flags-resistance.h"
 #include "system/angband.h"
 
 #include <string_view>
 #include <unordered_map>
 
-#define NUM_R_FLAGS_1 32
-#define NUM_R_FLAGS_2 32
-#define NUM_R_FLAGS_3 32
-#define NUM_R_FLAGS_4 32
-#define NUM_R_ABILITY_FLAGS_1 32
-#define NUM_R_ABILITY_FLAGS_2 32
-#define NUM_R_FLAGS_7 32
-#define NUM_R_FLAGS_8 32
-#define NUM_R_FLAGS_9 33
-#define NUM_R_FLAGS_R 32
+enum class MonsterAbilityType;
 
-enum class RF_ABILITY;
+extern const std::unordered_map<std::string_view, RaceBlowMethodType> r_info_blow_method;
+extern const std::unordered_map<std::string_view, RaceBlowEffectType> r_info_blow_effect;
+extern const std::unordered_map<std::string_view, race_flags1> r_info_flags1;
+extern const std::unordered_map<std::string_view, race_flags2> r_info_flags2;
+extern const std::unordered_map<std::string_view, race_flags3> r_info_flags3;
+extern const std::unordered_map<std::string_view, MonsterAbilityType> r_info_ability_flags;
+extern const std::unordered_map<std::string_view, race_flags7> r_info_flags7;
+extern const std::unordered_map<std::string_view, race_flags8> r_info_flags8;
+extern const std::unordered_map<std::string_view, race_flags9> r_info_flags9;
+extern const std::unordered_map<std::string_view, race_flags_resistance> r_info_flagsr;
+extern const std::unordered_map<std::string_view, MonsterAuraType> r_info_aura_flags;
 
-extern concptr r_info_blow_method[NB_RBM_TYPE + 1];
-extern concptr r_info_blow_effect[NB_RBE_TYPE + 1];
-extern concptr r_info_flags1[NUM_R_FLAGS_1];
-extern concptr r_info_flags2[NUM_R_FLAGS_2];
-extern concptr r_info_flags3[NUM_R_FLAGS_3];
-extern const std::unordered_map<std::string_view, RF_ABILITY> r_info_ability_flags;
-extern concptr r_info_flags7[NUM_R_FLAGS_7];
-extern concptr r_info_flags8[NUM_R_FLAGS_8];
-extern concptr r_info_flags9[NUM_R_FLAGS_9];
-extern concptr r_info_flagsr[NUM_R_FLAGS_R];