FORCE_WEPON -> FORCE_WEAPON

diff --git a/lib/edit/a_info_j.txt b/lib/edit/a_info_j.txt
index decdc95..f5ac817 100644 (file)
--- a/lib/edit/a_info_j.txt
+++ b/lib/edit/a_info_j.txt
@@ -2230,7 +2230,7 @@ E:of Gandalf
 I:21:21:4
 W:30:50:40:140000
 P:0:3d2:10:13:0
-F:INT | WIS | CHR | HIDE_TYPE | SEARCH | BRAND_FIRE | FORCE_WEPON |
+F:INT | WIS | CHR | HIDE_TYPE | SEARCH | BRAND_FIRE | FORCE_WEAPON |
 F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | LITE | DEC_MANA |
 F:HOLD_LIFE | RES_FIRE | RES_NETHER | SEE_INVIS | ACTIVATE | SHOW_MODS
 D:$The staff of the great wizard Gandalf.  
@@ -2505,7 +2505,7 @@ E:'Goln Nova'
 I:23:16:2
 W:30:50:150:100000
 P:0:2d5:15:15:0
-F:STR | DEX | HIDE_TYPE | FORCE_WEPON |
+F:STR | DEX | HIDE_TYPE | FORCE_WEAPON |
 F:SHOW_MODS | RIDING | SLAY_DEMON
 D:¤«¤Ä¤ÆËâƳÅÔ»Ô¥µ¥¤¥é¡¼¥°¤òÇ˲õ¤Ä¤¯¤·¤¿Ëâ½Ã¡¢¥¶¥Ê¥Ã¥Õ¥¡¡¼¡£
 D:¤½¤ì¤òÌǤܤ·¤¿¤È¤¤¤ï¤ì¤ë¤Î¤¬¡¢¤³¤ÎÅÁÀâ¤ÎÉð´ï¤Ç¤¢¤ë¡£
@@ -3313,7 +3313,7 @@ E:'hermit's purple'
 I:21:2:2
 W:40:40:30:40000
 P:0:1d6:10:5:0
-F:INT | WIS | FORCE_WEPON |
+F:INT | WIS | FORCE_WEAPON |
 F:SEE_INVIS | TELEPATHY
 D:ȾͩÂ⽤·¤¿ÉԻ׵Ĥʰñ¤ÎÊܤÀ¡£½êÍ­¼Ô¤ÎÀº¿ÀÎϤò¹¶·âÎϤËÊÑ´¹¤·¡¢
 D:ÇÈÌæ¤ÎÎϤǿȤò¼é¤ë¤³¤È¤¬¤Ç¤­¤ë¡£

diff --git a/lib/edit/e_info_j.txt b/lib/edit/e_info_j.txt
index 603373d..6f8cd90 100644 (file)
--- a/lib/edit/e_info_j.txt
+++ b/lib/edit/e_info_j.txt
@@ -570,7 +570,7 @@ X:24:15
 W:0:18:0:12000
 C:3:3:0:2
 F:INT | WIS |
-F:FORCE_WEPON | SEE_INVIS
+F:FORCE_WEAPON | SEE_INVIS
 
 # The "Elemental" brands (4) (6)
 

diff --git a/src/artifact.c b/src/artifact.c
index 1bd5d22..5f09ba1 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -1038,7 +1038,7 @@ static void random_slay(object_type *o_ptr, bool is_scroll)
                                        artifact_bias = BIAS_NECROMANTIC;
                                break;
                        case 32:
-                               o_ptr->art_flags1 |= TR1_FORCE_WEPON;
+                               o_ptr->art_flags1 |= TR1_FORCE_WEAPON;
                                /*  if (is_scroll) msg_print("It looks consuming your MP!");*/
                                if (!artifact_bias)
                                        artifact_bias = (one_in_(2) ? BIAS_MAGE : BIAS_PRIESTLY);
@@ -1678,7 +1678,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
                o_ptr->to_h = 0;
                o_ptr->to_d = 0;
                o_ptr->art_flags1 &= ~(TR1_BLOWS);
