Merge remote-tracking branch 'ZM-Website/development' into development

Zelda-Universe · May 12, 2023 · 2fcf966 · 2fcf966
2 parents 6f78630 + aadd665
commit 2fcf966
Show file tree

Hide file tree

Showing 16 changed files with 126 additions and 55 deletions.
diff --git a/ajax/get_category_tree.php b/ajax/get_category_tree.php
@@ -1,14 +1,15 @@
 <?php
    $path = DIRNAME(__FILE__);
    include("$path/../config.php");
-
+   
    $map = $_GET["game"];
 
    $query = 'select *
                from ' . $map_prefix . 'marker_category
               where parent_id is null
                 and container_id = ' . $map . '
                 and visible = 1
+                and marker_category_type_id <> 3
               order by id
             ';
 

diff --git a/fonts/icomoon.eot b/fonts/icomoon.eot
diff --git a/fonts/icomoon.svg b/fonts/icomoon.svg
diff --git a/fonts/icomoon.ttf b/fonts/icomoon.ttf
diff --git a/fonts/icomoon.woff b/fonts/icomoon.woff
diff --git a/images/icons/totk/hyrule/ground/icon.png b/images/icons/totk/hyrule/ground/icon.png
diff --git a/images/icons/totk/hyrule/sky/icon.png b/images/icons/totk/hyrule/sky/icon.png
diff --git a/images/icons/totk/hyrule/underground/icon.png b/images/icons/totk/hyrule/underground/icon.png
diff --git a/index.html b/index.html
@@ -3,10 +3,10 @@
    <head>
   		<link rel="shortcut icon" href="favicon.ico" type="image/vnd.microsoft.icon" />
   		<link rel="apple-touch-icon" href="apple-touch-icon-precomposed.png" />
-  		<title>Breath of the Wild Interactive Map - Zelda Maps</title>
+  		<title>Tears of the Kingdom Interactive Map - Zelda Maps</title>
   		<meta charset="utf-8" />
   		<meta name="robots" content="index, follow">
-  		<meta name="keywords" content="Zelda, botw interactive map, breath of the wild interactive map, interactive map, map, botw, BotW, Breath of the Wild, Zelda Maps, breath of the wild map, botw map, Hyrule, hyrule map, botw guide" />
+  		<meta name="keywords" content="Zelda, totk interactive map, tears of the kingdom interactive map, botw interactive map, breath of the wild interactive map, interactive map, map, botw, BotW, totk, TotK, Breath of the Wild, Tears of the Kingdom, Zelda Maps, tears of the kingdom map, totk map, breath of the wild map, botw map, Hyrule, hyrule map, botw guide, totk guide" />
   		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover" />
   		<meta name="apple-mobile-web-app-capable" content="yes" />
   		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
@@ -58,7 +58,7 @@
           })();
           var game = urlParams["game"];
           if(game===undefined) {
-              window.location.href = "?game=BotW";
+              window.location.href = "?game=TotK";
           }
           $.getJSON("ajax.php?command=get_container_name&game="+game,function(data){
               if(!data.success) {

diff --git a/scripts/zmap.js b/scripts/zmap.js
@@ -4,7 +4,7 @@ function ZMap() {
    // Now that we have the changelog system using the database
    // with a field for each number, let's use 3 numbers and no
    // letters in the version.
-   this.version = '0.7.0';
+   this.version = '0.8.0';
 
    this.maps = [];
    this.games = [];

diff --git a/styles/fonts/icomoon.eot b/styles/fonts/icomoon.eot
diff --git a/styles/fonts/icomoon.svg b/styles/fonts/icomoon.svg
diff --git a/styles/fonts/icomoon.ttf b/styles/fonts/icomoon.ttf
diff --git a/styles/fonts/icomoon.woff b/styles/fonts/icomoon.woff
diff --git a/styles/style.css b/styles/style.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icomoon';
-  src:  url('fonts/icomoon.eot?3m8qpl');
-  src:  url('fonts/icomoon.eot?3m8qpl#iefix') format('embedded-opentype'),
-    url('fonts/icomoon.ttf?3m8qpl') format('truetype'),
-    url('fonts/icomoon.woff?3m8qpl') format('woff'),
-    url('fonts/icomoon.svg?3m8qpl#icomoon') format('svg');
+  src:  url('fonts/icomoon.eot?gu1tnm');
+  src:  url('fonts/icomoon.eot?gu1tnm#iefix') format('embedded-opentype'),
+    url('fonts/icomoon.ttf?gu1tnm') format('truetype'),
+    url('fonts/icomoon.woff?gu1tnm') format('woff'),
+    url('fonts/icomoon.svg?gu1tnm#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -13,7 +13,7 @@
 [class^="icon-"], [class*=" icon-"] {
   /* use !important to prevent issues with browser extensions that change fonts */
   font-family: 'icomoon' !important;
-  speak: none;
+  speak: never;
   font-style: normal;
   font-weight: normal;
   font-variant: normal;
@@ -25,11 +25,15 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-General_Store:before {
-  content: "\e900";
+.icon-Tears-of-the-Kingdom:before {
+  content: "\e932";
+  color: #fff;
 }
-.icon-General_Heart:before {
-  content: "\f004";
+.icon-TotK_Well:before {
+  content: "\e92a";
+}
+.icon-General_Cave:before {
+  content: "\e92b";
 }
 .icon-General_Map:before {
   content: "\e928";
@@ -205,6 +209,27 @@
 .icon-fa-envelope:before {
   content: "\f0e0";
 }
+.icon-TotK_Chasm:before {
+  content: "\e92c";
+}
+.icon-TotK_Bubbulfrog:before {
+  content: "\f069";
+}
+.icon-TotK_Sages-Will:before {
+  content: "\f111";
+}
+.icon-TotK_Lightroot:before {
+  content: "\f1bb";
+}
+.icon-TotK_SignNpc:before {
+  content: "\f277";
+}
+.icon-General_Heart:before {
+  content: "\f004";
+}
+.icon-LA_Portal:before {
+  content: "\e929";
+}
 .icon-General_House:before {
   content: "\e92d";
 }
@@ -217,3 +242,7 @@
 .icon-embed2:before {
   content: "\ea80";
 }
+.icon-General_Store:before {
+  content: "\e900";
+}
+
diff --git a/styles/zmain.css b/styles/zmain.css
@@ -1345,3 +1345,12 @@ header.ex1 {
     background-color: rgba(50,50,50,.8) !important;
 }
 
+
+.TotK-label {
+	color: #f8efae;
+    text-shadow: 0 1px 3px #977f41;
+    background-color: transparent;
+    box-shadow: none;
+    border: 0px;
+    font-size: 24px;
+}