From 2549aa58098f19d8c5c180fe9e58a57aedea8b4a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 8 Mar 2019 22:20:45 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=98=EB=B3=91,=20=EC=9D=B8=ED=83=90?=
 =?UTF-8?q?=EC=9E=A5=EB=8F=84=20=EC=A0=81=EC=9D=80=20=EB=B9=84=EC=A4=91?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9E=A5=EC=88=98=20=EC=B9=B4=EC=9A=B4?=
 =?UTF-8?q?=ED=8A=B8=EC=97=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_personnel.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php
index a7f21420..0c380582 100644
--- a/hwe/func_process_personnel.php
+++ b/hwe/func_process_personnel.php
@@ -131,6 +131,16 @@ function process_25(&$general) {
             $generals[$nation] = $cnt;
         }
 
+        foreach($db->queryAllLists('SELECT count(no), nation FROM general WHERE 3 <= npc and npc <= 4 AND nation > 0 GROUP BY nation') as list($cnt, $nation)){
+            //의병, 인탐장은 1/3로 카운트
+            if(key_exists($nation, $generals)){
+                $generals[$nation] += $cnt / 3;
+            }
+            else{
+                $generals[$nation] = $cnt / 3;
+            }
+        }
+
         $allGen = array_sum($generals);
 
         $genLimit = GameConst::$defaultMaxGeneral;