モンスターのテレポートにも受動テレポートモードを与えた. 自分の意志に

よるテレポートで自分が本来入れない地形に飛ぶようなことはなくなる. 関
連して, 以下の変更を含む.
* cave_teleportable_bold()をcave_player_teleportable_bold()と改名.
* 盗む能力を持つ乗馬は現在存在しないが, 乗馬が盗む打撃をすると乗馬だ
  けがテレポートする可能性のあるバグを修正.

diff --git a/src/cmd1.c b/src/cmd1.c
index afc211e..a098563 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -2819,7 +2819,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
                                        msg_format("%^s disappears!", m_name);
 #endif
 
-                                       teleport_away(c_ptr->m_idx, 50, FALSE);
+                                       teleport_away(c_ptr->m_idx, 50, FALSE, TRUE);
                                        num = num_blow + 1; /* Can't hit it anymore! */
                                        *mdeath = TRUE;
                                }

diff --git a/src/cmd6.c b/src/cmd6.c
index b7af32b..3b8be6c 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -6403,7 +6403,7 @@ msg_print("
                        for (i = 0; i < max_pet; i++)
                        {
                                pet_ctr = who[i];
-                               teleport_monster_to(pet_ctr, py, px, 100);
+                               teleport_monster_to(pet_ctr, py, px, 100, TRUE);
                        }
 
                        /* Free the "who" array */

diff --git a/src/externs.h b/src/externs.h
index 22a739f..8e9893f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1124,9 +1124,9 @@ extern bool rush_attack(bool *mdeath);
 extern void remove_all_mirrors(bool explode);
 
 /* spells3.c */
-extern bool teleport_away(int m_idx, int dis, bool dec_valour);
-extern void teleport_monster_to(int m_idx, int ty, int tx, int power);
-extern bool cave_teleportable_bold(int y, int x, bool passive);
+extern bool teleport_away(int m_idx, int dis, bool dec_valour, bool passive);
+extern void teleport_monster_to(int m_idx, int ty, int tx, int power, bool passive);
+extern bool cave_player_teleportable_bold(int y, int x, bool passive);
 extern void teleport_player(int dis, bool passive);
 extern void teleport_player_to(int ny, int nx, bool no_tele, bool passive);
 extern void teleport_level(int m_idx);

diff --git a/src/hissatsu.c b/src/hissatsu.c
index ef7d4fb..dc2d201 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -984,7 +984,7 @@ static bool cast_hissatsu_spell(int spell)
        case 27:
        {
                if (!tgt_pt(&x, &y)) return FALSE;
-               if (!cave_teleportable_bold(y, x, FALSE) ||
+               if (!cave_player_teleportable_bold(y, x, FALSE) ||
                    (distance(y, x, py, px) > MAX_SIGHT / 2) ||
                    !projectable(py, px, y, x))
                {

diff --git a/src/mane.c b/src/mane.c
index 27a3b52..874d979 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -998,7 +998,7 @@ msg_format("%s
                msg_format("You command %s to return.", m_name);
 #endif
 
-               teleport_monster_to(cave[target_row][target_col].m_idx, py, px, 100);
+               teleport_monster_to(cave[target_row][target_col].m_idx, py, px, 100, TRUE);
                break;
        }
        case MS_TELE_AWAY:

diff --git a/src/melee1.c b/src/melee1.c
index 09457b9..19f6082 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -2172,7 +2172,7 @@ msg_format("%^s
                msg_print("The thief flees laughing!");
 #endif
 
-               teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE);
+               teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE, FALSE);
        }
 
 

diff --git a/src/melee2.c b/src/melee2.c
index 1ebe406..f0b915a 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -1900,7 +1900,7 @@ act = "%s
                        case RBE_EAT_GOLD:
                                {
                                        pt = damage = 0;
-                                       if (one_in_(2)) blinked = TRUE;
+                                       if ((p_ptr->riding != m_idx) && one_in_(2)) blinked = TRUE;
                                        break;
                                }
 
@@ -2213,7 +2213,7 @@ msg_print("ť
                        mon_fight = TRUE;
                }
 
-               teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE);
+               teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE, FALSE);
        }
 
        return TRUE;

diff --git a/src/mspells1.c b/src/mspells1.c
index e4a1176..90f59f8 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -3410,7 +3410,7 @@ msg_format("%^s
                        msg_format("%^s blinks away.", m_name);
 #endif
 
-                       teleport_away(m_idx, 10, FALSE);
+                       teleport_away(m_idx, 10, FALSE, FALSE);
                        p_ptr->update |= (PU_MONSTERS);
                        break;
                }
@@ -3432,7 +3432,7 @@ msg_format("%^s
                        msg_format("%^s teleports away.", m_name);
 #endif
 
-                       teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE);
+                       teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE, FALSE);
 
                        if (los(py, px, oldfy, oldfx) && !world_monster)
                        {
@@ -3591,7 +3591,7 @@ msg_format("%^s
 #else
                                                msg_format("%^s suddenly go out of your sight!", m_name);
 #endif
-                                               teleport_away(m_idx, 10, FALSE);
+                                               teleport_away(m_idx, 10, FALSE, FALSE);
                                                p_ptr->update |= (PU_MONSTERS);
                                        }
                                        else

diff --git a/src/mspells2.c b/src/mspells2.c
index 1cba83c..ce37643 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -3056,7 +3056,7 @@ bool monst_spell_monst(int m_idx)
 
                }
 
-               teleport_away(m_idx, 10, FALSE);
+               teleport_away(m_idx, 10, FALSE, FALSE);
 
                break;
 
@@ -3071,7 +3071,7 @@ bool monst_spell_monst(int m_idx)
 #endif
                }
 
-               teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE);
+               teleport_away(m_idx, MAX_SIGHT * 2 + 5, FALSE, FALSE);
 
                if (los(py, px, m_ptr->fy, m_ptr->fx) && !world_monster && see_m)
                {
@@ -3177,7 +3177,7 @@ 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);
+                                       teleport_away(m_idx, 10, FALSE, FALSE);
                                        p_ptr->update |= (PU_MONSTERS);
                                }
                                else
@@ -3202,7 +3202,7 @@ bool monst_spell_monst(int m_idx)
                                        dam = damroll(4, 8);
 
                                        if (t_idx == p_ptr->riding) teleport_player_to(m_ptr->fy, m_ptr->fx, FALSE, TRUE);
-                                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100);
+                                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100, TRUE);
 
                                        sound(SOUND_FALL);
 
@@ -3317,7 +3317,7 @@ bool monst_spell_monst(int m_idx)
                if (!resists_tele)
                {
                        if (t_idx == p_ptr->riding) teleport_player_to(m_ptr->fy, m_ptr->fx, TRUE, TRUE);
-                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100);
+                       else teleport_monster_to(t_idx, m_ptr->fy, m_ptr->fx, 100, TRUE);
                }
 
                wake_up = TRUE;
@@ -3379,7 +3379,7 @@ bool monst_spell_monst(int m_idx)
                if (!resists_tele)
                {
                        if (t_idx == p_ptr->riding) teleport_player(MAX_SIGHT * 2 + 5, TRUE);
-                       else teleport_away(t_idx, MAX_SIGHT * 2 + 5, FALSE);
+                       else teleport_away(t_idx, MAX_SIGHT * 2 + 5, FALSE, TRUE);
                }
 
                wake_up = TRUE;

diff --git a/src/mspells3.c b/src/mspells3.c
index aef4bb3..9af5efb 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -1425,7 +1425,7 @@ msg_format("%s
                msg_format("You command %s to return.", m_name);
 #endif
 
-               teleport_monster_to(cave[target_row][target_col].m_idx, py, px, 100);
+               teleport_monster_to(cave[target_row][target_col].m_idx, py, px, 100, TRUE);
                break;
        }
        case MS_TELE_AWAY:

diff --git a/src/spells1.c b/src/spells1.c
index 8708a43..46decc3 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -5935,7 +5935,7 @@ note = "
                chg_virtue(V_VALOUR, -1);
 
                /* Teleport */
-               teleport_away(c_ptr->m_idx, do_dist, (bool)(!who));
+               teleport_away(c_ptr->m_idx, do_dist, (bool)(!who), TRUE);
 
                /* Hack -- get new location */
                y = m_ptr->fy;
