From 162792c56008a81410ac81eab233ae676769e83f Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Mon, 16 Jan 2023 20:46:38 +0100 Subject: [PATCH 1/9] prevents being taken over by squareminimap --- misc/mInstanceDifficulty.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/mInstanceDifficulty.lua b/misc/mInstanceDifficulty.lua index ac1f9615..1fd14dbd 100644 --- a/misc/mInstanceDifficulty.lua +++ b/misc/mInstanceDifficulty.lua @@ -303,7 +303,7 @@ function mMT:SetupInstanceDifficulty() local position, xOffset, yOffset = GetIconSettings("difficulty") local Font = LSM:Fetch("font", E.db.general.font) - mIDF = CreateFrame("Frame", "m_MinimapInstanceDifficulty", Minimap) + mIDF = CreateFrame("Frame", "m_MinimapInstanceDifficulty", E.UIParent) mIDF:Size(32, 32) mIDF:SetPoint(position, Minimap, xOffset, yOffset) mIDF.Text = mIDF:CreateFontString("mIDF_Text", "OVERLAY", "GameTooltipText") From 969b0adbbb91e3a4d129a5101401e1405a5586dc Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Tue, 17 Jan 2023 19:15:05 +0100 Subject: [PATCH 2/9] add color gardient function and add gardient keys --- core/mFunctions.lua | 9 +++++++++ misc/mInstanceDifficulty.lua | 25 +++++++++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/core/mFunctions.lua b/core/mFunctions.lua index 62e24514..a153749c 100644 --- a/core/mFunctions.lua +++ b/core/mFunctions.lua @@ -27,6 +27,15 @@ function mMT:ColorCheck(value) end end +function mMT:ColorFade(colorA, colorB, percent) + local color = {} + color.r = colorA.r - (colorA.r - colorB.r) * percent + color.g = colorA.g - (colorA.g - colorB.g) * percent + color.b = colorA.b - (colorA.b - colorB.b) * percent + color.color = E:RGBToHex(color.r, color.g, color.b) + return color +end + function mMT:mMisc() if E.db[mPlugin].mMsg then print(format(L["Welcome to %s version |CFF8E44AD%q|r, for |cff1784d1ElvUI|r!"], ns.mName, ns.mVersion)) diff --git a/misc/mInstanceDifficulty.lua b/misc/mInstanceDifficulty.lua index 1fd14dbd..4a0c1e58 100644 --- a/misc/mInstanceDifficulty.lua +++ b/misc/mInstanceDifficulty.lua @@ -182,16 +182,20 @@ local function GetIconSettings(button) profile.yOffset or defaults.yOffset end local function GetKeystoneLevelandColor() + local color = {} local keyStoneLevel, _ = C_ChallengeMode.GetActiveKeystoneInfo() if keyStoneLevel == 2 then return format("%s%s|r", colors.mpa.color, keyStoneLevel) elseif keyStoneLevel >= 10 then - return format("%s%s|r", colors.mpb.color, keyStoneLevel) + color = mMT:ColorFade(colors.mpa, colors.mpb, 0.083) + return format("%s%s|r", color.color, keyStoneLevel) elseif keyStoneLevel >= 15 then - return format("%s%s|r", colors.mpc.color, keyStoneLevel) + color = mMT:ColorFade(colors.mpb, colors.mpc, 0.25) + return format("%s%s|r", color.color, keyStoneLevel) elseif keyStoneLevel >= 20 then - return format("%s%s|r", colors.mpd.color, keyStoneLevel) - else + color = mMT:ColorFade(colors.mpc, colors.mpd, 0.041) + return format("%s%s|r", color.color, keyStoneLevel) + elseif keyStoneLevel >= 27 then return format("%s%s|r", colors.mpe.color, keyStoneLevel) end end @@ -575,6 +579,19 @@ local function mInstanceDifficultyOptions() UodateColors() end, }, + ID_Header_TEST = { + order = 3, + type = "header", + name = function() + local tmpText = "START - " + for i = 0, 1, 0.1 do + local color = ColorFade(E.db[mPlugin].mInstanceDifficulty.mpa, E.db[mPlugin].mInstanceDifficulty.mpb, i) + color = E:RGBToHex(color.r, color.g, color.b) + tmpText = tmpText .. color .. "XX - " .. tostring(i) .. " |r" + end + return tmpText + end, + }, } end From c739cf722d30c81011bb0829ac65fb0403ec5351 Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Wed, 18 Jan 2023 18:23:42 +0100 Subject: [PATCH 3/9] update colors fix nil error --- core/mFunctions.lua | 17 ++-- core/mSettings.lua | 11 +-- misc/mInstanceDifficulty.lua | 149 +++++++++++++++++++++++++++-------- 3 files changed, 132 insertions(+), 45 deletions(-) diff --git a/core/mFunctions.lua b/core/mFunctions.lua index a153749c..4eae8e26 100644 --- a/core/mFunctions.lua +++ b/core/mFunctions.lua @@ -29,11 +29,18 @@ end function mMT:ColorFade(colorA, colorB, percent) local color = {} - color.r = colorA.r - (colorA.r - colorB.r) * percent - color.g = colorA.g - (colorA.g - colorB.g) * percent - color.b = colorA.b - (colorA.b - colorB.b) * percent - color.color = E:RGBToHex(color.r, color.g, color.b) - return color + if colorA and colorA.r and colorA.g and colorA.b and colorB and colorB.r and colorB.g and colorB.b and percent then + color.r = colorA.r - (colorA.r - colorB.r) * percent + color.g = colorA.g - (colorA.g - colorB.g) * percent + color.b = colorA.b - (colorA.b - colorB.b) * percent + color.color = E:RGBToHex(color.r, color.g, color.b) + return color + elseif colorA and colorA.r and colorA.g and colorA.b then + return colorA + else + print("|CFFE74C3CERROR - mMediaTag - COLORFADE|r") + return nil + end end function mMT:mMisc() diff --git a/core/mSettings.lua b/core/mSettings.lua index 16aaab3d..a5405a09 100644 --- a/core/mSettings.lua +++ b/core/mSettings.lua @@ -450,14 +450,15 @@ P[mPlugin] = { }, ["mInstanceDifficulty"] = { ["enable"] = false, - ["mpe"] = { ["color"] = "|cffff003e", ["r"] = 1, ["g"] = 0, ["b"] = 0.24, }, + ["mpe"] = { ["color"] = "|cffff8f00", ["r"] = 1, ["g"] = 0, ["b"] = 0, }, + ["mpf"] = { ["color"] = "|cffff0047", ["r"] = 1, ["g"] = 0.56, ["b"] = 0.27, }, ["hc"] = { ["color"] = "|cff0595ff", ["b"] = 1, ["g"] = 0.58, ["r"] = 0.01, }, ["guild"] = { ["color"] = "|cff94ff00", ["r"] = 0.58, ["g"] = 1, ["b"] = 0, }, - ["tw"] = { ["color"] = "|cff00c0ff", ["r"] = 0, ["g"] = 0.75, ["b"] = 1, }, - ["mpc"] = { ["color"] = "|cfffff819", ["r"] = 1, ["g"] = 0.97, ["b"] = 0.098, }, + ["tw"] = { ["color"] = "|cff00c0ff", ["r"] = 0, ["g"] = 0.44, ["b"] = 1, }, + ["mpc"] = { ["color"] = "|cff0072ff", ["r"] = 1, ["g"] = 0.97, ["b"] = 1, }, ["nhc"] = { ["color"] = "|cff52ff76", ["b"] = 0.46, ["g"] = 1, ["r"] = 0.32, }, ["mpa"] = { ["color"] = "|cff97ffbd", ["r"] = 0.59, ["g"] = 1, ["b"] = 0.74, }, - ["mpd"] = { ["color"] = "|cffff8b00", ["r"] = 1, ["g"] = 0.54, ["b"] = 0, }, + ["mpd"] = { ["color"] = "|cff8800ff", ["r"] = 0.53, ["g"] = 0, ["b"] = 1, }, ["m"] = { ["color"] = "|cffaf00ff", ["g"] = 0, ["r"] = 0.68, ["b"] = 1.00, }, ["name"] = { ["color"] = "|cffffffff", ["r"] = 1, ["g"] = 1, ["b"] = 1, }, ["mp"] = { ["color"] = "|cffff8f00", ["b"] = 0, ["g"] = 0.56, ["r"] = 1, }, @@ -466,4 +467,4 @@ P[mPlugin] = { ["tg"] = { ["color"] = "|cff5dffb8", ["r"] = 0.36, ["g"] = 1, ["b"] = 0.72, }, ["pvp"] = { ["color"] = "|cffeb0056", ["r"] = 0.92, ["g"] = 0, ["b"] = 0.33, }, }, -} +} \ No newline at end of file diff --git a/misc/mInstanceDifficulty.lua b/misc/mInstanceDifficulty.lua index 4a0c1e58..988bee8c 100644 --- a/misc/mInstanceDifficulty.lua +++ b/misc/mInstanceDifficulty.lua @@ -21,6 +21,37 @@ local challenge = difficulty and difficulty.ChallengeMode or _G.MiniMapChallenge --Variables local mIDF = nil + +local percentValue = { + [2] = 0, + [3] = 0.14, + [4] = 0.28, + [5] = 0.42, + [6] = 0.56, + [7] = 0.71, + [8] = 0.85, + [9] = 1, + [10] = 0.2, + [11] = 0.4, + [12] = 0.6, + [13] = 0.8, + [14] = 1, + [15] = 0.2, + [16] = 0.4, + [17] = 0.6, + [18] = 0.8, + [19] = 1, + [20] = 0.2, + [21] = 0.4, + [22] = 0.6, + [23] = 0.8, + [24] = 1, + [25] = 0.2, + [26] = 0.4, + [27] = 0.6, + [28] = 0.8, + [29] = 1, +} local instanceDifficulty = { [1] = { c = "|CFF00FC00", d = "N" }, [2] = { c = "|CFF005AFC", d = "H" }, @@ -97,6 +128,7 @@ local shortNames = { local colors = { ["mpe"] = { ["color"] = "|cffff003e", ["r"] = 1, ["g"] = 0, ["b"] = 0.24, }, + ["mpf"] = { ["color"] = "|cffff003e", ["r"] = 1, ["g"] = 0, ["b"] = 0.24, }, ["hc"] = { ["color"] = "|cff004dff", ["b"] = 1, ["g"] = 0.30, ["r"] = 0, }, ["guild"] = { ["color"] = "|cff94ff00", ["r"] = 0.58, ["g"] = 1, ["b"] = 0, }, ["tw"] = { ["color"] = "|cff00c0ff", ["r"] = 0, ["g"] = 0.75, ["b"] = 1, }, @@ -156,6 +188,7 @@ local function UodateColors() ["mpc"] = db.mpc, ["mpd"] = db.mpd, ["mpe"] = db.mpe, + ["mpf"] = db.mpf, } end @@ -186,17 +219,23 @@ local function GetKeystoneLevelandColor() local keyStoneLevel, _ = C_ChallengeMode.GetActiveKeystoneInfo() if keyStoneLevel == 2 then return format("%s%s|r", colors.mpa.color, keyStoneLevel) - elseif keyStoneLevel >= 10 then - color = mMT:ColorFade(colors.mpa, colors.mpb, 0.083) + elseif keyStoneLevel <= 9 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpa, E.db[mPlugin].mInstanceDifficulty.mpb, percentValue[keyStoneLevel]) + return format("%s%s|r", color.color, keyStoneLevel) + elseif keyStoneLevel <=14 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpb, E.db[mPlugin].mInstanceDifficulty.mpc, percentValue[keyStoneLevel]) + return format("%s%s|r", color.color, keyStoneLevel) + elseif keyStoneLevel <= 19 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpc, E.db[mPlugin].mInstanceDifficulty.mpd, percentValue[keyStoneLevel]) return format("%s%s|r", color.color, keyStoneLevel) - elseif keyStoneLevel >= 15 then - color = mMT:ColorFade(colors.mpb, colors.mpc, 0.25) + elseif keyStoneLevel >= 24 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpd, E.db[mPlugin].mInstanceDifficulty.mpe, percentValue[keyStoneLevel]) return format("%s%s|r", color.color, keyStoneLevel) - elseif keyStoneLevel >= 20 then - color = mMT:ColorFade(colors.mpc, colors.mpd, 0.041) + elseif keyStoneLevel >= 29 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpe, E.db[mPlugin].mInstanceDifficulty.mpf, percentValue[keyStoneLevel]) return format("%s%s|r", color.color, keyStoneLevel) - elseif keyStoneLevel >= 27 then - return format("%s%s|r", colors.mpe.color, keyStoneLevel) + else + return format("%s%s|r", colors.mpf.color, keyStoneLevel) end end @@ -346,7 +385,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_NHC = { type = "color", - order = 3, + order = 4, name = "NHC", hasAlpha = false, get = function(info) @@ -361,7 +400,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_HC = { type = "color", - order = 4, + order = 5, name = "HC", hasAlpha = false, get = function(info) @@ -376,7 +415,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_M = { type = "color", - order = 5, + order = 6, name = "M", hasAlpha = false, get = function(info) @@ -391,7 +430,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_MP = { type = "color", - order = 6, + order = 7, name = "M+", hasAlpha = false, get = function(info) @@ -406,7 +445,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_LFR = { type = "color", - order = 7, + order = 8, name = "LFR", hasAlpha = false, get = function(info) @@ -421,7 +460,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_PVP = { type = "color", - order = 8, + order = 9, name = "PVP", hasAlpha = false, get = function(info) @@ -436,7 +475,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_TW = { type = "color", - order = 9, + order = 10, name = "TW", hasAlpha = false, get = function(info) @@ -451,7 +490,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_TG = { type = "color", - order = 10, + order = 11, name = "TG", hasAlpha = false, get = function(info) @@ -465,13 +504,13 @@ local function mInstanceDifficultyOptions() end, }, ID_Header_Other = { - order = 11, + order = 12, type = "header", name = L["Other Colors"], }, ID_Color_Name = { type = "color", - order = 12, + order = 13, name = L["Instance Name"], hasAlpha = false, get = function(info) @@ -486,7 +525,7 @@ local function mInstanceDifficultyOptions() }, ID_Color_Guild = { type = "color", - order = 13, + order = 14, name = L["Guild Group"], hasAlpha = false, get = function(info) @@ -500,13 +539,13 @@ local function mInstanceDifficultyOptions() end, }, ID_Header_Keylevel = { - order = 14, + order = 15, type = "header", name = L["M+ Keystone Level"], }, ID_Color_MA = { type = "color", - order = 15, + order = 16, name = "+2", hasAlpha = false, get = function(info) @@ -521,8 +560,8 @@ local function mInstanceDifficultyOptions() }, ID_Color_MB = { type = "color", - order = 16, - name = ">=10", + order = 17, + name = "<=9", hasAlpha = false, get = function(info) local t = E.db[mPlugin].mInstanceDifficulty.mpb @@ -536,8 +575,8 @@ local function mInstanceDifficultyOptions() }, ID_Color_MC = { type = "color", - order = 17, - name = ">=15", + order = 18, + name = "<=14", hasAlpha = false, get = function(info) local t = E.db[mPlugin].mInstanceDifficulty.mpc @@ -551,8 +590,8 @@ local function mInstanceDifficultyOptions() }, ID_Color_MD = { type = "color", - order = 18, - name = ">=20", + order = 19, + name = "<=19", hasAlpha = false, get = function(info) local t = E.db[mPlugin].mInstanceDifficulty.mpd @@ -566,8 +605,8 @@ local function mInstanceDifficultyOptions() }, ID_Color_ME = { type = "color", - order = 19, - name = "<=21", + order = 20, + name = "<=14", hasAlpha = false, get = function(info) local t = E.db[mPlugin].mInstanceDifficulty.mpe @@ -579,16 +618,56 @@ local function mInstanceDifficultyOptions() UodateColors() end, }, - ID_Header_TEST = { - order = 3, + ID_Color_MF = { + type = "color", + order = 21, + name = "<=29", + hasAlpha = false, + get = function(info) + local t = E.db[mPlugin].mInstanceDifficulty.mpf + return t.r, t.g, t.b + end, + set = function(info, r, g, b) + local t = E.db[mPlugin].mInstanceDifficulty.mpf + t.r, t.g, t.b, t.color = r, g, b, E:RGBToHex(r, g, b) + UodateColors() + end, + }, + ID_Header_Example = { + order = 30, type = "header", + name = L["Example"], + }, + ID_Header_Test = { + order = 31, + type = "description", name = function() - local tmpText = "START - " - for i = 0, 1, 0.1 do - local color = ColorFade(E.db[mPlugin].mInstanceDifficulty.mpa, E.db[mPlugin].mInstanceDifficulty.mpb, i) + local tmpText = "" + tmpText = "[DIFFICULTY] = " .. colors.nhc.color .. "N |r" .. " - " .. colors.hc.color .. "H |r" .. " - " .. colors.m.color .. "M |r " + tmpText = tmpText .. colors.lfr.color .. "LFR |r" .. " - " .. colors.tw.color .. "TW |r" .. " - " .. colors.tg.color .. "TG |r " + tmpText = tmpText .. colors.pvp.color .. "PVP |r" .. " - " .. colors.mp.color .. "M+ |r\n" + tmpText = tmpText .. "[OTHERS] = " .. colors.name.color .. "NAME |r" .. " - " .. colors.guild.color .. "GUILD |r\n\n" + tmpText = tmpText .. "[KEYLEVELS]\n" + local color = {} + for i = 2, 29, 1 do + print(percentValue[i]) + if i <= 9 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpa, E.db[mPlugin].mInstanceDifficulty.mpb, percentValue[i]) + elseif i <= 14 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpb, E.db[mPlugin].mInstanceDifficulty.mpc, percentValue[i]) + elseif i <= 19 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpc, E.db[mPlugin].mInstanceDifficulty.mpd, percentValue[i]) + elseif i <= 24 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpd, E.db[mPlugin].mInstanceDifficulty.mpe, percentValue[i]) + elseif i <= 29 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpe, E.db[mPlugin].mInstanceDifficulty.mpf, percentValue[i]) + end color = E:RGBToHex(color.r, color.g, color.b) - tmpText = tmpText .. color .. "XX - " .. tostring(i) .. " |r" + tmpText = tmpText .. color .. tostring(i) .. "|r " end + + tmpText = tmpText .. "\n\n\n[DEMO]\n" .. colors.name.color .. "HOV |r\n" .. colors.m.color .. "M|r |CFFF7DC6F5|r" + return tmpText end, }, From 00c59ea33dac8a6df4638829987e20a20a79816a Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Thu, 19 Jan 2023 18:41:00 +0100 Subject: [PATCH 4/9] update colore code for key level --- core/mSettings.lua | 2 +- misc/mInstanceDifficulty.lua | 51 ++++++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/core/mSettings.lua b/core/mSettings.lua index a5405a09..2e4ea5f8 100644 --- a/core/mSettings.lua +++ b/core/mSettings.lua @@ -451,7 +451,7 @@ P[mPlugin] = { ["mInstanceDifficulty"] = { ["enable"] = false, ["mpe"] = { ["color"] = "|cffff8f00", ["r"] = 1, ["g"] = 0, ["b"] = 0, }, - ["mpf"] = { ["color"] = "|cffff0047", ["r"] = 1, ["g"] = 0.56, ["b"] = 0.27, }, + ["mpf"] = { ["color"] = "|cffff0056", ["r"] = 1, ["g"] = 0, ["b"] = 0.33, }, ["hc"] = { ["color"] = "|cff0595ff", ["b"] = 1, ["g"] = 0.58, ["r"] = 0.01, }, ["guild"] = { ["color"] = "|cff94ff00", ["r"] = 0.58, ["g"] = 1, ["b"] = 0, }, ["tw"] = { ["color"] = "|cff00c0ff", ["r"] = 0, ["g"] = 0.44, ["b"] = 1, }, diff --git a/misc/mInstanceDifficulty.lua b/misc/mInstanceDifficulty.lua index 988bee8c..dd2488ee 100644 --- a/misc/mInstanceDifficulty.lua +++ b/misc/mInstanceDifficulty.lua @@ -136,7 +136,7 @@ local colors = { ["nhc"] = { ["color"] = "|cff52ff76", ["b"] = 0.46, ["g"] = 1, ["r"] = 0.32, }, ["mpa"] = { ["color"] = "|cff97ffbd", ["r"] = 0.59, ["g"] = 1, ["b"] = 0.74, }, ["mpd"] = { ["color"] = "|cffff8b00", ["r"] = 1, ["g"] = 0.54, ["b"] = 0, }, - ["m"] = { ["color"] = "|cffaf00ff", ["g"] = 0, ["r"] = 0.68, ["b"] = 1.00,}, + ["m"] = { ["color"] = "|cffaf00ff", ["g"] = 0, ["r"] = 0.68, ["b"] = 1.00, }, ["name"] = { ["color"] = "|cffffffff", ["r"] = 1, ["g"] = 1, ["b"] = 1, }, ["mp"] = { ["color"] = "|cffff8f00", ["b"] = 0, ["g"] = 0.56, ["r"] = 1, }, ["mpb"] = { ["color"] = "|cff27ff59", ["r"] = 0.15, ["g"] = 1, ["b"] = 0.34, }, @@ -214,25 +214,31 @@ local function GetIconSettings(button) profile.xOffset or defaults.xOffset, profile.yOffset or defaults.yOffset end + local function GetKeystoneLevelandColor() local color = {} local keyStoneLevel, _ = C_ChallengeMode.GetActiveKeystoneInfo() if keyStoneLevel == 2 then return format("%s%s|r", colors.mpa.color, keyStoneLevel) elseif keyStoneLevel <= 9 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpa, E.db[mPlugin].mInstanceDifficulty.mpb, percentValue[keyStoneLevel]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpa, E.db[mPlugin].mInstanceDifficulty.mpb, + percentValue[keyStoneLevel]) return format("%s%s|r", color.color, keyStoneLevel) - elseif keyStoneLevel <=14 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpb, E.db[mPlugin].mInstanceDifficulty.mpc, percentValue[keyStoneLevel]) + elseif keyStoneLevel <= 14 then + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpb, E.db[mPlugin].mInstanceDifficulty.mpc, + percentValue[keyStoneLevel]) return format("%s%s|r", color.color, keyStoneLevel) elseif keyStoneLevel <= 19 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpc, E.db[mPlugin].mInstanceDifficulty.mpd, percentValue[keyStoneLevel]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpc, E.db[mPlugin].mInstanceDifficulty.mpd, + percentValue[keyStoneLevel]) return format("%s%s|r", color.color, keyStoneLevel) elseif keyStoneLevel >= 24 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpd, E.db[mPlugin].mInstanceDifficulty.mpe, percentValue[keyStoneLevel]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpd, E.db[mPlugin].mInstanceDifficulty.mpe, + percentValue[keyStoneLevel]) return format("%s%s|r", color.color, keyStoneLevel) elseif keyStoneLevel >= 29 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpe, E.db[mPlugin].mInstanceDifficulty.mpf, percentValue[keyStoneLevel]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpe, E.db[mPlugin].mInstanceDifficulty.mpf, + percentValue[keyStoneLevel]) return format("%s%s|r", color.color, keyStoneLevel) else return format("%s%s|r", colors.mpf.color, keyStoneLevel) @@ -245,7 +251,7 @@ function UpdateDifficulty() challenge:Hide() local name, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceID, instanceGroupSize, LfgDungeonID = - GetInstanceInfo() + GetInstanceInfo() local inInstance, InstanceType = IsInInstance() if inInstance and name then @@ -254,8 +260,7 @@ function UpdateDifficulty() local difficultyColor = instanceDifficulty[difficultyID] and instanceDifficulty[difficultyID].c or "|CFFFFFFFF" local difficultyShort = instanceDifficulty[difficultyID] and instanceDifficulty[difficultyID].d or "" local isGuildParty = InGuildParty() - if - difficultyID == 8 + if difficultyID == 8 and C_MythicPlus.IsMythicPlusActive() and (C_ChallengeMode.GetActiveChallengeMapID() ~= nil) then @@ -344,7 +349,7 @@ end function mMT:SetupInstanceDifficulty() local position, xOffset, yOffset = GetIconSettings("difficulty") - local Font = LSM:Fetch("font", E.db.general.font) + local Font = LSM:Fetch("font", E.db.general.font) mIDF = CreateFrame("Frame", "m_MinimapInstanceDifficulty", E.UIParent) mIDF:Size(32, 32) @@ -643,24 +648,30 @@ local function mInstanceDifficultyOptions() type = "description", name = function() local tmpText = "" - tmpText = "[DIFFICULTY] = " .. colors.nhc.color .. "N |r" .. " - " .. colors.hc.color .. "H |r" .. " - " .. colors.m.color .. "M |r " - tmpText = tmpText .. colors.lfr.color .. "LFR |r" .. " - " .. colors.tw.color .. "TW |r" .. " - " .. colors.tg.color .. "TG |r " + tmpText = "[DIFFICULTY] = " .. + colors.nhc.color .. "N |r" .. " - " .. colors.hc.color .. "H |r" .. " - " .. colors.m.color .. "M |r " + tmpText = tmpText .. + colors.lfr.color .. "LFR |r" .. " - " .. colors.tw.color .. "TW |r" .. " - " .. colors.tg.color .. "TG |r " tmpText = tmpText .. colors.pvp.color .. "PVP |r" .. " - " .. colors.mp.color .. "M+ |r\n" tmpText = tmpText .. "[OTHERS] = " .. colors.name.color .. "NAME |r" .. " - " .. colors.guild.color .. "GUILD |r\n\n" tmpText = tmpText .. "[KEYLEVELS]\n" local color = {} for i = 2, 29, 1 do - print(percentValue[i]) if i <= 9 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpa, E.db[mPlugin].mInstanceDifficulty.mpb, percentValue[i]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpa, E.db[mPlugin].mInstanceDifficulty.mpb, percentValue[i + ]) elseif i <= 14 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpb, E.db[mPlugin].mInstanceDifficulty.mpc, percentValue[i]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpb, E.db[mPlugin].mInstanceDifficulty.mpc, percentValue[i + ]) elseif i <= 19 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpc, E.db[mPlugin].mInstanceDifficulty.mpd, percentValue[i]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpc, E.db[mPlugin].mInstanceDifficulty.mpd, percentValue[i + ]) elseif i <= 24 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpd, E.db[mPlugin].mInstanceDifficulty.mpe, percentValue[i]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpd, E.db[mPlugin].mInstanceDifficulty.mpe, percentValue[i + ]) elseif i <= 29 then - color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpe, E.db[mPlugin].mInstanceDifficulty.mpf, percentValue[i]) + color = mMT:ColorFade(E.db[mPlugin].mInstanceDifficulty.mpe, E.db[mPlugin].mInstanceDifficulty.mpf, percentValue[i + ]) end color = E:RGBToHex(color.r, color.g, color.b) tmpText = tmpText .. color .. tostring(i) .. "|r " @@ -669,7 +680,7 @@ local function mInstanceDifficultyOptions() tmpText = tmpText .. "\n\n\n[DEMO]\n" .. colors.name.color .. "HOV |r\n" .. colors.m.color .. "M|r |CFFF7DC6F5|r" return tmpText - end, + end, }, } end From 24f03117f3b0b4a6b472de43daa18201e089906b Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Fri, 20 Jan 2023 19:09:16 +0100 Subject: [PATCH 5/9] ne texture r29 --- media/sharedmedia.lua | 1 + media/textures/r29.tga | Bin 0 -> 13970 bytes 2 files changed, 1 insertion(+) create mode 100644 media/textures/r29.tga diff --git a/media/sharedmedia.lua b/media/sharedmedia.lua index 291bd9c3..12f2efd2 100644 --- a/media/sharedmedia.lua +++ b/media/sharedmedia.lua @@ -349,6 +349,7 @@ mAddStatusbar("mMediaTag R25", "r25.tga") mAddStatusbar("mMediaTag R26", "r26.tga") mAddStatusbar("mMediaTag R27", "r27.tga") mAddStatusbar("mMediaTag R28", "r28.tga") +mAddStatusbar("mMediaTag R29", "r29.tga") mAddStatusbar("mMediaTag Caith UI 1", "Wglass.tga") mAddStatusbar("mMediaTag Caith UI 2", "Wisps.tga") diff --git a/media/textures/r29.tga b/media/textures/r29.tga new file mode 100644 index 0000000000000000000000000000000000000000..a9d19af052c9ff5604d3a38a0dd54cf5fb751938 GIT binary patch literal 13970 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 literal 0 HcmV?d00001 From 9f56cf8348ceb58065fed24fbec59e7a175acb61 Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Sat, 21 Jan 2023 17:16:02 +0100 Subject: [PATCH 6/9] fix execute marker --- misc/mNameplateTools.lua | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/misc/mNameplateTools.lua b/misc/mNameplateTools.lua index e22d47c4..5704b18f 100644 --- a/misc/mNameplateTools.lua +++ b/misc/mNameplateTools.lua @@ -154,11 +154,18 @@ function mMT:updateAutoRange() executeAutoRange.range = IsPlayerSpell(309072) and 35 or 20 end elseif class == "WARRIOR" then - local execute_Id = (specID == 72) and 280735 or 163201 - local massacre_Id = (specID == 72) and 206315 or 281001 - if IsPlayerSpell(execute_Id) or IsPlayerSpell(massacre_Id) then -- Execute or Massacre - executeAutoRange.enabel = true - executeAutoRange.range = IsPlayerSpell(massacre_Id) and 35 or 20 + if specID == 72 then + local execute_Id = (specID == 72) and 280735 or 163201 + local massacre_Id = (specID == 72) and 206315 or 281001 + if IsPlayerSpell(execute_Id) or IsPlayerSpell(massacre_Id) then -- Execute or Massacre + executeAutoRange.enabel = true + executeAutoRange.range = IsPlayerSpell(massacre_Id) and 35 or 20 + end + elseif specID == 73 then + if IsPlayerSpell(163201) then -- Execute + executeAutoRange.enabel = true + executeAutoRange.range = 20 + end end elseif class == "HUNTER" then if IsPlayerSpell(273887) or ((specID == 255) and IsPlayerSpell(385718)) then @@ -304,7 +311,7 @@ local function mNameplateTools(table, event, frame) healthMarkers(table, percent) end - if E.db[mPlugin].mExecutemarker.enable and (E.db[mPlugin].mExecutemarker.auto and not executeAutoRange.enabel) then + if E.db[mPlugin].mExecutemarker.enable then executeMarker(table, percent) end end From c75519fd2d9e5daaf5cd7497335764f58e96f22f Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Sat, 21 Jan 2023 20:06:07 +0100 Subject: [PATCH 7/9] update and fix auto media color --- core/init.lua | 7 ++++++- core/mSettings.lua | 2 -- misc/mCustomClassColors.lua | 12 +++++------- misc/mFunctionsRetail.lua | 6 ------ 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/core/init.lua b/core/init.lua index 29f599c3..a23f17b5 100644 --- a/core/init.lua +++ b/core/init.lua @@ -31,13 +31,18 @@ function mMT:AddOptions() func() end end - +local function mAutoValueColor() +end -- addon laden function mMT:Initialize() if E.db[mPlugin].mCustomClassColors.enable then mMT:SetCustomColors() end + if E.db[mPlugin].mCustomClassColors.emediaenable then + mMT:SetElvUIMediaColor() + end + mMT:mMisc() -- module laden if E.Retail then diff --git a/core/mSettings.lua b/core/mSettings.lua index 2e4ea5f8..b0e2f8d5 100644 --- a/core/mSettings.lua +++ b/core/mSettings.lua @@ -3,8 +3,6 @@ local mPlugin = "mMediaTag" local addon, ns = ... P[mPlugin] = { - ["mKeystoneDB"] = {}, - ["mLogKeystone"] = true, ["mMsg"] = true, ["mTIcon"] = true, ["mTIconSize"] = 32, diff --git a/misc/mCustomClassColors.lua b/misc/mCustomClassColors.lua index 40154c12..f01d8111 100644 --- a/misc/mCustomClassColors.lua +++ b/misc/mCustomClassColors.lua @@ -37,9 +37,9 @@ local function ResetColors() UF:Update_AllFrames() end -local function SetElvUIMediaColor() +function mMT:SetElvUIMediaColor() local _, unitClass = UnitClass("PLAYER") - local colorDB = E.db[mPlugin].mCustomClassColors.colors[unitClass] + local colorDB = E.db[mPlugin].mCustomClassColors.enable and E.db[mPlugin].mCustomClassColors.colors[unitClass] or E:ClassColor(E.myclass, true) E.db.general.valuecolor["r"] = colorDB.r E.db.general.valuecolor["g"] = colorDB.g E.db.general.valuecolor["b"] = colorDB.b @@ -72,9 +72,6 @@ end function mMT:SetCustomColors() UpdateColors() hooksecurefunc(E, "ClassColor", mClassColor) - if E.db[mPlugin].mCustomClassColors.emediaenable then - SetElvUIMediaColor() - end end local function customclasscolorsOptions() @@ -101,13 +98,12 @@ local function customclasscolorsOptions() order = 3, type = "toggle", name = L["Change ElvUI Media color"], - disabled = function() return not E.db[mPlugin].mCustomClassColors.enable end, get = function(info) return E.db[mPlugin].mCustomClassColors.emediaenable end, set = function(info, value) E.db[mPlugin].mCustomClassColors.emediaenable = value - SetElvUIMediaColor() + mMT:SetElvUIMediaColor() E:StaticPopup_Show('CONFIG_RL') end }, @@ -115,6 +111,7 @@ local function customclasscolorsOptions() order = 4, type = "execute", name = L["Set Custom colors"], + desc = L["Set Custom colors"], disabled = function() return not E.db[mPlugin].mCustomClassColors.enable end, func = function() UpdateColors() @@ -125,6 +122,7 @@ local function customclasscolorsOptions() order = 5, type = "execute", name = L["Reset Custom colors"], + desc = L["Reset Custom colors"], func = function() ResetColors() E:StaticPopup_Show('CONFIG_RL') diff --git a/misc/mFunctionsRetail.lua b/misc/mFunctionsRetail.lua index 85e78a81..83febfdd 100644 --- a/misc/mFunctionsRetail.lua +++ b/misc/mFunctionsRetail.lua @@ -109,12 +109,6 @@ function mMT:OwenKeystone() 2, format("%s%s: |r %s%s|r%s +%s|r", other, L["Keystone"], myth, name, E:RGBToHex(r, g, b), keyStoneLevel) ) - - --if E.db[mPlugin].mLogKeystone then - -- --E.db[mPlugin].mKeystoneDB = - -- mInsert(E.db[mPlugin].mKeystoneDB, "name", "key") - --end - return OwenKeystoneText end end From 4724c342feb563ca82a133f1a633d835aedd9b53 Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Sun, 22 Jan 2023 14:50:02 +0100 Subject: [PATCH 8/9] diseable if EltreumUI gardient mode is on --- core/init.lua | 7 +++++-- misc/mCustomClassColors.lua | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/init.lua b/core/init.lua index a23f17b5..7eff42aa 100644 --- a/core/init.lua +++ b/core/init.lua @@ -31,11 +31,14 @@ function mMT:AddOptions() func() end end -local function mAutoValueColor() + +function mMT:Check_ElvUI_EltreumUI() + return (IsAddOnLoaded("ElvUI_EltreumUI") and E.db.ElvUI_EltreumUI.unitframes.gradientmode.enable) end + -- addon laden function mMT:Initialize() - if E.db[mPlugin].mCustomClassColors.enable then + if E.db[mPlugin].mCustomClassColors.enable and not mMT:Check_ElvUI_EltreumUI() then mMT:SetCustomColors() end diff --git a/misc/mCustomClassColors.lua b/misc/mCustomClassColors.lua index f01d8111..d48339e1 100644 --- a/misc/mCustomClassColors.lua +++ b/misc/mCustomClassColors.lua @@ -39,7 +39,7 @@ end function mMT:SetElvUIMediaColor() local _, unitClass = UnitClass("PLAYER") - local colorDB = E.db[mPlugin].mCustomClassColors.enable and E.db[mPlugin].mCustomClassColors.colors[unitClass] or E:ClassColor(E.myclass, true) + local colorDB = (E.db[mPlugin].mCustomClassColors.enable and not mMT:Check_ElvUI_EltreumUI()) and E.db[mPlugin].mCustomClassColors.colors[unitClass] or E:ClassColor(E.myclass, true) E.db.general.valuecolor["r"] = colorDB.r E.db.general.valuecolor["g"] = colorDB.g E.db.general.valuecolor["b"] = colorDB.b From d797bf8d8aaedd2eeb5bc2b3ee6c3072af9ecb4d Mon Sep 17 00:00:00 2001 From: mBlinkii Date: Sun, 22 Jan 2023 14:59:09 +0100 Subject: [PATCH 9/9] ## [ver. 2.92.2] - 22.01.2023 ### Update - FIX Auto media Color - FIX Auto Execute marker - UPDATE Instance difficulty for Minimap add color gardient function and add gardient keys - UPDATE Instance difficulty for Minimap prevents being taken over by squareminimap - UPDATE diseable Custom class colore if EltreumUI gardient mode is on ### Added - NEW Texture R28 --- CHANGELOG | 10 ++++++++++ ElvUI_mMediaTag.toc | 2 +- ElvUI_mMediaTag_Classic.toc | 2 +- ElvUI_mMediaTag_Mainline.toc | 2 +- ElvUI_mMediaTag_Wrath.toc | 2 +- core/mChangelog.lua | 4 ++-- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 673345aa..7adce611 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,16 @@ [Eng] - All changes to this project will be documented in this file. The latest changes are at the top. [Ger] - Alle Änderungen an diesem Projekt werden in dieser Datei dokumentiert. Die neuesten Änderungen stehen ganz oben. +## [ver. 2.92.2] - 22.01.2023 +### Update +- FIX Auto media Color +- FIX Auto Execute marker +- UPDATE Instance difficulty for Minimap add color gardient function and add gardient keys +- UPDATE Instance difficulty for Minimap prevents being taken over by squareminimap +- UPDATE diseable Custom class colore if EltreumUI gardient mode is on +### Added +- NEW Texture R28 + ## [ver. 2.92.1] - 16.01.2023 ### Update - UPDATE Datatex for the new ElvUI update diff --git a/ElvUI_mMediaTag.toc b/ElvUI_mMediaTag.toc index 2aff4dce..c8cef32e 100644 --- a/ElvUI_mMediaTag.toc +++ b/ElvUI_mMediaTag.toc @@ -1,7 +1,7 @@ ## Interface: 100002 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r ## Author: Blinkii -## Version: 2.92.1 +## Version: 2.92.2 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de ## RequiredDeps: ElvUI ## DefaultState: Enabled diff --git a/ElvUI_mMediaTag_Classic.toc b/ElvUI_mMediaTag_Classic.toc index 06f72288..9e2de7b4 100644 --- a/ElvUI_mMediaTag_Classic.toc +++ b/ElvUI_mMediaTag_Classic.toc @@ -1,7 +1,7 @@ ## Interface: 11403 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r ## Author: Blinkii -## Version: 2.92.1 +## Version: 2.92.2 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de ## RequiredDeps: ElvUI ## DefaultState: Enabled diff --git a/ElvUI_mMediaTag_Mainline.toc b/ElvUI_mMediaTag_Mainline.toc index 98c2f216..b17761f3 100644 --- a/ElvUI_mMediaTag_Mainline.toc +++ b/ElvUI_mMediaTag_Mainline.toc @@ -1,7 +1,7 @@ ## Interface: 100002 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r ## Author: Blinkii -## Version: 2.92.1 +## Version: 2.92.2 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de ## RequiredDeps: ElvUI ## DefaultState: Enabled diff --git a/ElvUI_mMediaTag_Wrath.toc b/ElvUI_mMediaTag_Wrath.toc index 6fd3e591..82705915 100644 --- a/ElvUI_mMediaTag_Wrath.toc +++ b/ElvUI_mMediaTag_Wrath.toc @@ -1,7 +1,7 @@ ## Interface: 30401 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r ## Author: Blinkii -## Version: 2.92.1 +## Version: 2.92.2 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de ## RequiredDeps: ElvUI ## DefaultState: Enabled diff --git a/core/mChangelog.lua b/core/mChangelog.lua index 18fff963..9dc1eceb 100644 --- a/core/mChangelog.lua +++ b/core/mChangelog.lua @@ -9,7 +9,7 @@ local format = format --Variables local ChangelogText = - "## [ver. 2.92.1] - 16.01.2023\n\n### Update\n- |CFFFF7F50###Update|r Datatex for the new ElvUI update\n- |CFFFF7F50###Update|r Removed some Fonts\n- |CFFFF7F50###Update|r Instance difficulty for Minimap update Shortname function\n- |CFFFF7F50###Update|r Instance difficulty for Minimap update HC color\n\n### Added\n- |CFF6495EDNEW|r Tag mName:last & mName:last:onlyininstance" + "## [ver. 2.92.2] - 22.01.2023\n### Update\n- |CFFDFFF00FIX|r Auto media Color\n- |CFFDFFF00FIX|r Auto Execute marker\n- |CFFFF7F50###Update|r Instance difficulty for Minimap add color gardient function and add gardient keys\n- |CFFFF7F50###Update|r Instance difficulty for Minimap prevents being taken over by squareminimap\n- |CFFFF7F50###Update|r diseable Custom class colore if EltreumUI gardient mode is on\n### Added\n- |CFF6495EDNEW|r Texture R28\n" function mMT:Changelog(opt) local Frame = CreateFrame("Frame", "mMediaTagChangelog", E.UIParent, "BackdropTemplate") @@ -37,9 +37,9 @@ function mMT:Changelog(opt) local Label2 = Frame:CreateFontString("ChangelogText", "OVERLAY", "GameTooltipText") Label2:SetFont(Font, 14) Label2:SetPoint("TOPLEFT", 20, -90) + Label2:SetText(ChangelogText) Label2:SetWidth(360) Label2:SetHeight(500) - Label2:SetText(ChangelogText) local Close = CreateFrame("Button", "CloseButton", Frame, BackdropTemplateMixin and "BackdropTemplate") Close:Point("BOTTOM", Frame, "BOTTOM", 0, 10)