From 316d46679522874b2cfd7b091d057d772cdb7987 Mon Sep 17 00:00:00 2001 From: hide_d Date: Tue, 15 May 2018 22:38:05 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=A9=EB=9E=91=EA=B5=B0=20=EC=8B=9C?= =?UTF-8?q?=EB=82=98=EB=A6=AC=EC=98=A4=EB=A5=BC=20=EC=A0=9C=EB=8C=80?= =?UTF-8?q?=EB=A1=9C=20=EC=8B=9C=EC=9E=91=ED=95=A0=20=EC=88=98=20=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Scenario/NPC.php | 2 +- hwe/scenario/scenario_5.json | 2 +- hwe/scenario/scenario_8.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hwe/sammo/Scenario/NPC.php b/hwe/sammo/Scenario/NPC.php index 80000859..7ec7c807 100644 --- a/hwe/sammo/Scenario/NPC.php +++ b/hwe/sammo/Scenario/NPC.php @@ -152,7 +152,7 @@ class NPC{ $city = $this->locatedCity; if($city === null){ - if($nationID == 0){ + if($nationID == 0 || !CityHelper::getAllNationCities($nationID)){ $cityObj = Util::choiceRandom(CityHelper::getAllCities()); } else{ diff --git a/hwe/scenario/scenario_5.json b/hwe/scenario/scenario_5.json index 028810fc..184d7670 100644 --- a/hwe/scenario/scenario_5.json +++ b/hwe/scenario/scenario_5.json @@ -314,7 +314,7 @@ [134, "유도",1278, 0, null, 35, 33, 68, 0, 168, 214, "재간", null], [ 46, "유벽",1279, 0, null, 63, 71, 23, 0, 168, 210, "출세", null], [ 75, "유봉",1280, 0, null, 60, 65, 62, 0, 188, 220, "출세", null], - [ 75, "유비",1281, 8, null, 85, 75, 70,12, 161, 223, "왕좌", "인덕", "관우가 날 저버렸다니... 믿을 수 없다."], + [ 75, "유비",1281, 8, "업", 85, 75, 70,12, 161, 223, "왕좌", "인덕", "관우가 날 저버렸다니... 믿을 수 없다."], [ 75, "유선1",1282, 0, null, 24, 17, 21, 0, 207, 271, "대의", null], [ 55, "유순",1283, 5, null, 67, 61, 54, 0, 184, 239, "출세", null], [ 75, "유심",1284, 0, null, 63, 46, 70, 0, 238, 263, "왕좌", null], diff --git a/hwe/scenario/scenario_8.json b/hwe/scenario/scenario_8.json index c59301f4..3d5ce369 100644 --- a/hwe/scenario/scenario_8.json +++ b/hwe/scenario/scenario_8.json @@ -131,7 +131,7 @@ [ 48, "마완",1097, 0, null, 49, 64, 26, 0, 170, 211, "안전", "기병"], [ 19, "마준",1098, 0, null, 45, 63, 62, 0, 196, 260, "안전", null], [ 71, "마철",1099, 0, null, 71, 60, 31, 0, 179, 211, "대의", "기병"], - [ 70, "마초",1100, 6, null, 78, 97, 40,12, 176, 226, "대의", "기병"], + [ 70, "마초",1100, 6, "한중", 78, 97, 40,12, 176, 226, "대의", "기병"], [131, "마충1",1101, 2, null, 67, 62, 51, 0, 186, 222, "재간", null], [ 69, "마충2",1102, 0, null, 61, 68, 51, 0, 187, 249, "출세", null], [ 71, "마휴",1103, 0, null, 71, 60, 32, 0, 178, 211, "대의", "기병"],