Tweaks to luacheck, and fix some errors

DeadlyBossMods · Feb 20, 2020 · d97c895 · d97c895
1 parent cf4006d
commit d97c895
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 39 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -102,8 +102,12 @@ globals = {
 	"LOCALE_zhCN",
 	"LOCALE_zhTW",
 
-	-- FrameXML misc
-	"BNET_CLIENT_WOW",
+	-- FrameXML misc
+	"ALTERNATE_POWER_INDEX",
+	"BNET_CLIENT_WOW",
+	"CHALLENGE_MODE_MEDAL1",
+	"CHALLENGE_MODE_MEDAL2",
+	"CHALLENGE_MODE_MEDAL3",
 	"C_BattleNet",
 	"C_Calendar",
 	"C_ChatInfo",

diff --git a/DBM-Challenges/BfA/NzothVisionOrgrimmar.lua b/DBM-Challenges/BfA/NzothVisionOrgrimmar.lua
@@ -7,9 +7,6 @@ mod.onlyNormal = true
 
 mod:RegisterCombat("scenario", 2212)--2212, 2213 (org, stormwind)
 
---mod:RegisterEvents(
---	"ZONE_CHANGED_NEW_AREA"
---)
 mod:RegisterEventsInCombat(
 	"SPELL_CAST_START 297822 297746 304976 297574 304251 306726 299110 307863 300351 300388 304101 304282 306001 306199 303589 305875 306828 306617 300388 296537 305378 298630 298033 305236",
 	"SPELL_AURA_APPLIED 311390 315385 316481 311641 299055",
@@ -67,7 +64,6 @@ local specWarnMaddeningRoar			= mod:NewSpecialWarningRun(304101, nil, nil, nil,
 local specWarnStampedingCorruption	= mod:NewSpecialWarningDodge(304282, nil, nil, nil, 2, 2)
 local specWarnHowlinginPain			= mod:NewSpecialWarningCast(306199, "SpellCaster", nil, nil, 1, 2)
 local specWarnSanguineResidue		= mod:NewSpecialWarningDodge(303589, nil, nil, nil, 2, 2)
-local specWarnDefiledGround			= mod:NewSpecialWarningDodge(306828, nil, nil, nil, 2, 2)
 local specWarnRingofChaos			= mod:NewSpecialWarningDodge(306617, nil, nil, nil, 2, 2)
 local specWarnHorrifyingShout		= mod:NewSpecialWarningInterrupt(305378, "HasInterrupt", nil, nil, 1, 2)
 local specWarnMentalAssault			= mod:NewSpecialWarningInterrupt(296537, "HasInterrupt", nil, nil, 1, 2)
@@ -87,7 +83,6 @@ local timerDefiledGroundCD		= mod:NewAITimer(21, 306726, nil, nil, nil, 3)
 
 mod:AddInfoFrameOption(307831, true)
 
-local started = false
 local playerName = UnitName("player")
 mod.vb.GnshalCleared = false
 mod.vb.VezokkCleared = false
@@ -267,7 +262,6 @@ function mod:UNIT_DIED(args)
 		--timerCriesoftheVoidCD:Stop()
 		timerDefiledGroundCD:Stop()
 		DBM:EndCombat(self)
-		started = false
 	elseif cid == 156161 then--Inquisitor Gnshal
 		--timerCriesoftheVoidCD:Stop()
 		self.vb.GnshalCleared = true
@@ -283,19 +277,6 @@ function mod:UNIT_DIED(args)
 	end
 end
 
---[[
-function mod:ZONE_CHANGED_NEW_AREA()
-	local uiMap = C_Map.GetBestMapForUnit("player")
-	if started and uiMap ~= 1469 then
-		DBM:EndCombat(self, true)
-		started = false
-	elseif not started and uiMap == 1469 then
-		self:StartCombat(self, 0, "LOADING_SCREEN_DISABLED")
-		started = true
-	end
-end
---]]
-
 function mod:ENCOUNTER_START(encounterID)
 	if encounterID == 2332 and self:IsInCombat() then
 		timerSurgingDarknessCD:Start(11.1)

diff --git a/DBM-Challenges/BfA/NzothVisionStormwind.lua b/DBM-Challenges/BfA/NzothVisionStormwind.lua
@@ -7,9 +7,6 @@ mod.onlyNormal = true
 
 mod:RegisterCombat("scenario", 2213)--2212, 2213 (org, stormwind)
 
---mod:RegisterEvents(
---	"ZONE_CHANGED_NEW_AREA"
---)
 mod:RegisterEventsInCombat(
 	"SPELL_CAST_START 308278 309819 309648 298691 308669 308366 308406 311456 296911 296537 308481 308575 298033 308375 309882 309671 308305 311399",
 	"SPELL_AURA_APPLIED 311390 315385 316481 311641 308380 308366 308265",
@@ -88,7 +85,6 @@ mod:AddInfoFrameOption(307831, true)
 
 --Antispam 1: Boss throttles, 2: GTFOs, 3: Dodge stuff on ground. 4: Face Away/special action. 5: Dodge Shockwaves
 
-local started = false
 local playerName = UnitName("player")
 mod.vb.TherumCleared = false
 mod.vb.UlrokCleared = false
@@ -252,7 +248,6 @@ function mod:UNIT_DIED(args)
 		--timerExplosiveOrdnanceCD:Stop()
 		--timerChainsofServitudeCD:Stop()
 		DBM:EndCombat(self)
-		started = false
 	elseif cid == 156577 then--Therum Deepforge
 		--timerExplosiveOrdnanceCD:Stop()
 		self.vb.TherumCleared = true
@@ -267,19 +262,6 @@ function mod:UNIT_DIED(args)
 	end
 end
 
---[[
-function mod:ZONE_CHANGED_NEW_AREA()
-	local uiMap = C_Map.GetBestMapForUnit("player")
-	if started and uiMap ~= 1470 then
-		DBM:EndCombat(self, true)
-		started = false
-	elseif not started and uiMap == 1470 then
-		self:StartCombat(self, 0, "LOADING_SCREEN_DISABLED")
-		started = true
-	end
-end
---]]
-
 function mod:ENCOUNTER_START(encounterID)
 	if encounterID == 2338 and self:IsInCombat() then
 		timerDarkenedSkyCD:Start(4.9)