edit trapper + bug fixed: in each resouce places, when you upgrade 2 level with waiting loop, the "production at level ?" must equal to "upgrade to level ?"

Templates/Build/1.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid1"><a href="#" onClick="return Popup(0,4);" class="build_logo">
 <img class="building g1" src="img/x.gif" alt="<?php echo B1; ?>" title="<?php echo B1; ?>" />
 </a>
@@ -10,13 +14,38 @@
 	</tr>
     <?php 
     if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+	$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+	if($village->capital == 1) {
+	if($next<=20){
     ?>
 	<tr>
-		<th><?php echo NEXT_PROD; echo $village->resarray['f'.$id]+1; ?>:</th>
-		<td><b><?php echo $bid1[$village->resarray['f'.$id]+1]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+		<th><?php echo NEXT_PROD; echo $next; ?>:</th>
+		<td><b><?php echo $bid1[$next]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
 	</tr>
     <?php 
-    }
+    }else{
+	?>
+	<tr>
+		<th><?php echo NEXT_PROD; 20 ?>:</th>
+		<td><b><?php echo $bid1[20]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>	
+	<?php
+	}}else{
+	if($next<=10){
+    ?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo $next; ?>:</th>
+		<td><b><?php echo $bid1[$next]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>
+    <?php 
+    }else{
+	?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo 10; ?>:</th>
+		<td><b><?php echo $bid1[10]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>	
+	<?php
+	}}}
     ?>
 </table>
 <?php 

Templates/Build/10.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid10"><a href="#" onClick="return Popup(10,4);" class="build_logo">
 	<img class="building g10" src="img/x.gif" alt="Warehouse" title="Warehouse" />
 </a>
@@ -13,12 +17,20 @@
 	<tr>
 <?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-		<th>Capacity at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-		<td><b><?php echo $bid10[$village->resarray['f'.$id]+1]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
+		<th>Capacity at level <?php echo $next ?>:</th>
+		<td><b><?php echo $bid10[$next]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
         <?php
-            }
-            ?>
+            }else{
+		?>
+		<th>Capacity at level 20:</th>
+		<td><b><?php echo $bid10[20]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
+		<?php
+			}
+			}
+        ?>
 	</tr>
 	</table>
  <?php 

Templates/Build/11.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid11"><a href="#" onClick="return Popup(11,4);" class="build_logo">
 	<img class="building g11" src="img/x.gif" alt="Granary" title="Granary" />
 </a>
@@ -14,11 +18,19 @@
 	<tr>
 <?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-		<th>Capacity at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-		<td><b><?php echo $bid11[$village->resarray['f'.$id]+1]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
+		<th>Capacity at level <?php echo $next ?>:</th>
+		<td><b><?php echo $bid11[$next]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
         <?php
-            }
+            }else{
+		?>
+		<th>Capacity at level 20:</th>
+		<td><b><?php echo $bid11[20]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
+		<?php
+			}
+			}
             ?>
 	</tr>
 	</table>

