Skip to content

Commit

Permalink
Dropdowns still don't render at all if they don't have an option abov…
Browse files Browse the repository at this point in the history
…e them to anchor to, and since groupbyspells has removed most from misc section, added misc lines above all dropdowns as fallback
  • Loading branch information
MysticalOS committed Jan 8, 2024
1 parent 50e2559 commit 6110f64
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 5 deletions.
1 change: 1 addition & 0 deletions DBM-Raids-WoD/BlackrockFoundry/BlastFurnace.lua
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ mod:AddRangeFrameOption(8)
mod:AddBoolOption("InfoFrame")
mod:AddSetIconOption("SetIconOnFixate", 155196, false)
mod:AddHudMapOption("HudMapOnBomb", 155192, false)
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("VFYellType2", {"Countdown", "Apply"}, "Apply", "misc")--Countdown is a spammy nightmare on mythic (almost always 10 targets get debuff at same time), let guilds opt into this if they want it.

mod.vb.machinesDead = 0
Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/BlackrockFoundry/Gruul.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ local berserkTimer = mod:NewBerserkTimer(360)

mod:AddRangeFrameOption(8, 155530)
mod:AddHudMapOption("HudMapOnShatter", 155530, false)--Might be overwhelming. up to 8 targets on non mythic, and on mythic, 20 of them. So off by default
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("MythicSoakBehavior", {"ThreeGroup", "TwoGroup"}, "ThreeGroup", "misc")