-               o_ptr->art_flags1 &= ~(TR1_FORCE_WEPON);
+               o_ptr->art_flags1 &= ~(TR1_FORCE_WEAPON);
                o_ptr->art_flags1 &= ~(TR1_SLAY_ANIMAL);
                o_ptr->art_flags1 &= ~(TR1_SLAY_EVIL);
                o_ptr->art_flags1 &= ~(TR1_SLAY_UNDEAD);

diff --git a/src/bldg.c b/src/bldg.c
index 010d63c..6ae5788 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3076,11 +3076,11 @@ static void compare_weapon_aux1(object_type *o_ptr, int col, int r)
                if ((o_ptr->tval == TV_POLEARM) && ((o_ptr->sval == SV_LANCE) || (o_ptr->sval == SV_HEAVY_LANCE)))
                        mult = mult * (o_ptr->dd + 2) / o_ptr->dd;
        }
-       if ((p_ptr->pclass != CLASS_SAMURAI) && (f1 & TR1_FORCE_WEPON) && (p_ptr->csp > (o_ptr->dd * o_ptr->ds / 5))) mult = mult * 7 / 2;
+       if ((p_ptr->pclass != CLASS_SAMURAI) && (f1 & TR1_FORCE_WEAPON) && (p_ptr->csp > (o_ptr->dd * o_ptr->ds / 5))) mult = mult * 7 / 2;
 
        /* Print the relevant lines */
 #ifdef JP
-if (f1 & TR1_FORCE_WEPON)     compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 1*mult, "ÍýÎÏ:", f1, f2, f3, TERM_L_BLUE);
+if (f1 & TR1_FORCE_WEAPON)     compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 1*mult, "ÍýÎÏ:", f1, f2, f3, TERM_L_BLUE);
 if (f1 & TR1_SLAY_ANIMAL) compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "ưʪ:", f1, f2, f3, TERM_YELLOW);
 if (f1 & TR1_SLAY_EVIL)   compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "¼Ù°­:", f1, f2, f3, TERM_YELLOW);
 if (f1 & TR1_SLAY_UNDEAD) compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 3*mult, "ÉÔ»à:", f1, f2, f3, TERM_YELLOW);
@@ -3096,7 +3096,7 @@ if (f1 & TR1_BRAND_FIRE)  compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, co
 if (f1 & TR1_BRAND_COLD)  compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 5*mult/2, "Îä°À­:", f1, f2, f3, TERM_RED);
 if (f1 & TR1_BRAND_POIS)  compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 5*mult/2, "ÆÇ°À­:", f1, f2, f3, TERM_RED);
 #else
-       if (f1 & TR1_FORCE_WEPON)     compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 1*mult, "Force  :", f1, f2, f3, TERM_L_BLUE);
+       if (f1 & TR1_FORCE_WEAPON)     compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 1*mult, "Force  :", f1, f2, f3, TERM_L_BLUE);
        if (f1 & TR1_SLAY_ANIMAL) compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "Animals:", f1, f2, f3, TERM_YELLOW);
        if (f1 & TR1_SLAY_EVIL)   compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "Evil:", f1, f2, f3, TERM_YELLOW);
        if (f1 & TR1_SLAY_UNDEAD) compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 3*mult, "Undead:", f1, f2, f3, TERM_YELLOW);

diff --git a/src/cmd1.c b/src/cmd1.c
index e44d71f..a7784ce 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -527,7 +527,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode)
                                if (mult == 10) mult = 40;
                                else if (mult < 60) mult = 60;
                        }
