Fixed several non working timers/warnings in Brackenhide Hollow and u…

…pdated timers Smaller timer fixes to Azure Vaults
DeadlyBossMods · Dec 6, 2022 · f3e5eeb · f3e5eeb
1 parent c7b2257
commit f3e5eeb
Show file tree

Hide file tree

Showing 9 changed files with 164 additions and 122 deletions.
diff --git a/DBM-Party-Dragonflight/AlgetharAcademy/OvergrownAncient.lua b/DBM-Party-Dragonflight/AlgetharAcademy/OvergrownAncient.lua
@@ -145,9 +145,8 @@ function mod:SPELL_AURA_APPLIED(args)
 			DBM.InfoFrame:UpdateTable(toxinStacks, 0.2)
 		end
 		if args:IsPlayer() and amount >= 12 and self:AntiSpam(3.5, 1) then
-			specWarnLasherToxin:Cancel()--Possible to get multiple applications at once so we throttle by scheduling
-			specWarnLasherToxin:Schedule(0.2, amount)
-			specWarnLasherToxin:ScheduleVoice(0.2, "stackhigh")
+			specWarnLasherToxin:Show(amount)
+			specWarnLasherToxin:Play("stackhigh")
 		end
 	end
 end

diff --git a/DBM-Party-Dragonflight/BrackenhideHollow/DecatiarchWratheye.lua b/DBM-Party-Dragonflight/BrackenhideHollow/DecatiarchWratheye.lua
@@ -5,15 +5,14 @@ mod:SetRevision("@file-date-integer@")
 mod:SetCreatureID(186121)
 mod:SetEncounterID(2569)
 mod:SetUsedIcons(8)
