[Refactor] #40014 Reshaped monster-race.h

diff --git a/src/monster-race/monster-race.h b/src/monster-race/monster-race.h
index bdcdfdf..b336ce3 100644 (file)
--- a/src/monster-race/monster-race.h
+++ b/src/monster-race/monster-race.h
@@ -20,8 +20,6 @@ typedef struct monster_blow
        DICE_SID d_side;
 } monster_blow;
 
-extern MONRACE_IDX max_r_idx;
-
 /*
  * Monster "race" information, including racial memories
  *
@@ -48,22 +46,15 @@ typedef struct monster_race {
        STR_OFFSET E_name;              /*!< 名前データのオフセット(英語) /  Name offset(English) */
 #endif
        STR_OFFSET text;                /*!< 思い出テキストのオフセット / Lore text offset */
-
        DICE_NUMBER hdice;              /*!< HPのダイス数 / Creatures hit dice count */
        DICE_SID hside;                 /*!< HPのダイス面数 / Creatures hit dice sides */
-
        ARMOUR_CLASS ac;                /*!< アーマークラス / Armour Class */
-
        SLEEP_DEGREE sleep;                             /*!< 睡眠値 / Inactive counter (base) */
        POSITION aaf;                           /*!< 感知範囲(1-100スクエア) / Area affect radius (1-100) */
        SPEED speed;                            /*!< 加速(110で+0) / Speed (normally 110) */
-
        EXP mexp;                               /*!< 殺害時基本経験値 / Exp value for kill */
-
        BIT_FLAGS16 extra;                              /*!< 未使用 /  Unused (for now) */
-
        RARITY freq_spell;              /*!< 魔法＆特殊能力仕様頻度(1/n) /  Spell frequency */
-
        BIT_FLAGS flags1;                       /* Flags 1 (general) */
        BIT_FLAGS flags2;                       /* Flags 2 (abilities) */
        BIT_FLAGS flags3;                       /* Flags 3 (race/resist) */
@@ -76,66 +67,45 @@ typedef struct monster_race {
        BIT_FLAGS a_ability_flags2;     /* Activate Ability Flags 6 (special spells) */
        BIT_FLAGS a_ability_flags3;     /* Activate Ability Flags 7 (implementing) */
        BIT_FLAGS a_ability_flags4;     /* Activate Ability Flags 8 (implementing) */
-
        monster_blow blow[4];   /* Up to four blows per round */
        MONRACE_IDX reinforce_id[6];
        DICE_NUMBER reinforce_dd[6];
        DICE_SID reinforce_ds[6];
-
        ARTIFACT_IDX artifact_id[4];    /* 特定アーティファクトドロップID */
        RARITY artifact_rarity[4];      /* 特定アーティファクトレア度 */
        PERCENTAGE artifact_percent[4]; /* 特定アーティファクトドロップ率 */
-
        PERCENTAGE arena_ratio;         /* アリーナの評価修正値(%基準 / 0=100%) / Arena */
-
        MONRACE_IDX next_r_idx;
        EXP next_exp;
-
        DEPTH level;                    /* Level of creature */
        RARITY rarity;                  /* Rarity of creature */
-
        TERM_COLOR d_attr;              /* Default monster attribute */
        SYMBOL_CODE d_char;                     /* Default monster character */
-
        TERM_COLOR x_attr;              /* Desired monster attribute */
        SYMBOL_CODE x_char;                     /* Desired monster character */
-
-
        MONSTER_NUMBER max_num; /* Maximum population allowed per level */
        MONSTER_NUMBER cur_num; /* Monster population on current level */
-
        FLOOR_IDX floor_id;             /* Location of unique monster */
-
-
        MONSTER_NUMBER r_sights;        /* Count sightings of this monster */
        MONSTER_NUMBER r_deaths;        /* Count deaths from this monster */
-
        MONSTER_NUMBER r_pkills;        /* Count visible monsters killed in this life */
        MONSTER_NUMBER r_akills;        /* Count all monsters killed in this life */
        MONSTER_NUMBER r_tkills;        /* Count monsters killed in all lives */
-
        byte r_wake;                    /* Number of times woken up (?) */
        byte r_ignore;                  /* Number of times ignored (?) */
-
        #define MR1_SINKA 0x01
        byte r_xtra1;                   /* Something */
-
        byte r_xtra2;                   /* Something (unused) */
-
        ITEM_NUMBER r_drop_gold;        /*!< これまでに撃破時に落とした財宝の数 / Max number of gold dropped at once */
        ITEM_NUMBER r_drop_item;        /*!< これまでに撃破時に落としたアイテムの数 / Max number of item dropped at once */
-
        byte r_cast_spell;              /* Max number of other spells seen */
-
        byte r_blows[4];                /* Number of times each blow type was seen */
-
        u32b r_flags1;                  /* Observed racial flags */
        u32b r_flags2;                  /* Observed racial flags */
        u32b r_flags3;                  /* Observed racial flags */
        u32b r_flags4;                  /* Observed racial flags */
        u32b r_flags5;                  /* Observed racial flags */
        u32b r_flags6;                  /* Observed racial flags */
-       /* u32b r_flags7; */    /* Observed racial flags */
        u32b r_flagsr;                  /* Observed racial resistance flags */
 } monster_race;
 
@@ -148,3 +118,4 @@ extern char *r_text;
 
 extern s16b alloc_race_size;
 extern alloc_entry *alloc_race_table;
+extern MONRACE_IDX max_r_idx;