OSDN Git Service

[Refactor] #37353 ペット処理を cmd4.c から cmd-pet.c/h へ分離。
[hengband/hengband.git] / src / spells1.c
index 1756839..e5c0396 100644 (file)
-/* File: spells1.c */
-
-/*
+/*!
+ * @file spells1.c
+ * @brief 魔法による遠隔処理の実装 / Spell projection
+ * @date 2014/07/10
+ * @author
+ * <pre>
  * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
- *
  * This software may be copied and distributed for educational, research,
  * and not for profit purposes provided that this copyright and statement
  * are included in all such copies.  Other copyrights may also apply.
+ * </pre>
  */
 
-/* Purpose: Spell projection */
-
 #include "angband.h"
+#include "cmd-pet.h"
 
-/* ToDo: Make this global */
-/* 1/x chance of reducing stats (for elemental attacks) */
-#define HURT_CHANCE 16
 
+static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
+static int rakubadam_p; /*!< 落馬した際のダメージ量 */
 
-static int rakubadam_m;
-static int rakubadam_p;
+int project_length = 0; /*!< 投射の射程距離 */
 
-int project_length = 0;
 
-/*
+/*!
+ * @brief モンスター魅了用セービングスロー共通部(汎用系)
+ * @param pow 魅了パワー
+ * @param m_ptr 対象モンスター
+ * @return 魅了に抵抗したらTRUE
+ */
+static bool_hack common_saving_throw_charm(player_type *player_ptr, HIT_POINT pow, monster_type *m_ptr)
+{
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];
+
+       if(p_ptr->inside_arena) return TRUE;
+
+       /* Memorize a flag */
+       if (r_ptr->flagsr & RFR_RES_ALL)
+       {
+               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
+               return TRUE;
+       }
+
+       if (r_ptr->flags3 & RF3_NO_CONF)
+       {
+               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
+               return TRUE;
+       }
+
+       if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2 & MFLAG2_NOPET) return TRUE;
+
+       pow += (adj_chr_chm[player_ptr->stat_ind[A_CHR]] - 1);
+       if((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) pow = pow * 2 / 3;
+       return (r_ptr->level > randint1((pow - 10) < 1 ? 1 : (pow - 10)) + 5);
+}
+
+/*!
+ * @brief モンスター服従用セービングスロー共通部(部族依存系)
+ * @param pow 服従パワー
+ * @param m_ptr 対象モンスター
+ * @return 服従に抵抗したらTRUE
+ */
+static bool_hack common_saving_throw_control(player_type *player_ptr, HIT_POINT pow, monster_type *m_ptr)
+{
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];
+
+       if (p_ptr->inside_arena) return TRUE;
+
+       /* Memorize a flag */
+       if (r_ptr->flagsr & RFR_RES_ALL)
+       {
+               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
+               return TRUE;
+       }
+
+       if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2 & MFLAG2_NOPET) return TRUE;
+
+       pow += adj_chr_chm[player_ptr->stat_ind[A_CHR]] - 1;
+       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) pow = pow * 2 / 3;
+       return (r_ptr->level > randint1((pow - 10) < 1 ? 1 : (pow - 10)) + 5);
+}
+
+/*!
+* @brief 一部ボルト魔法のビーム化確率を算出する / Prepare standard probability to become beam for fire_bolt_or_beam()
+* @return ビーム化確率(%)
+* @details
+* ハードコーティングによる実装が行われている。
+* メイジは(レベル)%、ハイメイジ、スペルマスターは(レベル)%、それ以外の職業は(レベル/2)%
+*/
+int beam_chance(void)
+{
+       if (p_ptr->pclass == CLASS_MAGE)
+               return p_ptr->lev;
+       if (p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER)
+               return p_ptr->lev + 10;
+
+       return p_ptr->lev / 2;
+}
+
+
+/*!
+ * @brief 配置した鏡リストの次を取得する /
  * Get another mirror. for SEEKER 
+ * @param next_y 次の鏡のy座標を返す参照ポインタ
+ * @param next_x 次の鏡のx座標を返す参照ポインタ
+ * @param cury 現在の鏡のy座標
+ * @param curx 現在の鏡のx座標
  */
-static void next_mirror( int* next_y , int* next_x , int cury, int curx)
+static void next_mirror(int* next_y, int* next_x, int cury, int curx)
 {
-       int mirror_x[10],mirror_y[10]; /* 鏡はもっと少ない */
-       int mirror_num=0;              /* 鏡の数 */
-       int x,y;
+       int mirror_x[10], mirror_y[10]; /* 鏡はもっと少ない */
+       int mirror_num = 0;                       /* 鏡の数 */
+       int 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;
 }
                
-/*
+/*!
+ * @brief 万色表現用にランダムな色を選択する関数 /
  * Get a legal "multi-hued" color for drawing "spells"
+ * @param max 色IDの最大値
+ * @return 選択した色ID
  */
 static byte mh_attr(int max)
 {
@@ -83,8 +166,11 @@ static byte mh_attr(int max)
 }
 
 
-/*
+/*!
+ * @brief 魔法属性に応じたエフェクトの色を返す /
  * Return a color to use for the bolt/ball spells
+ * @param type 魔法属性
+ * @return 対応する色ID
  */
 static byte spell_color(int type)
 {
@@ -94,44 +180,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_INERTIA:        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:
@@ -139,16 +225,16 @@ 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 */
@@ -182,14 +268,22 @@ static byte spell_color(int type)
 }
 
 
-/*
+/*!
+ * @brief 始点から終点にかけた方向毎にボルトのキャラクタを返す /
  * Find the attr/char pair to use for a spell effect
- *
+ * @param y 始点Y座標
+ * @param x 始点X座標
+ * @param ny 終点Y座標
+ * @param nx 終点X座標
+ * @param typ 魔法の効果属性
+ * @return 方向キャラID
+ * @details
+ * <pre>
  * It is moving (or has moved) from (x,y) to (nx,ny).
- *
  * If the distance is not "one", we (may) return "*".
+ * </pre>
  */
