diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index cbd5f73c..f21c5309 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -1444,7 +1444,11 @@ class MYSQL_DB { } function getVSumField($uid, $field) { + if($field != "cp"){ $q = "SELECT sum(" . $field . ") FROM " . TB_PREFIX . "vdata where owner = $uid"; + }else{ + $q = "SELECT sum(" . $field . ") FROM " . TB_PREFIX . "vdata where owner = $uid and natar = 0"; + } $result = mysql_query($q, $this->connection); $row = mysql_fetch_row($result); return $row[0]; diff --git a/GameEngine/Database/db_MYSQLi.php b/GameEngine/Database/db_MYSQLi.php index a8fc8348..632847f5 100644 --- a/GameEngine/Database/db_MYSQLi.php +++ b/GameEngine/Database/db_MYSQLi.php @@ -1447,7 +1447,11 @@ class MYSQLi_DB { } function getVSumField($uid, $field) { + if($field != "cp"){ $q = "SELECT sum(" . $field . ") FROM " . TB_PREFIX . "vdata where owner = $uid"; + }else{ + $q = "SELECT sum(" . $field . ") FROM " . TB_PREFIX . "vdata where owner = $uid and natar = 0"; + } $result = mysqli_query($this->connection, $q); $row = mysqli_fetch_row($result); return $row[0]; diff --git a/Templates/Build/25_2.tpl b/Templates/Build/25_2.tpl index b95cf3ec..ed3152c8 100644 --- a/Templates/Build/25_2.tpl +++ b/Templates/Build/25_2.tpl @@ -14,7 +14,11 @@ +getVillageField($village->wid, 'natar') == 0){ ?> + + + diff --git a/Templates/Build/26_2.tpl b/Templates/Build/26_2.tpl index 765a82b8..fc48eed7 100644 --- a/Templates/Build/26_2.tpl +++ b/Templates/Build/26_2.tpl @@ -10,11 +10,14 @@

In order to extend your empire you need culture points. These culture points increase in the course of time and do so faster as your building levels increase.

-
Production of this village:getVillageField($village->wid, 'cp'); ?> Culture points per day0 Culture points per day
Production of all villages:
+getVillageField($village->wid, 'natar') == 0){ ?> + + + diff --git a/Templates/Build/27_show.tpl b/Templates/Build/27_show.tpl index bc25ee6c..c4cd0285 100644 --- a/Templates/Build/27_show.tpl +++ b/Templates/Build/27_show.tpl @@ -1,11 +1,15 @@ getArtefactDetails($_GET['show']); - if($artefact['size'] == 1){ + if($artefact['size'] == 1 && $artefact['type'] != 11){ $reqlvl = 10; $effect = "village"; - }elseif($artefact['size'] == 2 OR $artefact['size'] == 3){ + }else{ + if($artefact['type'] != 11){ $reqlvl = 20; + }else{ + $reqlvl = 10; + } $effect = "account"; } if ($artefact['conquered'] >= (time()-86400)){
Production of this village:getVillageField($village->wid, 'cp'); ?> Culture points per day0 Culture points per day
Production of all villages: