From 47d666ed8cc5167bb38e7356d7d51f0ee0d382cc Mon Sep 17 00:00:00 2001 From: Merathilis Date: Wed, 23 Mar 2022 18:41:18 +0100 Subject: [PATCH 01/29] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 77e4afe90..835007023 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

- - + +
----- From 55702649fc8a388780c97c72d45d3a810701bb79 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Wed, 23 Mar 2022 18:45:25 +0100 Subject: [PATCH 02/29] fuuuuuuuuuuuuuuuuuuuck --- .../Mainline/Modules/Skins/FrameXML/LootFrame.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/LootFrame.lua b/ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/LootFrame.lua index d2d9f42f5..c088f543b 100644 --- a/ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/LootFrame.lua +++ b/ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/LootFrame.lua @@ -26,7 +26,7 @@ local function LoadSkin() hooksecurefunc('BossBanner_ConfigureLootFrame', function(lootFrame, data) if not lootFrame.isSkinned then local iconHitBox = lootFrame.IconHitBox - local color = MER.ClassColors[data.className] + local color = F.ClassColors[data.className] S:HandleIcon(lootFrame.Icon, true) iconHitBox.IconBorder:SetTexture(nil) From bac2c2bdda7dd12da2312228068241dcccff66d4 Mon Sep 17 00:00:00 2001 From: Dlarge Date: Wed, 23 Mar 2022 22:07:25 +0100 Subject: [PATCH 03/29] Update Blizzard_ItemUpgradeUI.lua * fix? --- .../Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua index fe76e2753..7ec540241 100644 --- a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua +++ b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua @@ -10,7 +10,7 @@ local function LoadSkin() ItemUpgradeFrame.TopBG:Hide() ItemUpgradeFrame:Styling() - MER:CreateBackdropShadow(ItemUpgradeFrame) + F:CreateBackdropShadow(ItemUpgradeFrame) ItemUpgradeFrame.BottomBGShadow:Hide() ItemUpgradeFrame.BottomBG:Hide() From 05170eab8aac26989785d1ad3b3715848ce53634 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Thu, 24 Mar 2022 10:09:12 +0100 Subject: [PATCH 04/29] Revert "Update Blizzard_ItemUpgradeUI.lua" This reverts commit bac2c2bdda7dd12da2312228068241dcccff66d4. --- .../Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua index 7ec540241..fe76e2753 100644 --- a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua +++ b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua @@ -10,7 +10,7 @@ local function LoadSkin() ItemUpgradeFrame.TopBG:Hide() ItemUpgradeFrame:Styling() - F:CreateBackdropShadow(ItemUpgradeFrame) + MER:CreateBackdropShadow(ItemUpgradeFrame) ItemUpgradeFrame.BottomBGShadow:Hide() ItemUpgradeFrame.BottomBG:Hide() From 116d9ca6b37175d9483a707ad2445ee104761588 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Thu, 24 Mar 2022 10:36:35 +0100 Subject: [PATCH 05/29] Real fix for the ItemUpgradeUI --- .../Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua index fe76e2753..7f6657ae4 100644 --- a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua +++ b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ItemUpgradeUI.lua @@ -15,11 +15,6 @@ local function LoadSkin() ItemUpgradeFrame.BottomBGShadow:Hide() ItemUpgradeFrame.BottomBG:Hide() ItemUpgradeFrame.TopBG:Hide() - - local holder = ItemUpgradeFrame.ButtonFrame - holder:StripTextures() - holder:CreateBackdrop('Transparent') - holder.backdrop.Center:SetDrawLayer('BACKGROUND', -1) end S:AddCallbackForAddon("Blizzard_ItemUpgradeUI", "mUIItemUpgrade", LoadSkin) From 02fb7e8bfd5bf9b7e78eaa72e0d158212341fad2 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Thu, 24 Mar 2022 10:36:44 +0100 Subject: [PATCH 06/29] Upvalues --- ElvUI_MerathilisUI/Core/General/Core.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ElvUI_MerathilisUI/Core/General/Core.lua b/ElvUI_MerathilisUI/Core/General/Core.lua index ab8bbd4b0..3a9a02f0a 100644 --- a/ElvUI_MerathilisUI/Core/General/Core.lua +++ b/ElvUI_MerathilisUI/Core/General/Core.lua @@ -3,10 +3,18 @@ local LSM = E.LSM local _G = _G local format = string.format -local print, pairs = print, pairs +local ipairs, print, pairs, tonumber, type, select, unpack = ipairs, print, pairs, tonumber, type, select, unpack +local assert = assert +local strsplit = strsplit local tinsert = table.insert +local getmetatable = getmetatable +local EnumerateFrames = EnumerateFrames +local CreateFrame = CreateFrame local GetAddOnEnableState = GetAddOnEnableState +local GetAddOnMetadata = GetAddOnMetadata +local GetBuildInfo = GetBuildInfo +local hooksecurefunc = hooksecurefunc local backdropr, backdropg, backdropb, backdropa = unpack(E.media.backdropcolor) local borderr, borderg, borderb, bordera = unpack(E.media.bordercolor) From 5adbd550ace630395e6eea2c71c65953aed5f092 Mon Sep 17 00:00:00 2001 From: Dlarge Date: Sun, 27 Mar 2022 18:17:17 +0200 Subject: [PATCH 07/29] Update AutoButtons.lua * add new Reward Bag in openable Items --- ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua index 80cce089a..2c0f1738d 100644 --- a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua +++ b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua @@ -492,6 +492,7 @@ local openableItems = { 187576, 187577, 187817, + 190178, 190610, 191139, } From 4f68f13325fa7c5df0e8723117a5397eff83a332 Mon Sep 17 00:00:00 2001 From: Dlarge Date: Tue, 29 Mar 2022 18:32:39 +0200 Subject: [PATCH 08/29] Hearthstone,local * added new Hearthstone * added Spiritual Healing Potion * deDe Local update --- ElvUI_MerathilisUI/Core/Locales/deDE.lua | 27 +++++++++---------- .../Core/Modules/AutoButtons/AutoButtons.lua | 1 + .../Core/Modules/MicroBar/MicroBar.lua | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ElvUI_MerathilisUI/Core/Locales/deDE.lua b/ElvUI_MerathilisUI/Core/Locales/deDE.lua index 1608cd866..0914aa2ed 100644 --- a/ElvUI_MerathilisUI/Core/Locales/deDE.lua +++ b/ElvUI_MerathilisUI/Core/Locales/deDE.lua @@ -28,7 +28,7 @@ Wenn du jedoch ein anderes Layout über meines installierst, musst du es manuell |cffff8000Neue Features sind markiert mit einem: |r]=] -- LoginMessage -L["Enable/Disable the Login Message in Chat"] = "Aktiviert/Deaktiviert die Login-Nachricht im Chat" +L["Enable/Disable the Login Message in Chat"] = "Aktiviert/Deaktiviert die Login Nachricht im Chat" -- Bags L["Equipment Manager"] = "Ausrüstungsmanager" @@ -65,12 +65,12 @@ L["Shows a ChatBar with different quick buttons."] = "Zeigt eine Chatleiste mit L["Hide Community Chat"] = "Verstecke Community Chat" L["Adds an overlay to the Community Chat. Useful for streamers."] = "Fügt ein Overlay zum Community Chat hinzu. Nützlich für Streamer." L["Chat Hidden. Click to show"] = "Chat verstecken. Klicken um ihn wieder anzuzeigen" -L["Click to open Emoticon Frame"] = "Öffnet das Fenster mit Emotesymbolen" +L["Click to open Emoticon Frame"] = "Öffnet das Fenster mit Emote Symbolen" L["Emotes"] = true -- no need to translate -L["Damage Meter Filter"] = "Damage Meter-Filter" +L["Damage Meter Filter"] = "Damage Meter Filter" L["Fade Chat"] = "Chat ausblenden" L["Auto hide timeout"] = "Autom. Ausblendzeit" -L["Seconds before fading chat panel"] = "Sek. vor dem Ausblenden des Chat-Panels" +L["Seconds before fading chat panel"] = "Sek. vor dem Ausblenden des Chat Panels" L["Seperators"] = "Trennlinien" L["Orientation"] = "Orientierung" L["Please use Blizzard Communities UI add the channel to your main chat frame first."] = "Verwende die Benutzeroberfläche von Blizzard Communities. Füge den Kanal zuerst zu Deinem Hauptchat Frame hinzu." @@ -90,13 +90,13 @@ L["Guild"] = "Gilde" L["Officer"] = "Offizier" L["Only show chat bar when you mouse over it."] = "Zeige die Chatleiste nur an, wenn mit der Maus darüber gefahren wird." L["Button"] = "Tasten" -L["Item Level Links"] = "Gegenstandsstufen-Links" +L["Item Level Links"] = "Gegenstandsstufen Links" L["Block"] = "Blöcke" L["Custom Online Message"] = "Benutzerdefinierte Online Nachricht" -- Combat Alert L["Combat Alert"] = "Kampfalarmierung" -L["Enable/Disable the combat message if you enter/leave the combat."] = "Aktiviert/Deaktiviert die Kampf-Nachricht, wenn du den Kampf betrittst, oder verlässt." +L["Enable/Disable the combat message if you enter/leave the combat."] = "Aktiviert/Deaktiviert die Kampf Nachricht, wenn du den Kampf betrittst, oder verlässt." L["Enter Combat"] = "Beginne Kampf" L["Leave Combat"] = "Verlasse Kampf" L["Stay Duration"] = "Anzeigezeit" @@ -175,8 +175,8 @@ L["Additional Text"] = "Zusätzlicher Text" L["Interval"] = "Intervall" L["The interval of updating."] = "Aktualisierungsintervall" L["Home"] = true -L["Left Button"] = "Linker Button" -L["Right Button"] = "Rechter Button" +L["Left Button"] = "Linke Taste" +L["Right Button"] = "Rechte Taste" L["Left Panel"] = "Linkes Panel" L["Right Panel"] = "Rechtes Panel" L["Button #%d"] = "Tasten #%d" @@ -229,7 +229,7 @@ L["Automatically select the item with the highest reward."] = "Wählt automatisc L["Item Alerts"] = "Gegenstandsalarm" L["Announce in chat when someone placed an usefull item."] = "Kündigt im Chat an, wenn jemand einen nützlichen Gegenstand stellt." L["Maw ThreatBar"] = "Schlund Bedrohungleiste" -L["Replace the Maw Threat Display, with a simple StatusBar"] = "Ersetzt die Schlundbedrohungsanzeige mit einer simplen Statusleiste." +L["Replace the Maw Threat Display, with a simple StatusBar"] = "Ersetzt die Schlundbedrohungsanzeige mit einer einfachen Statusleiste." L.ANNOUNCE_FP_PRE = "{rt1} %s bereitet ein %s vor. {rt1}" L.ANNOUNCE_FP_CLICK = "{rt1} %s zaubert ein %s. Klick! {rt1}" L.ANNOUNCE_FP_USE = "{rt1} %s benutzte %s. {rt1}" @@ -249,7 +249,7 @@ L["Title Color"] = "Titelfarbe" L["Change the color of the title in the Tooltip."] = "Ändert die Farbe des Titels im Tooltip." L["Progress Info"] = "Fortschrittsinfo" L["Shows raid progress of a character in the tooltip"] = "Zeigt den Schlachtzugsfortschritt für einen Charakter im Tooltip an." -L["Mythic"] = "Mytisch" +L["Mythic"] = "Mythisch" L["Heroic"] = "Heroisch" L["Normal"] = true L["LFR"] = true @@ -267,7 +267,7 @@ L["Only Icons"] = "Nur Symbole" L["Use the new style tooltip."] = "Neuen Tooltip Stil verwenden." L["Display in English"] = "Nur Englisch verwenden" L["Show icon"] = "Symbol anzeigen" -L["Show the spell icon along with the name."] = "Verderbniseffekt Symbol samt Namen anzeigen." +L["Show the spell icon along with the name."] = "Das Zaubersymbol zusammen mit dem Namen anzeigen." -- Notification L["Notification"] = "Benachrichtigungen" @@ -333,7 +333,7 @@ L["The width of the buttons."] = "Die Breite der Tasten" L["Button Height"] = "Tastenhöhe" L["The height of the buttons."] = "Die Höhe der Tasten" L["Counter"] = "Zähler" -L["Outline"] = "Kontur" +L["Outline"] = "Outline" L["Button Groups"] = "Tastengruppen" L["Key Binding"] = "Tastenbelegung" L["Custom Items"] = "Benutzerdefinierte Gegenstände" @@ -465,7 +465,6 @@ L["Show the name on location your Hearthstone is bound to."] = "Zeige die Positi L["Combat Hide"] = "Im Kampf ausblenden" L["Show/Hide all panels when in combat"] = "Zeige/Verstecke das Panel während des Kampfes" L["Hide In Class Hall"] = "In der Klassenhalle ausblenden" -L["Hearthstone Location"] = "Ruhestein Position" L["Hearthstone Toys Order"] = "Ruhestein, Spielzeuge Reihenfolge" L["Show hearthstones"] = "Zeige Ruhestein" L["Show hearthstone type items in the list."] = "Zeigt Ruhesteingegenstände in der Liste" @@ -544,7 +543,7 @@ L["Reminder"] = "Erinnerung" L["Reminds you on self Buffs."] = "Erinnert Dich an eigene Buffs." -- Cooldowns -L["CooldownFlash"] = true +L["CooldownFlash"] = "Abklingzeiten Blinken" L["Settings"] = "Einstellungen" L["Fadein duration"] = "Einblendzeit" L["Fadeout duration"] = "Ausblendzeit" diff --git a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua index 2c0f1738d..6a76236c0 100644 --- a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua +++ b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua @@ -124,6 +124,7 @@ local potionsShadowlands = { 171370, 177278, 176811, + 180317, -- Spiritual Healing Potion 183823, 184090, 187802, diff --git a/ElvUI_MerathilisUI/Core/Modules/MicroBar/MicroBar.lua b/ElvUI_MerathilisUI/Core/Modules/MicroBar/MicroBar.lua index beca07745..4c8df7e2f 100644 --- a/ElvUI_MerathilisUI/Core/Modules/MicroBar/MicroBar.lua +++ b/ElvUI_MerathilisUI/Core/Modules/MicroBar/MicroBar.lua @@ -112,6 +112,7 @@ if E.Retail then tinsert(Heartstones, 182773) tinsert(Heartstones, 183716) tinsert(Heartstones, 184353) + tinsert(Heartstones, 188952) -- Dominated Hearthstone end local HeartstonesTable From 43f3c21b5247e76f89110983fbc676669a1c5764 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Tue, 29 Mar 2022 18:42:10 +0200 Subject: [PATCH 09/29] Nothing --- ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua index 6a76236c0..99f7a859c 100644 --- a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua +++ b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua @@ -124,7 +124,7 @@ local potionsShadowlands = { 171370, 177278, 176811, - 180317, -- Spiritual Healing Potion + 180317, -- Spiritual Healing Potion 183823, 184090, 187802, @@ -493,7 +493,7 @@ local openableItems = { 187576, 187577, 187817, - 190178, + 190178, 190610, 191139, } From f12d44e1e118a2dbd6837b3eb14790f8ed9253fb Mon Sep 17 00:00:00 2001 From: Merathilis Date: Sun, 3 Apr 2022 10:57:15 +0200 Subject: [PATCH 10/29] Add enlightened paragon box to the openable items --- ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua index 99f7a859c..c3de90023 100644 --- a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua +++ b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua @@ -492,6 +492,7 @@ local openableItems = { 187575, 187576, 187577, + 187780, 187817, 190178, 190610, From 17695d730682ffecfc24da2d23cd92cd7846763a Mon Sep 17 00:00:00 2001 From: Merathilis Date: Mon, 4 Apr 2022 10:21:31 +0200 Subject: [PATCH 11/29] Dirty Fix for PlayerChoice Backdrop --- .../Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua index b6f1b9bc9..06dae059d 100644 --- a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua +++ b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua @@ -13,7 +13,10 @@ local function LoadSkin() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.playerChoice) or E.private.muiSkins.blizzard.playerChoice ~= true then return end local frame = _G.PlayerChoiceFrame - frame:Styling() + + if frame.backdrop then + frame.backdrop:Styling() + end end S:AddCallbackForAddon("Blizzard_PlayerChoice", "mUIPlayerChoice", LoadSkin) From b7c279137bc95d59f0ab0e9f417b81a8774f7ada Mon Sep 17 00:00:00 2001 From: Merathilis Date: Sat, 9 Apr 2022 18:36:38 +0200 Subject: [PATCH 12/29] Add Eternal Rune thing to RBReminders --- ElvUI_MerathilisUI/Core/Modules/RBReminder/RBReminder.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI_MerathilisUI/Core/Modules/RBReminder/RBReminder.lua b/ElvUI_MerathilisUI/Core/Modules/RBReminder/RBReminder.lua index 21efe9f5c..850d6e170 100644 --- a/ElvUI_MerathilisUI/Core/Modules/RBReminder/RBReminder.lua +++ b/ElvUI_MerathilisUI/Core/Modules/RBReminder/RBReminder.lua @@ -45,6 +45,7 @@ module.ReminderBuffs = { 224001, -- Defiled Augumentation (15 primary stat) 270058, -- Battle Scarred Augmentation (60 primary stat) 347901, -- Veiled Augmentation (18 primary stat) + 367405, -- Eternal Augmentation (18 Agi, Strength or Int) }, Food = { 104280, -- Well Fed From f24c2ad056a82a0e2d919c4cf200572c5404fc22 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Wed, 13 Apr 2022 09:56:40 +0200 Subject: [PATCH 13/29] Blizzard already set the PlayerName of the BossBanner in ClassColor --- .../Mainline/Modules/Skins/FrameXML/LootFrame.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/LootFrame.lua b/ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/LootFrame.lua index c088f543b..f6e1a0828 100644 --- a/ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/LootFrame.lua +++ b/ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/LootFrame.lua @@ -23,10 +23,9 @@ local function LoadSkin() end -- Boss Banner - hooksecurefunc('BossBanner_ConfigureLootFrame', function(lootFrame, data) + hooksecurefunc('BossBanner_ConfigureLootFrame', function(lootFrame) if not lootFrame.isSkinned then local iconHitBox = lootFrame.IconHitBox - local color = F.ClassColors[data.className] S:HandleIcon(lootFrame.Icon, true) iconHitBox.IconBorder:SetTexture(nil) @@ -36,8 +35,6 @@ local function LoadSkin() lootFrame.Anim:HookScript("OnPlay", HideIconBG) lootFrame.Anim:HookScript("OnFinished", ShowIconBG) - lootFrame.PlayerName:SetTextColor(color.r, color.g, color.b) - lootFrame.isSkinned = true end end) From ca4758d54aed04ae10a9c2890ffff2b03477b37f Mon Sep 17 00:00:00 2001 From: Dlarge Date: Fri, 15 Apr 2022 11:03:03 +0200 Subject: [PATCH 14/29] Update AutoButtons.lua * added Eternal Augment Rune to AutoButtons --- ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua index c3de90023..8fabcd479 100644 --- a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua +++ b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua @@ -156,6 +156,7 @@ local flasksShadowlands = { 171280, 181468, -- Veiled Augment Rune + 190384, -- Eternal Augment Rune } -- Foods (Crafted by cooking) From e5c774bb848d9ab47099dd78eab4a6ca5430fe29 Mon Sep 17 00:00:00 2001 From: Dlarge Date: Sun, 17 Apr 2022 14:05:35 +0200 Subject: [PATCH 15/29] Update AutoButtons.lua *add more Chaches in openable Items --- ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua index 8fabcd479..8aa128b95 100644 --- a/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua +++ b/ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua @@ -494,9 +494,11 @@ local openableItems = { 187576, 187577, 187780, + 187781, 187817, 190178, 190610, + 191040, 191139, } From 029b342fc48f479edd67219f8f8e09c599cbed9f Mon Sep 17 00:00:00 2001 From: Merathilis Date: Wed, 20 Apr 2022 13:42:02 +0200 Subject: [PATCH 16/29] Cleanup --- .../Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua index 06dae059d..8da1c8601 100644 --- a/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua +++ b/ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_PlayerChoice.lua @@ -3,11 +3,6 @@ local MERS = MER:GetModule('MER_Skins') local S = E:GetModule('Skins') local _G = _G -local next, select = next, select - -local CreateFrame = CreateFrame -local hooksecurefunc = hooksecurefunc -local IsInJailersTower = IsInJailersTower local function LoadSkin() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.playerChoice) or E.private.muiSkins.blizzard.playerChoice ~= true then return end From d3fb4cbff94d00ab5eea8484e97a7760a9408064 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Thu, 21 Apr 2022 12:56:39 +0200 Subject: [PATCH 17/29] Added new Tooltip font settings to my install --- ElvUI_MerathilisUI/Core/General/Install.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ElvUI_MerathilisUI/Core/General/Install.lua b/ElvUI_MerathilisUI/Core/General/Install.lua index e55808481..10f48cdf1 100644 --- a/ElvUI_MerathilisUI/Core/General/Install.lua +++ b/ElvUI_MerathilisUI/Core/General/Install.lua @@ -691,7 +691,9 @@ function MER:SetupLayout(layout) E.db["tooltip"]["visibility"]["combat"] = false E.db["tooltip"]["healthBar"]["font"] = "Expressway" E.db["tooltip"]["font"] = "Expressway" - E.db["tooltip"]["fontOutline"] = "NONE" + E.db["tooltip"]["fontOutline"] = "OUTLINE" + E.db["tooltip"]["headerFont"] = "Expressway" + E.db["tooltip"]["headerFontOutline"] = "NONE" E.db["tooltip"]["headerFontSize"] = 12 E.db["tooltip"]["textFontSize"] = 11 E.db["tooltip"]["smallTextFontSize"] = 11 From 9cbd01dd855f82cf7a86c9beca2ef10973ca08d6 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Thu, 21 Apr 2022 13:05:28 +0200 Subject: [PATCH 18/29] Copy & Paste fail like a baaaws --- ElvUI_MerathilisUI/Core/General/Install.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_MerathilisUI/Core/General/Install.lua b/ElvUI_MerathilisUI/Core/General/Install.lua index 10f48cdf1..bb24b4dee 100644 --- a/ElvUI_MerathilisUI/Core/General/Install.lua +++ b/ElvUI_MerathilisUI/Core/General/Install.lua @@ -693,7 +693,7 @@ function MER:SetupLayout(layout) E.db["tooltip"]["font"] = "Expressway" E.db["tooltip"]["fontOutline"] = "OUTLINE" E.db["tooltip"]["headerFont"] = "Expressway" - E.db["tooltip"]["headerFontOutline"] = "NONE" + E.db["tooltip"]["headerFontOutline"] = "OUTLINE" E.db["tooltip"]["headerFontSize"] = 12 E.db["tooltip"]["textFontSize"] = 11 E.db["tooltip"]["smallTextFontSize"] = 11 From 3a7ce74e76942d1eb353f1c846f15caa98950e24 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Sat, 23 Apr 2022 11:25:22 +0200 Subject: [PATCH 19/29] Style the Voice Chat Panel if enabled --- ElvUI_MerathilisUI/Core/Modules/Chat/Chat.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ElvUI_MerathilisUI/Core/Modules/Chat/Chat.lua b/ElvUI_MerathilisUI/Core/Modules/Chat/Chat.lua index 0206bfb83..a8007c073 100644 --- a/ElvUI_MerathilisUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI_MerathilisUI/Core/Modules/Chat/Chat.lua @@ -91,6 +91,13 @@ function module:StyleChat() MER:CreateBackdropShadow(_G.RightChatPanel, true) end +function module:StyleVoicePanel() + if _G.ElvUIChatVoicePanel then + _G.ElvUIChatVoicePanel:Styling() + MER:CreateShadow(_G.ElvUIChatVoicePanel) + end +end + -- Hide communities chat. Useful for streamers -- Credits Nnogga local commOpen = CreateFrame("Frame", nil, UIParent) @@ -208,6 +215,7 @@ function module:Initialize() module:EasyChannel() module:StyleChat() + module:StyleVoicePanel() if E.Retail then module:ChatFilter() end From 8e8735252c081701f89cb812edd10e7d11e7a31f Mon Sep 17 00:00:00 2001 From: Merathilis Date: Tue, 26 Apr 2022 18:54:54 +0200 Subject: [PATCH 20/29] Adopt the changes from Windtools for the Merchant Frame, thx for the idea. --- ElvUI_MerathilisUI/Core/Init.lua | 1 + .../Modules/ExtendedVendor/ExtendedVendor.lua | 131 +++++ .../ExtendedVendor/Load_ExtendedVendor.xml | 4 + .../Core/Modules/ExtendedVendor/Options.lua | 70 +++ .../Core/Modules/Load_Modules.xml | 1 + .../Core/Modules/Skins/Options.lua | 31 -- ElvUI_MerathilisUI/Core/Settings/Profile.lua | 3 +- .../Modules/Skins/FrameXML/Load_FrameXML.xml | 1 + .../Modules/Skins/FrameXML/MerchantFrame.lua | 13 + .../Modules/Skins/FrameXML/RaidFrame.lua | 5 - .../Mainline/Modules/Skins/Load_Skins.xml | 1 - .../Mainline/Modules/Skins/Merchant.lua | 462 ------------------ 12 files changed, 222 insertions(+), 501 deletions(-) create mode 100644 ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/ExtendedVendor.lua create mode 100644 ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/Load_ExtendedVendor.xml create mode 100644 ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/Options.lua create mode 100644 ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/MerchantFrame.lua delete mode 100644 ElvUI_MerathilisUI/Mainline/Modules/Skins/Merchant.lua diff --git a/ElvUI_MerathilisUI/Core/Init.lua b/ElvUI_MerathilisUI/Core/Init.lua index 353f3fe8e..4913bb63f 100644 --- a/ElvUI_MerathilisUI/Core/Init.lua +++ b/ElvUI_MerathilisUI/Core/Init.lua @@ -44,6 +44,7 @@ MER.CVars = MER:NewModule('MER_CVars') MER.DashBoard = MER:NewModule('MER_DashBoard', 'AceEvent-3.0', 'AceHook-3.0') MER.DataBars = MER:NewModule('MER_DataBars') MER.Emotes = MER:NewModule('MER_Emotes') +MER.ExtendedVendor = MER:NewModule('MER_ExtendedVendor', 'AceHook-3.0') MER.FlightMode = MER:NewModule('MER_FlightMode', 'AceHook-3.0', 'AceTimer-3.0', 'AceEvent-3.0') MER.FlightModeBUI = MER:NewModule('MER_BUIFlightMode') MER.GameMenu = MER:NewModule('MER_GameMenu') diff --git a/ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/ExtendedVendor.lua b/ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/ExtendedVendor.lua new file mode 100644 index 000000000..a0bf4beff --- /dev/null +++ b/ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/ExtendedVendor.lua @@ -0,0 +1,131 @@ +local MER, F, E, L, V, P, G = unpack(select(2, ...)) +local module = MER:GetModule('MER_ExtendedVendor') +local MERS = MER:GetModule('MER_Skins') +local S = E:GetModule('Skins') + +-- Modified from Extended Vendor UI & NDui_Plus +local _G = _G +local unpack = unpack + +local CreateFrame = CreateFrame +local IsAddOnLoaded = IsAddOnLoaded + +local BLIZZARD_MERCHANT_ITEMS_PER_PAGE = 10 + +function module:SkinButton(i) + if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.merchant) then + return + end + + local item = _G["MerchantItem" .. i] + item:Size(155, 45) + item:StripTextures(true) + item:CreateBackdrop("Transparent") + item.backdrop:Point("TOPLEFT", -3, 2) + item.backdrop:Point("BOTTOMRIGHT", 2, -3) + MERS:CreateGradient(item.backdrop) + + local slot = _G["MerchantItem" .. i .. "SlotTexture"] + item.Name:Point("LEFT", slot, "RIGHT", -5, 5) + -- item.Name:Size(110, 30) + + local button = _G["MerchantItem" .. i .. "ItemButton"] + button:StripTextures() + button:StyleButton() + button:SetTemplate(nil, true) + button:Point("TOPLEFT", item, "TOPLEFT", 4, -4) + + local icon = button.icon + icon:SetTexCoord(unpack(E.TexCoords)) + icon:ClearAllPoints() + icon:Point("TOPLEFT", 1, -1) + icon:Point("BOTTOMRIGHT", -1, 1) + + S:HandleIconBorder(button.IconBorder) +end + +function module:UpdateMerchantPositions() + for i = 1, _G.MERCHANT_ITEMS_PER_PAGE do + local button = _G["MerchantItem" .. i] + button:Show() + button:ClearAllPoints() + + if (i % BLIZZARD_MERCHANT_ITEMS_PER_PAGE) == 1 then + if (i == 1) then + button:SetPoint("TOPLEFT", _G.MerchantFrame, "TOPLEFT", 24, -70) + else + button:SetPoint("TOPLEFT", _G["MerchantItem" .. (i - (BLIZZARD_MERCHANT_ITEMS_PER_PAGE - 1))], "TOPRIGHT", 12, 0) + end + else + if (i % 2) == 1 then + button:SetPoint("TOPLEFT", _G["MerchantItem" .. (i - 2)], "BOTTOMLEFT", 0, -16) + else + button:SetPoint("TOPLEFT", _G["MerchantItem" .. (i - 1)], "TOPRIGHT", 12, 0) + end + end + end +end + +function module:UpdateBuybackPositions() + for i = 1, _G.MERCHANT_ITEMS_PER_PAGE do + local button = _G["MerchantItem" .. i] + button:ClearAllPoints() + + local contentWidth = 3 * _G["MerchantItem1"]:GetWidth() + 2 * 50 + local firstButtonOffsetX = (_G.MerchantFrame:GetWidth() - contentWidth) / 2 + + if i > _G.BUYBACK_ITEMS_PER_PAGE then + button:Hide() + else + if i == 1 then + button:SetPoint("TOPLEFT", _G.MerchantFrame, "TOPLEFT", firstButtonOffsetX, -105) + else + if ((i % 3) == 1) then + button:SetPoint("TOPLEFT", _G["MerchantItem" .. (i - 3)], "BOTTOMLEFT", 0, -30) + else + button:SetPoint("TOPLEFT", _G["MerchantItem" .. (i - 1)], "TOPRIGHT", 50, 0) + end + end + end + end +end + +function module:Initialize() + if not E.db.mui.merchant.enable then return end + self.db = E.db.mui.merchent + MER:RegisterDB(self, "merchant") + + if IsAddOnLoaded("ExtVendor") then + self.StopRunning = "ExtVendor" + return + end + + if IsAddOnLoaded("ExtVendor") then + self.StopRunning = "ExtVendor" + return + end + + _G.MERCHANT_ITEMS_PER_PAGE = self.db.numberOfPages * 10 + _G.MerchantFrame:SetWidth(30 + self.db.numberOfPages * 330) + + for i = 1, _G.MERCHANT_ITEMS_PER_PAGE do + if not _G["MerchantItem" .. i] then + CreateFrame("Frame", "MerchantItem" .. i, _G.MerchantFrame, "MerchantItemTemplate") + self:SkinButton(i) + end + end + + _G.MerchantBuyBackItem:ClearAllPoints() + _G.MerchantBuyBackItem:SetPoint("TOPLEFT", _G.MerchantItem10, "BOTTOMLEFT", -14, -20) + _G.MerchantPrevPageButton:ClearAllPoints() + _G.MerchantPrevPageButton:SetPoint("CENTER", _G.MerchantFrame, "BOTTOM", 30, 55) + _G.MerchantPageText:ClearAllPoints() + _G.MerchantPageText:SetPoint("BOTTOM", _G.MerchantFrame, "BOTTOM", 160, 50) + _G.MerchantNextPageButton:ClearAllPoints() + _G.MerchantNextPageButton:SetPoint("CENTER", _G.MerchantFrame, "BOTTOM", 290, 55) + + self:SecureHook("MerchantFrame_UpdateMerchantInfo", "UpdateMerchantPositions") + self:SecureHook("MerchantFrame_UpdateBuybackInfo", "UpdateBuybackPositions") +end + +MER:RegisterModule(module:GetName()) diff --git a/ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/Load_ExtendedVendor.xml b/ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/Load_ExtendedVendor.xml new file mode 100644 index 000000000..e2b4b2474 --- /dev/null +++ b/ElvUI_MerathilisUI/Core/Modules/ExtendedVendor/Load_ExtendedVendor.xml @@ -0,0 +1,4 @@ + +