OSDN Git Service

[Refactor] #37353 spells1.c から spell-diceroll.c を分離。 / Separate spell-diceroll.c...
[hengband/hengband.git] / src / spells1.c
index 012f6e4..3a68fe5 100644 (file)
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
+#include "trap.h"
+#include "object-curse.h"
+#include "player-damage.h"
+
+#include "monster.h"
+#include "monster-status.h"
+#include "spells-diceroll.h"
+#include "spells-summon.h"
+#include "monsterrace-hook.h"
+
+#include "melee.h"
+#include "world.h"
+#include "projection.h"
+#include "mutation.h"
+#include "rooms.h"
+#include "artifact.h"
+#include "avatar.h"
+#include "player-status.h"
+#include "realm-hex.h"
 
-/* ToDo: Make this global */
-#define HURT_CHANCE 16 /*!< 属性攻撃を受けた際に能力値低下を起こす確率(1/X) / 1/x chance of reducing stats (for elemental attacks) */
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
 static int rakubadam_p; /*!< 落馬した際のダメージ量 */
@@ -22,6 +40,7 @@ static int rakubadam_p; /*!< 落馬した際のダメージ量 */
 int project_length = 0; /*!< 投射の射程距離 */
 
 
+
 /*!
  * @brief 配置した鏡リストの次を取得する /
  * Get another mirror. for SEEKER 
@@ -30,33 +49,33 @@ int project_length = 0; /*!< 投射の射程距離 */
  * @param cury 現在の鏡のy座標
  * @param curx 現在の鏡のx座標
  */
-static void next_mirror( int* next_y , int* next_x , int cury, int curx)
+static void next_mirror(POSITION* next_y, POSITION* next_x, POSITION cury, POSITION curx)
 {
-       int mirror_x[10],mirror_y[10]; /* 鏡はもっと少ない */
-       int mirror_num=0;              /* 鏡の数 */
-       int x,y;
+       POSITION mirror_x[10], mirror_y[10]; /* 鏡はもっと少ない */
+       int mirror_num = 0;                       /* 鏡の数 */
+       POSITION x, y;
        int num;
 
-       for( x=0 ; x < cur_wid ; x++ )
+       for (x = 0; x < cur_wid; x++)
        {
-               for( y=0 ; y < cur_hgt ; y++ )
+               for (y = 0; y < cur_hgt; y++)
                {
-                       if( is_mirror_grid(&cave[y][x])){
-                               mirror_y[mirror_num]=y;
-                               mirror_x[mirror_num]=x;
+                       if (is_mirror_grid(&cave[y][x])) {
+                               mirror_y[mirror_num] = y;
+                               mirror_x[mirror_num] = x;
                                mirror_num++;
                        }
                }
        }
-       if( mirror_num )
+       if (mirror_num)
        {
-               num=randint0(mirror_num);
-               *next_y=mirror_y[num];
-               *next_x=mirror_x[num];
+               num = randint0(mirror_num);
+               *next_y = mirror_y[num];
+               *next_x = mirror_x[num];
                return;
        }
-       *next_y=cury+randint0(5)-2;
-       *next_x=curx+randint0(5)-2;
+       *next_y = cury + randint0(5) - 2;
+       *next_x = curx + randint0(5) - 2;
        return;
 }
                
@@ -66,7 +85,7 @@ static void next_mirror( int* next_y , int* next_x , int cury, int curx)
  * @param max 色IDの最大値
  * @return 選択した色ID
  */
-static byte mh_attr(int max)
+static TERM_COLOR mh_attr(int max)
 {
        switch (randint1(max))
        {
@@ -97,7 +116,7 @@ static byte mh_attr(int max)
  * @param type 魔法属性
  * @return 対応する色ID
  */
-static byte spell_color(int type)
+static TERM_COLOR spell_color(int type)
 {
        /* Check if A.B.'s new graphics should be used (rr9) */
        if (streq(ANGBAND_GRAF, "new") || streq(ANGBAND_GRAF, "ne2"))
@@ -105,44 +124,44 @@ static byte spell_color(int type)
                /* Analyze */
                switch (type)
                {
-                       case GF_PSY_SPEAR:      return (0x06);
-                       case GF_MISSILE:        return (0x0F);
-                       case GF_ACID:           return (0x04);
-                       case GF_ELEC:           return (0x02);
-                       case GF_FIRE:           return (0x00);
-                       case GF_COLD:           return (0x01);
-                       case GF_POIS:           return (0x03);
-                       case GF_HOLY_FIRE:      return (0x00);
-                       case GF_HELL_FIRE:      return (0x00);
-                       case GF_MANA:           return (0x0E);
+                       case GF_PSY_SPEAR:              return (0x06);
+                       case GF_MISSILE:                return (0x0F);
+                       case GF_ACID:                   return (0x04);
+                       case GF_ELEC:                   return (0x02);
+                       case GF_FIRE:                   return (0x00);
+                       case GF_COLD:                   return (0x01);
+                       case GF_POIS:                   return (0x03);
+                       case GF_HOLY_FIRE:              return (0x00);
+                       case GF_HELL_FIRE:              return (0x00);
+                       case GF_MANA:                   return (0x0E);
                          /* by henkma */
-                       case GF_SEEKER:         return (0x0E);
-                       case GF_SUPER_RAY:      return (0x0E);
-
-                       case GF_ARROW:          return (0x0F);
-                       case GF_WATER:          return (0x04);
-                       case GF_NETHER:         return (0x07);
-                       case GF_CHAOS:          return (mh_attr(15));
-                       case GF_DISENCHANT:     return (0x05);
-                       case GF_NEXUS:          return (0x0C);
-                       case GF_CONFUSION:      return (mh_attr(4));
-                       case GF_SOUND:          return (0x09);
-                       case GF_SHARDS:         return (0x08);
-                       case GF_FORCE:          return (0x09);
-                       case GF_INERTIAL:        return (0x09);
-                       case GF_GRAVITY:        return (0x09);
-                       case GF_TIME:           return (0x09);
-                       case GF_LITE_WEAK:      return (0x06);
-                       case GF_LITE:           return (0x06);
-                       case GF_DARK_WEAK:      return (0x07);
-                       case GF_DARK:           return (0x07);
-                       case GF_PLASMA:         return (0x0B);
-                       case GF_METEOR:         return (0x00);
-                       case GF_ICE:            return (0x01);
-                       case GF_ROCKET:         return (0x0F);
-                       case GF_DEATH_RAY:      return (0x07);
-                       case GF_NUKE:           return (mh_attr(2));
-                       case GF_DISINTEGRATE:   return (0x05);
+                       case GF_SEEKER:                 return (0x0E);
+                       case GF_SUPER_RAY:              return (0x0E);
+
+                       case GF_ARROW:                  return (0x0F);
+                       case GF_WATER:                  return (0x04);
+                       case GF_NETHER:                 return (0x07);
+                       case GF_CHAOS:                  return (mh_attr(15));
+                       case GF_DISENCHANT:             return (0x05);
+                       case GF_NEXUS:                  return (0x0C);
+                       case GF_CONFUSION:              return (mh_attr(4));
+                       case GF_SOUND:                  return (0x09);
+                       case GF_SHARDS:                 return (0x08);
+                       case GF_FORCE:                  return (0x09);
+                       case GF_INERTIAL:               return (0x09);
+                       case GF_GRAVITY:                return (0x09);
+                       case GF_TIME:                   return (0x09);
+                       case GF_LITE_WEAK:              return (0x06);
+                       case GF_LITE:                   return (0x06);
+                       case GF_DARK_WEAK:              return (0x07);
+                       case GF_DARK:                   return (0x07);
+                       case GF_PLASMA:                 return (0x0B);
+                       case GF_METEOR:                 return (0x00);
+                       case GF_ICE:                    return (0x01);
+                       case GF_ROCKET:                 return (0x0F);
+                       case GF_DEATH_RAY:              return (0x07);
+                       case GF_NUKE:                   return (mh_attr(2));
+                       case GF_DISINTEGRATE:   return (0x05);
                        case GF_PSI:
                        case GF_PSI_DRAIN:
                        case GF_TELEKINESIS:
@@ -150,28 +169,27 @@ static byte spell_color(int type)
                        case GF_DRAIN_MANA:
                        case GF_MIND_BLAST:
                        case GF_BRAIN_SMASH:
-                                               return (0x09);
+                               return (0x09);
                        case GF_CAUSE_1:
                        case GF_CAUSE_2:
                        case GF_CAUSE_3:
-                       case GF_CAUSE_4:        return (0x0E);
-                       case GF_HAND_DOOM:      return (0x07);
-                       case GF_CAPTURE  :      return (0x0E);
-                       case GF_IDENTIFY:       return (0x01);
-                       case GF_ATTACK:        return (0x0F);
-                       case GF_PHOTO   :      return (0x06);
+                       case GF_CAUSE_4:                return (0x0E);
+                       case GF_HAND_DOOM:              return (0x07);
+                       case GF_CAPTURE  :              return (0x0E);
+                       case GF_IDENTIFY:               return (0x01);
+                       case GF_ATTACK:                 return (0x0F);
+                       case GF_PHOTO   :               return (0x06);
                }
        }
        /* Normal tiles or ASCII */
        else
        {
-               byte a;
-               char c;
+               TERM_COLOR a;
+               SYMBOL_CODE c;
 
                /* Lookup the default colors for this type */
-               cptr s = quark_str(gf_color[type]);
+               concptr s = quark_str(gf_color[type]);
 
-               /* Oops */
                if (!s) return (TERM_WHITE);
 
                /* Pick a random color */
@@ -208,14 +226,14 @@ static byte spell_color(int type)
  * If the distance is not "one", we (may) return "*".
  * </pre>
  */
-u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ)
+u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ)
 {
        int base;
 
        byte k;
 
-       byte a;
-       char c;
+       TERM_COLOR a;
+       SYMBOL_CODE c;
 
        /* No motion (*) */
        if ((ny == y) && (nx == x)) base = 0x30;
@@ -247,350 +265,6 @@ u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ)
 }
 
 
-/*!
- * @brief 始点から終点への経路を返す /
- * Determine the path taken by a projection.
- * @param gp 経路座標リストを返す参照ポインタ
- * @param range 距離
- * @param y1 始点Y座標
- * @param x1 始点X座標
- * @param y2 終点Y座標
- * @param x2 終点X座標
- * @param flg フラグID
- * @return リストの長さ
- * @details
- * <pre>
- * The projection will always start from the grid (y1,x1), and will travel
- * towards the grid (y2,x2), touching one grid per unit of distance along
- * the major axis, and stopping when it enters the destination grid or a
- * wall grid, or has travelled the maximum legal distance of "range".
- *
- * Note that "distance" in this function (as in the "update_view()" code)
- * is defined as "MAX(dy,dx) + MIN(dy,dx)/2", which means that the player
- * actually has an "octagon of projection" not a "circle of projection".
- *
- * The path grids are saved into the grid array pointed to by "gp", and
- * there should be room for at least "range" grids in "gp".  Note that
- * due to the way in which distance is calculated, this function normally
- * uses fewer than "range" grids for the projection path, so the result
- * of this function should never be compared directly to "range".  Note
- * that the initial grid (y1,x1) is never saved into the grid array, not
- * even if the initial grid is also the final grid.  XXX XXX XXX
- *
- * The "flg" flags can be used to modify the behavior of this function.
- *
- * In particular, the "PROJECT_STOP" and "PROJECT_THRU" flags have the same
- * semantics as they do for the "project" function, namely, that the path
- * will stop as soon as it hits a monster, or that the path will continue
- * through the destination grid, respectively.
- *
- * The "PROJECT_JUMP" flag, which for the "project()" function means to
- * start at a special grid (which makes no sense in this function), means
- * that the path should be "angled" slightly if needed to avoid any wall
- * grids, allowing the player to "target" any grid which is in "view".
- * This flag is non-trivial and has not yet been implemented, but could
- * perhaps make use of the "vinfo" array (above).  XXX XXX XXX
- *
- * This function returns the number of grids (if any) in the path.  This
- * function will return zero if and only if (y1,x1) and (y2,x2) are equal.
- *
- * This algorithm is similar to, but slightly different from, the one used
- * by "update_view_los()", and very different from the one used by "los()".
- * </pre>
- */
-sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg)
-{
-       int y, x;
-
-       int n = 0;
-       int k = 0;
-
-       /* Absolute */
-       int ay, ax;
-
-       /* Offsets */
-       int sy, sx;
-
-       /* Fractions */
-       int frac;
-
-       /* Scale factors */
-       int full, half;
-
-       /* Slope */
-       int m;
-
-       /* No path necessary (or allowed) */
-       if ((x1 == x2) && (y1 == y2)) return (0);
-
-
-       /* Analyze "dy" */
-       if (y2 < y1)
-       {
-               ay = (y1 - y2);
-               sy = -1;
-       }
-       else
-       {
-               ay = (y2 - y1);
-               sy = 1;
-       }
-
-       /* Analyze "dx" */
-       if (x2 < x1)
-       {
-               ax = (x1 - x2);
-               sx = -1;
-       }
-       else
-       {
-               ax = (x2 - x1);
-               sx = 1;
-       }
-
-
-       /* Number of "units" in one "half" grid */
-       half = (ay * ax);
-
-       /* Number of "units" in one "full" grid */
-       full = half << 1;
-
-       /* Vertical */
-       if (ay > ax)
-       {
-               /* Let m = ((dx/dy) * full) = (dx * dx * 2) */
-               m = ax * ax * 2;
-
-               /* Start */
-               y = y1 + sy;
-               x = x1;
-
-               frac = m;
-
-               if (frac > half)
-               {
-                       /* Advance (X) part 2 */
-                       x += sx;
-
-                       /* Advance (X) part 3 */
-                       frac -= full;
-
-                       /* Track distance */
-                       k++;
-               }
-
-               /* Create the projection path */
-               while (1)
-               {
-                       /* Save grid */
-                       gp[n++] = GRID(y, x);
-
-                       /* Hack -- Check maximum range */
-                       if ((n + (k >> 1)) >= range) break;
-
-                       /* Sometimes stop at destination grid */
-                       if (!(flg & (PROJECT_THRU)))
-                       {
-                               if ((x == x2) && (y == y2)) break;
-                       }
-
-                       if (flg & (PROJECT_DISI))
-                       {
-                               if ((n > 0) && cave_stop_disintegration(y, x)) break;
-                       }
-                       else if (flg & (PROJECT_LOS))
-                       {
-                               if ((n > 0) && !cave_los_bold(y, x)) break;
-                       }
-                       else if (!(flg & (PROJECT_PATH)))
-                       {
-                               /* Always stop at non-initial wall grids */
-                               if ((n > 0) && !cave_have_flag_bold(y, x, FF_PROJECT)) break;
-                       }
-
-                       /* Sometimes stop at non-initial monsters/players */
-                       if (flg & (PROJECT_STOP))
-                       {
-                               if ((n > 0) &&
-                                   (player_bold(y, x) || cave[y][x].m_idx != 0))
-                                       break;
-                       }
-
-                       if (!in_bounds(y, x)) break;
-
-                       /* Slant */
-                       if (m)
-                       {
-                               /* Advance (X) part 1 */
-                               frac += m;
-
-                               /* Horizontal change */
-                               if (frac > half)
-                               {
-                                       /* Advance (X) part 2 */
-                                       x += sx;
-
-                                       /* Advance (X) part 3 */
-                                       frac -= full;
-
-                                       /* Track distance */
-                                       k++;
-                               }
-                       }
-
-                       /* Advance (Y) */
-                       y += sy;
-               }
-       }
-
-       /* Horizontal */
-       else if (ax > ay)
-       {
-               /* Let m = ((dy/dx) * full) = (dy * dy * 2) */
-               m = ay * ay * 2;
-
-               /* Start */
-               y = y1;
-               x = x1 + sx;
-
-               frac = m;
-
-               /* Vertical change */
-               if (frac > half)
-               {
-                       /* Advance (Y) part 2 */
-                       y += sy;
-
-                       /* Advance (Y) part 3 */
-                       frac -= full;
-
-                       /* Track distance */
-                       k++;
-               }
-
-               /* Create the projection path */
-               while (1)
-               {
-                       /* Save grid */
-                       gp[n++] = GRID(y, x);
-
-                       /* Hack -- Check maximum range */
-                       if ((n + (k >> 1)) >= range) break;
-
-                       /* Sometimes stop at destination grid */
-                       if (!(flg & (PROJECT_THRU)))
-                       {
-                               if ((x == x2) && (y == y2)) break;
-                       }
-
-                       if (flg & (PROJECT_DISI))
-                       {
-                               if ((n > 0) && cave_stop_disintegration(y, x)) break;
-                       }
-                       else if (flg & (PROJECT_LOS))
-                       {
-                               if ((n > 0) && !cave_los_bold(y, x)) break;
-                       }
-                       else if (!(flg & (PROJECT_PATH)))
-                       {
-                               /* Always stop at non-initial wall grids */
-                               if ((n > 0) && !cave_have_flag_bold(y, x, FF_PROJECT)) break;
-                       }
-
-                       /* Sometimes stop at non-initial monsters/players */
-                       if (flg & (PROJECT_STOP))
-                       {
-                               if ((n > 0) &&
-                                   (player_bold(y, x) || cave[y][x].m_idx != 0))
-                                       break;
-                       }
-
-                       if (!in_bounds(y, x)) break;
-
-                       /* Slant */
-                       if (m)
-                       {
-                               /* Advance (Y) part 1 */
-                               frac += m;
-
-                               /* Vertical change */
-                               if (frac > half)
-                               {
-                                       /* Advance (Y) part 2 */
-                                       y += sy;
-
-                                       /* Advance (Y) part 3 */
-                                       frac -= full;
-
-                                       /* Track distance */
-                                       k++;
-                               }
-                       }
-
-                       /* Advance (X) */
-                       x += sx;
-               }
-       }
-
-       /* Diagonal */
-       else
-       {
-               /* Start */
-               y = y1 + sy;
-               x = x1 + sx;
-
-               /* Create the projection path */
-               while (1)
-               {
-                       /* Save grid */
-                       gp[n++] = GRID(y, x);
-
-                       /* Hack -- Check maximum range */
-                       if ((n + (n >> 1)) >= range) break;
-
-                       /* Sometimes stop at destination grid */
-                       if (!(flg & (PROJECT_THRU)))
-                       {
-                               if ((x == x2) && (y == y2)) break;
-                       }
-
-                       if (flg & (PROJECT_DISI))
-                       {
-                               if ((n > 0) && cave_stop_disintegration(y, x)) break;
-                       }
-                       else if (flg & (PROJECT_LOS))
-                       {
-                               if ((n > 0) && !cave_los_bold(y, x)) break;
-                       }
-                       else if (!(flg & (PROJECT_PATH)))
-                       {
-                               /* Always stop at non-initial wall grids */
-                               if ((n > 0) && !cave_have_flag_bold(y, x, FF_PROJECT)) break;
-                       }
-
-                       /* Sometimes stop at non-initial monsters/players */
-                       if (flg & (PROJECT_STOP))
-                       {
-                               if ((n > 0) &&
-                                   (player_bold(y, x) || cave[y][x].m_idx != 0))
-                                       break;
-                       }
-
-                       if (!in_bounds(y, x)) break;
-
-                       /* Advance (Y) */
-                       y += sy;
-
-                       /* Advance (X) */
-                       x += sx;
-               }
-       }
-
-       /* Length */
-       return (n);
-}
-
-
 
 /*
  * Mega-Hack -- track "affected" monsters (see "project()" comments)
@@ -623,21 +297,20 @@ static POSITION monster_target_y; /*!< モンスターの攻撃目標Y座標 */
  *
  * We return "TRUE" if the effect of the projection is "obvious".
  *
