Merge branch 'master' into Runs

application/Filter.php

@@ -29,7 +29,7 @@
         "monster_name" => "",
         "monster_min_stars" => 5,
         "monster_max_stars" => 6,
-        "monster_storage" => false,
+        "monster_in_storage" => false,
         "rune_min_stars" => 5,
         "rune_max_stars" => 6,
         "rune_min_level" => 0,
@@ -98,7 +98,7 @@
         "alternative_source" => 0
     ];
 
-    $FILTER_SKILUP = [
+    $FILTER_SKILLUP = [
         "min_stars" => 5,
         "max_stars" => 6,
         "min_natural_stars" => 5,

application/page/Runes_Page.php

@@ -72,6 +72,7 @@
          * and adds them to the $filters array.
          */
         private function parse_filters(){
+            global $QUALITY;
             if (isset($_GET["type"])){
                 $types = $_GET["type"];
                 foreach ($types as $type){
@@ -110,16 +111,16 @@
             if (isset($_GET["max_level"]) && intval($_GET["max_level"]) >= 0 && intval($_GET["max_level"]) <= 15){
                 $this->filters["max_level"] = $_GET["max_level"];
             }
-            if (isset($_GET["min_quality"]) && intval($_GET["min_quality"]) >= 0 && intval($_GET["min_quality"]) < 5){
+            if (isset($_GET["min_quality"]) && intval($_GET["min_quality"]) >= $QUALITY["NORMAL"] && intval($_GET["min_quality"]) <= $QUALITY["LEGEND"]){
                 $this->filters["min_quality"] = $_GET["min_quality"];
             }
-            if (isset($_GET["max_quality"]) && intval($_GET["max_quality"]) >= 0 && intval($_GET["max_quality"]) < 5){
+            if (isset($_GET["max_quality"]) && intval($_GET["max_quality"]) >= $QUALITY["NORMAL"] && intval($_GET["max_quality"]) <= $QUALITY["LEGEND"]){
                 $this->filters["max_quality"] = $_GET["max_quality"];
             }
-            if (isset($_GET["min_original_quality"]) && intval($_GET["min_original_quality"]) >= 0 && intval($_GET["min_original_quality"]) < 5){
+            if (isset($_GET["min_original_quality"]) && intval($_GET["min_original_quality"]) >= $QUALITY["NORMAL"] && intval($_GET["min_original_quality"]) <= $QUALITY["LEGEND"]){
                 $this->filters["min_original_quality"] = $_GET["min_original_quality"];
             }
-            if (isset($_GET["max_original_quality"]) && intval($_GET["max_original_quality"]) >= 0 && intval($_GET["max_original_quality"]) < 5){
+            if (isset($_GET["max_original_quality"]) && intval($_GET["max_original_quality"]) >= $QUALITY["NORMAL"] && intval($_GET["max_original_quality"]) <= $QUALITY["LEGEND"]){
                 $this->filters["max_original_quality"] = $_GET["max_original_quality"];
             }
             if (isset($_GET["min_efficiency"]) && intval($_GET["min_efficiency"]) >= 0 && intval($_GET["min_efficiency"]) <= 100){
@@ -198,7 +199,7 @@
                     break;
             }
             $s = $s . " ORDER BY ";
-            if ($this->filters["group"] == 0){
+            if ($this->filters["group"] == 1){ // 1: Type, 0: Slot
                 $s = $s . " type, slot, stars DESC, original_quality DESC, quality DESC, level;";
             }
             else{

application/view/fusion.php

@@ -38,10 +38,11 @@
             <h2>
                 Fusion filter
             </h2>
-            <form action='/fusion/' method='get'>
+            <form action='/fusion/' method='get' id='filter_fusion' class='filter'>
                 <table>
                     <tr>
                         <td class='filter'>
+                            <span>Target:</span>
                             <select name='product' id='filter_product'>
                                 <option value=''>All</option>
 <?php
@@ -53,7 +54,7 @@
                                         $selected = "";
                                     }
 ?>
-                                     <option value='<?=$product->id?>' <?=$selected?>><?=$product->element?> <?=$product->name?></option>
+                                     <option value='<?=$product->id?>' <?=$selected?>><?=$product->element_name?> <?=$product->name?></option>
 <?php
                                 }
 ?>

application/view/inc/filter_report_runeupgrade.php

@@ -174,7 +174,7 @@
             <td class='filter' colspan='4'>
                 <span>Condition:</span>
 <?php
-                $selected = Array("", "", "", "", "");
+                $selected = Array("", "", "", "", "", "");
                 $selected[$filters["alternative_condition"]] = "selected";
 
 ?>

application/view/inc/filter_runes.php

@@ -1,6 +1,7 @@
 <?php
     global $RUNE_SET;
     global $RUNE_STAT;
+    global $QUALITY;
 ?>
 <form action='/runes/' method='get' id='filter_runes' class='filter'>
     <table>
@@ -113,52 +114,52 @@
                 <span>Min. quality:</span>
 <?php
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["min_quality"]] = "selected";
+                $selected[$filters["min_quality"] - 1] = "selected";
 ?>
                 <select name='min_quality' id='filter_quality_min'>
-                    <option value='0' <?=$selected[0]?>>Normal</option>
-                    <option value='1' <?=$selected[1]?>>Magic</option>
-                    <option value='2' <?=$selected[2]?>>Rare</option>
-                    <option value='3' <?=$selected[3]?>>Hero</option>
-                    <option value='4' <?=$selected[4]?>>Legend</option>
+                    <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
+                    <option value='<?=$QUALITY["MAGIC"]?>' <?=$selected[1]?>>Magic</option>
+                    <option value='<?=$QUALITY["RARE"]?>' <?=$selected[2]?>>Rare</option>
+                    <option value='<?=$QUALITY["HERO"]?>' <?=$selected[3]?>>Hero</option>
+                    <option value='<?=$QUALITY["LEGEND"]?>' <?=$selected[4]?>>Legend</option>
                 </select>
                 <span>Max. quality:</span>
 <?php
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["max_quality"]] = "selected";
+                $selected[$filters["max_quality"] - 1] = "selected";
 ?>
-                <select name='min_quality' id='filter_quality_max'>
-                    <option value='0' <?=$selected[0]?>>Normal</option>
-                    <option value='1' <?=$selected[1]?>>Magic</option>
-                    <option value='2' <?=$selected[2]?>>Rare</option>
-                    <option value='3' <?=$selected[3]?>>Hero</option>
-                    <option value='4' <?=$selected[4]?>>Legend</option>
+                <select name='max_quality' id='filter_quality_max'>
+                    <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
+                    <option value='<?=$QUALITY["MAGIC"]?>' <?=$selected[1]?>>Magic</option>
+                    <option value='<?=$QUALITY["RARE"]?>' <?=$selected[2]?>>Rare</option>
+                    <option value='<?=$QUALITY["HERO"]?>' <?=$selected[3]?>>Hero</option>
+                    <option value='<?=$QUALITY["LEGEND"]?>' <?=$selected[4]?>>Legend</option>
                 </select>
             </td>
             <td class='filter'>
                 <span>Min. original quality:</span>
 <?php
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["min_original_quality"]] = "selected";
+                $selected[$filters["min_original_quality"] - 1] = "selected";
 ?>
-                <select name='min_quality' id='filter_original_quality_min'>
-                    <option value='0' <?=$selected[0]?>>Normal</option>
-                    <option value='1' <?=$selected[1]?>>Magic</option>
-                    <option value='2' <?=$selected[2]?>>Rare</option>
-                    <option value='3' <?=$selected[3]?>>Hero</option>
-                    <option value='4' <?=$selected[4]?>>Legend</option>
+                <select name='min_original_quality' id='filter_original_quality_min'>
+                    <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
+                    <option value='<?=$QUALITY["MAGIC"]?>' <?=$selected[1]?>>Magic</option>
+                    <option value='<?=$QUALITY["RARE"]?>' <?=$selected[2]?>>Rare</option>
+                    <option value='<?=$QUALITY["HERO"]?>' <?=$selected[3]?>>Hero</option>
+                    <option value='<?=$QUALITY["LEGEND"]?>' <?=$selected[4]?>>Legend</option>
                 </select>
                 <span>Max. original quality:</span>
 <?php
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["max_original_quality"]] = "selected";
+                $selected[$filters["max_original_quality"] - 1] = "selected";
 ?>
-                <select name='min_quality' id='filter_oriinal_quality_max'>
-                    <option value='0' <?=$selected[0]?>>Normal</option>
-                    <option value='1' <?=$selected[1]?>>Magic</option>
-                    <option value='2' <?=$selected[2]?>>Rare</option>
-                    <option value='3' <?=$selected[3]?>>Hero</option>
-                    <option value='4' <?=$selected[4]?>>Legend</option>
+                <select name='max_original_quality' id='filter_original_quality_max'>
+                    <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
+                    <option value='<?=$QUALITY["MAGIC"]?>' <?=$selected[1]?>>Magic</option>
+                    <option value='<?=$QUALITY["RARE"]?>' <?=$selected[2]?>>Rare</option>
+                    <option value='<?=$QUALITY["HERO"]?>' <?=$selected[3]?>>Hero</option>
+                    <option value='<?=$QUALITY["LEGEND"]?>' <?=$selected[4]?>>Legend</option>
                 </select>
             </td>
         </tr>

application/view/runes.php

@@ -51,7 +51,7 @@
                 $group_image = "";
                 foreach ($page->runes as $rune){
                     switch ($page->filters["group"]){
-                        case "TYPE":
+                        case 1: // "TYPE":
                             $group = $rune->type->name;
                             $group_title = $rune->type->name;
                             $group_image = $path["img"]["layout"] . "rune/" .str_pad($rune->type->id, 2, '0', STR_PAD_LEFT) . ".png";

public/css/ui.css

@@ -1,3 +1,43 @@
+:root {
+    /**
+     * Global elements
+     */
+    --global-color: #ffffff;
+    --global-background: #000000;
+    /**
+     * Links.
+     */
+    --ui-color-a: #08fff6;
+    --ui-color-a-hover: #cccccc;
+    --ui-color-a-shadow: #000000;
+    /**
+     * Header and footer.
+     */
+    --header-background: #884444;
+    --header-border: 0.2em solid #f2c920;
+    --header-border-radius: 0;
+    /**
+     * Star filters.
+     */
+    --star-filter-silver: sepia(100%) saturate(500%) grayscale(100%) drop-shadow(0 0 0.1em #000000) drop-shadow(0 0 0.1em #000000) drop-shadow(0 0 0.1em #000000);
+    --star-filter-gold: sepia(100%) saturate(500%) hue-rotate(10deg) saturate(200%) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000);
+    --star-filter-purple: sepia(100%) saturate(500%) hue-rotate(250deg) saturate(500%) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000);
+    --star-filter-red: sepia(100%) saturate(500%) hue-rotate(320deg) saturate(500%) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000);
+    /**
+     * Elemental colors.
+     */
+    --element-color-water: #0285f7;
+    --element-color-fire: #f72302;
+    --element-color-wind: #fcc923;
+    --element-color-light: #f2f7aa;
+    --element-color-dark: #4a0282;
+    --element-color-magic: #e21af4;
+    
+  --main-txt-color: blue;
+  --main-padding: 15px;
+}
+
+
 .desktop{ /* Elements to be shown only in large screens. */
     display: initial;
 }
@@ -33,58 +73,58 @@
     border-color: #ffaaaa;
 }
 .color_Fire{
-    color: #f72302;
+    color: var(--element-color-fire);
 }
 .color_Wind{
-    color: #fcc923;
+    color: var(--element-color-wind);
 }
 .color_Water{
-    color: #0285f7;
+    color: var(--element-color-water);
 }
 .color_Light{
-    color: #f2f7aa;
+    color: var(--element-color-light);
 }
 .color_Dark{
-    color: #4a0282;
+    color: var(--element-color-dark);
 }
 .color_Magic{
-    color: #e21af4;
+    color: var(--element-color-magic);
 }
 .border_Fire{
-    border-color: #f72302;
+    border-color: var(--element-color-fire);
 }
 .border_Wind{
-    border-color: #fcc923;
+    border-color: var(--element-color-wind);
 }
 .border_Water{
-    border-color: #0285f7;
+    border-color: var(--element-color-water);
 }
 .border_Light{
-    border-color: #f2f7aa;
+    border-color: var(--element-color-light);
 }
 .border_Dark{
-    border-color: #4a0282;
+    border-color: var(--element-color-dark);
 }
 .border_Magic{
-    border-color: #e21af4;
+    border-color: var(--element-color-magic);
 }
 .background_Fire{
-    background-color: #f72302;
+    background-color: var(--element-color-fire);
 }
 .background_Wind{
-    background-color: #fcc923;
+    background-color: var(--element-color-wind);
 }
 .background_Water{
-    background-color: #0285f7;
+    background-color: var(--element-color-water);
 }
 .background_Light{
-    background-color: #f2f7aa;
+    background-color: var(--element-color-light);
 }
 .background_Dark{
-    background-color: #4a0282;
+    background-color: var(--element-color-dark);
 }
 .background_Magic{
-    background-color: #e21af4;
+    background-color: var(--element-color-magic);
 }
 
 /* Star colors. */
@@ -92,71 +132,75 @@ img.star{
     
 }
 img.star.star_silver{
-    filter: sepia(100%) saturate(500%) grayscale(100%) drop-shadow(0 0 0.1em #000000) drop-shadow(0 0 0.1em #000000) drop-shadow(0 0 0.1em #000000);
+    filter: var(--star-filter-silver);
 }
 img.star.star_gold{
-    filter: sepia(100%) saturate(500%) hue-rotate(10deg) saturate(200%) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000);
+    filter: var(--star-filter-gold);
 }
 img.star.star_purple{
-    filter: sepia(100%) saturate(500%) hue-rotate(250deg) saturate(1500%) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000);
+    filter: var(--star-filter-purple);
 }
 img.star.star_red{
-    filter: sepia(100%) saturate(500%) hue-rotate(320deg) saturate(500%) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000) drop-shadow(0 0 0.1em #000);
+    filter: var(--star-filter-red);
 }
 
 html {
     height: 100%;
 }
 body{
+    background-color: var(--global-background);
+    color: var(--global-color);
     height: 100%;
     padding: 0;
     margin: 0;
-    background-color: #000000;
     text-align: center;
 }
 a{
-    color: #08fff6;
-    text-shadow: 0 0 0.5em #000000;
+    color: var(--ui-color-a);
+    text-shadow: 0 0 0.5em var(--ui-color-a-shadow);
     text-decoration: none;
     transition: all .3s ease-in-out;
 }
 a:hover{
-    color: #cccccc;
-    text-shadow: 0 0 0.1em #000000;
+    color: var(--ui-color-a-hover);
+    text-shadow: 0 0 0.1em var(--ui-color-a-shadow);
 }
 .fake_a{ /* Elements that look and act as links. */
-    color: #08fff6;
-    text-shadow: 0 0 0.5em #000000;
+    color: var(--ui-color-a);
+    text-shadow: 0 0 0.5em var(--ui-color-a-shadow);
     text-decoration: none;
     cursor: pointer;
     transition: all .3s ease-in-out;
 }
 .fake_a:hover{
-    color: #cccccc;
-    text-shadow: 0 0 0.1em #000000;
+    color: var(--ui-color-a-hover);
+    text-shadow: 0 0 0.1em var(--ui-color-a-shadow);
 }
 header{
-    border-bottom: 0.2em solid #f2c920;
-    border-left: 0.2em solid #f2c920;
-    border-right: 0.2em solid #f2c920;
-    border-bottom-right-radius: 1.5em;
-    border-bottom-left-radius: 1.5em;
+    border-bottom: var(--header-border);
+    border-left: var(--header-border);
+    border-right: var(--header-border);
+    border-bottom-right-radius: var(--header-border-radius);
+    border-bottom-left-radius: var(--header-border-radius);
     margin: 0 0 1em 0;
-    background-color: #884444;
+    background-color: var(--header-background);
     text-align: left;
 }
 header div#logo{
+    font-size: 70%;
     margin: auto;
     display: inline-block;
     vertical-align: middle;
-    width: 20em;
+    width: 14em;
     text-align: center;
 }
+header div#logo img#logo_img{
+    max-width: 14em;
+}
 header div#logo h1#logo_text{
     font-style: italic;
     margin: -2em auto -0.7em auto;
-    color: #ffffff;
-    text-shadow: 0 0 0.3em #000000, 0 0 0.3em #000000, 0 0 0.3em #000000, 0 0 0.3em #000000, 0 0 0.4em #000000, 0 0 0.4em #000000, 0 0 0.4em #000000, 0 0 1em #000000, 0 0 1em #000000;
+    text-shadow: 0 0 0.3em var(--ui-color-a-shadow), 0 0 0.3em var(--ui-color-a-shadow), 0 0 0.3em var(--ui-color-a-shadow), 0 0 0.3em var(--ui-color-a-shadow), 0 0 0.4em var(--ui-color-a-shadow), 0 0 0.4em var(--ui-color-a-shadow), 0 0 0.4em var(--ui-color-a-shadow), 0 0 1em var(--ui-color-a-shadow), 0 0 1em var(--ui-color-a-shadow);
 }
 header div#logo h1#logo_text span.large{
     font-size: 150%;
