Skip to content

GitLab

Commit 602bfe97 authored by Ivaria's avatar Ivaria
Browse files

-- Added new custom debuff display options 'Bar Glow' and 'Icon Glow' 

--  Default color settings under 'VuhDo Options > Colors > States'
-- Added new slash command "/vd about"
-- Add extern dep on LibCustomGlow in pkgmeta
parent 96674ea2
Hide whitespace changes
Inline Side-by-side
Showing with 416 additions and 104 deletions
.pkgmeta
View file @ 602bfe97
......@@ -18,6 +18,7 @@ externals:
Libs/LibCompress: svn://svn.wowace.com/wow/libcompress/mainline/trunk
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://repos.curseforge.com/wow/libcustomglow/mainline.git
VuhDoOptions/Libs/ChatThrottleLib: svn://svn.wowace.com/wow/chatthrottlelib/mainline/trunk
......
VuhDo.xml
View file @ 602bfe97
......@@ -10,7 +10,8 @@
<Script file="Libs\LibCompress\LibCompress.lua" />
<Script file="Libs\LibBase64-1.0\LibBase64-1.0.lua" />
<Script file="Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua" />
<Script file="Libs\LibCustomGlow-1.0\LibCustomGlow-1.0.lua" />
<Script file="VuhDoLocalization_en.lua" />
<Script file="VuhDoLocalization_de.lua" />
<Script file="VuhDoLocalization_fr.lua" />
......
VuhDoAddonAdapter.lua
View file @ 602bfe97
......@@ -14,6 +14,8 @@ VUHDO_LibCompressEncode = VUHDO_LibCompress:GetAddonEncodeTable();
VUHDO_LibBase64 = LibStub:GetLibrary("LibBase64-1.0");
VUHDO_LibCustomGlow = LibStub("LibCustomGlow-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");
VUHDO_LibSharedMedia:Register("font", "Vixar", "Interface\\AddOns\\VuhDo\\Fonts\\vixar.ttf");
......
VuhDoBarCustomizerDebuffIcon.lua
View file @ 602bfe97
......@@ -56,7 +56,9 @@ function VUHDO_customDebuffIconsInitLocalOverrides()
["isAliveTime"] = false,
["isFullDuration"] = false,
["isMine"] = true,
["isOthers"] = true
["isOthers"] = true,
["isBarGlow"] = false,
["isIconGlow"] = false,
};
end
......@@ -74,10 +76,14 @@ local tShieldPerc;
local tName;
local tButton;
local tIsAnim;
local tIsBarGlow;
local tIsIconGlow;
local function VUHDO_animateDebuffIcon(aButton, anIconInfo, aNow, anIconIndex, anIsInit, aUnit)
tCuDeStoConfig = sCuDeStoredSettings[anIconInfo[3]] or sCuDeStoredSettings[tostring(anIconInfo[7])] or sStaticConfig;
tIsAnim = tCuDeStoConfig["animate"] and VUHDO_MAY_DEBUFF_ANIM;
tIsBarGlow = tCuDeStoConfig["isBarGlow"];
tIsIconGlow = tCuDeStoConfig["isIconGlow"];
tTimeStamp = anIconInfo[2];
tAliveTime = anIsInit and 0 or aNow - tTimeStamp;
tName = anIconInfo[3];
......@@ -111,6 +117,56 @@ local function VUHDO_animateDebuffIcon(aButton, anIconInfo, aNow, anIconIndex, a
VUHDO_getBarIconFrame(aButton, anIconIndex):SetAlpha(1);
if tIsAnim then VUHDO_setDebuffAnimation(1.2); end
if tIsBarGlow then
VUHDO_LibCustomGlow.PixelGlow_Start(
aButton,
tCuDeStoConfig["barGlowColor"] and {
tCuDeStoConfig["barGlowColor"]["R"],
tCuDeStoConfig["barGlowColor"]["G"],
tCuDeStoConfig["barGlowColor"]["B"],
tCuDeStoConfig["barGlowColor"]["O"]
} or {
VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_BAR_GLOW"]["R"],
VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_BAR_GLOW"]["R"],
VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_BAR_GLOW"]["B"],
VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_BAR_GLOW"]["O"]
},
14, -- number of particles
0.3, -- frequency
8, -- length
2, -- thickness
0, -- x offset
0, -- y offset
false, -- border
VUHDO_CUSTOM_GLOW_CUDE_FRAME_KEY
);
end
if tIsIconGlow then
VUHDO_LibCustomGlow.PixelGlow_Start(
VUHDO_getBarIconFrame(aButton, anIconIndex),
tCuDeStoConfig["iconGlowColor"] and {
tCuDeStoConfig["iconGlowColor"]["R"],
tCuDeStoConfig["iconGlowColor"]["G"],
tCuDeStoConfig["iconGlowColor"]["B"],
tCuDeStoConfig["iconGlowColor"]["O"]
} or {
VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_ICON_GLOW"]["R"],
VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_ICON_GLOW"]["R"],
VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_ICON_GLOW"]["B"],
VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_ICON_GLOW"]["O"]
},
8, -- number of particles
0.3, -- frequency
6, -- length
2, -- thickness
0, -- x offset
0, -- y offset
false, -- border
VUHDO_CUSTOM_GLOW_CUDE_ICON_KEY
);
end
elseif VUHDO_getBarIcon(aButton, anIconIndex):GetTexture() ~= anIconInfo[1] then
VUHDO_getBarIcon(aButton, anIconIndex):SetTexture(anIconInfo[1]);
VUHDO_getBarIconFrame(aButton, anIconIndex):SetAlpha(1);
......@@ -182,6 +238,7 @@ function VUHDO_addDebuffIcon(aUnit, anIcon, aName, anExpiry, aStacks, aDuration,
for _, tButton in pairs(VUHDO_getUnitButtonsSafe(aUnit)) do
VUHDO_animateDebuffIcon(tButton, tIconInfo, GetTime(), tSlot + 39, true, aUnit);
tFrame = VUHDO_getBarIconFrame(tButton, tSlot + 39);
tFrame["debuffInfo"], tFrame["isBuff"], tFrame["debuffCnt"] = aName, anIsBuff, aCnt;
end
......@@ -237,10 +294,16 @@ function VUHDO_removeDebuffIcon(aUnit, aName)
if (VUHDO_DEBUFF_ICONS[aUnit][tCnt2] or sEmpty)[3] == aName then
VUHDO_DEBUFF_ICONS[aUnit][tCnt2][2] = 1; -- ~= -1, lock icon to not be processed by onupdate
for _, tButton2 in pairs(tAllButtons2) do
VUHDO_LibCustomGlow.PixelGlow_Stop(tButton2, VUHDO_CUSTOM_GLOW_CUDE_FRAME_KEY);
tFrame = VUHDO_getBarIconFrame(tButton2, tCnt2 + 39);
if tFrame then
VUHDO_LibCustomGlow.PixelGlow_Stop(tFrame, VUHDO_CUSTOM_GLOW_CUDE_ICON_KEY);
tFrame:SetAlpha(0);
tFrame["debuffInfo"] = nil;
tFrame["isBuff"] = nil;
tFrame["debuffCnt"] = nil;
end
end
......
VuhDoConst.lua
View file @ 602bfe97
......@@ -614,3 +614,7 @@ VUHDO_OWNER_2_PET = {
["raid39"] = "raidpet39",
["raid40"] = "raidpet40",
};
VUHDO_CUSTOM_GLOW_CUDE_FRAME_KEY = "_CuDe_Frame";
VUHDO_CUSTOM_GLOW_CUDE_ICON_KEY = "_CuDe_Icon";
VuhDoDefaults.lua
View file @ 602bfe97
......@@ -423,6 +423,8 @@ local function VUHDO_customDebuffsAddDefaultSettings(aBuffName)
["isStacks"] = VUHDO_CONFIG["CUSTOM_DEBUFF"]["isStacks"],
["isMine"] = true,
["isOthers"] = true,
["isBarGlow"] = false,
["isIconGlow"] = false,
}
end
......@@ -432,6 +434,20 @@ local function VUHDO_customDebuffsAddDefaultSettings(aBuffName)
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["color"]
= VUHDO_makeFullColor(0.6, 0.3, 0, 1, 0.8, 0.5, 0, 1);
end
if (not VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["isBarGlow"]) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["barGlowColor"] = nil;
elseif (VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["barGlowColor"] == nil) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["barGlowColor"]
= VUHDO_makeFullColor(0.95, 0.95, 0.32, 1, 1, 1, 0, 1);
end
if (not VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["isIconGlow"]) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["iconGlowColor"] = nil;
elseif (VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["iconGlowColor"] == nil) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][aBuffName]["iconGlowColor"]
= VUHDO_makeFullColor(0.95, 0.95, 0.32, 1, 1, 1, 0, 1);
end
end
......@@ -744,6 +760,8 @@ local VUHDO_DEFAULT_CU_DE_STORED_SETTINGS = {
["isFullDuration"] = false,
["isMine"] = true,
["isOthers"] = true,
["isBarGlow"] = false,
["isIconGlow"] = false,
-- ["color"] = {
-- ["R"] = 0.6,
......@@ -2059,6 +2077,8 @@ local VUHDO_DEFAULT_PANEL_SETUP = {
["DEBUFF" .. VUHDO_DEBUFF_TYPE_CURSE] = VUHDO_makeFullColor(0.7, 0, 0.7, 1, 1, 0, 1, 1),
["DEBUFF" .. VUHDO_DEBUFF_TYPE_MAGIC] = VUHDO_makeFullColor(0.4, 0.4, 0.8, 1, 0.329, 0.957, 1, 1),
["DEBUFF" .. VUHDO_DEBUFF_TYPE_CUSTOM] = VUHDO_makeFullColor(0.6, 0.3, 0, 1, 0.8, 0.5, 0, 1),
["DEBUFF_BAR_GLOW"] = VUHDO_makeFullColor(0.95, 0.95, 0.32, 1, 1, 1, 0, 1),
["DEBUFF_ICON_GLOW"] = VUHDO_makeFullColor(0.95, 0.95, 0.32, 1, 1, 1, 0, 1),
["CHARMED"] = VUHDO_makeFullColor(0.51, 0.082, 0.263, 1, 1, 0.31, 0.31, 1),
["BAR_FRAMES"] = {
......
VuhDoEventHandler.lua
View file @ 602bfe97
......@@ -712,6 +712,15 @@ end
--
local function VUHDO_printAbout()
VUHDO_Msg("VuhDo |cffffe566['vu:du:]|r v" .. VUHDO_VERSION .. " (use /vd). Currently maintained by Ivaria@US-Hyjal in honor of Marshy.");
end
--
function VUHDO_slashCmd(aCommand)
local tParsedTexts = VUHDO_textParse(aCommand);
......@@ -842,6 +851,9 @@ function VUHDO_slashCmd(aCommand)
VUHDO_xMsg(#tProfile, #tCompressed, #tUnCompressed);]]
elseif tCommandWord == "ab" or tCommandWord == "about" then
VUHDO_printAbout();
elseif aCommand == "?" or strfind(tCommandWord, "help") or aCommand == "" then
local tLines = VUHDO_splitString(VUHDO_I18N_COMMAND_LIST, "");
......@@ -1535,5 +1547,6 @@ function VUHDO_OnLoad(anInstance)
anInstance:SetScript("OnEvent", VUHDO_OnEvent);
anInstance:SetScript("OnUpdate", VUHDO_OnUpdate);
VUHDO_Msg("VuhDo |cffffe566['vu:du:]|r v" .. VUHDO_VERSION .. " (use /vd). Currently maintained by Ivaria@US-Hyjal in honor of Marshy.");
VUHDO_printAbout();
end
VuhDoOptions/VuhDoLocalization_de.lua
View file @ 602bfe97
......@@ -1129,3 +1129,6 @@ VUHDO_I18N_DURATION = "Duration";
VUHDO_I18N_SEC = "sec";
VUHDO_I18N_TRAIL_OF_LIGHT = "Trail of\nLight";
VUHDO_I18N_BAR_GLOW_COLOR = "Bar Glow";
VUHDO_I18N_ICON_GLOW_COLOR = "Icon Glow";
VuhDoOptions/VuhDoLocalization_en.lua
View file @ 602bfe97
......@@ -1129,3 +1129,6 @@ VUHDO_I18N_DURATION = "Duration";
VUHDO_I18N_SEC = "sec";
VUHDO_I18N_TRAIL_OF_LIGHT = "Trail of\nLight";
VUHDO_I18N_BAR_GLOW_COLOR = "Bar Glow";
VUHDO_I18N_ICON_GLOW_COLOR = "Icon Glow";
VuhDoOptions/VuhDoLocalization_es.lua
View file @ 602bfe97
......@@ -1144,3 +1144,6 @@ VUHDO_I18N_DURATION = "Duration";
VUHDO_I18N_SEC = "sec";
VUHDO_I18N_TRAIL_OF_LIGHT = "Trail of\nLight";
VUHDO_I18N_BAR_GLOW_COLOR = "Bar Glow";
VUHDO_I18N_ICON_GLOW_COLOR = "Icon Glow";
VuhDoOptions/VuhDoLocalization_fr.lua
View file @ 602bfe97
......@@ -1145,3 +1145,6 @@ VUHDO_I18N_DURATION = "Duration";
VUHDO_I18N_SEC = "sec";
VUHDO_I18N_TRAIL_OF_LIGHT = "Trail of\nLight";
VUHDO_I18N_BAR_GLOW_COLOR = "Bar Glow";
VUHDO_I18N_ICON_GLOW_COLOR = "Icon Glow";
VuhDoOptions/VuhDoLocalization_ru.lua
View file @ 602bfe97
......@@ -1309,3 +1309,6 @@ VUHDO_I18N_DURATION = "Duration";
VUHDO_I18N_SEC = "sec";
VUHDO_I18N_TRAIL_OF_LIGHT = "Trail of\nLight";
VUHDO_I18N_BAR_GLOW_COLOR = "Bar Glow";
VUHDO_I18N_ICON_GLOW_COLOR = "Icon Glow";
VuhDoOptions/VuhDoLocalization_zhCN.lua
View file @ 602bfe97
......@@ -1131,3 +1131,6 @@ VUHDO_I18N_DURATION = "Duration";
VUHDO_I18N_SEC = "sec";
VUHDO_I18N_TRAIL_OF_LIGHT = "Trail of\nLight";
VUHDO_I18N_BAR_GLOW_COLOR = "Bar Glow";
VUHDO_I18N_ICON_GLOW_COLOR = "Icon Glow";
VuhDoOptions/VuhDoLocalization_zhTW.lua
View file @ 602bfe97
......@@ -1131,3 +1131,6 @@ VUHDO_I18N_DURATION = "Duration";
VUHDO_I18N_SEC = "sec";
VUHDO_I18N_TRAIL_OF_LIGHT = "Trail of\nLight";
VUHDO_I18N_BAR_GLOW_COLOR = "Bar Glow";
VUHDO_I18N_ICON_GLOW_COLOR = "Icon Glow";
VuhDoOptions/VuhDoNewOptionsColorsStates.xml
View file @ 602bfe97
......@@ -8,7 +8,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="30" y="-300" />
<AbsDimension x="290" y="-200" />
</Offset>
</Anchor>
</Anchors>
......@@ -196,7 +196,7 @@
<Frame name="$parentDebuffsPanel" inherits="VuhDoPanelTemplate">
<Size>
<AbsDimension x="232" y="249" />
<AbsDimension x="232" y="330" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
......@@ -470,6 +470,40 @@
</Scripts>
</Frame>
<Frame name="$parentBarGlowTexture" inherits="VuhDoContextColorSwatchTexture">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-240" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetModel(self, "VUHDO_PANEL_SETUP.BAR_COLORS.DEBUFF_BAR_GLOW");
VUHDO_lnfInitColorSwatch(self, VUHDO_I18N_BAR_GLOW_COLOR, VUHDO_I18N_BAR_GLOW_COLOR);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K261);
</OnLoad>
</Scripts>
</Frame>
<Frame name="$parentIconGlowTexture" inherits="VuhDoContextColorSwatchTexture">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-278" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetModel(self, "VUHDO_PANEL_SETUP.BAR_COLORS.DEBUFF_ICON_GLOW");
VUHDO_lnfInitColorSwatch(self, VUHDO_I18N_ICON_GLOW_COLOR, VUHDO_I18N_ICON_GLOW_COLOR);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K261);
</OnLoad>
</Scripts>
</Frame>
<Frame name="$parentTextLabel" inherits="VuhDoLabelFrameTemplate">
<Size>
<AbsDimension x="75" y="18" />
......
VuhDoOptions/VuhDoNewOptionsDebuffsCustom.lua
View file @ 602bfe97
......@@ -63,6 +63,10 @@ VUHDO_FULL_DURATION_MODEL = nil;
VUHDO_MINE_MODEL = nil;
VUHDO_OTHERS_MODEL = nil;
VUHDO_COLOR_SWATCH_MODEL = nil;
VUHDO_BAR_GLOW_MODEL = nil;
VUHDO_BAR_GLOW_SWATCH_MODEL = nil;
VUHDO_ICON_GLOW_MODEL = nil;
VUHDO_ICON_GLOW_SWATCH_MODEL = nil;
VUHDO_SOUND_MODEL = nil;
......@@ -145,6 +149,43 @@ function VUHDO_customDebuffUpdateEditBox(anEditBox)
tCheckButton = _G[tPanelName .. "OthersCheckButton"];
VUHDO_lnfSetModel(tCheckButton, "VUHDO_CONFIG.CUSTOM_DEBUFF.STORED_SETTINGS." .. tValue .. ".isOthers");
VUHDO_lnfCheckButtonInitFromModel(tCheckButton);
tCheckButton = _G[tPanelName .. "BarGlowCheckButton"];
VUHDO_lnfSetModel(tCheckButton, "VUHDO_CONFIG.CUSTOM_DEBUFF.STORED_SETTINGS." .. tValue .. ".isBarGlow");
VUHDO_lnfCheckButtonInitFromModel(tCheckButton);
if (not VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].isBarGlow) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].barGlowColor = nil;
end
if (VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].barGlowColor == nil) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].barGlowColor
= VUHDO_deepCopyTable(VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_BAR_GLOW"]);
end
tColorSwatch = _G[tPanelName .. "BarGlowTexture"];
VUHDO_lnfSetModel(tColorSwatch, "VUHDO_CONFIG.CUSTOM_DEBUFF.STORED_SETTINGS." .. tValue .. ".barGlowColor");
VUHDO_lnfInitColorSwatch(tColorSwatch, VUHDO_I18N_COLOR, VUHDO_I18N_COLOR);
VUHDO_lnfColorSwatchInitFromModel(tColorSwatch);
tCheckButton = _G[tPanelName .. "IconGlowCheckButton"];
VUHDO_lnfSetModel(tCheckButton, "VUHDO_CONFIG.CUSTOM_DEBUFF.STORED_SETTINGS." .. tValue .. ".isIconGlow");
VUHDO_lnfCheckButtonInitFromModel(tCheckButton);
if (not VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].isIconGlow) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].iconGlowColor = nil;
end
if (VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].iconGlowColor == nil) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].iconGlowColor
= VUHDO_deepCopyTable(VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_ICON_GLOW"]);
end
tColorSwatch = _G[tPanelName .. "IconGlowTexture"];
VUHDO_lnfSetModel(tColorSwatch, "VUHDO_CONFIG.CUSTOM_DEBUFF.STORED_SETTINGS." .. tValue .. ".iconGlowColor");
VUHDO_lnfInitColorSwatch(tColorSwatch, VUHDO_I18N_COLOR, VUHDO_I18N_COLOR);
VUHDO_lnfColorSwatchInitFromModel(tColorSwatch);
else
anEditBox:SetTextColor(0.8, 0.8, 1, 1);
......@@ -159,7 +200,11 @@ function VUHDO_customDebuffUpdateEditBox(anEditBox)
VUHDO_FULL_DURATION_MODEL = false;
VUHDO_MINE_MODEL = true;
VUHDO_OTHERS_MODEL = true;
VUHDO_BAR_GLOW_MODEL = VUHDO_CONFIG.CUSTOM_DEBUFF.isBarGlow;
VUHDO_ICON_GLOW_MODEL = VUHDO_CONFIG.CUSTOM_DEBUFF.isIconGlow;
VUHDO_COLOR_SWATCH_MODEL = VUHDO_deepCopyTable(VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF" .. VUHDO_DEBUFF_TYPE_CUSTOM]);
VUHDO_BAR_GLOW_SWATCH_MODEL = VUHDO_deepCopyTable(VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_BAR_GLOW"]);
VUHDO_ICON_GLOW_SWATCH_MODEL = VUHDO_deepCopyTable(VUHDO_PANEL_SETUP.BAR_COLORS["DEBUFF_ICON_GLOW"]);
VUHDO_SOUND_MODEL = VUHDO_CONFIG.CUSTOM_DEBUFF.SOUND;
tCheckButton = _G[tPanelName .. "IconCheckButton"];
......@@ -206,6 +251,25 @@ function VUHDO_customDebuffUpdateEditBox(anEditBox)
tCheckButton = _G[tPanelName .. "OthersCheckButton"];
VUHDO_lnfSetModel(tCheckButton, "VUHDO_OTHERS_MODEL");
VUHDO_lnfCheckButtonInitFromModel(tCheckButton);
tCheckButton = _G[tPanelName .. "BarGlowCheckButton"];
VUHDO_lnfSetModel(tCheckButton, "VUHDO_BAR_GLOW_MODEL");
VUHDO_lnfCheckButtonInitFromModel(tCheckButton);
tColorSwatch = _G[tPanelName .. "BarGlowTexture"];
VUHDO_lnfSetModel(tColorSwatch, "VUHDO_BAR_GLOW_SWATCH_MODEL");
VUHDO_lnfInitColorSwatch(tColorSwatch, VUHDO_I18N_COLOR, VUHDO_I18N_COLOR);
VUHDO_lnfColorSwatchInitFromModel(tColorSwatch);
tCheckButton = _G[tPanelName .. "IconGlowCheckButton"];
VUHDO_lnfSetModel(tCheckButton, "VUHDO_ICON_GLOW_MODEL");
VUHDO_lnfCheckButtonInitFromModel(tCheckButton);
tColorSwatch = _G[tPanelName .. "IconGlowTexture"];
VUHDO_lnfSetModel(tColorSwatch, "VUHDO_ICON_GLOW_SWATCH_MODEL");
VUHDO_lnfInitColorSwatch(tColorSwatch, VUHDO_I18N_COLOR, VUHDO_I18N_COLOR);
VUHDO_lnfColorSwatchInitFromModel(tColorSwatch);
end
end
......@@ -275,6 +339,12 @@ function VUHDO_saveCustomDebuffOnClick(aButton)
tCheckButton = _G[tPanelName .. "OthersCheckButton"];
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].isOthers = VUHDO_forceBooleanValue(tCheckButton:GetChecked());
tCheckButton = _G[tPanelName .. "BarGlowCheckButton"];
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].isBarGlow = VUHDO_forceBooleanValue(tCheckButton:GetChecked());
tCheckButton = _G[tPanelName .. "IconGlowCheckButton"];
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].isIconGlow = VUHDO_forceBooleanValue(tCheckButton:GetChecked());
tComboBox = _G[tPanelName .. "SoundCombo"];
tSoundName = _G[tComboBox:GetName() .. "Text"]:GetText();
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].SOUND = VUHDO_LibSharedMedia:Fetch("sound", tSoundName);
......@@ -291,6 +361,28 @@ function VUHDO_saveCustomDebuffOnClick(aButton)
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].color = nil;
end
if (VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].isBarGlow) then
if (VUHDO_BAR_GLOW_SWATCH_MODEL ~= nil) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].barGlowColor
= VUHDO_deepCopyTable(VUHDO_BAR_GLOW_SWATCH_MODEL);
VUHDO_BAR_GLOW_SWATCH_MODEL = nil;
end
else
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].barGlowColor = nil;
end
if (VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].isIconGlow) then
if (VUHDO_ICON_GLOW_SWATCH_MODEL ~= nil) then
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].iconGlowColor
= VUHDO_deepCopyTable(VUHDO_ICON_GLOW_SWATCH_MODEL);
VUHDO_ICON_GLOW_SWATCH_MODEL = nil;
end
else
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue].iconGlowColor = nil;
end
VUHDO_CONFIG["CUSTOM_DEBUFF"]["SELECTED"] = tValue;
VUHDO_initCustomDebuffComboModel();
......
VuhDoOptions/VuhDoNewOptionsDebuffsCustom.xml
View file @ 602bfe97
......@@ -181,67 +181,146 @@
<Frame name="$parentStorePanel" inherits="VuhDoPanelTemplate">
<Size>
<AbsDimension x="235" y="410" />
<AbsDimension x="235" y="430" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="280" y="-20" />
<AbsDimension x="280" y="-10" />
</Offset>
</Anchor>
</Anchors>
<Frames>
<Button name="$parentSelectComboBox" inherits="VuhDoScrollComboBoxTemplate">
<Size>
<AbsDimension x="180" y="1" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="43" y="-86" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnShow>
VUHDO_lnfPatchFont(self, "Text");
VUHDO_setupCustomDebuffsComboModel(self);
</OnShow>
<OnLoad>
self:SetAttribute("custom_function", VUHDO_notifyCustomDebuffSelect);
</OnLoad>
</Scripts>
</Button>
<CheckButton name="$parentIconCheckButton" text="VUHDO_I18N_ICON" inherits="VuhDoCheckButtonTemplate">
<Frame name="$parentTitleLabel" inherits="VuhDoLabelFrameTemplate">
<Layers>
<Layer>
<FontString name="$parentLabel" text="VUHDO_I18N_STORE_DELETE" inherits="VuDoDefaultTitleFontTemplate">
</FontString>
</Layer>
</Layers>
</Frame>
<Frame name="$parentEditLabel" inherits="VuhDoLabelFrameTemplate">
<Size>
<AbsDimension x="120" y="18" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="18" y="-22" />
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer>
<FontString name="$parentLabel" text="VUHDO_I18N_DEBUFF_EDIT_BOX" justifyH="LEFT" inherits="VuDoDefaultFontTemplate">
</FontString>
</Layer>
</Layers>
</Frame>
<EditBox name="$parentEditBox" inherits="VuhDoEditBoxTemplate">
<Size>
<AbsDimension x="205" y="32" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-112" />
<AbsDimension x="18" y="-30" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K273);
</OnLoad>
<OnShow>
VUHDO_lnfPatchFont(self, "Hint"); VUHDO_lnfPatchFont(self, "");
if (VUHDO_CONFIG.CUSTOM_DEBUFF.SELECTED ~= nil) then
self:SetText(VUHDO_CONFIG.CUSTOM_DEBUFF.SELECTED);
end
</OnShow>
<OnTextChanged>
if (self:GetText() ~= "") then
VUHDO_customDebuffUpdateEditBox(self);
end
</OnTextChanged>
</Scripts>
</CheckButton>
</EditBox>
<CheckButton name="$parentColorCheckButton" text="VUHDO_I18N_BAR_COLOR" inherits="VuhDoCheckButtonTemplate">
<Frame name="$parentListLabel" inherits="VuhDoLabelFrameTemplate">
<Size>
<AbsDimension x="120" y="18" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="43" y="-56" />
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer>
<FontString name="$parentLabel" text="VUHDO_I18N_DEBUFF_LIST" justifyH="LEFT" inherits="VuDoDefaultFontTemplate">
</FontString>
</Layer>
</Layers>
</Frame>
<CheckButton name="$parentIconCheckButton" text="VUHDO_I18N_ICON" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-214" />
<AbsDimension x="13" y="-100" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K274);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K273);
</OnLoad>
</Scripts>
</CheckButton>
<Frame name="$parentColorTexture" inherits="VuhDoColorSwatchTexture">
<CheckButton name="$parentStacksCheckButton" text="VUHDO_I18N_APPLIANCES" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="125" y="-214" />
<AbsDimension x="125" y="-100" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K413);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K350);
</OnLoad>
</Scripts>
</Frame>
</CheckButton>
<CheckButton name="$parentAnimateCheckButton" text="VUHDO_I18N_ANIMATION" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-146" />
<AbsDimension x="13" y="-134" />
</Offset>
</Anchor>
</Anchors>
......@@ -256,7 +335,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="125" y="-146" />
<AbsDimension x="125" y="-134" />
</Offset>
</Anchor>
</Anchors>
......@@ -267,151 +346,130 @@
</Scripts>
</CheckButton>
<CheckButton name="$parentStacksCheckButton" text="VUHDO_I18N_APPLIANCES" inherits="VuhDoCheckButtonTemplate">
<CheckButton name="$parentAliveTimeCheckButton" text="VUHDO_I18N_ALIVE_TIME" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="125" y="-112" />
<AbsDimension x="13" y="-168" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K350);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K523);
</OnLoad>
</Scripts>
</CheckButton>
<Button name="$parentSelectComboBox" inherits="VuhDoScrollComboBoxTemplate">
<Size>
<AbsDimension x="180" y="1" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="43" y="-95" />
</Offset>
</Anchor>
</Anchors>
<CheckButton name="$parentFullDurationCheckButton" text="VUHDO_I18N_FULL_DURATION" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="125" y="-168" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnShow>
VUHDO_lnfPatchFont(self, "Text");
VUHDO_setupCustomDebuffsComboModel(self);
</OnShow>
<OnLoad>
self:SetAttribute("custom_function", VUHDO_notifyCustomDebuffSelect);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K528);
</OnLoad>
</Scripts>
</Button>
</CheckButton>
<Frame name="$parentTitleLabel" inherits="VuhDoLabelFrameTemplate">
<Layers>
<Layer>
<FontString name="$parentLabel" text="VUHDO_I18N_STORE_DELETE" inherits="VuDoDefaultTitleFontTemplate">
</FontString>
</Layer>
</Layers>
</Frame>
<CheckButton name="$parentColorCheckButton" text="VUHDO_I18N_BAR_COLOR" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-202" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K274);
</OnLoad>
</Scripts>
</CheckButton>
<Frame name="$parentEditLabel" inherits="VuhDoLabelFrameTemplate">
<Size>
<AbsDimension x="120" y="18" />
</Size>
<Frame name="$parentColorTexture" inherits="VuhDoColorSwatchTexture">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="18" y="-28" />
<AbsDimension x="125" y="-202" />
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer>
<FontString name="$parentLabel" text="VUHDO_I18N_DEBUFF_EDIT_BOX" justifyH="LEFT" inherits="VuDoDefaultFontTemplate">
</FontString>
</Layer>
</Layers>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K413);
</OnLoad>
</Scripts>
</Frame>
<EditBox name="$parentEditBox" inherits="VuhDoEditBoxTemplate">
<Size>
<AbsDimension x="205" y="32" />
</Size>
<CheckButton name="$parentBarGlowCheckButton" text="VUHDO_I18N_BAR_GLOW_COLOR" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="18" y="-36" />
<AbsDimension x="13" y="-236" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnShow>
VUHDO_lnfPatchFont(self, "Hint"); VUHDO_lnfPatchFont(self, "");
if (VUHDO_CONFIG.CUSTOM_DEBUFF.SELECTED ~= nil) then
self:SetText(VUHDO_CONFIG.CUSTOM_DEBUFF.SELECTED);
end
</OnShow>
<OnTextChanged>
if (self:GetText() ~= "") then
VUHDO_customDebuffUpdateEditBox(self);
end
</OnTextChanged>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K274);
</OnLoad>
</Scripts>
</EditBox>
</CheckButton>
<Frame name="$parentListLabel" inherits="VuhDoLabelFrameTemplate">
<Size>
<AbsDimension x="120" y="18" />
</Size>
<Frame name="$parentBarGlowTexture" inherits="VuhDoColorSwatchTexture">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="43" y="-65" />
<AbsDimension x="125" y="-236" />
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer>
<FontString name="$parentLabel" text="VUHDO_I18N_DEBUFF_LIST" justifyH="LEFT" inherits="VuDoDefaultFontTemplate">
</FontString>
</Layer>
</Layers>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K413);
</OnLoad>
</Scripts>
</Frame>
<CheckButton name="$parentAliveTimeCheckButton" text="VUHDO_I18N_ALIVE_TIME" inherits="VuhDoCheckButtonTemplate">
<CheckButton name="$parentIconGlowCheckButton" text="VUHDO_I18N_ICON_GLOW_COLOR" inherits="VuhDoCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-180" />
<AbsDimension x="13" y="-270" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K523);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K274);
</OnLoad>
</Scripts>
</CheckButton>
<CheckButton name="$parentFullDurationCheckButton" text="VUHDO_I18N_FULL_DURATION" inherits="VuhDoCheckButtonTemplate">
<Frame name="$parentIconGlowTexture" inherits="VuhDoColorSwatchTexture">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="125" y="-180" />
<AbsDimension x="125" y="-270" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K528);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K413);
</OnLoad>
</Scripts>
</CheckButton>
</Frame>
<Frame name="$parentSelectLabel" inherits="VuhDoLabelFrameTemplate">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-248" />
<AbsDimension x="13" y="-301" />
</Offset>
</Anchor>
</Anchors>
......@@ -427,7 +485,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-268" />
<AbsDimension x="13" y="-316" />
</Offset>
</Anchor>
</Anchors>
......@@ -437,7 +495,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="125" y="-268" />
<AbsDimension x="125" y="-316" />
</Offset>
</Anchor>
</Anchors>
......@@ -450,7 +508,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="43" y="-323" />
<AbsDimension x="43" y="-347" />
</Offset>
</Anchor>
</Anchors>
......@@ -466,7 +524,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="43" y="-338" />
<AbsDimension x="43" y="-362" />
</Offset>
</Anchor>
</Anchors>
......@@ -484,7 +542,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="13" y="-368" />
<AbsDimension x="13" y="-392" />
</Offset>
</Anchor>
</Anchors>
......@@ -502,7 +560,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="125" y="-368" />
<AbsDimension x="125" y="-392" />
</Offset>
</Anchor>
</Anchors>
......
changelog.txt
View file @ 602bfe97
......@@ -18,6 +18,8 @@ Bugfixes:
Improvements:
-- Added new custom debuff display options 'Bar Glow' and 'Icon Glow'
-- Default color settings under 'VuhDo Options > Colors > States'
-- Minimap icon profile and key layout dropdown menus are now sorted
-- Added new bouquet validator 'Flag: Own Combo Points =='
-- Added new default bouquet 'Player Combo Points'
......@@ -32,6 +34,7 @@ Improvements:
-- Added new default bouquet 'Player Arcane Charges'
-- Added new text provider 'Arcane Charges: <#n>'
-- Added default custom debuffs for Crucible of Storms raid
-- Added new slash command "/vd about"
--------------------------------------------------------------
......
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