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

Fixed some bugs

Browse Source 
+Returning troops time will now flow correctly in the rally point
+Resources won't be set to 0 anymore if overflow (this could have
happened in high speed servers)
+Fixed a distorted view of the right part  of the page, while reading a
mass message
This commit is contained in:
iopietro
2018-05-03 14:35:19 +02:00
parent 554a8a8d7f
commit e751a0c01f
6 changed files with 212 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Village.php
+129 -150
View File
@@ -18,23 +18,20 @@ include_once("Technology.php");
class Village {
public $type;
public $coor = array();
public $awood,$aclay,$airon,$acrop,$pop,$maxstore,$maxcrop,$atotal;
public $wid,$vname,$capital,$natar,$master;
public $resarray = array();
public $unitarray,$techarray,$unitall,$researching,$abarray = array();
private $infoarray = array();
private $production = array();
private $oasisowned,$ocounter = array();
public $coor = [];
public $awood, $aclay, $airon, $acrop, $pop, $maxstore, $maxcrop, $atotal;
public $wid, $vname, $capital, $natar, $master;
public $resarray = [];
public $unitarray, $techarray, $unitall, $researching, $abarray = [];
private $infoarray = [];
private $production = [];
private $oasisowned, $ocounter = [];
function __construct() {
global $session, $database;
if(isset($_SESSION['wid'])) {
$this->wid = $_SESSION['wid'];
}
else {
$this->wid = $session->villages[0];
}
if(isset($_SESSION['wid'])) $this->wid = $_SESSION['wid'];
else $this->wid = $session->villages[0];
$this->preloadVillagesData();
@@ -67,12 +64,13 @@ class Village {
}
public function getAllUnits($vid) {
global $database,$technology;
global $database, $technology;
return $technology->getUnits($database->getUnit($vid),$database->getEnforceVillage($vid,0));
}
private function LoadTown($second_run = false) {
global $database,$session,$logging,$technology;
global $database, $session, $logging, $technology;
$this->infoarray = $database->getVillage($this->wid);
if($this->infoarray['owner'] != $session->uid && !$session->isAdmin) {
unset($_SESSION['wid']);
@@ -110,15 +108,35 @@ class Village {
$this->allcrop = $this->getCropProd();
$this->loyalty = $this->infoarray['loyalty'];
$this->master = count($database->getMasterJobs($this->wid));
//de gs in town, zetten op max pakhuisinhoud
//If resources overflow the warehouse/granary limit, set them at the maximum value
$resourceUpdates = [];
if($this->awood>$this->maxstore){ $this->awood=$this->maxstore; $resourceUpdates['wood'] = $this->maxstore; }
if($this->aclay>$this->maxstore){ $this->aclay=$this->maxstore; $resourceUpdates['clay'] = $this->maxstore; }
if($this->airon>$this->maxstore){ $this->airon=$this->maxstore; $resourceUpdates['iron'] = $this->maxstore; }
if($this->acrop>$this->maxcrop){ $this->acrop=$this->maxcrop; $resourceUpdates['crop'] = $this->maxcrop; }
if($this->awood > $this->maxstore)
{
$this->awood = $this->maxstore;
$resourceUpdates['wood'] = $this->maxstore;
}
if($this->aclay > $this->maxstore)
{
$this->aclay = $this->maxstore;
$resourceUpdates['clay'] = $this->maxstore;
}
if($this->airon > $this->maxstore)
{
$this->airon = $this->maxstore;
$resourceUpdates['iron'] = $this->maxstore;
}
if($this->acrop > $this->maxcrop)
{
$this->acrop = $this->maxcrop;
$resourceUpdates['crop'] = $this->maxcrop;
}
if (count($resourceUpdates)) {
$database->updateResource( $this->wid, array_keys( $resourceUpdates ), array_values($resourceUpdates) );
$database->updateResource($this->wid, array_keys($resourceUpdates), array_values($resourceUpdates));
// reload cache if we've updated resources and the like
if ($second_run) {
@@ -126,188 +144,148 @@ class Village {
call_user_func(get_class($database).'::clearVillageCache');
$this->preloadVillagesData();
}
} else if ($second_run) {
$this->preloadVillagesData();
}
}
else if ($second_run) $this->preloadVillagesData();
}
private function calculateProduction() {
global $technology,$database,$session;
global $technology, $database, $session;
// clear cache, since we're updating village data
call_user_func(get_class($database).'::clearVillageCache');
$normalA = $database->getOwnArtefactInfoByType($_SESSION['wid'],4);
$largeA = $database->getOwnUniqueArtefactInfo($session->uid,4,2);
$uniqueA = $database->getOwnUniqueArtefactInfo($session->uid,4,3);
$upkeep = $technology->getUpkeep($this->unitall, 0, $this->wid);
$this->production['wood'] = $this->getWoodProd();
$this->production['clay'] = $this->getClayProd();
$this->production['iron'] = $this->getIronProd();
if ($uniqueA['size']==3 && $uniqueA['owner']==$session->uid){
$this->production['crop'] = $this->getCropProd()- $this->pop - (($upkeep)-round($upkeep*0.50));
}else if ($normalA['type']==4 && $normalA['size']==1 && $normalA['owner']==$session->uid){
$this->production['crop'] = $this->getCropProd()-$this->pop-(($upkeep)-round($upkeep*0.25));
}else if ($largeA['size']==2 && $largeA['owner']==$session->uid){
$this->production['crop'] = $this->getCropProd()-$this->pop-(($upkeep)-round($upkeep*0.25));
}else{
$this->production['crop'] = $this->getCropProd()-$this->pop-$upkeep;
$this->production['crop'] = $this->getCropProd() - $this->pop - $upkeep;
}
}
private function processProduction() {
global $database;
$timepast = time() - $this->infoarray['lastupdate'];
$nwood = ($this->production['wood'] / 3600) * $timepast;
$nclay = ($this->production['clay'] / 3600) * $timepast;
$niron = ($this->production['iron'] / 3600) * $timepast;
$ncrop = ($this->production['crop'] / 3600) * $timepast;
$database->modifyResource($this->wid,$nwood,$nclay,$niron,$ncrop,1);
$nwood = min(($this->production['wood'] / 3600) * $timepast, $this->maxstore);
$nclay = min(($this->production['clay'] / 3600) * $timepast, $this->maxstore);
$niron = min(($this->production['iron'] / 3600) * $timepast, $this->maxstore);
$ncrop = min(($this->production['crop'] / 3600) * $timepast, $this->maxcrop);
$database->modifyResource($this->wid, $nwood, $nclay, $niron, $ncrop, 1);
$database->updateVillage($this->wid);
$this->LoadTown(true);
}
private function getWoodProd() {
global $bid1,$bid5,$session;
$basewood = $sawmill = 0;
$woodholder = array();
for($i=1;$i<=38;$i++) {
if($this->resarray['f'.$i.'t'] == 1) {
array_push($woodholder,'f'.$i);
}
if($this->resarray['f'.$i.'t'] == 5) {
$sawmill = $this->resarray['f'.$i];
}
global $bid1, $bid5, $session;
$wood = $sawmill = 0;
$woodholder = [];
for($i = 1; $i <= 38; $i++) {
if($this->resarray['f'.$i.'t'] == 1) array_push($woodholder,'f'.$i);
if($this->resarray['f'.$i.'t'] == 5) $sawmill = $this->resarray['f'.$i];
}
for($i=0;$i<=count($woodholder)-1;$i++) { $basewood+= $bid1[$this->resarray[$woodholder[$i]]]['prod']; }
$wood = $basewood + $basewood * 0.25 * $this->ocounter[0];
if($sawmill >= 1) {
$wood += $basewood / 100 * $bid5[$sawmill]['attri'];
}
if($session->bonus1 == 1) {
$wood *= 1.25;
}
$wood *= SPEED;
return round($wood);
for($i = 0; $i <= count($woodholder) - 1; $i++) $wood += $bid1[$this->resarray[$woodholder[$i]]]['prod'];
$wood = $wood + $wood * 0.25 * $this->ocounter[0];
if($sawmill >= 1) $wood += $wood / 100 * $bid5[$sawmill]['attri'];
if($session->bonus1 == 1) $wood *= 1.25;
return round($wood * SPEED);
}
private function getClayProd() {
global $bid2,$bid6,$session;
$baseclay = $clay = $brick = 0;
$clayholder = array();
for($i=1;$i<=38;$i++) {
if($this->resarray['f'.$i.'t'] == 2) {
array_push($clayholder,'f'.$i);
}
if($this->resarray['f'.$i.'t'] == 6) {
$brick = $this->resarray['f'.$i];
}
global $bid2, $bid6, $session;
$clay = $brick = 0;
$clayholder = [];
for($i = 1; $i <= 38; $i++) {
if($this->resarray['f'.$i.'t'] == 2) array_push($clayholder,'f'.$i);
if($this->resarray['f'.$i.'t'] == 6) $brick = $this->resarray['f'.$i];
}
for($i=0;$i<=count($clayholder)-1;$i++) { $baseclay+= $bid2[$this->resarray[$clayholder[$i]]]['prod']; }
$clay = $baseclay + $baseclay * 0.25 * $this->ocounter[1];
if($brick >= 1) {
$clay += $baseclay / 100 * $bid6[$brick]['attri'];
}
if($session->bonus2 == 1) {
$clay *= 1.25;
}
$clay *= SPEED;
return round($clay);
for($i = 0; $i <= count($clayholder) - 1; $i++) $clay+= $bid2[$this->resarray[$clayholder[$i]]]['prod'];
$clay = $clay + $clay * 0.25 * $this->ocounter[1];
if($brick >= 1) $clay += $clay / 100 * $bid6[$brick]['attri'];
if($session->bonus2 == 1) $clay *= 1.25;
return round($clay * SPEED);
}
private function getIronProd() {
global $bid3,$bid7,$session;
$baseiron = $foundry = 0;
$ironholder = array();
for($i=1;$i<=38;$i++) {
if($this->resarray['f'.$i.'t'] == 3) {
array_push($ironholder,'f'.$i);
}
if($this->resarray['f'.$i.'t'] == 7) {
$foundry = $this->resarray['f'.$i];
}
global $bid3, $bid7, $session;
$iron = $foundry = 0;
$ironholder = [];
for($i = 1; $i <= 38; $i++) {
if($this->resarray['f'.$i.'t'] == 3) array_push($ironholder,'f'.$i);
if($this->resarray['f'.$i.'t'] == 7) $foundry = $this->resarray['f'.$i];
}
for($i=0;$i<=count($ironholder)-1;$i++) { $baseiron+= $bid3[$this->resarray[$ironholder[$i]]]['prod']; }
$iron = $baseiron + $baseiron * 0.25 * $this->ocounter[2];
if($foundry >= 1) {
$iron += $baseiron / 100 * $bid7[$foundry]['attri'];
}
if($session->bonus3 == 1) {
$iron *= 1.25;
}
$iron *= SPEED;
return round($iron);
for($i = 0;$i <= count($ironholder) - 1; $i++) $iron+= $bid3[$this->resarray[$ironholder[$i]]]['prod'];
$iron = $iron + $iron * 0.25 * $this->ocounter[2];
if($foundry >= 1) $iron += $iron / 100 * $bid7[$foundry]['attri'];
if($session->bonus3 == 1) $iron *= 1.25;
return round($iron * SPEED);
}
private function getCropProd() {
global $bid4,$bid8,$bid9,$session;
$basecrop = $grainmill = $bakery = 0;
$cropholder = array();
for($i=1;$i<=38;$i++) {
if($this->resarray['f'.$i.'t'] == 4) {
array_push($cropholder,'f'.$i);
}
if($this->resarray['f'.$i.'t'] == 8) {
$grainmill = $this->resarray['f'.$i];
}
if($this->resarray['f'.$i.'t'] == 9) {
$bakery = $this->resarray['f'.$i];
}
global $bid4, $bid8, $bid9, $session;
$crop = $grainmill = $bakery = 0;
$cropholder = [];
for($i = 1; $i <= 38; $i++) {
if($this->resarray['f'.$i.'t'] == 4) array_push($cropholder,'f'.$i);
if($this->resarray['f'.$i.'t'] == 8) $grainmill = $this->resarray['f'.$i];
if($this->resarray['f'.$i.'t'] == 9) $bakery = $this->resarray['f'.$i];
}
for ( $i = 0; $i <= count( $cropholder ) - 1; $i ++ ) {
$basecrop += $bid4[ $this->resarray[ $cropholder[ $i ] ] ]['prod'];
}
for ($i = 0; $i <= count($cropholder) - 1; $i++) $crop += $bid4[$this->resarray[$cropholder[$i]]]['prod'];
$bonus = 0.25 * $this->ocounter[3];
$crop = $basecrop + $basecrop * 0.25 * $this->ocounter[3];
$crop = $crop + $crop * 0.25 * $this->ocounter[3];
if($grainmill >= 1 || $bakery >= 1) {
$crop += $basecrop /100 * ((isset($bid8[$grainmill]['attri']) ? $bid8[$grainmill]['attri'] : 0) + (isset($bid9[$bakery]['attri']) ? $bid9[$bakery]['attri'] : 0));
$crop += $crop / 100 * ((isset($bid8[$grainmill]['attri']) ? $bid8[$grainmill]['attri'] : 0) + (isset($bid9[$bakery]['attri']) ? $bid9[$bakery]['attri'] : 0));
}
if($session->bonus4 == 1) $crop *= 1.25;
if($session->bonus4 == 1) {
$crop *= 1.25;
}
$crop *= SPEED;
return round($crop);
return round($crop * SPEED);
}
private function sortOasis() {
$crop = $clay = $wood = $iron = 0;
if (!empty($this->oasisowned)) {
foreach ($this->oasisowned as $oasis) {
switch ( $oasis['type'] ) {
if(!empty($this->oasisowned)){
foreach($this->oasisowned as $oasis){
switch($oasis['type']){
case 1:
case 2:
$wood += 1;
$wood++;
break;
case 3:
$wood += 1;
$crop += 1;
$wood++;
$crop++;
break;
case 4:
case 5:
$clay += 1;
$clay++;
break;
case 6:
$clay += 1;
$crop += 1;
$clay++;
$crop++;
break;
case 7:
case 8:
$iron += 1;
$iron++;
break;
case 9:
$iron += 1;
$crop += 1;
$iron++;
$crop++;
break;
case 10:
case 11:
$crop += 1;
$crop++;
break;
case 12:
$crop += 2;
@@ -315,19 +293,20 @@ class Village {
}
}
}
return array($wood,$clay,$iron,$crop);
return [$wood, $clay, $iron, $crop];
}
private function ActionControl() {
global $session;
if(SERVER_WEB_ROOT) {
$page = $_SERVER['SCRIPT_NAME'];
}
else {
if(SERVER_WEB_ROOT) $page = $_SERVER['SCRIPT_NAME'];
else
{
$explode = explode("/",$_SERVER['SCRIPT_NAME']);
$i = count($explode)-1;
$page = $explode[$i];
}
if($page == "build.php" && $session->uid != $this->infoarray['owner']) {
unset($_SESSION['wid']);
header("Location: dorf1.php");