From 23924acbebe5838098d779f59356cdf3a2295c78 Mon Sep 17 00:00:00 2001 From: Anch Date: Tue, 4 Jul 2023 14:11:02 +1200 Subject: [PATCH] db link (#3) You can now alt right click items to open them to there ascensionDB page in your browser. --- AtlasLoot/AtlasLoot.toc | 4 ++-- AtlasLoot/Core/AtlasLoot.lua | 2 +- AtlasLoot/Core/Filter.lua | 2 +- AtlasLoot/Core/ItemIDsDatabaseFixes.lua | 2 +- AtlasLoot/Core/LootButtons.lua | 20 +++++++++++-------- AtlasLoot/Core/Options.lua | 2 ++ .../AtlaslootDefaultFrameCreate.lua | 1 + AtlasLoot/Libs/LibStub/LibStub.lua | 2 +- AtlasLoot/Locales/constants.en.lua | 4 +++- AtlasLoot/Menus/DungeonRaidMenus.lua | 2 +- AtlasLoot_OriginalWoW/originalwow.lua | 2 +- 11 files changed, 26 insertions(+), 17 deletions(-) diff --git a/AtlasLoot/AtlasLoot.toc b/AtlasLoot/AtlasLoot.toc index a2b6666..e3210de 100644 --- a/AtlasLoot/AtlasLoot.toc +++ b/AtlasLoot/AtlasLoot.toc @@ -1,8 +1,8 @@ -## Interface: 30300 +## Interface: 30300 ## Title: AtlasLoot Ascension Edition ## Notes: Shows the possible loot from the bosses ## Author: v7 Rebuid Done by: Anch, Rvng -## Version: v7.2.5 +## Version: v7.2.8 ## X-eMail: ## X-Credits: Skray, Szyler and others. ## X-Category: Map diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index a058b50..b7b5dd4 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -1116,4 +1116,4 @@ function AtlasLoot:LoadItemIDsDatabase() -- This will run over time (usually about 30s for a file this size), but will maintain playable fps while running. content:ParseAsync() - end + end \ No newline at end of file diff --git a/AtlasLoot/Core/Filter.lua b/AtlasLoot/Core/Filter.lua index 88e84ce..fdb50b6 100644 --- a/AtlasLoot/Core/Filter.lua +++ b/AtlasLoot/Core/Filter.lua @@ -414,4 +414,4 @@ StaticPopupDialogs["ATLASLOOT_DELETE_FILTERLIST"] = { timeout = 0, whileDead = 1, hideOnEscape = 1 -}; +}; \ No newline at end of file diff --git a/AtlasLoot/Core/ItemIDsDatabaseFixes.lua b/AtlasLoot/Core/ItemIDsDatabaseFixes.lua index fc0b978..59a7623 100644 --- a/AtlasLoot/Core/ItemIDsDatabaseFixes.lua +++ b/AtlasLoot/Core/ItemIDsDatabaseFixes.lua @@ -306,4 +306,4 @@ for _, v in pairs(ItemIDsDatabase) do if not v["MythicRaid"] then v["MythicRaid"] = tonumber("13"..v[2]); end -end +end \ No newline at end of file diff --git a/AtlasLoot/Core/LootButtons.lua b/AtlasLoot/Core/LootButtons.lua index c4db4e9..8e0ec6a 100644 --- a/AtlasLoot/Core/LootButtons.lua +++ b/AtlasLoot/Core/LootButtons.lua @@ -227,6 +227,8 @@ function AtlasLootItem_OnClick(self ,arg1) StaticPopupDialogs.ATLASLOOT_ADD_CUSTOMHEADER.num = self.number; elseif (arg1=="LeftButton") and ATLASLOOT_ITEM_UNLOCK then AtlasLoot:MoveWishlistItem("Up",self.number); + elseif (arg1=="RightButton" and IsAltKeyDown()) then + OpenAscensionDBURL("?item="..self.itemID) elseif(arg1=="RightButton" and not iteminfo and self.itemID ~= 0) then AtlasLootTooltip:SetHyperlink("item:"..self.itemID..":0:0:0:0:0:0:0"); if not AtlasLoot.db.profile.ItemSpam then @@ -281,6 +283,8 @@ function AtlasLootItem_OnClick(self ,arg1) if IsShiftKeyDown() then spellID = string.sub(self.itemID, 2); ChatEdit_InsertLink(AtlasLoot_GetEnchantLink(spellID)); + elseif (arg1=="RightButton" and IsAltKeyDown()) then + OpenAscensionDBURL("?item="..self.itemID) elseif IsAltKeyDown() then if AtlasLootItemsFrame.refresh[2] == "AtlasLoot_CurrentWishList" then AtlasLoot_DeleteFromWishList(self.itemID, self.number); @@ -329,11 +333,11 @@ function AtlasLootItem_ShowCompareItem(self) if ( not link ) then return end - + ShoppingTooltip1:SetOwner(AtlasLootTooltip, "ANCHOR_NONE"); ShoppingTooltip2:SetOwner(AtlasLootTooltip, "ANCHOR_NONE"); ShoppingTooltip3:SetOwner(AtlasLootTooltip, "ANCHOR_NONE"); - + local item1 = nil; local item2 = nil; local item3 = nil; @@ -350,7 +354,7 @@ function AtlasLootItem_ShowCompareItem(self) if not item1 and not item2 and not item3 then return end - + if item3 then if not item1 then item1, item3 = true, nil; @@ -364,11 +368,11 @@ function AtlasLootItem_ShowCompareItem(self) item1, item2 = true, nil; ShoppingTooltip1:SetHyperlinkCompareItem(link, 2, 1, AtlasLootTooltip); end - + local left, right, anchor1, anchor2 = AtlasLootTooltip:GetLeft(), AtlasLootTooltip:GetRight(), "TOPLEFT", "TOPRIGHT"; if not left or not right then return end if (GetScreenWidth() - right) < left then anchor1, anchor2 = anchor2, anchor1 end - + if item1 then ShoppingTooltip1:ClearAllPoints(); ShoppingTooltip1:SetPoint(anchor1, AtlasLootTooltip, anchor2, 0, -10); @@ -379,14 +383,14 @@ function AtlasLootItem_ShowCompareItem(self) ShoppingTooltip2:SetPoint(anchor1, ShoppingTooltip1, anchor2); ShoppingTooltip2:Show(); end - + if item3 then ShoppingTooltip3:ClearAllPoints(); ShoppingTooltip3:SetPoint(anchor1, ShoppingTooltip2, anchor2); ShoppingTooltip3:Show(); end end - + end - + diff --git a/AtlasLoot/Core/Options.lua b/AtlasLoot/Core/Options.lua index cc51653..8d7af7e 100644 --- a/AtlasLoot/Core/Options.lua +++ b/AtlasLoot/Core/Options.lua @@ -175,6 +175,8 @@ function AtlasLoot_DisplayHelp() WHITE..AL["Shift+Left Click the item like you would for any other in-game item"].."\n\n".. ORANGE..AL["How to view an item in the Dressing Room:"].."\n".. WHITE..AL["Simply Ctrl+Left Click on the item. Sometimes the dressing room window is hidden behind the Atlas or AtlasLoot windows, so if nothing seems to happen move your Atlas or AtlasLoot windows and see if anything is hidden."].."\n\n".. + ORANGE..AL["How to open an item to its AscensionDB page in your browser window:"].."\n".. + WHITE..AL["Alt+Right Click any item to open it in a browser window."].."\n\n".. ORANGE..AL["How to add an item to the wishlist:"].."\n".. WHITE..AL["Alt+Left Click any item to add it to the wishlist."].."\n\n".. ORANGE..AL["How to delete an item from the wishlist:"].."\n".. diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua index 3359c53..ae6127c 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua @@ -575,6 +575,7 @@ local rows = setmetatable({}, { __index = function(t, i) end AtlasLoot:ScrollFrameUpdate(); end + end) if i == 1 then row:SetPoint("TOPLEFT", scrollFrame, 8, -8) diff --git a/AtlasLoot/Libs/LibStub/LibStub.lua b/AtlasLoot/Libs/LibStub/LibStub.lua index 0a4a641..0a41ac0 100644 --- a/AtlasLoot/Libs/LibStub/LibStub.lua +++ b/AtlasLoot/Libs/LibStub/LibStub.lua @@ -1,4 +1,4 @@ - -- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info +-- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info -- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2 -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS! local LibStub = _G[LIBSTUB_MAJOR] diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index bbcd1c7..8fa77b8 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -1,4 +1,4 @@ ---[[ +--[[ constants.en.lua This file defines an AceLocale table for all the various text strings needed by AtlasLoot. In this implementation, if a translation is missing, it will fall @@ -1586,6 +1586,8 @@ if AL then AL["How to view an 'unsafe' item:"] = true; AL["Unsafe items have a red border around the icon and are marked because you have not seen the item since the last patch or server restart. Right-click the item, then move your mouse back over the item or click the 'Query Server' button at the bottom of the loot page. This will also load any Bloodforged items."] = true; AL["How to view an item in the Dressing Room:"] = true; + AL["How to open an item to its AscensionDB page in your browser window:"] = true; + AL["Alt+Right Click any item to open it in a browser window."] = true; AL["Simply Ctrl+Left Click on the item. Sometimes the dressing room window is hidden behind the Atlas or AtlasLoot windows, so if nothing seems to happen move your Atlas or AtlasLoot windows and see if anything is hidden."] = true; AL["How to link an item to someone else:"] = true; AL["Shift+Left Click the item like you would for any other in-game item"] = true; diff --git a/AtlasLoot/Menus/DungeonRaidMenus.lua b/AtlasLoot/Menus/DungeonRaidMenus.lua index bceb906..30b1b8d 100644 --- a/AtlasLoot/Menus/DungeonRaidMenus.lua +++ b/AtlasLoot/Menus/DungeonRaidMenus.lua @@ -110,4 +110,4 @@ AtlasLoot_SubMenus["Dungeons and RaidsWRATH"] = { { "", "UtgardeKeep", "Utgarde Keep" }; { "", "UtgardePinnacle", "Utgarde Pinnacle" }; { "", "TheVioletHold", "The Violet Hold" }; -}; +}; \ No newline at end of file diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index ff26ee3..da27cf8 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -4055,7 +4055,7 @@ AtlasLoot_Data["Naxxramas60"] = { { 9, 22819, "", "=q4=Shield of Condemnation", "=ds=#w8#", "", "18.18%" }, { 10, 23057, "", "=q4=Gem of Trapped Innocents", "=ds=#s2#", "", "18.18%" }, { 11, 23053, "", "=q4=Stormrage's Talisman of Seething", "=ds=#s2#", "", "18.18%" }, - { 13, 691119, "", "=q4=The Phylactery of Kel'Thuzad", "=ds=#m2#", "", "100%" }, + { 13, 22520, "", "=q4=The Phylactery of Kel'Thuzad", "=ds=#m2#", "", "100%" }, { 14, 23207, "", "=q4=Mark of the Champion", "=q1=#m4# =ds=#s14#" }, { 15, 23206, "", "=q4=Mark of the Champion", "=q1=#m4# =ds=#s14#" }, { 16, 1510496, "", "=q4=Desecrated Ring", "=ds=#tt3#", "", "100%", "=TT=T3FINGER" };