From e74c7a95181270f7dbd2a2f31ad3fe4752e5e92c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 16 Apr 2012 21:48:09 +0300 Subject: [PATCH] update village map symbol (scroll not working, need to find fix) --- Templates/Ajax/mapscroll.tpl | 64 ++++++++++++++++++++++++++++++++--- Templates/Ajax/mapscroll2.tpl | 64 ++++++++++++++++++++++++++++++++--- 2 files changed, 118 insertions(+), 10 deletions(-) diff --git a/Templates/Ajax/mapscroll.tpl b/Templates/Ajax/mapscroll.tpl index 51dc016e..ffaa1018 100644 --- a/Templates/Ajax/mapscroll.tpl +++ b/Templates/Ajax/mapscroll.tpl @@ -92,12 +92,66 @@ $i=0; $yrow = 0; $map_js =''; -while ($donnees = mysql_fetch_assoc($result2)){ +while ($donnees = mysql_fetch_assoc($result2)){ $targetalliance = $donnees['user_alliance']; -$neutralarray = array(); -$friendarray = array(); -$enemyarray = array(); -$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($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_user']? ($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']; + if(count($database->diplomacyExistingRelationships($targetalliance))){ + foreach($database->diplomacyExistingRelationships($targetalliance) as $key => $row9){ + if($row9['alli1'] == $_SESSION['alliance_user']){ + if($row9['type'] == 1){ + $neutralarray = 0; + $friendarray = 1; + $enemyarray = 0; + } else if($row9['type'] == 2){ + $neutralarray = 1; + $friendarray = 0; + $enemyarray = 0; + + } else if($row9['type'] == 3){ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 1; + + } + }else{ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 0; + + } + } + }elseif(count($database->diplomacyExistingRelationships2($targetalliance))){ + foreach($database->diplomacyExistingRelationships2($targetalliance) as $key => $row9){ + if($row9['alli2'] == $_SESSION['alliance_user']){ + if($row9['type'] == 1){ + $neutralarray = 0; + $friendarray = 1; + $enemyarray = 0; + + } else if($row9['type'] == 2){ + $neutralarray = 1; + $friendarray = 0; + $enemyarray = 0; + + } else if($row9['type'] == 3){ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 1; + + } + }else{ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 0; + + } + } + }else{ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 0; + + } +$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (($friendarray == 1)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (($enemyarray == 1)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (($neutralarray == 1)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $_SESSION['alliance_user']? ($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']; //Javascript map info if($yrow!=7){ diff --git a/Templates/Ajax/mapscroll2.tpl b/Templates/Ajax/mapscroll2.tpl index ca6d6129..e4362f5c 100644 --- a/Templates/Ajax/mapscroll2.tpl +++ b/Templates/Ajax/mapscroll2.tpl @@ -111,11 +111,65 @@ $map_js =''; while ($donnees = mysql_fetch_assoc($result2)){ $targetalliance = $donnees['user_alliance']; -$neutralarray = array(); -$friendarray = array(); -$enemyarray = array(); -$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($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_user']? ($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']; - +$targetalliance = $donnees['user_alliance']; + if(count($database->diplomacyExistingRelationships($targetalliance))){ + foreach($database->diplomacyExistingRelationships($targetalliance) as $key => $row9){ + if($row9['alli1'] == $_SESSION['alliance_user']){ + if($row9['type'] == 1){ + $neutralarray = 0; + $friendarray = 1; + $enemyarray = 0; + } else if($row9['type'] == 2){ + $neutralarray = 1; + $friendarray = 0; + $enemyarray = 0; + + } else if($row9['type'] == 3){ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 1; + + } + }else{ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 0; + + } + } + }elseif(count($database->diplomacyExistingRelationships2($targetalliance))){ + foreach($database->diplomacyExistingRelationships2($targetalliance) as $key => $row9){ + if($row9['alli2'] == $_SESSION['alliance_user']){ + if($row9['type'] == 1){ + $neutralarray = 0; + $friendarray = 1; + $enemyarray = 0; + + } else if($row9['type'] == 2){ + $neutralarray = 1; + $friendarray = 0; + $enemyarray = 0; + + } else if($row9['type'] == 3){ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 1; + + } + }else{ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 0; + + } + } + }else{ + $neutralarray = 0; + $friendarray = 0; + $enemyarray = 0; + + } +$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (($friendarray == 1)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (($enemyarray == 1)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (($neutralarray == 1)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $_SESSION['alliance_user']? ($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'];