Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor fleet missions' code | Part 09 | Defense systems rebuild #102

Merged
merged 7 commits into from
Apr 11, 2020
Merged

Refactor fleet missions' code | Part 09 | Defense systems rebuild #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21b5c04
GH-91 Create an actual array map utility (with keys accessible in the…
mdziekon Apr 11, 2020
590d64b
GH-91 Create calculateUnitsRebuild() util
mdziekon Apr 11, 2020
2fd675c
GH-91 Don't let rebuild percentage drop below 0
mdziekon Apr 11, 2020
cc5bb2d
GH-91 Use calculateUnitsRebuild() calculate defense systems rebuild i…
mdziekon Apr 11, 2020
ab86a9c
GH-91 Use calculateUnitsRebuild() calculate defense systems rebuild i…
mdziekon Apr 11, 2020
7f3c42f
GH-91 Use calculateUnitsRebuild() calculate defense systems rebuild i…
mdziekon Apr 11, 2020
30f8cad
GH-91 Remove unused $_LANG global from Attack, Destruction & GroupAtt…
mdziekon Apr 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 18 additions & 39 deletions includes/functions/MissionCaseAttack.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?php

use UniEngine\Engine\Includes\Helpers\Common\Collections;
use UniEngine\Engine\Modules\Flights;

function MissionCaseAttack($FleetRow, &$_FleetCache)
{
global $_EnginePath, $_Vars_Prices, $_Lang, $_Vars_GameElements, $_Vars_ElementCategories, $_GameConfig, $UserStatsData, $UserDev_Log, $IncludeCombatEngine,
$HPQ_PlanetUpdatedFields;
global $_EnginePath, $_Vars_Prices, $_Vars_GameElements, $_Vars_ElementCategories,
$_GameConfig, $UserStatsData, $UserDev_Log, $IncludeCombatEngine, $HPQ_PlanetUpdatedFields;

$Return = array();
$Now = time();
Expand Down Expand Up @@ -275,7 +276,6 @@ function MissionCaseAttack($FleetRow, &$_FleetCache)
$DefShips = $Combat['DefenderShips'];
$AtkLost = $Combat['AtkLose'];
$DefLost = $Combat['DefLose'];
$DefSysLost = $Combat['DefSysLost'];
$ShotDown = $Combat['ShotDown'];

$QryUpdateFleets = [];
Expand Down Expand Up @@ -348,45 +348,24 @@ function MissionCaseAttack($FleetRow, &$_FleetCache)
$rebuiltDefenseSystems = [];

$i = 1;
if(!empty($DefendingFleets))
{
foreach($DefendingFleets as $User => $Ships)
{
if($User == 0)
{
$DefSysLostIDs = array_keys($DefSysLost);
$DefSysLostIDs[] = -1;
if (!empty($DefendingFleets)) {
foreach ($DefendingFleets as $User => $Ships) {
if ($User == 0) {
$rebuiltDefenseSystems = Flights\Utils\Calculations\calculateUnitsRebuild([
'originalShips' => $DefendingFleets[0],
'postCombatShips' => $DefShips[0],
'fleetRow' => $FleetRow,
'targetUser' => $TargetUser,
]);

foreach($Ships as $ID => $Count)
{
if(in_array($ID, $DefSysLostIDs))
{
$Count = $DefShips[0][$ID];
$Chance = mt_rand(60, 80 + (($TargetUser['engineer_time'] >= $FleetRow['fleet_start_time']) ? 20 : 0));
$Fluctuation = mt_rand(-15, 15);
if($Fluctuation > 0)
{
$Fluctuation = 0;
}
$rebuiltDefenseSystems[$ID] = round($DefSysLost[$ID] * (($Chance + $Fluctuation) / 100));
$Count += $rebuiltDefenseSystems[$ID];
if($DefendingFleets[0][$ID] < $Count)
{
$Count = $DefendingFleets[0][$ID];
}
unset($DefSysLost[$ID]);
}
else
{
$Count = $DefShips[0][$ID];
}
if($Count == 0)
{
foreach ($Ships as $ID => $Count) {
$Count = ($DefShips[0][$ID] + $rebuiltDefenseSystems[$ID]);

if ($Count == 0) {
$Count = '0';
}
$TargetPlanet[$_Vars_GameElements[$ID]] = $Count;
if($Count < $DefendingFleets[0][$ID])
{
if ($Count < $DefendingFleets[0][$ID]) {
$UserDev_UpPl[] = $ID.','.($DefendingFleets[0][$ID] - $Count);
$_FleetCache['updatePlanets'][$TargetPlanet['id']] = true;
$HPQ_PlanetUpdatedFields[] = $_Vars_GameElements[$ID];
Expand Down Expand Up @@ -932,7 +911,7 @@ function MissionCaseAttack($FleetRow, &$_FleetCache)
'report' => $CreatedReport,
'combatResult' => $Result,
'fleetRow' => $FleetRow,
'rebuiltElements' => $rebuiltDefenseSystems,
'rebuiltElements' => Collections\compact($rebuiltDefenseSystems),
'hasLostAnyDefenseSystems' => Flights\Utils\Helpers\hasLostAnyDefenseSystem([
'originalShips' => $DefendingFleets,
'postCombatShips' => $DefShips,
Expand Down
61 changes: 20 additions & 41 deletions includes/functions/MissionCaseDestruction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<?php

use UniEngine\Engine\Includes\Helpers\Common\Collections;
use UniEngine\Engine\Modules\Flights;

function MissionCaseDestruction($FleetRow, &$_FleetCache)
{
global $_EnginePath, $_User, $_Vars_Prices, $_Lang, $_Vars_GameElements, $_Vars_ElementCategories, $_GameConfig, $ChangeCoordinatesForFleets,
$UserStatsData, $UserDev_Log, $IncludeCombatEngine, $HPQ_PlanetUpdatedFields, $GlobalParsedTasks;
global $_EnginePath, $_User, $_Vars_Prices, $_Vars_GameElements, $_Vars_ElementCategories,
$_GameConfig, $ChangeCoordinatesForFleets, $UserStatsData, $UserDev_Log,
$IncludeCombatEngine, $HPQ_PlanetUpdatedFields, $GlobalParsedTasks;

$DEATHSTAR_ELEMENT_ID = 214;

Expand Down Expand Up @@ -285,7 +287,6 @@ function MissionCaseDestruction($FleetRow, &$_FleetCache)
$DefShips = $Combat['DefenderShips'];
$AtkLost = $Combat['AtkLose'];
$DefLost = $Combat['DefLose'];
$DefSysLost = $Combat['DefSysLost'];
$ShotDown = $Combat['ShotDown'];

$QryUpdateFleets = [];
Expand Down Expand Up @@ -515,47 +516,25 @@ function MissionCaseDestruction($FleetRow, &$_FleetCache)

// Parse result data - Defenders
$i = 1;
if(!empty($DefendingFleets))
{
foreach($DefendingFleets as $User => $Ships)
{
if($User == 0)
{
if($MoonHasBeenDestroyed !== 1)
{
$DefSysLostIDs = array_keys($DefSysLost);
$DefSysLostIDs[] = -1;
if (!empty($DefendingFleets)) {
foreach ($DefendingFleets as $User => $Ships) {
if ($User == 0) {
if ($MoonHasBeenDestroyed !== 1) {
$rebuiltDefenseSystems = Flights\Utils\Calculations\calculateUnitsRebuild([
'originalShips' => $DefendingFleets[0],
'postCombatShips' => $DefShips[0],
'fleetRow' => $FleetRow,
'targetUser' => $TargetUser,
]);

foreach($Ships as $ID => $Count)
{
if(in_array($ID, $DefSysLostIDs))
{
$Count = $DefShips[0][$ID];
$Chance = mt_rand(60, 80 + (($TargetUser['engineer_time'] >= $FleetRow['fleet_start_time']) ? 20 : 0));
$Fluctuation = mt_rand(-11, 11);
if($Fluctuation > 0)
{
$Fluctuation = 0;
}
$rebuiltDefenseSystems[$ID] = round($DefSysLost[$ID] * (($Chance + $Fluctuation) / 100));
$Count += $rebuiltDefenseSystems[$ID];
if($DefendingFleets[0][$ID] < $Count)
{
$Count = $DefendingFleets[0][$ID];
}
unset($DefSysLost[$ID]);
}
else
{
$Count = $DefShips[0][$ID];
}
if($Count == 0)
{
foreach ($Ships as $ID => $Count) {
$Count = ($DefShips[0][$ID] + $rebuiltDefenseSystems[$ID]);

if ($Count == 0) {
$Count = '0';
}
$TargetPlanet[$_Vars_GameElements[$ID]] = $Count;
if($Count < $DefendingFleets[0][$ID])
{
if ($Count < $DefendingFleets[0][$ID]) {
$UserDev_UpPl[] = $ID.','.($DefendingFleets[0][$ID] - $Count);
$_FleetCache['updatePlanets'][$TargetPlanet['id']] = true;
$HPQ_PlanetUpdatedFields[] = $_Vars_GameElements[$ID];
Expand Down Expand Up @@ -1126,7 +1105,7 @@ function MissionCaseDestruction($FleetRow, &$_FleetCache)
'fleetRow' => $FleetRow,
'rebuiltElements' => (
!$MoonHasBeenDestroyed ?
$rebuiltDefenseSystems :
Collections\compact($rebuiltDefenseSystems) :
[]
),
'hasMoonBeenDestroyed' => $MoonHasBeenDestroyed,
Expand Down
57 changes: 18 additions & 39 deletions includes/functions/MissionCaseGroupAttack.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?php

use UniEngine\Engine\Includes\Helpers\Common\Collections;
use UniEngine\Engine\Modules\Flights;

function MissionCaseGroupAttack($FleetRow, &$_FleetCache)
{
global $_EnginePath, $_Vars_Prices, $_Lang, $_Vars_GameElements, $_Vars_ElementCategories, $_GameConfig, $UserStatsData, $UserDev_Log, $IncludeCombatEngine,
$HPQ_PlanetUpdatedFields;
global $_EnginePath, $_Vars_Prices, $_Vars_GameElements, $_Vars_ElementCategories,
$_GameConfig, $UserStatsData, $UserDev_Log, $IncludeCombatEngine, $HPQ_PlanetUpdatedFields;

$Return = array();
$Now = time();
Expand Down Expand Up @@ -379,7 +380,6 @@ function MissionCaseGroupAttack($FleetRow, &$_FleetCache)
$DefShips = $Combat['DefenderShips'];
$AtkLost = $Combat['AtkLose'];
$DefLost = $Combat['DefLose'];
$DefSysLost = $Combat['DefSysLost'];
$ShotDown = $Combat['ShotDown'];
$ForceContribution = $Combat['ForceContribution'];

Expand Down Expand Up @@ -527,45 +527,24 @@ function MissionCaseGroupAttack($FleetRow, &$_FleetCache)
$rebuiltDefenseSystems = [];

// Parse result data - Defenders
if(!empty($DefendingFleets))
{
foreach($DefendingFleets as $User => $Ships)
{
if($User == 0)
{
$DefSysLostIDs = array_keys($DefSysLost);
$DefSysLostIDs[] = -1;
if (!empty($DefendingFleets)) {
foreach ($DefendingFleets as $User => $Ships) {
if($User == 0) {
$rebuiltDefenseSystems = Flights\Utils\Calculations\calculateUnitsRebuild([
'originalShips' => $DefendingFleets[0],
'postCombatShips' => $DefShips[0],
'fleetRow' => $FleetRow,
'targetUser' => $TargetUser,
]);

foreach($Ships as $ID => $Count)
{
if(in_array($ID, $DefSysLostIDs))
{
$Count = $DefShips[0][$ID];
$Chance = mt_rand(60, 80 + (($TargetUser['engineer_time'] >= $FleetRow['fleet_start_time']) ? 20 : 0));
$Fluctuation = mt_rand(-11, 11);
if($Fluctuation > 0)
{
$Fluctuation = 0;
}
$rebuiltDefenseSystems[$ID] = round($DefSysLost[$ID] * (($Chance + $Fluctuation) / 100));
$Count += $rebuiltDefenseSystems[$ID];
if($DefendingFleets[0][$ID] < $Count)
{
$Count = $DefendingFleets[0][$ID];
}
unset($DefSysLost[$ID]);
}
else
{
$Count = $DefShips[0][$ID];
}
if($Count == 0)
{
foreach($Ships as $ID => $Count) {
$Count = ($DefShips[0][$ID] + $rebuiltDefenseSystems[$ID]);

if ($Count == 0) {
$Count = '0';
}
$TargetPlanet[$_Vars_GameElements[$ID]] = $Count;
if($Count < $DefendingFleets[0][$ID])
{
if ($Count < $DefendingFleets[0][$ID]) {
$UserDev_UpPl[] = $ID.','.($DefendingFleets[0][$ID] - $Count);
$_FleetCache['updatePlanets'][$TargetPlanet['id']] = true;
$HPQ_PlanetUpdatedFields[] = $_Vars_GameElements[$ID];
Expand Down Expand Up @@ -1290,7 +1269,7 @@ function MissionCaseGroupAttack($FleetRow, &$_FleetCache)
'report' => $CreatedReport,
'combatResult' => $Result,
'fleetRow' => $FleetRow,
'rebuiltElements' => $rebuiltDefenseSystems,
'rebuiltElements' => Collections\compact($rebuiltDefenseSystems),
'hasLostAnyDefenseSystems' => Flights\Utils\Helpers\hasLostAnyDefenseSystem([
'originalShips' => $DefendingFleets,
'postCombatShips' => $DefShips,
Expand Down
10 changes: 10 additions & 0 deletions includes/helpers/common/collections.functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ function without($collection, $excludedElement) {
});
}

function map($collection, $iteratee) {
$mappedObject = [];

foreach ($collection as $key => $value) {
$mappedObject[$key] = $iteratee($value, $key);
}

return $mappedObject;
}

function mapEntries($collection, $iteratee) {
$mappedObject = [];

Expand Down
1 change: 1 addition & 0 deletions modules/flights/_includes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
include($includePath . './utils/calculations/calculatePillageFactor.utils.php');
include($includePath . './utils/calculations/calculatePillageStorage.utils.php');
include($includePath . './utils/calculations/calculateResourcesLoss.utils.php');
include($includePath . './utils/calculations/calculateUnitsRebuild.utils.php');
include($includePath . './utils/factories/createCombatMessages.utils.php');
include($includePath . './utils/factories/createFleetDevelopmentLogEntries.utils.php');
include($includePath . './utils/factories/createFleetUpdateEntry.utils.php');
Expand Down
Loading