Iñigo Valentin 6 anni fa
parent
commit
8b73fee506

+ 2 - 2
application/Filter.php

@@ -44,7 +44,7 @@
         "rune_max_max_efficiency" => 100,
         "rune_max_max_efficiency" => 100,
         "rune_slot" => [],
         "rune_slot" => [],
         "grind" => 1,
         "grind" => 1,
-        "grind_min_quality" => $QUALITY["NORMAL"],
+        "grind_min_quality" => $QUALITY["RARE"],
         "grind_stat" => [
         "grind_stat" => [
             $RUNE_STAT["HP%"],
             $RUNE_STAT["HP%"],
             $RUNE_STAT["ATK%"],
             $RUNE_STAT["ATK%"],
@@ -55,7 +55,7 @@
             $RUNE_STAT["ACC"]
             $RUNE_STAT["ACC"]
         ],
         ],
         "gem" => 1,
         "gem" => 1,
-        "gem_min_quality" => $QUALITY["NORMAL"],
+        "gem_min_quality" => $QUALITY["RARE"],
         "gem_stat_from" => [
         "gem_stat_from" => [
             $RUNE_STAT["HP"],
             $RUNE_STAT["HP"],
             $RUNE_STAT["ATK"],
             $RUNE_STAT["ATK"],

+ 1 - 0
application/config.php

@@ -17,6 +17,7 @@
             "skill" => $root . "img/skill/",
             "skill" => $root . "img/skill/",
             "essence" => $root . "img/essence/",
             "essence" => $root . "img/essence/",
             "rune" => $root . "img/rune/",
             "rune" => $root . "img/rune/",
+            "grind" => $root . "img/grind/",
             "element" => $root . "img/element/",
             "element" => $root . "img/element/",
             "skill_guild" => $root . "img/skill_guild/",
             "skill_guild" => $root . "img/skill_guild/",
             "decoration" => $root . "img/decoration/",
             "decoration" => $root . "img/decoration/",

+ 3 - 1
application/page/Report_Runecraft_Page.php

@@ -46,6 +46,7 @@
             $this->view = $path["view"] . "report_runecraft.php";
             $this->view = $path["view"] . "report_runecraft.php";
             $this->parse_filters();
             $this->parse_filters();
             $s = $this->build_query();
             $s = $this->build_query();
+            error_log($s);
             $q = $this->db->query($s);
             $q = $this->db->query($s);
             $prev_monster = "";
             $prev_monster = "";
             $prev_rune = "";
             $prev_rune = "";
@@ -100,6 +101,7 @@
             //global $RUNE_STAT;
             //global $RUNE_STAT;
             global $FILTER_RUNECRAFT;
             global $FILTER_RUNECRAFT;
             global $FILTER_SKILLUP;
             global $FILTER_SKILLUP;
+            global $QUALITY;
             $this->filters = $FILTER_RUNECRAFT;
             $this->filters = $FILTER_RUNECRAFT;
             // Monster
             // Monster
             if (isset($_GET["monster_min_stars"]) && intval($_GET["monster_min_stars"]) > 0 && intval($_GET["monster_min_stars"]) < 7){
             if (isset($_GET["monster_min_stars"]) && intval($_GET["monster_min_stars"]) > 0 && intval($_GET["monster_min_stars"]) < 7){
@@ -127,7 +129,7 @@
             if (isset($_GET["rune_min_level"]) && intval($_GET["rune_min_level"]) >= 0 && intval($_GET["rune_min_level"]) <= 15){
             if (isset($_GET["rune_min_level"]) && intval($_GET["rune_min_level"]) >= 0 && intval($_GET["rune_min_level"]) <= 15){
                 $this->filters["rune_min_level"] = $_GET["rune_min_level"];
                 $this->filters["rune_min_level"] = $_GET["rune_min_level"];
             }
             }
-            if (isset($_GET["rune_max_level"]) && intval($_GET["max_level"]) >= 0 && intval($_GET["rune_max_level"]) <= 15){
+            if (isset($_GET["rune_max_level"]) && intval($_GET["rune_max_level"]) >= 0 && intval($_GET["rune_max_level"]) <= 15){
                 $this->filters["rune_max_level"] = $_GET["rune_max_level"];
                 $this->filters["rune_max_level"] = $_GET["rune_max_level"];
             }
             }
             if (isset($_GET["rune_min_quality"]) && intval($_GET["rune_min_quality"]) >= $QUALITY["NORMAL"] && intval($_GET["rune_min_quality"]) <= $QUALITY["LEGEND"]){
             if (isset($_GET["rune_min_quality"]) && intval($_GET["rune_min_quality"]) >= $QUALITY["NORMAL"] && intval($_GET["rune_min_quality"]) <= $QUALITY["LEGEND"]){

+ 1 - 0
application/page/Report_Runeupgrade_Page.php

@@ -122,6 +122,7 @@
          * min_stars (1-6) and in_storage (on/off).
          * min_stars (1-6) and in_storage (on/off).
          */
          */
         private function parse_filters(){
         private function parse_filters(){
+            global $QUALITY;
             // Monster
             // Monster
             if (isset($_GET["monster_min_stars"]) && intval($_GET["monster_min_stars"]) > 0 && intval($_GET["monster_min_stars"]) < 7){
             if (isset($_GET["monster_min_stars"]) && intval($_GET["monster_min_stars"]) > 0 && intval($_GET["monster_min_stars"]) < 7){
                 $this->filters["monster_min_stars"] = $_GET["monster_min_stars"];
                 $this->filters["monster_min_stars"] = $_GET["monster_min_stars"];

+ 9 - 9
application/view/inc/filter_report_runecraft.php

@@ -75,7 +75,7 @@
 <?php
 <?php
 
 
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["rune_min_quality"]] = "selected";
+                $selected[$filters["rune_min_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='rune_min_quality' id='filter_quality_min'>
                 <select name='rune_min_quality' id='filter_quality_min'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -87,7 +87,7 @@
                 -
                 -
 <?php
 <?php
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["rune_max_quality"]] = "selected";
+                $selected[$filters["rune_max_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='rune_max_quality' id='filter_quality_max'>
                 <select name='rune_max_quality' id='filter_quality_max'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -103,7 +103,7 @@
                 <span>Original quality:</span>
                 <span>Original quality:</span>
 <?php
 <?php
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["rune_min_original_quality"]] = "selected";
+                $selected[$filters["rune_min_original_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='rune_min_original_quality' id='filter_original_quality_min'>
                 <select name='rune_min_original_quality' id='filter_original_quality_min'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -115,7 +115,7 @@
                 -
                 -
 <?php
 <?php
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["rune_max_original_quality"]] = "selected";
+                $selected[$filters["rune_max_original_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='rune_max_original_quality' id='filter_original_quality_max'>
                 <select name='rune_max_original_quality' id='filter_original_quality_max'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -162,7 +162,7 @@
                 <span>Min. quality:</span>
                 <span>Min. quality:</span>
 <?php
 <?php
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["grind_min_quality"]] = "selected";
+                $selected[$filters["grind_min_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='grind_min_quality'>
                 <select name='grind_min_quality'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -174,7 +174,7 @@
             </td>
             </td>
             <td class='filter filter_separator' colspan='2'>
             <td class='filter filter_separator' colspan='2'>
                 <span>Stats:</span>
                 <span>Stats:</span>
-                <select multiple name='grind_stat' id='filter_grind_stat'>
+                <select multiple name='grind_stat[]' id='filter_grind_stat'>
 <?php
 <?php
                     foreach($RUNE_STAT as $k=>$n){
                     foreach($RUNE_STAT as $k=>$n){
                         $selected = "";
                         $selected = "";
@@ -210,7 +210,7 @@
                 <span>Min. quality:</span>
                 <span>Min. quality:</span>
 <?php
 <?php
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["gem_min_quality"]] = "selected";
+                $selected[$filters["gem_min_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='gem_min_quality'>
                 <select name='gem_min_quality'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -222,7 +222,7 @@
             </td>
             </td>
             <td class='filter filter_separator'>
             <td class='filter filter_separator'>
                 <span>Replace...</span>
                 <span>Replace...</span>
-                <select multiple name='gem_stat_from' id='filter_gem_stat_from'>
+                <select multiple name='gem_stat_from[]' id='filter_gem_stat_from'>
 <?php
 <?php
                     foreach($RUNE_STAT as $k=>$n){
                     foreach($RUNE_STAT as $k=>$n){
                         $selected = "";
                         $selected = "";
@@ -239,7 +239,7 @@
             </td>
             </td>
             <td class='filter filter_separator'>
             <td class='filter filter_separator'>
                 <span>...with...</span>
                 <span>...with...</span>
-                <select multiple name='gem_stat_from' id='filter_gem_stat_to'>
+                <select multiple name='gem_stat_from[]' id='filter_gem_stat_to'>
 <?php
 <?php
                     foreach($RUNE_STAT as $k=>$n){
                     foreach($RUNE_STAT as $k=>$n){
                         $selected = "";
                         $selected = "";

+ 4 - 4
application/view/inc/filter_report_runeupgrade.php

@@ -74,7 +74,7 @@
 <?php
 <?php
 
 
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["rune_min_quality"]] = "selected";
+                $selected[$filters["rune_min_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='rune_min_quality' id='filter_quality_min'>
                 <select name='rune_min_quality' id='filter_quality_min'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -86,7 +86,7 @@
                 -
                 -
 <?php
 <?php
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["rune_max_quality"]] = "selected";
+                $selected[$filters["rune_max_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='rune_max_quality' id='filter_quality_max'>
                 <select name='rune_max_quality' id='filter_quality_max'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -102,7 +102,7 @@
                 <span>Original quality:</span>
                 <span>Original quality:</span>
 <?php
 <?php
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["rune_min_original_quality"]] = "selected";
+                $selected[$filters["rune_min_original_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='rune_min_original_quality' id='filter_original_quality_min'>
                 <select name='rune_min_original_quality' id='filter_original_quality_min'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
@@ -114,7 +114,7 @@
                 -
                 -
 <?php
 <?php
                 $selected = Array("", "", "", "", "");
                 $selected = Array("", "", "", "", "");
-                $selected[$filters["rune_max_original_quality"]] = "selected";
+                $selected[$filters["rune_max_original_quality"] - 1] = "selected";
 ?>
 ?>
                 <select name='rune_max_original_quality' id='filter_original_quality_max'>
                 <select name='rune_max_original_quality' id='filter_original_quality_max'>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>
                     <option value='<?=$QUALITY["NORMAL"]?>' <?=$selected[0]?>>Normal</option>

+ 4 - 0
application/view/report_runeupgrade.php

@@ -1,3 +1,7 @@
+<?php
+    global $RUNE_STAT;
+    global $QUALITY;
+?>
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html lang='en'>
 <html lang='en'>
     <head>
     <head>