From d82787f5a69ad78c435129b8427d34b221a3b2b7 Mon Sep 17 00:00:00 2001 From: MysticalOS Date: Mon, 22 Apr 2024 14:39:06 -0400 Subject: [PATCH] Fix luaLS errors in 21 files --- DBM-Raids-BfA/CrucibleofStorms/Uunat.lua | 5 +-- .../EternalPalace/AbyssalCommanderSivara.lua | 10 +++--- .../EternalPalace/LadyPriscillaAshvane.lua | 4 +-- DBM-Raids-BfA/EternalPalace/QueenAzshara.lua | 34 ++++++++++++------- .../EternalPalace/RadianceofAzshara.lua | 6 ++-- .../EternalPalace/TheQueensCourt.lua | 2 +- DBM-Raids-BfA/Nyalotha/Drestagath.lua | 2 +- .../Nyalotha/IlgynothCorruptionReborn.lua | 4 +-- DBM-Raids-BfA/Nyalotha/NZothTheCorruptor.lua | 16 ++++++--- DBM-Raids-BfA/Nyalotha/TheProphetSkitra.lua | 6 ++-- DBM-Raids-BfA/Nyalotha/Vexiona.lua | 2 +- DBM-Raids-BfA/Uldir/Mythrax.lua | 2 +- DBM-Raids-BfA/Uldir/Vectis.lua | 13 ++++--- DBM-Raids-BfA/Uldir/Zekvhozj.lua | 4 +-- DBM-Raids-BfA/Uldir/Zul.lua | 14 ++++---- DBM-Raids-BfA/localization.cn.lua | 2 +- DBM-Raids-BfA/localization.en.lua | 2 +- DBM-Raids-BfA/localization.es.lua | 2 +- DBM-Raids-BfA/localization.it.lua | 2 +- DBM-Raids-BfA/localization.ru.lua | 2 +- DBM-Raids-BfA/localization.tw.lua | 2 +- 21 files changed, 78 insertions(+), 58 deletions(-) diff --git a/DBM-Raids-BfA/CrucibleofStorms/Uunat.lua b/DBM-Raids-BfA/CrucibleofStorms/Uunat.lua index c3b7329..7e35f84 100644 --- a/DBM-Raids-BfA/CrucibleofStorms/Uunat.lua +++ b/DBM-Raids-BfA/CrucibleofStorms/Uunat.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: dbm-sync-checker local mod = DBM:NewMod(2332, "DBM-Raids-BfA", 3, 1177) local L = mod:GetLocalizedStrings() @@ -65,7 +66,7 @@ local specWarnUnstableResonanceVoid = mod:NewSpecialWarningYouPos(293663, nil, local specWarnUnstableResonanceOcean = mod:NewSpecialWarningYouPos(293662, nil, nil, nil, 1, 6) local specWarnUnstableResonanceStorm = mod:NewSpecialWarningYouPos(293661, nil, nil, nil, 1, 6) local yellUnstableResonanceSign = mod:NewPosYell(293653, DBM_CORE_L.AUTO_YELL_CUSTOM_POSITION) -local yellUnstableResonanceRelic = mod:NewPosYell("ej18970", DBM_CORE_L.AUTO_YELL_CUSTOM_POSITION2, nil, nil, "YELL") +local yellUnstableResonanceRelic = mod:NewShortPosYell("ej18970", nil, nil, nil, "YELL") --Stage One: His All-Seeing Eyes local specWarnTouchoftheEnd = mod:NewSpecialWarningYou(284851, nil, nil, nil, 1, 2) local specWarnTouchoftheEndTaunt = mod:NewSpecialWarningTaunt(284851, nil, nil, nil, 1, 6) @@ -495,7 +496,7 @@ function mod:SPELL_SUMMON(args) local UnitID = "nameplate"..i local GUID = UnitGUID(UnitID) local cid = self:GetCIDFromGUID(GUID) - if cid == 139059 then + if GUID and cid == 139059 then local unitPower = UnitPower(UnitID) if not unitTracked[GUID] then unitTracked[GUID] = "None" end if (unitPower < 30) then diff --git a/DBM-Raids-BfA/EternalPalace/AbyssalCommanderSivara.lua b/DBM-Raids-BfA/EternalPalace/AbyssalCommanderSivara.lua index 4e08f84..1763fa4 100644 --- a/DBM-Raids-BfA/EternalPalace/AbyssalCommanderSivara.lua +++ b/DBM-Raids-BfA/EternalPalace/AbyssalCommanderSivara.lua @@ -47,10 +47,10 @@ local specWarnFrozenBlood = mod:NewSpecialWarningKeepMove(295795, nil, nil, n local specWarnVenomousBlood = mod:NewSpecialWarningStopMove(295796, nil, nil, nil, 1, 2) local specWarnOverwhelmingBarrage = mod:NewSpecialWarningDodge(296551, nil, nil, nil, 3, 2) local specWarnOverflowingChill = mod:NewSpecialWarningMoveAway(295348, nil, nil, nil, 1, 2) -local yellOverflowingChill = mod:NewPosYell(295348, DBM_CORE_L.AUTO_YELL_CUSTOM_POSITION2) +local yellOverflowingChill = mod:NewShortPosYell(295348) local yellOverflowingChillFades = mod:NewIconFadesYell(295348) local specWarnOverflowingVenom = mod:NewSpecialWarningMoveAway(295421, nil, nil, nil, 1, 2) -local yellOverflowingVenom = mod:NewPosYell(295421, DBM_CORE_L.AUTO_YELL_CUSTOM_POSITION2) +local yellOverflowingVenom = mod:NewShortPosYell(295421) local yellOverflowingVenomFades = mod:NewIconFadesYell(295421) local specWarnInversion = mod:NewSpecialWarningMoveAway(295791, nil, nil, nil, 3, 2) local specWarnInversionSicknessFrost = mod:NewSpecialWarningYou(300882, nil, nil, nil, 1, 2)--Separate warning in case user wants to customize sound based on type @@ -58,12 +58,12 @@ local specWarnInversionSicknessToxic = mod:NewSpecialWarningYou(300883, nil, nil local yellInversionSickness = mod:NewYell(300882) local yellInversionSicknessFades = mod:NewIconFadesYell(300882) local specWarnFrostJav = mod:NewSpecialWarningYou(295606, nil, nil, nil, 1, 2) -local yellFrostJav = mod:NewPosYell(295606, DBM_CORE_L.AUTO_YELL_CUSTOM_POSITION2) +local yellFrostJav = mod:NewShortPosYell(295606) local specWarnToxicJav = mod:NewSpecialWarningYou(295607, nil, nil, nil, 1, 2) -local yellToxicJav = mod:NewPosYell(295607, DBM_CORE_L.AUTO_YELL_CUSTOM_POSITION2) +local yellToxicJav = mod:NewShortPosYell(295607) local specWarnGTFO = mod:NewSpecialWarningGTFO(300961, nil, nil, nil, 1, 8) -local timerCrushingReverbCD = mod:NewCDTimer(22.3, 295332, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON, nil, mod:IsMelee() and 2, 4) +local timerCrushingReverbCD = mod:NewCDTimer(22.3, 295332, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON, nil, mod:IsMelee() and 2 or nil, 4) local timerOverwhelmingBarrageCD = mod:NewCDTimer(40, 296551, nil, nil, nil, 2, nil, DBM_COMMON_L.DEADLY_ICON, nil, 1, 4) local timerOverflowCD = mod:NewCDTimer(40.1, 295346, nil, nil, nil, 3)--31.6 previously, but 40 as of mythic testing local timerInversionCD = mod:NewCDTimer(72.9, 295791, nil, nil, nil, 2, nil, DBM_COMMON_L.HEROIC_ICON, nil, 3, 4) diff --git a/DBM-Raids-BfA/EternalPalace/LadyPriscillaAshvane.lua b/DBM-Raids-BfA/EternalPalace/LadyPriscillaAshvane.lua index ac3b56a..92e37c2 100644 --- a/DBM-Raids-BfA/EternalPalace/LadyPriscillaAshvane.lua +++ b/DBM-Raids-BfA/EternalPalace/LadyPriscillaAshvane.lua @@ -47,7 +47,7 @@ local specWarnGTFO = mod:NewSpecialWarningGTFO(296752, nil, nil, nil, 1, 8) --local timerCoralGrowthCD = mod:NewCDCountTimer(30, 296555, nil, nil, nil, 3, nil, nil, nil, 1, 4) local timerRipplingwaveCD = mod:NewCDCountTimer(35, 296688, nil, nil, nil, 3, nil, nil, nil, 3, 4) -local timerBarnacleBashCD = mod:NewCDCountTimer(15, 296725, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON, nil, mod:IsTank() and 2, 4) +local timerBarnacleBashCD = mod:NewCDCountTimer(15, 296725, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON, nil, mod:IsTank() and 2 or nil, 4) local timerBrinyBubbleCD = mod:NewCDCountTimer(15, 297324, nil, nil, nil, 3, nil, DBM_COMMON_L.TANK_ICON..DBM_COMMON_L.DAMAGE_ICON, nil, 2, 4) local timerUpsurgeCD = mod:NewCDCountTimer(15.3, 298055, nil, nil, nil, 3) --Stage 2 @@ -293,7 +293,7 @@ function mod:SPELL_AURA_APPLIED(args) end end elseif spellId == 297397 or spellId == 302989 then--Briny targetting spell - warnBrinyBubble:CombinedShow(0.3, args.destname) + warnBrinyBubble:CombinedShow(0.3, args.destName) if args:IsPlayer() then specWarnBrinyBubbleNear:Cancel() specWarnBrinyBubbleNear:CancelVoice() diff --git a/DBM-Raids-BfA/EternalPalace/QueenAzshara.lua b/DBM-Raids-BfA/EternalPalace/QueenAzshara.lua index 210cdfb..d5ff18b 100644 --- a/DBM-Raids-BfA/EternalPalace/QueenAzshara.lua +++ b/DBM-Raids-BfA/EternalPalace/QueenAzshara.lua @@ -247,26 +247,30 @@ do if mod.Options.ShowTimeNotStacks then --Higher Performance check that scans all debuff remaining times for uId in DBM:GetGroupMembers() do - if not (UnitGroupRolesAssigned(uId) == "TANK" or GetPartyAssignment("MAINTANK", uId, 1) or UnitIsDeadOrGhost(uId)) then--Exclude tanks and dead + if not (UnitGroupRolesAssigned(uId) == "TANK" or GetPartyAssignment("MAINTANK", uId, true) or UnitIsDeadOrGhost(uId)) then--Exclude tanks and dead local unitName = DBM:GetUnitFullName(uId) + if unitName then local spellName2, _, _, _, _, expireTime2 = DBM:UnitDebuff(uId, 298569) - if spellName2 and expireTime2 then - local remaining2 = expireTime2-GetTime() - tempLines[unitName] = math.floor(remaining2) - tempLinesSorted[#tempLinesSorted + 1] = unitName - else - tempLines[unitName] = 0 - tempLinesSorted[#tempLinesSorted + 1] = unitName + if spellName2 and expireTime2 then + local remaining2 = expireTime2-GetTime() + tempLines[unitName] = math.floor(remaining2) + tempLinesSorted[#tempLinesSorted + 1] = unitName + else + tempLines[unitName] = 0 + tempLinesSorted[#tempLinesSorted + 1] = unitName + end end end end else --More performance friendly check that just returns all player stacks (the default option) for uId in DBM:GetGroupMembers() do - if not (UnitGroupRolesAssigned(uId) == "TANK" or GetPartyAssignment("MAINTANK", uId, 1) or UnitIsDeadOrGhost(uId)) then--Exclude tanks and dead + if not (UnitGroupRolesAssigned(uId) == "TANK" or GetPartyAssignment("MAINTANK", uId, true) or UnitIsDeadOrGhost(uId)) then--Exclude tanks and dead local unitName = DBM:GetUnitFullName(uId) - tempLines[unitName] = drainedSoulStacks[unitName] or 0 - tempLinesSorted[#tempLinesSorted + 1] = unitName + if unitName then + tempLines[unitName] = drainedSoulStacks[unitName] or 0 + tempLinesSorted[#tempLinesSorted + 1] = unitName + end end end end @@ -366,7 +370,9 @@ function mod:OnCombatStart(delay) end for uId in DBM:GetGroupMembers() do local unitName = DBM:GetUnitFullName(uId) - drainedSoulStacks[unitName] = 0 + if unitName then + drainedSoulStacks[unitName] = 0 + end end if self.Options.InfoFrame then DBM.InfoFrame:SetHeader(OVERVIEW) @@ -391,7 +397,9 @@ function mod:OnTimerRecovery() for uId in DBM:GetGroupMembers() do local _, _, currentStack = DBM:UnitDebuff(uId, 298569) local unitName = DBM:GetUnitFullName(uId) - drainedSoulStacks[unitName] = currentStack or 0 + if unitName then + drainedSoulStacks[unitName] = currentStack or 0 + end if UnitIsUnit(uId, "player") and currentStack then playerSoulDrained = true end diff --git a/DBM-Raids-BfA/EternalPalace/RadianceofAzshara.lua b/DBM-Raids-BfA/EternalPalace/RadianceofAzshara.lua index e78e40b..ab08d18 100644 --- a/DBM-Raids-BfA/EternalPalace/RadianceofAzshara.lua +++ b/DBM-Raids-BfA/EternalPalace/RadianceofAzshara.lua @@ -40,7 +40,7 @@ local yellArcaneBomb = mod:NewPosYell(296737) local yellArcaneBombFades = mod:NewIconFadesYell(296737) local specWarnUnshackledPower = mod:NewSpecialWarningCount(296894, nil, nil, nil, 2, 2) -local timerTideFistCD = mod:NewNextCountTimer(58.2, 296546, nil, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON, nil, mod:IsTank() and 2, 4) +local timerTideFistCD = mod:NewNextCountTimer(58.2, 296546, nil, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON, nil, mod:IsTank() and 2 or nil, 4) local timerArcanadoBurstCD = mod:NewNextCountTimer(58.2, 296430, nil, nil, nil, 3) local timerArcaneBombCD = mod:NewNextCountTimer(58.2, 296737, nil, "-Tank", nil, 3, nil, nil, nil, 3, 4) local timerUnshacklingPowerCD = mod:NewNextCountTimer(58.2, 296894, nil, nil, nil, 2, nil, DBM_COMMON_L.HEALER_ICON, nil, 1, 4) @@ -160,7 +160,7 @@ function mod:SPELL_AURA_APPLIED(args) yellArcaneBombFades:Countdown(spellId, nil, icon) end if self.Options.SetIconOnArcaneBomb then - self:SetIcon(args.destname, self.vb.arcaneBombicon) + self:SetIcon(args.destName, self.vb.arcaneBombicon) end self.vb.arcaneBombicon = self.vb.arcaneBombicon + 1 end @@ -173,7 +173,7 @@ function mod:SPELL_AURA_REMOVED(args) yellArcaneBombFades:Cancel() end if self.Options.SetIconOnArcaneBomb then - self:SetIcon(args.destname, 0) + self:SetIcon(args.destName, 0) end end end diff --git a/DBM-Raids-BfA/EternalPalace/TheQueensCourt.lua b/DBM-Raids-BfA/EternalPalace/TheQueensCourt.lua index 3d25756..6450802 100644 --- a/DBM-Raids-BfA/EternalPalace/TheQueensCourt.lua +++ b/DBM-Raids-BfA/EternalPalace/TheQueensCourt.lua @@ -71,7 +71,7 @@ local yellFreneticCharge = mod:NewYell(299914, nil, nil, nil, "YELL") local yellFreneticChargeFades = mod:NewShortFadesYell(299914, nil, nil, nil, "YELL") local specWarnZealousEruption = mod:NewSpecialWarningMoveTo(301807, nil, nil, nil, 3, 2) -local timerFreneticChargeCD = mod:NewNextTimer(40, 299914, nil, nil, nil, 3, nil, nil, nil, not mod:IsTank() and 2, 4) +local timerFreneticChargeCD = mod:NewNextTimer(40, 299914, nil, nil, nil, 3, nil, nil, nil, not mod:IsTank() and 2 or nil, 4) local timerZealousEruptionCD = mod:NewNextTimer(104.4, 301807, nil, nil, nil, 2) mod:AddSetIconOption("SetIconFreneticCharge", 299914, true, false, {4}) diff --git a/DBM-Raids-BfA/Nyalotha/Drestagath.lua b/DBM-Raids-BfA/Nyalotha/Drestagath.lua index 598ae32..e1f85a8 100644 --- a/DBM-Raids-BfA/Nyalotha/Drestagath.lua +++ b/DBM-Raids-BfA/Nyalotha/Drestagath.lua @@ -19,7 +19,7 @@ mod:RegisterEventsInCombat( "SPELL_AURA_REMOVED 310277 310358 312595 310361", -- "SPELL_PERIODIC_DAMAGE", -- "SPELL_PERIODIC_MISSED", - "UNIT_DIED", +-- "UNIT_DIED", "UNIT_SPELLCAST_SUCCEEDED boss1", "UNIT_POWER_UPDATE boss1" ) diff --git a/DBM-Raids-BfA/Nyalotha/IlgynothCorruptionReborn.lua b/DBM-Raids-BfA/Nyalotha/IlgynothCorruptionReborn.lua index 453a6ca..0e5fd2b 100644 --- a/DBM-Raids-BfA/Nyalotha/IlgynothCorruptionReborn.lua +++ b/DBM-Raids-BfA/Nyalotha/IlgynothCorruptionReborn.lua @@ -310,7 +310,7 @@ function mod:SPELL_AURA_APPLIED(args) end if spellId == 313759 then--Mythic Only Option if self.Options.SetIconOnCusedBlood then - self.SetIcon(args.destName, self.vb.bloodIcon) + self:SetIcon(args.destName, self.vb.bloodIcon) end self.vb.bloodIcon = self.vb.bloodIcon + 1 end @@ -342,7 +342,7 @@ function mod:SPELL_AURA_REMOVED(args) end if spellId == 313759 then--Mythic Only Option if self.Options.SetIconOnCusedBlood then - self.SetIcon(args.destName, 0) + self:SetIcon(args.destName, 0) end end end diff --git a/DBM-Raids-BfA/Nyalotha/NZothTheCorruptor.lua b/DBM-Raids-BfA/Nyalotha/NZothTheCorruptor.lua index ad42576..2ff5c84 100644 --- a/DBM-Raids-BfA/Nyalotha/NZothTheCorruptor.lua +++ b/DBM-Raids-BfA/Nyalotha/NZothTheCorruptor.lua @@ -444,9 +444,11 @@ do if select(4, UnitPosition(uId)) == currentMapId then if (difficultyName == "mythic" or not mod.Options.HideDead or not UnitIsDeadOrGhost(uId)) then local unitName = DBM:GetUnitFullName(uId) - local count = UnitPower(uId, ALTERNATE_POWER_INDEX) - tempLines[unitName] = count - tempLinesSorted[#tempLinesSorted + 1] = unitName + if unitName then + local count = UnitPower(uId, ALTERNATE_POWER_INDEX) + tempLines[unitName] = count + tempLinesSorted[#tempLinesSorted + 1] = unitName + end end end end @@ -513,7 +515,9 @@ function mod:OnCombatStart(delay) end for uId in DBM:GetGroupMembers() do local name = DBM:GetUnitFullName(uId) - neckAvailable[name] = true + if name then + neckAvailable[name] = true + end end currentMapId = select(4, UnitPosition("player")) if self.Options.InfoFrame then @@ -554,7 +558,9 @@ function mod:OnTimerRecovery() --On recovery no way to know neck status, so set all to false for uId in DBM:GetGroupMembers() do local name = DBM:GetUnitFullName(uId) - neckAvailable[name] = false + if name then + neckAvailable[name] = false + end end end diff --git a/DBM-Raids-BfA/Nyalotha/TheProphetSkitra.lua b/DBM-Raids-BfA/Nyalotha/TheProphetSkitra.lua index 4313633..9702440 100644 --- a/DBM-Raids-BfA/Nyalotha/TheProphetSkitra.lua +++ b/DBM-Raids-BfA/Nyalotha/TheProphetSkitra.lua @@ -18,8 +18,8 @@ mod:RegisterEventsInCombat( "SPELL_CAST_SUCCESS 313239 307937 313276", "SPELL_AURA_APPLIED 307784 307785 313208 308065 307950", "SPELL_AURA_APPLIED_DOSE 308059", - "SPELL_AURA_REMOVED 313208 308065 307950",--307784 307785 - "UNIT_SPELLCAST_SUCCEEDED boss1" + "SPELL_AURA_REMOVED 313208 308065 307950"--307784 307785 +-- "UNIT_SPELLCAST_SUCCEEDED boss1" ) --[[ @@ -40,7 +40,7 @@ local specWarnImagesofAbsolutionSwitch = mod:NewSpecialWarningSwitch(313239, "d local specWarnShadowShock = mod:NewSpecialWarningStack(308059, nil, 7, nil, nil, 1, 6) local specWarnShadowShockTaunt = mod:NewSpecialWarningTaunt(308059, nil, nil, nil, 1, 2) local specWarnShredPsyche = mod:NewSpecialWarningMoveAway(307937, nil, nil, nil, 1, 2) -local yellShredPsyche = mod:NewPosYell(307937, DBM_CORE_L.AUTO_YELL_CUSTOM_POSITION2) +local yellShredPsyche = mod:NewShortPosYell(307937) local yellShredPsycheFades = mod:NewIconFadesYell(307937) local specWarnShredPsycheSwitch = mod:NewSpecialWarningSwitch(307937, "dps", nil, nil, 1, 2) diff --git a/DBM-Raids-BfA/Nyalotha/Vexiona.lua b/DBM-Raids-BfA/Nyalotha/Vexiona.lua index 830b591..46a182a 100644 --- a/DBM-Raids-BfA/Nyalotha/Vexiona.lua +++ b/DBM-Raids-BfA/Nyalotha/Vexiona.lua @@ -133,7 +133,7 @@ function mod:OnCombatStart(delay) local UnitID = "nameplate"..i local GUID = UnitGUID(UnitID) local cid = self:GetCIDFromGUID(GUID) - if cid == 157447 then + if GUID and cid == 157447 then local unitPower = UnitPower(UnitID) if not unitTracked[GUID] then unitTracked[GUID] = "None" end if (unitPower < 30) then diff --git a/DBM-Raids-BfA/Uldir/Mythrax.lua b/DBM-Raids-BfA/Uldir/Mythrax.lua index f438606..d2cfe06 100644 --- a/DBM-Raids-BfA/Uldir/Mythrax.lua +++ b/DBM-Raids-BfA/Uldir/Mythrax.lua @@ -60,7 +60,7 @@ mod:AddTimerLine(SCENARIO_STAGE:format(1)) local timerEssenceShearCD = mod:NewNextSourceTimer(19.5, 274693, 41032, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON, nil, 2, 3)--Short Text "Shear", All timers generlaly 20 but 19.9 can happen and DBM has to use lost known time local timerObliterationBlastCD = mod:NewNextSourceTimer(14.9, 273538, 158259, nil, nil, 3)--Short Text "Blast" local timerOblivionSphereCD = mod:NewNextCountTimer(14.9, 272407, nil, nil, nil, 3, nil, nil, nil, 1, 3) -local timerImminentRuinCD = mod:NewNextCountTimer(14.9, 272536, 139074, nil, nil, 3, nil, nil, nil, not mod:IsTank() and 3, 3)--Short Text "Ruin" +local timerImminentRuinCD = mod:NewNextCountTimer(14.9, 272536, 139074, nil, nil, 3, nil, nil, nil, not mod:IsTank() and 3 or nil, 3)--Short Text "Ruin" local timerLivingWeaponCD = mod:NewNextTimer(60.5, 276922, nil, nil, nil, 1, nil, DBM_COMMON_L.MYTHIC_ICON)--Mythic local timerVoidEchoesCD = mod:NewNextCountTimer(60.5, 279157, nil, nil, nil, 2, nil, DBM_COMMON_L.HEROIC_ICON) mod:AddTimerLine(SCENARIO_STAGE:format(2)) diff --git a/DBM-Raids-BfA/Uldir/Vectis.lua b/DBM-Raids-BfA/Uldir/Vectis.lua index e7c0e5b..611f5e7 100644 --- a/DBM-Raids-BfA/Uldir/Vectis.lua +++ b/DBM-Raids-BfA/Uldir/Vectis.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: cast-local-type, assign-type-mismatch local mod = DBM:NewMod(2166, "DBM-Raids-BfA", 5, 1031) local L = mod:GetLocalizedStrings() @@ -61,7 +62,7 @@ local specWarnTerminalEruption = mod:NewSpecialWarningSpell(274989, nil, nil, --mod:AddTimerLine(Nexus) local timerEvolvingAfflictionCD = mod:NewCDTimer(8.5, 265178, nil, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON) local timerGestateCD = mod:NewNextTimer(25.5, 265212, nil, nil, nil, 3, nil, nil, nil, 1, 3) -local timerContagionCD = mod:NewNextCountTimer(23, 267242, nil, nil, nil, 2, nil, DBM_COMMON_L.DEADLY_ICON, nil, mod:IsHealer() and 2, 3) +local timerContagionCD = mod:NewNextCountTimer(23, 267242, nil, nil, nil, 2, nil, DBM_COMMON_L.DEADLY_ICON, nil, mod:IsHealer() and 2 or nil, 3) local timerLiquefyCD = mod:NewNextTimer(90.9, 265217, nil, nil, nil, 6, nil, nil, nil, 3, 3) local timerplagueBombCD = mod:NewCDCountTimer(11.4, 266459, nil, nil, nil, 5)--11.4 or 12.2, not sure which one blizz decided on, find out later local timerImmunoSuppCD = mod:NewCDCountTimer("d25.5", 265206, nil, nil, nil, 5, nil, DBM_COMMON_L.HEALER_ICON) @@ -176,9 +177,11 @@ do --Show lingering and vectors combined for entire raid for uId in DBM:GetGroupMembers() do local unitName = DBM:GetUnitFullName(uId) - local count = lingeringTable[unitName] or 0 - tempLines[unitName] = count - tempLinesSorted[#tempLinesSorted + 1] = unitName + if unitName then + local count = lingeringTable[unitName] or 0 + tempLines[unitName] = count + tempLinesSorted[#tempLinesSorted + 1] = unitName + end end --Sort lingering according to options if showHighest then @@ -188,7 +191,7 @@ do end --Now move lingering back into regular infoframe tables for _, name in ipairs(tempLinesSorted) do - local hasVector = false + local hasVector = -1 for i=1, 4 do if vectorTargets[i] and vectorTargets[i] == name then DBM:Debug("Vector "..i.." on "..name, 3) diff --git a/DBM-Raids-BfA/Uldir/Zekvhozj.lua b/DBM-Raids-BfA/Uldir/Zekvhozj.lua index ae659f9..f1b2c1c 100644 --- a/DBM-Raids-BfA/Uldir/Zekvhozj.lua +++ b/DBM-Raids-BfA/Uldir/Zekvhozj.lua @@ -67,7 +67,7 @@ local timerTitanSparkCD = mod:NewCDTimer(37.6, 264954, nil, "Healer", nil, 2 local timerAddsCD = mod:NewAddsTimer(120, 31700, nil, nil, nil, 1, nil, DBM_COMMON_L.DAMAGE_ICON)--Generic Timer only used on Mythic mod:AddTimerLine(SCENARIO_STAGE:format(1)) local timerQirajiWarriorCD = mod:NewCDTimer(60, "ej18071", nil, nil, nil, 1, 31700)--UNKNOWN, TODO -local timerEyeBeamCD = mod:NewCDTimer(40, 264382, nil, nil, nil, 3, nil, nil, nil, not mod:IsTank() and 3, 5) +local timerEyeBeamCD = mod:NewCDTimer(40, 264382, nil, nil, nil, 3, nil, nil, nil, not mod:IsTank() and 3 or nil, 5) mod:AddTimerLine(SCENARIO_STAGE:format(2)) local timerAnubarCasterCD = mod:NewCDTimer(80, "ej18397", nil, nil, nil, 1, 31700)--82 local timerRoilingDeceitCD = mod:NewCDTimer(45, 265360, nil, nil, nil, 3)--61 @@ -312,7 +312,7 @@ function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId) elseif spellId == 264746 then--Eye beam self.vb.eyeCount = 0 specWarnEyeBeamSoon:Show() - specWarnEyeBeamSoon:Play("Scattersoon") + specWarnEyeBeamSoon:Play("scattersoon") --here because this spell ID fires at beginning of each set ONCE if self:IsMythic() then timerEyeBeamCD:Schedule(6, 60) diff --git a/DBM-Raids-BfA/Uldir/Zul.lua b/DBM-Raids-BfA/Uldir/Zul.lua index 1188ba1..6af1c26 100644 --- a/DBM-Raids-BfA/Uldir/Zul.lua +++ b/DBM-Raids-BfA/Uldir/Zul.lua @@ -66,7 +66,7 @@ local yellDeathwish = mod:NewYell(274271) local specWarnDeathwishNear = mod:NewSpecialWarningClose(274271, nil, nil, nil, 1, 2) mod:AddTimerLine(DBM:EJ_GetSectionInfo(18527)) -local timerDarkRevolationCD = mod:NewCDCountTimer(55, 273365, nil, nil, nil, 3, nil, nil, nil, not mod:IsTank() and 1, 4)--55-63 (might get delayed by other casts) +local timerDarkRevolationCD = mod:NewCDCountTimer(55, 273365, nil, nil, nil, 3, nil, nil, nil, not mod:IsTank() and 1 or nil, 4)--55-63 (might get delayed by other casts) local timerPoolofDarknessCD = mod:NewCDCountTimer(30.6, 273361, nil, nil, nil, 5, nil, DBM_COMMON_L.DEADLY_ICON) local timerCallofCrawgCD = mod:NewTimer(42.6, "timerCallofCrawgCD", 273889, nil, nil, 1, DBM_COMMON_L.DAMAGE_ICON)--Spawn trigger local timerCallofHexerCD = mod:NewTimer(62.1, "timerCallofHexerCD", 273889, nil, nil, 1, DBM_COMMON_L.DAMAGE_ICON)--Spawn trigger @@ -77,7 +77,7 @@ local timerBloodyCleaveCD = mod:NewCDTimer(14.1, 273316, nil, "Tank", nil, 5, local timerCongealBloodCD = mod:NewCDTimer(22.7, 273451, nil, "Dps", nil, 5, nil, DBM_COMMON_L.DAMAGE_ICON) mod:AddTimerLine(DBM:EJ_GetSectionInfo(18550)) local timerRupturingBloodCD = mod:NewCDTimer(6.1, 274358, nil, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON) -local timerDeathwishCD = mod:NewNextCountTimer(27.9, 274271, nil, nil, nil, 3, nil, DBM_COMMON_L.DEADLY_ICON..DBM_COMMON_L.MAGIC_ICON, nil, not mod:IsTank() and 1, 4) +local timerDeathwishCD = mod:NewNextCountTimer(27.9, 274271, nil, nil, nil, 3, nil, DBM_COMMON_L.DEADLY_ICON..DBM_COMMON_L.MAGIC_ICON, nil, not mod:IsTank() and 1 or nil, 4) --local berserkTimer = mod:NewBerserkTimer(600) @@ -142,8 +142,10 @@ do local spellName, _, count = DBM:UnitDebuff(uId, 274195) if spellName and count then local unitName = DBM:GetUnitFullName(uId) - tempLines[unitName] = count - tempLinesSorted[#tempLinesSorted + 1] = unitName + if unitName then + tempLines[unitName] = count + tempLinesSorted[#tempLinesSorted + 1] = unitName + end end end --Sort debuffs by highest then inject into regular table @@ -192,7 +194,7 @@ function mod:OnCombatStart(delay) local UnitID = "nameplate"..i local GUID = UnitGUID(UnitID) local cid = self:GetCIDFromGUID(GUID) - if cid == 139059 then + if GUID and cid == 139059 then local unitPower = UnitPower(UnitID) if not unitTracked[GUID] then unitTracked[GUID] = "None" end if (unitPower < 30) then @@ -289,7 +291,7 @@ function mod:SPELL_CAST_SUCCESS(args) local UnitID = "nameplate"..i local GUID = UnitGUID(UnitID) local cid = self:GetCIDFromGUID(GUID) - if cid == 139059 then + if GUID and cid == 139059 then local unitPower = UnitPower(UnitID) if not unitTracked[GUID] then unitTracked[GUID] = "None" end if (unitPower < 30) then diff --git a/DBM-Raids-BfA/localization.cn.lua b/DBM-Raids-BfA/localization.cn.lua index 4942a9e..c7c8840 100644 --- a/DBM-Raids-BfA/localization.cn.lua +++ b/DBM-Raids-BfA/localization.cn.lua @@ -83,7 +83,7 @@ L:SetTimerLocalization({ timerCallofCrawgCD = "下一个嗜血抱齿兽池 (%s)", timerCallofHexerCD = "下一个鲜血妖术师池 (%s)", timerCallofCrusherCD = "下一个碾压者池 (%s)", - timerAddIncoming = DBM_COMMON_L.INCOMMING + timerAddIncoming = DBM_COMMON_L.INCOMING }) L:SetOptionLocalization({ diff --git a/DBM-Raids-BfA/localization.en.lua b/DBM-Raids-BfA/localization.en.lua index 3ef3b12..6d6ce96 100644 --- a/DBM-Raids-BfA/localization.en.lua +++ b/DBM-Raids-BfA/localization.en.lua @@ -81,7 +81,7 @@ L:SetTimerLocalization({ timerCallofCrawgCD = "Next Crawg Pool (%s)", timerCallofHexerCD = "Next Hexer Pool (%s)", timerCallofCrusherCD = "Next Crusher Pool (%s)", - timerAddIncoming = DBM_COMMON_L.INCOMMING + timerAddIncoming = DBM_COMMON_L.INCOMING }) L:SetOptionLocalization({ diff --git a/DBM-Raids-BfA/localization.es.lua b/DBM-Raids-BfA/localization.es.lua index b48728b..e2ec86d 100644 --- a/DBM-Raids-BfA/localization.es.lua +++ b/DBM-Raids-BfA/localization.es.lua @@ -77,7 +77,7 @@ L:SetTimerLocalization({ timerCallofCrawgCD = "Tragadones (%s)", timerCallofHexerCD = "Aojasangres (%s)", timerCallofCrusherCD = "Trituradora (%s)", - timerAddIncoming = DBM_COMMON_L.INCOMMING + timerAddIncoming = DBM_COMMON_L.INCOMING }) L:SetOptionLocalization({ diff --git a/DBM-Raids-BfA/localization.it.lua b/DBM-Raids-BfA/localization.it.lua index 662bf85..703b4a8 100644 --- a/DBM-Raids-BfA/localization.it.lua +++ b/DBM-Raids-BfA/localization.it.lua @@ -82,7 +82,7 @@ L:SetTimerLocalization({ timerCallofCrawgCD = "Prossima Pozza Crog (%s)", timerCallofHexerCD = "Prossima Pozza Sanguemalefico (%s)", timerCallofCrusherCD = "Prossima Pozza Frantumatrice (%s)", - timerAddIncoming = DBM_COMMON_L.INCOMMING + timerAddIncoming = DBM_COMMON_L.INCOMING }) L:SetOptionLocalization({ diff --git a/DBM-Raids-BfA/localization.ru.lua b/DBM-Raids-BfA/localization.ru.lua index bb3257d..7dbbe4e 100644 --- a/DBM-Raids-BfA/localization.ru.lua +++ b/DBM-Raids-BfA/localization.ru.lua @@ -82,7 +82,7 @@ L:SetTimerLocalization({ timerCallofCrawgCD = "Следующий пулл Крогов (%s)", timerCallofHexerCD = "Следующий пулл Ведьмаков (%s)", timerCallofCrusherCD = "Следующий пулл Крошителей (%s)", - timerAddIncoming = DBM_COMMON_L.INCOMMING + timerAddIncoming = DBM_COMMON_L.INCOMING }) L:SetOptionLocalization({ diff --git a/DBM-Raids-BfA/localization.tw.lua b/DBM-Raids-BfA/localization.tw.lua index 3e55556..a5807fe 100644 --- a/DBM-Raids-BfA/localization.tw.lua +++ b/DBM-Raids-BfA/localization.tw.lua @@ -82,7 +82,7 @@ L:SetTimerLocalization({ timerCallofCrawgCD = "下一次粉碎者鮮血池(%s)", timerCallofHexerCD = "下一次血咒師鮮血池(%s)", timerCallofCrusherCD = "下一次克洛格鮮血池(%s)", - timerAddIncoming = DBM_COMMON_L.INCOMMING + timerAddIncoming = DBM_COMMON_L.INCOMING }) L:SetOptionLocalization({