-u16b bolt_pict(int y, int x, int ny, int nx, int typ)
+u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ)
 {
        int base;
 
@@ -228,9 +322,19 @@ u16b bolt_pict(int y, int x, int ny, int 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
@@ -267,8 +371,9 @@ u16b bolt_pict(int y, int x, int ny, int nx, int typ)
  *
  * 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, int range, int y1, int x1, int y2, int x2, int flg)
+sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, BIT_FLAGS flg)
 {
        int y, x;
 
@@ -382,7 +487,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
                        if (flg & (PROJECT_STOP))
                        {
                                if ((n > 0) &&
-                                   (player_bold(y, x) || cave[y][x].m_idx != 0))
+                                       (player_bold(y, x) || cave[y][x].m_idx != 0))
                                        break;
                        }
 
@@ -471,7 +576,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
                        if (flg & (PROJECT_STOP))
                        {
                                if ((n > 0) &&
-                                   (player_bold(y, x) || cave[y][x].m_idx != 0))
+                                       (player_bold(y, x) || cave[y][x].m_idx != 0))
                                        break;
                        }
 
@@ -542,7 +647,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
                        if (flg & (PROJECT_STOP))
                        {
                                if ((n > 0) &&
-                                   (player_bold(y, x) || cave[y][x].m_idx != 0))
+                                       (player_bold(y, x) || cave[y][x].m_idx != 0))
                                        break;
                        }
 
@@ -565,17 +670,25 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
 /*
  * Mega-Hack -- track "affected" monsters (see "project()" comments)
  */
-static int project_m_n;
-static int project_m_x;
-static int project_m_y;
+static int project_m_n; /*!< 魔法効果範囲内にいるモンスターの数 */
+static POSITION project_m_x; /*!< 処理中のモンスターX座標 */
+static POSITION project_m_y; /*!< 処理中のモンスターY座標 */
 /* Mega-Hack -- monsters target */
-static s16b monster_target_x;
-static s16b monster_target_y;
-
-
-/*
- * We are called from "project()" to "damage" terrain features
- *
+static POSITION monster_target_x; /*!< モンスターの攻撃目標X座標 */
+static POSITION monster_target_y; /*!< モンスターの攻撃目標Y座標 */
+
+
+/*!
+ * @brief 汎用的なビーム/ボルト/ボール系による地形効果処理 / We are called from "project()" to "damage" terrain features
+ * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player")
+ * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
+ * @param y 目標Y座標 / Target y location (or location to travel "towards")
+ * @param x 目標X座標 / Target x location (or location to travel "towards")
+ * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player)
+ * @param typ 効果属性 / Type of damage to apply to monsters (and objects)
+ * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE
+ * @details
+ * <pre>
  * We are called both for "beam" effects and "ball" effects.
  *
  * The "r" parameter is the "distance from ground zero".
@@ -588,11 +701,12 @@ static s16b monster_target_y;
  * XXX XXX XXX We also "see" grids which are "memorized", probably a hack
  *
  * XXX XXX XXX 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(int who, int r, int y, int x, HIT_POINT dam, int 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);
@@ -613,18 +727,18 @@ static bool project_f(int who, int r, int y, int x, int dam, int 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:
@@ -636,13 +750,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;
                }
                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 */
@@ -710,7 +824,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;
                                }
 
@@ -729,7 +843,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;
                                }
                        }
@@ -758,7 +872,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                if (known)
                                {
                                        /* Message */
-                    msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!"));
+                                       msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!"));
                                        obvious = TRUE;
                                }
 
@@ -801,7 +915,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                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;
                                }
                        }
@@ -816,7 +930,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                /* 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;
                                }
 
@@ -1054,7 +1168,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);
@@ -1065,7 +1179,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                /* 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);
                                }
 
@@ -1081,8 +1195,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);
@@ -1093,7 +1207,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                                /* 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);
                                }
 
@@ -1132,7 +1246,17 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 
 
 
-/*
+/*!
+ * @brief 汎用的なビーム/ボルト/ボール系によるアイテムオブジェクトへの効果処理 / Handle a beam/bolt/ball causing damage to a monster.
+ * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player")
+ * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
+ * @param y 目標Y座標 / Target y location (or location to travel "towards")
+ * @param x 目標X座標 / Target x location (or location to travel "towards")
+ * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player)
+ * @param typ 効果属性 / Type of damage to apply to monsters (and objects)
+ * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE
+ * @details
+ * <pre>
  * We are called from "project()" to "damage" objects
  *
  * We are called both for "beam" effects and "ball" effects.
@@ -1147,21 +1271,22 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
  * XXX XXX XXX 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, int 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];
 
-       int k_idx = 0;
+       KIND_OBJECT_IDX k_idx = 0;
        bool is_potion = FALSE;
 
 
@@ -1207,7 +1332,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;
@@ -1219,7 +1344,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;
@@ -1230,8 +1355,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;
@@ -1242,7 +1367,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;
                                }
@@ -1255,14 +1380,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;
@@ -1273,15 +1398,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;
@@ -1294,8 +1419,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;
@@ -1307,21 +1432,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;
@@ -1333,8 +1458,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;
                        }
@@ -1367,7 +1492,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
                                                /* Notice */
                                                if (known && (o_ptr->marked & OM_FOUND))
                                                {
-                            msg_print(_("カチッと音がした!", "Click!"));
+                                                       msg_print(_("カチッと音がした!", "Click!"));
                                                        obvious = TRUE;
                                                }
                                        }
@@ -1380,7 +1505,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;
@@ -1388,21 +1513,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;
@@ -1429,8 +1554,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);
                                }
                        }
 
