Save damages dealt by player for each monster. (Do not use yet)

[hengband/hengband.git] / src / mspells1.c

diff --git a/src/mspells1.c b/src/mspells1.c
index 196c4ea..1b2ab43 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -484,7 +484,8 @@ bool clean_shot(int y1, int x1, int y2, int x2, bool friend)
  */
 static void bolt(int m_idx, int typ, int dam_hp, int monspell, bool learnable)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_PLAYER | PROJECT_REFLECTABLE;
+       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_PLAYER;
+       if (typ != GF_ARROW) flg  |= PROJECT_REFLECTABLE;
 
        /* Target the player with a bolt attack */
        (void)project(m_idx, 0, py, px, dam_hp, typ, flg, (learnable ? monspell : -1));
@@ -1310,6 +1311,7 @@ bool make_attack_spell(int m_idx)
        u32b mode = 0L;
        int s_num_6 = (easy_band ? 2 : 6);
        int s_num_4 = (easy_band ? 1 : 4);
+       int rad = 0; //For elemental spells
 
        /* Target location */
        int x = px;
@@ -1667,7 +1669,7 @@ bool make_attack_spell(int m_idx)
        if (!spell_is_inate(thrown_spell)
            && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2)) || (randint0(100) < failrate)))
        {
-               disturb(1, 0);
+               disturb(1, 1);
                /* Message */
 #ifdef JP
                msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
@@ -1678,6 +1680,17 @@ bool make_attack_spell(int m_idx)
                return (TRUE);
        }
 
+       /* Hex: Anti Magic Barrier */
+       if (!spell_is_inate(thrown_spell) && magic_barrier(m_idx))
+       {
+#ifdef JP
+               msg_format("È¿ËâË¡¥Ð¥ê¥¢¤¬%^s¤Î¼öʸ¤ò¤«¤­¾Ã¤·¤¿¡£", m_name);
+#else
+               msg_format("Anti magic barrier cancels the spell which %^s casts.");
+#endif
+               return (TRUE);
+       }
+
        /* Projectable? */
        direct = player_bold(y, x);
 
@@ -1689,7 +1702,7 @@ bool make_attack_spell(int m_idx)
                /* RF4_SHRIEK */
                case 96+0:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬¤«¤ó¹â¤¤¶âÀÚ¤êÀ¼¤ò¤¢¤²¤¿¡£", m_name);
 #else
