From 5b5e71851bf9bfd649e58b4aa75f4aeef9c536a3 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 3 May 2019 01:35:32 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php        | 10 +++++-----
 hwe/func_time_event.php |  6 ------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 4df8a10b..21be8707 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -23,15 +23,15 @@ function SetDevelop($genType, $no, $city, $tech) {
     switch($genType) {
     case 0: //무장
         if($prob < 30) {
-            if($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            if($city['po'] < $city['de']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
             elseif($city['de'] < 99) { $command = EncodeCommand(0, 0, 0, 5); } //수비
             else { $command = EncodeCommand(0, 0, 0, 9); } //조달
         } elseif($prob < 60) {
-            if($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            if($city['po'] < $city['wa']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
             elseif($city['wa'] < 99) { $command = EncodeCommand(0, 0, 0, 6); } //성벽
             else { $command = EncodeCommand(0, 0, 0, 9); } //조달
         } elseif($prob < 90) {
-            if($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            if($city['po'] < $city['se']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
             elseif($city['se'] < 99) { $command = EncodeCommand(0, 0, 0, 8); } //치안
             else { $command = EncodeCommand(0, 0, 0, 9); } //조달
         } else {
@@ -57,12 +57,12 @@ function SetDevelop($genType, $no, $city, $tech) {
         break;
     case 1: //지장
         if($prob < 40) {
-            if($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            if($city['po'] < $city['ag']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
             elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
             elseif($city['ag'] < 99) { $command = EncodeCommand(0, 0, 0, 1); } //농업
             else { $command = EncodeCommand(0, 0, 0, 9); } //조달
         } elseif($prob < 80) {
-            if($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            if($city['po'] < $city['co']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
             elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
             elseif($city['co'] < 99) { $command = EncodeCommand(0, 0, 0, 2); } //상업
             else { $command = EncodeCommand(0, 0, 0, 9); } //조달
diff --git a/hwe/func_time_event.php b/hwe/func_time_event.php
index 1a4056f4..47fa3deb 100644
--- a/hwe/func_time_event.php
+++ b/hwe/func_time_event.php
@@ -715,13 +715,7 @@ function disaster() {
                 $city['comm'] *= $ratio;  $city['secu'] *= $ratio;  $city['def'] *= $ratio;
                 $city['wall'] *= $ratio;
         
-                if($city['pop'] > $city['pop2']) { $city['pop'] = $city['pop2']; }
                 if($city['rate'] > 100) { $city['rate'] = 100; }
-                if($city['agri'] > $city['agri2']) { $city['agri'] = $city['agri2']; }
-                if($city['comm'] > $city['comm2']) { $city['comm'] = $city['comm2']; }
-                if($city['secu'] > $city['secu2']) { $city['secu'] = $city['secu2']; }
-                if($city['def'] > $city['def2']) { $city['def'] = $city['def2']; }
-                if($city['wall'] > $city['wall2']) { $city['wall'] = $city['wall2']; }
         
                 $query = "update city set state='$state',pop='{$city['pop']}',rate='{$city['rate']}',agri='{$city['agri']}',comm='{$city['comm']}',secu='{$city['secu']}',def='{$city['def']}',wall='{$city['wall']}' where city='$disastercity[$i]'";
                 MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");