@@ -1440,7 +1565,7 @@ 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;
@@ -1467,11 +1592,19 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 }
 
 
-/*
- * Helper function for "project()" below.
- *
- * Handle a beam/bolt/ball causing damage to a monster.
- *
+/*!
+ * @brief 汎用的なビーム/ボルト/ボール系によるモンスターへの効果処理 / Handle a beam/bolt/ball causing damage to a monster.
+ * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player")
+ * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
+ * @param y 目標Y座標 / Target y location (or location to travel "towards")
+ * @param x 目標X座標 / Target x location (or location to travel "towards")
+ * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player)
+ * @param typ 効果属性 / Type of damage to apply to monsters (and objects)
+ * @param flg 効果フラグ
+ * @param see_s_msg TRUEならばメッセージを表示する
+ * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE
+ * @details
+ * <pre>
  * This routine takes a "source monster" (by index) which is mostly used to
  * determine if the player is causing the damage, and a "radius" (see below),
  * which is used to decrease the power of explosions with distance, and a
@@ -1479,49 +1612,55 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
  * (polymorph and teleport being the obvious ones), a default damage, which
  * is modified as needed based on various properties, and finally a "damage
  * type" (see below).
- *
+ * </pre>
+ * <pre>
  * Note that this routine can handle "no damage" attacks (like teleport) by
  * taking a "zero" damage, and can even take "parameters" to attacks (like
  * confuse) by accepting a "damage", using it to calculate the effect, and
  * then setting the damage to zero.  Note that the "damage" parameter is
  * divided by the radius, so monsters not at the "epicenter" will not take
  * as much damage (or whatever)...
- *
+ * </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
- *
+ * </pre>
+ * <pre>
  * Various messages are produced, and damage is applied.
- *
+ * </pre>
+ * <pre>
  * Just "casting" a substance (i.e. plasma) does not make you immune, you must
  * actually be "made" of that substance, or "breathe" big balls of it.
- *
  * We assume that "Plasma" monsters, and "Plasma" breathers, are immune
  * to plasma.
- *
  * We assume "Nether" is an evil, necromantic force, so it doesn't hurt undead,
  * and hurts evil less.  If can breath nether, then it resists it as well.
- *
+ * </pre>
+ * <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
  * the "note" string is appended to the monster name, if not NULL.  So,
  * to make a spell have "no effect" just set "note" to NULL.  You should
  * also set "notice" to FALSE, or the player will learn what the spell does.
- *
+ * </pre>
+ * <pre>
  * We attempt to return "TRUE" if the player saw anything "useful" happen.
+ * "flg" was added.
+ * </pre>
  */
-/* "flg" was added. */
-static bool project_m(int who, int r, int y, int x, int 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, int typ, BIT_FLAGS flg, bool see_s_msg)
 {
        int tmp;
 
@@ -1579,7 +1718,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
        char m_name[80];
        char m_poss[10];
 
-       int photo = 0;
+       PARAMETER_VALUE photo = 0;
 
        /* Assume no note */
        cptr note = NULL;
@@ -1626,7 +1765,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -1641,14 +1780,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
                        }
@@ -1662,15 +1801,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -1683,20 +1822,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
                        }
@@ -1710,20 +1849,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
                        }
@@ -1737,14 +1876,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
                        }
@@ -1758,14 +1897,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
                        }
@@ -1779,15 +1918,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
                        }
@@ -1800,27 +1939,27 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -1832,8 +1971,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -1848,14 +1987,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
                        }
@@ -1869,7 +2008,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -1877,21 +2016,21 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
                        }
@@ -1905,7 +2044,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -1913,13 +2052,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
@@ -1933,21 +2072,21 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
                        }
@@ -1965,16 +2104,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -1987,14 +2126,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
                        }
@@ -2009,15 +2148,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
@@ -2031,15 +2170,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
@@ -2053,15 +2192,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -2073,15 +2212,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
                        }
@@ -2094,15 +2233,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
                        }
@@ -2111,20 +2250,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                }
 
                /* Inertia -- breathers resist */
-               case GF_INERTIA:
+               case GF_INERTIAL:
                {
                        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);
                        }
@@ -2132,7 +2271,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        {
                                /* 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;
                                }
@@ -2141,7 +2280,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                {
                                        if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+                                               note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
                                }
                        }
@@ -2155,14 +2294,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
                        }
@@ -2178,8 +2317,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -2189,13 +2328,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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;
                                }
                        }
@@ -2205,8 +2344,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
@@ -2216,7 +2355,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                /* 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;
                                }
@@ -2225,7 +2364,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                {
                                        if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+                                               note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
                                }
 
@@ -2234,12 +2373,12 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                                /* 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;
                                }
                        }
@@ -2255,7 +2394,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -2271,7 +2410,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -2279,8 +2418,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -2291,17 +2430,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        if (seen) obvious = TRUE;
 
                        /* PSI only works if the monster can see you! -- RG */
-                       if (!(los(m_ptr->fy, m_ptr->fx, py, px)))
+                       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;
@@ -2309,15 +2448,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
 
                                /*
@@ -2325,18 +2464,18 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                 * 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
                                        {
@@ -2356,7 +2495,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                                                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;
@@ -2386,13 +2525,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                                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;
                }
 
@@ -2401,22 +2540,22 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
 
                                /*
@@ -2424,17 +2563,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                 * 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
                                        {
@@ -2442,7 +2581,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                                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;
@@ -2456,10 +2595,10 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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!"));
+                               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!"));
                                msg_format(msg, m_name, str);
 
                                b = MIN(p_ptr->msp, p_ptr->csp + b);
@@ -2467,7 +2606,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                p_ptr->redraw |= PR_MANA;
                                p_ptr->window |= (PW_SPELL);
                        }
-            note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+                       note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
                        break;
                }
 
@@ -2476,8 +2615,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -2493,7 +2632,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* 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;
@@ -2510,7 +2649,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -2524,8 +2663,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -2541,15 +2680,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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)
@@ -2565,18 +2704,18 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                 * 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
                                        {
@@ -2592,7 +2731,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                                        default:
                                                        {
                                                                if (r_ptr->flags3 & RF3_NO_FEAR)
-                                    note = _("には効果がなかった。", " is unaffected.");
+                                                                       note = _("には効果がなかった。", " is unaffected.");
                                                                else
                                                                        set_afraid(p_ptr->afraid + dam);
                                                        }
@@ -2602,15 +2741,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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
@@ -2642,22 +2781,22 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
                        }
@@ -2666,13 +2805,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 
                /* 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;
@@ -2685,7 +2824,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                        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;
                        }
@@ -2700,8 +2839,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -2714,7 +2853,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                        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;
                        }
@@ -2722,8 +2861,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                 (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;
                        }
@@ -2737,8 +2876,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -2748,10 +2887,10 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* 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;
                        }
@@ -2769,8 +2908,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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
                        {
@@ -2780,7 +2919,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                /* Attempt to clone. */
                                if (multiply_monster(c_ptr->m_idx, TRUE, 0L))
                                {
-                    note = _("が分裂した!", " spawns!");
+                                       note = _("が分裂した!", " spawns!");
                                }
                        }
 
