From f4593ca6290daeef52424cfdac79b54692387c60 Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 15 Mar 2018 22:23:57 +0900 Subject: [PATCH] =?utf8?q?#37784=20summon=5Fspecific()=E3=81=A7=E7=89=B9?= =?utf8?q?=E5=AE=9A=E7=A8=AE=E6=97=8F=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=97?= =?utf8?q?=E3=81=AA=E3=81=84(type=3D0)=E6=99=82=E3=81=AFPM=5FALLOW=5FUNIQU?= =?utf8?q?E=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=AA=E3=81=8F=E3=81=A6?= =?utf8?q?=E3=82=82=E3=80=81=E3=83=A6=E3=83=8B=E3=83=BC=E3=82=AF=E3=82=92?= =?utf8?q?=E5=80=99=E8=A3=9C=E3=81=AB=E5=85=A5=E3=82=8C=E3=81=A6=E3=81=97?= =?utf8?q?=E3=81=BE=E3=81=86=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92summon=5Fs?= =?utf8?q?pecific=5Fokay()=E3=81=AB=E3=81=A6=E4=BF=AE=E6=AD=A3=E3=80=82=20?= =?utf8?q?/=20Fix=20summon=5Fspecific=5Fokay()=20for=20summon=5Fspecific()?= =?utf8?q?=20at=20type=3D0=20selects=20unique=20monsters=20regardless=20of?= =?utf8?q?=20no=20PM=5FALLOW=5FUNIQUE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/monster2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/monster2.c b/src/monster2.c index e6d20de9e..8c3fcb291 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -3959,11 +3959,11 @@ static bool summon_specific_okay(MONRACE_IDX r_idx) } } + if (!summon_unique_okay && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))) return FALSE; + /* Hack -- no specific type specified */ if (!summon_specific_type) return (TRUE); - if (!summon_unique_okay && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))) return FALSE; - if ((summon_specific_who < 0) && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) && monster_has_hostile_align(NULL, 10, -10, r_ptr)) -- 2.11.0