From 57d2cf7413eb8fcc41291351bf4606fa5f1b8c29 Mon Sep 17 00:00:00 2001 From: Shadowss Date: Fri, 1 Nov 2013 09:37:17 +0200 Subject: [PATCH] fix finish all --- GameEngine/Building.php | 139 ++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 68 deletions(-) diff --git a/GameEngine/Building.php b/GameEngine/Building.php index e8208397..27484527 100644 --- a/GameEngine/Building.php +++ b/GameEngine/Building.php @@ -669,73 +669,76 @@ class Building { return false; } - public function finishAll() { - global $database,$session,$logging,$village,$bid18,$bid10,$bid11,$technology,$_SESSION; - if($session->access!=BANNED){ - $finish = 0; - foreach($this->buildArray as $jobs) { - if($jobs['wid']==$village->wid){ - $wwvillage = $database->getResourceLevel($jobs['wid']); - if($wwvillage['f99t']!=40){ - $level = $jobs['level']; - if($jobs['type'] != 25 AND $jobs['type'] != 26 AND $jobs['type'] != 40) { - $finish = 1; - $resource = $this->resourceRequired($jobs['field'],$jobs['type']); - if($jobs['master'] == 0){ - $q = "UPDATE ".TB_PREFIX."fdata set f".$jobs['field']." = ".$jobs['level'].", f".$jobs['field']."t = ".$jobs['type']." where vref = ".$jobs['wid']; - }else{ - $villwood = $database->getVillageField($jobs['wid'],'wood'); - $villclay = $database->getVillageField($jobs['wid'],'clay'); - $villiron = $database->getVillageField($jobs['wid'],'iron'); - $villcrop = $database->getVillageField($jobs['wid'],'crop'); - $type = $jobs['type']; - $buildarray = $GLOBALS["bid".$type]; - $buildwood = $buildarray[$level]['wood']; - $buildclay = $buildarray[$level]['clay']; - $buildiron = $buildarray[$level]['iron']; - $buildcrop = $buildarray[$level]['crop']; - if($buildwood < $villwood && $buildclay < $villclay && $buildiron < $villiron && $buildcrop < $villcrop){ - $newgold = $session->gold-1; - $database->updateUserField($session->uid, "gold", $newgold, 1); - $enought_res = 1; - $q = "UPDATE ".TB_PREFIX."fdata set f".$jobs['field']." = ".$jobs['level'].", f".$jobs['field']."t = ".$jobs['type']." where vref = ".$jobs['wid']; - } - } - if($database->query($q) && ($enought_res == 1 or $jobs['master'] == 0)) { - $database->modifyPop($jobs['wid'],$resource['pop'],0); - $database->addCP($jobs['wid'],$resource['cp']); - $q = "DELETE FROM ".TB_PREFIX."bdata where id = ".$jobs['id']; - $database->query($q); - if($jobs['type'] == 18) { - $owner = $database->getVillageField($jobs['wid'],"owner"); - $max = $bid18[$level]['attri']; - $q = "UPDATE ".TB_PREFIX."alidata set max = $max where leader = $owner"; - $database->query($q); - } - } - if(($jobs['field'] >= 19 && ($session->tribe == 1 || ALLOW_ALL_TRIBE)) || (!ALLOW_ALL_TRIBE && $session->tribe != 1)) { $innertimestamp = $jobs['timestamp']; } - } - } - } - } - if($finish == 1){ - $database->finishDemolition($village->wid); - $technology->finishTech(); - $logging->goldFinLog($village->wid); - $database->modifyGold($session->uid,2,0); - $stillbuildingarray = $database->getJobs($village->wid); - if(count($stillbuildingarray) == 1) { - if($stillbuildingarray[0]['loopcon'] == 1) { - $q = "UPDATE ".TB_PREFIX."bdata SET loopcon=0,timestamp=".(time()+$stillbuildingarray[0]['timestamp']-$innertimestamp)." WHERE id=".$stillbuildingarray[0]['id']; - $database->query($q); - } - } - } - header("Location: ".$session->referrer); - }else{ - header("Location: banned.php"); - } - } + public function finishAll() { + global $database,$session,$logging,$village,$bid18,$bid10,$bid11,$technology,$_SESSION; + if($session->access!=BANNED){ + $finish = 0; + + foreach($this->buildArray as $jobs) { + if($jobs['wid']==$village->wid){ + $finish=2; + $wwvillage = $database->getResourceLevel($jobs['wid']); + if($wwvillage['f99t']!=40){ + $level = $jobs['level']; + if($jobs['type'] != 25 AND $jobs['type'] != 26 AND $jobs['type'] != 40) { + $finish = 1; + $resource = $this->resourceRequired($jobs['field'],$jobs['type']); + if($jobs['master'] == 0){ + $q = "UPDATE ".TB_PREFIX."fdata set f".$jobs['field']." = ".$jobs['level'].", f".$jobs['field']."t = ".$jobs['type']." where vref = ".$jobs['wid']; + }else{ + $villwood = $database->getVillageField($jobs['wid'],'wood'); + $villclay = $database->getVillageField($jobs['wid'],'clay'); + $villiron = $database->getVillageField($jobs['wid'],'iron'); + $villcrop = $database->getVillageField($jobs['wid'],'crop'); + $type = $jobs['type']; + $buildarray = $GLOBALS["bid".$type]; + $buildwood = $buildarray[$level]['wood']; + $buildclay = $buildarray[$level]['clay']; + $buildiron = $buildarray[$level]['iron']; + $buildcrop = $buildarray[$level]['crop']; + if($buildwood < $villwood && $buildclay < $villclay && $buildiron < $villiron && $buildcrop < $villcrop){ + $newgold = $session->gold-1; + $database->updateUserField($session->uid, "gold", $newgold, 1); + $enought_res = 1; + $q = "UPDATE ".TB_PREFIX."fdata set f".$jobs['field']." = ".$jobs['level'].", f".$jobs['field']."t = ".$jobs['type']." where vref = ".$jobs['wid']; + } + } + if($database->query($q) && ($enought_res == 1 or $jobs['master'] == 0)) { + $database->modifyPop($jobs['wid'],$resource['pop'],0); + $database->addCP($jobs['wid'],$resource['cp']); + $q = "DELETE FROM ".TB_PREFIX."bdata where id = ".$jobs['id']; + $database->query($q); + if($jobs['type'] == 18) { + $owner = $database->getVillageField($jobs['wid'],"owner"); + $max = $bid18[$level]['attri']; + $q = "UPDATE ".TB_PREFIX."alidata set max = $max where leader = $owner"; + $database->query($q); + } + } + if(($jobs['field'] >= 19 && ($session->tribe == 1 || ALLOW_ALL_TRIBE)) || (!ALLOW_ALL_TRIBE && $session->tribe != 1)) { $innertimestamp = $jobs['timestamp']; } + } + } + } + } + if($finish == 1 or $finish==0){ + $database->finishDemolition($village->wid); + $technology->finishTech(); + $logging->goldFinLog($village->wid); + $database->modifyGold($session->uid,2,0); + $stillbuildingarray = $database->getJobs($village->wid); + if(count($stillbuildingarray) == 1) { + if($stillbuildingarray[0]['loopcon'] == 1) { + //$q = "UPDATE ".TB_PREFIX."bdata SET loopcon=0,timestamp=".(time()+$stillbuildingarray[0]['timestamp']-$innertimestamp)." WHERE id=".$stillbuildingarray[0]['id']; + $q = "UPDATE ".TB_PREFIX."bdata SET loopcon=0 WHERE id=".$stillbuildingarray[0]['id']; + $database->query($q); + } + } + } + header("Location: ".$session->referrer); + }else{ + header("Location: banned.php"); + } + } public function resourceRequired($id,$tid,$plus=1) { $name = "bid".$tid; @@ -792,4 +795,4 @@ class Building { } }; -?> \ No newline at end of file +?>