- * XXX XXX XXX We also "see" grids which are "memorized", probably a hack
+ * We also "see" grids which are "memorized", probably a hack
  *
- * XXX XXX XXX Perhaps we should affect doors?
+ * Perhaps we should affect doors?
  * </pre>
  */
-static bool project_f(int who, int r, int y, int x, int dam, int typ)
+static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ)
 {
-       cave_type       *c_ptr = &cave[y][x];
-       feature_type    *f_ptr = &f_info[c_ptr->feat];
+       cave_type *c_ptr = &cave[y][x];
+       feature_type *f_ptr = &f_info[c_ptr->feat];
 
        bool obvious = FALSE;
        bool known = player_has_los_bold(y, x);
 
 
-       /* XXX XXX XXX */
        who = who ? who : 0;
 
        /* Reduce damage by distance */
@@ -646,24 +319,24 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 
        if (have_flag(f_ptr->flags, FF_TREE))
        {
-               cptr message;
+               concptr message;
                switch (typ)
                {
                case GF_POIS:
                case GF_NUKE:
                case GF_DEATH_RAY:
-            message = _("枯れた", "was blasted."); break;
+                       message = _("枯れた", "was blasted."); break;
                case GF_TIME:
-            message = _("縮んだ", "shrank."); break;
+                       message = _("縮んだ", "shrank."); break;
                case GF_ACID:
-            message = _("溶けた", "melted."); break;
+                       message = _("溶けた", "melted."); break;
                case GF_COLD:
                case GF_ICE:
-            message = _("凍り、砕け散った", "was frozen and smashed."); break;
+                       message = _("凍り、砕け散った", "was frozen and smashed."); break;
                case GF_FIRE:
                case GF_ELEC:
                case GF_PLASMA:
-            message = _("燃えた", "burns up!"); break;
+                       message = _("燃えた", "burns up!"); break;
                case GF_METEOR:
                case GF_CHAOS:
                case GF_MANA:
@@ -675,13 +348,13 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                case GF_DISENCHANT:
                case GF_FORCE:
                case GF_GRAVITY:
-            message = _("粉砕された", "was crushed."); break;
+                       message = _("粉砕された", "was crushed."); break;
                default:
-                       message = NULL;break;
+                       message = NULL; break;
                }
                if (message)
                {
-            msg_format(_("木は%s。", "A tree %s"), message);
+                       msg_format(_("木は%s。", "A tree %s"), message);
                        cave_set_feat(y, x, one_in_(3) ? feat_brake : feat_grass);
 
                        /* Observe */
@@ -749,7 +422,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                /* Check line of sight */
                                if (known)
                                {
-                    msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!"));
+                                       msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!"));
                                        obvious = TRUE;
                                }
 
@@ -768,7 +441,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                /* Check line of sound */
                                if (known && (old_feat != c_ptr->feat))
                                {
-                    msg_print(_("カチッと音がした!", "Click!"));
+                                       msg_print(_("カチッと音がした!", "Click!"));
                                        obvious = TRUE;
                                }
                        }
@@ -777,10 +450,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                        if (!p_ptr->blind && player_has_los_bold(y, x))
                        {
                                c_ptr->info &= ~(CAVE_UNSAFE);
-
-                               /* Redraw */
                                lite_spot(y, x);
-
                                obvious = TRUE;
                        }
 
@@ -796,8 +466,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                /* Check line of sight */
                                if (known)
                                {
-                                       /* Message */
-                    msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!"));
+                                       msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!"));
                                        obvious = TRUE;
                                }
 
@@ -809,10 +478,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                        if (!p_ptr->blind && player_has_los_bold(y, x))
                        {
                                c_ptr->info &= ~(CAVE_UNSAFE);
-
-                               /* Redraw */
                                lite_spot(y, x);
-
                                obvious = TRUE;
                        }
 
@@ -827,20 +493,15 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                feature_type *mimic_f_ptr = &f_info[get_feat_mimic(c_ptr)];
 
                                cave_alter_feat(y, x, FF_SPIKE);
-
                                c_ptr->mimic = old_mimic;
 
-                               /* Notice */
                                note_spot(y, x);
-
-                               /* Redraw */
                                lite_spot(y, x);
 
                                /* Check line of sight */
                                if (known && have_flag(mimic_f_ptr->flags, FF_OPEN))
                                {
-                                       /* Message */
-                    msg_format(_("%sに何かがつっかえて開かなくなった。", "The %s seems stuck."), f_name + mimic_f_ptr->name);
+                                       msg_format(_("%sに何かがつっかえて開かなくなった。", "The %s seems stuck."), f_name + mimic_f_ptr->name);
                                        obvious = TRUE;
                                }
                        }
@@ -852,10 +513,9 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                {
                        if (have_flag(f_ptr->flags, FF_HURT_ROCK))
                        {
-                               /* Message */
                                if (known && (c_ptr->info & (CAVE_MARK)))
                                {
-                    msg_format(_("%sが溶けて泥になった!", "The %s turns into mud!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
+                                       msg_format(_("%sが溶けて泥になった!", "The %s turns into mud!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
                                        obvious = TRUE;
                                }
 
@@ -924,10 +584,8 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                        c_ptr->info |= CAVE_OBJECT;
                        c_ptr->mimic = feat_glyph;
 
-                       /* Notice */
                        note_spot(y, x);
 
-                       /* Redraw */
                        lite_spot(y, x);
 
                        break;
@@ -1002,13 +660,8 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                        if (!(d_info[dungeon_type].flags1 & DF1_DARKNESS))
                        {
                                c_ptr->info |= (CAVE_GLOW);
-
-                               /* Notice */
                                note_spot(y, x);
-
-                               /* Redraw */
                                lite_spot(y, x);
-
                                update_local_illumination(y, x);
 
                                /* Observe */
@@ -1016,7 +669,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 
                                /* Mega-Hack -- Update the monster in the affected grid */
                                /* This allows "spear of light" (etc) to work "correctly" */
-                               if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+                               if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
 
                                if (p_ptr->special_defense & NINJA_S_STEALTH)
                                {
@@ -1067,21 +720,18 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                        /* Forget */
                                        c_ptr->info &= ~(CAVE_MARK);
 
-                                       /* Notice */
                                        note_spot(y, x);
                                }
 
-                               /* Redraw */
                                lite_spot(y, x);
 
                                update_local_illumination(y, x);
 
-                               /* Notice */
                                if (player_can_see_bold(y, x)) obvious = TRUE;
 
                                /* Mega-Hack -- Update the monster in the affected grid */
                                /* This allows "spear of light" (etc) to work "correctly" */
-                               if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+                               if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
                        }
 
                        /* All done */
@@ -1093,7 +743,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                {
                        if (is_mirror_grid(c_ptr))
                        {
-                msg_print(_("鏡が割れた!", "The mirror was crashed!"));
+                               msg_print(_("鏡が割れた!", "The mirror was crashed!"));
                                sound(SOUND_GLASS);
                                remove_mirror(y, x);
                                project(0, 2, y, x, p_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
@@ -1101,10 +751,9 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 
                        if (have_flag(f_ptr->flags, FF_GLASS) && !have_flag(f_ptr->flags, FF_PERMANENT) && (dam >= 50))
                        {
-                               /* Message */
                                if (known && (c_ptr->info & CAVE_MARK))
                                {
-                    msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
+                                       msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
                                        sound(SOUND_GLASS);
                                }
 
@@ -1120,8 +769,8 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                case GF_SOUND:
                {
                        if (is_mirror_grid(c_ptr) && p_ptr->lev < 40)
-            {
-                msg_print(_("鏡が割れた!", "The mirror was crashed!"));
+                       {
+                               msg_print(_("鏡が割れた!", "The mirror was crashed!"));
                                sound(SOUND_GLASS);
                                remove_mirror(y, x);
                                project(0, 2, y, x, p_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
@@ -1129,10 +778,9 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 
                        if (have_flag(f_ptr->flags, FF_GLASS) && !have_flag(f_ptr->flags, FF_PERMANENT) && (dam >= 200))
                        {
-                               /* Message */
                                if (known && (c_ptr->info & CAVE_MARK))
                                {
-                    msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
+                                       msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
                                        sound(SOUND_GLASS);
                                }
 
@@ -1193,29 +841,28 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
  * Note that we determine if the player can "see" anything that happens
  * by taking into account: blindness, line-of-sight, and illumination.
  *
- * XXX XXX XXX We also "see" grids which are "memorized", probably a hack
+ * We also "see" grids which are "memorized", probably a hack
  *
  * We return "TRUE" if the effect of the projection is "obvious".
  * </pre>
  */
-static bool project_o(int who, int r, int y, int x, int dam, int typ)
+static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ)
 {
        cave_type *c_ptr = &cave[y][x];
 
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        bool obvious = FALSE;
        bool known = player_has_los_bold(y, x);
 
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
-       int k_idx = 0;
+       KIND_OBJECT_IDX k_idx = 0;
        bool is_potion = FALSE;
 
 
-       /* XXX XXX XXX */
        who = who ? who : 0;
 
        /* Reduce damage by distance */
@@ -1225,14 +872,13 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
        /* Scan all objects in the grid */
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
-               /* Acquire object */
                object_type *o_ptr = &o_list[this_o_idx];
 
                bool is_art = FALSE;
                bool ignore = FALSE;
                bool do_kill = FALSE;
 
-               cptr note_kill = NULL;
+               concptr note_kill = NULL;
 
 #ifndef JP
                /* Get the "plural"-ness */
@@ -1241,8 +887,6 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 
                /* Acquire next object */
                next_o_idx = o_ptr->next_o_idx;
-
-               /* Extract the flags */
                object_flags(o_ptr, flgs);
 
                /* Check for artifact */
@@ -1257,7 +901,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                if (hates_acid(o_ptr))
                                {
                                        do_kill = TRUE;
-                    note_kill = _("融けてしまった!", (plural ? " melt!" : " melts!"));
+                                       note_kill = _("融けてしまった!", (plural ? " melt!" : " melts!"));
                                        if (have_flag(flgs, TR_IGNORE_ACID)) ignore = TRUE;
                                }
                                break;
@@ -1269,7 +913,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                if (hates_elec(o_ptr))
                                {
                                        do_kill = TRUE;
-                    note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
+                                       note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
                                        if (have_flag(flgs, TR_IGNORE_ELEC)) ignore = TRUE;
                                }
                                break;
@@ -1280,8 +924,8 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                        {
                                if (hates_fire(o_ptr))
                                {
-                    do_kill = TRUE;
-                    note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!"));
+                                       do_kill = TRUE;
+                                       note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!"));
                                        if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
                                }
                                break;
@@ -1292,7 +936,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                        {
                                if (hates_cold(o_ptr))
                                {
-                    note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!"));
+                                       note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!"));
                                        do_kill = TRUE;
                                        if (have_flag(flgs, TR_IGNORE_COLD)) ignore = TRUE;
                                }
@@ -1305,14 +949,14 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                if (hates_fire(o_ptr))
                                {
                                        do_kill = TRUE;
-                    note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!"));
+                                       note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!"));
                                        if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
                                }
                                if (hates_elec(o_ptr))
                                {
                                        ignore = FALSE;
                                        do_kill = TRUE;
-                    note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
+                                       note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
                                        if (have_flag(flgs, TR_IGNORE_ELEC)) ignore = TRUE;
                                }
                                break;
@@ -1323,15 +967,15 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                        {
                                if (hates_fire(o_ptr))
                                {
-                    do_kill = TRUE;
-                    note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!"));
+                                       do_kill = TRUE;
+                                       note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!"));
                                        if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
                                }
                                if (hates_cold(o_ptr))
                                {
                                        ignore = FALSE;
                                        do_kill = TRUE;
-                    note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!"));
+                                       note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!"));
                                        if (have_flag(flgs, TR_IGNORE_COLD)) ignore = TRUE;
                                }
                                break;
@@ -1344,8 +988,8 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                        case GF_SOUND:
                        {
                                if (hates_cold(o_ptr))
-                {
-                    note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!"));
+                               {
+                                       note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!"));
                                        do_kill = TRUE;
                                }
                                break;
@@ -1357,21 +1001,21 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                        case GF_SUPER_RAY:
                        {
                                do_kill = TRUE;
-                note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
+                               note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
                                break;
                        }
 
                        case GF_DISINTEGRATE:
                        {
                                do_kill = TRUE;
-                note_kill = _("蒸発してしまった!", (plural ? " evaporate!" : " evaporates!"));
+                               note_kill = _("蒸発してしまった!", (plural ? " evaporate!" : " evaporates!"));
                                break;
                        }
 
                        case GF_CHAOS:
                        {
                                do_kill = TRUE;
-                note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
+                               note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
                                if (have_flag(flgs, TR_RES_CHAOS)) ignore = TRUE;
                                else if ((o_ptr->tval == TV_SCROLL) && (o_ptr->sval == SV_SCROLL_CHAOS)) ignore = TRUE;
                                break;
@@ -1383,8 +1027,8 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                        {
                                if (object_is_cursed(o_ptr))
                                {
-                    do_kill = TRUE;
-                    note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
+                                       do_kill = TRUE;
+                                       note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!"));
                                }
                                break;
                        }
@@ -1414,10 +1058,9 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                                /* Identify */
                                                object_known(o_ptr);
 
-                                               /* Notice */
                                                if (known && (o_ptr->marked & OM_FOUND))
                                                {
-                            msg_print(_("カチッと音がした!", "Click!"));
+                                                       msg_print(_("カチッと音がした!", "Click!"));
                                                        obvious = TRUE;
                                                }
                                        }
@@ -1430,7 +1073,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                if (o_ptr->tval == TV_CORPSE)
                                {
                                        int i;
-                                       u32b mode = 0L;
+                                       BIT_FLAGS mode = 0L;
 
                                        if (!who || is_pet(&m_list[who]))
                                                mode |= PM_FORCE_PET;
@@ -1438,21 +1081,21 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                        for (i = 0; i < o_ptr->number ; i++)
                                        {
                                                if (((o_ptr->sval == SV_CORPSE) && (randint1(100) > 80)) ||
-                                                   ((o_ptr->sval == SV_SKELETON) && (randint1(100) > 60)))
+                                                       ((o_ptr->sval == SV_SKELETON) && (randint1(100) > 60)))
                                                {
                                                        if (!note_kill)
                                                        {
-                                note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust."));
+                                                               note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust."));
                                                        }
                                                        continue;
                                                }
                                                else if (summon_named_creature(who, y, x, o_ptr->pval, mode))
                                                {
-                            note_kill = _("生き返った。", " revived.");
+                                                       note_kill = _("生き返った。", " revived.");
                                                }
                                                else if (!note_kill)
                                                {
-                            note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust."));
+                                                       note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust."));
                                                }
                                        }
                                        do_kill = TRUE;
@@ -1479,8 +1122,8 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                /* Observe the resist */
                                if (known && (o_ptr->marked & OM_FOUND))
                                {
-                    msg_format(_("%sは影響を受けない!", 
-                       (plural ? "The %s are unaffected!" : "The %s is unaffected!")), o_name);
+                                       msg_format(_("%sは影響を受けない!", 
+                                          (plural ? "The %s are unaffected!" : "The %s is unaffected!")), o_name);
                                }
                        }
 
@@ -1490,14 +1133,11 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                /* Describe if needed */
                                if (known && (o_ptr->marked & OM_FOUND) && note_kill)
                                {
-                    msg_format(_("%sは%s", "The %s%s"), o_name, note_kill);
+                                       msg_format(_("%sは%s", "The %s%s"), o_name, note_kill);
                                }
 
                                k_idx = o_ptr->k_idx;
                                is_potion = object_is_potion(o_ptr);
-
-
-                               /* Delete the object */
                                delete_object_idx(this_o_idx);
 
                                /* Potions produce effects when 'shattered' */
@@ -1506,7 +1146,6 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                        (void)potion_smash_effect(who, y, x, k_idx);
                                }
 
-                               /* Redraw */
                                lite_spot(y, x);
                        }
                }
@@ -1548,7 +1187,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
  * </pre>
  * <pre>
  * Note that "polymorph" is dangerous, since a failure in "place_monster()"'
- * may result in a dereference of an invalid pointer.  XXX XXX XXX
+ * may result in a dereference of an invalid pointer.  
  * </pre>
  * <pre>
  * Various messages are produced, and damage is applied.
@@ -1564,15 +1203,15 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
  * <pre>
  * Damage reductions use the following formulas:
  *   Note that "dam = dam * 6 / (randint1(6) + 6);"
- *     gives avg damage of .655, ranging from .858 to .500
+ *      gives avg damage of .655, ranging from .858 to .500
  *   Note that "dam = dam * 5 / (randint1(6) + 6);"
- *     gives avg damage of .544, ranging from .714 to .417
+ *      gives avg damage of .544, ranging from .714 to .417
  *   Note that "dam = dam * 4 / (randint1(6) + 6);"
- *     gives avg damage of .444, ranging from .556 to .333
+ *      gives avg damage of .444, ranging from .556 to .333
  *   Note that "dam = dam * 3 / (randint1(6) + 6);"
- *     gives avg damage of .327, ranging from .427 to .250
+ *      gives avg damage of .327, ranging from .427 to .250
  *   Note that "dam = dam * 2 / (randint1(6) + 6);"
- *     gives something simple.
+ *      gives something simple.
  * </pre>
  * <pre>
  * In this function, "result" messages are postponed until the end, where
@@ -1585,7 +1224,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
  * "flg" was added.
  * </pre>
  */
-static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int flg, bool see_s_msg)
+static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, bool see_s_msg)
 {
        int tmp;
 
@@ -1640,21 +1279,21 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
        bool heal_leper = FALSE;
 
        /* Hold the monster name */
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
        char m_poss[10];
 
-       int photo = 0;
+       PARAMETER_VALUE photo = 0;
 
        /* Assume no note */
-       cptr note = NULL;
+       concptr note = NULL;
 
        /* Assume a default death */
-       cptr note_dies = extract_note_dies(real_r_ptr(m_ptr));
+       concptr note_dies = extract_note_dies(real_r_idx(m_ptr));
 
-       int ty = m_ptr->fy;
-       int tx = m_ptr->fx;
+       POSITION ty = m_ptr->fy;
+       POSITION tx = m_ptr->fx;
 
-       int caster_lev = (who > 0) ? r_info[caster_ptr->r_idx].level : (p_ptr->lev * 2);
+       DEPTH caster_lev = (who > 0) ? r_info[caster_ptr->r_idx].level : (p_ptr->lev * 2);
 
        /* Nobody here */
        if (!c_ptr->m_idx) return (FALSE);
@@ -1678,7 +1317,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
        /* Get the monster possessive ("his"/"her"/"its") */
        monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 
-       if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 1);
+       if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(TRUE, TRUE);
 
        /* Analyze the damage type */
        switch (typ)
@@ -1690,7 +1329,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -1705,14 +1344,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_IM_ACID)
                        {
-                note = _("にはかなり耐性がある!", " resists a lot.");
+                               note = _("にはかなり耐性がある!", " resists a lot.");
                                dam /= 9;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ACID);
                        }
@@ -1726,15 +1365,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_IM_ELEC)
                        {
-                note = _("にはかなり耐性がある!", " resists a lot.");
-                dam /= 9;
+                               note = _("にはかなり耐性がある!", " resists a lot.");
+                               dam /= 9;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ELEC);
                        }
                        break;
@@ -1747,20 +1386,20 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_IM_FIRE)
                        {
-                note = _("にはかなり耐性がある!", " resists a lot.");
+                               note = _("にはかなり耐性がある!", " resists a lot.");
                                dam /= 9;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_FIRE);
                        }
                        else if (r_ptr->flags3 & (RF3_HURT_FIRE))
                        {
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+                               note = _("はひどい痛手をうけた。", " is hit hard.");
                                dam *= 2;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_FIRE);
                        }
@@ -1774,20 +1413,20 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_IM_COLD)
                        {
-                note = _("にはかなり耐性がある!", " resists a lot.");
+                               note = _("にはかなり耐性がある!", " resists a lot.");
                                dam /= 9;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD);
                        }
                        else if (r_ptr->flags3 & (RF3_HURT_COLD))
-            {
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+                       {
+                               note = _("はひどい痛手をうけた。", " is hit hard.");
                                dam *= 2;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD);
                        }
@@ -1801,14 +1440,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_IM_POIS)
                        {
-                note = _("にはかなり耐性がある!", " resists a lot.");
+                               note = _("にはかなり耐性がある!", " resists a lot.");
                                dam /= 9;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS);
                        }
@@ -1822,14 +1461,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_IM_POIS)
                        {
-                note = _("には耐性がある。", " resists.");
+                               note = _("には耐性がある。", " resists.");
                                dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS);
                        }
@@ -1843,15 +1482,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flags3 & RF3_GOOD)
-            {
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+                       {
+                               note = _("はひどい痛手をうけた。", " is hit hard.");
                                dam *= 2;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
                        }
@@ -1864,27 +1503,27 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flags3 & RF3_GOOD)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_GOOD;
                        }
                        else if (r_ptr->flags3 & RF3_EVIL)
                        {
-                dam *= 2;
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+                               dam *= 2;
+                               note = _("はひどい痛手をうけた。", " is hit hard.");
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL;
                        }
                        else
