diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 97f5c92b..27ecab5b 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -1627,7 +1627,7 @@ class Automation { $cranny = 0; for($i=19;$i<39;$i++){ if($buildarray['f'.$i.'t']==23){ - $cranny += $bid23[$buildarray['f'.$i.'']]['attri']; + $cranny += $bid23[$buildarray['f'.$i.'']]['attri']*CRANNY_CAPACITY; } } diff --git a/Templates/Build/23.tpl b/Templates/Build/23.tpl index 8e737548..9b07674b 100644 --- a/Templates/Build/23.tpl +++ b/Templates/Build/23.tpl @@ -37,11 +37,11 @@ include("next.tpl"); tribe == 3) { ?> - resarray['f'.$id]]['attri']*2; ?> units + resarray['f'.$id]]['attri']*2*CRANNY_CAPACITY; ?> units - resarray['f'.$id]]['attri']; ?> units + resarray['f'.$id]]['attri']*CRANNY_CAPACITY; ?> units @@ -55,11 +55,11 @@ include("next.tpl"); tribe == 3) { ?> - resarray['f'.$id]+1+$loopsame+$doublebuild+$master]['attri']*2*$artefact_bouns*$good_effect/$bad_effect; ?> units + resarray['f'.$id]+1+$loopsame+$doublebuild+$master]['attri']*2*CRANNY_CAPACITY*$artefact_bouns*$good_effect/$bad_effect; ?> units - resarray['f'.$id]+1+$loopsame+$doublebuild+$master]['attri']*$artefact_bouns*$good_effect/$bad_effect; ?> units + resarray['f'.$id]+1+$loopsame+$doublebuild+$master]['attri']*CRANNY_CAPACITY*$artefact_bouns*$good_effect/$bad_effect; ?> units @@ -67,11 +67,11 @@ include("next.tpl"); tribe == 3) { ?> - units + units - units + units diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl index ca63e31c..10ecb25d 100644 --- a/install/data/constant_format.tpl +++ b/install/data/constant_format.tpl @@ -64,6 +64,9 @@ define("EVASION_SPEED","%EVASIONSPEED%"); // Values: 1 (normal), 3 (3x speed) etc... define("TRADER_CAPACITY","%TRADERCAP%"); +// ***** Cranny capacity +define("CRANNY_CAPACITY","%CRANNYCAP%"); + // ***** 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 f74139dd..6dddc4e7 100644 --- a/install/process.php +++ b/install/process.php @@ -43,6 +43,7 @@ class Process { $text = preg_replace("'%INCSPEED%'", $_POST['incspeed'], $text); $text = preg_replace("'%EVASIONSPEED%'", $_POST['evasionspeed'], $text); $text = preg_replace("'%TRADERCAP%'", $_POST['tradercap'], $text); + $text = preg_replace("'%CRANNYCAP%'", $_POST['crannycap'], $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 2a0362fd..89761609 100644 --- a/install/templates/config.tpl +++ b/install/templates/config.tpl @@ -13,7 +13,8 @@ echo "
Error creating constant.php Server speed: Troop speed: Evasion speed: - Trader capacity (1 = 1x...): + Trader capacity (1 = 1x...): + Cranny capacity: World size: