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

Remove some unused code and some fix

Browse Source 
Remove some unused code and some fix
This commit is contained in:
novgorodschi catalin
2026-05-21 13:12:21 +03:00
parent 878ecec687
commit 05bfde9063
22 changed files with 256 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Map/mapview.tpl
+15 -13
View File
@@ -244,9 +244,9 @@ while ($donnees = mysqli_fetch_assoc($result2)) {
$sessionAlliance = (int)$session->alliance;
$allyCache = $database->getAllianceAlly($sessionAlliance, 1);
$warCache = $database->getAllianceWar2($sessionAlliance);
$neutralCache = $database->getAllianceAlly($sessionAlliance, 2);
$allyCache = $database->getAllianceAlly($sessionAlliance, 1)?: [];
$warCache = $database->getAllianceWar2($sessionAlliance)?: [];
$neutralCache = $database->getAllianceAlly($sessionAlliance, 2)?: [];
$target = (int)$donnees["aliance_id"];
@@ -254,17 +254,19 @@ while ($donnees = mysqli_fetch_assoc($result2)) {
RELATION STATUS
========================= */
$friend = ($target && $sessionAlliance) ? (
($allyCache[0]['alli1'] == $target || $allyCache[0]['alli2'] == $target)
) : 0;
$friend = $war = $neutral = 0;
$war = ($target && $sessionAlliance) ? (
($warCache[0]['alli1'] == $target || $warCache[0]['alli2'] == $target)
) : 0;
$neutral = ($target && $sessionAlliance) ? (
($neutralCache[0]['alli1'] == $target || $neutralCache[0]['alli2'] == $target)
) : 0;
if ($target && $sessionAlliance) {
foreach ($allyCache as $ac) {
if ((($ac['alli1']?? 0) == $target) || (($ac['alli2']?? 0) == $target)) { $friend = 1; break; }
}
foreach ($warCache as $wc) {
if ((($wc['alli1']?? 0) == $target) || (($wc['alli2']?? 0) == $target)) { $war = 1; break; }
}
foreach ($neutralCache as $nc) {
if ((($nc['alli1']?? 0) == $target) || (($nc['alli2']?? 0) == $target)) { $neutral = 1; break; }
}
}
/* =========================
IMAGE DECISION (UNCHANGED)
Templates/Map/mapviewlarge.tpl
+15 -14
View File
@@ -384,9 +384,9 @@ while ($donnees = mysqli_fetch_assoc($result2)) {
$sessionAlliance = (int)$session->alliance;
$allyCache = $database->getAllianceAlly($sessionAlliance, 1);
$warCache = $database->getAllianceWar2($sessionAlliance);
$neutralCache = $database->getAllianceAlly($sessionAlliance, 2);
$allyCache = $database->getAllianceAlly($sessionAlliance, 1)?: [];
$warCache = $database->getAllianceWar2($sessionAlliance)?: [];
$neutralCache = $database->getAllianceAlly($sessionAlliance, 2)?: [];
$target = (int)$donnees["aliance_id"];
@@ -394,18 +394,19 @@ while ($donnees = mysqli_fetch_assoc($result2)) {
RELATION STATUS
========================= */
$friend = ($target && $sessionAlliance) ? (
($allyCache[0]['alli1'] == $target || $allyCache[0]['alli2'] == $target)
) : 0;
$war = ($target && $sessionAlliance) ? (
($warCache[0]['alli1'] == $target || $warCache[0]['alli2'] == $target)
) : 0;
$neutral = ($target && $sessionAlliance) ? (
($neutralCache[0]['alli1'] == $target || $neutralCache[0]['alli2'] == $target)
) : 0;
$friend = $war = $neutral = 0;
if ($target && $sessionAlliance) {
foreach ($allyCache as $ac) {
if ((($ac['alli1']?? 0) == $target) || (($ac['alli2']?? 0) == $target)) { $friend = 1; break; }
}
foreach ($warCache as $wc) {
if ((($wc['alli1']?? 0) == $target) || (($wc['alli2']?? 0) == $target)) { $war = 1; break; }
}
foreach ($neutralCache as $nc) {
if ((($nc['alli1']?? 0) == $target) || (($nc['alli2']?? 0) == $target)) { $neutral = 1; break; }
}
}
/* =========================
IMAGE DECISION
Templates/a2b/attack.tpl
+1 -1
View File
@@ -13,7 +13,7 @@ $ckey = $generator->generateRandStr(6);
if (!isset($process['t10']) || $process['t10'] == ''){ $t10 = 0; }else{ $t10 = $process['t10']; }
if (!isset($process['t11']) || $process['t11'] == ''){ $t11 = 0; }else{ $t11 = $process['t11']; $showhero=1; }
$totalunits = 0;
for($i = 1; $i <= 11; $i++){
$totalunits += (($i != 3 && $session->tribe == 3) ||
($i != 4 && $session->tribe != 3)) ? (!empty($process['t'.$i]) ? $process['t'.$i] : 0) : 0;