OSDN Git Service

refactor: remove learnable from arguments
[hengband/hengband.git] / src / mspells2.c
index 1014a1b..aba7e39 100644 (file)
@@ -1,26 +1,39 @@
-/* File: mspells2.c */
-
-/*
- * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
- *
- * This software may be copied and distributed for educational, research,
- * and not for profit purposes provided that this copyright and statement
- * are included in all such copies.  Other copyrights may also apply.
+/*!
+ * @file mspells2.c
+ * @brief ¥â¥ó¥¹¥¿¡¼ËâË¡¤Î¼ÂÁõ(ÂÐ¥â¥ó¥¹¥¿¡¼½èÍý) / Monster spells (attack monster)
+ * @date 2014/01/17
+ * @author
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke\n
+ * This software may be copied and distributed for educational, research,\n
+ * and not for profit purposes provided that this copyright and statement\n
+ * are included in all such copies.  Other copyrights may also apply.\n
+ * 2014 Deskull rearranged comment for Doxygen.\n
+ * @details
  */
 
-/* Purpose: Monster spells (attack monster) */
-
 #include "angband.h"
 
 
-/*
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬Å¨ÂÐ¥â¥ó¥¹¥¿¡¼¤Ë¥Ö¥ì¥¹/¥Ü¡¼¥ë·¿Æü쵻ǽ¤òÊü¤Ä½èÍý /
  * Monster casts a breath (or ball) attack at another monster.
+ * @param m_idx Æü쵻ǽ¤ò»È¤¦¥â¥ó¥¹¥¿¡¼¤Î»²¾ÈID
+ * @param y ÌÜɸ¤ÎYºÂɸ
+ * @param x ÌÜɸ¤ÎXºÂɸ
+ * @param typ ¸ú²Ì°À­¤ÎID
+ * @param dam_hp °ÒÎÏ
+ * @param rad È¾·Â
+ * @param breath TRUE¤Ê¤é¤Ð¥Ö¥ì¥¹ / FALSE¤Ê¤é¤Ð¥Ü¡¼¥ë
+ * @param monspell Æü칶·â¤ÎID
+ * @return ¤Ê¤·
+ * @details
  * Pass over any monsters that may be in the way
  * Affect grids, objects, monsters, and the player
  */
-static void monst_breath_monst(int m_idx, int y, int x, int typ, int dam_hp, int rad, bool breath, int monspell, bool learnable)
+void monst_breath_monst(int m_idx, int y, int x, int typ, int dam_hp, int rad, bool breath, int monspell)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_MONSTER;
+       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+    bool learnable = spell_learnable(m_idx);
 
        monster_type *m_ptr = &m_list[m_idx];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
@@ -31,33 +44,81 @@ static void monst_breath_monst(int m_idx, int y, int x, int typ, int dam_hp, int
        /* Handle breath attacks */
        if (breath) rad = 0 - rad;
 
-       if (typ == GF_ROCKET) flg |= PROJECT_STOP;
+       switch (typ)
+       {
+       case GF_ROCKET:
+               flg |= PROJECT_STOP;
+               break;
+       case GF_DRAIN_MANA:
+       case GF_MIND_BLAST:
+       case GF_BRAIN_SMASH:
+       case GF_CAUSE_1:
+       case GF_CAUSE_2:
+       case GF_CAUSE_3:
+       case GF_CAUSE_4:
+       case GF_HAND_DOOM:
+               flg |= (PROJECT_HIDE | PROJECT_AIMED);
+               break;
+       }
 
        (void)project(m_idx, rad, y, x, dam_hp, typ, flg, (learnable ? monspell : -1));
 }
 
 
-/*
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬Å¨ÂÐ¥â¥ó¥¹¥¿¡¼¤Ë¥Ü¥ë¥È·¿Æü쵻ǽ¤òÊü¤Ä½èÍý /
  * Monster casts a bolt at another monster
+ * @param m_idx Æü쵻ǽ¤ò»È¤¦¥â¥ó¥¹¥¿¡¼¤Î»²¾ÈID
+ * @param y ÌÜɸ¤ÎYºÂɸ
+ * @param x ÌÜɸ¤ÎXºÂɸ
+ * @param typ ¸ú²Ì°À­¤ÎID
+ * @param dam_hp °ÒÎÏ
+ * @param monspell Æü칶·â¤ÎID
+ * @param learnable ¥é¡¼¥Ë¥ó¥°²Äǽ¤ÊÁ°Äó¤¬Â·¤Ã¤Æ¤¤¤ë¤Ê¤é¤ÐTRUE
+ * @return ¤Ê¤·
+ * @details
  * Stop if we hit a monster
  * Affect monsters and the player
  */
-static void monst_bolt_monst(int m_idx, int y, int x, int typ, int dam_hp, int monspell, bool learnable)
+static void monst_bolt_monst(int m_idx, int y, int x, int typ, int dam_hp, int monspell)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_MONSTER | PROJECT_REFLECTABLE;
+       int flg = PROJECT_STOP | PROJECT_KILL;
+    bool learnable = spell_learnable(m_idx);
 
+       if (typ != GF_ARROW) flg |= PROJECT_REFLECTABLE;
        (void)project(m_idx, 0, y, x, dam_hp, typ, flg, (learnable ? monspell : -1));
 }
 
-static void monst_beam_monst(int m_idx, int y, int x, int typ, int dam_hp, int monspell, bool learnable)
+
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬Å¨ÂÐ¥â¥ó¥¹¥¿¡¼¤Ë¥Ó¡¼¥à·¿Æü쵻ǽ¤òÊü¤Ä½èÍý /
+ * Monster casts a bolt at another monster
+ * @param m_idx Æü쵻ǽ¤ò»È¤¦¥â¥ó¥¹¥¿¡¼¤Î»²¾ÈID
+ * @param y ÌÜɸ¤ÎYºÂɸ
+ * @param x ÌÜɸ¤ÎXºÂɸ
+ * @param typ ¸ú²Ì°À­¤ÎID
+ * @param dam_hp °ÒÎÏ
+ * @param monspell Æü칶·â¤ÎID
+ * @param learnable ¥é¡¼¥Ë¥ó¥°²Äǽ¤ÊÁ°Äó¤¬Â·¤Ã¤Æ¤¤¤ë¤Ê¤é¤ÐTRUE
+ * @return ¤Ê¤·
+ */
+static void monst_beam_monst(int m_idx, int y, int x, int typ, int dam_hp, int monspell)
 {
-       int flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_THRU | PROJECT_MONSTER;
+       int flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_THRU;
+    bool learnable = spell_learnable(m_idx);
 
        (void)project(m_idx, 0, y, x, dam_hp, typ, flg, (learnable ? monspell : -1));
 }
 
-/*
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬Å¨ÂÐ¥â¥ó¥¹¥¿¡¼¤Ë¥Ó¡¼¥à¤òÅö¤Æ¤ë¤³¤È²Äǽ¤«¤òȽÄꤹ¤ë /
  * Determine if a beam spell will hit the target.
+ * @param y1 »ÏÅÀ¤ÎYºÂɸ
+ * @param x1 »ÏÅÀ¤ÎXºÂɸ
+ * @param y2 ÌÜɸ¤ÎYºÂɸ
+ * @param x2 ÌÜɸ¤ÎXºÂɸ
+ * @param m_ptr »ÈÍѤ¹¤ë¥â¥ó¥¹¥¿¡¼¤Î¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
+ * @return ¥Ó¡¼¥à¤¬Åþã²Äǽ¤Ê¤é¤ÐTRUE¤òÊÖ¤¹
  */
 static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
 {
@@ -67,7 +128,7 @@ static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
        int grid_n = 0;
        u16b grid_g[512];
 
-       bool friend = is_pet(m_ptr);
+       bool is_friend = is_pet(m_ptr);
 
        /* Check the projection path */
        grid_n = project_path(grid_g, MAX_RANGE, y1, x1, y2, x2, PROJECT_THRU);
@@ -82,14 +143,14 @@ static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
 
                if (y == y2 && x == x2)
                        hit2 = TRUE;
-               else if (friend && cave[y][x].m_idx > 0 &&
+               else if (is_friend && cave[y][x].m_idx > 0 &&
                         !are_enemies(m_ptr, &m_list[cave[y][x].m_idx]))
                {
                        /* Friends don't shoot friends */
                        return FALSE;
                }
 
-               if (friend && player_bold(y, x))
+               if (is_friend && player_bold(y, x))
                        return FALSE;
        }
        if (!hit2)
@@ -97,11 +158,27 @@ static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
        return TRUE;
 }
 
