diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 1dbb31ae..5a840a21 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -946,6 +946,41 @@ class Automation { $toF = $database->getVillage($data['to']); $fromF = $database->getVillage($data['from']); + $DefenderUnit = array(); + $DefenderUnit = $database->getUnit($data['to']); + $evasion = $database->getVillageField($data['to'],"evasion"); + $maxevasion = $database->getUserField($DefenderID,"maxevasion",0); + $gold = $database->getUserField($DefenderID,"gold",0); + $playerunit = ($targettribe-1)*10; + $cannotsend = 0; + $movements = $database->getMovement("34",$data['to'],1); + for($y=0;$y < count($movements);$y++){ + $returntime = $units[$y]['endtime']-time(); + if($units[$y]['sort_type'] == 4 && $units[$y]['from'] != 0 && $returntime <= 10){ + $cannotsend = 1; + } + } + if($evasion == 1 && $maxevasion > 0 && $gold > 1 && $cannotsend == 0){ + $totaltroops = 0; + for($i=1;$i<=10;$i++){ + $playerunit += $i; + $data['u'.$i] = $DefenderUnit['u'.$playerunit]; + $database->modifyUnit($data['to'],array($playerunit),array($DefenderUnit['u'.$playerunit]),array(0)); + $playerunit -= $i; + $totaltroops += $data['u'.$i]; + } + $data['u11'] = $DefenderUnit['hero']; + $totaltroops += $data['u11']; + if($totaltroops > 0){ + $database->modifyUnit($data['to'],array("hero"),array($DefenderUnit['hero']),array(0)); + $attackid = $database->addAttack($data['to'],$data['u1'],$data['u2'],$data['u3'],$data['u4'],$data['u5'],$data['u6'],$data['u7'],$data['u8'],$data['u9'],$data['u10'],$data['u11'],4,0,0,0,0,0,0,0,0,0,0,0); + $database->addMovement(4,0,$data['to'],$attackid,time(),time()+(180/EVASION_SPEED)); + $newgold = $gold-2; + $newmaxevasion = $maxevasion-1; + $database->updateUserField($DefenderID, "gold", $newgold, 1); + $database->updateUserField($DefenderID, "maxevasion", $newmaxevasion, 1); + } + } //get defence units $Defender = array(); $rom = $ger = $gal = $nat = $natar = 0; $Defender = $database->getUnit($data['to']); @@ -2571,7 +2606,8 @@ $crannyimg = "getTrainingList(); - if(count($trainlist) > 0) { - foreach($trainlist as $train) { - $database->updateTraining($train['id'],0); - $trained = 0; - - $timepast = $train['timestamp'] - $time; - $trained = $timepast-($train['amt']-1)*$train['eachtime']; + if(count($trainlist) > 0){ + foreach($trainlist as $train){ + $timepast = $train['timestamp2'] - $time; $pop = $train['pop']; - if($trained <= 0){ + if($timepast <= 0 && $train['amt'] > 0) { if($train['unit']>60 && $train['unit']!=99){ $database->modifyUnit($train['vref'],array($train['unit']-60),array(1),array(1)); }else{ $database->modifyUnit($train['vref'],array($train['unit']),array(1),array(1)); } - $database->updateTraining($train['id'],1); + $database->updateTraining($train['id'],1,$train['eachtime']); + } + if($train['amt'] == 0){ + $database->trainUnit($train['id'],0,0,0,0,1,1); } - if($timepast < 0) { - $database->trainUnit($train['id'],0,0,0,0,1,1); - } } } if(file_exists("GameEngine/Prevention/training.txt")) { diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index 1dd5b991..c3678b69 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -2061,6 +2061,9 @@ case 7: $q = "SELECT * FROM " . TB_PREFIX . "movement where " . TB_PREFIX . "movement." . $where . " = $village and sort_type = 4 and ref = 0 and proc = 0 ORDER BY endtime ASC"; break; + case 8: + $q = "SELECT * FROM " . TB_PREFIX . "movement, " . TB_PREFIX . "attacks where " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 4 OR " . TB_PREFIX . "movement." . $where . " = $village and sort_type = 4 and ref = 0 and proc = 0 ORDER BY endtime ASC"; + break; case 34: $q = "SELECT * FROM " . TB_PREFIX . "movement, " . TB_PREFIX . "attacks where " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 3 or " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 4 ORDER BY endtime ASC"; break; @@ -2159,6 +2162,31 @@ return NULL; } } + + function getUnitsNumber($vid) { + $q = "SELECT * from " . TB_PREFIX . "units where vref = $vid"; + $result = mysql_query($q, $this->connection); + $dbarray = mysql_fetch_assoc($result); + $totalunits = 0; + $movingunits = $this->getVillageMovement($vid); + for($i=1;$i<=50;$i++){ + $totalunits += $dbarray['u'.$i]; + } + $totalunits += $dbarray['hero']; + $movingunits = $this->getVillageMovement($vid); + $reinforcingunits = $this->getEnforceArray($vid,1); + $owner = $this->getVillageField($vid,"owner"); + $ownertribe = $this->getUserField($owner,"tribe",0); + $start = ($ownertribe-1)*10+1; + $end = ($ownertribe*10); + for($i=$start;$i<=$end;$i++){ + $totalunits += $movingunits['u'.$i]; + $totalunits += $reinforcingunits['u'.$i]; + } + $totalunits += $movingunits['hero']; + $totalunits += $reinforcingunits['hero']; + return $totalunits; + } function getHero($uid=0,$all=0) { if ($all) { @@ -2295,7 +2323,7 @@ $now = time(); $uid = $this->getVillageField($vid, "owner"); - + $oldeach = $each; $artefact = count($this->getOwnUniqueArtefactInfo2($uid,5,3,0)); $artefact1 = count($this->getOwnUniqueArtefactInfo2($vid,5,1,1)); $artefact2 = count($this->getOwnUniqueArtefactInfo2($uid,5,2,0)); @@ -2315,18 +2343,25 @@ $each = round($each); } if($each == 0){ $each = 1; } + $time2 = $now+$each; if(count($queued) > 0) { $time += $queued[count($queued) - 1]['timestamp'] - $now; + $time2 += $queued[count($queued) - 1]['timestamp'] - $now; } - $q = "INSERT INTO " . TB_PREFIX . "training values (0,$vid,$unit,$amt,$pop,$time,$each)"; + if($queued[count($queued) - 1]['unit'] == $unit){ + $time = $amt*$oldeach; + $q = "UPDATE " . TB_PREFIX . "training SET amt = amt + $amt, timestamp = timestamp + $time WHERE id = ".$queued[count($queued) - 1]['id'].""; + }else{ + $q = "INSERT INTO " . TB_PREFIX . "training values (0,$vid,$unit,$amt,$pop,$time,$each,$time2)"; + } } else { $q = "DELETE FROM " . TB_PREFIX . "training where id = $vid"; } return mysql_query($q, $this->connection); } - function updateTraining($id, $trained) { - $q = "UPDATE " . TB_PREFIX . "training set amt = amt - $trained where id = $id"; + function updateTraining($id, $trained, $each) { + $q = "UPDATE " . TB_PREFIX . "training set amt = amt - $trained,timestamp2 = timestamp2 + $each where id = $id"; return mysql_query($q, $this->connection); } @@ -3084,6 +3119,8 @@ return $casualties; } + //end general statistics + function addFriend($uid, $column, $friend) { $q = "UPDATE " . TB_PREFIX . "users SET $column = $friend WHERE id = $uid"; return mysql_query($q, $this->connection); @@ -3113,8 +3150,17 @@ } } } - } + } + function setVillageEvasion($vid) { + $village = $this->getVillage($vid); + if($village['evasion'] == 0){ + $q = "UPDATE " . TB_PREFIX . "vdata SET evasion = 1 WHERE wref = $vid"; + }else{ + $q = "UPDATE " . TB_PREFIX . "vdata SET evasion = 0 WHERE wref = $vid"; + } + return mysql_query($q, $this->connection); + } } ; diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php index 2dd34952..14ed3b00 100644 --- a/GameEngine/Technology.php +++ b/GameEngine/Technology.php @@ -420,7 +420,6 @@ class Technology { $upkeep /= 4; $upkeep = round($upkeep); $upkeep *= 3; - $upkeep = round($upkeep); } return $upkeep; } diff --git a/Templates/Build/16_99.tpl b/Templates/Build/16_99.tpl index 91a62fa6..8eeb44f3 100644 --- a/Templates/Build/16_99.tpl +++ b/Templates/Build/16_99.tpl @@ -20,5 +20,57 @@ if(!$session->goldclub) {
+
+ + + + + + + + + + + + + + + + + + villages)-1;$i++) { + $wref = $session->villages[$i]; + $vname = $database->getVillageField($wref,"name"); + $vchecked = $database->getVillageField($wref,"evasion"); + $reinf = $database->getEnforceVillage($wref,0); + if($vchecked == 1){ $checked = 'checked'; }else{ $checked = ''; } + ?> + + + + + + + + + + getUserArray($session->uid, 1); + ?> + +
evasion settings
villageown troopsreinforcement
>getUnitsNumber($wref); ?>
+
+
+ + Send troops away a maximun of times + (costs: Gold2 per evasion) + + + +

merchantAvail()) { echo "DISABLED"; }?>/>

+ + \ No newline at end of file diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl index 42f6749b..278ee30d 100644 --- a/Templates/Build/16_incomming.tpl +++ b/Templates/Build/16_incomming.tpl @@ -136,7 +136,6 @@ if ($units[$y]['sort_type']==3){ $to = $database->getMInfo($units[$y]['vref']); -if($units[$y]['from'] != 0){ ?> @@ -205,76 +204,6 @@ if($units[$y]['from'] != 0){
- - - - - - - - - tribe; - $start = ($tribe-1)*10+1; - $end = ($tribe*10); - echo ""; - for($i=$start;$i<=($end);$i++) { - echo ""; - } - if($units[$y]['t11'] != 0) { - echo ""; - } - ?> - - - 0"; - } - else { - echo ""; - } - } - ?> - - - - - - - - - - - - - -
?">
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops"; - echo $units[$y]['t'.$i]."
Bounty"> - \"Lumber\"".$res['wood']."\"Clay\"".$res['clay']."\"Iron\"".$res['iron']."\"Crop\"".$res['crop'].""; - echo "
\"carry\"".$totalres."/".$totalcarry."
"; - ?> -
Arrival"> - ".$generator->getTimeFormat($units[$y]['endtime']-time())." h"; - $datetime = $generator->procMtime($units[$y]['endtime']); - echo "
"; - if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; - } - echo "at ".$datetime[1]."
"; - ?> - -
-"; echo $train['amt']." ".$train['name'].""; if ($TrainCount == 1 ) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); + $NextFinished = $generator->getTimeFormat($train['timestamp2']-time()); echo "".$generator->getTimeFormat($train['timestamp']-time()).""; } else { echo $generator->getTimeFormat($train['eachtime']*$train['amt']); diff --git a/Templates/Build/20.tpl b/Templates/Build/20.tpl index a712684e..681dfbd9 100644 --- a/Templates/Build/20.tpl +++ b/Templates/Build/20.tpl @@ -50,7 +50,7 @@ echo "\"".$train['name']."\""; echo $train['amt']." ".$train['name'].""; if ($TrainCount == 1) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); + $NextFinished = $generator->getTimeFormat($train['timestamp2']-time()); echo "".$generator->getTimeFormat($train['timestamp']-time()).""; } else { echo $generator->getTimeFormat($train['eachtime']*$train['amt']); diff --git a/Templates/Build/21.tpl b/Templates/Build/21.tpl index 0616473b..369d82fb 100644 --- a/Templates/Build/21.tpl +++ b/Templates/Build/21.tpl @@ -104,7 +104,7 @@ echo "\"".$train['name']."\""; echo $train['amt']." ".$train['name'].""; if ($TrainCount == 1 ) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); + $NextFinished = $generator->getTimeFormat($train['timestamp2']-time()); echo "".$generator->getTimeFormat($train['timestamp']-time()).""; } else { echo $generator->getTimeFormat($train['eachtime']*$train['amt']); diff --git a/Templates/Build/25_progress.tpl b/Templates/Build/25_progress.tpl index baac5a49..44c9397a 100644 --- a/Templates/Build/25_progress.tpl +++ b/Templates/Build/25_progress.tpl @@ -16,7 +16,7 @@ echo "\"".$train['name']."\""; echo $train['amt']." ".$train['name'].""; if ($TrainCount == 1 ) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); + $NextFinished = $generator->getTimeFormat($train['timestamp2']-time()); echo "".$generator->getTimeFormat($train['timestamp']-time()).""; } else { echo $generator->getTimeFormat($train['eachtime']*$train['amt']); diff --git a/Templates/Build/26_progress.tpl b/Templates/Build/26_progress.tpl index baac5a49..44c9397a 100644 --- a/Templates/Build/26_progress.tpl +++ b/Templates/Build/26_progress.tpl @@ -16,7 +16,7 @@ echo "\"".$train['name']."\""; echo $train['amt']." ".$train['name'].""; if ($TrainCount == 1 ) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); + $NextFinished = $generator->getTimeFormat($train['timestamp2']-time()); echo "".$generator->getTimeFormat($train['timestamp']-time()).""; } else { echo $generator->getTimeFormat($train['eachtime']*$train['amt']); diff --git a/Templates/Build/29.tpl b/Templates/Build/29.tpl index 36b71c1c..b9b6f496 100644 --- a/Templates/Build/29.tpl +++ b/Templates/Build/29.tpl @@ -39,7 +39,7 @@ echo "\"".$train['name']."\""; echo $train['amt']." ".$train['name'].""; if ($TrainCount == 1 ) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); + $NextFinished = $generator->getTimeFormat($train['timestamp2']-time()); echo "".$generator->getTimeFormat($train['timestamp']-time()).""; } else { echo $generator->getTimeFormat($train['eachtime']*$train['amt']); diff --git a/Templates/Build/30.tpl b/Templates/Build/30.tpl index 0cf6b38f..7aeede76 100644 --- a/Templates/Build/30.tpl +++ b/Templates/Build/30.tpl @@ -39,7 +39,7 @@ echo "\"".$train['name']."\""; echo $train['amt']." ".$train['name'].""; if ($TrainCount == 1 ) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); + $NextFinished = $generator->getTimeFormat($train['timestamp2']-time()); echo "".$generator->getTimeFormat($train['timestamp']-time()).""; } else { echo $generator->getTimeFormat($train['eachtime']*$train['amt']); diff --git a/Templates/Build/42.tpl b/Templates/Build/42.tpl index dbd2d9f6..d5427f58 100644 --- a/Templates/Build/42.tpl +++ b/Templates/Build/42.tpl @@ -39,7 +39,7 @@ echo "\"".$train['name']."\""; echo $train['amt']." ".$train['name'].""; if ($TrainCount == 1 ) { - $NextFinished = $generator->getTimeFormat(($train['timestamp']-time())-($train['amt']-1)*$train['eachtime']); + $NextFinished = $generator->getTimeFormat($train['timestamp2']-time()); echo "".$generator->getTimeFormat($train['timestamp']-time()).""; } else { echo $generator->getTimeFormat($train['eachtime']*$train['amt']); diff --git a/Templates/a2b/newdorf.tpl b/Templates/a2b/newdorf.tpl index 97aa9475..51ce3492 100644 --- a/Templates/a2b/newdorf.tpl +++ b/Templates/a2b/newdorf.tpl @@ -76,7 +76,7 @@ $cps = $session->cp; if($cps >= $need_cps) { ?> - + - +

getError("error"); ?>

diff --git a/Templates/goldClub/farmlist_editraid.tpl b/Templates/goldClub/farmlist_editraid.tpl index 600b1917..04d37997 100644 --- a/Templates/goldClub/farmlist_editraid.tpl +++ b/Templates/goldClub/farmlist_editraid.tpl @@ -18,7 +18,7 @@ $oasistype = $type['oasistype']; $vdata = $database->getVillage($Wref); $villageOwner = $database->getVillageField($Wref,'owner'); $userAccess = $database->getUserField($villageOwner,'access',0); -}elseif($_POST['x']!="" && $_POST['y']!="" && is_numeric($_POST['x']) && is_numeric($_POST['y'])){{ +}elseif($_POST['x']!="" && $_POST['y']!="" && is_numeric($_POST['x']) && is_numeric($_POST['y'])){ $Wref = $database->getVilWref($_POST['x'], $_POST['y']); $WrefX = $_POST['x']; $WrefY = $_POST['y']; @@ -72,7 +72,6 @@ $troops = "".$_POST['t1']."+".$_POST['t2']."+".$_POST['t3']."+".$_POST['t4']."+" header("Location: build.php?id=39&t=99"); } } -} if($FLData['owner'] == $session->uid){ ?> diff --git a/Templates/movement.tpl b/Templates/movement.tpl index 132551e3..6df80feb 100644 --- a/Templates/movement.tpl +++ b/Templates/movement.tpl @@ -9,7 +9,7 @@ ## ## ################################################################################# -$aantal=(count($database->getMovement(4,$village->wid,1))+count($database->getMovement(4,$village->wid,0))+count($database->getMovement(3,$village->wid,1))+count($database->getMovement(3,$village->wid,0))); +$aantal=(count($database->getMovement(4,$village->wid,1))+count($database->getMovement(4,$village->wid,0))+count($database->getMovement(3,$village->wid,1))+count($database->getMovement(3,$village->wid,0))+count($database->getMovement(7,$village->wid,1))); if($aantal > 0){ echo ''; } @@ -32,6 +32,22 @@ if($aantal > 0){ $timer += 1; } +/* Units coming back from evasion */ +$aantal = count($database->getMovement(7,$village->wid,1)); +$aantal2 = $database->getMovement(7,$village->wid,1); +if($aantal > 0){ + foreach($aantal2 as $receive) { + $action = 'def1'; + $aclass = 'd1'; + $title = ''.ARRIVING_REINF_TROOPS.''; + $short = ''.ARRIVING_REINF_TROOPS_SHORT.''; + $NextArrival[] = $receive['endtime']; + } + echo ' + '; + $timer += 1; +} + /* attack/raid on you! */ $aantal = count($database->getMovement(3,$village->wid,1)); $aantal2 = $database->getMovement(3,$village->wid,1); diff --git a/build.php b/build.php index 7039efb2..d27a00be 100644 --- a/build.php +++ b/build.php @@ -193,6 +193,26 @@ if($session->goldclub == 1 && $session->access != BANNED){ if($_POST['action'] == 'startRaid'){ include ("Templates/a2b/startRaid.tpl"); } + + if(isset($_GET['slid']) && is_numeric($_GET['slid'])) { + $FLData = $database->getFLData($_GET['slid']); + if($FLData['owner'] == $session->uid){ + $checked[$_GET['slid']] = 1; + } + } + + if(isset($_GET['evasion']) && is_numeric($_GET['evasion'])) { + $evasionvillage = $database->getVillage($_GET['evasion']); + if($evasionvillage['owner'] == $session->uid){ + $database->setVillageEvasion($_GET['evasion']); + } + header("Location: build.php?id=39&t=99"); + } + + if(isset($_POST['maxevasion']) && is_numeric($_POST['maxevasion'])) { + $database->updateUserField($session->uid, "maxevasion", $_POST['maxevasion'], 1); + header("Location: build.php?id=39&t=99"); + } } }else{ $create = 0; diff --git a/dorf2.php b/dorf2.php index 50ad139d..a13b1680 100644 --- a/dorf2.php +++ b/dorf2.php @@ -70,7 +70,7 @@ header("Location: banned.php");
-

vname; if($village->loyalty!='100'){ if($village->loyalty>'33'){ $color="gr"; }else{ $color="re"; } ?>
loyalty); ?>%

+

vname; if($village->loyalty!='100'){ if($village->loyalty>'33'){ $color="green"; }else{ $color="red"; } ?>
loyalty); ?>%

NewBuilding) { include("Templates/Building.tpl"); diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl index 40be368b..c2ee07d4 100644 --- a/install/data/constant_format.tpl +++ b/install/data/constant_format.tpl @@ -57,6 +57,9 @@ define("GP_LOCATE", "gpack/travian_default/"); // Values: 1 (normal), 3 (3x speed) etc... define("INCREASE_SPEED","%INCSPEED%"); +// ***** Evasion Speed +define("EVASION_SPEED","%EVASIONSPEED%"); + // ***** Trader capacity // Values: 1 (normal), 3 (3x speed) etc... define("TRADER_CAPACITY","%TRADERCAP%"); diff --git a/install/data/sql.sql b/install/data/sql.sql index a564f25f..866d2c83 100644 --- a/install/data/sql.sql +++ b/install/data/sql.sql @@ -1230,6 +1230,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%training` ( `pop` int(10) unsigned NOT NULL, `timestamp` int(10) unsigned NOT NULL, `eachtime` int(10) unsigned NOT NULL, + `timestamp2` int(10) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1394,6 +1395,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` ( `friend17wait` int(10) unsigned NOT NULL, `friend18wait` int(10) unsigned NOT NULL, `friend19wait` int(10) unsigned NOT NULL, + `maxevasion` mediumint(3) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ; @@ -1436,6 +1438,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%vdata` ( `created` int(11) NOT NULL, `natar` tinyint(1) unsigned NOT NULL, `starv` int(10) unsigned NOT NULL, +`evasion` tinyint(1) unsigned NOT NULL, PRIMARY KEY (`wref`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; diff --git a/install/process.php b/install/process.php index cdedd3a4..398a0f70 100644 --- a/install/process.php +++ b/install/process.php @@ -41,6 +41,7 @@ $text = preg_replace("'%LANG%'", $_POST['lang'], $text); $text = preg_replace("'%SPEED%'", $_POST['speed'], $text); $text = preg_replace("'%INCSPEED%'", $_POST['incspeed'], $text); + $text = preg_replace("'%EVASIONSPEED%'", $_POST['evasionspeed'], $text); $text = preg_replace("'%TRADERCAP%'", $_POST['tradercap'], $text); $text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text); $text = preg_replace("'%UTRACK%'", $_POST['trackusers'], $text); diff --git a/install/templates/config.tpl b/install/templates/config.tpl index 6ae279c8..71835a81 100644 --- a/install/templates/config.tpl +++ b/install/templates/config.tpl @@ -11,7 +11,8 @@ echo "
Error creating constant.php
'.TROOP_MOVEMENTS.'
'.$title.'»
'.$aantal.' '.$short.'
in '.$generator->getTimeFormat(min($NextArrival)-time()).' '.HOURS.'
- + +
Server name:
Server speed:
Troop speed:
Troop speed:
Evasion speed:
Trader capacity (1 = 1x...):
World size: