xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-02 18:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

General fixes

Browse Source 
+Fixed a bug that didn't permit to attack with catapults with the new
automation system
+Fixed a warning that could have been displayed in certain cases
This commit is contained in:
iopietro
2018-05-23 17:36:16 +02:00
parent e70d0ff619
commit fca22ac98b
4 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Building.php
+6 -15
View File
@@ -479,8 +479,8 @@ class Building {
}
}
private function constructBuilding($id,$tid) {
global $database,$village,$session,$logging;
private function constructBuilding($id, $tid) {
global $database, $village, $session, $logging;
if($session->access == BANNED) {
header("Location: banned.php");
@@ -890,7 +890,7 @@ class Building {
public function resourceRequired($id, $tid, $plus = 1) {
$name = "bid".$tid;
global $$name, $village, $bid15;
global $$name, $village, $bid15, $database;
$dataarray = $$name;
$wood = $dataarray[$village->resarray['f'.$id] + $plus]['wood'];
@@ -898,19 +898,10 @@ class Building {
$iron = $dataarray[$village->resarray['f'.$id] + $plus]['iron'];
$crop = $dataarray[$village->resarray['f'.$id] + $plus]['crop'];
$pop = $dataarray[$village->resarray['f'.$id] + $plus]['pop'];
if($tid == 15){
if($this->getTypeLevel(15) == 0) $time = round($dataarray[$village->resarray['f'.$id] + $plus]['time'] / SPEED * 5);
else $time = round($dataarray[$village->resarray['f'.$id] + $plus]['time'] / SPEED);
}else{
if($this->getTypeLevel(15) > 0) {
$time = round($dataarray[$village->resarray['f'.$id] + $plus]['time'] * ($bid15[$this->getTypeLevel(15)]['attri'] /100) / SPEED);
}
else $time = round($dataarray[$village->resarray['f'.$id] + $plus]['time'] * 5 / SPEED);
}
$time = $database->getBuildingTime($id, $tid, $plus, $village->wid, $village->resarray);
$cp = $dataarray[$village->resarray['f'.$id] + $plus]['cp'];
return ["wood" => $wood, "clay" => $clay, "iron" => $iron, "crop" => $crop, "pop" => $pop, "time" => $time,"cp" => $cp];
return ["wood" => $wood, "clay" => $clay, "iron" => $iron, "crop" => $crop, "pop" => $pop, "time" => $time, "cp" => $cp];
}
public function getTypeField($type) {