xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-08 05:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: more caching where possible

Browse Source 
This also fixes "Multihunter" being stated as the one attacking
reinforcements in villages during battle (now stores real attacker ID).
This commit is contained in:
Martin Ambrus
2017-11-12 10:36:53 +01:00
parent 994cef151c
commit 3d44226c92
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Battle.php
+6 -5
View File
@@ -238,7 +238,7 @@ class Battle {
}
//1 raid 0 normal
function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$residence,$attpop,$defpop,$type,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$tblevel,$stonemason,$walllevel,$offhero,$hero_strenght,$deffhero,$AttackerID,$DefenderID,$AttackerWref,$DefenderWref,$conqureby) {
function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$residence,$attpop,$defpop,$type,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$tblevel,$stonemason,$walllevel,$offhero,$hero_strenght,$deffhero,$AttackerID,$DefenderID,$AttackerWref,$DefenderWref,$conqureby, $defReinforcements = null, $villageOwners = array(), $userdataCache = array()) {
global $bid34,$bid35,$database;
// Define the array, with the units
@@ -303,10 +303,11 @@ class Battle {
$cdp *= $defenderhero['db'];
}
}
$DefendersAll = $database->getEnforceVillage($DefenderWref,0);
$villageOwners = [];
$userdataCache = [];
$villageOwners[$DefenderWref] = $database->getVillageField($DefenderWref,"owner");
$DefendersAll = (!is_null($defReinforcements) ? $database->getEnforceVillage($DefenderWref,0) : $defReinforcements);
if (!isset($villageOwners[$DefenderWref])) {
$villageOwners[ $DefenderWref ] = $database->getVillageField( $DefenderWref, "owner" );
}
if(!empty($DefendersAll) && $DefenderWref>0){
foreach($DefendersAll as $defenders) {