GH-139 Create shared fleet array ships counter

mdziekon · May 26, 2022 · 95b5a75 · 95b5a75
1 parent d3a8842
commit 95b5a75
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/fleet2.php b/fleet2.php
@@ -187,10 +187,9 @@
 }
 
 $Fleet['array'] = $fleetArrayParsingResult['payload']['parsedFleet'];
+$Fleet['count'] = FlightControl\Utils\Helpers\FleetArray\getAllShipsCount($Fleet['array']);
 
 foreach ($Fleet['array'] as $shipID => $shipCount) {
-    $Fleet['count'] += $shipCount;
-
     $allShipsOfTypeStorage = getShipsStorageCapacity($shipID) * $shipCount;
 
     if (canShipPillage($shipID)) {

diff --git a/fleet3.php b/fleet3.php
@@ -202,10 +202,9 @@ function messageRed($Text, $Title)
 }
 
 $Fleet['array'] = $fleetArrayParsingResult['payload']['parsedFleet'];
+$Fleet['count'] = FlightControl\Utils\Helpers\FleetArray\getAllShipsCount($Fleet['array']);
 
 foreach ($Fleet['array'] as $shipID => $shipCount) {
-    $Fleet['count'] += $shipCount;
-
     $allShipsOfTypeStorage = getShipsStorageCapacity($shipID) * $shipCount;
 
     if (canShipPillage($shipID)) {

diff --git a/modules/flightControl/_includes.php b/modules/flightControl/_includes.php
@@ -63,6 +63,7 @@
     include($includePath . './utils/helpers/getAvailableExpeditionTimes.helper.php');
     include($includePath . './utils/helpers/getAvailableHoldTimes.helper.php');
     include($includePath . './utils/helpers/getAvailableSpeeds.helper.php');
+    include($includePath . './utils/helpers/getFleetArrayInfo.helper.php');
     include($includePath . './utils/helpers/getFleetsInFlightCounters.helper.php');
     include($includePath . './utils/helpers/getFleetUnionJoinData.helper.php');
     include($includePath . './utils/helpers/getFlightParams.helper.php');

diff --git a/modules/flightControl/utils/helpers/getFleetArrayInfo.helper.php b/modules/flightControl/utils/helpers/getFleetArrayInfo.helper.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace UniEngine\Engine\Modules\FlightControl\Utils\Helpers\FleetArray;
+
+function getAllShipsCount($fleetArray) {
+    return array_sum($fleetArray);
+}
+
+?>