Commit fac9dd6b authored by Ivaria's avatar Ivaria
Browse files

Fixed muting of SFX and Error Speech when auto-firing spells/trinkets. Added...

Fixed muting of SFX and Error Speech when auto-firing spells/trinkets.  Added remaining spell IDs for debuff absorb Touch of Harm and Befouled.
parent e4af3e47
......@@ -84,7 +84,7 @@ local UnitIsDeadOrGhost = UnitIsDeadOrGhost;
local UnitIsFeignDeath = UnitIsFeignDeath;
local UnitExists = UnitExists;
local UnitHealth = UnitHealth;
local UnitHealthMax = UnitHealthMax;
--local UnitHealthMax = UnitHealthMax;
local string = string;
local UnitIsAFK = UnitIsAFK;
local UnitIsConnected = UnitIsConnected;
......
......@@ -111,8 +111,9 @@ local function VUHDO_animateDebuffIcon(aButton, anIconInfo, aNow, anIconIndex, a
if tIsAnim then VUHDO_setDebuffAnimation(1.2); end
elseif VUHDO_getBarIcon(aButton, anIconIndex):GetTexture() ~= anIconInfo[1] then
VUHDO_getBarIcon(aButton, anIconIndex):SetTexture(anIconInfo[1]);
VUHDO_getBarIconFrame(aButton, anIconIndex):SetAlpha(1);
VUHDO_updateHealthBarsFor(aUnit, VUHDO_UPDATE_RANGE);
end
if tIsAnim then
......
......@@ -7,7 +7,7 @@ local VUHDO_TOT_GUIDS = { };
-------------------------------------------------
local UnitClass = UnitClass;
local UnitPowerType = UnitPowerType;
local UnitHealthMax = UnitHealthMax;
--local UnitHealthMax = UnitHealthMax;
local UnitHealth = UnitHealth;
local UnitName = UnitName;
local UnitMana = UnitMana;
......
......@@ -343,8 +343,8 @@ VUHDO_SPELL_ID.DEBUFF_PHASE_SHIFT = VUHDO_getSpellInfo(8611);
VUHDO_SPELL_ID.DEBUFF_SONIC_BURST = VUHDO_getSpellInfo(64140);
VUHDO_SPELL_ID.DEBUFF_MARK_OF_THE_NECROMANCER = VUHDO_getSpellInfo(184450);
VUHDO_SPELL_ID.DEBUFF_BEFOULED = VUHDO_getSpellInfo(189030);
VUHDO_SPELL_ID.DEBUFF_TOUCH_OF_HARM = VUHDO_getSpellInfo(180166);
VUHDO_SPELL_ID.DEBUFF_TOUCH_OF_HARM = VUHDO_getSpellInfo(180164);
VUHDO_SPELL_ID.DEBUFF_MARK_OF_DOOM = VUHDO_getSpellInfo(181099);
--
......
......@@ -437,6 +437,9 @@ end
local VUHDO_CUSTOM_DEBUFF_ADD_ONLY_BY_ID = {
[VUHDO_SPELL_ID.DEBUFF_MARK_OF_THE_NECROMANCER] = true,
[VUHDO_SPELL_ID.DEBUFF_MARK_OF_DOOM] = true,
[VUHDO_SPELL_ID.DEBUFF_BEFOULED] = true,
[VUHDO_SPELL_ID.DEBUFF_TOUCH_OF_HARM] = true,
};
--
......@@ -1259,9 +1262,6 @@ function VUHDO_loadDefaultConfig()
181306, -- Explosive Burst
181321, -- Fel Touch
-- Hellfire High Council
184450, -- Mark of the Necromancer Purple
185065, -- Mark of the Necromancer Yellow
185066, -- Mark of the Necromancer Red
184358, -- Fel Rage
-- Killrogg Deadeye
180372, -- Heart Seeker
......@@ -1281,14 +1281,10 @@ function VUHDO_loadDefaultConfig()
-- Fel Lord Zakuun
181508, -- Seed of Destruction
179620, -- Fel Crystal
189030, -- Befouled Red
189031, -- Befouled Yellow
189032, -- Befouled Green
-- Xhul'horac
186490, -- Chains of Fel
186546, -- Black Hole
-- Tyrant Velhari
180166, -- Touch of Harm
180128, -- Edict of Condemnation
180526, -- Font of Corruption
-- Mannoroth
......@@ -1309,8 +1305,19 @@ function VUHDO_loadDefaultConfig()
-- 6.2 - WoD - Hellfire Citadel - part 2
VUHDO_addCustomSpellIds(27,
-- [[ Hellfire Citadel ]]
-- Hellfire High Council
184450, -- Mark of the Necromancer Purple
185065, -- Mark of the Necromancer Yellow
185066, -- Mark of the Necromancer Red
-- Socrethar the Eternal
184124 -- Gift of the Man'ari
184124, -- Gift of the Man'ari
-- Fel Lord Zakuun
189030, -- Befouled Red
189031, -- Befouled Yellow
189032, -- Befouled Green
-- Tyrant Velhari
180164, -- Touch of Harm
180166 -- Touch of Harm
);
for _, tName in pairs(VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED"]) do
......
......@@ -584,7 +584,8 @@ function VUHDO_OnEvent(_, anEvent, anArg1, anArg2, anArg3, anArg4, anArg5, anArg
if VUHDO_RAID then VUHDO_readyCheckEnds(); end
elseif "CVAR_UPDATE" == anEvent then
VUHDO_IS_SFX_ENABLED = tonumber(GetCVar("Sound_EnableErrorSpeech")) == 1;
VUHDO_IS_SFX_ENABLED = tonumber(GetCVar("Sound_EnableSFX")) == 1;
VUHDO_IS_SOUND_ERRORSPEECH_ENABLED = tonumber(GetCVar("Sound_EnableErrorSpeech")) == 1;
if VUHDO_VARIABLES_LOADED then VUHDO_reloadUI(false); end
elseif "INSPECT_READY" == anEvent then
......
VUHDO_IS_SFX_ENABLED = true;
VUHDO_IS_SOUND_ERRORSPEECH_ENABLED = true;
local VUHDO_RAID;
local VUHDO_RAID_NAMES;
......@@ -98,6 +99,10 @@ local function VUHDO_getFireText(anAction)
if not sFireText then
sFireText = "";
if VUHDO_IS_SFX_ENABLED then
sFireText = sFireText .. "/console Sound_EnableSFX 0\n";
end
if VUHDO_IS_SOUND_ERRORSPEECH_ENABLED then
sFireText = sFireText .. "/console Sound_EnableErrorSpeech 0\n";
end
......@@ -121,10 +126,14 @@ local function VUHDO_getFireText(anAction)
sFireText = sFireText .. VUHDO_getInstantFireText(2);
-- Ton wieder an
if VUHDO_IS_SFX_ENABLED then
if VUHDO_IS_SOUND_ERRORSPEECH_ENABLED then
sFireText = sFireText .. "/console Sound_EnableErrorSpeech 1\n";
end
if VUHDO_IS_SFX_ENABLED then
sFireText = sFireText .. "/console Sound_EnableSFX 1\n";
end
sFireText = sFireText .. "/run UIErrorsFrame:Clear()\n";
end
......@@ -445,7 +454,8 @@ function VUHDO_initKeyboardMacros()
local tKey1, tKey2;
local tBindPrefix = "VUHDO_KEY_ASSIGN_";
VUHDO_IS_SFX_ENABLED = tonumber(GetCVar("Sound_EnableErrorSpeech")) == 1;
VUHDO_IS_SFX_ENABLED = tonumber(GetCVar("Sound_EnableSFX")) == 1;
VUHDO_IS_SOUND_ERRORSPEECH_ENABLED = tonumber(GetCVar("Sound_EnableErrorSpeech")) == 1;
if not VUHDO_SPELLS_KEYBOARD then return; end
......
......@@ -48,6 +48,9 @@ local VUHDO_ABSORB_DEBUFFS = {
-- Patch 6.2 - Hellfire Citadel
[189030] = function(aUnit) return select(15, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_BEFOULED)), 10 * 60; end, -- Fel Lord Zakuun
[189031] = function(aUnit) return select(15, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_BEFOULED)), 10 * 60; end, -- Fel Lord Zakuun
[189032] = function(aUnit) return select(15, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_BEFOULED)), 10 * 60; end, -- Fel Lord Zakuun
[180164] = function(aUnit) return select(15, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_TOUCH_OF_HARM)), 10 * 60; end, -- Tyrant Velhari
[180166] = function(aUnit) return select(15, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_TOUCH_OF_HARM)), 10 * 60; end, -- Tyrant Velhari
--[79105] = function(aUnit) return 280000, 60 * 60; end, -- @TESTING PW:F
......
......@@ -10,7 +10,7 @@ local UnitPowerType = UnitPowerType;
local UnitPower = UnitPower;
local UnitPowerMax = UnitPowerMax;
local UnitHealth = UnitHealth;
local UnitHealthMax = UnitHealthMax;
--local UnitHealthMax = UnitHealthMax;
local UnitIsConnected = UnitIsConnected;
local UnitIsAFK = UnitIsAFK;
local UnitIsDND = UnitIsDND;
......
......@@ -19,6 +19,7 @@ Bugfixes:
-- If you are upgrading from v3.68 please note Shadow of Death needs to
-- be manually deleted from the custom debuff list
-- Fixed localization bug when adding default custom debuffs by spell ID
-- Fixed muting of SFX and Error Speech when auto-firing spells/trinkets
Improvements:
......
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