-            {
-                note = _("には耐性がある。", " resists.");
+                       {
+                               note = _("には耐性がある。", " resists.");
                                dam *= 3; dam /= randint1(6) + 6;
                        }
                        break;
@@ -1896,8 +1535,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -1912,14 +1551,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_PLAS)
-            {
-                note = _("には耐性がある。", " resists.");
+                       {
+                               note = _("には耐性がある。", " resists.");
                                dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_PLAS);
                        }
@@ -1933,7 +1572,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -1941,21 +1580,21 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (r_ptr->flagsr & RFR_RES_NETH)
                        {
                                if (r_ptr->flags3 & RF3_UNDEAD)
-                {
-                    note = _("には完全な耐性がある!", " is immune.");
+                               {
+                                       note = _("には完全な耐性がある!", " is immune.");
                                        dam = 0;
                                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD);
                                }
                                else
                                {
-                    note = _("には耐性がある。", " resists.");
+                                       note = _("には耐性がある。", " resists.");
                                        dam *= 3; dam /= randint1(6) + 6;
                                }
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NETH);
                        }
                        else if (r_ptr->flags3 & RF3_EVIL)
-            {
-                note = _("はいくらか耐性を示した。", " resists somewhat.");
+                       {
+                               note = _("はいくらか耐性を示した。", " resists somewhat.");
                                dam /= 2;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL);
                        }
@@ -1969,7 +1608,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -1977,13 +1616,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (r_ptr->flagsr & RFR_RES_WATE)
                        {
                                if ((m_ptr->r_idx == MON_WATER_ELEM) || (m_ptr->r_idx == MON_UNMAKER))
-                {
-                    note = _("には完全な耐性がある!", " is immune.");
+                               {
+                                       note = _("には完全な耐性がある!", " is immune.");
                                        dam = 0;
                                }
                                else
-                {
-                    note = _("には耐性がある。", " resists.");
+                               {
+                                       note = _("には耐性がある。", " resists.");
                                        dam *= 3; dam /= randint1(6) + 6;
                                }
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WATE);
@@ -1997,21 +1636,21 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_CHAO)
-            {
-                note = _("には耐性がある。", " resists.");
+                       {
+                               note = _("には耐性がある。", " resists.");
                                dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_CHAO);
                        }
                        else if ((r_ptr->flags3 & RF3_DEMON) && one_in_(3))
-            {
-                note = _("はいくらか耐性を示した。", " resists somewhat.");
+                       {
+                               note = _("はいくらか耐性を示した。", " resists somewhat.");
                                dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON);
                        }
@@ -2029,16 +1668,16 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_SHAR)
                        {
-                note = _("には耐性がある。", " resists.");
-                dam *= 3; dam /= randint1(6) + 6;
+                               note = _("には耐性がある。", " resists.");
+                               dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR);
                        }
                        break;
@@ -2051,14 +1690,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_SHAR)
-            {
-                note = _("はいくらか耐性を示した。", " resists somewhat.");
+                       {
+                               note = _("はいくらか耐性を示した。", " resists somewhat.");
                                dam /= 2;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR);
                        }
@@ -2073,15 +1712,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_SOUN)
                        {
-                note = _("には耐性がある。", " resists.");
-                dam *= 2; dam /= randint1(6) + 6;
+                               note = _("には耐性がある。", " resists.");
+                               dam *= 2; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SOUN);
                        }
                        else do_stun = (10 + randint1(15) + r) / (r + 1);
@@ -2095,15 +1734,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flags3 & RF3_NO_CONF)
                        {
-                note = _("には耐性がある。", " resists.");
-                dam *= 3; dam /= randint1(6) + 6;
+                               note = _("には耐性がある。", " resists.");
+                               dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
                        }
                        else do_conf = (10 + randint1(15) + r) / (r + 1);
@@ -2117,15 +1756,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_DISE)
                        {
-                note = _("には耐性がある。", " resists.");
-                dam *= 3; dam /= randint1(6) + 6;
+                               note = _("には耐性がある。", " resists.");
+                               dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DISE);
                        }
                        break;
@@ -2137,15 +1776,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_NEXU)
-            {
-                note = _("には耐性がある。", " resists.");
+                       {
+                               note = _("には耐性がある。", " resists.");
                                dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NEXU);
                        }
@@ -2158,15 +1797,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_WALL)
-            {
-                note = _("には耐性がある。", " resists.");
+                       {
+                               note = _("には耐性がある。", " resists.");
                                dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WALL);
                        }
@@ -2180,15 +1819,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_INER)
-            {
-                note = _("には耐性がある。", " resists.");
+                       {
+                               note = _("には耐性がある。", " resists.");
                                dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER);
                        }
@@ -2196,7 +1835,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        {
                                /* Powerful monsters can resist */
                                if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-                                   (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                                       (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                                {
                                        obvious = FALSE;
                                }
@@ -2205,7 +1844,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                {
                                        if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+                                               note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
                                }
                        }
@@ -2219,14 +1858,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_TIME)
                        {
-                note = _("には耐性がある。", " resists.");
+                               note = _("には耐性がある。", " resists.");
                                dam *= 3; dam /= randint1(6) + 6;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_TIME);
                        }
@@ -2242,8 +1881,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2253,13 +1892,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (r_ptr->flags1 & (RF1_UNIQUE))
                                {
                                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                    note = _("には効果がなかった。", " is unaffected!");
+                                       note = _("には効果がなかった。", " is unaffected!");
                                        resist_tele = TRUE;
                                }
                                else if (r_ptr->level > randint1(100))
                                {
                                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                    note = _("には耐性がある!", " resists!");
+                                       note = _("には耐性がある!", " resists!");
                                        resist_tele = TRUE;
                                }
                        }
@@ -2269,8 +1908,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) do_dist = 0;
 
                        if (r_ptr->flagsr & RFR_RES_GRAV)
