Commit 63162d6d authored by Ivaria's avatar Ivaria

Added Ra-den Unleashed Void debuff absorb tracking. Added option to display...

Added Ra-den Unleashed Void debuff absorb tracking. Added option to display player nicknames from Details! add-on.
parent 7d4d3103
......@@ -20,6 +20,7 @@ externals:
Libs/LibBase64-1.0: git://git.wowace.com/wow/libbase64-1-0/mainline.git
Libs/LibDBIcon-1.0: svn://svn.wowace.com/wow/libdbicon-1-0/mainline/trunk/LibDBIcon-1.0
Libs/LibCustomGlow-1.0: git://github.com/Stanzilla/LibCustomGlow.git
Libs/NickTag-1.0: https://github.com/Tercioo/NickTag-1.0.git
VuhDoOptions/Libs/ChatThrottleLib: svn://svn.wowace.com/wow/chatthrottlelib/mainline/trunk
......
## Interface: 80300
## Title: VuhDo ['vu:du:]
## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
## Version: 3.110
## Version: 3.111
## Notes: Raid Frames providing click-heal functionality, buff and debuff control, main tank management and much more
## SavedVariablesPerCharacter: VUHDO_CONFIG, VUHDO_PANEL_SETUP, VUHDO_SPELL_ASSIGNMENTS, VUHDO_HOSTILE_SPELL_ASSIGNMENTS, VUHDO_MM_SETTINGS, VUHDO_PLAYER_TARGETS, VUHDO_MAINTANK_NAMES, VUHDO_BUFF_SETTINGS, VUHDO_POWER_TYPE_COLORS, VUHDO_SPELLS_KEYBOARD, VUHDO_SPELL_CONFIG, VUHDO_BUFF_ORDER, VUHDO_SPEC_LAYOUTS, VUHDO_GROUP_SIZE, VUHDO_RAID, VUHDO_INDICATOR_CONFIG
## SavedVariables: VUHDO_DEFAULT_LAYOUT, VUHDO_DEFAULT_PROFILE, VUHDO_PROFILES, VUHDO_MANUAL_ROLES, VUHDO_SPELL_LAYOUTS, VUHDO_USER_CLASS_COLORS, VUHDO_DEBUFF_BLACKLIST, VUHDO_BOUQUETS, VUHDO_COMBAT_LOG_TRACE, VUHDO_GLOBAL_CONFIG, VUHDO_DEBUG
......@@ -16,6 +16,7 @@ Libs\AceGUI-3.0\AceGUI-3.0.xml
Libs\AceConfig-3.0\AceConfig-3.0.xml
Libs\UTF8\utf8.lua
Libs\UTF8\utf8data.lua
Libs\NickTag-1.0\NickTag-1.0.xml
VuhDoPanel.xml
VuhDoBuffWatch.xml
......
......@@ -13,8 +13,8 @@ VUHDO_LibCompress = LibStub:GetLibrary("LibCompress");
VUHDO_LibCompressEncode = VUHDO_LibCompress:GetAddonEncodeTable();
VUHDO_LibBase64 = LibStub:GetLibrary("LibBase64-1.0");
VUHDO_LibCustomGlow = LibStub("LibCustomGlow-1.0");
VUHDO_LibNickTag = LibStub("NickTag-1.0");
VUHDO_LibSharedMedia:Register("font", "Arial Black", "Interface\\AddOns\\VuhDo\\Fonts\\ariblk.ttf");
VUHDO_LibSharedMedia:Register("font", "Emblem", "Interface\\AddOns\\VuhDo\\Fonts\\Emblem.ttf");
......
......@@ -85,7 +85,7 @@ function VUHDO_customHealthInitLocalOverrides()
VUHDO_getOverhealText = _G["VUHDO_getOverhealText"];
VUHDO_getBarRoleIcon = _G["VUHDO_getBarRoleIcon"];
VUHDO_getBarIconFrame = _G["VUHDO_getBarIconFrame"];
VUHDO_updateClusterHighlights = _G["VUHDO_updateClusterHighlights"];
VUHDO_updateClusterHighlights = _G["VUHDO_updateClusterHighlights"];
VUHDO_customizeTargetBar = _G["VUHDO_customizeTargetBar"];
VUHDO_getColoredString = _G["VUHDO_getColoredString"];
VUHDO_textColor = _G["VUHDO_textColor"];
......@@ -380,46 +380,54 @@ function VUHDO_customizeText(aButton, aMode, anIsTarget)
-- Basic name text
if tIsName then
tOwnerInfo = VUHDO_RAID[tInfo["ownerUnit"]];
tIndex = tInfo["name"] .. (tInfo["ownerUnit"] or "") .. tPanelNum;
tOwnerInfo = VUHDO_RAID[tInfo["ownerUnit"]];
tIndex = tInfo["name"] .. (tInfo["ownerUnit"] or "") .. tPanelNum;
if not VUHDO_NAME_TEXTS[tIndex] then
if not VUHDO_NAME_TEXTS[tIndex] or tInfo["name"] ~= tNickname then
local tNickname;
if tSetup["ID_TEXT"]["showName"] then
tTextString = (tSetup["ID_TEXT"]["showClass"] and not tInfo["isPet"])
and tInfo["className"] .. ": " or "";
if VUHDO_LibNickTag and tSetup["ID_TEXT"]["showNickname"] then
tNickname = VUHDO_LibNickTag:GetNickname(tInfo["name"]) or tInfo["name"];
else
tNickname = tInfo["name"];
end
if tSetup["ID_TEXT"]["showName"] then
tTextString = (tSetup["ID_TEXT"]["showClass"] and not tInfo["isPet"])
and tInfo["className"] .. ": " or "";
tTextString = tTextString .. ((not tOwnerInfo or not tSetup["ID_TEXT"]["showPetOwners"])
and tInfo["name"] or tOwnerInfo["name"] .. ": " .. tInfo["name"]);
else
tTextString = (tSetup["ID_TEXT"]["showClass"] and not tInfo["isPet"])
and tInfo["className"] or "";
and tNickname or tOwnerInfo["name"] .. ": " .. tNickname);
else
tTextString = (tSetup["ID_TEXT"]["showClass"] and not tInfo["isPet"])
and tInfo["className"] or "";
if tOwnerInfo and tSetup["ID_TEXT"]["showPetOwners"] then
tTextString = tTextString .. tOwnerInfo["name"];
end
end
tMaxChars = tSetup["PANEL_COLOR"]["TEXT"]["maxChars"];
if tOwnerInfo and tSetup["ID_TEXT"]["showPetOwners"] then
tTextString = tTextString .. tOwnerInfo["name"];
end
end
if tMaxChars > 0 and #tTextString > tMaxChars then
tTextString = VUHDO_utf8Cut(tTextString, tMaxChars);
end
VUHDO_NAME_TEXTS[tIndex] = tTextString;
else
tTextString = VUHDO_NAME_TEXTS[tIndex];
end
-- Add title flags
if tSetup["ID_TEXT"]["showTags"] and not anIsTarget then
if "focus" == tUnit then
tTextString = format("|cffff0000%s|r-%s", VUHDO_I18N_FOC, tTextString);
elseif "target" == tUnit then
tTextString = format("|cffff0000%s|r-%s", VUHDO_I18N_TAR, tTextString);
elseif tOwnerInfo and tOwnerInfo["isVehicle"] then
tTextString = format("|cffff0000%s|r-%s", VUHDO_I18N_VEHICLE, tTextString);
tMaxChars = tSetup["PANEL_COLOR"]["TEXT"]["maxChars"];
if tMaxChars > 0 and #tTextString > tMaxChars then
tTextString = VUHDO_utf8Cut(tTextString, tMaxChars);
end
VUHDO_NAME_TEXTS[tIndex] = tTextString;
else
tTextString = VUHDO_NAME_TEXTS[tIndex];
end
-- Add title flags
if tSetup["ID_TEXT"]["showTags"] and not anIsTarget then
if "focus" == tUnit then
tTextString = format("|cffff0000%s|r-%s", VUHDO_I18N_FOC, tTextString);
elseif "target" == tUnit then
tTextString = format("|cffff0000%s|r-%s", VUHDO_I18N_TAR, tTextString);
elseif tOwnerInfo and tOwnerInfo["isVehicle"] then
tTextString = format("|cffff0000%s|r-%s", VUHDO_I18N_VEHICLE, tTextString);
end
end
end
end
tTagText = (tSetup["ID_TEXT"]["showTags"] and not anIsTarget)
......@@ -489,11 +497,10 @@ function VUHDO_customizeText(aButton, aMode, anIsTarget)
end
end
-- Aggro Text
if tIsName then
if tInfo["aggro"] and sIsAggroText then
tTextString = format("|cffff2020%s|r%s|cffff2020%s|r",
-- Aggro Text
if tIsName then
if tInfo["aggro"] and sIsAggroText then
tTextString = format("|cffff2020%s|r%s|cffff2020%s|r",
VUHDO_THREAT_CFG["AGGRO_TEXT_LEFT"], tTextString, VUHDO_THREAT_CFG["AGGRO_TEXT_RIGHT"]);
end
......
......@@ -311,6 +311,7 @@ VUHDO_SPELL_ID.DEBUFF_CHILLED_BLOOD = VUHDO_getSpellInfo(245586);
VUHDO_SPELL_ID.DEBUFF_IMMUNOSUPPRESSION = VUHDO_getSpellInfo(265206);
VUHDO_SPELL_ID.DEBUFF_DECAYING_MIND = VUHDO_getSpellInfo(278961);
VUHDO_SPELL_ID.DEBUFF_UMBRAL_SHELL = VUHDO_getSpellInfo(284722);
VUHDO_SPELL_ID.DEBUFF_UNLEASHED_VOID = VUHDO_getSpellInfo(306184);
......
......@@ -2005,6 +2005,25 @@ function VUHDO_loadDefaultConfig()
316542 -- Paranoia
);
-- 8.3.0 - Battle for Azeroth - Visions of N'Zoth part 2
VUHDO_addCustomSpellIds(47,
-- [[ Ny'alotha, The Waking City ]]
-- Wrathion
-- Maut
-- The Prophet Skitra
-- Dark Inquisitor Xanesh
-- Vexiona
-- The Hivemind
-- Ra-den
306184 -- Unleashed Void
-- Shad'har the Insatiable
-- Drest'agath
-- Il'gynoth
-- Carapice of N'Zoth
-- N'Zoth
);
local debuffRemovalList = {};
for tIndex, tName in pairs(VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED"]) do
......@@ -2379,7 +2398,8 @@ local VUHDO_DEFAULT_PER_PANEL_SETUP = {
},
["ID_TEXT"] = {
["showName"] = true,
["showName"] = true,
["showNickname"] = false,
["showClass"] = false,
["showTags"] = true,
["showPetOwners"] = true,
......
......@@ -329,6 +329,7 @@ local VUHDO_DEFAULT_PROFILES = {
["ID_TEXT"] = {
["showClass"] = false,
["showName"] = true,
["showNickname"] = false,
["showTags"] = true,
["position"] = "CENTER+CENTER",
["_spacing"] = 18.99999430662054,
......@@ -1045,6 +1046,7 @@ local VUHDO_DEFAULT_PROFILES = {
["ID_TEXT"] = {
["showClass"] = false,
["showName"] = true,
["showNickname"] = false,
["showTags"] = true,
["position"] = "BOTTOMRIGHT+BOTTOMRIGHT",
["_spacing"] = 17.99999507979553,
......@@ -1206,6 +1208,7 @@ local VUHDO_DEFAULT_PROFILES = {
["ID_TEXT"] = {
["showClass"] = false,
["showName"] = true,
["showNickname"] = false,
["showTags"] = true,
["position"] = "BOTTOMRIGHT+BOTTOMRIGHT",
["showPetOwners"] = true,
......@@ -1365,7 +1368,8 @@ local VUHDO_DEFAULT_PROFILES = {
},
["ID_TEXT"] = {
["showClass"] = false,
["showName"] = true,
["showName"] = true,
["showNickname"] = false,
["showTags"] = true,
["position"] = "BOTTOMRIGHT+BOTTOMRIGHT",
["showPetOwners"] = true,
......@@ -1525,7 +1529,8 @@ local VUHDO_DEFAULT_PROFILES = {
},
["ID_TEXT"] = {
["showClass"] = false,
["showName"] = true,
["showName"] = true,
["showNickname"] = false,
["showTags"] = true,
["position"] = "BOTTOMRIGHT+BOTTOMRIGHT",
["_spacing"] = 17.99999507979553,
......
......@@ -635,6 +635,7 @@ VUHDO_I18N_TT.K577 = "Click to display a glow on the bar while active.";
VUHDO_I18N_TT.K578 = "Select a color for the icon glow.";
VUHDO_I18N_TT.K579 = "Select a color for the bar glow.";
VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons."
VUHDO_I18N_TT.K581 = "Check to show player nickname on bars.";
VUHDO_I18N_DEFAULT_PROFILE = "Default Profile";
VUHDO_I18N_DEFAULT_LAYOUT = "Default Layout";
......@@ -1138,3 +1139,5 @@ VUHDO_I18N_BAR_GLOW_COLOR = "Bar Glow";
VUHDO_I18N_ICON_GLOW_COLOR = "Icon Glow";
VUHDO_I18N_BLACKLIST_KEY_MODIFIES = "Ignore List Modifier Key";
VUHDO_I18N_NICKNAME = "Details!\nNickname"
......@@ -635,7 +635,7 @@
<Frame name="$parentShowWhatPanel" inherits="VuhDoPanelTemplate">
<Size>
<AbsDimension x="120" y="186" />
<AbsDimension x="120" y="226" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
......@@ -662,7 +662,7 @@
</Scripts>
</CheckButton>
<CheckButton name="$parentClassCheckButton" text="VUHDO_I18N_CLASS" inherits="VuhDoCheckButtonTemplate">
<CheckButton name="$parentNicknameCheckButton" text="VUHDO_I18N_NICKNAME" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
......@@ -670,6 +670,23 @@
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetModel(self, "VUHDO_PANEL_SETUP.#PNUM#.ID_TEXT.showNickname");
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K581);
VUHDO_lnfAddConstraint(self, VUHDO_LF_CONSTRAINT_DISABLE, "VUHDO_PANEL_SETUP.#PNUM#.ID_TEXT.showName", false);
</OnLoad>
</Scripts>
</CheckButton>
<CheckButton name="$parentClassCheckButton" text="VUHDO_I18N_CLASS" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="10" y="-107" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetModel(self, "VUHDO_PANEL_SETUP.#PNUM#.ID_TEXT.showClass");
......@@ -682,7 +699,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="10" y="-107" />
<AbsDimension x="10" y="-145" />
</Offset>
</Anchor>
</Anchors>
......@@ -698,7 +715,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="10" y="-145" />
<AbsDimension x="10" y="-183" />
</Offset>
</Anchor>
</Anchors>
......
## Interface: 80300
## Title: VuhDo ['vu:du:] - Options
## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
## Version: 3.110
## Version: 3.111
## Notes: VuhDo Options
## SavedVariables: VUHDO_OPTIONS_SETTINGS
## SavedVariablesPerCharacter: VUHDO_GLOBAL_ICONS, VUHDO_GI_SCAN_IDX
......
......@@ -74,6 +74,9 @@ local VUHDO_ABSORB_DEBUFFS = {
[284722] = function(aUnit) return select(16, VUHDO_unitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_UMBRAL_SHELL)), 10 * 60; end, -- Uu'nat Umbral Shell
[286771] = function(aUnit) return select(16, VUHDO_unitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_UMBRAL_SHELL)), 10 * 60; end, -- Uu'nat Umbral Shell
-- Patch 8.3.0 - Battle for Azeroth - Ny'alotha
[306184] = function(aUnit) return select(16, VUHDO_unitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_UNLEASHED_VOID)), 40; end, -- Unleashed Void
--[79105] = function(aUnit) return 280000, 60 * 60; end, -- @TESTING PW:F
};
......
Version 3.111
Known issues:
-- BfA stat squish cleanup still a work in progress
-- AOE Advice spell equations need complete overhaul
-- Some text providers need changes to better display small numbers
-- Debuff tooltips are currently bugged when using ElvUI
-- Deselect 'VuhDo Options > Panels > Tooltips > Tooltips > Debuffs'
-- In 8.2.0 Blizzard removed the ability to play sounds by file path
-- If you have LibSharedMedia installed make sure it is up to date
-- You may need to reselect your sound options in VuhDo for debuffs
Bugfixes:
Improvements:
-- Added option to display player nicknames from Details! add-on
-- See 'VuhDo Options > Panels > Text > Show Text > Show Nickname'
-- Added Ra-den Unleashed Void debuff absorb tracking
--------------------------------------------------------------
Version 3.110
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment