OSDN Git Service

branch-hexの変更をコミット。
[hengband/hengband.git] / src / mspells2.c
index d4288de..3e7ec22 100644 (file)
@@ -20,7 +20,7 @@
  */
 static void monst_breath_monst(int m_idx, int y, int x, int typ, int dam_hp, int rad, bool breath, int monspell, bool learnable)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_MONSTER;
+       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 
        monster_type *m_ptr = &m_list[m_idx];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
@@ -31,7 +31,22 @@ static void monst_breath_monst(int m_idx, int y, int x, int typ, int dam_hp, int
        /* Handle breath attacks */
        if (breath) rad = 0 - rad;
 
-       if (typ == GF_ROCKET) flg |= PROJECT_STOP;
+       switch (typ)
+       {
+       case GF_ROCKET:
+               flg |= PROJECT_STOP;
+               break;
+       case GF_DRAIN_MANA:
+       case GF_MIND_BLAST:
+       case GF_BRAIN_SMASH:
+       case GF_CAUSE_1:
+       case GF_CAUSE_2:
+       case GF_CAUSE_3:
+       case GF_CAUSE_4:
+       case GF_HAND_DOOM:
+               flg |= (PROJECT_HIDE | PROJECT_AIMED);
+               break;
+       }
 
        (void)project(m_idx, rad, y, x, dam_hp, typ, flg, (learnable ? monspell : -1));
 }
@@ -44,14 +59,14 @@ static void monst_breath_monst(int m_idx, int y, int x, int typ, int dam_hp, int
  */
 static void monst_bolt_monst(int m_idx, int y, int x, int typ, int dam_hp, int monspell, bool learnable)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_MONSTER | PROJECT_REFLECTABLE;
+       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 
        (void)project(m_idx, 0, y, x, dam_hp, typ, flg, (learnable ? monspell : -1));
 }
 
 static void monst_beam_monst(int m_idx, int y, int x, int typ, int dam_hp, int monspell, bool learnable)
 {
-       int flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_THRU | PROJECT_MONSTER;
+       int flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_THRU;
 
        (void)project(m_idx, 0, y, x, dam_hp, typ, flg, (learnable ? monspell : -1));
 }
@@ -89,7 +104,7 @@ static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
                        return FALSE;
                }
 
-               if (friend && y == py && x == px)
+               if (friend && player_bold(y, x))
                        return FALSE;
        }
        if (!hit2)
@@ -97,11 +112,15 @@ static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
        return TRUE;
 }
 
-static bool breath_direct(int y1, int x1, int y2, int x2, int rad, bool disint_ball, bool friend)
+static bool breath_direct(int y1, int x1, int y2, int x2, int rad, int typ, bool friend)
 {
        /* Must be the same as projectable() */
 
-       int i, y, x;
+       int i;
+
+       /* Initial grid */
+       int y = y1;
+       int x = x1;
 
        int grid_n = 0;
        u16b grid_g[512];
@@ -114,52 +133,147 @@ static bool breath_direct(int y1, int x1, int y2, int x2, int rad, bool disint_b
        bool hit2 = FALSE;
        bool hityou = FALSE;
 
+       int flg;
+
+       switch (typ)
+       {
+       case GF_LITE:
+       case GF_LITE_WEAK:
+               flg = PROJECT_LOS;
+               break;
+       case GF_DISINTEGRATE:
+               flg = PROJECT_DISI;
+               break;
+       default:
+               flg = 0;
+               break;
+       }
+
        /* Check the projection path */
-       grid_n = project_path(grid_g, MAX_RANGE, y1, x1, y2, x2, disint_ball ? PROJECT_DISI : 0);
-       breath_shape(grid_g, grid_n, &grids, gx, gy, gm, &gm_rad, rad, y1, x1, y2, x2, disint_ball, FALSE);
+       grid_n = project_path(grid_g, MAX_RANGE, y1, x1, y2, x2, flg);
 
-       for (i = 0; i < grids; i++)
+       /* Project along the path */
+       for (i = 0; i < grid_n; ++i)
        {
-               /* Extract the location */
-               y = gy[i];
-               x = gx[i];
+               int ny = GRID_Y(grid_g[i]);
+               int nx = GRID_X(grid_g[i]);
 
-               if (y == y2 && x == x2)
-                       hit2 = TRUE;
-               if (y == py && x == px)
-                       hityou = TRUE;
+               if (flg & PROJECT_DISI)
+               {
+                       /* Hack -- Balls explode before reaching walls */
+                       if (cave_stop_disintegration(ny, nx)) break;
+               }
+               else if (flg & PROJECT_LOS)
+               {
+                       /* Hack -- Balls explode before reaching walls */
+                       if (!cave_los_bold(ny, nx)) break;
+               }
+               else
+               {
+                       /* Hack -- Balls explode before reaching walls */
+                       if (!cave_have_flag_bold(ny, nx, FF_PROJECT)) break;
+               }
+
+               /* Save the "blast epicenter" */
+               y = ny;
+               x = nx;
        }
-       if (!hit2)
-               return FALSE;
-       if (friend && hityou)
-               return FALSE;
+
+       grid_n = i;
+
+       if (!grid_n)
+       {
+               if (flg & PROJECT_DISI)
+               {
+                       if (in_disintegration_range(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
+                       if (in_disintegration_range(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+               }
+               else if (flg & PROJECT_LOS)
+               {
+                       if (los(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
+                       if (los(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+               }
+               else
+               {
+                       if (projectable(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
+                       if (projectable(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+               }
+       }
+       else
+       {
+               breath_shape(grid_g, grid_n, &grids, gx, gy, gm, &gm_rad, rad, y1, x1, y, x, typ);
+
+               for (i = 0; i < grids; i++)
+               {
+                       /* Extract the location */
+                       y = gy[i];
+                       x = gx[i];
+
+                       if ((y == y2) && (x == x2)) hit2 = TRUE;
+                       if (player_bold(y, x)) hityou = TRUE;
+               }
+       }
+
+       if (!hit2) return FALSE;
+       if (friend && hityou) return FALSE;
+
        return TRUE;
 }
 
 /*
- * Get the actual center point of ball spells (originally from TOband)
+ * Get the actual center point of ball spells (rad > 1) (originally from TOband)
  */
-static void get_project_point(int sy, int sx, int *ty, int *tx, int flg)
+void get_project_point(int sy, int sx, int *ty, int *tx, int flg)
 {
        u16b path_g[128];
-       int  path_n;
+       int  path_n, i;
 
        path_n = project_path(path_g, MAX_RANGE, sy, sx, *ty, *tx, flg);
 
-       if (path_n)
-       {
-               /* Use final point of projection */
-               *ty = GRID_Y(path_g[path_n - 1]);
-               *tx = GRID_X(path_g[path_n - 1]);
-       }
-       else
+       *ty = sy;
+       *tx = sx;
+
+       /* Project along the path */
+       for (i = 0; i < path_n; i++)
        {
+               sy = GRID_Y(path_g[i]);
+               sx = GRID_X(path_g[i]);
+
+               /* Hack -- Balls explode before reaching walls */
+               if (!cave_have_flag_bold(sy, sx, FF_PROJECT)) break;
+
                *ty = sy;
                *tx = sx;
        }
 }
 
 /*
+ * Check should monster cast dispel spell at other monster.
+ */
+static bool dispel_check_monster(int m_idx, int t_idx)
+{
+       monster_type *t_ptr = &m_list[t_idx];
+
+       /* Invulnabilty */
+       if (MON_INVULNER(t_ptr)) return TRUE;
+
+       /* Speed */
+       if (t_ptr->mspeed < 135)
+       {
+               if (MON_FAST(t_ptr)) return TRUE;
+       }
+
+       /* Riding monster */
+       if (t_idx == p_ptr->riding)
+       {
+               if (dispel_check(m_idx)) return TRUE;
+       }
+
+       /* No need to cast dispel spell */
+       return FALSE;
+}
+
+/*
  * Monster tries to 'cast a spell' (or breath, etc)
  * at another monster.
  *
@@ -174,7 +288,7 @@ bool monst_spell_monst(int m_idx)
        int dam = 0;
        int start;
        int plus = 1;
-       u32b p_mode = 0L, u_mode = 0L;
+       u32b u_mode = 0L;
        int s_num_6 = (easy_band ? 2 : 6);
        int s_num_4 = (easy_band ? 1 : 4);
 
@@ -182,8 +296,10 @@ bool monst_spell_monst(int m_idx)
 
        char m_name[160];
        char t_name[160];
+
+#ifndef JP
        char m_poss[160];
-       char ddesc[160];
+#endif
 
        monster_type *m_ptr = &m_list[m_idx];
        monster_type *t_ptr = NULL;
@@ -198,12 +314,11 @@ bool monst_spell_monst(int m_idx)
 
        bool blind = (p_ptr->blind ? TRUE : FALSE);
 
-       bool see_m = m_ptr->ml;
+       bool see_m = is_seen(m_ptr);
        bool maneable = player_has_los_bold(m_ptr->fy, m_ptr->fx);
-       bool learnable = (see_m && maneable && !world_monster);
+       bool learnable = (m_ptr->ml && maneable && !world_monster);
        bool see_t;
        bool see_either;
-       bool see_both;
        bool known;
 
        bool pet = is_pet(m_ptr);
@@ -211,12 +326,17 @@ bool monst_spell_monst(int m_idx)
        bool in_no_magic_dungeon = (d_info[dungeon_type].flags1 & DF1_NO_MAGIC) && dun_level
                && (!p_ptr->inside_quest || is_fixed_quest_idx(p_ptr->inside_quest));
 
+       bool can_use_lite_area = FALSE;
+
+       bool can_remember;
+
+       bool resists_tele = FALSE;
+
        /* Prepare flags for summoning */
-       if (pet) p_mode |= PM_FORCE_PET;
        if (!pet) u_mode |= PM_ALLOW_UNIQUE;
 
        /* Cannot cast spells when confused */
-       if (m_ptr->confused) return (FALSE);
+       if (MON_CONFUSED(m_ptr)) return (FALSE);
 
        /* Extract the racial spell flags */
        f4 = r_ptr->flags4;
@@ -230,7 +350,7 @@ bool monst_spell_monst(int m_idx)
                t_ptr = &m_list[t_idx];
 
                /* Cancel if not projectable (for now) */
-               if (!projectable(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx))
+               if ((m_idx == t_idx) || !projectable(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx))
                {
                        t_idx = 0;
                }
@@ -246,8 +366,8 @@ bool monst_spell_monst(int m_idx)
                        t_ptr = &m_list[t_idx];
 
                        /* Cancel if neither enemy nor a given target */
-                       if (t_idx != pet_t_m_idx &&
-                           !are_enemies(m_ptr, t_ptr))
+                       if ((m_idx == t_idx) ||
+                           ((t_idx != pet_t_m_idx) && !are_enemies(m_ptr, t_ptr)))
                        {
                                t_idx = 0;
                        }
@@ -287,7 +407,7 @@ bool monst_spell_monst(int m_idx)
                        if (!t_ptr->r_idx) continue;
 
                        /* Monster must be 'an enemy' */
-                       if (!are_enemies(m_ptr, t_ptr)) continue;
+                       if ((m_idx == t_idx) || !are_enemies(m_ptr, t_ptr)) continue;
 
                        /* Monster must be projectable */
                        if (!projectable(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx)) continue;
@@ -313,6 +433,38 @@ bool monst_spell_monst(int m_idx)
        /* Extract the monster level */
        rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
 
+       /* Remove unimplemented spells */
+       f6 &= ~(RF6_WORLD | RF6_TRAPS | RF6_FORGET);
+
+       if (f4 & RF4_BR_LITE)
+       {
+               if (!los(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx))
+                       f4 &= ~(RF4_BR_LITE);
+       }
+
+       /* Remove unimplemented special moves */
+       if (f6 & RF6_SPECIAL)
+       {
+               if ((m_ptr->r_idx != MON_ROLENTO) && (r_ptr->d_char != 'B'))
+                       f6 &= ~(RF6_SPECIAL);
+       }
+
+       if (f6 & RF6_DARKNESS)
+       {
+               bool vs_ninja = (p_ptr->pclass == CLASS_NINJA) && !is_hostile(t_ptr);
+
+               if (vs_ninja &&
+                   !(r_ptr->flags3 & (RF3_UNDEAD | RF3_HURT_LITE)) &&
+                   !(r_ptr->flags7 & RF7_DARK_MASK))
+                       can_use_lite_area = TRUE;
+
+               if (!(r_ptr->flags2 & RF2_STUPID))
+               {
+                       if (d_info[dungeon_type].flags1 & DF1_DARKNESS) f6 &= ~(RF6_DARKNESS);
+                       else if (vs_ninja && !can_use_lite_area) f6 &= ~(RF6_DARKNESS);
+               }
+       }
+
        if (in_no_magic_dungeon && !(r_ptr->flags2 & RF2_STUPID))
        {
                f4 &= (RF4_NOMAGIC_MASK);
@@ -324,8 +476,11 @@ bool monst_spell_monst(int m_idx)
        {
                f4 &= ~(RF4_SUMMON_MASK);
                f5 &= ~(RF5_SUMMON_MASK);
-               f6 &= ~(RF6_SUMMON_MASK);
+               f6 &= ~(RF6_SUMMON_MASK | RF6_TELE_LEVEL);
+
+               if (m_ptr->r_idx == MON_ROLENTO) f6 &= ~(RF6_SPECIAL);
        }
+
        if (p_ptr->inside_battle && !one_in_(3))
        {
                f6 &= ~(RF6_HEAL);
@@ -345,7 +500,7 @@ bool monst_spell_monst(int m_idx)
 
                if (!(p_ptr->pet_extra_flags & PF_TELEPORT))
                {
-                       f6 &= ~(RF6_BLINK | RF6_TPORT | RF6_TELE_AWAY);
+                       f6 &= ~(RF6_BLINK | RF6_TPORT | RF6_TELE_TO | RF6_TELE_AWAY | RF6_TELE_LEVEL);
                }
 
                if (!(p_ptr->pet_extra_flags & PF_ATTACK_SPELL))
@@ -371,13 +526,13 @@ bool monst_spell_monst(int m_idx)
                        {
                                int real_y = y;
                                int real_x = x;
-                               int dist;
 
                                get_project_point(m_ptr->fy, m_ptr->fx, &real_y, &real_x, 0L);
-                               dist = distance(real_y, real_x, py, px);
 
-                               if (los(real_y, real_x, py, px))
+                               if (projectable(real_y, real_x, py, px))
                                {
+                                       int dist = distance(real_y, real_x, py, px);
+
                                        if (dist <= 2)
                                        {
                                                f4 &= ~(RF4_BALL_MASK & ~(RF4_ROCKET));
@@ -391,6 +546,11 @@ bool monst_spell_monst(int m_idx)
                                                f6 &= ~(RF6_BIG_BALL_MASK);
                                        }
                                }
+                               else if (f5 & RF5_BA_LITE)
+                               {
+                                       if ((distance(real_y, real_x, py, px) <= 4) && los(real_y, real_x, py, px))
+                                               f5 &= ~(RF5_BA_LITE);
+                               }
                        }
 
                        if (f4 & RF4_ROCKET)
@@ -399,7 +559,7 @@ bool monst_spell_monst(int m_idx)
                                int real_x = x;
 
                                get_project_point(m_ptr->fy, m_ptr->fx, &real_y, &real_x, PROJECT_STOP);
-                               if (los(real_y, real_x, py, px) && (distance(real_y, real_x, py, px) <= 2))
+                               if (projectable(real_y, real_x, py, px) && (distance(real_y, real_x, py, px) <= 2))
                                        f4 &= ~(RF4_ROCKET);
                        }
 
@@ -420,14 +580,19 @@ bool monst_spell_monst(int m_idx)
                                /* Expected breath radius */
                                int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 3 : 2;
 
-                               if (!breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, FALSE, TRUE))
+                               if (!breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, 0, TRUE))
                                {
                                        f4 &= ~(RF4_BREATH_MASK);
                                        f5 &= ~(RF5_BREATH_MASK);
                                        f6 &= ~(RF6_BREATH_MASK);
                                }
+                               else if ((f4 & RF4_BR_LITE) &&
+                                        !breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, GF_LITE, TRUE))
+                               {
+                                       f4 &= ~(RF4_BR_LITE);
+                               }
                                else if ((f4 & RF4_BR_DISI) &&
-                                        !breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, TRUE, TRUE))
+                                        !breath_direct(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, rad, GF_DISINTEGRATE, TRUE))
                                {
                                        f4 &= ~(RF4_BR_DISI);
                                }
@@ -437,9 +602,15 @@ bool monst_spell_monst(int m_idx)
                /* Special moves restriction */
                if (f6 & RF6_SPECIAL)
                {
-                       if (r_ptr->d_char == 'B')
+                       if (m_ptr->r_idx == MON_ROLENTO)
                        {
-                               if (!(p_ptr->pet_extra_flags & PF_TELEPORT)) f6 &= ~(RF6_SPECIAL);
+                               if ((p_ptr->pet_extra_flags & (PF_ATTACK_SPELL | PF_SUMMON_SPELL)) != (PF_ATTACK_SPELL | PF_SUMMON_SPELL))
+                                       f6 &= ~(RF6_SPECIAL);
+                       }
+                       else if (r_ptr->d_char == 'B')
+                       {
+                               if ((p_ptr->pet_extra_flags & (PF_ATTACK_SPELL | PF_TELEPORT)) != (PF_ATTACK_SPELL | PF_TELEPORT))
+                                       f6 &= ~(RF6_SPECIAL);
                        }
                        else f6 &= ~(RF6_SPECIAL);
                }
@@ -447,40 +618,72 @@ bool monst_spell_monst(int m_idx)
 
        /* Remove some spells if necessary */
 
-       /* Check for a clean bolt shot */
-       if (((f4 & RF4_BOLT_MASK) ||
-            (f5 & RF5_BOLT_MASK) ||
-            (f6 & RF6_BOLT_MASK)) &&
-           !(r_ptr->flags2 & RF2_STUPID) &&
-           !clean_shot(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, pet))
+       if (!(r_ptr->flags2 & RF2_STUPID))
        {
-               f4 &= ~(RF4_BOLT_MASK);
-               f5 &= ~(RF5_BOLT_MASK);
-               f6 &= ~(RF6_BOLT_MASK);
-       }
+               /* Check for a clean bolt shot */
+               if (((f4 & RF4_BOLT_MASK) ||
+                    (f5 & RF5_BOLT_MASK) ||
+                    (f6 & RF6_BOLT_MASK)) &&
+                   !clean_shot(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, pet))
+               {
+                       f4 &= ~(RF4_BOLT_MASK);
+                       f5 &= ~(RF5_BOLT_MASK);
+                       f6 &= ~(RF6_BOLT_MASK);
+               }
 
-       /* Check for a possible summon */
-       if (((f4 & RF4_SUMMON_MASK) ||
-            (f5 & RF5_SUMMON_MASK) ||
-            (f6 & RF6_SUMMON_MASK)) &&
-           !(r_ptr->flags2 & RF2_STUPID) &&
-           !(summon_possible(t_ptr->fy, t_ptr->fx)))
-       {
-               /* Remove summoning spells */
-               f4 &= ~(RF4_SUMMON_MASK);
-               f5 &= ~(RF5_SUMMON_MASK);
-               f6 &= ~(RF6_SUMMON_MASK);
+               /* Check for a possible summon */
+               if (((f4 & RF4_SUMMON_MASK) ||
+                    (f5 & RF5_SUMMON_MASK) ||
+                    (f6 & RF6_SUMMON_MASK)) &&
+                   !(summon_possible(t_ptr->fy, t_ptr->fx)))
+               {
+                       /* Remove summoning spells */
+                       f4 &= ~(RF4_SUMMON_MASK);
+                       f5 &= ~(RF5_SUMMON_MASK);
+                       f6 &= ~(RF6_SUMMON_MASK);
+               }
+
+               /* Dispel magic */
+               if ((f4 & RF4_DISPEL) && !dispel_check_monster(m_idx, t_idx))
+               {
+                       /* Remove dispel spell */
+                       f4 &= ~(RF4_DISPEL);
+               }
+
+               /* Check for a possible raise dead */
+               if ((f6 & RF6_RAISE_DEAD) && !raise_possible(m_ptr))
+               {
+                       /* Remove raise dead spell */
+                       f6 &= ~(RF6_RAISE_DEAD);
+               }
+
+               /* Special moves restriction */
+               if (f6 & RF6_SPECIAL)
+               {
+                       if ((m_ptr->r_idx == MON_ROLENTO) && !summon_possible(t_ptr->fy, t_ptr->fx))
+                       {
+                               f6 &= ~(RF6_SPECIAL);
+                       }
+               }
        }
 
-       /* Hack -- allow "desperate" spells */
-       if ((r_ptr->flags2 & RF2_SMART) &&
-           (m_ptr->hp < m_ptr->maxhp / 10) &&
-           (randint0(100) < 50))
+       if (r_ptr->flags2 & RF2_SMART)
        {
-               /* Require intelligent spells */
-               f4 &= (RF4_INT_MASK);
-               f5 &= (RF5_INT_MASK);
-               f6 &= (RF6_INT_MASK);
+               /* Hack -- allow "desperate" spells */
+               if ((m_ptr->hp < m_ptr->maxhp / 10) &&
+                   (randint0(100) < 50))
+               {
+                       /* Require intelligent spells */
+                       f4 &= (RF4_INT_MASK);
+                       f5 &= (RF5_INT_MASK);
+                       f6 &= (RF6_INT_MASK);
+               }
+
+               /* Hack -- decline "teleport level" in some case */
+               if ((f6 & RF6_TELE_LEVEL) && TELE_LEVEL_IS_INEFF((t_idx == p_ptr->riding) ? 0 : t_idx))
+               {
+                       f6 &= ~(RF6_TELE_LEVEL);
+               }
        }
 
        /* No spells left */
@@ -516,21 +719,19 @@ bool monst_spell_monst(int m_idx)
        /* Get the monster name (or "it") */
        monster_desc(m_name, m_ptr, 0x00);
 
+#ifndef JP
        /* Get the monster possessive ("his"/"her"/"its") */
-       monster_desc(m_poss, m_ptr, 0x22);
+       monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
+#endif
 
        /* Get the target's name (or "it") */
        monster_desc(t_name, t_ptr, 0x00);
 
-       /* Hack -- Get the "died from" name */
-       monster_desc(ddesc, m_ptr, 0x88);
-
        /* Choose a spell to cast */
        thrown_spell = spell[randint0(num)];
 
-       see_t = t_ptr->ml;
+       see_t = is_seen(t_ptr);
        see_either = (see_m || see_t);
-       see_both = (see_m && see_t);
 
        /* Can the player be aware of this attack? */
        known = (m_ptr->cdis <= MAX_SIGHT) || (t_ptr->cdis <= MAX_SIGHT);
@@ -538,19 +739,32 @@ bool monst_spell_monst(int m_idx)
        if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 0);
 
        /* Check for spell failure (inate attacks never fail) */
-       if (!spell_is_inate(thrown_spell) && (in_no_magic_dungeon || (m_ptr->stunned && one_in_(2))))
+       if (!spell_is_inate(thrown_spell) && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2))))
        {
                disturb(1, 0);
                /* Message */
 #ifdef JP
-               msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
+               if (see_m) msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
 #else
-               msg_format("%^s tries to cast a spell, but fails.", m_name);
+               if (see_m) msg_format("%^s tries to cast a spell, but fails.", m_name);
 #endif
 
                return (TRUE);
        }
 
+       /* Hex: Anti Magic Barrier */
+       if (!spell_is_inate(thrown_spell) && magic_barrier(m_idx))
+       {
+#ifdef JP
+               if (see_m) msg_format("È¿ËâË¡¥Ð¥ê¥¢¤¬%^s¤Î¼öʸ¤ò¤«¤­¾Ã¤·¤¿¡£", m_name);
+#else
+               if (see_m) msg_format("Anti magic barrier cancels the spell which %^s casts.");
+#endif
+               return (TRUE);
+       }
+
+       can_remember = is_original_ap_and_seen(m_ptr);
+
        switch (thrown_spell)
        {
        /* RF4_SHRIEK */
@@ -583,9 +797,28 @@ bool monst_spell_monst(int m_idx)
 
        /* RF4_DISPEL */
        case 96+2:
-               return FALSE;
+               if (known)
+               {
+                       if (see_m)
+                       {
+#ifdef JP
+                               msg_format("%^s¤¬%s¤ËÂФ·¤ÆËâÎϾõî¤Î¼öʸ¤òÇ°¤¸¤¿¡£", m_name, t_name);
+#else
+                               msg_format("%^s invokes a dispel magic at %s.", m_name, t_name);
+#endif
+                       }
+                       else
+                       {
+                               mon_fight = TRUE;
+                       }
+               }
+
+               if (t_idx == p_ptr->riding) dispel_player();
+               dispel_monster_status(t_idx);
 
-       /* RF4_XXX4X4 */
+               break;
+
+       /* RF4_ROCKET */
        case 96+3:
                if (known)
                {
@@ -1546,7 +1779,7 @@ bool monst_spell_monst(int m_idx)
 
                break;
 
-       /* RF4_RF4_BR_NUKE */
+       /* RF4_BR_NUKE */
        case 96+29:
                if (known)
                {
@@ -2043,48 +2276,8 @@ bool monst_spell_monst(int m_idx)
 
                }
 
-               /* Heal the monster */
-               if (m_ptr->hp < m_ptr->maxhp)
-               {
-                       if (!tr_ptr->flags4 && !tr_ptr->flags5 && !tr_ptr->flags6)
-                       {
-                               if (see_both)
-                               {
-#ifdef JP
-                                       msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                                       msg_format("%^s is unaffected!", t_name);
-#endif
-
-                               }
-                       }
-                       else
-                       {
-                               /* Attack power */
-                               int power = (randint1(rlev) / 2) + 1;
-
-                               /* Heal */
-                               m_ptr->hp += 6 * power;
-                               if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
-
-                               /* Redraw (later) if needed */
-                               if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
-                               if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
-
-                               /* Special message */
-                               if (see_m)
-                               {
-#ifdef JP
-                                       msg_format("%^s¤Ïµ¤Ê¬¤¬Îɤµ¤½¤¦¤À¡£", m_name);
-#else
-                                       msg_format("%^s appears healthier.", m_name);
-#endif
-
-                               }
-                       }
-               }
-
-               wake_up = TRUE;
+               dam = ((randint1(rlev) / 2) + 1);
+               monst_breath_monst(m_idx, y, x, GF_DRAIN_MANA, dam, 0, FALSE, MS_DRAIN_MANA, learnable);
 
                break;
 
@@ -2093,7 +2286,7 @@ bool monst_spell_monst(int m_idx)
                if (see_m)
                {
 #ifdef JP
-                       msg_format("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À", m_name, t_name);
+                       msg_format("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", m_name, t_name);
 #else
                        msg_format("%^s gazes intently at %s.", m_name, t_name);
 #endif
@@ -2101,56 +2294,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(7, 7);
-               /* Attempt a saving throw */
-               if ((tr_ptr->flags1 & RF1_UNIQUE) ||
-                   (tr_ptr->flags3 & RF3_NO_CONF) ||
-                   (tr_ptr->flags3 & RF3_RES_ALL) ||
-                   (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10))
-               {
-                       /* No obvious effect */
-                       if (see_both)
-                       {
-                               /* Memorize a flag */
-                               if (tr_ptr->flags3 & (RF3_RES_ALL))
-                               {
-                                       tr_ptr->r_flags3 |= (RF3_RES_ALL);
-                               }
-                               else if (tr_ptr->flags3 & (RF3_NO_CONF))
-                               {
-                                       tr_ptr->r_flags3 |= (RF3_NO_CONF);
-                               }
-
-#ifdef JP
-                               msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                               msg_format("%^s is unaffected!", t_name);
-#endif
-
-                       }
-               }
-               else
-               {
-                       if (see_t)
-                       {
-#ifdef JP
-                               msg_format("%^s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£", t_name);
-#else
-                               msg_format("%^s is blasted by psionic energy.", t_name);
-#endif
-
-                       }
-
-                       t_ptr->confused += randint0(4) + 4;
-
-#ifdef JP
-                       mon_take_hit_mon(t_idx, dam, &fear, "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£", m_idx);
-#else
-                       mon_take_hit_mon(t_idx, dam, &fear, " collapses, a mindless husk.", m_idx);
-#endif
-
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_MIND_BLAST, dam, 0, FALSE, MS_MIND_BLAST, learnable);
 
                break;
 
@@ -2159,7 +2303,7 @@ bool monst_spell_monst(int m_idx)
                if (see_m)
                {
 #ifdef JP
-                       msg_format("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À", m_name, t_name);
+                       msg_format("%^s¤Ï%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", m_name, t_name);
 #else
                        msg_format("%^s gazes intently at %s.", m_name, t_name);
 #endif
@@ -2167,58 +2311,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(12, 12);
-               /* Attempt a saving throw */
-               if ((tr_ptr->flags1 & RF1_UNIQUE) ||
-                   (tr_ptr->flags3 & RF3_NO_CONF) ||
-                   (tr_ptr->flags3 & RF3_RES_ALL) ||
-                   (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10))
-               {
-                       /* No obvious effect */
-                       if (see_both)
-                       {
-                               /* Memorize a flag */
-                               if (tr_ptr->flags3 & (RF3_RES_ALL))
-                               {
-                                       tr_ptr->r_flags3 |= (RF3_RES_ALL);
-                               }
-                               else if (tr_ptr->flags3 & (RF3_NO_CONF))
-                               {
-                                       tr_ptr->r_flags3 |= (RF3_NO_CONF);
-                               }
-
-#ifdef JP
-                               msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
-#else
-                               msg_format("%^s is unaffected!", t_name);
-#endif
-
-                       }
-               }
-               else
-               {
-                       if (see_t)
-                       {
-#ifdef JP
-                               msg_format("%^s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£", t_name);
-#else
-                               msg_format("%^s is blasted by psionic energy.", t_name);
-#endif
-
-                       }
-
-                       t_ptr->confused += randint0(4) + 4;
-                       t_ptr->slow = MIN(200, t_ptr->slow + 10);
-                       t_ptr->stunned += randint0(4) + 4;
-
-#ifdef JP
-                       mon_take_hit_mon(t_idx, dam, &fear, "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£", m_idx);
-#else
-                       mon_take_hit_mon(t_idx, dam, &fear, " collapses, a mindless husk.", m_idx);
-#endif
-
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_BRAIN_SMASH, dam, 0, FALSE, MS_BRAIN_SMASH, learnable);
 
                break;
 
@@ -2242,27 +2335,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(3, 8);
-               if ((randint0(100 + rlev/2) < (tr_ptr->level + 35)) ||
-                   (tr_ptr->flags3 & RF3_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flags3 & (RF3_RES_ALL))
-                       {
-                               tr_ptr->r_flags3 |= (RF3_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                       if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-               }
-               else
-               {
-                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_CAUSE_1, dam, 0, FALSE, MS_CAUSE_1, learnable);
 
                break;
 
@@ -2286,28 +2359,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(8, 8);
-               if ((randint0(100 + rlev/2) < (tr_ptr->level + 35)) ||
-                   (tr_ptr->flags3 & RF3_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flags3 & (RF3_RES_ALL))
-                       {
-                               tr_ptr->r_flags3 |= (RF3_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                       if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-               }
-               else
-               {
-                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
-
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_CAUSE_2, dam, 0, FALSE, MS_CAUSE_2, learnable);
 
                break;
 
@@ -2331,27 +2383,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(10, 15);
-               if ((randint0(100 + rlev/2) < (tr_ptr->level + 35)) ||
-                   (tr_ptr->flags3 & RF3_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flags3 & (RF3_RES_ALL))
-                       {
-                               tr_ptr->r_flags3 |= (RF3_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                       if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-               }
-               else
-               {
-                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_CAUSE_3, dam, 0, FALSE, MS_CAUSE_3, learnable);
 
                break;
 
@@ -2375,27 +2407,7 @@ bool monst_spell_monst(int m_idx)
                }
 
                dam = damroll(15, 15);
-               if (((randint0(100 + rlev/2) < (tr_ptr->level + 35)) && (m_ptr->r_idx != MON_KENSHIROU)) ||
-                   (tr_ptr->flags3 & RF3_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flags3 & (RF3_RES_ALL))
-                       {
-                               tr_ptr->r_flags3 |= (RF3_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                       if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-               }
-               else
-               {
-                       mon_take_hit_mon(t_idx, dam, &fear, NULL, m_idx);
-               }
-
-               wake_up = TRUE;
+               monst_breath_monst(m_idx, y, x, GF_CAUSE_4, dam, 0, FALSE, MS_CAUSE_4, learnable);
 
                break;
 
@@ -2726,9 +2738,7 @@ bool monst_spell_monst(int m_idx)
                }
                else
                {
-                       if (!t_ptr->monfear) fear = TRUE;
-
-                       t_ptr->monfear += randint0(4) + 4;
+                       if (set_monster_monfear(t_idx, MON_MONFEAR(t_ptr) + randint0(4) + 4)) fear = TRUE;
                }
 
                wake_up = TRUE;
@@ -2777,13 +2787,12 @@ bool monst_spell_monst(int m_idx)
                else
                {
 #ifdef JP
-                       if (see_t)   msg_format("%^s¤ÏÌܤ¬¸«¤¨¤Ê¤¯¤Ê¤Ã¤¿¡ª ", t_name);
+                       if (see_t) msg_format("%^s¤ÏÌܤ¬¸«¤¨¤Ê¤¯¤Ê¤Ã¤¿¡ª ", t_name);
 #else
                        if (see_t) msg_format("%^s is blinded!", t_name);
 #endif
 
-
-                       t_ptr->confused += 12 + (byte)randint0(4);
+                       (void)set_monster_confused(t_idx, MON_CONFUSED(t_ptr) + 12 + randint0(4));
                }
 
                wake_up = TRUE;
@@ -2835,8 +2844,7 @@ bool monst_spell_monst(int m_idx)
                        if (see_t) msg_format("%^s seems confused.", t_name);
 #endif
 
-
-                       t_ptr->confused += 12 + (byte)randint0(4);
+                       (void)set_monster_confused(t_idx, MON_CONFUSED(t_ptr) + 12 + randint0(4));
                }
 
                wake_up = TRUE;
@@ -2883,7 +2891,7 @@ bool monst_spell_monst(int m_idx)
                }
                else
                {
-                       if (!t_ptr->slow)
+                       if (set_monster_slow(t_idx, MON_SLOW(t_ptr) + 50))
                        {
 #ifdef JP
                                if (see_t) msg_format("%s¤ÎÆ°¤­¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£", t_name);
@@ -2891,8 +2899,6 @@ bool monst_spell_monst(int m_idx)
                                if (see_t) msg_format("%^s starts moving slower.", t_name);
 #endif
                        }
-
-                       t_ptr->slow = MIN(200, t_ptr->slow + 50);
                }
 
                wake_up = TRUE;
@@ -2945,8 +2951,7 @@ bool monst_spell_monst(int m_idx)
                        if (see_t) msg_format("%^s is paralyzed!", t_name);
 #endif
 
-
-                       t_ptr->stunned += randint1(4) + 4;
+                       (void)set_monster_stunned(t_idx, MON_STUNNED(t_ptr) + randint1(4) + 4);
                }
 
                wake_up = TRUE;
@@ -2961,7 +2966,7 @@ bool monst_spell_monst(int m_idx)
                        if (see_m)
                        {
 #ifdef JP
-                               msg_format("%^s¤¬¼«Ê¬¤ÎÂΤËÇ°¤òÁ÷¤Ã¤¿¡£", m_name, m_poss);
+                               msg_format("%^s¤¬¼«Ê¬¤ÎÂΤËÇ°¤òÁ÷¤Ã¤¿¡£", m_name);
 #else
                                msg_format("%^s concentrates on %s body.", m_name, m_poss);
 #endif
@@ -2974,17 +2979,14 @@ bool monst_spell_monst(int m_idx)
                }
 
                /* Allow quick speed increases to base+10 */
-               if (!m_ptr->fast)
+               if (set_monster_fast(m_idx, MON_FAST(m_ptr) + 100))
                {
 #ifdef JP
                        if (see_m) msg_format("%^s¤ÎÆ°¤­¤¬Â®¤¯¤Ê¤Ã¤¿¡£", m_name);
 #else
                        if (see_m) msg_format("%^s starts moving faster.", m_name);
 #endif
-
                }
-               m_ptr->fast = MIN(200, m_ptr->fast + 100);
-               if (p_ptr->riding == m_idx) p_ptr->update |= PU_BONUS;
                break;
 
        /* RF6_HAND_DOOM */
@@ -3006,42 +3008,8 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flags3 & RF3_RES_ALL))
-               {
-                       /* Memorize a flag */
-                       if (tr_ptr->flags3 & (RF3_RES_ALL))
-                       {
-                               tr_ptr->r_flags3 |= (RF3_RES_ALL);
-                       }
-#ifdef JP
-                       if (see_both) msg_format("¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª", t_name);
-#else
-                       if (see_both) msg_format("^%s is unaffected!", t_name);
-#endif
-
-               }
-               else
-               {
-                       if ((r_ptr->level + randint1(20)) >
-                           (tr_ptr->level + 10 + randint1(20)))
-                       {
-                               t_ptr->hp = t_ptr->hp -
-                                       (((s32b)((40 + randint1(20)) * t_ptr->hp)) / 100);
-
-                               if (t_ptr->hp < 1) t_ptr->hp = 1;
-                       }
-                       else
-                       {
-#ifdef JP
-                               if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
-#else
-                               if (see_both) msg_format("%^s resists!", t_name);
-#endif
-
-                       }
-               }
-
-               wake_up = TRUE;
+               dam = 20; /* Dummy power */
+               monst_breath_monst(m_idx, y, x, GF_HAND_DOOM, dam, 0, FALSE, MS_HAND_DOOM, learnable);
 
                break;
 
@@ -3101,7 +3069,6 @@ bool monst_spell_monst(int m_idx)
 #else
                                msg_format("%^s looks healthier.", m_name);
 #endif
-
                        }
                        else
                        {
@@ -3114,10 +3081,10 @@ bool monst_spell_monst(int m_idx)
                if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
 
                /* Cancel fear */
-               if (m_ptr->monfear)
+               if (MON_MONFEAR(m_ptr))
                {
                        /* Cancel fear */
-                       m_ptr->monfear = 0;
+                       (void)set_monster_monfear(m_idx, 0);
 
                        /* Message */
 #ifdef JP
@@ -3125,7 +3092,6 @@ bool monst_spell_monst(int m_idx)
 #else
                        if (see_m) msg_format("%^s recovers %s courage.", m_name, m_poss);
 #endif
-
                }
 
                break;
@@ -3142,7 +3108,6 @@ bool monst_spell_monst(int m_idx)
 #else
                                msg_format("%^s casts a Globe of Invulnerability.", m_name);
 #endif
-
                        }
                        else
                        {
@@ -3150,77 +3115,60 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               if (!m_ptr->invulner) m_ptr->invulner = randint1(4) + 4;
-
-               if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
-               if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
+               if (!MON_INVULNER(m_ptr)) (void)set_monster_invulner(m_idx, randint1(4) + 4, FALSE);
                break;
 
        /* RF6_BLINK */
        case 160+4:
-               if (see_m)
+               if (teleport_barrier(m_idx))
                {
+                       if (see_m)
+                       {
 #ifdef JP
-                       msg_format("%^s¤¬½Ö»þ¤Ë¾Ã¤¨¤¿¡£", m_name);
+                               msg_format("ËâË¡¤Î¥Ð¥ê¥¢¤¬%^s¤Î¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤷¤¿¡£", m_name);
 #else
-                       msg_format("%^s blinks away.", m_name);
+                               msg_format("Magic barrier obstructs teleporting of %^s.", m_name);
 #endif
-
+                       }
                }
-
-               teleport_away(m_idx, 10, FALSE);
-
-               break;
-
-       /* RF6_TPORT */
-       case 160+5:
-               if (see_m)
+               else
                {
+                       if (see_m)
+                       {
 #ifdef JP
-                       msg_format("%^s¤¬¥Æ¥ì¥Ý¡¼¥È¤·¤¿¡£", m_name);
+                               msg_format("%^s¤¬½Ö»þ¤Ë¾Ã¤¨¤¿¡£", m_name);
 #else
-                       msg_format("%^s teleports away.", m_name);
+                               msg_format("%^s blinks away.", m_name);
 #endif
+                       }
+                       teleport_away(m_idx, 10, 0L);
                }
+               break;
 
-               teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE);
-
-               if (los(py, px, m_ptr->fy, m_ptr->fx) && !world_monster && see_m)
+       /* RF6_TPORT */
+       case 160+5:
+               if (teleport_barrier(m_idx))
                {
-                       for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
+                       if (see_m)
                        {
-                               u32b flgs[TR_FLAG_SIZE];
-                               object_type *o_ptr = &inventory[i];
-
-                               if (cursed_p(o_ptr)) continue;
-
-                               object_flags(o_ptr, flgs);
-
-                               if((have_flag(flgs, TR_TELEPORT)) || (p_ptr->muta1 & MUT1_VTELEPORT) || (p_ptr->pclass == CLASS_IMITATOR))
-                               {
 #ifdef JP
-                                       cptr msg = "¤Ä¤¤¤Æ¤¤¤­¤Þ¤¹¤«¡©";
+                               msg_format("ËâË¡¤Î¥Ð¥ê¥¢¤¬%^s¤Î¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤷¤¿¡£", m_name);
 #else
-                                       cptr msg = "Do you follow it? ";
+                               msg_format("Magic barrier obstructs teleporting of %^s.", m_name);
 #endif
-
-                                       if(get_check_strict(msg, CHECK_OKAY_CANCEL))
-                                       {
-                                               if (one_in_(3))
-                                               {
-                                                       teleport_player(200);
+                       }
+               }
+               else
+               {
+                       if (see_m)
+                       {
 #ifdef JP
-                                                       msg_print("¼ºÇÔ¡ª");
+                               msg_format("%^s¤¬¥Æ¥ì¥Ý¡¼¥È¤·¤¿¡£", m_name);
 #else
-                                                       msg_print("Failed!");
+                               msg_format("%^s teleports away.", m_name);
 #endif
-                                               }
-                                               else teleport_player_to(m_ptr->fy, m_ptr->fx, TRUE);
-                                               p_ptr->energy_need = ENERGY_NEED();
-                                       }
-                                       break;
-                               }
                        }
+                       teleport_away_followable(m_idx);
                }
                break;
 
@@ -3231,7 +3179,7 @@ bool monst_spell_monst(int m_idx)
                if(m_ptr->r_idx = MON_DIO) who == 1;
                else if(m_ptr->r_idx = MON_WONG) who == 3;
                dam = who;
-               if(!process_the_world(randint1(2)+2, who, los(py, px, m_ptr->fy, m_ptr->fx))) return (FALSE);
+               if(!process_the_world(randint1(2)+2, who, player_has_los_bold(m_ptr->fy, m_ptr->fx))) return (FALSE);
 #endif
                return FALSE;
 
@@ -3243,6 +3191,39 @@ bool monst_spell_monst(int m_idx)
                        /* Moved to process_monster(), like multiplication */
                        return FALSE;
 
+               case MON_ROLENTO:
+                       if (known)
+                       {
+                               if (see_either)
+                               {
+                                       disturb(1, 0);
+
+#ifdef JP
+                                       msg_format("%^s¤Ï¼êÜØÃƤò¤Ð¤é¤Þ¤¤¤¿¡£", m_name);
+#else
+                                       msg_format("%^s throws some hand grenades.", m_name);
+#endif
+                               }
+                               else
+                               {
+                                       mon_fight = TRUE;
+                               }
+                       }
+
+                       {
+                               int num = 1 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_named_creature(m_idx, y, x, MON_SHURYUUDAN, 0);
+                               }
+                       }
+
+                       if (known && !see_t && count)
+                       {
+                               mon_fight = TRUE;
+                       }
+                       break;
+
                default:
                        if (r_ptr->d_char == 'B')
                        {
@@ -3256,13 +3237,79 @@ bool monst_spell_monst(int m_idx)
                                                msg_format("%^s suddenly go out of your sight!", m_name);
 #endif
                                        }
-                                       teleport_away(m_idx, 10, FALSE);
-                                       p_ptr->update |= (PU_MONSTERS | PU_MON_LITE);
+                                       teleport_away(m_idx, 10, TELEPORT_NONMAGICAL);
+                                       p_ptr->update |= (PU_MONSTERS);
                                }
                                else
                                {
-                                       /* Not implemented */
-                                       return FALSE;
+                                       if (known)
+                                       {
+                                               if (see_either)
+                                               {
+#ifdef JP
+                                                       msg_format("%^s¤¬%s¤òÄϤó¤Ç¶õÃ椫¤éÅꤲÍî¤È¤·¤¿¡£", m_name, t_name);
+#else
+                                                       msg_format("%^s holds %s, and drops from the sky.", m_name, t_name);
+#endif
+
+                                               }
+                                               else
+                                               {
+                                                       mon_fight = TRUE;
+                                               }
+                                       }
+
+                                       dam = damroll(4, 8);
+
+                                       if (t_idx == p_ptr->riding) teleport_player_to(m_ptr->fy, m_ptr->fx, TELEPORT_NONMAGICAL | TELEPORT_PASSIVE);
+                                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100, TELEPORT_NONMAGICAL | TELEPORT_PASSIVE);
+
+                                       sound(SOUND_FALL);
+
+                                       if (tr_ptr->flags7 & RF7_CAN_FLY)
+                                       {
+#ifdef JP
+                                               if (see_t) msg_format("%^s¤ÏÀŤ«¤ËÃåÃϤ·¤¿¡£", t_name);
+#else
+                                               if (see_t) msg_format("%^s floats gently down to the ground.", t_name);
+#endif
+                                       }
+                                       else
+                                       {
+#ifdef JP
+                                               if (see_t) msg_format("%^s¤ÏÃÏÌ̤Ë᤭¤Ä¤±¤é¤ì¤¿¡£", t_name);
+#else
+                                               if (see_t) msg_format("%^s crashed into the ground.", t_name);
+#endif
+                                               dam += damroll(6, 8);
+                                       }
+
+                                       if (p_ptr->riding == t_idx)
+                                       {
+                                               int get_damage = 0;
+
+                                               /* Mega hack -- this special action deals damage to the player. Therefore the code of "eyeeye" is necessary.
+                                                  -- henkma
+                                                */
+                                               get_damage = take_hit(DAMAGE_NOESCAPE, dam, m_name, -1);
+                                               if (p_ptr->tim_eyeeye && get_damage > 0 && !p_ptr->is_dead)
+                                               {
+#ifdef JP
+                                                       msg_format("¹¶·â¤¬%s¼«¿È¤ò½ý¤Ä¤±¤¿¡ª", m_name);
+#else
+                                                       char m_name_self[80];
+
+                                                       /* hisself */
+                                                       monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
+
+                                                       msg_format("The attack of %s has wounded %s!", m_name, m_name_self);
+#endif
+                                                       project(0, 0, m_ptr->fy, m_ptr->fx, get_damage, GF_MISSILE, PROJECT_KILL, -1);
+                                                       set_tim_eyeeye(p_ptr->tim_eyeeye-5, TRUE);
+                                               }
+                                       }
+
+                                       mon_take_hit_mon(t_idx, dam, &fear, extract_note_dies(real_r_ptr(t_ptr)), m_idx);
                                }
                                break;
                        }
@@ -3276,8 +3323,63 @@ bool monst_spell_monst(int m_idx)
 
        /* RF6_TELE_TO */
        case 160+8:
-               /* Not implemented */
-               return FALSE;
+               if (known)
+               {
+                       if (see_either)
+                       {
+#ifdef JP
+                               msg_format("%^s¤¬%s¤ò°ú¤­Ìᤷ¤¿¡£", m_name, t_name);
+#else
+                               msg_format("%^s commands %s to return.", m_name, t_name);
+#endif
+
+                       }
+                       else
+                       {
+                               mon_fight = TRUE;
+                       }
+               }
+
+               if (tr_ptr->flagsr & RFR_RES_TELE)
+               {
+                       if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flagsr & RFR_RES_ALL))
+                       {
+                               if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
+                               if (see_t)
+                               {
+#ifdef JP
+                                       msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
+#else
+                                       msg_format("%^s is unaffected!", t_name);
+#endif
+                               }
+
+                               resists_tele = TRUE;
+                       }
+                       else if (tr_ptr->level > randint1(100))
+                       {
+                               if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
+                               if (see_t)
+                               {
+#ifdef JP
+                                       msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
+#else
+                                       msg_format("%^s resists!", t_name);
+#endif
+                               }
+
+                               resists_tele = TRUE;
+                       }
+               }
+
+               if (!resists_tele)
+               {
+                       if (t_idx == p_ptr->riding) teleport_player_to(m_ptr->fy, m_ptr->fx, TELEPORT_PASSIVE);
+                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100, TELEPORT_PASSIVE);
+               }
+
+               wake_up = TRUE;
+               break;
 
        /* RF6_TELE_AWAY */
        case 160+9:
@@ -3298,55 +3400,86 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
+               if (tr_ptr->flagsr & RFR_RES_TELE)
                {
-                       bool resists_tele = FALSE;
-
-                       if (tr_ptr->flags3 & RF3_RES_TELE)
+                       if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flagsr & RFR_RES_ALL))
                        {
-                               if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flags3 & (RF3_RES_ALL)))
+                               if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
+                               if (see_t)
                                {
-                                       if (see_t)
-                                       {
-                                               tr_ptr->r_flags3 |= RF3_RES_TELE;
 #ifdef JP
-                                               msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
+                                       msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
 #else
-                                               msg_format("%^s is unaffected!", t_name);
+                                       msg_format("%^s is unaffected!", t_name);
 #endif
-
-                                       }
-
-                                       resists_tele = TRUE;
                                }
-                               else if (tr_ptr->level > randint1(100))
+
+                               resists_tele = TRUE;
+                       }
+                       else if (tr_ptr->level > randint1(100))
+                       {
+                               if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
+                               if (see_t)
                                {
-                                       if (see_t)
-                                       {
-                                               tr_ptr->r_flags3 |= RF3_RES_TELE;
 #ifdef JP
-                                               msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
+                                       msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
 #else
-                                               msg_format("%^s resists!", t_name);
+                                       msg_format("%^s resists!", t_name);
 #endif
-
-                                       }
-
-                                       resists_tele = TRUE;
                                }
-                       }
 
-                       if (!resists_tele)
-                       {
-                               if (t_idx == p_ptr->riding) teleport_player(MAX_SIGHT * 2 + 5);
-                               else teleport_away(t_idx, MAX_SIGHT * 2 + 5, FALSE);
+                               resists_tele = TRUE;
                        }
                }
+
+               if (!resists_tele)
+               {
+                       if (t_idx == p_ptr->riding) teleport_player_away(m_idx, MAX_SIGHT * 2 + 5);
+                       else teleport_away(t_idx, MAX_SIGHT * 2 + 5, TELEPORT_PASSIVE);
+               }
+
+               wake_up = TRUE;
                break;
 
        /* RF6_TELE_LEVEL */
        case 160+10:
-               /* Not implemented */
-               return FALSE;
+               if (known)
+               {
+                       if (see_either)
+                       {
+#ifdef JP
+                               msg_format("%^s¤¬%s¤Î­¤ò»Ø¤µ¤·¤¿¡£", m_name, t_name);
+#else
+                               msg_format("%^s gestures at %s's feet.", m_name, t_name);
+#endif
+                       }
+                       else
+                       {
+                               mon_fight = TRUE;
+                       }
+               }
+
+               if (tr_ptr->flagsr & (RFR_EFF_RES_NEXU_MASK | RFR_RES_TELE))
+               {
+#ifdef JP
+                       if (see_t) msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
+#else
+                       if (see_t) msg_format("%^s is unaffected!", t_name);
+#endif
+               }
+               else if ((tr_ptr->flags1 & RF1_QUESTOR) ||
+                           (tr_ptr->level > randint1((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10))
+               {
+#ifdef JP
+                       if (see_t) msg_format("%^s¤Ï¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª", t_name);
+#else
+                       if (see_t) msg_format("%^s resist the effects!", t_name);
+#endif
+               }
+               else teleport_level((t_idx == p_ptr->riding) ? 0 : t_idx);
+
+               wake_up = TRUE;
+               break;
 
        /* RF6_PSY_SPEAR */
        case 160+11:
@@ -3379,20 +3512,22 @@ bool monst_spell_monst(int m_idx)
                        if (see_m)
                        {
 #ifdef JP
-                               msg_format("%^s¤¬°Å°Ç¤ÎÃæ¤Ç¼ê¤ò¿¶¤Ã¤¿¡£", m_name);
+                               if (can_use_lite_area) msg_format("%^s¤¬ÊÕ¤ê¤òÌÀ¤ë¤¯¾È¤é¤·¤¿¡£", m_name);
+                               else msg_format("%^s¤¬°Å°Ç¤ÎÃæ¤Ç¼ê¤ò¿¶¤Ã¤¿¡£", m_name);
 #else
-                               msg_format("%^s gestures in shadow.", m_name);
+                               if (can_use_lite_area) msg_format("%^s cast a spell to light up.", m_name);
+                               else msg_format("%^s gestures in shadow.", m_name);
 #endif
 
-
                                if (see_t)
                                {
 #ifdef JP
-                                       msg_format("%^s¤Ï°Å°Ç¤ËÊñ¤Þ¤ì¤¿¡£", t_name);
+                                       if (can_use_lite_area) msg_format("%^s¤ÏÇò¤¤¸÷¤ËÊñ¤Þ¤ì¤¿¡£", t_name);
+                                       else msg_format("%^s¤Ï°Å°Ç¤ËÊñ¤Þ¤ì¤¿¡£", t_name);
 #else
-                                       msg_format("%^s is surrounded by darkness.", t_name);
+                                       if (can_use_lite_area) msg_format("%^s is surrounded by a white light.", t_name);
+                                       else msg_format("%^s is surrounded by darkness.", t_name);
 #endif
-
                                }
                        }
                        else
@@ -3401,9 +3536,16 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               (void)project(m_idx, 3, y, x, 0, GF_DARK_WEAK, PROJECT_GRID | PROJECT_KILL | PROJECT_MONSTER, MS_DARKNESS);
-
-               unlite_room(y, x);
+               if (can_use_lite_area)
+               {
+                       (void)project(m_idx, 3, y, x, 0, GF_LITE_WEAK, PROJECT_GRID | PROJECT_KILL, -1);
+                       lite_room(y, x);
+               }
+               else
+               {
+                       (void)project(m_idx, 3, y, x, 0, GF_DARK_WEAK, PROJECT_GRID | PROJECT_KILL, MS_DARKNESS);
+                       unlite_room(y, x);
+               }
 
                break;
 
@@ -3431,8 +3573,12 @@ bool monst_spell_monst(int m_idx)
                }
 
                trap_creation(y, x);
-#endif
+
                break;
+#else
+               /* Not implemented */
+               return FALSE;
+#endif
 
        /* RF6_FORGET */
        case 160+14:
@@ -3466,7 +3612,7 @@ bool monst_spell_monst(int m_idx)
                animate_dead(m_idx, m_ptr->fy, m_ptr->fx);
                break;
 
-       /* RF6_SUMMON_KIN */
+       /* RF6_S_KIN */
        case 160+16:
                if (known)
                {
@@ -3474,17 +3620,7 @@ bool monst_spell_monst(int m_idx)
                        {
                                disturb(1, 0);
 
-                               if (m_ptr->r_idx == MON_ROLENTO)
-                               {
-#ifdef JP
-                                       msg_format("%^s¤Ï¼êÜØÃƤò¤Ð¤é¤Þ¤¤¤¿¡£",
-                                                  m_name);
-#else
-                                       msg_format("%^s throws some hand grenades.",
-                                                  m_name);
-#endif
-                               }
-                               else if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
+                               if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
                                {
 #ifdef JP
                                        msg_format("%^s¤¬¥À¥ó¥¸¥ç¥ó¤Î¼ç¤ò¾¤´­¤·¤¿¡£", m_name);
@@ -3510,64 +3646,82 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               if(m_ptr->r_idx == MON_ROLENTO)
+               switch (m_ptr->r_idx)
                {
-                       int num = 1 + randint1(3);
-                       for (k = 0; k < num; k++)
+               case MON_MENELDOR:
+               case MON_GWAIHIR:
+               case MON_THORONDOR:
                        {
-                               count += summon_named_creature(m_idx, y, x, MON_SHURYUUDAN, p_mode);
+                               int num = 4 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_specific(m_idx, y, x, rlev, SUMMON_EAGLES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+                               }
                        }
-               }
-               else if(m_ptr->r_idx == MON_THORONDOR ||
-                       m_ptr->r_idx == MON_GWAIHIR ||
-                       m_ptr->r_idx == MON_MENELDOR)
-               {
-                       int num = 4 + randint1(3);
-                       for (k = 0; k < num; k++)
+                       break;
+
+               case MON_BULLGATES:
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_EAGLES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | p_mode));
+                               int num = 2 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_named_creature(m_idx, y, x, MON_IE, 0);
+                               }
                        }
-               }
-               else if(m_ptr->r_idx == MON_LOUSY)
-               {
-                       int num = 2 + randint1(3);
-                       for (k = 0; k < num; k++)
+                       break;
+
+               case MON_SERPENT:
+               case MON_ZOMBI_SERPENT:
+                       if (r_info[MON_JORMUNGAND].cur_num < r_info[MON_JORMUNGAND].max_num && one_in_(6))
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_LOUSE, (PM_ALLOW_GROUP | p_mode));
+                               if (known && see_t)
+                               {
+#ifdef JP
+                                       msg_print("ÃÏÌ̤«¤é¿å¤¬¿á¤­½Ð¤·¤¿¡ª");
+#else
+                                       msg_print("Water blew off from the ground!");
+#endif
+                               }
+                               project(t_idx, 8, y, x, 3, GF_WATER_FLOW, PROJECT_GRID | PROJECT_HIDE, -1);
                        }
-               }
-               else if(m_ptr->r_idx == MON_BULLGATES)
-               {
-                       int num = 2 + randint1(3);
-                       for (k = 0; k < num; k++)
+
                        {
-                               count += summon_named_creature(m_idx, y, x, 921, p_mode);
+                               int num = 2 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_specific(m_idx, y, x, rlev, SUMMON_GUARDIANS, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+                               }
                        }
-               }
-               else if (m_ptr->r_idx == MON_CALDARM)
-               {
-                       int num = randint1(3);
-                       for (k = 0; k < num; k++)
+                       break;
+
+               case MON_CALDARM:
                        {
-                               count += summon_named_creature(m_idx, y, x, 930, p_mode);
+                               int num = randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_named_creature(m_idx, y, x, MON_LOCKE_CLONE, 0);
+                               }
                        }
-               }
-               else if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
-               {
-                       int num = 2 + randint1(3);
-                       for (k = 0; k < num; k++)
+                       break;
+
+               case MON_LOUSY:
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_GUARDIANS, (PM_ALLOW_GROUP | p_mode | PM_ALLOW_UNIQUE));
+                               int num = 2 + randint1(3);
+                               for (k = 0; k < num; k++)
+                               {
+                                       count += summon_specific(m_idx, y, x, rlev, SUMMON_LOUSE, (PM_ALLOW_GROUP));
+                               }
                        }
