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

Merge branch 'master' of https://github.com/Shadowss/TravianZ

Browse Source
This commit is contained in:
Shadow
2014-02-17 08:12:10 +02:00
parent 0231274907 268d46c782
commit 8e1bec2160
8 changed files with 920 additions and 1225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+2 -2
View File
@@ -1395,8 +1395,8 @@ class Automation {
}
//to battle.php
//fix by ronix
$battlepart = $battle->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,0,0,$AttackerID,$DefenderID,$AttackerWref,$DefenderWref,$conqureby);
$battlepart = $battle->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,0,0,0,$AttackerID,$DefenderID,$AttackerWref,$DefenderWref,$conqureby);
//units attack string for battleraport
$unitssend_att = ''.$data['t1'].','.$data['t2'].','.$data['t3'].','.$data['t4'].','.$data['t5'].','.$data['t6'].','.$data['t7'].','.$data['t8'].','.$data['t9'].','.$data['t10'].'';
$herosend_att = $data['t11'];
GameEngine/Battle.php
+714 -1031
View File
File diff suppressed because it is too large Load Diff
GameEngine/Building.php
+41 -23
View File
@@ -55,29 +55,47 @@ class Building {
}
}
public function procBuild($get) {
global $session, $village;
if(isset($get['a']) && $get['c'] == $session->checker && !isset($get['id'])) {
if($get['a'] == 0) {
$this->removeBuilding($get['d']);
}
else {
$session->changeChecker();
$this->canProcess($village->resarray['f'.$get['a'].'t'],$get['a']);
$this->upgradeBuilding($get['a']);
}
}
if(isset($get['a']) && $get['c'] == $session->checker && isset($get['id'])) {
$session->changeChecker();
$this->canProcess($get['a'],$get['id']);
$this->constructBuilding($get['id'],$get['a']);
}
if(isset($get['buildingFinish'])) {
if($session->gold >= 2 && $session->sit == 0) {
$this->finishAll();
}
}
}
public function procBuild($get) {
global $session, $village, $database;
if(isset($get['a']) && $get['c'] == $session->checker && !isset($get['id'])) {
if($get['a'] == 0) {
$this->removeBuilding($get['d']);
}else {
$session->changeChecker();
$this->canProcess($village->resarray['f'.$get['a'].'t'],$get['a']);
$this->upgradeBuilding($get['a']);
}
}
if(isset($get['master']) && isset($get['id']) && isset($get['time']) && $session->gold >= 1 && $session->goldclub && $village->master == 0 && (isset($get['c']) && $get['c']== $session->checker) && isset($_SESSION['mas'])) {
$m=$get['master'];
$master=explode(",",$_SESSION['mas'][$m]);
if($get['master']==$master[0] && $get['id']==$master[1] && $get['time']==$master[2]) {
$session->changeChecker();
unset($_SESSION['mas']);
if($session->access==BANNED){
header("Location: banned.php");
exit;
}
$level = $database->getResourceLevel($village->wid);
$database->addBuilding($village->wid, $get['id'], $get['master'], 1, $get['time'], 1, $level['f'.$get['id']] + 1 + count($database->getBuildingByField($village->wid,$get['id'])));
if($get['id'] > 18) {
header("Location: dorf2.php");
} else {
header("Location: dorf1.php");
}
}
}
if(isset($get['a']) && $get['c'] == $session->checker && isset($get['id'])) {
$session->changeChecker();
$this->canProcess($get['a'],$get['id']);
$this->constructBuilding($get['id'],$get['a']);
}
if(isset($get['buildingFinish']) && $session->plus) {
if($session->gold >= 2 && $session->sit == 0) {
$this->finishAll();
}
}
}
public function canBuild($id,$tid) {
global $village,$session,$database;