diff --git a/BuffsDebuffs.lua b/BuffsDebuffs.lua index 4201d64..c15c183 100644 --- a/BuffsDebuffs.lua +++ b/BuffsDebuffs.lua @@ -251,8 +251,8 @@ maw_lorkhaj.rakkhat_lunarbastion[74352] = true maw_lorkhaj.rakkhat_lunarbastion[74357] = true maw_lorkhaj.rakkhat_lunarbastion[74362] = true maw_lorkhaj.rakkhat_lunarbastion[74367] = true --- Armor Weakening provided by Hulk's Thunderous Smash -maw_lorkhaj.rakkhat_hulk_armorweakening = 74672 +-- Armor Weakened debuff provided by Hulk's Thunderous Smash attack +maw_lorkhaj.rakkhat_hulk_armorweakened = 74672 --Mobs -- Eclipse Field (Sun-Eater) diff --git a/RaidNotifier.lua b/RaidNotifier.lua index 573155c..28564a6 100644 --- a/RaidNotifier.lua +++ b/RaidNotifier.lua @@ -678,7 +678,7 @@ do ---------------------- EVENT_MANAGER:AddFilterForEvent(self.Name, EVENT_EFFECT_CHANGED, REGISTER_FILTER_UNIT_TAG, "player") end if (self.raidId == RAID_MAW_OF_LORKHAJ) then - EVENT_MANAGER:AddFilterForEvent(self.Name, EVENT_EFFECT_CHANGED, REGISTER_FILTER_ABILITY_ID, self.BuffsDebuffs[RAID_MAW_OF_LORKHAJ].rakkhat_hulk_armorweakening) + EVENT_MANAGER:AddFilterForEvent(self.Name, EVENT_EFFECT_CHANGED, REGISTER_FILTER_ABILITY_ID, self.BuffsDebuffs[RAID_MAW_OF_LORKHAJ].rakkhat_hulk_armorweakened) end end if (bossesChangedCallback) then diff --git a/Settings.lua b/Settings.lua index e0ac033..a4ea39f 100644 --- a/Settings.lua +++ b/Settings.lua @@ -216,7 +216,7 @@ do ------------------ rakkhat_darkbarrage = false, rakkhat_lunarbastion1 = 0, -- "Off" rakkhat_lunarbastion2 = 0, -- "Off" - hulk_thunderoussmash = false, + hulk_armorweakened = false, suneater_eclipse = 1, -- "Self" shattering_strike = 0, -- "Off" zhaj_gripoflorkhaj = true, @@ -1145,9 +1145,9 @@ function RaidNotifier:CreateSettingsMenu() }, "mawLorkhaj", "rakkhat_darkbarrage") MakeControlEntry({ type = "checkbox", - name = L.Settings_MawLorkhaj_Hulk_ThunderousSmash, - tooltip = L.Settings_MawLorkhaj_Hulk_ThunderousSmash_TT, - }, "mawLorkhaj", "hulk_thunderoussmash") + name = L.Settings_MawLorkhaj_Hulk_ArmorWeakened, + tooltip = L.Settings_MawLorkhaj_Hulk_ArmorWeakened_TT, + }, "mawLorkhaj", "hulk_armorweakened") -- MakeControlEntry({ -- type = "dropdown", -- name = L.Settings_MawLorkhaj_Rakkhat_LunarBastion1, diff --git a/TrialMawOfLorkhaj.lua b/TrialMawOfLorkhaj.lua index 8330672..659bd74 100644 --- a/TrialMawOfLorkhaj.lua +++ b/TrialMawOfLorkhaj.lua @@ -72,22 +72,22 @@ function RaidNotifier.MOL.OnEffectChanged(eventCode, changeType, eSlot, eName, u local self = RaidNotifier local buffsDebuffs, settings = self.BuffsDebuffs[raidId], self.Vars.mawLorkhaj - if (abilityId == buffsDebuffs.rakkhat_hulk_armorweakening and string.sub(uTag, 1, 5) == "group") then - if (settings.hulk_thunderoussmash) then + if (abilityId == buffsDebuffs.rakkhat_hulk_armorweakened and string.sub(uTag, 1, 5) == "group") then + if (settings.hulk_armorweakened) then if (changeType ~= EFFECT_RESULT_FADED) then if (AreUnitsEqual(uTag, "player")) then if (stackCount == 1) then - self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_HULK_THUNDEROUSSMASH1), "mawLorkhaj", "hulk_thunderoussmash") + self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_HULK_ARMORWEAKENED1), "mawLorkhaj", "hulk_armorweakened") elseif (stackCount == 2) then - self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_HULK_THUNDEROUSSMASH2), "mawLorkhaj", "hulk_thunderoussmash") + self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_HULK_ARMORWEAKENED2), "mawLorkhaj", "hulk_armorweakened") end else local targetPlayerName = self.UnitIdToString(uId) if (stackCount == 1) then - self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_HULK_THUNDEROUSSMASH1_OTHER), targetPlayerName), "mawLorkhaj", "hulk_thunderoussmash") + self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_HULK_ARMORWEAKENED1_OTHER), targetPlayerName), "mawLorkhaj", "hulk_armorweakened") elseif (stackCount == 2) then - self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_HULK_THUNDEROUSSMASH2_OTHER), targetPlayerName), "mawLorkhaj", "hulk_thunderoussmash") + self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_HULK_ARMORWEAKENED2_OTHER), targetPlayerName), "mawLorkhaj", "hulk_armorweakened") end end end diff --git a/lang/en.lua b/lang/en.lua index f2a1b25..acf745d 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -253,8 +253,8 @@ L.Settings_MawLorkhaj_Rakkhat_LunarBastion1 = "Rakkhat: Lunar Bastion Ga L.Settings_MawLorkhaj_Rakkhat_LunarBastion1_TT = "Shows when a player gains the blessing from the glowing platform." L.Settings_MawLorkhaj_Rakkhat_LunarBastion2 = "Rakkhat: Lunar Bastion Lost" L.Settings_MawLorkhaj_Rakkhat_LunarBastion2_TT = "Shows when a player loses the blessing from the glowing platform." -L.Settings_MawLorkhaj_Hulk_ThunderousSmash = "Hulk: Thunderous Smash" -L.Settings_MawLorkhaj_Hulk_ThunderousSmash_TT = "Alerts when Hulk applies stack of Thunderous Smash on the tank, making his armor weakened. You should not have more than two stacks as third is oneshot." +L.Settings_MawLorkhaj_Hulk_ArmorWeakened = "Hulk: Armor Weakened" +L.Settings_MawLorkhaj_Hulk_ArmorWeakened_TT = "Alerts when Hulk applies stack of Armor Weakened debuff by his Thunderous Smash attack. You should not have more than two stacks or incoming damage will be too high to handle." L.Settings_MawLorkhaj_ShatteringStrike = "Mobs: Shattering Strike" L.Settings_MawLorkhaj_ShatteringStrike_TT = "Get a warning when Dro-m'Athra Savage is about to cast shattering strike attack." L.Settings_MawLorkhaj_Shattered = "Mobs: Armor Shattered" @@ -278,10 +278,10 @@ L.Alerts_MawLorkhaj_Rakkhat_LunarBastion1 = "You gained |cFEFF7FLunar L.Alerts_MawLorkhaj_Rakkhat_LunarBastion1_Other = "|cFF0000<>|r gained |cFEFF7FLunar Bastion|r" L.Alerts_MawLorkhaj_Rakkhat_LunarBastion2 = "You lost |cFEFF7FLunar Bastion|r" L.Alerts_MawLorkhaj_Rakkhat_LunarBastion2_Other = "|cFF0000<>|r lost |cFEFF7FLunar Bastion|r" -L.Alerts_MawLorkhaj_Hulk_ThunderousSmash1 = "You got 1 stack of |c000055Hulk's Thunderous Smash|r." -L.Alerts_MawLorkhaj_Hulk_ThunderousSmash1_Other = "|cFF0000<>|r got 1 stack of |c000055Hulk's Thunderous Smash|r." -L.Alerts_MawLorkhaj_Hulk_ThunderousSmash2 = "You got |cFF00002 stacks|r of |c000055Hulk's Thunderous Smash|r!" -L.Alerts_MawLorkhaj_Hulk_ThunderousSmash2_Other = "|cFF0000<>|r got |cFF00002 stacks|r of |c000055Hulk's Thunderous Smash|r!" +L.Alerts_MawLorkhaj_Hulk_ArmorWeakened1 = "You got 1 stack of |c000055Armor Weakened|r debuff." +L.Alerts_MawLorkhaj_Hulk_ArmorWeakened1_Other = "|cFF0000<>|r got 1 stack of |c000055Armor Weakened|r debuff." +L.Alerts_MawLorkhaj_Hulk_ArmorWeakened2 = "You got |cFF00002 stacks|r of |c000055Armor Weakened|r debuff!" +L.Alerts_MawLorkhaj_Hulk_ArmorWeakened2_Other = "|cFF0000<>|r got |cFF00002 stacks|r of |c000055Armor Weakened|r debuff!" L.Alerts_MawLorkhaj_Suneater_Eclipse = "Incoming |cFF0000Eclipse Field|r on you." L.Alerts_MawLorkhaj_Suneater_Eclipse_Other = "Incoming |cFF0000Eclipse Field|r on |cFF0000<>|r!" L.Alerts_MawLorkhaj_ShatteringStrike = "Incoming |c000055Shattering Strike|r on you."