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(