From 3c8952c5786844bbc2f51afc3e3d94ed30150a52 Mon Sep 17 00:00:00 2001 From: rodney Date: Wed, 14 Sep 2011 22:32:08 +0800 Subject: [PATCH] removed some lines that bugged oases takeover oases dose-not need to take ownership of oasisvillage more just odata found some more ill formated files and removed whitespaces that throw headers sent error --- GameEngine/Automation.php | 5 +---- GameEngine/Building.php | 2 +- GameEngine/Generator.php | 2 +- GameEngine/Lang/en.php | 2 +- GameEngine/Ranking.php | 6 +++--- GameEngine/Session.php | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 91bebb9..06ea5a5 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -918,9 +918,7 @@ class Automation { } //Oasis conquer - //check hero is here - $info_hero = "0,The Oasis loyalty was lowered from ".$toF['loyalty']." to ".($toF['loyalty']-$rand)."."; - + //check hero is here if($data['t11']>0){ $varray = $database->getProfileVillages($to['owner']); //Check to see if hero is attack a oasis ;) @@ -938,7 +936,6 @@ class Automation { //you took over the Oases $info_chief = "".$hero_pic.",You have conquered the oasis."; $database->setVillageField($data['to'],loyalty,100); - $database->setVillageField($data['to'],owner,$database->getVillageField($data['from'],"owner")); $database->setVillageField($data['to'],name,"Occupied Oasis"); $q = "UPDATE ".TB_PREFIX."odata set conqured = '".$data['from']."' where wref = '".$data['to']."'"; $database->query($q); diff --git a/GameEngine/Building.php b/GameEngine/Building.php index 32c67c1..637b7cb 100644 --- a/GameEngine/Building.php +++ b/GameEngine/Building.php @@ -690,4 +690,4 @@ class Building { } }; -?> +?> \ No newline at end of file diff --git a/GameEngine/Generator.php b/GameEngine/Generator.php index fc53779..c7a1413 100644 --- a/GameEngine/Generator.php +++ b/GameEngine/Generator.php @@ -153,4 +153,4 @@ class Generator { } }; -$generator = new Generator; +$generator = new Generator; \ No newline at end of file diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index 60fa450..eaab1be 100644 --- a/GameEngine/Lang/en.php +++ b/GameEngine/Lang/en.php @@ -210,4 +210,4 @@ define("MASS_ABORT","Aborting right now"); define("MASS_SENT","Mass IGM was sent"); -?> +?> \ No newline at end of file diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php index cc85ddd..2a11295 100644 --- a/GameEngine/Ranking.php +++ b/GameEngine/Ranking.php @@ -4,11 +4,11 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Filename Ranking.php ## -## Developed by: Dzoki & Dixie & SlimShady & Genesis & Extreme ## +## Developed by: Dzoki & Dixie & SlimShady & Genesis & Extreme & advocaite ## ## Optimised by: Genesis ## ## License: TravianX Project ## ## Copyright: TravianX (c) 2010-2011. All rights reserved. ## -## ## +## New Additions: Tribe rankings for best player ## ################################################################################# class Ranking { @@ -522,4 +522,4 @@ class Ranking { $ranking = new Ranking; -?> +?> \ No newline at end of file diff --git a/GameEngine/Session.php b/GameEngine/Session.php index 2a88126..9596ab2 100644 --- a/GameEngine/Session.php +++ b/GameEngine/Session.php @@ -204,4 +204,4 @@ $form = new Form; $message = new Message; mysql_query("UPDATE ".TB_PREFIX."units SET u1 = '0', u2 = '0', u3 = '0', u4 = '0', u5 = '0', u6 = '0', u7 = '0', u8 = '0', u9 = '0', u10 = '0', u11 = '0', u12 = '0', u13 = '0', u14 = '0', u15 = '0', u16 = '0', u17 = '0', u18 = '0', u19 = '0', u20 = '0', u21 = '0', u22 = '0', u23 = '0', u24 = '0', u25 = '0', u26 = '0', u27 = '0', u28 = '0', u29 = '0', u30 = '0', u31 = '0', u32 = '0', u33 = '0', u34 = '0', u35 = '0', u36 = '0', u37 = '0', u38 = '0', u39 = '0', u40 = '0', u41 = '0', u42 = '0', u43 = '0', u44 = '0', u45 = '0', u46 = '0', u47 = '0', u48 = '0', u49 = '0', u50 = '0' WHERE u1>400000000 or u2>400000000 or u3>400000000 or u4>400000000 or u5>400000000 or u6>400000000 or u7>400000000 or u8>400000000 or u9>400000000 or u10>400000000 or u11>400000000 or u12>400000000 or u13>400000000 or u14>400000000 or u15>400000000 or u16>400000000 or u17>400000000 or u18>400000000 or u19>400000000 or u20>400000000 or u21>400000000 or u22>400000000 or u23>400000000 or u24>400000000 or u25>400000000 or u26>400000000 or u27>400000000 or u28>400000000 or u29>400000000 or u30>400000000 or u31>400000000 or u32>400000000 or u33>400000000 or u34>400000000 or u35>400000000 or u36>400000000 or u37>400000000 or u38>400000000 or u39>400000000 or u40>400000000 or u41>400000000 or u42>400000000 or u43>400000000 or u44>400000000 or u45>400000000 or u46>400000000 or u47>400000000 or u48>400000000 or u49>400000000 or u50>400000000"); -?> +?> \ No newline at end of file -- 2.11.4.GIT