Skip to content

Commit

Permalink
GH-91 Use the new utility function to calculate united raid's pillage
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdziekon
mdziekon committed Mar 28, 2020
1 parent 24efa02 commit 4e825da
Showing 1 changed file with 23 additions and 88 deletions.
111 changes: 23 additions & 88 deletions includes/functions/MissionCaseGroupAttack.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

use UniEngine\Engine\Modules\Flights;

function MissionCaseGroupAttack($FleetRow, &$_FleetCache)
{
global $_EnginePath, $_Vars_Prices, $_Lang, $_Vars_GameElements, $_Vars_ElementCategories, $_GameConfig, $UserStatsPattern, $UserStatsData, $UserDev_Log, $IncludeCombatEngine,
Expand Down Expand Up @@ -532,6 +534,8 @@ function MissionCaseGroupAttack($FleetRow, &$_FleetCache)
$TotalCryStolen = 0;
$TotalDeuStolen = 0;

$maxResourcesPillage = null;

if(!empty($AtkShips))
{
if($Result === COMBAT_ATK)
Expand Down Expand Up @@ -559,9 +563,10 @@ function MissionCaseGroupAttack($FleetRow, &$_FleetCache)
}
}

$MaxMetSteal = $TargetPlanet['metal'] * $ResourceSteal_Factor;
$MaxCrySteal = $TargetPlanet['crystal'] * $ResourceSteal_Factor;
$MaxDeuSteal = $TargetPlanet['deuterium'] * $ResourceSteal_Factor;
$maxResourcesPillage = Flights\Utils\Missions\calculateMaxPlanetPillage([
'planet' => $TargetPlanet,
'maxPillagePercentage' => $ResourceSteal_Factor,
]);
}

foreach($AtkShips as $User => $Ships)
Expand Down Expand Up @@ -615,101 +620,32 @@ function MissionCaseGroupAttack($FleetRow, &$_FleetCache)

if($Result === COMBAT_ATK)
{
// New SYSTEM
$FleetStorage -= $AttackingFleetRes[$AttackingFleetID[$User]]['metal'];
$FleetStorage -= $AttackingFleetRes[$AttackingFleetID[$User]]['crystal'];
$FleetStorage -= $AttackingFleetRes[$AttackingFleetID[$User]]['deuterium'];

if($FleetStorage > 0)
{
$GiveAwayMet = false;
$GiveAwayCry = false;

$AllowTakeMoreMet = 0;
$AllowTakeMoreCry = 0;
$AllowTakeMoreDeu = 0;
$resourcesPillage = Flights\Utils\Missions\calculateEvenResourcesPillage([
'maxPillagePerResource' => $maxResourcesPillage,
'fleetTotalStorage' => $FleetStorage,
]);

$StoragePerResource = $FleetStorage / 3;

// First - calculate, if any resource will leave free storage
if($MaxMetSteal < $StoragePerResource)
{
$AllowTakeMore = ($StoragePerResource - $MaxMetSteal) / 2;
$AllowTakeMoreCry += $AllowTakeMore;
$AllowTakeMoreDeu += $AllowTakeMore;
$GiveAwayMet = true;
foreach ($resourcesPillage as $resourceKey => $resourcePillage) {
$maxResourcesPillage[$resourceKey] -= $resourcePillage;
}

if($MaxCrySteal < ($StoragePerResource + $AllowTakeMoreCry))
{
$AllowTakeMore = (($StoragePerResource + $AllowTakeMoreCry) - $MaxCrySteal) / 2;
if($GiveAwayMet == false)
{
$AllowTakeMoreMet += $AllowTakeMore;
$AllowTakeMoreDeu += $AllowTakeMore;
}
else
{
$AllowTakeMoreDeu += $AllowTakeMore * 2;
}
$GiveAwayCry = true;
}
$QryUpdateFleets[$i]['metal'] = $resourcesPillage['metal'];
$QryUpdateFleets[$i]['crystal'] = $resourcesPillage['crystal'];
$QryUpdateFleets[$i]['deuterium'] = $resourcesPillage['deuterium'];

if($MaxDeuSteal < ($StoragePerResource + $AllowTakeMoreDeu))
{
$AllowTakeMore = (($StoragePerResource + $AllowTakeMoreDeu) - $MaxDeuSteal) / 2;
if($GiveAwayCry == false)
{
$AllowTakeMoreMet += $AllowTakeMore;
$AllowTakeMoreCry += $AllowTakeMore;
}
else
{
$AllowTakeMoreMet += $AllowTakeMore * 2;
}
}

//Second - calculate stolen resources
if($MaxMetSteal > ($StoragePerResource + $AllowTakeMoreMet))
{
$QryUpdateFleets[$i]['metal'] = floor($StoragePerResource + $AllowTakeMoreMet);
$MaxMetSteal -= $QryUpdateFleets[$i]['metal'];
$TotalMetStolen += $QryUpdateFleets[$i]['metal'];
}
else
{
$QryUpdateFleets[$i]['metal'] = floor($MaxMetSteal);
$MaxMetSteal -= $QryUpdateFleets[$i]['metal'];
$TotalMetStolen += $QryUpdateFleets[$i]['metal'];
}
if($MaxCrySteal > ($StoragePerResource + $AllowTakeMoreCry))
{
$QryUpdateFleets[$i]['crystal'] = floor($StoragePerResource + $AllowTakeMoreCry);
$MaxCrySteal -= $QryUpdateFleets[$i]['crystal'];
$TotalCryStolen += $QryUpdateFleets[$i]['crystal'];
}
else
{
$QryUpdateFleets[$i]['crystal'] = floor($MaxCrySteal);
$MaxCrySteal -= $QryUpdateFleets[$i]['crystal'];
$TotalCryStolen += $QryUpdateFleets[$i]['crystal'];
}
if($MaxDeuSteal > ($StoragePerResource + $AllowTakeMoreDeu))
{
$QryUpdateFleets[$i]['deuterium'] = floor($StoragePerResource + $AllowTakeMoreDeu);
$MaxDeuSteal -= $QryUpdateFleets[$i]['deuterium'];
$TotalDeuStolen += $QryUpdateFleets[$i]['deuterium'];
}
else
{
$QryUpdateFleets[$i]['deuterium'] = floor($MaxDeuSteal);
$MaxDeuSteal -= $QryUpdateFleets[$i]['deuterium'];
$TotalDeuStolen += $QryUpdateFleets[$i]['deuterium'];
}
$Return['FleetArchive'][$AttackingFleetID[$User]]['Fleet_End_Res_Metal'] = $resourcesPillage['metal'];
$Return['FleetArchive'][$AttackingFleetID[$User]]['Fleet_End_Res_Crystal'] = $resourcesPillage['crystal'];
$Return['FleetArchive'][$AttackingFleetID[$User]]['Fleet_End_Res_Deuterium'] = $resourcesPillage['deuterium'];

$Return['FleetArchive'][$AttackingFleetID[$User]]['Fleet_End_Res_Metal'] = $QryUpdateFleets[$i]['metal'];
$Return['FleetArchive'][$AttackingFleetID[$User]]['Fleet_End_Res_Crystal'] = $QryUpdateFleets[$i]['crystal'];
$Return['FleetArchive'][$AttackingFleetID[$User]]['Fleet_End_Res_Deuterium'] = $QryUpdateFleets[$i]['deuterium'];
$TotalMetStolen += $resourcesPillage['metal'];
$TotalCryStolen += $resourcesPillage['crystal'];
$TotalDeuStolen += $resourcesPillage['deuterium'];

if($QryUpdateFleets[$i]['metal'] > 0)
{
Expand Down Expand Up @@ -739,7 +675,6 @@ function MissionCaseGroupAttack($FleetRow, &$_FleetCache)
$TriggerTasksCheck[$AttackingFleetOwners[$AttackingFleetID[$User]]]['BATTLE_COLLECT_DEUTERIUM'] += $QryUpdateFleets[$i]['deuterium'];
}
}
// END OF NEW SYSTEM
}
}
else
Expand Down

0 comments on commit 4e825da

Please sign in to comment.