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

Fix start timer for Arathi Basin #136

Merged
merged 1 commit into from
Feb 17, 2024
Merged

Fix start timer for Arathi Basin #136

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
8 changes: 4 additions & 4 deletions DBM-PvP/PvPGeneral.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,13 +404,13 @@ do
end

function mod:CHAT_MSG_BG_SYSTEM_NEUTRAL(msg)
if self.Options.TimerStart and msg == L.BgStart120 or msg:find(L.BgStart120) then
if self.Options.TimerStart and msg:find(L.BgStart120) then
startTimer:Update(isClassic and 1.5 or 0, 120)
elseif self.Options.TimerStart and msg == L.BgStart60 or msg:find(L.BgStart60) or msg == L.ArenaStart60 or msg:find(L.ArenaStart60) then
elseif self.Options.TimerStart and (msg:find(L.BgStart60) or msg == L.ArenaStart60 or msg:find(L.ArenaStart60)) then
startTimer:Update(isClassic and 61.5 or 60, 120)
elseif self.Options.TimerStart and msg == L.BgStart30 or msg:find(L.BgStart30) or msg == L.ArenaStart30 or msg:find(L.ArenaStart30) then
elseif self.Options.TimerStart and (msg:find(L.BgStart30) or msg == L.ArenaStart30 or msg:find(L.ArenaStart30)) then
startTimer:Update(isClassic and 91.5 or 90, 120)
elseif self.Options.TimerStart and msg == L.ArenaStart15 or msg:find(L.ArenaStart15) then
elseif self.Options.TimerStart and (msg == L.ArenaStart15 or msg:find(L.ArenaStart15)) then
startTimer:Update(isClassic and 106.5 or 105, 120)
elseif not isClassic and (msg == L.Vulnerable1 or msg == L.Vulnerable2 or msg:find(L.Vulnerable1) or msg:find(L.Vulnerable2)) then
vulnerableTimer:Start()
Expand Down
7 changes: 4 additions & 3 deletions DBM-PvP/localization.en.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ L:SetOptionLocalization({

L:SetMiscLocalization({
-- Supports "The battle begins in 2 minutes." and "The battle for Wintergrasp begins in 2 minutes." (Because.. wrath classic)
BgStart120 = "The battle(.*) begins in 2 minutes.",
BgStart60 = "The battle(.*) begins in 1 minute.",
BgStart30 = "The battle(.*) begins in 30 seconds.",
-- SoD: "The Battle for Arathi Basin will begin in 1 minute."
BgStart120 = "The [bB]attle.*begin.*in 2 minutes.",
BgStart60 = "The [bB]attle.*begin.*in 1 minute.",
BgStart30 = "The [bB]attle.*begin.*in 30 seconds.",
ArenaStart60 = "One minute until the Arena battle begins!",
ArenaStart30 = "Thirty seconds until the Arena battle begins!",
ArenaStart15 = "Fifteen seconds until the Arena battle begins!",
Expand Down