mod.vb.smashCount = 0
Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/BlackrockFoundry/Oregorger.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ local timerExplosiveShardCD = mod:NewCDTimer(12, 156390, nil, "MeleeDps", 3, 3
local timerExplosiveShard = mod:NewCastTimer(3.5, 156390, nil, "MeleeDps")
local timerRetchedBlackrockCD = mod:NewCDTimer(15.5, 156179, nil, "Ranged", 2, 3)

mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("InterruptBehavior", {"Smart", "Fixed"}, "Smart", "misc")

mod.vb.torrentCount = 0
Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/BlackrockFoundry/Thogar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ mod:AddInfoFrameOption(176312)
mod:AddSetIconOption("SetIconOnAdds", "ej9549", false, true)
mod:AddHudMapOption("HudMapForTrain", 176312, false)
mod:AddBoolOption("HudMapUseIcons")--Depending what is easier to see/understand, i may change this to default off
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("TrainVoiceAnnounce", {"LanesOnly", "MovementsOnly", "LanesandMovements"}, "LanesOnly", "misc")
mod:AddDropdownOption("InfoFrameSpeed", {"Immediately", "Delayed"}, "Delayed", "misc")

Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/HellfireCitadel/Archimonde.lua
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ mod:AddBoolOption("NamesWroughtHud", true)
mod:AddBoolOption("FilterOtherPhase", true)
mod:AddBoolOption("overrideMarkOfLegion", false)
mod:AddInfoFrameOption(184964)
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("MarkBehavior", {"Numbered", "LocSmallFront", "LocSmallBack", "NoAssignment"}, "Numbered", "misc")

mod.vb.phase = 1
Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/HellfireCitadel/Socrethar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ mod:AddRangeFrameOption(10, 184124)
mod:AddHudMapOption("HudMapOnOrb", 180221)
mod:AddHudMapOption("HudMapOnCharge", 182051)
mod:AddSetIconOption("SetIconOnCharge", 182051, true)
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("InterruptBehavior", {"Count3Resume", "Count3Reset", "Count4Resume", "Count4Reset"}, "Count3Resume", "misc")

mod.vb.ReverberatingBlow = 0
Expand Down
11 changes: 6 additions & 5 deletions DBM-Raids-WoD/HellfireCitadel/Xhulhorac.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ mod:RegisterEventsInCombat(
local warnFelPortal = mod:NewSpellAnnounce(187003, 2, nil, nil, nil, nil, nil, 2)
local warnFelSurge = mod:NewTargetAnnounce(186407, 3)
local warnFelStrike = mod:NewSpellAnnounce(186271, 3, nil, "Tank")
local warnImps = mod:NewCountAnnounce("ej11694", 2, 112866, "Melee")
local warnImps = mod:NewCountAnnounce(-11694, 2, 112866, "Melee")
----Adds
local warnFelChains = mod:NewTargetAnnounce(186490, 3)
local warnEmpoweredFelChains = mod:NewTargetAnnounce(189775, 3)--Mythic
Expand All @@ -36,7 +36,7 @@ local warnEmpoweredFelChains = mod:NewTargetAnnounce(189775, 3)--Mythic
local warnVoidPortal = mod:NewSpellAnnounce(187006, 2, nil, nil, nil, nil, nil, 2)
local warnVoidSurge = mod:NewTargetAnnounce(186333, 3)
local warnVoidStrike = mod:NewSpellAnnounce(186292, 3, nil, "Tank")
local warnVoids = mod:NewCountAnnounce("ej11714", 2, 697, "Ranged")
local warnVoids = mod:NewCountAnnounce(-11714, 2, 697, "Ranged")
----
--End Phase
local warnPhase3 = mod:NewPhaseAnnounce(3, 2, nil, nil, nil, nil, nil, 2)
Expand Down Expand Up @@ -74,15 +74,15 @@ local specWarnEmpBlackHole = mod:NewSpecialWarningCount(189779, nil, nil, nil,
----Boss
local timerFelStrikeCD = mod:NewCDTimer(13, 186271, nil, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON)--15.8-17
local timerFelSurgeCD = mod:NewCDTimer(29, 186407, nil, "-Tank", 2, 3, nil, nil, nil, 1, 3)
local timerImpCD = mod:NewNextTimer(25, "ej11694", nil, nil, nil, 1, 112866, nil, nil, 3, 4)
local timerImpCD = mod:NewNextTimer(25, -11694, nil, nil, nil, 1, 112866, nil, nil, 3, 4)
----Big Add
local timerFelBlazeFlurryCD = mod:NewCDTimer(12.9, 186453, nil, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON)
local timerFelChainsCD = mod:NewCDTimer(30, 186490, nil, "-Tank", nil, 3)--30-34. Often 34 but it can and will be 30 sometimes.
--Void Phase
----Boss
local timerVoidStrikeCD = mod:NewCDTimer(15, 186292, nil, "Tank", nil, 5, nil, DBM_COMMON_L.TANK_ICON)
local timerVoidSurgeCD = mod:NewCDTimer(29, 186333, nil, "-Tank", 2, 3, nil, nil, nil, 2, 3)
local timerVoidsCD = mod:NewNextTimer(30, "ej11714", nil, "Ranged", nil, 1, 697)
local timerVoidsCD = mod:NewNextTimer(30, -11714, nil, "Ranged", nil, 1, 697)
----Big Add
local timerWitheringGazeCD = mod:NewCDTimer(22, 186783, nil, "Tank", 2, 5, nil, DBM_COMMON_L.TANK_ICON)
local timerBlackHoleCD = mod:NewCDCountTimer(29.5, 186546, nil, "-Tank", 2, 5)
Expand All @@ -97,7 +97,8 @@ local timerOverwhelmingChaosCD = mod:NewNextCountTimer(10, 187204, nil, nil, 2,
--Applied gives all targets, this is the easier strat for most users, where they wait until everyone has it, then run in different directions.
--Both, gives users ALL the information for everything so they can decide on their own. This will be default until I can see what becomes more popular. Maybe both will be what everyone ends up preferring.
mod:AddRangeFrameOption(5, 189775)--Mythic
mod:AddSetIconOption("SetIconOnImps", "ej11694", true, true)
mod:AddSetIconOption("SetIconOnImps", -11694, true, true)
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("ChainsBehavior", {"Cast", "Applied", "Both"}, "Both", "misc")

mod.vb.EmpFelChainCount = 0
Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/HellfireCitadel/Zakuun.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ mod:AddInfoFrameOption(182008, false)
mod:AddSetIconOption("SetIconOnSeeds", 181508, true)--Start at 8, descending. On by default, because it's quite imperative to know who/where seed targets are at all times.
mod:AddSetIconOption("SetIconOnLatent", 182008, false)
mod:AddHudMapOption("HudMapOnSeeds", 181508)
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("SeedsBehavior", {"Iconed", "Numbered", "DirectionLine", "FreeForAll"}, "Iconed", "misc")--CrossPerception, CrossCardinal, ExCardinal

mod.vb.befouledTargets = 0
Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/Highmaul/Brackenspore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ mod:AddTimerLine(ENCOUNTER_JOURNAL_SECTION_FLAG12)
local timerSpecialCD = mod:NewCDSpecialTimer(20)--Mythic Specials. Shared cd, which special he uses is random. 20-25 second variation, unless delayed by spores. then 20-25+10

mod:AddRangeFrameOption(8, 160254, false)
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("InterruptCounter", {"Two", "Three", "Four"}, "Two", "misc")

mod.vb.sporesAlive = 0
Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/Highmaul/Margok.lua
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ mod:AddSetIconOption("SetIconOnInfiniteDarkness", 165102, false)
mod:AddInfoFrameOption(176537)
mod:AddHudMapOption("HudMapOnMarkOfChaos", 158605)
mod:AddHudMapOption("HudMapOnBranded", 156225, false)
mod:AddMiscLine(DBM_CORE_L.OPTION_CATEGORY_DROPDOWNS)
mod:AddDropdownOption("GazeYellType", {"Countdown", "Stacks"}, "Countdown", "misc")

mod.vb.markActive = false
Expand Down

0 comments on commit 6110f64

Please sign in to comment.