@@ -168,13 +212,13 @@ header div#logo h1#logo_text span.small{
 header nav{
     display: inline-block;
     vertical-align: middle;
-    font-size: 80%;
+    font-size: 110%;
 }
 header nav a{
-    font-size: 2em;
     font-weight: bold;
+    text-transform: capitalize;
+    font-variant: small-caps;
     margin: 0.5em;
-    color: #ffffff;
     text-decoration: none;
     position: relative;
     transition: all .4s ease-in-out;
@@ -190,21 +234,19 @@ header nav a:hover{
         display: block;
     }
     header nav a:hover{
-        color: #ffffff;
         text-shadow: 0 0 0 #000000;
     }
 }
 footer{
-    color: #ffffff;
     font-size: 80%;
     text-align: center;
-    border-top: 0.2em solid #f2c920;
-    border-left: 0.2em solid #f2c920;
-    border-right: 0.2em solid #f2c920;
-    border-top-right-radius: 1.5em;
-    border-top-left-radius: 1.5em;
+    border-top: var(--header-border);
+    border-left: var(--header-border);
+    border-right: var(--header-border);
+    border-top-right-radius: var(--header-border-radius);
+    border-top-left-radius: var(--header-border-radius);
     margin: 2em 0 0 0;
-    background-color: #884444;
+    background-color: var(--header-background);
     padding: 1em 2em 1em 2em;
 }
 footer table#footer_table{