-            {
-                note = _("には耐性がある!", " resists!");
+                       {
+                               note = _("には耐性がある!", " resists!");
                                dam *= 3; dam /= randint1(6) + 6;
                                do_dist = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV);
@@ -2280,7 +1919,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                /* 1. slowness */
                                /* Powerful monsters can resist */
                                if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-                                   (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                                       (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                                {
                                        obvious = FALSE;
                                }
@@ -2289,7 +1928,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                {
                                        if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+                                               note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
                                }
 
@@ -2298,12 +1937,12 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                                /* Attempt a saving throw */
                                if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-                                   (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                                       (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                                {
                                        /* Resist */
                                        do_stun = 0;
                                        /* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected!");
+                                       note = _("には効果がなかった。", " is unaffected!");
                                        obvious = FALSE;
                                }
                        }
@@ -2319,7 +1958,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2335,7 +1974,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2343,8 +1982,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (r_ptr->flags3 & RF3_HURT_ROCK)
                        {
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK);
-                note = _("の皮膚がただれた!", " loses some skin!");
-                note_dies = _("は蒸発した!", " evaporates!");
+                               note = _("の皮膚がただれた!", " loses some skin!");
+                               note_dies = _("は蒸発した!", " evaporates!");
                                dam *= 2;
                        }
                        break;
@@ -2358,14 +1997,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (!(los(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x)))
                        {
                                if (seen_msg) 
-                    msg_format(_("%sはあなたが見えないので影響されない!", "%^s can't see you, and isn't affected!"), m_name);
+                                       msg_format(_("%sはあなたが見えないので影響されない!", "%^s can't see you, and isn't affected!"), m_name);
                                skipped = TRUE;
                                break;
                        }
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2373,15 +2012,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (r_ptr->flags2 & RF2_EMPTY_MIND)
                        {
                                dam = 0;
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
 
                        }
                        else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) ||
-                                (r_ptr->flags3 & RF3_ANIMAL) ||
-                                (r_ptr->level > randint1(3 * dam)))
-            {
-                note = _("には耐性がある!", " resists!");
+                                        (r_ptr->flags3 & RF3_ANIMAL) ||
+                                        (r_ptr->level > randint1(3 * dam)))
+                       {
+                               note = _("には耐性がある!", " resists!");
                                dam /= 3;
 
                                /*
@@ -2389,18 +2028,18 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                 * attacks back on them
                                 */
                                if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
-                                   (r_ptr->level > p_ptr->lev / 2) &&
-                                   one_in_(2))
+                                       (r_ptr->level > p_ptr->lev / 2) &&
+                                       one_in_(2))
                                {
                                        note = NULL;
                                        msg_format(_("%^sの堕落した精神は攻撃を跳ね返した!", 
-                        (seen ? "%^s's corrupted mind backlashes your attack!" : 
-                                "%^ss corrupted mind backlashes your attack!")), m_name);
+                                               (seen ? "%^s's corrupted mind backlashes your attack!" : 
+                                                               "%^ss corrupted mind backlashes your attack!")), m_name);
 
                                        /* Saving throw */
                                        if ((randint0(100 + r_ptr->level / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
                                        {
-                        msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
+                                               msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
                                        }
                                        else
                                        {
@@ -2420,7 +2059,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                                                case 3:
                                                                {
                                                                        if (r_ptr->flags3 & RF3_NO_FEAR)
-                                        note = _("には効果がなかった。", " is unaffected.");
+                                                                               note = _("には効果がなかった。", " is unaffected.");
                                                                        else
                                                                                set_afraid(p_ptr->afraid + 3 + randint1(dam));
                                                                        break;
@@ -2450,13 +2089,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                                do_fear = 3 + randint1(dam);
                                                break;
                                        default:
-                        note = _("は眠り込んでしまった!", " falls asleep!");
+                                               note = _("は眠り込んでしまった!", " falls asleep!");
                                                do_sleep = 3 + randint1(dam);
                                                break;
                                }
                        }
 
-            note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+                       note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
                        break;
                }
 
@@ -2465,22 +2104,22 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flags2 & RF2_EMPTY_MIND)
                        {
-                dam = 0;
-                note = _("には完全な耐性がある!", " is immune.");
+                               dam = 0;
+                               note = _("には完全な耐性がある!", " is immune.");
                        }
                        else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) ||
-                                (r_ptr->flags3 & RF3_ANIMAL) ||
-                                (r_ptr->level > randint1(3 * dam)))
-            {
-                note = _("には耐性がある!", " resists!");
+                                        (r_ptr->flags3 & RF3_ANIMAL) ||
+                                        (r_ptr->level > randint1(3 * dam)))
+                       {
+                               note = _("には耐性がある!", " resists!");
                                dam /= 3;
 
                                /*
@@ -2488,17 +2127,17 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                 * attacks back on them
                                 */
                                if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
-                                    (r_ptr->level > p_ptr->lev / 2) &&
-                                    (one_in_(2)))
+                                        (r_ptr->level > p_ptr->lev / 2) &&
+                                        (one_in_(2)))
                                {
                                        note = NULL;
                                        msg_format(_("%^sの堕落した精神は攻撃を跳ね返した!", 
-                        (seen ? "%^s's corrupted mind backlashes your attack!" : 
-                                "%^ss corrupted mind backlashes your attack!")), m_name);
+                                               (seen ? "%^s's corrupted mind backlashes your attack!" : 
+                                                               "%^ss corrupted mind backlashes your attack!")), m_name);
                                        /* Saving throw */
                                        if ((randint0(100 + r_ptr->level / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
                                        {
-                        msg_print(_("あなたは効力を跳ね返した!", "You resist the effects!"));
+                                               msg_print(_("あなたは効力を跳ね返した!", "You resist the effects!"));
                                        }
                                        else
                                        {
@@ -2506,7 +2145,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                                monster_desc(killer, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
                                                if (!CHECK_MULTISHADOW())
                                                {
-                            msg_print(_("超能力パワーを吸いとられた!", "Your psychic energy is drained!"));
+                                                       msg_print(_("超能力パワーを吸いとられた!", "Your psychic energy is drained!"));
                                                        p_ptr->csp -= damroll(5, dam) / 2;
                                                        if (p_ptr->csp < 0) p_ptr->csp = 0;
                                                        p_ptr->redraw |= PR_MANA;
@@ -2520,10 +2159,10 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        else if (dam > 0)
                        {
                                int b = damroll(5, dam) / 4;
-                cptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana");
-                cptr msg = _("あなたは%sの苦痛を%sに変換した!", 
-                     (seen ? "You convert %s's pain into %s!" : 
-                             "You convert %ss pain into %s!"));
+                               concptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana");
+                               concptr msg = _("あなたは%sの苦痛を%sに変換した!", 
+                                        (seen ? "You convert %s's pain into %s!" : 
+                                                        "You convert %ss pain into %s!"));
                                msg_format(msg, m_name, str);
 
                                b = MIN(p_ptr->msp, p_ptr->csp + b);
@@ -2531,7 +2170,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                p_ptr->redraw |= PR_MANA;
                                p_ptr->window |= (PW_SPELL);
                        }
-            note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+                       note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
                        break;
                }
 
@@ -2540,8 +2179,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2557,7 +2196,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & RF1_UNIQUE) ||
-                           (r_ptr->level > 5 + randint1(dam)))
+                               (r_ptr->level > 5 + randint1(dam)))
                        {
                                /* Resist */
                                do_stun = 0;
@@ -2574,7 +2213,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2588,8 +2227,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2605,15 +2244,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
                        {
-                note = _("には効果がなかった!", " is immune.");
+                               note = _("には効果がなかった!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) ||
-                           (r_ptr->flags3 & RF3_NO_CONF) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                               (r_ptr->flags3 & RF3_NO_CONF) ||
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                        {
                                /* Memorize a flag */
                                if (r_ptr->flags3 & RF3_NO_CONF)
@@ -2629,18 +2268,18 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                 * attacks back on them
                                 */
                                if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
-                                   (r_ptr->level > p_ptr->lev / 2) &&
-                                   (one_in_(2)))
+                                       (r_ptr->level > p_ptr->lev / 2) &&
+                                       (one_in_(2)))
                                {
-                    note = NULL;
-                    msg_format(_("%^sの堕落した精神は攻撃を跳ね返した!",
-                        (seen ? "%^s's corrupted mind backlashes your attack!" :
-                        "%^ss corrupted mind backlashes your attack!")), m_name);
+                                       note = NULL;
+                                       msg_format(_("%^sの堕落した精神は攻撃を跳ね返した!",
+                                               (seen ? "%^s's corrupted mind backlashes your attack!" :
+                                               "%^ss corrupted mind backlashes your attack!")), m_name);
 
                                        /* Saving throw */
                                        if (randint0(100 + r_ptr->level/2) < p_ptr->skill_sav)
                                        {
-                        msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
+                                               msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
                                        }
                                        else
                                        {
@@ -2656,7 +2295,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                                        default:
                                                        {
                                                                if (r_ptr->flags3 & RF3_NO_FEAR)
-                                    note = _("には効果がなかった。", " is unaffected.");
+                                                                       note = _("には効果がなかった。", " is unaffected.");
                                                                else
                                                                        set_afraid(p_ptr->afraid + dam);
                                                        }
@@ -2666,15 +2305,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                else
                                {
                                        /* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+                                       note = _("には効果がなかった。", " is unaffected.");
                                        obvious = FALSE;
                                }
                        }
                        else
                        {
-                               if ((dam > 29) && (randint1(100) < dam))
+                               if (!common_saving_throw_charm(p_ptr, dam, m_ptr))
                                {
-                    note = _("があなたに隷属した。", " is in your thrall!");
+                                       note = _("があなたに隷属した。", " is in your thrall!");
                                        set_pet(m_ptr);
                                }
                                else
@@ -2706,22 +2345,22 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        do_stun = (randint1(15) + 1) / (r + 1);
                        if (r_ptr->flagsr & RFR_IM_COLD)
-            {
-                note = _("にはかなり耐性がある!", " resists a lot.");
+                       {
+                               note = _("にはかなり耐性がある!", " resists a lot.");
                                dam /= 9;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD);
                        }
                        else if (r_ptr->flags3 & (RF3_HURT_COLD))
                        {
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+                               note = _("はひどい痛手をうけた。", " is hit hard.");
                                dam *= 2;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD);
                        }
@@ -2730,18 +2369,18 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
 
                /* Drain Life */
-               case GF_OLD_DRAIN:
+               case GF_HYPODYNAMIA:
                {
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
-                       if (!monster_living(r_ptr))
+                       if (!monster_living(m_ptr->r_idx))
                        {
                                if (is_original_ap_and_seen(m_ptr))
                                {
@@ -2749,7 +2388,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                        if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD);
                                        if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING);
                                }
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                                dam = 0;
                        }
@@ -2764,13 +2403,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
-                       if (!monster_living(r_ptr))
+                       if (!monster_living(m_ptr->r_idx))
                        {
                                if (is_original_ap_and_seen(m_ptr))
                                {
@@ -2778,7 +2417,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                        if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD);
                                        if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING);
                                }
-                note = _("には完全な耐性がある!", " is immune.");
+                               note = _("には完全な耐性がある!", " is immune.");
                                obvious = FALSE;
                                dam = 0;
                        }
@@ -2786,8 +2425,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                 (randint1(888) != 666)) ||
                                 (((r_ptr->level + randint1(20)) > randint1((caster_lev / 2) + randint1(10))) &&
                                 randint1(100) != 66))
-            {
-                note = _("には耐性がある!", " resists!");
+                       {
+                               note = _("には耐性がある!", " resists!");
                                obvious = FALSE;
                                dam = 0;
                        }
@@ -2801,8 +2440,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2812,10 +2451,10 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Powerful monsters can resist */
                        if ((r_ptr->flags1 & RF1_UNIQUE) ||
-                           (r_ptr->flags1 & RF1_QUESTOR) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                               (r_ptr->flags1 & RF1_QUESTOR) ||
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                do_poly = FALSE;
                                obvious = FALSE;
                        }
@@ -2833,8 +2472,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if ((p_ptr->inside_arena) || is_pet(m_ptr) || (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & (RF7_NAZGUL | RF7_UNIQUE2)))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                        }
                        else
                        {
@@ -2844,7 +2483,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                /* Attempt to clone. */
                                if (multiply_monster(c_ptr->m_idx, TRUE, 0L))
                                {
-                    note = _("が分裂した!", " spawns!");
+                                       note = _("が分裂した!", " spawns!");
                                }
                        }
 
@@ -2865,7 +2504,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (m_ptr->maxhp < m_ptr->max_maxhp)
                        {
-                if (seen_msg) msg_format(_("%^sの強さが戻った。", "%^s recovers %s vitality."), m_name, m_poss);
+                               if (seen_msg) msg_format(_("%^sの強さが戻った。", "%^s recovers %s vitality."), m_name, m_poss);
                                m_ptr->maxhp = m_ptr->max_maxhp;
                        }
 
@@ -2887,17 +2526,17 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        (void)set_monster_csleep(c_ptr->m_idx, 0);
                        if (MON_STUNNED(m_ptr))
                        {
-                if (seen_msg) msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
+                               if (seen_msg) msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
                                (void)set_monster_stunned(c_ptr->m_idx, 0);
                        }
                        if (MON_CONFUSED(m_ptr))
                        {
-                if (seen_msg) msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
+                               if (seen_msg) msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
                                (void)set_monster_confused(c_ptr->m_idx, 0);
                        }
                        if (MON_MONFEAR(m_ptr))
                        {
-                if (seen_msg) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name);
+                               if (seen_msg) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name);
                                (void)set_monster_monfear(c_ptr->m_idx, 0);
                        }
 
@@ -2938,8 +2577,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (p_ptr->health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_HEALTH);
                        if (p_ptr->riding == c_ptr->m_idx) p_ptr->redraw |= (PR_UHEALTH);
 
-                       /* Message */
-            note = _("は体力を回復したようだ。", " looks healthier.");
+                       note = _("は体力を回復したようだ。", " looks healthier.");
 
                        /* No "real" damage */
                        dam = 0;
@@ -2955,7 +2593,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        /* Speed up */
                        if (set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100))
                        {
-                note = _("の動きが速くなった。", " starts moving faster.");
+                               note = _("の動きが速くなった。", " starts moving faster.");
                        }
 
                        if (!who)
@@ -2978,17 +2616,17 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        /* Powerful monsters can resist */
                        if ((r_ptr->flags1 & RF1_UNIQUE) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                        }
 
@@ -2997,7 +2635,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        {
                                if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                {
-                    note = _("の動きが遅くなった。", " starts moving slower.");
+                                       note = _("の動きが遅くなった。", " starts moving slower.");
                                }
                        }
 
@@ -3013,16 +2651,16 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & RF1_UNIQUE) ||
-                           (r_ptr->flags3 & RF3_NO_SLEEP) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                               (r_ptr->flags3 & RF3_NO_SLEEP) ||
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                        {
                                /* Memorize a flag */
                                if (r_ptr->flags3 & RF3_NO_SLEEP)
@@ -3030,13 +2668,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP);
                                }
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                        }
                        else
                        {
                                /* Go to sleep (much) later */
-                note = _("は眠り込んでしまった!", " falls asleep!");
+                               note = _("は眠り込んでしまった!", " falls asleep!");
                                do_sleep = 500;
                        }
 
@@ -3060,16 +2698,16 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        }
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & RF1_UNIQUE) ||
-                           !(r_ptr->flags3 & RF3_EVIL) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                               !(r_ptr->flags3 & RF3_EVIL) ||
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                        }
                        else
                        {
                                /* Go to sleep (much) later */
-                note = _("は動けなくなった!", " is suspended!");
+                               note = _("は動けなくなった!", " is suspended!");
                                do_sleep = 500;
                        }
 
@@ -3084,23 +2722,23 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & RF1_UNIQUE) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                        }
                        else
                        {
                                /* Go to sleep (much) later */
-                note = _("は動けなくなった!", " is suspended!");
+                               note = _("は動けなくなった!", " is suspended!");
                                do_sleep = 500;
                        }
 
@@ -3113,7 +2751,6 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                case GF_CHARM:
                {
                        int vir;
-                       dam += (adj_con_fix[p_ptr->stat_ind[A_CHR]] - 1);
                        vir = virtue_number(V_HARMONY);
                        if (vir)
                        {
@@ -3128,44 +2765,25 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        if (seen) obvious = TRUE;
 
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
-
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & RF1_QUESTOR) ||
-                           (r_ptr->flags3 & RF3_NO_CONF) ||
-                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 5))
+                       if (common_saving_throw_charm(p_ptr, dam, m_ptr))
                        {
-                               /* Memorize a flag */
-                               if (r_ptr->flags3 & RF3_NO_CONF)
-                               {
-                                       if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
-                               }
 
                                /* Resist */
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
 
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
-                note = _("はあなたに敵意を抱いている!", " hates you too much!");
+                               note = _("はあなたに敵意を抱いている!", " hates you too much!");
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
-                note = _("は突然友好的になったようだ!", " suddenly seems friendly!");
+                               note = _("は突然友好的になったようだ!", " suddenly seems friendly!");
                                set_pet(m_ptr);
 
                                chg_virtue(V_INDIVIDUALISM, -1);
@@ -3196,36 +2814,23 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                dam -= p_ptr->virtues[vir-1]/20;
                        }
 
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
-
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & RF1_QUESTOR) ||
-                         (!(r_ptr->flags3 & RF3_UNDEAD)) ||
-                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                                (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       if (common_saving_throw_control(p_ptr, dam, m_ptr) ||
+                               !(r_ptr->flags3 & RF3_UNDEAD))
                        {
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
-                note = _("はあなたに敵意を抱いている!", " hates you too much!");
+                               note = _("はあなたに敵意を抱いている!", " hates you too much!");
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
-                note = _("は既にあなたの奴隷だ!", " is in your thrall!");
+                               note = _("は既にあなたの奴隷だ!", " is in your thrall!");
                                set_pet(m_ptr);
                        }
 
@@ -3252,37 +2857,23 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                dam -= p_ptr->virtues[vir-1]/20;
                        }
 
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
-
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & RF1_QUESTOR) ||
-                         (!(r_ptr->flags3 & RF3_DEMON)) ||
-                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                                (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       if (common_saving_throw_control(p_ptr, dam, m_ptr) ||
+                               !(r_ptr->flags3 & RF3_DEMON))
                        {
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
-
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
-                note = _("はあなたに敵意を抱いている!", " hates you too much!");
+                               note = _("はあなたに敵意を抱いている!", " hates you too much!");
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
-                note = _("は既にあなたの奴隷だ!", " is in your thrall!");
+                               note = _("は既にあなたの奴隷だ!", " is in your thrall!");
                                set_pet(m_ptr);
                        }
 
@@ -3295,7 +2886,6 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                case GF_CONTROL_ANIMAL:
                {
                        int vir;
-
                        if (seen) obvious = TRUE;
 
                        vir = virtue_number(V_NATURE);
@@ -3310,47 +2900,25 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                dam -= p_ptr->virtues[vir-1]/20;
                        }
 
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
-
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
-                         (!(r_ptr->flags3 & (RF3_ANIMAL))) ||
-                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                                (r_ptr->flags3 & (RF3_NO_CONF)) ||
-                                (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       if (common_saving_throw_control(p_ptr, dam, m_ptr) ||
+                               !(r_ptr->flags3 & RF3_ANIMAL))
                        {
-                               /* Memorize a flag */
-                               if (r_ptr->flags3 & (RF3_NO_CONF))
-                               {
-                                       if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
-                               }
-
                                /* Resist */
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
-
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
-                note = _("はあなたに敵意を抱いている!", " hates you too much!");
+                               note = _("はあなたに敵意を抱いている!", " hates you too much!");
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
-                note = _("はなついた。", " is tamed!");
+                               note = _("はなついた。", " is tamed!");
                                set_pet(m_ptr);
-
                                if (r_ptr->flags3 & RF3_ANIMAL)
                                        chg_virtue(V_NATURE, 1);
                        }
@@ -3361,14 +2929,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                }
 
                /* Tame animal */
-               case GF_CONTROL_LIVING:
+               case GF_CHARM_LIVING:
                {
                        int vir;
 
                        vir = virtue_number(V_UNLIFE);
                        if (seen) obvious = TRUE;
 
-                       dam += (adj_chr_chm[p_ptr->stat_ind[A_CHR]]);
                        vir = virtue_number(V_UNLIFE);
                        if (vir)
                        {
@@ -3381,43 +2948,27 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                dam -= p_ptr->virtues[vir-1]/20;
                        }
 
-                       if (r_ptr->flags3 & (RF3_NO_CONF)) dam -= 30;
-                       if (dam < 1) dam = 1;
-            msg_format(_("%sを見つめた。", "You stare into %s."), m_name);
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
+                       msg_format(_("%sを見つめた。", "You stare into %s."), m_name);
 
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
-                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                                !monster_living(r_ptr) ||
-                                ((r_ptr->level+10) > randint1(dam)))
+                       if (common_saving_throw_charm(p_ptr, dam, m_ptr) ||
+                               !monster_living(m_ptr->r_idx))
                        {
                                /* Resist */
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
-
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
-                note = _("はあなたに敵意を抱いている!", " hates you too much!");
+                               note = _("はあなたに敵意を抱いている!", " hates you too much!");
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
-                note = _("を支配した。", " is tamed!");
+                               note = _("を支配した。", " is tamed!");
                                set_pet(m_ptr);
-
                                if (r_ptr->flags3 & RF3_ANIMAL)
                                        chg_virtue(V_NATURE, 1);
                        }
@@ -3433,8 +2984,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -3444,8 +2995,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-                           (r_ptr->flags3 & (RF3_NO_CONF)) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                               (r_ptr->flags3 & (RF3_NO_CONF)) ||
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                        {
                                /* Memorize a flag */
                                if (r_ptr->flags3 & (RF3_NO_CONF))
@@ -3457,7 +3008,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                do_conf = 0;
 
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                        }
 
@@ -3471,8 +3022,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -3481,13 +3032,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                        {
                                /* Resist */
                                do_stun = 0;
 
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                        }
 
@@ -3522,8 +3073,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
 
                                /* Special effect */
-                note = _("は光に身をすくめた!", " cringes from the light!");
-                note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!");
+                               note = _("は光に身をすくめた!", " cringes from the light!");
+                               note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!");
                        }
 
                        /* Normally no damage */
