From 5ecfe72e19f4a9c1cead98a14295bfebb462e566 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 23 Jun 2018 05:06:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EB=A0=B9=20=EC=A0=84=EB=9E=B5=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 4b514ab6..adac5bb8 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -1143,9 +1143,6 @@ function NPCStaffWork($general, $nation, $dipState){
         foreach($nationGenerals as $nationGeneral){
             $generalCity = $nationCities[$nationGeneral['city']]??null;
             if(!$generalCity){
-                if(!in_array($nationGeneral['no'], $lostGeneralsID)){
-                    trigger_error('쓔?');
-                } 
                 continue;
             }
             if($nationGeneral['crew'] < 2000){
@@ -1157,6 +1154,9 @@ function NPCStaffWork($general, $nation, $dipState){
             if($generalCity['front']){
                 continue;
             }
+            if($nationGeneral['train'] * $nationGeneral['atmos'] < 75 * 75){
+                continue;
+            }
     
             $score = 5;
             if($nationGeneral['npc']<2){
@@ -1204,6 +1204,9 @@ function NPCStaffWork($general, $nation, $dipState){
             if(!$generalCity['front']){
                 continue;
             }
+            if($generalCity['pop'] - 33000 > $nationGeneral['leader']){
+                continue;
+            }
     
             $score = 5;
             if($nationGeneral['npc']<2){