Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added DBM-Core/sounds/castingbonespikes.mp3
View file
Open in desktop
Binary file not shown.
Binary file added DBM-Core/sounds/gasbomb.mp3
View file
Open in desktop
Binary file not shown.
Binary file added DBM-Core/sounds/infest.mp3
View file
Open in desktop
Binary file not shown.
Binary file added DBM-Core/sounds/link.mp3
View file
Open in desktop
Binary file not shown.
Binary file added DBM-Core/sounds/malleable.mp3
View file
Open in desktop
Binary file not shown.
Binary file added DBM-Core/sounds/necro.mp3
View file
Open in desktop
Binary file not shown.
Binary file added DBM-Core/sounds/soulreaper.mp3
View file
Open in desktop
Binary file not shown.
Binary file added DBM-Core/sounds/spirits.mp3
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions DBM-Icecrown/FrostwingHalls/Valithria.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ local warnPortalOpen = mod:NewAnnounce("WarnPortalOpen", 4, 72483)
local specWarnLayWaste = mod:NewSpecialWarningSpell(71730)
local specWarnManaVoid = mod:NewSpecialWarningMove(71741)

local specWarnSuppresserOne = mod:NewSpecialWarning("Suppressors")
local specWarnSuppresserTwo = mod:NewSpecialWarning("Suppressors")
local specWarnSuppresserThree = mod:NewSpecialWarning("Suppressors")
local specWarnSuppresserFour = mod:NewSpecialWarning("Suppressors")
local specWarnSuppresserOne = mod:NewSpecialWarning("Suppressors", not mod:IsHealer())
local specWarnSuppresserTwo = mod:NewSpecialWarning("Suppressors", not mod:IsHealer())
local specWarnSuppresserThree = mod:NewSpecialWarning("Suppressors", not mod:IsHealer())
local specWarnSuppresserFour = mod:NewSpecialWarning("Suppressors", not mod:IsHealer())

local timerLayWaste = mod:NewBuffActiveTimer(12, 69325)
local timerNextPortal = mod:NewCDTimer(46.5, 72483, nil)
Expand All @@ -43,10 +43,10 @@ local timerCorrosion = mod:NewTargetTimer(6, 70751, nil, false)
local timerBlazingSkeleton = mod:NewTimer(50, "TimerBlazingSkeleton", 17204)
local timerAbom = mod:NewTimer(50, "TimerAbom", 43392)--Experimental

local timerSuppresserOne = mod:NewTimer(70, "1st wave of Suppressors")
local timerSuppresserTwo = mod:NewTimer(60, "2nd wave of Suppressors")
local timerSuppresserThree = mod:NewTimer(60, "3rd wave of Suppressors")
local timerSuppresserFour = mod:NewTimer(60, "4th wave of Suppressors")
local timerSuppresserOne = mod:NewTimer(70, "1st wave of Suppressors", not mod:IsHealer())
local timerSuppresserTwo = mod:NewTimer(60, "2nd wave of Suppressors", not mod:IsHealer())
local timerSuppresserThree = mod:NewTimer(60, "3rd wave of Suppressors", not mod:IsHealer())
local timerSuppresserFour = mod:NewTimer(60, "4th wave of Suppressors", not mod:IsHealer())

local berserkTimer = mod:NewBerserkTimer(420)