@@ -2801,7 +2940,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
                        }
 
@@ -2823,17 +2962,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        (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);
                        }
 
@@ -2875,7 +3014,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -2891,7 +3030,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        /* 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)
@@ -2914,17 +3053,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
                        }
 
@@ -2933,7 +3072,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        {
                                if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                {
-                    note = _("の動きが遅くなった。", " starts moving slower.");
+                                       note = _("の動きが遅くなった。", " starts moving slower.");
                                }
                        }
 
@@ -2949,16 +3088,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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)
@@ -2966,13 +3105,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                        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;
                        }
 
@@ -2989,23 +3128,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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) ||
-                           !(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;
                        }
 
@@ -3020,23 +3159,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
                        }
 
@@ -3049,7 +3188,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                case GF_CHARM:
                {
                        int vir;
-                       dam += (adj_con_fix[p_ptr->stat_ind[A_CHR]] - 1);
                        vir = virtue_number(V_HARMONY);
                        if (vir)
                        {
@@ -3064,44 +3202,25 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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);
@@ -3132,36 +3251,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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);
                        }
 
@@ -3188,37 +3294,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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);
                        }
 
@@ -3231,7 +3323,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                case GF_CONTROL_ANIMAL:
                {
                        int vir;
-
                        if (seen) obvious = TRUE;
 
                        vir = virtue_number(V_NATURE);
@@ -3246,47 +3337,25 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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);
                        }
@@ -3297,14 +3366,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                }
 
                /* 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)
                        {
@@ -3317,43 +3385,27 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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(r_ptr))
                        {
                                /* 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);
                        }
@@ -3369,8 +3421,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -3380,8 +3432,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* 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))
@@ -3393,7 +3445,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                do_conf = 0;
 
                                /* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                        }
 
@@ -3407,8 +3459,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -3417,13 +3469,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* 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;
                        }
 
@@ -3458,8 +3510,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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 */
@@ -3480,23 +3532,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -3509,15 +3561,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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);
                        }
@@ -3543,8 +3595,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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 */
@@ -3570,14 +3622,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                {
                                        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;
                                        }
                                }
@@ -3615,14 +3667,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                {
                                        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;
                                        }
                                }
@@ -3656,14 +3708,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        {
                                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;
                                }
                        }
@@ -3707,7 +3759,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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;
                                }
@@ -3750,7 +3802,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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;
                                }
@@ -3785,11 +3837,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* 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;
                        }
@@ -3819,8 +3871,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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 */
@@ -3856,8 +3908,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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 */
@@ -3892,8 +3944,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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 */
@@ -3925,8 +3977,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                if (seen) obvious = TRUE;
 
                                /* Message */
-                note = _("は身震いした。", " shudders.");
-                note_dies = _("はドロドロに溶けた!", " dissolves!");
+                               note = _("は身震いした。", " shudders.");
+                               note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
 
                        /* Others ignore */
@@ -3961,8 +4013,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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 */
@@ -3991,8 +4043,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        if (seen) obvious = TRUE;
 
                        /* Message */
-            note = _("は身震いした。", " shudders.");
-            note_dies = _("はドロドロに溶けた!", " dissolves!");
+                       note = _("は身震いした。", " shudders.");
+                       note_dies = _("はドロドロに溶けた!", " dissolves!");
                        break;
                }
 
