Skip to content

Commit 2de4d8c

Browse files
committed
dawnbreaker and city of echos updates for midnight prepatch
1 parent f4e9288 commit 2de4d8c

File tree

6 files changed

+48
-270
lines changed

6 files changed

+48
-270
lines changed

DBM-Party-WarWithin/ArakaraCityofEchoes/Anubzekt.lua

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,28 @@ mod.sendMainBossGUID = true
1212

1313
mod:RegisterCombat("combat")
1414

15+
mod:AddPrivateAuraSoundOption(433740, true, 433740, 1)
16+
17+
function mod:OnLimitedCombatStart()
18+
self:EnablePrivateAuraSound(433740, "runout", 2)
19+
end
20+
21+
--[[
1522
mod:RegisterEventsInCombat(
1623
"SPELL_CAST_START 435012 439506 433766 442210",
1724
"SPELL_CAST_SUCCESS 433740",
1825
"SPELL_AURA_APPLIED 433740",
1926
"SPELL_AURA_REMOVED 434408 433740"
20-
-- "SPELL_AURA_REMOVED"
21-
-- "SPELL_PERIODIC_DAMAGE",
22-
-- "SPELL_PERIODIC_MISSED"
23-
-- "UNIT_SPELLCAST_SUCCEEDED boss1"
2427
)
25-
26-
--TODO: Charge also casts Impale. Eye also casts Impale AND Infestion. So Impale and Infestation timers will need enough data to separate true CDs from chained mechanics
27-
--TODO: Target scan Burrowing Charge and impale?
28-
--TODO, add Bloodstained Webmage on mythic, including it's web wrap
28+
--]]
2929
--[[
3030
(ability.id = 435012 or ability.id = 439506 or ability.id = 433766) and type = "begincast"
3131
or ability.id = 433740 and type = "cast"
3232
or ability.id = 434408 and type = "removebuff"
3333
or type = "dungeonencounterstart" or type = "dungeonencounterend"
3434
or ability.id = 442210 and (type = "begincast" or type = "cast") or stoppedAbility.id = 442210
3535
--]]
36+
--[[
3637
local warnImpale = mod:NewCountAnnounce(433425, 3)
3738
local warnBurrowCharge = mod:NewCountAnnounce(439506, 3)
3839
@@ -82,16 +83,11 @@ function mod:OnCombatStart(delay)
8283
self.vb.infestationCount = 0
8384
self.vb.eyeCount = 0
8485
self.vb.stormActive = false
85-
-- timerInfestationCD:Start(1-delay, 1)--Instantly on pull
8686
timerImpaleCD:Start(4.4-delay, 1)
8787
timerBurrowChargeCD:Start(14.2-delay, 1)
8888
timerEyeOfTheStormCD:Start(30.7-delay, 1)
8989
end
9090
91-
--function mod:OnCombatEnd()
92-
93-
--end
94-
9591
function mod:SPELL_CAST_START(args)
9692
local spellId = args.spellId
9793
if spellId == 435012 then
@@ -156,7 +152,6 @@ function mod:SPELL_AURA_APPLIED(args)
156152
yellInfestationFades:Countdown(spellId)
157153
end
158154
end
159-
--mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
160155
161156
function mod:SPELL_AURA_REMOVED(args)
162157
local spellId = args.spellId
@@ -175,30 +170,4 @@ function mod:SPELL_AURA_REMOVED(args)
175170
end
176171
end
177172
end
178-
179-
--[[
180-
function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId, spellName)
181-
if spellId == 372820 and destGUID == UnitGUID("player") and self:AntiSpam(3, 2) then
182-
specWarnGTFO:Show(spellName)
183-
specWarnGTFO:Play("watchfeet")
184-
end
185-
end
186-
mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
187-
--]]
188-
189-
--[[
190-
function mod:UNIT_DIED(args)
191-
local cid = self:GetCIDFromGUID(args.destGUID)
192-
if cid == 193435 then
193-
194-
end
195-
end
196-
--]]
197-
198-
--[[
199-
function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId)
200-
if spellId == 74859 then
201-
202-
end
203-
end
204173
--]]

