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,