Use the helper function to calculate max storage capacities of each r…

…esource
mdziekon · Aug 22, 2019 · 00be5cc · 00be5cc
1 parent 0f46cac
commit 00be5cc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/admin/UserDevScanner.php b/admin/UserDevScanner.php
@@ -61,9 +61,11 @@ function ResourceUpdate(&$CurrentPlanet, $CurrentUser, $StartTime, $EndTime) {
     );
 
     // Calculate Place in Storages
-    $CurrentPlanet['metal_max'] = (floor(BASE_STORAGE_SIZE * pow(1.7, $CurrentPlanet[$_Vars_GameElements[22]])));
-    $CurrentPlanet['crystal_max'] = (floor(BASE_STORAGE_SIZE * pow(1.7, $CurrentPlanet[$_Vars_GameElements[23]])));
-    $CurrentPlanet['deuterium_max'] = (floor(BASE_STORAGE_SIZE * pow(1.7, $CurrentPlanet[$_Vars_GameElements[24]])));
+    $totalCapacities = getPlanetTotalStorageCapacities($CurrentPlanet);
+
+    foreach ($totalCapacities as $resourceKey => $resourceCapacity) {
+        $CurrentPlanet["{$resourceKey}_max"] = $resourceCapacity;
+    }
 
     $geologistTimelineSubperiods = [];
     $engineerTimelineSubperiods = [];

diff --git a/includes/functions/PlanetResourceUpdate.php b/includes/functions/PlanetResourceUpdate.php
@@ -14,9 +14,11 @@ function PlanetResourceUpdate($CurrentUser, &$CurrentPlanet, $UpdateTime, $Simul
     $ProductionTime = ($UpdateTime - $CurrentPlanet['last_update']);
 
     // Update place for resources
-    $CurrentPlanet['metal_max'] = (floor(BASE_STORAGE_SIZE * pow(1.7, $CurrentPlanet[$_Vars_GameElements[22]])));
-    $CurrentPlanet['crystal_max'] = (floor(BASE_STORAGE_SIZE * pow(1.7, $CurrentPlanet[$_Vars_GameElements[23]])));
-    $CurrentPlanet['deuterium_max'] = (floor(BASE_STORAGE_SIZE * pow(1.7, $CurrentPlanet[$_Vars_GameElements[24]])));
+    $totalCapacities = getPlanetTotalStorageCapacities($CurrentPlanet);
+
+    foreach ($totalCapacities as $resourceKey => $resourceCapacity) {
+        $CurrentPlanet["{$resourceKey}_max"] = $resourceCapacity;
+    }
 
     // Start ResourceUpdating
     if ($CurrentPlanet['planet_type'] == 1) {

diff --git a/resources.php b/resources.php
@@ -131,9 +131,11 @@ function BuildRessourcePage($CurrentUser, &$CurrentPlanet)
 
     // -------------------------------------------------------------------------------------------------------
     // Calculate Storage
-    $CurrentPlanet['metal_max'] = floor(BASE_STORAGE_SIZE * pow (1.7, $CurrentPlanet[$_Vars_GameElements[22]]));
-    $CurrentPlanet['crystal_max'] = floor(BASE_STORAGE_SIZE * pow (1.7, $CurrentPlanet[$_Vars_GameElements[23]]));
-    $CurrentPlanet['deuterium_max'] = floor(BASE_STORAGE_SIZE * pow (1.7, $CurrentPlanet[$_Vars_GameElements[24]]));
+    $totalCapacities = getPlanetTotalStorageCapacities($CurrentPlanet);
+
+    foreach ($totalCapacities as $resourceKey => $resourceCapacity) {
+        $CurrentPlanet["{$resourceKey}_max"] = $resourceCapacity;
+    }
 
     // -------------------------------------------------------------------------------------------------------
     $parse['resource_row'] = '';