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

Update Battle.php

Browse Source
This commit is contained in:
Shadow
2013-11-19 12:27:01 +02:00
parent 3bd91ab12a
commit 744a3c2227
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Battle.php
+11 -5
View File
@@ -155,9 +155,10 @@ class Battle {
if(!$scout) if(!$scout)
return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$post['palast'],$post['ew1'],$post['ew2'],$post['ktyp']+3,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$post['kata'],$post['stonemason'],$walllevel,$offhero,0,0,0,0); return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$post['palast'],$post['ew1'],$post['ew2'],$post['ktyp']+3,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$post['kata'],$post['stonemason'],$walllevel,$offhero,0,0,0,0,0);
else
return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$post['palast'],$post['ew1'],$post['ew2'],1,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$post['kata'],$post['stonemason'],$walllevel,0,0,0,0,0); else
return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$post['palast'],$post['ew1'],$post['ew2'],1,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$post['kata'],$post['stonemason'],$walllevel,0,0,0,0,0,0);
} }
public function getTypeLevel($tid,$vid) { public function getTypeLevel($tid,$vid) {
@@ -208,7 +209,7 @@ class Battle {
} }
//1 raid 0 normal //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,$AttackerID,$DefenderID,$AttackerWref,$DefenderWref) { 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,$AttackerID,$DefenderID,$AttackerWref,$DefenderWref,$conqureby) {
global $bid34,$bid35,$database; global $bid34,$bid35,$database;
//fix by ronix //fix by ronix
@@ -283,7 +284,12 @@ class Battle {
//get every enforcement in defender village //get every enforcement in defender village
$DefendersAll = $database->getEnforceVillage($DefenderWref,0); if ($conqureby>0) { //def from oasis
$DefendersAll = $database->getOasisEnforce($data['to'],1);
} else {
$DefendersAll = $database->getEnforceVillage($DefenderWref,0);
}
if(!empty($DefendersAll)){
// Calculates the total points of the Defender // Calculates the total points of the Defender
if(!empty($DefendersAll)){ if(!empty($DefendersAll)){