Merge pull request #508 from iopietro/master

Fixed a bug in the map
Fixed the issue #485.

GameEngine/Session.php

@@ -273,7 +273,36 @@ class Session {
                     $this->CheckHeroReal();
                 }
 			}
-
+			
+			/**
+			 * Creates an array with the vrefs of attacked/scouted/reinforced villages and oasis
+			 * 
+			 */
+			
+			public function populateAttacks(){
+		        global $database, $village;
+		        
+		        $troopsMovement = $database->getMovement(3, $village->wid, 0);
+		        
+		        if(count($troopsMovement) > 0){
+		            foreach($troopsMovement as $movement)
+		            {
+		                switch($movement['attack_type']){
+		                    case 1:
+		                        $_SESSION['troops_movement']['scouts'][] = $movement['to'];
+		                        break;
+		                    case 2:
+		                        $_SESSION['troops_movement']['enforcements'][] = $movement['to'];
+		                        break;
+		                    case 3:
+		                    case 4:
+		                        $_SESSION['troops_movement']['attacks'][] = $movement['to'];
+		                        break;
+		                }
+		            }
+		        }	        	    
+			}
+			
 			private function SurfControl(){
 				if(SERVER_WEB_ROOT) {
 					$page = $_SERVER['SCRIPT_NAME'];

Templates/Ajax/mapscroll.tpl

@@ -5,8 +5,6 @@ include_once ("GameEngine/Lang/" . LANG . ".php");
 include_once("GameEngine/Generator.php");
 include_once("GameEngine/Database.php");
 
-//include("GameEngine/Session.php");
-
 if($y < $yy)	{$y = $y + (($yy - $y) /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){
 $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
 	$regcount=0;
 	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_fieldtype'] != 0){
 				$map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$donnees['aliance_name']."\",\"".$donnees['user_tribe']."\"]\n";

Templates/Ajax/mapscroll2.tpl

@@ -6,8 +6,6 @@ include_once("GameEngine/Generator.php");
 include_once("GameEngine/Database.php");
 header("Content-Type: application/json;");
 
-//include("GameEngine/Session.php");
-
 if($y < $yy)	{$y = $y + (($yy - $y) /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){
 $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
 	$regcount=0;
 	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_fieldtype'] != 0){
 				$map_js.= ",\"".$donnees['ville_name']."\",\"".$donnees['user_username']."\",\"".$donnees['ville_pop']."\",\"".$donnees['aliance_name']."\",\"".$donnees['user_tribe']."\"]\n";

Templates/Map/mapview.tpl

@@ -35,6 +35,14 @@ else {
     $bigmid = $village->wid;
 }
 
+if(isset($_SESSION['troops_movement'])){
+    unset($_SESSION['troops_movement']);
+}
+
+if($session->plus){
+    $session->populateAttacks();
+} 
+
 $xm7 = ($x-7) < -WORLD_MAX? $x+WORLD_MAX+WORLD_MAX-6 : $x-7;
 $xm3 = ($x-3) < -WORLD_MAX? $x+WORLD_MAX+WORLD_MAX-2 : $x-3;
 $xm2 = ($x-2) < -WORLD_MAX? $x+WORLD_MAX+WORLD_MAX-1 : $x-2;
@@ -154,22 +162,18 @@ if (isset($neutralarray[0])) {
 //echo in_array($targetalliance,$friendarray);
 	$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)? ($friend==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : ($war==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : ($neutral==1? ($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 Attacks by Shadow & MisterX
+	// Map Attacks by Shadow & MisterX - fixed by iopietro
-
-    	$att = '';
-    	if($session->plus) {
-        $wref = $village->wid;
-        $toWref =  $donnees['map_id'];
-
-        if ($database->checkAttack($wref,$toWref) != 0) {
-		$att = '<span class=\'m3\' ></span>';
-        }elseif ($database->checkEnforce($wref,$toWref) != 0) {
-		$att = '<span class=\'m9\' ></span>';
-		}elseif ($database->checkScout($wref,$toWref) != 0) {
-		$att = '<span class=\'m6\' ></span>';
-		}
-    	}
 
+	$att = "";
+	if(isset($_SESSION['troops_movement'])) {
+	    if (isset($_SESSION['troops_movement']['attacks']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['attacks'])) {
+	        $att = '<span class=\'m3\' ></span>';
+	    }elseif (isset($_SESSION['troops_movement']['scouts']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['scouts'])) {
+	        $att = '<span class=\'m6\' ></span>';
+	    }elseif (isset($_SESSION['troops_movement']['enforcements']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['enforcements'])) {
+	        $att = '<span class=\'m9\' ></span>';
+	    }
+	}
 		
 	// Map content
 	if($donnees['ville_user']==3 && $donnees['ville_name']==PLANVILLAGE){
@@ -183,7 +187,7 @@ if (isset($neutralarray[0])) {
 
 	//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."\"";
+		$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";

Templates/Map/mapviewlarge.tpl

@@ -31,6 +31,15 @@ else{
     $x = $village->coor['x'];
     $bigmid = $village->wid;
 }
+
+if(isset($_SESSION['troops_movement'])){
+    unset($_SESSION['troops_movement']);
+}
+
+if($session->plus){
+    $session->populateAttacks();
+}
+
 $xm7 = ($x-7) < -WORLD_MAX? $x+WORLD_MAX+WORLD_MAX-6 : $x-7;
 $xm6 = ($x-6) < -WORLD_MAX? $x+WORLD_MAX+WORLD_MAX-5 : $x-6;
 $xm5 = ($x-5) < -WORLD_MAX? $x+WORLD_MAX+WORLD_MAX-4 : $x-5; 
@@ -332,22 +341,18 @@ if (isset($neutralarray[0])) {
 //echo in_array($targetalliance,$friendarray);
 	$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)? ($friend==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : ($war==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : ($neutral==1? ($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 Attacks by Shadow and MisterX
+    // Map Attacks by Shadow and MisterX - Fixed by iopietro
-    	$att = '';
+	$att = "";
-    	if($session->plus) {
+	if(isset($_SESSION['troops_movement'])) {
-        $wref = $village->wid;
+	    if (isset($_SESSION['troops_movement']['attacks']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['attacks'])) {
-        $toWref =  $donnees['map_id'];
+	        $att = '<span class=\'m3\' ></span>';
+	    }elseif (isset($_SESSION['troops_movement']['scouts']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['scouts'])) {
+	        $att = '<span class=\'m6\' ></span>';
+	    }elseif (isset($_SESSION['troops_movement']['enforcements']) && in_array($donnees['map_id'], $_SESSION['troops_movement']['enforcements'])) {
+	        $att = '<span class=\'m9\' ></span>';
+	    }
+	}
 
-        if ($database->checkAttack($wref,$toWref) != 0) {
-		$att = '<span class=\'m3\' ></span>';
-        }elseif ($database->checkEnforce($wref,$toWref) != 0) {
-		$att = '<span class=\'m9\' ></span>';
-		}elseif ($database->checkScout($wref,$toWref) != 0) {
-		$att = '<span class=\'m6\' ></span>';
-		}
-    	}
-
-	
 	// Map content
 	if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){
 	$map_content .= "<div id='i_".$row."_".$i."' class='o99'>$att</div>\r"; 
@@ -360,7 +365,7 @@ if (isset($neutralarray[0])) {
 	
 	//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."\"";
+		$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";

karte.php

@@ -48,7 +48,7 @@ else{
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 
 	<script src="mt-full.js?0ac37" type="text/javascript"></script>
-	<script src="unx.js?f4b7h" type="text/javascript"></script>
+	<script src="unx.js?f4b7i" type="text/javascript"></script>
 	<script src="new.js?0ac37" type="text/javascript"></script>
 	<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
 	<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7i" rel="stylesheet" type="text/css" />

unx.js

@@ -591,7 +591,7 @@ else{if(of.firstChild){of.removeChild(of.firstChild);}
 }
 }
 function te(_e,area){area.details={}
-;var ch=['x','y','nr','typ','querystring','img','dname','name','ew','ally','vid','atyp','atime'];for(var i=0;i<_e.length;i++){area.details[ch[i]]=_e[i];}
+;var ch=['x','y','nr','typ','querystring','img','atyp','dname','name','ew','ally','vid','atime'];for(var i=0;i<_e.length;i++){area.details[ch[i]]=_e[i];}
 area.details.normal_field=area.details.name===undefined&&area.details.typ==0;area.details.free_oasis=area.details.name===undefined&&area.details.typ!=0;area.details.occupied_oasis=area.details.name!==undefined&&area.details.typ!=0;area.details.village=area.details.name!==undefined&&area.details.typ==0;area.details.fresh={}
 ;area.details.classic_oasis=area.details.querystring==='';}
 function df(dh){switch(dh){case 1:return[3,3,3,9];case 2:return[3,4,5,6];case 3:return[4,4,4,6];case 4:return[4,5,3,6];case 5:return[5,3,4,6];case 6:return[1,1,1,15];case 7:return[4,4,3,7];case 8:return[3,4,4,7];case 9:return[4,3,4,7];case 10:return[3,5,4,6];case 11:return[4,3,5,6];case 12:return[5,4,3,6];default:return false;}