Exiles/coa-atlasloot
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

Merge branch 'token-system' into 6.2.2

Browse Source
This commit is contained in:
Anch
2022-01-31 13:02:07 +13:00
parent 013a9812f1 5a4720bfd2
commit 7cc4c25dfa
13 changed files with 1146 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AtlasLoot/Core/AtlasIntegration.lua
+1 -1
View File
@@ -37,7 +37,7 @@ function AtlasLootBoss_OnClick(name)
local zoneID = ATLAS_DROPDOWNS[AtlasOptions.AtlasType][AtlasOptions.AtlasZone];
local id = this.idnum;
AtlasLoot_Lastboss = AtlasLootBossButtons[zoneID][id];
--If the loot table was already shown and boss clicked again, hide the loot table and fix boss list icons
if getglobal(name.."_Selected"):IsVisible() then
getglobal(name.."_Selected"):Hide();
AtlasLoot/Core/AtlasLoot.lua
+41 -16
View File
@@ -55,6 +55,7 @@ ATLASLOOT_INDENT = " ";
AtlasLoot_Dewdrop = AceLibrary("Dewdrop-2.0");
AtlasLoot_DewdropSubMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_DewdropSubMenu2 = AceLibrary("Dewdrop-2.0");
AtlasLoot_DifficultyAtlas = AceLibrary("Dewdrop-2.0");
--Variable to cap debug spam
ATLASLOOT_DEBUGSHOWN = false;
@@ -81,8 +82,6 @@ Hooked_Atlas_Refresh = nil;
Hooked_Atlas_OnShow = nil;
Hooked_AtlasScrollBar_Update = nil;
--Pre Sets for defficuilty menu
SelectedTable2TextSet = true
isTablereference = false
notPattern = false
@@ -367,6 +366,7 @@ function AtlasLoot_OnVariablesLoaded()
AtlasLootDefaultFrame_SelectedCategory:SetText(AL["Choose Table ..."]);
AtlasLootDefaultFrame_SelectedTable:SetText("");
AtlasLootDefaultFrame_SelectedTable2:SetText("");
AtlasLootItemsFrame_DifficultyAtlasButton:SetText("Select Difficulty");
AtlasLootDefaultFrame_SelectedCategory:Show();
AtlasLootDefaultFrame_SelectedTable:Show();
AtlasLootDefaultFrame_SelectedTable2:Show();
@@ -528,18 +528,30 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
--Ditch the Quicklook selector
AtlasLoot_QuickLooks:Hide();
AtlasLootQuickLooksButton:Hide();
-- Hide the Filter Check-Box
AtlasLootFilterCheck:Hide();
-- Hide Selector
AtlasLootItemsFrame_DifficultyAtlasButton:Disable();
AtlasLootItemsFrame_DifficultyAtlasButton:Hide();
-- Updates AtlasLoot_Lastboss if your in a main loot table
if AtlasLoot_Hold == false or AtlasLoot_Lastboss == nil then
AtlasLoot_Lastboss = dataID;
end
dataSource_backup = dataSource;
if dataID == "SearchResult" or dataID == "WishList" then
ItemindexID = "";
AtlasLootItemsFrame_DifficultyAtlasButton:Disable();
AtlasLootItemsFrame_DifficultyAtlasButton:Hide();
AtlasLootDefaultFrame_SubMenu2:Disable();
AtlasLootDefaultFrame_SelectedTable2:SetText("");
AtlasLootDefaultFrame_SelectedTable2:Hide();
dataSource = {};
-- Match the page number to display
AtlasLootItemsFrame_DifficultyAtlasButton:SetText("Select Difficulty");
dataSource = {};
-- Match the page number to display
wlPage = tonumber(dataSource_backup:match("%d+$"));
-- Aquiring items of the page
if dataID == "SearchResult" then
@@ -559,7 +571,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
else
Type = dataSource[dataID].Type;
end
if Type ~= lastType then
AtlasLoot_DifficultyDisable()
if lastReference ~= nil then
@@ -576,6 +588,13 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
AtlasLootFilterCheck:SetChecked(false);
ATLASLOOT_FILTER_ENABLE = false
end
if (AtlasLootItemsFrame:GetParent() == AlphaMapAlphaMapFrame or AtlasLootItemsFrame:GetParent() == AtlasFrame) then
AtlasMapMenu = true;
else
AtlasLootItemsFrame_DifficultyAtlasButton:Hide();
AtlasLootItemsFrame_DifficultyAtlasButton:Disable();
AtlasMapMenu = false;
end
if Type == nil and ATLASLOOT_FILTER_ENABLE == false or dataID:match("MENU") or ATLASLOOT_FILTER_ENABLE and dataSource[AtlasLoot_CurrentBoss].Type == nil then -- disable difficulty menu
AtlasLoot_DifficultyDisable()
@@ -794,9 +813,13 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
else
itemButton.droprate = nil;
end
if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][8] then
if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][8] then
itemButton.sourcePage = dataSource[dataID][i][8];
end
elseif dataSource[dataID][i][8] ~= nil and dataSource[dataID][i][8]:match("=LT=") then
itemButton.sourcePage = string.sub(dataSource[dataID][i][8], 5);
else
itemButton.sourcePage = nil;
end
if dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH] then
itemButton.difficulty = dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH];
else
@@ -868,7 +891,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
AtlasLoot_BossName:SetText(AtlasLoot_TableNames[dataID][1]..affix);
else
AtlasLoot_BossName:SetText(boss);
end
end
--Consult the button registry to determine what nav buttons are required
if dataID == "SearchResult" or dataID == "WishList" then
if wlPage < wlPageMax then
@@ -891,11 +915,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
end
if tablebase.Back then
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = tablebase.Back;
getglobal("AtlasLootItemsFrame_BACK").lootpage = tablebase.Back;
end
end
end
--For Alphamap and Atlas integration, show a 'close' button to hide the loot table and restore the map view
@@ -910,7 +932,6 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if ATLASLOOT_FILTER_ENABLE == true and dataID ~= "FilterList" then
AtlasLoot_HideNoUsableItems()
end
if AtlasLoot.db.profile.ItemAutoQuery then AtlasLoot_QueryLootPage(); end
end
@@ -1004,8 +1025,8 @@ function AtlasLoot_GenerateAtlasMenu(dataID, pFrame)
getglobal("AtlasLootItemsFrame_PREV"):Show();
getglobal("AtlasLootItemsFrame_PREV").lootpage = tablebase.Prev;
end
if tablebase.Back then
getglobal("AtlasLootItemsFrame_BACK"):Show();
if tablebase.Back then
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = tablebase.Back;
end
@@ -1096,6 +1117,10 @@ function AtlasLoot_NavButton_OnClick()
AtlasLoot_ShowItemsFrame("SearchResult", this.lootpage, (AL["Search Result: %s"]):format(AtlasLootCharDB.LastSearchedText or ""), AtlasLootItemsFrame.refresh[4]);
elseif strsub(this.lootpage, 1, 12) == "WishListPage" then
AtlasLoot_ShowItemsFrame("WishList", this.lootpage, AL["Wishlist"], AtlasLootItemsFrame.refresh[4]);
elseif AtlasLoot_Hold == true then
AtlasLoot_ShowItemsFrame(AtlasLoot_Lastboss, AtlasLootItemsFrame.refresh[2], "", AtlasLootItemsFrame.refresh[4]);
-- Lets AtlasLoot_Lastboss be updated after going back to main table
AtlasLoot_Hold = false;
else
AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], "", AtlasLootItemsFrame.refresh[4]);
end
AtlasLoot/Core/AtlasLoot.xml
+140 -378
View File
@@ -369,6 +369,30 @@
</OnShow>
</Scripts>
</Button>
<Button name="$parent_DifficultyAtlasButton" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="140" y="23" />
</Size>
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="60" y="4"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnShow>
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
<OnClick>
if AtlasLoot_DifficultyAtlas:IsOpen() then
AtlasLoot_DifficultyAtlas:Close();
else
AtlasLoot_DifficultyAtlas:Open(this);
end
</OnClick>
</Scripts>
</Button>
<Button name="AtlasLootItem_1" inherits="AtlasLootItem_Template" id="1">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parent" relativePoint="TOPLEFT">
@@ -601,7 +625,7 @@
</Button>
<Button name="AtlasLootServerQueryButton" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="160" y="23"/>
<AbsDimension x="140" y="23"/>
</Size>
<Anchors>
<Anchor point="BOTTOM" relativeTo="$parent" relativePoint="BOTTOM">
@@ -1769,14 +1793,51 @@
</Scripts>
</Button>
<EditBox name="$parent_SearchBox" inherits="InputBoxTemplate" letters="100">
<Size>
<AbsDimension x="265" y="35"></AbsDimension>
</Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parent" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="30" y="-55"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_SearchText" inherits="GameFontNormal" text="Name: ">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_SearchBox" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="-8" y="-3"/>
</Offset>
</Anchor>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnLoad>
this:SetAutoFocus(false);
this:SetTextInsets(0, 8, 0, 0);
</OnLoad>
<OnEnterPressed>
AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText());
this:ClearFocus();
</OnEnterPressed>
</Scripts>
<FontString name="$parent_SearchString" inherits="GameFontNormal"></FontString>
</EditBox>
<Button name="$parent_Quality" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="130" y="20"/>
</Size>
<Anchors>
<Anchor point="TOP" relativeTo="$parent" relativePoint="TOP">
<Anchor point="LEFT" relativeTo="$parent_SearchBox" relativePoint="RIGHT">
<Offset>
<AbsDimension x="-160" y="-60"/>
<AbsDimension x="15"/>
</Offset>
</Anchor>
</Anchors>
@@ -1803,7 +1864,6 @@
</OnClick>
<OnShow>
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
this:SetText("Select Quality");
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
@@ -1814,15 +1874,15 @@
<AbsDimension x="130" y="20"/>
</Size>
<Anchors>
<Anchor point="TOP" relativeTo="$parent_Quality" relativePoint="BOTTOM">
<Anchor point="TOPLEFT" relativeTo="$parent_SearchBox" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension y="-25"/>
<AbsDimension x="-8" y="-25"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Equip Type Info: ">
<FontString name="$parent_EquipText" inherits="GameFontNormal" text="Item Type: ">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_Equip" relativePoint="TOPLEFT">
<Offset>
@@ -1843,7 +1903,6 @@
</OnClick>
<OnShow>
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
this:SetText("Select Item Type");
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
@@ -1859,6 +1918,19 @@
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_EquipSubText" inherits="GameFontNormal" text="Item Subtype: ">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_EquipSub" relativePoint="TOPLEFT">
<Offset>
<AbsDimension y="5"/>
</Offset>
</Anchor>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnClick>
if AtlasLoot_EquipSubMenu:IsOpen() then
@@ -1874,7 +1946,8 @@
</OnShow>
</Scripts>
</Button>
<Button name="$parent_WeaponSub" inherits="OptionsButtonTemplate">
<Button name="$parent_Difficulty" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="130" y="20"/>
</Size>
@@ -1885,33 +1958,6 @@
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
if AtlasLoot_WeaponSubMenu:IsOpen() then
AtlasLoot_WeaponSubMenu:Close();
else
AtlasLoot_WeaponSubMenu:Open(this);
end
</OnClick>
<OnShow>
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
this:SetText("Select Weapon Type");
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
</Button>
<Button name="$parent_Difficulty" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="130" y="20"/>
</Size>
<Anchors>
<Anchor point="TOP" relativeTo="$parent_Equip" relativePoint="BOTTOM">
<Offset>
<AbsDimension y="-25"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Difficulty: ">
@@ -1935,114 +1981,35 @@
</OnClick>
<OnShow>
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
this:SetText("Select Difficulty");
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
</Button>
<Button name="$parent_MythicSub" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="130" y="20"/>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_Difficulty" relativePoint="RIGHT">
<Offset>
<AbsDimension x="15"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
if AtlasLoot_DiffSubMenu:IsOpen() then
AtlasLoot_DiffSubMenu:Close();
else
AtlasLoot_DiffSubMenu:Open(this);
end
</OnClick>
<OnShow>
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
this:SetText("Mythic+ 1");
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
</Button>
<Button name="$parent_Argument1" inherits="OptionsButtonTemplate">
<EditBox name="$parent_LevelMin" inherits="InputBoxTemplate" letters="5">
<Size>
<AbsDimension x="130" y="20"/>
<AbsDimension x="47" y="35"></AbsDimension>
</Size>
<Anchors>
<Anchor point="TOP" relativeTo="$parent_Difficulty" relativePoint="BOTTOM">
<Anchor point="TOPLEFT" relativeTo="$parent_SearchBox" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension y="-40"/>
<AbsDimension x="0" y="-70"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Extra Search Options 1:">
<FontString name="$parent_LevelMinText" inherits="GameFontNormal" text="Level Range:">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_Argument1" relativePoint="TOPLEFT">
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_LevelMin" relativePoint="TOPLEFT">
<Offset>
<AbsDimension y="5"/>
<AbsDimension x="-8" y="-3"/>
</Offset>
</Anchor>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnClick>
if AtlasLoot_Argument1Menu:IsOpen() then
AtlasLoot_Argument1Menu:Close();
else
AtlasLoot_Argument1Menu:Open(this);
end
</OnClick>
<OnShow>
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
this:SetText("Required Level");
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
</Button>
<Button name="$parent_Argument1Sub" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="130" y="20"/>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_Argument1" relativePoint="RIGHT">
<Offset>
<AbsDimension x="15"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
if AtlasLoot_Argument1SubMenu:IsOpen() then
AtlasLoot_Argument1SubMenu:Close();
else
AtlasLoot_Argument1SubMenu:Open(this);
end
</OnClick>
<OnShow>
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
this:SetText("Equals");
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
</Button>
<EditBox name="$parent_Argument1Value" inherits="InputBoxTemplate" letters="5">
<Size>
<AbsDimension x="65" y="35"></AbsDimension>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_Argument1Sub" relativePoint="RIGHT">
<Offset>
<AbsDimension x="15"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
this:SetAutoFocus(false);
@@ -2052,85 +2019,33 @@
this:ClearFocus();
</OnEnterPressed>
</Scripts>
<FontString name="$parent_Argument1String" inherits="GameFontNormal"></FontString>
<FontString name="$parent_LevelMinString" inherits="GameFontNormal"></FontString>
</EditBox>
<Button name="$parent_Argument2" inherits="OptionsButtonTemplate">
<EditBox name="$parent_LevelMax" inherits="InputBoxTemplate" letters="5">
<Size>
<AbsDimension x="130" y="20"/>
<AbsDimension x="47" y="35"></AbsDimension>
</Size>
<Anchors>
<Anchor point="TOP" relativeTo="$parent_Argument1" relativePoint="BOTTOM">
<Anchor point="LEFT" relativeTo="$parent_LevelMin" relativePoint="RIGHT">
<Offset>
<AbsDimension y="-25"/>
<AbsDimension x="25" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Extra Seach Options 2: ">
<FontString name="$parent_LevelMaxText" inherits="GameFontNormal" text="to">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_Argument2" relativePoint="TOPLEFT">
<Anchor point="LEFT" relativeTo="AtlasLootAdvancedSearch_LevelMin" relativePoint="RIGHT">
<Offset>
<AbsDimension y="5"/>
<AbsDimension x="4" y="0"/>
</Offset>
</Anchor>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnClick>
if AtlasLoot_Argument2Menu:IsOpen() then
AtlasLoot_Argument2Menu:Close();
else
AtlasLoot_Argument2Menu: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_Argument2Sub" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="130" y="20"/>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_Argument2" relativePoint="RIGHT">
<Offset>
<AbsDimension x="15"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
if AtlasLoot_Argument2SubMenu:IsOpen() then
AtlasLoot_Argument2SubMenu:Close();
else
AtlasLoot_Argument2SubMenu: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_Argument2Value" inherits="InputBoxTemplate" letters="5">
<Size>
<AbsDimension x="65" y="35"></AbsDimension>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_Argument2Sub" relativePoint="RIGHT">
<Offset>
<AbsDimension x="15"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
this:SetAutoFocus(false);
@@ -2140,85 +2055,33 @@
this:ClearFocus();
</OnEnterPressed>
</Scripts>
<FontString name="$parent_Argument2String" inherits="GameFontNormal"></FontString>
<FontString name="$parent_LevelMaxString" inherits="GameFontNormal"></FontString>
</EditBox>
<Button name="$parent_Argument3" inherits="OptionsButtonTemplate">
<EditBox name="$parent_ILevelMin" inherits="InputBoxTemplate" letters="5">
<Size>
<AbsDimension x="130" y="20"/>
<AbsDimension x="47" y="35"></AbsDimension>
</Size>
<Anchors>
<Anchor point="TOP" relativeTo="$parent_Argument2" relativePoint="BOTTOM">
<Anchor point="LEFT" relativeTo="$parent_LevelMax" relativePoint="RIGHT">
<Offset>
<AbsDimension y="-25"/>
<AbsDimension x="25" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Extra Seach Options 3: ">
<FontString name="$parent_ILevelMinText" inherits="GameFontNormal" text="Item Level:">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_Argument3" relativePoint="TOPLEFT">
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_ILevelMin" relativePoint="TOPLEFT">
<Offset>
<AbsDimension y="5"/>
<AbsDimension x="-7" y="-3"/>
</Offset>
</Anchor>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnClick>
if AtlasLoot_Argument3Menu:IsOpen() then
AtlasLoot_Argument3Menu:Close();
else
AtlasLoot_Argument3Menu: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_Argument3Sub" inherits="OptionsButtonTemplate">
<Size>
<AbsDimension x="130" y="20"/>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_Argument3" relativePoint="RIGHT">
<Offset>
<AbsDimension x="15"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
if AtlasLoot_Argument3SubMenu:IsOpen() then
AtlasLoot_Argument3SubMenu:Close();
else
AtlasLoot_Argument3SubMenu: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_Argument3Value" inherits="InputBoxTemplate" letters="5">
<Size>
<AbsDimension x="65" y="35"></AbsDimension>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_Argument3Sub" relativePoint="RIGHT">
<Offset>
<AbsDimension x="15"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
this:SetAutoFocus(false);
@@ -2228,85 +2091,33 @@
this:ClearFocus();
</OnEnterPressed>
</Scripts>
<FontString name="$parent_Argument3String" inherits="GameFontNormal"></FontString>
<FontString name="$parent_ILevelMinString" inherits="GameFontNormal"></FontString>
</EditBox>
<Button name="$parent_Argument4" inherits="OptionsButtonTemplate">
<EditBox name="$parent_ILevelMax" inherits="InputBoxTemplate" letters="5">
<Size>
<AbsDimension x="130" y="20"/>
<AbsDimension x="47" y="35"></AbsDimension>
</Size>
<Anchors>
<Anchor point="TOP" relativeTo="$parent_Argument3" relativePoint="BOTTOM">
<Anchor point="LEFT" relativeTo="$parent_ILevelMin" relativePoint="RIGHT">
<Offset>
<AbsDimension y="-25"/>
<AbsDimension x="25" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Extra Seach Options 4: ">
<FontString name="$parent_ILevelMaxText" inherits="GameFontNormal" text="to">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_Argument4" relativePoint="TOPLEFT">
<Anchor point="LEFT" relativeTo="AtlasLootAdvancedSearch_ILevelMin" relativePoint="RIGHT">
<Offset>
<AbsDimension y="5"/>
<AbsDimension x="4" y="0"/>
</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);
@@ -2316,42 +2127,43 @@
this:ClearFocus();
</OnEnterPressed>
</Scripts>
<FontString name="$parent_Argument4String" inherits="GameFontNormal"></FontString>
<FontString name="$parent_ILevelMaxString" inherits="GameFontNormal"></FontString>
</EditBox>
<EditBox name="$parent_SearchBox" inherits="InputBoxTemplate" letters="100">
<Frame name="$parent_ArgumentContainer">
<Size>
<AbsDimension x="240" y="35"></AbsDimension>
<AbsDimension x="450" y="340"/>
</Size>
<Anchors>
<Anchor point="BOTTOM" relativeTo="$parent" relativePoint="BOTTOM">
<Anchor point="TOPLEFT" relativeTo="$parent_LevelMin" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="-120" y="20"/>
<AbsDimension x="-8" y="-40"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
this:SetAutoFocus(false);
this:SetTextInsets(0, 8, 0, 0);
</OnLoad>
<OnEnterPressed>
AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText());
this:ClearFocus();
</OnEnterPressed>
</Scripts>
<FontString name="$parent_SearchString" inherits="GameFontNormal"></FontString>
</EditBox>
<Layers>
<Layer level="OVERLAY">
<FontString name="$parent_Arg1Text" inherits="GameFontNormal" text="Additional Filters:">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="AtlasLootAdvancedSearch_ArgumentContainer" relativePoint="TOPLEFT">
<Offset>
<AbsDimension y="5"/>
</Offset>
</Anchor>
</Anchors>
</FontString>
</Layer>
</Layers>
</Frame>
<Button name="$parent_SearchButton" inherits="UIPanelButtonTemplate2">
<Size>
<AbsDimension x="69" y="32"/>
<AbsDimension x="70" y="32"/>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_SearchBox" relativePoint="RIGHT">
<Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="0" y="0"/>
<AbsDimension x="20" y="20"/>
</Offset>
</Anchor>
</Anchors>
@@ -2363,46 +2175,18 @@
</OnShow>
<OnClick>
AtlasLootAdvancedSearch_SearchBox:ClearFocus();
AtlasLootAdvancedSearch_Argument1Value:ClearFocus();
AtlasLootAdvancedSearch_Argument2Value:ClearFocus();
AtlasLootAdvancedSearch_Argument3Value:ClearFocus();
AtlasLootAdvancedSearch_Argument4Value:ClearFocus();
AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText(), {AtlasLootAdvancedSearch_Argument1Value:GetText(), AtlasLootAdvancedSearch_Argument2Value:GetText(), AtlasLootAdvancedSearch_Argument3Value:GetText(), AtlasLootAdvancedSearch_Argument4Value:GetText()});
</OnClick>
</Scripts>
</Button>
<Button name="$parent_SearchOptionsButton">
<Size>
<AbsDimension x="28" y="28" />
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_SearchButton" relativePoint="RIGHT">
<Offset>
<AbsDimension x="-6" y="0"/>
</Offset>
</Anchor>
</Anchors>
<NormalTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Up"/>
<PushedTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Down"/>
<DisabledTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Disabled"/>
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
<Scripts>
<OnShow>
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
<OnClick>
AtlasLoot:ShowSearchOptions(this);
AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText());
</OnClick>
</Scripts>
</Button>
<Button name="$parent_SearchClearButton" inherits="UIPanelButtonTemplate2">
<Size>
<AbsDimension x="58" y="32"/>
<AbsDimension x="70" y="32"/>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_SearchOptionsButton" relativePoint="RIGHT">
<Anchor point="LEFT" relativeTo="$parent_SearchButton" relativePoint="RIGHT">
<Offset>
<AbsDimension x="-2" y="0"/>
<AbsDimension x="10" y="0"/>
</Offset>
</Anchor>
</Anchors>
@@ -2419,28 +2203,6 @@
</OnClick>
</Scripts>
</Button>
<Button name="$parent_LastResultButton" inherits="UIPanelButtonTemplate2">
<Size>
<AbsDimension x="100" y="32"/>
</Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_SearchClearButton" relativePoint="RIGHT">
<Offset>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnShow>
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
this:SetText(AL["Last Result"]);
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
<OnClick>
AtlasLoot:ShowSearchResult();
</OnClick>
</Scripts>
</Button>
</Frames>
</Frame>
</Ui>
AtlasLoot/Core/LootButtons.lua
+4
View File
@@ -263,6 +263,10 @@ function AtlasLootItem_OnClick(arg1)
if(dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID)) then
AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLoot_TableNames[dataID][1], AtlasLootItemsFrame.refresh[4]);
end
elseif (arg1=="LeftButton") and this.sourcePage ~= nil then
--Holds AtlasLoot_Lastboss so back button works
AtlasLoot_Hold = true;
AtlasLoot_ShowBossLoot(this.sourcePage, this.sourcePage, pFrame);
end
else
if IsShiftKeyDown() then
AtlasLoot/Core/Search.lua
+15 -14
View File
@@ -203,7 +203,7 @@ local SLOT_FILTERS = {
["thrown"] = "INVTYPE_THROWN",
["rangedright"] = "INVTYPE_RANGEDRIGHT",
["quiver"] = "INVTYPE_QUIVER",
["relic"] = "INVTYPE_RELIC"
["relic"] = "INVTYPE_RELIC",
};
local TYPE_FILTERS = {
@@ -217,25 +217,26 @@ local TYPE_FILTERS = {
["totem"] = "Totems",
["sigil"] = "Sigils",
["axe1h"] = "One-Handed Axes",
["axe2h"] = "Two-Handed Axes",
["bows"] = "Bows",
["bow"] = "Bows",
["crossbow"] = "Crossbows",
["dagger"] = "Daggers",
["guns"] = "Guns",
["gun"] = "Guns",
["fishing poles"] = "Fishing Poles",
["fist"] = "Fist Weapons",
["miscellaneous"] = "Miscellaneous",
["axe"] = "One-Handed Axes",
["mace"] = "One-Handed Maces",
["sword"] = "One-Handed Swords",
["mace1h"] = "One-Handed Maces",
["mace2h"] = "Two-Handed Maces",
["polearm"] = "Polearms",
["stave"] = "Staves",
["staves"] = "Staves",
["sword1h"] = "One-Handed Swords",
["sword2h"] = "Two-Handed Swords",
["staff"] = "Staves",
["fist"] = "Fist Weapons",
["generic"] = "",
["dagger"] = "Daggers",
["thrown"] = "Thrown",
["2haxe"] = "Two-Handed Axes",
["2hmace"] = "Two-Handed Maces",
["2hsword"] = "Two-Handed Swords",
["crossbows"] = "Crossbows",
["crossbow"] = "Crossbows",
["wand"] = "Wands",
["fishingpole"] = "Fishing Poles",
}
local NON_EQUIPABLE_SLOTS = {
AtlasLoot/Core/SearchAdvanced.lua
+338 -160
View File
@@ -3,22 +3,14 @@ local modules = { "AtlasLoot_BurningCrusade", "AtlasLoot_Crafting", "AtlasLoot_O
AtlasLoot_QualityMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_DifficultyMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_DiffSubMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_EquipMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_EquipSubMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_WeaponSubMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_Argument1Menu = AceLibrary("Dewdrop-2.0");
AtlasLoot_Argument1SubMenu = AceLibrary("Dewdrop-2.0");
local MAX_ARGUMENTS = 6;
local ACTIVE_ARGUMENT = 0;
AtlasLoot_Argument2Menu = AceLibrary("Dewdrop-2.0");
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");
AtlasLoot_ArgumentMenus = {};
AtlasLoot_ArgumentSubMenus = {};
local GREY = "|cff999999";
local RED = "|cffff0000";
@@ -37,32 +29,68 @@ AdvSearchSubMenuText = "";
AdvSearchSetup = false;
AtlasLoot_FrameMenuList = {
["EquipSubMenu"] = {AtlasLoot_EquipSubMenu, "AtlasLootAdvancedSearch_EquipSub", "Select Option", "type", "", "AtlasLootAdvancedSearch_WeaponSub"};
["MythicSubMenu"] = {AtlasLoot_DiffSubMenu, "AtlasLootAdvancedSearch_MythicSub", "Mythic+ 1", "difficulty", 5};
["WeaponSubMenu"] = {AtlasLoot_WeaponSubMenu, "AtlasLootAdvancedSearch_WeaponSub", "Select Weapon Type", "type", ""};
["EquipSubMenu"] = {AtlasLoot_EquipSubMenu, "AtlasLootAdvancedSearch_EquipSub", "Select Option", "type", ""};
}
AtlasLoot_AdvancedSearchMenus = {
["Difficulty"] ={
[1] = {
{"Normal", "difficulty", AtlasLoot_Difficulty.Normal, "MythicSubMenu", "Disable"},
{"Normal", "difficulty", AtlasLoot_Difficulty.Normal},
},
[2] = {
{"Heroic", "difficulty", AtlasLoot_Difficulty.Heroic, "MythicSubMenu", "Disable"},
{"Heroic", "difficulty", AtlasLoot_Difficulty.Heroic},
},
[3] = {
{"Mythic/Ascended", "difficulty", AtlasLoot_Difficulty.Mythic, "MythicSubMenu", "Disable"},
{"Mythic/Ascended", "difficulty", AtlasLoot_Difficulty.Mythic},
},
[4] = {
{"Mythic Plus", "difficulty", AtlasLoot_Difficulty.MythicPlus[1], "MythicSubMenu", "MythicPlus"},
["Mythic+ 1-10"] = {
{"Mythic 1", "difficulty", AtlasLoot_Difficulty.MythicPlus[1]},
{"Mythic 2", "difficulty", AtlasLoot_Difficulty.MythicPlus[2]},
{"Mythic 3", "difficulty", AtlasLoot_Difficulty.MythicPlus[3]},
{"Mythic 4", "difficulty", AtlasLoot_Difficulty.MythicPlus[4]},
{"Mythic 5", "difficulty", AtlasLoot_Difficulty.MythicPlus[5]},
{"Mythic 6", "difficulty", AtlasLoot_Difficulty.MythicPlus[6]},
{"Mythic 7", "difficulty", AtlasLoot_Difficulty.MythicPlus[7]},
{"Mythic 8", "difficulty", AtlasLoot_Difficulty.MythicPlus[8]},
{"Mythic 9", "difficulty", AtlasLoot_Difficulty.MythicPlus[9]},
{"Mythic 10", "difficulty", AtlasLoot_Difficulty.MythicPlus[10]},
},
},
[5] = {
{"Bloodforged", "difficulty", AtlasLoot_Difficulty.Bloodforged, "MythicSubMenu", "Disable"},
[5] = {
["Mythic+ 11-20"] = {
{"Mythic 11", "difficulty", AtlasLoot_Difficulty.MythicPlus[11]},
{"Mythic 12", "difficulty", AtlasLoot_Difficulty.MythicPlus[12]},
{"Mythic 13", "difficulty", AtlasLoot_Difficulty.MythicPlus[13]},
{"Mythic 14", "difficulty", AtlasLoot_Difficulty.MythicPlus[14]},
{"Mythic 15", "difficulty", AtlasLoot_Difficulty.MythicPlus[15]},
{"Mythic 16", "difficulty", AtlasLoot_Difficulty.MythicPlus[16]},
{"Mythic 17", "difficulty", AtlasLoot_Difficulty.MythicPlus[17]},
{"Mythic 18", "difficulty", AtlasLoot_Difficulty.MythicPlus[18]},
{"Mythic 19", "difficulty", AtlasLoot_Difficulty.MythicPlus[19]},
{"Mythic 20", "difficulty", AtlasLoot_Difficulty.MythicPlus[20]},
},
},
};
["MythicPlus"] = {
[6] = {
["Mythic+ 21-30"] = {
{"Mythic 21", "difficulty", AtlasLoot_Difficulty.MythicPlus[21]},
{"Mythic 22", "difficulty", AtlasLoot_Difficulty.MythicPlus[22]},
{"Mythic 23", "difficulty", AtlasLoot_Difficulty.MythicPlus[23]},
{"Mythic 24", "difficulty", AtlasLoot_Difficulty.MythicPlus[24]},
{"Mythic 25", "difficulty", AtlasLoot_Difficulty.MythicPlus[25]},
{"Mythic 26", "difficulty", AtlasLoot_Difficulty.MythicPlus[26]},
{"Mythic 27", "difficulty", AtlasLoot_Difficulty.MythicPlus[27]},
{"Mythic 28", "difficulty", AtlasLoot_Difficulty.MythicPlus[28]},
{"Mythic 29", "difficulty", AtlasLoot_Difficulty.MythicPlus[29]},
{"Mythic 30", "difficulty", AtlasLoot_Difficulty.MythicPlus[30]},
},
},
[7] = {
{"Bloodforged", "difficulty", AtlasLoot_Difficulty.Bloodforged},
},
[8] = {
{RED.."Reset", "difficulty", "reset"},
},
};
["Quality"] = {
@@ -84,6 +112,9 @@ AtlasLoot_AdvancedSearchMenus = {
[4] = {
{AtlasLoot_FixText("=q5=").."Legendary", "quality", "legendary"},
},
[5] = {
{RED.."Reset", "quality", "reset"},
},
};
["Equip"] = {
@@ -111,27 +142,33 @@ AtlasLoot_AdvancedSearchMenus = {
[8] = {
{"Feet", "equip", "feet", "EquipSubMenu", "ArmorType"},
},
[9] = {
{"Back", "equip", "back", "EquipSubMenu", "Disable"},
},
[10] = {
{"Necklace", "equip", "neck", "EquipSubMenu", "Disable"},
},
[11] = {
{"Ring", "equip", "finger", "EquipSubMenu", "Disable"},
},
[12] = {
{"Trinket", "equip", "trinket", "EquipSubMenu", "Disable"},
},
[13] = {
{"Weapon/Shield", "equip", "#w", "EquipSubMenu", "WeaponEquip"},
},
[14] = {
{"Held in Off-Hand", "equip", "holdable", "EquipSubMenu", "Disable"},
[9] = {
["Accessories"] = {
{"Necklace", "equip", "neck", "EquipSubMenu", "Disable"},
{"Back", "equip", "back", "EquipSubMenu", "Disable"},
{"Ring", "equip", "finger", "EquipSubMenu", "Disable"},
{"Trinket", "equip", "trinket", "EquipSubMenu", "Disable"},
},
},
[15] = {
{"Relic", "equip", "relic", "EquipSubMenu", "RelicType"},
[10] = {
["Weapons"] = {
{"One-Hand", "equip", "weapon", "EquipSubMenu", "WeaponType1H"},
{"Two-Hand", "equip", "2h", "EquipSubMenu", "WeaponType2H"},
{"Main Hand", "equip", "mainhand", "EquipSubMenu", "WeaponType1H"},
{"Off Hand", "equip", "offhand", "EquipSubMenu", "WeaponType1H"},
{"Ranged", "equip", "ranged", "EquipSubMenu", "WeaponTypeRanged"},
{"Relic", "equip", "relic", "EquipSubMenu", "RelicType"},
},
},
[11] = {
["Off-Hand"] = {
{"Shield", "equip", "shield", "EquipSubMenu", "Disable"},
{"Held in Off-Hand", "equip", "holdable", "EquipSubMenu", "Disable"},
}
},
[12] = {
{RED.."Reset", "equip", "reset", "EquipSubMenu", "Disable"},
},
};
["ArmorType"] = {
@@ -147,6 +184,9 @@ AtlasLoot_AdvancedSearchMenus = {
[4] = {
{"Plate", "type", "Plate"},
},
[5] = {
{RED.."Reset", "type", "reset"},
},
};
["RelicType"] = {
@@ -162,65 +202,72 @@ AtlasLoot_AdvancedSearchMenus = {
[4] = {
{"Sigil", "type", "sigil"},
},
[5] = {
{RED.."Reset", "type", "reset"},
},
};
["WeaponEquip"] = {
["WeaponType1H"] = {
[1] = {
{"One-Hand", "equip", "weapon", "WeaponSubMenu", "WeaponType"},
},
[2] = {
{"Two-Hand", "equip", "2h", "WeaponSubMenu", "WeaponType"},
},
[3] = {
{"Main Hand", "equip", "mainhand", "WeaponSubMenu", "WeaponType"},
},
[4] = {
{"Off Hand", "equip", "offhand", "WeaponSubMenu", "WeaponType"},
},
[5] = {
{"Ranged", "equip", "ranged", "WeaponSubMenu", "WeaponType"},
}
};
["WeaponType"] = {
[1] = {
{"Axe", "type", "axe"}
{"Axe", "type", "axe1h"}
},
[2] = {
{"Mace", "type", "mace"}
{"Mace", "type", "mace1h"}
},
[3] = {
{"Sword", "type", "sword"}
{"Sword", "type", "sword1h"}
},
[4] = {
{"Dagger", "type", "dagger"}
},
[5] = {
{"Fist Weapon", "type", "fist"}
},
[6] = {
{RED.."Reset", "type", "reset"},
},
};
["WeaponType2H"] = {
[1] = {
{"Axe", "type", "axe2h"}
},
[2] = {
{"Mace", "type", "mace2h"}
},
[3] = {
{"Sword", "type", "sword2h"}
},
[4] = {
{"Polearm", "type", "polearm"}
},
[5] = {
{"Dagger", "type", "dagger"}
{"Staff", "type", "staff"}
},
[6] = {
{"Staff", "type", "stave"}
{RED.."Reset", "type", "reset"},
},
[7] = {
{"Fist Weapon", "type", "fist"}
};
["WeaponTypeRanged"] = {
[1] = {
{"Bow", "type", "bows"}
},
[8] = {
{"Bow", "type", "bow"}
[2] = {
{"Gun", "type", "guns"}
},
[9] = {
{"Gun", "type", "gun"}
[3] = {
{"Crossbow", "type", "crossbows"}
},
[10] = {
{"Crossbow", "type", "crossbow"}
},
[11] = {
[4] = {
{"Wand", "type", "wand"}
},
[12] = {
[5] = {
{"Thrown", "type", "thrown"}
},
[13] = {
{"Shield", "type", "shield"}
[6] = {
{RED.."Reset", "type", "reset"},
},
};
}
@@ -320,14 +367,6 @@ AdvancedSearchOptions = {
["equip"] = "",
["type"] = "",
["difficulty"] = "",
["arg1"] = "minlvl",
["arg1op"] = "=",
["arg2"] = "",
["arg2op"] = "",
["arg3"] = "",
["arg3op"] = "",
["arg4"] = "",
["arg4op"] = "",
}
function AtlasLoot_AdvancedSearchSetup()
@@ -335,22 +374,69 @@ function AtlasLoot_AdvancedSearchSetup()
AtlasLoot_AdvancedSearchRegister(AtlasLoot_EquipMenu, AtlasLootAdvancedSearch_Equip, AtlasLoot_AdvancedSearchMenus["Equip"]);
AtlasLoot_AdvancedSearchRegister(AtlasLoot_DifficultyMenu, AtlasLootAdvancedSearch_Difficulty, AtlasLoot_AdvancedSearchMenus["Difficulty"]);
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"]);
local addArg = CreateFrame("Button", "AtlasLootAdvancedSearch_ArgumentContainerAddArgBtn", AtlasLootAdvancedSearch_ArgumentContainer, "OptionsButtonTemplate");
addArg:SetPoint("BOTTOMLEFT", AtlasLootAdvancedSearch_ArgumentContainer, "TOPLEFT", 110, 2);
addArg:SetSize(20, 20);
addArg:SetText("+");
addArg:SetScript("OnClick", function(self, button)
AddArgumentContainer();
end)
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"]);
local remArg = CreateFrame("Button", "AtlasLootAdvancedSearch_ArgumentContainerRemArgBtn", AtlasLootAdvancedSearch_ArgumentContainer, "OptionsButtonTemplate")
remArg:SetPoint("LEFT", AtlasLootAdvancedSearch_ArgumentContainerAddArgBtn, "RIGHT", 10, 0);
remArg:SetSize(20, 20);
remArg:SetText("-");
remArg:SetScript("OnClick", function(self, button)
RemoveArgumentContainer();
end)
remArg:Disable();
--Setup Mythic+ dropdown options;
for i = 1, 30, 1 do
AtlasLoot_AdvancedSearchMenus["MythicPlus"][i] = {
{"Mythic+ "..i, "difficulty", AtlasLoot_Difficulty.MythicPlus[i]};
}
end
for n = 1, MAX_ARGUMENTS do
AtlasLoot_ArgumentMenus[n] = AceLibrary("Dewdrop-2.0");
AtlasLoot_ArgumentSubMenus[n] = AceLibrary("Dewdrop-2.0");
local btn = CreateFrame("Button", "AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n), AtlasLootAdvancedSearch_ArgumentContainer, "OptionsButtonTemplate");
btn:SetPoint("TOPLEFT", AtlasLootAdvancedSearch_ArgumentContainer, "TOPLEFT", 0, -((n-1) * 35));
btn:SetSize(130, 20);
btn:SetScript("OnClick", function(self, button)
if AtlasLoot_ArgumentMenus[n]:IsOpen() then
AtlasLoot_ArgumentMenus[n]:Close();
else
AtlasLoot_ArgumentMenus[n]:Open(self);
end
end)
btn:Hide();
btn:SetText("Select Option");
local sub = CreateFrame("Button", "AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n).."Sub", AtlasLootAdvancedSearch_ArgumentContainer, "OptionsButtonTemplate");
sub:SetPoint("LEFT", btn, "RIGHT", 15, 0);
sub:SetSize(130, 20);
sub:SetScript("OnClick", function(self, button)
if AtlasLoot_ArgumentSubMenus[n]:IsOpen() then
AtlasLoot_ArgumentSubMenus[n]:Close();
else
AtlasLoot_ArgumentSubMenus[n]:Open(self);
end
end)
sub:Hide();
sub:Disable();
local txt = CreateFrame("EditBox", "AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n).."Value", AtlasLootAdvancedSearch_ArgumentContainer, "InputBoxTemplate")
txt:SetPoint("LEFT", sub, "RIGHT", 15, 0);
txt:SetSize(65, 35);
txt:SetAutoFocus(false);
txt:SetTextInsets(0, 8, 0, 0);
txt:SetScript("OnEnterPressed", function(self)
self:ClearFocus();
end)
txt:Hide();
AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_ArgumentMenus[n], _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n)], tostring(n), AtlasLoot_AdvancedSearchArguments["Arguments"]);
AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_ArgumentSubMenus[n], _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n).."Sub"], tostring(n), AtlasLoot_AdvancedSearchArguments["Operators"]);
end
--Reset Search options to defualt
AtlasLoot_AdvancedSearchReset();
AdvSearchSetup = true;
end
@@ -370,6 +456,12 @@ function AtlasLoot_AdvancedSearchShow()
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootItemsFrame_BACK"):Hide();
--Clear these values to defualt
AdvSearchSubMenuEnabled = 0;
AdvSearchSubMenuText = "";
AdvSearchSubMenu2Enabled = 0;
AdvSearchSubMenuText = "";
if AtlasLootDefaultFrame_SubMenu2:IsEnabled() then
AdvSearchSubMenu2Enabled = 1;
AdvSearchSubMenu2Text = AtlasLootDefaultFrame_SelectedTable2:GetText();
@@ -402,9 +494,6 @@ function AtlasLoot_AdvancedSearchShow()
getglobal("AtlasLootItem_"..i).spellitemID = 0;
end
--Reset Search options
AtlasLoot_AdvancedSearchReset();
AtlasLoot_BossName:SetText("Advanced Search");
AtlasLootAdvancedSearch:ClearAllPoints();
@@ -442,50 +531,76 @@ function AtlasLoot_AdvancedSearchReset()
["equip"] = "",
["type"] = "",
["difficulty"] = "",
["arg1"] = "minlvl",
["arg1op"] = "=",
["arg2"] = "",
["arg2op"] = "",
["arg3"] = "",
["arg3op"] = "",
["arg4"] = "",
["arg4op"] = "",
}
for i = 1, MAX_ARGUMENTS do
AdvancedSearchOptions["arg"..tostring(i)] = "";
AdvancedSearchOptions["arg"..tostring(i).."op"] = "";
RemoveArgumentContainer();
end
AtlasLootAdvancedSearch_LevelMin:SetText(UnitLevel("player"));
AtlasLootAdvancedSearch_LevelMax:SetText(UnitLevel("player"));
AtlasLootAdvancedSearch_ILevelMin:SetText("");
AtlasLootAdvancedSearch_ILevelMax:SetText("");
AtlasLootAdvancedSearch_Quality:SetText("Select Quality");
AtlasLootAdvancedSearch_Equip:SetText("Select Item Type");
AtlasLootAdvancedSearch_Difficulty:SetText("Select Difficulty");
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")
AtlasLootAdvancedSearch_MythicSub:Disable();
AtlasLootAdvancedSearch_MythicSub:SetText("Mythic+ 1");
AtlasLootAdvancedSearch_WeaponSub:Disable();
AtlasLootAdvancedSearch_WeaponSub:SetText("Select Weapon Type")
AtlasLootAdvancedSearch_Argument2Sub:Disable();
AtlasLootAdvancedSearch_Argument2Sub:SetText("Select Option");
AtlasLootAdvancedSearch_Argument2Value:Hide();
AtlasLootAdvancedSearch_Argument2Value:SetText("");
AtlasLootAdvancedSearch_Argument3Sub:Disable();
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("");
AtlasLootAdvancedSearch_Difficulty:SetText("Select Difficulty");
end
function AddArgumentContainer()
if ACTIVE_ARGUMENT == MAX_ARGUMENTS then AdvSearchArgButtonToggle() return end
ACTIVE_ARGUMENT = ACTIVE_ARGUMENT + 1;
_G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT)]:Show();
_G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT)]:SetText("Select Option");
_G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT).."Sub"]:Show();
AdvSearchArgButtonToggle()
end
function RemoveArgumentContainer()
if ACTIVE_ARGUMENT == 0 then AdvSearchArgButtonToggle() return end
AdvancedSearchOptions["arg"..tostring(ACTIVE_ARGUMENT)] = "";
AdvancedSearchOptions["arg"..tostring(ACTIVE_ARGUMENT).."op"] = "";
_G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT)]:Hide();
_G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT).."Sub"]:Disable();
_G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT).."Sub"]:Hide();
_G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT).."Value"]:Hide();
ACTIVE_ARGUMENT = ACTIVE_ARGUMENT - 1;
AdvSearchArgButtonToggle()
end
function AdvSearchArgButtonToggle()
if ACTIVE_ARGUMENT == MAX_ARGUMENTS then
AtlasLootAdvancedSearch_ArgumentContainerAddArgBtn:Disable()
else
AtlasLootAdvancedSearch_ArgumentContainerAddArgBtn:Enable()
end
if ACTIVE_ARGUMENT == 0 then
AtlasLootAdvancedSearch_ArgumentContainerRemArgBtn:Disable()
else
AtlasLootAdvancedSearch_ArgumentContainerRemArgBtn:Enable()
end
end
AdvSearchDefaultText = {
["quality"] = "Select Quality",
["equip"] = "Select Item Type",
["type"] = "Select Option",
["difficulty"] = "Select Difficulty"
}
function AtlasLoot_AdvancedSearchMenuClick(Object, VariableToSet, VariableValue, ChildMenu, ChildMenuRegister)
--Setups child menus and sets search options to default
@@ -497,6 +612,14 @@ function AtlasLoot_AdvancedSearchMenuClick(Object, VariableToSet, VariableValue,
if(AtlasLoot_FrameMenuList[ChildMenu][6]) then
getglobal(AtlasLoot_FrameMenuList[ChildMenu][6]):Disable();
end
if VariableValue == "reset" then
AdvancedSearchOptions[VariableToSet] = "";
Object[1]:SetText(AdvSearchDefaultText[VariableToSet]);
Object[2]:Close();
getglobal(AtlasLoot_FrameMenuList[ChildMenu][2]):SetText(AtlasLoot_FrameMenuList[ChildMenu][3])
return
end
else
AtlasLoot_AdvancedSearchRegister(AtlasLoot_FrameMenuList[ChildMenu][1], getglobal(AtlasLoot_FrameMenuList[ChildMenu][2]), AtlasLoot_AdvancedSearchMenus[ChildMenuRegister]);
AdvancedSearchOptions[AtlasLoot_FrameMenuList[ChildMenu][4]] = AtlasLoot_FrameMenuList[ChildMenu][5];
@@ -508,6 +631,12 @@ function AtlasLoot_AdvancedSearchMenuClick(Object, VariableToSet, VariableValue,
end
end
end
if VariableValue == "reset" then
AdvancedSearchOptions[VariableToSet] = "";
Object[1]:SetText(AdvSearchDefaultText[VariableToSet]);
Object[2]:Close();
return
end
AdvancedSearchOptions[VariableToSet] = VariableValue;
Object[1]:SetText(Object[3]);
Object[2]:Close();
@@ -568,6 +697,24 @@ function AtlasLoot_AdvancedSearchRegister(DropDown, DropDownObject, MenuOption)
'func', function() DropDown:Close() end,
'notCheckable', true
)
elseif level == 2 then
if value then
for k,v in ipairs(value) do
DropDown:AddLine(
'text', v[1],
'textR', 1,
'textG', 0.82,
'textB', 0,
'func', AtlasLoot_AdvancedSearchMenuClick,
'arg1', {DropDownObject, DropDown, v[1]},
'arg2', v[2],
'arg3', v[3],
'arg4', v[4],
'arg5', v[5],
'notCheckable', true
)
end
end
end
end,
'dontHook', true
@@ -578,24 +725,24 @@ function AtlasLoot_AdvancedSearchArgumentClick(Object, VariableToSet, VariableVa
if IsOperator and VariableValue == "reset" then
AdvancedSearchOptions["arg"..VariableToSet.."op"] = "";
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):SetText("");
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):Hide();
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):SetText("");
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):Hide();
Object[1]:SetText("Select Option");
Object[2]:Close();
elseif IsOperator then
AdvancedSearchOptions["arg"..VariableToSet.."op"] = VariableValue;
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):Show();
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):Show();
Object[1]:SetText(Object[3]);
Object[2]:Close();
elseif VariableValue == "reset" then
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Sub"):SetText("Select Option");
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Sub"):Disable();
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Sub"):SetText("Select Option");
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Sub"):Disable();
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):SetText("");
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):Hide();
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):SetText("");
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):Hide();
AdvancedSearchOptions["arg"..VariableToSet] = "";
AdvancedSearchOptions["arg"..VariableToSet.."op"] = "";
@@ -603,12 +750,12 @@ function AtlasLoot_AdvancedSearchArgumentClick(Object, VariableToSet, VariableVa
Object[1]:SetText("Select Option");
Object[2]:Close();
else
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Sub"):SetText("Select Option");
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Sub"):Enable();
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Sub"):SetText("Select Option");
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Sub"):Enable();
AdvancedSearchOptions["arg"..VariableToSet.."op"] = "";
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):SetText("");
getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):Hide();
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):SetText("");
getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):Hide();
AdvancedSearchOptions["arg"..VariableToSet] = VariableValue;
Object[1]:SetText(Object[3]);
@@ -749,7 +896,7 @@ function AtlasLoot_AdvancedSearchArgumentRegister(DropDown, DropDownObject, Argu
)
end
function AtlasLoot:AdvancedSearch(Text, args)
function AtlasLoot:AdvancedSearch(Text)
if not Text then return end
Text = strtrim(Text);
local advSearchString = Text or "";
@@ -763,10 +910,21 @@ function AtlasLoot:AdvancedSearch(Text, args)
return str;
end
local function AdvancedSearchFixType(slot, subType)
if slot == "2h" and (subType == "axe" or subType == "sword" or subType == "mace") then
return slot..subType;
local function GetTextByName(name)
if (_G["AtlasLootAdvancedSearch_"..name]) then
return _G["AtlasLootAdvancedSearch_"..name]:GetText()
end
return nil;
end
local function FixRangedSlot(subType)
if (subType == "wand" or subType == "gun" or subType == "crossbow") then
return "rangedright";
elseif subType == "thrown" then
return "thrown";
end
return "ranged";
end
if AdvancedSearchOptions["quality"] ~= "" then
@@ -774,11 +932,13 @@ function AtlasLoot:AdvancedSearch(Text, args)
end
if AdvancedSearchOptions["equip"] ~= "" then
if AdvancedSearchOptions["equip"] == "ranged" and AdvancedSearchOptions["type"] ~= ""then
AdvancedSearchOptions["equip"] = FixRangedSlot(AdvancedSearchOptions["type"]);
end
advSearchString = AppendSearchString(advSearchString, "slot="..AdvancedSearchOptions["equip"]);
end
if AdvancedSearchOptions["type"] ~= "" and AdvancedSearchOptions["type"] then
AdvancedSearchOptions["type"] = AdvancedSearchFixType(AdvancedSearchOptions["equip"], AdvancedSearchOptions["type"]) or AdvancedSearchOptions["type"];
advSearchString = AppendSearchString(advSearchString, "type="..AdvancedSearchOptions["type"]);
end
@@ -786,16 +946,34 @@ function AtlasLoot:AdvancedSearch(Text, args)
advSearchString = AppendSearchString(advSearchString, "dif="..AdvancedSearchOptions["difficulty"]);
end
for i = 1, 4, 1 do
if (GetTextByName("LevelMin") and GetTextByName("LevelMin") ~= "") then
advSearchString = AppendSearchString(advSearchString, "minlvl>="..GetTextByName("LevelMin"));
end
if (GetTextByName("LevelMax") and GetTextByName("LevelMax") ~= "") then
advSearchString = AppendSearchString(advSearchString, "minlvl<="..GetTextByName("LevelMax"));
end
if (GetTextByName("ILevelMin") and GetTextByName("ILevelMin") ~= "") then
advSearchString = AppendSearchString(advSearchString, "ilvl>="..GetTextByName("ILevelMin"));
end
if (GetTextByName("ILevelMax") and GetTextByName("ILevelMax") ~= "") then
advSearchString = AppendSearchString(advSearchString, "ilvl<="..GetTextByName("ILevelMax"));
end
for i = 1, ACTIVE_ARGUMENT, 1 do
if AdvancedSearchOptions["arg"..i] ~= "" then
local arg = _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(i).."Value"]:GetText();
if AdvancedSearchOptions["arg"..i.."op"] == "" then
AdvancedSearchOptions["arg"..i.."op"] = ">"
args[i] = "0";
print(args[i]);
arg = "0";
end
advSearchString = AppendSearchString(advSearchString, AdvancedSearchOptions["arg"..i]..AdvancedSearchOptions["arg"..i.."op"]..args[i]);
advSearchString = AppendSearchString(advSearchString, AdvancedSearchOptions["arg"..i]..AdvancedSearchOptions["arg"..i.."op"]..arg);
end
end
AtlasLoot:Search(string.lower(advSearchString));
end
AtlasLoot/Core/TextParsing.lua
+11 -1
View File
@@ -132,7 +132,7 @@ function AtlasLoot_FixText(text)
text = gsub(text, "#e22#", AL["Combat Pet"]);
text = gsub(text, "#e23#", AL["Fireworks"]);
text = gsub(text, "#e24#", AL["Fishing Lure"]);
-- Labels for Loot Descriptions
text = gsub(text, "#m1#", AL["Classes:"]);
text = gsub(text, "#m2#", AL["This Item Begins a Quest"]);
@@ -699,6 +699,16 @@ function AtlasLoot_FixText(text)
text = gsub(text, "#aq40s8#", AL["Doomcaller's Attire"]);
text = gsub(text, "#aq40s9#", AL["Conqueror's Battlegear"]);
-- Teir Tokens
text = gsub(text, "#tt1#", AL["Tier 1 Set Token"]);
text = gsub(text, "#tt2#", AL["Tier 2 Set Token"]);
text = gsub(text, "#tt2.5#", AL["Tier 2.5 Set Token"]);
text = gsub(text, "#tt3#", AL["Tier 3 Set Token"]);
text = gsub(text, "#tt4#", AL["Tier 4 Set Token"]);
text = gsub(text, "#tt5#", AL["Tier 5 Set Token"]);
text = gsub(text, "#tt6#", AL["Tier 6 Set Token"]);
text = gsub(text, "#tt7#", AL["Tier 7 Set Token"]);
-- Dungeon 1 Sets
text = gsub(text, "#t0s1#", AL["Wildheart Raiment"]);
text = gsub(text, "#t0s2#", AL["Beaststalker Armor"]);
AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
+182 -15
View File
@@ -25,6 +25,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
AtlasLoot_Dewdrop = AceLibrary("Dewdrop-2.0");
AtlasLoot_DewdropSubMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_DewdropSubMenu2 = AceLibrary("Dewdrop-2.0");
AtlasLoot_DifficultyAtlas = AceLibrary("Dewdrop-2.0");
indexID = 2
ItemindexID = ""
@@ -33,7 +34,7 @@ AtlasLoot_Data["AtlasLootFallback"] = {
};
--[[
AtlasLoot_DewDropClick(tablename, text, tabletype, tabletype2):
AtlasLoot_DewDropClick(tablename, text, tabletype):
tablename - Name of the loot table in the database
text - Heading for the loot table
tabletype - Whether the tablename indexes an actual table or needs to generate a submenu
@@ -44,10 +45,12 @@ function AtlasLoot_DewDropClick(tablename, text, tabletype)
--Definition of where I want the loot table to be shown
pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" };
--If the button clicked was linked to a loot table
if tabletype == "Table" then
--Show the loot table
AtlasLoot_ShowItemsFrame(tablename, "", text, pFrame);
Hold = false;
if tabletype == "Table" then
--Show the loot table
AtlasLoot_ShowBossLoot(tablename, tablename, pFrame);
--Save needed info for fuure re-display of the table
AtlasLoot_Lastboss = tablename;
AtlasLoot.db.profile.LastBoss = tablename;
--Purge the text label for the submenu and disable the submenu
AtlasLootDefaultFrame_SubMenu:Disable();
@@ -57,6 +60,7 @@ function AtlasLoot_DewDropClick(tablename, text, tabletype)
else
--Enable the submenu button
AtlasLootDefaultFrame_SubMenu:Enable();
AtlasLoot_Lastboss = AtlasLoot_DewDropDown_SubTables[tablename][1][2];
--Show the first loot table associated with the submenu
AtlasLoot_ShowBossLoot(AtlasLoot_DewDropDown_SubTables[tablename][1][2], AtlasLoot_DewDropDown_SubTables[tablename][1][1], pFrame);
--Save needed info for fuure re-display of the table
@@ -157,11 +161,32 @@ function AtlasLoot_DewDropSubMenu2Click(raidtablename, itemID, itemColour)
end
end
function AtlasLoot_DifficultyAtlasClick(raidtablename, itemID, itemColour)
if ATLASLOOT_FILTER_ENABLE == true then --used to refresh loottable when filter is enabled
AtlasLoot_FilterEnableButton()
ReEnableFilter = true
end
-- gets itemID reference
AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID, itemColour)
--Show the select loot table
AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4]);
--Set text for difficulty
AtlasLootItemsFrame_DifficultyAtlasButton:SetText(DropTablename);
AtlasLoot_DifficultyAtlas:Close(1);
if ReEnableFilter then --used to refresh loottable when filter is enabled
AtlasLoot_FilterEnableButton()
end
end
function AtlasLoot_DifficultyDisable() --Disables Difficulty Menu
isTablereference = false
notPattern = false
AtlasLootItemsFrame_DifficultyAtlasButton:Hide();
AtlasLootItemsFrame_DifficultyAtlasButton:Disable();
AtlasLoot_DifficultyAtlas:Unregister(AtlasLootItemsFrame_DifficultyAtlasButton);
AtlasLoot_DewdropSubMenu2:Unregister(AtlasLootDefaultFrame_SubMenu2);
AtlasLootDefaultFrame_SubMenu2:Disable();
AtlasLootItemsFrame_DifficultyAtlasButton:SetText("Select Difficulty");
AtlasLootDefaultFrame_SelectedTable2:SetText("");
AtlasLootDefaultFrame_SelectedTable2:Hide();
DewDrop2Enable = false
@@ -170,15 +195,26 @@ end
function AtlasLoot_DifficultyEnable(dataID, dataSource) --Enables Difficulty Menu
if not AtlasLoot_Difficulty[dataSource[dataID].Type] then return end
AtlasLootDefaultFrame_SubMenu2:Enable();
AtlasLoot_DewdropSubMenu2:Unregister(AtlasLootDefaultFrame_SubMenu2);
AtlasLoot_DewdropSubMenu2Register(AtlasLoot_Difficulty[dataSource[dataID].Type]);
if SelectedTable2TextSet == false then
AtlasLootDefaultFrame_SelectedTable2:SetText(AtlasLoot_Difficulty[dataSource[dataID].Type][1][1][1])
if AtlasMapMenu == true then
AtlasLootItemsFrame_DifficultyAtlasButton:Show();
AtlasLootItemsFrame_DifficultyAtlasButton:Enable();
AtlasLoot_DifficultyAtlas:Unregister(AtlasLootItemsFrame_DifficultyAtlasButton);
AtlasLoot_DifficultyAtlasRegister(AtlasLoot_Difficulty[dataSource[dataID].Type]);
if SelectedTable2TextSet == false then
AtlasLootItemsFrame_DifficultyAtlasButton:SetText(AtlasLoot_Difficulty[dataSource[dataID].Type][1][1][1])
end
SelectedTable2TextSet = true
else
AtlasLootDefaultFrame_SubMenu2:Enable();
AtlasLoot_DewdropSubMenu2:Unregister(AtlasLootDefaultFrame_SubMenu2);
AtlasLoot_DewdropSubMenu2Register(AtlasLoot_Difficulty[dataSource[dataID].Type]);
if SelectedTable2TextSet == false then
AtlasLootDefaultFrame_SelectedTable2:SetText(AtlasLoot_Difficulty[dataSource[dataID].Type][1][1][1])
end
AtlasLootDefaultFrame_SelectedTable2:Show();
SelectedTable2TextSet = true
end
AtlasLootDefaultFrame_SelectedTable2:Show();
SelectedTable2TextSet = true
end
function AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID, itemColour)
@@ -370,6 +406,140 @@ function AtlasLoot_DewdropSubMenu2Register(loottable)
)
end
function AtlasLoot_DifficultyAtlasRegister(loottable)
AtlasLoot_DifficultyAtlas:Register(AtlasLootItemsFrame_DifficultyAtlasButton,
'point', function(parent)
return "BOTTOM", "TOP"
end,
'children', function(level, value)
if level == 1 then
if AtlasLoot_Difficulty then
for k,v in ipairs(loottable) do
--If a link to show a submenu
if (type(v[1]) == "table") and (type(v[1][1]) == "string") then
local checked = false;
if v[1][3] == "Submenu" then
AtlasLoot_DifficultyAtlas:AddLine(
'text', v[1][1],
'textR', 1,
'textG', 0.82,
'textB', 0,
'func', AtlasLoot_DifficultyAtlasClick,
'arg1', v[1][1],
'arg2', v[1][2],
'arg3', v[1][3],
'arg4', v[1][4],
'notCheckable', true
)
elseif v[1][1] ~= "" then
AtlasLoot_DifficultyAtlas:AddLine(
'text', v[1][1],
'textR', 1,
'textG', 0.82,
'textB', 0,
'func', AtlasLoot_DifficultyAtlasClick,
'arg1', v[1][1],
'arg2', v[1][2],
'arg3', v[1][3],
'arg4', v[1][4],
'notCheckable', true
)
end
else
local lock=0;
--If an entry linked to a subtable
for i,j in pairs(v) do
if lock==0 then
AtlasLoot_DifficultyAtlas:AddLine(
'text', i,
'textR', 1,
'textG', 0.82,
'textB', 0,
'hasArrow', true,
'value', j,
'notCheckable', true
)
lock=1;
end
end
end
end
end
--Close button
AtlasLoot_DifficultyAtlas:AddLine(
'text', AL["Close Menu"],
'textR', 0,
'textG', 1,
'textB', 1,
'func', function() AtlasLoot_DifficultyAtlas:Close() end,
'notCheckable', true
)
elseif level == 2 then
if value then
for k,v in ipairs(value) do
if type(v) == "table" then
if (type(v[1]) == "string") then
local checked = false;
--If an entry to show a submenu
if v[4] == "Header" then
AtlasLoot_Dewdrop:AddLine(
'text', v[1],
'textR', 0.2,
'textG', 0.82,
'textB', 0.5,
'func', AtlasLoot_DifficultyAtlasClick,
'arg1', v[1],
'arg2', v[2],
'arg3', v[3],
'arg4', v[4],
'notCheckable', true
)
elseif v[3] == "Submenu" then
AtlasLoot_DifficultyAtlas:AddLine(
'text', v[1],
'textR', 1,
'textG', 0.82,
'textB', 0,
'func', AtlasLoot_DifficultyAtlasClick,
'arg1', v[1],
'arg2', v[2],
'arg3', v[3],
'arg4', v[4],
'notCheckable', true
)
else
AtlasLoot_DifficultyAtlas:AddLine(
'text', v[1],
'textR', 1,
'textG', 0.82,
'textB', 0,
'func', AtlasLoot_DifficultyAtlasClick,
'arg1', v[1],
'arg2', v[2],
'arg3', v[3],
'arg4', v[4],
'notCheckable', true
)
end
end
end
end
end
AtlasLoot_DifficultyAtlas:AddLine(
'text', AL["Close Menu"],
'textR', 0,
'textG', 1,
'textB', 1,
'func', function() AtlasLoot_DifficultyAtlas:Close() end,
'notCheckable', true
)
end
end,
'dontHook', true
)
end
--[[
AtlasLoot_DewdropSubMenuRegister(loottable):
loottable - Table defining the sub menu
@@ -674,9 +844,6 @@ function AtlasLoot_SetNewStyle(style)
"AtlasLootDefaultFrameLastResultButton",
"AtlasLootDefaultFrameWishListButton",
"AtlasLootDefaultFrameAdvancedSearchButton",
"AtlasLootAdvancedSearch_SearchButton",
"AtlasLootAdvancedSearch_SearchClearButton",
"AtlasLootAdvancedSearch_LastResultButton"
}
if style == "new" then
AtlasLoot/DefaultFrame/DewDropDown.lua
+6 -6
View File
@@ -286,22 +286,22 @@ AtlasLoot_DewDropDown = {
},
[4] = {
{ AL["Crafting"], "CRAFTINGMENU", "Table", "Submenu2Table" },
{ AL["Crafting"], "CRAFTINGMENU", "Table" },
},
[5] = {
{ AL["Sets/Collections"], "SETMENU", "Table", "Submenu2Table" },
{ AL["Sets/Collections"], "SETMENU", "Table" },
},
[6] = {
{ AL["PvP Rewards"], "PVPMENU", "Table", "Submenu2Table" },
{ AL["PvP Rewards"], "PVPMENU", "Table" },
},
[7] = {
{ AL["World Bosses"], "WorldBosses", "Submenu", "Submenu2Table" },
{ AL["World Bosses"], "WorldBosses", "Submenu" },
},
[8] = {
{ AL["Reputation Factions"], "REPMENU", "Table", "Submenu2Table" },
{ AL["Reputation Factions"], "REPMENU", "Table" },
},
[9] = {
{ AL["World Events"], "WORLDEVENTMENU", "Table", "Submenu2Table" },
{ AL["World Events"], "WORLDEVENTMENU", "Table" },
},
};
AtlasLoot/Locales/constants.en.lua
+10 -1
View File
@@ -125,7 +125,16 @@ if AL then
AL["Mythic Tier 7"] = true;
AL["Mythic Tier 8"] = true;
AL["Mythic Tier 9"] = true;
AL["Mythic Tier 10"] = true;
AL["Mythic Tier 10"] = true;
AL["Tier 1 Set Token"] = true;
AL["Tier 2 Set Token"] = true;
AL["Tier 2.5 Set Token"] = true;
AL["Tier 3 Set Token"] = true;
AL["Tier 4 Set Token"] = true;
AL["Tier 5 Set Token"] = true;
AL["Tier 6 Set Token"] = true;
AL["Tier 7 Set Token"] = true;
AL["Tier 8 Set Token"] = true;
-- Slash commands
AL["reset"] = true;
AtlasLoot/TableRegister/loottables.en.lua
+11
View File
@@ -1534,6 +1534,17 @@ end
AtlasLoot_TableNames["T1T2Warlock"] = { LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1T2Warrior"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1T2DPSWarrior"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1Bracers"] = {"Teir 1 Bracers", "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1Belts"] = {"Teir 1 Belts", "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1Gloves"] = {"Teir 1 Gloves", "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1Shoulders"] = {"Teir 1 Shoulders", "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1Boots"] = {"Teir 1 Boots", "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1Legs"] = {"Teir 1 Legs", "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1Helms"] = {"Teir 1 Helms", "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1Chests"] = {"Teir 1 Chests", "AtlasLootOriginalWoW" };
-- T1/T2 Sets HEROIC FLEX
AtlasLoot_TableNames["T1T2Druid25Man"] = { "Druid", "AtlasLootOriginalWoW" };
AtlasLoot_TableNames["T1T2Hunter25Man"] = { LOCALIZED_CLASS_NAMES_MALE["HUNTER"], "AtlasLootOriginalWoW" };