@@ -3544,23 +3095,23 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_LITE)
-            {
-                note = _("には耐性がある!", " resists!");
+                       {
+                               note = _("には耐性がある!", " resists!");
                                dam *= 2; dam /= (randint1(6)+6);
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_LITE);
                        }
                        else if (r_ptr->flags3 & (RF3_HURT_LITE))
                        {
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
-                note = _("は光に身をすくめた!", " cringes from the light!");
-                note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!");
+                               note = _("は光に身をすくめた!", " cringes from the light!");
+                               note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!");
                                dam *= 2;
                        }
                        break;
@@ -3573,15 +3124,15 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flagsr & RFR_RES_DARK)
-            {
-                note = _("には耐性がある!", " resists!");
+                       {
+                               note = _("には耐性がある!", " resists!");
                                dam *= 2; dam /= (randint1(6)+6);
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DARK);
                        }
@@ -3607,8 +3158,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK);
 
                                /* Cute little message */
-                note = _("の皮膚がただれた!", " loses some skin!");
-                note_dies = _("はドロドロに溶けた!", " dissolves!");
+                               note = _("の皮膚がただれた!", " loses some skin!");
+                               note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
 
                        /* Usually, ignore the effects */
@@ -3634,14 +3185,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                {
                                        if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
                                        {
-                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                        note = _("には効果がなかった。", " is unaffected.");
+                                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+                                               note = _("には効果がなかった。", " is unaffected.");
                                                resists_tele = TRUE;
                                        }
                                        else if (r_ptr->level > randint1(100))
                                        {
-                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                        note = _("には耐性がある!", " resists!");
+                                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+                                               note = _("には耐性がある!", " resists!");
                                                resists_tele = TRUE;
                                        }
                                }
@@ -3679,14 +3230,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                {
                                        if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
                                        {
-                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                        note = _("には効果がなかった。", " is unaffected.");
+                                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+                                               note = _("には効果がなかった。", " is unaffected.");
                                                resists_tele = TRUE;
                                        }
                                        else if (r_ptr->level > randint1(100))
                                        {
-                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                        note = _("には耐性がある!", " resists!");
+                                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+                                               note = _("には耐性がある!", " resists!");
                                                resists_tele = TRUE;
                                        }
                                }
@@ -3720,21 +3271,20 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        {
                                if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
                                {
-                    if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                    note = _("には効果がなかった。", " is unaffected.");
+                                       if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+                                       note = _("には効果がなかった。", " is unaffected.");
                                        resists_tele = TRUE;
                                }
                                else if (r_ptr->level > randint1(100))
                                {
-                    if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                    note = _("には耐性がある!", " resists!");
+                                       if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+                                       note = _("には耐性がある!", " resists!");
                                        resists_tele = TRUE;
                                }
                        }
 
                        if (!resists_tele)
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Prepare to teleport */
@@ -3758,7 +3308,6 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        /* Only affect undead */
                        if (r_ptr->flags3 & (RF3_UNDEAD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3771,7 +3320,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
                                {
                                        /* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+                                       note = _("には効果がなかった。", " is unaffected.");
                                        obvious = FALSE;
                                        do_fear = 0;
                                }
@@ -3801,7 +3350,6 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        /* Only affect evil */
                        if (r_ptr->flags3 & (RF3_EVIL))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3814,7 +3362,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
                                {
                                        /* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+                                       note = _("には効果がなかった。", " is unaffected.");
                                        obvious = FALSE;
                                        do_fear = 0;
                                }
@@ -3841,7 +3389,6 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                skipped = TRUE;
                                break;
                        }
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Apply some fear */
@@ -3849,11 +3396,11 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-                           (r_ptr->flags3 & (RF3_NO_FEAR)) ||
-                           (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                               (r_ptr->flags3 & (RF3_NO_FEAR)) ||
+                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                        {
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                                do_fear = 0;
                        }
@@ -3876,15 +3423,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        /* Only affect undead */
                        if (r_ptr->flags3 & (RF3_UNDEAD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD);
 
-                               /* Message */
-                note = _("は身震いした。", " shudders.");
-                note_dies = _("はドロドロに溶けた!", " dissolves!");
+                               note = _("は身震いした。", " shudders.");
+                               note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
 
                        /* Others ignore */
@@ -3913,15 +3458,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        /* Only affect evil */
                        if (r_ptr->flags3 & (RF3_EVIL))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL);
 
-                               /* Message */
-                note = _("は身震いした。", " shudders.");
-                note_dies = _("はドロドロに溶けた!", " dissolves!");
+                               note = _("は身震いした。", " shudders.");
+                               note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
 
                        /* Others ignore */
@@ -3949,15 +3492,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        /* Only affect good */
                        if (r_ptr->flags3 & (RF3_GOOD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
 
-                               /* Message */
-                note = _("は身震いした。", " shudders.");
-                note_dies = _("はドロドロに溶けた!", " dissolves!");
+                               note = _("は身震いした。", " shudders.");
+                               note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
 
                        /* Others ignore */
@@ -3983,14 +3524,12 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                break;
                        }
                        /* Only affect non-undead */
-                       if (monster_living(r_ptr))
+                       if (monster_living(m_ptr->r_idx))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
-                               /* Message */
-                note = _("は身震いした。", " shudders.");
-                note_dies = _("はドロドロに溶けた!", " dissolves!");
+                               note = _("は身震いした。", " shudders.");
+                               note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
 
                        /* Others ignore */
@@ -4018,15 +3557,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        /* Only affect demons */
                        if (r_ptr->flags3 & (RF3_DEMON))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON);
 
-                               /* Message */
-                note = _("は身震いした。", " shudders.");
-                note_dies = _("はドロドロに溶けた!", " dissolves!");
+                               note = _("は身震いした。", " shudders.");
+                               note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
 
                        /* Others ignore */
@@ -4051,12 +3588,10 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                dam = 0;
                                break;
                        }
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
-                       /* Message */
-            note = _("は身震いした。", " shudders.");
-            note_dies = _("はドロドロに溶けた!", " dissolves!");
+                       note = _("は身震いした。", " shudders.");
+                       note_dies = _("はドロドロに溶けた!", " dissolves!");
                        break;
                }
 
@@ -4066,8 +3601,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4091,22 +3626,20 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                                /* Special message */
                                                if (see_s_msg)
                                                {
-                                                       /* Get the monster name */
                                                        monster_desc(killer, caster_ptr, 0);
-                            msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer);
+                                                       msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer);
                                                }
                                        }
                                }
                                else
                                {
-                                       /* Message */
-                    msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), m_name);
+                                       msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), m_name);
                                        (void)hp_player(dam);
                                }
                        }
                        else
                        {
-                if (see_s_msg) msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name);
+                               if (see_s_msg) msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name);
                        }
                        dam = 0;
                        break;
@@ -4116,12 +3649,11 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                case GF_MIND_BLAST:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
-            if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
+                       if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4136,26 +3668,26 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (r_ptr->flags3 & (RF3_NO_CONF))
                                {
                                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
-                }
-                note = _("には効果がなかった。", " is unaffected.");
+                               }
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        else if (r_ptr->flags2 & RF2_EMPTY_MIND)
                        {
-                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
-                note = _("には完全な耐性がある!", " is immune.");
+                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                        }
                        else if (r_ptr->flags2 & RF2_WEIRD_MIND)
                        {
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
-                note = _("には耐性がある。", " resists.");
+                               note = _("には耐性がある。", " resists.");
                                dam /= 3;
                        }
                        else
                        {
-                note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
-                note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+                               note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
+                               note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
 
                                if (who > 0) do_conf = randint0(4) + 4;
                                else do_conf = randint0(8) + 8;
@@ -4167,12 +3699,11 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                case GF_BRAIN_SMASH:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
-            if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
+                       if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4187,26 +3718,26 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (r_ptr->flags3 & (RF3_NO_CONF))
                                {
                                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
-                }
-                note = _("には効果がなかった。", " is unaffected.");
+                               }
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        else if (r_ptr->flags2 & RF2_EMPTY_MIND)
                        {
-                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
-                note = _("には完全な耐性がある!", " is immune.");
+                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                        }
                        else if (r_ptr->flags2 & RF2_WEIRD_MIND)
                        {
-                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
-                note = _("には耐性がある!", " resists!");
+                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
+                               note = _("には耐性がある!", " resists!");
                                dam /= 3;
                        }
                        else
                        {
-                note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
-                note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+                               note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
+                               note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
 
                                if (who > 0)
                                {
@@ -4227,12 +3758,11 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                case GF_CAUSE_1:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
-            if (!who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), m_name);
+                       if (!who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4240,8 +3770,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4251,12 +3781,11 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                case GF_CAUSE_2:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
-            if (!who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), m_name);
+                       if (!who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4264,8 +3793,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4275,12 +3804,11 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                case GF_CAUSE_3:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
-            if (!who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた!", "You point at %s, incanting terribly!"), m_name);
+                       if (!who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた!", "You point at %s, incanting terribly!"), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4288,8 +3816,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4299,14 +3827,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                case GF_CAUSE_4:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
                        if (!who) 
-                msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", 
-                             "You point at %s, screaming the word, 'DIE!'."), m_name);
+                               msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", 
+                                                        "You point at %s, screaming the word, 'DIE!'."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4314,8 +3841,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if ((randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35)) && ((who <= 0) || (caster_ptr->r_idx != MON_KENSHIROU)))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4327,16 +3854,16 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
 
                        if (r_ptr->flags1 & RF1_UNIQUE)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        else
@@ -4350,7 +3877,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                }
                                else
                                {
-                    note = _("は耐性を持っている!", "resists!");
+                                       note = _("は耐性を持っている!", "resists!");
                                        dam = 0;
                                }
                        }
@@ -4362,28 +3889,28 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                {
                        int nokori_hp;
                        if ((p_ptr->inside_quest && (quest[p_ptr->inside_quest].type == QUEST_TYPE_KILL_ALL) && !is_pet(m_ptr)) ||
-                           (r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags7 & (RF7_NAZGUL)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (r_ptr->flags1 & RF1_QUESTOR) || m_ptr->parent_m_idx)
-            {
-                msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name);
+                               (r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags7 & (RF7_NAZGUL)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (r_ptr->flags1 & RF1_QUESTOR) || m_ptr->parent_m_idx)
+                       {
+                               msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name);
                                skipped = TRUE;
                                break;
                        }
 
                        if (is_pet(m_ptr)) nokori_hp = m_ptr->maxhp * 4L;
-                       else if ((p_ptr->pclass == CLASS_BEASTMASTER) && monster_living(r_ptr))
+                       else if ((p_ptr->pclass == CLASS_BEASTMASTER) && monster_living(m_ptr->r_idx))
                                nokori_hp = m_ptr->maxhp * 3 / 10;
                        else
                                nokori_hp = m_ptr->maxhp * 3 / 20;
 
                        if (m_ptr->hp >= nokori_hp)
                        {
-                msg_format(_("もっと弱らせないと。", "You need to weaken %s more."), m_name);
+                               msg_format(_("もっと弱らせないと。", "You need to weaken %s more."), m_name);
                                skipped = TRUE;
                        }
                        else if (m_ptr->hp < randint0(nokori_hp))
                        {
                                if (m_ptr->mflag2 & MFLAG2_CHAMELEON) choose_new_monster(c_ptr->m_idx, FALSE, MON_CHAMELEON);
-                msg_format(_("%sを捕えた!", "You capture %^s!"), m_name);
+                               msg_format(_("%sを捕えた!", "You capture %^s!"), m_name);
                                cap_mon = m_ptr->r_idx;
                                cap_mspeed = m_ptr->mspeed;
                                cap_hp = m_ptr->hp;
@@ -4393,7 +3920,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                {
                                        if (rakuba(-1, FALSE))
                                        {
-                        msg_format(_("地面に落とされた。", "You have fallen from %s."), m_name);
+                                               msg_format(_("地面に落とされた。", "You have fallen from %s."), m_name);
                                        }
                                }
 
@@ -4403,7 +3930,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        }
                        else
                        {
-                msg_format(_("うまく捕まえられなかった。", "You failed to capture %s."), m_name);
+                               msg_format(_("うまく捕まえられなかった。", "You failed to capture %s."), m_name);
                                skipped = TRUE;
                        }
                        break;
@@ -4425,23 +3952,23 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
                        if (r_ptr->flags2 & RF2_EMPTY_MIND)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
                                break;
                        }
                        if (MON_CSLEEP(m_ptr))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                                skipped = TRUE;
                                break;
