diff --git a/.pkgmeta b/.pkgmeta index 109f067d..208d75f5 100644 --- a/.pkgmeta +++ b/.pkgmeta @@ -1,8 +1,8 @@ package-as: AtlasLootClassic manual-changelog: - filename: AtlasLootClassic/Documentation/Release_Notes.txt - markup-type: plain + filename: AtlasLootClassic/Documentation/Release_Notes.md + markup-type: markdown enable-nolib-creation: no diff --git a/AtlasLootClassic/Addons/Favourites_GUI.lua b/AtlasLootClassic/Addons/Favourites_GUI.lua index 6a4512c1..d85f1104 100644 --- a/AtlasLootClassic/Addons/Favourites_GUI.lua +++ b/AtlasLootClassic/Addons/Favourites_GUI.lua @@ -15,6 +15,7 @@ local LibSharedMedia = LibStub("LibSharedMedia-3.0") -- lua local type = _G.type local pairs = _G.pairs +local format = _G.format -- WoW local GetItemQuality, GetItemIcon, GetItemInfoInstant, ItemExist = _G.C_Item.GetItemQualityByID, _G.C_Item.GetItemIconByID, _G.GetItemInfoInstant, _G.C_Item.DoesItemExistByID @@ -24,6 +25,7 @@ local GetItemCount = _G.GetItemCount local GetAlTooltip = AtlasLoot.Tooltip.GetTooltip -- const +local TT_INFO_ENTRY = "|cFFCFCFCF%s:|r %s" local EMPTY_SLOT_DUMMY = 136509 -- emptyslot local EMPTY_SLOTS = { [INVSLOT_AMMO] = 136510, -- ammo @@ -218,6 +220,17 @@ local function GUI_EditBoxOnEnterPressed(self) self:ClearFocus() end +local function GUI_InfoOnEnter(self) + local tooltip = GetAlTooltip() + tooltip:SetOwner(self, "ANCHOR_LEFT", (self:GetWidth() * 0.5), 5) + tooltip:AddLine(format(TT_INFO_ENTRY, AL["Alt + Left Click"], AL["Remove item from list"])) + tooltip:Show() +end + +local function GUI_InfoOnLeave(self) + GetAlTooltip():Hide() +end + -- ########################### -- Slot functions @@ -678,6 +691,11 @@ function GUI:Create() frame.titleFrame:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -27, -23) frame.titleFrame.text:SetText(AL["AtlasLoot"].." - "..AL["Favourites"]) + frame.infoButton = CreateFrame("Button", nil, frame, "UIPanelInfoButton") + frame.infoButton:SetPoint("RIGHT", frame.titleFrame, "RIGHT", -1, 0) + frame.infoButton:SetScript("OnEnter", GUI_InfoOnEnter) + frame.infoButton:SetScript("OnLeave", GUI_InfoOnLeave) + frame.content = CreateFrame("Frame", nil, frame) frame.content:SetPoint("TOPLEFT", frame.titleFrame, "BOTTOMLEFT", 0, -3) frame.content:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -5, 5) diff --git a/AtlasLootClassic/Data/ContentPhase.lua b/AtlasLootClassic/Data/ContentPhase.lua index c3df9a40..8049ab8c 100644 --- a/AtlasLootClassic/Data/ContentPhase.lua +++ b/AtlasLootClassic/Data/ContentPhase.lua @@ -86,7 +86,7 @@ local PHASE_ITEMS = { [11646] = 2, [11734] = 2, [11643] = 2, [11732] = 2, [11622] = 2, [11736] = 2, [11644] = 2, [18329] = 2, [18356] = 2, [11642] = 2, [18357] = 2, [18358] = 2, [18359] = 2, [18360] = 2, [18361] = 2, [18362] = 2, [18363] = 2, [18364] = 2, [18330] = 2, [18331] = 2, [11733] = 2, [18249] = 2, [18714] = 2, [18783] = 2, [18784] = 2, [18781] = 2, [18782] = 2, [18262] = 2, [17203] = 2, [17204] = 2, - [18253] = 2, [17623] = 2, + [18253] = 2, [17623] = 2, [18251] = 2, -- Phase 3 [2806] = 3, [5998] = 3, [13015] = 3, [13047] = 3, [16818] = 3, [16832] = 3, [16897] = 3, [16898] = 3, [16899] = 3, [16902] = 3, @@ -270,7 +270,7 @@ local PHASE_ITEMS = { [20861] = 5, [20863] = 5, [20862] = 5, [20859] = 5, [20865] = 5, [20860] = 5, [20858] = 5, [20873] = 5, [20869] = 5, [20866] = 5, [20870] = 5, [20868] = 5, [20867] = 5, [20872] = 5, [21761] = 5, [21156] = 5, [20383] = 5, [20876] = 5, [20879] = 5, [20875] = 5, [20878] = 5, [20881] = 5, [20877] = 5, [20874] = 5, [20882] = 5, [21762] = 5, [21230] = 5, [21229] = 5, [21146] = 5, [21147] = 5, - [21148] = 5, [21149] = 5, [20949] = 5, [20844] = 5, + [21148] = 5, [21149] = 5, [20949] = 5, [20844] = 5, [21342] = 5, -- Phase 6 [22224] = 6, [22352] = 6, [22353] = 6, [22354] = 6, [22355] = 6, [22356] = 6, [22357] = 6, [22358] = 6, [22359] = 6, [22360] = 6, diff --git a/AtlasLootClassic/Data/Token.lua b/AtlasLootClassic/Data/Token.lua index ce911bf2..ff1c28eb 100644 --- a/AtlasLootClassic/Data/Token.lua +++ b/AtlasLootClassic/Data/Token.lua @@ -171,6 +171,10 @@ local TOKEN = { [18703] = { 18714, 18713, 18715 }, -- Ancient Petrified Leaf [18646] = { 18665, 18646, 0, 18608, 18609 }, -- The Eye of Divinity [18665] = 18646, -- The Eye of Shadow + [17074] = { 17074, 17223 }, -- Shadowstrike + [17223] = 17074, -- Thunderstrike + [18608] = { 18608, 18609 }, -- Benediction + [18609] = 18608, -- Anathema -- Quests [10441] = { 10657, 10658, type = 3 }, -- Glowing Shard diff --git a/AtlasLootClassic/Documentation/Release_Notes.txt b/AtlasLootClassic/Documentation/Release_Notes.md similarity index 82% rename from AtlasLootClassic/Documentation/Release_Notes.txt rename to AtlasLootClassic/Documentation/Release_Notes.md index 3f445cb9..849c7c0b 100644 --- a/AtlasLootClassic/Documentation/Release_Notes.txt +++ b/AtlasLootClassic/Documentation/Release_Notes.md @@ -1,18 +1,15 @@ -AtlasLootClassic +# AtlasLootClassic This mod is distributed under Version 2 of the GPL. A copy of the GPL is included in this zip file with links to non-english translations. +## v1.1.5-beta (Aug. 19, 2019) -Patch Notes - - -v1.1.5-beta (Aug. XX, 2019) -======================== - Add a GUI for favourites - Favourite Lists can now shown in the item tooltip +- Some tokens and content phase things + +## v1.1.4-beta (Aug. 15, 2019) -v1.1.4-beta (Aug. 15, 2019) -======================== - Mounts should now always been shown on mouseover - Add Rogue poisons into crafting module - Add more Sets @@ -23,9 +20,8 @@ v1.1.4-beta (Aug. 15, 2019) - Fix AQ mounts preview - Move out PvP Weapons and Mounts into own tables +## v1.1.3-beta (Aug. 12, 2019) -v1.1.3-beta (Aug. 12, 2019) -======================== - ItemSets are now colored - Classes on ItemSets now are colored - Add content phase support for item sets @@ -34,8 +30,8 @@ v1.1.3-beta (Aug. 12, 2019) - Add white border for common items instead of the gray one - Add border for enchanting profession -v1.1.2-beta (Aug. 10, 2019) -======================== +## v1.1.2-beta (Aug. 10, 2019) + - Fix bug with favourites shown in tooltip needs a reload - Fix caching issue with unknown items and favourites - Fix loading bug with faction module on Horde @@ -43,8 +39,8 @@ v1.1.2-beta (Aug. 10, 2019) - Update some item content phases - Mount preview should now work while holding Ctrl -v1.1.0-beta (Aug. 07, 2019) -======================== +## v1.1.0-beta (Aug. 07, 2019) + - Favourites system added - SetItems are now marked and clickable to show the whole set - There is now a search box under every loot page @@ -64,28 +60,28 @@ v1.1.0-beta (Aug. 07, 2019) - Headers should no longer show the difficulty text when not needed - Options now use AceLib -v1.0.0-beta3 (Jul. 11, 2019) -======================== +## v1.0.0-beta3 (Jul. 11, 2019) + - Add first Profession (Alchemy) for testing the new Prof/Mat system - Add Recipe database - Add Profession database - Fix order of some Tokens and add multiline support - Remove double entries that are no longer needed with recipe db -v1.0.0-beta2 (Jul. 09, 2019) -======================== +## v1.0.0-beta2 (Jul. 09, 2019) + - Add much more Tokens and expand their usage - Cleanup some loottables - Fix pkgmeta -v1.0.0-beta1 (Jul. 08, 2019) -======================== +## v1.0.0-beta1 (Jul. 08, 2019) + - Add Token support and Tokens for DM-Books, ZG, AQ20, AQ40, T3 - Add World Events - Add Tier Sets - Add better icons for Sets - Fix bug with item description and rename "Junk" -v1.0.0-beta0 (Jul. 07, 2019) -======================== -- First upload of Classic version \ No newline at end of file +## v1.0.0-beta0 (Jul. 07, 2019) + +- First upload of Classic version diff --git a/README.md b/README.md index d0b6e578..e59f3e40 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,15 @@ AtlasLoot Classic is an UI mod allowing for loot tables of bosses to be browsed * Crafting with informations about materials, created items and skill ranks * Factions * Collections with item sets and world events -* Add your favourite items into a favourite list with "ALT + Left click" supports import/export, multiple lists global and profile based and more +* Favourites are the new wishlist + +## Favourites + +* Add items directly from AtlasLoot with `Alt + Left Click` +* Setup global and profile based lists +* Show on item tooltip if the item is on any active list +* Import and export your lists +* A GUI that let you plan your gear and shows a indicator if you already own an item ![image](https://drive.google.com/uc?export=view&id=1ExzBOWRcefewTRHA9BQOdz9m7FFY-zzP)![image](https://drive.google.com/uc?export=view&id=187PAs2VYp2b6AQqIvq1Dcstb-B1DXJJx)