From eec8c381c6b584a33e2c9f549b4af410471a90e6 Mon Sep 17 00:00:00 2001
From: merstrax <merstrax@gmail.com>
Date: Mon, 17 Jan 2022 06:38:44 -0500
Subject: [PATCH] Set first option to required level and its value to
 playerlevel Added a fourth options selection

---
 AtlasLoot/Core/AtlasLoot.xml      | 99 +++++++++++++++++++++++++++++--
 AtlasLoot/Core/SearchAdvanced.lua | 42 ++++++++-----
 2 files changed, 123 insertions(+), 18 deletions(-)

diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml
index 955be38..81ab198 100644
--- a/AtlasLoot/Core/AtlasLoot.xml
+++ b/AtlasLoot/Core/AtlasLoot.xml
@@ -1980,7 +1980,7 @@
 				</Anchors>
 				<Layers>
 					<Layer level="OVERLAY">
-						<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Extra Seach Options 1: ">
+						<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Extra Search Options 1:">
 							<Anchors>
 								<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_Argument1" relativePoint="TOPLEFT">
 									<Offset>
@@ -2001,7 +2001,7 @@
 					</OnClick>
 					<OnShow>
 						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
-						this:SetText("Select Option");
+						this:SetText("Required Level");
 						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
 					</OnShow>
 				</Scripts>
@@ -2027,7 +2027,7 @@
 					</OnClick>
 					<OnShow>
 						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
-						this:SetText("Select Option");
+						this:SetText("Equals");
 						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
 					</OnShow>
 				</Scripts>
@@ -2231,6 +2231,96 @@
 				<FontString name="$parent_Argument3String" inherits="GameFontNormal"></FontString>
 			</EditBox>
 
+			<Button name="$parent_Argument4" inherits="OptionsButtonTemplate">
+				<Size>
+					<AbsDimension x="130" y="20"/>
+				</Size>
+				<Anchors>
+					<Anchor point="TOP" relativeTo="$parent_Argument3" relativePoint="BOTTOM">
+						<Offset>
+							<AbsDimension y="-25"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Layers>
+					<Layer level="OVERLAY">
+						<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Extra Seach Options 4: ">
+							<Anchors>
+								<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_Argument4" relativePoint="TOPLEFT">
+									<Offset>
+										<AbsDimension y="5"/>
+									</Offset>
+								</Anchor>
+							</Anchors>
+						</FontString>
+					</Layer>
+				</Layers>
+				<Scripts>
+					<OnClick>
+						if AtlasLoot_Argument4Menu:IsOpen() then
+							AtlasLoot_Argument4Menu:Close();
+						else
+							AtlasLoot_Argument4Menu:Open(this);
+						end
+					</OnClick>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText("Select Option");
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+				</Scripts>
+			</Button>
+			<Button name="$parent_Argument4Sub" inherits="OptionsButtonTemplate">
+				<Size>
+					<AbsDimension x="130" y="20"/>
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_Argument4" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="15"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick>
+						if AtlasLoot_Argument4SubMenu:IsOpen() then
+							AtlasLoot_Argument4SubMenu:Close();
+						else
+							AtlasLoot_Argument4SubMenu:Open(this);
+						end
+					</OnClick>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText("Select Option");
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+				</Scripts>
+			</Button>
+			<EditBox name="$parent_Argument4Value" inherits="InputBoxTemplate" letters="5">
+				<Size>
+					<AbsDimension x="65" y="35"></AbsDimension>
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_Argument4Sub" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="15"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnLoad>
+						this:SetAutoFocus(false);
+						this:SetTextInsets(0, 8, 0, 0);
+					</OnLoad>
+					<OnEnterPressed>
+						this:ClearFocus();
+					</OnEnterPressed>
+				</Scripts>
+				<FontString name="$parent_Argument4String" inherits="GameFontNormal"></FontString>
+			</EditBox>
+
+			
+
 			<EditBox name="$parent_SearchBox" inherits="InputBoxTemplate" letters="100">
 				<Size>
 					<AbsDimension x="240" y="35"></AbsDimension>
