[Feature] #38635 f_info.txtの修正と共に、変数上の登録追加。 / Fix f_info.txt and add entry to global...

diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt
index 6e178f0..2cabc67 100644 (file)
--- a/lib/edit/f_info.txt
+++ b/lib/edit/f_info.txt
@@ -1853,7 +1853,7 @@ W:2
 F:LOS | PROJECT | MOVE | PLACE | REMEMBER | GLOW | POISON_PUDDLE | DEEP | CAN_FLY |
 F:TELEPORTABLE
 
-N:234:SHALLOW_ACID_PUDDLE
+N:234:SHALLOW_POISONOUS_PUDDLE
 J:浅い毒の沼
 E:shallow poisonous puddle
 G:~:G

diff --git a/src/defines.h b/src/defines.h
index c1b7148..e50dff2 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -5257,8 +5257,8 @@ extern int PlayerUID;
 #define DF1_CAVE                0x00000400L
 #define DF1_CAVERN              0x00000800L
 #define DF1_ARCADE              0x00001000L
-#define DF1_XXX13               0x00002000L
-#define DF1_XXX14               0x00004000L
+#define DF1_LAKE_ACID           0x00002000L
+#define DF1_LAKE_POISONOUS      0x00004000L
 #define DF1_XXX15               0x00008000L
 #define DF1_FORGET              0x00010000L
 #define DF1_LAKE_WATER          0x00020000L
@@ -5274,10 +5274,10 @@ extern int PlayerUID;
 #define DF1_NO_MELEE            0x08000000L
 #define DF1_CHAMELEON           0x10000000L
 #define DF1_DARKNESS            0x20000000L
-#define DF1_XXX30               0x40000000L
-#define DF1_XXX31               0x80000000L
+#define DF1_ACID_RIVER          0x40000000L
+#define DF1_POISONOUS_RIVER     0x80000000L
 
-#define DF1_LAKE_MASK (DF1_LAKE_WATER | DF1_LAKE_LAVA | DF1_LAKE_RUBBLE | DF1_LAKE_TREE)
+#define DF1_LAKE_MASK (DF1_LAKE_WATER | DF1_LAKE_LAVA | DF1_LAKE_RUBBLE | DF1_LAKE_TREE | DF1_LAKE_POISONOUS | DF1_LAKE_ACID)
 
 #define DUNGEON_ANGBAND  1
 #define DUNGEON_GALGALS  2

diff --git a/src/externs.h b/src/externs.h
index c639cc2..34e84b8 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -428,6 +428,14 @@ extern FEAT_IDX feat_deep_water;
 extern FEAT_IDX feat_shallow_water;
 extern FEAT_IDX feat_deep_lava;
 extern FEAT_IDX feat_shallow_lava;
+extern FEAT_IDX feat_heavy_cold_zone;
+extern FEAT_IDX feat_cold_zone;
+extern FEAT_IDX feat_heavy_electrical_zone;
+extern FEAT_IDX feat_electrical_zone;
+extern FEAT_IDX feat_deep_acid_puddle;
+extern FEAT_IDX feat_shallow_acid_puddle;
+extern FEAT_IDX feat_deep_poisonous_puddle;
+extern FEAT_IDX feat_shallow_poisonous_puddle;
 extern FEAT_IDX feat_dirt;
 extern FEAT_IDX feat_grass;
 extern FEAT_IDX feat_flower;

diff --git a/src/init2.c b/src/init2.c
index c95785d..f64375e 100644 (file)
--- a/src/init2.c
+++ b/src/init2.c
@@ -1737,6 +1737,14 @@ static errr init_feat_variables(void)
        feat_shallow_water = f_tag_to_index_in_init("SHALLOW_WATER");
        feat_deep_lava = f_tag_to_index_in_init("DEEP_LAVA");
        feat_shallow_lava = f_tag_to_index_in_init("SHALLOW_LAVA");
+       feat_heavy_cold_zone = f_tag_to_index_in_init("HEAVY_COLD_ZONE");
+       feat_cold_zone = f_tag_to_index_in_init("COLD_ZONE");
+       feat_heavy_electrical_zone = f_tag_to_index_in_init("HEAVY_ELECTRICAL_ZONE");
+       feat_electrical_zone = f_tag_to_index_in_init("ELECTRICAL_ZONE");
+       feat_deep_acid_puddle = f_tag_to_index_in_init("DEEP_ACID_PUDDLE");
+       feat_shallow_acid_puddle = f_tag_to_index_in_init("SHALLOW_ACID_PUDDLE");
+       feat_deep_poisonous_puddle = f_tag_to_index_in_init("DEEP_POISONOUS_PUDDLE");
+       feat_shallow_poisonous_puddle = f_tag_to_index_in_init("SHALLOW_POISONOUS_PUDDLE");
        feat_dirt = f_tag_to_index_in_init("DIRT");
        feat_grass = f_tag_to_index_in_init("GRASS");
        feat_flower = f_tag_to_index_in_init("FLOWER");

diff --git a/src/variable.c b/src/variable.c
index fd8958e..f8cf1b9 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -935,6 +935,14 @@ FEAT_IDX feat_deep_water;
 FEAT_IDX feat_shallow_water;
 FEAT_IDX feat_deep_lava;
 FEAT_IDX feat_shallow_lava;
+FEAT_IDX feat_heavy_cold_zone;
+FEAT_IDX feat_cold_zone;
+FEAT_IDX feat_heavy_electrical_zone;
+FEAT_IDX feat_electrical_zone;
+FEAT_IDX feat_deep_acid_puddle;
+FEAT_IDX feat_shallow_acid_puddle;
+FEAT_IDX feat_deep_poisonous_puddle;
+FEAT_IDX feat_shallow_poisonous_puddle;
 FEAT_IDX feat_dirt;
 FEAT_IDX feat_grass;
 FEAT_IDX feat_flower;