From b12e0358d61358a103beefcf1a848a734361f17e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 8 Apr 2019 01:43:01 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=A9=EB=9E=91=EA=B5=B0=EC=9D=B4=EA=B1=B0?=
 =?UTF-8?q?=EB=82=98,=20=EA=B5=AD=EA=B0=80=EC=9D=98=20=EC=9D=B8=EA=B5=AC?=
 =?UTF-8?q?=EA=B0=80=20=EB=8B=A4=20=EC=B0=A8=EB=8D=94=EB=9D=BC=EB=8F=84=20?=
 =?UTF-8?q?=EC=9D=B8=EA=B5=AC=20=ED=83=90=EC=83=89=20=EA=B0=80=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_personnel.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php
index c1f28636..270a7f42 100644
--- a/hwe/func_process_personnel.php
+++ b/hwe/func_process_personnel.php
@@ -299,10 +299,6 @@ function process_29(&$general) {
     $josaUn = JosaUtil::pick($nation['name'], '은');
     if($general['level'] == 0) {
         $log[] = "<C>●</>{$admin['month']}월:재야입니다. 인재탐색 실패. <1>$date</>";
-    } elseif($nation['level'] <= 0) {
-        $log[] = "<C>●</>{$admin['month']}월:방랑군입니다. 인재탐색 실패. <1>$date</>";
-    } elseif($admin['year'] < $admin['startyear']+3 && $nation['gennum'] >= GameConst::$initialNationGenLimit) {
-        $log[] = "<C>●</>{$admin['month']}월:현재 <D>{$nation['name']}</>{$josaUn} 탐색이 제한되고 있습니다. 인재탐색 실패.";
     } elseif($general['gold'] < $admin['develcost']) {
         $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. 인재탐색 실패. <1>$date</>";
     } else {
@@ -367,7 +363,18 @@ function process_29(&$general) {
 
             $join_prop = 0.55 * $avg_cnt / ($gen_cnt + $npc_cnt / 2);
 
-            if($nation['scout'] != 0 || !Util::randBool($join_prop)) {
+            $no_scout = false;
+            if($nation['scout'] != 0){
+                $no_scout = true;
+            }
+            else if($nation['level'] <= 0){
+                $no_scout = true;
+            }
+            else if($admin['year'] < $admin['startyear']+3 && $nation['gennum'] >= GameConst::$initialNationGenLimit){
+                $no_scout = true;
+            }
+
+            if($no_scout || !Util::randBool($join_prop)) {
                 $scoutType = "발견";
                 $scoutLevel = 0;
                 $scoutNation = 0;