-static bool breath_direct(int y1, int x1, int y2, int x2, int rad, bool disint_ball, bool friend)
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬Å¨ÂÐ¥â¥ó¥¹¥¿¡¼¤ËľÀܥ֥쥹¤òÅö¤Æ¤ë¤³¤È¤¬²Äǽ¤«¤òȽÄꤹ¤ë /
+ * Determine if a breath will hit the target.
+ * @param y1 »ÏÅÀ¤ÎYºÂɸ
+ * @param x1 »ÏÅÀ¤ÎXºÂɸ
+ * @param y2 ÌÜɸ¤ÎYºÂɸ
+ * @param x2 ÌÜɸ¤ÎXºÂɸ
+ * @param rad È¾·Â
+ * @param typ ¸ú²Ì°À­ID
+ * @param is_friend TRUE¤Ê¤é¤Ð¡¢¥×¥ì¥¤¥ä¡¼¤ò´¬¤­¹þ¤à»þ¤Ë¥Ö¥ì¥¹¤ÎȽÄê¤òFALSE¤Ë¤¹¤ë¡£
+ * @return ¥Ö¥ì¥¹¤òľÀÜÅö¤Æ¤é¤ì¤ë¤Ê¤é¤ÐTRUE¤òÊÖ¤¹
+ */
+static bool breath_direct(int y1, int x1, int y2, int x2, int rad, int typ, bool is_friend)
 {
        /* Must be the same as projectable() */
 
-       int i, y, x;
+       int i;
+
+       /* Initial grid */
+       int y = y1;
+       int x = x1;
 
        int grid_n = 0;
        u16b grid_g[512];
@@ -114,55 +191,163 @@ static bool breath_direct(int y1, int x1, int y2, int x2, int rad, bool disint_b
        bool hit2 = FALSE;
        bool hityou = FALSE;
 
+       int flg;
+
+       switch (typ)
+       {
+       case GF_LITE:
+       case GF_LITE_WEAK:
+               flg = PROJECT_LOS;
+               break;
+       case GF_DISINTEGRATE:
+               flg = PROJECT_DISI;
+               break;
+       default:
+               flg = 0;
+               break;
+       }
+
        /* Check the projection path */
-       grid_n = project_path(grid_g, MAX_RANGE, y1, x1, y2, x2, disint_ball ? PROJECT_DISI : 0);
-       breath_shape(grid_g, grid_n, &grids, gx, gy, gm, &gm_rad, rad, y1, x1, y2, x2, disint_ball, FALSE);
+       grid_n = project_path(grid_g, MAX_RANGE, y1, x1, y2, x2, flg);
 
-       for (i = 0; i < grids; i++)
+       /* Project along the path */
+       for (i = 0; i < grid_n; ++i)
        {
-               /* Extract the location */
-               y = gy[i];
-               x = gx[i];
+               int ny = GRID_Y(grid_g[i]);
+               int nx = GRID_X(grid_g[i]);
 
-               if (y == y2 && x == x2)
-                       hit2 = TRUE;
-               if (player_bold(y, x))
-                       hityou = TRUE;
+               if (flg & PROJECT_DISI)
+               {
+                       /* Hack -- Balls explode before reaching walls */
+                       if (cave_stop_disintegration(ny, nx)) break;
+               }
+               else if (flg & PROJECT_LOS)
+               {
+                       /* Hack -- Balls explode before reaching walls */
+                       if (!cave_los_bold(ny, nx)) break;
+               }
+               else
+               {
+                       /* Hack -- Balls explode before reaching walls */
+                       if (!cave_have_flag_bold(ny, nx, FF_PROJECT)) break;
+               }
+
+               /* Save the "blast epicenter" */
+               y = ny;
+               x = nx;
        }
-       if (!hit2)
-               return FALSE;
-       if (friend && hityou)
-               return FALSE;
+
+       grid_n = i;
+
+       if (!grid_n)
+       {
+               if (flg & PROJECT_DISI)
+               {
+                       if (in_disintegration_range(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
+                       if (in_disintegration_range(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+               }
+               else if (flg & PROJECT_LOS)
+               {
+                       if (los(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
+                       if (los(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+               }
+               else
+               {
+                       if (projectable(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
+                       if (projectable(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+               }
+       }
+       else
+       {
+               breath_shape(grid_g, grid_n, &grids, gx, gy, gm, &gm_rad, rad, y1, x1, y, x, typ);
+
+               for (i = 0; i < grids; i++)
+               {
+                       /* Extract the location */
+                       y = gy[i];
+                       x = gx[i];
+
+                       if ((y == y2) && (x == x2)) hit2 = TRUE;
+                       if (player_bold(y, x)) hityou = TRUE;
+               }
+       }
+
+       if (!hit2) return FALSE;
+       if (is_friend && hityou) return FALSE;
+
        return TRUE;
 }
 
-/*
- * Get the actual center point of ball spells (originally from TOband)
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬ÆüìǽÎϤÎÌÜɸÃÏÅÀ¤ò·è¤á¤ë½èÍý /
+ * Get the actual center point of ball spells (rad > 1) (originally from TOband)
+ * @param sy »ÏÅÀ¤ÎYºÂɸ
+ * @param sx »ÏÅÀ¤ÎXºÂɸ
+ * @param ty ÌÜɸYºÂɸ¤òÊÖ¤¹»²¾È¥Ý¥¤¥ó¥¿
+ * @param tx ÌÜɸXºÂɸ¤òÊÖ¤¹»²¾È¥Ý¥¤¥ó¥¿
+ * @param flg È½Äê¤Î¥Õ¥é¥°ÇÛÎó
+ * @return ¤Ê¤·
  */
-static void get_project_point(int sy, int sx, int *ty, int *tx, int flg)
+void get_project_point(int sy, int sx, int *ty, int *tx, int flg)
 {
        u16b path_g[128];
-       int  path_n;
+       int  path_n, i;
 
        path_n = project_path(path_g, MAX_RANGE, sy, sx, *ty, *tx, flg);
 
-       if (path_n)
-       {
-               /* Use final point of projection */
-               *ty = GRID_Y(path_g[path_n - 1]);
-               *tx = GRID_X(path_g[path_n - 1]);
-       }
-       else
+       *ty = sy;
+       *tx = sx;
+
+       /* Project along the path */
+       for (i = 0; i < path_n; i++)
        {
+               sy = GRID_Y(path_g[i]);
+               sx = GRID_X(path_g[i]);
+
+               /* Hack -- Balls explode before reaching walls */
+               if (!cave_have_flag_bold(sy, sx, FF_PROJECT)) break;
+
                *ty = sy;
                *tx = sx;
        }
 }
 
-/*
- * Monster tries to 'cast a spell' (or breath, etc)
- * at another monster.
- *
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬Å¨¥â¥ó¥¹¥¿¡¼¤ËËâÎϾõî¤ò»È¤¦¤«¤É¤¦¤«¤òÊÖ¤¹ /
+ * Check should monster cast dispel spell at other monster.
+ * @param m_idx ½Ñ¼Ô¤Î¥â¥ó¥¹¥¿¡¼ID
+ * @param t_idx ÌÜɸ¤Î¥â¥ó¥¹¥¿¡¼ID
+ * @return ËâÎϾõî¤ò»È¤¦¤Ù¤­¤Ê¤é¤ÐTRUE¤òÊѤ¨¤¹¡£
+ */
+static bool dispel_check_monster(int m_idx, int t_idx)
+{
+       monster_type *t_ptr = &m_list[t_idx];
+
+       /* Invulnabilty */
+       if (MON_INVULNER(t_ptr)) return TRUE;
+
+       /* Speed */
+       if (t_ptr->mspeed < 135)
+       {
+               if (MON_FAST(t_ptr)) return TRUE;
+       }
+
+       /* Riding monster */
+       if (t_idx == p_ptr->riding)
+       {
+               if (dispel_check(m_idx)) return TRUE;
+       }
+
+       /* No need to cast dispel spell */
+       return FALSE;
+}
+
+/*!
+ * @brief ¥â¥ó¥¹¥¿¡¼¤¬Å¨¥â¥ó¥¹¥¿¡¼¤ËÆüìǽÎϤò»È¤¦½èÍý¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó /
+ * Monster tries to 'cast a spell' (or breath, etc) at another monster.
+ * @param m_idx ½Ñ¼Ô¤Î¥â¥ó¥¹¥¿¡¼ID
+ * @return ¼ÂºÝ¤ËÆüìǽÎϤò»È¤Ã¤¿¾ì¹çTRUE¤òÊÖ¤¹
+ * @details
  * The player is only disturbed if able to be affected by the spell.
  */
 bool monst_spell_monst(int m_idx)
@@ -174,9 +359,10 @@ bool monst_spell_monst(int m_idx)
        int dam = 0;
        int start;
        int plus = 1;
-       u32b p_mode = 0L, u_mode = 0L;
+       u32b u_mode = 0L;
        int s_num_6 = (easy_band ? 2 : 6);
        int s_num_4 = (easy_band ? 1 : 4);
+       int rad = 0; //For elemental balls
 
        byte spell[96], num = 0;
 
@@ -200,12 +386,10 @@ bool monst_spell_monst(int m_idx)
 
        bool blind = (p_ptr->blind ? TRUE : FALSE);
 
-       bool see_m = m_ptr->ml;
+       bool see_m = is_seen(m_ptr);
        bool maneable = player_has_los_bold(m_ptr->fy, m_ptr->fx);
-       bool learnable = (see_m && maneable && !world_monster);
        bool see_t;
        bool see_either;
-       bool see_both;
        bool known;
 
        bool pet = is_pet(m_ptr);
@@ -213,14 +397,17 @@ bool monst_spell_monst(int m_idx)
        bool in_no_magic_dungeon = (d_info[dungeon_type].flags1 & DF1_NO_MAGIC) && dun_level
                && (!p_ptr->inside_quest || is_fixed_quest_idx(p_ptr->inside_quest));
 
+       bool can_use_lite_area = FALSE;
+
+       bool can_remember;
+
        bool resists_tele = FALSE;
 
        /* Prepare flags for summoning */
-       if (pet) p_mode |= PM_FORCE_PET;
        if (!pet) u_mode |= PM_ALLOW_UNIQUE;
 
        /* Cannot cast spells when confused */
-       if (m_ptr->confused) return (FALSE);
+       if (MON_CONFUSED(m_ptr)) return (FALSE);
 
        /* Extract the racial spell flags */
        f4 = r_ptr->flags4;
@@ -234,7 +421,7 @@ bool monst_spell_monst(int m_idx)
                t_ptr = &m_list[t_idx];
 
                /* Cancel if not projectable (for now) */
-               if (!projectable(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx))
+               if ((m_idx == t_idx) || !projectable(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx))
                {
                        t_idx = 0;
                }
@@ -250,8 +437,8 @@ bool monst_spell_monst(int m_idx)
                        t_ptr = &m_list[t_idx];
 
                        /* Cancel if neither enemy nor a given target */
-                       if (t_idx != pet_t_m_idx &&
-                           !are_enemies(m_ptr, t_ptr))
+                       if ((m_idx == t_idx) ||
+                           ((t_idx != pet_t_m_idx) && !are_enemies(m_ptr, t_ptr)))
                        {
                                t_idx = 0;
                        }
@@ -291,7 +478,7 @@ bool monst_spell_monst(int m_idx)
                        if (!t_ptr->r_idx) continue;
 
                        /* Monster must be 'an enemy' */
-                       if (!are_enemies(m_ptr, t_ptr)) continue;
+                       if ((m_idx == t_idx) || !are_enemies(m_ptr, t_ptr)) continue;
 
                        /* Monster must be projectable */
                        if (!projectable(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx)) continue;
@@ -317,6 +504,38 @@ bool monst_spell_monst(int m_idx)
        /* Extract the monster level */
        rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
 
+       /* Remove unimplemented spells */
+       f6 &= ~(RF6_WORLD | RF6_TRAPS | RF6_FORGET);
+
+       if (f4 & RF4_BR_LITE)
+       {
+               if (!los(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx))
+                       f4 &= ~(RF4_BR_LITE);
+       }
+
+       /* Remove unimplemented special moves */
+       if (f6 & RF6_SPECIAL)
+       {
+               if ((m_ptr->r_idx != MON_ROLENTO) && (r_ptr->d_char != 'B'))
+                       f6 &= ~(RF6_SPECIAL);
+       }
+
+       if (f6 & RF6_DARKNESS)
+       {
+               bool vs_ninja = (p_ptr->pclass == CLASS_NINJA) && !is_hostile(t_ptr);
+
+               if (vs_ninja &&
+                   !(r_ptr->flags3 & (RF3_UNDEAD | RF3_HURT_LITE)) &&
+                   !(r_ptr->flags7 & RF7_DARK_MASK))
+                       can_use_lite_area = TRUE;
+
+               if (!(r_ptr->flags2 & RF2_STUPID))
+               {
+                       if (d_info[dungeon_type].flags1 & DF1_DARKNESS) f6 &= ~(RF6_DARKNESS);
+                       else if (vs_ninja && !can_use_lite_area) f6 &= ~(RF6_DARKNESS);
+               }
+       }
+
        if (in_no_magic_dungeon && !(r_ptr->flags2 & RF2_STUPID))
        {
                f4 &= (RF4_NOMAGIC_MASK);
@@ -328,7 +547,9 @@ bool monst_spell_monst(int m_idx)
        {
                f4 &= ~(RF4_SUMMON_MASK);
                f5 &= ~(RF5_SUMMON_MASK);
-               f6 &= ~(RF6_SUMMON_MASK);
+               f6 &= ~(RF6_SUMMON_MASK | RF6_TELE_LEVEL);
+
+               if (m_ptr->r_idx == MON_ROLENTO) f6 &= ~(RF6_SPECIAL);
        }
 
        if (p_ptr->inside_battle && !one_in_(3))
@@ -376,13 +597,13 @@ bool monst_spell_monst(int m_idx)
                        {
                                int real_y = y;
                                int real_x = x;
-                               int dist;
 
                                get_project_point(m_ptr->fy, m_ptr->fx, &real_y, &real_x, 0L);
-                               dist = distance(real_y, real_x, py, px);
 
-                               if (los(real_y, real_x, py, px))
+                               if (projectable(real_y, real_x, py, px))
                                {
+                                       int dist = distance(real_y, real_x, py, px);
+
                                        if (dist <= 2)
                                        {
                                                f4 &= ~(RF4_BALL_MASK & ~(RF4_ROCKET));
@@ -396,6 +617,11 @@ bool monst_spell_monst(int m_idx)
                                                f6 &= ~(RF6_BIG_BALL_MASK);
                                        }
                                }
+                               else if (f5 & RF5_BA_LITE)
+                               {
+                                       if ((distance(real_y, real_x, py, px) <= 4) && los(real_y, real_x, py, px))
+                                               f5 &= ~(RF5_BA_LITE);
+                               }
                        }
 
                        if (f4 & RF4_ROCKET)
@@ -404,7 +630,7 @@ bool monst_spell_monst(int m_idx)
                                int real_x = x;
 
                                get_project_point(m_ptr->fy, m_ptr->fx, &real_y, &real_x, PROJECT_STOP);
-                               if (los(real_y, real_x, py, px) && (distance(real_y, real_x, py, px) <= 2))
+                               if (projectable(real_y, real_x, py, px) && (distance(real_y, real_x, py, px) <= 2))
                                        f4 &= ~(RF4_ROCKET);
                        }
 
@@ -425,14 +651,19 @@ bool monst_spell_monst(int m_idx)
                                /* Expected breath radius */
                                int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 3 : 2;
 
-                               if (!breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, FALSE, TRUE))
+                               if (!breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, 0, TRUE))
                                {
                                        f4 &= ~(RF4_BREATH_MASK);
                                        f5 &= ~(RF5_BREATH_MASK);
                                        f6 &= ~(RF6_BREATH_MASK);
                                }
+                               else if ((f4 & RF4_BR_LITE) &&
+                                        !breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, GF_LITE, TRUE))
+                               {
+                                       f4 &= ~(RF4_BR_LITE);
+                               }
                                else if ((f4 & RF4_BR_DISI) &&
-                                        !breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, TRUE, TRUE))
+                                        !breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, GF_DISINTEGRATE, TRUE))
                                {
                                        f4 &= ~(RF4_BR_DISI);
                                }
@@ -442,9 +673,15 @@ bool monst_spell_monst(int m_idx)
                /* Special moves restriction */
                if (f6 & RF6_SPECIAL)
                {
-                       if (r_ptr->d_char == 'B')
+                       if (m_ptr->r_idx == MON_ROLENTO)
+                       {
+                               if ((p_ptr->pet_extra_flags & (PF_ATTACK_SPELL | PF_SUMMON_SPELL)) != (PF_ATTACK_SPELL | PF_SUMMON_SPELL))
+                                       f6 &= ~(RF6_SPECIAL);
+                       }
+                       else if (r_ptr->d_char == 'B')
                        {
-                               if (!(p_ptr->pet_extra_flags & PF_TELEPORT)) f6 &= ~(RF6_SPECIAL);
+                               if ((p_ptr->pet_extra_flags & (PF_ATTACK_SPELL | PF_TELEPORT)) != (PF_ATTACK_SPELL | PF_TELEPORT))
+                                       f6 &= ~(RF6_SPECIAL);
                        }
                        else f6 &= ~(RF6_SPECIAL);
                }
@@ -452,40 +689,72 @@ bool monst_spell_monst(int m_idx)
 
        /* Remove some spells if necessary */
 
-       /* Check for a clean bolt shot */
-       if (((f4 & RF4_BOLT_MASK) ||
-            (f5 & RF5_BOLT_MASK) ||
-            (f6 & RF6_BOLT_MASK)) &&
-           !(r_ptr->flags2 & RF2_STUPID) &&
-           !clean_shot(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, pet))
+       if (!(r_ptr->flags2 & RF2_STUPID))
        {
-               f4 &= ~(RF4_BOLT_MASK);
-               f5 &= ~(RF5_BOLT_MASK);
-               f6 &= ~(RF6_BOLT_MASK);
-       }
+               /* Check for a clean bolt shot */
+               if (((f4 & RF4_BOLT_MASK) ||
+                    (f5 & RF5_BOLT_MASK) ||
+                    (f6 & RF6_BOLT_MASK)) &&
+                   !clean_shot(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, pet))
+               {
+                       f4 &= ~(RF4_BOLT_MASK);
+                       f5 &= ~(RF5_BOLT_MASK);
+                       f6 &= ~(RF6_BOLT_MASK);
+               }
 
-       /* Check for a possible summon */
-       if (((f4 & RF4_SUMMON_MASK) ||
-            (f5 & RF5_SUMMON_MASK) ||
-            (f6 & RF6_SUMMON_MASK)) &&
-           !(r_ptr->flags2 & RF2_STUPID) &&
-           !(summon_possible(t_ptr->fy, t_ptr->fx)))
-       {
-               /* Remove summoning spells */
-               f4 &= ~(RF4_SUMMON_MASK);
-               f5 &= ~(RF5_SUMMON_MASK);
-               f6 &= ~(RF6_SUMMON_MASK);
+               /* Check for a possible summon */
+               if (((f4 & RF4_SUMMON_MASK) ||
+                    (f5 & RF5_SUMMON_MASK) ||
+                    (f6 & RF6_SUMMON_MASK)) &&
+                   !(summon_possible(t_ptr->fy, t_ptr->fx)))
+               {
+                       /* Remove summoning spells */
+                       f4 &= ~(RF4_SUMMON_MASK);
+                       f5 &= ~(RF5_SUMMON_MASK);
+                       f6 &= ~(RF6_SUMMON_MASK);
+               }
+
+               /* Dispel magic */
+               if ((f4 & RF4_DISPEL) && !dispel_check_monster(m_idx, t_idx))
+               {
+                       /* Remove dispel spell */
+                       f4 &= ~(RF4_DISPEL);
+               }
+
+               /* Check for a possible raise dead */
+               if ((f6 & RF6_RAISE_DEAD) && !raise_possible(m_ptr))
+               {
+                       /* Remove raise dead spell */
+                       f6 &= ~(RF6_RAISE_DEAD);
+               }
+
+               /* Special moves restriction */
+               if (f6 & RF6_SPECIAL)
+               {
+                       if ((m_ptr->r_idx == MON_ROLENTO) && !summon_possible(t_ptr->fy, t_ptr->fx))
+                       {
+                               f6 &= ~(RF6_SPECIAL);
+                       }
+               }
        }
 
-       /* Hack -- allow "desperate" spells */
-       if ((r_ptr->flags2 & RF2_SMART) &&
-           (m_ptr->hp < m_ptr->maxhp / 10) &&
-           (randint0(100) < 50))
+       if (r_ptr->flags2 & RF2_SMART)
        {
-               /* Require intelligent spells */
-               f4 &= (RF4_INT_MASK);
-               f5 &= (RF5_INT_MASK);
-               f6 &= (RF6_INT_MASK);
+               /* Hack -- allow "desperate" spells */
+               if ((m_ptr->hp < m_ptr->maxhp / 10) &&
+                   (randint0(100) < 50))
+               {
+                       /* Require intelligent spells */
+                       f4 &= (RF4_INT_MASK);
+                       f5 &= (RF5_INT_MASK);
+                       f6 &= (RF6_INT_MASK);
+               }
+
+               /* Hack -- decline "teleport level" in some case */
+               if ((f6 & RF6_TELE_LEVEL) && TELE_LEVEL_IS_INEFF((t_idx == p_ptr->riding) ? 0 : t_idx))
+               {
+                       f6 &= ~(RF6_TELE_LEVEL);
+               }
        }
 
        /* No spells left */
@@ -532,102 +801,42 @@ bool monst_spell_monst(int m_idx)
        /* Choose a spell to cast */
        thrown_spell = spell[randint0(num)];
 
-       see_t = t_ptr->ml;
+       see_t = is_seen(t_ptr);
        see_either = (see_m || see_t);
-       see_both = (see_m && see_t);
 
        /* Can the player be aware of this attack? */
        known = (m_ptr->cdis <= MAX_SIGHT) || (t_ptr->cdis <= MAX_SIGHT);
 
-       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 0);
+       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 1);
 
        /* Check for spell failure (inate attacks never fail) */
-       if (!spell_is_inate(thrown_spell) && (in_no_magic_dungeon || (m_ptr->stunned && one_in_(2))))
+       if (!spell_is_inate(thrown_spell) && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2))))
        {
-               disturb(1, 0);
+               disturb(1, 1);
                /* Message */
-#ifdef JP
-               msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
-#else
-               msg_format("%^s tries to cast a spell, but fails.", m_name);
-#endif
+               if (see_m) msg_format(_("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", 
+                                           "%^s tries to cast a spell, but fails."), m_name);
 
                return (TRUE);
        }
 
-       switch (thrown_spell)
+       /* Hex: Anti Magic Barrier */
+       if (!spell_is_inate(thrown_spell) && magic_barrier(m_idx))
        {
-       /* RF4_SHRIEK */
-       case 96+0:
-               if (known)
-               {
-                       if (see_m)
-                       {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¶«¤ó¤À¡£", m_name, t_name);
-#else
-                               msg_format("%^s shrieks at %s.", m_name, t_name);
-#endif
-
-                       }
-                       else
-                       {
-                               mon_fight = TRUE;
-                       }
-               }
-
-               wake_up = TRUE;
-
-               break;
-
-       /* RF4_XXX1 */
-       case 96+1:
-               /* XXX XXX XXX */
-               return FALSE;
-
-       /* RF4_DISPEL */
-       case 96+2:
-               return FALSE;
-
-       /* RF4_XXX4X4 */
-       case 96+3:
-               if (known)
-               {
-                       if (see_either)
-                       {
-                               disturb(1, 0);
-
-                               if (blind)
-                               {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤ò¼Í¤Ã¤¿¡£", m_name);
-#else
-                                       msg_format("%^s shoots something.", m_name);
-#endif
-
-                               }
-                               else
-                               {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¥í¥±¥Ã¥È¤òȯ¼Í¤·¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s fires a rocket at %s.", m_name, t_name);
-#endif
-
-                               }
-                       }
-                       else
-                       {
-                               mon_fight = TRUE;
-                       }
-               }
-
-               dam = ((m_ptr->hp / 4) > 800 ? 800 : (m_ptr->hp / 4));
-               monst_breath_monst(m_idx, y, x, GF_ROCKET,
-                                  dam, 2, FALSE, MS_ROCKET, learnable);
+               if (see_m) msg_format(_("È¿ËâË¡¥Ð¥ê¥¢¤¬%^s¤Î¼öʸ¤ò¤«¤­¾Ã¤·¤¿¡£", 
+                                           "Anti magic barrier cancels the spell which %^s casts."), m_name);
+               return (TRUE);
+       }
 
-               break;
+       can_remember = is_original_ap_and_seen(m_ptr);
 
+       switch (thrown_spell)
+       {
+    case 96 + 0: MM_spell_RF4_SHRIEK(m_idx, t_idx); break; /* RF4_SHRIEK */
+    case 96 + 1: return FALSE;  /* RF4_XXX1 */
+    case 96 + 2: MM_spell_RF4_DISPEL(m_idx, t_idx); break; /* RF4_DISPEL */
+    case 96 + 3: dam = MM_spell_RF4_ROCKET(y, x, m_idx, t_idx); break; /* RF4_ROCKET */
+       
        /* RF4_SHOOT */
        case 96+4:
                if (known)
@@ -636,21 +845,11 @@ bool monst_spell_monst(int m_idx)
                        {
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬´ñ̯¤Ê²»¤òȯ¤·¤¿¡£", m_name);
-#else
-                                       msg_format("%^s makes a strange noise.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬´ñ̯¤Ê²»¤òȯ¤·¤¿¡£", "%^s makes a strange noise."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÌð¤òÊü¤Ã¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s fires an arrow at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÌð¤òÊü¤Ã¤¿¡£", "%^s fires an arrow at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -662,7 +861,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(r_ptr->blow[0].d_dice, r_ptr->blow[0].d_side);
-               monst_bolt_monst(m_idx, y, x, GF_ARROW, dam, MS_SHOOT, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_ARROW, dam, MS_SHOOT);
 
                break;
 
@@ -687,25 +886,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë»À¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes acid at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë»À¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes acid at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -718,7 +907,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_ACID,
-                                  dam,0, TRUE, MS_BR_ACID, learnable);
+                                  dam,0, TRUE, MS_BR_ACID);
 
                break;
 
@@ -728,25 +917,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë°ðºÊ¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes lightning at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë°ðºÊ¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes lightning at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -759,7 +938,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_ELEC,
-                                  dam,0, TRUE, MS_BR_ELEC, learnable);
+                                  dam,0, TRUE, MS_BR_ELEC);
 
                break;
 
@@ -769,25 +948,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë²Ð±ê¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes fire at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë²Ð±ê¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes fire at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -800,7 +969,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_FIRE,
-                                  dam,0, TRUE, MS_BR_FIRE, learnable);
+                                  dam,0, TRUE, MS_BR_FIRE);
 
                break;
 
