From 7cbf3df2436b176aafa35bee2088ddd015a476b7 Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 3 Apr 2019 23:51:42 +0900 Subject: [PATCH] =?utf8?q?[fix]=20#38790=20=E3=83=81=E3=83=A3=E3=83=BC?= =?utf8?q?=E3=82=B8=E3=83=9E=E3=83=B3=E3=81=8C=E5=88=86=E8=A3=82=E5=87=A6?= =?utf8?q?=E7=90=86=E3=81=A8=E3=81=82=E3=82=84=E3=81=97=E3=81=84=E5=BD=B1?= =?utf8?q?=E3=81=AE=E6=99=82=E3=81=AF=E3=82=B8=E3=83=A5=E3=83=A9=E3=83=AB?= =?utf8?q?=E6=98=9F=E4=BA=BA=E3=81=A8=E8=AA=A4=E8=AA=8D=E3=81=97=E3=81=AA?= =?utf8?q?=E3=81=84=E3=82=88=E3=81=86=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD?= =?utf8?q?=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/monster2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/monster2.c b/src/monster2.c index 33ff4ae0b..a7d7976b9 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -2404,13 +2404,13 @@ static bool monster_hook_tanuki(MONRACE_IDX r_idx) * @param r_idx モンスター種族ID * @return モンスター種族の表層ID */ -static MONRACE_IDX initial_r_appearance(MONRACE_IDX r_idx) +static MONRACE_IDX initial_r_appearance(MONRACE_IDX r_idx, BIT_FLAGS generate_mode) { int attempts = 1000; MONRACE_IDX ap_r_idx; - DEPTH min = MIN(current_floor_ptr->base_level-5, 50); + DEPTH min = MIN(current_floor_ptr->base_level - 5, 50); - if (p_ptr->pseikaku == SEIKAKU_CHARGEMAN) + if (p_ptr->pseikaku == SEIKAKU_CHARGEMAN && !(generate_mode & (PM_MULTIPLY | PM_KAGE))) { if (current_floor_ptr->base_level == 0 || one_in_(5)) return MON_ALIEN_JURAL; } @@ -2598,7 +2598,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I /* Save the race */ m_ptr->r_idx = r_idx; - m_ptr->ap_r_idx = initial_r_appearance(r_idx); + m_ptr->ap_r_idx = initial_r_appearance(r_idx, mode); /* No flags */ m_ptr->mflag = 0; -- 2.11.0