Templates/Build/14.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid14"><a href="#" onClick="return Popup(14,4);" class="build_logo">
 	<img class="building g14" src="img/x.gif" alt="Tournament Square" title="Tournament Square" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-			<th>Speed bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid14[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Speed bonus at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid14[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Speed bonus at level 20:</th>
+			<td><b><?php echo $bid14[20]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/15.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid15"><a href="#" onClick="return Popup(15,4);" class="build_logo">
 	<img class="building g15" src="img/x.gif" alt="Main Building" title="Main Building" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-			<th>Construction time at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo round($bid15[$village->resarray['f'.$id]+1]['attri']); ?></b> Percent</td>
+			<th>Construction time at level <?php echo $next; ?>:</th>
+			<td><b><?php echo round($bid15[$next]['attri']); ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Construction time at level 20:</th>
+			<td><b><?php echo round($bid15[20]['attri']); ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/2.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid2"><a href="#" onClick="return Popup(2,4);" class="build_logo">
 <img class="building g2" src="img/x.gif" alt="<?php echo B2; ?>" title="<?php echo B2; ?>" />
 </a>
@@ -11,13 +15,38 @@
 	</tr>
 	 <?php 
     if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+	$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+	if($village->capital == 1) {
+	if($next<=20){
     ?>
 	<tr>
-		<th><?php echo NEXT_PROD; echo $village->resarray['f'.$id]+1; ?>:</th>
-		<td><b><?php echo $bid2[$village->resarray['f'.$id]+1]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+		<th><?php echo NEXT_PROD; echo $next; ?>:</th>
+		<td><b><?php echo $bid2[$next]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
 	</tr>
     <?php 
-    }
+    }else{
+	?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo 20; ?>:</th>
+		<td><b><?php echo $bid2[20]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>	
+	<?php
+	}}else{
+	if($next<=10){
+    ?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo $next; ?>:</th>
+		<td><b><?php echo $bid2[$next]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>
+    <?php 
+    }else{
+	?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo 10; ?>:</th>
+		<td><b><?php echo $bid2[10]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>	
+	<?php
+	}}}
     ?>
 </table>
 

Templates/Build/23.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid23"><a href="#" onClick="return Popup(23,4);" class="build_logo">
 	<img class="building g23" src="img/x.gif" alt="Cranny" title="Cranny" />
 </a>
@@ -8,36 +12,12 @@
 	<table cellpadding="1" cellspacing="1" id="build_value">
 	<tr>
 		<th>Currently hidden units per resource:</th>
-<?php
-		if($session->tribe == 1) {
-		?>
-		<td><b><?php echo $bid23[$village->resarray['f'.$id]]['attri']; ?></b> units</td>
-		<?php
-			}
-		?>
-<?php
-		if($session->tribe == 2) {
-		?>
-		<td><b><?php echo $bid23[$village->resarray['f'.$id]]['attri']; ?></b> units</td>
-		<?php
-			}
-		?>
 <?php
 		if($session->tribe == 3) {
 		?>
 		<td><b><?php echo $bid23[$village->resarray['f'.$id]]['attri']*2; ?></b> units</td>
 		<?php
-			}
-		?>
-<?php
-		if($session->tribe == 4) {
-		?>
-		<td><b><?php echo $bid23[$village->resarray['f'.$id]]['attri']; ?></b> units</td>
-		<?php
-			}
-		?>
-<?php
-		if($session->tribe == 5) {
+			}else{
 		?>
 		<td><b><?php echo $bid23[$village->resarray['f'.$id]]['attri']; ?></b> units</td>
 		<?php
@@ -47,46 +27,32 @@
 	<tr>
 <?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		if($next<=10){
         ?>
-		<th>Hidden units per resource at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-<?php
-		if($session->tribe == 1) {
-		?>
-		<td><b><?php echo $bid23[$village->resarray['f'.$id]+1]['attri']; ?></b> units</td>
-		<?php
-			}
-		?>
-<?php
-		if($session->tribe == 2) {
-		?>
-		<td><b><?php echo $bid23[$village->resarray['f'.$id]+1]['attri']; ?></b> units</td>
-		<?php
-			}
-		?>
+		<th>Hidden units per resource at level <?php echo $village->resarray['f'.$id]+1+$loopsame+$doublebuild; ?>:</th>
 <?php
 		if($session->tribe == 3) {
 		?>
-		<td><b><?php echo $bid23[$village->resarray['f'.$id]+1]['attri']*2; ?></b> units</td>
+		<td><b><?php echo $bid23[$village->resarray['f'.$id]+1+$loopsame+$doublebuild]['attri']*2; ?></b> units</td>
 		<?php
-			}
+			}else{
 		?>
+		<td><b><?php echo $bid23[$village->resarray['f'.$id]+1+$loopsame+$doublebuild]['attri']; ?></b> units</td>
+		<?php
+			}}else{
+        ?>
+		<th>Hidden units per resource at level 20:</th>
 <?php
-		if($session->tribe == 4) {
+		if($session->tribe == 3) {
 		?>
-		<td><b><?php echo $bid23[$village->resarray['f'.$id]+1]['attri']; ?></b> units</td>
+		<td><b><?php echo $bid23[10]['attri']*2; ?></b> units</td>
 		<?php
-			}
+			}else{
 		?>
-<?php
-		if($session->tribe == 5) {
-		?>
-		<td><b><?php echo $bid23[$village->resarray['f'.$id]+1]['attri']; ?></b> units</td>
+		<td><b><?php echo $bid23[10]['attri']; ?></b> units</td>
 		<?php
-			}
-		?>
-        <?php
-            }
-            ?>
+			}}}
+        ?>
 	</tr>
 	</table>
 <?php 

