From a73364580928592eb777f734a5a2ccdc0b24d4f0 Mon Sep 17 00:00:00 2001 From: mogami Date: Tue, 11 Jun 2002 14:22:59 +0000 Subject: [PATCH] =?utf8?q?=E6=95=B5=E3=81=8C=E6=95=B5=E3=81=AB=E5=AF=BE?= =?utf8?q?=E3=81=97=E3=81=A6=E3=81=AE=E8=A1=8C=E5=8B=95=E3=81=A8=E3=81=97?= =?utf8?q?=E3=81=A6=E6=AD=BB=E8=80=85=E5=BE=A9=E6=B4=BB=E3=82=92=E4=BD=BF?= =?utf8?q?=E3=81=86=E3=81=A8=E3=81=8D=E3=80=81=E8=A6=96=E7=95=8C=E7=AF=84?= =?utf8?q?=E5=9B=B2=E5=A4=96=E3=81=A7=E3=82=82=E3=83=A1=E3=83=83=E3=82=BB?= =?utf8?q?=E3=83=BC=E3=82=B8=E3=81=8C=20=E5=87=BA=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd5.c | 2 +- src/defines.h | 1 + src/monster2.c | 2 +- src/mspells2.c | 20 +++++++++++++++----- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/cmd5.c b/src/cmd5.c index 59e9e2b98..7880da824 100644 --- a/src/cmd5.c +++ b/src/cmd5.c @@ -4224,7 +4224,7 @@ msg_print(" if (cave_empty_bold2(my, mx)) break; } if (attempt < 0) continue; - summon_specific(-1, my, mx, plev, SUMMON_KNIGHTS, (PM_ALLOW_GROUP | PM_FORCE_PET)); + summon_specific(-1, my, mx, plev, SUMMON_KNIGHTS, (PM_ALLOW_GROUP | PM_FORCE_PET | PM_HASTE)); } (void)set_hero(randint1(25) + 25, FALSE); (void)set_blessed(randint1(25) + 25, FALSE); diff --git a/src/defines.h b/src/defines.h index a3648cdb6..d625de399 100644 --- a/src/defines.h +++ b/src/defines.h @@ -2582,6 +2582,7 @@ #define PM_NO_PET 0x00000020 #define PM_ALLOW_UNIQUE 0x00000040 #define PM_IGNORE_TERRAIN 0x00000080 +#define PM_HASTE 0x00000100 /* diff --git a/src/monster2.c b/src/monster2.c index bcaeefb5c..f493c942d 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -3048,7 +3048,7 @@ msg_print(" } } - if (summon_specific_type == SUMMON_KNIGHTS) m_ptr->fast = 100; + if (mode & PM_HASTE) m_ptr->fast = 100; if (m_ptr->mspeed > 199) m_ptr->mspeed = 199; diff --git a/src/mspells2.c b/src/mspells2.c index 314fdcc1f..f2e8286a3 100644 --- a/src/mspells2.c +++ b/src/mspells2.c @@ -3512,18 +3512,28 @@ msg_format("%^s /* RF6_RAISE_DEAD */ case 160+15: { - disturb(1, 0); + if (known) + { + if (see_either) + { + disturb(1, 0); #ifdef JP - if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name); + if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name); #else - if (blind) msg_format("%^s mumbles.", m_name); + if (blind) msg_format("%^s mumbles.", m_name); #endif #ifdef JP - else msg_format("%^s¤¬»à¼ÔÉü³è¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name); + else msg_format("%^s¤¬»à¼ÔÉü³è¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name); #else - else msg_format("%^s casts a spell to revive corpses.", m_name); + else msg_format("%^s casts a spell to revive corpses.", m_name); #endif + } + else + { + mon_fight = TRUE; + } + } animate_dead(m_idx, m_ptr->fy, m_ptr->fx); break; } -- 2.11.0