From a2d3ac9e708ae18b70bbe2114f16d889144f25f4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 22:51:39 +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=A5=EC=88=98=EC=9D=98=20NPC?=
 =?UTF-8?q?=20=EB=A9=94=EC=8B=9C=EC=A7=80=EA=B0=80=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php       | 9 ++++++++-
 hwe/sammo/Scenario.php | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index de01ce8a..b9e35bc1 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -192,7 +192,14 @@ function processAI($no) {
 
     $query = "select nation,level,tech,gold,rice,rate,type,color,name,war from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error("processAI03 ".MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
+    $nation = MYDB_fetch_array($result)??[
+        'nation'=>0,
+        'color'=>'#000000',
+        'name'=>'재야',
+        'level'=>0,
+        'gold'=>0,
+        'rice'=>0,
+    ];
 
     $coreCommand = array();
     if($general['level'] >= 5) {
diff --git a/hwe/sammo/Scenario.php b/hwe/sammo/Scenario.php
index deb28cdd..983090e5 100644
--- a/hwe/sammo/Scenario.php
+++ b/hwe/sammo/Scenario.php
@@ -64,7 +64,7 @@ class Scenario{
 
             list(
                 $affinity, $name, $pictureID, $nationID, $locatedCity, 
-                $leadership, $power, $intel, $birth, $death, $ego,
+                $leadership, $power, $intel, $level, $birth, $death, $ego,
                 $char, $text
             ) = $rawGeneral;
 
@@ -83,6 +83,7 @@ class Scenario{
                 $leadership, 
                 $power, 
                 $intel, 
+                $level, 
                 $birth, 
                 $death, 
                 $ego,
@@ -117,7 +118,7 @@ class Scenario{
                 $leadership, 
                 $power, 
                 $intel, 
-                $level,
+                $level, 
                 $birth, 
                 $death, 
                 $ego,