xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 00:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

General fixes

Browse Source 
+You can no longer build WW if your and your alliance building plans
aren't active yet
+You can no longer remove the WW from the village if you remove it from
the building queue
+Spies from every tribe will now consume crop correctly, when returning
from a scouting attacks
+Spies from every tribe will now be displayed correctly, in the "Troops"
tab of dorf3.php, when returning from a scouting attack
+Building levels will now not be downgraded by 1 level, when conquering
a Natars' village
+Natars' villages with an artifact inside, will now be deleted if the
artifact is conquered (even if the pop isn't 0)
This commit is contained in:
iopietro
2018-06-09 03:03:01 +02:00
parent a8d6b9c357
commit d96259afd8
4 changed files with 74 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Technology.php
+12 -14
View File
@@ -161,7 +161,8 @@ class Technology {
}
public function getUnitList() {
global $database,$village;
global $database, $village;
$unitarray = func_num_args() == 1 ? $database->getUnit(func_get_arg(0)) : $village->unitall;
$listArray = [];
for($i = 1; $i < count($this->unarray); $i++) {
@@ -170,15 +171,15 @@ class Technology {
$holder['id'] = $i;
$holder['name'] = $this->unarray[$i];
$holder['amt'] = $unitarray['u'.$i];
array_push($listArray,$holder);
array_push($listArray, $holder);
}
}
if($unitarray['hero'] > 0 && !empty($unitarray['hero'])) {
$holder['id'] = "hero";
$holder['name'] = $this->unarray[$i];
$holder['amt'] = $unitarray['hero'];
array_push($listArray,$holder);
$holder['id'] = "hero";
$holder['name'] = $this->unarray[$i];
$holder['amt'] = $unitarray['hero'];
array_push($listArray, $holder);
}
return $listArray;
}
@@ -235,7 +236,7 @@ class Technology {
return $ownunit;
}
function getAllUnits($base,$InVillageOnly=False,$mode=0) {
function getAllUnits($base, $InVillageOnly = false, $mode=0) {
global $database;
$ownunit = $database->getUnit($base);
@@ -285,19 +286,16 @@ class Technology {
}
}
}
if(!$InVillageOnly){
$movement = $database->getVillageMovement($base);
if(!empty($movement)){
for($i = 1; $i <= 50; $i++){
if(!isset($ownunit['u' . $i])){
$ownunit['u' . $i] = 0;
}
$ownunit['u' . $i] += (isset($movement['u' . $i]) ? $movement['u' . $i] : 0);
if(!isset($ownunit['u'.$i])) $ownunit['u'.$i] = 0;
$ownunit['u'.$i] += (isset($movement['u'.$i]) ? $movement['u'.$i] : 0);
}
if(!isset($ownunit['hero'])){
$ownunit['hero'] = 0;
}
if(!isset($ownunit['hero'])) $ownunit['hero'] = 0;
$ownunit['hero'] += (isset($movement['hero']) ? $movement['hero'] : 0);
}
}