diff --git a/GameEngine/Database.php b/GameEngine/Database.php index 0f6c365d..0bd092dc 100755 --- a/GameEngine/Database.php +++ b/GameEngine/Database.php @@ -7033,7 +7033,7 @@ References: User ID/Message ID, Mode SUM(IF(size = '1' AND vref = $vid, 1, 0)) small, SUM(IF(size = '2', 1, 0)) great, SUM(IF(size = '3', 1, 0)) `unique` - FROM " . TB_PREFIX . "artefacts WHERE owner = ".(int) $uid." AND active = 1 AND (type = $kind OR kind = $kind)"; + FROM " . TB_PREFIX . "artefacts WHERE owner = ".$uid." AND active = 1 AND (type = $kind OR kind = $kind) AND del = 0"; $result = mysqli_query($this->dblink, $q); return $this->mysqli_fetch_all($result)[0]; } @@ -7251,7 +7251,7 @@ References: User ID/Message ID, Mode FROM ".TB_PREFIX."artefacts WHERE - owner = ".$uid." AND type = 11 AND active = 1"; + owner = ".$uid." AND type = 11 AND active = 1 AND del = 0"; }else{ $q = "SELECT Count(*) as Total @@ -7260,7 +7260,7 @@ References: User ID/Message ID, Mode INNER JOIN ".TB_PREFIX."users AS users ON users.id != ".$uid." AND users.alliance = ".$alliance." AND artefacts.owner = users.id AND artefacts.type = 11 WHERE - users.id > 4 AND artefacts.active = 1"; + users.id > 4 AND artefacts.active = 1 AND artefacts.del = 0"; } $result = mysqli_fetch_array(mysqli_query($this->dblink, $q), MYSQLI_ASSOC); @@ -7336,7 +7336,7 @@ References: User ID/Message ID, Mode return (isset($cachedValue[$type.$size]) ? $cachedValue[$type.$size] : []); } - $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $id "; + $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $id AND del = 0"; $result = $this->mysqli_fetch_all(mysqli_query($this->dblink,$q)); // cache all types and return the requested one @@ -7366,7 +7366,7 @@ References: User ID/Message ID, Mode return (isset($cachedValue[$size.$type]) ? $cachedValue[$size.$type] : []); } - $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE ".(!$mode ? 'owner' : 'vref')." = $id AND active = 1"; + $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE ".(!$mode ? 'owner' : 'vref')." = $id AND active = 1 AND del = 0"; $result = $this->mysqli_fetch_all(mysqli_query($this->dblink,$q)); // cache all types and return the requested one @@ -7411,7 +7411,7 @@ References: User ID/Message ID, Mode return $cachedData[$vref]; } - $q = "SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE vref = $vref"; + $q = "SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE vref = $vref AND del = 0"; $result = mysqli_fetch_array(mysqli_query($this->dblink, $q), MYSQLI_ASSOC); $cachedData[$vref] = $result['Total']; @@ -7517,7 +7517,7 @@ References: User ID/Message ID, Mode SUM(IF(size = '1', 1, 0)) small, SUM(IF(size = '2', 1, 0)) great, SUM(IF(size = '3', 1, 0)) `unique` - FROM " . TB_PREFIX . "artefacts WHERE owner = ".(int) $uid.($mode ? " AND active = 1" : ""); + FROM " . TB_PREFIX . "artefacts WHERE owner = ".(int) $uid.($mode ? " AND active = 1 AND del = 0" : ""); $result = mysqli_query($this->dblink, $q); return $this->mysqli_fetch_all($result)[0]; } @@ -7548,7 +7548,7 @@ References: User ID/Message ID, Mode function getNewestArtifactBySize($id, $size){ list($id, $size) = $this->escape_input((int) $id, (int) $size); - $q = "SELECT * FROM ".TB_PREFIX."artefacts WHERE active = 1 AND owner = $id AND size = $size ORDER BY conquered DESC LIMIT 1"; + $q = "SELECT * FROM ".TB_PREFIX."artefacts WHERE active = 1 AND owner = $id AND size = $size AND del = 0 ORDER BY conquered DESC LIMIT 1"; $result = mysqli_query($this->dblink, $q); return mysqli_fetch_array($result); } @@ -7606,7 +7606,7 @@ References: User ID/Message ID, Mode function getArtefactDetails($id) { list($id) = $this->escape_input((int) $id); - $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE id = " . $id . " LIMIT 1"; + $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE id = ".$id." AND del = 0 LIMIT 1"; $result = mysqli_query($this->dblink,$q); return mysqli_fetch_array($result); } diff --git a/Templates/Build/27_1.tpl b/Templates/Build/27_1.tpl index 10f5fab8..03775d30 100644 --- a/Templates/Build/27_1.tpl +++ b/Templates/Build/27_1.tpl @@ -21,22 +21,22 @@ $coor = $database->getCoor($wref); '.ANY_ARTIFACTS.''; - } else { - foreach($artefact1 as $artefact){ - $coor2 = $database->getCoor($artefact['vref']); - if($artefact['size'] == 1 && $artefact['type'] != 11){ - $reqlvl = 10; - $effect = "village"; - }else{ - if($artefact['type'] != 11){ - $reqlvl = 20; - }else{ - $reqlvl = 10; - } -$effect = "account"; -} +if (empty($artefact1)) echo ''.ANY_ARTIFACTS.''; +else +{ + foreach($artefact1 as $artefact){ + $coor2 = $database->getCoor($artefact['vref']); + if($artefact['size'] == 1 && $artefact['type'] != 11){ + $reqlvl = 10; + $effect = "village"; + }else{ + if($artefact['type'] != 11){ + $reqlvl = 20; + }else{ + $reqlvl = 10; + } + $effect = "account"; + } echo ''; echo ' ' . $artefact['name'] . ' ' . $artefact['effect'] . ' @@ -46,8 +46,8 @@ Treasury ' . $reqlvl . ', Effect ' . $effect . ' '; echo '' . $database->getVillageField($artefact['vref'], "name") . ''; echo '' . date("d.m.Y H:i", $artefact['conquered']) . ''; + } } - } ?> @@ -72,13 +72,13 @@ Treasury ' . $reqlvl . ', Effect ' . $effect . ' dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts"), MYSQLI_ASSOC); +$count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE del = 0"), MYSQLI_ASSOC); $count = $count['Total']; if($count == 0) echo ''.NO_ARTIFACTS_AREA.''; else { - $arts = mysqli_query($database->dblink,"SELECT type, vref, id, name, size, owner, effect FROM " . TB_PREFIX . "artefacts"); - $rows = array(); + $arts = mysqli_query($database->dblink,"SELECT type, vref, id, name, size, owner, effect FROM " . TB_PREFIX . "artefacts WHERE del = 0"); + $rows = []; while($row = mysqli_fetch_array($arts)) { $query = mysqli_query($database->dblink,'SELECT x, y FROM `' . TB_PREFIX . 'wdata` WHERE `id` = ' . (int) $row['vref']); $coor2 = mysqli_fetch_assoc($query); diff --git a/Templates/Build/27_2.tpl b/Templates/Build/27_2.tpl index a8641757..c296e6b4 100644 --- a/Templates/Build/27_2.tpl +++ b/Templates/Build/27_2.tpl @@ -30,14 +30,14 @@ dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts"), MYSQLI_ASSOC); + //TODO: Merge this in a unique foreach + $count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE del = 0"), MYSQLI_ASSOC); $count = $count['Total']; if($count == 0) echo ''.NO_ARTIFACTS.''; else { - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 1"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 1 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -55,7 +55,7 @@ dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 2"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 2 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -73,7 +73,7 @@ dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 3"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 3 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -91,7 +91,7 @@ dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 4"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 4 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -108,7 +108,7 @@ dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 5"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 5 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -125,7 +125,7 @@ dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 6"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 6 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -142,7 +142,7 @@ dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 7"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 7 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -159,7 +159,7 @@ dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 8"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 8 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -173,7 +173,7 @@ ?> dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE type = 11"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE type = 11 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; diff --git a/Templates/Build/27_3.tpl b/Templates/Build/27_3.tpl index 32c0db8c..345408e4 100644 --- a/Templates/Build/27_3.tpl +++ b/Templates/Build/27_3.tpl @@ -31,13 +31,13 @@ dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts"), MYSQLI_ASSOC); + $count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE del = 0"), MYSQLI_ASSOC); $count = $count['Total']; if($count == 0) { echo ''.NO_ARTIFACTS.''; } else { - - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 1"); + //TODO: Merge this in a unique foreach + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 1 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -51,7 +51,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 1"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 1 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -71,7 +71,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 2"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 2 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -85,7 +85,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 2"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 2 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -105,7 +105,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 3"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 3 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -119,7 +119,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 3"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 3 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -139,7 +139,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 4"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 4 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -153,7 +153,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 4"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 4 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -172,7 +172,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 5"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 5 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -186,7 +186,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 5"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 5 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -205,7 +205,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 6"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 6 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -219,7 +219,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 6"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 6 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -238,7 +238,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 7"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 7 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -252,7 +252,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 7"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 7 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo ''; @@ -271,7 +271,7 @@ unset($artefact); unset($row); - $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 8"); + $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 8 AND del = 0"); while($row = mysqli_fetch_array($artefact)) { echo ''; echo '';