Expand Down
3 changes: 3 additions & 0 deletions DBM-Icecrown/TheFrozenThrone/LichKing.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ function mod:SPELL_CAST_START(args)
warnInfest:Show()
specWarnInfest:Show()
timerInfestCD:Start()
PlaySoundFile("Interface\\Addons\\DBM-Core\\sounds\\infest.mp3")
elseif args:IsSpellID(72762) then -- Defile
if self.Options.LKBugWorkaround then
self:ScheduleMethod(0.1, "OldDefileTarget")
Expand Down Expand Up @@ -339,6 +340,7 @@ function mod:SPELL_CAST_SUCCESS(args)
lastPlagueCast = GetTime()
if args:IsPlayer() then
specWarnNecroticPlague:Show()
PlaySoundFile("Interface\\Addons\\DBM-Core\\sounds\\necro.mp3")
end
if self.Options.NecroticPlagueIcon then
self:SetIcon(args.destName, 5, 5)
Expand All @@ -348,6 +350,7 @@ function mod:SPELL_CAST_SUCCESS(args)
specwarnSoulreaper:Show(args.destName)
timerSoulreaper:Start(args.destName)
timerSoulreaperCD:Start()
PlaySoundFile("Interface\\Addons\\DBM-Core\\sounds\\soulreaper.mp3")
if args:IsPlayer() then
specWarnSoulreaper:Show()
end
Expand Down
1 change: 1 addition & 0 deletions DBM-Icecrown/TheLowerSpire/Deathwhisper.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ function mod:SPELL_SUMMON(args)
if time() - lastSpirit > 5 then
warnSummonSpirit:Show()
timerSummonSpiritCD:Start()
PlaySoundFile("Interface\\Addons\\DBM-Core\\sounds\\spirits.mp3")
lastSpirit = time()
end
end
Expand Down
9 changes: 5 additions & 4 deletions DBM-Icecrown/TheLowerSpire/LordMarrowgar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function mod:OnCombatStart(delay)
end

function mod:SPELL_AURA_APPLIED(args)
if args:IsSpellID(69076) then -- Bone Storm (Whirlwind)
if args:IsSpellID(69076) then -- Bone Storm (Whirlwind)
specWarnWhirlwind:Show()
timerWhirlwindCD:Start()
preWarnWhirlwind:Schedule(85)
Expand Down Expand Up @@ -105,16 +105,17 @@ end
]]

function mod:SPELL_CAST_START(args)
if args:IsSpellID(69057, 70826, 72088, 72089) then -- Bone Spike Graveyard
if args:IsSpellID(69057, 70826, 72088, 72089) then -- Bone Spike Graveyard
warnBoneSpike:Show()
timerBoneSpike:Start()
timerBoneSpikeUp:Start()
PlaySoundFile("Interface\\Addons\\DBM-Core\\sounds\\castingbonespikes.mp3")
end
end

--[[
function mod:SPELL_CAST_START(args)
if args:IsSpellID(69057, 70826, 72088, 72089) then -- Bone Spike Graveyard
if args:IsSpellID(69057, 70826, 72088, 72089) then -- Bone Spike Graveyard
warnBoneSpike:Show()
timerBoneSpike:Start()
end
Expand All @@ -129,7 +130,7 @@ function mod:SPELL_PERIODIC_DAMAGE(args)
end

function mod:SPELL_SUMMON(args)
if args:IsSpellID(69062, 72669, 72670) then -- Impale
if args:IsSpellID(69062, 72669, 72670) then -- Impale
impaleTargets[#impaleTargets + 1] = args.sourceName
timerBoned:Start()
if self.Options.SetIconOnImpale then
Expand Down
2 changes: 2 additions & 0 deletions DBM-Icecrown/ThePlagueworks/Putricide.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,13 @@ function mod:SPELL_CAST_SUCCESS(args)
warnChokingGasBomb:Show()
specWarnChokingGasBomb:Show()
timerChokingGasBombCD:Start()
PlaySoundFile("Interface\\Addons\\DBM-Core\\sounds\\gasbomb.mp3")
elseif args:IsSpellID(72855, 72856, 70911) then
timerUnboundPlagueCD:Start()
elseif args:IsSpellID(72615, 72295, 74280, 74281) then
warnMalleableGoo:Show()
specWarnMalleableGooCast:Show()
PlaySoundFile("Interface\\Addons\\DBM-Core\\sounds\\malleable.mp3")
if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
timerMalleableGooCD:Start(20)
else
Expand Down