Skip to content

GitLab

Commit 3ca9dc13 authored by Ivaria's avatar Ivaria
Browse files

Fixed display of GCD bar for some classes and specs - needs completion. Fixed... 

Fixed display of GCD bar for some classes and specs - needs completion. Fixed absorption tracking for 'Befouled' and 'Touch of Harm'. Added absorption tracking for Mythic+ affix debuff 'Overflowing'.
parent 8cd86b49
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 25 deletions
VuhDoConstSpells.lua
View file @ 3ca9dc13
......@@ -346,6 +346,7 @@ VUHDO_SPELL_ID.DEBUFF_BEFOULED = VUHDO_getSpellInfo(189030);
VUHDO_SPELL_ID.DEBUFF_TOUCH_OF_HARM = VUHDO_getSpellInfo(180164);
VUHDO_SPELL_ID.DEBUFF_MARK_OF_DOOM = VUHDO_getSpellInfo(181099);
VUHDO_SPELL_ID.DEBUFF_MOMENTUM = VUHDO_getSpellInfo(198108);
VUHDO_SPELL_ID.DEBUFF_OVERFLOWING = VUHDO_getSpellInfo(221772);
--
......
VuhDoEventHandler.lua
View file @ 3ca9dc13
......@@ -1181,13 +1181,17 @@ function VUHDO_OnUpdate(_, aTimeDelta)
end
-- Update GCD-Bar
if VUHDO_GCD_UPDATE and VUHDO_GCD_SPELLS[VUHDO_PLAYER_CLASS] then
tGcdStart, tGcdDuration = GetSpellCooldown(VUHDO_GCD_SPELLS[VUHDO_PLAYER_CLASS]);
if (tGcdDuration or 0) == 0 then
VuhDoGcdStatusBar:SetValue(0);
VUHDO_GCD_UPDATE = false;
else
VuhDoGcdStatusBar:SetValue((tGcdDuration - (GetTime() - tGcdStart)) / tGcdDuration);
if VUHDO_GCD_UPDATE then
local tGcdSpell = VUHDO_GCD_SPELLS[VUHDO_PLAYER_CLASS][GetSpecialization() or 1];
if tGcdSpell then
tGcdStart, tGcdDuration = GetSpellCooldown(tGcdSpell);
if (tGcdDuration or 0) == 0 then
VuhDoGcdStatusBar:SetValue(0);
VUHDO_GCD_UPDATE = false;
else
VuhDoGcdStatusBar:SetValue((tGcdDuration - (GetTime() - tGcdStart)) / tGcdDuration);
end
end
end
......
VuhDoShieldAbsorb.lua
View file @ 3ca9dc13
......@@ -39,11 +39,14 @@ local VUHDO_ABSORB_DEBUFFS = {
[110214] = function(aUnit) return 280000, 2 * 60; end, -- Consuming Shroud
-- 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
[189030] = function(aUnit) return select(17, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_BEFOULED)), 10 * 60; end, -- Fel Lord Zakuun
[189031] = function(aUnit) return select(17, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_BEFOULED)), 10 * 60; end, -- Fel Lord Zakuun
[189032] = function(aUnit) return select(17, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_BEFOULED)), 10 * 60; end, -- Fel Lord Zakuun
[180164] = function(aUnit) return select(17, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_TOUCH_OF_HARM)), 10 * 60; end, -- Tyrant Velhari
[180166] = function(aUnit) return select(17, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_TOUCH_OF_HARM)), 10 * 60; end, -- Tyrant Velhari
-- Patch 7.0 - Legion
[221772] = function(aUnit) return select(17, UnitDebuff(aUnit, VUHDO_SPELL_ID.DEBUFF_OVERFLOWING)), 10 * 60; end, -- Mythic+ affix
--[79105] = function(aUnit) return 280000, 60 * 60; end, -- @TESTING PW:F
};
......
VuhDoSpellEstimator.lua
View file @ 3ca9dc13
......@@ -6,19 +6,66 @@ VUHDO_SPELL_TYPE_HOT = 1; -- Spell type heal over time
VUHDO_GCD_SPELLS = {
-- TODO: many of these GCD spell IDs are now deprecated, replace them
["WARRIOR"] = GetSpellInfo(78), -- Heroic Strike
["ROGUE"] = GetSpellInfo(1752), -- Sinister Strike
["HUNTER"] = GetSpellInfo(1494), -- Track beasts
["PALADIN"] = VUHDO_SPELL_ID.FLASH_OF_LIGHT, -- Flash of Light
["MAGE"] = GetSpellInfo(133), -- Fire Ball
["WARLOCK"] = GetSpellInfo(686), -- Shadow Bolt
["SHAMAN"] = GetSpellInfo(8004), -- Healing Surge
["DRUID"] = VUHDO_SPELL_ID.REJUVENATION, -- Rejuvenation
["PRIEST"] = VUHDO_SPELL_ID.BUFF_POWER_WORD_FORTITUDE, -- Power Word: Fortitude
["DEATHKNIGHT"] = GetSpellInfo(48266), -- Blood Presence
["MONK"] = GetSpellInfo(100780), -- Jab
["DEMONHUNTER"] = GetSpellInfo(162243), -- Demon's Bite
["WARRIOR"] = {
[1] = GetSpellInfo(78), -- Heroic Strike
[2] = GetSpellInfo(78), -- Heroic Strike
[3] = GetSpellInfo(78), -- Heroic Strike
},
["ROGUE"] = {
[1] = GetSpellInfo(1752), -- Sinister Strike
[2] = GetSpellInfo(1752), -- Sinister Strike
[3] = GetSpellInfo(1752), -- Sinister Strike
},
["HUNTER"] = {
[1] = GetSpellInfo(1494), -- Track beasts
[2] = GetSpellInfo(1494), -- Track beasts
[3] = GetSpellInfo(1494), -- Track beasts
},
["PALADIN"] = {
[1] = VUHDO_SPELL_ID.FLASH_OF_LIGHT, -- Flash of Light
[2] = VUHDO_SPELL_ID.FLASH_OF_LIGHT, -- Flash of Light
[3] = VUHDO_SPELL_ID.FLASH_OF_LIGHT, -- Flash of Light
},
["MAGE"] = {
[1] = GetSpellInfo(133), -- Fire Ball
[2] = GetSpellInfo(133), -- Fire Ball
[3] = GetSpellInfo(133), -- Fire Ball
},
["WARLOCK"] = {
[1] = GetSpellInfo(686), -- Shadow Bolt
[2] = GetSpellInfo(686), -- Shadow Bolt
[3] = GetSpellInfo(686), -- Shadow Bolt
},
["SHAMAN"] = {
[1] = GetSpellInfo(8004), -- Healing Surge
[2] = GetSpellInfo(8004), -- Healing Surge
[3] = GetSpellInfo(8004), -- Healing Surge
},
["DRUID"] = {
[1] = VUHDO_SPELL_ID.REJUVENATION, -- Rejuvenation
[2] = VUHDO_SPELL_ID.REJUVENATION, -- Rejuvenation
[3] = VUHDO_SPELL_ID.REJUVENATION, -- Rejuvenation
[4] = VUHDO_SPELL_ID.REJUVENATION, -- Rejuvenation
},
["PRIEST"] = {
[1] = VUHDO_SPELL_ID.DISPEL_MAGIC, -- Dispel Magic
[2] = VUHDO_SPELL_ID.DISPEL_MAGIC, -- Dispel Magic
[3] = VUHDO_SPELL_ID.DISPEL_MAGIC, -- Dispel Magic
},
["DEATHKNIGHT"] = {
[1] = GetSpellInfo(48266), -- Blood Presence
[2] = GetSpellInfo(48266), -- Blood Presence
[3] = GetSpellInfo(48266), -- Blood Presence
},
["MONK"] = {
[1] = GetSpellInfo(100780), -- Jab
[2] = GetSpellInfo(100780), -- Jab
[3] = GetSpellInfo(100780), -- Jab
},
["DEMONHUNTER"] = {
[1] = GetSpellInfo(162243), -- Demon's Bite
[2] = GetSpellInfo(162243), -- Demon's Bite
},
};
......
changelog.txt
View file @ 3ca9dc13
......@@ -18,6 +18,8 @@ Bugfixes:
-- Mage 'Remove Curse' is no longer a valid dispel
-- Updated all class dispel abilities
-- Updated all default spell bindings for healer dispels
-- Fixed display of GCD bar
-- Fixed absorption tracking for 'Befouled' and 'Touch of Harm'
Improvements:
......@@ -25,6 +27,7 @@ Improvements:
-- Bar health text now abbreviates million as '<n>M'
-- Tooltip text now abbreviates millions as '<n>M'
-- Added default custom debuffs for Emerald Nightmare raid encounters
-- Added absorption tracking for Mythic+ affix debuff 'Overflowing'
--------------------------------------------------------------
......
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