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/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>