Fusion page css for small screens. Improved filters for runes and report pages.

application/page/Report_Runeupgrade_Page.php

@@ -143,8 +143,8 @@
             if (isset($_GET["rune_min_stars"]) && intval($_GET["rune_min_stars"]) > 0 && intval($_GET["rune_min_stars"]) < 7){
                 $this->filters["rune_min_stars"] = $_GET["rune_min_stars"];
             }
-            if (isset($_GET["rune_max_stars"]) && intval($_GET["max_stars"]) > 0 && intval($_GET["rune_max_stars"]) < 7){
-                $this->filters["mnster_max_stars"] = $_GET["rune_max_stars"];
+            if (isset($_GET["rune_max_stars"]) && intval($_GET["rune_max_stars"]) > 0 && intval($_GET["rune_max_stars"]) < 7){
+                $this->filters["rune_max_stars"] = $_GET["rune_max_stars"];
             }
             if (isset($_GET["rune_min_level"]) && intval($_GET["rune_min_level"]) >= 0 && intval($_GET["mnster_min_level"]) <= 15){
                 $this->filters["rune_min_level"] = $_GET["rune_min_level"];
@@ -293,7 +293,7 @@
                 $s = $s . " AND monster.in_storage = 0 ";
             }
             if (count($this->filters["rune_slot"]) > 0){
-                $s = $s . " AND rune_slot IN ( ";
+                $s = $s . " AND rune.slot IN ( ";
                 foreach($this->filters["rune_slot"] as $t){
                     $s = $s . "$t, ";
                 }
@@ -306,9 +306,9 @@
               "  monster.id, " .
               "  rune.slot, " .
               "  id, " .
-              "  rune_alt.stars, " .
-              "  rune_alt.original_quality, " .
-              "  rune_alt.main_stat_value;";
+              "  rune_alt.stars DESC, " .
+              "  rune_alt.original_quality DESC , " .
+              "  rune_alt.main_stat_value DESC;";
             return $s;
         }
     }

application/page/Runes_Page.php

@@ -28,7 +28,7 @@
             "max_quality" => 4,
             "min_original_quality" => 0,
             "max_original_quality" => 4,
-            "min_stars" => 6,
+            "min_stars" => 1,
             "max_stars" => 6,
             "min_level" => 0,
             "max_level" => 15,

application/view/monster.php

@@ -440,7 +440,7 @@
                                     <tr class='main_stat'>
                                         <td class='stat'>
 <?php
