Skip to content

Commit b4a933f

Browse files
committed
Fix Magtheridon's Quake Bar
1 parent 3c37860 commit b4a933f

6 files changed

+12
-11
lines changed

DBM_Outlands/Magtheridon.lua

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
local Mag = DBM:NewBossMod("Magtheridon", DBM_MAG_NAME, DBM_MAG_DESCRIPTION, DBM_MAGS_LAIR, DBMGUI_TAB_OTHER_BC, 3);
22

3-
Mag.Version = "1.2";
3+
Mag.Version = "1.3";
44
Mag.Author = "FigureEightLV"; -- Originally by Tandanu
55

66
Mag:RegisterCombat("EMOTE", DBM_MAG_EMOTE_PULL);
@@ -19,7 +19,7 @@ Mag:AddOption("WarnNova", true, DBM_MAG_OPTION_3);
1919
Mag:AddBarOption("Phase 2")
2020
Mag:AddBarOption("Heal")
2121
Mag:AddBarOption("Blast Nova")
22-
Mag:AddBarOption("Quake")
22+
Mag:AddBarOption("Quake%d", true, DBM_MAG_OPTION_4)
2323
Mag:AddBarOption("Enrage", false)
2424

2525
function Mag:OnCombatStart(delay)
@@ -71,15 +71,11 @@ function Mag:OnSync(msg)
7171
self:ScheduleSelf(110, "Phase2Warn", 10);
7272
elseif msg == "Firstnova" then
7373
self:StartStatusBarTimer(55, "Blast Nova", "Interface\\Icons\\Spell_Fire_SealOfFire");
74-
elseif msg:sub(1, 5) == "Quake" then -- Quake timers can become off when Blast Nova occurs at the same time
75-
local count = msg:sub(6, 7)
76-
if count == "1" then
77-
self:StartStatusBarTimer(40, "Quake", "Interface\\Icons\\Spell_Nature_Earthquake");
78-
self:ScheduleMethod(40, "SendSync", "Quake2");
79-
else
80-
self:StartStatusBarTimer(50, "Quake", "Interface\\Icons\\Spell_Nature_Earthquake");
81-
self:ScheduleMethod(50, "SendSync", "Quake" .. count);
82-
end
74+
elseif msg:sub(1,5) == "Quake" then -- Quake timers can become off when Blast Nova occurs at the same time
75+
local count = tonumber(msg:sub(6,7))
76+
local timer = count > 1 and 50 or 38
77+
self:StartStatusBarTimer(timer, "Quake"..count, "Interface\\Icons\\Spell_Nature_Earthquake");
78+
self:ScheduleMethod(timer, "SendSync", "Quake"..(count + 1));
8379
elseif msg == "Enrage" then
8480
self:StartStatusBarTimer(1200, "Enrage", "Interface\\Icons\\Spell_Shadow_UnholyFrenzy")
8581
self:ScheduleAnnounce(600, DBM_GENERIC_ENRAGE_WARN:format(10, DBM_MIN), 1)

DBM_Outlands/localization.cn.lua

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ if (GetLocale() == "zhCN") then
135135
DBM_MAG_OPTION_1 = "警报地狱火";
136136
DBM_MAG_OPTION_2 = "警报黑暗治愈";
137137
DBM_MAG_OPTION_3 = "警报冲击新星";
138+
DBM_MAG_OPTION_4 = "地震";
138139

139140
DBM_MAG_EMOTE_PULL = "%s的禁锢开始变弱!";
140141
DBM_MAG_YELL_PHASE2 = "我……自由了!"

DBM_Outlands/localization.de.lua

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
DBM_MAG_OPTION_1 = "Infernos ansagen";
108108
DBM_MAG_OPTION_2 = "Heilung ansagen";
109109
DBM_MAG_OPTION_3 = "Drucknova ansagen";
110+
DBM_MAG_OPTION_4 = "Erdbeben";
110111

111112
DBM_MAG_EMOTE_PULL = "Die Fesseln von %s werden schwächer!";
112113
DBM_MAG_YELL_PHASE2 = "Ich... bin... frei!"

DBM_Outlands/localization.en.lua

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ DBM_MAG_DESCRIPTION = "Announces Infernals and Dark Mending and shows timers fo
101101
DBM_MAG_OPTION_1 = "Announce Infernals";
102102
DBM_MAG_OPTION_2 = "Announce Heal";
103103
DBM_MAG_OPTION_3 = "Announce Blast Nova";
104+
DBM_MAG_OPTION_4 = "Quake";
104105

105106
DBM_MAG_EMOTE_PULL = "%s's bonds begin to weaken!";
106107
DBM_MAG_YELL_PHASE2 = "I... am... unleashed!"

DBM_Outlands/localization.ru.lua

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ DBM_MAG_DESCRIPTION = "Объявляет и показывает таймер
104104
DBM_MAG_OPTION_1 = "Объявить Инферналов";
105105
DBM_MAG_OPTION_2 = "Объявить Исцеление";
106106
DBM_MAG_OPTION_3 = "Объявить Вспышка Огненной звезды";
107+
DBM_MAG_OPTION_4 = "Сотрясение";
107108

108109
DBM_MAG_EMOTE_PULL = "начинает ослабевать!";
109110
DBM_MAG_YELL_PHASE2 = "Я… освобожден!"

DBM_Outlands/localization.tw.lua

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ DBM_MAG_DESCRIPTION = "提示地獄火, 補血, 衝擊新星, 顯示階段計
124124
DBM_MAG_OPTION_1 = "提示召喚地獄火";
125125
DBM_MAG_OPTION_2 = "提示補血";
126126
DBM_MAG_OPTION_3 = "提示衝擊新星";
127+
DBM_MAG_OPTION_4 = "Quake";
127128

128129
DBM_MAG_EMOTE_PULL = "%s的束縛開始變弱!";
129130
DBM_MAG_YELL_PHASE2 = "我……被……釋放了!"

0 commit comments

Comments
 (0)