From b51de80bc65c2fed2222d6bc8448306126acdb18 Mon Sep 17 00:00:00 2001
From: Shadow <cata7007@gmail.com>
Date: Thu, 28 Nov 2013 10:16:52 +0200
Subject: [PATCH] Update dorf2.tpl

---
 Templates/dorf2.tpl | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/Templates/dorf2.tpl b/Templates/dorf2.tpl
index 40caebe4..9a9e5288 100644
--- a/Templates/dorf2.tpl
+++ b/Templates/dorf2.tpl
@@ -26,20 +26,19 @@ else {
 <?php
 $coords = array(19=>"53,91,91,71,127,91,91,112","136,66,174,46,210,66,174,87","196,56,234,36,270,56,234,77","270,69,308,49,344,69,308,90","327,117,365,97,401,117,365,138","14,129,52,109,88,129,52,150","97,137,135,117,171,137,135,158","182,119,182,65,257,65,257,119,220,140","337,156,375,136,411,156,375,177","2,199,40,179,76,199,40,220","129,164,167,144,203,164,167,185","92,189,130,169,166,189,130,210","342,216,380,196,416,216,380,237","22,238,60,218,96,238,60,259","167,232,205,212,241,232,205,253","290,251,328,231,364,251,328,272","95,273,133,253,169,273,133,294","222,284,260,264,296,284,260,305","80,306,118,286,154,306,118,327","199,316,237,296,273,316,237,337","270,158,303,135,316,155,318,178,304,211,288,227,263,238,250,215");
 for($t=19;$t<=39;$t++) {
-if(($village->resarray['f99t'] == 40 AND ($t)=='25') or ($village->resarray['f99t'] == 40 AND ($t)=='26') or ($village->resarray['f99t'] == 40 AND ($t)=='29') or ($village->resarray['f99t'] == 40 AND ($t)=='30') or ($village->resarray['f99t'] == 40 AND ($t)=='33')) {
-echo "<area href=\"build.php?id=99\" title=\"WorldWonder Level ".$village->resarray['f99']."\" coords=\"$coords[$t]\" shape=\"poly\"/>";
-} else {
-if($village->resarray['f'.$t.'t'] != 0) {
-$title = $building->procResType($village->resarray['f'.$t.'t']). " Level ".$village->resarray['f'.$t];
-}
-else {
-    $title = "Building site";
-    if(($t == 39) && ($village->resarray['f'.$t] == 0)) {
-        $title = "Rally Point building site";
+    if ($village->natar==1 && ( $t== 25 || $t == 26 || $t == 29 || $t == 30 || $t == 33 )) {
+        echo "<area href=\"build.php?id=99\" title=\"WorldWonder Level ".$village->resarray['f99']."\" coords=\"$coords[$t]\" shape=\"poly\"/>";
+    }else{
+        if($village->resarray['f'.$t.'t'] != 0) {
+            $title = $building->procResType($village->resarray['f'.$t.'t']). " Level ".$village->resarray['f'.$t];
+        }else{
+            $title = "Building site";
+            if(($t == 39) && ($village->resarray['f'.$t] == 0)) {
+                $title = "Rally Point building site";
+            }
         }
-}
-	echo "<area href=\"build.php?id=$t\" title=\"$title\" coords=\"$coords[$t]\" shape=\"poly\"/>";
-}
+        echo "<area href=\"build.php?id=$t\" title=\"$title\" coords=\"$coords[$t]\" shape=\"poly\"/>";
+    }
 }
 ?>
 	
@@ -62,12 +61,12 @@ $vmapc = ($village->resarray['f40'] == 0)? "d2_0" : "d2_1".$session->tribe;
 <div id="village_map" class="<?php echo $vmapc; ?>">
 <?php
 for ($i=1;$i<=20;$i++) {
-	if(($village->resarray['f99t'] == 40 AND ($i+18)=='25') or ($village->resarray['f99t'] == 40 AND ($i+18)=='26') or ($village->resarray['f99t'] == 40 AND ($i+18)=='29') or ($village->resarray['f99t'] == 40 AND ($i+18)=='30') or ($village->resarray['f99t'] == 40 AND ($i+18)=='33')) {
-		} else {
-	$text = "Building site";
-	$img = "iso";
-    	if($village->resarray['f'.($i+18).'t'] != 0) {
-        	$text = $building->procResType($village->resarray['f'.($i+18).'t'])." Level ".$village->resarray['f'.($i+18)];
+    if($village->natar==1 AND (($i+18)=='25' || ($i+18)=='26' || ($i+18)=='29' || ($i+18)=='30' || ($i+18)=='33')) {
+        } else {
+    $text = "Building site";
+    $img = "iso";
+        if($village->resarray['f'.($i+18).'t'] != 0) {
+            $text = $building->procResType($village->resarray['f'.($i+18).'t'])." Level ".$village->resarray['f'.($i+18)];
             $img = "g".$village->resarray['f'.($i+18).'t'];
        }
     foreach($building->buildArray as $job) {
@@ -104,8 +103,8 @@ for ($i=1;$i<=20;$i++) {
       }
 ?>
 <?php
-if($village->resarray['f99t'] == 40) {
-if($village->resarray['f99'] >= 0 && $village->resarray['f99'] <= 19) {
+if($village->natar == 1) {
+if($village->resarray['f99'] > 0 && $village->resarray['f99'] <= 19) {
 echo '<img class="ww g40" src="img/x.gif" alt="Worldwonder">'; }
 if($village->resarray['f99'] >= 20 && $village->resarray['f99'] <= 39) {
 echo '<img class="ww g40_1" src="img/x.gif" alt="Worldwonder">'; }