From d4f16abfac178a2fa4b04b5e698a4915a38c1af8 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 28 Nov 2018 00:29:53 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=94=ED=96=89=EB=B6=80=EC=9D=98=20?=
 =?UTF-8?q?=EC=9E=A5=EC=88=98=EC=88=98=EC=97=90=EC=84=9C=20'=EB=B6=80?=
 =?UTF-8?q?=EB=8C=80=EC=9E=A5'=EC=9D=B4=20=EC=A0=9C=EC=99=B8=EB=90=A9?=
 =?UTF-8?q?=EB=8B=88=EB=8B=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_genList.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/hwe/b_genList.php b/hwe/b_genList.php
index 6829d2f7..6166d500 100644
--- a/hwe/b_genList.php
+++ b/hwe/b_genList.php
@@ -99,10 +99,15 @@ switch ($type) {
 
 $generals = $db->query('SELECT npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general WHERE nation = %i %l', $me['nation'], $orderSQL);
 
+$genCntEff = 0;
 foreach ($generals as &$general) {
     $general['cityText'] = CityConst::byID($general['city'])->name;
     $general['troopText'] = $troopName[$general['troop']]??'-';
 
+    if($general['npc'] != 5){
+        $genCntEff += 1;
+    }
+
     if ($general['level'] == 12) {
         $lbonus = $nation['level'] * 2;
     } elseif ($general['level'] >= 5) {
@@ -220,11 +225,11 @@ foreach($generals as $general){
 <tr>
 <td class='bg1'>전체 금</td><td><?=number_format($totalGold)?></td>
 <td class='bg1'>전체 쌀</td><td><?=number_format($totalRice)?></td>
-<td class='bg1'>평균 금</td><td><?=number_format($totalGold/$genCnt, 2)?></td>
-<td class='bg1'>평균 쌀</td><td><?=number_format($totalRice/$genCnt, 2)?></td>
+<td class='bg1'>평균 금</td><td><?=number_format($totalGold/$genCntEff, 2)?></td>
+<td class='bg1'>평균 쌀</td><td><?=number_format($totalRice/$genCntEff, 2)?></td>
 </tr>
 <tr>
-<td class='bg1'>전체 병력/장수</td><td><?=number_format($crewTotal)?>/<?=number_format($genCnt)?></td>
+<td class='bg1'>전체 병력/장수</td><td><?=number_format($crewTotal)?>/<?=number_format($genCntEff)?></td>
 <td class='bg1'>훈사 90 병력/장수</td><td><?=number_format($crew90)?>/<?=number_format($gen90)?></td>
 <td class='bg1'>훈사 80 병력/장수</td><td><?=number_format($crew80)?>/<?=number_format($gen80)?></td>
 <td class='bg1'>훈사 60 병력/장수</td><td><?=number_format($crew60)?>/<?=number_format($gen60)?></td>