Templates/Build/28.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid28"><a href="#" onClick="return Popup(28,4);" class="build_logo">
 	<img class="building g28" src="img/x.gif" alt="Trade Office" title="Trade Office" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-			<th>Merchant load at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid28[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Merchant load at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid28[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Merchant load at level 20:</th>
+			<td><b><?php echo $bid28[20]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/3.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid3"><a href="#" onClick="return Popup(3,4);" class="build_logo">
 <img class="building g3" src="img/x.gif" alt="<?php echo B3; ?>" title="<?php echo B3; ?>" />
 </a>
@@ -13,13 +17,38 @@
 	</tr>
 	 <?php 
     if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+	$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+	if($village->capital == 1) {
+	if($next<=20){
     ?>
 	<tr>
-		<th><?php echo NEXT_PROD; echo $village->resarray['f'.$id]+1; ?>:</th>
-		<td><b><?php echo $bid3[$village->resarray['f'.$id]+1]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+		<th><?php echo NEXT_PROD; echo $next; ?>:</th>
+		<td><b><?php echo $bid3[$next]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
 	</tr>
     <?php 
-    }
+    }else{
+	?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo 20; ?>:</th>
+		<td><b><?php echo $bid3[20]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>	
+	<?php
+	}}else{
+	if($next<=10){
+    ?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo $next; ?>:</th>
+		<td><b><?php echo $bid3[$next]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>
+    <?php 
+    }else{
+	?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo 10; ?>:</th>
+		<td><b><?php echo $bid3[10]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>	
+	<?php
+	}}}
     ?>
 </table>
 

Templates/Build/31.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid31">
 <h1>City Wall <span class="level">Level <?php echo $village->resarray['f'.$id]; ?></span></h1>
 <p class="build_desc">By building a City Wall you can protect your village against the barbarian hordes of your enemies. The higher the wall's level, the higher the bonus given to your forces' defence.</p>
@@ -9,12 +13,20 @@
 		</tr><tr>
         <?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-			<th>Defence Bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
+			<th>Defence Bonus at level <?php echo $next; ?>:</th>
 
-			<td><b><?php echo $bid31[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<td><b><?php echo $bid31[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+		?>
+		<th>Defence Bonus at level 20:</th>
+		<td><b><?php echo $bid31[20]['attri']; ?></b> Percent</td>
+		<?php
+			}
+			}
             ?>
 		</tr></table>
 <?php 

Templates/Build/32.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid32">
 <h1>Earth Wall <span class="level">Level <?php echo $village->resarray['f'.$id]; ?></span></h1>
 <p class="build_desc">By building a Earth Wall you can protect your village against the barbarian hordes of your enemies. The higher the wall's level, the higher the bonus given to your forces' defence.</p>
@@ -9,12 +13,20 @@
 		</tr><tr>
         <?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-			<th>Defence Bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
+			<th>Defence Bonus at level <?php echo $next; ?>:</th>
 
-			<td><b><?php echo $bid32[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<td><b><?php echo $bid32[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+		?>
+		<th>Defence Bonus at level 20:</th>
+		<td><b><?php echo $bid32[20]['attri']; ?></b> Percent</td>
+		<?php
+			}
+			}
             ?>
 		</tr></table>
 <?php 

Templates/Build/33.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid33">
 <h1>Palisade <span class="level">Level <?php echo $village->resarray['f'.$id]; ?></span></h1>
 <p class="build_desc">By building a Palisade you can protect your village against the barbarian hordes of your enemies. The higher the wall's level, the higher the bonus given to your forces' defence.</p>
@@ -9,12 +13,20 @@
 		</tr><tr>
         <?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-			<th>Defence Bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
+			<th>Defence Bonus at level <?php echo $next; ?>:</th>
 
-			<td><b><?php echo $bid33[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<td><b><?php echo $bid33[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+		?>
+		<th>Defence Bonus at level 20:</th>
+		<td><b><?php echo $bid33[20]['attri']; ?></b> Percent</td>
+		<?php
+			}
+			}
             ?>
 		</tr></table>
 <?php 

Templates/Build/34.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid34"><a href="#" onClick="return Popup(34,4);" class="build_logo">
 	<img class="building g34" src="img/x.gif" alt="Stonemason's Lodge" title="Stonemason's Lodge" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-			<th>Stability bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid34[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Stability bonus at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid34[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Stability bonus at level 20:</th>
+			<td><b><?php echo $bid34[20]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/35.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid35"><a href="#" onClick="return Popup(35,4);" class="build_logo">
 	<img class="building g35" src="img/x.gif" alt="Brewery" title="Brewery" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=10){
         ?>
-			<th>Bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid35[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Bonus at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid35[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Bonus at level 10:</th>
+			<td><b><?php echo $bid35[10]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/36.tpl

@@ -1,25 +1,43 @@
-<div id="build" class="gid36"><h1>Vallenzetter <span class="level">Niveau 1</span></h1>
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
+<div id="build" class="gid36"><h1>Trapper <span class="level">Level <?php echo $village->resarray['f'.$id]; ?></span></h1>
 <p class="build_desc">
 	<a href="#" onClick="return Popup(36,4, 'gid');"
 		class="build_logo"> <img
 		class="building g36"
-		src="img/x.gif" alt="Vallenzetter"
-		title="Vallenzetter" /> </a>
-	Met goed verstopte vallen, beschermt de vallenzetter zijn dorp. Onachtzame aanvallers kunnen zo gevangen genomen worden en zijn geen gevaar meer voor het dorp.</p>
+		src="img/x.gif" alt="Trapper"
+		title="Trapper" /> </a>
+	The trapper protects your village with well hidden traps. This means that unwary enemies can be imprisoned and won't be able to harm your village anymore. </p>
 
 <table cellpadding="1" cellspacing="1" id="build_value">
 	<tr>
-		<th>Actuele maximale aantal</th>
+		<th>Currect maximum traps to train:</th>
 
-		<td><b>10</b> Vallen</td>
+		<td><b><?php echo $bid36[$village->resarray['f'.$id]]['attri']; ?></b> Traps</td>
 	</tr>
 	<tr>
-		<th>Maximale aantal bij niveau 2</th>
-		<td><b>22</b> Vallen</td>
+	<?php 
+        if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
+        ?>
+		<th>Maximum traps to train at level <?php echo $next; ?>:</th>
+		<td><b><?php echo $bid36[$next]['attri']; ?></b> Traps</td>
+        <?php
+            }else{
+		?>
+		<th>Maximum traps to train at level 20:</th>
+		<td><b><?php echo $bid36[20]['attri']; ?></b> Traps</td>
+		<?php
+			}
+			}
+        ?>
 
 	</tr>
 </table>
-<p>Je bezit op het moment <b>0</b> vallen, daarvan zijn er <b>0</b> bezet.</p>
+<p>Your currently have <b>0</b> traps, <b>0</b> of which are occupied.</p>
 <form method="POST" name="snd" action="build.php"><input type="hidden"
 	name="id" value="22" /> <input type="hidden"
 	name="z" value="17" /> <input type="hidden" name="a"
@@ -29,9 +47,9 @@
 	<thead>
 
 		<tr>
-			<td>Naam</td>
-			<td>Aantal</td>
-			<td>max</td>
+			<td>Name</td>
+			<td>Quantity</td>
+			<td>Max</td>
 		</tr>
 	</thead>
 	<tbody>
@@ -39,25 +57,25 @@
 		<tr>
 			<td class="desc">
 			<div class="tit"><img class="unit u99" src="img/x.gif"
-				alt="Val"
-				title="Val" /> <a href="#"
-				onClick="return Popup(36,4,'gid');">Vallen</a> <span class="info">(Aanwezig: 0)</span>
+				alt="Trap"
+				title="Trap" /> <a href="#"
+				onClick="return Popup(36,4,'gid');">Trap</a> <span class="info">(Available: 0)</span>
 			</div>
 			<div class="details">
 <span><img class="r1" src="img/x.gif"
-				alt="Hout" title="Hout" />20|</span><span><img class="r2" src="img/x.gif"
-				alt="Klei" title="Klei" />30|</span><span><img class="r3" src="img/x.gif"
-				alt="IJzer" title="IJzer" />10|</span><span><img class="r4" src="img/x.gif"
-				alt="Graan" title="Graan" />20|</span><span><img class="r5" src="img/x.gif" alt="Graanverbruik"
-				title="Graanverbruik" />0|<img class="clock" src="img/x.gif"
-				alt="duur" title="duur" />0:10:00</span>
+				alt="Lumber" title="Lumber" />20|</span><span><img class="r2" src="img/x.gif"
+				alt="Clay" title="Clay" />30|</span><span><img class="r3" src="img/x.gif"
+				alt="Iron" title="Iron" />10|</span><span><img class="r4" src="img/x.gif"
+				alt="Crop" title="Crop" />20|</span><span><img class="r5" src="img/x.gif" alt="Crop consumption"
+				title="Crop consumption" />0|<img class="clock" src="img/x.gif"
+				alt="Duration" title="Duration" />0:10:00</span>
 
 			</div>
 			</td>
 			<td class="val"><input type="text" class="text" name="t99" value="0"
 				maxlength="4"></td>
 			<td class="max"><a href="#"
-				onClick="document.snd.t99.value=10">(10)</a></td>
+				onClick="document.snd.t99.value=<?php echo $bid36[$village->resarray['f'.$id]]['attri']; ?>">(<?php echo $bid36[$village->resarray['f'.$id]]['attri']; ?>)</a></td>
 		</tr>
 	</tbody>
 </table>

Templates/Build/38.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid38"><a href="#" onClick="return Popup(38,4);" class="build_logo">
 	<img class="building g38" src="img/x.gif" alt="Great Warehouse" title="Great Warehouse" />
 </a>
@@ -13,11 +17,19 @@
 	<tr>
 <?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-		<th>Capacity at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-		<td><b><?php echo $bid38[$village->resarray['f'.$id]+1]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
+		<th>Capacity at level <?php echo $next ?>:</th>
+		<td><b><?php echo $bid38[$next]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
         <?php
-            }
+            }else{
+		?>
+		<th>Capacity at level 20:</th>
+		<td><b><?php echo $bid38[20]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
+		<?php
+			}
+			}
             ?>
 	</tr>
 	</table>

