diff --git a/.vscode/settings.json b/.vscode/settings.json index a25dc791..48101993 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -803,7 +803,8 @@ "LFG_LIST_AND_MORE", "ItemRefTooltip", "NPEV2_CHAT_USER_TAG_GUIDE", - "SOCIAL_QUEUE_QUEUED_FOR" + "SOCIAL_QUEUE_QUEUED_FOR", + "TALENTS" ], "Lua.diagnostics.disable": [ "undefined-field", @@ -815,18 +816,24 @@ "cSpell.words": [ "autogrow", "Azilroka", + "backdropfadecolor", + "bgstyle", "BOTTOMLEFT", "BOTTOMRIGHT", + "brewfest", "castbar", "castbarshield", + "Cata", "CERROR", "CFFE", "CFFFF", "CFFFFFFFF", "chromie", "Chromie", + "CLAMPTOBLACKADDITIVE", "classcolors", "classicons", + "classiconstyle", "colora", "colorb", "colorhc", @@ -858,9 +865,13 @@ "Dura", "EDITBOX", "Eltreum", + "eltruism", "Eltruism", "elvbg", "ELVUI", + "enablemasking", + "extraborder", + "extrashadow", "Flightstones", "fontcolor", "fontflag", @@ -878,6 +889,7 @@ "hidetext", "highlightcolor", "hooksecurefunc", + "iconbg", "iconcolor", "ictexture", "ilevel", @@ -897,6 +909,8 @@ "Loadout", "Lockdown", "Luckyone", + "macrotext", + "maskb", "materialicons", "menuparent", "Merathilis", @@ -908,6 +922,7 @@ "MTDB", "myclass", "mythp", + "necrolord", "nfauto", "nfcolor", "nfflash", @@ -945,6 +960,7 @@ "targetmarker", "targettarget", "tconcat", + "TCOORDS", "texttoname", "THICKOUTLINE", "thxto", @@ -952,6 +968,7 @@ "Timewarped", "tinsert", "TOPLEFT", + "TOPRIGHT", "tremove", "Trenchy", "Tukui", diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc index 01cdf5d4..41da2014 100644 --- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc +++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc @@ -1,6 +1,6 @@ ## Interface: 30403 ## Author: Blinkii -## Version: 3.45 +## Version: 3.46 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r ## Notes: mMediaTag & Tools is a plugin for ElvUI. mMediaTag adds many media files like textures/ fonts/ icons and some tools to ElvUI. ## Notes-deDE: mMediaTag & Tools ist ein Plugin für ElvUI. mMediaTag fügt viele Mediendateien wie Texturen/ Schriften/ Symbole und einige Tools zu ElvUI hinzu. diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc index 18fb5626..7f64f115 100644 --- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc +++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc @@ -1,6 +1,6 @@ ## Interface: 40400 ## Author: Blinkii -## Version: 3.45 +## Version: 3.46 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon ## AddonCompartmentFunc: ElvUI_mMediaTag_OnAddonCompartmentClick diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc index bbf2dd8f..506ccf2a 100644 --- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc +++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc @@ -1,6 +1,6 @@ ## Interface: 110000, 110002 ## Author: Blinkii -## Version: 3.45 +## Version: 3.46 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r ## Notes: ElvUI Plugin from Blinkii | Support: mMediaTag@gmx.de ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc index 63475487..17091ad9 100644 --- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc +++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc @@ -1,6 +1,6 @@ ## Interface: 11503 ## Author: Blinkii -## Version: 3.45 +## Version: 3.46 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r ## Notes: mMediaTag & Tools is a plugin for ElvUI. mMediaTag adds many media files like textures/ fonts/ icons and some tools to ElvUI. ## Notes-deDE: mMediaTag & Tools ist ein Plugin für ElvUI. mMediaTag fügt viele Mediendateien wie Texturen/ Schriften/ Symbole und einige Tools zu ElvUI hinzu. diff --git a/Addon/ElvUI_mMediaTag/core/dropdown.lua b/Addon/ElvUI_mMediaTag/core/dropdown.lua index bb139954..5a47603d 100644 --- a/Addon/ElvUI_mMediaTag/core/dropdown.lua +++ b/Addon/ElvUI_mMediaTag/core/dropdown.lua @@ -49,8 +49,8 @@ local function OnLeave(btn) end -- list = tbl see below --- text = string, Secondtext = string, color = color string for first text, icon = texture, func = function, funcOnEnter = function, --- funcOnLeave = function, isTitle = bolean, macro = macrotext, tooltip = id or var you can use for the functions, notClickable = bolean +-- text = string, SecondText = string, color = color string for first text, icon = texture, func = function, funcOnEnter = function, +-- funcOnLeave = function, isTitle = boolean, macro = macrotext, tooltip = id or var you can use for the functions, notClickable = boolean function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay) local SAVE_HEIGHT = (E.db.mMT.general.datatextfontsize or E.db.general.fontSize) / 3 + 16 local BUTTON_HEIGHT = 0 @@ -116,11 +116,11 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay) frame.buttons[i].text:SetJustifyH("LEFT") end - if list[i].Secondtext then - frame.buttons[i].Secondtext = frame.buttons[i]:CreateFontString(nil, "BORDER") - frame.buttons[i].Secondtext:SetAllPoints() - frame.buttons[i].Secondtext:FontTemplate(nil, E.db.mMT.general.datatextfontsize, "") - frame.buttons[i].Secondtext:SetJustifyH("RIGHT") + if list[i].SecondText then + frame.buttons[i].SecondText = frame.buttons[i]:CreateFontString(nil, "BORDER") + frame.buttons[i].SecondText:SetAllPoints() + frame.buttons[i].SecondText:FontTemplate(nil, E.db.mMT.general.datatextfontsize, "") + frame.buttons[i].SecondText:SetJustifyH("RIGHT") end if list[i].tooltip then @@ -146,8 +146,8 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay) end end - if list[i].Secondtext and frame.buttons[i].Secondtext then - frame.buttons[i].Secondtext:SetText(list[i].Secondtext or "") + if list[i].SecondText and frame.buttons[i].SecondText then + frame.buttons[i].SecondText:SetText(list[i].SecondText or "") end if i == 1 then @@ -165,8 +165,8 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay) end if width ~= 0 then - if frame.buttons[i].Secondtext then - local secondWidth = frame.buttons[i].Secondtext:GetStringWidth() + if frame.buttons[i].SecondText then + local secondWidth = frame.buttons[i].SecondText:GetStringWidth() if secondWidth ~= 0 then width = width + secondWidth @@ -214,4 +214,4 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay) mDropDownFrame.mTimer = mMT:ScheduleTimer("DropDownTimer", autoHideDelay) ToggleFrame(frame) end -end \ No newline at end of file +end diff --git a/Addon/ElvUI_mMediaTag/core/options/dock.lua b/Addon/ElvUI_mMediaTag/core/options/dock.lua index 05edd818..befcb353 100644 --- a/Addon/ElvUI_mMediaTag/core/options/dock.lua +++ b/Addon/ElvUI_mMediaTag/core/options/dock.lua @@ -1021,7 +1021,7 @@ local function configTable() dockspellbook = { order = 11, type = "group", - name = SPELLBOOK_ABILITIES_BUTTON, + name = PLAYERSPELLS_BUTTON, args = { dockspellbookicon = { order = 1, diff --git a/Addon/ElvUI_mMediaTag/modules/Dock/mSpellBook.lua b/Addon/ElvUI_mMediaTag/modules/Dock/mSpellBook.lua index 2072d7bd..b3ef31b1 100644 --- a/Addon/ElvUI_mMediaTag/modules/Dock/mSpellBook.lua +++ b/Addon/ElvUI_mMediaTag/modules/Dock/mSpellBook.lua @@ -9,7 +9,7 @@ local PlayerSpellsUtil = _G.PlayerSpellsUtil local _G = _G local Config = { name = "mMT_Dock_SpellBook", - localizedName = mMT.DockString .. " " .. SPELLBOOK_ABILITIES_BUTTON, + localizedName = mMT.DockString .. " " .. PLAYERSPELLS_BUTTON, category = "mMT-" .. mMT.DockString, icon = { notification = false, @@ -20,7 +20,7 @@ local Config = { local function OnEnter(self) if E.db.mMT.dockdatatext.tip.enable then - DT.tooltip:AddLine(SPELLBOOK_ABILITIES_BUTTON) + DT.tooltip:AddLine(PLAYERSPELLS_BUTTON) DT.tooltip:Show() end diff --git a/Addon/ElvUI_mMediaTag/modules/all/functions.lua b/Addon/ElvUI_mMediaTag/modules/all/functions.lua index e1b92bf9..35682564 100644 --- a/Addon/ElvUI_mMediaTag/modules/all/functions.lua +++ b/Addon/ElvUI_mMediaTag/modules/all/functions.lua @@ -192,7 +192,7 @@ local ProfessionsColor = { } -- list = tbl see below --- text = string, Secondtext = string, color = color string for first text, icon = texture, func = function, funcOnEnter = function, +-- text = string, SecondText = string, color = color string for first text, icon = texture, func = function, funcOnEnter = function, -- funcOnLeave = function, isTitle = bolean, macro = macrotext, tooltip = id or var you can use for the functions, notClickable = bolean local function getProfSkill(skillLevel, maxSkillLevel, skillModifier) @@ -291,7 +291,7 @@ local function InsertInTable(tbl, textA, textB, title, icon, color, spell) if spell then tinsert(tbl, { text = textA, - Secondtext = textB, + SecondText = textB, color = color, icon = icon, isTitle = title, @@ -301,9 +301,9 @@ local function InsertInTable(tbl, textA, textB, title, icon, color, spell) end, }) else - -- text = string, Secondtext = string, color = color string for first text, icon = texture, func = function, funcOnEnter = function, + -- text = string, SecondText = string, color = color string for first text, icon = texture, func = function, funcOnEnter = function, -- funcOnLeave = function, isTitle = bolean, macro = macrotext, tooltip = id or var you can use for the functions, notClickable = bolean - tinsert(tbl, { text = textA, Secondtext = textB, isTitle = title, notClickable = title, func = function() end }) + tinsert(tbl, { text = textA, SecondText = textB, isTitle = title, notClickable = title, func = function() end }) end end @@ -371,7 +371,7 @@ function mMT:GetProfessions(tooltip) local name = spellInfo.name or "" tinsert(MenuTable, { text = format("|T%s:14:14:0:0:64:64:5:59:5:59|t %s", texture, name), - Secondtext = GetFireCD(), + SecondText = GetFireCD(), color = "|CFFFF9B00", isTitle = false, macro = "/cast " .. name, diff --git a/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua b/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua index 8ce29966..f5005bc9 100644 --- a/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua +++ b/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua @@ -74,6 +74,10 @@ local Teleports = { [168807] = true, --wormhole-generator-kultiras [151652] = true, --wormhole-generator-argus [112059] = true, --wormhole-centrifuge + [30542] = true, --Dimensional Ripper - Area + [30544] = true, --Ultrasafe Transporter: Toshley's Station + [18986] = true, --Ultrasafe Transporter: Gadgetzan + [18984] = true, --Dimensional Ripper - Everlook }, }, items = { @@ -183,6 +187,7 @@ local Teleports = { [193759] = true, --teleport-hall-of-the-guardian [193753] = true, --dreamwalk [126892] = true, --zen-pilgrimage + [265225] = true, -- Mole Machine }, }, season = { @@ -280,7 +285,7 @@ end local function mMenuAdd(tbl, text, time, macro, icon, tooltip, funcOnEnter) tinsert(tbl, { text = text, - Secondtext = time, + SecondText = time, icon = icon, isTitle = false, tooltip = tooltip, diff --git a/Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua b/Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua index e2d65e0d..7878334c 100644 --- a/Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua +++ b/Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua @@ -109,6 +109,10 @@ local function SetFonts() tmpFonts["bar"].fontsize = E.db.mMT.objectivetracker.bar.fontsize end + if tmpFonts["misc"] then + tmpFonts["misc"].fontsize = fontConfig.fontsize.text + end + return tmpFonts end @@ -425,17 +429,23 @@ local function CreateStageFrame(block, isChallengeMode) if isChallengeMode then block:StripTextures() - block.Level:ClearAllPoints() - block.Level:SetPoint("TOPLEFT", mMT_StageBlock, "TOPLEFT", 10, -10) - SetTextProperties(block.Level, fonts.misc) + if block.Level then + block.Level:ClearAllPoints() + block.Level:SetPoint("TOPLEFT", mMT_StageBlock, "TOPLEFT", 10, -10) + SetTextProperties(block.Level, fonts.misc) + end - block.TimeLeft:ClearAllPoints() - block.TimeLeft:SetPoint("LEFT", mMT_StageBlock, "LEFT", 8, 2) - SetTextProperties(block.TimeLeft, fonts.time) + if block.TimeLeft then + block.TimeLeft:ClearAllPoints() + block.TimeLeft:SetPoint("LEFT", mMT_StageBlock, "LEFT", 8, 2) + SetTextProperties(block.TimeLeft, fonts.time) + end - --block.DeathCount:ClearAllPoints() - --block.DeathCount:SetPoint("RIGHT", mMT_StageBlock, "RIGHT", -8, 2) - SetTextProperties(block.DeathCount.Count, fonts.misc) + if block.DeathCount and block.DeathCount.Count then + --block.DeathCount:ClearAllPoints() + --block.DeathCount:SetPoint("RIGHT", mMT_StageBlock, "RIGHT", -8, 2) + SetTextProperties(block.DeathCount.Count, fonts.misc) + end S:HandleStatusBar(block.StatusBar) else @@ -462,7 +472,7 @@ local function SkinStageBlock(stageBlock, scenarioID, scenarioType, widgetSetID, -- create stage block bg if not stageBlock.mMT_StageBlock then - CreateStageFrame(stageBlock, false) + CreateStageFrame(stageBlock, C_ChallengeMode.GetActiveChallengeMapID()) else if IsInInstance() and stageBlock.mMT_StageBlock and stageBlock.mMT_StageBlock.Difficulty then stageBlock.mMT_StageBlock.Difficulty:SetText(mMT:GetDungeonInfo(false, false, true)) @@ -485,7 +495,7 @@ local function SkinChallengeBlock(challengeBlock, elapsedTime) -- create stage block bg if not challengeBlock.mMT_StageBlock then - CreateStageFrame(challengeBlock, true) + CreateStageFrame(challengeBlock, C_ChallengeMode.GetActiveChallengeMapID()) end -- get dungeon time limits @@ -680,8 +690,8 @@ local function AddBackground() end backdrop:ClearAllPoints() - backdrop:SetPoint("TOPLEFT", _G.ObjectiveTrackerFrame, "TOPLEFT", -20, 10) - backdrop:SetPoint("BOTTOMRIGHT", _G.ObjectiveTrackerFrame, "BOTTOMRIGHT", 10, -10) + backdrop:SetPoint("TOPLEFT", _G.ObjectiveTrackerFrame.NineSlice, "TOPLEFT", 10, 10) + backdrop:SetPoint("BOTTOMRIGHT", _G.ObjectiveTrackerFrame.NineSlice, "BOTTOMRIGHT", 16, -10) backdrop:Show() else diff --git a/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua b/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua index 71666c58..1f81caf1 100644 --- a/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua +++ b/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua @@ -252,7 +252,7 @@ local function getColor(unit) return defaultColor end - if UnitIsPlayer(unit) then + if UnitIsPlayer(unit) or (E.Retail and UnitInPartyIsAI(unit)) then if settings.general.reaction then local playerFaction = cachedFaction.player or select(1, UnitFactionGroup("player")) cachedFaction.player = playerFaction diff --git a/CHANGELOG.md b/CHANGELOG.md index b78c2fc5..941f1f06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog - ElvUI_mMediaTag [Eng] - All changes to this project will be documented in this file. The latest changes are at the top. +## [ver. 3.46] - 02.08.2024 +### FIX +- FIX - Dock - Spellbook Tooltip +- FIX - ObjectiveTracker - Bug with Chatlangemode and missing font Settings +### Update +- UPDATE - Datatext - Teleports add more Engineering teleports and Mole Machine +- UPDATE - ObjectiveTracker Background - change the behavior +- UPDATE - Portraits can now class color the Portraits from Followers/ AI NPC + ## [ver. 3.45] - 31.07.2024 ### FIX - FIX - Dropdown Menus fro Dock Icons and Datatexts