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

Fixed a bug in the map

Browse Source 
Enforcements/scouts/attacks are now tracked in the map if you've a plus account.
This commit is contained in:
Pietro
2018-04-04 15:40:33 +02:00
committed by GitHub
parent b1aecea890
commit a6e09cf2c1
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Ajax/mapscroll.tpl
+13 -3
View File
@@ -5,8 +5,6 @@ include_once ("GameEngine/Lang/" . LANG . ".php");
include_once("GameEngine/Generator.php"); include_once("GameEngine/Generator.php");
include_once("GameEngine/Database.php"); include_once("GameEngine/Database.php");
//include("GameEngine/Session.php");
if($y < $yy) {$y = $y + (($yy - $y) /2);} if($y < $yy) {$y = $y + (($yy - $y) /2);}
else {$y = $yy + (($y - $yy) /2);} else {$y = $yy + (($y - $yy) /2);}
@@ -111,10 +109,22 @@ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($don
if($donnees['ville_user']==3 && $donnees['ville_name']==PLANVILLAGE){ if($donnees['ville_user']==3 && $donnees['ville_name']==PLANVILLAGE){
$image = "o99"; $image = "o99";
} }
$att = "";
if(isset($_SESSION['troops_movement'])) {
if (isset($_SESSION['troops_movement']['attacks']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['attacks'])) {
$att = 3;
}elseif (isset($_SESSION['troops_movement']['scouts']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['scouts'])) {
$att = 6;
}elseif (isset($_SESSION['troops_movement']['enforcements']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['enforcements'])) {
$att = 9;
}
}
//Javascript map info //Javascript map info
$regcount=0; $regcount=0;
if($yrow!=7){ 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."\""; $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."\",\"".$att."\"";
if($donnees['map_occupied']){ if($donnees['map_occupied']){
if($donnees['map_fieldtype'] != 0){ if($donnees['map_fieldtype'] != 0){
$map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$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";
Templates/Ajax/mapscroll2.tpl
+13 -3
View File
@@ -6,8 +6,6 @@ include_once("GameEngine/Generator.php");
include_once("GameEngine/Database.php"); include_once("GameEngine/Database.php");
header("Content-Type: application/json;"); header("Content-Type: application/json;");
//include("GameEngine/Session.php");
if($y < $yy) {$y = $y + (($yy - $y) /2);} if($y < $yy) {$y = $y + (($yy - $y) /2);}
else {$y = $yy + (($y - $yy) /2);} else {$y = $yy + (($y - $yy) /2);}
@@ -128,10 +126,22 @@ $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($don
if($donnees['ville_user']==3 && $donnees['ville_name']==PLANVILLAGE){ if($donnees['ville_user']==3 && $donnees['ville_name']==PLANVILLAGE){
$image = "o99"; $image = "o99";
} }
$att = "";
if(isset($_SESSION['troops_movement'])) {
if (isset($_SESSION['troops_movement']['attacks']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['attacks'])) {
$att = 3;
}elseif (isset($_SESSION['troops_movement']['scouts']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['scouts'])) {
$att = 6;
}elseif (isset($_SESSION['troops_movement']['enforcements']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['enforcements'])) {
$att = 9;
}
}
//Javascript map info //Javascript map info
$regcount=0; $regcount=0;
if($yrow!=13){ 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."\""; $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."\",\"".$att."\"";
if($donnees['map_occupied']){ if($donnees['map_occupied']){
if($donnees['map_fieldtype'] != 0){ if($donnees['map_fieldtype'] != 0){
$map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$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";