@@ -810,25 +979,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÎ䵤¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes frost at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÎ䵤¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes frost at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -841,7 +1000,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_COLD,
-                                  dam,0, TRUE, MS_BR_COLD, learnable);
+                                  dam,0, TRUE, MS_BR_COLD);
                break;
 
        /* RF4_BR_POIS */
@@ -850,25 +1009,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¥¬¥¹¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes gas at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¥¬¥¹¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes gas at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -881,7 +1030,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 800 ? 800 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_POIS,
-                                  dam,0, TRUE, MS_BR_POIS, learnable);
+                                  dam,0, TRUE, MS_BR_POIS);
 
                break;
 
@@ -891,25 +1040,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÃϹö¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes nether at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÃϹö¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes nether at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -922,7 +1061,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 550 ? 550 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_NETHER,
-                                  dam,0, TRUE, MS_BR_NETHER, learnable);
+                                  dam,0, TRUE, MS_BR_NETHER);
 
                break;
 
@@ -932,25 +1071,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÁ®¸÷¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes light at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÁ®¸÷¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes light at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -963,7 +1092,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_LITE,
-                                  dam,0, TRUE, MS_BR_LITE, learnable);
+                                  dam,0, TRUE, MS_BR_LITE);
 
                break;
 
@@ -973,25 +1102,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë°Å¹õ¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes darkness at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë°Å¹õ¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes darkness at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1004,7 +1123,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_DARK,
-                                  dam,0, TRUE, MS_BR_DARK, learnable);
+                                  dam,0, TRUE, MS_BR_DARK);
 
                break;
 
@@ -1014,25 +1133,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ëº®Íð¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes confusion at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ëº®Íð¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes confusion at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1045,7 +1154,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 450 ? 450 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_CONFUSION,
-                                  dam,0, TRUE, MS_BR_CONF, learnable);
+                                  dam,0, TRUE, MS_BR_CONF);
 
                break;
 
@@ -1055,31 +1164,19 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (m_ptr->r_idx == MON_JAIAN)
-#ifdef JP
-                                       msg_format("¡Ö¥Ü¥©¥¨¡Á¡Á¡Á¡Á¡Á¡Á¡×");
-#else
-                               msg_format("'Booooeeeeee'");
-#endif
+                               {
+                                       msg_format(_("¡Ö¥Ü¥©¥¨¡Á¡Á¡Á¡Á¡Á¡Á¡×", "'Booooeeeeee'"));
+                               }
                                else if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¹ì²»¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes sound at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¹ì²»¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes sound at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1092,7 +1189,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 450 ? 450 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_SOUND,
-                                  dam,0, TRUE, MS_BR_SOUND, learnable);
+                                  dam,0, TRUE, MS_BR_SOUND);
 
                break;
 
@@ -1102,25 +1199,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¥«¥ª¥¹¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes chaos at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¥«¥ª¥¹¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes chaos at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1133,7 +1220,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 600 ? 600 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_CHAOS,
-                                  dam,0, TRUE, MS_BR_CHAOS, learnable);
+                                  dam,0, TRUE, MS_BR_CHAOS);
 
                break;
 
@@ -1143,25 +1230,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÎô²½¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes disenchantment at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÎô²½¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes disenchantment at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1174,7 +1251,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 500 ? 500 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_DISENCHANT,
-                                  dam,0, TRUE, MS_BR_DISEN, learnable);
+                                  dam,0, TRUE, MS_BR_DISEN);
 
                break;
 
@@ -1184,25 +1261,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë°ø²Ìº®Íð¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes nexus at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë°ø²Ìº®Íð¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes nexus at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1215,7 +1282,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 250 ? 250 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_NEXUS,
-                                  dam,0, TRUE, MS_BR_NEXUS, learnable);
+                                  dam,0, TRUE, MS_BR_NEXUS);
 
                break;
 
@@ -1225,25 +1292,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë»þ´ÖµÕž¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes time at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë»þ´ÖµÕž¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes time at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1256,7 +1313,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 150 ? 150 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_TIME,
-                                  dam,0, TRUE, MS_BR_TIME, learnable);
+                                  dam,0, TRUE, MS_BR_TIME);
 
                break;
 
@@ -1266,25 +1323,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÃÙÆߤΥ֥쥹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes inertia at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÃÙÆߤΥ֥쥹¤òÅǤ¤¤¿¡£", "%^s breathes inertia at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1297,7 +1344,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 200 ? 200 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_INERTIA,
-                                  dam,0, TRUE, MS_BR_INERTIA, learnable);
+                                  dam,0, TRUE, MS_BR_INERTIA);
 
                break;
 
@@ -1307,25 +1354,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë½ÅÎϤΥ֥쥹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes gravity at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë½ÅÎϤΥ֥쥹¤òÅǤ¤¤¿¡£", "%^s breathes gravity at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1338,7 +1375,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 200 ? 200 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_GRAVITY,
-                                  dam,0, TRUE, MS_BR_GRAVITY, learnable);
+                                  dam,0, TRUE, MS_BR_GRAVITY);
 
                break;
 
@@ -1348,31 +1385,19 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (m_ptr->r_idx == MON_BOTEI)
-#ifdef JP
-                                       msg_format("¡Ö¥ÜÄë¥Ó¥ë¥«¥Ã¥¿¡¼¡ª¡ª¡ª¡×");
-#else
-                               msg_format("'Boty-Build cutter!!!'");
-#endif
+                               {
+                                       msg_format(_("¡Ö¥ÜÄë¥Ó¥ë¥«¥Ã¥¿¡¼¡ª¡ª¡ª¡×", "'Boty-Build cutter!!!'"));
+                               }
                                else if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÇËÊҤΥ֥쥹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes shards at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÇËÊҤΥ֥쥹¤òÅǤ¤¤¿¡£", "%^s breathes shards at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1385,7 +1410,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 500 ? 500 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_SHARDS,
-                                  dam,0, TRUE, MS_BR_SHARDS, learnable);
+                                  dam,0, TRUE, MS_BR_SHARDS);
 
                break;
 
@@ -1395,25 +1420,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¥×¥é¥º¥Þ¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes plasma at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¥×¥é¥º¥Þ¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes plasma at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1426,7 +1441,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 150 ? 150 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_PLASMA,
-                                  dam,0, TRUE, MS_BR_PLASMA, learnable);
+                                  dam,0, TRUE, MS_BR_PLASMA);
 
                break;
 
@@ -1436,25 +1451,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¥Õ¥©¡¼¥¹¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes force at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¥Õ¥©¡¼¥¹¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes force at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1467,7 +1472,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 200 ? 200 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_FORCE,
-                                  dam,0, TRUE, MS_BR_FORCE, learnable);
+                                  dam,0, TRUE, MS_BR_FORCE);
                break;
 
        /* RF4_BR_MANA */
