Merge pull request #169 from Qwatayean/patch-10

vars factor 'Expedition' has no use
jkroepke · Jun 26, 2018 · ed10b47 · ed10b47
2 parents ad4321a + e934b28
commit ed10b47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/includes/classes/class.FleetFunctions.php b/includes/classes/class.FleetFunctions.php
@@ -82,7 +82,7 @@ private static function GetShipSpeed($Ship, $Player)
 
 	public static function getExpeditionLimit($USER)
 	{
-		return floor(sqrt($USER[$GLOBALS['resource'][124]]));
+		return floor(sqrt($USER[$GLOBALS['resource'][124]])) + $USER['factor']['Expedition'];
 	}
 
 	public static function getDMMissionLimit($USER)

diff --git a/includes/pages/game/ShowFleetTablePage.class.php b/includes/pages/game/ShowFleetTablePage.class.php
@@ -193,7 +193,7 @@ public function show()
 		if ($techExpedition >= 1)
 		{
 			$activeExpedition   = FleetFunctions::GetCurrentFleets($USER['id'], 15, true);
-			$maxExpedition 		= floor(sqrt($techExpedition));
+			$maxExpedition 		= floor(sqrt($techExpedition)) + $USER['factor']['Expedition'];
 		}
 		else
 		{