､ｵ､ｭ､ﾛ､ﾉ､ﾎﾊﾑｹｹ､ﾏ｡｢ｸ惕ﾃ､ﾆｴｴ､ﾎ､ﾛ､ｦ､ﾋcommit､ｷ､ﾆ､ｷ､ﾞ､ﾃ､ｿ､ﾎ､ﾇ｡｢ｴｴ､ommitﾁｰ､ﾎｾﾖ､ﾋﾌ皃ｷ､ｿ｡｣

diff --git a/lib/edit/a_info_j.txt b/lib/edit/a_info_j.txt
index 848423c..52506a4 100644 (file)
--- a/lib/edit/a_info_j.txt
+++ b/lib/edit/a_info_j.txt
@@ -238,7 +238,7 @@ E:'Frakir'
 I:45:32:1
 W:50:40:2:75000
 F:STR | INT | WIS | DEX | CON | CHR | STEALTH | HIDE_TYPE |
-F:RES_POIS | ACTIVATE | SEE_INVIS | SEARCH | WARNING | INSTA_ART
+F:RES_POIS | ACTIVATE | SEE_INVIS | SEARCH | INSTA_ART
 D:º®Æ٤β¦»Ò¥Þ¡¼¥ê¥ó¤¬¥í¥°¥ë¥¹¤«¤éÀ¸¤ß½Ð¤·¤¿°Õ»×¤ò»ý¤Ã¤¿ÏÓÎؤÀ¡£
 D:ÉáÃʤÏÌܤ˸«¤¨¤Ê¤¤¤¬Ì®Æ°¤·¤Æ´í¸±¤òÃΤ餻¤Æ¤¯¤ì¤ë¡£ÁõÈ÷¤¹¤ë¤â¤Î¤¬
 D:Ì¿¤º¤ë¤È·Á¤òÊѤ¨¤ÆŨ¤Î¼ó¤òÄù¤á¤ë¤³¤È¤¬¤Ç¤­¤ë¡£

diff --git a/lib/edit/k_info_j.txt b/lib/edit/k_info_j.txt
index 563433d..c0d717a 100644 (file)
--- a/lib/edit/k_info_j.txt
+++ b/lib/edit/k_info_j.txt
@@ -5080,7 +5080,6 @@ G:=:d
 I:45:54:0
 W:10:0:2:200
 A:10/2
-F:WARNING
 
 N:619:& ¹ÝÅ´¤Î¥¯¥í¥¹¥Ü¥¦¤ÎÌð
 E:& Steel Bolt~

