xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 00:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor(sendunitsComplete): extract calculatePopulations() [#155]

Browse Source 
Move the attacker/defender total-population computation (and the two
getProfileVillages() lookups that feed it) out of the per-attack loop into a
dedicated private method. Behaviour-preserving: the method takes the initial
$defpop/$attpop (0 for villages, 500 for the oasis branch) and accumulates onto
them exactly as before, and returns the village lists ($varray/$varray1) used
later for the can-destroy check and handleConquest().

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Ferywir
2026-06-15 08:34:20 +02:00
committed by Catalin Novgorodschi
parent 4842b7edc1
commit 7ec51902fd
1 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+41 -12
View File
@@ -1963,6 +1963,41 @@ class Automation {
];
}
/**
* Compute attacker/defender total populations and fetch their village lists.
* Pure behaviour-preserving extraction (refactor for issue #155).
*
* @param array $to Defender village info (getMInfo/getOMInfo).
* @param array $from Attacker village info (getMInfo).
* @param int $isoasis Whether the target is an oasis (defender pop counts only for villages).
* @param int $defpop Initial defender population (accumulated onto).
* @param int $attpop Initial attacker population (accumulated onto).
* @return array{varray:array,varray1:array,defpop:int,attpop:int}
*/
private function calculatePopulations($to, $from, $isoasis, $defpop, $attpop) {
global $database;
$varray = $database->getProfileVillages($to['owner'], 0, false);
if ($to['owner'] == $from['owner']) $varray1 = $varray;
else $varray1 = $database->getProfileVillages($from['owner'], 0, false);
// total population of the defender
if($isoasis == 0){
foreach($varray as $defenderVillage) $defpop += $defenderVillage['pop'];
}
// total population of the attacker
foreach($varray1 as $attackerVillage) $attpop += $attackerVillage['pop'];
return [
'varray' => $varray,
'varray1' => $varray1,
'defpop' => $defpop,
'attpop' => $attpop,
];
}
private function sendunitsComplete() {
// PROCESARE ATACURI COMPLETE - functie critica, pastrata 100% compatibila
// Aceasta functie gestioneaza toate atacurile care ajung la destinatie
@@ -2202,18 +2237,12 @@ class Automation {
$walllevel = $tblevel = $stonemason = 0;
}
$varray = $database->getProfileVillages($to['owner'], 0, false);
if ($to['owner'] == $from['owner']) $varray1 = $varray;
else $varray1 = $database->getProfileVillages($from['owner'], 0, false);
// total population of the defender
if($isoasis == 0){
foreach($varray as $defenderVillage) $defpop += $defenderVillage['pop'];
}
// total population of the attacker
foreach($varray1 as $attackerVillage) $attpop += $attackerVillage['pop'];
// attacker/defender populations + village lists — extracted to calculatePopulations() [#155]
$popData = $this->calculatePopulations($to, $from, $isoasis, $defpop, $attpop);
$varray = $popData['varray'];
$varray1 = $popData['varray1'];
$defpop = $popData['defpop'];
$attpop = $popData['attpop'];
//fix by ronix
for ($i = 1; $i <= 50; $i++) {