@@ -1476,25 +1481,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËËâÎϤΥ֥쥹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes mana at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËËâÎϤΥ֥쥹¤òÅǤ¤¤¿¡£", "%^s breathes mana at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1507,7 +1502,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 250 ? 250 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_MANA,
-                                  dam,0, TRUE, MS_BR_MANA, learnable);
+                                  dam,0, TRUE, MS_BR_MANA);
 
                break;
 
@@ -1517,25 +1512,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÊü¼Íǽµå¤òÊü¤Ã¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s casts a ball of radiation at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÊü¼Íǽµå¤òÊü¤Ã¤¿¡£", "%^s casts a ball of radiation at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1546,35 +1531,25 @@ bool monst_spell_monst(int m_idx)
 
                dam = (rlev + damroll(10, 6));
                monst_breath_monst(m_idx, y, x, GF_NUKE,
-                                  dam, 2, FALSE, MS_BALL_NUKE, learnable);
+                                  dam, 2, FALSE, MS_BALL_NUKE);
 
                break;
 
-       /* RF4_RF4_BR_NUKE */
+       /* RF4_BR_NUKE */
        case 96+29:
                if (known)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÊü¼ÍÀ­ÇÑ´þʪ¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes toxic waste at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÊü¼ÍÀ­ÇÑ´þʪ¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes toxic waste at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1587,7 +1562,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 3) > 800 ? 800 : (m_ptr->hp / 3));
                monst_breath_monst(m_idx, y, x, GF_NUKE,
-                                  dam,0, TRUE, MS_BR_NUKE, learnable);
+                                  dam,0, TRUE, MS_BR_NUKE);
                break;
 
        /* RF4_BA_CHAO */
@@ -1596,25 +1571,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬¶²¤í¤·¤²¤Ë¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles frighteningly.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬¶²¤í¤·¤²¤Ë¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles frighteningly."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë½ã¥í¥°¥ë¥¹¤òÊü¤Ã¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s invokes raw Logrus upon %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë½ã¥í¥°¥ë¥¹¤òÊü¤Ã¤¿¡£", "%^s invokes raw Logrus upon %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1625,7 +1590,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = (rlev * 2) + damroll(10, 10);
                monst_breath_monst(m_idx, y, x, GF_CHAOS,
-                                  dam, 4, FALSE, MS_BALL_CHAOS, learnable);
+                                  dam, 4, FALSE, MS_BALL_CHAOS);
 
                break;
 
@@ -1635,25 +1600,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s breathes.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ëʬ²ò¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s breathes disintegration at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ëʬ²ò¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes disintegration at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1666,7 +1621,7 @@ bool monst_spell_monst(int m_idx)
 
                dam = ((m_ptr->hp / 6) > 150 ? 150 : (m_ptr->hp / 6));
                monst_breath_monst(m_idx, y, x, GF_DISINTEGRATE,
-                                  dam,0, TRUE, MS_BR_DISI, learnable);
+                                  dam,0, TRUE, MS_BR_DISI);
                break;
 
        /* RF5_BA_ACID */
@@ -1675,25 +1630,16 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s casts an acid ball at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", 
+                                                        "%^s casts an acid ball at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1702,9 +1648,17 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               dam = (randint1(rlev * 3) + 15) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, 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);
+               }
+               monst_breath_monst(m_idx, y, x, GF_ACID, dam, rad, FALSE, MS_BALL_ACID);
                break;
 
        /* RF5_BA_ELEC */
@@ -1713,25 +1667,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s casts a lightning ball at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a lightning ball at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1740,9 +1684,17 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               dam = (randint1(rlev * 3 / 2) + 8) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, 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);
+               }
+               monst_breath_monst(m_idx, y, x, GF_ELEC, dam, rad, FALSE, MS_BALL_ELEC);
                break;
 
        /* RF5_BA_FIRE */
@@ -1751,41 +1703,25 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (m_ptr->r_idx == MON_ROLENTO)
                                {
-#ifdef JP
-                                       if (blind)
-                                               msg_format("%^s¤¬²¿¤«¤òÅꤲ¤¿¡£", m_name);
-                                       else
-                                               msg_format("%^s¤¬%^s¤Ë¸þ¤«¤Ã¤Æ¼êÜØÃƤòÅꤲ¤¿¡£", m_name, t_name);
-#else
                                        if (blind)
-                                               msg_format("%^s throws something.", m_name);
+                                               msg_format(_("%^s¤¬²¿¤«¤òÅꤲ¤¿¡£", "%^s throws something."), m_name);
                                        else
-                                               msg_format("%^s throws a hand grenade.", m_name);
-#endif
+                                               msg_format(_("%^s¤¬%^s¤Ë¸þ¤«¤Ã¤Æ¼êÜØÃƤòÅꤲ¤¿¡£", "%^s throws a hand grenade."), m_name, t_name);
                                }
                                else
                                {
                                        if (blind)
                                        {
-#ifdef JP
-                                               msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                               msg_format("%^s mumbles.", m_name);
-#endif
-
+                                               msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                                        }
                                        else
                                        {
-#ifdef JP
-                                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                                               msg_format("%^s casts a fire ball at %s.", m_name, t_name);
-#endif
-
+                                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£",
+                                                                "%^s casts a fire ball at %s."), m_name, t_name);
                                        }
                                }
                        }
@@ -1795,9 +1731,17 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               dam = (randint1(rlev * 7 / 2) + 10) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, 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);
+               }
+               monst_breath_monst(m_idx, y, x, GF_FIRE, dam, rad, FALSE, MS_BALL_FIRE);
                break;
 
        /* RF5_BA_COLD */
@@ -1806,25 +1750,16 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s casts a frost ball at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", 
+                                                        "%^s casts a frost ball at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1833,9 +1768,17 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               dam = (randint1(rlev * 3 / 2) + 10) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, 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);
+               }
+               monst_breath_monst(m_idx, y, x, GF_COLD, dam, rad, FALSE, MS_BALL_COLD);
                break;
 
        /* RF5_BA_POIS */
@@ -1844,25 +1787,16 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ°­½­±À¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s casts a stinking cloud at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ°­½­±À¤Î¼öʸ¤ò¾§¤¨¤¿¡£", 
+                                                        "%^s casts a stinking cloud at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1872,7 +1806,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(12, 2) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, GF_POIS, dam, 2, FALSE, MS_BALL_POIS, learnable);
+               monst_breath_monst(m_idx, y, x, GF_POIS, dam, 2, FALSE, MS_BALL_POIS);
 
                break;
 
@@ -1882,25 +1816,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆÃϹöµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s casts a nether ball at %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆÃϹöµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a nether ball at %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1910,7 +1834,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = 50 + damroll(10, 10) + (rlev * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1));
-               monst_breath_monst(m_idx, y, x, GF_NETHER, dam, 2, FALSE, MS_BALL_NETHER, learnable);
+               monst_breath_monst(m_idx, y, x, GF_NETHER, dam, 2, FALSE, MS_BALL_NETHER);
 
                break;
 
@@ -1920,31 +1844,17 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÂФ·¤Æή¤ì¤ë¤è¤¦¤Ê¿È¿¶¤ê¤ò¤·¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s gestures fluidly at %s.", m_name, t_name);
-#endif
-
-#ifdef JP
-                                       msg_format("%^s¤Ï±²´¬¤Ë°û¤ß¹þ¤Þ¤ì¤¿¡£", t_name);
-#else
-                                       msg_format("%^s is engulfed in a whirlpool.", t_name);
-#endif
+                                       msg_format(_("%^s¤¬%s¤ËÂФ·¤Æή¤ì¤ë¤è¤¦¤Ê¿È¿¶¤ê¤ò¤·¤¿¡£", "%^s gestures fluidly at %s."), m_name, t_name);
 
+                                       msg_format(_("%^s¤Ï±²´¬¤Ë°û¤ß¹þ¤Þ¤ì¤¿¡£", "%^s is engulfed in a whirlpool."), t_name);
                                }
                        }
                        else
@@ -1954,7 +1864,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = ((r_ptr->flags2 & RF2_POWERFUL) ? randint1(rlev * 3) : randint1(rlev * 2)) + 50;
-               monst_breath_monst(m_idx, y, x, GF_WATER, dam, 4, FALSE, MS_BALL_WATER, learnable);
+               monst_breath_monst(m_idx, y, x, GF_WATER, dam, 4, FALSE, MS_BALL_WATER);
 
                break;
 
@@ -1964,25 +1874,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles powerfully.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÂФ·¤ÆËâÎϤÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s invokes a mana storm upon %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÂФ·¤ÆËâÎϤÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a mana storm upon %s."), m_name, t_name);
                                }
                        }
                        else
@@ -1992,7 +1892,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = (rlev * 4) + 50 + damroll(10, 10);
-               monst_breath_monst(m_idx, y, x, GF_MANA, dam, 4, FALSE, MS_BALL_MANA, learnable);
+               monst_breath_monst(m_idx, y, x, GF_MANA, dam, 4, FALSE, MS_BALL_MANA);
 
                break;
 
@@ -2002,25 +1902,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles powerfully.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÂФ·¤Æ°Å¹õ¤ÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s invokes a darkness storm upon %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÂФ·¤Æ°Å¹õ¤ÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a darkness storm upon %s."), m_name, t_name);
                                }
                        }
                        else
@@ -2030,7 +1920,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = (rlev * 4) + 50 + damroll(10, 10);
-               monst_breath_monst(m_idx, y, x, GF_DARK, dam, 4, FALSE, MS_BALL_DARK, learnable);
+               monst_breath_monst(m_idx, y, x, GF_DARK, dam, 4, FALSE, MS_BALL_DARK);
 
                break;
 
@@ -2039,56 +1929,11 @@ bool monst_spell_monst(int m_idx)
                if (see_m)
                {
                        /* Basic message */
-#ifdef JP
-                       msg_format("%^s¤ÏÀº¿À¥¨¥Í¥ë¥®¡¼¤ò%s¤«¤éµÛ¤¤¤È¤Ã¤¿¡£", m_name, t_name);
-#else
-                       msg_format("%^s draws psychic energy from %s.", m_name, t_name);
-#endif
-
-               }
-
-               /* Heal the monster */
-               if (m_ptr->hp < m_ptr->maxhp)
-               {
-                       if (!tr_ptr->flags4 && !tr_ptr->flags5 && !tr_ptr->flags6)
-                       {
-                               if (see_both)
-                               {
-#ifdef JP
-                                       msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                                       msg_format("%^s is unaffected!", t_name);
-#endif
-
-                               }
-                       }
-                       else
-                       {
-                               /* Attack power */
-                               int power = (randint1(rlev) / 2) + 1;
-
-                               /* Heal */
-                               m_ptr->hp += 6 * power;
-                               if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
-
-                               /* Redraw (later) if needed */
-                               if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
-                               if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
-
-                               /* Special message */
-                               if (see_m)
-                               {
-#ifdef JP
-                                       msg_format("%^s¤Ïµ¤Ê¬¤¬Îɤµ¤½¤¦¤À¡£", m_name);
-#else
-                                       msg_format("%^s appears healthier.", m_name);
-#endif
-
-                               }
-                       }
+                       msg_format(_("%^s¤ÏÀº¿À¥¨¥Í¥ë¥®¡¼¤ò%s¤«¤éµÛ¤¤¤È¤Ã¤¿¡£", "%^s draws psychic energy from %s."), m_name, t_name);
                }
 
-               wake_up = TRUE;
+               dam = ((randint1(rlev) / 2) + 1);
+               monst_breath_monst(m_idx, y, x, GF_DRAIN_MANA, dam, 0, FALSE, MS_DRAIN_MANA);
 
                break;
 
@@ -2096,61 +1941,11 @@ bool monst_spell_monst(int m_idx)
        case 128+10:
                if (see_m)
                {
-#ifdef JP
-                       msg_format("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À", m_name, t_name);
-#else
-                       msg_format("%^s gazes intently at %s.", m_name, t_name);
-#endif
-
+                       msg_format(_("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", "%^s gazes intently at %s."), m_name, t_name);
                }
 
                dam = damroll(7, 7);
-               /* Attempt a saving throw */
-               if ((tr_ptr->flags1 & RF1_UNIQUE) ||
-                   (tr_ptr->flags3 & RF3_NO_CONF) ||
-                   (tr_ptr->flagsr & RFR_RES_ALL) ||
-                   (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10))
-               {
-                       /* No obvious effect */
-                       if (see_both)
-                       {
-                               if (is_original_ap(t_ptr))
-                               {
-                                       /* Memorize a flag */
-                                       if (tr_ptr->flagsr & RFR_RES_ALL) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                                       if (tr_ptr->flags3 & RF3_NO_CONF) tr_ptr->r_flags3 |= (RF3_NO_CONF);
-                               }
-
-#ifdef JP
-                               msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                               msg_format("%^s is unaffected!", t_name);
-#endif
-
-                       }
-               }
-               else
-               {
-                       if (see_t)
-                       {
-#ifdef JP
-                               msg_format("%^s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£", t_name);
-#else
-                               msg_format("%^s is blasted by psionic energy.", t_name);
-#endif
-
-                       }
-
-                       t_ptr->confused += randint0(4) + 4;
-
-#ifdef JP
-                       mon_take_hit_mon(t_idx, dam, &fear, "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£", m_idx);
-#else
-                       mon_take_hit_mon(t_idx, dam, &fear, " collapses, a mindless husk.", m_idx);
-#endif
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_MIND_BLAST, dam, 0, FALSE, MS_MIND_BLAST);
 
                break;
 
@@ -2158,63 +1953,11 @@ bool monst_spell_monst(int m_idx)
        case 128+11:
                if (see_m)
                {
-#ifdef JP
-                       msg_format("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À", m_name, t_name);
-#else
-                       msg_format("%^s gazes intently at %s.", m_name, t_name);
-#endif
-
+                       msg_format(_("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", "%^s gazes intently at %s."), m_name, t_name);
                }
 
                dam = damroll(12, 12);
