Skip to content

Commit

Permalink
Migrate all old icon options to numeric type system
Browse files Browse the repository at this point in the history
  • Loading branch information
MysticalOS committed Apr 28, 2024
1 parent 69a0462 commit 99243f0
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion DBM-Raids-WoTLK/Naxx/ConstructQuarter/Grobbulus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ local timerInjection = mod:NewTargetTimer(10, 28169, nil, nil, nil, 3)
local timerCloud = mod:NewNextTimer(15, 28240, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)
local enrageTimer = mod:NewBerserkTimer(720)

mod:AddSetIconOption("SetIconOnInjectionTarget", 28169, false, false, {1, 2, 3, 4})
mod:AddSetIconOption("SetIconOnInjectionTarget", 28169, false, 0, {1, 2, 3, 4})

local mutateIcons = {}

Expand Down
6 changes: 3 additions & 3 deletions DBM-Raids-WoTLK/Naxx/FrostwyrmLair/Kel'Thuzad.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ local timerMC = mod:NewBuffActiveTimer(20, 28410, nil, nil, nil, 3)
--local timerMCCD = mod:NewCDTimer(90, 28410, nil, nil, nil, 3)--actually 60 second cdish but its easier to do it this way for the first one.
local timerPhase2 = mod:NewTimer(215, "TimerPhase2", "136116", nil, nil, 6)

mod:AddSetIconOption("SetIconOnMC", 28410, true, false, {1, 2, 3})
mod:AddSetIconOption("SetIconOnManaBomb", 27819, false, false, {8})
mod:AddSetIconOption("SetIconOnFrostTomb", 27808, true, false, {1, 2, 3, 4, 5, 6, 7, 8})
mod:AddSetIconOption("SetIconOnMC", 28410, true, 0, {1, 2, 3})
mod:AddSetIconOption("SetIconOnManaBomb", 27819, false, 0, {8})
mod:AddSetIconOption("SetIconOnFrostTomb", 27808, true, 0, {1, 2, 3, 4, 5, 6, 7, 8})
mod:AddRangeFrameOption(10, 27819)