@@ -4002,14 +4054,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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->flags4 & ~(RF4_NOMAGIC_MASK)) || (r_ptr->flags5 & ~(RF5_NOMAGIC_MASK)) || (r_ptr->flags6 & ~(RF6_NOMAGIC_MASK)))
+                       if ((r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) || (r_ptr->a_ability_flags1 & ~(RF5_NOMAGIC_MASK)) || (r_ptr->a_ability_flags2 & ~(RF6_NOMAGIC_MASK)))
                        {
                                if (who > 0)
                                {
@@ -4029,20 +4081,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                                {
                                                        /* 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;
@@ -4053,11 +4105,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                {
                        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;
@@ -4072,26 +4124,26 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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;
@@ -4104,11 +4156,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                {
                        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;
@@ -4123,26 +4175,26 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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)
                                {
@@ -4164,11 +4216,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                {
                        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;
@@ -4176,8 +4228,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* Attempt a saving throw */
                        if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4188,11 +4240,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                {
                        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;
@@ -4200,8 +4252,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* Attempt a saving throw */
                        if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4212,11 +4264,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                {
                        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;
@@ -4224,8 +4276,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* Attempt a saving throw */
                        if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4237,12 +4289,12 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -4250,8 +4302,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* 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;
@@ -4263,16 +4315,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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
@@ -4286,7 +4338,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                }
                                else
                                {
-                    note = _("は耐性を持っている!", "resists!");
+                                       note = _("は耐性を持っている!", "resists!");
                                        dam = 0;
                                }
                        }
@@ -4298,9 +4350,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                {
                        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;
                        }
@@ -4313,13 +4365,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
@@ -4329,7 +4381,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                {
                                        if (rakuba(-1, FALSE))
                                        {
-                        msg_format(_("地面に落とされた。", "You have fallen from %s."), m_name);
+                                               msg_format(_("地面に落とされた。", "You have fallen from %s."), m_name);
                                        }
                                }
 
@@ -4339,7 +4391,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        }
                        else
                        {
-                msg_format(_("うまく捕まえられなかった。", "You failed to capture %s."), m_name);
+                               msg_format(_("うまく捕まえられなかった。", "You failed to capture %s."), m_name);
                                skipped = TRUE;
                        }
                        break;
@@ -4361,23 +4413,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -4392,9 +4444,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        {
                                /* 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;
                                }
 
@@ -4403,7 +4455,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                {
                                        if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+                                               note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
                                }
                        }
@@ -4414,13 +4466,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                                /* 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;
                                }
                        }
@@ -4429,8 +4481,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        {
                                /* 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)
@@ -4439,20 +4491,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                        }
 
                                        /* 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 */
@@ -4466,16 +4518,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
                        }
@@ -4497,8 +4549,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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 */
@@ -4520,8 +4572,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -4542,16 +4594,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                /* 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 */
@@ -4559,7 +4611,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                }
                                else
                                {
-                    note = _("を支配した。", " is tamed!");
+                                       note = _("を支配した。", " is tamed!");
                                        set_pet(m_ptr);
                                        (void)set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100);
 
@@ -4588,8 +4640,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
@@ -4597,8 +4649,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* Attempt a saving throw */
                        if (randint0(100 + dam) < (r_ptr->level + 50))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+                       {
+                               note = _("には効果がなかった。", " is unaffected.");
                                dam = 0;
                        }
                        break;
@@ -4644,7 +4696,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
        /* 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)
@@ -4656,8 +4708,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
        {
                /* 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;
@@ -4665,12 +4717,12 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        /* 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;
                        }
 
@@ -4692,14 +4744,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        /* 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;
                        }
 
@@ -4719,7 +4771,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        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;
                        }
@@ -4735,7 +4787,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                if (seen) obvious = TRUE;
 
                                /* Monster polymorphs */
-                note = _("が変身した!", " changes!");
+                               note = _("が変身した!", " changes!");
 
                                /* Turn off the damage */
                                dam = 0;
@@ -4743,7 +4795,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        else
                        {
                                /* No polymorph */
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                        }
 
                        /* Hack -- Get new monster */
@@ -4760,7 +4812,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        if (seen) obvious = TRUE;
 
                        /* Message */
-            note = _("が消え去った!", " disappears!");
+                       note = _("が消え去った!", " disappears!");
 
                        if (!who) chg_virtue(V_VALOUR, -1);
 
@@ -4837,7 +4889,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        if (sad)
                        {
-                msg_print(_("少し悲しい気分がした。", "You feel sad for a moment."));
+                               msg_print(_("少し悲しい気分がした。", "You feel sad for a moment."));
                        }
                }
 
@@ -4864,7 +4916,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
        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)
                {
@@ -4896,7 +4948,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
                        /* 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))
@@ -4915,7 +4967,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                                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 */
@@ -4934,30 +4986,30 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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;
                                }
                        case 3: case 4: case 5: case 6:
                                if (!count)
                                {
-                                       int dam = damroll(10, 10);
-                    msg_print(_("純粋な魔力の次元への扉が開いた!", "A portal opens to a plane of raw mana!"));
+                                       int extra_dam = damroll(10, 10);
+                                       msg_print(_("純粋な魔力の次元への扉が開いた!", "A portal opens to a plane of raw mana!"));
 
-                                       project(0, 8, ty,tx, dam, GF_MANA, curse_flg, -1);
+                                       project(0, 8, ty, tx, extra_dam, GF_MANA, curse_flg, -1);
                                        if (!one_in_(6)) break;
                                }
                        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:
@@ -4969,17 +5021,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                        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), py, px, (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);
                                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);
@@ -5073,7 +5125,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                q_ptr->ident |= (IDENT_MENTAL);
 
                /* Drop it in the dungeon */
-               (void)drop_near(q_ptr, -1, py, px);
+               (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
        }
 
        /* Track it */
@@ -5085,27 +5137,31 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
        return (obvious);
 }
 
-
-/*
- * Helper function for "project()" below.
- *
+/*!
+ * @brief 汎用的なビーム/ボルト/ボール系によるプレイヤーへの効果処理 / Helper function for "project()" below.
+ * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player")
+ * @param who_name 効果を起こしたモンスターの名前
+ * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
+ * @param y 目標Y座標 / Target y location (or location to travel "towards")
+ * @param x 目標X座標 / Target x location (or location to travel "towards")
+ * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player)
+ * @param typ 効果属性 / Type of damage to apply to monsters (and objects)
+ * @param flg 効果フラグ
+ * @param monspell 効果元のモンスター魔法ID
+ * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE
+ * @details
  * Handle a beam/bolt/ball causing damage to the player.
- *
  * This routine takes a "source monster" (by index), a "distance", a default
  * "damage", and a "damage type".  See "project_m()" above.
- *
  * If "rad" is non-zero, then the blast was centered elsewhere, and the damage
  * is reduced (see "project_m()" above).  This can happen if a monster breathes
  * at the player and hits a wall instead.
- *
  * NOTE (Zangband): 'Bolt' attacks can be reflected back, so we need
  * to know if this is actually a ball or a bolt spell
- *
- *
  * 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, int y, int x, int dam, int typ, int flg, int monspell)
+static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, int typ, BIT_FLAGS flg, int monspell)
 {
        int k = 0;
        int rlev = 0;
@@ -5148,15 +5204,16 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
        if ((p_ptr->reflect || ((p_ptr->special_defense & KATA_FUUJIN) && !p_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10))
        {
-               byte t_y, t_x;
+               POSITION t_y, t_x;
                int max_attempts = 10;
+               sound(SOUND_REFLECT);
 
-        if (blind) 
-            msg_print(_("何かが跳ね返った!", "Something bounces!"));
+               if (blind) 
+                       msg_print(_("何かが跳ね返った!", "Something bounces!"));
                else if (p_ptr->special_defense & KATA_FUUJIN) 
-            msg_print(_("風の如く武器を振るって弾き返した!", "The attack bounces!"));
+                       msg_print(_("風の如く武器を振るって弾き返した!", "The attack bounces!"));
                else 
-            msg_print(_("攻撃が跳ね返った!", "The attack bounces!"));
+                       msg_print(_("攻撃が跳ね返った!", "The attack bounces!"));
 
 
                /* Choose 'new' target */