@@ -2276,7 +2366,8 @@
 						AtlasLootAdvancedSearch_Argument1Value:ClearFocus();
 						AtlasLootAdvancedSearch_Argument2Value:ClearFocus();
 						AtlasLootAdvancedSearch_Argument3Value:ClearFocus();
-						AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText(), {AtlasLootAdvancedSearch_Argument1Value:GetText(), AtlasLootAdvancedSearch_Argument2Value:GetText(), AtlasLootAdvancedSearch_Argument3Value:GetText()});
+						AtlasLootAdvancedSearch_Argument4Value:ClearFocus();
+						AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText(), {AtlasLootAdvancedSearch_Argument1Value:GetText(), AtlasLootAdvancedSearch_Argument2Value:GetText(), AtlasLootAdvancedSearch_Argument3Value:GetText(), AtlasLootAdvancedSearch_Argument4Value:GetText()});
 					</OnClick>
 				</Scripts>
 			</Button>
diff --git a/AtlasLoot/Core/SearchAdvanced.lua b/AtlasLoot/Core/SearchAdvanced.lua
index 3e4d269..6752636 100644
--- a/AtlasLoot/Core/SearchAdvanced.lua
+++ b/AtlasLoot/Core/SearchAdvanced.lua
@@ -17,6 +17,9 @@ AtlasLoot_Argument2SubMenu = AceLibrary("Dewdrop-2.0");
 AtlasLoot_Argument3Menu = AceLibrary("Dewdrop-2.0");
 AtlasLoot_Argument3SubMenu = AceLibrary("Dewdrop-2.0");
 
+AtlasLoot_Argument4Menu = AceLibrary("Dewdrop-2.0");
+AtlasLoot_Argument4SubMenu = AceLibrary("Dewdrop-2.0");
+
 local GREY = "|cff999999";
 local RED = "|cffff0000";
 local WHITE = "|cffFFFFFF";
@@ -67,7 +70,7 @@ AtlasLoot_AdvancedSearchMenus = {
         --     {AtlasLoot_FixText("=q0=").."Poor", "quality", "poor"},
         -- },
         -- [2] = {
-        --     {AtlasLoot_FixText("=q1=").."Normal", "quality", "normal"},
+        --     {AtlasLoot_FixText("=q1=").."Common", "quality", "common"},
         -- },
         [1] = {
             {AtlasLoot_FixText("=q2=").."Uncommon", "quality", "uncommon"},
@@ -316,13 +319,15 @@ AdvancedSearchOptions = {
     ["quality"] = "",
     ["equip"] = "",
     ["type"] = "",
-    ["difficulty"] = 0,
-	["arg1"] = "",
-	["arg1op"] = "",
+    ["difficulty"] = "",
+	["arg1"] = "minlvl",
+	["arg1op"] = "=",
 	["arg2"] = "",
 	["arg2op"] = "",
 	["arg3"] = "",
 	["arg3op"] = "",
+	["arg4"] = "",
+	["arg4op"] = "",
 }
 
 function AtlasLoot_AdvancedSearchSetup()
@@ -333,10 +338,12 @@ function AtlasLoot_AdvancedSearchSetup()
 	AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument1Menu, AtlasLootAdvancedSearch_Argument1, "1", AtlasLoot_AdvancedSearchArguments["Arguments"]);
 	AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument2Menu, AtlasLootAdvancedSearch_Argument2, "2", AtlasLoot_AdvancedSearchArguments["Arguments"]);
 	AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument3Menu, AtlasLootAdvancedSearch_Argument3, "3", AtlasLoot_AdvancedSearchArguments["Arguments"]);
+	AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument4Menu, AtlasLootAdvancedSearch_Argument4, "4", AtlasLoot_AdvancedSearchArguments["Arguments"]);
 
 	AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument1SubMenu, AtlasLootAdvancedSearch_Argument1Sub, "1", AtlasLoot_AdvancedSearchArguments["Operators"]);
 	AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument2SubMenu, AtlasLootAdvancedSearch_Argument2Sub, "2", AtlasLoot_AdvancedSearchArguments["Operators"]);
 	AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument3SubMenu, AtlasLootAdvancedSearch_Argument3Sub, "3", AtlasLoot_AdvancedSearchArguments["Operators"]);
