From 02688c7c8548114947917bc5aeff6ffdf2a5acce Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Mon, 5 Aug 2024 23:16:26 +0700 Subject: [PATCH 01/11] Update M+ affixes --- ls_UI/core/defaults.lua | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ls_UI/core/defaults.lua b/ls_UI/core/defaults.lua index b4000ef5..272955bc 100644 --- a/ls_UI/core/defaults.lua +++ b/ls_UI/core/defaults.lua @@ -520,16 +520,17 @@ D.global = { [226512] = true, -- Sanguine (Sanguine Ichor) [240443] = true, -- Bursting (Burst) [240559] = true, -- Grievous (Grievous Wound) - -- DRAGONFLIGHT SEASON 1 - [396364] = true, -- Thundering (Mark of Wind) - [396369] = true, -- Thundering (Mark of Lightning) - [396411] = true, -- Thundering (Primal Overload) - -- DRAGONFLIGHT SEASON 2 - [408556] = true, -- Entangling (Entangled) - [408805] = true, -- Incorporeal (Destabilize) - [409465] = true, -- Afflicted (Cursed Spirit) - [409470] = true, -- Afflicted (Poisoned Spirit) - [409472] = true, -- Afflicted (Diseased Spirit) + -- TWW SEASON 1 + [440313] = true, -- Xal'atath's Bargain: Devour (Void Rift) + [440328] = true, -- Xal'atath's Bargain: Devour (Mending Void) + [465136] = true, -- Xal'atath's Bargain: Devour (Lingering Void) + [461895] = true, -- Xal'atath's Bargain: Ascendant (Unstable Power) + [461904] = true, -- Xal'atath's Bargain: Ascendant (Cosmic Ascension) + [461910] = true, -- Xal'atath's Bargain: Ascendant (Cosmic Ascension) + [461978] = true, -- Xal'atath's Bargain: Frenzied + [462508] = true, -- Xal'atath's Bargain: Voidbound (Dark Prayer) + [462704] = true, -- Xal'atath's Bargain: Oblivion (Shattered Essence) + [463767] = true, -- Xal'atath's Bargain: Oblivion (Void Essence) }, }, textures = { From 444dafe32cd85aef01b9d2ea88afe230599727b7 Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Mon, 16 Sep 2024 22:33:50 +0700 Subject: [PATCH 02/11] Update tooltip on relevant events --- ls_UI/modules/tooltips/tooltips.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ls_UI/modules/tooltips/tooltips.lua b/ls_UI/modules/tooltips/tooltips.lua index 0bdc3edb..3e48fd3c 100644 --- a/ls_UI/modules/tooltips/tooltips.lua +++ b/ls_UI/modules/tooltips/tooltips.lua @@ -515,6 +515,12 @@ function MODULE:Init() end end) + E:RegisterEvent("UPDATE_MOUSEOVER_UNIT", function() + if GameTooltip:IsForbidden() then return end + + GameTooltip:RefreshData() + end) + isInit = true self:Update() From 8cb75dacd8e87bf2c79925b937e5dec2f1dda980 Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Mon, 16 Sep 2024 22:34:07 +0700 Subject: [PATCH 03/11] Update filters --- ls_UI/core/defaults.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ls_UI/core/defaults.lua b/ls_UI/core/defaults.lua index 272955bc..a9edf836 100644 --- a/ls_UI/core/defaults.lua +++ b/ls_UI/core/defaults.lua @@ -507,6 +507,7 @@ D.global = { [335152] = true, -- Sign of Iron [359082] = true, -- Sign of the Legion [397734] = true, -- Word of a Worthy Ally + [430191] = true, -- Warband Mentored Leveling }, ["M+ Affixes"] = { state = true, @@ -529,6 +530,7 @@ D.global = { [461910] = true, -- Xal'atath's Bargain: Ascendant (Cosmic Ascension) [461978] = true, -- Xal'atath's Bargain: Frenzied [462508] = true, -- Xal'atath's Bargain: Voidbound (Dark Prayer) + [462510] = true, -- Xal'atath's Bargain: Voidbound (Dark Prayer) [462704] = true, -- Xal'atath's Bargain: Oblivion (Shattered Essence) [463767] = true, -- Xal'atath's Bargain: Oblivion (Void Essence) }, From 73a115e7a69682412628508e434c25331836f9f3 Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Sun, 3 Nov 2024 10:12:44 +0700 Subject: [PATCH 04/11] Hide guild emblem --- ls_UI/modules/bars/micromenu.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ls_UI/modules/bars/micromenu.lua b/ls_UI/modules/bars/micromenu.lua index 929ea220..b4f7de38 100644 --- a/ls_UI/modules/bars/micromenu.lua +++ b/ls_UI/modules/bars/micromenu.lua @@ -372,6 +372,11 @@ local function handleMicroButton(button, useBlizz) if button.PushedShadow then E:ForceHide(button.PushedShadow) end + + if button.Emblem then + E:ForceHide(button.Emblem) + E:ForceHide(button.HighlightEmblem) + end end end From 7d73394198b8da30c59d41a4c348ed5fe8618d1d Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Sun, 3 Nov 2024 10:58:40 +0700 Subject: [PATCH 05/11] Sidestep caching when fetching gems --- ls_UI/core/utils.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ls_UI/core/utils.lua b/ls_UI/core/utils.lua index bc7d18c2..ca205da0 100644 --- a/ls_UI/core/utils.lua +++ b/ls_UI/core/utils.lua @@ -827,7 +827,15 @@ do end end elseif line.type == GEM_LINE then - gems[idx] = line.gemIcon and GEM_TEMPLATE:format(line.gemIcon) or SOCKET_TEMPLATE:format(line.socketType) + -- sidestep caching + local gemID = C_Item.GetItemGemID(itemLink, idx) + if gemID then + local _, _, _, _, icon = C_Item.GetItemInfoInstant(gemID) + gems[idx] = GEM_TEMPLATE:format(icon) + else + gems[idx] = SOCKET_TEMPLATE:format(line.socketType) + end + idx = idx + 1 end end From be05912a90d2c09461a46f3d457bdd522e08eba4 Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Sun, 3 Nov 2024 11:02:53 +0700 Subject: [PATCH 06/11] Customise inspect frame --- .luacheckrc | 31 +++ ls_UI/core/defaults.lua | 7 + ls_UI/locales/enUS.lua | 1 + ls_UI/locales/ruRU.lua | 1 + ls_UI/modules/blizzard/_blizzard.xml | 1 + ls_UI/modules/blizzard/core.lua | 1 + ls_UI/modules/blizzard/inspectframe.lua | 247 ++++++++++++++++++++++++ ls_UI_Options/blizzard.lua | 59 ++++++ 8 files changed, 348 insertions(+) create mode 100644 ls_UI/modules/blizzard/inspectframe.lua diff --git a/.luacheckrc b/.luacheckrc index f2a10085..192ea433 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -120,6 +120,7 @@ read_globals = { "DebuffFrame", "DeleteInboxItem", "DifficultyUtil", + "DUNGEON_SCORE_LINK_ITEM_LEVEL", "DUNGEONS_BUTTON", "EJMicroButton", "ENCHANTED_TOOLTIP_LINE", @@ -218,6 +219,36 @@ read_globals = { "InboxFrame", "InCombatLockdown", "InGuildParty", + "InspectBackSlot", + "InspectChestSlot", + "InspectFeetSlot", + "InspectFinger0Slot", + "InspectFinger1Slot", + "InspectFrame", + "InspectHandsSlot", + "InspectHeadSlot", + "InspectLegsSlot", + "InspectMainHandSlot", + "InspectModelFrame", + "InspectModelFrameBorderBottom", + "InspectModelFrameBorderBottom2", + "InspectModelFrameBorderBottomLeft", + "InspectModelFrameBorderBottomRight", + "InspectModelFrameBorderLeft", + "InspectModelFrameBorderRight", + "InspectModelFrameBorderTop", + "InspectModelFrameBorderTopLeft", + "InspectModelFrameBorderTopRight", + "InspectNeckSlot", + "InspectPaperDollItemsFrame", + "InspectSecondaryHandSlot", + "InspectShirtSlot", + "InspectShoulderSlot", + "InspectTabardSlot", + "InspectTrinket0Slot", + "InspectTrinket1Slot", + "InspectWaistSlot", + "InspectWristSlot", "IsAltKeyDown", "IsControlKeyDown", "IsInActiveWorldPVP", diff --git a/ls_UI/core/defaults.lua b/ls_UI/core/defaults.lua index a9edf836..56c78aa9 100644 --- a/ls_UI/core/defaults.lua +++ b/ls_UI/core/defaults.lua @@ -2817,6 +2817,10 @@ D.profile = { ilvl = true, enhancements = true, }, + inspect_frame = { + ilvl = true, + enhancements = true, + }, game_menu = { scale = 1, }, @@ -2894,6 +2898,9 @@ PrD.profile = { character_frame = { -- CharacterFrame enabled = true, }, + inspect_frame = { -- InspectFrame + enabled = true, + }, command_bar = { -- OrderHallCommandBar enabled = true }, diff --git a/ls_UI/locales/enUS.lua b/ls_UI/locales/enUS.lua index 0186fae4..76be9058 100644 --- a/ls_UI/locales/enUS.lua +++ b/ls_UI/locales/enUS.lua @@ -273,6 +273,7 @@ L["ICON"] = "Icon" L["IMPORT"] = "Import" L["IMPOSSIBLE"] = "Impossible" L["INDEX"] = "Index" +L["INSPECT_FRAME"] = "Inspect Frame" L["INSPECT_INFO"] = "Inspect Info" L["INVALID_EVENTS_ERR"] = "Attempted to use invalid events: %s." L["ITEM_COUNT"] = "Item Count" diff --git a/ls_UI/locales/ruRU.lua b/ls_UI/locales/ruRU.lua index acbbc5b7..097130e8 100644 --- a/ls_UI/locales/ruRU.lua +++ b/ls_UI/locales/ruRU.lua @@ -175,6 +175,7 @@ L["ICON"] = "Иконка" L["IMPORT"] = "Импортировать" L["IMPOSSIBLE"] = "Невозможный" L["INDEX"] = "Индекс" +L["INSPECT_FRAME"] = "Окно осмотра" L["INSPECT_INFO"] = "Информация осмотра" L["INVALID_EVENTS_ERR"] = "Попытка использовать недопустимые события: %s." L["ITEM_COUNT"] = "Кол-во предметов" diff --git a/ls_UI/modules/blizzard/_blizzard.xml b/ls_UI/modules/blizzard/_blizzard.xml index 05dbd633..2aa547d7 100644 --- a/ls_UI/modules/blizzard/_blizzard.xml +++ b/ls_UI/modules/blizzard/_blizzard.xml @@ -4,6 +4,7 @@ \ No newline at end of file diff --git a/ls_UI/embeds/oUF b/ls_UI/embeds/oUF index 637ace2d..91d0de91 160000 --- a/ls_UI/embeds/oUF +++ b/ls_UI/embeds/oUF @@ -1 +1 @@ -Subproject commit 637ace2dfbb502df17f3864db901695356182521 +Subproject commit 91d0de9107afeb22f66d39d3218fbb3d07f1341c From a98694838e03e83317e64fda6ee891d42b0eded8 Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Sun, 3 Nov 2024 11:20:09 +0700 Subject: [PATCH 09/11] Fix 3D portrait alpha --- ls_UI/modules/unitframes/elements/portrait.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ls_UI/modules/unitframes/elements/portrait.lua b/ls_UI/modules/unitframes/elements/portrait.lua index b3a6b219..066a3950 100644 --- a/ls_UI/modules/unitframes/elements/portrait.lua +++ b/ls_UI/modules/unitframes/elements/portrait.lua @@ -4,8 +4,13 @@ local UF = P:GetModule("UnitFrames") -- Lua local _G = getfenv(0) +local hooksecurefunc = _G.hooksecurefunc -- Mine +local function updateAlpha(self, alpha) + self.Portrait3D:SetModelAlpha(alpha) +end + local element_proto = {} function element_proto:UpdateConfig() @@ -71,5 +76,7 @@ function UF:CreatePortrait(frame, parent) frame.Portrait2D = Mixin((parent or frame):CreateTexture(nil, "ARTWORK"), element_proto) frame.Portrait3D = Mixin(CreateFrame("PlayerModel", nil, parent or frame), element_proto) + hooksecurefunc(frame, "SetAlpha", updateAlpha) + return frame.Portrait2D end From a10e9bacaa3ca50e11963ec26d1c06d507e25301 Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Sun, 3 Nov 2024 11:31:31 +0700 Subject: [PATCH 10/11] =?UTF-8?q?=F0=9F=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 16 ++++++++++++++++ ls_UI/core/changelog.lua | 12 +++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 052f1665..8f66ae00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # CHANGELOG +## Version 110005.01 + +- Added 11.0.5 support. + +### Action Bars + +- Fixed an issue where the guild emblem would appear on top the guild micro button. + +### Blizzard + +- Added custom inspect panel. Can be found at /LSUI > Blizzard > Inspect Frame, enabled by default. + +### Unit Frames + +- Fixed an issue where 3D portrait wouldn't fade properly. + ## Version 110000.03 ### Action Bars diff --git a/ls_UI/core/changelog.lua b/ls_UI/core/changelog.lua index 2673b278..57facf2f 100644 --- a/ls_UI/core/changelog.lua +++ b/ls_UI/core/changelog.lua @@ -6,7 +6,17 @@ local _G = getfenv(0) -- Mine E.CHANGELOG = [[ +- Added 11.0.5 support. + ### Action Bars -- Fixed an issue where droids wouldn't get the skyriding bar in the flying form. +- Fixed an issue where the guild emblem would appear on top the guild micro button. + +### Blizzard + +- Added custom inspect panel. Can be found at /LSUI > Blizzard > Inspect Frame, enabled by default. + +### Unit Frames + +- Fixed an issue where 3D portrait wouldn't fade properly. ]] From f99a548b4cb39d394fc1fd79045f20de4203fcb0 Mon Sep 17 00:00:00 2001 From: Val Voronov Date: Sun, 3 Nov 2024 11:31:41 +0700 Subject: [PATCH 11/11] .toc bump --- ls_UI/ls_UI.toc | 4 ++-- ls_UI_Options/ls_UI_Options.toc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ls_UI/ls_UI.toc b/ls_UI/ls_UI.toc index e29b6fab..9076a7d7 100644 --- a/ls_UI/ls_UI.toc +++ b/ls_UI/ls_UI.toc @@ -1,6 +1,6 @@ -## Interface: 110000, 110002 +## Interface: 110005, 110007 ## Author: lightspark -## Version: 110000.03 +## Version: 110005.01 ## Title: LS: |cff1a9fc0UI|r ## Notes: Yet another UI, but this one is a bit special... ## IconTexture: Interface\AddOns\ls_UI\assets\logo-64 diff --git a/ls_UI_Options/ls_UI_Options.toc b/ls_UI_Options/ls_UI_Options.toc index 33126b21..0fc5267d 100644 --- a/ls_UI_Options/ls_UI_Options.toc +++ b/ls_UI_Options/ls_UI_Options.toc @@ -1,4 +1,4 @@ -## Interface: 110000, 110002 +## Interface: 110005, 110007 ## Author: lightspark ## Title: LS: |cff1a9fc0UI|r |cff888987OptionsUI|r ## Notes: Options for LS: |cff1a9fc0UI|r.