diff --git a/src/cmd1.c b/src/cmd1.c
index 3770e5b..d2b225c 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -4480,14 +4480,15 @@ msg_format("%s
        {
                int oy, ox;
 
-               if (p_ptr->warning)
-               {
-                       if(!process_frakir(x,y))
-                       {
-                               energy_use = 25;
-                               return;
-                       }
-               }
+#ifdef USE_FRAKIR
+                if (p_ptr->warning)
+                 {
+                   if(!process_frakir(x,y))
+                     {
+                       energy_use = 25;return;
+                     }
+                 }
+#endif
 
                if (do_past)
                {

diff --git a/src/defines.h b/src/defines.h
index b4346fd..e71d500 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2957,7 +2957,7 @@
 #define TR3_NO_MAGIC            0x00000020L     /* Anti-magic */
 #define TR3_DEC_MANA            0x00000040L     /* ??? */
 #define TR3_TY_CURSE            0x00000080L     /* The Ancient Curse */
-#define TR3_WARNING             0x00000100L     /* Warning */
+#define TR3_XXX1                0x00000100L
 #define TR3_HIDE_TYPE           0x00000200L     /* Hide "pval" description */
 #define TR3_SHOW_MODS           0x00000400L     /* Always show Tohit/Todam */
 #define TR3_INSTA_ART           0x00000800L     /* Item must be an artifact */

diff --git a/src/externs.h b/src/externs.h
index 068207f..2d8f010 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -890,7 +890,10 @@ extern cptr item_activation(object_type *o_ptr);
 extern void combine_pack(void);
 extern void reorder_pack(void);
 extern void display_koff(int k_idx);
+
+#ifdef USE_FRAKIR
 extern bool process_frakir(int xx, int yy);
+#endif
 extern void do_cmd_kaji(bool only_browse);
 
 /* racial.c */

diff --git a/src/init1.c b/src/init1.c
index 48e96b8..63d9311 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -578,7 +578,7 @@ static cptr k_info_flags3[] =
        "NO_MAGIC",
        "DEC_MANA",
        "TY_CURSE",
-       "WARNING",
+       "XXX1",
        "HIDE_TYPE",
        "SHOW_MODS",
        "INSTA_ART",

diff --git a/src/object1.c b/src/object1.c
index 2eacf02..ea0c042 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -188,7 +188,7 @@ void object_flags(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
                                        case 0: (*f3) |= (TR3_FEATHER);     break;
                                        case 1: (*f3) |= (TR3_LITE);        break;
                                        case 2: (*f3) |= (TR3_SEE_INVIS);   break;
-                                       case 3: (*f3) |= (TR3_WARNING);     break;
+                                       case 3: (*f3) |= (TR3_TELEPATHY);   break;
                                        case 4: (*f3) |= (TR3_SLOW_DIGEST); break;
                                        case 5: (*f3) |= (TR3_REGEN);       break;
                                        case 6: (*f2) |= (TR2_FREE_ACT);    break;
@@ -387,7 +387,7 @@ void object_flags_known(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
                                                case 0: (*f3) |= (TR3_FEATHER);     break;
                                                case 1: (*f3) |= (TR3_LITE);        break;
                                                case 2: (*f3) |= (TR3_SEE_INVIS);   break;
-                                               case 3: (*f3) |= (TR3_WARNING);     break;
+                                               case 3: (*f3) |= (TR3_TELEPATHY);   break;
                                                case 4: (*f3) |= (TR3_SLOW_DIGEST); break;
                                                case 5: (*f3) |= (TR3_REGEN);       break;
                                                case 6: (*f2) |= (TR2_FREE_ACT);    break;
@@ -3413,15 +3413,6 @@ info[i++] = "
 #endif
 
        }
-       if (f3 & (TR3_WARNING))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï´í¸±¤ËÂФ·¤Æ·Ù¹ð¤òȯ¤¹¤ë¡£";
-#else
-               info[i++] = "XXX";
-#endif
-
-       }
        if (f2 & (TR2_REFLECT))
        {
 #ifdef JP

diff --git a/src/xtra1.c b/src/xtra1.c
index 14212a9..add5998 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3958,6 +3958,8 @@ void calc_bonuses(void)
                /* Extract the item flags */
                object_flags(o_ptr, &f1, &f2, &f3);
 
+               if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_WARNING)) || (o_ptr->name1 == ART_BARAHIR)) p_ptr->warning = TRUE;
+
                /* Affect stats */
                if (f1 & (TR1_STR)) p_ptr->stat_add[A_STR] += o_ptr->pval;
                if (f1 & (TR1_INT)) p_ptr->stat_add[A_INT] += o_ptr->pval;
@@ -4014,7 +4016,6 @@ void calc_bonuses(void)
                if (f3 & (TR3_FEATHER))     p_ptr->ffall = TRUE;
                if (f2 & (TR2_FREE_ACT))    p_ptr->free_act = TRUE;
                if (f2 & (TR2_HOLD_LIFE))   p_ptr->hold_life = TRUE;
-               if (f3 & (TR3_WARNING))     p_ptr->warning = TRUE;
 
                /* Immunity flags */
                if (f2 & (TR2_IM_FIRE)) p_ptr->immune_fire = TRUE;

diff --git a/src/z-config.h b/src/z-config.h
index 382994a..5cf2f69 100644 (file)
--- a/src/z-config.h
+++ b/src/z-config.h
@@ -709,6 +709,11 @@
 /* # define SCRIPT_OBJ_KIND */
 #endif /* USE_SCRIPT */
 
+/*
+ * The Frakir can predict danger when equipped
+ */
+#define USE_FRAKIR
+
 #ifndef HAVE_CONFIG_H
 #ifndef MSDOS
 #define WORLD_SCORE