+	AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument4SubMenu, AtlasLootAdvancedSearch_Argument4Sub, "4", AtlasLoot_AdvancedSearchArguments["Operators"]);
 
 	--Setup Mythic+ dropdown options;
     for i = 1, 30, 1 do
@@ -433,22 +440,29 @@ function AtlasLoot_AdvancedSearchReset()
 	AdvancedSearchOptions = {
 		["quality"] = "",
 		["equip"] = "",
-		["equipType"] = "",
-		["difficulty"] = AtlasLoot_Difficulty.Normal,
-		["arg1"] = "",
-		["arg1op"] = "",
+		["type"] = "",
+		["difficulty"] = "",
+		["arg1"] = "minlvl",
+		["arg1op"] = "=",
 		["arg2"] = "",
 		["arg2op"] = "",
 		["arg3"] = "",
 		["arg3op"] = "",
+		["arg4"] = "",
+		["arg4op"] = "",
 	}
 
 	AtlasLootAdvancedSearch_Quality:SetText("Select Quality");
 	AtlasLootAdvancedSearch_Equip:SetText("Select Item Type");
 	AtlasLootAdvancedSearch_Difficulty:SetText("Select Difficulty");
-	AtlasLootAdvancedSearch_Argument1:SetText("Select Option");
+
+	AtlasLootAdvancedSearch_Argument1:SetText("Required Level");
+	AtlasLootAdvancedSearch_Argument1Sub:SetText("Equals");
+	AtlasLootAdvancedSearch_Argument1Value:SetText(UnitLevel("player"));
+	
 	AtlasLootAdvancedSearch_Argument2:SetText("Select Option");
 	AtlasLootAdvancedSearch_Argument3:SetText("Select Option");
+	AtlasLootAdvancedSearch_Argument4:SetText("Select Option");
 
 	AtlasLootAdvancedSearch_EquipSub:Disable();
 	AtlasLootAdvancedSearch_EquipSub:SetText("Select Option")
@@ -457,10 +471,6 @@ function AtlasLoot_AdvancedSearchReset()
 	AtlasLootAdvancedSearch_WeaponSub:Disable();
 	AtlasLootAdvancedSearch_WeaponSub:SetText("Select Weapon Type")
 
-	AtlasLootAdvancedSearch_Argument1Sub:Disable();
-	AtlasLootAdvancedSearch_Argument1Sub:SetText("Select Option");
-	AtlasLootAdvancedSearch_Argument1Value:Hide();
-	AtlasLootAdvancedSearch_Argument1Value:SetText("");
 	AtlasLootAdvancedSearch_Argument2Sub:Disable();
 	AtlasLootAdvancedSearch_Argument2Sub:SetText("Select Option");
 	AtlasLootAdvancedSearch_Argument2Value:Hide();
@@ -469,6 +479,10 @@ function AtlasLoot_AdvancedSearchReset()
 	AtlasLootAdvancedSearch_Argument3Sub:SetText("Select Option");
 	AtlasLootAdvancedSearch_Argument3Value:Hide();
 	AtlasLootAdvancedSearch_Argument3Value:SetText("");
+	AtlasLootAdvancedSearch_Argument4Sub:Disable();
+	AtlasLootAdvancedSearch_Argument4Sub:SetText("Select Option");
+	AtlasLootAdvancedSearch_Argument4Value:Hide();
+	AtlasLootAdvancedSearch_Argument4Value:SetText("");
 end
 
 
@@ -772,7 +786,7 @@ function AtlasLoot:AdvancedSearch(Text, args)
 		advSearchString = AppendSearchString(advSearchString, "dif="..AdvancedSearchOptions["difficulty"]);
 	end
 
-	for i = 1, 3, 1 do
+	for i = 1, 4, 1 do
 		if AdvancedSearchOptions["arg"..i] ~= "" then
 			if AdvancedSearchOptions["arg"..i.."op"] == "" then
 				AdvancedSearchOptions["arg"..i.."op"] = ">"