Skip to content

Commit

Permalink
Remove achiv taimer
Browse files Browse the repository at this point in the history
  • Loading branch information
Waini4 committed Dec 4, 2023
1 parent d68bf12 commit 36b7880
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 35 deletions.
4 changes: 2 additions & 2 deletions DBM-Coliseum/Twins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ local timerSpecial = mod:NewTimer(45, "TimerSpecialSpell", "Interface\\Icons\
local timerHeal = mod:NewCastTimer(15, 65875, nil, nil, nil, 4, nil, DBM_COMMON_L.INTERRUPT_ICON)
local timerLightTouch = mod:NewTargetTimer(20, 65950, nil, false, 2, 3)
local timerDarkTouch = mod:NewTargetTimer(20, 66001, nil, false, 2, 3)
local timerAchieve = mod:NewAchievementTimer(180, 3815)
--local timerAchieve = mod:NewAchievementTimer(180, 3815)

local timerAnubRoleplay = mod:NewTimer(47.5, "TimerAnubRoleplay", 43827, nil, nil, 6)

Expand All @@ -59,7 +59,7 @@ function mod:OnCombatStart(delay)
DBM:FireCustomEvent("DBM_EncounterStart", 34497, "The Twin Val'kyr")
timerSpecial:Start(-delay)
warnSpecial:Schedule(40 - delay)
timerAchieve:Start(-delay)
--timerAchieve:Start(-delay)
if self:IsHeroic() then
enrageTimer:Start(360 - delay)
else
Expand Down
1 change: 1 addition & 0 deletions DBM-Core/DBM-Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11110,6 +11110,7 @@ do
obj:AddOption(optionDefault, optionName, colorType, countdown, spellId, timerType)
tinsert(self.timers, obj)
-- todo: move the string creation to the GUI with SetFormattedString...
--//TODO Разобратся с ачивами
if timerType == "achievement" then
self.localization.options[id] = L.AUTO_TIMER_OPTIONS[timerType]:format(
GetAchievementLink(spellId):gsub("%[(.+)%]",
Expand Down
4 changes: 2 additions & 2 deletions DBM-EyeOfEternity/Malygos.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ local timerVortexCD = mod:NewNextTimer(60, 56105, nil, nil, nil, 2)
local timerBreath = mod:NewBuffActiveTimer(8, 56505, nil, nil, nil, 5) --lasts 5 seconds plus 3 sec cast.
local timerBreathCD = mod:NewCDTimer(59, 56505, nil, nil, nil, 2)
local timerStaticFieldCD = mod:NewCDTimer(12.5, 57430, nil, nil, nil, 3) --High 15-25 second variation
local timerAchieve = mod:NewAchievementTimer(360, "И ты не вечен")
--local timerAchieve = mod:NewAchievementTimer(360, "И ты не вечен")
local timerIntermission = mod:NewPhaseTimer(22)
--local timerAttackable = mod:NewTimer(24, "Malygos Wipes Debuffs") -- Not enough info nor locales on the code from previous contributor to know what this is intended for. Disabled for now

Expand Down Expand Up @@ -92,7 +92,7 @@ function mod:OnCombatStart(delay)
self:SetStage(1)
timerVortexCD:Start(40) -- 44.6-delay
enrageTimer:Start(-delay)
timerAchieve:Start(-delay)
--timerAchieve:Start(-delay)
table.wipe(guids)
end

Expand Down
6 changes: 3 additions & 3 deletions DBM-Icecrown/FrostwingHalls/Sindragosa.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ local specWarnMysticBuffet = mod:NewSpecialWarningStack(70128, false, 5, nil, n

local timerMysticBuffet = mod:NewBuffFadesTimer(8, 70128, nil, nil, nil, 5)
local timerNextMysticBuffet = mod:NewNextTimer(6, 70128, nil, nil, nil, 2)
local timerMysticAchieve = mod:NewAchievementTimer(30, 4620, "AchievementMystic")
--local timerMysticAchieve = mod:NewAchievementTimer(30, 4620, "AchievementMystic")

mod:AddBoolOption("AchievementCheck", false, "announce", nil, nil, nil, 4620, "achievement")

Expand Down Expand Up @@ -340,7 +340,7 @@ function mod:SPELL_AURA_APPLIED(args)
warnMysticBuffet:Show(args.amount or 1)
end
if self.Options.AchievementCheck and not self.vb.warnedfailed and (args.amount or 1) < 2 then
timerMysticAchieve:Start()
--timerMysticAchieve:Start()
end
end
if args:IsDestTypePlayer() then
Expand Down Expand Up @@ -382,7 +382,7 @@ function mod:SPELL_AURA_REMOVED(args)
end
elseif args:IsSpellID(70127, 72528, 72529, 72530) then
if args:IsPlayer() then
timerMysticAchieve:Cancel()
--timerMysticAchieve:Cancel()
timerMysticBuffet:Cancel()
end
end
Expand Down
4 changes: 2 additions & 2 deletions DBM-Icecrown/TheLowerSpire/LordMarrowgar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ local specWarnWhirlwind = mod:NewSpecialWarningRun(69076, nil, nil, nil, 4, 2)
local timerBoneSpike = mod:NewCDTimer(18, 69057, nil, nil, nil, 1, nil, DBM_COMMON_L.DAMAGE_ICON)
local timerWhirlwindCD = mod:NewCDTimer(30, 69076, nil, nil, nil, 2, nil, DBM_COMMON_L.MYTHIC_ICON)
local timerWhirlwind = mod:NewBuffActiveTimer(30, 69076, nil, nil, nil, 6)
local timerBoned = mod:NewAchievementTimer(8, 4610)
--local timerBoned = mod:NewAchievementTimer(8, 4610)
local timerBoneSpikeUp = mod:NewCastTimer(69057)
local timerWhirlwindStart = mod:NewCastTimer(69076)

Expand Down Expand Up @@ -107,7 +107,7 @@ mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
function mod:SPELL_SUMMON(args)
if args:IsSpellID(69062, 72669, 72670) then -- Impale
warnImpale:CombinedShow(0.3, args.sourceName)
timerBoned:Start()
--timerBoned:Start()
if self.Options.SetIconOnImpale then
self:SetIcon(args.sourceName, self.vb.impaleIcon)
end
Expand Down
4 changes: 2 additions & 2 deletions DBM-Naxx/ConstructQuarter/Patchwerk.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mod:RegisterEventsInCombat(
local myRealm = select(4, DBM:GetMyPlayerInfo()) == 1

local enrageTimer = mod:NewBerserkTimer(myRealm and 480 or 360)
local timerAchieve = mod:NewAchievementTimer(180, 1857)
--local timerAchieve = mod:NewAchievementTimer(180, 1857)

mod:AddBoolOption("WarningHateful", false, "announce", nil, nil, nil, 28308)

Expand All @@ -24,7 +24,7 @@ end

function mod:OnCombatStart(delay)
enrageTimer:Start(-delay)
timerAchieve:Start(-delay)
--timerAchieve:Start(-delay)
end

function mod:SPELL_DAMAGE(_, _, _, _, destName, _, spellId, _, _, amount)
Expand Down
8 changes: 4 additions & 4 deletions DBM-Onyxia/Onyxia.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ mod:RegisterEventsInCombat(
)
mod:AddTimerLine(L.Achievement)

local timerAchieve = mod:NewAchievementTimer(300, 4405)
local timerAchieveWhelps = mod:NewAchievementTimer(10, 4406)
--local timerAchieve = mod:NewAchievementTimer(300, 4405)
--local timerAchieveWhelps = mod:NewAchievementTimer(10, 4406)

mod:AddTimerLine(DBM_CORE_L.SCENARIO_STAGE:format(1)..": 100% – 66%")

Expand Down Expand Up @@ -62,7 +62,7 @@ function mod:OnCombatStart(delay)
self.vb.whelpsCount = 0
self.vb.warned_preP2 = false
self.vb.warned_preP3 = false
timerAchieve:Start(-delay)
--timerAchieve:Start(-delay)
if self.Options.SoundWTF3 then
DBM:PlaySoundFile("Interface\\AddOns\\DBM-Onyxia\\sounds\\dps-very-very-slowly.ogg")
self:Schedule(20, DBM.PlaySoundFile, DBM, "Interface\\AddOns\\DBM-Onyxia\\sounds\\hit-it-like-you-mean-it.ogg")
Expand Down Expand Up @@ -163,7 +163,7 @@ function mod:OnSync(msg)
--timerBigAddCD:Start(65)
-- preWarnDeepBreath:Schedule(72) -- Pre-Warn Deep Breath
timerNextDeepBreath:Start(77) -- 67
timerAchieveWhelps:Start()
--timerAchieveWhelps:Start()
timerNextFlameBreath:Cancel()
self:ScheduleMethod(5, "Whelps")
if self.Options.SoundWTF3 then
Expand Down
4 changes: 2 additions & 2 deletions DBM-Party-WotLK/AhnKahet/Volazj.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ local specWarnShadowCrashNear = mod:NewSpecialWarningClose(60848, nil, nil, nil,
local yellShadowCrash = mod:NewYell(62660)

local timerInsanity = mod:NewCastTimer(5, 57496, nil, nil, nil, 6)
local timerAchieve = mod:NewAchievementTimer(120, 1862)
--local timerAchieve = mod:NewAchievementTimer(120, 1862)

function mod:OnCombatStart(delay)
if not self:IsDifficulty("normal5") then
timerAchieve:Start(-delay)
--timerAchieve:Start(-delay)
end
end

Expand Down
4 changes: 2 additions & 2 deletions DBM-Party-WotLK/AzjolNerub/Anubarak.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ mod:RegisterEventsInCombat(

local warningPound = mod:NewSpellAnnounce(53472, 3)

local timerAchieve = mod:NewAchievementTimer(240, 1860)
--local timerAchieve = mod:NewAchievementTimer(240, 1860)

function mod:OnCombatStart(delay)
if not self:IsDifficulty("normal5") then
timerAchieve:Start(-delay)
--timerAchieve:Start(-delay)
end
end

Expand Down
4 changes: 2 additions & 2 deletions DBM-Party-WotLK/HallsOfLightning/Loken.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ mod:RegisterEventsInCombat(
local warningNova = mod:NewSpellAnnounce(52960, 3)

local timerNovaCD = mod:NewCDTimer(30, 52960, nil, nil, nil, 2)
local timerAchieve = mod:NewAchievementTimer(120, 1867)
--local timerAchieve = mod:NewAchievementTimer(120, 1867)

function mod:OnCombatStart(delay)
if not self:IsDifficulty("normal5") then
timerAchieve:Start(-delay)
-- timerAchieve:Start(-delay)
end
end

Expand Down
4 changes: 2 additions & 2 deletions DBM-Party-WotLK/HallsOfStone/MaidenOfGrief.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ local timerWoe = mod:NewTargetTimer(10, 50761, nil, "Healer", nil, 5, nil, DBM
local timerSorrow = mod:NewBuffActiveTimer(6, 50760)
local timerStormCD = mod:NewCDTimer(20, 50752, nil, nil, nil, 3)
local timerSorrowCD = mod:NewCDTimer(30, 50760, nil, nil, nil, 2)
local timerAchieve = mod:NewAchievementTimer(60, 1866)
--local timerAchieve = mod:NewAchievementTimer(60, 1866)

local stormName = DBM:GetSpellInfo(50752)

function mod:OnCombatStart(delay)
if not self:IsDifficulty("normal5") then
timerAchieve:Start(-delay)
-- timerAchieve:Start(-delay)
end
end

Expand Down
4 changes: 2 additions & 2 deletions DBM-Party-WotLK/HallsofReflection/LichKingEvent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mod:RegisterEvents(

local WarnWave = mod:NewAnnounce("WarnWave", 2)

local timerEscape = mod:NewAchievementTimer(360, 4526, "achievementEscape")
--local timerEscape = mod:NewAchievementTimer(360, 4526, "achievementEscape")

local addWaves = {
[1] = { "6 "..L.Ghoul, "1 "..L.WitchDoctor },
Expand All @@ -21,7 +21,7 @@ local addWaves = {
function mod:SPELL_AURA_REMOVED(args)
if args.spellId == 69708 then --Lich King has broken out of his iceblock, this starts actual event
if self:IsDifficulty("heroic5") then
timerEscape:Start()
-- timerEscape:Start()
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions DBM-Party-WotLK/UtgardePinnacle/SkadiTheRuthless.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ local specWarnWhirlwind = mod:NewSpecialWarningRun(59322, nil, nil, 2, 4, 2)
local timerPoisonDebuff = mod:NewTargetTimer(12, 50258, nil, "Healer", 2, 5, nil, DBM_COMMON_L.HEALER_ICON)
local timerPoisonCD = mod:NewCDTimer(10, 59331, nil, "Healer", nil, 5)
local timerWhirlwindCD = mod:NewCDTimer(20, 59322, nil, nil, nil, 2)
local timerAchieve = mod:NewAchievementTimer(180, 1873)
--local timerAchieve = mod:NewAchievementTimer(180, 1873)

function mod:SPELL_CAST_START(args)
if args:IsSpellID(50255, 59331) then
Expand Down Expand Up @@ -55,7 +55,7 @@ function mod:CHAT_MSG_MONSTER_YELL(msg)
warnPhase2:Show()
elseif msg == L.CombatStart or msg:find(L.CombatStart) then
if not self:IsDifficulty("normal5") then
timerAchieve:Start()
-- timerAchieve:Start()
end
end
end
4 changes: 2 additions & 2 deletions DBM-Ulduar/Hodir.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ local enrageTimer = mod:NewBerserkTimer(475)
local timerFlashFreeze = mod:NewCastTimer(9, 312818, nil, nil, nil, 2)
local timerFrozenBlows = mod:NewBuffActiveTimer(20, 63512, nil, nil, nil, 5, nil, CL.TANK_ICON)
local timerFlashFrCD = mod:NewCDTimer(60, 312818, nil, nil, nil, 2)
local timerAchieve = mod:NewAchievementTimer(179, 3182)
--local timerAchieve = mod:NewAchievementTimer(179, 3182)

mod:AddSetIconOption("SetIconOnStormCloud", 65123, true, false, {8, 7})

Expand All @@ -40,7 +40,7 @@ function mod:OnCombatStart(delay)
DBM:FireCustomEvent("DBM_EncounterStart", 32845, "Hodir")

enrageTimer:Start(-delay)
timerAchieve:Start()
-- timerAchieve:Start()
timerFlashFrCD:Start(-delay)
self.vb.stormCloudIcon = 8
end
Expand Down
4 changes: 2 additions & 2 deletions DBM-Ulduar/Ignis.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ local timerFlameJetsCooldown = mod:NewCDCountTimer(42, 312727, nil, nil, nil, 2)
local timerScorchCooldown = mod:NewCDTimer(31, 312730, nil, nil, nil, 5)
local timerScorchCast = mod:NewCastTimer(3, 312730)
local timerSlagPot = mod:NewTargetTimer(10, 312731, nil, nil, nil, 3)
local timerAchieve = mod:NewAchievementTimer(240, 2930)
--local timerAchieve = mod:NewAchievementTimer(240, 2930)

mod.vb.FlameJetsCount = 0

Expand All @@ -35,7 +35,7 @@ mod:AddSetIconOption("SlagPotIcon", 63477, false, false, {8})
function mod:OnCombatStart(delay)
DBM:FireCustomEvent("DBM_EncounterStart", 33118, "Ignis the Furnace Master")
self.vb.FlameJetsCount = 0
timerAchieve:Start()
--timerAchieve:Start()
timerScorchCooldown:Start(12-delay)
timerFlameJetsCooldown:Start(29, self.vb.FlameJetsCount)
end
Expand Down
4 changes: 2 additions & 2 deletions DBM-Ulduar/XT002.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ local timerTympanicTantrumCD = mod:NewCDTimer(35, 312939, nil, nil, nil, 2, ni
local timerHeart = mod:NewCastTimer(30, 312945, nil, nil, nil, 6, nil, CL.DAMAGE_ICON)
local timerLightBomb = mod:NewTargetTimer(9, 312941, nil, nil, nil, 3)
local timerGravityBomb = mod:NewTargetTimer(9, 312943, nil, nil, nil, 3)
local timerAchieve = mod:NewAchievementTimer(205, 2937)
--local timerAchieve = mod:NewAchievementTimer(205, 2937)

mod:AddSetIconOption("SetIconOnLightBombTarget", 312941, true, true, { 7 })
mod:AddSetIconOption("SetIconOnGravityBombTarget", 64234, true, true, { 8 })
Expand All @@ -46,7 +46,7 @@ mod:AddRangeFrameOption(12, nil, true)
function mod:OnCombatStart(delay)
DBM:FireCustomEvent("DBM_EncounterStart", 33293, "XT-002 Deconstructor")
enrageTimer:Start(-delay)
timerAchieve:Start()
--timerAchieve:Start()
if self:IsDifficulty("normal10") then
timerTympanicTantrumCD:Start(35 - delay)
else
Expand Down
4 changes: 2 additions & 2 deletions DBM-Ulduar/YoggSaron.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mod:RegisterEventsInCombat(


--Общие
local timerAchieve = mod:NewAchievementTimer(420, 3013)
--local timerAchieve = mod:NewAchievementTimer(420, 3013)
local enrageTimer = mod:NewBerserkTimer(900)

--1 фаза
Expand Down Expand Up @@ -108,7 +108,7 @@ function mod:OnCombatStart(delay)
Guardians = 0
self:SetStage(1)
enrageTimer:Start()
timerAchieve:Start()
--timerAchieve:Start()
if self.Options.ShowSaraHealth and not self.Options.HealthFrame then
DBM.BossHealth:Show(L.name)
end
Expand Down

0 comments on commit 36b7880

Please sign in to comment.