ｿｷ･ﾈ･鬣ﾃ･ﾗ｡｢ｷﾙﾊﾖ､ﾉｲﾃ｡｣

diff --git a/lib/edit/f_info_j.txt b/lib/edit/f_info_j.txt
index ec5eb0e..ae3bb1a 100644 (file)
--- a/lib/edit/f_info_j.txt
+++ b/lib/edit/f_info_j.txt
@@ -559,6 +559,10 @@ N:90:
 E:compact rune
 G:^:D
 
+N:91:·ÙÊóÁõÃÖ
+E:alarm
+G:^:R
+
 N:93:²Ö
 E:flower
 G:::G

diff --git a/src/cave.c b/src/cave.c
index 9fc6ec5..d8aaa33 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -75,6 +75,7 @@ bool is_trap(int feat)
                case FEAT_TRAP_POISON:
                case FEAT_TRAP_SLEEP:
                case FEAT_TRAP_TRAPS:
+               case FEAT_TRAP_ALARM:
                {
                        /* A trap */
                        return (TRUE);
@@ -1288,6 +1289,7 @@ void map_info(int y, int x, byte *ap, char *cp)
                case FEAT_TRAP_POISON:
                case FEAT_TRAP_SLEEP:
                case FEAT_TRAP_TRAPS:
+               case FEAT_TRAP_ALARM:
                case FEAT_DIRT:
                case FEAT_GRASS:
                case FEAT_FLOWER:

diff --git a/src/cmd1.c b/src/cmd1.c
index 1bdbb7e..6f3d610 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -2142,6 +2142,19 @@ msg_print("
 
                        break;
                }
+
+               case FEAT_TRAP_ALARM:
+               {
+#ifdef JP
+                       msg_print("¤±¤¿¤¿¤Þ¤·¤¤²»¤¬ÌĤê¶Á¤¤¤¿¡ª");
+#else
+                       msg_print("An alarm sounds!");
+#endif
+
+                       aggravate_monsters(0);
+
+                       break;
+               }
        }
        if (break_trap && is_trap(c_ptr->feat))
        {

diff --git a/src/defines.h b/src/defines.h
index 998a7b6..0f93729 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1032,6 +1032,7 @@
 #define FEAT_GRASS              0x59
 
 #define FEAT_TRAP_TRAPS         0x5A
+#define FEAT_TRAP_ALARM         0x5B
 
 #define FEAT_FLOWER             0x5D
 #define FEAT_DEEP_GRASS         0x5E

diff --git a/src/object2.c b/src/object2.c
index dace069..854c6a1 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -5067,7 +5067,7 @@ void acquirement(int y1, int x1, int num, bool great, bool known)
 }
 
 
-#define MAX_TRAPS              17
+#define MAX_TRAPS              18
 
 static int trap_num[MAX_TRAPS] =
 {
@@ -5088,6 +5088,7 @@ static int trap_num[MAX_TRAPS] =
        FEAT_TRAP_POISON,
        FEAT_TRAP_SLEEP,
        FEAT_TRAP_TRAPS,
+       FEAT_TRAP_ALARM,
 };