@@ -228,7 +270,6 @@ footer table#footer_table td{
 input[type=button], input[type=submit]{
     font-size: 100%;
     font-weight: bold;
-    color: #ffffff;
     padding: 0.3em 1em 0.3em 1em;
     background-color: #351e0b;
     border: 0.2em solid #f2c920;
@@ -240,7 +281,6 @@ input[type=button], input[type=submit]{
 input[type=text], input[type=number]{
     font-size: 80%;
     font-weight: bold;
-    color: #ffffff;
     padding: 0 0.3em;
     background-color: #351e0b;
     border: 0.2em solid #f2c920;
@@ -252,7 +292,6 @@ input[type=number]{
 }
 input[type=checkbox]{
     font-weight: bold;
-    color: #ffffff;
     background-color: #351e0b;
     border: 0.2em solid #f2c920;
     border-radius: 0.5em;
@@ -263,7 +302,6 @@ input[type=checkbox]{
 select{
     font-size: 80%;
     font-weight: bold;
-    color: #ffffff;
     padding: 0 0.1em;
     background-color: #351e0b;
     border: 0.2em solid #f2c920;
@@ -275,7 +313,6 @@ select{
 a.a_button{ /* Links that look like buttons. */
     font-size: 100%;
     font-weight: bold;
-    color: #ffffff;
     padding: 0.3em 1em 0.3em 1em;
     background-color: #351e0b;
     border: 0.2em solid #f2c920;;
@@ -301,7 +338,6 @@ section h2{
     margin: -0.25em -0.25em 0.5em -0.25em;
     border-bottom: 0.1em solid #f2c920;
     background-color: #000000bb;
-    color: #ffffff;
     text-align: left;
     border-top-left-radius: 0.25em;
     border-top-right-radius: 0.25em;
@@ -448,7 +484,6 @@ div.rune_panel.rune_level_15 span.rune_stars img.star{
 div.rune_panel span.rune_level{
     font-size: 130%;
     font-weight: bold;
-    color: #ffffff;
     text-shadow: 0 0 0.2em #000000, 0 0 0.2em #000000, 0 0 0.2em #000000, 0 0 0.2em #000000, 0 0 0.2em #000000;
     position: relative;
     top: 4.7em;
@@ -586,7 +621,6 @@ table.rune td.icon div.rune_panel{
     font-size: 70%;
 }
 table.rune td.stats{
-    color: #ffffff;
     border-bottom: 0.2em solid #777777;
     border-top: 0.2em solid #777777;
     background-color: #655c59;
@@ -594,7 +628,6 @@ table.rune td.stats{
 }
 
 table.rune td.stats table{
-    color: #ffffff;
     font-size: 90%;
 }
 
@@ -634,7 +667,6 @@ table.rune td.stats table td.value img{
 }
 
 table.rune td.details{
-    color: #ffffff;
     padding-left: 0.5em;
     border-bottom: 0.2em solid #777777;
     border-right: 0.2em solid #777777;
@@ -659,7 +691,6 @@ table.rune td.details table.table_details span.quality{
     border: 0.1em solid #000000;
     border-radius: 0.2em;
     font-weight: bold;
-    color: #ffffff;
     text-shadow: 0 0 0.1em #000000;
     padding: 0 0.3em;
     width: 5em;
@@ -755,7 +786,6 @@ div.craft_panel span.craft_stat{
     width: 100%;
     text-align: center;
     font-size: 60%;
-    color: #ffffff;
     text-shadow: 0 0 0.2em #000000, 0 0 0.2em #000000, 0 0 0.2em #000000, 0 0 0.2em #000000, 0 0 0.2em #000000;
     position: absolute;
     top: 2.7em;