From 7674747f1a45dcc1f364f7bc01a800dade771bcf Mon Sep 17 00:00:00 2001
From: yi12345 <yarin_din@walla.com>
Date: Fri, 17 May 2013 08:45:03 +0300
Subject: [PATCH] update

---
 GameEngine/Database/db_MYSQL.php  | 4 ++++
 GameEngine/Database/db_MYSQLi.php | 4 ++++
 Templates/Build/25_2.tpl          | 4 ++++
 Templates/Build/26_2.tpl          | 5 ++++-
 Templates/Build/27_show.tpl       | 8 ++++++--
 5 files changed, 22 insertions(+), 3 deletions(-)

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 @@
 <table cellpadding="1" cellspacing="1" id="build_value">
 <tr>
 	<th>Production of this village:</th>
+<?php if($database->getVillageField($village->wid, 'natar') == 0){ ?>
 	<td><b><?php echo $database->getVillageField($village->wid, 'cp'); ?></b> Culture points per day</td>
+<?php }else{ ?>
+	<td><b>0</b> Culture points per day</td>
+<?php } ?>
 </tr>
 <tr>
 	<th>Production of all villages:</th>
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 @@
 <?php include("26_menu.tpl"); ?>
 
 <p>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.</p>
-
 <table cellpadding="1" cellspacing="1" id="build_value">
 <tr>
 	<th>Production of this village:</th>
+<?php if($database->getVillageField($village->wid, 'natar') == 0){ ?>
 	<td><b><?php echo $database->getVillageField($village->wid, 'cp'); ?></b> Culture points per day</td>
+<?php }else{ ?>
+	<td><b>0</b> Culture points per day</td>
+<?php } ?>
 </tr>
 <tr>
 	<th>Production of all villages:</th>
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 @@
 <?php
 
     $artefact = $database->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)){