#39854 r_info.txtから GUARDIAN フラグを削除し, d_info.txtのみから参照するよう修正．

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index bd9273e..eeec9e6 100644 (file)
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -17817,7 +17817,7 @@ F:DROP_GOOD | DROP_GREAT | RES_CHAO | RES_NETH |
 F:SMART | KILL_WALL | KILL_BODY | POWERFUL |
 F:REGENERATE | NONLIVING | CAN_FLY | RIDING |
 F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE | GUARDIAN |
+F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE |
 S:1_IN_3 | 
 S:S_MONSTERS | BR_CHAO | BA_CHAO | ROCKET | S_CYBER | S_KIN |
 S:BR_NETH | BR_MANA | S_HI_UNDEAD | S_HI_DRAGON | S_UNIQUE |

diff --git a/src/info-reader/race-info-tokens-table.c b/src/info-reader/race-info-tokens-table.c
index 50174de..1f378f7 100644 (file)
--- a/src/info-reader/race-info-tokens-table.c
+++ b/src/info-reader/race-info-tokens-table.c
@@ -315,6 +315,7 @@ concptr r_a_ability_flags2[NUM_R_ABILITY_FLAGS_2] = {
 /*!
  * モンスター特性トークンの定義7 /
  * Monster race flags
+ * "GUARDIAN" ... init.c d_infoの FINAL_GUARDIAN_* にて自動指定
  */
 concptr r_info_flags7[NUM_R_FLAGS_7] = {
        "AQUATIC",
@@ -329,7 +330,7 @@ concptr r_info_flags7[NUM_R_FLAGS_7] = {
        "SELF_LITE_1",
        "HAS_LITE_2",
        "SELF_LITE_2",
-       "GUARDIAN",
+       "XXX7X12",
        "CHAMELEON",
        "XXXX4XXX",
        "TANUKI",