Skip to content

Commit 3b5abe3

Browse files
MysticalOSMysticalOS
committed
Remove deprecated functions: (rangeframe, hud, arrow)
due to buggy diffs, some regressions may be possible since it's harder to verify nothing was accidentally removed
1 parent 22cedae commit 3b5abe3

24 files changed

+5919
-6260
lines changed

‎DBM-Pandaria/Anger.lua‎

Lines changed: 97 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,97 @@
1-
local mod = DBM:NewMod(691, "DBM-Pandaria", nil, 322)
2-
local L = mod:GetLocalizedStrings()
3-
4-
mod:SetRevision("@file-date-integer@")
5-
mod:SetCreatureID(60491)
6-
mod:SetEncounterID(1564)
7-
mod:SetReCombatTime(20, 10)
8-
mod:SetUsedIcons(8, 7, 6, 5, 4, 3, 2, 1)
9-
mod:EnableWBEngageSync()--Enable syncing engage in outdoors
10-
11-
mod:RegisterCombat("combat_yell", L.Pull)
12-
13-
mod:RegisterEventsInCombat(
14-
"SPELL_CAST_START 119488 119622",
15-
"SPELL_AURA_APPLIED 119622 119626",
16-
"SPELL_AURA_REMOVED 119626 119488",
17-
"UNIT_AURA player"
18-
)
19-
20-
local warnGrowingAnger = mod:NewTargetNoFilterAnnounce(119622, 4)--Mind control trigger
21-
local warnAggressiveBehavior = mod:NewTargetAnnounce(119626, 4)--Actual mind control targets
22-
local warnUnleashedWrath = mod:NewSpellAnnounce(119488, 3)
23-
24-
local specWarnGrowingAnger = mod:NewSpecialWarningYou(119622, nil, nil, nil, 1, 2)
25-
local specWarnGTFO = mod:NewSpecialWarningGTFO(119610, nil, nil, nil, 1, 8)
26-
27-
local timerGrowingAngerCD = mod:NewCDTimer(32, 119622, nil, nil, nil, 3)--Min 32.6~ Max 67.8
28-
local timerUnleashedWrathCD = mod:NewCDTimer(53, 119488, nil, nil, nil, 2)--Based on rage, but timing is consistent enough to use a CD bar, might require some perfecting later, similar to xariona's special, if rage doesn't reset after wipes, etc.
29-
local timerUnleashedWrath = mod:NewBuffActiveTimer(24, 119488, nil, "Tank|Healer", nil, 5)
30-
31-
mod:AddRangeFrameOption(5, 119622)
32-
mod:AddSetIconOption("SetIconOnMC2", 119626, false, 0, {8, 7, 6, 5, 4, 3, 2, 1})
33-
mod:AddReadyCheckOption(32099, false)
34-
35-
local bitterThought, growingAnger = DBM:GetSpellName(119601), DBM:GetSpellName(119622)
36-
local playerMCed = false
37-
38-
local function debuffFilter(uId)
39-
return DBM:UnitDebuff(uId, growingAnger)
40-
end
41-
42-
function mod:updateRangeFrame()
43-
if not self.Options.RangeFrame then return end
44-
if DBM:UnitDebuff("player", growingAnger) then
45-
DBM.RangeCheck:Show(5, nil)--Show everyone.
46-
else
47-
DBM.RangeCheck:Show(5, debuffFilter)--Show only people who have debuff.
48-
end
49-
end
50-
51-
function mod:OnCombatStart(delay, yellTriggered)
52-
playerMCed = false
53-
if yellTriggered then
54-
timerUnleashedWrathCD:Start(-delay)
55-
timerGrowingAngerCD:Start(30.6-delay)
56-
end
57-
end
58-
59-
function mod:OnCombatEnd()
60-
if self.Options.RangeFrame then
61-
DBM.RangeCheck:Hide()
62-
end
63-
playerMCed = false
64-
end
65-
66-
function mod:SPELL_CAST_START(args)
67-
local spellId = args.spellId
68-
if spellId == 119488 then
69-
warnUnleashedWrath:Show()
70-
timerUnleashedWrath:Start()
71-
elseif spellId == 119622 then
72-
timerGrowingAngerCD:Start()
73-
end
74-
end
75-
76-
function mod:SPELL_AURA_APPLIED(args)
77-
local spellId = args.spellId
78-
if spellId == 119622 then
79-
warnGrowingAnger:CombinedShow(1.2, args.destName)
80-
self:updateRangeFrame()
81-
if args:IsPlayer() then
82-
specWarnGrowingAnger:Show()
83-
specWarnGrowingAnger:Play("findmc")
84-
end
85-
elseif spellId == 119626 then
86-
--Maybe add in function to update icons here in case of a spread that results in more then the original 3 getting the final MC debuff.
87-
if self.Options.SetIconOnMC2 then--Set icons on first debuff to get an earlier spread out.
88-
self:SetSortedIcon("roster", 1.2, args.destName, 8, 3, true)
89-
end
90-
warnAggressiveBehavior:CombinedShow(2.5, args.destName)
91-
if args:IsPlayer() then
92-
playerMCed = true
93-
end
94-
if self.Options.RangeFrame then
95-
DBM.RangeCheck:Hide()
96-
end
97-
end
98-
end
99-
100-
function mod:SPELL_AURA_REMOVED(args)
101-
local spellId = args.spellId
102-
if spellId == 119626 and self.Options.SetIconOnMC2 then--Remove them after the MCs break.
103-
self:SetIcon(args.destName, 0)
104-
if args:IsPlayer() then
105-
playerMCed = false
106-
end
107-
elseif spellId == 119488 then
108-
timerUnleashedWrathCD:Start()
109-
end
110-
end
111-
112-
function mod:UNIT_AURA(uId)
113-
if DBM:UnitDebuff("player", bitterThought) and self:AntiSpam(2) and not playerMCed then
114-
specWarnGTFO:Show(bitterThought)
115-
specWarnGTFO:Play("watchfeet")
116-
end
117-
end
1+
local mod = DBM:NewMod(691, "DBM-Pandaria", nil, 322)
2+
local L = mod:GetLocalizedStrings()
3+
4+
mod:SetRevision("@file-date-integer@")
5+
mod:SetCreatureID(60491)
6+
mod:SetEncounterID(1564)
7+
mod:SetReCombatTime(20, 10)
8+
mod:SetUsedIcons(8, 7, 6, 5, 4, 3, 2, 1)
9+
mod:EnableWBEngageSync()--Enable syncing engage in outdoors
10+
11+
mod:RegisterCombat("combat_yell", L.Pull)
12+
13+
mod:RegisterEventsInCombat(
14+
"SPELL_CAST_START 119488 119622",
15+
"SPELL_AURA_APPLIED 119622 119626",
16+
"SPELL_AURA_REMOVED 119626 119488",
17+
"UNIT_AURA player"
18+
)
19+
20+
local warnGrowingAnger = mod:NewTargetNoFilterAnnounce(119622, 4)--Mind control trigger
21+
local warnAggressiveBehavior = mod:NewTargetAnnounce(119626, 4)--Actual mind control targets
22+
local warnUnleashedWrath = mod:NewSpellAnnounce(119488, 3)
23+
24+
local specWarnGrowingAnger = mod:NewSpecialWarningYou(119622, nil, nil, nil, 1, 2)
25+
local specWarnGTFO = mod:NewSpecialWarningGTFO(119610, nil, nil, nil, 1, 8)
26+
27+
local timerGrowingAngerCD = mod:NewCDTimer(32, 119622, nil, nil, nil, 3)--Min 32.6~ Max 67.8
28+
local timerUnleashedWrathCD = mod:NewCDTimer(53, 119488, nil, nil, nil, 2)--Based on rage, but timing is consistent enough to use a CD bar, might require some perfecting later, similar to xariona's special, if rage doesn't reset after wipes, etc.
29+
local timerUnleashedWrath = mod:NewBuffActiveTimer(24, 119488, nil, "Tank|Healer", nil, 5)
30+
31+
mod:AddSetIconOption("SetIconOnMC2", 119626, false, 0, {8, 7, 6, 5, 4, 3, 2, 1})
32+
mod:AddReadyCheckOption(32099, false)
33+
34+
local bitterThought, growingAnger = DBM:GetSpellName(119601), DBM:GetSpellName(119622)
35+
local playerMCed = false
36+
37+
38+
function mod:OnCombatStart(delay, yellTriggered)
39+
playerMCed = false
40+
if yellTriggered then
41+
timerUnleashedWrathCD:Start(-delay)
42+
timerGrowingAngerCD:Start(30.6-delay)
43+
end
44+
end
45+
46+
function mod:OnCombatEnd()
47+
playerMCed = false
48+
end
49+
50+
function mod:SPELL_CAST_START(args)
51+
local spellId = args.spellId
52+
if spellId == 119488 then
53+
warnUnleashedWrath:Show()
54+
timerUnleashedWrath:Start()
55+
elseif spellId == 119622 then
56+
timerGrowingAngerCD:Start()
57+
end
58+
end
59+
60+
function mod:SPELL_AURA_APPLIED(args)
61+
local spellId = args.spellId
62+
if spellId == 119622 then
63+
warnGrowingAnger:CombinedShow(1.2, args.destName)
64+
if args:IsPlayer() then
65+
specWarnGrowingAnger:Show()
66+
specWarnGrowingAnger:Play("findmc")
67+
end
68+
elseif spellId == 119626 then
69+
--Maybe add in function to update icons here in case of a spread that results in more then the original 3 getting the final MC debuff.
70+
if self.Options.SetIconOnMC2 then--Set icons on first debuff to get an earlier spread out.
71+
self:SetSortedIcon("roster", 1.2, args.destName, 8, 3, true)
72+
end
73+
warnAggressiveBehavior:CombinedShow(2.5, args.destName)
74+
if args:IsPlayer() then
75+
playerMCed = true
76+
end
77+
end
78+
end
79+
80+
function mod:SPELL_AURA_REMOVED(args)
81+
local spellId = args.spellId
82+
if spellId == 119626 and self.Options.SetIconOnMC2 then--Remove them after the MCs break.
83+
self:SetIcon(args.destName, 0)
84+
if args:IsPlayer() then
85+
playerMCed = false
86+
end
87+
elseif spellId == 119488 then
88+
timerUnleashedWrathCD:Start()
89+
end
90+
end
91+
92+
function mod:UNIT_AURA(uId)
93+
if DBM:UnitDebuff("player", bitterThought) and self:AntiSpam(2) and not playerMCed then
94+
specWarnGTFO:Show(bitterThought)
95+
specWarnGTFO:Play("watchfeet")
96+
end
97+
end

0 commit comments

Comments
 (0)