-               /* Attempt a saving throw */
-               if ((tr_ptr->flags1 & RF1_UNIQUE) ||
-                   (tr_ptr->flags3 & RF3_NO_CONF) ||
-                   (tr_ptr->flagsr & RFR_RES_ALL) ||
-                   (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10))
-               {
-                       /* No obvious effect */
-                       if (see_both)
-                       {
-                               if (is_original_ap(t_ptr))
-                               {
-                                       /* Memorize a flag */
-                                       if (tr_ptr->flagsr & RFR_RES_ALL) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                                       if (tr_ptr->flags3 & RF3_NO_CONF) tr_ptr->r_flags3 |= (RF3_NO_CONF);
-                               }
-
-#ifdef JP
-                               msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                               msg_format("%^s is unaffected!", t_name);
-#endif
-
-                       }
-               }
-               else
-               {
-                       if (see_t)
-                       {
-#ifdef JP
-                               msg_format("%^s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£", t_name);
-#else
-                               msg_format("%^s is blasted by psionic energy.", t_name);
-#endif
-
-                       }
-
-                       t_ptr->confused += randint0(4) + 4;
-                       t_ptr->slow = MIN(200, t_ptr->slow + 10);
-                       t_ptr->stunned += randint0(4) + 4;
-
-#ifdef JP
-                       mon_take_hit_mon(t_idx, dam, &fear, "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£", m_idx);
-#else
-                       mon_take_hit_mon(t_idx, dam, &fear, " collapses, a mindless husk.", m_idx);
-#endif
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_BRAIN_SMASH, dam, 0, FALSE, MS_BRAIN_SMASH);
 
                break;
 
@@ -2224,12 +1967,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤Ï%s¤ò»Ø¤µ¤·¤Æ¼ö¤¤¤ò¤«¤±¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s points at %s and curses.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤Ï%s¤ò»Ø¤µ¤·¤Æ¼ö¤¤¤ò¤«¤±¤¿¡£", "%^s points at %s and curses."), m_name, t_name);
                        }
                        else
                        {
@@ -2238,27 +1976,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(3, 8);
-               if ((randint0(100 + rlev/2) < (tr_ptr->level + 35)) ||
-                   (tr_ptr->flagsr & RFR_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flagsr & RFR_RES_ALL)
-                       {
-                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                       if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-               }
-               else
-               {
-                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_CAUSE_1, dam, 0, FALSE, MS_CAUSE_1);
 
                break;
 
@@ -2268,12 +1986,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤Ï%s¤ò»Ø¤µ¤·¤Æ¶²¤í¤·¤²¤Ë¼ö¤¤¤ò¤«¤±¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s points at %s and curses horribly.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤Ï%s¤ò»Ø¤µ¤·¤Æ¶²¤í¤·¤²¤Ë¼ö¤¤¤ò¤«¤±¤¿¡£", 
+                                                "%^s points at %s and curses horribly."), m_name, t_name);
                        }
                        else
                        {
@@ -2282,27 +1996,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(8, 8);
-               if ((randint0(100 + rlev/2) < (tr_ptr->level + 35)) ||
-                   (tr_ptr->flagsr & RFR_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flagsr & RFR_RES_ALL)
-                       {
-                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                       if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-               }
-               else
-               {
-                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_CAUSE_2, dam, 0, FALSE, MS_CAUSE_2);
 
                break;
 
@@ -2312,12 +2006,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤Ï%s¤ò»Ø¤µ¤·¡¢¶²¤í¤·¤²¤Ë¼öʸ¤ò¾§¤¨¤¿¡ª", m_name, t_name);
-#else
-                               msg_format("%^s points at %s, incanting terribly!", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤Ï%s¤ò»Ø¤µ¤·¡¢¶²¤í¤·¤²¤Ë¼öʸ¤ò¾§¤¨¤¿¡ª", 
+                                                "%^s points at %s, incanting terribly!"), m_name, t_name);
                        }
                        else
                        {
@@ -2326,27 +2016,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(10, 15);
-               if ((randint0(100 + rlev/2) < (tr_ptr->level + 35)) ||
-                   (tr_ptr->flagsr & RFR_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flagsr & RFR_RES_ALL)
-                       {
-                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                       if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-               }
-               else
-               {
-                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_CAUSE_3, dam, 0, FALSE, MS_CAUSE_3);
 
                break;
 
@@ -2356,12 +2026,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤ÎÈ빦¤òÆͤ¤¤Æ¡¢¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", m_name, t_name);
-#else
-                               msg_format("%^s points at %s, screaming the word, 'DIE!'", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤ÎÈ빦¤òÆͤ¤¤Æ¡¢¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", 
+                                                "%^s points at %s, screaming the word, 'DIE!'"), m_name, t_name);
                        }
                        else
                        {
@@ -2370,27 +2036,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(15, 15);
-               if (((randint0(100 + rlev/2) < (tr_ptr->level + 35)) && (m_ptr->r_idx != MON_KENSHIROU)) ||
-                   (tr_ptr->flagsr & RFR_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flagsr & RFR_RES_ALL)
-                       {
-                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                       if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-               }
-               else
-               {
-                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_CAUSE_4, dam, 0, FALSE, MS_CAUSE_4);
 
                break;
 
@@ -2400,12 +2046,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥·¥Ã¥É¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts an acid bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥·¥Ã¥É¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts an acid bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2414,8 +2055,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = (damroll(7, 8) + (rlev / 3)) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_bolt_monst(m_idx, y, x, GF_ACID,
-                                dam, MS_BOLT_ACID, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_ACID, dam, MS_BOLT_ACID);
 
                break;
 
@@ -2425,12 +2065,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a lightning bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a lightning bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2439,8 +2074,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = (damroll(4, 8) + (rlev / 3)) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_bolt_monst(m_idx, y, x, GF_ELEC,
-                                dam, MS_BOLT_ELEC, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_ELEC, dam, MS_BOLT_ELEC);
 
                break;
 
@@ -2450,12 +2084,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a fire bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a fire bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2464,8 +2093,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = (damroll(9, 8) + (rlev / 3)) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_bolt_monst(m_idx, y, x, GF_FIRE,
-                                dam, MS_BOLT_FIRE, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_FIRE, dam, MS_BOLT_FIRE);
 
                break;
 
@@ -2475,12 +2103,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥¤¥¹¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a frost bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¢¥¤¥¹¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a frost bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2489,8 +2112,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = (damroll(6, 8) + (rlev / 3)) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_bolt_monst(m_idx, y, x, GF_COLD,
-                                dam, MS_BOLT_COLD, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_COLD, dam, MS_BOLT_COLD);
 
                break;
 
@@ -2500,25 +2122,16 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                                       msg_format("%^s mumbles powerfully.", m_name);
-#endif
-
+                                       msg_format(_("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬%s¤ËÂФ·¤Æ¥¹¥¿¡¼¥Ð¡¼¥¹¥È¤Î¼öʸ¤òÇ°¤¸¤¿¡£", m_name, t_name);
-#else
-                                       msg_format("%^s invokes a starburst upon %s.", m_name, t_name);
-#endif
-
+                                       msg_format(_("%^s¤¬%s¤ËÂФ·¤Æ¥¹¥¿¡¼¥Ð¡¼¥¹¥È¤Î¼öʸ¤òÇ°¤¸¤¿¡£", 
+                                                        "%^s invokes a starburst upon %s."), m_name, t_name);
                                }
                        }
                        else
@@ -2528,7 +2141,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = (rlev * 4) + 50 + damroll(10, 10);
-               monst_breath_monst(m_idx, y, x, GF_LITE, dam, 4, FALSE, MS_STARBURST, learnable);
+               monst_breath_monst(m_idx, y, x, GF_LITE, dam, 4, FALSE, MS_STARBURST);
 
                break;
 
@@ -2538,12 +2151,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆÃϹö¤ÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a nether bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆÃϹö¤ÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£",
+                                                "%^s casts a nether bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2552,8 +2161,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = 30 + damroll(5, 5) + (rlev * 4) / ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 3);
-               monst_bolt_monst(m_idx, y, x, GF_NETHER,
-                                dam, MS_BOLT_NETHER, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_NETHER, dam, MS_BOLT_NETHER);
 
                break;
 
@@ -2563,12 +2171,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¦¥©¡¼¥¿¡¼¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a water bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥¦¥©¡¼¥¿¡¼¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", 
+                                                "%^s casts a water bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2577,8 +2181,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(10, 10) + (rlev * 3 / ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 3));
-               monst_bolt_monst(m_idx, y, x, GF_WATER,
-                                dam, MS_BOLT_WATER, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_WATER, dam, MS_BOLT_WATER);
 
                break;
 
@@ -2588,12 +2191,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆËâÎϤÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a mana bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤ÆËâÎϤÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", 
+                                                "%^s casts a mana bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2602,8 +2201,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = randint1(rlev * 7 / 2) + 50;
-               monst_bolt_monst(m_idx, y, x, GF_MANA,
-                                dam, MS_BOLT_MANA, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_MANA, dam, MS_BOLT_MANA);
 
                break;
 
@@ -2613,12 +2211,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥×¥é¥º¥Þ¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a plasma bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥×¥é¥º¥Þ¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", 
+                                                "%^s casts a plasma bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2627,8 +2221,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = 10 + damroll(8, 7) + (rlev * 3 / ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 3));
-               monst_bolt_monst(m_idx, y, x, GF_PLASMA,
-                                dam, MS_BOLT_PLASMA, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_PLASMA, dam, MS_BOLT_PLASMA);
 
                break;
 
@@ -2638,12 +2231,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¶Ë´¨¤ÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts an ice bolt at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¶Ë´¨¤ÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£",
+                                                "%^s casts an ice bolt at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2652,8 +2241,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(6, 6) + (rlev * 3 / ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 3));
-               monst_bolt_monst(m_idx, y, x, GF_ICE,
-                                dam, MS_BOLT_ICE, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_ICE, dam, MS_BOLT_ICE);
 
                break;
 
@@ -2663,12 +2251,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a magic missile at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", 
+                                                "%^s casts a magic missile at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2677,8 +2261,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(2, 6) + (rlev / 3);
-               monst_bolt_monst(m_idx, y, x, GF_MISSILE,
-                                dam, MS_MAGIC_MISSILE, learnable);
+               monst_bolt_monst(m_idx, y, x, GF_MISSILE, dam, MS_MAGIC_MISSILE);
 
                break;
 
@@ -2688,12 +2271,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬¶²¤í¤·¤²¤Ê¸¸³Ð¤òºî¤ê½Ð¤·¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a fearful illusion in front of %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬¶²¤í¤·¤²¤Ê¸¸³Ð¤òºî¤ê½Ð¤·¤¿¡£",
+                                                "%^s casts a fearful illusion in front of %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2703,27 +2282,18 @@ bool monst_spell_monst(int m_idx)
 
                if (tr_ptr->flags3 & RF3_NO_FEAR)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ï¶²Éݤò´¶¤¸¤Ê¤¤¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s refuses to be frightened.", t_name);
-#endif
+                       if (see_t) msg_format(_("%^s¤Ï¶²Éݤò´¶¤¸¤Ê¤¤¡£", 
+                                                   "%^s refuses to be frightened."), t_name);
 
                }
                else if (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ï¶²Éݤò´¶¤¸¤Ê¤¤¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s refuses to be frightened.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤Ï¶²Éݤò´¶¤¸¤Ê¤¤¡£", 
+                                                   "%^s refuses to be frightened."), t_name);
                }
                else
                {
-                       if (!t_ptr->monfear) fear = TRUE;
-
-                       t_ptr->monfear += randint0(4) + 4;
+                       if (set_monster_monfear(t_idx, MON_MONFEAR(t_ptr) + randint0(4) + 4)) fear = TRUE;
                }
 
                wake_up = TRUE;
@@ -2736,12 +2306,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%s¤Ï¼öʸ¤ò¾§¤¨¤Æ%s¤ÎÌܤò¾Æ¤­ÉÕ¤«¤»¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a spell, burning %s%s eyes.", m_name, t_name,
-                                          (streq(t_name, "it") ? "s" : "'s"));
-#endif
+                               _(msg_format("%s¤Ï¼öʸ¤ò¾§¤¨¤Æ%s¤ÎÌܤò¾Æ¤­ÉÕ¤«¤»¤¿¡£", m_name, t_name),
+                                 msg_format("%^s casts a spell, burning %s%s eyes.", m_name, t_name,
+                                                (streq(t_name, "it") ? "s" : "'s")));
 
                        }
                        else
@@ -2753,32 +2320,17 @@ bool monst_spell_monst(int m_idx)
                /* Simulate blindness with confusion */
                if (tr_ptr->flags3 & RF3_NO_CONF)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s is unaffected.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", "%^s is unaffected."), t_name);
                }
                else if (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s is unaffected.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", "%^s is unaffected."), t_name);
                }
                else
                {
-#ifdef JP
-                       if (see_t)   msg_format("%^s¤ÏÌܤ¬¸«¤¨¤Ê¤¯¤Ê¤Ã¤¿¡ª ", t_name);
-#else
-                       if (see_t) msg_format("%^s is blinded!", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤ÏÌܤ¬¸«¤¨¤Ê¤¯¤Ê¤Ã¤¿¡ª ", "%^s is blinded!"), t_name);
 
-                       t_ptr->confused += 12 + (byte)randint0(4);
+                       (void)set_monster_confused(t_idx, MON_CONFUSED(t_ptr) + 12 + randint0(4));
                }
 
                wake_up = TRUE;
@@ -2791,12 +2343,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤ÎÁ°¤Ë¸¸ÏÇŪ¤Ê¸¸¤ò¤Ä¤¯¤ê½Ð¤·¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s casts a mesmerizing illusion in front of %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤ÎÁ°¤Ë¸¸ÏÇŪ¤Ê¸¸¤ò¤Ä¤¯¤ê½Ð¤·¤¿¡£",
+                                                "%^s casts a mesmerizing illusion in front of %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2806,32 +2354,20 @@ bool monst_spell_monst(int m_idx)
 
                if (tr_ptr->flags3 & RF3_NO_CONF)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤ÏÏǤ蘆¤ì¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s disbelieves the feeble spell.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤ÏÏǤ蘆¤ì¤Ê¤«¤Ã¤¿¡£",
+                                                   "%^s disbelieves the feeble spell."), t_name);
                }
                else if (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤ÏÏǤ蘆¤ì¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s disbelieves the feeble spell.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤ÏÏǤ蘆¤ì¤Ê¤«¤Ã¤¿¡£",
+                                                   "%^s disbelieves the feeble spell."), t_name);
                }
                else
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ïº®Í𤷤¿¤è¤¦¤À¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s seems confused.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤Ïº®Í𤷤¿¤è¤¦¤À¡£",
+                                                   "%^s seems confused."), t_name);
 
