From 97bea08171ec5e2ac18af7bbe9dfc2210fb2ab5f Mon Sep 17 00:00:00 2001 From: cosme12 Date: Mon, 31 Aug 2015 12:03:41 -0300 Subject: [PATCH 1/3] Master builder fix --- GameEngine/Building.php | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/GameEngine/Building.php b/GameEngine/Building.php index 597bcee1..98242098 100644 --- a/GameEngine/Building.php +++ b/GameEngine/Building.php @@ -72,24 +72,22 @@ class Building { $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'])) { + 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)) { $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"); - } + $master = $_GET; + $session->changeChecker(); + 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']))); + $database->modifyGold($session->uid,1,0); + if($get['id'] > 18) { + header("Location: dorf2.php"); + } else { + header("Location: dorf1.php"); + } } if(isset($get['a']) && $get['c'] == $session->checker && isset($get['id'])) { if ($get['id'] > 18 && ($get['id'] < 41 || $get['id'] == 99)){ From aed0d130dfb99d22714732ae1d98e39a70c21149 Mon Sep 17 00:00:00 2001 From: cosme12 Date: Mon, 31 Aug 2015 12:10:35 -0300 Subject: [PATCH 2/3] Master builder fix --- Templates/Build/upgrade.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Templates/Build/upgrade.tpl b/Templates/Build/upgrade.tpl index 81b3d8cb..820ccd90 100644 --- a/Templates/Build/upgrade.tpl +++ b/Templates/Build/upgrade.tpl @@ -27,7 +27,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { gold >= 1 && $village->master == 0){ - echo "".CONSTRUCTING_MASTER_BUILDER." "; + echo "checker\">".CONSTRUCTING_MASTER_BUILDER." "; echo '('.COSTS.': Gold1)'; }else{ echo "".CONSTRUCTING_MASTER_BUILDER.""; @@ -35,7 +35,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { } }else{ if($session->gold >= 1 && $village->master == 0){ - echo "".CONSTRUCTING_MASTER_BUILDER." "; + echo "checker\">".CONSTRUCTING_MASTER_BUILDER." "; echo '('.COSTS.': Gold1)'; }else{ echo "".CONSTRUCTING_MASTER_BUILDER.""; @@ -51,7 +51,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { gold >= 1 && $village->master == 0){ - echo "".CONSTRUCTING_MASTER_BUILDER." "; + echo "checker\">".CONSTRUCTING_MASTER_BUILDER." "; echo '('.COSTS.': Gold1)'; }else{ echo "".CONSTRUCTING_MASTER_BUILDER.""; @@ -59,7 +59,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { } }else{ if($session->gold >= 1 && $village->master == 0){ - echo "".CONSTRUCTING_MASTER_BUILDER." "; + echo "checker\">".CONSTRUCTING_MASTER_BUILDER." "; echo '('.COSTS.': Gold1)'; }else{ echo "".CONSTRUCTING_MASTER_BUILDER.""; @@ -89,7 +89,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { gold >= 1 && $village->master == 0){ - echo "".CONSTRUCTING_MASTER_BUILDER." "; + echo "checker\">".CONSTRUCTING_MASTER_BUILDER." "; echo '('.COSTS.': Gold1)'; }else{ echo "".CONSTRUCTING_MASTER_BUILDER.""; @@ -97,7 +97,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { } }else{ if($session->gold >= 1 && $village->master == 0){ - echo "".CONSTRUCTING_MASTER_BUILDER." "; + echo "checker\">".CONSTRUCTING_MASTER_BUILDER." "; echo '('.COSTS.': Gold1)'; }else{ echo "".CONSTRUCTING_MASTER_BUILDER.""; From 3c830662229d507057e96d433f56fa4dcd6231d7 Mon Sep 17 00:00:00 2001 From: cosme12 Date: Mon, 31 Aug 2015 12:12:15 -0300 Subject: [PATCH 3/3] Master builder fix --- Templates/Build/avaliable/availupgrade.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Templates/Build/avaliable/availupgrade.tpl b/Templates/Build/avaliable/availupgrade.tpl index 2f0f6907..c9797723 100644 --- a/Templates/Build/avaliable/availupgrade.tpl +++ b/Templates/Build/avaliable/availupgrade.tpl @@ -23,7 +23,7 @@ $mastertime = $uprequire['time']; ?>
gold >= 1 && $village->master == 0){ - echo "Constructing with master builder "; + echo "checker\">Constructing with master builder "; echo '(costs: Gold1)'; }else{ echo "Constructing with master builder"; @@ -37,7 +37,7 @@ $mastertime = $uprequire['time']; ?>
gold >= 1 && $village->master == 0){ - echo "Constructing with master builder "; + echo "checker\">Constructing with master builder "; echo '(costs: Gold1)'; }else{ echo "Constructing with master builder"; @@ -61,7 +61,7 @@ $mastertime = $uprequire['time']; ?>
gold >= 1 && $village->master == 0){ - echo "Constructing with master builder "; + echo "checker\">Constructing with master builder "; echo '(costs: Gold1)'; }else{ echo "Constructing with master builder"; @@ -84,4 +84,4 @@ $mastertime = $uprequire['time']; } } ?> - \ No newline at end of file +