Templates/Build/39.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid39"><a href="#" onClick="return Popup(39,4);" class="build_logo">
 	<img class="building g39" src="img/x.gif" alt="Great Granary" title="Great Granary" />
 </a>
@@ -14,11 +18,19 @@
 	<tr>
 <?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=20){
         ?>
-		<th>Capacity at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-		<td><b><?php echo $bid39[$village->resarray['f'.$id]+1]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
+		<th>Capacity at level <?php echo $next ?>:</th>
+		<td><b><?php echo $bid39[$next]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
         <?php
-            }
+            }else{
+		?>
+		<th>Capacity at level 20:</th>
+		<td><b><?php echo $bid39[20]['attri']*STORAGE_MULTIPLIER; ?></b> units</td>
+		<?php
+			}
+			}
             ?>
 	</tr>
 	</table>

Templates/Build/4.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid4"><a href="#" onClick="return Popup(4,4);" class="build_logo">
 	<img class="building g4" src="img/x.gif" alt="<?php echo B4; ?>" title="<?php echo B4; ?>" />
 </a>
@@ -11,14 +15,39 @@
 	</tr>
 	<tr>
 	 <?php 
-   	 if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
-    	?>
+    if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+	$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+	if($village->capital == 1) {
+	if($next<=20){
+    ?>
 	<tr>
-		<th><?php echo NEXT_PROD; echo $village->resarray['f'.$id]+1; ?>:</th>
-		<td><b><?php echo $bid4[$village->resarray['f'.$id]+1]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+		<th><?php echo NEXT_PROD; echo $next; ?>:</th>
+		<td><b><?php echo $bid4[$next]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
 	</tr>
     <?php 
-    }
+    }else{
+	?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo 20; ?>:</th>
+		<td><b><?php echo $bid4[20]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>	
+	<?php
+	}}else{
+	if($next<=10){
+    ?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo $next; ?>:</th>
+		<td><b><?php echo $bid4[$next]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>
+    <?php 
+    }else{
+	?>
+	<tr>
+		<th><?php echo NEXT_PROD; echo 10; ?>:</th>
+		<td><b><?php echo $bid4[10]['prod']* SPEED; ?></b> <?php echo PER_HR; ?></td>
+	</tr>	
+	<?php
+	}}}
     ?>
 	</tr>
 </table>

