From 124036cea6f362ddee82da5cc0eb458794b63cfc Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 16 Jun 2018 11:01:12 +0900
Subject: [PATCH] =?UTF-8?q?npc=20=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=A0=84?=
 =?UTF-8?q?=EC=BD=98=EC=9D=B4=20=EC=9E=88=EB=8A=94=EC=A7=80=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=ED=95=98=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80.=20=EA=B1=B8=EA=B7=B8=EB=A3=B9=20=EB=8C=80=EC=A0=84?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Scenario/NPC.php    | 9 ++++++---
 hwe/scenario/scenario_34.json | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hwe/sammo/Scenario/NPC.php b/hwe/sammo/Scenario/NPC.php
index 3b6be57b..48607e22 100644
--- a/hwe/sammo/Scenario/NPC.php
+++ b/hwe/sammo/Scenario/NPC.php
@@ -150,13 +150,16 @@ class NPC{
         }
         else if(is_numeric($picturePath)){
             if($picturePath < 0){
-                $picturePath = 'default.jpg';
+                $picturePath = null;
+            }
+            else if(\key_exists($picturePath, $env['stored_icons']['.']??[])){
+                $picturePath = $env['stored_icons']['.'][$picturePath];
             }
             else{
-                $picturePath = "{$picturePath}.jpg";
+                $picturePath = null;
             }
         }
-        else if($picturePath !== null){
+        else if($picturePath !== null && in_array($picturePath, $env['stored_icons'][$env['icon_path']??'.']??[])){
             $picturePath = ($env['icon_path']??'.').'/'.$picturePath;
         }
         else if($picturePath === null && \key_exists('stored_icons', $env)){
diff --git a/hwe/scenario/scenario_34.json b/hwe/scenario/scenario_34.json
index 69f1f3c3..69e2957a 100644
--- a/hwe/scenario/scenario_34.json
+++ b/hwe/scenario/scenario_34.json
@@ -6,6 +6,7 @@
     ],
     "diplomacy":[
     ],
+    "iconPath": "걸그룹",
     "stat":{
         "total":220,
         "min":40,