diff --git a/GameEngine/Battle.php b/GameEngine/Battle.php index 6a65c4c2..29e6640a 100644 --- a/GameEngine/Battle.php +++ b/GameEngine/Battle.php @@ -287,47 +287,47 @@ class Battle { $cdp *= $defenderhero['db']; } } - $DefendersAll = $database->getEnforceVillage($DefenderWref,0); - if(!empty($DefendersAll) && $DefenderWref>0){ - foreach($DefendersAll as $defenders) { - for ($i=1;$i<=50;$i++) {$def_ab[$i]=0;} - $fromvillage = $defenders['from']; - $enforcetribe = $database->getUserField($database->getVillageField($fromvillage,"owner"),"tribe",0); - $ud=($enforcetribe-1)*10; - if($defenders['from']>0) { //don't check nature tribe - $armory = $database->getABTech($defenders['from']); // Armory level every village enforcement - $def_ab[$ud+1] = $armory['a1']; - $def_ab[$ud+2] = $armory['a2']; - $def_ab[$ud+3] = $armory['a3']; - $def_ab[$ud+4] = $armory['a4']; - $def_ab[$ud+5] = $armory['a5']; - $def_ab[$ud+6] = $armory['a6']; - $def_ab[$ud+7] = $armory['a7']; - $def_ab[$ud+8] = $armory['a8']; - } - if ($type==1) { - $datadefScout=$this->getDataDefScout($Defender,$def_ab,$defender_artefact,$AttackerWref,$AttackerID); - $dp+=$datadefScout['dp']; - $cdp+=$datadefScout['cdp']; - $involve=$datadefScout['involve']; - if ($datadefScout['detect']==1) $detected = 1; - }else{ - $datadef=$this->getDataDef($Defenders,$def_ab); - $dp+=$datadef['dp']; - $cdp+=$datadef['cdp']; - $involve=$datadef['involve']; - } - $reinfowner = $database->getVillageField($fromvillage,"owner"); - $defhero = $this->getBattleHero($reinfowner); - //calculate def hero from enforcement - if($defenders['hero'] != 0){ - $cdp += $defhero['dc']; - $dp += $defhero['di']; - $dp *= $defhero['db']; - $cdp *= $defhero['db']; - } - } - } + $DefendersAll = $database->getEnforceVillage($DefenderWref,0); + if(!empty($DefendersAll) && $DefenderWref>0){ + foreach($DefendersAll as $defenders) { + for ($i=1;$i<=50;$i++) {$def_ab[$i]=0;} + $fromvillage = $defenders['from']; + $enforcetribe = $database->getUserField($database->getVillageField($fromvillage,"owner"),"tribe",0); + $ud=($enforcetribe-1)*10; + if($defenders['from']>0) { //don't check nature tribe + $armory = $database->getABTech($defenders['from']); // Armory level every village enforcement + $def_ab[$ud+1] = $armory['a1']; + $def_ab[$ud+2] = $armory['a2']; + $def_ab[$ud+3] = $armory['a3']; + $def_ab[$ud+4] = $armory['a4']; + $def_ab[$ud+5] = $armory['a5']; + $def_ab[$ud+6] = $armory['a6']; + $def_ab[$ud+7] = $armory['a7']; + $def_ab[$ud+8] = $armory['a8']; + } + if ($type==1) { + $datadefScout=$this->getDataDefScout($defenders,$def_ab,$defender_artefact,$AttackerWref,$AttackerID); + $dp+=$datadefScout['dp']; + $cdp+=$datadefScout['cdp']; + $involve=$datadefScout['involve']; + if ($datadefScout['detect']==1) $detected = 1; + }else{ + $datadef=$this->getDataDef($defenders,$def_ab); + $dp+=$datadef['dp']; + $cdp+=$datadef['cdp']; + $involve=$datadef['involve']; + } + $reinfowner = $database->getVillageField($fromvillage,"owner"); + $defhero = $this->getBattleHero($reinfowner); + //calculate def hero from enforcement + if($defenders['hero'] != 0){ + //$cdp += $defhero['dc']; + //$dp += $defhero['di']; + $dp *= $defhero['db']; + $cdp *= $defhero['db']; + } + } + } // Calculate the total number of points Attacker $start = ($att_tribe-1)*10+1; $end = ($att_tribe*10); diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index 1a224535..c6b3a426 100644 --- a/GameEngine/Lang/en.php +++ b/GameEngine/Lang/en.php @@ -482,6 +482,33 @@ define("FOUNDNEWVILLAGE","Founding New village"); define("UNDERATTACK","The village is under attack"); define("OASISATTACK","The Oasis is under attack"); define("OASISATTACKS","Oasis Att."); +define("RETURNFROM","Return from"); +define("REINFORCEMENTFOR","Reinforcement to"); +define("ATTACK_ON","Attack to"); +define("RAID_ON","Raid to"); +define("SCOUTING","Scouting"); +define("PRISONERS","Prisioners"); +define("PRISONERSIN","Prisioners in"); +define("PRISONERSFROM","Prisioners from"); +define("TROOPS","Troops"); +define("TROOPSFROM","Troops"); +define("BOUNTY","Bounty"); +define("ARRIVAL","Arrival"); +define("INCOMING_TROOPS","Incoming Troops"); +define("TROOPS_ON_THEIR_WAY","Troops on their way"); +define("OWN_TROOPS","Own troops"); +define("ON","on"); +define("AT","at"); +define("UPKEEP","Upkeep"); +define("SEND_BACK","Send back"); +define("TROOPS_IN_THE_VILLAGE","Troops in the village"); +define("TROOPS_IN_OTHER_VILLAGE","Troops in other village"); +define("TROOPS_IN_OASIS","Troops in oasis"); +define("KILL","Kill"); +define("FROM","From"); +define("SEND_TROOPS","Send troops"); +define("TASKMASTER","Taskmaster"); +define("VILLAGE_OF_THE_ELDERS_TROOPS","village of the elders troops"); //SEND TROOP define("REINFORCE","Reinforcement"); @@ -574,6 +601,8 @@ define("ARMOURY","Armoury"); define("TOURNAMENTSQUARE","Tournament Square"); define("MAINBUILDING","Main Building"); define("RALLYPOINT","Rally Point"); +define("OVERVIEW","Resumen"); +define("RALLYPOINT_DESC","Your village's troops meet here. From here you can send them out to conquer, raid or reinforce other villages."); define("MARKETPLACE","Marketplace"); define("EMBASSY","Embassy"); define("BARRACKS","Barracks"); diff --git a/GameEngine/Lang/es.php b/GameEngine/Lang/es.php index 0dd54bcb..725870fc 100644 --- a/GameEngine/Lang/es.php +++ b/GameEngine/Lang/es.php @@ -6,7 +6,7 @@ // Made by: Dzoki & Dixie (TravianX) // // - TravianX = Travian Clone Project - // // DO NOT REMOVE COPYRIGHT NOTICE! // -// Adding tasks and constructions by: Armando // +// Adding tasks, constructions and artefact by: Armando // ////////////////////////////////////////////////////////////////////////////////////////////////////// // // // SPANISH // @@ -432,12 +432,44 @@ define("HOURS","horas"); //ATTACKS ETC. define("TROOP_MOVEMENTS","movimientos de tropa:"); -define("ARRIVING_REINF_TROOPS","Llegando refuerzos"); +define("ARRIVING_REINF_TROOPS","Refuerzos llegando "); define("ARRIVING_REINF_TROOPS_SHORT","Refuer."); define("OWN_ATTACKING_TROOPS","Tropas atacando"); define("ATTACK","Ataque"); -define("OWN_REINFORCING_TROOPS","Refuerzos despachados"); +define("OWN_REINFORCING_TROOPS","Reforzando"); define("TROOPS_DORF","Tropas:"); +define("NEWVILLAGE","Nueva Aldea."); +define("FOUNDNEWVILLAGE","Fundando Nueva Aldea"); +define("UNDERATTACK","Tropas atacantes llegando"); +define("OASISATTACK","Tropas atacantes llegando"); +define("OASISATTACKS","Oasis Att."); +define("RETURNFROM","Regreso de"); +define("REINFORCEMENTFOR","Refuerzo para"); +define("ATTACK_ON","Ataque contra"); +define("RAID_ON","Asalto contra"); +define("SCOUTING","Espiando a"); +define("PRISONERS","Prisioneros"); +define("PRISONERSIN","Prisioneros en"); +define("PRISONERSFROM","Prisioneros de"); +define("TROOPS","Tropas"); +define("TROOPSFROM","Tropas de"); +define("BOUNTY","Botín"); +define("ARRIVAL","Llegada"); +define("INCOMING_TROOPS","Tropas llegando"); +define("TROOPS_ON_THEIR_WAY","Tropas saliendo"); +define("OWN_TROOPS","Tropas propias"); +define("ON","el"); +define("AT","a las"); +define("UPKEEP","Consumo"); +define("SEND_BACK","Retirar"); +define("TROOPS_IN_THE_VILLAGE","Tropas en esta aldea"); +define("TROOPS_IN_OTHER_VILLAGE","Tropas en otras aldeas"); +define("TROOPS_IN_OASIS","Tropas en oasis"); +define("KILL","Matar"); +define("FROM","aldea"); +define("SEND_TROOPS","Enviar tropas"); +define("TASKMASTER","Amo de las Misiones"); +define("VILLAGE_OF_THE_ELDERS_TROOPS","Tropas de la Aldea de los Sabios Ancianos"); //LOGIN.php @@ -449,6 +481,8 @@ define("PW_GENERATE","Pedir nueva contraseña"); define("EMAIL_NOT_VERIFIED","Correo no verificado!"); define("EMAIL_FOLLOW","Sigue este vínculo para activar este enlace."); define("VERIFY_EMAIL","Verificar Correo."); +define("SERVER_STARTS_IN","Servidor comenzará en: "); +define("START_NOW","EMPIEZA AHORA"); //404.php @@ -489,6 +523,8 @@ define("ARMOURY","Armería"); define("TOURNAMENTSQUARE","Plaza de torneos"); define("MAINBUILDING","Edificio Principal"); define("RALLYPOINT","Plaza de Reuniones"); +define("OVERVIEW","Resumen"); +define("RALLYPOINT_DESC","Aqui se reúnen las tropas de tu aldea. Desde aquí, pueden ser enviadas para atacar, conquistar, asaltar, fundar otras aldeas o como refuerzos.

Si hay menos unidades atacantes que el nivel de la plaza de reuniones entonces puedo ver el tipo de unidad. "); define("MARKETPLACE","Mercado"); define("EMBASSY","Embajada"); define("BARRACKS","Cuartel"); diff --git a/GameEngine/Lang/ru.php b/GameEngine/Lang/ru.php index 73071e58..fa749faa 100644 --- a/GameEngine/Lang/ru.php +++ b/GameEngine/Lang/ru.php @@ -6,7 +6,7 @@ // Made by: Dzoki & Dixie (TravianX) // // - TravianX = Travian Clone Project - // // DO NOT REMOVE COPYRIGHT NOTICE! // -// Adding tasks and constructions by: Armando // +// Adding tasks, constructions and artefact by: Armando // ////////////////////////////////////////////////////////////////////////////////////////////////////// // // // Русский // @@ -206,6 +206,7 @@ define("Q13_RESP","Very good, your village grows and thrives!"); define("Q14","Task 14: Instructions"); define("Q14_DESC","In the ingame instructions you can find short information texts about different buildings and types of units.

Click on 'instructions' at the left to find out how much lumber is required for the barracks."); define("Q14_ORDER","Order:<\/p>Enter how much lumber barracks cost"); +define("Q14_BUTN","complete task"); define("Q14_RESP","Exactly! Barracks cost 210 lumber."); define("Q15","Task 15: Main Building"); @@ -225,7 +226,8 @@ define("Q17_BUTN1","Military"); define("Q18","Task 18: Military"); define("Q18_DESC","A brave decision. To be able to send troops you need a rally point.

The rally point must be built on a specific building site. The "); -define("Q18_DESC1"," is located on the right side of the main building, slightly below it. The building site itself is curved."); +define("Q18_DESC1"," building site."); +define("Q18_DESC2"," is located on the right side of the main building, slightly below it. The building site itself is curved."); define("Q18_ORDER","Order:<\/p>Construct a rally point."); define("Q18_RESP","Your rally point has been erected! A good move towards world domination!"); @@ -238,7 +240,8 @@ define("Q20","Task 20: Train."); define("Q20_DESC","Now that you have barracks you can start training troops. Train two "); define("Q20_ORDER","Please train 2 "); define("Q20_RESP","The foundation for your glorious army has been laid.

Before sending your army off to plunder you should check with the."); -define("Q20_RESP1","to see how many troops you need to successfully fight one rat without losses."); +define("Q20_RESP1","Combat Simulator"); +define("Q20_RESP2","to see how many troops you need to successfully fight one rat without losses."); define("Q21","Task 18: Economy"); define("Q21_DESC","Trade & Economy was your choice. Golden times await you for sure!"); @@ -463,6 +466,38 @@ define("OWN_ATTACKING_TROOPS","Собственные атакующие вой define("ATTACK","Атака"); define("OWN_REINFORCING_TROOPS","Собственные прибивающие войска"); define("TROOPS_DORF","Войска:"); +define("NEWVILLAGE","New vill."); +define("FOUNDNEWVILLAGE","Founding New village"); +define("UNDERATTACK","The village is under attack"); +define("OASISATTACK","The Oasis is under attack"); +define("OASISATTACKS","Oasis Att."); +define("RETURNFROM","Return from"); +define("REINFORCEMENTFOR","Reinforcement to"); +define("ATTACK_ON","Attack to"); +define("RAID_ON","Raid to"); +define("SCOUTING","Scouting"); +define("PRISONERS","Prisioners"); +define("PRISONERSIN","Prisioners in"); +define("PRISONERSFROM","Prisioners from"); +define("TROOPS","Troops"); +define("TROOPSFROM","Troops"); +define("BOUNTY","Bounty"); +define("ARRIVAL","Arrival"); +define("INCOMING_TROOPS","Incoming Troops"); +define("TROOPS_ON_THEIR_WAY","Troops on their way"); +define("OWN_TROOPS","Own troops"); +define("ON","on"); +define("AT","at"); +define("UPKEEP","Upkeep"); +define("SEND_BACK","Send back"); +define("TROOPS_IN_THE_VILLAGE","Troops in the village"); +define("TROOPS_IN_OTHER_VILLAGE","Troops in other village"); +define("TROOPS_IN_OASIS","Troops in oasis"); +define("KILL","Kill"); +define("FROM","From"); +define("SEND_TROOPS","Send troops"); +define("TASKMASTER","Taskmaster"); +define("VILLAGE_OF_THE_ELDERS_TROOPS","village of the elders troops"); //LOGIN.php @@ -474,6 +509,8 @@ define("PW_GENERATE","Создать новый пароль."); define("EMAIL_NOT_VERIFIED","Email nне принят!"); define("EMAIL_FOLLOW","Проследуйте по следующей ссылке чтобы активировать аккаунт."); define("VERIFY_EMAIL","Email подтвержден."); +define("SERVER_STARTS_IN","Server will start in: "); +define("START_NOW","START NOW"); //404.php @@ -514,6 +551,8 @@ define("ARMOURY","Armoury"); define("TOURNAMENTSQUARE","Tournament Square"); define("MAINBUILDING","Main Building"); define("RALLYPOINT","Rally Point"); +define("OVERVIEW","Resumen"); +define("RALLYPOINT_DESC","Your village's troops meet here. From here you can send them out to conquer, raid or reinforce other villages."); define("MARKETPLACE","Marketplace"); define("EMBASSY","Embassy"); define("BARRACKS","Barracks"); diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php index eba63329..cd6d3f5f 100644 --- a/GameEngine/Lang/zh_tw.php +++ b/GameEngine/Lang/zh_tw.php @@ -6,7 +6,7 @@ // Made by: Dzoki & Dixie (TravianX) // // - TravianX = Travian Clone Project - // // DO NOT REMOVE COPYRIGHT NOTICE! // -// Adding tasks and constructions by: Armando // +// Adding tasks, constructions and artefact by: Armando // ////////////////////////////////////////////////////////////////////////////////////////////////////// // // // ENGLISH // @@ -209,6 +209,7 @@ define("Q13_RESP","Very good, your village grows and thrives!"); define("Q14","Task 14: Instructions"); define("Q14_DESC","In the ingame instructions you can find short information texts about different buildings and types of units.

Click on 'instructions' at the left to find out how much lumber is required for the barracks."); define("Q14_ORDER","Order:<\/p>Enter how much lumber barracks cost"); +define("Q14_BUTN","complete task"); define("Q14_RESP","Exactly! Barracks cost 210 lumber."); define("Q15","Task 15: Main Building"); @@ -228,7 +229,8 @@ define("Q17_BUTN1","Military"); define("Q18","Task 18: Military"); define("Q18_DESC","A brave decision. To be able to send troops you need a rally point.

The rally point must be built on a specific building site. The "); -define("Q18_DESC1"," is located on the right side of the main building, slightly below it. The building site itself is curved."); +define("Q18_DESC1"," building site."); +define("Q18_DESC2"," is located on the right side of the main building, slightly below it. The building site itself is curved."); define("Q18_ORDER","Order:<\/p>Construct a rally point."); define("Q18_RESP","Your rally point has been erected! A good move towards world domination!"); @@ -241,7 +243,8 @@ define("Q20","Task 20: Train."); define("Q20_DESC","Now that you have barracks you can start training troops. Train two "); define("Q20_ORDER","Please train 2 "); define("Q20_RESP","The foundation for your glorious army has been laid.

Before sending your army off to plunder you should check with the."); -define("Q20_RESP1","to see how many troops you need to successfully fight one rat without losses."); +define("Q20_RESP1","Combat Simulator"); +define("Q20_RESP2","to see how many troops you need to successfully fight one rat without losses."); define("Q21","Task 18: Economy"); define("Q21_DESC","Trade & Economy was your choice. Golden times await you for sure!"); @@ -472,6 +475,38 @@ define("OWN_ATTACKING_TROOPS","Own attacking troops"); define("ATTACK","攻擊"); define("OWN_REINFORCING_TROOPS","Own reinforcing troops"); define("TROOPS_DORF","軍隊:"); +define("NEWVILLAGE","New vill."); +define("FOUNDNEWVILLAGE","Founding New village"); +define("UNDERATTACK","The village is under attack"); +define("OASISATTACK","The Oasis is under attack"); +define("OASISATTACKS","Oasis Att."); +define("RETURNFROM","Return from"); +define("REINFORCEMENTFOR","Reinforcement to"); +define("ATTACK_ON","Attack to"); +define("RAID_ON","Raid to"); +define("SCOUTING","Scouting"); +define("PRISONERS","Prisioners"); +define("PRISONERSIN","Prisioners in"); +define("PRISONERSFROM","Prisioners from"); +define("TROOPS","Troops"); +define("TROOPSFROM","Troops"); +define("BOUNTY","Bounty"); +define("ARRIVAL","Arrival"); +define("INCOMING_TROOPS","Incoming Troops"); +define("TROOPS_ON_THEIR_WAY","Troops on their way"); +define("OWN_TROOPS","Own troops"); +define("ON","on"); +define("AT","at"); +define("UPKEEP","Upkeep"); +define("SEND_BACK","Send back"); +define("TROOPS_IN_THE_VILLAGE","Troops in the village"); +define("TROOPS_IN_OTHER_VILLAGE","Troops in other village"); +define("TROOPS_IN_OASIS","Troops in oasis"); +define("KILL","Kill"); +define("FROM","From"); +define("SEND_TROOPS","Send troops"); +define("TASKMASTER","Taskmaster"); +define("VILLAGE_OF_THE_ELDERS_TROOPS","village of the elders troops"); //LOGIN.php @@ -483,6 +518,8 @@ define("PW_GENERATE","產生一組新密碼."); define("EMAIL_NOT_VERIFIED","電子郵件帳號不正確!"); define("EMAIL_FOLLOW","Follow this link to activate your account."); define("VERIFY_EMAIL","驗證郵件."); +define("SERVER_STARTS_IN","Server will start in: "); +define("START_NOW","START NOW"); //404.php @@ -523,6 +560,8 @@ define("ARMOURY","Armoury"); define("TOURNAMENTSQUARE","Tournament Square"); define("MAINBUILDING","Main Building"); define("RALLYPOINT","Rally Point"); +define("OVERVIEW","Resumen"); +define("RALLYPOINT_DESC","Your village's troops meet here. From here you can send them out to conquer, raid or reinforce other villages."); define("MARKETPLACE","Marketplace"); define("EMBASSY","Embassy"); define("BARRACKS","Barracks"); diff --git a/GameEngine/Units.php b/GameEngine/Units.php index 362b17c9..bf80043d 100644 --- a/GameEngine/Units.php +++ b/GameEngine/Units.php @@ -74,8 +74,8 @@ class Units { } private function loadUnits($post) { global $database,$village,$session,$generator,$logging,$form; - // Busqueda por nombre de pueblo - // Confirmamos y buscamos las coordenadas por nombre de pueblo + // Search by town name + // Coordinates and look confirm name people if(isset($post['x']) && isset($post['y']) && $post['x'] != "" && $post['y'] != "") { $vid = $database->getVilWref($post['x'],$post['y']); unset($post['dname']); @@ -141,8 +141,8 @@ class Units { } } - // Busqueda por coordenadas de pueblo - // Confirmamos y buscamos las coordenadas por coordenadas de pueblo + // People search by coordinates + // We confirm and seek coordinate coordinates Village if(isset($post['x']) && isset($post['y']) && $post['x'] != "" && $post['y'] != "") { $coor = array('x'=>$post['x'], 'y'=>$post['y']); $id = $generator->getBaseID($coor['x'],$coor['y']); @@ -191,14 +191,14 @@ class Units { $form->addError("error","You cant attack same village you are sending from."); //break; } - // Procesamos el array con los errores dados en el formulario + // We process the array with the errors given in the form if($form->returnErrors() > 0) { $_SESSION['errorarray'] = $form->getErrors(); $_SESSION['valuearray'] = $_POST; header("Location: a2b.php"); }else{ - // Debemos devolver un array con $post, que contiene todos los datos mas - // otra variable que definira que el flag esta levantado y se va a enviar y el tipo de envio + // We must return an array with $ post, which contains all the data more + // another variable that will define the flag is raised and is being sent and the type of shipping $villageName = $database->getVillageField($id,'name'); $speed= 300; $timetaken = $generator->procDistanceTime($coor,$village->coor,INCREASE_SPEED,1); diff --git a/Templates/Build/16.tpl b/Templates/Build/16.tpl index 7125c377..91197e6f 100644 --- a/Templates/Build/16.tpl +++ b/Templates/Build/16.tpl @@ -1,16 +1,16 @@
-

Rally point level resarray['f'.$id]; ?>

-

Your village's troops meet here. From here you can send them out to conquer, raid or reinforce other villages.

+

resarray['f'.$id]; ?>

+

- Overview | - Send troops | - Combat Simulator goldclub==1){ ?>| - Gold Club - -
+ | + | + goldclub==1){ ?>| + Gold Club + +
getMovement("34",$village->wid,1); $settlers = $database->getMovement("7",$village->wid,1); @@ -22,108 +22,106 @@ $oasis_incoming += count($database->getMovement(6,$conqured['wref'],0)); $units_incoming = count($units_type); $settlers_incoming = count($settlers); for($i=0;$i<$units_incoming;$i++){ - if($units_type[$i]['attack_type'] == 1 && $units_type[$i]['sort_type'] == 3) - $units_incoming -= 1; + if($units_type[$i]['attack_type'] == 1 && $units_type[$i]['sort_type'] == 3) + $units_incoming -= 1; } if($units_incoming > 0 or $settlers_incoming > 0 or $oasis_incoming > 0){ ?> -

Incoming troops ()

- () + - -

Troops in the village

- - - - - - -
vname; ?>"> - Own troops
- - enforcetome) > 0) { + +

+ + + + + + +
vname; ?>"> +
+enforcetome) > 0) { foreach($village->enforcetome as $enforce) { - $colspan = 10+$enforce['hero']; - if($enforce['from']!=0){ + $colspan = 10+$enforce['hero']; + if($enforce['from']!=0){ echo " - "; +getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'],"name")." +"; $tribe = $database->getUserField($database->getVillageField($enforce['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; $end = ($tribe*10); echo ""; for($i=$start;$i<=($end);$i++) { - echo ""; + echo ""; } - if($enforce['hero']!=0){ - echo ""; - } - echo ""; - for($i=$start;$i<=($start+9);$i++) { + if($enforce['hero']!=0){ + echo ""; + } +echo ""; +for($i=$start;$i<=($start+9);$i++) { if($enforce['u'.$i] == 0) { - echo ""; - } - if($enforce['hero']!=0){ - echo ""; - } - echo " - "; - - echo "
- getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'],"name").""; - echo "getVillageField($enforce['from'],"owner")."\">".$database->getUserField($database->getVillageField($enforce['from'],"owner"),"username",0)." troops"; - echo "
"; +if (LANG == "es") { + echo "getVillageField($enforce['from'],"owner")."\">".TROOPSFROM." ".$database->getUserField($database->getVillageField($enforce['from'],"owner"),"username",0)." "; + }else{ echo "getVillageField($enforce['from'],"owner")."\">".$database->getUserField($database->getVillageField($enforce['from'],"owner"),"username",0)." ".TROOPSFROM.""; + +} + echo "
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops\"Hero\"
".TROOPS.""; + echo ""; } - else { +else { echo ""; } - echo $enforce['u'.$i]."".$enforce['hero']."
Upkeep
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"per hour
Send back
"; - }else{ +echo $enforce['u'.$i].""; +} + if($enforce['hero']!=0){ + echo "".$enforce['hero'].""; + } +echo " +".UPKEEP."
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"".PER_HR."
".SEND_BACK."
"; +echo ""; + }else{ echo " - +"; $tribe = 4; $start = ($tribe-1)*10+1; $end = ($tribe*10); echo ""; for($i=$start;$i<=($end);$i++) { - echo ""; + echo ""; } - if($enforce['hero']!=0){ - echo ""; - } - echo ""; - for($i=$start;$i<=($start+9);$i++) { + if($enforce['hero']!=0){ + echo ""; + } +echo ""; +for($i=$start;$i<=($start+9);$i++) { if($enforce['u'.$i] == 0) { - echo ""; - } - if($enforce['hero']!=0){ - echo ""; - } - echo " - "; - - echo "
- Taskmaster"; - echo " village of the elders troops"; +".TASKMASTER.""; + echo " ".VILLAGE_OF_THE_ELDERS_TROOPS.""; echo "
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops\"Hero\"
".TROOPS.""; + echo ""; } - else { +else { echo ""; } - echo $enforce['u'.$i]."".$enforce['hero']."
Upkeep
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"per hour
Send back
"; - } - } - } - $enforcevill = array(); - $enforceoasis = array(); - - $allenforce=$village->enforcetoyou; - $enforcemeoasis=$village->enforceoasis; - - if(count($allenforce) > 0) { +echo $enforce['u'.$i].""; +} + if($enforce['hero']!=0){ + echo "".$enforce['hero'].""; + } +echo " +".UPKEEP."
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"".PER_HR."
".SEND_BACK."
"; +echo ""; + } +} +} +$enforcevill = array(); +$enforceoasis = array(); +$allenforce=$village->enforcetoyou; +$enforcemeoasis=$village->enforceoasis; +if(count($allenforce) > 0) { foreach($allenforce as $enforce) { $conquredvid=$database->getOasisField($enforce['vref'], "conqured"); if ($conquredvid>0) { @@ -132,180 +130,180 @@ if($units_incoming > 0 or $settlers_incoming > 0 or $oasis_incoming > 0){ } else { array_push($enforcevill,$enforce); } - } - } - if(count($enforcemeoasis) > 0) { +} +} +if(count($enforcemeoasis) > 0) { foreach($enforcemeoasis as $enforce) { array_push($enforceoasis,$enforce); - } - } - - if (count($enforcevill)>0) { - echo "

Troops in other village

"; + } +} +if (count($enforcevill)>0) { + echo "

".TROOPS_IN_OTHER_VILLAGE."

"; foreach($enforcevill as $enforce) { $colspan = 10+$enforce['hero']; echo " - +"; $tribe = $database->getUserField($database->getVillageField($enforce['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; $end = ($tribe*10); echo ""; for($i=$start;$i<=($end);$i++) { - echo ""; + echo ""; } - if($enforce['hero']!=0){ +if($enforce['hero']!=0){ echo ""; } - echo ""; - for($i=$start;$i<=($start+9);$i++) { +echo ""; +for($i=$start;$i<=($start+9);$i++) { if($enforce['u'.$i] == 0) { echo ""; - } - if($enforce['hero']!=0){ +echo $enforce['u'.$i].""; +} +if($enforce['hero']!=0){ echo ""; } - echo " - "; - echo "
- getMapCheck($enforce['vref'])."\">".$database->getVillageField($enforce['vref'],"name").""; - echo "getVillageField($enforce['from'],"owner")."\">".$database->getUserField($database->getVillageField($enforce['from'],"owner"),"username",0)." troops"; +getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'],"name").""; + echo "getMapCheck($enforce['vref'])."\">".REINFORCEMENTFOR." ".$database->getVillageField($enforce['vref'],"name")." "; echo "
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops
".TROOPS.""; } - else { +else { echo ""; } - echo $enforce['u'.$i]."".$enforce['hero']."
Upkeep
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"per hour
Send back
"; - } - } - if(count($enforceoasis) > 0) { - echo "

Troops in oasis

"; +echo " +".UPKEEP."
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"".PER_HR."
".SEND_BACK."
"; +echo ""; +} +} +if(count($enforceoasis) > 0) { + echo "

".TROOPS_IN_OASIS."

"; foreach($enforceoasis as $enforce) { $colspan = 10+$enforce['hero']; echo " - +"; $tribe = $database->getUserField($database->getVillageField($enforce['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; $end = ($tribe*10); echo ""; for($i=$start;$i<=($end);$i++) { - echo ""; + echo ""; } - if($enforce['hero']!=0){ +if($enforce['hero']!=0){ echo ""; } - echo ""; - for($i=$start;$i<=($start+9);$i++) { +echo ""; +for($i=$start;$i<=($start+9);$i++) { if($enforce['u'.$i] == 0) { echo ""; - } - if($enforce['hero']!=0){ +echo $enforce['u'.$i].""; +} +if($enforce['hero']!=0){ echo ""; } - echo " - "; - echo "
- getMapCheck($enforce['vref'])."\">".$database->getVillageField($enforce['conqured'],"name").""; - echo "getVillageField($enforce['from'],"owner")."\">".$database->getUserField($database->getVillageField($enforce['from'],"owner"),"username",0)." troops from getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'],"name").""; +getMapCheck($enforce['vref'])."\">".$database->getVillageField($enforce['conqured'],"name").""; +if (LANG == "es") { + echo "getVillageField($enforce['from'],"owner")."\">".TROOPSFROM." ".$database->getUserField($database->getVillageField($enforce['from'],"owner"),"username",0)." ".FROM." getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'],"name").""; +}else{ echo "getVillageField($enforce['from'],"owner")."\">".$database->getUserField($database->getVillageField($enforce['from'],"owner"),"username",0)." ".TROOPSFROM." ".FROM." getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'],"name").""; +} echo "
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops
".TROOPS.""; } - else { +else { echo ""; } - echo $enforce['u'.$i]."".$enforce['hero']."
Upkeep
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"per hour
Send back
"; - } - } - if(count($database->getPrisoners3($village->wid)) > 0) { - echo "

Prisoners

"; +echo " +".UPKEEP."
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"".PER_HR."
".SEND_BACK."
"; +echo ""; +} +} +if(count($database->getPrisoners3($village->wid)) > 0) { + echo "

".PRISONERS."

"; foreach($database->getPrisoners3($village->wid) as $prisoners) { - $colspan = 10+$prisoners['t11']; + $colspan = 10+$prisoners['t11']; echo " - +"; $tribe = $database->getUserField($database->getVillageField($prisoners['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; $end = ($tribe*10); echo ""; for($i=$start;$i<=($end);$i++) { - echo ""; + echo ""; } - if($prisoners['t11']!=0){ - echo ""; - } - echo ""; - for($i=1;$i<=10;$i++) { + if($prisoners['t11']!=0){ + echo ""; + } +echo ""; +for($i=1;$i<=10;$i++) { if($prisoners['t'.$i] == 0) { - echo ""; - } - if($prisoners['t11']!=0){ - echo ""; - } - echo " - "; - - echo "
- getMapCheck($prisoners['wref'])."\">".$database->getVillageField($prisoners['wref'],"name").""; - echo "getMapCheck($prisoners['wref'])."\">prisoners in ".$database->getVillageField($prisoners['wref'],"name").""; +getMapCheck($prisoners['wref'])."\">".$database->getVillageField($prisoners['wref'],"name").""; + echo "getMapCheck($prisoners['wref'])."\">".PRISONERSIN." ".$database->getVillageField($prisoners['wref'],"name").""; echo "
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops\"Hero\"
".TROOPS.""; + echo ""; } - else { +else { echo ""; } - echo $prisoners['t'.$i]."".$prisoners['t11']."
Upkeep
".$technology->getUpkeep($prisoners,$tribe,0,1)."\"Crop\"per hour
Kill
"; - } - } - if(count($database->getPrisoners($village->wid)) > 0) { - echo "

Prisoners

"; +echo $prisoners['t'.$i].""; +} + if($prisoners['t11']!=0){ + echo "".$prisoners['t11'].""; + } +echo " +".UPKEEP."
".$technology->getUpkeep($prisoners,$tribe,0,1)."\"Crop\"".PER_HR."
".KILL."
"; +echo ""; +} +} +if(count($database->getPrisoners($village->wid)) > 0) { + echo "

".PRISONERS."

"; foreach($database->getPrisoners($village->wid) as $prisoners) { - $colspan = 10+$prisoners['t11']; - $colspan2 = 11+$prisoners['t11']; + $colspan = 10+$prisoners['t11']; + $colspan2 = 11+$prisoners['t11']; echo " - +"; $tribe = $database->getUserField($database->getVillageField($prisoners['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; $end = ($tribe*10); echo ""; for($i=$start;$i<=($end);$i++) { - echo ""; + echo ""; } - if($prisoners['t11']!=0){ - echo ""; - } - echo ""; - for($i=1;$i<=10;$i++) { + if($prisoners['t11']!=0){ + echo ""; + } +echo ""; +for($i=1;$i<=10;$i++) { if($prisoners['t'.$i] == 0) { - echo ""; - } - if($prisoners['t11']!=0){ - echo ""; - } - echo " - "; - - echo "
- getMapCheck($prisoners['from'])."\">".$database->getVillageField($prisoners['from'],"name").""; - echo "getMapCheck($prisoners['from'])."\">prisoners from ".$database->getVillageField($prisoners['from'],"name").""; +getMapCheck($prisoners['from'])."\">".$database->getVillageField($prisoners['from'],"name").""; + echo "getMapCheck($prisoners['from'])."\">".PRISONERSFROM." ".$database->getVillageField($prisoners['from'],"name").""; echo "
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops\"Hero\"
".TROOPS.""; + echo ""; } - else { +else { echo ""; } - echo $prisoners['t'.$i]."".$prisoners['t11']."
\"Crop\"
Send Back
"; - } - } - ?> +echo $prisoners['t'.$i].""; +} + if($prisoners['t11']!=0){ + echo "".$prisoners['t11'].""; + } +echo " +
\"Crop\"
".SEND_BACK."
"; +echo ""; +} +} +?> getMovement("3",$village->wid,0); $settlers = $database->getMovement("5",$village->wid,0); $units_incoming = count($units_type); for($i=0;$i<$units_incoming;$i++){ - if($units_type[$i]['vref'] != $village->wid) - $units_incoming -= 1; + if($units_type[$i]['vref'] != $village->wid) + $units_incoming -= 1; } $units_incoming += count($settlers); if($units_incoming >= 1){ - echo "

Troops on their way

"; - include("16_walking.tpl"); + echo "

".TROOPS_ON_THEIR_WAY."

"; + include("16_walking.tpl"); } include("upgrade.tpl"); diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl index 9b259db0..5a70367a 100644 --- a/Templates/Build/16_incomming.tpl +++ b/Templates/Build/16_incomming.tpl @@ -15,9 +15,11 @@ $res = mysql_fetch_array($res1); $timer = $y+1; if ($units[$y]['sort_type']==3){ if ($units[$y]['attack_type']==3){ - $actionType = "Attack on "; + $actionType = ATTACK_ON; } else if ($units[$y]['attack_type']==4){ - $actionType = "Raid on "; + $actionType = RAID_ON; + } else if ($units[$y]['attack_type']==2){ + $actionType = REINFORCEMENTFOR; } $reinfowner = $database->getVillageField($units[$y]['from'],"owner"); if($units[$y]['attack_type'] != 1){ @@ -30,7 +32,7 @@ if ($units[$y]['sort_type']==3){ echo ""; $tribe = $database->getUserField($database->getVillageField($units[$y]['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; @@ -42,7 +44,7 @@ if ($units[$y]['sort_type']==3){ if($units[$y]['t11'] != 0 && $reinfowner == $session->uid) { echo ""; } - echo ""; + echo ""; for($i=1;$i<=$colspan;$i++) { $totalunits = $units[$y]['t1']+$units[$y]['t2']+$units[$y]['t3']+$units[$y]['t4']+$units[$y]['t5']+$units[$y]['t6']+$units[$y]['t7']+$units[$y]['t8']+$units[$y]['t9']+$units[$y]['t10']+$units[$y]['t11']; if($units[$y]['attack_type'] == 2){ @@ -63,7 +65,7 @@ if ($units[$y]['sort_type']==3){ $artefact1 = count($database->getOwnUniqueArtefactInfo2($village->wid,3,1,1)); $artefact2 = count($database->getOwnUniqueArtefactInfo2($session->uid,3,2,0)); $total_artefact = $artefact + $artefact1 + $artefact2; - if($totalunits > $building->getTypeLevel(16) && $total_artefact == 0){ + if($total_artefact == 0){ echo ""; }else{ if($units[$y]['t'.$i] == 0) { @@ -78,15 +80,15 @@ if ($units[$y]['sort_type']==3){ echo ' - + @@ -105,7 +107,7 @@ if ($units[$y]['sort_type']==3){ for($i=$start;$i<=($end);$i++) { echo ""; } - echo ""; + echo ""; for($i=1;$i<=10;$i++) { echo ""; } @@ -113,15 +115,15 @@ if ($units[$y]['sort_type']==3){ echo ' - + @@ -131,15 +133,19 @@ if ($units[$y]['sort_type']==3){ } }else if ($units[$y]['sort_type']==4){ if ($units[$y]['attack_type']==1){ - $actionType = "Return from "; + $actionType = RETURNFROM; } else if ($units[$y]['attack_type']==2){ - $actionType = "Reinforcement for "; + $actionType = RETURNFROM; } else if ($units[$y]['attack_type']==3){ - $actionType = "Return from "; + $actionType = RETURNFROM; } else if ($units[$y]['attack_type']==4){ - $actionType = "Return from "; + $actionType = RETURNFROM; } - +$isoasis = $database->isVillageOases($units[$y]['from']); +if ($isoasis ==0){ +$from = $database->getMInfo($units[$y]['from']); +} else { +$from = $database->getOMInfo($units[$y]['from']);} $to = $database->getMInfo($units[$y]['vref']); ?> @@ -147,7 +153,7 @@ $to = $database->getMInfo($units[$y]['vref']); - + @@ -164,7 +170,7 @@ $to = $database->getMInfo($units[$y]['vref']); } ?> - + getMInfo($units[$y]['vref']); - + - + @@ -219,11 +225,11 @@ $total_for = count($oasis); for($y=0;$y < $total_for;$y++){ $timer = $y+1; if ($oasis[$y]['attack_type']==2){ - $actionType = "Reinforcement for "; + $actionType = REINFORCEMENTFOR; } else if ($oasis[$y]['attack_type']==3){ - $actionType = "Attack on "; + $actionType = ATTACK_ON; } else if ($oasis[$y]['attack_type']==4){ - $actionType = "Raid on "; + $actionType = RAID_ON; } $reinfowner = $database->getVillageField($oasis[$y]['from'],"owner"); if($oasis[$y]['t11'] != 0 && $reinfowner == $session->uid) { @@ -234,7 +240,7 @@ $timer = $y+1; echo "
getMapCheck($units[$y]['from'])."\">".$database->getVillageField($units[$y]['from'],"name")." "; - echo "getVillageField($units[$y]['from'],"owner")."\">".$database->getUserField($database->getVillageField($units[$y]['from'],"owner"),"username",0)."'s troops"; + echo "getMapCheck($units[$y]['to'])."\">".$actionType." ".$database->getVillageField($units[$y]['to'],"name").""; echo "
\"Hero\"
Troops
".TROOPS."?
Arrival'.ARRIVAL.'
'.$generator->getTimeFormat($units[$y]['endtime']-time()).' h
'; $datetime = $generator->procMtime($units[$y]['endtime']); echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]." hours
+ echo "".AT." ".$datetime[1]." ".HRS."
getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
Troops
".TROOPS."?
Arrival'.ARRIVAL.'
'.$generator->getTimeFormat($units[$y]['endtime']-time()).' h
'; $datetime = $generator->procMtime($units[$y]['endtime']); echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]."
+ echo "".AT." ".$datetime[1]."
vname; ?>">">
Troops
Bounty
"> getMInfo($units[$y]['vref']);
Arrival "> ".$generator->getTimeFormat($units[$y]['endtime']-time())." h"; $datetime = $generator->procMtime($units[$y]['endtime']); - echo "
"; + echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]."
"; + echo "".AT." ".$datetime[1]."
"; ?>
"; $tribe = $database->getUserField($database->getVillageField($oasis[$y]['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; @@ -246,7 +252,7 @@ $timer = $y+1; if($oasis[$y]['t11'] != 0 && $reinfowner == $session->uid) { echo ""; } - echo ""; + echo ""; for($i=1;$i<=$colspan;$i++) { $totalunits = $oasis[$y]['t1']+$oasis[$y]['t2']+$oasis[$y]['t3']+$oasis[$y]['t4']+$oasis[$y]['t5']+$oasis[$y]['t6']+$oasis[$y]['t7']+$oasis[$y]['t8']+$oasis[$y]['t9']+$oasis[$y]['t10']+$oasis[$y]['t11']; if($oasis[$y]['attack_type'] == 2){ @@ -282,15 +288,15 @@ $timer = $y+1; echo ' - + @@ -309,7 +315,7 @@ $to = $database->getMInfo($settlers[$x]['to']); - + @@ -323,7 +329,7 @@ $to = $database->getMInfo($settlers[$x]['to']); } ?> - + getMInfo($settlers[$x]['to']); - +
getMapCheck($oasis[$y]['from'])."\">".$database->getVillageField($oasis[$y]['from'],"name")." "; - echo "getVillageField($oasis[$y]['from'],"owner")."\">".$database->getUserField($database->getVillageField($oasis[$y]['from'],"owner"),"username",0)."'s troops"; + echo "getVillageField($oasis[$y]['from'],"owner")."\">".$database->getUserField($database->getVillageField($oasis[$y]['from'],"owner"),"username",0)."'s troopslll"; echo "
\"Hero\"
Troops
".TROOPS."
Arrival'.ARRIVAL.'
'.$generator->getTimeFormat($oasis[$y]['endtime']-time()).' h
'; $datetime = $generator->procMtime($oasis[$y]['endtime']); - echo "
"; + echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]." hours
+ echo "".AT." ".$datetime[1]." ".HRS."
vname; ?>
Troops
Arrival ".$generator->getTimeFormat($settlers[$x]['endtime']-time())." h"; $datetime = $generator->procMtime($settlers[$x]['endtime']); - echo "
"; + echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]."
"; + echo "".AT." ".$datetime[1]."
"; ?>
- \ No newline at end of file + diff --git a/Templates/Build/16_troops.tpl b/Templates/Build/16_troops.tpl index 0db9460c..61929035 100644 --- a/Templates/Build/16_troops.tpl +++ b/Templates/Build/16_troops.tpl @@ -11,7 +11,7 @@ } ?> - Troops + unitarray['u'.$i] == 0) { @@ -30,5 +30,5 @@ ?> - Upkeep - ">getUpkeep($village->unitarray,0); ?>Cropper hour + + ">getUpkeep($village->unitarray,0); ?>Crop diff --git a/Templates/Build/16_walking.tpl b/Templates/Build/16_walking.tpl index 5899e7e7..77af10fe 100644 --- a/Templates/Build/16_walking.tpl +++ b/Templates/Build/16_walking.tpl @@ -6,16 +6,16 @@ for($y=0;$y<$total_for;$y++){ $timer += 1; if($units[$y]['attack_type'] == 2){ - $attack_type = "Reinforcing"; + $attack_type = REINFORCEMENTFOR; } if($units[$y]['attack_type'] == 1){ - $attack_type = "Scouting"; + $attack_type = SCOUTING; } if($units[$y]['attack_type'] == 3){ - $attack_type = "Attack to"; + $attack_type = ATTACK_ON; } if($units[$y]['attack_type'] == 4){ - $attack_type = "Raid to"; + $attack_type = RAID_ON; } $isoasis = $database->isVillageOases($units[$y]['to']); if ($isoasis ==0){ @@ -41,7 +41,7 @@ $to = $database->getOMInfo($units[$y]['to']);} } ?> - Troops + getOMInfo($units[$y]['to']);} - Arrival + "> ".$generator->getTimeFormat($units[$y]['endtime']-time())." h"; $datetime = $generator->procMtime($units[$y]['endtime']); - echo "
"; + echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]."
"; + echo "".AT." ".$datetime[1]."
"; if (($units[$y]['starttime']+90)>time()){ ?>
">
@@ -97,7 +97,7 @@ $timer += 1; vname; ?> - Found new village + @@ -111,7 +111,7 @@ $timer += 1; } ?> - Troops + - Arrival + "> ".$generator->getTimeFormat($settlers[$y]['endtime']-time())." h"; $datetime = $generator->procMtime($settlers[$y]['endtime']); echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]."
"; + echo "".AT." ".$datetime[1].""; if (($settlers[$y]['starttime']+90)>time()){ ?>
">
diff --git a/Templates/Build/17_3.tpl b/Templates/Build/17_3.tpl index 81cf171f..cc9dc41a 100644 --- a/Templates/Build/17_3.tpl +++ b/Templates/Build/17_3.tpl @@ -252,7 +252,7 @@ function testSum() {

- userinfo['gold'] > 3) { ?>Trade resources at (step 2 of 2) (Costs: Gold3)Trade resources at (step 2 of 2) (Costs: Gold3)"; }?>

+ userinfo['gold'] >= 3) { ?>Trade resources at (step 2 of 2) (Costs: Gold3)Trade resources at (step 2 of 2) (Costs: Gold3)"; }?>