@@ -6247,7 +6247,7 @@ msg_print("
                                        msg_print("Space warps about you!");
 #endif
 
-                                       if (m_ptr->r_idx) teleport_away(c_ptr->m_idx, damroll(10, 10), FALSE);
+                                       if (m_ptr->r_idx) teleport_away(c_ptr->m_idx, damroll(10, 10), FALSE, TRUE);
                                        if (one_in_(13)) count += activate_hi_summon(ty, tx, TRUE);
                                        if (!one_in_(6)) break;
                                }

diff --git a/src/spells2.c b/src/spells2.c
index 81071c3..2985da1 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -5289,7 +5289,7 @@ bool destroy_area(int y1, int x1, int r, bool in_generate)
                                        m_ptr->hp = m_ptr->maxhp;
 
                                        /* Try to teleport away quest monsters */
-                                       if (!teleport_away(c_ptr->m_idx, (r * 2) + 1, TRUE)) continue;
+                                       if (!teleport_away(c_ptr->m_idx, (r * 2) + 1, TRUE, FALSE)) continue;
                                }
                                else
                                {

diff --git a/src/spells3.c b/src/spells3.c
index df1136e..d435b92 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -19,6 +19,31 @@
 #define HURT_CHANCE 16
 
 
+static bool cave_monster_teleportable_bold(int m_idx, int y, int x, bool passive)
+{
+       monster_type *m_ptr = &m_list[m_idx];
+       cave_type    *c_ptr = &cave[y][x];
+       feature_type *f_ptr = &f_info[c_ptr->feat];
+
+       /* Require "teleportable" space */
+       if (!have_flag(f_ptr->flags, FF_TELEPORTABLE)) return FALSE;
+
+       if (c_ptr->m_idx && (c_ptr->m_idx != m_idx)) return FALSE;
+       if (player_bold(y, x)) return FALSE;
+
+       /* Hack -- no teleport onto glyph of warding */
+       if (is_glyph_grid(c_ptr)) return FALSE;
+       if (is_explosive_rune_grid(c_ptr)) return FALSE;
+
+       if (!passive)
+       {
+               if (!monster_can_cross_terrain(c_ptr->feat, &r_info[m_ptr->r_idx], 0)) return FALSE;
+       }
+
+       return TRUE;
+}
+
+
 /*
  * Teleport a monster, normally up to "dis" grids away.
  *
@@ -26,7 +51,7 @@
  *
  * But allow variation to prevent infinite loops.
  */
-bool teleport_away(int m_idx, int dis, bool dec_valour)
+bool teleport_away(int m_idx, int dis, bool dec_valour, bool passive)
 {
        int oy, ox, d, i, min;
        int tries = 0;
@@ -36,7 +61,6 @@ bool teleport_away(int m_idx, int dis, bool dec_valour)
 
        monster_type *m_ptr = &m_list[m_idx];
 
-
        /* Paranoia */
        if (!m_ptr->r_idx) return (FALSE);
 
@@ -50,7 +74,7 @@ bool teleport_away(int m_idx, int dis, bool dec_valour)
        if (dec_valour &&
            (((p_ptr->chp * 10) / p_ptr->mhp) > 5) &&
                (4+randint1(5) < ((p_ptr->chp * 10) / p_ptr->mhp)))
-       {       
+       {
                chg_virtue(V_VALOUR, -1);
        }
 
@@ -77,15 +101,7 @@ bool teleport_away(int m_idx, int dis, bool dec_valour)
                        /* Ignore illegal locations */
                        if (!in_bounds(ny, nx)) continue;
 
-                       /* Require "empty" floor space */
-                       if (!cave_empty_bold(ny, nx)) continue;
-
-                       /* Hack -- no teleport onto glyph of warding */
-                       if (is_glyph_grid(&cave[ny][nx])) continue;
-                       if (is_explosive_rune_grid(&cave[ny][nx])) continue;
-
-                       /* ...nor onto the Pattern */
-                       if (pattern_tile(ny, nx)) continue;
+                       if (!cave_monster_teleportable_bold(m_idx, ny, nx, passive)) continue;
 
                        /* No teleporting into vaults and such */
                        if (!(p_ptr->inside_quest || p_ptr->inside_arena))
@@ -144,7 +160,7 @@ bool teleport_away(int m_idx, int dis, bool dec_valour)
 /*
  * Teleport monster next to a grid near the given location
  */
-void teleport_monster_to(int m_idx, int ty, int tx, int power)
+void teleport_monster_to(int m_idx, int ty, int tx, int power, bool passive)
 {
        int ny, nx, oy, ox, d, i, min;
        int attempts = 500;
@@ -152,7 +168,6 @@ void teleport_monster_to(int m_idx, int ty, int tx, int power)
        bool look = TRUE;
        monster_type *m_ptr = &m_list[m_idx];
 
-
        /* Paranoia */
        if (!m_ptr->r_idx) return;
 
@@ -179,8 +194,6 @@ void teleport_monster_to(int m_idx, int ty, int tx, int power)
                /* Try several locations */
                for (i = 0; i < 500; i++)
                {
-                       cave_type    *c_ptr;
-
                        /* Pick a (possibly illegal) location */
                        while (1)
                        {
@@ -193,20 +206,10 @@ void teleport_monster_to(int m_idx, int ty, int tx, int power)
                        /* Ignore illegal locations */
                        if (!in_bounds(ny, nx)) continue;
 
-                       /* Require "empty" floor space */
-                       if (!cave_empty_bold(ny, nx)) continue;
-
-                       c_ptr = &cave[ny][nx];
-
-                       /* Hack -- no teleport onto glyph of warding */
-                       if (is_glyph_grid(c_ptr)) continue;
-                       if (is_explosive_rune_grid(c_ptr)) continue;
-
-                       /* ...nor onto the Pattern */
-                       if (pattern_tile(ny, nx)) continue;
+                       if (!cave_monster_teleportable_bold(m_idx, ny, nx, passive)) continue;
 
                        /* No teleporting into vaults and such */
-                       /* if (c_ptr->info & (CAVE_ICKY)) continue; */
+                       /* if (cave[ny][nx].info & (CAVE_ICKY)) continue; */
 
                        /* This grid looks good */
                        look = FALSE;
@@ -251,7 +254,7 @@ void teleport_monster_to(int m_idx, int ty, int tx, int power)
 }
 
 
-bool cave_teleportable_bold(int y, int x, bool passive)
+bool cave_player_teleportable_bold(int y, int x, bool passive)
 {
        cave_type    *c_ptr = &cave[y][x];
        feature_type *f_ptr = &f_info[c_ptr->feat];
@@ -359,7 +362,7 @@ msg_print("
                        /* Ignore illegal locations */
                        if (!in_bounds(y, x)) continue;
 
-                       if (!cave_teleportable_bold(y, x, passive)) continue;
+                       if (!cave_player_teleportable_bold(y, x, passive)) continue;
 
                        /* This grid looks good */
                        look = FALSE;
@@ -413,7 +416,7 @@ msg_print("
                                if ((r_ptr->flags6 & RF6_TPORT) &&
                                    !(r_ptr->flagsr & RFR_RES_TELE))
                                {
-                                       if (!m_ptr->csleep) teleport_monster_to(tmp_m_idx, y, x, r_ptr->level);
+                                       if (!m_ptr->csleep) teleport_monster_to(tmp_m_idx, y, x, r_ptr->level, FALSE);
                                }
                        }
                }
@@ -458,7 +461,7 @@ void teleport_player_to(int ny, int nx, bool no_tele, bool passive)
                if (p_ptr->wizard && !passive) break;
 
                /* Accept teleportable floor grids */
-               if (cave_teleportable_bold(y, x, passive)) break;
+               if (cave_player_teleportable_bold(y, x, passive)) break;
 
                /* Occasionally advance the distance */
                if (++ctr > (4 * dis * dis + 4 * dis + 1))
@@ -5691,7 +5694,7 @@ static bool dimension_door_aux(int x, int y)
 
        p_ptr->energy_need += (s16b)((s32b)(60 - plev) * ENERGY_NEED() / 100L);
 
-       if (!cave_teleportable_bold(y, x, FALSE) ||
+       if (!cave_player_teleportable_bold(y, x, FALSE) ||
            (distance(y, x, py, px) > plev / 2 + 10) ||
            (!randint0(plev / 10 + 10)))
        {