🚀 RELEASE: 6.1.2 (#27)

Toxicom · Dec 19, 2022 · 8021965 · 8021965
1 parent d57a0bf
commit 8021965
Show file tree

Hide file tree

Showing 21 changed files with 266 additions and 112 deletions.
diff --git a/Core/Changelog/6.1.0.lua b/Core/Changelog/6.1.0.lua
@@ -12,16 +12,18 @@ TXUI.Changelog["6.1.0"] = {
     end
   end,
   CHANGES = {
-    "* General",
-    F.String.Good("New: ") .. "Refactored whole options window",
-    F.String.Good("New: ") .. "Font changing feature " .. F.String.Error("[EXPERIMENTAL]"),
-    "Move tooltip to accomodate space for new Details",
-    "Change tooltip's health bar",
+    "* ToxiUI",
+    F.String.Good("[NEW] ") .. "Refactored whole options window",
+    F.String.Good("[NEW] ") .. "Font changing feature " .. F.String.Error("[EXPERIMENTAL]"),
     "Gradient Mode rewritten, better performance",
     "Lots of fixes for Dragonflight " .. F.String.Error("[Please report bugs on GitHub or Discord!]"),
 
+    "* ElvUI",
+    "Movers: Move tooltip to accomodate space for new Details",
+    "Tooltip: Change health bar height",
+
     "* Details",
-    F.String.Good("New: ") .. "Skin with icons, in collaboration with Redtuzk" .. F.String.Error("UI"),
+    F.String.Good("[NEW] ") .. "Skin with icons, in collaboration with Redtuzk" .. F.String.Error("UI"),
 
     "* Boss Mods",
     "BigWigs: Update to match Details",

diff --git a/Core/Changelog/6.1.1.lua b/Core/Changelog/6.1.1.lua
@@ -3,7 +3,7 @@ local TXUI, F, E, I, V, P, G = unpack(select(2, ...))
 TXUI.Changelog["6.1.1"] = {
   HOTFIX = true,
   CHANGES = {
-    "* General",
-    "Fix the addon lmao",
+    "* ToxiUI",
+    "Hotfix AddOn not loading for non-beta builds",
   },
 }
diff --git a/Core/Changelog/6.1.2.lua b/Core/Changelog/6.1.2.lua
@@ -0,0 +1,25 @@
+local TXUI, F, E, I, V, P, G = unpack(select(2, ...))
+
+TXUI.Changelog["6.1.2"] = {
+  HOTFIX = true,
+  CHANGES = {
+    "* ToxiUI",
+    "Fix Gradient Mode's Dead unit color",
+    F.String.Good("[NEW] ") .. "Evoker spec icons. Credits to " .. F.String.Class("Nawuko", "MONK"),
+    "WunderBar: Add Valdrakken & Tol Barad portals for mages",
+    "WunderBar: Change default background",
+    "Armory: Update enchant slots for Dragonflight",
+    F.String.Good("[NEW] ") .. "Armory: Socket warning for neck slot. Credits to " .. F.String.Epic("Ryada"),
+    "VehicleBar: Fix taint that would happen during combat while mounting. Credits to " .. F.String.Epic("Ryada"),
+
+    "* ElvUI",
+    "Movers: Move the Dragon Riding Vigor bar to the bottom",
+    "Minimap: Hide tracking icon",
+    "Minimap: Increase size of LFG eye",
+    "Reposition and update the Focus frame",
+
+    "* Plater",
+    "Update interrupt cast color mod",
+    "Update M+ colored mobs mod",
+  },
+}
diff --git a/Core/Changelog/Changelog.xml b/Core/Changelog/Changelog.xml
@@ -34,4 +34,5 @@
   <Script file='6.0.1.lua' />
   <Script file='6.1.0.lua' />
   <Script file='6.1.1.lua' />
+  <Script file='6.1.2.lua' />
 </Ui>
diff --git a/Core/Dev/Toxi/Profiles.lua b/Core/Dev/Toxi/Profiles.lua
@@ -5,6 +5,8 @@ local T = TXUI:GetModule("Dev"):GetModule("Toxi")
 --@do-not-package@
 
 local SetCVar = SetCVar
+local unitframeTypes = { "player", "party", "focus", "target", "arena", "boss" }
+local disabledMenuIcons = { "chat", "quest", "shop", "spell", "talent", "pvp", "ach", "char", "lfg", "pet" }
 
 function T:SetupCvars()
   -- CVars
@@ -18,41 +20,31 @@ function T:SetupProfile()
   E.db.TXUI.general.fontStyleOverride[I.Fonts.Primary] = "OUTLINE"
   E.db.TXUI.general.fontStyleOverride[I.Fonts.PrimaryBold] = "OUTLINE"
 
+  -- WunderBar: General
+  E.db.TXUI.wunderbar.general.backgroundTexture = "WorldState Score"
+
   -- WunderBar: Modules
   E.db.TXUI.wunderbar.modules.LeftPanel[2] = "Profession"
   E.db.TXUI.wunderbar.modules.LeftPanel[3] = "DataBar"
   E.db.TXUI.wunderbar.modules.MiddlePanel[3] = "Volume"
 
   -- WunderBar: Submodules
   -- WunderBar: MicroMenu
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.chat.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.journal.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.quest.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.shop.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.spell.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.talent.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.pvp.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.ach.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.char.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.lfg.enabled = false
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.pet.enabled = false
-
-  E.db.TXUI.wunderbar.subModules.MicroMenu.icons.journal.enabled = true
+  for _, icon in ipairs(disabledMenuIcons) do
+    E.db.TXUI.wunderbar.subModules.MicroMenu.icons[icon].enabled = false
+  end
 
   -- WunderBar: DataBar
   E.db.TXUI.wunderbar.subModules.DataBar.infoEnabled = true
   E.db.TXUI.wunderbar.subModules.DataBar.showCompletedXP = true
 
   -- WunderBar: Profession
-  E.db.TXUI.wunderbar.subModules.Profession.general.showIcons = false
+  E.db.TXUI.wunderbar.subModules.Profession.general.showIcons = true
 
   -- WunderBar: Hearthstone
   E.db.TXUI.wunderbar.subModules.Hearthstone.primaryHS = TXUI.IsRetail and 193588 or 6948
 
   -- Themes: Gradient Mode
-  E.db.TXUI.themes.gradientMode.classColorMap[1]["PRIEST"] = F.Table.HexToRGB("#77009f")
-  E.db.TXUI.themes.gradientMode.classColorMap[2]["PRIEST"] = F.Table.HexToRGB("#a000e9")
-
   E.db.TXUI.themes.gradientMode.classColorMap[1]["DEATHKNIGHT"] = F.Table.HexToRGB("#6e1234")
 
   -- Skins: ElvUI
@@ -73,23 +65,29 @@ function T:SetupProfile()
   E.db.bags.bagSize = TXUI.IsRetail and 50 or 60
   E.db.bags.bagButtonSpacing = 2
   E.db.bags.split.player = true
-  E.db.bags.split.bag1 = true
-  E.db.bags.split.bag2 = true
-  E.db.bags.split.bag3 = true
-  E.db.bags.split.bag4 = true
-  E.db.bags.split.bagSpacing = 10
 
+  -- Enable split for bags 1 - 11
+  for i = 1, 11 do
+    E.db.bags.split["bag" .. i] = true
+  end
+
+  E.db.bags.split.bagSpacing = 10
+  E.db.bags.split.bankSpacing = 10
+  E.db.bags.bank = true
   E.db.bags.bankSize = TXUI.IsRetail and 50 or 60
   E.db.bags.bankButtonSpacing = 2
-  E.db.bags.bank = true
-  E.db.bags.split.bag5 = true
-  E.db.bags.split.bag6 = true
-  E.db.bags.split.bag7 = true
-  E.db.bags.split.bag8 = true
-  E.db.bags.split.bag9 = true
-  E.db.bags.split.bag10 = true
-  E.db.bags.split.bag11 = true
-  E.db.bags.split.bankSpacing = 10
+
+  -- ElvUI: UnitFrames
+  for _, ufType in ipairs(unitframeTypes) do
+    E.db.unitframe.units[ufType].customTexts["!Health"].font = "- Personal"
+    E.db.unitframe.units[ufType].customTexts["!Health"].fontOutline = "OUTLINE"
+    E.db.unitframe.units[ufType].customTexts["!Health"].size = 36
+    E.db.unitframe.units[ufType].customTexts["!Health"].text_format = "[tx:classcolor][perhp]"
+    E.db.unitframe.units[ufType].customTexts["!Health"].yOffset = 15
+  end
+
+  -- WindTools
+  E.db.WT.item.inspect.enable = false -- clashes with narcissus talent inspect
 end
 
 T:AddCallback("SetupCvars")

diff --git a/Core/Functions/String.lua b/Core/Functions/String.lua
@@ -81,10 +81,23 @@ function F.String.Warning(msg)
   return F.String.Color(msg, I.Enum.Colors.WARNING)
 end
 
+-- Supporter colors
 function F.String.Legendary(msg)
   return F.String.Color(msg, I.Enum.Colors.LEGENDARY)
 end
 
+function F.String.Epic(msg)
+  return F.String.Color(msg, I.Enum.Colors.EPIC)
+end
+
+function F.String.Rare(msg)
+  return F.String.Color(msg, I.Enum.Colors.RARE)
+end
+
+function F.String.Beta(msg)
+  return F.String.Color(msg, I.Enum.Colors.BETA)
+end
+
 function F.String.Covenant(msg)
   if not TXUI.IsRetail then return F.String.ElvUI(msg) end
 
@@ -226,3 +239,10 @@ function F.String.FastGradientHex(text, h1, h2)
 
   return F.String.FastGradient(text, r1, g1, b1, r2, g2, b2)
 end
+
+function F.String.FastColorGradientHex(percentage, h1, h2)
+  local r1, g1, b1 = F.String.HexToRGB(h1)
+  local r2, g2, b2 = F.String.HexToRGB(h2)
+
+  return F.FastColorGradient(percentage, r1, g1, b1, r2, g2, b2)
+end
diff --git a/Core/Internal.lua b/Core/Internal.lua
@@ -210,6 +210,7 @@ I.GradientMode = {
         ["targettarget"] = true,
         ["arena"] = true,
         ["boss"] = true,
+        ["focus"] = true,
       },
     },
   },
@@ -403,6 +404,15 @@ I.HearthstoneData = {
 
   [32266] = { ["type"] = "spell", ["hearthstone"] = false, ["portal"] = true }, -- Portal: Exodar
   [32271] = { ["type"] = "spell", ["hearthstone"] = false, ["teleport"] = true }, -- Teleport: Exodar
+
+  [395289] = { ["type"] = "spell", ["hearthstone"] = false, ["portal"] = true }, -- Portal: Valdrakken
+  [395277] = { ["type"] = "spell", ["hearthstone"] = false, ["teleport"] = true }, -- Teleport: Valdrakken
+
+  [88346] = { ["type"] = "spell", ["hearthstone"] = false, ["portal"] = true }, -- Portal: Tol Barad - Horde
+  [88344] = { ["type"] = "spell", ["hearthstone"] = false, ["teleport"] = true }, -- Teleport: Tol Barad - Horde
+
+  [88345] = { ["type"] = "spell", ["hearthstone"] = false, ["portal"] = true }, -- Portal: Tol Barad - Alliance
+  [88342] = { ["type"] = "spell", ["hearthstone"] = false, ["teleport"] = true }, -- Teleport: Tol Barad - Alliance
 }
 
 I.HearthstoneData_Wrath = {

diff --git a/Core/InternalData.lua b/Core/InternalData.lua
@@ -7,18 +7,18 @@ I.Data.Contributor = {
     [I.Enum.Developers.TOXI] = {
       [I.Enum.Flavor.RETAIL] = {
         -- Ravencrest
-        ["Calistrø-Ravencrest"] = true,
-        ["Calìstro-Ravencrest"] = true,
-        ["Melissandei-Ravencrest"] = true,
-        ["Toxí-Ravencrest"] = true,
-        ["Toxicom-Ravencrest"] = true,
-        ["Toxicòm-Ravencrest"] = true,
-        ["Toxicøm-Ravencrest"] = true,
-        ["Tòxicom-Ravencrest"] = true,
-        ["Tøxicom-Ravencrest"] = true,
-        ["Tøxii-Ravencrest"] = true,
-        ["Toxilich-Ravencrest"] = true,
-        ["Toxivoker-Ravencrest"] = true,
+        ["Calistrø-Ravencrest"] = true, -- Paladin
+        ["Calìstro-Ravencrest"] = true, -- Mage
+        ["Melissandei-Ravencrest"] = true, -- Druid
+        ["Toxí-Ravencrest"] = true, -- Warrior
+        ["Toxicom-Ravencrest"] = true, -- Warlock
+        ["Toxisin-Ravencrest"] = true, -- Rogue
+        ["Toxicøm-Ravencrest"] = true, -- Priest
+        ["Tòxicom-Ravencrest"] = true, -- Demon Hunter
+        ["Tøxicom-Ravencrest"] = true, -- Shaman
+        ["Tøxii-Ravencrest"] = true, -- Hunter
+        ["Toxilich-Ravencrest"] = true, -- Death Knight
+        ["Toxivoker-Ravencrest"] = true, -- Evoker
 
         -- TarrenMill
         ["Toxiholy-TarrenMill"] = true,
@@ -242,7 +242,8 @@ I.Data.Contributor = {
   [I.Enum.ContributorType.BETA] = {
     ["v0dKa"] = {
       [I.Enum.Flavor.RETAIL] = {
-        ["Bakul-Antonidas"] = true, -- Yes, only 1 Char, 1 Main, He is insane!
+        ["Bakul-Antonidas"] = true,
+        ["Mythelor-Antonidas"] = true,
       },
     },
 

diff --git a/Core/Profile.lua b/Core/Profile.lua
@@ -123,12 +123,12 @@ P.themes = {
       [I.Enum.GradientMode.Color.NORMAL] = { -- RIGHT
         DISCONNECTED = F.Table.HexToRGB("#ff6b59"), -- disconnect
         TAPPED = F.Table.HexToRGB("#a3a6b0"), -- tapped
-        DEAD = F.Table.HexToRGB("#48000a"), -- dead
+        DEAD = F.Table.HexToRGB("#cd001c"), -- dead
       },
       [I.Enum.GradientMode.Color.SHIFT] = { -- LEFT
         DISCONNECTED = F.Table.HexToRGB("#e85747"), -- disconnect
         TAPPED = F.Table.HexToRGB("#7d828f"), -- tapped
-        DEAD = F.Table.HexToRGB("#2a0006"), -- dead
+        DEAD = F.Table.HexToRGB("#61000e"), -- dead
       },
     },
 
@@ -143,7 +143,7 @@ P.themes = {
         MONK = F.Table.HexToRGB("#00ff96"),
         PALADIN = F.Table.HexToRGB("#f58cba"),
         PRIEST = F.Table.HexToRGB("#ffffff"),
-        ROGUE = F.Table.HexToRGB("#ffeb40"),
+        ROGUE = F.Table.HexToRGB("#fff368"),
         SHAMAN = F.Table.HexToRGB("#0a7ded"),
         WARLOCK = F.Table.HexToRGB("#8561ed"),
         WARRIOR = F.Table.HexToRGB("#e0a361"),
@@ -158,7 +158,7 @@ P.themes = {
         MONK = F.Table.HexToRGB("#05bf73"),
         PALADIN = F.Table.HexToRGB("#d9548f"),
         PRIEST = F.Table.HexToRGB("#d1d1d1"),
-        ROGUE = F.Table.HexToRGB("#ffd142"),
+        ROGUE = F.Table.HexToRGB("#ffb759"),
         SHAMAN = F.Table.HexToRGB("#0061bf"),
         WARLOCK = F.Table.HexToRGB("#634aad"),
         WARRIOR = F.Table.HexToRGB("#c78c4a"),
@@ -293,6 +293,7 @@ P.vehicleBar = {
   animations = true,
   animationsMult = 1, -- Animation speed, higher than 1 => slower, lower than 1 => faster
   -- This applies to bar combat fadeIn/fadeOut and "normal" font color changes (not clock/txui button etc)
+  dragonRiding = true,
 
   position = "BOTTOM,ElvUIParent,BOTTOM,0,210",
 }
@@ -458,6 +459,7 @@ P.armory = {
     enchantTextEnabled = true,
     abbreviateEnchantText = true,
     missingEnchantText = true,
+    missingSocketText = true,
 
     itemQualityGradientEnabled = true,
     itemQualityGradientWidth = 65,
@@ -551,10 +553,10 @@ P.wunderbar = {
     noCombatHover = false,
     noHover = false,
 
-    backgroundTexture = "BuiOnePixel",
+    backgroundTexture = "TX WorldState Score",
     backgroundColor = "CLASS", -- NONE, CLASS, VALUE (ElvUI), CUSTOM
     backgroundCustomColor = F.Table.HexToRGB("#ffffff00"),
-    backgroundGradient = false,
+    backgroundGradient = true,
     backgroundGradientAlpha = 1,
 
     accentFontColor = "TXUI", -- CLASS, TXUI, VALUE (ElvUI), CUSTOM
@@ -789,8 +791,8 @@ P.wunderbar = {
         [270] = "", -- monk mist
         [577] = "", -- dh havoc
         [581] = "", -- dh veng
-        [1467] = "", -- evo dev (fire mage icon)
-        [1468] = "", -- evo pres (resto druid icon)
+        [1467] = "", -- ev devastation
+        [1468] = "", -- ev preservation
 
         -- Wrath
         -- TODO: convert to spec ids

diff --git a/ElvUI_ToxiUI.toc b/ElvUI_ToxiUI.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cffffffffToxi|r|cff00e4f5UI|r
 ## Notes: Minimalistic ElvUI Edit by |cff00e4f5Toxi|r
 ## Author: Toxi (Toxicom#2957)
-## Version: 6.1.1
+## Version: 6.1.2
 ## RequiredDeps: ElvUI, ElvUI_WindTools
 ## OptionalDeps: Details, Plater
 ## DefaultState: Enabled

diff --git a/ElvUI_ToxiUI_Wrath.toc b/ElvUI_ToxiUI_Wrath.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cffffffffToxi|r|cff00e4f5UI|r
 ## Notes: Minimalistic ElvUI Edit by |cff00e4f5Toxi|r
 ## Author: Toxi (Toxicom#2957)
-## Version: 6.1.1
+## Version: 6.1.2
 ## RequiredDeps: ElvUI
 ## OptionalDeps: Details, Plater
 ## DefaultState: Enabled

diff --git a/Media/Fonts/ToxiIcons.ttf b/Media/Fonts/ToxiIcons.ttf
diff --git a/Modules/Misc/Core.lua b/Modules/Misc/Core.lua
@@ -21,9 +21,6 @@ function M:Initialize()
   -- Don't init second time
   if self.Initialized then return end
 
-  -- Don't init if its not a TXUI profile
-  if not F.IsTXUIProfile() then return end
-
   -- Call registered submodules
   for index, func in next, self.callOnInit do
     xpcall(func, errorhandler, self)