@@ -4456,9 +3983,9 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        {
                                /* Powerful monsters can resist */
                                if ((r_ptr->flags1 & RF1_UNIQUE) ||
-                                   (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-                {
-                    note = _("には効果がなかった。", " is unaffected.");
+                                       (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                               {
+                                       note = _("には効果がなかった。", " is unaffected.");
                                        obvious = FALSE;
                                }
 
@@ -4467,7 +3994,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                {
                                        if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+                                               note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
                                }
                        }
@@ -4478,13 +4005,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                                /* Attempt a saving throw */
                                if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-                                   (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                                       (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                                {
                                        /* Resist */
                                        do_stun = 0;
 
                                        /* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+                                       note = _("には効果がなかった。", " is unaffected.");
                                        obvious = FALSE;
                                }
                        }
@@ -4493,8 +4020,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        {
                                /* Attempt a saving throw */
                                if ((r_ptr->flags1 & RF1_UNIQUE) ||
-                                   (r_ptr->flags3 & RF3_NO_SLEEP) ||
-                                   (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                                       (r_ptr->flags3 & RF3_NO_SLEEP) ||
+                                       (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                                {
                                        /* Memorize a flag */
                                        if (r_ptr->flags3 & RF3_NO_SLEEP)
@@ -4503,20 +4030,20 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                        }
 
                                        /* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+                                       note = _("には効果がなかった。", " is unaffected.");
                                        obvious = FALSE;
                                }
                                else
                                {
                                        /* Go to sleep (much) later */
-                    note = _("は眠り込んでしまった!", " falls asleep!");
+                                       note = _("は眠り込んでしまった!", " falls asleep!");
                                        do_sleep = 500;
                                }
                        }
 
                        if (!done)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                        }
 
                        /* No "real" damage */
@@ -4530,16 +4057,16 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
 
-            if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One")))
+                       if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One")))
                        {
-                if (seen_msg) msg_format(_("%sは消滅した!", "%^s disappered!"), m_name);
+                               if (seen_msg) msg_format(_("%sは消滅した!", "%^s disappered!"), m_name);
                                chg_virtue(V_VITALITY, -1);
                                return TRUE;
                        }
@@ -4561,8 +4088,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
 
                                /* Special effect */
-                note = _("は光に身をすくめた!", " cringes from the light!");
-                note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!");
+                               note = _("は光に身をすくめた!", " cringes from the light!");
+                               note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!");
                        }
 
                        /* Normally no damage */
@@ -4584,8 +4111,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4606,16 +4133,16 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                /* No need to tame your pet */
                                if (is_pet(m_ptr))
                                {
-                    note = _("の動きが速くなった。", " starts moving faster.");
+                                       note = _("の動きが速くなった。", " starts moving faster.");
                                        (void)set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100);
                                        success = TRUE;
                                }
 
                                /* Attempt a saving throw */
                                else if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
-                                   (r_ptr->flags1 & (RF1_UNIQUE)) ||
-                                   (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                                   (p_ptr->cursed & TRC_AGGRAVATE) ||
+                                       (r_ptr->flags1 & (RF1_UNIQUE)) ||
+                                       (m_ptr->mflag2 & MFLAG2_NOPET) ||
+                                       (p_ptr->cursed & TRC_AGGRAVATE) ||
                                         ((r_ptr->level+10) > randint1(dam)))
                                {
                                        /* Resist */
@@ -4623,7 +4150,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                }
                                else
                                {
-                    note = _("を支配した。", " is tamed!");
+                                       note = _("を支配した。", " is tamed!");
                                        set_pet(m_ptr);
                                        (void)set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100);
 
@@ -4652,8 +4179,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある!", " is immune.");
+                       {
+                               note = _("には完全な耐性がある!", " is immune.");
                                skipped = TRUE;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -4661,8 +4188,8 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Attempt a saving throw */
                        if (randint0(100 + dam) < (r_ptr->level + 50))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4708,7 +4235,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
        /* Modify the damage */
        tmp = dam;
        dam = mon_damage_mod(m_ptr, dam, (bool)(typ == GF_PSY_SPEAR));
-    if ((tmp > 0) && (dam == 0)) note = _("はダメージを受けていない。", " is unharmed.");
+       if ((tmp > 0) && (dam == 0)) note = _("はダメージを受けていない。", " is unharmed.");
 
        /* Check for death */
        if (dam > m_ptr->hp)
@@ -4720,21 +4247,20 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
        {
                /* Sound and Impact resisters never stun */
                if (do_stun &&
-                   !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) &&
-                   !(r_ptr->flags3 & RF3_NO_STUN))
+                       !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) &&
+                       !(r_ptr->flags3 & RF3_NO_STUN))
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Get stunned */
                        if (MON_STUNNED(m_ptr))
                        {
-                note = _("はひどくもうろうとした。", " is more dazed.");
-                tmp = MON_STUNNED(m_ptr) + (do_stun / 2);
+                               note = _("はひどくもうろうとした。", " is more dazed.");
+                               tmp = MON_STUNNED(m_ptr) + (do_stun / 2);
                        }
                        else
                        {
-                note = _("はもうろうとした。", " is dazed.");
+                               note = _("はもうろうとした。", " is dazed.");
                                tmp = do_stun;
                        }
 
@@ -4750,20 +4276,19 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                         !(r_ptr->flags3 & RF3_NO_CONF) &&
                         !(r_ptr->flagsr & RFR_EFF_RES_CHAO_MASK))
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Already partially confused */
                        if (MON_CONFUSED(m_ptr))
                        {
-                note = _("はさらに混乱したようだ。", " looks more confused.");
+                               note = _("はさらに混乱したようだ。", " looks more confused.");
                                tmp = MON_CONFUSED(m_ptr) + (do_conf / 2);
                        }
 
                        /* Was not confused */
                        else
                        {
-                note = _("は混乱したようだ。", " looks confused.");
+                               note = _("は混乱したようだ。", " looks confused.");
                                tmp = do_conf;
                        }
 
@@ -4776,14 +4301,13 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                if (do_time)
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp - 1;
 
                        if (do_time)
                        {
-                note = _("は弱くなったようだ。", " seems weakened.");
+                               note = _("は弱くなったようだ。", " seems weakened.");
                                m_ptr->maxhp -= do_time;
                                if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp - m_ptr->maxhp;
                        }
@@ -4795,11 +4319,10 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                {
                        if (polymorph_monster(y, x))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Monster polymorphs */
-                note = _("が変身した!", " changes!");
+                               note = _("が変身した!", " changes!");
 
                                /* Turn off the damage */
                                dam = 0;
@@ -4807,7 +4330,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        else
                        {
                                /* No polymorph */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                        }
 
                        /* Hack -- Get new monster */
@@ -4820,11 +4343,9 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                /* Handle "teleport" */
                if (do_dist)
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
-                       /* Message */
-            note = _("が消え去った!", " disappears!");
+                       note = _("が消え去った!", " disappears!");
 
                        if (!who) chg_virtue(V_VALOUR, -1);
 
@@ -4896,12 +4417,12 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        /* Generate treasure, etc */
                        monster_death(c_ptr->m_idx, FALSE);
 
-                       /* Delete the monster */
+
                        delete_monster_idx(c_ptr->m_idx);
 
                        if (sad)
                        {
-                msg_print(_("少し悲しい気分がした。", "You feel sad for a moment."));
+                               msg_print(_("少し悲しい気分がした。", "You feel sad for a moment."));
                        }
                }
 
@@ -4928,11 +4449,11 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
        else if (heal_leper)
        {
-        if (seen_msg) msg_print(_("不潔な病人は病気が治った!", "The Mangy looking leper is healed!"));
+               if (seen_msg) msg_print(_("不潔な病人は病気が治った!", "The Mangy looking leper is healed!"));
 
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                {
-                       char m2_name[80];
+                       char m2_name[MAX_NLEN];
 
                        monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
@@ -4960,7 +4481,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                        /* Give detailed messages if visible or destroyed */
                        if (note && seen_msg)
-                msg_format(_("%s%s", "%^s%s"), m_name, note);
+                               msg_format(_("%s%s", "%^s%s"), m_name, note);
 
                        /* Hack -- Pain message */
                        else if (known && (dam || !do_fear))
@@ -4972,14 +4493,10 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        if (((dam > 0) || get_angry) && !do_sleep)
                                anger_monster(m_ptr);
 
-                       /* Take note */
                        if ((fear || do_fear) && seen)
                        {
-                               /* Sound */
                                sound(SOUND_FLEE);
-
-                               /* Message */
-                msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
+                               msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
                        }
 
                        /* Hack -- handle sleep */
@@ -4998,7 +4515,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        case 1: case 2:
                                if (!count)
                                {
-                    msg_print(_("地面が揺れた...", "The ground trembles..."));
+                                       msg_print(_("地面が揺れた...", "The ground trembles..."));
                                        earthquake(ty, tx, 4 + randint0(4));
                                        if (!one_in_(6)) break;
                                }
@@ -5006,7 +4523,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                if (!count)
                                {
                                        int extra_dam = damroll(10, 10);
-                    msg_print(_("純粋な魔力の次元への扉が開いた!", "A portal opens to a plane of raw mana!"));
+                                       msg_print(_("純粋な魔力の次元への扉が開いた!", "A portal opens to a plane of raw mana!"));
 
                                        project(0, 8, ty, tx, extra_dam, GF_MANA, curse_flg, -1);
                                        if (!one_in_(6)) break;
@@ -5014,14 +4531,14 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        case 7: case 8:
                                if (!count)
                                {
-                    msg_print(_("空間が歪んだ!", "Space warps about you!"));
+                                       msg_print(_("空間が歪んだ!", "Space warps about you!"));
 
                                        if (m_ptr->r_idx) teleport_away(c_ptr->m_idx, damroll(10, 10), TELEPORT_PASSIVE);
                                        if (one_in_(13)) count += activate_hi_summon(ty, tx, TRUE);
                                        if (!one_in_(6)) break;
                                }
                        case 9: case 10: case 11:
-                msg_print(_("エネルギーのうねりを感じた!", "You feel a surge of energy!"));
+                               msg_print(_("エネルギーのうねりを感じた!", "You feel a surge of energy!"));
                                project(0, 7, ty, tx, 50, GF_DISINTEGRATE, curse_flg, -1);
                                if (!one_in_(6)) break;
                        case 12: case 13: case 14: case 15: case 16:
@@ -5033,17 +4550,17 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                        case 19: case 20: case 21: case 22:
                        {
                                bool pet = !one_in_(3);
-                               u32b mode = PM_ALLOW_GROUP;
+                               BIT_FLAGS mode = PM_ALLOW_GROUP;
 
                                if (pet) mode |= PM_FORCE_PET;
                                else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
 
-                               count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode);
+                               count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode, '\0');
                                if (!one_in_(6)) break;
                        }
                        case 23: case 24: case 25:
                                if (p_ptr->hold_exp && (randint0(100) < 75)) break;
-                msg_print(_("経験値が体から吸い取られた気がする!", "You feel your experience draining away..."));
+                               msg_print(_("経験値が体から吸い取られた気がする!", "You feel your experience draining away..."));
 
                                if (p_ptr->hold_exp) lose_exp(p_ptr->exp / 160);
                                else lose_exp(p_ptr->exp / 16);
@@ -5053,7 +4570,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
                                int i = 0;
                                if (one_in_(13))
                                {
-                                       while (i < 6)
+                                       while (i < A_MAX)
                                        {
                                                do
                                                {
@@ -5079,13 +4596,11 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
        {
                p_ptr->health_who = c_ptr->m_idx;
                p_ptr->redraw |= (PR_HEALTH);
-               redraw_stuff();
+               handle_stuff();
        }
 
-       /* XXX XXX XXX Verify this code */
-
-       /* Update the monster */
-       if (m_ptr->r_idx) update_mon(c_ptr->m_idx, FALSE);
+       /* Verify this code */
+       if (m_ptr->r_idx) update_monster(c_ptr->m_idx, FALSE);
 
        /* Redraw the monster grid */
        lite_spot(y, x);
@@ -5094,7 +4609,6 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
        /* Update monster recall window */
        if ((p_ptr->monster_race_idx == m_ptr->r_idx) && (seen || !m_ptr->r_idx))
        {
-               /* Window stuff */
                p_ptr->window |= (PW_MONSTER);
        }
 
@@ -5124,8 +4638,6 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
        {
                object_type *q_ptr;
                object_type forge;
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Prepare to make a Blade of Chaos */
@@ -5135,8 +4647,6 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 
                /* Mark the item as fully known */
                q_ptr->ident |= (IDENT_MENTAL);
-
-               /* Drop it in the dungeon */
                (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
        }
 
@@ -5173,10 +4683,10 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
  * We return "TRUE" if any "obvious" effects were observed.  XXX XXX Actually,
  * we just assume that the effects were obvious, for historical reasons.
  */
-static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell)
+static bool project_p(MONSTER_IDX who, concptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell)
 {
        int k = 0;
-       int rlev = 0;
+       DEPTH rlev = 0;
 
        /* Hack -- assume obvious */
        bool obvious = TRUE;
@@ -5191,13 +4701,13 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
        monster_type *m_ptr = NULL;
 
        /* Monster name (for attacks) */
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        /* Monster name (for damage) */
        char killer[80];
 
        /* Hack -- messages */
-       cptr act = NULL;
+       concptr act = NULL;
 
        int get_damage = 0;
 
@@ -5218,6 +4728,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
        {
                POSITION t_y, t_x;
                int max_attempts = 10;
+               sound(SOUND_REFLECT);
 
                if (blind) 
                        msg_print(_("何かが跳ね返った!", "Something bounces!"));
@@ -5252,11 +4763,10 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 
                project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell);
 
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
                return TRUE;
        }
 
-       /* XXX XXX XXX */
        /* Limit maximum damage */
        if (dam > 1600) dam = 1600;
 
@@ -5270,12 +4780,8 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 
        if (who > 0)
        {
-               /* Get the source monster */
                m_ptr = &m_list[who];
-               /* Extract the monster level */
                rlev = (((&r_info[m_ptr->r_idx])->level >= 1) ? (&r_info[m_ptr->r_idx])->level : 1);
-
-               /* Get the monster name */
                monster_desc(m_name, m_ptr, 0);
 
                /* Get the monster's real name (gotten before polymorph!) */
@@ -5286,15 +4792,15 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                switch (who)
                {
                case PROJECT_WHO_UNCTRL_POWER:
-            strcpy(killer, _("制御できない力の氾流", "uncontrollable power storm"));
+                       strcpy(killer, _("制御できない力の氾流", "uncontrollable power storm"));
                        break;
 
                case PROJECT_WHO_GLASS_SHARDS:
-            strcpy(killer, _("ガラスの破片", "shards of glass"));
+                       strcpy(killer, _("ガラスの破片", "shards of glass"));
                        break;
 
                default:
-            strcpy(killer, _("罠", "a trap"));
+                       strcpy(killer, _("罠", "a trap"));
                        break;
                }
 
@@ -5308,7 +4814,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                /* Standard damage -- hurts inventory too */
                case GF_ACID:
                {
-            if (fuzzy) msg_print(_("酸で攻撃された!", "You are hit by acid!"));                       
+                       if (fuzzy) msg_print(_("酸で攻撃された!", "You are hit by acid!"));                    
                        get_damage = acid_dam(dam, killer, monspell, FALSE);
                        break;
                }
@@ -5316,8 +4822,8 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                /* Standard damage -- hurts inventory too */
                case GF_FIRE:
                {
-            if (fuzzy) msg_print(_("火炎で攻撃された!", "You are hit by fire!"));
-            get_damage = fire_dam(dam, killer, monspell, FALSE);
+                       if (fuzzy) msg_print(_("火炎で攻撃された!", "You are hit by fire!"));
+                       get_damage = fire_dam(dam, killer, monspell, FALSE);
                        break;
                }
 
@@ -5341,13 +4847,12 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_POIS:
                {
                        bool double_resist = IS_OPPOSE_POIS();
-            if (fuzzy) msg_print(_("毒で攻撃された!", "You are hit by poison!"));
+                       if (fuzzy) msg_print(_("毒で攻撃された!", "You are hit by poison!"));
 
                        if (p_ptr->resist_pois) dam = (dam + 2) / 3;
                        if (double_resist) dam = (dam + 2) / 3;
 
-                       if ((!(double_resist || p_ptr->resist_pois)) &&
-                            one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW())
+                       if ((!(double_resist || p_ptr->resist_pois)) && one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW())
                        {
                                do_dec_stat(A_CON);
                        }
@@ -5365,7 +4870,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_NUKE:
                {
                        bool double_resist = IS_OPPOSE_POIS();
-            if (fuzzy) msg_print(_("放射能で攻撃された!", "You are hit by radiation!"));
+                       if (fuzzy) msg_print(_("放射能で攻撃された!", "You are hit by radiation!"));
 
                        if (p_ptr->resist_pois) dam = (2 * dam + 2) / 5;
                        if (double_resist) dam = (2 * dam + 2) / 5;
@@ -5376,7 +4881,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 
                                if (one_in_(5)) /* 6 */
                                {
-                    msg_print(_("奇形的な変身を遂げた!", "You undergo a freakish metamorphosis!"));
+                                       msg_print(_("奇形的な変身を遂げた!", "You undergo a freakish metamorphosis!"));
                                        if (one_in_(4)) /* 4 */
                                                do_poly_self();
                                        else
@@ -5394,7 +4899,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                /* Standard damage */
                case GF_MISSILE:
                {
-            if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!"));
+                       if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!"));
                        get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
                        break;
                }
@@ -5402,7 +4907,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                /* Holy Orb -- Player only takes partial damage */
                case GF_HOLY_FIRE:
                {
-            if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!"));
+                       if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!"));
                        if (p_ptr->align > 10)
                                dam /= 2;
                        else if (p_ptr->align < -10)
@@ -5413,7 +4918,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 
                case GF_HELL_FIRE:
                {
-            if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!"));
+                       if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!"));
                        if (p_ptr->align > 10)
                                dam *= 2;
                        get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
@@ -5448,9 +4953,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                (void)set_stun(p_ptr->stun + plus_stun);
                        }
 
-                       if (!(p_ptr->resist_fire ||
-                               IS_OPPOSE_FIRE() ||
-                               p_ptr->immune_fire))
+                       if (!(p_ptr->resist_fire || IS_OPPOSE_FIRE() || p_ptr->immune_fire))
                        {
                                inven_damage(set_acid_destroy, 3);
                        }
@@ -5473,7 +4976,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 
                        if (prace_is_(RACE_SPECTRE) && !CHECK_MULTISHADOW())
                        {
-                msg_print(_("気分がよくなった。", "You feel invigorated!"));
+                               msg_print(_("気分がよくなった。", "You feel invigorated!"));
                                hp_player(dam / 4);
                                learn_spell(monspell);
                        }
@@ -5489,21 +4992,23 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_WATER:
                {
                        if (fuzzy) msg_print(_("何か湿ったもので攻撃された!", "You are hit by something wet!"));
-            if (!CHECK_MULTISHADOW())
+                       if (!CHECK_MULTISHADOW())
                        {
-                               if (!p_ptr->resist_sound)
+                               if (!p_ptr->resist_sound && !p_ptr->resist_water)
                                {
                                        set_stun(p_ptr->stun + randint1(40));
                                }
-                               if (!p_ptr->resist_conf)
+                               if (!p_ptr->resist_conf && !p_ptr->resist_water)
                                {
                                        set_confused(p_ptr->confused + randint1(5) + 5);
                                }
 
-                               if (one_in_(5))
+                               if (one_in_(5) && !p_ptr->resist_water)
                                {
                                        inven_damage(set_cold_destroy, 3);
                                }
+
+                               if (p_ptr->resist_water) get_damage /= 4;
                        }
 
                        get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
@@ -5513,7 +5018,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                /* Chaos -- many effects */
                case GF_CHAOS:
                {
-            if (fuzzy) msg_print(_("無秩序の波動で攻撃された!", "You are hit by a wave of anarchy!"));
+                       if (fuzzy) msg_print(_("無秩序の波動で攻撃された!", "You are hit by a wave of anarchy!"));
                        if (p_ptr->resist_chaos)
                        {
                                dam *= 6; dam /= (randint1(4) + 7);
@@ -5530,7 +5035,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                        (void)set_image(p_ptr->image + randint1(10));
                                        if (one_in_(3))
                                        {
-                        msg_print(_("あなたの身体はカオスの力で捻じ曲げられた!", "Your body is twisted by chaos!"));
+                                               msg_print(_("あなたの身体はカオスの力で捻じ曲げられた!", "Your body is twisted by chaos!"));
                                                (void)gain_random_mutation(0);
                                        }
                                }
@@ -5707,7 +5212,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 
                        if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE))
                        {
-                if (!CHECK_MULTISHADOW()) msg_print(_("光で肉体が焦がされた!", "The light scorches your flesh!"));
+                               if (!CHECK_MULTISHADOW()) msg_print(_("光で肉体が焦がされた!", "The light scorches your flesh!"));
                                dam *= 2;
                        }
                        else if (prace_is_(RACE_S_FAIRY))
@@ -5722,17 +5227,11 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                        {
                                p_ptr->wraith_form = 0;
                                msg_print(_("閃光のため非物質的な影の存在でいられなくなった。",
-                    "The light forces you out of your incorporeal shadow form."));
+                                       "The light forces you out of your incorporeal shadow form."));
 
-                               p_ptr->redraw |= PR_MAP;
-                               /* Update monsters */
+                               p_ptr->redraw |= (PR_MAP | PR_STATUS);
                                p_ptr->update |= (PU_MONSTERS);
-                               /* Window stuff */
                                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
-
-                               /* Redraw status bar */
-                               p_ptr->redraw |= (PR_STATUS);
-
                        }
 
                        break;
@@ -5764,7 +5263,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                        {
                                dam *= 4;
                                dam /= (randint1(4) + 7);
-                msg_print(_("時間が通り過ぎていく気がする。", "You feel as if time is passing you by."));
+                               msg_print(_("時間が通り過ぎていく気がする。", "You feel as if time is passing you by."));
                        }
                        else if (!CHECK_MULTISHADOW())
                        {
@@ -5773,7 +5272,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                        case 1: case 2: case 3: case 4: case 5:
                                        {
                                                if (p_ptr->prace == RACE_ANDROID) break;
-                        msg_print(_("人生が逆戻りした気がする。", "You feel life has clocked back."));
+                                               msg_print(_("人生が逆戻りした気がする。", "You feel life has clocked back."));
                                                lose_exp(100 + (p_ptr->exp / 100) * MON_DRAIN_LIFE);
                                                break;
                                        }
@@ -5782,16 +5281,16 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                        {
                                                switch (randint1(6))
                                                {
-                            case 1: k = A_STR; act = _("強く", "strong"); break;
-                            case 2: k = A_INT; act = _("聡明で", "bright"); break;
-                            case 3: k = A_WIS; act = _("賢明で", "wise"); break;
-                            case 4: k = A_DEX; act = _("器用で", "agile"); break;
-                            case 5: k = A_CON; act = _("健康で", "hale"); break;
-                            case 6: k = A_CHR; act = _("美しく", "beautiful"); break;
+                                                       case 1: k = A_STR; act = _("強く", "strong"); break;
+                                                       case 2: k = A_INT; act = _("聡明で", "bright"); break;
+                                                       case 3: k = A_WIS; act = _("賢明で", "wise"); break;
+                                                       case 4: k = A_DEX; act = _("器用で", "agile"); break;
+                                                       case 5: k = A_CON; act = _("健康で", "hale"); break;
+                                                       case 6: k = A_CHR; act = _("美しく", "beautiful"); break;
                                                }
 
                                                msg_format(_("あなたは以前ほど%sなくなってしまった...。", 
-                                     "You're not as %s as you used to be..."), act);
+                                                                        "You're not as %s as you used to be..."), act);
 
                                                p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 3) / 4;
                                                if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3;
@@ -5802,9 +5301,9 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                        case 10:
                                        {
                                                msg_print(_("あなたは以前ほど力強くなくなってしまった...。", 
-                                    "You're not as powerful as you used to be..."));
+                                                                       "You're not as powerful as you used to be..."));
 
-                                               for (k = 0; k < 6; k++)
+                                               for (k = 0; k < A_MAX; k++)
                                                {
                                                        p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 7) / 8;
                                                        if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3;
@@ -5886,11 +5385,11 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_OLD_SLEEP:
                {
                        if (p_ptr->free_act)  break;
-            if (fuzzy) msg_print(_("眠ってしまった!", "You fall asleep!"));
+                       if (fuzzy) msg_print(_("眠ってしまった!", "You fall asleep!"));
 
                        if (ironman_nightmare)
                        {
-                msg_print(_("恐ろしい光景が頭に浮かんできた。", "A horrible vision enters your mind."));
+                               msg_print(_("恐ろしい光景が頭に浮かんできた。", "A horrible vision enters your mind."));
                                /* Have some nightmares */
                                sanity_blast(NULL, FALSE);
                        }
@@ -6001,15 +5500,15 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                {
                        if (CHECK_MULTISHADOW())
                        {
-                msg_print(_("攻撃は幻影に命中し、あなたには届かなかった。", "The attack hits Shadow, you are unharmed!"));
+                               msg_print(_("攻撃は幻影に命中し、あなたには届かなかった。", "The attack hits Shadow, you are unharmed!"));
                        }
                        else if (p_ptr->csp)
                        {
                                /* Basic message */
                                if (who > 0) 
-                    msg_format(_("%^sに精神エネルギーを吸い取られてしまった!", "%^s draws psychic energy from you!"), m_name);
+                                       msg_format(_("%^sに精神エネルギーを吸い取られてしまった!", "%^s draws psychic energy from you!"), m_name);
                                else 
-                    msg_print(_("精神エネルギーを吸い取られてしまった!", "Your psychic energy is drawn!"));
+                                       msg_print(_("精神エネルギーを吸い取られてしまった!", "Your psychic energy is drawn!"));
 
                                /* Full drain */
                                if (dam >= p_ptr->csp)
@@ -6026,13 +5525,8 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                }
 
                                learn_spell(monspell);
-
-                               /* Redraw mana */
                                p_ptr->redraw |= (PR_MANA);
-
-                               /* Window stuff */
-                               p_ptr->window |= (PW_PLAYER);
-                               p_ptr->window |= (PW_SPELL);
+                               p_ptr->window |= (PW_PLAYER | PW_SPELL);
 
                                if (who > 0)
                                {
@@ -6050,7 +5544,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                                /* Special message */
                                                if (m_ptr->ml)
                                                {
-                            msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), m_name);
+                                                       msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), m_name);
                                                }
                                        }
                                }
@@ -6065,14 +5559,14 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                {
                        if ((randint0(100 + rlev / 2) < MAX(5, p_ptr->skill_sav)) && !CHECK_MULTISHADOW())
                        {
-                msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
+                               msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
                                learn_spell(monspell);
                        }
                        else
                        {
                                if (!CHECK_MULTISHADOW())
                                {
-                    msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy."));
+                                       msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy."));
 
                                        if (!p_ptr->resist_conf)
                                        {
@@ -6102,15 +5596,15 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_BRAIN_SMASH:
                {
                        if ((randint0(100 + rlev / 2) < MAX(5, p_ptr->skill_sav)) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
+                       {
+                               msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
                                learn_spell(monspell);
                        }
                        else
                        {
                                if (!CHECK_MULTISHADOW())
-                {
-                    msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy."));
+                               {
+                                       msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy."));
 
                                        p_ptr->csp -= 100;
                                        if (p_ptr->csp < 0)
@@ -6156,8 +5650,8 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_CAUSE_1:
                {
                        if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
+                       {
+                               msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
                                learn_spell(monspell);
                        }
                        else
@@ -6172,8 +5666,8 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_CAUSE_2:
                {
                        if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
+                       {
+                               msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
                                learn_spell(monspell);
                        }
                        else
@@ -6188,8 +5682,8 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_CAUSE_3:
                {
                        if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
+                       {
+                               msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
                                learn_spell(monspell);
                        }
                        else
@@ -6205,7 +5699,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                {
                        if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !(m_ptr->r_idx == MON_KENSHIROU) && !CHECK_MULTISHADOW())
                        {
-                msg_print(_("しかし秘孔を跳ね返した!", "You resist the effects!"));
+                               msg_print(_("しかし秘孔を跳ね返した!", "You resist the effects!"));
                                learn_spell(monspell);
                        }
                        else
@@ -6220,15 +5714,15 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                case GF_HAND_DOOM:
                {
                        if ((randint0(100 + rlev/2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
+                       {
+                               msg_print(_("しかし効力を跳ね返した!", "You resist the effects!"));
                                learn_spell(monspell);
                        }
                        else
                        {
                                if (!CHECK_MULTISHADOW())
                                {
-                    msg_print(_("あなたは命が薄まっていくように感じた!", "You feel your life fade away!"));
+                                       msg_print(_("あなたは命が薄まっていくように感じた!", "You feel your life fade away!"));
                                        curse_equipment(40, 20);
                                }
 
@@ -6255,7 +5749,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
        if ((p_ptr->tim_eyeeye || hex_spelling(HEX_EYE_FOR_EYE))
                && (get_damage > 0) && !p_ptr->is_dead && (who > 0))
        {
-               char m_name_self[80];
+               GAME_TEXT m_name_self[80];
 
                /* hisself */
                monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
@@ -6271,8 +5765,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
        }
 
 
-       /* Disturb */
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
 
 
        if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && who && (who != p_ptr->riding))
@@ -6288,59 +5781,45 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 /*
  * Find the distance from (x, y) to a line.
  */
-int dist_to_line(int y, int x, int y1, int x1, int y2, int x2)
+POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 {
        /* Vector from (x, y) to (x1, y1) */
-       int py = y1 - y;
-       int px = x1 - x;
+       POSITION py = y1 - y;
+       POSITION px = x1 - x;
 
        /* Normal vector */
-       int ny = x2 - x1;
-       int nx = y1 - y2;
+       POSITION ny = x2 - x1;
+       POSITION nx = y1 - y2;
 
-   /* Length of N */
-       int pd = distance(y1, x1, y, x);
-       int nd = distance(y1, x1, y2, x2);
+       /* Length of N */
+       POSITION pd = distance(y1, x1, y, x);
+       POSITION nd = distance(y1, x1, y2, x2);
 
        if (pd > nd) return distance(y, x, y2, x2);
 
        /* Component of P on N */
        nd = ((nd) ? ((py * ny + px * nx) / nd) : 0);
 
-   /* Absolute value */
-   return((nd >= 0) ? nd : 0 - nd);
+       /* Absolute value */
+       return((nd >= 0) ? nd : 0 - nd);
 }
 
 
 
 /*
- * XXX XXX XXX
+ * 
  * Modified version of los() for calculation of disintegration balls.
  * Disintegration effects are stopped by permanent walls.
  */
 bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 {
-       /* Delta */
-       POSITION dx, dy;
-
-       /* Absolute */
-       POSITION ax, ay;
-
-       /* Signs */
-       POSITION sx, sy;
-
-       /* Fractions */
-       POSITION qx, qy;
-
-       /* Scanners */
-       POSITION tx, ty;
-
-       /* Scale factors */
-       POSITION f1, f2;
-
-       /* Slope, or 1/Slope, of LOS */
-       POSITION m;
-
+       POSITION dx, dy; /* Delta */
+       POSITION ax, ay; /* Absolute */
+       POSITION sx, sy; /* Signs */
+       POSITION qx, qy; /* Fractions */
+       POSITION tx, ty; /* Scanners */
+       POSITION f1, f2; /* Scale factors */
+       POSITION m; /* Slope, or 1/Slope, of LOS */
 
        /* Extract the offset */
        dy = y2 - y1;
@@ -6350,15 +5829,12 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
        ay = ABS(dy);
        ax = ABS(dx);
 
-
        /* Handle adjacent (or identical) grids */
        if ((ax < 2) && (ay < 2)) return (TRUE);
 
-
        /* Paranoia -- require "safe" origin */
        /* if (!in_bounds(y1, x1)) return (FALSE); */
 
-
        /* Directly South/North */
        if (!dx)
        {
@@ -6409,12 +5885,10 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
                return (TRUE);
        }
 
-
        /* Extract some signs */
        sx = (dx < 0) ? -1 : 1;
        sy = (dy < 0) ? -1 : 1;
 
-
        /* Vertical "knights" */
        if (ax == 1)
        {
@@ -6433,7 +5907,6 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
                }
        }
 
-
        /* Calculate scale factor div 2 */
        f2 = (ax * ay);
 
@@ -6544,10 +6017,10 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 /*
  * breath shape
  */
-void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ)
+void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ)
 {
-       int by = y1;
-       int bx = x1;
+       POSITION by = y1;
+       POSITION bx = x1;
        int brad = 0;
        int brev = rad * rad / dist;
        int bdis = 0;
@@ -6557,13 +6030,13 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte
 
        while (bdis <= mdis)
        {
-               int x, y;
+               POSITION x, y;
 
                if ((0 < dist) && (path_n < dist))
                {
-                       int ny = GRID_Y(path_g[path_n]);
-                       int nx = GRID_X(path_g[path_n]);
-                       int nd = distance(ny, nx, y1, x1);
+                       POSITION ny = GRID_Y(path_g[path_n]);
+                       POSITION nx = GRID_X(path_g[path_n]);
+                       POSITION nd = distance(ny, nx, y1, x1);
 
                        /* Get next base point */
                        if (bdis >= nd)
@@ -6773,17 +6246,17 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte
  * and "update_view()" and "update_monsters()" need to be called.
  * </pre>
  */
-bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell)
+bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell)
 {
        int i, t, dist;
 
-       int y1, x1;
-       int y2, x2;
-       int by, bx;
+       POSITION y1, x1;
+       POSITION y2, x2;
+       POSITION by, bx;
 
        int dist_hack = 0;
 
-       int y_saver, x_saver; /* For reflecting monsters */
+       POSITION y_saver, x_saver; /* For reflecting monsters */
 
        int msec = delay_factor * delay_factor * delay_factor;
 
@@ -6814,18 +6287,18 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
        int grids = 0;
 
        /* Coordinates of the affected grids */
-       byte gx[1024], gy[1024];
+       POSITION gx[1024], gy[1024];
 
        /* Encoded "radius" info (see above) */
-       byte gm[32];
+       POSITION gm[32];
 
        /* Actual radius encoded in gm[] */
-       int gm_rad = rad;
+       POSITION gm_rad = rad;
 
        bool jump = FALSE;
 
        /* Attacker's name (prepared before polymorph)*/
-       char who_name[80];
+       GAME_TEXT who_name[MAX_NLEN];
 
        /* Can the player see the source of this effect? */
        bool see_s_msg = TRUE;
@@ -6837,8 +6310,8 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
        rakubadam_m = 0;
 
        /* Default target of monsterspell is player */
-       monster_target_y=p_ptr->y;
-       monster_target_x=p_ptr->x;
+       monster_target_y = p_ptr->y;
+       monster_target_x = p_ptr->x;
 
        /* Hack -- Jump to target */
        if (flg & (PROJECT_JUMP))
@@ -6867,7 +6340,6 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                monster_desc(who_name, &m_list[who], MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
        }
 
-       /* Oops */
        else
        {
                x1 = x;
@@ -6933,8 +6405,6 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
        /* Calculate the projection path */
 
        path_n = project_path(path_g, (project_length ? project_length : MAX_RANGE), y1, x1, y2, x2, flg);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        /* Giga-Hack SEEKER & SUPER_RAY */
@@ -6974,8 +6444,8 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                                {
                                        u16b p;
 
-                                       byte a;
-                                       char c;
+                                       TERM_COLOR a;
+                                       SYMBOL_CODE c;
 
                                        /* Obtain the bolt pict */
                                        p = bolt_pict(oy, ox, y, x, typ);
@@ -7017,50 +6487,50 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                                        Term_xtra(TERM_XTRA_DELAY, msec);
                                }
                        }
-                       if(project_o(0,0,y,x,dam,GF_SEEKER))notice=TRUE;
-                       ifis_mirror_grid(&cave[y][x]))
+                       if (project_o(0, 0, y, x, dam, GF_SEEKER))notice = TRUE;
+                       if (is_mirror_grid(&cave[y][x]))
                        {
-                         /* The target of monsterspell becomes tha mirror(broken) */
-                               monster_target_y=(s16b)y;
-                               monster_target_x=(s16b)x;
+                               /* The target of monsterspell becomes tha mirror(broken) */
+                               monster_target_y = y;
+                               monster_target_x = x;
 
                                remove_mirror(y, x);
                                next_mirror(&oy, &ox, y, x);
 
-                               path_n = i+project_path(&(path_g[i+1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
-                               for(j = last_i; j <= i; j++)
+                               path_n = i + project_path(&(path_g[i + 1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
+                               for (j = last_i; j <= i; j++)
                                {
                                        y = GRID_Y(path_g[j]);
                                        x = GRID_X(path_g[j]);
-                                       if(project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice=TRUE;
-                                       if(!who && (project_m_n==1) && !jump ){
-                                         if(cave[project_m_y][project_m_x].m_idx >0 ){
-                                           monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
-
-                                           if (m_ptr->ml)
-                                           {
-                                             /* Hack -- auto-recall */
-                                             if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-
-                                             /* Hack - auto-track */
-                                             health_track(cave[project_m_y][project_m_x].m_idx);
-                                           }
-                                         }
+                                       if (project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice = TRUE;
+                                       if (!who && (project_m_n == 1) && !jump) {
+                                               if (cave[project_m_y][project_m_x].m_idx > 0) {
+                                                       monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
+
+                                                       if (m_ptr->ml)
+                                                       {
+                                                               /* Hack -- auto-recall */
+                                                               if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
+
+                                                               /* Hack - auto-track */
+                                                               health_track(cave[project_m_y][project_m_x].m_idx);
+                                                       }
+                                               }
                                        }
-                                       (void)project_f(0,0,y,x,dam,GF_SEEKER);
+                                       (void)project_f(0, 0, y, x, dam, GF_SEEKER);
                                }
                                last_i = i;
                        }
                }
                for(i = last_i ; i < path_n ; i++)
                {
-                       int py, px;
+                       POSITION py, px;
                        py = GRID_Y(path_g[i]);
                        px = GRID_X(path_g[i]);
-                       if(project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
+                       if (project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
                                notice = TRUE;
-                       if(!who && (project_m_n==1) && !jump ){
-                               if(cave[project_m_y][project_m_x].m_idx > 0)
+                       if (!who && (project_m_n == 1) && !jump) {
+                               if (cave[project_m_y][project_m_x].m_idx > 0)
                                {
                                        monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
 
@@ -7089,11 +6559,11 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
 
                for (i = 0; i < path_n; ++i)
                {
-                       int oy = y;
-                       int ox = x;
+                       POSITION oy = y;
+                       POSITION ox = x;
 
-                       int ny = GRID_Y(path_g[i]);
-                       int nx = GRID_X(path_g[i]);
+                       POSITION ny = GRID_Y(path_g[i]);
+                       POSITION nx = GRID_X(path_g[i]);
 
                        /* Advance */
                        y = ny;
@@ -7112,8 +6582,8 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                                {
                                        u16b p;
 
-                                       byte a;
-                                       char c;
+                                       TERM_COLOR a;
+                                       SYMBOL_CODE c;
 
                                        /* Obtain the bolt pict */
                                        p = bolt_pict(oy, ox, y, x, typ);
@@ -7188,7 +6658,7 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                }
                for( i = 0; i < path_n ; i++ )
                {
-                       int py, px;
+                       POSITION py, px;
                        py = GRID_Y(path_g[i]);
                        px = GRID_X(path_g[i]);
                        (void)project_m(0, 0, py, px, dam, GF_SUPER_RAY, flg, TRUE);
@@ -7214,11 +6684,11 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
        /* Project along the path */
        for (i = 0; i < path_n; ++i)
        {
-               int oy = y;
-               int ox = x;
+               POSITION oy = y;
+               POSITION ox = x;
 
-               int ny = GRID_Y(path_g[i]);
-               int nx = GRID_X(path_g[i]);
+               POSITION ny = GRID_Y(path_g[i]);
+               POSITION nx = GRID_X(path_g[i]);
 
                if (flg & PROJECT_DISI)
                {
@@ -7256,8 +6726,8 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                        {
                                u16b p;
 
-                               byte a;
-                               char c;
+                               TERM_COLOR a;
+                               SYMBOL_CODE c;
 
                                /* Obtain the bolt pict */
                                p = bolt_pict(oy, ox, y, x, typ);
@@ -7337,11 +6807,11 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                /*
                 * Create a conical breath attack
                 *
-                *         ***
-                *     ********
+                *       ***
+                *   ********
                 * D********@**
-                *     ********
-                *         ***
+                *   ********
+                *       ***
                 */
 
                if (breath)
@@ -7418,8 +6888,8 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                                {
                                        u16b p;
 
-                                       byte a;
-                                       char c;
+                                       TERM_COLOR a;
+                                       SYMBOL_CODE c;
 
                                        drawn = TRUE;
 
@@ -7473,10 +6943,7 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                }
        }
 
-
-       /* Update stuff if needed */
-       if (p_ptr->update) update_stuff();
-
+       update_creature(p_ptr);
 
        if (flg & PROJECT_KILL)
        {
@@ -7517,8 +6984,7 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                }
        }
 
-       /* Update stuff if needed */
-       if (p_ptr->update) update_stuff();
+       update_creature(p_ptr);
 
        /* Check objects */
        if (flg & (PROJECT_ITEM))
@@ -7583,10 +7049,10 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                                monster_race *ref_ptr = &r_info[m_ptr->r_idx];
 
                                if ((flg & PROJECT_REFLECTABLE) && cave[y][x].m_idx && (ref_ptr->flags2 & RF2_REFLECTING) &&
-                                   ((cave[y][x].m_idx != p_ptr->riding) || !(flg & PROJECT_PLAYER)) &&
-                                   (!who || dist_hack > 1) && !one_in_(10))
+                                       ((cave[y][x].m_idx != p_ptr->riding) || !(flg & PROJECT_PLAYER)) &&
+                                       (!who || dist_hack > 1) && !one_in_(10))
                                {
-                                       byte t_y, t_x;
+                                       POSITION t_y, t_x;
                                        int max_attempts = 10;
 
                                        /* Choose 'new' target */
@@ -7604,14 +7070,15 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                                                t_x = x_saver;
                                        }
 
+                                       sound(SOUND_REFLECT);
                                        if (is_seen(m_ptr))
                                        {
                                                if ((m_ptr->r_idx == MON_KENSHIROU) || (m_ptr->r_idx == MON_RAOU))
-                            msg_print(_("「北斗神拳奥義・二指真空把!」", "The attack bounces!"));
+                                                       msg_print(_("「北斗神拳奥義・二指真空把!」", "The attack bounces!"));
                                                else if (m_ptr->r_idx == MON_DIO) 
-                            msg_print(_("ディオ・ブランドーは指一本で攻撃を弾き返した!", "The attack bounces!"));
+                                                       msg_print(_("ディオ・ブランドーは指一本で攻撃を弾き返した!", "The attack bounces!"));
                                                else 
-                            msg_print(_("攻撃は跳ね返った!", "The attack bounces!"));
+                                                       msg_print(_("攻撃は跳ね返った!", "The attack bounces!"));
                                        }
                                        if (is_original_ap_and_seen(m_ptr)) ref_ptr->r_flags2 |= RF2_REFLECTING;
 
@@ -7718,7 +7185,6 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                /* Player affected one monster (without "jumping") */
                if (!who && (project_m_n == 1) && !jump)
                {
-                       /* Location */
                        x = project_m_x;
                        y = project_m_y;
 
@@ -7817,7 +7283,7 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
 
        if (p_ptr->riding)
        {
-               char m_name[80];
+               GAME_TEXT m_name[MAX_NLEN];
 
                monster_desc(m_name, &m_list[p_ptr->riding], 0);
 
@@ -7825,14 +7291,14 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
                {
                        if (rakuba(rakubadam_m, FALSE))
                        {
-                msg_format(_("%^sに振り落とされた!", "%^s has thrown you off!"), m_name);
+                               msg_format(_("%^sに振り落とされた!", "%^s has thrown you off!"), m_name);
                        }
                }
                if (p_ptr->riding && rakubadam_p > 0)
                {
                        if(rakuba(rakubadam_p, FALSE))
                        {
-                msg_format(_("%^sから落ちてしまった!", "You have fallen from %s."), m_name);
+                               msg_format(_("%^sから落ちてしまった!", "You have fallen from %s."), m_name);
                        }
                }
        }
@@ -7846,63 +7312,62 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
  * @param dam ダメージ量
  * @return 効果があったらTRUEを返す
  */
-bool binding_field( int dam )
+bool binding_field(HIT_POINT dam)
 {
-       int mirror_x[10],mirror_y[10]; /* 鏡はもっと少ない */
-       int mirror_num=0;              /* 鏡の数 */
-       int x,y;
-       int centersign;
-       int x1,x2,y1,y2;
+       POSITION mirror_x[10], mirror_y[10]; /* 鏡はもっと少ない */
+       int mirror_num = 0;                       /* 鏡の数 */
+       POSITION x, y;
+       POSITION centersign;
+       POSITION x1, x2, y1, y2;
        u16b p;
-       int msec= delay_factor*delay_factor*delay_factor;
+       int msec = delay_factor*delay_factor*delay_factor;
 
        /* 三角形の頂点 */
-       int point_x[3];
-       int point_y[3];
+       POSITION point_x[3];
+       POSITION point_y[3];
 
        /* Default target of monsterspell is player */
-       monster_target_y=p_ptr->y;
-       monster_target_x=p_ptr->x;
+       monster_target_y = p_ptr->y;
+       monster_target_x = p_ptr->x;
 
-       for( x=0 ; x < cur_wid ; x++ )
+       for (x = 0; x < cur_wid; x++)
        {
-               for( y=0 ; y < cur_hgt ; y++ )
-               {
-                       ifis_mirror_grid(&cave[y][x]) &&
-                           distance(p_ptr->y,p_ptr->x,y,x) <= MAX_RANGE &&
-                           distance(p_ptr->y,p_ptr->x,y,x) != 0 &&
-                           player_has_los_bold(y,x) &&
-                           projectable(p_ptr->y, p_ptr->x, y, x)
-                           ){
-                               mirror_y[mirror_num]=y;
-                               mirror_x[mirror_num]=x;
+               for (y = 0; y < cur_hgt; y++)
+               {
+                       if (is_mirror_grid(&cave[y][x]) &&
+                               distance(p_ptr->y, p_ptr->x, y, x) <= MAX_RANGE &&
+                               distance(p_ptr->y, p_ptr->x, y, x) != 0 &&
+                               player_has_los_bold(y, x) &&
+                               projectable(p_ptr->y, p_ptr->x, y, x)
+                               ) {
+                               mirror_y[mirror_num] = y;
+                               mirror_x[mirror_num] = x;
                                mirror_num++;
                        }
                }
        }
 
-       if( mirror_num < 2 )return FALSE;
+       if (mirror_num < 2)return FALSE;
 
-       point_x[0] = randint0( mirror_num );
+       point_x[0] = randint0(mirror_num);
        do {
-         point_x[1] = randint0( mirror_num );
-       }
-       while( point_x[0] == point_x[1] );
-
-       point_y[0]=mirror_y[point_x[0]];
-       point_x[0]=mirror_x[point_x[0]];
-       point_y[1]=mirror_y[point_x[1]];
-       point_x[1]=mirror_x[point_x[1]];
-       point_y[2]=p_ptr->y;
-       point_x[2]=p_ptr->x;
-
-       x=point_x[0]+point_x[1]+point_x[2];
-       y=point_y[0]+point_y[1]+point_y[2];
-
-       centersign = (point_x[0]*3-x)*(point_y[1]*3-y)
-               - (point_y[0]*3-y)*(point_x[1]*3-x);
-       if( centersign == 0 )return FALSE;
-                           
+               point_x[1] = randint0(mirror_num);
+       } while (point_x[0] == point_x[1]);
+
+       point_y[0] = mirror_y[point_x[0]];
+       point_x[0] = mirror_x[point_x[0]];
+       point_y[1] = mirror_y[point_x[1]];
+       point_x[1] = mirror_x[point_x[1]];
+       point_y[2] = p_ptr->y;
+       point_x[2] = p_ptr->x;
+
+       x = point_x[0] + point_x[1] + point_x[2];
+       y = point_y[0] + point_y[1] + point_y[2];
+
+       centersign = (point_x[0] * 3 - x)*(point_y[1] * 3 - y)
+               - (point_y[0] * 3 - y)*(point_x[1] * 3 - x);
+       if (centersign == 0)return FALSE;
+
        x1 = point_x[0] < point_x[1] ? point_x[0] : point_x[1];
        x1 = x1 < point_x[2] ? x1 : point_x[2];
        y1 = point_y[0] < point_y[1] ? point_y[0] : point_y[1];
@@ -7913,78 +7378,78 @@ bool binding_field( int dam )
        y2 = point_y[0] > point_y[1] ? point_y[0] : point_y[1];
        y2 = y2 > point_y[2] ? y2 : point_y[2];
 
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                           centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                           centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
                                        /* Visual effects */
-                                       if(!(p_ptr->blind)
-                                          && panel_contains(y,x)){
-                                         p = bolt_pict(y,x,y,x, GF_MANA );
-                                         print_rel(PICT_C(p), PICT_A(p),y,x);
-                                         move_cursor_relative(y, x);
-                                         /*if (fresh_before)*/ Term_fresh();
-                                         Term_xtra(TERM_XTRA_DELAY, msec);
+                                       if (!(p_ptr->blind)
+                                               && panel_contains(y, x)) {
+                                               p = bolt_pict(y, x, y, x, GF_MANA);
+                                               print_rel(PICT_C(p), PICT_A(p), y, x);
+                                               move_cursor_relative(y, x);
+                                               /*if (fresh_before)*/ Term_fresh();
+                                               Term_xtra(TERM_XTRA_DELAY, msec);
                                        }
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                           centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                           centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_f(0,0,y,x,dam,GF_MANA); 
+                                       (void)project_f(0, 0, y, x, dam, GF_MANA);
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                           centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                           centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_o(0,0,y,x,dam,GF_MANA); 
+                                       (void)project_o(0, 0, y, x, dam, GF_MANA);
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                           centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                           centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_m(0,0,y,x,dam,GF_MANA,
-                                         (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP),TRUE);
+                                       (void)project_m(0, 0, y, x, dam, GF_MANA,
+                                               (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP), TRUE);
                                }
                        }
                }
        }
-       if( one_in_(7) ){
-        msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror"));
-               remove_mirror(point_y[0],point_x[0]);
+       if (one_in_(7)) {
+               msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror"));
+               remove_mirror(point_y[0], point_x[0]);
        }
 
        return TRUE;
@@ -7995,22 +7460,22 @@ bool binding_field( int dam )
  * @param dam ダメージ量
  * @return 効果があったらTRUEを返す
  */
-void seal_of_mirror( int dam )
+void seal_of_mirror(HIT_POINT dam)
 {
-       int x,y;
+       POSITION x, y;
 
-       for( x = 0 ; x < cur_wid ; x++ )
+       for (x = 0; x < cur_wid; x++)
        {
-               for( y = 0 ; y < cur_hgt ; y++ )
+               for (y = 0; y < cur_hgt; y++)
                {
-                       ifis_mirror_grid(&cave[y][x]))
+                       if (is_mirror_grid(&cave[y][x]))
                        {
-                               if(project_m(0,0,y,x,dam,GF_GENOCIDE,
-                                                        (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP),TRUE))
+                               if (project_m(0, 0, y, x, dam, GF_GENOCIDE,
+                                       (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP), TRUE))
                                {
-                                       if( !cave[y][x].m_idx )
+                                       if (!cave[y][x].m_idx)
                                        {
-                                               remove_mirror(y,x);
+                                               remove_mirror(y, x);
                                        }
                                }
                        }
@@ -8018,4 +7483,26 @@ void seal_of_mirror( int dam )
        }
        return;
 }
-     
+
+
+
+/*!
+ * @brief 領域魔法に応じて技能の名称を返す。
+ * @param tval 魔法書のtval
+ * @return 領域魔法の技能名称を保管した文字列ポインタ
+ */
+concptr spell_category_name(OBJECT_TYPE_VALUE tval)
+{
+       switch (tval)
+       {
+       case TV_HISSATSU_BOOK:
+               return _("必殺技", "art");
+       case TV_LIFE_BOOK:
+               return _("祈り", "prayer");
+       case TV_MUSIC_BOOK:
+               return _("歌", "song");
+       default:
+               return _("呪文", "spell");
+       }
+}
+