@@ -5168,7 +5225,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                                t_x = m_list[who].fx - 1 + randint1(3);
                                max_attempts--;
                        }
-                       while (max_attempts && in_bounds2u(t_y, t_x) && !projectable(py, px, t_y, t_x));
+                       while (max_attempts && in_bounds2u(t_y, t_x) && !projectable(p_ptr->y, p_ptr->x, t_y, t_x));
 
                        if (max_attempts < 1)
                        {
@@ -5178,8 +5235,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                }
                else
                {
-                       t_y = py - 1 + randint1(3);
-                       t_x = px - 1 + randint1(3);
+                       t_y = p_ptr->y - 1 + randint1(3);
+                       t_x = p_ptr->x - 1 + randint1(3);
                }
 
                project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell);
@@ -5218,15 +5275,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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;
                }
 
@@ -5240,7 +5297,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                /* 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;
                }
@@ -5248,8 +5305,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                /* 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;
                }
 
@@ -5273,13 +5330,13 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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())
+                                one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW())
                        {
                                do_dec_stat(A_CON);
                        }
@@ -5297,7 +5354,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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;
@@ -5308,7 +5365,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
                                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
@@ -5326,7 +5383,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                /* 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;
                }
@@ -5334,7 +5391,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                /* 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)
@@ -5345,7 +5402,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
                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);
@@ -5355,13 +5412,13 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                /* Arrow -- XXX no dodging */
                case GF_ARROW:
                {
-            if (fuzzy)
-            {
-                msg_print(_("何か鋭いもので攻撃された!", "You are hit by something sharp!"));
-            }
+                       if (fuzzy)
+                       {
+                               msg_print(_("何か鋭いもので攻撃された!", "You are hit by something sharp!"));
+                       }
                        else if ((inventory[INVEN_RARM].name1 == ART_ZANTETSU) || (inventory[INVEN_LARM].name1 == ART_ZANTETSU))
                        {
-                msg_print(_("矢を斬り捨てた!", "You cut down the arrow!"));
+                               msg_print(_("矢を斬り捨てた!", "You cut down the arrow!"));
                                break;
                        }
                        get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
@@ -5376,13 +5433,13 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
                        if (!p_ptr->resist_sound && !CHECK_MULTISHADOW())
                        {
-                               int k = (randint1((dam > 40) ? 35 : (dam * 3 / 4 + 5)));
-                               (void)set_stun(p_ptr->stun + k);
+                               int plus_stun = (randint1((dam > 40) ? 35 : (dam * 3 / 4 + 5)));
+                               (void)set_stun(p_ptr->stun + plus_stun);
                        }
 
                        if (!(p_ptr->resist_fire ||
-                             IS_OPPOSE_FIRE() ||
-                             p_ptr->immune_fire))
+                               IS_OPPOSE_FIRE() ||
+                               p_ptr->immune_fire))
                        {
                                inven_damage(set_acid_destroy, 3);
                        }
@@ -5397,13 +5454,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        if (p_ptr->resist_neth)
                        {
                                if (!prace_is_(RACE_SPECTRE))
+                               {
                                        dam *= 6; dam /= (randint1(4) + 7);
+                               }
                        }
                        else if (!CHECK_MULTISHADOW()) drain_exp(200 + (p_ptr->exp / 100), 200 + (p_ptr->exp / 1000), 75);
 
                        if (prace_is_(RACE_SPECTRE) && !CHECK_MULTISHADOW())
                        {
-                msg_print(_("気分がよくなった。", "You feel invigorated!"));
+                               msg_print(_("気分がよくなった。", "You feel invigorated!"));
                                hp_player(dam / 4);
                                learn_spell(monspell);
                        }
