From 0f342270dcbd86135547e7147aa49296d92bdb38 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 18 Jun 2018 02:23:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EB=82=98=EB=A6=AC=EC=98=A4=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=9E=98=EB=AA=BB=EB=90=9C=20?=
 =?UTF-8?q?=EB=8F=84=EC=8B=9C=EB=A5=BC=20=EC=9E=85=EB=A0=A5=ED=95=9C=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EC=97=90=EB=8F=84=20=EC=A0=95=EC=83=81=20?=
 =?UTF-8?q?=EB=B9=8C=EB=93=9C=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/CityHelper.php       | 6 +++++-
 hwe/sammo/Scenario/NPC.php     | 7 ++++---
 hwe/scenario/scenario_360.json | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/hwe/sammo/CityHelper.php b/hwe/sammo/CityHelper.php
index de664322..99655d1a 100644
--- a/hwe/sammo/CityHelper.php
+++ b/hwe/sammo/CityHelper.php
@@ -76,7 +76,11 @@ class CityHelper{
             self::generateCache();
         }
 
-        return self::$listInv[$cityName];
+        $city = self::$listInv[$cityName]??null;
+        if($city === null){
+            trigger_error("$cityName 에 해당하는 도시가 없습니다.");
+        }
+        return $city;
     }
 
     
diff --git a/hwe/sammo/Scenario/NPC.php b/hwe/sammo/Scenario/NPC.php
index 48607e22..e9297472 100644
--- a/hwe/sammo/Scenario/NPC.php
+++ b/hwe/sammo/Scenario/NPC.php
@@ -177,6 +177,9 @@ class NPC{
         }
 
         $city = $this->locatedCity;
+        if($city !== null){
+            $city = CityHelper::getCityByName($city)['id']??null;
+        }
         if($city === null){
             if($nationID == 0 || !CityHelper::getAllNationCities($nationID)){
                 $cityObj = Util::choiceRandom(CityHelper::getAllCities());
@@ -187,9 +190,7 @@ class NPC{
             '@phan-var array<string,string|int> $cityObj';
             $city = $cityObj['id'];
         }
-        else{
-            $city = CityHelper::getCityByName($city)['id'];
-        }
+        
 
         $experience = $age * 100;
         $dedication = $age * 100;
diff --git a/hwe/scenario/scenario_360.json b/hwe/scenario/scenario_360.json
index ae4f70ec..6faec34b 100644
--- a/hwe/scenario/scenario_360.json
+++ b/hwe/scenario/scenario_360.json
@@ -624,7 +624,7 @@
         [0, "큐어러블리", null, 0, null, 80, 83, 47, 0, 160, 300, null, null],
         [0, "큐어프린세스", null, 0, null, 76, 85, 55, 0, 160, 300, null, null],
         [0, "큐어허니", null, 0, null, 83, 86, 67, 0, 160, 300, null, null],
-        [0, "큐어포춘", null, 0, "`", 82, 90, 80, 0, 160, 300, null, null],
+        [0, "큐어포춘", null, 0, null, 82, 90, 80, 0, 160, 300, null, null],
         [0, "블루", null, 0, null, 41, 29, 17, 0, 160, 210, null, null],
         [0, "큐어텐더", null, 0, null, 82, 94, 77, 0, 160, 300, null, null],
         [0, "큐어플로라", null, 0, null, 81, 87, 69, 0, 160, 300, null, null],
@@ -666,7 +666,7 @@
         [0, "노야마아즈사", null, 0, null, 82, 30, 72, 0, 160, 300, null, null],
         [0, "강영웅", null, 0, null, 86, 39, 90, 0, 160, 300, null, null],
         [0, "마츠오카유이치", null, 0, null, 84, 36, 72, 0, 160, 300, null, null],
-        [0, "타카야나기켄", "`", 0, null, 82, 28, 80, 0, 160, 300, null, null],
+        [0, "타카야나기켄", null, 0, null, 82, 28, 80, 0, 160, 300, null, null],
         [0, "니시노카오루", null, 0, null, 86, 34, 85, 0, 160, 300, null, null],
         [0, "코다마미노리", null, 0, null, 75, 30, 82, 0, 160, 300, null, null],
         [0, "사카키바라요코", null, 0, null, 85, 35, 77, 0, 160, 300, null, null],