diff --git a/hwe/sammo/Scenario.php b/hwe/sammo/Scenario.php index 9acc9063..41f07b0d 100644 --- a/hwe/sammo/Scenario.php +++ b/hwe/sammo/Scenario.php @@ -354,7 +354,7 @@ class Scenario{ 'npc_cnt'=>count($this->getNPC()), 'npcEx_cnt'=>count($this->getNPCex()), 'npcNeutral_cnt'=>count($this->getNPCneutral()), - 'nation'=>array_map(function($nation) use ($nationGeneralCnt, $nationGeneralExCnt){ + 'nation'=>array_map(function($nation) use ($nationGeneralCnt, $nationGeneralExCnt, $nationGeneralNeutralCnt){ $brief = $nation->getBrief(); $brief['generals'] = Util::array_get($nationGeneralCnt[$nation->getID()], 0); $brief['generalsEx'] = Util::array_get($nationGeneralExCnt[$nation->getID()], 0); diff --git a/hwe/scenario/scenario_2210.json b/hwe/scenario/scenario_2210.json index 65dbaf34..1a57ab8e 100644 --- a/hwe/scenario/scenario_2210.json +++ b/hwe/scenario/scenario_2210.json @@ -12,7 +12,7 @@ "npcMax": 90, "chiefMin": 65 }, - "iconPath": "pokemon_v1", + "iconPath": "포켓몬스터", "fiction": 1, "nation":[