DBM-Party-WarWithin/ArakaraCityofEchoes/Avanoxx.lua

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ local L = mod:GetLocalizedStrings()
44
mod:SetRevision("@file-date-integer@")
55
mod:SetCreatureID(213179)
66
mod:SetEncounterID(2926)
7-
mod:SetUsedIcons(1, 2, 3, 4)
7+
--mod:SetUsedIcons(1, 2, 3, 4)
88
mod:SetHotfixNoticeRev(20240818000000)
99
--mod:SetMinSyncRevision(20211203000000)
1010
mod:SetZone(2660)
@@ -13,23 +13,20 @@ mod.sendMainBossGUID = true
1313

1414
mod:RegisterCombat("combat")
1515

16+
--[[
1617
mod:RegisterEventsInCombat(
1718
"SPELL_CAST_START 438471 438476 438473",
18-
-- "SPELL_CAST_SUCCESS",
1919
"SPELL_SUMMON 439040",
2020
"SPELL_AURA_APPLIED 446794 439070 436614",
2121
"SPELL_AURA_APPLIED_DOSE 446794 434830"
22-
-- "SPELL_AURA_REMOVED"
23-
-- "SPELL_PERIODIC_DAMAGE",
24-
-- "SPELL_PERIODIC_MISSED"
25-
-- "UNIT_SPELLCAST_SUCCEEDED boss1"
2622
)
23+
--]]
2724

