Added scrollbar on crafting list

Added the possibility to add a custom scenario when teleporting before crafting
ShishioValentine · Mar 6, 2021 · 0734f1f · 0734f1f
2 parents fe822d0 + 3a9df59
commit 0734f1f
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 24 deletions.
diff --git a/MainUserControlV2.Designer.cs b/MainUserControlV2.Designer.cs
diff --git a/MainUserControlV2.cs b/MainUserControlV2.cs
@@ -85,7 +85,8 @@ private void SearchThread()
                 jobs = _jobFilter;
             }
             Service_Misc.LogText(_logTextBox, "Alright, let's look for " + elemToSearch);
-            List<FFXIVSearchItem> listResults = GarlandTool.Search(elemToSearch, _logTextBox, FFXIVItem.TypeItem.Crafted, jobs, minLevel, maxLevel);
+            bool searchForGathered = VPThreading.GetChecked(_gatherIemCheckBox);
+            List<FFXIVSearchItem> listResults = GarlandTool.Search(elemToSearch, _logTextBox, searchForGathered ? FFXIVItem.TypeItem.Gathered : FFXIVItem.TypeItem.Crafted, jobs, minLevel, maxLevel);
 
             //Storing in options
             MiqoCraftOptions options = new MiqoCraftOptions();

diff --git a/MiqoCraftCore/GarlandTool.cs b/MiqoCraftCore/GarlandTool.cs
@@ -89,31 +89,38 @@ public static List<FFXIVSearchItem> Search(string iElemToSearch, System.Windows.
                         item.UrlImage = "http://garlandtools.org/files/icons/item/" + dataToken["c"].Value<string>() + ".png";
                         item.UrlGarland = "http://garlandtools.org/db/#item/" + dataToken["i"].Value<string>();
 
-                        if (dataToken["f"] != null && iType == FFXIVItem.TypeItem.Crafted)
+                        if (dataToken["f"] != null)
                         {
-                            string jobID = dataToken["f"][0]["job"].Value<string>();
-                            string itemClass = GetJobName(jobID);
-                            string itemLevel = dataToken["f"][0]["lvl"].Value<string>();
-                            int level = 0;
-                            int.TryParse(itemLevel, out level);
-                            if (iMinLevel > 0 && level < iMinLevel)
+                            try
                             {
-                                Service_Misc.LogText(iLogBox, "Found something but its level is under the requested min level : " + itemName + " - Level : " + itemLevel);
-                                continue;
+                                string itemLevel = dataToken["f"][0]["lvl"].Value<string>();
+                                int level = 0;
+                                int.TryParse(itemLevel, out level);
+                                if (iMinLevel > 0 && level < iMinLevel)
+                                {
+                                    Service_Misc.LogText(iLogBox, "Found something but its level is under the requested min level : " + itemName + " - Level : " + itemLevel);
+                                    continue;
+                                }
+                                if (iMaxLevel > 0 && level > iMaxLevel)
+                                {
+                                    Service_Misc.LogText(iLogBox, "Found something but its level is over the requested max level : " + itemName + " - Level : " + itemLevel);
+                                    continue;
+                                }
+
+                                string jobID = dataToken["f"][0]["job"].Value<string>();
+                                string itemClass = GetJobName(jobID);
+                                if (null != iJobs && iJobs.Count > 0 && !iJobs.Contains(itemClass.ToUpper()) && !iJobs.Contains(itemClass.ToLower()))
+                                {
+                                    Service_Misc.LogText(iLogBox, "Found something but its job is not in the requested list : " + itemName + " - Job : " + itemClass);
+                                    continue;
+                                }
+                                item.Class = itemClass;
+                                item.Level = itemLevel;
                             }
-                            if (iMaxLevel > 0 && level > iMaxLevel)
+                            catch
                             {
-                                Service_Misc.LogText(iLogBox, "Found something but its level is over the requested max level : " + itemName + " - Level : " + itemLevel);
-                                continue;
-                            }
 
-                            if (null != iJobs && iJobs.Count > 0 && !iJobs.Contains(itemClass.ToUpper()) && !iJobs.Contains(itemClass.ToLower()))
-                            {
-                                Service_Misc.LogText(iLogBox, "Found something but its job is not in the requested list : " + itemName + " - Job : " + itemClass);
-                                continue;
                             }
-                            item.Class = itemClass;
-                            item.Level = itemLevel;
                         }
                         else if (iType == FFXIVItem.TypeItem.Crafted)
                         {

diff --git a/MiqoCraftCore/Service_Misc.cs b/MiqoCraftCore/Service_Misc.cs
@@ -605,6 +605,12 @@ public static string RemoveIllegalCharacters(string iString)
        .Replace("+3?}", "+3\"}")
        .Replace("+4?}", "+4\"}")
        .Replace("+5?}", "+5\"}")
+       .Replace("+1}", "+1\"}")
+       .Replace("+1}", "+1\"}")
+       .Replace("+2}", "+2\"}")
+       .Replace("+3}", "+3\"}")
+       .Replace("+4}", "+4\"}")
+       .Replace("+5}", "+5\"}")
        .Replace("・・", "\"");
         }
     }

diff --git a/MiqoCraftCore/obj/Release/MiqoCraftCore.csprojAssemblyReference.cache b/MiqoCraftCore/obj/Release/MiqoCraftCore.csprojAssemblyReference.cache
diff --git a/MiqoCraftMapViewer/bin/Debug/MiqoCraftMapViewer.exe b/MiqoCraftMapViewer/bin/Debug/MiqoCraftMapViewer.exe
diff --git a/MiqoCraftMapViewer/bin/Debug/MiqoCraftMapViewer.pdb b/MiqoCraftMapViewer/bin/Debug/MiqoCraftMapViewer.pdb
diff --git a/MiqoCraftMapViewer/obj/Debug/MiqoCraftMapViewer.csproj.CoreCompileInputs.cache b/MiqoCraftMapViewer/obj/Debug/MiqoCraftMapViewer.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-539c83ca086490ca436a5c765dabe11a14dd0231
+6a3f064ecbd128374256a13c8e499a6ff1cad7f4
diff --git a/MiqoCraftMapViewer/obj/Debug/MiqoCraftMapViewer.csproj.GenerateResource.cache b/MiqoCraftMapViewer/obj/Debug/MiqoCraftMapViewer.csproj.GenerateResource.cache
diff --git a/MiqoCraftMapViewer/obj/Debug/MiqoCraftMapViewer.exe b/MiqoCraftMapViewer/obj/Debug/MiqoCraftMapViewer.exe
diff --git a/MiqoCraftMapViewer/obj/Debug/MiqoCraftMapViewer.pdb b/MiqoCraftMapViewer/obj/Debug/MiqoCraftMapViewer.pdb
diff --git a/MiqoCraftMapViewer/obj/Release/MiqoCraftMapViewer.csprojAssemblyReference.cache b/MiqoCraftMapViewer/obj/Release/MiqoCraftMapViewer.csprojAssemblyReference.cache
diff --git a/MiqoGridFinder/bin/Debug/MiqoGridFinder.exe b/MiqoGridFinder/bin/Debug/MiqoGridFinder.exe
diff --git a/MiqoGridFinder/bin/Debug/MiqoGridFinder.pdb b/MiqoGridFinder/bin/Debug/MiqoGridFinder.pdb
diff --git a/MiqoGridFinder/obj/Debug/MiqoGridFinder.csproj.CoreCompileInputs.cache b/MiqoGridFinder/obj/Debug/MiqoGridFinder.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2e46e225bf9d275bb6a2f817420138afb76c617d
+a355edc08d78a768a7cd4d54243a77346b740f48
diff --git a/MiqoGridFinder/obj/Debug/MiqoGridFinder.csproj.GenerateResource.cache b/MiqoGridFinder/obj/Debug/MiqoGridFinder.csproj.GenerateResource.cache
diff --git a/MiqoGridFinder/obj/Debug/MiqoGridFinder.exe b/MiqoGridFinder/obj/Debug/MiqoGridFinder.exe
diff --git a/MiqoGridFinder/obj/Debug/MiqoGridFinder.pdb b/MiqoGridFinder/obj/Debug/MiqoGridFinder.pdb