Skip to content

Commit

Permalink
[ver. 3.46] - 02.08.2024 (#111)
Browse files Browse the repository at this point in the history
## [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
  • Loading branch information
mBlinkii authored Aug 2, 2024
2 parents 265fb4a + fc2d472 commit 83021b9
Show file tree
Hide file tree
Showing 13 changed files with 81 additions and 40 deletions.
19 changes: 18 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -858,9 +865,13 @@
"Dura",
"EDITBOX",
"Eltreum",
"eltruism",
"Eltruism",
"elvbg",
"ELVUI",
"enablemasking",
"extraborder",
"extrashadow",
"Flightstones",
"fontcolor",
"fontflag",
Expand All @@ -878,6 +889,7 @@
"hidetext",
"highlightcolor",
"hooksecurefunc",
"iconbg",
"iconcolor",
"ictexture",
"ilevel",
Expand All @@ -897,6 +909,8 @@
"Loadout",
"Lockdown",
"Luckyone",
"macrotext",
"maskb",
"materialicons",
"menuparent",
"Merathilis",
Expand All @@ -908,6 +922,7 @@
"MTDB",
"myclass",
"mythp",
"necrolord",
"nfauto",
"nfcolor",
"nfflash",
Expand Down Expand Up @@ -945,13 +960,15 @@
"targetmarker",
"targettarget",
"tconcat",
"TCOORDS",
"texttoname",
"THICKOUTLINE",
"thxto",
"Timeb",
"Timewarped",
"tinsert",
"TOPLEFT",
"TOPRIGHT",
"tremove",
"Trenchy",
"Tukui",
Expand Down
2 changes: 1 addition & 1 deletion Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc
Original file line number Diff line number Diff line change
@@ -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: [email protected]
## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon
Expand Down
2 changes: 1 addition & 1 deletion Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
24 changes: 12 additions & 12 deletions Addon/ElvUI_mMediaTag/core/dropdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -214,4 +214,4 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay)
mDropDownFrame.mTimer = mMT:ScheduleTimer("DropDownTimer", autoHideDelay)
ToggleFrame(frame)
end
end
end
2 changes: 1 addition & 1 deletion Addon/ElvUI_mMediaTag/core/options/dock.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ local function configTable()
dockspellbook = {
order = 11,
type = "group",
name = SPELLBOOK_ABILITIES_BUTTON,
name = PLAYERSPELLS_BUTTON,
args = {
dockspellbookicon = {
order = 1,
Expand Down
4 changes: 2 additions & 2 deletions Addon/ElvUI_mMediaTag/modules/Dock/mSpellBook.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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

Expand Down
10 changes: 5 additions & 5 deletions Addon/ElvUI_mMediaTag/modules/all/functions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand All @@ -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

Expand Down Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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,
Expand Down
36 changes: 23 additions & 13 deletions Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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))
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 83021b9

Please sign in to comment.