diff --git a/Dragonflight/DawnOfTheInfinite/Locales/deDE.lua b/Dragonflight/DawnOfTheInfinite/Locales/deDE.lua index 2926c5be3..7e95e36ab 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/deDE.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/deDE.lua @@ -22,6 +22,7 @@ if L then L.infinite_saboteur = "Ewiger Saboteur" L.infinite_riftmage = "Unendliche Rissmagierin" L.timelost_waveshaper = "Zeitverlorener Wellenformer" + L.timelost_aerobot = "Zeitverlorener Luftbot" L.chronaxie = "Chronaxie" L.horde_destroyer = "Zerstörer der Horde" L.alliance_destroyer = "Zerstörer der Allianz" diff --git a/Dragonflight/DawnOfTheInfinite/Locales/esES.lua b/Dragonflight/DawnOfTheInfinite/Locales/esES.lua index 43c1430cf..5884c03d4 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/esES.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/esES.lua @@ -22,6 +22,7 @@ if L then L.infinite_saboteur = "Saboteador Infinito" L.infinite_riftmage = "Maga de falla infinita" L.timelost_waveshaper = "Moldeaolas perdido en el tiempo" + L.timelost_aerobot = "Aerobot perdido en el tiempo" L.chronaxie = "Chronaxie" L.horde_destroyer = "Destructor de la Horda" L.alliance_destroyer = "Destructor de la Alianza" diff --git a/Dragonflight/DawnOfTheInfinite/Locales/frFR.lua b/Dragonflight/DawnOfTheInfinite/Locales/frFR.lua index a099763fa..d13a85fc2 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/frFR.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/frFR.lua @@ -22,6 +22,7 @@ if L then L.infinite_saboteur = "Saboteur infini" L.infinite_riftmage = "Mage de faille infini" L.timelost_waveshaper = "Sculpte-vagues perdu dans le temps" + L.timelost_aerobot = "Aérobot perdu dans le temps" L.chronaxie = "Chronaxie" L.horde_destroyer = "Destructeur de la Horde" L.alliance_destroyer = "Destructeur de l'Alliance" diff --git a/Dragonflight/DawnOfTheInfinite/Locales/itIT.lua b/Dragonflight/DawnOfTheInfinite/Locales/itIT.lua index 63a6d6316..ea5219d9b 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/itIT.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/itIT.lua @@ -22,6 +22,7 @@ if L then --L.infinite_saboteur = "Infinite Saboteur" --L.infinite_riftmage = "Infinite Riftmage" --L.timelost_waveshaper = "Time-Lost Waveshaper" + --L.timelost_aerobot = "Time-Lost Aerobot" --L.chronaxie = "Chronaxie" --L.horde_destroyer = "Horde Destroyer" --L.alliance_destroyer = "Alliance Destroyer" diff --git a/Dragonflight/DawnOfTheInfinite/Locales/koKR.lua b/Dragonflight/DawnOfTheInfinite/Locales/koKR.lua index f1e1404bf..ef26719f0 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/koKR.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/koKR.lua @@ -22,6 +22,7 @@ if L then L.infinite_saboteur = "무한의 파괴자" L.infinite_riftmage = "무한의 균열법사" L.timelost_waveshaper = "잃어버린 시간의 물결구체자" + --L.timelost_aerobot = "Time-Lost Aerobot" L.chronaxie = "크로나시" L.horde_destroyer = "호드 구축함" L.alliance_destroyer = "얼라이언스 구축함" diff --git a/Dragonflight/DawnOfTheInfinite/Locales/ptBR.lua b/Dragonflight/DawnOfTheInfinite/Locales/ptBR.lua index 87ffd3792..20b46b410 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/ptBR.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/ptBR.lua @@ -22,6 +22,7 @@ if L then L.infinite_saboteur = "Sabotador Infinito" L.infinite_riftmage = "Maga da Fenda Infinita" L.timelost_waveshaper = "Moldaonda Perdido no Tempo" + L.timelost_aerobot = "Robô Aéreo Perdido no Tempo" L.chronaxie = "Cronaxie" L.horde_destroyer = "Destróier da Horda" L.alliance_destroyer = "Destróier da Aliança" diff --git a/Dragonflight/DawnOfTheInfinite/Locales/ruRU.lua b/Dragonflight/DawnOfTheInfinite/Locales/ruRU.lua index 4bdc24b60..2ee08a3fa 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/ruRU.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/ruRU.lua @@ -22,6 +22,7 @@ if L then L.infinite_saboteur = "Саботажник из рода Бесконечности" L.infinite_riftmage = "Маг портала бесконечности" L.timelost_waveshaper = "Затерянный во времени заклинатель моря" + L.timelost_aerobot = "Затерянный во времени аэробот" L.chronaxie = "Хронакси" L.horde_destroyer = "Эсминец Орды" L.alliance_destroyer = "Эсминец Альянса" diff --git a/Dragonflight/DawnOfTheInfinite/Locales/zhCN.lua b/Dragonflight/DawnOfTheInfinite/Locales/zhCN.lua index b76504fa2..e20f54784 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/zhCN.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/zhCN.lua @@ -22,6 +22,7 @@ if L then L.infinite_saboteur = "永恒破坏者" L.infinite_riftmage = "永恒裂隙法师" L.timelost_waveshaper = "迷时塑波者" + L.timelost_aerobot = "迷时翔机" L.chronaxie = "克罗纳克西" L.horde_destroyer = "部落驱除坦克" L.alliance_destroyer = "联盟驱逐舰" diff --git a/Dragonflight/DawnOfTheInfinite/Locales/zhTW.lua b/Dragonflight/DawnOfTheInfinite/Locales/zhTW.lua index 305990368..63a2f63c0 100644 --- a/Dragonflight/DawnOfTheInfinite/Locales/zhTW.lua +++ b/Dragonflight/DawnOfTheInfinite/Locales/zhTW.lua @@ -22,6 +22,7 @@ if L then --L.infinite_saboteur = "Infinite Saboteur" --L.infinite_riftmage = "Infinite Riftmage" --L.timelost_waveshaper = "Time-Lost Waveshaper" + --L.timelost_aerobot = "Time-Lost Aerobot" --L.chronaxie = "Chronaxie" --L.horde_destroyer = "Horde Destroyer" --L.alliance_destroyer = "Alliance Destroyer" diff --git a/Dragonflight/DawnOfTheInfinite/Options/Colors.lua b/Dragonflight/DawnOfTheInfinite/Options/Colors.lua index f96b8bb7f..36f2e9d7b 100644 --- a/Dragonflight/DawnOfTheInfinite/Options/Colors.lua +++ b/Dragonflight/DawnOfTheInfinite/Options/Colors.lua @@ -84,10 +84,12 @@ BigWigs:AddColors("Dawn of the Infinite Trash", { [412063] = "orange", [412129] = "orange", [412136] = "orange", + [412156] = "orange", + [412200] = "purple", [412215] = "orange", [412378] = "red", [412806] = "orange", - [412922] = "yellow", + [412922] = {"blue","yellow"}, [413024] = "yellow", [413529] = "orange", [413544] = {"blue","purple","yellow"}, diff --git a/Dragonflight/DawnOfTheInfinite/Options/Sounds.lua b/Dragonflight/DawnOfTheInfinite/Options/Sounds.lua index ca38658a6..afbbc247b 100644 --- a/Dragonflight/DawnOfTheInfinite/Options/Sounds.lua +++ b/Dragonflight/DawnOfTheInfinite/Options/Sounds.lua @@ -76,7 +76,7 @@ BigWigs:AddSounds("Dawn of the Infinite Trash", { [407125] = "alarm", [407205] = "alarm", [407535] = "info", - [407891] = "alert", + [407891] = "warning", [407906] = "underyou", [411300] = "alert", [411994] = "alert", @@ -84,10 +84,12 @@ BigWigs:AddSounds("Dawn of the Infinite Trash", { [412063] = "alarm", [412129] = "alarm", [412136] = "alarm", + [412156] = "alarm", + [412200] = "alarm", [412215] = "alert", [412378] = "warning", [412806] = "alarm", - [412922] = "alert", + [412922] = "info", [413024] = "info", [413529] = "alarm", [413544] = "alert", @@ -99,7 +101,7 @@ BigWigs:AddSounds("Dawn of the Infinite Trash", { [415770] = "alert", [415773] = "alarm", [417002] = "underyou", - [417011] = "alert", + [417011] = "warning", [417481] = "alert", [418200] = "alert", [418684] = "info", diff --git a/Dragonflight/DawnOfTheInfinite/Trash.lua b/Dragonflight/DawnOfTheInfinite/Trash.lua index d683d28d2..a5c4f5b8c 100644 --- a/Dragonflight/DawnOfTheInfinite/Trash.lua +++ b/Dragonflight/DawnOfTheInfinite/Trash.lua @@ -28,6 +28,7 @@ mod:RegisterEnableMob( 206230, -- Infinite Diversionist 208698, -- Infinite Riftmage 205363, -- Time-Lost Waveshaper + 205723, -- Time-Lost Aerobot 206070, -- Chronaxie 203861, -- Horde Destroyer 208208, -- Alliance Destroyer @@ -66,6 +67,7 @@ if L then L.infinite_saboteur = "Infinite Saboteur" L.infinite_riftmage = "Infinite Riftmage" L.timelost_waveshaper = "Time-Lost Waveshaper" + L.timelost_aerobot = "Time-Lost Aerobot" L.chronaxie = "Chronaxie" L.horde_destroyer = "Horde Destroyer" L.alliance_destroyer = "Alliance Destroyer" @@ -129,6 +131,9 @@ function mod:GetOptions() 418200, -- Infinite Burn -- Time-Lost Waveshaper 411300, -- Fish Bolt Volley + -- Time-Lost Aerobot + 412156, -- Bombing Run + 412200, -- Electro-Juiced Gigablast -- Chronaxie 419516, -- Chronal Eruption 419511, -- Temporal Link @@ -172,6 +177,7 @@ function mod:GetOptions() [419351] = L.infinite_saboteur, [418200] = L.infinite_riftmage, [411300] = L.timelost_waveshaper, + [412156] = L.timelost_aerobot, [419516] = L.chronaxie, [407535] = L.horde_destroyer, [418684] = L.alliance_destroyer, @@ -253,6 +259,10 @@ function mod:OnBossEnable() -- Time-Lost Waveshaper self:Log("SPELL_CAST_START", "FishBoltVolley", 411300) + -- Time-Lost Aerobot + self:Log("SPELL_CAST_START", "BombingRun", 412156) + self:Log("SPELL_CAST_START", "ElectroJuicedGigablast", 412200) + -- Chronaxie self:Log("SPELL_CAST_START", "ChronalEruption", 419516) self:Log("SPELL_AURA_APPLIED", "ChronalEruptionApplied", 419517) @@ -464,18 +474,21 @@ function mod:ShroudingSandstorm(args) --self:NameplateCDBar(args.spellId, 19.4, args.sourceGUID) end -function mod:BindingGrasp(args) - -- TODO get target? can be movement dispelled? - -- it's interruptible so maybe doesn't matter? - self:Message(args.spellId, "yellow") - self:PlaySound(args.spellId, "alert") - --self:NameplateCDBar(args.spellId, 19.4, args.sourceGUID) +do + local function printTarget(self, name, guid) + self:TargetMessage(412922, "yellow", name) + self:PlaySound(412922, "info", nil, name) + end + + function mod:BindingGrasp(args) + self:GetUnitTarget(printTarget, 0.4, args.sourceGUID) + --self:NameplateCDBar(args.spellId, 19.4, args.sourceGUID) + end end -- Spurlok, Timesworn Sentinel function mod:OrbOfContemplation(args) - -- TODO get target? self:Message(args.spellId, "orange") self:PlaySound(args.spellId, "alarm") --self:NameplateCDBar(args.spellId, 13.4, args.sourceGUID) @@ -538,6 +551,20 @@ function mod:FishBoltVolley(args) --self:NameplateCDBar(args.spellId, 13.3, args.sourceGUID) end +-- Time-Lost Aerobot + +function mod:BombingRun(args) + self:Message(args.spellId, "orange") + self:PlaySound(args.spellId, "alarm") + --self:NameplateCDBar(args.spellId, 23.0, args.sourceGUID) +end + +function mod:ElectroJuicedGigablast(args) + self:Message(args.spellId, "purple") + self:PlaySound(args.spellId, "alarm") + --self:NameplateCDBar(args.spellId, 25.5, args.sourceGUID) +end + -- Chronaxie function mod:ChronalEruption(args) @@ -586,8 +613,8 @@ end function mod:HealingWave(args) self:Message(args.spellId, "yellow", CL.casting:format(args.spellName)) - self:PlaySound(args.spellId, "alert") - -- TODO unknown CD + self:PlaySound(args.spellId, "warning") + --self:NameplateCDBar(args.spellId, 9.7, args.sourceGUID) end do @@ -595,7 +622,7 @@ do function mod:EarthquakeDamage(args) if self:Me(args.destGUID) then local t = args.time - if t - prev > 1.5 then + if t - prev > 2 then prev = t self:PersonalMessage(args.spellId, "underyou") self:PlaySound(args.spellId, "underyou", nil, args.destName) @@ -608,8 +635,8 @@ end function mod:HolyLight(args) self:Message(args.spellId, "yellow", CL.casting:format(args.spellName)) - self:PlaySound(args.spellId, "alert") - -- TODO unknown CD + self:PlaySound(args.spellId, "warning") + --self:NameplateCDBar(args.spellId, 9.7, args.sourceGUID) end do @@ -617,7 +644,7 @@ do function mod:ConsecrationDamage(args) if self:Me(args.destGUID) then local t = args.time - if t - prev > 1.5 then + if t - prev > 2 then prev = t self:PersonalMessage(args.spellId, "underyou") self:PlaySound(args.spellId, "underyou", nil, args.destName)