Templates/Build/5.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid5"><a href="#" onClick="return Popup(5,4);" class="build_logo">
 	<img class="building g5" src="img/x.gif" alt="Sawmill" title="Sawmill" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=5){
         ?>
-			<th>Wood bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid5[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Wood bonus at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid5[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Wood bonus at level 5:</th>
+			<td><b><?php echo $bid5[5]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/6.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid6"><a href="#" onClick="return Popup(6,4);" class="build_logo">
 	<img class="building g6" src="img/x.gif" alt="Brickyard" title="Brickyard" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=5){
         ?>
-			<th>Clay bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid6[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Clay bonus at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid6[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Clay bonus at level 5:</th>
+			<td><b><?php echo $bid6[5]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/7.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid7"><a href="#" onClick="return Popup(7,4);" class="build_logo">
 	<img class="building g7" src="img/x.gif" alt="Iron Foundry" title="Iron Foundry" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=5){
         ?>
-			<th>Iron bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid7[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Iron bonus at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid7[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Iron bonus at level 5:</th>
+			<td><b><?php echo $bid7[5]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/8.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid8"><a href="#" onClick="return Popup(8,4);" class="build_logo">
 	<img class="building g8" src="img/x.gif" alt="Grain Mill" title="Grain Mill" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=5){
         ?>
-			<th>Crop bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid8[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Crop bonus at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid8[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Crop bonus at level 5:</th>
+			<td><b><?php echo $bid8[5]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>

Templates/Build/9.tpl

@@ -1,3 +1,7 @@
+<?php
+	$loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0;
+	$doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0;
+?>
 <div id="build" class="gid9"><a href="#" onClick="return Popup(9,4);" class="build_logo">
 	<img class="building g9" src="img/x.gif" alt="Bakery" title="Bakery" />
 </a>
@@ -13,11 +17,18 @@
 		<tr>
 		<?php 
         if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) {
+		$next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild;
+		if($next<=5){
         ?>
-			<th>Crop bonus at level <?php echo $village->resarray['f'.$id]+1; ?>:</th>
-			<td><b><?php echo $bid9[$village->resarray['f'.$id]+1]['attri']; ?></b> Percent</td>
+			<th>Crop bonus at level <?php echo $next; ?>:</th>
+			<td><b><?php echo $bid9[$next]['attri']; ?></b> Percent</td>
             <?php
-            }
+            }else{
+        ?>
+			<th>Crop bonus at level 5:</th>
+			<td><b><?php echo $bid9[5]['attri']; ?></b> Percent</td>
+            <?php
+			}}
             ?>
 		</tr>
 	</table>