From 4c89ad91d253aba9a7b0663888dd609816ec71b0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 18 Sep 2018 01:56:32 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EB=8C=80=EC=9E=A5=20=EC=8B=9C?=
 =?UTF-8?q?=EC=9E=91=20=EB=8F=84=EC=8B=9C=EB=A5=BC=20=EB=9E=9C=EB=8D=A4?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_gamerule.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index d60761c5..7ffec272 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -962,7 +962,7 @@ function updateNationState() {
     $history = array();
     $admin = $gameStor->getValues(['year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm']);
 
-    $query = "select nation,name,level,capital from nation";
+    $query = "select nation,name,level from nation";
     $nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $nationcount = MYDB_num_rows($nationresult);
 
@@ -1022,14 +1022,14 @@ function updateNationState() {
             }
 
             
-            $lastAssemblerID = $gameStor->assemblerID??0;
+            $lastAssemblerID = $gameStor->assembler_id??0;
             $jumpStep = $nationlevel - max(1, $oldLevel);
             if($jumpStep > 0){
                 foreach(range(1, $jumpStep) as $levelGen){
                     $lastAssemblerID += 1;
                     
                     $npcObj = new Scenario\NPC(
-                        999, '부대장'.$lastAssemblerID, null, $nation['nation'], $nation['capital'], 
+                        999, '부대장'.$lastAssemblerID, null, $nation['nation'], null, 
                         10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15,  '은둔', '척사'
                     );
                     $npcObj->npc = 5;
@@ -1057,7 +1057,7 @@ function updateNationState() {
                     
                 }
             }
-            $gameStor->assemblerID = $lastAssemblerID;
+            $gameStor->assembler_id = $lastAssemblerID;
 
             //작위 상승
             $query = "update nation set level='{$nation['level']}' where nation='{$nation['nation']}'";