xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-15 17:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Shadowss/TravianZ

Browse Source
This commit is contained in:
Shadow
2014-02-21 15:29:45 +02:00
parent 48264ad2db 895dab25e1
commit 6c94bb2a8b
15 changed files with 478 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Battle.php
+41 -41
View File
@@ -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);
GameEngine/Lang/en.php
+29
View File
@@ -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");
GameEngine/Lang/es.php
+39 -3
View File
@@ -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&iacute;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&ntilde;a");
define("EMAIL_NOT_VERIFIED","Correo no verificado!");
define("EMAIL_FOLLOW","Sigue este v&iacute;nculo para activar este enlace.");
define("VERIFY_EMAIL","Verificar Correo.");
define("SERVER_STARTS_IN","Servidor comenzar&aacute; en: ");
define("START_NOW","EMPIEZA AHORA");
//404.php
@@ -489,6 +523,8 @@ define("ARMOURY","Armer&iacute;a");
define("TOURNAMENTSQUARE","Plaza de torneos");
define("MAINBUILDING","Edificio Principal");
define("RALLYPOINT","Plaza de Reuniones");
define("OVERVIEW","Resumen");
define("RALLYPOINT_DESC","Aqui se re&uacute;nen las tropas de tu aldea. Desde aqu&iacute;, pueden ser enviadas para atacar, conquistar, asaltar, fundar otras aldeas o como refuerzos. <br \/> <br \/> 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");
GameEngine/Lang/ru.php
+42 -3
View File
@@ -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.<br \/><br \/>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.<br \/><br \/>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.<br \/><br \/>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");
GameEngine/Lang/zh_tw.php
+42 -3
View File
@@ -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.<br \/><br \/>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.<br \/><br \/>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.<br \/><br \/>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");
GameEngine/Units.php
+7 -7
View File
@@ -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);