From 15fec2bb7eaec843e3e3c8aa18369b3a0dfdd220 Mon Sep 17 00:00:00 2001
From: Shadowss <cata7007@gmail.com>
Date: Fri, 20 Sep 2013 13:40:23 +0300
Subject: [PATCH 1/2] fix movements for found now village and oasis attack

---
 GameEngine/Lang/en.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php
index 892d7a21..b2670f44 100644
--- a/GameEngine/Lang/en.php
+++ b/GameEngine/Lang/en.php
@@ -294,7 +294,7 @@ define("SE","South East");
 define("RANDOM","random");
 define("ACCEPT_RULES"," I accept the game rules and general terms and conditions.");
 define("ONE_PER_SERVER","Each player may only own ONE account per server.");
-define("BEFORE_REGISTER","Before you register an account you should read the <a href='../anleitung.php' target='_blank'>instructions</a> of TravianX to see the specific advantages and disadvantages of the three tribes.");
+define("BEFORE_REGISTER","Before you register an account you should read the <a href='../anleitung.php' target='_blank'>instructions</a> of Travian ro1 to see the specific advantages and disadvantages of the three tribes.");
 define("BUILDING_UPGRADING","Building:");
 define("HOURS","hours");
 
@@ -302,11 +302,17 @@ define("HOURS","hours");
 //ATTACKS ETC.
 define("TROOP_MOVEMENTS","Troop Movements:");
 define("ARRIVING_REINF_TROOPS","Arriving reinforcing troops");
+define("ARRIVING_ATTACKING_TROOPS","Arriving attacker troops");
 define("ARRIVING_REINF_TROOPS_SHORT","Reinf.");
 define("OWN_ATTACKING_TROOPS","Own attacking troops");
 define("ATTACK","Attack");
 define("OWN_REINFORCING_TROOPS","Own reinforcing troops");
 define("TROOPS_DORF","Troops:");
+define("NEWVILLAGE","New village");
+define("FOUNDNEWVILLAGE","Founding New village");
+define("UNDERATTACK","The village is under attack");
+define("OASISATTACK","The Oasis is under attack");
+define("OASISATTACKS","Oasis Attack");
 
 
 //LOGIN.php

From 331d4d8865b65873ca73f444d53a8a8922634187 Mon Sep 17 00:00:00 2001
From: Shadowss <cata7007@gmail.com>
Date: Fri, 20 Sep 2013 14:03:19 +0300
Subject: [PATCH 2/2] fix movements for found now village and oasis attack

---
 Templates/movement.tpl | 45 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/Templates/movement.tpl b/Templates/movement.tpl
index c25ab17a..4dfcdd29 100644
--- a/Templates/movement.tpl
+++ b/Templates/movement.tpl
@@ -4,12 +4,13 @@
 ## --------------------------------------------------------------------------- ##
 ##  Filename       movement.tpl                                                ##
 ##  Developed by:  Dzoki                                                       ##
+##  Updated by:    Shadow                                                      ##
 ##  License:       TravianX Project                                            ##
 ##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
 ##                                                                             ##
 #################################################################################
 
-$aantal = (count($database->getMovement(4,$village->wid,1))+count($database->getMovement(3,$village->wid,1))+count($database->getMovement(3,$village->wid,0))+count($database->getMovement(7,$village->wid,1))-count($database->getMovement(8,$village->wid,1))-count($database->getMovement(9,$village->wid,0)));
+$aantal = (count($database->getMovement(4,$village->wid,1))+count($database->getMovement(3,$village->wid,1))+count($database->getMovement(3,$village->wid,0))+count($database->getMovement(7,$village->wid,1))+count($database->getMovement(5,$village->wid,0))+count($database->getMovement(6,$village->wid,0))-count($database->getMovement(8,$village->wid,1))-count($database->getMovement(9,$village->wid,0)));
 
 if($aantal > 0){
 	echo	'<table id="movements" cellpadding="1" cellspacing="1"><thead><tr><th colspan="3">'.TROOP_MOVEMENTS.'</th></tr></thead><tbody>';
@@ -129,4 +130,44 @@ if($lala > 0){
 	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
 	<td><div class="mov"><span class="'.$aclass.'">'.$lala.'&nbsp;'.$short.'</span></div><div class="dur_r">in&nbsp;<span id="timer'.$timer.'">'.$generator->getTimeFormat(min($NextArrival3)-time()).'</span>&nbsp;'.HOURS.'</div></div></td></tr>';
 	$timer += 1;
-}
\ No newline at end of file
+}
+
+/* Found NEW VILLAGE by Shadow */
+
+$aantal = count($database->getMovement(5,$village->wid,0));
+$aantal2 = $database->getMovement(5,$village->wid,0);
+if($aantal > 0){
+	if(!empty($NextArrival5)) { reset($NextArrival5); }	
+			foreach($aantal2 as $receive) {
+				$action = 'att3';
+				$aclass = 'a3';
+				$title = ''.FOUNDNEWVILLAGE.'';
+				$short = ''.NEWVILLAGE.'';
+				$NextArrival5[] = $receive['endtime'];
+			}
+			
+	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
+	<td><div class="mov"><span class="'.$aclass.'">'.$aantal.'&nbsp;'.$short.'</span></div><div class="dur_r">&nbsp;<span id="timer'.$timer.'">'.$generator->getTimeFormat($receive['endtime']-time()).'</span>&nbsp;'.HOURS.'</div></div></td></tr>';
+	$timer += 1;
+
+}
+
+/* Attacks on Oasis (to my oasis) by Shadow */
+
+$aantal = count($database->getMovement(6,$village->wid,0));
+$aantal2 = $database->getMovement(6,$village->wid,0);
+if($aantal > 0){
+	if(!empty($NextArrival6)) { reset($NextArrival6); }	
+			foreach($aantal2 as $receive) {
+				$action = 'att3';
+				$aclass = 'a1';
+				$title = ''.OASISATTACK.'';
+				$short = ''.OASISATTACKS.'';
+				$NextArrival6[] = $receive['endtime'];
+			}
+			
+	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
+	<td><div class="mov"><span class="'.$aclass.'">'.$aantal.'&nbsp;'.$short.'</span></div><div class="dur_r">&nbsp;<span id="timer'.$timer.'">'.$generator->getTimeFormat($receive['endtime']-time()).'</span>&nbsp;'.HOURS.'</div></div></td></tr>';
+	$timer += 1;
+
+}