-                       t_ptr->confused += 12 + (byte)randint0(4);
+                       (void)set_monster_confused(t_idx, MON_CONFUSED(t_ptr) + 12 + randint0(4));
                }
 
                wake_up = TRUE;
@@ -2844,13 +2380,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%s¤¬%s¤Î¶ÚÆù¤«¤éÎϤòµÛ¤¤¤È¤Ã¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s drains power from %s%s muscles.", m_name, t_name,
-                                          (streq(t_name, "it") ? "s" : "'s"));
-#endif
-
+                               _(msg_format("%s¤¬%s¤Î¶ÚÆù¤«¤éÎϤòµÛ¤¤¤È¤Ã¤¿¡£", m_name, t_name),
+                                 msg_format("%^s drains power from %s%s muscles.", m_name, t_name,
+                                          (streq(t_name, "it") ? "s" : "'s")));
                        }
                        else
                        {
@@ -2860,34 +2392,21 @@ bool monst_spell_monst(int m_idx)
 
                if (tr_ptr->flags1 & RF1_UNIQUE)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s is unaffected.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£",
+                                                   "%^s is unaffected."), t_name);
                }
                else if (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s is unaffected.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£",
+                                                   "%^s is unaffected."), t_name);
                }
                else
                {
-                       if (!t_ptr->slow)
+                       if (set_monster_slow(t_idx, MON_SLOW(t_ptr) + 50))
                        {
-#ifdef JP
-                               if (see_t) msg_format("%s¤ÎÆ°¤­¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£", t_name);
-#else
-                               if (see_t) msg_format("%^s starts moving slower.", t_name);
-#endif
+                               if (see_t) msg_format(_("%s¤ÎÆ°¤­¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£",
+                                                           "%^s starts moving slower."), t_name);
                        }
-
-                       t_ptr->slow = MIN(200, t_ptr->slow + 50);
                }
 
                wake_up = TRUE;
@@ -2900,12 +2419,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤Ï%s¤ò¤¸¤Ã¤È¸«¤Ä¤á¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s stares intently at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤Ï%s¤ò¤¸¤Ã¤È¸«¤Ä¤á¤¿¡£", "%^s stares intently at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -2916,32 +2430,17 @@ bool monst_spell_monst(int m_idx)
                if ((tr_ptr->flags1 & RF1_UNIQUE) ||
                    (tr_ptr->flags3 & RF3_NO_STUN))
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s is unaffected.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", "%^s is unaffected."), t_name);
                }
                else if (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s is unaffected.", t_name);
-#endif
-
+                       if (see_t) msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", "%^s is unaffected."), t_name);
                }
                else
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤ÏËãá㤷¤¿¡ª", t_name);
-#else
-                       if (see_t) msg_format("%^s is paralyzed!", t_name);
-#endif
+                       if (see_t) msg_format(_("%^s¤ÏËãá㤷¤¿¡ª", "%^s is paralyzed!"), t_name);
 
-
-                       t_ptr->stunned += randint1(4) + 4;
+                       (void)set_monster_stunned(t_idx, MON_STUNNED(t_ptr) + randint1(4) + 4);
                }
 
                wake_up = TRUE;
@@ -2955,12 +2454,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬¼«Ê¬¤ÎÂΤËÇ°¤òÁ÷¤Ã¤¿¡£", m_name);
-#else
-                               msg_format("%^s concentrates on %s body.", m_name, m_poss);
-#endif
-
+                               msg_format(_("%^s¤¬¼«Ê¬¤ÎÂΤËÇ°¤òÁ÷¤Ã¤¿¡£", "%^s concentrates on %s body."), m_name);
                        }
                        else
                        {
@@ -2969,17 +2463,10 @@ bool monst_spell_monst(int m_idx)
                }
 
                /* Allow quick speed increases to base+10 */
-               if (!m_ptr->fast)
+               if (set_monster_fast(m_idx, MON_FAST(m_ptr) + 100))
                {
-#ifdef JP
-                       if (see_m) msg_format("%^s¤ÎÆ°¤­¤¬Â®¤¯¤Ê¤Ã¤¿¡£", m_name);
-#else
-                       if (see_m) msg_format("%^s starts moving faster.", m_name);
-#endif
-
+                       if (see_m) msg_format(_("%^s¤ÎÆ°¤­¤¬Â®¤¯¤Ê¤Ã¤¿¡£", "%^s starts moving faster."), m_name);
                }
-               m_ptr->fast = MIN(200, m_ptr->fast + 100);
-               if (p_ptr->riding == m_idx) p_ptr->update |= PU_BONUS;
                break;
 
        /* RF6_HAND_DOOM */
@@ -2988,12 +2475,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë<ÇËÌǤμê>¤òÊü¤Ã¤¿¡ª", m_name, t_name);
-#else
-                               msg_format("%^s invokes the Hand of Doom upon %s!", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë<ÇËÌǤμê>¤òÊü¤Ã¤¿¡ª", "%^s invokes the Hand of Doom upon %s!"), m_name, t_name);
                        }
                        else
                        {
@@ -3001,42 +2483,8 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flagsr & RFR_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flagsr & RFR_RES_ALL)
-                       {
-                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª", t_name);
-#else
-                       if (see_both) msg_format("^%s is unaffected!", t_name);
-#endif
-
-               }
-               else
-               {
-                       if ((r_ptr->level + randint1(20)) >
-                           (tr_ptr->level + 10 + randint1(20)))
-                       {
-                               t_ptr->hp = t_ptr->hp -
-                                       (((s32b)((40 + randint1(20)) * t_ptr->hp)) / 100);
-
-                               if (t_ptr->hp < 1) t_ptr->hp = 1;
-                       }
-                       else
-                       {
-#ifdef JP
-                               if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                               if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-                       }
-               }
-
-               wake_up = TRUE;
+               dam = 20; /* Dummy power */
+               monst_breath_monst(m_idx, y, x, GF_HAND_DOOM, dam, 0, FALSE, MS_HAND_DOOM);
 
                break;
 
@@ -3046,12 +2494,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤Ï¼«Ê¬¤Î½ý¤ËÇ°¤ò½¸Ã椷¤¿¡£", m_name);
-#else
-                               msg_format("%^s concentrates on %s wounds.", m_name, m_poss);
-#endif
-
+                               msg_format(_("%^s¤Ï¼«Ê¬¤Î½ý¤ËÇ°¤ò½¸Ã椷¤¿¡£", "%^s concentrates on %s wounds."), m_name);
                        }
                        else
                        {
@@ -3072,12 +2515,7 @@ bool monst_spell_monst(int m_idx)
                        {
                                if (see_m)
                                {
-#ifdef JP
-                                       msg_format("%^s¤Ï´°Á´¤Ë¼£¤Ã¤¿¡ª", m_name);
-#else
-                                       msg_format("%^s looks completely healed!", m_name);
-#endif
-
+                                       msg_format(_("%^s¤Ï´°Á´¤Ë¼£¤Ã¤¿¡ª", "%^s looks completely healed!"), m_name);
                                }
                                else
                                {
@@ -3091,12 +2529,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤ÏÂÎÎϤò²óÉü¤·¤¿¤è¤¦¤À¡£", m_name);
-#else
-                               msg_format("%^s looks healthier.", m_name);
-#endif
-
+                               msg_format(_("%^s¤ÏÂÎÎϤò²óÉü¤·¤¿¤è¤¦¤À¡£", "%^s looks healthier."), m_name);
                        }
                        else
                        {
@@ -3109,18 +2542,13 @@ bool monst_spell_monst(int m_idx)
                if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
 
                /* Cancel fear */
-               if (m_ptr->monfear)
+               if (MON_MONFEAR(m_ptr))
                {
                        /* Cancel fear */
-                       m_ptr->monfear = 0;
+                       (void)set_monster_monfear(m_idx, 0);
 
                        /* Message */
-#ifdef JP
-                       if (see_m) msg_format("%^s¤Ïͦµ¤¤ò¼è¤êÌᤷ¤¿¡£", m_name);
-#else
-                       if (see_m) msg_format("%^s recovers %s courage.", m_name, m_poss);
-#endif
-
+                       if (see_m) msg_format(_("%^s¤Ïͦµ¤¤ò¼è¤êÌᤷ¤¿¡£", "%^s recovers %s courage."), m_name);
                }
 
                break;
@@ -3131,13 +2559,8 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-                               disturb(1, 0);
-#ifdef JP
-                               msg_format("%s¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
-                               msg_format("%^s casts a Globe of Invulnerability.", m_name);
-#endif
-
+                               disturb(1, 1);
+                               msg_format(_("%s¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a Globe of Invulnerability."), m_name);
                        }
                        else
                        {
@@ -3145,77 +2568,44 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               if (!m_ptr->invulner) m_ptr->invulner = randint1(4) + 4;
-
-               if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
-               if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
+               if (!MON_INVULNER(m_ptr)) (void)set_monster_invulner(m_idx, randint1(4) + 4, FALSE);
                break;
 
        /* RF6_BLINK */
        case 160+4:
-               if (see_m)
+               if (teleport_barrier(m_idx))
+               {
+                       if (see_m)
+                       {
+                               msg_format(_("ËâË¡¤Î¥Ð¥ê¥¢¤¬%^s¤Î¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤷¤¿¡£", "Magic barrier obstructs teleporting of %^s."), m_name);
+                       }
+               }
+               else
                {
-#ifdef JP
-                       msg_format("%^s¤¬½Ö»þ¤Ë¾Ã¤¨¤¿¡£", m_name);
-#else
-                       msg_format("%^s blinks away.", m_name);
-#endif
-
+                       if (see_m)
+                       {
+                               msg_format(_("%^s¤¬½Ö»þ¤Ë¾Ã¤¨¤¿¡£", "%^s blinks away."), m_name);
+                       }
+                       teleport_away(m_idx, 10, 0L);
                }
-
-               teleport_away(m_idx, 10, FALSE);
-
                break;
 
        /* RF6_TPORT */
        case 160+5:
-               if (see_m)
+               if (teleport_barrier(m_idx))
                {
-#ifdef JP
-                       msg_format("%^s¤¬¥Æ¥ì¥Ý¡¼¥È¤·¤¿¡£", m_name);
-#else
-                       msg_format("%^s teleports away.", m_name);
-#endif
+                       if (see_m)
+                       {
+                               msg_format(_("ËâË¡¤Î¥Ð¥ê¥¢¤¬%^s¤Î¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤷¤¿¡£", "Magic barrier obstructs teleporting of %^s."), m_name);
+                       }
                }
-
-               teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE);
-
-               if (los(py, px, m_ptr->fy, m_ptr->fx) && !world_monster && see_m)
+               else
                {
-                       for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
+                       if (see_m)
                        {
-                               u32b flgs[TR_FLAG_SIZE];
-                               object_type *o_ptr = &inventory[i];
-
-                               if (cursed_p(o_ptr)) continue;
-
-                               object_flags(o_ptr, flgs);
-
-                               if((have_flag(flgs, TR_TELEPORT)) || (p_ptr->muta1 & MUT1_VTELEPORT) || (p_ptr->pclass == CLASS_IMITATOR))
-                               {
-#ifdef JP
-                                       cptr msg = "¤Ä¤¤¤Æ¤¤¤­¤Þ¤¹¤«¡©";
-#else
-                                       cptr msg = "Do you follow it? ";
-#endif
-
-                                       if(get_check_strict(msg, CHECK_OKAY_CANCEL))
-                                       {
-                                               if (one_in_(3))
-                                               {
-                                                       teleport_player(200);
-#ifdef JP
-                                                       msg_print("¼ºÇÔ¡ª");
-#else
-                                                       msg_print("Failed!");
-#endif
-                                               }
-                                               else teleport_player_to(m_ptr->fy, m_ptr->fx, TRUE);
-                                               p_ptr->energy_need = ENERGY_NEED();
-                                       }
-                                       break;
-                               }
+                               msg_format(_("%^s¤¬¥Æ¥ì¥Ý¡¼¥È¤·¤¿¡£", "%^s teleports away."), m_name);
                        }
+                       teleport_away_followable(m_idx);
                }
                break;
 
@@ -3226,7 +2616,7 @@ bool monst_spell_monst(int m_idx)
                if(m_ptr->r_idx = MON_DIO) who == 1;
                else if(m_ptr->r_idx = MON_WONG) who == 3;
                dam = who;
-               if(!process_the_world(randint1(2)+2, who, los(py, px, m_ptr->fy, m_ptr->fx))) return (FALSE);
+               if(!process_the_world(randint1(2)+2, who, player_has_los_bold(m_ptr->fy, m_ptr->fx))) return (FALSE);
 #endif
                return FALSE;
 
@@ -3238,6 +2628,35 @@ bool monst_spell_monst(int m_idx)
                        /* Moved to process_monster(), like multiplication */
                        return FALSE;
 
+               case MON_ROLENTO:
+                       if (known)
+                       {
+                               if (see_either)
+                               {
+                                       disturb(1, 1);
+
+                                       msg_format(_("%^s¤Ï¼êÜØÃƤò¤Ð¤é¤Þ¤¤¤¿¡£", "%^s throws some hand grenades."), m_name);
+                               }
+                               else
+                               {
+                                       mon_fight = TRUE;
+                               }
+                       }
+
+                       {
+                               int num = 1 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_named_creature(m_idx, y, x, MON_SHURYUUDAN, 0);
+                               }
+                       }
+
+                       if (known && !see_t && count)
+                       {
+                               mon_fight = TRUE;
+                       }
+                       break;
+
                default:
                        if (r_ptr->d_char == 'B')
                        {
@@ -3245,14 +2664,10 @@ bool monst_spell_monst(int m_idx)
                                {
                                        if (see_m)
                                        {
-#ifdef JP
-                                               msg_format("%^s¤ÏÆÍÁ³µÞ¾å¾º¤·¤Æ»ë³¦¤«¤é¾Ã¤¨¤¿!", m_name);
-#else
-                                               msg_format("%^s suddenly go out of your sight!", m_name);
-#endif
+                                               msg_format(_("%^s¤ÏÆÍÁ³µÞ¾å¾º¤·¤Æ»ë³¦¤«¤é¾Ã¤¨¤¿!", "%^s suddenly go out of your sight!"), m_name);
                                        }
-                                       teleport_away(m_idx, 10, FALSE);
-                                       p_ptr->update |= (PU_MONSTERS | PU_MON_LITE);
+                                       teleport_away(m_idx, 10, TELEPORT_NONMAGICAL);
+                                       p_ptr->update |= (PU_MONSTERS);
                                }
                                else
                                {
@@ -3260,12 +2675,7 @@ bool monst_spell_monst(int m_idx)
                                        {
                                                if (see_either)
                                                {
-#ifdef JP
-                                                       msg_format("%^s¤¬%s¤òÄϤó¤Ç¶õÃ椫¤éÅꤲÍ¤¿¡£", m_name, t_name);
-#else
-                                                       msg_format("%^s holds %s, and drops from the sky.", m_name, t_name);
-#endif
-
+                                                       msg_format(_("%^s¤¬%s¤òÄϤó¤Ç¶õÃ椫¤éÅꤲÍî¤È¤·¤¿¡£", "%^s holds %s, and drops from the sky."), m_name, t_name);
                                                }
                                                else
                                                {
@@ -3275,28 +2685,46 @@ bool monst_spell_monst(int m_idx)
 
                                        dam = damroll(4, 8);
 
-                                       if (t_idx == p_ptr->riding) teleport_player_to(m_ptr->fy, m_ptr->fx, FALSE);
-                                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100);
+                                       if (t_idx == p_ptr->riding) teleport_player_to(m_ptr->fy, m_ptr->fx, TELEPORT_NONMAGICAL | TELEPORT_PASSIVE);
+                                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100, TELEPORT_NONMAGICAL | TELEPORT_PASSIVE);
+
+                                       sound(SOUND_FALL);
 
                                        if (tr_ptr->flags7 & RF7_CAN_FLY)
                                        {
-#ifdef JP
-                                               if (see_t) msg_format("%^s¤ÏÀŤ«¤ËÃåÃϤ·¤¿¡£", t_name);
-#else
-                                               if (see_t) msg_format("%^s floats gently down to the ground.", t_name);
-#endif
+                                               if (see_t) msg_format(_("%^s¤ÏÀŤ«¤ËÃåÃϤ·¤¿¡£", "%^s floats gently down to the ground."), t_name);
                                        }
                                        else
                                        {
-#ifdef JP
-                                               if (see_t) msg_format("%^s¤ÏÃÏÌ̤Ë᤭¤Ä¤±¤é¤ì¤¿¡£", t_name);
-#else
-                                               if (see_t) msg_format("%^s crashed into the ground.", t_name);
-#endif
+                                               if (see_t) msg_format(_("%^s¤ÏÃÏÌ̤Ë᤭¤Ä¤±¤é¤ì¤¿¡£", "%^s crashed into the ground."), t_name);
+
                                                dam += damroll(6, 8);
                                        }
 
-                                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
+                                       if (p_ptr->riding == t_idx)
+                                       {
+                                               int get_damage = 0;
+
+                                               /* Mega hack -- this special action deals damage to the player. Therefore the code of "eyeeye" is necessary.
+                                                  -- henkma
+                                                */
+                                               get_damage = take_hit(DAMAGE_NOESCAPE, dam, m_name, -1);
+                                               if (p_ptr->tim_eyeeye && get_damage > 0 && !p_ptr->is_dead)
+                                               {
+                                                       char m_name_self[80];
+
+                                                       /* hisself */
+                                                       monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
+
+                                                       _(msg_format("¹¶·â¤¬%s¼«¿È¤ò½ý¤Ä¤±¤¿¡ª", m_name),
+                                                         msg_format("The attack of %s has wounded %s!", m_name, m_name_self));
+
+                                                       project(0, 0, m_ptr->fy, m_ptr->fx, get_damage, GF_MISSILE, PROJECT_KILL, -1);
+                                                       set_tim_eyeeye(p_ptr->tim_eyeeye-5, TRUE);
+                                               }
+                                       }
+
+                                       mon_take_hit_mon(t_idx, dam, &fear, extract_note_dies(real_r_ptr(t_ptr)), m_idx);
                                }
                                break;
                        }
@@ -3314,12 +2742,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤ò°ú¤­Ìᤷ¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s commands %s to return.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤ò°ú¤­Ìᤷ¤¿¡£", "%^s commands %s to return."), m_name, t_name);
                        }
                        else
                        {
@@ -3331,30 +2754,20 @@ bool monst_spell_monst(int m_idx)
                {
                        if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flagsr & RFR_RES_ALL))
                        {
+                               if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
                                if (see_t)
                                {
-                                       if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
-#ifdef JP
-                                       msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                                       msg_format("%^s is unaffected!", t_name);
-#endif
-
+                                       msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", "%^s is unaffected!"), t_name);
                                }
 
                                resists_tele = TRUE;
                        }
                        else if (tr_ptr->level > randint1(100))
                        {
+                               if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
                                if (see_t)
                                {
-                                       if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
-#ifdef JP
-                                       msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                                       msg_format("%^s resists!", t_name);
-#endif
-
+                                       msg_format(_("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", "%^s resists!"), t_name);
                                }
 
                                resists_tele = TRUE;
@@ -3363,8 +2776,8 @@ bool monst_spell_monst(int m_idx)
 
                if (!resists_tele)
                {
-                       if (t_idx == p_ptr->riding) teleport_player_to(m_ptr->fy, m_ptr->fx, TRUE);
-                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100);
+                       if (t_idx == p_ptr->riding) teleport_player_to(m_ptr->fy, m_ptr->fx, TELEPORT_PASSIVE);
+                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100, TELEPORT_PASSIVE);
                }
 
                wake_up = TRUE;
