気を練ると攻撃力アップ

幽霊のペナアップ

diff --git a/lib/file/monfear_j.txt b/lib/file/monfear_j.txt
index 201d0ff..fb2b3d6 100644 (file)
--- a/lib/file/monfear_j.txt
+++ b/lib/file/monfear_j.txt
@@ -550,20 +550,19 @@ N:1018:Raou the Conqueror
 ¡Ö¤Ê¤ó¤È¡¢¤³¤Î¥é¥ª¥¦¤ÎƬ¾å¤Ë»àÃûÀ±¤¬¡ª¡×
 
 N:1029:Baby satan
-13
-¤Ï¥Æ¥ì¥Ý¡¼¥È¤·¤¿¡£
-¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£
-¤¬¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª
-¤¬ËâË¡¤ÇÆÃÊ̤ʶ¯Å¨¤ò¾¤´­¤·¤¿¡ª
-¤¬ËâÎϤÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£
-¤¬°Å¹õ¤ÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£
-¤¬¥¹¥¿¡¼¥Ð¡¼¥¹¥È¤Î¼öʸ¤òÇ°¤¸¤¿¡£
-¤¬¸÷¤Î·õ¤òÊü¤Ã¤¿¡£
-¤¬ÇËÌǤμê¤òÊü¤Ã¤¿¡ª
-¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£
-¤¬¼«Ê¬¤Î½ý¤Ë½¸Ã椷¤¿¡£
-¤¬¥¢¥ó¥Ð¡¼¤Î²¦¤ò¾¤´­¤·¤¿¡ª
-¡Ö¡Ø¥¶¡¦¥ï¡¼¥ë¥É¡Ù¡ª»þ¤Ï»ß¤Þ¤Ã¤¿¡ª¡×
+12
+¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬ËâË¡¤ÇÆÃÊ̤ʶ¯Å¨¤ò¾¤´­¤·¤¿¡ª¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬ËâÎϤÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬°Å¹õ¤ÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬¥¹¥¿¡¼¥Ð¡¼¥¹¥È¤Î¼öʸ¤òÇ°¤¸¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬¸÷¤Î·õ¤òÊü¤Ã¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬ÇËÌǤμê¤òÊü¤Ã¤¿¡ª¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬¼«Ê¬¤Î½ý¤Ë½¸Ã椷¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬¥¢¥ó¥Ð¡¼¤Î²¦¤ò¾¤´­¤·¤¿¡ª¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¡Ö¡Ø¥¶¡¦¥ï¡¼¥ë¥É¡Ù¡ª»þ¤Ï»ß¤Þ¤Ã¤¿¡ª¡×¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
 
 
 N:*:Default lines

diff --git a/lib/file/monspeak_j.txt b/lib/file/monspeak_j.txt
index 1a987f3..3418c9b 100644 (file)
--- a/lib/file/monspeak_j.txt
+++ b/lib/file/monspeak_j.txt
@@ -1001,16 +1001,16 @@ N:1018:Raou the Conqueror
 
 N:1029:Baby satan
 10
-¤¬¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª
-¤¬ËâË¡¤ÇÆÃÊ̤ʶ¯Å¨¤ò¾¤´­¤·¤¿¡ª
-¤¬ËâÎϤÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£
-¤¬°Å¹õ¤ÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£
-¤¬¥¹¥¿¡¼¥Ð¡¼¥¹¥È¤Î¼öʸ¤òÇ°¤¸¤¿¡£
-¤¬¸÷¤Î·õ¤òÊü¤Ã¤¿¡£
-¤¬ÇËÌǤμê¤òÊü¤Ã¤¿¡ª
-¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£
-¤¬¥¢¥ó¥Ð¡¼¤Î²¦¤ò¾¤´­¤·¤¿¡ª
-¡Ö¡Ø¥¶¡¦¥ï¡¼¥ë¥É¡Ù¡ª»þ¤Ï»ß¤Þ¤Ã¤¿¡ª¡×
+¤¬¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬ËâË¡¤ÇÆÃÊ̤ʶ¯Å¨¤ò¾¤´­¤·¤¿¡ª¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬ËâÎϤÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬°Å¹õ¤ÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬¥¹¥¿¡¼¥Ð¡¼¥¹¥È¤Î¼öʸ¤òÇ°¤¸¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬¸÷¤Î·õ¤òÊü¤Ã¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬ÇËÌǤμê¤òÊü¤Ã¤¿¡ª¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¤¬¥¢¥ó¥Ð¡¼¤Î²¦¤ò¾¤´­¤·¤¿¡ª¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
+¡Ö¡Ø¥¶¡¦¥ï¡¼¥ë¥É¡Ù¡ª»þ¤Ï»ß¤Þ¤Ã¤¿¡ª¡×¤·¤«¤·MP¤¬Â­¤é¤Ê¤¤¡ª
 
 N:1063:lousy, the King of louses
 4