-                       if ((p_ptr->pclass != CLASS_SAMURAI) && (f1 & TR1_FORCE_WEPON) && (p_ptr->csp > (o_ptr->dd * o_ptr->ds / 5)))
+                       if ((p_ptr->pclass != CLASS_SAMURAI) && (f1 & TR1_FORCE_WEAPON) && (p_ptr->csp > (o_ptr->dd * o_ptr->ds / 5)))
                        {
                                p_ptr->csp -= (1+(o_ptr->dd * o_ptr->ds / 5));
                                p_ptr->redraw |= (PR_MANA);
@@ -3468,7 +3468,7 @@ msg_format("
                                        if (!(p_ptr->resist_pois || p_ptr->oppose_pois) && (mult < 3))
                                                mult = mult * 5 / 2;
 
-                                       if ((p_ptr->pclass != CLASS_SAMURAI) && (f1 & TR1_FORCE_WEPON) && (p_ptr->csp > (p_ptr->msp / 30)))
+                                       if ((p_ptr->pclass != CLASS_SAMURAI) && (f1 & TR1_FORCE_WEAPON) && (p_ptr->csp > (p_ptr->msp / 30)))
                                        {
                                                p_ptr->csp -= (1+(p_ptr->msp / 30));
                                                p_ptr->redraw |= (PR_MANA);

diff --git a/src/cmd2.c b/src/cmd2.c
index f48c8a5..b93102f 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3523,7 +3523,7 @@ s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                }
                        }
 
-                       if ((f1 & TR1_FORCE_WEPON) && (p_ptr->csp > (p_ptr->msp / 30)))
+                       if ((f1 & TR1_FORCE_WEAPON) && (p_ptr->csp > (p_ptr->msp / 30)))
                        {
                                p_ptr->csp -= (1+(p_ptr->msp / 30));
                                p_ptr->redraw |= (PR_MANA);

diff --git a/src/cmd3.c b/src/cmd3.c
index 66fcd62..c5a7cb9 100644 (file)
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -1390,7 +1390,7 @@ static flag_insc_table flag_insc_brand[] =
        { "µÛ", "V", TR1_VAMPIRIC, 1, 0 },
        { "¿Ì", "Q", TR1_IMPACT, 1, 0 },
        { "ÀÚ", "S", TR1_VORPAL, 1, 0 },
-       { "Íý", "M", TR1_FORCE_WEPON, 1, 0 },
+       { "Íý", "M", TR1_FORCE_WEAPON, 1, 0 },
        { NULL, NULL, 0, 0, 0 }
 };
 
@@ -1515,7 +1515,7 @@ static flag_insc_table flag_insc_brand[] =
        { "V", TR1_VAMPIRIC, 1, 0 },
        { "Q", TR1_IMPACT, 1, 0 },
        { "S", TR1_VORPAL, 1, 0 },
-       { "M", TR1_FORCE_WEPON, 1, 0 },
+       { "M", TR1_FORCE_WEAPON, 1, 0 },
        { NULL, 0, 0, 0 }
 };
 

diff --git a/src/defines.h b/src/defines.h
index bb182e2..b2f371f 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1411,7 +1411,7 @@
 #define EGO_WEST                68
 #define EGO_ATTACKS             69
 #define EGO_SLAYING_WEAPON      70
-#define EGO_FORCE_WEPON             71
+#define EGO_FORCE_WEAPON        71
 #define EGO_BRAND_ACID          72
 #define EGO_BRAND_ELEC          73
 #define EGO_BRAND_FIRE          74
@@ -2889,7 +2889,7 @@
 #define TR1_CON                 0x00000010L     /* CON += "pval" */
 #define TR1_CHR                 0x00000020L     /* CHR += "pval" */
 #define TR1_MAGIC_MASTERY       0x00000040L     /* Later */
-#define TR1_FORCE_WEPON             0x00000080L     /* Later */
+#define TR1_FORCE_WEAPON        0x00000080L     /* Later */
 #define TR1_STEALTH             0x00000100L     /* Stealth += "pval" */
 #define TR1_SEARCH              0x00000200L     /* Search += "pval" */
 #define TR1_INFRA               0x00000400L     /* Infra += "pval" */

diff --git a/src/files.c b/src/files.c
index ca7e16d..91ec584 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2209,7 +2209,7 @@ static void display_player_various(void)
                                basedam *= 11;
                                basedam /= 9;
                        }
-                       if (object_known_p(o_ptr) && (p_ptr->pclass != CLASS_SAMURAI) && (f1 & TR1_FORCE_WEPON) && (p_ptr->csp > (o_ptr->dd * o_ptr->ds / 5)))
+                       if (object_known_p(o_ptr) && (p_ptr->pclass != CLASS_SAMURAI) && (f1 & TR1_FORCE_WEAPON) && (p_ptr->csp > (o_ptr->dd * o_ptr->ds / 5)))
                                basedam = basedam * 7 / 2;
                        if (p_ptr->riding && (o_ptr->tval == TV_POLEARM) && ((o_ptr->sval == SV_LANCE) || (o_ptr->sval == SV_HEAVY_LANCE)))
                                basedam = basedam*(o_ptr->dd+2)/o_ptr->dd;

