魔法の難易度を下げるEASY_SPELLをフラグ化した。同時に大賢者のアミュレットにEASY_SPELLフラグを追加した。

diff --git a/lib/edit/e_info_j.txt b/lib/edit/e_info_j.txt
index 1ae3593..e1dd822 100644 (file)
--- a/lib/edit/e_info_j.txt
+++ b/lib/edit/e_info_j.txt
@@ -1201,6 +1201,7 @@ E:and Wizardry
 X:27:10
 W:30:0:0:1500
 C:0:0:0:0
+F:EASY_SPELL
 
 N:180:µæ¶Ë̵Ũ¶ä²ÏºÇ¶¯¤Î
 E:of the Mightiest in the Galaxy
@@ -1438,7 +1439,7 @@ E:of High Rank
 X:29:15
 W:0:0:0:10000
 C:0:0:5:5
-F:RES_BLIND | RES_CONF | WARNING
+F:RES_BLIND | RES_CONF | WARNING | EASY_SPELL
 
 N:236:´¶ÃΤÎ
 E:and Detection

diff --git a/src/defines.h b/src/defines.h
index 391dc13..4e7ef3d 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2995,7 +2995,7 @@
 #define TR_SUST_CON            36
 #define TR_SUST_CHR            37
 #define TR_RIDING              38
-#define TR_XXX2                39     /* Later */
+#define TR_EASY_SPELL          39
 #define TR_IM_ACID             40
 #define TR_IM_ELEC             41
 #define TR_IM_FIRE             42

diff --git a/src/init1.c b/src/init1.c
index c82ab69..7718b16 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -533,7 +533,7 @@ static cptr k_info_flags[] =
        "SUST_CON",
        "SUST_CHR",
        "RIDING",
-       "XXX2",
+       "EASY_SPELL",
        "IM_ACID",
        "IM_ELEC",
        "IM_FIRE",

diff --git a/src/object1.c b/src/object1.c
index c963829..b50d6ea 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -2473,7 +2473,7 @@ info[i++] = "
 
        }
 
-       if (o_ptr->name2 == EGO_RING_WIZARD)
+       if (have_flag(flgs, TR_EASY_SPELL))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò²¼¤²¤ë¡£";

diff --git a/src/object2.c b/src/object2.c
index 16f6a6a..bc02585 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -964,7 +964,7 @@ s32b flag_cost(object_type * o_ptr, int plusses)
        if (have_flag(flgs, TR_SUST_CON)) total += 850;
        if (have_flag(flgs, TR_SUST_CHR)) total += 250;
        if (have_flag(flgs, TR_RIDING)) total += 0;
-       if (have_flag(flgs, TR_XXX2)) total += 0;
+       if (have_flag(flgs, TR_EASY_SPELL)) total += 1500;
        if (have_flag(flgs, TR_THROW)) total += 5000;
        if (have_flag(flgs, TR_FREE_ACT)) total += 4500;
        if (have_flag(flgs, TR_HOLD_LIFE)) total += 8500;

diff --git a/src/wizard2.c b/src/wizard2.c
index 3d04d29..05d1674 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -579,10 +579,10 @@ static void wiz_display_item(object_type *o_ptr)
 
        prt("+------------FLAGS2------------+", 17, j);
        prt("SUST....IMMUN.RESIST............", 18, j);
-       prt("      r aefctrpsaefcpfldbc sn   ", 19, j);
-       prt("siwdcci clioheatcliooeialoshtncd", 20, j);
-       prt("tnieohd ierlrfraierliatrnnnrhehi", 21, j);
-       prt("rtsxnae.dcedwlatdcedsrekdfddrxss", 22, j);
+       prt("      reaefctrpsaefcpfldbc sn   ", 19, j);
+       prt("siwdcciaclioheatcliooeialoshtncd", 20, j);
+       prt("tnieohdsierlrfraierliatrnnnrhehi", 21, j);
+       prt("rtsxnaeydcedwlatdcedsrekdfddrxss", 22, j);
        prt_binary(flgs[1], 23, j);
 
        prt("+------------FLAGS3------------+", 10, j+32);

diff --git a/src/xtra1.c b/src/xtra1.c
index f9dac2d..13d77ef 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3971,7 +3971,7 @@ void calc_bonuses(void)
                if (o_ptr->name2 == EGO_2WEAPON) easy_2weapon = TRUE;
                if (o_ptr->name2 == EGO_RING_RES_TIME) p_ptr->resist_time = TRUE;
                if (o_ptr->name2 == EGO_RING_THROW) p_ptr->mighty_throw = TRUE;
-               if (o_ptr->name2 == EGO_RING_WIZARD) p_ptr->easy_spell = TRUE;
+               if (have_flag(flgs, TR_EASY_SPELL)) p_ptr->easy_spell = TRUE;
                if (o_ptr->name2 == EGO_AMU_FOOL) p_ptr->heavy_spell = TRUE;
                if (o_ptr->name2 == EGO_AMU_NAIVETY) down_saving = TRUE;