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){