-               }
-               else
-               {
+                       break;
+
+               default:
                        summon_kin_type = r_ptr->d_char;
 
                        for (k = 0; k < 4; k++)
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_KIN, (PM_ALLOW_GROUP | p_mode));
+                               count += summon_specific(m_idx, y, x, rlev, SUMMON_KIN, (PM_ALLOW_GROUP));
                        }
+                       break;
                }
 
                if (known && !see_t && count)
@@ -3600,7 +3754,7 @@ bool monst_spell_monst(int m_idx)
 
                if (is_friendly(m_ptr))
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_CYBER, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_CYBER, (PM_ALLOW_GROUP));
                }
                else
                {
@@ -3635,7 +3789,7 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               count += summon_specific(m_idx, y, x, rlev, 0, (p_mode | u_mode));
+               count += summon_specific(m_idx, y, x, rlev, 0, (u_mode));
 
                if (known && !see_t && count)
                {
@@ -3667,7 +3821,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_6; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, 0, (PM_ALLOW_GROUP | p_mode | u_mode));
+                       count += summon_specific(m_idx, y, x, rlev, 0, (PM_ALLOW_GROUP | u_mode));
                }
 
                if (known && !see_t && count)
@@ -3700,7 +3854,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_6; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_ANT, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_ANT, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3733,7 +3887,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_6; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_SPIDER, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_SPIDER, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3766,7 +3920,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HOUND, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HOUND, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3799,7 +3953,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HYDRA, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HYDRA, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3840,7 +3994,7 @@ bool monst_spell_monst(int m_idx)
 
                        for (k = 0; k < num; k++)
                        {
-                               count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, (PM_ALLOW_GROUP | p_mode));
+                               count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, (PM_ALLOW_GROUP));
                        }
                }
 
