From 2470270c15313bb09ea4c6a694e2bed4d19246ca Mon Sep 17 00:00:00 2001 From: Arrvis the Lion Date: Sat, 2 Oct 2021 12:38:06 +0300 Subject: [PATCH] [KA] Added Chaurus Bite projectile announcements at Yandir boss --- BuffsDebuffs.lua | 2 ++ Settings.lua | 8 ++++++++ TrialKynesAegis.lua | 10 ++++++++++ lang/en.lua | 4 ++++ 4 files changed, 24 insertions(+) diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua index a807fed..1382eee 100644 --- a/BuffsDebuffs.lua +++ b/BuffsDebuffs.lua @@ -597,6 +597,8 @@ kynes_aegis.yandir_harpy_totem_spawn = 133511 kynes_aegis.yandir_gargoyle_totem_spawn = 133514 -- Chaurus Totem spawn at Yandir the Butcher boss kynes_aegis.yandir_chaurus_totem_spawn = 133516 +-- Chaurus Bile, projectile from Chaurus Totem at Yandir the Butcher boss +kynes_aegis.yandir_chaurus_bile = 133559 RaidNotifier.BuffsDebuffs[RAID_KYNES_AEGIS] = kynes_aegis diff --git a/Settings.lua b/Settings.lua index f9cc173..c9449b0 100644 --- a/Settings.lua +++ b/Settings.lua @@ -300,6 +300,7 @@ do ------------------ bitter_knight_sanguine_prison = false, bloodknight_blood_fountain = false, yandir_totem_spawn = 0, -- "Off" + yandir_chaurus_bile = 0, -- "Off" }, rockgrove = { sulxan_reaver_sundering_strike = 0, -- "Off" @@ -551,6 +552,7 @@ function RaidNotifier:CreateSettingsMenu() L.Settings_General_Choices_OnlyChaurusTotem, L.Settings_General_Choices_All, }, + yandir_chaurus_bile = off_self_all, }, rockgrove = { sulxan_reaver_sundering_strike = off_self_all, @@ -1615,6 +1617,12 @@ function RaidNotifier:CreateSettingsMenu() tooltip = L.Settings_KynesAegis_Totem_TT, choices = choices.kynesAegis.yandir_totem_spawn, }, "kynesAegis", "yandir_totem_spawn") + MakeControlEntry({ + type = "dropdown", + name = L.Settings_KynesAegis_Chaurus_Bile, + tooltip = L.Settings_KynesAegis_Chaurus_Bile_TT, + choices = choices.kynesAegis.yandir_chaurus_bile, + }, "kynesAegis", "yandir_chaurus_bile") subTable = nil --end submenu -- Rockgrove diff --git a/TrialKynesAegis.lua b/TrialKynesAegis.lua index abea43c..00ab208 100644 --- a/TrialKynesAegis.lua +++ b/TrialKynesAegis.lua @@ -71,5 +71,15 @@ function RaidNotifier.KA.OnCombatEvent(_, result, isError, aName, aGraphic, aAct self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_KYNESAEGIS_CHAURUS_TOTEM), "kynesAegis", "yandir_totem_spawn") end end + -- Chaurus Bile projectile from Chaurus Totem at Yandir the Butcher boss + if (abilityId == buffsDebuffs.yandir_chaurus_bile) then + if (settings.yandir_chaurus_bile >= 1) then + if (tType == COMBAT_UNIT_TYPE_PLAYER) then + self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_KYNESAEGIS_CHAURUS_BILE_SELF), "kynesAegis", "yandir_chaurus_bile") + elseif (settings.yandir_chaurus_bile == 2) then + self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_KYNESAEGIS_CHAURUS_BILE_COMMON), "kynesAegis", "yandir_chaurus_bile", 2) + end + end + end end end diff --git a/lang/en.lua b/lang/en.lua index 8fc6838..5ea88b4 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -561,6 +561,8 @@ L.Settings_KynesAegis_Blood_Fountain = "General: Blood Fountain" L.Settings_KynesAegis_Blood_Fountain_TT = "Alerts you when Bloodknight starts his Blood Fountain attack, counting down until it is unleashed. It looks like cross-shaped AoE, and need to be avoided as it deals heavy damage." L.Settings_KynesAegis_Totem = "Yandir: Totems spawn" L.Settings_KynesAegis_Totem_TT = "Alerts you when certain totem appeared during the battle with Yandir the Butcher boss.\n\nDragon Totems: always two appears at the same time; each one blows out fire along a straight line in two opposite directions.\nHarpy Totem: spawns a lightning aura that will radiate out.\nGargoyle totem: encases random players into stone.\nChaurus Totem: poisons several people, and this poison should not be spread to others, that's why you should not stack at this phase." +L.Settings_KynesAegis_Chaurus_Bile = "Yandir: Chaurus Bile" +L.Settings_KynesAegis_Chaurus_Bile_TT = "Alerts you when Chaurus Totem launch Chaurus Bile projectiles towards random group members. This projectile can be dodged." -- Alerts L.Alerts_KynesAegis_Crashing_Wall = "|cd2a100Crashing Wall|r in" @@ -570,6 +572,8 @@ L.Alerts_KynesAegis_Dragon_Totem = "Two |cffa500Dragon Totems L.Alerts_KynesAegis_Harpy_Totem = "|c00bfffHarpy Totem|r spawned." L.Alerts_KynesAegis_Gargoyle_Totem = "|cf5f5dcGargoyle Totem|r spawned." L.Alerts_KynesAegis_Chaurus_Totem = "|c39942eChaurus Totem|r spawned. Don't stack!" +L.Alerts_KynesAegis_Chaurus_Bile_Self = "|c39942eChaurus Bile|r incoming at you. Dodge!" +L.Alerts_KynesAegis_Chaurus_Bile_Common = "|c39942eChaurus Bile|r incoming!" --------------------------------