Fixed a bug where target warning for bombs on Academy trash would not…

… aggregate

Fixed a bug on Melidrussa where the hail bomb would give wrong voice prompt
Halls of Valor:
 - Added trash alert for the storm drakes Crackling Storm attack
 - Added RP timer after Skovald fight that shows when Odyn becomes active and can have his fight started (english only for now)

DBM-Party-Dragonflight/AlgetharAcademy/AlgetharAcademyTrash.lua

@@ -98,7 +98,7 @@ function mod:SPELL_AURA_APPLIED(args)
 			yellnViciousAmbush:Yell()
 		end
 	elseif spellId == 387843 then
-		warnAstralBombTargets:Show(args.destName)
+		warnAstralBombTargets:CombinedShow(1, args.destName)
 		if args:IsPlayer() then
 			specWarnAstralBomb:Show()
 			specWarnAstralBomb:Play("runout")

DBM-Party-Dragonflight/AlgetharAcademy/OvergrownAncient.lua

@@ -24,7 +24,9 @@ mod:RegisterEventsInCombat(
 --	"UNIT_SPELLCAST_SUCCEEDED boss1"
 )
 
+--TODO, add RP timer, almost had it but OS crashed and lost entire nights worth of transcriptor logs. Maybe next week!
 --TODO, Branch Out target scan? it says "at a location" not "at a player"
