From de96aad0865bbd986457896536d7bf8bdacab10c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 26 Nov 2018 15:17:51 +0900
Subject: [PATCH] =?UTF-8?q?[cac19cad4d]=EC=88=98=EB=B9=84=20=EC=9A=B0?=
 =?UTF-8?q?=EC=84=A0=20=EC=88=9C=EC=9C=84=EB=A5=BC=20=EB=B6=80=EC=83=81?=
 =?UTF-8?q?=EC=97=AC=EB=B6=80,=20=EC=88=98=EB=87=8C=EC=97=AC=EB=B6=80,=20?=
 =?UTF-8?q?=ED=9B=88=EC=82=AC=20=EC=97=AC=EB=B6=80=EB=A5=BC=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/process_war.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/hwe/process_war.php b/hwe/process_war.php
index 509c46f0..ca59fe7c 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -173,15 +173,16 @@ function extractBattleOrder($general){
         return 0;
     }
 
-    return (
-        $general['leader'] +
-        $general['power'] +
-        $general['intel'] +
-        getWeapEff($general['weap']) +
-        getHorseEff($general['horse']) +
-        getBookEff($general['book']) +
-        $general['crew'] / 100
-    );
+    $staticNation = getNationStaticInfo($general['nation']);
+    setLeadershipBonus($general, $staticNation['level']);
+
+    $totalStat = 
+        getGeneralLeadership($general, true, true, true, true) +
+        getGeneralPower($general, true, true, true, true) +
+        getGeneralIntel($general, true, true, true, true);
+
+    $totalCrew = $general['crew'] / 10000 * $general['train'] * $general['atmos'];
+    return $totalStat + $totalCrew / 100;
 }
 
 function processWar_NG(