@@ -3874,7 +4028,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < 1; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_DEMON, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_DEMON, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3907,7 +4061,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < 1; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_UNDEAD, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_UNDEAD, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3940,7 +4094,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < 1; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_DRAGON, (PM_ALLOW_GROUP | p_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_DRAGON, (PM_ALLOW_GROUP));
                }
 
                if (known && !see_t && count)
@@ -3973,7 +4127,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_6; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, (PM_ALLOW_GROUP | p_mode | u_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, (PM_ALLOW_GROUP | u_mode));
                }
 
                if (known && !see_t && count)
@@ -4006,7 +4160,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_DRAGON, (PM_ALLOW_GROUP | p_mode | u_mode));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_DRAGON, (PM_ALLOW_GROUP | u_mode));
                }
 
                if (known && !see_t && count)
@@ -4039,7 +4193,7 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_AMBERITES, (PM_ALLOW_GROUP | p_mode | PM_ALLOW_UNIQUE));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_AMBERITES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
                }
 
                if (known && !see_t && count)
@@ -4072,7 +4226,21 @@ bool monst_spell_monst(int m_idx)
 
                for (k = 0; k < s_num_4; k++)
                {
-                       count += summon_specific(m_idx, y, x, rlev, SUMMON_UNIQUE, (PM_ALLOW_GROUP | p_mode | PM_ALLOW_UNIQUE));
+                       count += summon_specific(m_idx, y, x, rlev, SUMMON_UNIQUE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+               }
+
+               {
+                       int non_unique_type = SUMMON_HI_UNDEAD;
+
+                       if ((m_ptr->sub_align & (SUB_ALIGN_GOOD | SUB_ALIGN_EVIL)) == (SUB_ALIGN_GOOD | SUB_ALIGN_EVIL))
+                               non_unique_type = 0;
+                       else if (m_ptr->sub_align & SUB_ALIGN_GOOD)
+                               non_unique_type = SUMMON_ANGEL;
+
+                       for (k = count; k < s_num_4; k++)
+                       {
+                               count += summon_specific(m_idx, y, x, rlev, non_unique_type, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+                       }
                }
 
                if (known && !see_t && count)
@@ -4083,10 +4251,7 @@ bool monst_spell_monst(int m_idx)
                break;
        }
 
-       if (wake_up)
-       {
-               t_ptr->csleep = 0;
-       }
+       if (wake_up) (void)set_monster_csleep(t_idx, 0);
 
        if (fear && see_t)
        {
@@ -4095,10 +4260,9 @@ bool monst_spell_monst(int m_idx)
 #else
                msg_format("%^s flees in terror!", t_name);
 #endif
-
        }
 
-       if (see_m && maneable && !world_monster && !p_ptr->blind && (p_ptr->pclass == CLASS_IMITATOR))
+       if (m_ptr->ml && maneable && !world_monster && !p_ptr->blind && (p_ptr->pclass == CLASS_IMITATOR))
        {
                if (thrown_spell != 167) /* Not RF6_SPECIAL */
                {
@@ -4116,12 +4280,12 @@ bool monst_spell_monst(int m_idx)
                        p_ptr->mane_num++;
                        new_mane = TRUE;
 
-                       p_ptr->redraw |= (PR_MANE);
+                       p_ptr->redraw |= (PR_IMITATION);
                }
        }
 
        /* Remember what the monster did, if we saw it */
-       if (see_m)
+       if (can_remember)
        {
                /* Inate spell */
                if (thrown_spell < 32*4)
@@ -4148,7 +4312,7 @@ bool monst_spell_monst(int m_idx)
        /* Always take note of monsters that kill you */
        if (p_ptr->is_dead && (r_ptr->r_deaths < MAX_SHORT) && !p_ptr->inside_arena)
        {
-               r_ptr->r_deaths++;
+               r_ptr->r_deaths++; /* Ignore appearance difference */
        }
 
        /* A spell was cast */