xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-30 15:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132 from AlinV2V/patch-1

Browse Source 
Update Battle.php
This commit is contained in:
Catalin Novgorodschi
2026-02-05 14:21:13 +02:00
committed by GitHub
parent 3e8a14bc09 70f911996d
commit 16832648f6
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Battle.php
+24 -20
View File
@@ -279,18 +279,20 @@ class Battle {
$cdp += $datadefScout['cdp']; $cdp += $datadefScout['cdp'];
$involve = $datadefScout['involve']; $involve = $datadefScout['involve'];
if(!$detected && $datadefScout['detect']) $detected = $datadefScout['detect']; if(!$detected && $datadefScout['detect']) $detected = $datadefScout['detect'];
}else{ }else{
$datadef = $this->getDataDef($Defender, $def_ab); $datadef = $this->getDataDef($Defender, $def_ab);
$dp += $datadef['dp']; $own_dp = $datadef['dp'];
$cdp += $datadef['cdp']; $own_cdp = $datadef['cdp'];
$involve = $datadef['involve']; $involve = $datadef['involve'];
if(isset($Defender['hero']) && $Defender['hero'] != 0){ if(isset($Defender['hero']) && $Defender['hero'] != 0){
$units['Def_unit']['hero'] = $Defender['hero']; $units['Def_unit']['hero'] = $Defender['hero'];
$cdp += $defenderhero['dc']; $own_cdp += $defenderhero['dc'];
$dp += $defenderhero['di']; $own_dp += $defenderhero['di'];
$dp *= $defenderhero['db']; $own_dp *= $defenderhero['db'];
$cdp *= $defenderhero['db']; $own_cdp *= $defenderhero['db'];
} }
$dp += $own_dp;
$cdp += $own_cdp;
} }
$DefendersAll = (!is_null($defReinforcements) ? $database->getEnforceVillage($DefenderWref, 0) : $defReinforcements); $DefendersAll = (!is_null($defReinforcements) ? $database->getEnforceVillage($DefenderWref, 0) : $defReinforcements);
@@ -329,21 +331,23 @@ class Battle {
$cdp += $datadefScout['cdp']; $cdp += $datadefScout['cdp'];
$involve = $datadefScout['involve']; $involve = $datadefScout['involve'];
if(!$detected && $datadefScout['detect']) $detected = $datadefScout['detect']; if(!$detected && $datadefScout['detect']) $detected = $datadefScout['detect'];
}else{ }else{
$datadef = $this->getDataDef($defenders, $def_ab); $datadef = $this->getDataDef($defenders, $def_ab);
$dp += $datadef['dp']; $reinf_dp = $datadef['dp'];
$cdp += $datadef['cdp']; $reinf_cdp = $datadef['cdp'];
$involve = $datadef['involve']; $involve += $datadef['involve'];
} $reinfowner = $database->getVillageField($fromvillage, "owner");
$reinfowner = $database->getVillageField($fromvillage, "owner"); $defhero = $this->getBattleHero($reinfowner);
$defhero = $this->getBattleHero($reinfowner);
//calculate def hero from enforcement
if($defenders['hero'] != 0){ if($defenders['hero'] != 0 && $type != 1){
$cdp += $defhero['dc']; $reinf_cdp += $defhero['dc'];
$dp += $defhero['di']; $reinf_dp += $defhero['di'];
$dp *= $defhero['db']; $reinf_dp *= $defhero['db'];
$cdp *= $defhero['db']; $reinf_cdp *= $defhero['db'];
}
$dp += $reinf_dp;
$cdp += $reinf_cdp;
} }
} }
} }