diff --git a/Addon/!mMT_MediaPack/!mMT_MediaPack.toc b/Addon/!mMT_MediaPack/!mMT_MediaPack.toc new file mode 100644 index 00000000..d58731ca --- /dev/null +++ b/Addon/!mMT_MediaPack/!mMT_MediaPack.toc @@ -0,0 +1,14 @@ +## Interface: 30403 +## Author: Blinkii +## Version: 1.19 +## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r +## Notes: mMT Media Pack by Blinkii | Support: mMediaTag@gmx.de +## IconTexture: Interface\AddOns\!mMT_MediaPack\media\logo\mmt_icon +## SavedVariables: mMTSettings +## DefaultState: Enabled +## OptionalDeps: LibStub, LibSharedMedia-3.0 +## X-Curse-Project-ID: 289502 +## X-Wago-ID: 9rN48AND + +embeds.xml +media\core.lua diff --git a/Addon/!mMT_MediaPack/!mMT_MediaPack_Cata.toc b/Addon/!mMT_MediaPack/!mMT_MediaPack_Cata.toc index 7a40c17b..7bfe6b33 100644 --- a/Addon/!mMT_MediaPack/!mMT_MediaPack_Cata.toc +++ b/Addon/!mMT_MediaPack/!mMT_MediaPack_Cata.toc @@ -1,6 +1,6 @@ ## Interface: 40400 ## Author: Blinkii -## Version: 1.18 +## Version: 1.19 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r ## Notes: mMT Media Pack by Blinkii | Support: mMediaTag@gmx.de ## IconTexture: Interface\AddOns\!mMT_MediaPack\media\logo\mmt_icon diff --git a/Addon/!mMT_MediaPack/!mMT_MediaPack_Classic.toc b/Addon/!mMT_MediaPack/!mMT_MediaPack_Classic.toc index 3ad6dcd2..49d11028 100644 --- a/Addon/!mMT_MediaPack/!mMT_MediaPack_Classic.toc +++ b/Addon/!mMT_MediaPack/!mMT_MediaPack_Classic.toc @@ -1,6 +1,6 @@ ## Interface: 11502 ## Author: Blinkii -## Version: 1.18 +## Version: 1.19 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r ## Notes: mMT Media Pack by Blinkii | Support: mMediaTag@gmx.de ## IconTexture: Interface\AddOns\!mMT_MediaPack\media\logo\mmt_icon diff --git a/Addon/!mMT_MediaPack/!mMT_MediaPack_Mainline.toc b/Addon/!mMT_MediaPack/!mMT_MediaPack_Mainline.toc index f5474f98..a57f8204 100644 --- a/Addon/!mMT_MediaPack/!mMT_MediaPack_Mainline.toc +++ b/Addon/!mMT_MediaPack/!mMT_MediaPack_Mainline.toc @@ -1,6 +1,6 @@ ## Interface: 100207 ## Author: Blinkii -## Version: 1.18 +## Version: 1.19 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r ## Notes: mMT Media Pack by Blinkii | Support: mMediaTag@gmx.de ## IconTexture: Interface\AddOns\!mMT_MediaPack\media\logo\mmt_icon diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc new file mode 100644 index 00000000..7ce29a11 --- /dev/null +++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc @@ -0,0 +1,26 @@ +## Interface: 30403 +## Author: Blinkii +## Version: 3.42 +## 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. +## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon +## AddonCompartmentFunc: ElvUI_mMediaTag_OnAddonCompartmentClick +## AddonCompartmentFuncOnEnter: ElvUI_mMediaTag_OnAddonCompartmentOnEnter +## AddonCompartmentFuncOnLeave: ElvUI_mMediaTag_OnAddonCompartmentOnLeave +## SavedVariables: mMTDB +## RequiredDeps: ElvUI +## DefaultState: Enabled +## X-Curse-Project-ID: 289502 +## X-Wago-ID: 9rN48AND + +lib\load_libs.xml +lib\LibAddonCompat-1.0.lua + +localization\load_localization.xml + +init.lua +core\load_core.xml +media\load_media.xml +modules\load_modules_classic.xml +modules\classic\load_classic.xml diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc index a25fbf14..756cf255 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.41 +## Version: 3.42 ## 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_Classic.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Classic.toc index bf8bd76f..70ca76a8 100644 --- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Classic.toc +++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Classic.toc @@ -1,6 +1,6 @@ ## Interface: 11502 ## Author: Blinkii -## Version: 3.41 +## Version: 3.42 ## 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_Mainline.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc index 6a981e7b..cee97039 100644 --- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc +++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc @@ -1,6 +1,6 @@ ## Interface: 100207 ## Author: Blinkii -## Version: 3.41 +## Version: 3.42 ## 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/core/core.lua b/Addon/ElvUI_mMediaTag/core/core.lua index 67192d6a..396b390f 100644 --- a/Addon/ElvUI_mMediaTag/core/core.lua +++ b/Addon/ElvUI_mMediaTag/core/core.lua @@ -32,26 +32,26 @@ end function mMT:Update_MP_Settings() if IsAddOnLoaded("!mMT_MediaPack") then - mMTSettings.all = E.db.mMT.mp_textures.all - mMTSettings.a = E.db.mMT.mp_textures.a - mMTSettings.b = E.db.mMT.mp_textures.b - mMTSettings.c = E.db.mMT.mp_textures.c - mMTSettings.d = E.db.mMT.mp_textures.d - mMTSettings.e = E.db.mMT.mp_textures.e - mMTSettings.f = E.db.mMT.mp_textures.f - mMTSettings.g = E.db.mMT.mp_textures.g - mMTSettings.h = E.db.mMT.mp_textures.h - mMTSettings.i = E.db.mMT.mp_textures.i - mMTSettings.j = E.db.mMT.mp_textures.j - mMTSettings.k = E.db.mMT.mp_textures.k - mMTSettings.l = E.db.mMT.mp_textures.l - mMTSettings.n = E.db.mMT.mp_textures.n - mMTSettings.m = E.db.mMT.mp_textures.m - mMTSettings.o = E.db.mMT.mp_textures.o - mMTSettings.p = E.db.mMT.mp_textures.p - mMTSettings.q = E.db.mMT.mp_textures.q - mMTSettings.r = E.db.mMT.mp_textures.r - mMTSettings.s = E.db.mMT.mp_textures.s + mMTSettings.all = E.db.mMT.mp_textures.all + mMTSettings.a = E.db.mMT.mp_textures.a + mMTSettings.b = E.db.mMT.mp_textures.b + mMTSettings.c = E.db.mMT.mp_textures.c + mMTSettings.d = E.db.mMT.mp_textures.d + mMTSettings.e = E.db.mMT.mp_textures.e + mMTSettings.f = E.db.mMT.mp_textures.f + mMTSettings.g = E.db.mMT.mp_textures.g + mMTSettings.h = E.db.mMT.mp_textures.h + mMTSettings.i = E.db.mMT.mp_textures.i + mMTSettings.j = E.db.mMT.mp_textures.j + mMTSettings.k = E.db.mMT.mp_textures.k + mMTSettings.l = E.db.mMT.mp_textures.l + mMTSettings.n = E.db.mMT.mp_textures.n + mMTSettings.m = E.db.mMT.mp_textures.m + mMTSettings.o = E.db.mMT.mp_textures.o + mMTSettings.p = E.db.mMT.mp_textures.p + mMTSettings.q = E.db.mMT.mp_textures.q + mMTSettings.r = E.db.mMT.mp_textures.r + mMTSettings.s = E.db.mMT.mp_textures.s end end @@ -91,6 +91,65 @@ function mMT:CheckEltruism() return elt_tbl end +function mMT:CheckMerathilisUI() + local mui_tbl = { + loaded = IsAddOnLoaded("ElvUI_MerathilisUI"), + gradient = false, + custom = false, + colors = nil, + } + + + + if mui_tbl.loaded then + mui_tbl.gradient = E.db.mui.gradient and E.db.mui.gradient.enable + mui_tbl.custom = E.db.mui.gradient and E.db.mui.gradient.customColor.enableClass + local c = mui_tbl.custom and E.db.mui.gradient.customColor or _G.ElvUI_MerathilisUI[2].ClassGradient + + if mui_tbl.custom then + mui_tbl.colors = { + ["WARRIOR"] = { a = { r = c.warriorcolorR1, g = c.warriorcolorG1, b = c.warriorcolorB1, a = 1 }, b = { r = c.warriorcolorR2, g = c.warriorcolorG2, b = c.warriorcolorB2, a = 1 } }, + ["PALADIN"] = { a = { r = c.paladincolorR1, g = c.paladincolorG1, b = c.paladincolorB1, a = 1 }, b = { r = c.paladincolorR2, g = c.paladincolorG2, b = c.paladincolorB2, a = 1 } }, + ["HUNTER"] = { a = { r = c.huntercolorR1, g = c.huntercolorG1, b = c.huntercolorB1, a = 1 }, b = { r = c.huntercolorR2, g = c.huntercolorG2, b = c.huntercolorB2, a = 1 } }, + ["ROGUE"] = { a = { r = c.roguecolorR1, g = c.roguecolorG1, b = c.roguecolorB1, a = 1 }, b = { r = c.roguecolorR2, g = c.roguecolorG2, b = c.roguecolorB2, a = 1 } }, + ["PRIEST"] = { a = { r = c.priestcolorR1, g = c.priestcolorG1, b = c.priestcolorB1, a = 1 }, b = { r = c.priestcolorR2, g = c.priestcolorG2, b = c.priestcolorB2, a = 1 } }, + ["DEATHKNIGHT"] = { a = { r = c.deathknightcolorR1, g = c.deathknightcolorG1, b = c.deathknightcolorB1, a = 1 }, b = { r = c.deathknightcolorR2, g = c.deathknightcolorG2, b = c.deathknightcolorB2, a = 1 } }, + ["SHAMAN"] = { a = { r = c.shamancolorR1, g = c.shamancolorG1, b = c.shamancolorB1, a = 1 }, b = { r = c.shamancolorR2, g = c.shamancolorG2, b = c.shamancolorB2, a = 1 } }, + ["MAGE"] = { a = { r = c.magecolorR1, g = c.magecolorG1, b = c.magecolorB1, a = 1 }, b = { r = c.magecolorR2, g = c.magecolorG2, b = c.magecolorB2, a = 1 } }, + ["WARLOCK"] = { a = { r = c.warlockcolorR1, g = c.warlockcolorG1, b = c.warlockcolorB1, a = 1 }, b = { r = c.warlockcolorR2, g = c.warlockcolorG2, b = c.warlockcolorB2, a = 1 } }, + ["MONK"] = { a = { r = c.monkcolorR1, g = c.monkcolorG1, b = c.monkcolorB1, a = 1 }, b = { r = c.monkcolorR2, g = c.monkcolorG2, b = c.monkcolorB2, a = 1 } }, + ["DRUID"] = { a = { r = c.druidcolorR1, g = c.druidcolorG1, b = c.druidcolorB1, a = 1 }, b = { r = c.druidcolorR2, g = c.druidcolorG2, b = c.druidcolorB2, a = 1 } }, + ["DEMONHUNTER"] = { a = { r = c.demonhuntercolorR1, g = c.demonhuntercolorG1, b = c.demonhuntercolorB1, a = 1 }, b = { r = c.demonhuntercolorR2, g = c.demonhuntercolorG2, b = c.demonhuntercolorB2, a = 1 } }, + ["EVOKER"] = { a = { r = c.evokercolorR1, g = c.evokercolorG1, b = c.evokercolorB1, a = 1 }, b = { r = c.evokercolorR2, g = c.evokercolorG2, b = c.evokercolorB2, a = 1 } }, + ["friendly"] = { a = { r = c.npcfriendlyR1, g = c.npcfriendlyG1, b = c.npcfriendlyB1, a = 1 }, b = { r = c.npcfriendlyR2, g = c.npcfriendlyG2, b = c.npcfriendlyB2, a = 1 } }, + ["neutral"] = { a = { r = c.npcneutralR1, g = c.npcneutralG1, b = c.npcneutralB1, a = 1 }, b = { r = c.npcneutralR2, g = c.npcneutralG2, b = c.npcneutralB2, a = 1 } }, + ["enemy"] = { a = { r = c.npchostileR1, g = c.npchostileG1, b = c.npchostileB1, a = 1 }, b = { r = c.npchostileR2, g = c.npchostileG2, b = c.npchostileB2, a = 1 } }, + } + else + mui_tbl.colors = { + ["WARRIOR"] = { a = { r = c.WARRIOR.r1, g = c.WARRIOR.g1, b = c.WARRIOR.b1, a = 1 }, b = { r = c.WARRIOR.r2, g = c.WARRIOR.g2, b = c.WARRIOR.b2, a = 1 } }, + ["PALADIN"] = { a = { r = c.PALADIN.r1, g = c.PALADIN.g1, b = c.PALADIN.b1, a = 1 }, b = { r = c.PALADIN.r2, g = c.PALADIN.g2, b = c.PALADIN.b2, a = 1 } }, + ["HUNTER"] = { a = { r = c.HUNTER.r1, g = c.HUNTER.g1, b = c.HUNTER.b1, a = 1 }, b = { r = c.HUNTER.r2, g = c.HUNTER.g2, b = c.HUNTER.b2, a = 1 } }, + ["ROGUE"] = { a = { r = c.ROGUE.r1, g = c.ROGUE.g1, b = c.ROGUE.b1, a = 1 }, b = { r = c.ROGUE.r2, g = c.ROGUE.g2, b = c.ROGUE.b2, a = 1 } }, + ["PRIEST"] = { a = { r = c.PRIEST.r1, g = c.PRIEST.g1, b = c.PRIEST.b1, a = 1 }, b = { r = c.PRIEST.r2, g = c.PRIEST.g2, b = c.PRIEST.b2, a = 1 } }, + ["DEATHKNIGHT"] = { a = { r = c.DEATHKNIGHT.r1, g = c.DEATHKNIGHT.g1, b = c.DEATHKNIGHT.b1, a = 1 }, b = { r = c.DEATHKNIGHT.r2, g = c.DEATHKNIGHT.g2, b = c.DEATHKNIGHT.b2, a = 1 } }, + ["SHAMAN"] = { a = { r = c.SHAMAN.r1, g = c.SHAMAN.g1, b = c.SHAMAN.b1, a = 1 }, b = { r = c.SHAMAN.r2, g = c.SHAMAN.g2, b = c.SHAMAN.b2, a = 1 } }, + ["MAGE"] = { a = { r = c.MAGE.r1, g = c.MAGE.g1, b = c.MAGE.b1, a = 1 }, b = { r = c.MAGE.r2, g = c.MAGE.g2, b = c.MAGE.b2, a = 1 } }, + ["WARLOCK"] = { a = { r = c.WARLOCK.r1, g = c.WARLOCK.g1, b = c.WARLOCK.b1, a = 1 }, b = { r = c.WARLOCK.r2, g = c.WARLOCK.g2, b = c.WARLOCK.b2, a = 1 } }, + ["MONK"] = { a = { r = c.MONK.r1, g = c.MONK.g1, b = c.MONK.b1, a = 1 }, b = { r = c.MONK.r2, g = c.MONK.g2, b = c.MONK.b2, a = 1 } }, + ["DRUID"] = { a = { r = c.DRUID.r1, g = c.DRUID.g1, b = c.DRUID.b1, a = 1 }, b = { r = c.DRUID.r2, g = c.DRUID.g2, b = c.DRUID.b2, a = 1 } }, + ["DEMONHUNTER"] = { a = { r = c.DEMONHUNTER.r1, g = c.DEMONHUNTER.g1, b = c.DEMONHUNTER.b1, a = 1 }, b = { r = c.DEMONHUNTER.r2, g = c.DEMONHUNTER.g2, b = c.DEMONHUNTER.b2, a = 1 } }, + ["EVOKER"] = { a = { r = c.EVOKER.r1, g = c.EVOKER.g1, b = c.EVOKER.b1, a = 1 }, b = { r = c.EVOKER.r2, g = c.EVOKER.g2, b = c.EVOKER.b2, a = 1 } }, + ["friendly"] = { a = { r = c.NPCFRIENDLY.r1, g = c.NPCFRIENDLY.g1, b = c.NPCFRIENDLY.b1, a = 1 }, b = { r = c.NPCFRIENDLY.r2, g = c.NPCFRIENDLY.g2, b = c.NPCFRIENDLY.b2, a = 1 } }, + ["neutral"] = { a = { r = c.NPCNEUTRAL.r1, g = c.NPCNEUTRAL.g1, b = c.NPCNEUTRAL.b1, a = 1 }, b = { r = c.NPCNEUTRAL.r2, g = c.NPCNEUTRAL.g2, b = c.NPCNEUTRAL.b2, a = 1 } }, + ["enemy"] = { a = { r = c.NPCHOSTILE.r1, g = c.NPCHOSTILE.g1, b = c.NPCHOSTILE.b1, a = 1 }, b = { r = c.NPCHOSTILE.r2, g = c.NPCHOSTILE.g2, b = c.NPCHOSTILE.b2, a = 1 } }, + } + end + end + + return mui_tbl +end + function mMT:JiberishIcons() local jib_tbl = { version = nil, diff --git a/Addon/ElvUI_mMediaTag/core/options/changelog.lua b/Addon/ElvUI_mMediaTag/core/options/changelog.lua index 3cf7a879..d99ef194 100644 --- a/Addon/ElvUI_mMediaTag/core/options/changelog.lua +++ b/Addon/ElvUI_mMediaTag/core/options/changelog.lua @@ -16,7 +16,7 @@ local change_log_important = { "This update will reset the Spell DB.", } -local releasdate = "27.06.2024" +local releasdate = "28.06.2024" local change_log_new = { "Portraits can now use custom textures.", @@ -24,6 +24,7 @@ local change_log_new = { "Portraits setting to force reaction colors on Player Units.", "TAGs: mLevel:hidecombat, mLevelSmart:hidecombat, mHealth:onlypercent-with-absorbs:ndp, mHealth:short:absorbs, mColor:absorbs.", "TAGs: mHealth:current-percent:absorbs, mHealth:current-percent:ndp:absorbs, mHealth:current-percent:short:absorbs, mHealth:current-percent:short:ndp:absorbs.", + "Add general TOC file for WOTLK Version in China", } local change_log_update = { @@ -32,6 +33,7 @@ local change_log_update = { "NEW: Icon for Teleports data text.", "Portraits texture names.", "Removed Portraits texture simple square and added flipped Versions for Drop texture.", + "Add Stone of the Hearth and Draenic Hologem to TP datatext (thx to Merathilis)", } local change_log_fix = { @@ -43,6 +45,8 @@ local change_log_fix = { "Removed empty data text entry.", "Add S Pack to mMT Settings DB.", "Datatext Durability/ Ilevel: Durability color values.", + "Removed debug print.", + "Portraits Optimized code and fixed flipped drop texture (black background)", } local function Concatenation(tbl, icon, color) diff --git a/Addon/ElvUI_mMediaTag/core/options/portraits.lua b/Addon/ElvUI_mMediaTag/core/options/portraits.lua index caa668fd..4c748c2f 100644 --- a/Addon/ElvUI_mMediaTag/core/options/portraits.lua +++ b/Addon/ElvUI_mMediaTag/core/options/portraits.lua @@ -148,20 +148,8 @@ local function configTable() mMT.Modules.Portraits:Initialize() end, }, - toggle_gradien_eltr = { - order = 2, - type = "toggle", - name = L["Use Eltruism colors"], - get = function(info) - return E.db.mMT.portraits.general.eltruism - end, - set = function(info, value) - E.db.mMT.portraits.general.eltruism = value - mMT.Modules.Portraits:Initialize() - end, - }, select_gradient = { - order = 3, + order = 2, type = "select", name = L["Gradient Orientation"], disabled = function() @@ -179,6 +167,39 @@ local function configTable() VERTICAL = "VERTICAL", }, }, + spacer_texture1 = { + order = 3, + type = "description", + name = "\n\n", + }, + toggle_gradien_eltr = { + order = 4, + type = "toggle", + name = L["Use Eltruism colors"], + get = function(info) + return E.db.mMT.portraits.general.eltruism + end, + set = function(info, value) + E.db.mMT.portraits.general.eltruism = value + E.db.mMT.portraits.general.mui = false + mMT.ElvUI_EltreumUI = mMT:CheckEltruism() + mMT.Modules.Portraits:Initialize() + end, + }, + toggle_gradien_mui = { + order = 5, + type = "toggle", + name = L["Use MerathilisUI colors"], + get = function(info) + return E.db.mMT.portraits.general.mui + end, + set = function(info, value) + E.db.mMT.portraits.general.mui = value + E.db.mMT.portraits.general.eltruism = false + mMT.ElvUI_MerathilisUI = mMT:CheckMerathilisUI() + mMT.Modules.Portraits:Initialize() + end, + }, }, }, }, @@ -680,7 +701,6 @@ local function configTable() return E.db.mMT.portraits.player.flippe and E.db.mMT.portraits.player.texture .. "T" or E.db.mMT.portraits.player.texture end, set = function(info, value) - mMT:Print(value, (value == "SQT" or value == "ROT")) E.db.mMT.portraits.player.flippe = (value == "SQT" or value == "ROT") if value == "SQT" then E.db.mMT.portraits.player.texture = "SQ" diff --git a/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua b/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua index b6350d32..be41cb35 100644 --- a/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua +++ b/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua @@ -47,7 +47,7 @@ P.mMT = { castbar = { enable = false, texture = "mMediaTag A8" }, altpower = { enable = false, texture = "mMediaTag A8" }, }, - customtextures= { + customtextures = { health = { enable = false, texture = "mMediaTag A8" }, power = { enable = false, texture = "mMediaTag A8" }, castbar = { enable = false, texture = "mMediaTag A8" }, @@ -718,6 +718,7 @@ P.mMT = { enable = false, reaction = false, eltruism = false, + mui = false, gradient = true, default = false, corner = true, diff --git a/Addon/ElvUI_mMediaTag/init.lua b/Addon/ElvUI_mMediaTag/init.lua index 16fd9f7b..94095f43 100644 --- a/Addon/ElvUI_mMediaTag/init.lua +++ b/Addon/ElvUI_mMediaTag/init.lua @@ -24,6 +24,7 @@ mMT.Config = {} mMT.DB = {} mMT.ClassColor = {} mMT.ElvUI_EltreumUI = {} +mMT.ElvUI_MerathilisUI = {} mMT.ElvUI_JiberishIcons = {} mMT.DEVNames = {} mMT.DevMode = false @@ -201,6 +202,7 @@ function mMT:Initialize() -- update defaults mMT.ElvUI_EltreumUI = mMT:CheckEltruism() + mMT.ElvUI_MerathilisUI = mMT:CheckMerathilisUI() mMT.ClassColor = mMT:UpdateClassColor() mMT.ElvUI_JiberishIcons = mMT:JiberishIcons() mMT.DEVNames = mMT:GetDevNames() @@ -273,6 +275,7 @@ end function mMT:PLAYER_ENTERING_WORLD(event) -- update defaults mMT.ElvUI_EltreumUI = mMT:CheckEltruism() + mMT.ElvUI_MerathilisUI = mMT:CheckMerathilisUI() mMT.ClassColor = mMT:UpdateClassColor() mMT.ElvUI_JiberishIcons = mMT:JiberishIcons() mMT.DEVNames = mMT:GetDevNames() diff --git a/Addon/ElvUI_mMediaTag/localization/deDE.lua b/Addon/ElvUI_mMediaTag/localization/deDE.lua index 1bde68d6..7d94b803 100644 --- a/Addon/ElvUI_mMediaTag/localization/deDE.lua +++ b/Addon/ElvUI_mMediaTag/localization/deDE.lua @@ -709,3 +709,6 @@ L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = "|cffFFFFFFStrg + Linksk L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = "|cffFFFFFFLinks Klick:|r Talent Spezialisierung ändern" L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = "|cffFFFFFFRechtsklick:|r Beutespezialisierung ändern" L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = "|cffFFFFFFShift + Links Klick:|r Zeige Talent Spezialisierungs Interface" + +-- new +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/enUS.lua b/Addon/ElvUI_mMediaTag/localization/enUS.lua index 924c2872..39eab15c 100644 --- a/Addon/ElvUI_mMediaTag/localization/enUS.lua +++ b/Addon/ElvUI_mMediaTag/localization/enUS.lua @@ -712,3 +712,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/esMX.lua b/Addon/ElvUI_mMediaTag/localization/esMX.lua index 145719c2..c66563bc 100644 --- a/Addon/ElvUI_mMediaTag/localization/esMX.lua +++ b/Addon/ElvUI_mMediaTag/localization/esMX.lua @@ -712,3 +712,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/frFR.lua b/Addon/ElvUI_mMediaTag/localization/frFR.lua index fee317ea..e8c519a5 100644 --- a/Addon/ElvUI_mMediaTag/localization/frFR.lua +++ b/Addon/ElvUI_mMediaTag/localization/frFR.lua @@ -711,3 +711,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/itIT.lua b/Addon/ElvUI_mMediaTag/localization/itIT.lua index 933b569f..1b91d692 100644 --- a/Addon/ElvUI_mMediaTag/localization/itIT.lua +++ b/Addon/ElvUI_mMediaTag/localization/itIT.lua @@ -712,3 +712,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/koKR.lua b/Addon/ElvUI_mMediaTag/localization/koKR.lua index 968f1a70..159b6d44 100644 --- a/Addon/ElvUI_mMediaTag/localization/koKR.lua +++ b/Addon/ElvUI_mMediaTag/localization/koKR.lua @@ -712,3 +712,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/ptBR.lua b/Addon/ElvUI_mMediaTag/localization/ptBR.lua index b83df8a4..015ed686 100644 --- a/Addon/ElvUI_mMediaTag/localization/ptBR.lua +++ b/Addon/ElvUI_mMediaTag/localization/ptBR.lua @@ -712,3 +712,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/ruRU.lua b/Addon/ElvUI_mMediaTag/localization/ruRU.lua index 4e90c51e..9888a9b1 100644 --- a/Addon/ElvUI_mMediaTag/localization/ruRU.lua +++ b/Addon/ElvUI_mMediaTag/localization/ruRU.lua @@ -712,3 +712,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/zhCN.lua b/Addon/ElvUI_mMediaTag/localization/zhCN.lua index b37eb984..c4c86f38 100644 --- a/Addon/ElvUI_mMediaTag/localization/zhCN.lua +++ b/Addon/ElvUI_mMediaTag/localization/zhCN.lua @@ -712,3 +712,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/localization/zhTW.lua b/Addon/ElvUI_mMediaTag/localization/zhTW.lua index 02f17572..4987ee73 100644 --- a/Addon/ElvUI_mMediaTag/localization/zhTW.lua +++ b/Addon/ElvUI_mMediaTag/localization/zhTW.lua @@ -712,3 +712,4 @@ L["Absorbs color."] = true L["Other Colors"] = true L["Drop flipped"] = true L["Drop round flipped"] = true +L["Use MerathilisUI colors"] = true diff --git a/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua b/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua index 6c53a59a..efc50450 100644 --- a/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua +++ b/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua @@ -51,14 +51,16 @@ local Teleports = { [172179] = true, --eternal-travelers-hearthstone [180290] = true, --night-fae-hearthstone [182773] = true, --necrolord-hearthstone + [183716] = true, -- Venthyr Sinstone [184353] = true, --kyrian-hearthstone [188952] = true, --dominated-hearthstone [190196] = true, --enlightened-hearthstone [193588] = true, --Timewalker's Hearthstone [200630] = true, --ohnir-windsages-hearthstone - [183716] = true, -- Venthyr Sinstone [208704] = true, -- Deepdweller's Earthen Hearthstone [209035] = true, -- hearthstone-of-the-flame + [212337] = true, -- Stone of the Hearth (Hearthstone 10th Anniversary) + [210455] = true, -- Draenic Hologem }, }, engineering = { @@ -78,98 +80,99 @@ local Teleports = { available = false, tps = { [6948] = true, --hearthstone - [17690] = true, --frostwolf-insignia-rank-1 - [17691] = true, --stormpike-insignia-rank-1 - [17900] = true, --stormpike-insignia-rank-2 - [17901] = true, --stormpike-insignia-rank-3 - [17902] = true, --stormpike-insignia-rank-4 - [17903] = true, --stormpike-insignia-rank-5 - [17904] = true, --stormpike-insignia-rank-6 - [17905] = true, --frostwolf-insignia-rank-2 - [17906] = true, --frostwolf-insignia-rank-3 - [17907] = true, --frostwolf-insignia-rank-4 - [17908] = true, --frostwolf-insignia-rank-5 - [17909] = true, --frostwolf-insignia-rank-6 - [18984] = true, --dimensional-ripper-everlook - [18986] = true, --ultrasafe-transporter-gadgetzan - [22589] = true, --atiesh-greatstaff-of-the-guardian - [22630] = true, --atiesh-greatstaff-of-the-guardian - [22631] = true, --atiesh-greatstaff-of-the-guardian - [22632] = true, --atiesh-greatstaff-of-the-guardian - [28585] = true, --ruby-slippers - [29796] = true, --socrethars-teleportation-stone - [30542] = true, --dimensional-ripper-area-52 - [30544] = true, --ultrasafe-transporter-toshleys-station - [32757] = true, --blessed-medallion-of-karabor - [35230] = true, --darnarians-scroll-of-teleportation - [37118] = true, --scroll-of-recall - [37863] = true, --direbrews-remote - [40585] = true, --signet-of-the-kirin-tor - [40586] = true, --band-of-the-kirin-tor - [43824] = true, --the-schools-of-arcane-magic-mastery - [44314] = true, --scroll-of-recall-ii - [44315] = true, --scroll-of-recall-iii - [44934] = true, --loop-of-the-kirin-tor - [44935] = true, --ring-of-the-kirin-tor - [45688] = true, --inscribed-band-of-the-kirin-tor - [45689] = true, --inscribed-loop-of-the-kirin-tor - [45690] = true, --inscribed-ring-of-the-kirin-tor - [45691] = true, --inscribed-signet-of-the-kirin-tor - [46874] = true, --argent-crusaders-tabard - [48954] = true, --etched-band-of-the-kirin-tor - [48955] = true, --etched-loop-of-the-kirin-tor - [48956] = true, --etched-ring-of-the-kirin-tor - [48957] = true, --etched-signet-of-the-kirin-tor - [50287] = true, --boots-of-the-bay - [51557] = true, --runed-signet-of-the-kirin-tor - [51558] = true, --runed-loop-of-the-kirin-tor - [51559] = true, --runed-ring-of-the-kirin-tor - [51560] = true, --runed-band-of-the-kirin-tor - [52251] = true, --jainas-locket - [54452] = true, --ethereal-portal - [58487] = true, --potion-of-deepholm - [61379] = true, --gidwins-hearthstone - [63206] = true, --wrap-of-unity - [63207] = true, --wrap-of-unity - [63352] = true, --shroud-of-cooperation - [63353] = true, --shroud-of-cooperation - [63378] = true, --hellscreams-reach-tabard - [63379] = true, --baradins-wardens-tabard - [64457] = true, --the-last-relic-of-argus - [65274] = true, --cloak-of-coordination - [65360] = true, --cloak-of-coordination - [68808] = true, --heros-hearthstone - [68809] = true, --veterans-hearthstone - [92510] = true, --voljins-hearthstone - [93672] = true, --dark-portal - [95050] = true, --the-brassiest-knuckle - [95051] = true, --the-brassiest-knuckle - [95567] = true, --kirin-tor-beacon [95568] = true, --sunreaver-beacon - [103678] = true, --time-lost-artifact - [118663] = true, --relic-of-karabor - [118907] = true, --pit-fighters-punching-ring - [118908] = true, --pit-fighters-punching-ring - [119183] = true, --scroll-of-risky-recall - [128353] = true, --admirals-compass - [128502] = true, --hunters-seeking-crystal - [129276] = true, --beginners-guide-to-dimensional-rifting - [138448] = true, --emblem-of-margoss - [139590] = true, --scroll-of-teleport-ravenholdt - [139599] = true, --empowered-ring-of-the-kirin-tor - [141013] = true, --scroll-of-town-portal-shalanir - [141014] = true, --scroll-of-town-portal-sashjtar - [141015] = true, --scroll-of-town-portal-kaldelar - [141016] = true, --scroll-of-town-portal-faronaar - [141017] = true, --scroll-of-town-portal-liantril - [141605] = true, --flight-masters-whistle - [142298] = true, --astonishingly-scarlet-slippers - [142469] = true, --violet-seal-of-the-grand-magus - [142543] = true, --scroll-of-town-portal - [144391] = true, --pugilists-powerful-punching-ring - [151016] = true, --fractured-necrolyte-skull - [180817] = true, --cypher-of-relocation + [95567] = true, --kirin-tor-beacon + [95051] = true, --the-brassiest-knuckle + [95050] = true, --the-brassiest-knuckle + [93672] = true, --dark-portal + [92510] = true, --voljins-hearthstone + [68809] = true, --veterans-hearthstone + [68808] = true, --heros-hearthstone + [65360] = true, --cloak-of-coordination + [65274] = true, --cloak-of-coordination + [64457] = true, --the-last-relic-of-argus + [63379] = true, --baradins-wardens-tabard + [63378] = true, --hellscreams-reach-tabard + [63353] = true, --shroud-of-cooperation + [63352] = true, --shroud-of-cooperation + [63207] = true, --wrap-of-unity + [63206] = true, --wrap-of-unity + [61379] = true, --gidwins-hearthstone + [58487] = true, --potion-of-deepholm + [54452] = true, --ethereal-portal + [52251] = true, --jainas-locket + [51560] = true, --runed-band-of-the-kirin-tor + [51559] = true, --runed-ring-of-the-kirin-tor + [51558] = true, --runed-loop-of-the-kirin-tor + [51557] = true, --runed-signet-of-the-kirin-tor + [50287] = true, --boots-of-the-bay + [48957] = true, --etched-signet-of-the-kirin-tor + [48956] = true, --etched-ring-of-the-kirin-tor + [48955] = true, --etched-loop-of-the-kirin-tor + [48954] = true, --etched-band-of-the-kirin-tor + [46874] = true, --argent-crusaders-tabard + [45691] = true, --inscribed-signet-of-the-kirin-tor + [45690] = true, --inscribed-ring-of-the-kirin-tor + [45689] = true, --inscribed-loop-of-the-kirin-tor + [45688] = true, --inscribed-band-of-the-kirin-tor + [44935] = true, --ring-of-the-kirin-tor + [44934] = true, --loop-of-the-kirin-tor + [44315] = true, --scroll-of-recall-iii + [44314] = true, --scroll-of-recall-ii + [43824] = true, --the-schools-of-arcane-magic-mastery + [40586] = true, --band-of-the-kirin-tor + [40585] = true, --signet-of-the-kirin-tor + [37863] = true, --direbrews-remote + [37118] = true, --scroll-of-recall + [35230] = true, --darnarians-scroll-of-teleportation + [32757] = true, --blessed-medallion-of-karabor + [30544] = true, --ultrasafe-transporter-toshleys-station + [30542] = true, --dimensional-ripper-area-52 + [29796] = true, --socrethars-teleportation-stone + [28585] = true, --ruby-slippers + [22632] = true, --atiesh-greatstaff-of-the-guardian + [22631] = true, --atiesh-greatstaff-of-the-guardian + [22630] = true, --atiesh-greatstaff-of-the-guardian + [22589] = true, --atiesh-greatstaff-of-the-guardian + [18986] = true, --ultrasafe-transporter-gadgetzan + [18984] = true, --dimensional-ripper-everlook [184871] = true, --dark-portal 2? + [180817] = true, --cypher-of-relocation + [17909] = true, --frostwolf-insignia-rank-6 + [17908] = true, --frostwolf-insignia-rank-5 + [17907] = true, --frostwolf-insignia-rank-4 + [17906] = true, --frostwolf-insignia-rank-3 + [17905] = true, --frostwolf-insignia-rank-2 + [17904] = true, --stormpike-insignia-rank-6 + [17903] = true, --stormpike-insignia-rank-5 + [17902] = true, --stormpike-insignia-rank-4 + [17901] = true, --stormpike-insignia-rank-3 + [17900] = true, --stormpike-insignia-rank-2 + [17691] = true, --stormpike-insignia-rank-1 + [17690] = true, --frostwolf-insignia-rank-1 + [151016] = true, --fractured-necrolyte-skull + [144391] = true, --pugilists-powerful-punching-ring + [142543] = true, --scroll-of-town-portal + [142469] = true, --violet-seal-of-the-grand-magus + [142298] = true, --astonishingly-scarlet-slippers + [141605] = true, --flight-masters-whistle + [141017] = true, --scroll-of-town-portal-liantril + [141016] = true, --scroll-of-town-portal-faronaar + [141015] = true, --scroll-of-town-portal-kaldelar + [141014] = true, --scroll-of-town-portal-sashjtar + [141013] = true, --scroll-of-town-portal-shalanir + [139599] = true, --empowered-ring-of-the-kirin-tor + [139590] = true, --scroll-of-teleport-ravenholdt + [138448] = true, --emblem-of-margoss + [129276] = true, --beginners-guide-to-dimensional-rifting + [128502] = true, --hunters-seeking-crystal + [128353] = true, --admirals-compass + [119183] = true, --scroll-of-risky-recall + [118908] = true, --pit-fighters-punching-ring + [118907] = true, --pit-fighters-punching-ring + [118663] = true, --relic-of-karabor + [103678] = true, --time-lost-artifact + [219222] = true, --Time-Lost Artifact }, }, spells = { @@ -309,7 +312,7 @@ local function mOnEnterSpell(btn) GameTooltip:Show() end -local function mGetInfos(TeleportsTable, spell, tip, check) +local function mGetInfos(TeleportsTable, spell, toy, tip, check) for i, v in pairs(TeleportsTable.tps) do local texture, name, hasSpell, hasItem = nil, nil, false, 0 if spell then @@ -363,6 +366,10 @@ local function mGetInfos(TeleportsTable, spell, tip, check) mMenuAdd(Teleports.menu, text1, text2, "/cast " .. name, texture, i, function(btn) mOnEnterSpell(btn) end) + elseif toy then + mMenuAdd(Teleports.menu, text1, text2, "/usetoy " .. name, texture, i, function(btn) + mOnEnterItem(btn) + end) else mMenuAdd(Teleports.menu, text1, text2, "/use " .. name, texture, i, function(btn) mOnEnterItem(btn) @@ -388,13 +395,13 @@ local function EngineeringCheck() end local function CheckIfAvailable() - mGetInfos(Teleports.toys, false, true, true) - mGetInfos(Teleports.engineering, false, true, true) - mGetInfos(Teleports.season, true, true, true) - mGetInfos(Teleports.df, true, true, true) - mGetInfos(Teleports.dungeonportals, true, true, true) - mGetInfos(Teleports.items, false, true, true) - mGetInfos(Teleports.spells, true, true, true) + mGetInfos(Teleports.toys, false, true, true, true) + mGetInfos(Teleports.engineering, false, true, true, true) + mGetInfos(Teleports.season, true, false, true, true) + mGetInfos(Teleports.df, true, false, true, true) + mGetInfos(Teleports.dungeonportals, true, false, true, true) + mGetInfos(Teleports.items, false, false, true, true) + mGetInfos(Teleports.spells, true, false, true, true) end local function mUpdateTPList(button) @@ -405,39 +412,39 @@ local function mUpdateTPList(button) if Teleports.toys.available and button == "LeftButton" then tinsert(Teleports.menu, { text = format("%s%s|r", title, L["Toys"]), isTitle = true, notClickable = true }) - mGetInfos(Teleports.toys, false, false, false) + mGetInfos(Teleports.toys, false, true, false, false) tinsert(Teleports.menu, { text = "", isTitle = true, notClickable = true }) end if EngineeringCheck() and Teleports.engineering.available and button == "RightButton" then tinsert(Teleports.menu, { text = format("%s%s|r", title, L["Engineering"]), isTitle = true, notClickable = true }) - mGetInfos(Teleports.engineering, false, false, false) + mGetInfos(Teleports.engineering, false, true, false, false) tinsert(Teleports.menu, { text = "", isTitle = true, notClickable = true }) end if Teleports.season.available and button == "LeftButton" then tinsert(Teleports.menu, { text = format("%s%s|r", title, L["M+ Season"]), isTitle = true, notClickable = true }) - mGetInfos(Teleports.season, true, false, false) + mGetInfos(Teleports.season, true, false, false, false) tinsert(Teleports.menu, { text = "", isTitle = true, notClickable = true }) end if Teleports.df.available and button == "LeftButton" then tinsert(Teleports.menu, { text = format("%s%s|r", title, L["DF Dungeons"]), isTitle = true, notClickable = true }) - mGetInfos(Teleports.df, true, false, false) + mGetInfos(Teleports.df, true, false, false, false) end if Teleports.dungeonportals.available and button == "MiddleButton" then tinsert(Teleports.menu, { text = format("%s%s|r", title, L["M+ Season"]), isTitle = true, notClickable = true }) - mGetInfos(Teleports.season, true, false, false) + mGetInfos(Teleports.season, true, false, false, false) tinsert(Teleports.menu, { text = "", isTitle = true, notClickable = true }) tinsert(Teleports.menu, { text = format("%s%s|r", title, L["All Dungeon Teleports"]), isTitle = true, notClickable = true }) - mGetInfos(Teleports.dungeonportals, true, false, false) + mGetInfos(Teleports.dungeonportals, true, false, false, false) tinsert(Teleports.menu, { text = "", isTitle = true, notClickable = true }) end @@ -445,8 +452,8 @@ local function mUpdateTPList(button) tinsert(Teleports.menu, { text = "", isTitle = true, notClickable = true }) tinsert(Teleports.menu, { text = format("%s%s|r", title, L["Other"]), isTitle = true, notClickable = true }) - mGetInfos(Teleports.items, false, false, false) - mGetInfos(Teleports.spells, true, false, false) + mGetInfos(Teleports.items, false, false, false, false) + mGetInfos(Teleports.spells, true, false, false, false) end end @@ -461,32 +468,32 @@ local function mTPTooltip() CheckIfAvailable() if Teleports.toys.available then DT.tooltip:AddLine(L["Toys"]) - mGetInfos(Teleports.toys, false, true, false) + mGetInfos(Teleports.toys, false, true, true, false) end if EngineeringCheck() and Teleports.engineering.available then DT.tooltip:AddLine(" ") DT.tooltip:AddLine(L["Engineering"]) - mGetInfos(Teleports.engineering, false, true, false) + mGetInfos(Teleports.engineering, false, true, true, false) end if Teleports.season.available then DT.tooltip:AddLine(" ") DT.tooltip:AddLine(L["M+ Season"]) - mGetInfos(Teleports.season, true, true, false) + mGetInfos(Teleports.season, true, false, true, false) end if Teleports.df.available then DT.tooltip:AddLine(" ") DT.tooltip:AddLine(L["DF Dungeons"]) - mGetInfos(Teleports.df, true, true, false) + mGetInfos(Teleports.df, true, false, true, false) end if Teleports.items.available or Teleports.spells.available then DT.tooltip:AddLine(" ") DT.tooltip:AddLine(L["Other"]) - mGetInfos(Teleports.items, false, true, false) - mGetInfos(Teleports.spells, true, true, false) + mGetInfos(Teleports.items, false, false, true, false) + mGetInfos(Teleports.spells, true, false, true, false) end end diff --git a/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua b/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua index 58838283..257c60aa 100644 --- a/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua +++ b/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua @@ -11,7 +11,7 @@ if not module then end local settings = {} - +local colors = {} local path = "Interface\\Addons\\ElvUI_mMediaTag\\media\\portraits\\" local textures = { texture = { @@ -195,11 +195,11 @@ local textures = { local function mirrorTexture(texture, mirror, top) if texture.mClass then - local ULx, ULy, LLx, LLy, URx, URy, LRx, LRy = unpack(texture.mCoords) - if mirror then - texture:SetTexCoord(URx, URy, LRx, LRy, ULx, ULy, LLx, LLy) + local coords = texture.mCoords + if #coords == 8 then + texture:SetTexCoord(unpack(mirror and { coords[3], coords[4], coords[7], coords[8], coords[1], coords[2], coords[5], coords[6] } or coords)) else - texture:SetTexCoord(ULx, ULy, LLx, LLy, URx, URy, LRx, LRy) + texture:SetTexCoord(unpack(mirror and { coords[2], coords[1], coords[3], coords[4] } or coords)) end else texture:SetTexCoord(mirror and 1 or 0, mirror and 0 or 1, top and 1 or 0, top and 0 or 1) @@ -232,68 +232,51 @@ end local cachedFaction = {} local function getColor(unit) + local defaultColor = colors.default + if settings.general.default then - return settings.colors.default + return defaultColor end if UnitIsPlayer(unit) then if settings.general.reaction then - if not cachedFaction.player then - cachedFaction.player = select(1, UnitFactionGroup("player")) - end - - if unit ~= "Player" then - local guid = UnitGUID(unit) - if guid and not cachedFaction[guid] then - cachedFaction[guid] = select(1, UnitFactionGroup(unit)) - end + local playerFaction = cachedFaction.player or select(1, UnitFactionGroup("player")) + cachedFaction.player = playerFaction + local unitFaction = cachedFaction[UnitGUID(unit)] or select(1, UnitFactionGroup(unit)) + cachedFaction[UnitGUID(unit)] = unitFaction - if cachedFaction.player ~= cachedFaction[guid] then - return settings.colors.enemy - else - return settings.colors.friendly - end - else - return settings.colors.friendly - end + return colors[(playerFaction == unitFaction) and "friendly" or "enemy"] else local _, class = UnitClass(unit) - return settings.colors[class] + return colors[class] end else local reaction = UnitReaction(unit, "player") - if reaction then - return settings.colors[(reaction <= 3) and "enemy" or reaction == 4 and "neutral" or "friendly"] - else - return settings.colors.enemy - end + return colors[reaction and ((reaction <= 3) and "enemy" or (reaction == 4) and "neutral" or "friendly") or "enemy"] end end +local function adjustColor(color, shift) + return { + r = color.r - shift, + g = color.g - shift, + b = color.b - shift, + a = color.a, + } +end + local function UpdateIconBackground(tx, unit, mirror) tx:SetTexture(textures.background[settings.general.bgstyle], "CLAMP", "CLAMP", "TRILINEAR") local color = settings.shadow.classBG and getColor(unit) or settings.shadow.background - local bgColor = {} + local bgColor = { r = 1, g = 1, b = 1, a = 1 } local ColorShift = settings.shadow.bgColorShift if not color.r then - bgColor.a = { r = 1, g = 1, b = 1, a = 1 } - bgColor.a.r = color.a.r - ColorShift - bgColor.a.g = color.a.g - ColorShift - bgColor.a.b = color.a.b - ColorShift - bgColor.a.a = color.a.a - - bgColor.b = { r = 1, g = 1, b = 1, a = 1 } - bgColor.b.r = color.b.r - ColorShift - bgColor.b.g = color.b.g - ColorShift - bgColor.b.b = color.b.b - ColorShift - bgColor.b.a = color.b.a - elseif bgColor.r then - bgColor = { r = 1, g = 1, b = 1, a = 1 } - bgColor.r = color.r - ColorShift - bgColor.g = color.g - ColorShift - bgColor.b = color.b - ColorShift + bgColor.a = adjustColor(color.a, ColorShift) + bgColor.b = adjustColor(color.b, ColorShift) + else + bgColor = adjustColor(color, ColorShift) end setColor(tx, bgColor, mirror) @@ -302,37 +285,26 @@ end local function SetPortraits(frame, unit, masking, mirror) if settings.general.classicons and UnitIsPlayer(unit) then local class = select(2, UnitClass(unit)) - local IconTexture = "Interface\\WorldStateFrame\\Icons-Classes" local coords = CLASS_ICON_TCOORDS[class] local style = settings.general.classiconstyle if mMT.ElvUI_JiberishIcons.loaded and style ~= "BLIZZARD" then coords = class and mMT.ElvUI_JiberishIcons.texCoords[class] - IconTexture = mMT.ElvUI_JiberishIcons.path .. style - end - - if coords then - if #coords == 8 then - local ULx, ULy, LLx, LLy, URx, URy, LRx, LRy = unpack(coords) - if mirror then - frame.portrait:SetTexCoord(URx, URy, LRx, LRy, ULx, ULy, LLx, LLy) - else - frame.portrait:SetTexCoord(ULx, ULy, LLx, LLy, URx, URy, LRx, LRy) - end - else - local left, right, top, bottom = unpack(coords) - frame.portrait:SetTexCoord(mirror and right or left, mirror and left or right, top, bottom) - end + frame.portrait:SetTexture(mMT.ElvUI_JiberishIcons.path .. style) + else + frame.portrait:SetTexture("Interface\\WorldStateFrame\\Icons-Classes") end - frame.portrait:SetTexture(IconTexture) - if frame.iconbg then UpdateIconBackground(frame.iconbg, unit, mirror) end frame.portrait.mClass = unit frame.portrait.mCoords = coords + + if coords then + mirrorTexture(frame.portrait, mirror) + end else if frame.portrait.mClass then frame.portrait.mClass = nil @@ -362,7 +334,7 @@ local function CreateIconBackground(frame, unit, mirror, flippe) tmpTexture:SetAllPoints(frame) tmpTexture:SetTexture(textures.background[settings.general.bgstyle], "CLAMP", "CLAMP", "TRILINEAR") - local color = flippe and {r = 0, g = 0, b = 0, a = 1} or (settings.shadow.classBG and getColor(unit) or settings.shadow.background) + local color = flippe and { r = 0, g = 0, b = 0, a = 1 } or (settings.shadow.classBG and getColor(unit) or settings.shadow.background) setColor(tmpTexture, color, mirror) return tmpTexture @@ -416,7 +388,7 @@ local function CreatePortrait(parent, conf, unit) -- Class Icon Background if settings.general.classicons or conf.flippe then - frame.iconbg = CreateIconBackground(frame, unit, conf.mirror, (conf.flippe and not settings.general.classicons) ) + frame.iconbg = CreateIconBackground(frame, unit, conf.mirror, (conf.flippe and not settings.general.classicons)) frame.iconbg:AddMaskTexture(frame.mask) end @@ -478,7 +450,7 @@ end local function CheckRareElite(frame, unit) local c = UnitClassification(unit) - local color = settings.colors[c] + local color = colors[c] if color then setColor(frame.extra, color) @@ -589,6 +561,7 @@ local function UpdatePortrait(frame, conf, unit, parent) end else frame.iconbg = CreateIconBackground(frame, unit, conf.mirror, (conf.flippe and not settings.general.classicons)) + frame.iconbg:AddMaskTexture(frame.mask) end elseif frame.iconbg and not settings.general.classicons then frame.iconbg:Hide() @@ -873,22 +846,18 @@ function module:Initialize() end if settings.general.eltruism and mMT.ElvUI_EltreumUI.loaded then - settings.colors.WARRIOR = mMT.ElvUI_EltreumUI.colors.WARRIOR - settings.colors.PALADIN = mMT.ElvUI_EltreumUI.colors.PALADIN - settings.colors.HUNTER = mMT.ElvUI_EltreumUI.colors.HUNTER - settings.colors.ROGUE = mMT.ElvUI_EltreumUI.colors.ROGUE - settings.colors.PRIEST = mMT.ElvUI_EltreumUI.colors.PRIEST - settings.colors.DEATHKNIGHT = mMT.ElvUI_EltreumUI.colors.DEATHKNIGHT - settings.colors.SHAMAN = mMT.ElvUI_EltreumUI.colors.SHAMAN - settings.colors.MAGE = mMT.ElvUI_EltreumUI.colors.MAGE - settings.colors.WARLOCK = mMT.ElvUI_EltreumUI.colors.WARLOCK - settings.colors.MONK = mMT.ElvUI_EltreumUI.colors.MONK - settings.colors.DRUID = mMT.ElvUI_EltreumUI.colors.DRUID - settings.colors.DEMONHUNTER = mMT.ElvUI_EltreumUI.colors.DEMONHUNTER - settings.colors.EVOKER = mMT.ElvUI_EltreumUI.colors.EVOKER - settings.colors.friendly = mMT.ElvUI_EltreumUI.colors.friendly - settings.colors.neutral = mMT.ElvUI_EltreumUI.colors.neutral - settings.colors.enemy = mMT.ElvUI_EltreumUI.colors.enemy + colors = mMT.ElvUI_EltreumUI.colors + elseif settings.general.mui and mMT.ElvUI_MerathilisUI.loaded then + --colors = mMT.ElvUI_MerathilisUI.colors + + if not colors.inverted then + for i, tbl in pairs(mMT.ElvUI_MerathilisUI.colors) do + colors[i] = { a = tbl.b, b = tbl.a } + end + colors.inverted = true + end + else + colors = settings.colors end local frames = {} diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f3dfa6..0f5b5ac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Changelog - ElvUI_mMediaTag [Eng] - All changes to this project will be documented in this file. The latest changes are at the top. +## [ver. 3.42] - 28.06.2024 +### FIX +- FIX - Removed debug print. +- FIX - Portraits Optimized code and fixed flipped drop texture (black background) +### Update +- UPDATE - Add Stone of the Hearth and Draenic Hologem to TP datatext (thx to Merathilis) +### NEW +- NEW - Add general TOC file for WOTLK Version in China + + ## [ver. 3.41] - 27.06.2024 ### FIX - FIX - Portraits colors if gradient mode is disabled.