28-
--TODO, if higher difficulties kill adds instead of CC/control them, swap to 8-5 icons instead of 1-4
2925
--[[
3026
(ability.id = 438471 or ability.id = 438476 or ability.id = 438473) and type = "begincast"
3127
or type = "dungeonencounterstart" or type = "dungeonencounterend"
3228
--]]
29+
--[[
3330
local warnInsatiable = mod:NewStackAnnounce(446794, 4)
3431
local warnVileWebbing = mod:NewCountAnnounce(434830, 3, nil, nil, DBM_CORE_L.AUTO_ANNOUNCE_OPTIONS.stack:format(434830))--Player
3532
local warnWebWrap = mod:NewTargetNoFilterAnnounce(436614, 2, nil, "RemoveMagic")
@@ -38,8 +35,6 @@ local specWarnAlertingShrill = mod:NewSpecialWarningCount(438476, nil, nil, n
3835
local specWarnGossamerOnslaught = mod:NewSpecialWarningDodgeCount(438473, nil, nil, nil, 2, 2)
3936
local specWarnVoraciousBite = mod:NewSpecialWarningDefensive(438471, nil, nil, nil, 1, 2)
4037
local specWarnHunger = mod:NewSpecialWarningRun(439070, nil, nil, nil, 1, 2)
41-
--local yellSomeAbility = mod:NewYell(372107)
42-
--local specWarnGTFO = mod:NewSpecialWarningGTFO(372820, nil, nil, nil, 1, 8)
4338
4439
local timerVoraciousBiteCD = mod:NewCDCountTimer(14.1, 438471, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)
4540
local timerAlertingShrillCD = mod:NewVarCountTimer("v38.7-40.9", 438476, nil, nil, nil, 1)--38.7-40.9
@@ -62,10 +57,6 @@ function mod:OnCombatStart(delay)
6257
timerGossamerOnslaughtCD:Start(30.0-delay, 1)
6358
end
6459
65-
--function mod:OnCombatEnd()
66-
67-
--end
68-
6960
function mod:SPELL_CAST_START(args)
7061
local spellId = args.spellId
7162
if spellId == 438471 then
@@ -106,15 +97,6 @@ function mod:SPELL_CAST_START(args)
10697
end
10798
end
10899
109-
--[[
110-
function mod:SPELL_CAST_SUCCESS(args)
111-
local spellId = args.spellId
112-
if spellId == 372858 then
113-
114-
end
115-
end
116-
--]]
117-
118100
function mod:SPELL_SUMMON(args)
119101
local spellId = args.spellId
120102
if spellId == 439040 then
@@ -142,30 +124,4 @@ function mod:SPELL_AURA_APPLIED(args)
142124
end
143125
end
144126
mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
145-
146-
--[[
147-
function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId, spellName)
148-
if spellId == 372820 and destGUID == UnitGUID("player") and self:AntiSpam(3, 2) then
149-
specWarnGTFO:Show(spellName)
150-
specWarnGTFO:Play("watchfeet")
151-
end
152-
end
153-
mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
154-
--]]
155-
156-
--[[
157-
function mod:UNIT_DIED(args)
158-
local cid = self:GetCIDFromGUID(args.destGUID)
159-
if cid == 193435 then
160-
161-
end
162-
end
163-
--]]
164-
165-
--[[
166-
function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId)
167-
if spellId == 74859 then
168-
169-
end
170-
end
171127
--]]

DBM-Party-WarWithin/ArakaraCityofEchoes/KikataltheHarvester.lua

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,20 @@ mod.sendMainBossGUID = true
1212

1313
mod:RegisterCombat("combat")
1414

15+
--[[
1516
mod:RegisterEventsInCombat(
1617
"SPELL_CAST_START 432117 432227 432130 461487",
17-
-- "SPELL_CAST_SUCCESS 431985"
1818
"SPELL_AURA_APPLIED 432031"
19-
-- "SPELL_AURA_REMOVED"
20-
-- "SPELL_PERIODIC_DAMAGE",
21-
-- "SPELL_PERIODIC_MISSED"
2219
)
20+
--]]
2321

24-
--TODO, grasping spammy
2522
--[[
2623
(ability.id = 432117 or ability.id = 432227 or ability.id = 432130 or ability.id = 461487) and type = "begincast"
2724
or type = "dungeonencounterstart" or type = "dungeonencounterend"
2825
2926
or ability.id = 431985 and type = "cast"
3027
--]]
28+
--[[
3129
local warnVenomVolley = mod:NewCountAnnounce(432227, 3)
3230
local warnCultivatedPoisons = mod:NewCountAnnounce(461487, 3)
3331
local warnSingularity = mod:NewCastAnnounce(432117, 4)
@@ -62,10 +60,6 @@ function mod:OnCombatStart(delay)
6260
timerCosmicSingularityCD:Start(26.5-delay, 1)
6361
end
6462
65-
--function mod:OnCombatEnd()
66-
67-
--end
68-
6963
function mod:SPELL_CAST_START(args)
7064
local spellId = args.spellId
7165
if spellId == 432117 then
@@ -137,15 +131,6 @@ function mod:SPELL_CAST_START(args)
137131
end
138132
end
139133
140-
--[[
141-
function mod:SPELL_CAST_SUCCESS(args)
142-
local spellId = args.spellId
143-
if spellId == 431985 then
144-
timerAddsCD:Start()
145-
end
146-
end
147-
--]]
148-
149134
function mod:SPELL_AURA_APPLIED(args)
150135
local spellId = args.spellId
151136
if spellId == 432031 then
@@ -155,14 +140,4 @@ function mod:SPELL_AURA_APPLIED(args)
155140
end
156141
end
157142
end
158-
--mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
159-
160-
--[[
161-
function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId, spellName)
162-
if spellId == 372820 and destGUID == UnitGUID("player") and self:AntiSpam(3, 2) then
163-
specWarnGTFO:Show(spellName)
164-
specWarnGTFO:Play("watchfeet")
165-
end
166-
end
167-
mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
168143
--]]

DBM-Party-WarWithin/TheDawnbreaker/Anubikkaj.lua

Lines changed: 10 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@ mod:SetRevision("@file-date-integer@")
55
mod:SetCreatureID(211089)
66
mod:SetEncounterID(2838)
77
mod:SetHotfixNoticeRev(20240706000000)
8-
--mod:SetMinSyncRevision(20211203000000)
98
mod:SetZone(2662)
109
--mod.respawnTime = 29
1110
mod.sendMainBossGUID = true
1211

1312
mod:RegisterCombat("combat")
1413

14+
mod:AddPrivateAuraSoundOption(426865, true, 426860, 1)--Dark Orb target
15+
16+
function mod:OnLimitedCombatStart()
17+
self:EnablePrivateAuraSound(426865, "targetyou", 2)--Dark Orb
18+
self:EnablePrivateAuraSound(450855, "targetyou", 2, 426865)--Register Additional ID
19+
end
20+
21+
--[[
1522
mod:RegisterEventsInCombat(
1623
"SPELL_CAST_START 427001 426860 426787 452127 452099"
17-
-- "SPELL_SUMMON 452145"
18-
-- "SPELL_CAST_SUCCESS",
19-
-- "SPELL_AURA_APPLIED",
20-
-- "SPELL_AURA_REMOVED"
21-
-- "SPELL_PERIODIC_DAMAGE",
22-
-- "SPELL_PERIODIC_MISSED"
23-
-- "UNIT_SPELLCAST_SUCCEEDED boss1"
2424
)
25+
--]]
2526

2627
--[[
2728
(target.name = "Anub'ikkaj" or target.name = "Ascendant Vis'coxria" or target.name = "Deathscreamer Iken'tak" or target.name = "Ixkreten the Unbreakable") and (type = "applybuff" or type = "removebuff" or type = "death" or type = "removebuffstack" or type = "applybuffstack")
@@ -33,7 +34,7 @@ mod:RegisterEventsInCombat(
3334
or ability.id = 452145 and type = "summon"
3435
or ability.id = 452099 and type = "begincast"
3536
--]]
36-
--TODO, auto marking Animate Shadows? 7 of them always spawn so it may be overkill
37+
--[[
3738
local warnAnimatedShadows = mod:NewCountAnnounce(452127, 3)--Change to switch alert if they have to die asap
3839
3940
local specWarnTerrifyingSlam = mod:NewSpecialWarningRunCount(427001, nil, nil, nil, 4, 2)
@@ -180,58 +181,4 @@ function mod:SPELL_CAST_START(args)
180181
end
181182
end
182183
end
183-
184-
--[[
185-
function mod:SPELL_SUMMON(args)
186-
local spellId = args.spellId
187-
if spellId == 452145 then
188-
189-
end
190-
end
191-
--]]
192-
193-
--[[
194-
function mod:SPELL_CAST_SUCCESS(args)
195-
local spellId = args.spellId
196-
if spellId == 372858 then
197-
198-
end
199-
end
200-
--]]
201-
202-
--[[
203-
function mod:SPELL_AURA_APPLIED(args)
204-
local spellId = args.spellId
205-
if spellId == 372858 then
206-
207-
end
208-
end
209-
--mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
210-
--]]
211-
212-
--[[
213-
function mod:SPELL_PERIODIC_DAMAGE(_, _, _, _, destGUID, _, _, _, spellId, spellName)
214-
if spellId == 372820 and destGUID == UnitGUID("player") and self:AntiSpam(3, 2) then
215-
specWarnGTFO:Show(spellName)
216-
specWarnGTFO:Play("watchfeet")
217-
end
218-
end
219-
mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
220-
--]]
221-
222-
--[[
223-
function mod:UNIT_DIED(args)
224-
local cid = self:GetCIDFromGUID(args.destGUID)
225-
if cid == 193435 then
226-
227-
end
228-
end
229-
--]]
230-
231-
--[[
232-
function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId)
233-
if spellId == 74859 then
234-
235-
end
236-
end
237184
--]]

0 commit comments

Comments
 (0)