GH-139 Move max flight's speed getter into an util

mdziekon · May 27, 2022 · 0a7f0b0 · 0a7f0b0
1 parent acce507
commit 0a7f0b0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 13 deletions.
diff --git a/fleet1.php b/fleet1.php
@@ -122,19 +122,6 @@
     }
 }
 
-$slowestShipSpeed = min(
-    array_map_withkeys($shipsDetails, function ($shipDetails) {
-        return $shipDetails['speed'];
-    })
-);
-
-// Speed modifier
-if (MORALE_ENABLED) {
-    if ($_User['morale_level'] <= MORALE_PENALTY_FLEETSLOWDOWN) {
-        $slowestShipSpeed *= MORALE_PENALTY_FLEETSLOWDOWN_VALUE;
-    }
-}
-
 $_Lang['P_HideACSJoining'] = $Hide;
 $GetACSData = intval($_POST['getacsdata']);
 $SetPosNotEmpty = false;
@@ -202,9 +189,15 @@
     $_Lang['SetTargetMission'] = 2;
 }
 
+$slowestShipSpeed = FlightControl\Utils\Helpers\getSlowestShipSpeed([
+    'shipsDetails' => $shipsDetails,
+    'user' => &$_User,
+]);
+
 // Show info boxes
 $_Lang['P_SFBInfobox'] = FlightControl\Components\SmartFleetBlockadeInfoBox\render()['componentHTML'];
 
+
 $_Lang['P_ShipsDetailsJSON'] = json_encode($shipsDetails, JSON_FORCE_OBJECT);
 $_Lang['speedallsmin'] = $slowestShipSpeed;
 $_Lang['MaxSpeedPretty'] = prettyNumber($slowestShipSpeed);

diff --git a/modules/flightControl/_includes.php b/modules/flightControl/_includes.php
@@ -68,6 +68,7 @@
     include($includePath . './utils/helpers/getFleetUnionJoinData.helper.php');
     include($includePath . './utils/helpers/getFlightParams.helper.php');
     include($includePath . './utils/helpers/getQuantumGateStateDetails.helper.php');
+    include($includePath . './utils/helpers/getSlowestShipSpeed.helper.php');
     include($includePath . './utils/helpers/getTargetInfo.helper.php');
     include($includePath . './utils/helpers/getUserExpeditionSlotsCount.helper.php');
     include($includePath . './utils/helpers/getUserFleetSlotsCount.helper.php');

diff --git a/modules/flightControl/utils/helpers/getSlowestShipSpeed.helper.php b/modules/flightControl/utils/helpers/getSlowestShipSpeed.helper.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace UniEngine\Engine\Modules\FlightControl\Utils\Helpers;
+
+/**
+ * @param array $params
+ * @param Array<{ speed: number }> $params['shipsDetails']
+ * @param ref $params['user']
+ */
+function getSlowestShipSpeed($params) {
+    $shipsDetails = $params['shipsDetails'];
+    $user = &$params['user'];
+
+    $slowestShipSpeed = min(
+        array_map_withkeys($shipsDetails, function ($shipDetails) {
+            return $shipDetails['speed'];
+        })
+    );
+
+    if (
+        MORALE_ENABLED &&
+        $user['morale_level'] <= MORALE_PENALTY_FLEETSLOWDOWN
+    ) {
+        $slowestShipSpeed *= MORALE_PENALTY_FLEETSLOWDOWN_VALUE;
+    }
+
+    return $slowestShipSpeed;
+}
+
+?>