-                                            if (strpos($rune->main_stat, "%") !== false){
+                                            f (in_array($rune->main_stat, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                 $stat_name = str_replace("%", "", $rune->main_stat);
                                                 $stat_value = "+ " . $rune->main_stat_value . "%";
                                             }

application/view/report_runeupgrade.php

@@ -484,7 +484,7 @@
                             <tr>
                                 <td class='icon'>
                                     <div class='rune_panel rune_slot_<?=$rupgrade["rune"]->slot?> rune_level_<?=$rupgrade["rune"]->level?> rune_quality_<?=$rupgrade["rune"]->quality?> rune_original_quality_<?=$rupgrade["rune"]->original_quality?>'>
-                                        <img class='rune_base' src=<?=$path["img"]["layout"]?>rune/base.png/>
+                                        <img class='rune_base' src='<?=$path["img"]["layout"]?>rune/base.png'/>
                                         <img class='rune_icon' src='<?=$path["img"]["layout"]?>rune/<?=$rupgrade["rune"]->type?>.png'/>
                                         <span class='rune_stars'>
 <?php
@@ -505,7 +505,7 @@
                                         <tr class='main_stat'>
                                             <td class='stat'>
 <?php
-                                                    if (strpos($rupgrade["rune"]->main_stat, "%") !== false){
+                                                    if (in_array($rupgrade["rune"]->main_stat, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                         $stat_name = str_replace("%", "", $rupgrade["rune"]->main_stat);
                                                         $stat_value = "+ " . $rupgrade["rune"]->main_stat_value . "%";
                                                     }
@@ -527,7 +527,7 @@
                                                         $stat_name = "&nbsp;";
                                                         $stat_value = "";
                                                     }
-                                                    elseif (strpos($rupgrade["rune"]->innate_stat, "%") !== false){
+                                                    elseif (in_array($rupgrade["rune"]->innate_stat, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                         $stat_name = str_replace("%", "", $rupgrade["rune"]->innate_stat);
                                                         $stat_value = "+ " . $rupgrade["rune"]->innate_stat_value . "%";
                                                     }
@@ -549,7 +549,7 @@
                                                         $stat_name = "&nbsp;";
                                                         $stat_value = "";
                                                     }
-                                                    elseif (strpos($rupgrade["rune"]->substat_1, "%") !== false){
+                                                    elseif (in_array($rupgrade["rune"]->substat_1, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                         $stat_name = str_replace("%", "", $rupgrade["rune"]->substat_1);
                                                         $stat_value = "+ " . $rupgrade["rune"]->substat_1_value . "%";
                                                     }
@@ -577,7 +577,7 @@
                                                         $stat_name = "&nbsp;";
                                                         $stat_value = "";
                                                     }
-                                                    elseif (strpos($rupgrade["rune"]->substat_2, "%") !== false){
+                                                    elseif (in_array($rupgrade["rune"]->substat_2, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                         $stat_name = str_replace("%", "", $rupgrade["rune"]->substat_2);
                                                         $stat_value = "+ " . $rupgrade["rune"]->substat_2_value . "%";
                                                     }
@@ -605,7 +605,7 @@
                                                         $stat_name = "&nbsp;";
                                                         $stat_value = "";
                                                     }
-                                                    elseif (strpos($rupgrade["rune"]->substat_3, "%") !== false){
+                                                    elseif (in_array($rupgrade["rune"]->substat_3, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                         $stat_name = str_replace("%", "", $rupgrade["rune"]->substat_3);
                                                         $stat_value = "+ " . $rupgrade["rune"]->substat_3_value . "%";
                                                     }
@@ -633,7 +633,7 @@
                                                         $stat_name = "&nbsp;";
                                                         $stat_value = "";
                                                     }
-                                                    elseif (strpos($rupgrade["rune"]->substat_4, "%") !== false){
+                                                    elseif (in_array($rupgrade["rune"]->substat_4, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                         $stat_name = str_replace("%", "", $rupgrade["rune"]->substat_4);
                                                         $stat_value = "+ " . $rupgrade["rune"]->substat_4_value . "%";
                                                     }
@@ -758,7 +758,7 @@
                                     <tr>
                                         <td class='icon'>
                                             <div class='rune_panel rune_slot_<?=$alternative->slot?> rune_level_<?=$alternative->level?> rune_quality_<?=$alternative->quality?> rune_original_quality_<?=$alternative->original_quality?>'>
-                                                <img class='rune_base' src=<?=$path["img"]["layout"]?>rune/base.png/>
+                                                <img class='rune_base' src='<?=$path["img"]["layout"]?>rune/base.png'/>
                                                 <img class='rune_icon' src='<?=$path["img"]["layout"]?>rune/<?=$alternative->type?>.png'/>
                                                 <span class='rune_stars'>
 <?php
@@ -790,7 +790,7 @@
                                                 <tr class='main_stat'>
                                                     <td class='stat'>
 <?php
-                                                            if (strpos($alternative->main_stat, "%") !== false){
+                                                            if (in_array($alternative->main_stat, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                                 $stat_name = str_replace("%", "", $alternative->main_stat);
                                                                 $stat_value = "+ " . $alternative->main_stat_value . "%";
                                                             }
@@ -812,7 +812,7 @@
                                                                 $stat_name = "&nbsp;";
                                                                 $stat_value = "";
                                                             }
-                                                            elseif (strpos($alternative->innate_stat, "%") !== false){
+                                                            elseif (in_array($alternative->innate_stat, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                                 $stat_name = str_replace("%", "", $alternative->innate_stat);
                                                                 $stat_value = "+ " . $alternative->innate_stat_value . "%";
                                                             }
@@ -834,7 +834,7 @@
                                                                 $stat_name = "&nbsp;";
                                                                 $stat_value = "";
                                                             }
-                                                            elseif (strpos($alternative->substat_1, "%") !== false){
+                                                            elseif (in_array($alternative->substat_1, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                                 $stat_name = str_replace("%", "", $alternative->substat_1);
                                                                 $stat_value = "+ " . $alternative->substat_1_value . "%";
                                                             }
@@ -862,7 +862,7 @@
                                                                 $stat_name = "&nbsp;";
                                                                 $stat_value = "";
                                                             }
-                                                            elseif (strpos($alternative->substat_2, "%") !== false){
+                                                            elseif (in_array($alternative->substat_2, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                                 $stat_name = str_replace("%", "", $alternative->substat_2);
                                                                 $stat_value = "+ " . $alternative->substat_2_value . "%";
                                                             }
@@ -890,7 +890,7 @@
                                                                 $stat_name = "&nbsp;";
                                                                 $stat_value = "";
                                                             }
-                                                            elseif (strpos($alternative->substat_3, "%") !== false){
+                                                            elseif (in_array($alternative->substat_3, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                                 $stat_name = str_replace("%", "", $alternative->substat_3);
                                                                 $stat_value = "+ " . $alternative->substat_3_value . "%";
                                                             }
@@ -918,7 +918,7 @@
                                                                 $stat_name = "&nbsp;";
                                                                 $stat_value = "";
                                                             }
-                                                            elseif (strpos($alternative->substat_4, "%") !== false){
+                                                            elseif (in_array($alternative->substat_4, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
                                                                 $stat_name = str_replace("%", "", $alternative->substat_4);
                                                                 $stat_value = "+ " . $alternative->substat_4_value . "%";
                                                             }

public/css/fusion.css

@@ -33,6 +33,17 @@ div.owned{
     padding: 0 0.3em;
 }
 
+@media screen and (max-width : 990px){
+    div.owned{
+        border: 0;
+        background-color:initial;
+        border-radius: 0;
+        padding: 0em;
+        font-size: 60%;
+        margin: -0.5em;
+    }
+}
+
 div.owned span.owned{
     display: block;
     text-align: center;
@@ -40,12 +51,22 @@ div.owned span.owned{
     font-size: 90%;
     color: #ffffff;
 }
+@media screen and (max-width : 990px){
+    div.owned span.owned{
+        display: none;
+    }
+}
 
 div.owned div.monster_panel{
     display: inline-block;
     font-size: 60%;
     margin: -0.2em;
 }
+@media screen and (max-width : 990px){
+    div.owned div.monster_panel{
+        margin: -0.2em -0.2em -2em -0.2em;
+    }
+}
 
 div.f5{
     display: block;
@@ -64,8 +85,28 @@ div.f5 > div.product{
     border-bottom-left-radius: 8em;
     padding: 2em;
 }
+@media screen and (max-width : 990px){
+    div.f5 > div.product{
+        display: block;
+        width: 100%;
+        background: initial;
+        border-left:0;
+        border-top: 0;;
+        border-bottom: 0;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: ;
+        padding: 0;
+    }
+}
+
+div.f5 > div.product > a > div.monster_panel{
+    display: inline-block;
+    vertical-align: middle;
+}
+
 div.f5 > div.product > div.owned{
     display: inline-block;
+    vertical-align: middle;
 }
 
 div.f5 > div.ingredients{
@@ -80,10 +121,32 @@ div.f5 > div.ingredients{
     border-bottom-right-radius: 1em;
     padding: 0.5em 0.5em 0.5em 0;
 }
+@media screen and (max-width : 990px){
+    div.f5 > div.ingredients{
+        display: block;
+        border-left:0;
+        border-top: 0;;
+        border-bottom: 0;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        padding: 0;
+    }
+}
 
 div.f4{
     display:block;
 }
+@media screen and (max-width : 990px){
+    div.f4{
+        display: inline-block;
+        vertical-align: top;
+        width: 22%;
+        border: 0.2em solid #000000;
+        background-color: #00000033;
+    }
+}
 
 div.f4 > div.product{
     display: inline-block;
@@ -96,20 +159,56 @@ div.f4 > div.product{
     border-bottom-left-radius: 4em;
     background: linear-gradient(90deg, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0.5) 100%);
 }
+@media screen and (max-width : 990px){
+    div.f4 > div.product{
+        display: block;
+        width: 100%;
+        background: initial;
+        border-left:0;
+        border-top: 0;
+        border-bottom: 0;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: ;
+        padding: 0;
+    }
+}
 div.f4.extra > div.product{
     display: block;
     width: auto;
     margin-top: 0.2em;
     margin-bottom: 0.5em;
 }
+@media screen and (max-width : 990px){
+    div.4.extra > div.product{
+        display: block;
+        width: 100%;
+        background: initial;
+        border-left:0;
+        border-top: 0;
+        border-bottom: 0;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: ;
+        padding: 0;
+    }
+}
 div.f4 > div.product > a > div.unawakened{
     display: inline-block;
     vertical-align: top;
     width: 6em;
 }
+@media screen and (max-width : 990px){
+    div.f4 > div.product > a > div.unawakened{
+        display: none;
+    }
+}
 div.f4.extra > div.product > a > div.unawakened{
     vertical-align: middle;
 }
+@media screen and (max-width : 990px){
+    div.f4.extra > div.product > a > div.unawakened{
+        display: none;
+    }
+}
 
 div.f4 > div.product > div.essences{
     display: inline-block;
@@ -117,6 +216,11 @@ div.f4 > div.product > div.essences{
     text-align: center;
     vertical-align: top;
 }
+@media screen and (max-width : 990px){
+    div.f4 > div.product > div.essences{
+        display: none;
+    }
+}
 div.f4.extra > div.product > div.essences{
     vertical-align: middle;
     margin-left: 1em;
@@ -149,6 +253,19 @@ div.f4 > div.ingredients{
     padding: 0;
     margin: 0.2em 0;
 }
+@media screen and (max-width : 990px){
+    div.f4 > div.ingredients{
+        display: block;
+        width: 100%;
+        background: initial;
+        border-left:0;
+        border-top: 0;
+        border-bottom: 0;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: ;
+        padding: 0;
+    }
+}
 
 div.f3{
     display: block;
@@ -162,13 +279,33 @@ div.f3{
     background: linear-gradient(90deg, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0.5) 100%);
 }
 
-div.f3 > div.product{
+@media screen and (max-width : 990px){
+    div.f3{
+        display: inline-block;
+        vertical-align: top;
+        width: 43%;
+        font-size: 45%;
+        border-left: 0;
+        border-top: 0;
+        border-bottom: 0;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        background: initial;
+        padding: 0.1em;
+        background-color: #00000033;
+        border: 0.1em solid #000000;
+    }
 }
 
 div.f3 > div.product > a > div.unawakened{
     display: inline-block;
     vertical-align: middle;
 }
+@media screen and (max-width : 990px){
+    div.f3 > div.product > a > div.unawakened{
+        display: none;
+    }
+}
 
 
 div.f3 > div.product > div.essences{
@@ -177,6 +314,11 @@ div.f3 > div.product > div.essences{
     text-align: center;
     vertical-align: middle;
 }
+@media screen and (max-width : 990px){
+    div.f3 > div.product > div.essences{
+        display: none;
+    }
+}
 
 div.f3 > div.product > a > div.awakened{
     display: inline-block;
@@ -186,4 +328,4 @@ div.f3 > div.product > a > div.awakened{
 div.f3 > div.product > div.owned{
     display: inline-block;
     vertical-align: middle;
-}
+}