mod.vb.warnedAdds = false
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoTLK/RubySanctum/Baltharus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ local timerWhirlwind = mod:NewBuffActiveTimer(4, 75125, nil, "Tank|Healer", nil
local timerRepellingWave = mod:NewCastTimer(4, 74509, nil, nil, nil, 2)--1 second cast + 3 second stun
local timerBrand = mod:NewBuffActiveTimer(10, 74505, nil, nil, nil, 5)

mod:AddSetIconOption("SetIconOnBrand", 74505, false, false, {1, 2, 3, 4, 5, 6, 7, 8})
mod:AddSetIconOption("SetIconOnBrand", 74505, false, 0, {1, 2, 3, 4, 5, 6, 7, 8})
mod:AddRangeFrameOption(12, 74505)

mod.vb.warnedSplit1 = false
Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-WoTLK/RubySanctum/Halion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ local timerMeteorCD = mod:NewNextTimer(40, 74648, nil, nil, nil, 3)--Target
local timerMeteorCast = mod:NewCastTimer(7, 74648, nil, nil, nil, 3)--7-8 seconds from boss yell the meteor impacts.
local timerFlameBreathCD = mod:NewCDTimer(12.1, 74525, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)--12.1-19.4

mod:AddSetIconOption("SetIconOnFireConsumption", 74562, true, false, {7})--Red x for Fire
mod:AddSetIconOption("SetIconOnFireConsumption", 74562, true, 0, {7})--Red x for Fire

-- Stage Two - Twilight Realm (75%)
local twilightRealmName = DBM:GetSpellName(74807)
Expand All @@ -74,7 +74,7 @@ local timerTwilightCutter = mod:NewBuffActiveTimer(10, 74769, nil, nil, nil, 6
local timerTwilightCutterCD = mod:NewNextTimer(15, 74769, nil, nil, nil, 6)
local timerDarkBreathCD = mod:NewCDTimer(12.1, 74806, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)--12.1-19.4

mod:AddSetIconOption("SetIconOnShadowConsumption", 74792, true, false, {3})--Purple diamond for shadow
mod:AddSetIconOption("SetIconOnShadowConsumption", 74792, true, 0, {3})--Purple diamond for shadow

-- Stage Three - Corporeality (50%)
local twilightDivisionName = DBM:GetSpellName(75063)
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoTLK/RubySanctum/Saviana.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ local timerBreath = mod:NewCDTimer(25, 74403, nil, "Tank|Healer", nil, 5, nil,
local timerEnrage = mod:NewBuffActiveTimer(10, 78722, nil, "RemoveEnrage|Tank|Healer", nil, 5, nil, DBM_COMMON_L.ENRAGE_ICON..DBM_COMMON_L.TANK_ICON)

mod:AddRangeFrameOption(10, 74456)
mod:AddSetIconOption("beaconIcon", 74453, true, false, {8, 7, 6, 5, 4})
mod:AddSetIconOption("beaconIcon", 74453, true, 0, {8, 7, 6, 5, 4})

mod:GroupSpells(74453, 74456, 74452)--Group target debuff ID with regular debuff IDs

Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-WoTLK/Ulduar/Freya.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ local timerTremorCD = mod:NewCDTimer(22.9, 62859, nil, nil, nil, 2)--22.9-47.8
local timerLifebinderCD = mod:NewCDTimer(38.2, 62869, nil, nil, nil, 1)
local timerRootsCD = mod:NewCDTimer(13.6, 62438, nil, nil, nil, 3)--13.6-29.6

mod:AddSetIconOption("SetIconOnFury", 63571, false, false, {7, 8})
mod:AddSetIconOption("SetIconOnRoots", 62438, false, false, {6, 5, 4})
mod:AddSetIconOption("SetIconOnFury", 63571, false, 0, {7, 8})
mod:AddSetIconOption("SetIconOnRoots", 62438, false, 0, {6, 5, 4})
mod:AddRangeFrameOption(8, 63571)

local adds = {}
Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-WoTLK/Ulduar/GeneralVezax.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ local timerLifeLeech = mod:NewTargetTimer(10, 63276, nil, false, 2, 3)
local timerLifeLeechCD = mod:NewCDTimer(20.4, 63276, nil, "Ranged", 2, 3, nil, nil, nil, 1, 3)
local timerHardmode = mod:NewTimer(189, "hardmodeSpawn", nil, nil, nil, 1)

mod:AddSetIconOption("SetIconOnShadowCrash", 62660, true, false, {8})
mod:AddSetIconOption("SetIconOnLifeLeach", 63276, true, false, {7})
mod:AddSetIconOption("SetIconOnShadowCrash", 62660, true, 0, {8})
mod:AddSetIconOption("SetIconOnLifeLeach", 63276, true, 0, {7})

mod.vb.interruptCount = 0
mod.vb.vaporsCount = 0
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoTLK/Ulduar/Hodir.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ local timerFrozenBlows = mod:NewBuffActiveTimer(20, 63512, nil, nil, nil, 5, ni
local timerFlashFrCD = mod:NewCDTimer(50, 61968, nil, nil, nil, 2)
local timerAchieve = mod:NewTimer(50, "TimerHardmode", "132597", nil, nil, 0)

mod:AddSetIconOption("SetIconOnStormCloud", 65123, true, false, {1, 2})
mod:AddSetIconOption("SetIconOnStormCloud", 65123, true, 0, {1, 2})

mod.vb.stormCloudIcon = 1

Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoTLK/Ulduar/Ignis.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ end

mod.vb.ConstructCount = 0

mod:AddSetIconOption("SlagPotIcon", 63477, false, false, {8})
mod:AddSetIconOption("SlagPotIcon", 63477, false, 0, {8})

function mod:OnCombatStart(delay)
self.vb.ConstructCount = 0
Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-WoTLK/Ulduar/IronCouncil.lua
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ local warnStaticDisruption = mod:NewTargetAnnounce(63494, 3)
local timerFusionPunchCast = mod:NewCastTimer(3, 61903, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON..DBM_COMMON_L.MAGIC_ICON)
local timerFusionPunchActive = mod:NewTargetTimer(4, 61903, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON..DBM_COMMON_L.MAGIC_ICON)
local timerOverwhelmingPower = mod:NewTargetTimer(25, 61888, nil, nil, nil, 5, nil, DBM_COMMON_L.TANK_ICON)
mod:AddSetIconOption("SetIconOnOverwhelmingPower", 61888, false, false, {8})
mod:AddSetIconOption("SetIconOnStaticDisruption", 63494, false, false, {1, 2, 3, 4, 5, 6, 7})
mod:AddSetIconOption("SetIconOnOverwhelmingPower", 61888, false, 0, {8})
mod:AddSetIconOption("SetIconOnStaticDisruption", 63494, false, 0, {1, 2, 3, 4, 5, 6, 7})

-- Runemaster Molgeim
-- Lightning Blast ... don't know, maybe 63491
Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-WoTLK/Ulduar/Kologarn.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ local timerRespawnLeftArm = mod:NewTimer(48, "timerLeftArm", nil, nil, nil, 1)
local timerRespawnRightArm = mod:NewTimer(48, "timerRightArm", nil, nil, nil, 1)
local timerTimeForDisarmed = mod:NewTimer(10, "achievementDisarmed") -- 10 HC / 12 nonHC

mod:AddSetIconOption("SetIconOnGripTarget", 64292, true, false, {7, 6, 5})
mod:AddSetIconOption("SetIconOnEyebeamTarget", 63346, true, false, {8})
mod:AddSetIconOption("SetIconOnGripTarget", 64292, true, 0, {7, 6, 5})
mod:AddSetIconOption("SetIconOnEyebeamTarget", 63346, true, 0, {8})

mod.vb.disarmActive = false
local gripTargets = {}
Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-WoTLK/Ulduar/Mimiron.lua
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ local timerFlameSuppressant = mod:NewBuffActiveTimer(10, 65192, nil, nil, nil,
--local timerNextFrostBomb = mod:NewNextTimer(80, 64623, nil, nil, nil, 3, nil, DBM_COMMON_L.HEROIC_ICON)
local timerBombExplosion = mod:NewCastTimer(15, 65333, nil, nil, nil, 3)

mod:AddSetIconOption("SetIconOnNapalm", 63666, false, false, {1, 2, 3, 4, 5, 6, 7})
mod:AddSetIconOption("SetIconOnPlasmaBlast", 64529, false, false, {8})
mod:AddSetIconOption("SetIconOnNapalm", 63666, false, 0, {1, 2, 3, 4, 5, 6, 7})
mod:AddSetIconOption("SetIconOnPlasmaBlast", 64529, false, 0, {8})
mod:AddRangeFrameOption("6")

mod:GroupSpells(63274, 63414)--Spinning Up and P3Wx2
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoTLK/Ulduar/Thorim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ local timerUnbalancingStrike = mod:NewCDTimer(25.6, 62130, nil, "Tank", nil, 5,
local timerHardmode = mod:NewTimer(175, "TimerHardmode", 62042)

mod:AddRangeFrameOption("8")
mod:AddSetIconOption("SetIconOnBomb", 62526, false, false, {7})
mod:AddSetIconOption("SetIconOnBomb", 62526, false, 0, {7})

local lastcharge = {}

Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-WoTLK/Ulduar/XT002.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ else
timerAchieve = mod:NewAchievementTimer(205, 2937)
end

mod:AddSetIconOption("SetIconOnLightBombTarget", 65121, true, true, {1})
mod:AddSetIconOption("SetIconOnGravityBombTarget", 64234, true, true, {2})
mod:AddSetIconOption("SetIconOnLightBombTarget", 65121, true, 5, {1})
mod:AddSetIconOption("SetIconOnGravityBombTarget", 64234, true, 5, {2})

function mod:OnCombatStart(delay)
enrageTimer:Start(self:IsClassic() and 360 or 600-delay)
Expand Down
8 changes: 4 additions & 4 deletions DBM-Raids-WoTLK/Ulduar/YoggSaron.lua
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ else
timerAchieve = mod:NewAchievementTimer(420, 3012)
end

mod:AddSetIconOption("SetIconOnFearTarget", 63830, true, false, {6})
mod:AddSetIconOption("SetIconOnFervorTarget", 63138, false, false, {7})
mod:AddSetIconOption("SetIconOnBrainLinkTarget", 63802, true, false, {1, 2})
mod:AddSetIconOption("SetIconOnBeacon", 64465, true, true, {1, 2, 3, 4, 5, 6, 7, 8})
mod:AddSetIconOption("SetIconOnFearTarget", 63830, true, 0, {6})
mod:AddSetIconOption("SetIconOnFervorTarget", 63138, false, 0, {7})
mod:AddSetIconOption("SetIconOnBrainLinkTarget", 63802, true, 0, {1, 2})
mod:AddSetIconOption("SetIconOnBeacon", 64465, true, 5, {1, 2, 3, 4, 5, 6, 7, 8})
mod:AddInfoFrameOption(63050)
mod:AddNamePlateOption("NPAuraOnBeacon", 64465, true)

Expand Down

0 comments on commit 99243f0

Please sign in to comment.