@@ -5419,7 +5478,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                case GF_WATER:
                {
                        if (fuzzy) msg_print(_("何か湿ったもので攻撃された!", "You are hit by something wet!"));
-            if (!CHECK_MULTISHADOW())
+                       if (!CHECK_MULTISHADOW())
                        {
                                if (!p_ptr->resist_sound)
                                {
@@ -5443,7 +5502,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                /* 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);
@@ -5460,7 +5519,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                                        (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);
                                        }
                                }
@@ -5512,8 +5571,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        }
                        else if (!CHECK_MULTISHADOW())
                        {
-                               int k = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
-                               (void)set_stun(p_ptr->stun + k);
+                               int plus_stun = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
+                               (void)set_stun(p_ptr->stun + plus_stun);
                        }
 
                        if (!p_ptr->resist_sound || one_in_(13))
@@ -5614,7 +5673,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                }
 
                /* Inertia -- slowness */
-               case GF_INERTIA:
+               case GF_INERTIAL:
                {
                        if (fuzzy) msg_print(_("何か遅いもので攻撃された!", "You are hit by something slow!"));
                        if (!CHECK_MULTISHADOW()) (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);
@@ -5637,7 +5696,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
                        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))
@@ -5652,7 +5711,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        {
                                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 */
@@ -5694,7 +5753,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                        {
                                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())
                        {
@@ -5703,7 +5762,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                                        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;
                                        }
@@ -5712,16 +5771,16 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                                        {
                                                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;
@@ -5732,7 +5791,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                                        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++)
                                                {
@@ -5753,7 +5812,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                case GF_GRAVITY:
                {
                        if (fuzzy) msg_print(_("何か重いもので攻撃された!", "You are hit by something heavy!"));
-            msg_print(_("周辺の重力がゆがんだ。", "Gravity warps around you."));
+                               msg_print(_("周辺の重力がゆがんだ。", "Gravity warps around you."));
 
                        if (!CHECK_MULTISHADOW())
                        {
@@ -5762,8 +5821,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                                        (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);
                                if (!(p_ptr->resist_sound || p_ptr->levitation))
                                {
-                                       int k = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
-                                       (void)set_stun(p_ptr->stun + k);
+                                       int plus_stun = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
+                                       (void)set_stun(p_ptr->stun + plus_stun);
                                }
                        }
                        if (p_ptr->levitation)
@@ -5816,20 +5875,13 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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."));
-
-                               /* Pick a nightmare */
-                               get_mon_num_prep(get_nightmare, NULL);
-
+                               msg_print(_("恐ろしい光景が頭に浮かんできた。", "A horrible vision enters your mind."));
                                /* Have some nightmares */
-                               have_nightmare(get_mon_num(MAX_DEPTH));
-
-                               /* Remove the monster restriction */
-                               get_mon_num_prep(NULL, NULL);
+                               sanity_blast(NULL, FALSE);
                        }
 
                        set_paralyzed(p_ptr->paralyzed + dam);
@@ -5938,15 +5990,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                {
                        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)
@@ -5987,7 +6039,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                                                /* Special message */
                                                if (m_ptr->ml)
                                                {
-                            msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), m_name);
+                                                       msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), m_name);
                                                }
                                        }
                                }
@@ -6002,14 +6054,14 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                {
                        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)
                                        {
@@ -6039,15 +6091,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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)
@@ -6093,8 +6145,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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
@@ -6109,8 +6161,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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
@@ -6125,8 +6177,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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
@@ -6142,7 +6194,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                {
                        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
@@ -6157,15 +6209,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                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);
                                }
 
@@ -6225,27 +6277,27 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 /*
  * 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);
 }
 
 
@@ -6255,28 +6307,28 @@ int dist_to_line(int y, int x, int y1, int x1, int y2, int x2)
  * Modified version of los() for calculation of disintegration balls.
  * Disintegration effects are stopped by permanent walls.
  */
-bool in_disintegration_range(int y1, int x1, int y2, int x2)
+bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 {
        /* Delta */
-       int dx, dy;
+       POSITION dx, dy;
 
        /* Absolute */
-       int ax, ay;
+       POSITION ax, ay;
 
        /* Signs */
-       int sx, sy;
+       POSITION sx, sy;
 
        /* Fractions */
-       int qx, qy;
+       POSITION qx, qy;
 
        /* Scanners */
-       int tx, ty;
+       POSITION tx, ty;
 
        /* Scale factors */
-       int f1, f2;
+       POSITION f1, f2;
 
        /* Slope, or 1/Slope, of LOS */
-       int m;
+       POSITION m;
 
 
        /* Extract the offset */
@@ -6481,10 +6533,10 @@ bool in_disintegration_range(int y1, int x1, int y2, int 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, int typ)
 {
-       int by = y1;
-       int bx = x1;
+       POSITION by = y1;
+       POSITION bx = x1;
        int brad = 0;
        int brev = rad * rad / dist;
        int bdis = 0;
@@ -6568,20 +6620,19 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte
 }
 
 
-/*
- * Generic "beam"/"bolt"/"ball" projection routine.
- *
- * Input:
- *   who: Index of "source" monster (zero for "player")
- *   rad: Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
- *   y,x: Target location (or location to travel "towards")
- *   dam: Base damage roll to apply to affected monsters (or player)
- *   typ: Type of damage to apply to monsters (and objects)
- *   flg: Extra bit flags (see PROJECT_xxxx in "defines.h")
- *
- * Return:
- *   TRUE if any "effects" of the projection were observed, else FALSE
- *
+/*!
+ * @brief 汎用的なビーム/ボルト/ボール系処理のルーチン Generic "beam"/"bolt"/"ball" projection routine.
+ * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player")
+ * @param rad 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
+ * @param y 目標Y座標 / Target y location (or location to travel "towards")
+ * @param x 目標X座標 / Target x location (or location to travel "towards")
+ * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player)
+ * @param typ 効果属性 / Type of damage to apply to monsters (and objects)
+ * @param flg 効果フラグ / Extra bit flags (see PROJECT_xxxx in "defines.h")
+ * @param monspell 効果元のモンスター魔法ID
+ * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE
+ * @details
+ * <pre>
  * Allows a monster (or player) to project a beam/bolt/ball of a given kind
  * towards a given location (optionally passing over the heads of interposing
  * monsters), and have it do a given amount of damage to the monsters (and
@@ -6709,18 +6760,19 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte
  * Note that we must call "handle_stuff()" after affecting terrain features
  * in the blast radius, in case the "illumination" of the grid was changed,
  * and "update_view()" and "update_monsters()" need to be called.
+ * </pre>
  */
-bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int monspell)
+bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int 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;
 
@@ -6751,13 +6803,13 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
        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;
 
@@ -6774,8 +6826,8 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
        rakubadam_m = 0;
 
        /* Default target of monsterspell is player */
-       monster_target_y=py;
-       monster_target_x=px;
+       monster_target_y=p_ptr->y;
+       monster_target_x=p_ptr->x;
 
        /* Hack -- Jump to target */
        if (flg & (PROJECT_JUMP))
