Merge pull request #47 from mBlinkii/dev

Ver. 2.95
mBlinkii · Apr 1, 2023 · b03e003 · b03e003
2 parents 22af245 + d4fb47a
commit b03e003
Show file tree

Hide file tree

Showing 30 changed files with 270 additions and 172 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -118,7 +118,8 @@
         "ShowOptionsPanel",
         "STAT_CATEGORY_ENHANCEMENTS",
         "STAT_MASTERY",
-        "CreateBaseTooltipInfo"
+        "CreateBaseTooltipInfo",
+        "class"
     ],
     "Lua.diagnostics.disable": [
         "redundant-parameter",

diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,15 @@
 [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.95] - 01.04.2023
+### Update
+- FIX Healthmarker - if no Healthbar
+- FIX Game Menu - Talent button
+- UPDATE Combinations now available in the ElvUI dropdown menu
+- NEW Mail Icons
+- NEW Gradient interrupt colors
+- NEW Interrupt ready marker
+
 ## [ver. 2.94] - 22.03.2023
 ### Update
 - UPDATE TOC update

diff --git a/ElvUI_mMediaTag.toc b/ElvUI_mMediaTag.toc
@@ -1,7 +1,7 @@
 ## Interface: 100007
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.94
+## Version: 2.95
 ## 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
@@ -1,7 +1,7 @@
 ## Interface: 11403
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.94
+## Version: 2.95
 ## 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
@@ -1,7 +1,7 @@
 ## Interface: 100007
 ## Title: |cff1784d1ElvUI|r |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r
 ## Author: Blinkii
-## Version: 2.94
+## Version: 2.95
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 # RequiredDeps: ElvUI
 ## Dependencies: ElvUI

diff --git 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.94
+## Version: 2.95
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled

diff --git a/core/init.lua b/core/init.lua
@@ -48,8 +48,26 @@ function mMT:Initialize()
 
 	mMT:mMisc() -- module laden
 
+	E.Media.CombatIcons.mMT1 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\combat1.tga]]
+	E.Media.CombatIcons.mMT2 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\combat2.tga]]
+	E.Media.CombatIcons.mMT3 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\fire1.tga]]
+	E.Media.CombatIcons.mMT4 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\fire9.tga]]
+	E.Media.CombatIcons.mMT5 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\lightning7.tga]]
+	E.Media.CombatIcons.mMT6 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\lightning9.tga]]
+
+	E.Media.MailIcons.mMT1 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail1.tga]]
+	E.Media.MailIcons.mMT2 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail2.tga]]
+	E.Media.MailIcons.mMT3 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail3.tga]]
+	E.Media.MailIcons.mMT4 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail4.tga]]
+	E.Media.MailIcons.mMT5 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail5.tga]]
+	E.Media.MailIcons.mMT6 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail6.tga]]
+	E.Media.MailIcons.mMT7 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail7.tga]]
+	E.Media.MailIcons.mMT8 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail8.tga]]
+	E.Media.MailIcons.mMT9 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail9.tga]]
+	E.Media.MailIcons.mMT10 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail10.tga]]
+
 	if E.Retail then
-		if E.db[mPlugin].mHealthmarker.enable or E.db[mPlugin].mExecutemarker.enable then
+		if E.private.nameplates.enable and E.db[mPlugin].mHealthmarker.enable or E.db[mPlugin].mExecutemarker.enable then
 			mMT:StartNameplateTools()
 		end
 

diff --git a/core/mChangelog.lua b/core/mChangelog.lua
@@ -9,7 +9,7 @@ local format = format
 
 --Variables
 local ChangelogText =
-	"## [ver. 2.94] - 22.03.2023\n\n### Update\n- |CFFFF7F50Update|r TOC update\n- |CFFFF7F50Update|r Update NP Healthmarker\n- |CFFFF7F50Update|r Currencys Icons to fit the text size\n\n\n\n\n|CFF6495EDIMPORTANT INFO -- With the next version of mMediaTag, the settings of mMediaTag will be reset. This is done for optimisation and because over time many corpses have accumulated in the settings.|r"
+	"## [ver. 2.95] - 01.04.2023\n\n- FIX Healthmarker - if no Healthbar\n- FIX Game Menu - Talent button\n- UPDATE Combinations now available in the ElvUI dropdown menu\n- NEW Mail Icons\n- NEW Gradient interrupt colors\n- NEW Interrupt ready marker"
 
 function mMT:Changelog(opt)
 	local Frame = CreateFrame("Frame", "mMediaTagChangelog", E.UIParent, "BackdropTemplate")

diff --git a/core/mOptions.lua b/core/mOptions.lua
@@ -410,13 +410,6 @@ local function OptionsCore()
 						childGroups = "tab",
 						args = {},
 					},
-					customcombaticon = {
-						order = 5,
-						type = "group",
-						name = L["Custom Combaticons"],
-						childGroups = "tab",
-						args = {},
-					},
 					customclasscolors = {
 						order = 6,
 						type = "group",
@@ -840,13 +833,6 @@ local function OptionsCoreClassic()
 				type = "group",
 				name = L["Cosmetic"],
 				args = {
-					customcombaticon = {
-						order = 5,
-						type = "group",
-						name = L["Custom Combaticons"],
-						childGroups = "tab",
-						args = {},
-					},
 					rolesymbols = {
 						order = 1,
 						type = "group",

diff --git a/core/mSettings.lua b/core/mSettings.lua
@@ -398,15 +398,32 @@ P[mPlugin] = {
 	},
 	["mCastbar"] = {
 		["enable"] = true,
+		["gardient"] = true,
 		["kickcd"] = {
+			["r"] = 1,
+			["g"] = 0,
+			["b"] = 1,
+		},
+		["readymarker"] = {
 			["r"] = 0.545098,
 			["g"] = 0,
 			["b"] = 0.545098,
 		},
+		["kickcdb"] = {
+			["r"] = 0.56,
+			["g"] = 0,
+			["b"] = 0.56,
+		},
 		["kickintime"] = {
-			["r"] = 0,
-			["g"] = 0.74902,
-			["b"] = 1,
+			["r"] = 0.03,
+			["g"] = 0.93,
+			["b"] = 0.2,
+		},
+		["inactivetime"] = .8,
+		["kickintimeb"] = {
+			["r"] = 0.08,
+			["g"] = 0.5,
+			["b"] = 0.57,
 		},
 	},
 	["mHealthmarker"] = {

diff --git a/core/settings/defaultSettings.lua b/core/settings/defaultSettings.lua
diff --git a/core/settings/load_settings.xml b/core/settings/load_settings.xml
diff --git a/core/settings/main.lua b/core/settings/main.lua
diff --git a/media/mail/mail1.tga b/media/mail/mail1.tga
diff --git a/media/mail/mail10.tga b/media/mail/mail10.tga
diff --git a/media/mail/mail2.tga b/media/mail/mail2.tga
diff --git a/media/mail/mail3.tga b/media/mail/mail3.tga
diff --git a/media/mail/mail4.tga b/media/mail/mail4.tga
diff --git a/media/mail/mail5.tga b/media/mail/mail5.tga
diff --git a/media/mail/mail6.tga b/media/mail/mail6.tga
diff --git a/media/mail/mail7.tga b/media/mail/mail7.tga
diff --git a/media/mail/mail8.tga b/media/mail/mail8.tga
diff --git a/media/mail/mail9.tga b/media/mail/mail9.tga
diff --git a/media/textures/r1.tga b/media/textures/r1.tga
diff --git a/misc/load_misc.xml b/misc/load_misc.xml
@@ -8,7 +8,6 @@
 	<Script file="mCustomClassColors.lua"/>
 	<Script file="mBGTexture.lua"/>
 	<Script file="mCastbar.lua"/>
-	<Script file="mCombatIcon.lua"/>
 	<Script file="mDungeon.lua"/>
 	<Script file="mFPSMS.lua"/>
 	<Script file="mFunctionsMisc.lua"/>

diff --git a/misc/load_misc_classic.xml b/misc/load_misc_classic.xml
@@ -13,7 +13,6 @@
 	<Script file="mTools.lua"/>
 	<Script file="mCoordinatesX.lua"/>
 	<Script file="mCoordinatesY.lua"/>
-	<Script file="mCombatIcon.lua"/>
 	<Script file="mFPSMS.lua"/>
 	<Include file="Dock\load_dock_classic.xml"/>
 	<Script file="mBGTexture.lua"/>