@@ -3376,12 +2789,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤Ï%s¤ò¥Æ¥ì¥Ý¡¼¥È¤µ¤»¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s teleports %s away.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤Ï%s¤ò¥Æ¥ì¥Ý¡¼¥È¤µ¤»¤¿¡£", "%^s teleports %s away."), m_name, t_name);
                        }
                        else
                        {
@@ -3393,30 +2801,20 @@ bool monst_spell_monst(int m_idx)
                {
                        if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flagsr & RFR_RES_ALL))
                        {
+                               if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
                                if (see_t)
                                {
-                                       if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
-#ifdef JP
-                                       msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                                       msg_format("%^s is unaffected!", t_name);
-#endif
-
+                                       msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", "%^s is unaffected!"), t_name);
                                }
 
                                resists_tele = TRUE;
                        }
                        else if (tr_ptr->level > randint1(100))
                        {
+                               if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
                                if (see_t)
                                {
-                                       if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
-#ifdef JP
-                                       msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                                       msg_format("%^s resists!", t_name);
-#endif
-
+                                       msg_format(_("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", "%^s resists!"), t_name);
                                }
 
                                resists_tele = TRUE;
@@ -3425,8 +2823,8 @@ bool monst_spell_monst(int m_idx)
 
                if (!resists_tele)
                {
-                       if (t_idx == p_ptr->riding) teleport_player(MAX_SIGHT * 2 + 5);
-                       else teleport_away(t_idx, MAX_SIGHT * 2 + 5, FALSE);
+                       if (t_idx == p_ptr->riding) teleport_player_away(m_idx, MAX_SIGHT * 2 + 5);
+                       else teleport_away(t_idx, MAX_SIGHT * 2 + 5, TELEPORT_PASSIVE);
                }
 
                wake_up = TRUE;
@@ -3438,11 +2836,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Î­¤ò»Ø¤µ¤·¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s gestures at %s's feet.", m_name, t_name);
-#endif
+                               msg_format(_("%^s¤¬%s¤Î­¤ò»Ø¤µ¤·¤¿¡£", "%^s gestures at %s's feet."), m_name, t_name);
                        }
                        else
                        {
@@ -3452,20 +2846,12 @@ bool monst_spell_monst(int m_idx)
 
                if (tr_ptr->flagsr & (RFR_EFF_RES_NEXU_MASK | RFR_RES_TELE))
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                       if (see_t) msg_format("%^s is unaffected!", t_name);
-#endif
+                       if (see_t) msg_format(_("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", "%^s is unaffected!"), t_name);
                }
                else if ((tr_ptr->flags1 & RF1_QUESTOR) ||
                            (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10))
                {
-#ifdef JP
-                       if (see_t) msg_format("%^s¤Ï¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª", t_name);
-#else
-                       if (see_t) msg_format("%^s resist the effects!", t_name);
-#endif
+                       if (see_t) msg_format(_("%^s¤Ï¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª", "%^s resist the effects!"), t_name);
                }
                else teleport_level((t_idx == p_ptr->riding) ? 0 : t_idx);
 
@@ -3478,12 +2864,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¸÷¤Î·õ¤òÊü¤Ã¤¿¡£", m_name, t_name);
-#else
-                               msg_format("%^s throw a Psycho-spear at %s.", m_name, t_name);
-#endif
-
+                               msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¸÷¤Î·õ¤òÊü¤Ã¤¿¡£", "%^s throw a Psycho-spear at %s."), m_name, t_name);
                        }
                        else
                        {
@@ -3492,8 +2873,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = (r_ptr->flags2 & RF2_POWERFUL) ? (randint1(rlev * 2) + 180) : (randint1(rlev * 3 / 2) + 120);
-               monst_beam_monst(m_idx, y, x, GF_PSY_SPEAR,
-                                dam, MS_PSY_SPEAR, learnable);
+               monst_beam_monst(m_idx, y, x, GF_PSY_SPEAR, dam, MS_PSY_SPEAR);
                break;
 
        /* RF6_DARKNESS */
@@ -3502,21 +2882,25 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬°Å°Ç¤ÎÃæ¤Ç¼ê¤ò¿¶¤Ã¤¿¡£", m_name);
-#else
-                               msg_format("%^s gestures in shadow.", m_name);
-#endif
-
+                               if (can_use_lite_area)
+                               {
+                                       msg_format(_("%^s¤¬ÊÕ¤ê¤òÌÀ¤ë¤¯¾È¤é¤·¤¿¡£", "%^s cast a spell to light up."), m_name);
+                               }
+                               else
+                               {
+                                       msg_format(_("%^s¤¬°Å°Ç¤ÎÃæ¤Ç¼ê¤ò¿¶¤Ã¤¿¡£", "%^s gestures in shadow."), m_name);
+                               }
 
                                if (see_t)
                                {
-#ifdef JP
-                                       msg_format("%^s¤Ï°Å°Ç¤ËÊñ¤Þ¤ì¤¿¡£", t_name);
-#else
-                                       msg_format("%^s is surrounded by darkness.", t_name);
-#endif
-
+                                       if (can_use_lite_area)
+                                       {
+                                               msg_format(_("%^s¤ÏÇò¤¤¸÷¤ËÊñ¤Þ¤ì¤¿¡£", "%^s is surrounded by a white light."), t_name);
+                                       }
+                                       else
+                                       {
+                                               msg_format(_("%^s¤Ï°Å°Ç¤ËÊñ¤Þ¤ì¤¿¡£", "%^s is surrounded by darkness."), t_name);
+                                       }
                                }
                        }
                        else
@@ -3525,9 +2909,16 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               (void)project(m_idx, 3, y, x, 0, GF_DARK_WEAK, PROJECT_GRID | PROJECT_KILL | PROJECT_MONSTER, MS_DARKNESS);
-
-               unlite_room(y, x);
+               if (can_use_lite_area)
+               {
+                       (void)project(m_idx, 3, y, x, 0, GF_LITE_WEAK, PROJECT_GRID | PROJECT_KILL, -1);
+                       lite_room(y, x);
+               }
+               else
+               {
+                       (void)project(m_idx, 3, y, x, 0, GF_DARK_WEAK, PROJECT_GRID | PROJECT_KILL, MS_DARKNESS);
+                       unlite_room(y, x);
+               }
 
                break;
 
@@ -3538,25 +2929,21 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-#ifdef JP
-                               msg_format("%^s¤¬¼öʸ¤ò¾§¤¨¤Æ¼Ù°­¤ËÈù¾Ð¤ó¤À¡£", m_name);
-#else
-                               msg_format("%^s casts a spell and cackles evilly.", m_name);
-#endif
+                               msg_format(_("%^s¤¬¼öʸ¤ò¾§¤¨¤Æ¼Ù°­¤ËÈù¾Ð¤ó¤À¡£", "%^s casts a spell and cackles evilly."), m_name);
                        }
                        else
                        {
-#ifdef JP
-                               msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
-#else
-                               msg_format("%^s mumbles.", m_name);
-#endif
+                               msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
                        }
                }
 
                trap_creation(y, x);
-#endif
+
                break;
+#else
+               /* Not implemented */
+               return FALSE;
+#endif
 
        /* RF6_FORGET */
        case 160+14:
