From fcbaefc90eebb09372e28577fc3bec5dd851af67 Mon Sep 17 00:00:00 2001
From: lietuvis10 <50807912+lietuvis10@users.noreply.github.com>
Date: Mon, 27 Oct 2025 14:18:57 +0200
Subject: [PATCH] Update mapviewlarge.tpl
Updated mapviewlarge to not go over WORLD_MAX or -WORLD_MAX. Now when you go to WORLD_MAX it works same like smaller map that goes from lets say 50;50 to x axis -50;50 or y axis 50;50 to 50;-50 (WORLD_MAX 50x50 in this example).
---
Templates/Map/mapviewlarge.tpl | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/Templates/Map/mapviewlarge.tpl b/Templates/Map/mapviewlarge.tpl
index 1602498e..03d4a544 100644
--- a/Templates/Map/mapviewlarge.tpl
+++ b/Templates/Map/mapviewlarge.tpl
@@ -1,20 +1,5 @@
getCoor($_GET['z']);
$y = $currentcoor['y'];
@@ -316,8 +301,7 @@ $targetalliance=$donnees["aliance_id"];
$friendarray=$database->getAllianceAlly($donnees["aliance_id"],1);
$neutralarray=$database->getAllianceAlly($donnees["aliance_id"],2);
$enemyarray=$database->getAllianceWar2($donnees["aliance_id"]);
-//var_dump($friendarray);
-//echo "(".$friendarray[0]['alli1'].">0 or ".$donnees["aliance_id"].">0) and (".$friendarray[0]['alli1']."==".$donnees["aliance_id"]." or ".$friendarray[0]['alli2']."==".$donnees["aliance_id"].") and (".$session->alliance." != ".$targetalliance." and ".$session->alliance." and ".$targetalliance.")
\n";
+
if (isset($friendarray[0])) {
$friend = (($friendarray[0]['alli1']>0 and $friendarray[0]['alli2']>0 and $donnees["aliance_id"]>0) and ($friendarray[0]['alli1']==$session->alliance or $friendarray[0]['alli2']==$session->alliance) and ($session->alliance != $targetalliance and $session->alliance and $targetalliance)) ? '1':'0';
}else $friend='0';
@@ -328,11 +312,6 @@ if (isset($neutralarray[0])) {
$neutral = (($neutralarray[0]['alli1']>0 and $neutralarray[0]['alli2']>0 and $donnees["aliance_id"]>0) and ($neutralarray[0]['alli1']==$session->alliance or $neutralarray[0]['alli2']==$session->alliance) and ($session->alliance != $targetalliance and $session->alliance and $targetalliance)) ? '1':'0';
}else $neutral='0';
-//echo $targetalliance.">>";
-//var_dump($friendarray);
-//echo"|||
";
-//var_dump($arraydiplo);
-//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 - Fixed by iopietro
@@ -441,6 +420,7 @@ if (isset($neutralarray[0])) {
m_c.ad = [[];
m_c.z = {"x":,"y":};
m_c.size = 13;
+ m_c.world_max = ; //lietuvis10 fix
var mdim = {"x":13,"y":13,"rad":6}
var mmode = 0;
function init_local(){map_init();}