+--TODO, recheck and fix barkbreaker since alternating timer failed in my run
 --TODO, do stuff with Splinterbark/Abunance mythic mechanic? Seems self explanatory. You get a bleedd on spawn, and clear it on death with target goal to be "don't ignore adds"
 --[[
 (ability.id = 388923 or ability.id = 388623 or ability.id = 396640 or ability.id = 388544) and type = "begincast"
@@ -104,12 +106,12 @@ function mod:SPELL_CAST_START(args)
 		end
 	elseif spellId == 388544 then
 		self.vb.barkCount = self.vb.barkCount + 1
-		--4.6, 30.3, 18.2, 29.2
-		if self.vb.germinateCount % 2 == 0 then
+		--4.6, 30.3, 18.2, 29.2 (Pattern does not always hold, needs review)
+--		if self.vb.germinateCount % 2 == 0 then
 			timerBarkbreakerCD:Start(18.2, self.vb.barkCount+1)
-		else
-			timerBarkbreakerCD:Start(29.2, self.vb.barkCount+1)
-		end
+--		else
+--			timerBarkbreakerCD:Start(29.2, self.vb.barkCount+1)
+--		end
 		if self:IsTanking("player", "boss1", nil, true) then
 			specWarnBarkbreaker:Show()
 			specWarnBarkbreaker:Play("defensive")

DBM-Party-Dragonflight/RubyLifePools/MelidrussaChillworn.lua

@@ -78,7 +78,7 @@ function mod:SPELL_CAST_START(args)
 		timerChillstormCD:Start()
 	elseif spellId == 396044 then
 		specWarnHailbombs:Show()
-		specWarnHailbombs:Play("shockwave")
+		specWarnHailbombs:Play("watchstep")
 		timerHailbombsCD:Start()
 	elseif spellId == 373046 then
 		specWarnAwakenWhelps:Show()

DBM-Party-Legion/HallsOfValor/HoVTrash.lua

@@ -7,18 +7,21 @@ mod:SetRevision("@file-date-integer@")
 mod.isTrashMod = true
 
 mod:RegisterEvents(
-	"SPELL_CAST_START 199805 192563 199726 191508 199210",
+	"SPELL_CAST_START 199805 192563 199726 191508 199210 198892",
 	"SPELL_AURA_APPLIED 215430",
 	"SPELL_AURA_REMOVED 215430"
 )
 
 --TODO wicked dagger (199674)?
 local warnCrackle					= mod:NewTargetAnnounce(199805, 2)
+local warnCracklingStorm			= mod:NewTargetAnnounce(198892, 2)
 
 local specWarnBlastofLight			= mod:NewSpecialWarningDodge(191508, nil, nil, nil, 2, 2)
 local specWarnPenetratingShot		= mod:NewSpecialWarningDodge(199210, nil, nil, nil, 2, 2)
-local specWarnCrackle				= mod:NewSpecialWarningDodge(199805, nil, nil, nil, 1, 2)
+local specWarnCrackle				= mod:NewSpecialWarningYou(199805, nil, nil, nil, 1, 2)
 local yellCrackle					= mod:NewShortYell(199805)
+local specWarnCracklingStorm		= mod:NewSpecialWarningYou(198892, nil, nil, nil, 1, 2)
+local yellCracklingStorm			= mod:NewShortYell(198892)
 local specWarnThunderstrike			= mod:NewSpecialWarningMoveAway(215430, nil, nil, nil, 1, 2)
 local yellThunderstrike				= mod:NewShortYell(215430)
 local specWarnCleansingFlame		= mod:NewSpecialWarningInterrupt(192563, "HasInterrupt", nil, nil, 1, 2)
@@ -33,18 +36,34 @@ function mod:CrackleTarget(targetname, uId)
 	end
 	if targetname == UnitName("player") then
 		specWarnCrackle:Show()
-		specWarnCrackle:Play("watchstep")
+		specWarnCrackle:Play("targetyou")
 		yellCrackle:Yell()
 	else
 		warnCrackle:Show(targetname)
 	end
 end
 
+function mod:CracklingStormTarget(targetname, uId)
+	if not targetname then
+		warnCracklingStorm:Show(DBM_COMMON_L.UNKNOWN)
+		return
+	end
+	if targetname == UnitName("player") then
+		specWarnCracklingStorm:Show()
+		specWarnCracklingStorm:Play("targetyou")
+		yellCracklingStorm:Yell()
+	else
+		warnCracklingStorm:Show(targetname)
+	end
+end
+
 function mod:SPELL_CAST_START(args)
 	if not self.Options.Enabled then return end
 	local spellId = args.spellId
 	if spellId == 199805 then
 		self:BossTargetScanner(args.sourceGUID, "CrackleTarget", 0.1, 9)
+	elseif spellId == 198892 then
+		self:BossTargetScanner(args.sourceGUID, "CracklingStormTarget", 0.1, 9)
 	elseif spellId == 192563 and self:CheckInterruptFilter(args.sourceGUID, false, true) then
 		specWarnCleansingFlame:Show(args.sourceName)
 		specWarnCleansingFlame:Play("kickcast")

DBM-Party-Legion/HallsOfValor/Hymdall.lua

@@ -58,7 +58,7 @@ function mod:SPELL_CAST_START(args)
 		if self.vb.bladeCount % 2 == 0 then
 			timerDancingBladeCD:Start(11.2)
 		else
-			timerDancingBladeCD:Start(32.5)
+			timerDancingBladeCD:Start(31.1)
 		end
 	elseif spellId == 188404 then
 		self.vb.breathCount = self.vb.breathCount + 1

DBM-Party-Legion/HallsOfValor/KingSkovald.lua

@@ -22,6 +22,7 @@ mod:RegisterEvents(
 )
 
 --TODO, longer/more pulls, a timer sequence may be better than on fly timer correction.
+--TODO, Fix Savage blade, which sometimes doesn't reset after ragnarok?
 --[[
 (ability.id = 193659 or ability.id = 193668 or ability.id = 193826 or ability.id = 194112) and type = "begincast"
  or type = "dungeonencounterstart" or type = "dungeonencounterend"
@@ -82,7 +83,7 @@ function mod:SPELL_CAST_START(args)
 		specWarnRagnarok:Show(SHIELDSLOT)
 		specWarnRagnarok:Play("findshield")
 		timerRushCD:Restart(12)
-		timerSavageBladeCD:Restart(29.9)
+--		timerSavageBladeCD:Restart(29.9)--Needs New Review
 	elseif spellId == 194112 then
 		warnClaimAegis:Show()
 	end

DBM-Party-Legion/HallsOfValor/Odyn.lua

@@ -14,6 +14,9 @@ mod:RegisterEventsInCombat(
 	"SPELL_AURA_APPLIED 197963 197964 197965 197966 197967",
 	"UNIT_SPELLCAST_SUCCEEDED boss1"
 )
+mod:RegisterEvents(
+	"CHAT_MSG_MONSTER_YELL"
+)
 
 --http://legion.wowhead.com/icons/name:boss_odunrunes_
 --["198263-Radiant Tempest"] = "pull:8.0, 72.0, 40.0", huh?
@@ -32,6 +35,7 @@ local specWarnRunicBrand			= mod:NewSpecialWarningMoveTo(197961, nil, nil, nil,
 local specWarnAdd					= mod:NewSpecialWarningSwitch(201221, "-Healer", nil, nil, 1, 2)
 local specWarnSurge					= mod:NewSpecialWarningInterrupt(198750, "HasInterrupt", nil, nil, 1, 2)
 
+local timerRP						= mod:NewRPTimer(28.5)
 --local timerSpearCD					= mod:NewCDTimer(8, 198077, nil, nil, nil, 3)--More data needed
 local timerTempestCD				= mod:NewCDCountTimer(56, 198263, nil, nil, nil, 2, nil, DBM_COMMON_L.DEADLY_ICON)--More data needed
 local timerShatterSpearsCD			= mod:NewCDTimer(56, 198077, nil, nil, nil, 2)
@@ -141,3 +145,18 @@ function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId)
 		timerAddCD:Start()
 	end
 end
+
+--"<1368.18 21:44:20> [CHAT_MSG_MONSTER_YELL] Most impressive! I never thought I would meet anyone who could match the Valarjar's strength... and yet here you stand.#Odyn###Odyn##0#0##0#1600#nil#0#false#false#false#false", -- [6314]
+--About 3 seconds to trigger gossip, since RP is for when gossip becomes available
+--"<1399.95 21:44:52> [DBM_Debug] StartCombat called by : ENCOUNTER_START. LastInstanceMapID is 1477#nil", -- [6329]
+function mod:CHAT_MSG_MONSTER_YELL(msg)
+	if (msg == L.OdynRP or msg:find(L.OdynRP)) then
+		self:SendSync("OdynRP")--Syncing to help unlocalized clients
+	end
+end
+
+function mod:OnSync(msg, targetname)
+	if msg == "OdynRP" and self:AntiSpam(10, 2) then
+		timerRP:Start()
+	end
+end

DBM-Party-Legion/localization.en.lua

@@ -140,7 +140,8 @@ L:SetMiscLocalization({
 L= DBM:GetModLocalization(1489)
 
 L:SetMiscLocalization({
-	tempestModeMessage		=	"Not tempest sequence: %s. Rechecking in 8 seconds."
+	tempestModeMessage		= "Not tempest sequence: %s. Rechecking in 8 seconds.",
+	OdynRP					= "There is one final trial that awaits: me. Should you triumph, I will carve your names in these sacred halls myself and grant you a reward worthy of your valor."
 })
 
 -----------------------