[Fix] 「回避の彫像」「守りのルーン」の表記ブレの統一 #357

"Glyph"表記と"Rune"表記が混在しているが、これを"Rune"表記に統一する。
ゲーム中の説明、ソースコード中の表記等から"Glyph"表記を一掃した。
動作は変更しない。

diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt
index 1468512..417bedb 100644 (file)
--- a/lib/edit/f_info.txt
+++ b/lib/edit/f_info.txt
@@ -71,15 +71,15 @@ K:SECRET:INVIS
 F:LOS | PROJECT | MOVE | PLACE | SECRET | TRAP | HIT_TRAP | CAN_FLY |
 F:HURT_DISI | TELEPORTABLE
 
-# 0x03 --> glyph of warding
+# 0x03 --> rune of protection
 
-N:3:GLYPH
-J:å\9b\9eé\81¿ã\81®å½«å\83\8f
-E:glyph of warding
+N:3:RUNE_PROTECTION
+J:å®\88ã\82\8aã\81®ã\83«ã\83¼ã\83³
+E:rune of protection
 G:;:y:LIT
 W:16
 K:DESTROYED:*FLOOR*
-F:LOS | PROJECT | MOVE | PLACE | NOTICE | REMEMBER | GLYPH | CAN_FLY |
+F:LOS | PROJECT | MOVE | PLACE | NOTICE | REMEMBER | RUNE_PROTECTION | CAN_FLY |
 F:HURT_DISI
 
 # 0x04 --> open door
@@ -807,13 +807,13 @@ W:5
 K:UNPERM:GRANITE
 F:REMEMBER | TUNNEL | WALL | PERMANENT
 
-N:64:EXPLOSIVE_RUNE
+N:64:RUNE_EXPLOSION
 J:爆発ルーン
-E:explosive rune
+E:rune of explosion
 G:;:R:LIT
 W:16
 K:DESTROYED:*FLOOR*
-F:LOS | PROJECT | MOVE | PLACE | NOTICE | REMEMBER | CAN_FLY | MINOR_GLYPH |
+F:LOS | PROJECT | MOVE | PLACE | NOTICE | REMEMBER | CAN_FLY | RUNE_EXPLOSION |
 F:HURT_DISI
 
 N:65:PATTERN_START

diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index 6868efe..3fe60bb 100644 (file)
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -2087,8 +2087,8 @@ G:?:w
 I:70:38:0
 W:50:0:5:500
 A:50/4:90/2
-D:$It creates a glyph on the floor you stand when you read it.
-D:ã\81\9dã\82\8cã\81¯èª­ã\82\80ã\81¨è\87ªå\88\86ã\81®è¶³å\85\83ã\81®åº\8aã\81«å\9b\9eé\81¿ã\81®å½«å\83\8fを作り出す。
+D:$It creates a rune of protection on the floor you stand when you read it.
+D:ã\81\9dã\82\8cã\81¯èª­ã\82\80ã\81¨è\87ªå\88\86ã\81®è¶³å\85\83ã\81®åº\8aã\81«å®\88ã\82\8aã\81®ã\83«ã\83¼ã\83³を作り出す。
 
 N:191:*解呪*:食地 臓臓 扈知
 E:*Remove Curse*:bluju wex blu

diff --git a/lib/help/dungeon.txt b/lib/help/dungeon.txt
index 9e9ef69..5dda568 100644 (file)
--- a/lib/help/dungeon.txt
+++ b/lib/help/dungeon.txt
@@ -33,7 +33,7 @@ to something you are more comfortable with.
 --- Features that do not block line of sight ---
  
   [[[[w|.|   Floor                       [[[[v|*|   A Mirror                     
-  [[[[w|.|   A trap (hidden)             [[[[y|;|   A glyph of warding             
+  [[[[w|.|   A trap (hidden)             [[[[y|;|   A rune of protection         
   [[[[w|^|   A trap (known)              [[[[R|;|   A explosive rune             
   [[[[u|.|   Dirt                        [[[[B|*|   Section of the Pattern  
   [[[[g|.|   Patch of grass              [[[[b|*|   Section of the Pattern  

diff --git a/lib/pref/graf-ibm.prf b/lib/pref/graf-ibm.prf
index 69d68ef..1ed7663 100644 (file)
--- a/lib/pref/graf-ibm.prf
+++ b/lib/pref/graf-ibm.prf
@@ -3224,7 +3224,7 @@ F:1:0x01:0x2E:LIT
 # invisible trap
 F:2:0x01:0x2E:LIT
 
-# glyph of warding
+# rune of protection
 F:3:0x0E:0xCB:LIT
 
 # open door

diff --git a/lib/pref/graf-ne2.prf b/lib/pref/graf-ne2.prf
index 935105f..e85e2a9 100644 (file)
--- a/lib/pref/graf-ne2.prf
+++ b/lib/pref/graf-ne2.prf
@@ -308,7 +308,7 @@ S:0xFF:0x85/0x9E
 # open floor
 F:1:0x80/0x81:LIT
 
-# glyph of warding
+# rune of protection
 F:3:0x8D/0x95:LIT
 
 # open door

diff --git a/lib/pref/graf-new.prf b/lib/pref/graf-new.prf
index 8078627..40c15d5 100644 (file)
--- a/lib/pref/graf-new.prf
+++ b/lib/pref/graf-new.prf
@@ -311,7 +311,7 @@ S:0xFF:0x85/0x9E
 # open floor
 F:1:0x80/0x81:LIT
 
-# glyph of warding
+# rune of protection
 F:3:0x8D/0x95:LIT
 
 # open door

diff --git a/lib/pref/graf-xxx.prf b/lib/pref/graf-xxx.prf
index d8d1e95..c227ecd 100644 (file)
--- a/lib/pref/graf-xxx.prf
+++ b/lib/pref/graf-xxx.prf
@@ -3506,7 +3506,7 @@ R:1069:0x03:0x70
 # open floor
 F:1:0xD9:0x80:LIT
 
-# glyph of warding
+# rune of protection
 F:3:0xD9:0x83:LIT
 
 # open door

diff --git a/lib/pref/spell-xx.prf b/lib/pref/spell-xx.prf
index 63aad81..5136fed 100644 (file)
--- a/lib/pref/spell-xx.prf
+++ b/lib/pref/spell-xx.prf
@@ -64,7 +64,7 @@ Z:GF_DISP_DEMON:RRro
 Z:GF_DISP_LIVING:GGg
 Z:GF_ROCKET:DDDroy
 Z:GF_NUKE:wwwroy
-Z:GF_MAKE_GLYPH:RRRr
+Z:GF_MAKE_RUNE_PROTECTION:RRRr
 Z:GF_STASIS:B
 Z:GF_STONE_WALL:s
 Z:GF_DEATH_RAY:DDDDssG

diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c
index 96da677..d61979d 100644 (file)
--- a/src/effect/effect-feature.c
+++ b/src/effect/effect-feature.c
@@ -265,11 +265,11 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI
             obvious = TRUE;
         break;
     }
-    case GF_MAKE_GLYPH: {
+    case GF_MAKE_RUNE_PROTECTION: {
         if (!cave_naked_bold(caster_ptr, y, x))
             break;
         g_ptr->info |= CAVE_OBJECT;
-        g_ptr->mimic = feat_glyph;
+        g_ptr->mimic = feat_rune_protection;
         note_spot(caster_ptr, y, x);
         lite_spot(caster_ptr, y, x);
         break;
@@ -419,7 +419,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI
         break;
     }
     case GF_DISINTEGRATE: {
-        if (is_mirror_grid(g_ptr) || is_glyph_grid(g_ptr) || is_explosive_rune_grid(g_ptr))
+        if (is_mirror_grid(g_ptr) || is_rune_protection_grid(g_ptr) || is_rune_explosion_grid(g_ptr))
             remove_mirror(caster_ptr, y, x);
 
         if (!has_flag(f_ptr->flags, FF_HURT_DISI) || has_flag(f_ptr->flags, FF_PERMANENT))

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index e40ec36..19ae37d 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -96,7 +96,7 @@ concptr blind_spell_effect_messages[MAX_GF] = {
     "", // GF_DISP_LIVING = 71, /*!< 魔法効果: 生命退散*/
     "", // GF_ROCKET = 72, /*!< 魔法効果: ロケット*/
     "", // GF_NUKE = 73, /*!< 魔法効果: 放射性廃棄物*/
-    "", // GF_MAKE_GLYPH = 74, /*!< 魔法効果: 守りのルーン生成*/
+    "", // GF_MAKE_RUNE_PROTECTION = 74, /*!< 魔法効果: 守りのルーン生成*/
     "", // GF_STASIS = 75, /*!< 魔法効果: モンスター拘束*/
     "", // GF_STONE_WALL = 76, /*!< 魔法効果: 壁生成*/
     "", // GF_DEATH_RAY = 77, /*!< 魔法効果: 死の光線*/
@@ -326,4 +326,4 @@ bool affect_player(MONSTER_IDX who, player_type *target_ptr, concptr who_name, i
     }
 
     return TRUE;
-}
\ No newline at end of file
+}

diff --git a/src/floor/floor-leaver.c b/src/floor/floor-leaver.c
index b4ea315..2527f53 100644 (file)
--- a/src/floor/floor-leaver.c
+++ b/src/floor/floor-leaver.c
@@ -226,8 +226,8 @@ static void get_out_monster(player_type *protected_ptr)
         if (tries > 20 * dis * dis)
             dis++;
 
-        if (!in_bounds(floor_ptr, ny, nx) || !is_cave_empty_bold(protected_ptr, ny, nx) || is_glyph_grid(&floor_ptr->grid_array[ny][nx])
-            || is_explosive_rune_grid(&floor_ptr->grid_array[ny][nx]) || pattern_tile(floor_ptr, ny, nx))
+        if (!in_bounds(floor_ptr, ny, nx) || !is_cave_empty_bold(protected_ptr, ny, nx) || is_rune_protection_grid(&floor_ptr->grid_array[ny][nx])
+            || is_rune_explosion_grid(&floor_ptr->grid_array[ny][nx]) || pattern_tile(floor_ptr, ny, nx))
             continue;
 
         m_ptr = &floor_ptr->m_list[m_idx];

diff --git a/src/grid/feature-flag-types.h b/src/grid/feature-flag-types.h
index 8b59c77..c938d42 100644 (file)
--- a/src/grid/feature-flag-types.h
+++ b/src/grid/feature-flag-types.h
@@ -27,7 +27,7 @@ typedef enum feature_flag_type {
     FF_DOOR = 18, /*!< ドアのある地形である */
     FF_TRAP = 19, /*!< トラップのある地形である */
     FF_STAIRS = 20, /*!< 階段のある地形である */
-    FF_GLYPH = 21, /*!< 守りのルーンが張られた地形である */
+    FF_RUNE_PROTECTION = 21, /*!< 守りのルーンが張られた地形である */
     FF_LESS = 22, /*!< 階上に通じる地形である */
     FF_MORE = 23, /*!< 階下に通じる地形である */
     FF_AVOID_RUN = 24, /*!< 自動移動機能時に障害として迂回すべき地形である */
@@ -59,7 +59,7 @@ typedef enum feature_flag_type {
     FF_SHAFT = 101, /*!< 坑道である。(2階層移動する階段である) */
     FF_MOUNTAIN = 102, /*!< ダンジョンの山地形である */
     FF_BLDG = 103, /*!< 施設の入り口である */
-    FF_MINOR_GLYPH = 104, /*!< 爆発のルーンのある地形である */
+    FF_RUNE_EXPLOSION = 104, /*!< 爆発のルーンのある地形である */
     FF_PATTERN = 105, /*!< パターンのある地形である */
     FF_TOWN = 106, /*!< 広域マップ用の街がある地形である */
     FF_ENTRANCE = 107, /*!< 広域マップ用のダンジョンがある地形である */

diff --git a/src/grid/feature.c b/src/grid/feature.c
index a546077..438c089 100644 (file)
--- a/src/grid/feature.c
+++ b/src/grid/feature.c
@@ -28,8 +28,8 @@ FEAT_IDX feat_none;
 FEAT_IDX feat_floor;
 
 /* Objects */
-FEAT_IDX feat_glyph;
-FEAT_IDX feat_explosive_rune;
+FEAT_IDX feat_rune_protection;
+FEAT_IDX feat_rune_explosion;
 FEAT_IDX feat_mirror;
 
 /* Stairs */

diff --git a/src/grid/feature.h b/src/grid/feature.h
index 4cddaa1..a363b15 100644 (file)
--- a/src/grid/feature.h
+++ b/src/grid/feature.h
@@ -60,8 +60,8 @@ extern char *f_tag;
 /*** Terrain feature variables ***/
 extern FEAT_IDX feat_none;
 extern FEAT_IDX feat_floor;
-extern FEAT_IDX feat_glyph;
-extern FEAT_IDX feat_explosive_rune;
+extern FEAT_IDX feat_rune_protection;
+extern FEAT_IDX feat_rune_explosion;
 extern FEAT_IDX feat_mirror;
 extern FEAT_IDX feat_up_stair;
 extern FEAT_IDX feat_down_stair;

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 890dc47..a03e621 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -88,7 +88,7 @@ static const byte feature_action_flags[FF_FLAG_MAX] = {
     0, /* DOOR */
     0, /* TRAP */
     0, /* STAIRS */
-    0, /* GLYPH */
+    0, /* RUNE_OF_PROTECTION */
     0, /* LESS */
     0, /* MORE */
     0, /* RUN */
@@ -174,7 +174,7 @@ static const byte feature_action_flags[FF_FLAG_MAX] = {
     0, /* SHAFT */
     0, /* MOUNTAIN */
     0, /* BLDG */
-    0, /* MINOR_GLYPH */
+    0, /* RUNE_OF_EXPLOSION */
     0, /* PATTERN */
     0, /* TOWN */
     0, /* ENTRANCE */
@@ -1011,22 +1011,22 @@ bool is_mirror_grid(grid_type *g_ptr)
 }
 
 /*
- *  Return TRUE if there is a mirror on the grid.
+ *  Return TRUE if there is a rune of protection on the grid.
  */
-bool is_glyph_grid(grid_type *g_ptr)
+bool is_rune_protection_grid(grid_type *g_ptr)
 {
-    if ((g_ptr->info & CAVE_OBJECT) && has_flag(f_info[g_ptr->mimic].flags, FF_GLYPH))
+    if ((g_ptr->info & CAVE_OBJECT) && has_flag(f_info[g_ptr->mimic].flags, FF_RUNE_PROTECTION))
         return TRUE;
     else
         return FALSE;
 }
 
 /*
- *  Return TRUE if there is a mirror on the grid.
+ *  Return TRUE if there is a rune of explosion on the grid.
  */
-bool is_explosive_rune_grid(grid_type *g_ptr)
+bool is_rune_explosion_grid(grid_type *g_ptr)
 {
-    if ((g_ptr->info & CAVE_OBJECT) && has_flag(f_info[g_ptr->mimic].flags, FF_MINOR_GLYPH))
+    if ((g_ptr->info & CAVE_OBJECT) && has_flag(f_info[g_ptr->mimic].flags, FF_RUNE_EXPLOSION))
         return TRUE;
     else
         return FALSE;
@@ -1056,10 +1056,10 @@ bool cave_monster_teleportable_bold(player_type *player_ptr, MONSTER_IDX m_idx,
     if (player_bold(player_ptr, y, x))
         return FALSE;
 
-    /* Hack -- no teleport onto glyph of warding */
-    if (is_glyph_grid(g_ptr))
+    /* Hack -- no teleport onto rune of protection */
+    if (is_rune_protection_grid(g_ptr))
         return FALSE;
-    if (is_explosive_rune_grid(g_ptr))
+    if (is_rune_explosion_grid(g_ptr))
         return FALSE;
 
     if (!(mode & TELEPORT_PASSIVE)) {

diff --git a/src/grid/grid.h b/src/grid/grid.h
index 080036f..02d6bf6 100644 (file)
--- a/src/grid/grid.h
+++ b/src/grid/grid.h
@@ -127,7 +127,7 @@ typedef struct grid_template_type {
 #define CAVE_KNOWN      0x0200    /* Directly viewed or map detected flag */
 #define CAVE_NOTE       0x0400    /* Flag for delayed visual update (needs note_spot()) */
 #define CAVE_REDRAW     0x0800    /* Flag for delayed visual update (needs lite_spot()) */
-#define CAVE_OBJECT     0x1000    /* Mirror, glyph, etc. */
+#define CAVE_OBJECT     0x1000    /* Mirror, rune, etc. */
 #define CAVE_UNSAFE     0x2000    /* Might have trap */
 #define CAVE_IN_DETECT  0x4000    /* trap detected area (inner circle only) */
 
@@ -153,8 +153,8 @@ extern void place_bound_perm_wall(player_type *player_ptr, grid_type *g_ptr);
 extern bool is_known_trap(player_type *player_ptr, grid_type *g_ptr);
 extern bool is_hidden_door(player_type *player_ptr, grid_type *g_ptr);
 extern bool is_mirror_grid(grid_type *g_ptr);
-extern bool is_glyph_grid(grid_type *g_ptr);
-extern bool is_explosive_rune_grid(grid_type *g_ptr);
+extern bool is_rune_protection_grid(grid_type *g_ptr);
+extern bool is_rune_explosion_grid(grid_type *g_ptr);
 extern bool player_can_enter(player_type *creature_ptr, FEAT_IDX feature, BIT_FLAGS16 mode);
 
 /*!

diff --git a/src/info-reader/feature-info-tokens-table.c b/src/info-reader/feature-info-tokens-table.c
index c6d70d2..da0c85b 100644 (file)
--- a/src/info-reader/feature-info-tokens-table.c
+++ b/src/info-reader/feature-info-tokens-table.c
@@ -26,7 +26,7 @@ concptr f_info_flags[NUM_F_FLAGS] = {
     "DOOR",
     "TRAP",
     "STAIRS",
-    "GLYPH",
+    "RUNE_PROTECTION",
     "LESS",
     "MORE",
     "AVOID_RUN",
@@ -112,7 +112,7 @@ concptr f_info_flags[NUM_F_FLAGS] = {
     "SHAFT",
     "MOUNTAIN",
     "BLDG",
-    "MINOR_GLYPH",
+    "RUNE_EXPLOSION",
     "PATTERN",
     "TOWN",
     "ENTRANCE",

diff --git a/src/info-reader/feature-reader.c b/src/info-reader/feature-reader.c
index b746d5b..be64786 100644 (file)
--- a/src/info-reader/feature-reader.c
+++ b/src/info-reader/feature-reader.c
@@ -255,8 +255,8 @@ errr init_feat_variables(void)
     feat_none = f_tag_to_index_in_init("NONE");
 
     feat_floor = f_tag_to_index_in_init("FLOOR");
-    feat_glyph = f_tag_to_index_in_init("GLYPH");
-    feat_explosive_rune = f_tag_to_index_in_init("EXPLOSIVE_RUNE");
+    feat_rune_protection = f_tag_to_index_in_init("RUNE_PROTECTION");
+    feat_rune_explosion = f_tag_to_index_in_init("RUNE_EXPLOSION");
     feat_mirror = f_tag_to_index_in_init("MIRROR");
 
     feat_door[DOOR_DOOR].open = f_tag_to_index_in_init("OPEN_DOOR");

diff --git a/src/io/gf-descriptions.c b/src/io/gf-descriptions.c
index 2f636bd..c0f7ba6 100644 (file)
--- a/src/io/gf-descriptions.c
+++ b/src/io/gf-descriptions.c
@@ -63,7 +63,7 @@ const named_num gf_desc[MAX_NAMED_NUM] =
        {"GF_DISP_LIVING",                      GF_DISP_LIVING          },
        {"GF_ROCKET",                           GF_ROCKET                       },
        {"GF_NUKE",                                     GF_NUKE                         },
-       {"GF_MAKE_GLYPH",                       GF_MAKE_GLYPH           },
+    {"GF_MAKE_RUNE_PROTECTION",        GF_MAKE_RUNE_PROTECTION},
        {"GF_STASIS",                           GF_STASIS                       },
        {"GF_STONE_WALL",                       GF_STONE_WALL           },
        {"GF_DEATH_RAY",                        GF_DEATH_RAY            },

diff --git a/src/load/load-v1-5-0.c b/src/load/load-v1-5-0.c
index a6f5d65..dfab30b 100644 (file)
--- a/src/load/load-v1-5-0.c
+++ b/src/load/load-v1-5-0.c
@@ -680,7 +680,7 @@ errr rd_dungeon_old(player_type *player_ptr)
                 /* Old CAVE_IN_MIRROR flag */
                 if (g_ptr->info & CAVE_OBJECT) {
                     g_ptr->mimic = feat_mirror;
-                } else if ((g_ptr->feat == OLD_FEAT_MINOR_GLYPH) || (g_ptr->feat == OLD_FEAT_GLYPH)) {
+                } else if ((g_ptr->feat == OLD_FEAT_RUNE_EXPLOSION) || (g_ptr->feat == OLD_FEAT_RUNE_PROTECTION)) {
                     g_ptr->info |= CAVE_OBJECT;
                     g_ptr->mimic = g_ptr->feat;
                     g_ptr->feat = feat_floor;
@@ -778,4 +778,4 @@ errr rd_dungeon_old(player_type *player_ptr)
         current_world_ptr->character_dungeon = TRUE;
 
     return 0;
-}
\ No newline at end of file
+}

diff --git a/src/load/old-feature-types.h b/src/load/old-feature-types.h
index 2ab0021..ddd2cd8 100644 (file)
--- a/src/load/old-feature-types.h
+++ b/src/load/old-feature-types.h
@@ -3,10 +3,10 @@
 /*** Terrain Feature Indexes (see "lib/edit/f_info.txt") ***/
 typedef enum old_feature_type {
        OLD_FEAT_INVIS = 0x02,
-       OLD_FEAT_GLYPH = 0x03,
+       OLD_FEAT_RUNE_PROTECTION = 0x03,
        OLD_FEAT_QUEST_ENTER = 0x08,
        OLD_FEAT_QUEST_EXIT = 0x09,
-       OLD_FEAT_MINOR_GLYPH = 0x40,
+       OLD_FEAT_RUNE_EXPLOSION = 0x40,
        OLD_FEAT_BLDG_1 = 0x81,
        OLD_FEAT_MIRROR = 0xc3,
 } old_feature_type;

diff --git a/src/mind/mind-explanations-table.c b/src/mind/mind-explanations-table.c
index aa43f11..7995ec2 100644 (file)
--- a/src/mind/mind-explanations-table.c
+++ b/src/mind/mind-explanations-table.c
@@ -130,7 +130,7 @@ mind_power const mind_powers[MAX_MIND_KINDS] = {
         { 25, 32, 60, _("煙玉", "Smoke Ball") },
         { 28, 32, 60, _("転身", "Swap Position") },
 
-        { 30, 30, 70, _("爆発の紋章", "Glyph of Explosion") },
+        { 30, 30, 70, _("爆発の紋章", "Rune of Explosion") },
         { 32, 40, 40, _("土遁", "Hide in Mud") },
         { 34, 35, 50, _("霧隠れ", "Hide in Mist") },
         { 38, 40, 60, _("煉獄火炎", "Rengoku-Kaen") },
@@ -285,7 +285,7 @@ concptr const mind_tips[MAX_MIND_KINDS][MAX_MIND_POWERS] = {
         _("ダメージのない混乱の球を放つ。", "Releases a confusion ball which doesn't inflict any damage."),
         _("1体のモンスターと位置を交換する。", "Causes you and a targeted monster to exchange positions."),
         _("自分のいる床の上に、モンスターが通ると爆発してダメージを与えるルーンを描く。",
-            "Sets a glyph under you. The glyph will explode when a monster moves on it."),
+            "Sets a rune under you. The rune will explode when a monster moves on it."),
         _("一定時間、半物質化し壁を通り抜けられるようになる。さらに、一定時間酸への耐性を得る。装備による耐性に累積する。",
             "Makes you ethereal for a period of time. While ethereal, you can pass through walls and are resistant to acid."
             " The resistance can be added to that from equipment for more powerful resistance."),

diff --git a/src/mind/mind-ninja.c b/src/mind/mind-ninja.c
index 71913ca..ad68bd8 100644 (file)
--- a/src/mind/mind-ninja.c
+++ b/src/mind/mind-ninja.c
@@ -432,8 +432,8 @@ bool cast_ninja_spell(player_type *caster_ptr, mind_ninja_type spell)
         project_length = 0;
         (void)teleport_swap(caster_ptr, dir);
         break;
-    case EXPLOSION_GLYPH:
-        explosive_rune(caster_ptr, caster_ptr->y, caster_ptr->x);
+    case EXPLOSIVE_RUNE:
+        create_rune_explosion(caster_ptr, caster_ptr->y, caster_ptr->x);
         break;
     case HIDE_MUD:
         (void)set_pass_wall(caster_ptr, randint1(plev / 2) + plev / 2, FALSE);

diff --git a/src/mind/mind-numbers.h b/src/mind/mind-numbers.h
index 104393b..3b9ae23 100644 (file)
--- a/src/mind/mind-numbers.h
+++ b/src/mind/mind-numbers.h
@@ -82,7 +82,7 @@ typedef enum mind_ninja_type {
        CHAIN_HOOK = 12,
        SMOKE_BALL = 13,
        SWAP_POSITION = 14,
-       EXPLOSION_GLYPH = 15,
+       EXPLOSIVE_RUNE = 15,
        HIDE_MUD = 16,
        HIDE_MIST =17,
        PURGATORY_FLAME = 18,

diff --git a/src/monster-floor/monster-move.c b/src/monster-floor/monster-move.c
index bb591c6..685c31c 100644 (file)
--- a/src/monster-floor/monster-move.c
+++ b/src/monster-floor/monster-move.c
@@ -214,11 +214,11 @@ static bool process_protection_rune(player_type *target_ptr, turn_flags *turn_fl
     grid_type *g_ptr;
     g_ptr = &target_ptr->current_floor_ptr->grid_array[ny][nx];
     monster_race *r_ptr = &r_info[m_ptr->r_idx];
-    if (!turn_flags_ptr->do_move || !is_glyph_grid(g_ptr) || (((r_ptr->flags1 & RF1_NEVER_BLOW) != 0) && player_bold(target_ptr, ny, nx)))
+    if (!turn_flags_ptr->do_move || !is_rune_protection_grid(g_ptr) || (((r_ptr->flags1 & RF1_NEVER_BLOW) != 0) && player_bold(target_ptr, ny, nx)))
         return FALSE;
 
     turn_flags_ptr->do_move = FALSE;
-    if (is_pet(m_ptr) || (randint1(BREAK_GLYPH) >= r_ptr->level))
+    if (is_pet(m_ptr) || (randint1(BREAK_RUNE_PROTECTION) >= r_ptr->level))
         return TRUE;
 
     if (g_ptr->info & CAVE_MARK) {
@@ -247,14 +247,14 @@ static bool process_explosive_rune(player_type *target_ptr, turn_flags *turn_fla
     grid_type *g_ptr;
     g_ptr = &target_ptr->current_floor_ptr->grid_array[ny][nx];
     monster_race *r_ptr = &r_info[m_ptr->r_idx];
-    if (!turn_flags_ptr->do_move || !is_explosive_rune_grid(g_ptr) || (((r_ptr->flags1 & RF1_NEVER_BLOW) != 0) && player_bold(target_ptr, ny, nx)))
+    if (!turn_flags_ptr->do_move || !is_rune_explosion_grid(g_ptr) || (((r_ptr->flags1 & RF1_NEVER_BLOW) != 0) && player_bold(target_ptr, ny, nx)))
         return TRUE;
 
     turn_flags_ptr->do_move = FALSE;
     if (is_pet(m_ptr))
         return TRUE;
 
-    if (randint1(BREAK_MINOR_GLYPH) > r_ptr->level) {
+    if (randint1(BREAK_RUNE_EXPLOSION) > r_ptr->level) {
         if (g_ptr->info & CAVE_MARK) {
             msg_print(_("ルーンが爆発した！", "The rune explodes!"));
             BIT_FLAGS project_flags = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI;
@@ -503,4 +503,4 @@ void set_target(monster_type *m_ptr, POSITION y, POSITION x)
  * @param m_ptr モンスターの参照ポインタ
  * @return なし
  */
-void reset_target(monster_type *m_ptr) { set_target(m_ptr, 0, 0); }
\ No newline at end of file
+void reset_target(monster_type *m_ptr) { set_target(m_ptr, 0, 0); }

diff --git a/src/monster-floor/one-monster-placer.c b/src/monster-floor/one-monster-placer.c
index b4a82bd..cdb047f 100644 (file)
--- a/src/monster-floor/one-monster-placer.c
+++ b/src/monster-floor/one-monster-placer.c
@@ -170,11 +170,11 @@ static bool check_quest_placeable(player_type *player_ptr, MONRACE_IDX r_idx)
 static bool check_procection_rune(player_type *player_ptr, MONRACE_IDX r_idx, POSITION y, POSITION x)
 {
     grid_type *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    if (!is_glyph_grid(g_ptr))
+    if (!is_rune_protection_grid(g_ptr))
         return TRUE;
 
     monster_race *r_ptr = &r_info[r_idx];
-    if (randint1(BREAK_GLYPH) >= (r_ptr->level + 20))
+    if (randint1(BREAK_RUNE_PROTECTION) >= (r_ptr->level + 20))
         return FALSE;
 
     if (g_ptr->info & CAVE_MARK)
@@ -385,10 +385,10 @@ bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS
         floor_ptr->num_repro++;
 
     warn_unique_generation(player_ptr, r_idx);
-    if (!is_explosive_rune_grid(g_ptr))
+    if (!is_rune_explosion_grid(g_ptr))
         return TRUE;
 
-    if (randint1(BREAK_MINOR_GLYPH) > r_ptr->level) {
+    if (randint1(BREAK_RUNE_EXPLOSION) > r_ptr->level) {
         if (g_ptr->info & CAVE_MARK) {
             msg_print(_("ルーンが爆発した！", "The rune explodes!"));
             project(player_ptr, 0, 2, y, x, 2 * (player_ptr->lev + damroll(7, 7)), GF_MANA,
@@ -406,4 +406,4 @@ bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS
     lite_spot(player_ptr, y, x);
 
     return TRUE;
-}
\ No newline at end of file
+}

diff --git a/src/object-activation/activation-others.c b/src/object-activation/activation-others.c
index 6bf353c..ac897e1 100644 (file)
--- a/src/object-activation/activation-others.c
+++ b/src/object-activation/activation-others.c
@@ -328,14 +328,14 @@ bool activate_map_light(player_type *user_ptr)
 bool activate_exploding_rune(player_type *user_ptr)
 {
     msg_print(_("明るい赤色に輝いている...", "It glows bright red..."));
-    explosive_rune(user_ptr, user_ptr->y, user_ptr->x);
+    create_rune_explosion(user_ptr, user_ptr->y, user_ptr->x);
     return TRUE;
 }
 
 bool activate_protection_rune(player_type *user_ptr)
 {
     msg_print(_("ブルーに明るく輝いている...", "It glows light blue..."));
-    warding_glyph(user_ptr);
+    create_rune_protection_one(user_ptr);
     return TRUE;
 }
 

diff --git a/src/object-use/read-execution.c b/src/object-use/read-execution.c
index ed99104..6ca2239 100644 (file)
--- a/src/object-use/read-execution.c
+++ b/src/object-use/read-execution.c
@@ -354,7 +354,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known)
             break;
         }
         case SV_SCROLL_RUNE_OF_PROTECTION: {
-            warding_glyph(creature_ptr);
+            create_rune_protection_one(creature_ptr);
             ident = TRUE;
             break;
         }

diff --git a/src/racial/racial-switcher.c b/src/racial/racial-switcher.c
index bffde44..0d18afe 100644 (file)
--- a/src/racial/racial-switcher.c
+++ b/src/racial/racial-switcher.c
@@ -314,7 +314,7 @@ bool switch_race_racial_execution(player_type *creature_ptr, const s32b command)
         return TRUE;
     case RACE_HALF_OGRE:
         msg_print(_("爆発のルーンを慎重に仕掛けた...", "You carefully set an explosive rune..."));
-        (void)explosive_rune(creature_ptr, creature_ptr->y, creature_ptr->x);
+        (void)create_rune_explosion(creature_ptr, creature_ptr->y, creature_ptr->x);
         return TRUE;
     case RACE_HALF_GIANT:
         if (!get_aim_dir(creature_ptr, &dir))

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index e64e2d1..9cfcf5d 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -285,14 +285,14 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode)
 
     case 15:
         if (name)
-            return _("結界の紋章", "Glyph of Warding");
+            return _("結界の紋章", "Rune of Protection");
         if (desc)
             return _("自分のいる床の上に、モンスターが通り抜けたり召喚されたりすることができなくなるルーンを描く。",
-                "Sets a glyph on the floor beneath you. If you are on a glyph, monsters cannot attack you but can try to break the glyph.");
+                "Sets a rune on the floor beneath you. If you are on a rune, monsters cannot attack you but can try to break the rune.");
 
         {
             if (cast) {
-                warding_glyph(caster_ptr);
+                create_rune_protection_one(caster_ptr);
             }
         }
         break;
@@ -425,7 +425,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode)
             return _("真・結界", "Warding True");
         if (desc)
             return _("自分のいる床と周囲8マスの床の上に、モンスターが通り抜けたり召喚されたりすることができなくなるルーンを描く。",
-                "Creates glyphs in all adjacent squares and under you.");
+                "Creates runes in all adjacent squares and under you.");
 
         {
             POSITION rad = 1;
@@ -434,8 +434,8 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode)
                 return info_radius(rad);
 
             if (cast) {
-                warding_glyph(caster_ptr);
-                glyph_creation(caster_ptr, caster_ptr->y, caster_ptr->x);
+                create_rune_protection_one(caster_ptr);
+                create_rune_protection_area(caster_ptr, caster_ptr->y, caster_ptr->x);
             }
         }
         break;

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index 019c725..dc4f878 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -823,7 +823,7 @@ concptr do_music_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode
             return _("守りの歌", "Endurance");
         if (desc)
             return _("自分のいる床の上に、モンスターが通り抜けたり召喚されたりすることができなくなるルーンを描く。",
-                "Sets a glyph on the floor beneath you. If you are on a glyph, monsters cannot attack you but can try to break the glyph.");
+                "Sets a rune on the floor beneath you. If you are on a rune, monsters cannot attack you but can try to break the rune.");
 
         {
             /* Stop singing before start another */
@@ -832,7 +832,7 @@ concptr do_music_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode
 
             if (cast) {
                 msg_print(_("歌が神聖な場を作り出した．．．", "The holy power of the Music is creating sacred field..."));
-                warding_glyph(caster_ptr);
+                create_rune_protection_one(caster_ptr);
             }
         }
         break;

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index 92b64ba..2628fcf 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -503,7 +503,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mo
             return _("爆発のルーン", "Explosive Rune");
         if (desc)
             return _("自分のいる床の上に、モンスターが通ると爆発してダメージを与えるルーンを描く。",
-                "Sets a glyph under you. The glyph will explode when a monster moves on it.");
+                "Sets a rune under you. The rune will explode when a monster moves on it.");
 
         {
             DICE_NUMBER dice = 7;
@@ -514,7 +514,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mo
                 return info_damage(dice, sides, base);
 
             if (cast) {
-                explosive_rune(caster_ptr, caster_ptr->y, caster_ptr->x);
+                create_rune_explosion(caster_ptr, caster_ptr->y, caster_ptr->x);
             }
         }
         break;

diff --git a/src/spell-kind/earthquake.c b/src/spell-kind/earthquake.c
index 0aa469b..7bea1a0 100644 (file)
--- a/src/spell-kind/earthquake.c
+++ b/src/spell-kind/earthquake.c
@@ -204,10 +204,10 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M
                     if (!is_cave_empty_bold(caster_ptr, y, x))
                         continue;
 
-                    if (is_glyph_grid(&floor_ptr->grid_array[y][x]))
+                    if (is_rune_protection_grid(&floor_ptr->grid_array[y][x]))
                         continue;
 
-                    if (is_explosive_rune_grid(&floor_ptr->grid_array[y][x]))
+                    if (is_rune_explosion_grid(&floor_ptr->grid_array[y][x]))
                         continue;
 
                     if (pattern_tile(floor_ptr, y, x))
@@ -346,4 +346,4 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M
     }
 
     return TRUE;
-}
\ No newline at end of file
+}

diff --git a/src/spell-kind/spells-grid.c b/src/spell-kind/spells-grid.c
index 8eeec5f..8c5008f 100644 (file)
--- a/src/spell-kind/spells-grid.c
+++ b/src/spell-kind/spells-grid.c
@@ -14,10 +14,10 @@
 
 /*!
  * @brief 守りのルーン設置処理 /
- * Leave a "glyph of warding" which prevents monster movement
+ * Leave a "rune of protection" which prevents monster movement
  * @return 実際に設置が行われた場合TRUEを返す
  */
-bool warding_glyph(player_type *caster_ptr)
+bool create_rune_protection_one(player_type *caster_ptr)
 {
     if (!cave_clean_bold(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x)) {
         msg_print(_("床上のアイテムが呪文を跳ね返した。", "The object resists the spell."));
@@ -25,7 +25,7 @@ bool warding_glyph(player_type *caster_ptr)
     }
 
     caster_ptr->current_floor_ptr->grid_array[caster_ptr->y][caster_ptr->x].info |= CAVE_OBJECT;
-    caster_ptr->current_floor_ptr->grid_array[caster_ptr->y][caster_ptr->x].mimic = feat_glyph;
+    caster_ptr->current_floor_ptr->grid_array[caster_ptr->y][caster_ptr->x].mimic = feat_rune_protection;
     note_spot(caster_ptr, caster_ptr->y, caster_ptr->x);
     lite_spot(caster_ptr, caster_ptr->y, caster_ptr->x);
     return TRUE;
@@ -39,7 +39,7 @@ bool warding_glyph(player_type *caster_ptr)
  * @param x 設置場所
  * @return 実際に設置が行われた場合TRUEを返す
  */
-bool explosive_rune(player_type *caster_ptr, POSITION y, POSITION x)
+bool create_rune_explosion(player_type *caster_ptr, POSITION y, POSITION x)
 {
     floor_type *floor_ptr = caster_ptr->current_floor_ptr;
     if (!cave_clean_bold(floor_ptr, y, x)) {
@@ -48,7 +48,7 @@ bool explosive_rune(player_type *caster_ptr, POSITION y, POSITION x)
     }
 
     floor_ptr->grid_array[y][x].info |= CAVE_OBJECT;
-    floor_ptr->grid_array[y][x].mimic = feat_explosive_rune;
+    floor_ptr->grid_array[y][x].mimic = feat_rune_explosion;
     note_spot(caster_ptr, y, x);
     lite_spot(caster_ptr, y, x);
     return TRUE;

diff --git a/src/spell-kind/spells-grid.h b/src/spell-kind/spells-grid.h
index d0a0c55..af25857 100644 (file)
--- a/src/spell-kind/spells-grid.h
+++ b/src/spell-kind/spells-grid.h
@@ -2,6 +2,6 @@
 
 #include "system/angband.h"
 
-bool warding_glyph(player_type *caster_ptr);
-bool explosive_rune(player_type *caster_ptr, POSITION y, POSITION x);
+bool create_rune_protection_one(player_type *caster_ptr);
+bool create_rune_explosion(player_type *caster_ptr, POSITION y, POSITION x);
 void stair_creation(player_type *caster_ptr);

diff --git a/src/spell-kind/spells-neighbor.c b/src/spell-kind/spells-neighbor.c
index 4aea349..c7f8365 100644 (file)
--- a/src/spell-kind/spells-neighbor.c
+++ b/src/spell-kind/spells-neighbor.c
@@ -51,10 +51,10 @@ bool tree_creation(player_type *caster_ptr, POSITION y, POSITION x)
  * @param caster_ptr プレーヤーへの参照ポインタ
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool glyph_creation(player_type *caster_ptr, POSITION y, POSITION x)
+bool create_rune_protection_area(player_type *caster_ptr, POSITION y, POSITION x)
 {
     BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM;
-    return (project(caster_ptr, 0, 1, y, x, 0, GF_MAKE_GLYPH, flg, -1));
+    return (project(caster_ptr, 0, 1, y, x, 0, GF_MAKE_RUNE_PROTECTION, flg, -1));
 }
 
 /*!

diff --git a/src/spell-kind/spells-neighbor.h b/src/spell-kind/spells-neighbor.h
index 4ac531d..f7e144c 100644 (file)
--- a/src/spell-kind/spells-neighbor.h
+++ b/src/spell-kind/spells-neighbor.h
@@ -5,7 +5,7 @@
 bool door_creation(player_type *caster_ptr, POSITION y, POSITION x);
 bool trap_creation(player_type *caster_ptr, POSITION y, POSITION x);
 bool tree_creation(player_type *caster_ptr, POSITION y, POSITION x);
-bool glyph_creation(player_type *caster_ptr, POSITION y, POSITION x);
+bool create_rune_protection_area(player_type *caster_ptr, POSITION y, POSITION x);
 bool wall_stone(player_type *caster_ptr);
 bool destroy_doors_touch(player_type *caster_ptr);
 bool disarm_traps_touch(player_type *caster_ptr);

diff --git a/src/spell/spell-types.h b/src/spell/spell-types.h
index 56290f5..8d2de85 100644 (file)
--- a/src/spell/spell-types.h
+++ b/src/spell/spell-types.h
@@ -59,7 +59,7 @@ typedef enum spells_type
        GF_DISP_LIVING = 71,            /*!< 魔法効果: 生命退散*/
        GF_ROCKET = 72,                         /*!< 魔法効果: ロケット*/
        GF_NUKE = 73,                           /*!< 魔法効果: 放射性廃棄物*/
-       GF_MAKE_GLYPH = 74,                     /*!< 魔法効果: 守りのルーン生成*/
+       GF_MAKE_RUNE_PROTECTION = 74,  /*!< 魔法効果: 守りのルーン生成*/
        GF_STASIS = 75,                         /*!< 魔法効果: モンスター拘束*/
        GF_STONE_WALL = 76,                     /*!< 魔法効果: 壁生成*/
        GF_DEATH_RAY = 77,                      /*!< 魔法効果: 死の光線*/

diff --git a/src/system/gamevalue.h b/src/system/gamevalue.h
index afac5cd..06a3608 100644 (file)
--- a/src/system/gamevalue.h
+++ b/src/system/gamevalue.h
@@ -139,8 +139,8 @@
 #define TURNS_PER_TICK    10L     /*!< 時間経過処理を行うターン数の刻み / Number of energy-gain-turns per ticks */
 #define INN_DUNGEON_TURN_ADJ 10   /*!< 宿屋で時間をつぶした場合に増える dungeon_turn の倍率 */
 #define MAX_DAYS          20000   /*!< 内部処理中で保持される最大日数 / Maximum days */
-#define BREAK_GLYPH       550     /*!< 守りのルーンの強靭度 / Rune of protection resistance */
-#define BREAK_MINOR_GLYPH 299     /*!< 爆発のルーンの発動しやすさ / For explosive runes */
+#define BREAK_RUNE_PROTECTION       550     /*!< 守りのルーンの強靭度 / Rune of protection resistance */
+#define BREAK_RUNE_EXPLOSION 299     /*!< 爆発のルーンの発動しやすさ / For explosive runes */
 #define BTH_PLUS_ADJ      3       /*!< 武器経験値及びプレイヤーの打撃/射撃能力に応じた修正値倍率 / Adjust BTH per plus-to-hit */
 #define MON_MULT_ADJ      8       /*!< モンスターの増殖しにくさの基本倍率 / High value slows multiplication */
 #define MON_SUMMON_ADJ    2       /*!< 現在未使用 Adjust level of summoned creatures */

diff --git a/src/term/gameterm.c b/src/term/gameterm.c
index d35989d..1fe6e0c 100644 (file)
--- a/src/term/gameterm.c
+++ b/src/term/gameterm.c
@@ -180,7 +180,7 @@ const concptr ident_info[] =
        "8:我が家の入口",
        "9:書店の入口",
        "::岩石",
-       ";:å\9b\9eé\81¿ã\81®å½«å\83\8f/爆発のルーン",
+       ";:å®\88ã\82\8aã\81®ã\83«ã\83¼ã\83³/爆発のルーン",
        "<:上り階段",
        "=:指輪",
        ">:下り階段",
@@ -276,7 +276,7 @@ const concptr ident_info[] =
        "8:Entrance to your home",
        "9:Entrance to the Bookstore",
        "::Rubble",
-       ";:A glyph of warding / an explosive rune",
+       ";:A rune of protection / an explosive rune",
        "<:An up staircase",
        "=:A ring",
        ">:A down staircase",

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 1f9669e..b6288e4 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -350,7 +350,7 @@ void wiz_create_feature(player_type *creature_ptr)
     feature_type *f_ptr;
     f_ptr = &f_info[get_feat_mimic(g_ptr)];
 
-    if (has_flag(f_ptr->flags, FF_GLYPH) || has_flag(f_ptr->flags, FF_MINOR_GLYPH))
+    if (has_flag(f_ptr->flags, FF_RUNE_PROTECTION) || has_flag(f_ptr->flags, FF_RUNE_EXPLOSION))
         g_ptr->info |= CAVE_OBJECT;
     else if (has_flag(f_ptr->flags, FF_MIRROR))
         g_ptr->info |= CAVE_GLOW | CAVE_OBJECT;
@@ -636,4 +636,4 @@ void cheat_death(player_type *creature_ptr)
 
     exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, _("                            しかし、生き返った。", "                            but revived."));
     leave_floor(creature_ptr);
-}
\ No newline at end of file
+}