diff --git a/src/cmd1.c b/src/cmd1.c
index 3d03b0c..c19bf2d 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -2665,6 +2665,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
                                int min_level = 1;
                                martial_arts *ma_ptr = &ma_blows[0], *old_ptr = &ma_blows[0];
                                int resist_stun = 0;
+                               int weight = 8;
 
                                if (r_ptr->flags1 & RF1_UNIQUE) resist_stun += 88;
                                if (r_ptr->flags3 & RF3_NO_STUN) resist_stun += 66;
@@ -2762,7 +2763,14 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
                                        msg_format(ma_ptr->desc, m_name);
                                }
 
-                               k = critical_norm(p_ptr->lev * randint1((p_ptr->special_defense & KAMAE_SUZAKU) ? 5 : 10), min_level, k, p_ptr->to_h[0], 0);
+                               if (p_ptr->special_defense & KAMAE_SUZAKU) weight = 4;
+                               if ((p_ptr->pclass == CLASS_FORCETRAINER) && (p_ptr->magic_num1[0]))
+                               {
+                                       weight += (p_ptr->magic_num1[0]/30);
+                                       if (weight > 20) weight = 20;
+                               }
+
+                               k = critical_norm(p_ptr->lev * weight, min_level, k, p_ptr->to_h[0], 0);
 
                                if ((special_effect == MA_KNEE) && ((k + p_ptr->to_d[hand]) < m_ptr->hp))
                                {

diff --git a/src/dungeon.c b/src/dungeon.c
index b587bf3..ea5784b 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -5051,6 +5051,7 @@ msg_format("%^s
                        p_ptr->magic_num1[0] = 0;
                }
                else p_ptr->magic_num1[0] -= 40;
+               p_ptr->update |= (PU_BONUS);
        }
        if (p_ptr->action == ACTION_LEARN)
        {

diff --git a/src/mind.c b/src/mind.c
index 4b48357..f0f5af9 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -1078,6 +1078,7 @@ static bool cast_force_spell(int spell)
                msg_print("You improved the Force.");
 #endif
                p_ptr->magic_num1[0] += (70 + plev);
+               p_ptr->update |= (PU_BONUS);
                if (randint1(p_ptr->magic_num1[0]) > (plev * 4 + 120))
                {
 #ifdef JP
@@ -1251,6 +1252,7 @@ msg_print("
 
        }
        p_ptr->magic_num1[0] = 0;
+       p_ptr->update |= (PU_BONUS);
 
        return TRUE;
 }

diff --git a/src/object2.c b/src/object2.c
index 3a4e129..4f672dd 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -6846,7 +6846,7 @@ static void drain_essence(void)
        }
        if (old_name2 == EGO_2WEAPON)
        {
-               drain_value[ESSENCE_DEX] += 20;
+               drain_value[ESSENCE_DEX-1] += 20;
        }
        if ((o_ptr->tval >= TV_SHOT) && (o_ptr->tval <= TV_SWORD) && (o_ptr->tval != TV_BOW))
        {

diff --git a/src/tables.c b/src/tables.c
index cc422f1..17c16e0 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -3218,7 +3218,7 @@ player_race race_info[MAX_RACES] =
 
                { -5, 4, -1, 2, 0, -3 },
                10, 15, 12, 5, 5, 14, -15, -5,
-               7, 180,
+               7, 210,
                100, 30,
                72, 6, 100, 25,
                66, 4, 100, 20,

diff --git a/src/xtra1.c b/src/xtra1.c
index ae160f8..08f52b9 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3729,6 +3729,13 @@ void calc_bonuses(void)
                p_ptr->to_a += 100;
                p_ptr->dis_to_a += 100;
        }
+       /* Temporary shield */
+       else if (p_ptr->tsubureru || p_ptr->shield || p_ptr->magicdef)
+       {
+               p_ptr->to_a += 50;
+               p_ptr->dis_to_a += 50;
+       }
+
        if (p_ptr->tim_res_nether)
        {
                p_ptr->resist_neth = TRUE;
@@ -4386,12 +4393,6 @@ void calc_bonuses(void)
                p_ptr->dis_to_h_b += 10;
        }
 
-       /* Temporary shield */
-       if (p_ptr->tsubureru || p_ptr->shield || p_ptr->magicdef)
-       {
-               p_ptr->to_a += 50;
-               p_ptr->dis_to_a += 50;
-       }
        if (p_ptr->magicdef)
        {
                p_ptr->resist_blind = TRUE;
@@ -5019,6 +5020,11 @@ void calc_bonuses(void)
                        if (blow_base > 31) p_ptr->num_blow[0]++;
                        if (blow_base > 44) p_ptr->num_blow[0]++;
                        if (blow_base > 58) p_ptr->num_blow[0]++;
+                       if (p_ptr->magic_num1[0])
+                       {
+                               p_ptr->to_d[0] += (p_ptr->magic_num1[0]/5);
+                               p_ptr->dis_to_d[0] += (p_ptr->magic_num1[0]/5);
+                       }
                }
                else
                {