From 73778f37e2331aecd3f6cbe94a980de8f7d6775f Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Mon, 15 Apr 2013 12:40:17 +0300
Subject: [PATCH] add traper capacity

---
 Templates/Build/36.tpl           | 10 +++++-----
 install/data/constant_format.tpl |  2 ++
 install/process.php              |  1 +
 install/templates/config.tpl     |  1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Templates/Build/36.tpl b/Templates/Build/36.tpl
index 5f1f9f2c..726622ba 100644
--- a/Templates/Build/36.tpl
+++ b/Templates/Build/36.tpl
@@ -14,7 +14,7 @@ include("next.tpl");
 	<tr>
 		<th>Currect maximum traps to train:</th>
 
-		<td><b><?php echo $bid36[$village->resarray['f'.$id]]['attri']; ?></b> Traps</td>
+		<td><b><?php echo $bid36[$village->resarray['f'.$id]]['attri']*TRAPPER_CAPACITY; ?></b> Traps</td>
 	</tr>
 	<tr>
 	<?php 
@@ -23,12 +23,12 @@ include("next.tpl");
 		if($next<=20){
         ?>
 		<th>Maximum traps to train at level <?php echo $next; ?>:</th>
-		<td><b><?php echo $bid36[$next]['attri']; ?></b> Traps</td>
+		<td><b><?php echo $bid36[$next]['attri']*TRAPPER_CAPACITY; ?></b> Traps</td>
         <?php
             }else{
 		?>
 		<th>Maximum traps to train at level 20:</th>
-		<td><b><?php echo $bid36[20]['attri']; ?></b> Traps</td>
+		<td><b><?php echo $bid36[20]['attri']*TRAPPER_CAPACITY; ?></b> Traps</td>
 		<?php
 			}
 			}
@@ -66,7 +66,7 @@ include("next.tpl");
 				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" /><?php $dur=$generator->getTimeFormat(round(${'u99'}['time'] * ($bid19[$village->resarray['f'.$id]]['attri'] / 100) / SPEED)); 
+				alt="Duration" title="Duration" /><?php $dur=$generator->getTimeFormat(round(${'u99'}['time'] * ($bid19[$village->resarray['f'.$id]]['attri']*TRAPPER_CAPACITY / 100) / SPEED)); 
 				echo ($dur=="0:00:00")? "0:00:01":$dur; ?></span>
 
 			</div>
@@ -81,7 +81,7 @@ include("next.tpl");
 			$max1 = 0;
 			for($i=19;$i<41;$i++){
 			if($village->resarray['f'.$i.'t'] == 36){
-			$max1 += $bid36[$village->resarray['f'.$i]]['attri'];
+			$max1 += $bid36[$village->resarray['f'.$i]]['attri']*TRAPPER_CAPACITY;
 			}
 			}
 			if($max > $max1 - ($village->unitarray['u99'] + $train_amt)){
diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl
index 10ecb25d..d1a3eb5a 100644
--- a/install/data/constant_format.tpl
+++ b/install/data/constant_format.tpl
@@ -67,6 +67,8 @@ define("TRADER_CAPACITY","%TRADERCAP%");
 // ***** Cranny capacity
 define("CRANNY_CAPACITY","%CRANNYCAP%");
 
+// ***** Trapper capacity
+define("TRAPPER_CAPACITY","%TRAPPERCAP%");
 
 // ***** Village Expand
 // 1 = slow village expanding - more Cultural Points needed for every new village
diff --git a/install/process.php b/install/process.php
index 6dddc4e7..4ad31b93 100644
--- a/install/process.php
+++ b/install/process.php
@@ -44,6 +44,7 @@ class Process {
 		$text = preg_replace("'%EVASIONSPEED%'", $_POST['evasionspeed'], $text);
 		$text = preg_replace("'%TRADERCAP%'", $_POST['tradercap'], $text);
 		$text = preg_replace("'%CRANNYCAP%'", $_POST['crannycap'], $text);
+		$text = preg_replace("'%TRAPPERCAP%'", $_POST['trappercap'], $text);
 		$text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text);
 		$text = preg_replace("'%UTRACK%'", $_POST['trackusers'], $text);
 		$text = preg_replace("'%UTOUT%'", $_POST['timeout'], $text);
diff --git a/install/templates/config.tpl b/install/templates/config.tpl
index 89761609..2ac0c8e7 100644
--- a/install/templates/config.tpl
+++ b/install/templates/config.tpl
@@ -15,6 +15,7 @@ echo "<div class=\"headline\"><span class=\"f10 c5\">Error creating constant.php
 	<td><span class="f9 c6">Evasion speed:</span></td><td><input name="evasionspeed" type="text" id="evasionspeed" value="1" size="2"></td></tr><tr>
 	<td><span class="f9 c6">Trader capacity (1 = 1x...):</span></td><td width="140"><input type="text" name="tradercap" id="tradercap" value="1" size="2"></td>
 	<td><span class="f9 c6">Cranny capacity:</span></td><td width="140"><input type="text" name="crannycap" id="crannycap" value="1" size="2"></td></tr><tr>
+	<td><span class="f9 c6">Cranny capacity:</span></td><td width="140"><input type="text" name="trappercap" id="trappercap" value="1" size="2"></td></tr><tr>
 	<td><span class="f9 c6">World size:</span></td><td>
 				<select name="wmax">
 				<option value="10">10x10</option>