---mod:SetHotfixNoticeRev(20220322000000)
+mod:SetHotfixNoticeRev(20221505000000)
 --mod:SetMinSyncRevision(20211203000000)
 --mod.respawnTime = 29
 
 mod:RegisterCombat("combat")
 
 mod:RegisterEventsInCombat(
-	"SPELL_CAST_START 373960 376170",
-	"SPELL_CAST_SUCCESS 373917",
+	"SPELL_CAST_START 373960 376170 373912",
 	"SPELL_SUMMON 373944",
 	"SPELL_AURA_APPLIED 373896",
 	"SPELL_AURA_APPLIED_DOSE 373896",
@@ -23,19 +22,23 @@ mod:RegisterEventsInCombat(
 --	"SPELL_PERIODIC_MISSED",
 )
 
---TODO, correct Lifewater trigger (and remove it if it's hella spammy)
---TODO, proper decay strike trigger/CD
+--[[
+(ability.id = 373960 or ability.id = 376170 or ability.id = 373912) and type = "begincast"
+ or ability.id = 373944 and type = "summon"
+ or type = "dungeonencounterstart" or type = "dungeonencounterend"
+--]]
+--TODO, longer pulls for decaying strength timer
 local warnDecayigStrength						= mod:NewSpellAnnounce(373960, 3)
 
 local specWarnRotburstTotem						= mod:NewSpecialWarningSwitch(373944, nil, nil, nil, 1, 2)
 local specWarnChokingRotcloud					= mod:NewSpecialWarningDodge(376170, nil, nil, nil, 2, 2, 4)
 local specWarnDecaystrike						= mod:NewSpecialWarningDefensive(373917, nil, nil, nil, 1, 2)
 --local specWarnGTFO							= mod:NewSpecialWarningGTFO(340324, nil, nil, nil, 1, 8)
 
-local timerDecayingStrengthCD					= mod:NewAITimer(35, 373960, nil, nil, nil, 2)
-local timerRotburstTotemCD						= mod:NewAITimer(35, 373944, nil, nil, nil, 1, nil, DBM_COMMON_L.DAMAGE_ICON)
-local timerChokingRotcloutCD					= mod:NewAITimer(35, 376170, nil, nil, nil, 3, nil, DBM_COMMON_L.MYTHIC_ICON)
-local timerDecayStrikeCD						= mod:NewAITimer(35, 373917, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)
+local timerDecayingStrengthCD					= mod:NewCDTimer(35, 373960, nil, nil, nil, 2)
+local timerRotburstTotemCD						= mod:NewCDTimer(18.2, 373944, nil, nil, nil, 1, nil, DBM_COMMON_L.DAMAGE_ICON)--18-21
+local timerChokingRotcloutCD					= mod:NewCDTimer(42.5, 376170, nil, nil, nil, 3, nil, DBM_COMMON_L.MYTHIC_ICON)
+local timerDecayStrikeCD						= mod:NewCDTimer(19.4, 373917, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)
 
 --local berserkTimer							= mod:NewBerserkTimer(600)
 
@@ -49,11 +52,12 @@ mod.vb.waterCount = 0
 function mod:OnCombatStart(delay)
 	table.wipe(WitheringRotStacks)
 	self.vb.waterCount = 0
-	timerDecayingStrengthCD:Start(1-delay)
-	timerDecayStrikeCD:Start(1-delay)
 	if self:IsMythic() then
-		timerChokingRotcloutCD:Start(1-delay)
+		timerChokingRotcloutCD:Start(5.1-delay)
 	end
+	timerDecayStrikeCD:Start(10.8-delay)
+	timerRotburstTotemCD:Start(19.1-delay)
+	timerDecayingStrengthCD:Start(41.1-delay)
 	if self.Options.InfoFrame then
 		DBM.InfoFrame:SetHeader(DBM:GetSpellInfo(373896))
 		DBM.InfoFrame:Show(5, "table", WitheringRotStacks, 1)
@@ -77,17 +81,12 @@ function mod:SPELL_CAST_START(args)
 	local spellId = args.spellId
 	if spellId == 373960 then
 		warnDecayigStrength:Show()
-		timerDecayingStrengthCD:Start()
+--		timerDecayingStrengthCD:Start()
 	elseif spellId == 376170 then
 		specWarnChokingRotcloud:Show()
 		specWarnChokingRotcloud:Play("shockwave")
 		timerChokingRotcloutCD:Start()
-	end
-end
-
-function mod:SPELL_CAST_SUCCESS(args)
-	local spellId = args.spellId
-	if spellId == 373917 then
+	elseif spellId == 373912 then
 		timerDecayStrikeCD:Start()
 		if args:IsPlayer() then
 			specWarnDecaystrike:Show()
@@ -98,9 +97,10 @@ end
 
 function mod:SPELL_SUMMON(args)
 	local spellId = args.spellId
-	if spellId == 376797 then
+	if spellId == 373944 then
 		specWarnRotburstTotem:Show()
 		specWarnRotburstTotem:Play("attacktotem")
+		timerRotburstTotemCD:Start()
 		if self.Options.SetIconOnRotburstTotem then
 			self:ScanForMobs(args.destGUID, 2, 8, 1, nil, 12, "SetIconOnRotburstTotem")
 		end

diff --git a/DBM-Party-Dragonflight/BrackenhideHollow/Gutshot.lua b/DBM-Party-Dragonflight/BrackenhideHollow/Gutshot.lua
@@ -5,18 +5,18 @@ mod:SetRevision("@file-date-integer@")
 mod:SetCreatureID(186116)--194745 for Rotfang Hyena
 mod:SetEncounterID(2567)
 --mod:SetUsedIcons(1, 2, 3)
---mod:SetHotfixNoticeRev(20220322000000)
+mod:SetHotfixNoticeRev(20221205000000)
 --mod:SetMinSyncRevision(20211203000000)
 --mod.respawnTime = 29
 
 mod:RegisterCombat("combat")
 
 mod:RegisterEventsInCombat(
 	"SPELL_CAST_START 384416 384827 385435 384633 384353",
-	"SPELL_CAST_SUCCESS 385356",
+	"SPELL_CAST_SUCCESS 383979",
 	"SPELL_AURA_APPLIED 385356 384425 384764 384725 384638 384148 387889",
 --	"SPELL_AURA_APPLIED_DOSE",
-	"SPELL_AURA_REMOVED 384725 384638 387889"
+	"SPELL_AURA_REMOVED 384725 384638 387889 384148"
 --	"SPELL_PERIODIC_DAMAGE",
 --	"SPELL_PERIODIC_MISSED",
 --	"UNIT_SPELLCAST_SUCCEEDED boss1"
@@ -27,24 +27,29 @@ mod:RegisterEventsInCombat(
 --TODO, does bounding leap have some kind of detection of target?
 --TODO, is masters call actually interrupted or an invalid journal icon flag?
 --TODO, verify some cast spellids which were iffy tooltip wise. This fight was still work in progress in build mod was made in
+--[[
+(ability.id = 384416 or ability.id = 384827 or ability.id = 385435 or ability.id = 384633 or ability.id = 384353) and type = "begincast"
+ or ability.id = 383979 and type = "cast"
+ or type = "dungeonencounterstart" or type = "dungeonencounterend"
+--]]
 local warnEnsnaringTrap							= mod:NewTargetNoFilterAnnounce(384148, 3)--Trap going out
 local warnSmellLikeMeat							= mod:NewTargetNoFilterAnnounce(384425, 3)
 local warnCallHyenas							= mod:NewSpellAnnounce(384827, 2)
 
 local specWarnEnsnaringTrap						= mod:NewSpecialWarningYou(384148, nil, nil, nil, 1, 2)--Trap going out
-local yellEnsnaringTrap							= mod:NewYell(384148)--Trap going out
+local yellEnsnaringTrap							= mod:NewYell(384148, nil, false)--Trap going out
 local specWarnFeedingFrenzy						= mod:NewSpecialWarningDispel(384764, "RemoveEnrage", nil, nil, 1, 2)--Buff on mob
 local specWarnFeedingFrenzyYou					= mod:NewSpecialWarningRun(384725, nil, nil, nil, 4, 2)--Debuff on player
 local specWarnMastersCall						= mod:NewSpecialWarningInterrupt(384638, "HasInterrupt", nil, nil, 1, 2)
 local specWarnGutShot							= mod:NewSpecialWarningDefensive(384343, nil, nil, nil, 1, 2)--Trap going out
 --local specWarnGTFO							= mod:NewSpecialWarningGTFO(340324, nil, nil, nil, 1, 8)
 
 --mod:AddTimerLine(DBM:EJ_GetSectionInfo(24883))
-local timerEnsnaringTrapCD						= mod:NewAITimer(35, 384148, nil, nil, nil, 3)--Trap going out
-local timerMeatTossCD							= mod:NewAITimer(35, 384416, nil, nil, nil, 3)
-local timerCallHyenasCD							= mod:NewAITimer(35, 384827, nil, nil, nil, 1)
-local timerMastersCallCD						= mod:NewAITimer(35, 384638, nil, nil, nil, 4, nil, DBM_COMMON_L.INTERRUPT_ICON)
-local timerGutShotCD							= mod:NewAITimer(35, 384343, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)
+local timerEnsnaringTrapCD						= mod:NewCDTimer(19.4, 384148, nil, nil, nil, 3)--Trap going out
+local timerMeatTossCD							= mod:NewCDTimer(21.8, 384416, nil, nil, nil, 3)
+local timerCallHyenasCD							= mod:NewCDTimer(35, 384827, nil, nil, nil, 1)--Need actual CD
+local timerMastersCallCD						= mod:NewCDTimer(35, 384638, nil, nil, nil, 4, nil, DBM_COMMON_L.INTERRUPT_ICON)--Need actual CD
+local timerGutShotCD							= mod:NewCDTimer(21.8, 384343, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)
 
 --local berserkTimer							= mod:NewBerserkTimer(600)
 
@@ -59,17 +64,18 @@ mod:AddNamePlateOption("NPAuraOnHunterleadersTactics", 387889)
 mod:GroupSpells(384764, 384725)--Group the two frenzy IDs
 
 function mod:OnCombatStart(delay)
-	timerEnsnaringTrapCD:Start(1-delay)
-	timerMeatTossCD:Start(1-delay)
-	timerCallHyenasCD:Start(1-delay)
-	timerMastersCallCD:Start(1-delay)
-	timerGutShotCD:Start(1-delay)
+	timerEnsnaringTrapCD:Start(8.4-delay)
+	timerGutShotCD:Start(12-delay)
+	timerMeatTossCD:Start(20.5-delay)
+	timerCallHyenasCD:Start(31-delay)
+	timerMastersCallCD:Start(37-delay)
 	if self.Options.NPAuraOnFixate or self.Options.NPAuraOnMastersCall or self.Options.NPAuraOnEnsnaringTrap or self.Options.NPAuraOnHunterleadersTactics then
 		DBM:FireEvent("BossMod_EnableHostileNameplates")
 	end
 	if self.Options.RangeFrame then
 		DBM.RangeCheck:Show(4)
 	end
+	DBM:AddMsg("still missing timers for a 2nd Call Hyenas and second Master's call due to undertuning of mythic 0 dungeons, if you see these casts and are logging, please share with DBM")
 end
 
 function mod:OnCombatEnd()
@@ -92,7 +98,7 @@ function mod:SPELL_CAST_START(args)
 		warnCallHyenas:Show()
 		timerCallHyenasCD:Start()
 	elseif spellId == 384633 then
-		timerMastersCallCD:Start()
+--		timerMastersCallCD:Start()
 		if self:CheckInterruptFilter(args.sourceGUID, false, true) then
 			specWarnMastersCall:Show(args.sourceName)
 			specWarnMastersCall:Play("kickcast")
@@ -108,15 +114,15 @@ end
 
 function mod:SPELL_CAST_SUCCESS(args)
 	local spellId = args.spellId
-	if spellId == 385356 then
+	if spellId == 383979 then
 		timerEnsnaringTrapCD:Start()
 	end
 end
 
 function mod:SPELL_AURA_APPLIED(args)
 	local spellId = args.spellId
-	if spellId == 361966 then
-		warnEnsnaringTrap:CombinedShow(0.3, args.destName)--Data shows 2 targets, but change if it's not
+	if spellId == 385356 then
+		warnEnsnaringTrap:CombinedShow(0.3, args.destName)
 		if args:IsPlayer() then
 			specWarnEnsnaringTrap:Show()
 			specWarnEnsnaringTrap:Play("targetyou")
@@ -139,9 +145,13 @@ function mod:SPELL_AURA_APPLIED(args)
 		if self.Options.NPAuraOnMastersCall then
 			DBM.Nameplate:Show(true, args.destGUID, spellId, nil, 5)
 		end
-	elseif spellId == 384148 and args:IsDestTypeHostile() then
-		if self.Options.NPAuraOnEnsnaringTrap then
-			DBM.Nameplate:Show(true, args.destGUID, spellId, nil, 6)
+	elseif spellId == 384148 then
+		if args:IsDestTypeHostile() then--Nameplates used to show them being used on adds
+			if self.Options.NPAuraOnEnsnaringTrap then
+				DBM.Nameplate:Show(true, args.destGUID, spellId, nil, 6)
+			end
+		else--Alerts are shown for players fucking them up
+
 		end
 	elseif spellId == 387889 then
 		if self.Options.NPAuraOnHunterleadersTactics then