Update Battle.php

This commit is contained in:
Shadow
2014-02-19 07:37:37 +02:00
parent 06af170c47
commit 1e46ecc77c
+41 -41
View File
@@ -283,47 +283,47 @@ class Battle {
$cdp *= $defenderhero['db']; $cdp *= $defenderhero['db'];
} }
} }
$DefendersAll = $database->getEnforceVillage($DefenderWref,0); $DefendersAll = $database->getEnforceVillage($DefenderWref,0);
if(!empty($DefendersAll) && $DefenderWref>0){ if(!empty($DefendersAll) && $DefenderWref>0){
foreach($DefendersAll as $defenders) { foreach($DefendersAll as $defenders) {
for ($i=1;$i<=50;$i++) {$def_ab[$i]=0;} for ($i=1;$i<=50;$i++) {$def_ab[$i]=0;}
$fromvillage = $defenders['from']; $fromvillage = $defenders['from'];
$enforcetribe = $database->getUserField($database->getVillageField($fromvillage,"owner"),"tribe",0); $enforcetribe = $database->getUserField($database->getVillageField($fromvillage,"owner"),"tribe",0);
$ud=($enforcetribe-1)*10; $ud=($enforcetribe-1)*10;
if($defenders['from']>0) { //don't check nature tribe if($defenders['from']>0) { //don't check nature tribe
$armory = $database->getABTech($defenders['from']); // Armory level every village enforcement $armory = $database->getABTech($defenders['from']); // Armory level every village enforcement
$def_ab[$ud+1] = $armory['a1']; $def_ab[$ud+1] = $armory['a1'];
$def_ab[$ud+2] = $armory['a2']; $def_ab[$ud+2] = $armory['a2'];
$def_ab[$ud+3] = $armory['a3']; $def_ab[$ud+3] = $armory['a3'];
$def_ab[$ud+4] = $armory['a4']; $def_ab[$ud+4] = $armory['a4'];
$def_ab[$ud+5] = $armory['a5']; $def_ab[$ud+5] = $armory['a5'];
$def_ab[$ud+6] = $armory['a6']; $def_ab[$ud+6] = $armory['a6'];
$def_ab[$ud+7] = $armory['a7']; $def_ab[$ud+7] = $armory['a7'];
$def_ab[$ud+8] = $armory['a8']; $def_ab[$ud+8] = $armory['a8'];
} }
if ($type==1) { if ($type==1) {
$datadefScout=$this->getDataDefScout($Defender,$def_ab,$defender_artefact,$AttackerWref,$AttackerID); $datadefScout=$this->getDataDefScout($defenders,$def_ab,$defender_artefact,$AttackerWref,$AttackerID);
$dp+=$datadefScout['dp']; $dp+=$datadefScout['dp'];
$cdp+=$datadefScout['cdp']; $cdp+=$datadefScout['cdp'];
$involve=$datadefScout['involve']; $involve=$datadefScout['involve'];
if ($datadefScout['detect']==1) $detected = 1; if ($datadefScout['detect']==1) $detected = 1;
}else{ }else{
$datadef=$this->getDataDef($Defenders,$def_ab); $datadef=$this->getDataDef($defenders,$def_ab);
$dp+=$datadef['dp']; $dp+=$datadef['dp'];
$cdp+=$datadef['cdp']; $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 //calculate def hero from enforcement
if($defenders['hero'] != 0){ if($defenders['hero'] != 0){
$cdp += $defhero['dc']; //$cdp += $defhero['dc'];
$dp += $defhero['di']; //$dp += $defhero['di'];
$dp *= $defhero['db']; $dp *= $defhero['db'];
$cdp *= $defhero['db']; $cdp *= $defhero['db'];
} }
} }
} }
// Calculate the total number of points Attacker // Calculate the total number of points Attacker
$start = ($att_tribe-1)*10+1; $start = ($att_tribe-1)*10+1;
$end = ($att_tribe*10); $end = ($att_tribe*10);