diff --git a/WarWithin/CinderbrewMeadery/Options/Colors.lua b/WarWithin/CinderbrewMeadery/Options/Colors.lua index 5a9ae1120..ed2d2896d 100644 --- a/WarWithin/CinderbrewMeadery/Options/Colors.lua +++ b/WarWithin/CinderbrewMeadery/Options/Colors.lua @@ -42,4 +42,5 @@ BigWigs:AddColors("Cinderbrew Meadery Trash", { [442589] = "orange", [442995] = "yellow", [448619] = "orange", + [463206] = "yellow", }) diff --git a/WarWithin/CinderbrewMeadery/Options/Sounds.lua b/WarWithin/CinderbrewMeadery/Options/Sounds.lua index 42ebbe9e4..f1d20b687 100644 --- a/WarWithin/CinderbrewMeadery/Options/Sounds.lua +++ b/WarWithin/CinderbrewMeadery/Options/Sounds.lua @@ -42,4 +42,5 @@ BigWigs:AddSounds("Cinderbrew Meadery Trash", { [442589] = "alarm", [442995] = "alert", [448619] = "alarm", + [463206] = "alert", }) diff --git a/WarWithin/CinderbrewMeadery/Trash.lua b/WarWithin/CinderbrewMeadery/Trash.lua index 6ce88d591..2b67c7169 100644 --- a/WarWithin/CinderbrewMeadery/Trash.lua +++ b/WarWithin/CinderbrewMeadery/Trash.lua @@ -56,6 +56,7 @@ function mod:GetOptions() 434706, -- Cindrewbrew Toss -- Chef Chewie 434998, -- High Steaks + 463206, -- Tenderize -- Flavor Scientist 441627, -- Rejuvenating Honey 441434, -- Failed Batch @@ -102,6 +103,7 @@ function mod:OnBossEnable() -- Chef Chewie self:Log("SPELL_CAST_START", "HighSteaks", 434998) + self:Log("SPELL_CAST_START", "Tenderize", 463206) self:Death("ChefChewieDeath", 214697) -- Flavor Scientist @@ -183,12 +185,23 @@ do timer = self:ScheduleTimer("ChefChewieDeath", 30) end + function mod:Tenderize(args) + if timer then + self:CancelTimer(timer) + end + self:Message(args.spellId, "yellow") + self:PlaySound(args.spellId, "alert") + self:CDBar(args.spellId, 18.2) + timer = self:ScheduleTimer("ChefChewieDeath", 30) + end + function mod:ChefChewieDeath(args) if timer then self:CancelTimer(timer) timer = nil end self:StopBar(434998) -- High Steaks + self:StopBar(463206) -- Tenderize end end @@ -234,11 +247,16 @@ end -- Bee Wrangler do + local prev = 0 local function printTarget(self, name, guid) self:TargetMessage(441119, "orange", name) - self:PlaySound(441119, "alarm", nil, name) - if self:Me(guid) then - self:Say(441119, nil, nil, "Bee-Zooka") + local t = GetTime() + if t - prev > 2 then + prev = t + if self:Me(guid) then + self:Say(441119, nil, nil, "Bee-Zooka") + end + self:PlaySound(441119, "alarm", nil, name) end end @@ -261,9 +279,16 @@ end -- Royal Jelly Purveyor -function mod:HoneyVolley(args) - self:Message(args.spellId, "red", CL.casting:format(args.spellName)) - self:PlaySound(args.spellId, "alert") +do + local prev = 0 + function mod:HoneyVolley(args) + local t = args.time + if t - prev > 2 then + prev = t + self:Message(args.spellId, "red", CL.casting:format(args.spellName)) + self:PlaySound(args.spellId, "alert") + end + end end function mod:RainOfHoney(args)