diff --git a/src/init1.c b/src/init1.c
index 18745a2..be76820 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -500,7 +500,7 @@ static cptr k_info_flags1[] =
        "CON",
        "CHR",
        "MAGIC_MASTERY",
-       "FORCE_WEPON",
+       "FORCE_WEAPON",
        "STEALTH",
        "SEARCH",
        "INFRA",

diff --git a/src/object1.c b/src/object1.c
index e874cf3..bf2679b 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -3067,7 +3067,7 @@ info[i++] = "
 
        }
 
-       if (f1 & (TR1_FORCE_WEPON))
+       if (f1 & (TR1_FORCE_WEAPON))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤Ï»ÈÍѼԤÎËâÎϤò»È¤Ã¤Æ¹¶·â¤¹¤ë¡£";

diff --git a/src/object2.c b/src/object2.c
index 44d51e0..b939b58 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -928,7 +928,7 @@ s32b flag_cost(object_type * o_ptr, int plusses)
        count = 0;
        if (f1 & TR1_CHAOTIC) {total += 5000;count++;}
        if (f1 & TR1_VAMPIRIC) {total += 6500;count++;}
-       if (f1 & TR1_FORCE_WEPON) {tmp_cost += 2500;count++;}
+       if (f1 & TR1_FORCE_WEAPON) {tmp_cost += 2500;count++;}
        if (f1 & TR1_SLAY_ANIMAL) {tmp_cost += 1800;count++;}
        if (f1 & TR1_SLAY_EVIL) {tmp_cost += 2300;count++;}
        if (f1 & TR1_SLAY_UNDEAD) {tmp_cost += 1800;count++;}
@@ -6848,7 +6848,7 @@ static void drain_essence(void)
                }
        }
 
-       if ((old_f1 & TR1_FORCE_WEPON) && !(new_f1 & TR1_FORCE_WEPON))
+       if ((old_f1 & TR1_FORCE_WEAPON) && !(new_f1 & TR1_FORCE_WEAPON))
        {
                drain_value[ESSENCE_INT-1] += 5;
                drain_value[ESSENCE_WIS-1] += 5;

diff --git a/src/spells2.c b/src/spells2.c
index eb65f7b..e5107c7 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2780,7 +2780,7 @@ info[i++] = "
 
                }
 
-               if (f1 & (TR1_FORCE_WEPON))
+               if (f1 & (TR1_FORCE_WEAPON))
                {
 #ifdef JP
 info[i++] = "¤¢¤Ê¤¿¤ÎÉð´ï¤ÏMP¤ò»È¤Ã¤Æ¹¶·â¤¹¤ë¡£";

diff --git a/src/wizard1.c b/src/wizard1.c
index 890027c..81e8d22 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -665,7 +665,7 @@ static flag_desc brand_flags_desc[] =
        { TR1_BRAND_COLD,         "Åà·ë" },
        { TR1_BRAND_POIS,         "ÆÇ»¦" },
 
-       { TR1_FORCE_WEPON,            "ÍýÎÏ" },
+       { TR1_FORCE_WEAPON,       "ÍýÎÏ" },
        { TR1_CHAOTIC,            "º®ÆÙ" },
        { TR1_VAMPIRIC,           "µÛ·ì" },
        { TR1_IMPACT,             "ÃÏ¿Ì" },
@@ -677,7 +677,7 @@ static flag_desc brand_flags_desc[] =
        { TR1_BRAND_COLD,         "Frost Brand" },
        { TR1_BRAND_POIS,         "Poisoned" },
 
-       { TR1_FORCE_WEPON,            "Force" },
+       { TR1_FORCE_WEAPON,       "Force" },
        { TR1_CHAOTIC,            "Mark of Chaos" },
        { TR1_VAMPIRIC,           "Vampiric" },
        { TR1_IMPACT,             "Earthquake impact on hit" },