GH-139 Move storage counter to an util

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

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/fleet1.php b/fleet1.php
@@ -105,15 +105,12 @@
 
     $Fleet['array'] = $fleetArrayParsingResult['payload']['parsedFleet'];
 
-    foreach ($Fleet['array'] as $shipId => $shipCount) {
-        $allShipsOfTypeStorage = getShipsStorageCapacity($shipId) * $shipCount;
+    $shipsTotalStorage = FlightControl\Utils\Helpers\FleetArray\getShipsTotalStorage($Fleet['array']);
 
-        if (canShipPillage($shipId)) {
-            $Fleet['storage'] += $allShipsOfTypeStorage;
-        } else {
-            $Fleet['FuelStorage'] += $allShipsOfTypeStorage;
-        }
+    $Fleet['storage'] = $shipsTotalStorage['allPurpose'];
+    $Fleet['FuelStorage'] = $shipsTotalStorage['fuelOnly'];
 
+    foreach ($Fleet['array'] as $shipId => $shipCount) {
         $shipSpeed = getShipsCurrentSpeed($shipId, $_User);
         $shipConsumption = getShipsCurrentConsumption($shipId, $_User);
         $allShipsConsumption = ($shipConsumption * $shipCount);

diff --git a/fleet2.php b/fleet2.php
@@ -187,17 +187,12 @@
 }
 
 $Fleet['array'] = $fleetArrayParsingResult['payload']['parsedFleet'];
-$Fleet['count'] = FlightControl\Utils\Helpers\FleetArray\getAllShipsCount($Fleet['array']);
 
-foreach ($Fleet['array'] as $shipID => $shipCount) {
-    $allShipsOfTypeStorage = getShipsStorageCapacity($shipID) * $shipCount;
+$shipsTotalStorage = FlightControl\Utils\Helpers\FleetArray\getShipsTotalStorage($Fleet['array']);
 
-    if (canShipPillage($shipID)) {
-        $Fleet['storage'] += $allShipsOfTypeStorage;
-    } else {
-        $Fleet['FuelStorage'] += $allShipsOfTypeStorage;
-    }
-}
+$Fleet['count'] = FlightControl\Utils\Helpers\FleetArray\getAllShipsCount($Fleet['array']);
+$Fleet['storage'] = $shipsTotalStorage['allPurpose'];
+$Fleet['FuelStorage'] = $shipsTotalStorage['fuelOnly'];
 
 $AvailableMissions = FlightControl\Utils\Helpers\getValidMissionTypes([
     'targetCoordinates' => $Target,

diff --git a/fleet3.php b/fleet3.php
@@ -202,17 +202,12 @@ function messageRed($Text, $Title)
 }
 
 $Fleet['array'] = $fleetArrayParsingResult['payload']['parsedFleet'];
-$Fleet['count'] = FlightControl\Utils\Helpers\FleetArray\getAllShipsCount($Fleet['array']);
 
-foreach ($Fleet['array'] as $shipID => $shipCount) {
-    $allShipsOfTypeStorage = getShipsStorageCapacity($shipID) * $shipCount;
+$shipsTotalStorage = FlightControl\Utils\Helpers\FleetArray\getShipsTotalStorage($Fleet['array']);
 
-    if (canShipPillage($shipID)) {
-        $Fleet['storage'] += $allShipsOfTypeStorage;
-    } else {
-        $Fleet['FuelStorage'] += $allShipsOfTypeStorage;
-    }
-}
+$Fleet['count'] = FlightControl\Utils\Helpers\FleetArray\getAllShipsCount($Fleet['array']);
+$Fleet['storage'] = $shipsTotalStorage['allPurpose'];
+$Fleet['FuelStorage'] = $shipsTotalStorage['fuelOnly'];
 
 $validMissionTypes = FlightControl\Utils\Helpers\getValidMissionTypes([
     'targetCoordinates' => $Target,

diff --git a/modules/flightControl/utils/helpers/getFleetArrayInfo.helper.php b/modules/flightControl/utils/helpers/getFleetArrayInfo.helper.php
@@ -6,4 +6,23 @@ function getAllShipsCount($fleetArray) {
     return array_sum($fleetArray);
 }
 
+function getShipsTotalStorage($fleetArray) {
+    $storages = [
+        'allPurpose' => 0,
+        'fuelOnly' => 0,
+    ];
+
+    foreach ($fleetArray as $shipID => $shipCount) {
+        $allShipsOfTypeStorage = getShipsStorageCapacity($shipID) * $shipCount;
+
+        if (canShipPillage($shipID)) {
+            $storages['allPurpose'] += $allShipsOfTypeStorage;
+        } else {
+            $storages['fuelOnly'] += $allShipsOfTypeStorage;
+        }
+    }
+
+    return $storages;
+}
+
 ?>