@@ -3569,18 +2956,15 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-#ifdef JP
-                               if (blind) 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 spell to revive corpses.", m_name);
-#endif
+                               disturb(1, 1);
+                               if (blind)
+                               {
+                                       msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
+                               }
+                               else
+                               {
+                                       msg_format(_("%^s¤¬»à¼ÔÉü³è¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a spell to revive corpses."), m_name);
+                               }
                        }
                        else
                        {
@@ -3590,41 +2974,22 @@ bool monst_spell_monst(int m_idx)
                animate_dead(m_idx, m_ptr->fy, m_ptr->fx);
                break;
 
-       /* RF6_SUMMON_KIN */
+       /* RF6_S_KIN */
        case 160+16:
                if (known)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
-                               if (m_ptr->r_idx == MON_ROLENTO)
-                               {
-#ifdef JP
-                                       msg_format("%^s¤Ï¼êÜØÃƤò¤Ð¤é¤Þ¤¤¤¿¡£",
-                                                  m_name);
-#else
-                                       msg_format("%^s throws some hand grenades.",
-                                                  m_name);
-#endif
-                               }
-                               else if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
+                               if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
                                {
-#ifdef JP
-                                       msg_format("%^s¤¬¥À¥ó¥¸¥ç¥ó¤Î¼ç¤ò¾¤´­¤·¤¿¡£", m_name);
-#else
-                                       msg_format("%^s magically summons guardians of dungeons.", m_name);
-#endif
+                                       msg_format(_("%^s¤¬¥À¥ó¥¸¥ç¥ó¤Î¼ç¤ò¾¤´­¤·¤¿¡£", "%^s magically summons guardians of dungeons."), m_name);
                                }
                                else
                                {
-#ifdef JP
-                                       msg_format("%s¤¬ËâË¡¤Ç%s¤ò¾¤´­¤·¤¿¡£", m_name,
-                                                  ((r_ptr->flags1 & RF1_UNIQUE) ? "¼ê²¼" : "Ãç´Ö"));
-#else
-                                       msg_format("%^s magically summons %s %s.", m_name, m_poss,
-                                                  ((r_ptr->flags1 & RF1_UNIQUE) ? "minions" : "kin"));
-#endif
+                                       _(msg_format("%s¤¬ËâË¡¤Ç%s¤ò¾¤´­¤·¤¿¡£", m_name, ((r_ptr->flags1 & RF1_UNIQUE) ? "¼ê²¼" : "Ãç´Ö")),   
+                                         msg_format("%^s magically summons %s %s.", m_name, m_poss, ((r_ptr->flags1 & RF1_UNIQUE) ? "minions" : "kin")));
                                }
 
                        }
@@ -3634,64 +2999,78 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               if(m_ptr->r_idx == MON_ROLENTO)
+               switch (m_ptr->r_idx)
                {
-                       int num = 1 + randint1(3);
-                       for (k = 0; k < num; k++)
+               case MON_MENELDOR:
+               case MON_GWAIHIR:
+               case MON_THORONDOR:
                        {
-                               count += summon_named_creature(m_idx, y, x, MON_SHURYUUDAN, p_mode);
+                               int num = 4 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_specific(m_idx, y, x, rlev, SUMMON_EAGLES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+                               }
                        }
-               }
-               else if(m_ptr->r_idx == MON_THORONDOR ||
-                       m_ptr->r_idx == MON_GWAIHIR ||
-                       m_ptr->r_idx == MON_MENELDOR)
-               {
-                       int num = 4 + randint1(3);
-                       for (k = 0; k < num; k++)
+                       break;
+
+               case MON_BULLGATES:
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_EAGLES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | p_mode));
+                               int num = 2 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_named_creature(m_idx, y, x, MON_IE, 0);
+                               }
                        }
-               }
-               else if(m_ptr->r_idx == MON_LOUSY)
-               {
-                       int num = 2 + randint1(3);
-                       for (k = 0; k < num; k++)
+                       break;
+
+               case MON_SERPENT:
+               case MON_ZOMBI_SERPENT:
+                       if (r_info[MON_JORMUNGAND].cur_num < r_info[MON_JORMUNGAND].max_num && one_in_(6))
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_LOUSE, (PM_ALLOW_GROUP | p_mode));
+                               if (known && see_t)
+                               {
+                                       msg_print(_("ÃÏÌ̤«¤é¿å¤¬¿á¤­½Ð¤·¤¿¡ª", "Water blew off from the ground!"));
+                               }
+                               project(t_idx, 8, y, x, 3, GF_WATER_FLOW, PROJECT_GRID | PROJECT_HIDE, -1);
                        }
-               }
-               else if(m_ptr->r_idx == MON_BULLGATES)
-               {
-                       int num = 2 + randint1(3);
-                       for (k = 0; k < num; k++)
+
                        {
-                               count += summon_named_creature(m_idx, y, x, 921, p_mode);
+                               int num = 2 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_specific(m_idx, y, x, rlev, SUMMON_GUARDIANS, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+                               }
                        }
-               }
-               else if (m_ptr->r_idx == MON_CALDARM)
-               {
-                       int num = randint1(3);
-                       for (k = 0; k < num; k++)
+                       break;
+
+               case MON_CALDARM:
                        {
-                               count += summon_named_creature(m_idx, y, x, 930, p_mode);
+                               int num = randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_named_creature(m_idx, y, x, MON_LOCKE_CLONE, 0);
+                               }
                        }
-               }
-               else if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
-               {
-                       int num = 2 + randint1(3);
-                       for (k = 0; k < num; k++)
+                       break;
+
+               case MON_LOUSY:
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_GUARDIANS, (PM_ALLOW_GROUP | p_mode | PM_ALLOW_UNIQUE));
+                               int num = 2 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_specific(m_idx, y, x, rlev, SUMMON_LOUSE, (PM_ALLOW_GROUP));
+                               }
                        }
-               }
-               else
-               {
+                       break;
+
+               default:
                        summon_kin_type = r_ptr->d_char;
 
                        for (k = 0; k < 4; k++)
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_KIN, (PM_ALLOW_GROUP | p_mode));
+                               count += summon_specific(m_idx, y, x, rlev, SUMMON_KIN, (PM_ALLOW_GROUP));
                        }
+                       break;
                }
 
                if (known && !see_t && count)
@@ -3707,14 +3086,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons Cyberdemons!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª", "%^s magically summons Cyberdemons!"), m_name);
                        }
                        else
                        {
@@ -3724,7 +3098,7 @@ bool monst_spell_monst(int m_idx)
 
                if (is_friendly(m_ptr))
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_CYBER, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_CYBER, (PM_ALLOW_GROUP));
                }
                else
                {
@@ -3744,14 +3118,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤ÇÃç´Ö¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons help!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤ÇÃç´Ö¤ò¾¤´­¤·¤¿¡ª", "%^s magically summons help!"), m_name);
                        }
                        else
                        {
@@ -3759,7 +3128,7 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               count += summon_specific(m_idx, y, x, rlev, 0, (p_mode | u_mode));
+               count += summon_specific(m_idx, y, x, rlev, 0, (u_mode));
 
                if (known && !see_t && count)
                {
@@ -3774,14 +3143,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤Ç¥â¥ó¥¹¥¿¡¼¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons monsters!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤Ç¥â¥ó¥¹¥¿¡¼¤ò¾¤´­¤·¤¿¡ª", "%^s magically summons monsters!"), m_name);
                        }
                        else
                        {
@@ -3791,7 +3155,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_6; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, 0, (PM_ALLOW_GROUP | p_mode | u_mode));
+                       count += summon_specific(m_idx, y, x, rlev, 0, (PM_ALLOW_GROUP | u_mode));
                }
 
                if (known && !see_t && count)
@@ -3807,14 +3171,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤Ç¥¢¥ê¤ò¾¤´­¤·¤¿¡£", m_name);
-#else
-                               msg_format("%^s magically summons ants.", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤Ç¥¢¥ê¤ò¾¤´­¤·¤¿¡£", "%^s magically summons ants."), m_name);
                        }
                        else
                        {
@@ -3824,7 +3183,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_6; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_ANT, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_ANT, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3840,14 +3199,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤Ç¥¯¥â¤ò¾¤´­¤·¤¿¡£", m_name);
-#else
-                               msg_format("%^s magically summons spiders.", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤Ç¥¯¥â¤ò¾¤´­¤·¤¿¡£", "%^s magically summons spiders."), m_name);
                        }
                        else
                        {
@@ -3857,7 +3211,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_6; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_SPIDER, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_SPIDER, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3873,14 +3227,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤Ç¥Ï¥¦¥ó¥É¤ò¾¤´­¤·¤¿¡£", m_name);
-#else
-                               msg_format("%^s magically summons hounds.", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤Ç¥Ï¥¦¥ó¥É¤ò¾¤´­¤·¤¿¡£", "%^s magically summons hounds."), m_name);
                        }
                        else
                        {
@@ -3890,7 +3239,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HOUND, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HOUND, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3906,14 +3255,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤Ç¥Ò¥É¥é¤ò¾¤´­¤·¤¿¡£", m_name);
-#else
-                               msg_format("%^s magically summons hydras.", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤Ç¥Ò¥É¥é¤ò¾¤´­¤·¤¿¡£", "%^s magically summons hydras."), m_name);
                        }
                        else
                        {
@@ -3923,7 +3267,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HYDRA, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HYDRA, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3939,14 +3283,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤ÇÅ·»È¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons an angel!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤ÇÅ·»È¤ò¾¤´­¤·¤¿¡ª", "%^s magically summons an angel!"), m_name);
                        }
                        else
                        {
@@ -3964,7 +3303,7 @@ bool monst_spell_monst(int m_idx)
 
                        for (k = 0; k < num; k++)
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, (PM_ALLOW_GROUP | p_mode));
+                               count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, (PM_ALLOW_GROUP));
                        }
                }
 
@@ -3981,14 +3320,10 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤Çº®Æ٤εÜÄ¤é¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons a demon from the Courts of Chaos!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤Çº®Æ٤εÜÄ¤é¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª", 
+                                                "%^s magically summons a demon from the Courts of Chaos!"), m_name);
                        }
                        else
                        {
@@ -3998,7 +3333,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < 1; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_DEMON, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_DEMON, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -4014,14 +3349,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%s¤¬ËâË¡¤Ç¥¢¥ó¥Ç¥Ã¥É¤ò¾¤´­¤·¤¿¡£", m_name);
-#else
-                               msg_format("%^s magically summons undead.", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%s¤¬ËâË¡¤Ç¥¢¥ó¥Ç¥Ã¥É¤ò¾¤´­¤·¤¿¡£", "%^s magically summons undead."), m_name);
                        }
                        else
                        {
@@ -4031,7 +3361,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < 1; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_UNDEAD, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_UNDEAD, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -4047,14 +3377,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤Ç¥É¥é¥´¥ó¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons a dragon!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤Ç¥É¥é¥´¥ó¤ò¾¤´­¤·¤¿¡ª", "%^s magically summons a dragon!"), m_name);
                        }
                        else
                        {
@@ -4064,7 +3389,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < 1; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_DRAGON, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_DRAGON, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -4080,14 +3405,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%s¤¬ËâË¡¤Ç¥¢¥ó¥Ç¥Ã¥É¤ò¾¤´­¤·¤¿¡£", m_name);
-#else
-                               msg_format("%^s magically summons undead.", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%s¤¬ËâË¡¤Ç¥¢¥ó¥Ç¥Ã¥É¤ò¾¤´­¤·¤¿¡£", "%^s magically summons undead."), m_name);
                        }
                        else
                        {
@@ -4097,7 +3417,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_6; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, (PM_ALLOW_GROUP | p_mode | u_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, (PM_ALLOW_GROUP | u_mode));
                }
 
                if (known && !see_t && count)
@@ -4113,14 +3433,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤Ç¸ÅÂå¥É¥é¥´¥ó¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons ancient dragons!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤Ç¸ÅÂå¥É¥é¥´¥ó¤ò¾¤´­¤·¤¿¡ª", "%^s magically summons ancient dragons!"), m_name);
                        }
                        else
                        {
@@ -4130,7 +3445,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_DRAGON, (PM_ALLOW_GROUP | p_mode | u_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_DRAGON, (PM_ALLOW_GROUP | u_mode));
                }
 
                if (known && !see_t && count)
@@ -4146,14 +3461,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬¥¢¥ó¥Ð¡¼¤Î²¦Â²¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons Lords of Amber!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬¥¢¥ó¥Ð¡¼¤Î²¦Â²¤ò¾¤´­¤·¤¿¡ª", "%^s magically summons Lords of Amber!"), m_name);
                        }
                        else
                        {
@@ -4163,7 +3473,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_AMBERITES, (PM_ALLOW_GROUP | p_mode | PM_ALLOW_UNIQUE));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_AMBERITES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
                }
 
                if (known && !see_t && count)
@@ -4179,14 +3489,9 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
-
-#ifdef JP
-                               msg_format("%^s¤¬ËâË¡¤ÇÆÃÊ̤ʶ¯Å¨¤ò¾¤´­¤·¤¿¡ª", m_name);
-#else
-                               msg_format("%^s magically summons special opponents!", m_name);
-#endif
+                               disturb(1, 1);
 
+                               msg_format(_("%^s¤¬ËâË¡¤ÇÆÃÊ̤ʶ¯Å¨¤ò¾¤´­¤·¤¿¡ª", "%^s magically summons special opponents!"), m_name);
                        }
                        else
                        {
@@ -4196,7 +3501,21 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_UNIQUE, (PM_ALLOW_GROUP | p_mode | PM_ALLOW_UNIQUE));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_UNIQUE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+               }
+
+               {
+                       int non_unique_type = SUMMON_HI_UNDEAD;
+
+                       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++)
+                       {
+                               count += summon_specific(m_idx, y, x, rlev, non_unique_type, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+                       }
                }
 
                if (known && !see_t && count)
@@ -4207,22 +3526,14 @@ bool monst_spell_monst(int m_idx)
                break;
        }
 
-       if (wake_up)
-       {
-               t_ptr->csleep = 0;
-       }
+       if (wake_up) (void)set_monster_csleep(t_idx, 0);
 
        if (fear && see_t)
        {
-#ifdef JP
-               msg_format("%^s¤Ï¶²Éݤ·¤Æƨ¤²½Ð¤·¤¿¡ª", t_name);
-#else
-               msg_format("%^s flees in terror!", t_name);
-#endif
-
+               msg_format(_("%^s¤Ï¶²Éݤ·¤Æƨ¤²½Ð¤·¤¿¡ª", "%^s flees in terror!"), t_name);
        }
 
-       if (see_m && maneable && !world_monster && !p_ptr->blind && (p_ptr->pclass == CLASS_IMITATOR))
+       if (m_ptr->ml && maneable && !world_monster && !p_ptr->blind && (p_ptr->pclass == CLASS_IMITATOR))
        {
                if (thrown_spell != 167) /* Not RF6_SPECIAL */
                {
@@ -4240,12 +3551,12 @@ bool monst_spell_monst(int m_idx)
                        p_ptr->mane_num++;
                        new_mane = TRUE;
 
-                       p_ptr->redraw |= (PR_MANE);
+                       p_ptr->redraw |= (PR_IMITATION);
                }
        }
 
        /* Remember what the monster did, if we saw it */
-       if (see_m && is_original_ap(m_ptr))
+       if (can_remember)
        {
                /* Inate spell */
                if (thrown_spell < 32*4)