@@ -6792,8 +6844,8 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
        /* Start at player */
        else if (who <= 0)
        {
-               x1 = px;
-               y1 = py;
+               x1 = p_ptr->x;
+               y1 = p_ptr->y;
        }
 
        /* Start at monster */
@@ -6961,27 +7013,27 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
                                monster_target_y=(s16b)y;
                                monster_target_x=(s16b)x;
 
-                               remove_mirror(y,x);
-                               next_mirror( &oy,&ox,y,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++ )
+                               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(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];
+                                               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);
+                                               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);
-                                           }
+                                                 /* Hack - auto-track */
+                                                 health_track(cave[project_m_y][project_m_x].m_idx);
+                                               }
                                          }
                                        }
                                        (void)project_f(0,0,y,x,dam,GF_SEEKER);
@@ -6989,28 +7041,29 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
                                last_i = i;
                        }
                }
-               for( i = last_i ; i < path_n ; i++ )
+               for(i = last_i ; i < path_n ; i++)
                {
-                       int x,y;
-                       y = GRID_Y(path_g[i]);
-                       x = GRID_X(path_g[i]);
-                       if(project_m(0,0,y,x,dam,GF_SEEKER,flg,TRUE))
-                         notice=TRUE;
+                       int 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))
+                               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(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);
+                                       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);
-                           }
-                         }
+                                               /* 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, py, px, dam, GF_SEEKER);
                }
                return notice;
        }
@@ -7124,25 +7177,25 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
                }
                for( i = 0; i < path_n ; i++ )
                {
-                       int x,y;
-                       y = GRID_Y(path_g[i]);
-                       x = GRID_X(path_g[i]);
-                       (void)project_m(0,0,y,x,dam,GF_SUPER_RAY,flg,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];
+                       int 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);
+                       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);
+                                       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);
-                           }
-                         }
+                                               /* Hack - auto-track */
+                                               health_track(cave[project_m_y][project_m_x].m_idx);
+                                       }
+                               }
                        }
-                       (void)project_f(0,0,y,x,dam,GF_SUPER_RAY);
+                       (void)project_f(0, 0, py, px, dam, GF_SUPER_RAY);
                }
                return notice;
        }
@@ -7273,11 +7326,11 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
                /*
                 * Create a conical breath attack
                 *
-                *         ***
-                *     ********
+                *       ***
+                *   ********
                 * D********@**
-                *     ********
-                *         ***
+                *   ********
+                *       ***
                 */
 
                if (breath)
@@ -7417,7 +7470,7 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
        if (flg & PROJECT_KILL)
        {
                see_s_msg = (who > 0) ? is_seen(&m_list[who]) :
-                       (!who ? TRUE : (player_can_see_bold(y1, x1) && projectable(py, px, y1, x1)));
+                       (!who ? TRUE : (player_can_see_bold(y1, x1) && projectable(p_ptr->y, p_ptr->x, y1, x1)));
        }
 
 
@@ -7519,10 +7572,10 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
                                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 */
@@ -7540,14 +7593,15 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
                                                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;
 
@@ -7761,14 +7815,14 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
                {
                        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);
                        }
                }
        }
@@ -7777,10 +7831,15 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
        return (notice);
 }
 
-bool binding_field( int dam )
+/*!
+ * @brief 鏡魔法「封魔結界」の効果処理
+ * @param dam ダメージ量
+ * @return 効果があったらTRUEを返す
+ */
+bool binding_field( HIT_POINT dam )
 {
        int mirror_x[10],mirror_y[10]; /* 鏡はもっと少ない */
-       int mirror_num=0;              /* 鏡の数 */
+       int mirror_num=0;                         /* 鏡の数 */
        int x,y;
        int centersign;
        int x1,x2,y1,y2;
@@ -7792,19 +7851,19 @@ bool binding_field( int dam )
        int point_y[3];
 
        /* Default target of monsterspell is player */
-       monster_target_y=py;
-       monster_target_x=px;
+       monster_target_y=p_ptr->y;
+       monster_target_x=p_ptr->x;
 
        for( x=0 ; x < cur_wid ; x++ )
        {
                for( y=0 ; y < cur_hgt ; y++ )
                {
                        if( is_mirror_grid(&cave[y][x]) &&
-                           distance(py,px,y,x) <= MAX_RANGE &&
-                           distance(py,px,y,x) != 0 &&
-                           player_has_los_bold(y,x) &&
-                           projectable(py, px, 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++;
@@ -7824,8 +7883,8 @@ bool binding_field( int dam )
        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]=py;
-       point_x[2]=px;
+       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];
@@ -7833,7 +7892,7 @@ bool binding_field( int dam )
        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];
@@ -7848,12 +7907,12 @@ bool binding_field( int dam )
                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)
+                               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)
+                               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(py, px, y, x)) {
+                               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)){
@@ -7871,12 +7930,12 @@ bool binding_field( int dam )
                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)
+                               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)
+                               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(py, px, y, x)) {
+                               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); 
                                }
                        }
@@ -7886,12 +7945,12 @@ bool binding_field( int dam )
                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)
+                               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)
+                               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(py, px, y, x)) {
+                               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); 
                                }
                        }
@@ -7901,12 +7960,12 @@ bool binding_field( int dam )
                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)
+                               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)
+                               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(py, px, y, x)) {
+                               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);
                                }
@@ -7914,14 +7973,19 @@ bool binding_field( int dam )
                }
        }
        if( one_in_(7) ){
-        msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror"));
+               msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror"));
                remove_mirror(point_y[0],point_x[0]);
        }
 
        return TRUE;
 }
 
-void seal_of_mirror( int dam )
+/*!
+ * @brief 鏡魔法「鏡の封印」の効果処理
+ * @param dam ダメージ量
+ * @return 効果があったらTRUEを返す
+ */
+void seal_of_mirror( HIT_POINT dam )
 {
        int x,y;
 
@@ -7944,4 +8008,4 @@ void seal_of_mirror( int dam )
        }
        return;
 }
-     
+