From f7b8619f9e914e4dde5ae80fe664d61b0477795a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Apr 2012 16:51:33 +0300 Subject: [PATCH 1/9] fix multivillage.tpl --- Templates/multivillage.tpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Templates/multivillage.tpl b/Templates/multivillage.tpl index 434848a4..c5d22522 100644 --- a/Templates/multivillage.tpl +++ b/Templates/multivillage.tpl @@ -100,6 +100,12 @@ else if(isset($_GET['vill']) && isset($_GET['id'])) { ● '.htmlspecialchars($returnVillageArray[$i-1]['name']).'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; + }}else{ + for($i=1;$i<=count($session->villages);++$i){echo' + + ● + '.htmlspecialchars($returnVillageArray[$i-1]['name']).' +
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; }}?> From f20383e59f8fd07103254febc3a1e9b041ff38fe Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Apr 2012 17:27:39 +0300 Subject: [PATCH 2/9] fix ally medals details --- allianz.php | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/allianz.php b/allianz.php index df98af46..f72dbc17 100644 --- a/allianz.php +++ b/allianz.php @@ -78,6 +78,50 @@ if($_GET['aid'] or $session->alliance!=0){ From b3795082efc5dd475e241df397cf8e435f7d9ee0 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Apr 2012 17:47:10 +0300 Subject: [PATCH 3/9] update Templates/Ranking/ww.tpl --- Templates/Ranking/ww.tpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Templates/Ranking/ww.tpl b/Templates/Ranking/ww.tpl index 4d79f490..b6d872d2 100644 --- a/Templates/Ranking/ww.tpl +++ b/Templates/Ranking/ww.tpl @@ -1,5 +1,5 @@ - \ No newline at end of file From 1dbb93d3e79c363e16317a7396afd3bf626e36dd Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Apr 2012 00:21:52 +0300 Subject: [PATCH 4/9] update README --- README | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/README b/README index 953435d6..f2c4f8f2 100644 --- a/README +++ b/README @@ -1,11 +1,5 @@ -Title : README -Author : Advocaite +TravianZ is based on TravianX v6.0.0 with some grapich changes from ZravianX. +I will try to make the best from this version and I will add every fix that I will found to it. +If you found fix to somthing please give it to me. -TravianX Brought to you by Advocaite & donn -This clone has seen many authors allkori,dzoki,dixxie PLus many more -the install process is fairly easy to do just make sure -GameEngine/Config.php Dose not exsist if it dose exsist delete it -Then run server in localhost you should be directed to a install page -folow instructions then play and enjoy. - -thankyou for you time +* find 'magic_quotes_gpc = Off' and replace with 'magic_quotes_gpc = On' for better options with special characters (you need to restart your appache and mysql for make this change affective) \ No newline at end of file From c37b8c8d62d68780557d2181af91b21294fbd592 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Apr 2012 01:07:14 +0300 Subject: [PATCH 5/9] enable special characters view in map and villages list --- .htaccess | 4 ++++ Templates/Ajax/mapscroll.tpl | 2 +- Templates/Ajax/mapscroll2.tpl | 2 +- Templates/Map/mapview.tpl | 4 ++-- Templates/Map/mapviewlarge.tpl | 4 ++-- Templates/multivillage.tpl | 24 ++++++++++++------------ 6 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 .htaccess diff --git a/.htaccess b/.htaccess new file mode 100644 index 00000000..8869ae3a --- /dev/null +++ b/.htaccess @@ -0,0 +1,4 @@ + + Order Deny,Allow + Deny from all + \ No newline at end of file diff --git a/Templates/Ajax/mapscroll.tpl b/Templates/Ajax/mapscroll.tpl index 59fe7413..d390e842 100644 --- a/Templates/Ajax/mapscroll.tpl +++ b/Templates/Ajax/mapscroll.tpl @@ -105,7 +105,7 @@ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($don $map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\""; if($donnees['map_occupied']){ if($donnees['map_fieldtype'] != 0){ - $map_js.= ",\"".htmlspecialchars($donnees['ville_name'])."\",\"".htmlspecialchars($donnees['user_username'])."\",\"".$donnees['ville_pop']."\",\"".htmlspecialchars($donnees['aliance_name'])."\",\"".$donnees['user_tribe']."\"]\n"; + $map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$donnees['aliance_name']."\",\"".$donnees['user_tribe']."\"]\n"; } } elseif($donnees['map_oasis'] != 0){ diff --git a/Templates/Ajax/mapscroll2.tpl b/Templates/Ajax/mapscroll2.tpl index 2ab3d6f8..bbdc1410 100644 --- a/Templates/Ajax/mapscroll2.tpl +++ b/Templates/Ajax/mapscroll2.tpl @@ -124,7 +124,7 @@ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($don $map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\""; if($donnees['map_occupied']){ if($donnees['map_fieldtype'] != 0){ - $map_js.= ",\"".htmlspecialchars($donnees['ville_name'])."\",\"".htmlspecialchars($donnees['user_username'])."\",\"".$donnees['ville_pop']."\",\"".htmlspecialchars($donnees['aliance_name'])."\",\"".$donnees['user_tribe']."\"]\n"; + $map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$donnees['aliance_name']."\",\"".$donnees['user_tribe']."\"]\n"; } } elseif($donnees['map_oasis'] != 0){ diff --git a/Templates/Map/mapview.tpl b/Templates/Map/mapview.tpl index 67ee93a8..3effb7f9 100644 --- a/Templates/Map/mapview.tpl +++ b/Templates/Map/mapview.tpl @@ -111,14 +111,14 @@ while ($donnees = mysql_fetch_assoc($result2)){ // Map content $map_content .= "
\r"; //Map create - $map_gen .= "\n"; + $map_gen .= "\n"; //Javascript map info if($yrow!=7){ $map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\""; if($donnees['map_occupied']){ if($donnees['map_fieldtype'] != 0){ - $map_js.= ",\"".htmlspecialchars($donnees['ville_name'])."\",\"".htmlspecialchars($donnees['user_username'])."\",\"".$donnees['ville_pop']."\",\"".htmlspecialchars($donnees['aliance_name'])."\",\"".$donnees['user_tribe']."\"]\n"; + $map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$donnees['aliance_name']."\",\"".$donnees['user_tribe']."\"]\n"; } } elseif($donnees['map_oasis'] != 0){ diff --git a/Templates/Map/mapviewlarge.tpl b/Templates/Map/mapviewlarge.tpl index 97374a9a..901b705e 100644 --- a/Templates/Map/mapviewlarge.tpl +++ b/Templates/Map/mapviewlarge.tpl @@ -186,14 +186,14 @@ while ($donnees = mysql_fetch_assoc($result2)){ // Map content $map_content .= "
\r"; //Map create - $map_gen .= "\n"; + $map_gen .= "\n"; //Javascript map info if($yrow!=13){ $map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\""; if($donnees['map_occupied']){ if($donnees['map_fieldtype'] != 0){ - $map_js.= ",\"".htmlspecialchars($donnees['ville_name'])."\",\"".htmlspecialchars($donnees['user_username'])."\",\"".$donnees['ville_pop']."\",\"".htmlspecialchars($donnees['aliance_name'])."\",\"".$donnees['user_tribe']."\"]\n"; + $map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$donnees['aliance_name']."\",\"".$donnees['user_tribe']."\"]\n"; } } elseif($donnees['map_oasis'] != 0){ diff --git a/Templates/multivillage.tpl b/Templates/multivillage.tpl index c5d22522..c5abcf5f 100644 --- a/Templates/multivillage.tpl +++ b/Templates/multivillage.tpl @@ -18,7 +18,7 @@ if(isset($_GET['w'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -26,7 +26,7 @@ else if(isset($_GET['r'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -34,7 +34,7 @@ else if(isset($_GET['o'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -42,7 +42,7 @@ else if(isset($_GET['z'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -50,7 +50,7 @@ else if(isset($_GET['s'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -58,7 +58,7 @@ else if(isset($_GET['c'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -66,7 +66,7 @@ else if(isset($_GET['t'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -74,7 +74,7 @@ else if(isset($_GET['d'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -82,7 +82,7 @@ else if(isset($_GET['aid'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -90,7 +90,7 @@ else if(isset($_GET['uid'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; } } @@ -98,13 +98,13 @@ else if(isset($_GET['vill']) && isset($_GET['id'])) { for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; }}else{ for($i=1;$i<=count($session->villages);++$i){echo' ● - '.htmlspecialchars($returnVillageArray[$i-1]['name']).' + '.$returnVillageArray[$i-1]['name'].'
('.$returnVillageArray[$i-1]['x'].'
|
'.$returnVillageArray[$i-1]['y'].')
'; }}?> From 3def4c1bdde24f4df2b47b2dcd110e0e7ea4025a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Apr 2012 01:28:09 +0300 Subject: [PATCH 6/9] fix add world wonder villages mode in admin panel and world wonder villages icon --- GameEngine/Admin/Mods/natarend.php | 2 +- Templates/Admin/natarend.tpl | 2 +- Templates/Map/mapview.tpl | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/GameEngine/Admin/Mods/natarend.php b/GameEngine/Admin/Mods/natarend.php index 0bc0327d..2dd4e0de 100644 --- a/GameEngine/Admin/Mods/natarend.php +++ b/GameEngine/Admin/Mods/natarend.php @@ -39,5 +39,5 @@ for($i=1;$i<=$amt;$i++) { mysql_query("Insert into ".TB_PREFIX."admin_log values (0,$id,'Added $amt WW Villages',".time().")"); -header("Location: ../../../Admin/admin.php?p=natarend&g"); +header("Location: ../../../admin.php?p=natarend&g"); ?> \ No newline at end of file diff --git a/Templates/Admin/natarend.tpl b/Templates/Admin/natarend.tpl index 7c49fede..3084119b 100644 --- a/Templates/Admin/natarend.tpl +++ b/Templates/Admin/natarend.tpl @@ -36,7 +36,7 @@ if($_SESSION['access'] < ADMIN) die("Access Denied: You are not Admin!");
Create World Wonder villages?
-

 gold  insert number of Wonders and press 'enter'
+

 insert number of Wonders and press 'enter'
0)?(($donnees['ville_user'] == $session->uid)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (in_array($targetalliance,$friendarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (in_array($targetalliance,$enemyarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (in_array($targetalliance,$neutralarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $session->alliance? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image']; // Map content + if ($donnees['ville_user'] == 3 && $donnees['ville_name'] == 'World Wonder'){ + $map_content .= "
\r"; + }else{ $map_content .= "
\r"; + } //Map create $map_gen .= "\n"; From 9353623f12ea06620fb1e86136e47df86c8840f9 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Apr 2012 01:38:13 +0300 Subject: [PATCH 7/9] return ww village icon to normal (is need to be like that) --- Templates/Map/mapview.tpl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Templates/Map/mapview.tpl b/Templates/Map/mapview.tpl index 124345f4..3effb7f9 100644 --- a/Templates/Map/mapview.tpl +++ b/Templates/Map/mapview.tpl @@ -109,11 +109,7 @@ while ($donnees = mysql_fetch_assoc($result2)){ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $session->uid)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (in_array($targetalliance,$friendarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (in_array($targetalliance,$enemyarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (in_array($targetalliance,$neutralarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $session->alliance? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image']; // Map content - if ($donnees['ville_user'] == 3 && $donnees['ville_name'] == 'World Wonder'){ - $map_content .= "
\r"; - }else{ $map_content .= "
\r"; - } //Map create $map_gen .= "\n"; From da595c40a5289901cd36249b4166a7c5a7a94c05 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Apr 2012 17:42:19 +0300 Subject: [PATCH 8/9] start to fix natar WW buildingplan village (still need to make the plan and to disable WW for player without plan) --- GameEngine/Admin/Mods/natarbuildingplan.php | 43 +++++++++++++++++ GameEngine/Admin/Mods/natarend.php | 4 +- GameEngine/Automation.php | 4 ++ Templates/Admin/menu.tpl | 1 + Templates/Admin/natarbuildingplan.tpl | 51 +++++++++++++++++++++ Templates/Admin/natarend.tpl | 2 +- Templates/Ajax/mapscroll.tpl | 4 ++ Templates/Ajax/mapscroll2.tpl | 4 ++ Templates/Map/mapview.tpl | 4 ++ Templates/Map/mapviewlarge.tpl | 4 ++ Templates/Map/vilview.tpl | 10 ++-- 11 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 GameEngine/Admin/Mods/natarbuildingplan.php create mode 100644 Templates/Admin/natarbuildingplan.tpl diff --git a/GameEngine/Admin/Mods/natarbuildingplan.php b/GameEngine/Admin/Mods/natarbuildingplan.php new file mode 100644 index 00000000..bae93a9b --- /dev/null +++ b/GameEngine/Admin/Mods/natarbuildingplan.php @@ -0,0 +1,43 @@ +access < ADMIN) die("Access Denied: You are not Admin!"); + +$id = $_POST['id']; +$amt = $_POST['vill_amount']; + +for($i=1;$i<=$amt;$i++) { + + $kid = rand(1,4); + + $wid = $database->generateBase($kid); + $database->setFieldTaken($wid); + $time = time(); + $q = "insert into `s1_vdata`(`wref`,`owner`,`name`,`capital`,`pop`,`cp`,`celebration`,`type`,`wood`,`clay`,`iron`,`maxstore`,`crop`,`maxcrop`,`lastupdate`,`loyalty`,`exp1`,`exp2`,`exp3`,`created`) values ('$wid','3','WW Buildingplan',0,233,232,0,0,80000.00,80000.00,80000.00,80000,80000.00,80000,1314974534,100,0,0,0,1314968914)"; + mysql_query($q) or die(mysql_error()); + $q = "insert into ".TB_PREFIX."fdata (`vref`,`f1`,`f1t`,`f2`,`f2t`,`f3`,`f3t`,`f4`,`f4t`,`f5`,`f5t`,`f6`,`f6t`,`f7`,`f7t`,`f8`,`f8t`,`f9`,`f9t`,`f10`,`f10t`,`f11`,`f11t`,`f12`,`f12t`,`f13`,`f13t`,`f14`,`f14t`,`f15`,`f15t`,`f16`,`f16t`,`f17`,`f17t`,`f18`,`f18t`,`f19`,`f19t`,`f20`,`f20t`,`f21`,`f21t`,`f22`,`f22t`,`f23`,`f23t`,`f24`,`f24t`,`f25`,`f25t`,`f26`,`f26t`,`f27`,`f27t`,`f28`,`f28t`,`f29`,`f29t`,`f30`,`f30t`,`f31`,`f31t`,`f32`,`f32t`,`f33`,`f33t`,`f34`,`f34t`,`f35`,`f35t`,`f36`,`f36t`,`f37`,`f37t`,`f38`,`f38t`,`f39`,`f39t`,`f40`,`f40t`,`f99`,`f99t`,`wwname`) values ($wid,0,1,0,4,0,1,0,3,0,2,0,2,0,3,0,4,0,4,0,3,0,3,0,4,0,4,0,1,0,4,0,2,0,1,0,2,20,17,20,11,20,15,20,10,10,22,10,25,0,0,0,0,10,19,0,0,0,0,0,0,10,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,0,0,0,0,'World Wonder')"; + mysql_query($q); + $database->addUnits($wid); + $database->addTech($wid); + $database->addABTech($wid); + $q = "UPDATE ".TB_PREFIX."units SET u41 = u41 + '150000', u42 = u42 + '150000', u43 = u43 + '150000', u44 = u44 + '150000', u45 = u45 + '150000', u46 = u46 + '150000', u47 = u47 + '150000', u48 = u48 + '150000' , u49 = u49 + '150000', u50 = u50 + '150000' WHERE vref = '".$wid."'"; + mysql_query($q); +} + + + mysql_query("Insert into ".TB_PREFIX."admin_log values (0,$id,'Added $amt WW Buildingplan Villages',".time().")"); + + +header("Location: ../../../admin.php?p=natarbuildingplan&g"); +?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/natarend.php b/GameEngine/Admin/Mods/natarend.php index 2dd4e0de..6b00e942 100644 --- a/GameEngine/Admin/Mods/natarend.php +++ b/GameEngine/Admin/Mods/natarend.php @@ -3,7 +3,7 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename gold.php ## +## Filename natarend.php ## ## Developed by: Dzoki ## ## License: TravianX Project ## ## Copyright: TravianX (c) 2010-2011. All rights reserved. ## @@ -24,7 +24,7 @@ for($i=1;$i<=$amt;$i++) { $wid = $database->generateBase($kid); $database->setFieldTaken($wid); $time = time(); - $q = "insert into `s1_vdata`(`wref`,`owner`,`name`,`capital`,`pop`,`cp`,`celebration`,`type`,`wood`,`clay`,`iron`,`maxstore`,`crop`,`maxcrop`,`lastupdate`,`loyalty`,`exp1`,`exp2`,`exp3`,`created`) values ('$wid','3','World Wonder',0,233,232,0,0,80000.00,80000.00,80000.00,80000,80000.00,80000,1314974534,100,0,0,0,1314968914)"; + $q = "insert into `s1_vdata`(`wref`,`owner`,`name`,`capital`,`pop`,`cp`,`celebration`,`type`,`wood`,`clay`,`iron`,`maxstore`,`crop`,`maxcrop`,`lastupdate`,`loyalty`,`exp1`,`exp2`,`exp3`,`created`) values ('$wid','3','WW village',0,233,232,0,0,80000.00,80000.00,80000.00,80000,80000.00,80000,1314974534,100,0,0,0,1314968914)"; mysql_query($q) or die(mysql_error()); $q = "insert into ".TB_PREFIX."fdata (`vref`,`f1`,`f1t`,`f2`,`f2t`,`f3`,`f3t`,`f4`,`f4t`,`f5`,`f5t`,`f6`,`f6t`,`f7`,`f7t`,`f8`,`f8t`,`f9`,`f9t`,`f10`,`f10t`,`f11`,`f11t`,`f12`,`f12t`,`f13`,`f13t`,`f14`,`f14t`,`f15`,`f15t`,`f16`,`f16t`,`f17`,`f17t`,`f18`,`f18t`,`f19`,`f19t`,`f20`,`f20t`,`f21`,`f21t`,`f22`,`f22t`,`f23`,`f23t`,`f24`,`f24t`,`f25`,`f25t`,`f26`,`f26t`,`f27`,`f27t`,`f28`,`f28t`,`f29`,`f29t`,`f30`,`f30t`,`f31`,`f31t`,`f32`,`f32t`,`f33`,`f33t`,`f34`,`f34t`,`f35`,`f35t`,`f36`,`f36t`,`f37`,`f37t`,`f38`,`f38t`,`f39`,`f39t`,`f40`,`f40t`,`f99`,`f99t`,`wwname`) values ($wid,0,1,0,4,0,1,0,3,0,2,0,2,0,3,0,4,0,4,0,3,0,3,0,4,0,4,0,1,0,4,0,2,0,1,0,2,20,17,20,11,20,15,20,10,10,22,10,25,0,0,0,0,10,19,0,0,0,0,0,0,10,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,0,0,1,40,'World Wonder')"; mysql_query($q); diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 65fb1222..bcd66568 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -1705,6 +1705,7 @@ private function loyaltyRegeneration() { $varray = $database->getProfileVillages($to['owner']); //kijken of laatste dorp is, of hoofddorp if(count($varray)!='1' AND $to['capital']!='1'){ + if($to['owenr']!=3 AND $to['name']!='WW Buildingplan'){ //if there is no Palace/Residence for ($i=18; $i<39; $i++){ if ($database->getFieldLevel($data['to'],"".$i."t")==25 or $database->getFieldLevel($data['to'],"".$i."t")==26){ @@ -1762,6 +1763,9 @@ private function loyaltyRegeneration() { } else { $info_chief = "".$chief_pic.",You cant take over this village."; } + } else { + $info_chief = "".$chief_pic.",You cant take over this village."; + } } if($data['t11'] > 0){ diff --git a/Templates/Admin/menu.tpl b/Templates/Admin/menu.tpl index 92f7c9f0..d24cc9ef 100644 --- a/Templates/Admin/menu.tpl +++ b/Templates/Admin/menu.tpl @@ -43,6 +43,7 @@ include_once ("GameEngine/Ranking.php"); System message Update top 10 Add World Wonder Villages + Add WW Buildingplan Villages

Admin Log diff --git a/Templates/Admin/natarbuildingplan.tpl b/Templates/Admin/natarbuildingplan.tpl new file mode 100644 index 00000000..63f17464 --- /dev/null +++ b/Templates/Admin/natarbuildingplan.tpl @@ -0,0 +1,51 @@ + + + + +

+ + + +








+ +
Create WW Buildingplan villages?
+ +

 insert number of Villages and press 'enter'
+ +
WW Buidingplan villages Added'; + + } + +?> \ No newline at end of file diff --git a/Templates/Admin/natarend.tpl b/Templates/Admin/natarend.tpl index 3084119b..7f4a7144 100644 --- a/Templates/Admin/natarend.tpl +++ b/Templates/Admin/natarend.tpl @@ -6,7 +6,7 @@ ## --------------------------------------------------------------------------- ## -## Filename natarstart.php ## +## Filename natarend.php ## ## Developed by: advocaite ## diff --git a/Templates/Ajax/mapscroll.tpl b/Templates/Ajax/mapscroll.tpl index d390e842..d37e0655 100644 --- a/Templates/Ajax/mapscroll.tpl +++ b/Templates/Ajax/mapscroll.tpl @@ -102,7 +102,11 @@ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($don //Javascript map info if($yrow!=7){ + if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){ + $map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"o99\""; + }else{ $map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\""; + } if($donnees['map_occupied']){ if($donnees['map_fieldtype'] != 0){ $map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$donnees['aliance_name']."\",\"".$donnees['user_tribe']."\"]\n"; diff --git a/Templates/Ajax/mapscroll2.tpl b/Templates/Ajax/mapscroll2.tpl index bbdc1410..7e241669 100644 --- a/Templates/Ajax/mapscroll2.tpl +++ b/Templates/Ajax/mapscroll2.tpl @@ -121,7 +121,11 @@ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($don //Javascript map info if($yrow!=13){ + if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){ + $map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"o99\""; + }else{ $map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\""; + } if($donnees['map_occupied']){ if($donnees['map_fieldtype'] != 0){ $map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$donnees['aliance_name']."\",\"".$donnees['user_tribe']."\"]\n"; diff --git a/Templates/Map/mapview.tpl b/Templates/Map/mapview.tpl index 3effb7f9..dbc949b5 100644 --- a/Templates/Map/mapview.tpl +++ b/Templates/Map/mapview.tpl @@ -109,7 +109,11 @@ while ($donnees = mysql_fetch_assoc($result2)){ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $session->uid)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (in_array($targetalliance,$friendarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (in_array($targetalliance,$enemyarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (in_array($targetalliance,$neutralarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $session->alliance? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image']; // Map content + if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){ + $map_content .= "
\r"; + }else{ $map_content .= "
\r"; + } //Map create $map_gen .= "\n"; diff --git a/Templates/Map/mapviewlarge.tpl b/Templates/Map/mapviewlarge.tpl index 901b705e..b39b2870 100644 --- a/Templates/Map/mapviewlarge.tpl +++ b/Templates/Map/mapviewlarge.tpl @@ -184,7 +184,11 @@ while ($donnees = mysql_fetch_assoc($result2)){ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $session->uid)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (in_array($targetalliance,$friendarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (in_array($targetalliance,$enemyarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (in_array($targetalliance,$neutralarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $session->alliance? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image']; // Map content + if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){ + $map_content .= "
\r"; + }else{ $map_content .= "
\r"; + } //Map create $map_gen .= "\n"; diff --git a/Templates/Map/vilview.tpl b/Templates/Map/vilview.tpl index 42399868..530047b4 100644 --- a/Templates/Map/vilview.tpl +++ b/Templates/Map/vilview.tpl @@ -1,6 +1,7 @@
getMInfo($_GET['d']); +$uinfo = $database->getVillage($basearray['id']); $oasis1 = mysql_query('SELECT * FROM `' . TB_PREFIX . 'odata` WHERE `wref` = ' . mysql_escape_string($_GET['d'])); $oasis = mysql_fetch_assoc($oasis1); ?> @@ -9,8 +10,11 @@ echo !$basearray['occupied']? $basearray['fieldtype']? "Abandoned valley" : "Uno }else{ echo $oasis['name']; echo " (".$basearray['x']."|".$basearray['y'].")"; } ?> -(capital)
"; } ?> - +(capital)"; } +if($uinfo['owner']==3 && $uinfo['name']=='WW Buildingplan'){ +?> +WW buildingplan + <?php switch($basearray['fieldtype']) { case 1: @@ -95,7 +99,7 @@ break; } echo $tt. /> - +
Date: Fri, 13 Apr 2012 04:15:39 +0300 Subject: [PATCH 9/9] improve market at least --- GameEngine/Database/db_MYSQL.php | 3 ++- GameEngine/Market.php | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index b1c6a4f8..d425c2ce 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -593,6 +593,8 @@ $dbarray = mysql_fetch_array($result); return $dbarray['fieldtype']; } + + /***************************************** Function to retrieve if is ocuped via ID @@ -1543,7 +1545,6 @@ } function getVillageByName($name) { - $name = mysql_real_escape_string($name, $this->connection); $q = "SELECT wref FROM " . TB_PREFIX . "vdata where name = '$name' limit 1"; $result = mysql_query($q, $this->connection); $dbarray = mysql_fetch_array($result); diff --git a/GameEngine/Market.php b/GameEngine/Market.php index da793072..8bbb2549 100644 --- a/GameEngine/Market.php +++ b/GameEngine/Market.php @@ -105,10 +105,13 @@ class Market { } if($database->getVillageState($id)) { $timetaken = $generator->procDistanceTime($coor,$village->coor,$session->tribe,0); + $res = $resource[0]+$resource[1]+$resource[2]+$resource[3]; + if($res!=0){ $reference = $database->sendResource($resource[0],$resource[1],$resource[2],$resource[3],$reqMerc,0); $database->modifyResource($village->wid,$resource[0],$resource[1],$resource[2],$resource[3],0); $database->addMovement(0,$village->wid,$id,$reference,time(),time()+$timetaken); $logging->addMarketLog($village->wid,1,array($resource[0],$resource[1],$resource[2],$resource[3],$id)); + } } } header("Location: build.php?id=".$post['id']);