Skip to content

Commit

Permalink
Version 2.2.2 final
Browse files Browse the repository at this point in the history 
- Fixed glyph cooldown in Maw of Lorkhaj being in milliseconds instead of seconds.
- Added aspects display at the False Moon Twins.
- Disabled the Lunar Bastion notifications due to changes with how the effect is reported to addons. Currently investigating if I can work around it.
  • Loading branch information
@kyoma
kyoma committed Aug 23, 2017
1 parent 2e1be4c commit 562a456
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 75 deletions.
4 changes: 2 additions & 2 deletions BuffsDebuffs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,10 @@ maw_lorkhaj.zhaj_gripoflorkhaj[57470] = true
maw_lorkhaj.zhaj_gripoflorkhaj[57471] = true
-- Curse
maw_lorkhaj.zhajBoss_curseability = 57517
maw_lorkhaj.zhajBoss_curseduration = 25000
maw_lorkhaj.zhajBoss_curseduration = 25
-- Glyphs
maw_lorkhaj.zhajBoss_glyphability = 57525
maw_lorkhaj.zhajBoss_glyphcooldown = 25000
maw_lorkhaj.zhajBoss_glyphcooldown = 25
maw_lorkhaj.zhajBoss_knownGlyphs = {}
maw_lorkhaj.zhajBoss_glyphs = {
{x=0.55496829748154, y=0.29175475239754},
Expand Down
102 changes: 43 additions & 59 deletions RaidNotifier.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1073,39 +1073,31 @@ do ---------------------------

-- False Moon Twins, S’Kinrai and Vashai
if (buffsDebuffs.twinBoss_lunaraspect[abilityId]) then
dbg("[%d] Receiving Lunar Aspect", abilityId)
--dbg("[%d] Receiving Lunar Aspect", abilityId)
if settings.twinBoss_aspects >= 2 then
self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_LUNAR_ASPECT), "mawLorkhaj", "twinBoss_aspects", 4)
end
if settings.twinBoss_aspects_status then
self:UpdateTwinAspect("lunar")
end
self:UpdateTwinAspect("lunar")
elseif (buffsDebuffs.twinBoss_shadowaspect[abilityId]) then
dbg("[%d] Receiving Shadow Aspect", abilityId)
--dbg("[%d] Receiving Shadow Aspect", abilityId)
if settings.twinBoss_aspects >= 2 then
self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_SHADOW_ASPECT), "mawLorkhaj", "twinBoss_aspects", 4)
end
if settings.twinBoss_aspects_status then
self:UpdateTwinAspect("shadow")
end
self:UpdateTwinAspect("shadow")
elseif (buffsDebuffs.twinBoss_lunarconversion[abilityId]) then
dbg("[%d] Converting to Lunar Aspect", abilityId)
--dbg("[%d] Converting to Lunar Aspect", abilityId)
--conversion just started
if settings.twinBoss_aspects >= 1 then
self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_LUNAR_CONVERSION), "mawLorkhaj", "twinBoss_aspects", 4)
end
if settings.twinBoss_aspects_status then
self:UpdateTwinAspect("tolunar")
end
self:UpdateTwinAspect("tolunar")
elseif (buffsDebuffs.twinBoss_shadowconversion[abilityId]) then
dbg("[%d] Converting to Shadow Aspect", abilityId)
--dbg("[%d] Converting to Shadow Aspect", abilityId)
--conversion just started
if settings.twinBoss_aspects >= 1 then
self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_SHADOW_CONVERSION), "mawLorkhaj", "twinBoss_aspects", 4)
end
if settings.twinBoss_aspects_status then
self:UpdateTwinAspect("toshadow")
end
self:UpdateTwinAspect("toshadow")
end

--Dro'm Athra Savage / Dro'm Athra Hulk: Armor Shatter
Expand Down Expand Up @@ -1134,19 +1126,19 @@ do ---------------------------
self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_UNSTABLE_VOID_OTHER), tName), "mawLorkhaj", "rakkhat_unstablevoid")
end
end
elseif (buffsDebuffs.rakkhat_lunarbastion[abilityId]) then
if settings.rakkhat_lunarbastion1 >= 1 then
tName = LUNIT:GetNameForUnitId(tUnitId) --isn't supplied by event for group members, only for the player
if (tType == COMBAT_UNIT_TYPE_PLAYER) then
if (settings.rakkhat_lunarbastion1 == 1 or settings.rakkhat_lunarbastion1 == 3) then --if "Self" or "All"
self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_LUNARBASTION1), "mawLorkhaj", "rakkhat_lunarbastion1")
end
elseif (tName ~= "") then
if (settings.rakkhat_lunarbastion1 == 2 or settings.rakkhat_lunarbastion1 == 3) then --if "Other" or "All"
self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_LUNARBASTION1_OTHER), tName), "mawLorkhaj", "rakkhat_lunarbastion1")
end
end
end
--elseif (buffsDebuffs.rakkhat_lunarbastion[abilityId]) then
-- if settings.rakkhat_lunarbastion1 >= 1 then
-- tName = LUNIT:GetNameForUnitId(tUnitId) --isn't supplied by event for group members, only for the player
-- if (tType == COMBAT_UNIT_TYPE_PLAYER) then
-- if (settings.rakkhat_lunarbastion1 == 1 or settings.rakkhat_lunarbastion1 == 3) then --if "Self" or "All"
-- self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_LUNARBASTION1), "mawLorkhaj", "rakkhat_lunarbastion1")
-- end
-- elseif (tName ~= "") then
-- if (settings.rakkhat_lunarbastion1 == 2 or settings.rakkhat_lunarbastion1 == 3) then --if "Other" or "All"
-- self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_LUNARBASTION1_OTHER), tName), "mawLorkhaj", "rakkhat_lunarbastion1")
-- end
-- end
-- end
end

elseif (result == ACTION_RESULT_EFFECT_FADED) then
Expand All @@ -1155,49 +1147,41 @@ do ---------------------------
-- End of conversion now properly falls under ACTION_RESULT_EFFECT_FADED
if (buffsDebuffs.twinBoss_lunarconversion[abilityId]) then
--conversion ended
dbg("[%d] Conversion Complete", abilityId)
--dbg("[%d] Conversion Complete", abilityId)
if settings.twinBoss_aspects >= 3 then
self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_LUNAR_ASPECT), "mawLorkhaj", "twinBoss_aspects", 4)
end
if settings.twinBoss_aspects_status then
self:UpdateTwinAspect("lunar")
end
self:UpdateTwinAspect("lunar")
elseif (buffsDebuffs.twinBoss_shadowconversion[abilityId]) then
--conversion ended
dbg("[%d] Conversion Complete", abilityId)
--dbg("[%d] Conversion Complete", abilityId)
if settings.twinBoss_aspects >= 3 then
self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_SHADOW_ASPECT), "mawLorkhaj", "twinBoss_aspects", 4)
end
if settings.twinBoss_aspects_status then
self:UpdateTwinAspect("shadow")
end
self:UpdateTwinAspect("shadow")
elseif (abilityId == buffsDebuffs.twinBoss_shadowaspectremove) then
dbg("[%d] Removing Shadow Aspect", abilityId)
if settings.twinBoss_aspects_status then
self:UpdateTwinAspect("none")
end
--dbg("[%d] Removing Shadow Aspect", abilityId)
self:UpdateTwinAspect("none")
elseif (abilityId == buffsDebuffs.twinBoss_lunaraspectremove) then
dbg("[%d] Removing Lunar Aspect", abilityId)
if settings.twinBoss_aspects_status then
self:UpdateTwinAspect("none")
end
--dbg("[%d] Removing Lunar Aspect", abilityId)
self:UpdateTwinAspect("none")
end
end

if (buffsDebuffs.rakkhat_lunarbastion[abilityId]) then
if settings.rakkhat_lunarbastion2 >= 1 then
tName = LUNIT:GetNameForUnitId(tUnitId) --isn't supplied by event for group members, only for the player
if (tType == COMBAT_UNIT_TYPE_PLAYER) then
if (settings.rakkhat_lunarbastion2 == 1 or settings.rakkhat_lunarbastion2 == 3) then --if "Self" or "All"
self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_LUNARBASTION2), "mawLorkhaj", "rakkhat_lunarbastion2")
end
elseif (tName ~= "") then
if (settings.rakkhat_lunarbastion2 == 2 or settings.rakkhat_lunarbastion2 == 3) then --if "Other" or "All"
self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_LUNARBASTION2_OTHER), tName), "mawLorkhaj", "rakkhat_lunarbastion2")
end
end
end
end
--if (buffsDebuffs.rakkhat_lunarbastion[abilityId]) then
-- if settings.rakkhat_lunarbastion2 >= 1 then
-- tName = LUNIT:GetNameForUnitId(tUnitId) --isn't supplied by event for group members, only for the player
-- if (tType == COMBAT_UNIT_TYPE_PLAYER) then
-- if (settings.rakkhat_lunarbastion2 == 1 or settings.rakkhat_lunarbastion2 == 3) then --if "Self" or "All"
-- self:AddAnnouncement(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_LUNARBASTION2), "mawLorkhaj", "rakkhat_lunarbastion2")
-- end
-- elseif (tName ~= "") then
-- if (settings.rakkhat_lunarbastion2 == 2 or settings.rakkhat_lunarbastion2 == 3) then --if "Other" or "All"
-- self:AddAnnouncement(zo_strformat(GetString(RAIDNOTIFIER_ALERTS_MAWLORKHAJ_RAKKHAT_LUNARBASTION2_OTHER), tName), "mawLorkhaj", "rakkhat_lunarbastion2")
-- end
-- end
-- end
--end
end

elseif (raidId == RAID_MAELSTROM_ARENA) then
Expand Down
30 changes: 18 additions & 12 deletions Settings.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,12 @@ function RaidNotifier:CreateSettingsMenu()
tooltip = L.Settings_MawLorkhaj_Twin_Aspects_TT,
choices = choices.mawLorkhaj.twinBoss_aspects,
}, "mawLorkhaj", "twinBoss_aspects")
MakeControlEntry({
type = "checkbox",
name = L.Settings_MawLorkhaj_Twin_Aspects_Status,
tooltip = L.Settings_MawLorkhaj_Twin_Aspects_Status_TT,
noAlert = true,
}, "mawLorkhaj", "twinBoss_aspects_status")
MakeControlEntry({
type = "dropdown",
name = L.Settings_MawLorkhaj_Rakkhat_Unstable_Void,
Expand All @@ -909,18 +915,18 @@ function RaidNotifier:CreateSettingsMenu()
name = L.Settings_MawLorkhaj_Rakkhat_DarkBarrage,
tooltip = L.Settings_MawLorkhaj_Rakkhat_DarkBarrage_TT,
}, "mawLorkhaj", "rakkhat_darkbarrage")
MakeControlEntry({
type = "dropdown",
name = L.Settings_MawLorkhaj_Rakkhat_LunarBastion1,
tooltip = L.Settings_MawLorkhaj_Rakkhat_LunarBastion1_TT,
choices = choices.mawLorkhaj.rakkhat_lunarbastion1,
}, "mawLorkhaj", "rakkhat_lunarbastion1")
MakeControlEntry({
type = "dropdown",
name = L.Settings_MawLorkhaj_Rakkhat_LunarBastion2,
tooltip = L.Settings_MawLorkhaj_Rakkhat_LunarBastion2_TT,
choices = choices.mawLorkhaj.rakkhat_lunarbastion2,
}, "mawLorkhaj", "rakkhat_lunarbastion2")
-- MakeControlEntry({
-- type = "dropdown",
-- name = L.Settings_MawLorkhaj_Rakkhat_LunarBastion1,
-- tooltip = L.Settings_MawLorkhaj_Rakkhat_LunarBastion1_TT,
-- choices = choices.mawLorkhaj.rakkhat_lunarbastion1,
-- }, "mawLorkhaj", "rakkhat_lunarbastion1")
-- MakeControlEntry({
-- type = "dropdown",
-- name = L.Settings_MawLorkhaj_Rakkhat_LunarBastion2,
-- tooltip = L.Settings_MawLorkhaj_Rakkhat_LunarBastion2_TT,
-- choices = choices.mawLorkhaj.rakkhat_lunarbastion2,
-- }, "mawLorkhaj", "rakkhat_lunarbastion2")
MakeControlEntry({
type = "checkbox",
name = L.Settings_MawLorkhaj_Shattered,
Expand Down
5 changes: 3 additions & 2 deletions UI.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,9 @@ do -------------------
--end

-- Maw of Lorkhaj: False Moon Twins
function RaidNotifier:UpdateTwinAspect(aspect) -- "none", "lunar" or "shadow"
if not self:IsDevMode() then return end -- placed here for centralization
function RaidNotifier:UpdateTwinAspect(aspect)
local settings = self.Vars.mawLorkhaj
if not settings.twinBoss_aspects_status then return end

if not display then return end
if owner ~= "mol_twins_aspect" then
Expand Down
2 changes: 2 additions & 0 deletions lang/en.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ L.Settings_MawLorkhaj_Zhaj_Glyphs_Invert = " - Inverted View"
L.Settings_MawLorkhaj_Zhaj_Glyphs_Invert_TT = "Invert cleansing platforms."
L.Settings_MawLorkhaj_Twin_Aspects = "False Moon Twins: Aspects"
L.Settings_MawLorkhaj_Twin_Aspects_TT = "Alerts when you get the Lunar or Shadow aspect at the False Moon Twins.\n\n Full alerts you when you get an aspect, when you are starting to convert to an aspect and when the conversion is complete.\n Normal alerts you when you get an aspect and when you are converting.\n Minimal only alerts you when you are converting."
L.Settings_MawLorkhaj_Twin_Aspects_Status = " - Show Status"
L.Settings_MawLorkhaj_Twin_Aspects_Status_TT = "Shows your current aspect in the status display during the boss fight."
L.Settings_MawLorkhaj_Rakkhat_Unstable_Void = "Rakkhat: Unstable Void"
L.Settings_MawLorkhaj_Rakkhat_Unstable_Void_TT = "Alerts when you have the unstable void effect at Rakkhat."
L.Settings_MawLorkhaj_Rakkhat_ThreshingWings = "Rakkhat: Threshing Wings"
Expand Down

0 comments on commit 562a456

Please sign in to comment.