From 48b1d89537ffa16602f47491c614f75dbdaa6b07 Mon Sep 17 00:00:00 2001 From: mogami Date: Sun, 23 Jun 2002 16:13:30 +0000 Subject: [PATCH] =?utf8?q?=E5=B1=B1=E3=81=AB=E5=A4=A7=E9=B7=B2=E3=81=8C?= =?utf8?q?=E5=87=BA=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=80=81=E3=83=A2?= =?utf8?q?=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=BC=E3=83=95=E3=83=A9=E3=82=B0?= =?utf8?q?=E3=81=ABWILD=5FMOUNTAIN=E3=82=92=E5=90=AB=E3=82=80=E3=83=80?= =?utf8?q?=E3=83=B3=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=A7=E3=81=AF=E3=80=81?= =?utf8?q?=20WILD=5FONLY=E3=81=AE=E3=83=A2=E3=83=B3=E3=82=B9=E3=82=BF?= =?utf8?q?=E3=83=BC=E3=82=82=E5=87=BA=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?utf8?q?=E3=81=97=E3=81=9F=E3=80=82=20=E3=83=80=E3=83=B3=E3=82=B8?= =?utf8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E4=B8=BB=E3=82=92=E3=82=BD=E3=83=AD?= =?utf8?q?=E3=83=B3=E3=83=89=E3=83=BC=E3=83=AB=E3=81=AB=E8=A8=AD=E5=AE=9A?= =?utf8?q?=E3=80=81ESCORT=E3=81=A8ESCORTS=E3=82=92=E4=BB=98=E3=81=91?= =?utf8?q?=E3=81=A6=E3=80=81=E5=AE=9F=E9=A8=93=E7=94=A8=E3=81=AB=20?= =?utf8?q?=E3=83=AC=E3=83=99=E3=83=AB=E3=81=A0=E3=81=9155=E3=81=AB?= =?utf8?q?=E4=B8=8A=E3=81=92=E3=81=A6=E3=81=8A=E3=81=84=E3=81=9F=E3=80=82?= =?utf8?q?=E3=81=9D=E3=81=AE=E4=BB=96=E3=81=AE=E5=A4=A7=E9=B7=B2=E3=83=A6?= =?utf8?q?=E3=83=8B=E3=83=BC=E3=82=AF=E3=82=82=E3=81=AA=E3=82=8B=E3=81=B9?= =?utf8?q?=E3=81=8F=E5=87=BA=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20?= =?utf8?q?=E3=83=AC=E3=82=A2=E3=83=AA=E3=83=86=E3=82=A31=E3=81=AB=E3=81=97?= =?utf8?q?=E3=81=9F=E3=80=82=E5=AE=9F=E9=9A=9B=E3=81=AB=E5=BC=B7=E3=81=95?= =?utf8?q?=E3=82=92=E5=A4=89=E3=81=88=E3=82=8B=E3=81=AE=E3=81=AF=E6=89=8B?= =?utf8?q?=E3=82=92=E5=87=BA=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/edit/d_info_j.txt | 1 + lib/edit/r_info_j.txt | 14 +++++++------- src/monster1.c | 5 +++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/edit/d_info_j.txt b/lib/edit/d_info_j.txt index 8125cead9..32756cf3f 100644 --- a/lib/edit/d_info_j.txt +++ b/lib/edit/d_info_j.txt @@ -218,6 +218,7 @@ P:46:76 W:25:50:20:3:14:160:75:20:0x00b7:0x00df L:89:100:89:0:89:0:0 A:97:100:56:0:56:0:97:56:0:0 +F:FINAL_GUARDIAN_468 | F:MONSTER_DIV_16 | WATER_RIVER | CAVE | CAVERN | NO_DOORS | BIG M:TROLL | GIANT | CAN_FLY | ANIMAL | WILD_MOUNTAIN | R_CHAR_O | R_CHAR_Y M:R_CHAR_H diff --git a/lib/edit/r_info_j.txt b/lib/edit/r_info_j.txt index efd06cd54..0ad1b527a 100644 --- a/lib/edit/r_info_j.txt +++ b/lib/edit/r_info_j.txt @@ -6439,12 +6439,12 @@ N:384: E:Meneldor the Swift G:B:u I:120:80d10:20:65:20 -W:24:5:0:360:0:0 +W:24:1:0:360:0:0 B:CLAW:HURT:7d3 B:CLAW:HURT:7d3 B:BITE:HURT:3d7 F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE -F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | FRIENDLY +F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | F:ANIMAL | GOOD | RIDING D:$An agent of supernatural beings, this creature looks like a D:$huge eagle. @@ -6901,12 +6901,12 @@ N:410: E:Gwaihir the Windlord G:B:u I:120:85d10:20:65:20 -W:24:5:0:360:0:0 +W:24:1:0:360:0:0 B:CLAW:HURT:15d2 B:CLAW:HURT:15d2 B:BITE:HURT:3d10 F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE -F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | FRIENDLY +F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | F:ANIMAL | GOOD | RIDING D:$An agent of supernatural beings, this creature looks like a D:$huge eagle. @@ -8037,12 +8037,12 @@ N:468: E:Thorondor G:B:u I:120:85d12:20:65:20 -W:30:6:0:555:0:0 +W:55:1:0:555:0:0 B:CLAW:HURT:16d2 B:CLAW:HURT:16d2 B:BITE:HURT:4d10 -F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE -F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | FRIENDLY +F:CAN_FLY | UNIQUE | ESCORT | ESCORTS | FORCE_MAXHP | DROP_CORPSE +F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | F:ANIMAL | GOOD | RIDING D:$An agent of supernatural being, Thorondor is the lord of eagles. D:¥½¥í¥ó¥É¡¼¥ë¤ÏĶ¼«Á³Åª¤Ê¸ºß¤Î»È¤¤¤Ç¡¢ÂçÏɤ¿¤Á¤Î²¦¤À¡£ diff --git a/src/monster1.c b/src/monster1.c index 61bb57800..2b2e16616 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -3222,7 +3222,12 @@ bool monster_dungeon(int r_idx) if (!(r_ptr->flags8 & RF8_WILD_ONLY)) return TRUE; else + { + dungeon_info_type *d_ptr = &d_info[dungeon_type]; + if ((d_ptr->mflags8 & RF8_WILD_MOUNTAIN) && + (r_ptr->flags8 & RF8_WILD_ONLY)) return TRUE; return FALSE; + } } -- 2.11.0