From a13bc630be296bd2f7716cc777ca02db9542d496 Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Fri, 21 May 2021 15:12:41 -0300 Subject: [PATCH] Warlock fixes --- Libs/LibRaidStatus/LibRaidStatus.lua | 2 +- Libs/LibRaidStatus/ThingsToMantain.lua | 1 + boot.lua | 9 +++++++-- core/gears.lua | 13 ++++++++++--- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Libs/LibRaidStatus/LibRaidStatus.lua b/Libs/LibRaidStatus/LibRaidStatus.lua index 26a0ce89c..8f98c5281 100644 --- a/Libs/LibRaidStatus/LibRaidStatus.lua +++ b/Libs/LibRaidStatus/LibRaidStatus.lua @@ -1,6 +1,6 @@ local major = "LibRaidStatus-1.0" -local CONST_LIB_VERSION = 15 +local CONST_LIB_VERSION = 16 LIB_RAID_STATUS_CAN_LOAD = false --declae the library within the LibStub diff --git a/Libs/LibRaidStatus/ThingsToMantain.lua b/Libs/LibRaidStatus/ThingsToMantain.lua index dc16a8267..42530d8f6 100644 --- a/Libs/LibRaidStatus/ThingsToMantain.lua +++ b/Libs/LibRaidStatus/ThingsToMantain.lua @@ -629,6 +629,7 @@ LIB_RAID_STATUS_COOLDOWNS_INFO = { [30283] = {cooldown = 60, duration = 3, talent = false, charges = 1, class = "WARLOCK", type = 5}, --Shadowfury [333889] = {cooldown = 180, duration = 15, talent = false, charges = 1, class = "WARLOCK", type = 5}, --Fel Domination --[6789] = {cooldown = 45, duration = 3, talent = 19291, charges = 1, class = "WARLOCK", type = 5}, --Mortal Coil (talent) + [5484] = {cooldown = 40, duration = 20, talent = 23465, charges = 1, class = "WARLOCK", type = 5}, --Howl of Terror (talent) --> shaman [198067] = {cooldown = 150, duration = 30, talent = false, charges = 1, class = "SHAMAN", type = 1}, --Fire Elemental diff --git a/boot.lua b/boot.lua index b38b03d82..4bd623bb6 100644 --- a/boot.lua +++ b/boot.lua @@ -6,8 +6,8 @@ local version, build, date, tocversion = GetBuildInfo() - _detalhes.build_counter = 8501 - _detalhes.alpha_build_counter = 8501 --if this is higher than the regular counter, use it instead + _detalhes.build_counter = 8513 + _detalhes.alpha_build_counter = 8513 --if this is higher than the regular counter, use it instead _detalhes.dont_open_news = true _detalhes.game_version = version _detalhes.userversion = version .. _detalhes.build_counter @@ -31,6 +31,11 @@ do local Loc = _G.LibStub("AceLocale-3.0"):GetLocale( "Details" ) local news = { + {"v9.0.5.8502.144", "May 21th, 2021"}, + "Added options to change the color of each team during an arena match.", + "Fixed One Segment Battleground.", + "Fixed an error with Howl of Terror on Demo Warlocks.", + {"v9.0.5.8501.144", "May 17th, 2021"}, "Complete overhaul and rerritten on Fade In and Out animations, this should fix all bugs related to animations not being consistent.", "Complete overhaul on the broadcaster tool for arenas 'Current DPS'. It shows now a bar indicating the dps of both teams.", diff --git a/core/gears.lua b/core/gears.lua index 7c3178df1..6683a6e4d 100644 --- a/core/gears.lua +++ b/core/gears.lua @@ -6,9 +6,10 @@ local UnitGUID = UnitGUID local UnitGroupRolesAssigned = DetailsFramework.UnitGroupRolesAssigned local select = select local floor = floor - local GetNumGroupMembers = GetNumGroupMembers +local CONST_INSPECT_ACHIEVEMENT_DISTANCE = 1 --Compare Achievements, 28 yards + local ItemUpgradeInfo = LibStub ("LibItemUpgradeInfo-1.0") --local LibGroupInSpecT = LibStub ("LibGroupInSpecT-1.1") --disabled due to classic wow local ItemUpgradeInfo @@ -1906,7 +1907,7 @@ function ilvl_core:CalcItemLevel (unitid, guid, shout) unitid = unitid [1] end - if (CheckInteractDistance (unitid, 1)) then + if (unitid and CanInspect(unitid) and UnitPlayerControlled(unitid) and CheckInteractDistance(unitid, CONST_INSPECT_ACHIEVEMENT_DISTANCE)) then --> 16 = all itens including main and off hand local item_amount = 16 @@ -2049,11 +2050,17 @@ end function ilvl_core:GetItemLevel (unitid, guid, is_forced, try_number) + --disable for timewalk wow ~timewalk + if (DetailsFramework.IsTimewalkWoW()) then + return + end + --> ddouble check if (not is_forced and (UnitAffectingCombat ("player") or InCombatLockdown())) then return end - if (not unitid or not CanInspect (unitid) or not CheckInteractDistance (unitid, 1)) then + + if (not unitid or not CanInspect(unitid) or not UnitPlayerControlled(unitid) or not CheckInteractDistance(unitid, CONST_INSPECT_ACHIEVEMENT_DISTANCE)) then if (is_forced) then try_number = try_number or 0 if (try_number > 18) then