@@ -1711,7 +1724,7 @@ msg_format("%^s
                case 96+2:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
                        else msg_format("%^s¤¬ËâÎϾõî¤Î¼öʸ¤òÇ°¤¸¤¿¡£", m_name);
@@ -1733,7 +1746,7 @@ msg_format("%^s
                /* RF4_ROCKET */
                case 96+3:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¼Í¤Ã¤¿¡£", m_name);
 #else
@@ -1757,7 +1770,7 @@ else msg_format("%^s
                case 96+4:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬´ñ̯¤Ê²»¤òȯ¤·¤¿¡£", m_name);
 #else
@@ -1800,7 +1813,7 @@ else msg_format("%^s
                /* RF4_BR_ACID */
                case 96+8:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1822,7 +1835,7 @@ else msg_format("%^s
                /* RF4_BR_ELEC */
                case 96+9:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1844,7 +1857,7 @@ else msg_format("%^s
                /* RF4_BR_FIRE */
                case 96+10:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1866,7 +1879,7 @@ else msg_format("%^s
                /* RF4_BR_COLD */
                case 96+11:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1888,7 +1901,7 @@ else msg_format("%^s
                /* RF4_BR_POIS */
                case 96+12:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1911,7 +1924,7 @@ else msg_format("%^s
                /* RF4_BR_NETH */
                case 96+13:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1933,7 +1946,7 @@ else msg_format("%^s
                /* RF4_BR_LITE */
                case 96+14:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1955,7 +1968,7 @@ else msg_format("%^s
                /* RF4_BR_DARK */
                case 96+15:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1977,7 +1990,7 @@ else msg_format("%^s
                /* RF4_BR_CONF */
                case 96+16:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1999,7 +2012,7 @@ else msg_format("%^s
                /* RF4_BR_SOUN */
                case 96+17:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (m_ptr->r_idx == MON_JAIAN)
 #ifdef JP
                                msg_format("¡Ö¥Ü¥©¥¨¡Á¡Á¡Á¡Á¡Á¡Á¡×");
@@ -2027,7 +2040,7 @@ else msg_format("%^s
                /* RF4_BR_CHAO */
                case 96+18:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2049,7 +2062,7 @@ else msg_format("%^s
                /* RF4_BR_DISE */
                case 96+19:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2071,7 +2084,7 @@ else msg_format("%^s
                /* RF4_BR_NEXU */
                case 96+20:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2093,7 +2106,7 @@ else msg_format("%^s
                /* RF4_BR_TIME */
                case 96+21:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2114,7 +2127,7 @@ else msg_format("%^s
                /* RF4_BR_INER */
                case 96+22:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2135,7 +2148,7 @@ else msg_format("%^s
                /* RF4_BR_GRAV */
                case 96+23:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2156,7 +2169,7 @@ else msg_format("%^s
                /* RF4_BR_SHAR */
                case 96+24:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (m_ptr->r_idx == MON_BOTEI)
 #ifdef JP
                                msg_format("¡Ö¥ÜÄë¥Ó¥ë¥«¥Ã¥¿¡¼¡ª¡ª¡ª¡×");
@@ -2184,7 +2197,7 @@ else msg_format("%^s
                /* RF4_BR_PLAS */
                case 96+25:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2205,7 +2218,7 @@ else msg_format("%^s
                /* RF4_BR_WALL */
                case 96+26:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2226,7 +2239,7 @@ else msg_format("%^s
                /* RF4_BR_MANA */
                case 96+27:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2246,7 +2259,7 @@ else msg_format("%^s
                /* RF4_BA_NUKE */
                case 96+28:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2268,7 +2281,7 @@ else msg_format("%^s
                /* RF4_BR_NUKE */
                case 96+29:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2290,7 +2303,7 @@ else msg_format("%^s
                /* RF4_BA_CHAO */
                case 96+30:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬¶²¤í¤·¤²¤Ë¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2312,7 +2325,7 @@ else msg_format("%^s
                /* RF4_BR_DISI */
                case 96+31:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2335,21 +2348,25 @@ else msg_format("%^s
                /* RF5_BA_ACID */
                case 128+0:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
-if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       else msg_format("%^s¤¬¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
                        if (blind) msg_format("%^s mumbles.", m_name);
-#endif
-
-#ifdef JP
-else msg_format("%^s¤¬¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
                        else msg_format("%^s casts an acid ball.", m_name);
 #endif
-
-                       dam = (randint1(rlev * 3) + 15) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-                       breath(y, x, m_idx, GF_ACID, dam, 2, FALSE, MS_BALL_ACID, learnable);
+                       if (r_ptr->flags2 & RF2_POWERFUL)
+                       {
+                               rad = 4;
+                               dam = (rlev * 4) + 50 + damroll(10, 10);
+                       }
+                       else
+                       {
+                               rad = 2;
+                               dam = (randint1(rlev * 3) + 15);
+                       }
+                       breath(y, x, m_idx, GF_ACID, dam, rad, FALSE, MS_BALL_ACID, learnable);
                        update_smart_learn(m_idx, DRS_ACID);
                        break;
                }
@@ -2357,21 +2374,26 @@ else msg_format("%^s
                /* RF5_BA_ELEC */
                case 128+1:
                {
-                       disturb(1, 0);
+                       int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
+                       disturb(1, 1);
 #ifdef JP
-if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       else msg_format("%^s¤¬¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
                        if (blind) msg_format("%^s mumbles.", m_name);
-#endif
-
-#ifdef JP
-else msg_format("%^s¤¬¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
                        else msg_format("%^s casts a lightning ball.", m_name);
 #endif
-
-                       dam = (randint1(rlev * 3 / 2) + 8) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-                       breath(y, x, m_idx, GF_ELEC, dam, 2, FALSE, MS_BALL_ELEC, learnable);
+                       if (r_ptr->flags2 & RF2_POWERFUL)
+                       {
+                               rad = 4;
+                               dam = (rlev * 4) + 50 + damroll(10, 10);
+                       }
+                       else
+                       {
+                               rad = 2;
+                               dam = (randint1(rlev * 3 / 2) + 8);
+                       }
+                       breath(y, x, m_idx, GF_ELEC, dam, rad, FALSE, MS_BALL_ELEC, learnable);
                        update_smart_learn(m_idx, DRS_ELEC);
                        break;
                }
@@ -2379,7 +2401,8 @@ else msg_format("%^s
                /* RF5_BA_FIRE */
                case 128+2:
                {
-                       disturb(1, 0);
+                       int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
+                       disturb(1, 1);
 
                        if (m_ptr->r_idx == MON_ROLENTO)
                        {
@@ -2398,20 +2421,25 @@ else msg_format("%^s
                        else
                        {
 #ifdef JP
-if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                               if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                               else msg_format("%^s¤¬¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
                                if (blind) msg_format("%^s mumbles.", m_name);
-#endif
-
-#ifdef JP
-else msg_format("%^s¤¬¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
                                else msg_format("%^s casts a fire ball.", m_name);
 #endif
                        }
 
-                       dam = (randint1(rlev * 7 / 2) + 10) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-                       breath(y, x, m_idx, GF_FIRE, dam, 2, FALSE, MS_BALL_FIRE, learnable);
+                       if (r_ptr->flags2 & RF2_POWERFUL)
+                       {
+                               rad = 4;
+                               dam = (rlev * 4) + 50 + damroll(10, 10);
+                       }
+                       else
+                       {
+                               rad = 2;
+                               dam = (randint1(rlev * 7 / 2) + 10);
+                       }
+                       breath(y, x, m_idx, GF_FIRE, dam, rad, FALSE, MS_BALL_FIRE, learnable);
                        update_smart_learn(m_idx, DRS_FIRE);
                        break;
                }
@@ -2419,21 +2447,26 @@ else msg_format("%^s
                /* RF5_BA_COLD */
                case 128+3:
                {
-                       disturb(1, 0);
+                       int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
+                       disturb(1, 1);
 #ifdef JP
-if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       else msg_format("%^s¤¬¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
                        if (blind) msg_format("%^s mumbles.", m_name);
-#endif
-
-#ifdef JP
-else msg_format("%^s¤¬¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
                        else msg_format("%^s casts a frost ball.", m_name);
 #endif
-
-                       dam = (randint1(rlev * 3 / 2) + 10) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-                       breath(y, x, m_idx, GF_COLD, dam, 2, FALSE, MS_BALL_COLD, learnable);
+                       if (r_ptr->flags2 & RF2_POWERFUL)
+                       {
+                               rad = 4;
+                               dam = (rlev * 4) + 50 + damroll(10, 10);
+                       }
+                       else
+                       {
+                               rad = 2;
+                               dam = (randint1(rlev * 3 / 2) + 10);
+                       }
+                       breath(y, x, m_idx, GF_COLD, dam, rad, FALSE, MS_BALL_COLD, learnable);
                        update_smart_learn(m_idx, DRS_COLD);
                        break;
                }
@@ -2441,7 +2474,7 @@ else msg_format("%^s
                /* RF5_BA_POIS */
                case 128+4:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2463,7 +2496,7 @@ else msg_format("%^s
                /* RF5_BA_NETH */
                case 128+5:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2485,7 +2518,7 @@ else msg_format("%^s
                /* RF5_BA_WATE */
                case 128+6:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2512,7 +2545,7 @@ msg_print("
                /* RF5_BA_MANA */
                case 128+7:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2533,7 +2566,7 @@ else msg_format("%^s
                /* RF5_BA_DARK */
                case 128+8:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2556,7 +2589,7 @@ else msg_format("%^s
                case 128+9:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        dam = (randint1(rlev) / 2) + 1;
                        breath(y, x, m_idx, GF_DRAIN_MANA, dam, 0, FALSE, MS_DRAIN_MANA, learnable);
@@ -2568,7 +2601,7 @@ else msg_format("%^s
                case 128+10:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (!seen)
                        {
 #ifdef JP
@@ -2597,7 +2630,7 @@ msg_format("%^s
                case 128+11:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (!seen)
                        {
 #ifdef JP
@@ -2626,7 +2659,7 @@ msg_format("%^s
                case 128+12:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2648,7 +2681,7 @@ else msg_format("%^s
                case 128+13:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2670,7 +2703,7 @@ else msg_format("%^s
                case 128+14:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤òÂçÀ¼¤Ç¶«¤ó¤À¡£", m_name);
 #else
@@ -2692,7 +2725,7 @@ else msg_format("%^s
                case 128+15:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", m_name);
 #else
@@ -2714,7 +2747,7 @@ else msg_format("%^s
                case 128+16:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2738,7 +2771,7 @@ else msg_format("%^s
                case 128+17:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2762,7 +2795,7 @@ else msg_format("%^s
                case 128+18:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2786,7 +2819,7 @@ else msg_format("%^s
                case 128+19:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2809,7 +2842,7 @@ else msg_format("%^s
                /* RF5_BA_LITE */
                case 128+20:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2832,7 +2865,7 @@ else msg_format("%^s
                case 128+21:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2856,7 +2889,7 @@ else msg_format("%^s
                case 128+22:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2879,7 +2912,7 @@ else msg_format("%^s
                case 128+23:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2902,7 +2935,7 @@ else msg_format("%^s
                case 128+24:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2925,7 +2958,7 @@ else msg_format("%^s
                case 128+25:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2949,7 +2982,7 @@ else msg_format("%^s
                case 128+26:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2972,7 +3005,7 @@ else msg_format("%^s
                case 128+27:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¯¤È¡¢¶²¤í¤·¤²¤Ê²»¤¬Ê¹¤³¤¨¤¿¡£", m_name);
 #else
@@ -3016,7 +3049,7 @@ msg_print("
                case 128+28:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3060,7 +3093,7 @@ msg_print("
                case 128+29:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¯¤È¡¢Æ¬¤òǺ¤Þ¤¹²»¤¬¤·¤¿¡£", m_name);
 #else
@@ -3104,7 +3137,7 @@ msg_print("
                case 128+30:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬¤¢¤Ê¤¿¤Î¶ÚÎϤòµÛ¤¤¼è¤í¤¦¤È¤·¤¿¡ª", m_name);
 #else
@@ -3142,7 +3175,7 @@ msg_print("
                case 128+31:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3185,7 +3218,7 @@ msg_format("
                /* RF6_HASTE */
                case 160+0:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (blind)
                        {
 #ifdef JP
@@ -3221,7 +3254,7 @@ msg_format("%^s
                case 160+1:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬<ÇËÌǤμê>¤òÊü¤Ã¤¿¡ª", m_name);
 #else
@@ -3235,7 +3268,7 @@ msg_format("%^s
                /* RF6_HEAL */
                case 160+2:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        /* Message */
                        if (blind)
@@ -3334,7 +3367,7 @@ msg_format("%^s
                /* RF6_INVULNER */
                case 160+3:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        /* Message */
                        if (!seen)
@@ -3363,29 +3396,49 @@ msg_format("%s
                /* RF6_BLINK */
                case 160+4:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
+                       if (teleport_barrier(m_idx))
+                       {
 #ifdef JP
-msg_format("%^s¤¬½Ö»þ¤Ë¾Ã¤¨¤¿¡£", m_name);
+                               msg_format("ËâË¡¤Î¥Ð¥ê¥¢¤¬%^s¤Î¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤷¤¿¡£", m_name);
 #else
-                       msg_format("%^s blinks away.", m_name);
+                               msg_format("Magic barrier obstructs teleporting of %^s.", m_name);
 #endif
-
-                       teleport_away(m_idx, 10, 0L);
-                       p_ptr->update |= (PU_MONSTERS);
+                       }
+                       else
+                       {
+#ifdef JP
+                               msg_format("%^s¤¬½Ö»þ¤Ë¾Ã¤¨¤¿¡£", m_name);
+#else
+                               msg_format("%^s blinks away.", m_name);
+#endif
+                               teleport_away(m_idx, 10, 0L);
+                               p_ptr->update |= (PU_MONSTERS);
+                       }
                        break;
                }
 
                /* RF6_TPORT */
                case 160+5:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
+                       if (teleport_barrier(m_idx))
+                       {
 #ifdef JP
-                       msg_format("%^s¤¬¥Æ¥ì¥Ý¡¼¥È¤·¤¿¡£", m_name);
+                               msg_format("ËâË¡¤Î¥Ð¥ê¥¢¤¬%^s¤Î¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤷¤¿¡£", m_name);
 #else
-                       msg_format("%^s teleports away.", m_name);
+                               msg_format("Magic barrier obstructs teleporting of %^s.", m_name);
 #endif
-
-                       teleport_away_followable(m_idx);
+                       }
+                       else
+                       {
+#ifdef JP
+                               msg_format("%^s¤¬¥Æ¥ì¥Ý¡¼¥È¤·¤¿¡£", m_name);
+#else
+                               msg_format("%^s teleports away.", m_name);
+#endif
+                               teleport_away_followable(m_idx);
+                       }
                        break;
                }
 
@@ -3393,7 +3446,7 @@ msg_format("%^s
                case 160+6:
                {
                        int who = 0;
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if(m_ptr->r_idx == MON_DIO) who = 1;
                        else if(m_ptr->r_idx == MON_WONG) who = 3;
                        dam = who;
@@ -3406,7 +3459,7 @@ msg_format("%^s
                {
                        int k;
 
-                       disturb(1, 0);
+                       disturb(1, 1);
                        switch (m_ptr->r_idx)
                        {
                        case MON_OHMU:
@@ -3501,7 +3554,7 @@ msg_format("%^s
                        default:
                                if (r_ptr->d_char == 'B')
                                {
-                                       disturb(1, 0);
+                                       disturb(1, 1);
                                        if (one_in_(3) || !direct)
                                        {
 #ifdef JP
@@ -3580,7 +3633,7 @@ msg_format("%^s
                case 160+8:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬¤¢¤Ê¤¿¤ò°ú¤­Ìᤷ¤¿¡£", m_name);
 #else
@@ -3596,7 +3649,7 @@ msg_format("%^s
                case 160+9:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤Ë¥Æ¥ì¥Ý¡¼¥È¤µ¤»¤é¤ì¤¿¡£", m_name);
                        if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON))
@@ -3614,7 +3667,7 @@ msg_format("%^s
                case 160+10:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«´ñ̯¤Ê¸ÀÍÕ¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3658,7 +3711,7 @@ msg_print("
                case 160+11:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3680,7 +3733,7 @@ else msg_format("%^s
                case 160+12:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3707,7 +3760,7 @@ else msg_format("%^s
                /* RF6_TRAPS */
                case 160+13:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤Æ¼Ù°­¤ËÈù¾Ð¤ó¤À¡£", m_name);
 #else
@@ -3729,7 +3782,7 @@ else msg_format("%^s
                case 160+14:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬¤¢¤Ê¤¿¤Îµ­²±¤ò¾Ãµî¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¡£", m_name);
 #else
@@ -3762,7 +3815,7 @@ msg_print("
                /* RF6_RAISE_DEAD */
                case 160+15:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3781,7 +3834,7 @@ else msg_format("%^s
                /* RF6_S_KIN */
                case 160+16:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
                        {
 #ifdef JP
@@ -3904,7 +3957,7 @@ else msg_format("%^s
                /* RF6_S_CYBER */
                case 160+17:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3930,7 +3983,7 @@ if (blind && count) msg_print("
                /* RF6_S_MONSTER */
                case 160+18:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3959,7 +4012,7 @@ if (blind && count) msg_print("
                /* RF6_S_MONSTERS */
                case 160+19:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3988,7 +4041,7 @@ if (blind && count) msg_print("¿
                /* RF6_S_ANT */
                case 160+20:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4017,7 +4070,7 @@ if (blind && count) msg_print("¿
                /* RF6_S_SPIDER */
                case 160+21:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4046,7 +4099,7 @@ if (blind && count) msg_print("¿
                /* RF6_S_HOUND */
                case 160+22:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4075,7 +4128,7 @@ if (blind && count) msg_print("¿
                /* RF6_S_HYDRA */
                case 160+23:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4106,7 +4159,7 @@ if (blind && count) msg_print("¿
                {
                        int num = 1;
 
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4152,7 +4205,7 @@ if (blind) msg_print("¿
                /* RF6_S_DEMON */
                case 160+25:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4181,7 +4234,7 @@ if (blind && count) msg_print("
                /* RF6_S_UNDEAD */
                case 160+26:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4210,7 +4263,7 @@ if (blind && count) msg_print("
                /* RF6_S_DRAGON */
                case 160+27:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4239,7 +4292,7 @@ if (blind && count) msg_print("
                /* RF6_S_HI_UNDEAD */
                case 160+28:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        if (((m_ptr->r_idx == MON_MORGOTH) || (m_ptr->r_idx == MON_SAURON) || (m_ptr->r_idx == MON_ANGMAR)) && ((r_info[MON_NAZGUL].cur_num+2) < r_info[MON_NAZGUL].max_num))
                        {
@@ -4334,7 +4387,7 @@ msg_print("
                /* RF6_S_HI_DRAGON */
                case 160+29:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4366,7 +4419,7 @@ msg_print("¿
                /* RF6_S_AMBERITES */
                case 160+30:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4400,7 +4453,10 @@ msg_print("
                /* RF6_S_UNIQUE */
                case 160+31:
                {
-                       disturb(1, 0);
+                       bool uniques_are_summoned = FALSE;
+                       int non_unique_type = SUMMON_HI_UNDEAD;
+
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4417,28 +4473,26 @@ else msg_format("%^s
                        {
                                count += summon_specific(m_idx, y, x, rlev, SUMMON_UNIQUE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
                        }
-                       if (r_ptr->flags3 & RF3_GOOD)
-                       {
-                               for (k = count; k < s_num_4; k++)
-                               {
-                                       count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
-                               }
-                       }
-                       else
+
+                       if (count) uniques_are_summoned = TRUE;
+
+                       if ((m_ptr->sub_align & (SUB_ALIGN_GOOD | SUB_ALIGN_EVIL)) == (SUB_ALIGN_GOOD | SUB_ALIGN_EVIL))
+                               non_unique_type = 0;
+                       else if (m_ptr->sub_align & SUB_ALIGN_GOOD)
+                               non_unique_type = SUMMON_ANGEL;
+
+                       for (k = count; k < s_num_4; k++)
                        {
-                               for (k = count; k < s_num_4; k++)
-                               {
-                                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
-                               }
+                               count += summon_specific(m_idx, y, x, rlev, non_unique_type, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
                        }
+
                        if (blind && count)
                        {
 #ifdef JP
-msg_print("¿¤¯¤ÎÎ϶¯¤¤¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬Ê¹¤³¤¨¤ë¡£");
+                               msg_format("¿¤¯¤Î%s¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬Ê¹¤³¤¨¤ë¡£", uniques_are_summoned ? "Î϶¯¤¤¤â¤Î" : "¤â¤Î");
 #else
-                               msg_print("You hear many powerful things appear nearby.");
+                               msg_format("You hear many %s appear nearby.", uniques_are_summoned ? "powerful things" : "things");
 #endif
-
                        }
                        break;
                }
@@ -4468,7 +4522,7 @@ msg_print("¿
                        p_ptr->mane_num++;
                        new_mane = TRUE;
 
-                       p_ptr->redraw |= (PR_MANE);
+                       p_ptr->redraw |= (PR_IMITATION);
                }
        }