Skip to content

Commit

Permalink
Cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
funkydude committed Dec 9, 2023
1 parent fde0cc5 commit d2933c9
Show file tree
Hide file tree
Showing 36 changed files with 215 additions and 159 deletions.
8 changes: 6 additions & 2 deletions CastleNathria/Affixes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ local bar_icon = bar_icon_texture
local L = mod:GetLocale()
if L then
L.custom_on_bar_icon = "Bar Icon"
L.custom_on_bar_icon_desc = bar_icon_texture.."Show the Fated Raid icon on bars."
L.custom_on_bar_icon_desc = "Show the Fated Raid icon on bars."

L.chaotic_essence = "Essence"
L.creation_spark = "Sparks"
Expand Down Expand Up @@ -88,10 +88,14 @@ end

function mod:VerifyEnable()
if C_ModifiedInstance.GetModifiedInstanceInfoFromMapID(self.instanceId) then
return true
return true
end
end

function mod:OnRegister()
L.custom_on_bar_icon_desc = bar_icon_texture .. L.custom_on_bar_icon_desc
end

function mod:OnBossEnable()
self:RegisterMessage("BigWigs_OnBossEngage", "OnBossEngage")
self:RegisterEvent("ENCOUNTER_END")
Expand Down
16 changes: 9 additions & 7 deletions CastleNathria/Altimor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ local ripSoulCount = 1
local shadesOfBargastCount = 1
local petrifyingHowlCount = 1
local mobCollector = {}
local lungeTarget = nil
local lungeTarget = 0

--------------------------------------------------------------------------------
-- Localization
Expand Down Expand Up @@ -117,7 +117,7 @@ function mod:OnEngage()
shadesOfBargastCount = 1
petrifyingHowlCount = 1
mobCollector = {}
lungeTarget = nil
lungeTarget = 0
self:SetStage(1)

self:Bar(334404, 6.5) -- Spreadshot
Expand Down Expand Up @@ -206,30 +206,32 @@ function mod:JaggedClawsApplied(args)
end

function mod:ViciousLungeApplied(args)
lungeTarget = args.destGUID
self:TargetMessage(args.spellId, "orange", args.destName, CL.count:format(args.spellName, viciousLungeCount))
self:PrimaryIcon(args.spellId, args.destName)
if self:Me(lungeTarget) then
if self:Me(args.destGUID) then
lungeTarget = 2
self:PlaySound(args.spellId, "warning")
self:Yell(args.spellId)
self:YellCountdown(args.spellId, 6)
else
lungeTarget = 1
end
viciousLungeCount = viciousLungeCount + 1
self:Bar(args.spellId, 25, CL.count:format(args.spellName, viciousLungeCount))
end

function mod:ViciousLungeRemoved(args)
lungeTarget = nil
lungeTarget = 0
self:PrimaryIcon(args.spellId)
if self:Me(args.destGUID) then
self:CancelYellCountdown(args.spellId)
end
end

function mod:MargoreDeath()
if lungeTarget then -- Vicious Lunge
if lungeTarget > 0 then -- Currently casting Vicious Lunge on someone
self:PrimaryIcon(334945)
if self:Me(lungeTarget) then
if lungeTarget == 2 then -- Casting it on you
self:CancelYellCountdown(334945)
self:Yell(334945, CL.cancelled:format(self:SpellName(334945)), true)
end
Expand Down
5 changes: 1 addition & 4 deletions CastleNathria/HungeringDestroyer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ if L then

L.custom_on_repeating_say_laser = "Repeating Volatile Ejection Say"
L.custom_on_repeating_say_laser_desc = "Repeating say messages for Volatile Ejection to help when moving into chat range of players that didn't see your first message."

L.currentHealth = "%d%%"
L.currentHealthIcon = "{rt%d}%d%%"
end

--------------------------------------------------------------------------------
Expand Down Expand Up @@ -167,7 +164,7 @@ local function RepeatingChatMessages()
local currentHealthPercent = math.floor(mod:GetHealth("player"))
if currentHealthPercent < 75 then -- Only let players know when you are below 75%
local myIcon = GetRaidTargetIndex("player")
local msg = myIcon and L.currentHealthIcon:format(myIcon, currentHealthPercent) or L.currentHealth:format(currentHealthPercent)
local msg = myIcon and ("{rt%d}%d%%"):format(myIcon, currentHealthPercent) or ("%d%%"):format(currentHealthPercent)
mod:Yell(false, msg, true)
end
if not mod:Mythic() then
Expand Down
2 changes: 1 addition & 1 deletion CastleNathria/InervaDarkvein.lua
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function mod:GetOptions()
331550, -- Condemn
},{
[331870] = "general",
[325379] = -22571, -- Container of Desire
[341621] = -22571, -- Container of Desire
[325769] = -22592, -- Container of Bottled Anima
[324983] = -22599, -- Container of Sin
[332664] = -22567, -- Container of Concentrated Anima
Expand Down
2 changes: 1 addition & 1 deletion CastleNathria/SunKingsSalvation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function mod:GetOptions()
[-21954] = -21951, -- Ministers of Vice
[326078] = -22231, -- Infusing Essences
[328889] = -22089, -- High Torturer Darithos
[338600] = "mythic",
[337859] = "mythic",
},{
[328479] = CL.fixate, -- Eyes on Target (Fixate)
[337859] = CL.shield, -- Cloak of Flames (Shield)
Expand Down
8 changes: 6 additions & 2 deletions SanctumOfDomination/Affixes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ local bar_icon = bar_icon_texture
local L = mod:GetLocale()
if L then
L.custom_on_bar_icon = "Bar Icon"
L.custom_on_bar_icon_desc = bar_icon_texture.."Show the Fated Raid icon on bars."
L.custom_on_bar_icon_desc = "Show the Fated Raid icon on bars."

L.chaotic_essence = "Essence"
L.creation_spark = "Sparks"
Expand Down Expand Up @@ -89,10 +89,14 @@ end

function mod:VerifyEnable()
if C_ModifiedInstance.GetModifiedInstanceInfoFromMapID(self.instanceId) then
return true
return true
end
end

function mod:OnRegister()
L.custom_on_bar_icon_desc = bar_icon_texture .. L.custom_on_bar_icon_desc
end

function mod:OnBossEnable()
self:RegisterMessage("BigWigs_OnBossEngage", "OnBossEngage")
self:RegisterEvent("ENCOUNTER_END")
Expand Down
28 changes: 13 additions & 15 deletions SanctumOfDomination/KelThuzad.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ if L then
L.spike = "Spike"
L.silence = mod:SpellName(226452) -- Silence
L.miasma = "Miasma" -- Short for Sinister Miasma
L.glacial_winds = "Tornadoes"
L.foul_winds = "Pushback"

L.custom_on_nameplate_fixate = "Fixate Nameplate Icon"
L.custom_on_nameplate_fixate_desc = "Show an icon on the nameplate of Frostbound Devoted that are fixed on you.\n\nRequires the use of Enemy Nameplates and a supported nameplate addon (KuiNameplates, Plater)."
Expand Down Expand Up @@ -98,8 +96,8 @@ function mod:GetOptions()
[348760] = CL.meteor, -- Frost Blast (Meteor)
[354289] = L.miasma, -- Necrotic Miasma (Miasma)
[352293] = self:SpellName(249436), -- Necrotic Destruction (Destruction)
[355055] = L.glacial_winds, -- Glacial Winds (Tornadoes)
[355127] = L.foul_winds, -- Foul Winds (Pushback)
[355055] = CL.tornadoes, -- Glacial Winds (Tornadoes)
[355127] = CL.pushback, -- Foul Winds (Pushback)
}
end

Expand Down Expand Up @@ -509,15 +507,15 @@ function mod:VengefulDestruction(args)
-- XXX Starts when the first person enters, should we keep this or just ditch it?
-- local remnant = self:GetBossId(176929) -- was only ever boss2, but just to make sure
-- if remnant and self:GetHealth(remnant) < 34 then -- final stage 2
-- --self:CDBar(355055, 3, L.glacial_winds) -- Glacial Winds
-- --self:CDBar(355055, 3, CL.tornadoes) -- Glacial Winds
-- --self:CDBar(352379, 11) -- Freezing Blast
-- -- if self:Mythic() then
-- -- self:CDBar(355127, 7, L.foul_winds) -- Foul Winds
-- -- self:CDBar(355127, 7, CL.pushback) -- Foul Winds
-- -- end
-- else
-- self:CDBar(352379, self:Mythic() and 3 or 7) -- Freezing Blast
-- if self:Mythic() then
-- self:CDBar(355127, 7, L.foul_winds) -- Foul Winds
-- self:CDBar(355127, 7, CL.pushback) -- Foul Winds
-- end
-- end
end
Expand All @@ -530,8 +528,8 @@ function mod:NecroticSurgeApplied(args)
end
self:StopBar(CL.cast:format(self:SpellName(249436))) -- Destruction
self:StopBar(352379) -- Freezing Blast
self:StopBar(L.glacial_winds) -- Glacial Winds
self:StopBar(L.foul_winds) -- Foul Winds
self:StopBar(CL.tornadoes) -- Glacial Winds
self:StopBar(CL.pushback) -- Foul Winds
if self:GetStage() == 2 then
self:SetStage(1)
soulFractureCount = 1
Expand Down Expand Up @@ -570,16 +568,16 @@ end

function mod:GlacialWinds(args)
if inPhylactery then
self:Message(args.spellId, "cyan", L.glacial_winds)
self:CDBar(args.spellId, 13.5, L.glacial_winds)
self:Message(args.spellId, "cyan", CL.tornadoes)
self:CDBar(args.spellId, 13.5, CL.tornadoes)
self:PlaySound(args.spellId, "info")
end
end

function mod:FoulWinds(args)
if inPhylactery then
self:Message(args.spellId, "yellow", L.foul_winds)
self:CDBar(args.spellId, 25.5, L.foul_winds)
self:Message(args.spellId, "yellow", CL.pushback)
self:CDBar(args.spellId, 25.5, CL.pushback)
self:PlaySound(args.spellId, "alert")
end
end
Expand All @@ -592,8 +590,8 @@ function mod:UndyingWrath(args)
end

self:StopBar(352379) -- Freezing Blast
self:StopBar(L.glacial_winds) -- Glacial Winds
self:StopBar(L.foul_winds) -- Foul Winds
self:StopBar(CL.tornadoes) -- Glacial Winds
self:StopBar(CL.pushback) -- Foul Winds
end

function mod:OnslaughtOfTheDamned(args)
Expand Down
12 changes: 7 additions & 5 deletions SanctumOfDomination/Locales/deDE.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ end
L = BigWigs:NewBossLocale("The Eye of the Jailer", "deDE")
if L then
L.chains = "Ketten" -- Short for Dragging Chains
L.pool = "Lache" -- Spreading Misery
L.pools = "Lachen" -- Spreading Misery (multiple)
L.death_gaze = "Todesblick" -- Short for Titanic Death Gaze
end

Expand Down Expand Up @@ -119,18 +117,22 @@ if L then
L.custom_on_nameplate_fixate = "Fixieren-Symbol an gegnerischen Namensplaketten"
L.custom_on_nameplate_fixate_desc = "Zeigt ein Symbol an der Namensplakette der Dich fixierenden Dunklen Wache an.\n\nBenötigt die Nutzung von Namensplaketten sowie ein unterstütztes Addon (KuiNameplates, Plater)."

--L.intermission_chains = "Intermission Chains"
L.chains = "Ketten" -- Short for Domination Chains
L.chain = "Kette" -- Single Domination Chain
L.darkness = "Dunkelheit" -- Short for Veil of Darkness
L.arrow = "Pfeil" -- Short for Wailing Arrow
--L.arrow_done = "DONE" -- Message when the arrow has hit
L.wave = "Welle" -- Short for Haunting Wave
L.dread = "Angst" -- Short for Crushing Dread
L.orbs = "Kugeln" -- Dark Communion
L.curse = "Fluch" -- Short for Curse of Lethargy
L.pools = "Lachen" -- Banshee's Bane
L.scream = "Kreischen" -- Banshee Scream

L.knife_fling = "Messer fliegen!" -- "Death-touched blades fling out"
--L.bridges = "Bridges"
--L.rive_counter = "%s (%d/%d)"
--L.soaks = "Soaks" -- Merciless
--L.count_x = "%s (x%d)(%d)"
--L.shroud_active = "Shroud (%d) - %.1f%%!"
end

L = BigWigs:NewBossLocale("Sanctum of Domination Affixes", "deDE")
Expand Down
12 changes: 7 additions & 5 deletions SanctumOfDomination/Locales/esES.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ end
L = BigWigs:NewBossLocale("The Eye of the Jailer", "esES")
if L then
L.chains = "Cadenas" -- Short for Dragging Chains
L.pool = "Charco" -- Spreading Misery
L.pools = "Charcos" -- Spreading Misery (multiple)
L.death_gaze = "Mirada Aniquiladora" -- Short for Titanic Death Gaze
end

Expand Down Expand Up @@ -119,18 +117,22 @@ if L then
L.custom_on_nameplate_fixate = "Icono placa de nombre Fijado"
L.custom_on_nameplate_fixate_desc = "Muestra un icono en la placa de nombre del Centinela Oscuro que se fija en ti.\n\nRequiere el uso de Placa de nombre enemigas y un addon de placas de nombres soportado (KuiNameplates, Plater)."

--L.intermission_chains = "Intermission Chains"
L.chains = "Cadenas" -- Short for Domination Chains
L.chain = "Cadena" -- Single Domination Chain
L.darkness = "Oscuridad" -- Short for Veil of Darkness
L.arrow = "Flecha" -- Short for Wailing Arrow
--L.arrow_done = "DONE" -- Message when the arrow has hit
L.wave = "Ola" -- Short for Haunting Wave
L.dread = "Terror" -- Short for Crushing Dread
L.orbs = "Orbes" -- Dark Communion
L.curse = "Maldicion" -- Short for Curse of Lethargy
L.pools = "Charcos" -- Banshee's Bane
L.scream = "Alarido" -- Banshee Scream

L.knife_fling = "¡Cuchillas fuera!" -- "Death-touched blades fling out"
--L.bridges = "Bridges"
--L.rive_counter = "%s (%d/%d)"
--L.soaks = "Soaks" -- Merciless
--L.count_x = "%s (x%d)(%d)"
--L.shroud_active = "Shroud (%d) - %.1f%%!"
end

L = BigWigs:NewBossLocale("Sanctum of Domination Affixes", "esES")
Expand Down
12 changes: 7 additions & 5 deletions SanctumOfDomination/Locales/esMX.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ end
L = BigWigs:NewBossLocale("The Eye of the Jailer", "esMX")
if L then
--L.chains = "Chains" -- Short for Dragging Chains
--L.pool = "Pool" -- Spreading Misery
--L.pools = "Pools" -- Spreading Misery (multiple)
--L.death_gaze = "Death Gaze" -- Short for Titanic Death Gaze
end

Expand Down Expand Up @@ -119,18 +117,22 @@ if L then
-- L.custom_on_nameplate_fixate = "Fixate Nameplate Icon"
-- L.custom_on_nameplate_fixate_desc = "Show an icon on the nameplate of Dark Sentinels that are fixed on you.\n\nRequires the use of Enemy Nameplates and a supported nameplate addon (KuiNameplates, Plater)."

--L.intermission_chains = "Intermission Chains"
-- L.chains = "Chains" -- Short for Domination Chains
-- L.chain = "Chain" -- Single Domination Chain
-- L.darkness = "Darkness" -- Short for Veil of Darkness
-- L.arrow = "Arrow" -- Short for Wailing Arrow
--L.arrow_done = "DONE" -- Message when the arrow has hit
-- L.wave = "Wave" -- Short for Haunting Wave
-- L.dread = "Dread" -- Short for Crushing Dread
-- L.orbs = "Orbs" -- Dark Communion
-- L.curse = "Curse" -- Short for Curse of Lethargy
-- L.pools = "Pools" -- Banshee's Bane
-- L.scream = "Scream" -- Banshee Scream

-- L.knife_fling = "Knives out!" -- "Death-touched blades fling out"
--L.bridges = "Bridges"
--L.rive_counter = "%s (%d/%d)"
--L.soaks = "Soaks" -- Merciless
--L.count_x = "%s (x%d)(%d)"
--L.shroud_active = "Shroud (%d) - %.1f%%!"
end

L = BigWigs:NewBossLocale("Sanctum of Domination Affixes", "esMX")
Expand Down
12 changes: 7 additions & 5 deletions SanctumOfDomination/Locales/frFR.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ end
L = BigWigs:NewBossLocale("The Eye of the Jailer", "frFR")
if L then
L.chains = "Chaînes" -- Short for Dragging Chains
L.pool = "Pool" -- Spreading Misery
L.pools = "Pools" -- Spreading Misery (multiple)
L.death_gaze = "Rayon" -- Short for Titanic Death Gaze
end

Expand Down Expand Up @@ -119,18 +117,22 @@ if L then
L.custom_on_nameplate_fixate = "Icône de Rage"
L.custom_on_nameplate_fixate_desc = "Affiche une icône au dessus de la Sentinelle sombre si vous êtes sa cible. \n\nNécessite un addon de Nameplates (KuiNameplates, Plater)."

--L.intermission_chains = "Intermission Chains"
L.chains = "Chaînes" -- Short for Domination Chains
L.chain = "Chaîne" -- Single Domination Chain
L.darkness = "Voile" -- Short for Veil of Darkness
L.arrow = "Flèche" -- Short for Wailing Arrow
--L.arrow_done = "DONE" -- Message when the arrow has hit
L.wave = "Vague" -- Short for Haunting Wave
L.dread = "Effroi" -- Short for Crushing Dread
L.orbs = "Orbes" -- Dark Communion
L.curse = "Malédiction" -- Short for Curse of Lethargy
L.pools = "Fléau" -- Banshee's Bane
L.scream = "Cri" -- Banshee Scream

L.knife_fling = "Poignards, Sortez !" -- "Death-touched blades fling out"
--L.bridges = "Bridges"
--L.rive_counter = "%s (%d/%d)"
--L.soaks = "Soaks" -- Merciless
--L.count_x = "%s (x%d)(%d)"
--L.shroud_active = "Shroud (%d) - %.1f%%!"
end

L = BigWigs:NewBossLocale("Sanctum of Domination Affixes", "frFR")
Expand Down
12 changes: 7 additions & 5 deletions SanctumOfDomination/Locales/itIT.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ end
L = BigWigs:NewBossLocale("The Eye of the Jailer", "itIT")
if L then
L.chains = "Catene" -- Short for Dragging Chains
L.pool = "Pozza" -- Miseria Dilagante
L.pools = "Pozze" -- Miseria Dilagante (multiplo)
L.death_gaze = "Sguardo della Morte" -- Corto per Sguardo della Morte Titanico
end

Expand Down Expand Up @@ -119,18 +117,22 @@ if L then
L.custom_on_nameplate_fixate = "Icona Nameplate Rabbia"
L.custom_on_nameplate_fixate_desc = "Mostra un'icona sul nameplate della Sentinella Oscura che ha preso di mira te.\n\nRichiede l'uso dei Nameplates del nemico e un'appon per nameplates supportato (KuiNameplates, Plater)."

--L.intermission_chains = "Intermission Chains"
L.chains = "Catene" -- Short for Domination Chains
L.chain = "Catena" -- Single Domination Chain
L.darkness = "Oscurità" -- Short for Veil of Darkness
L.arrow = "Freccia" -- Short for Wailing Arrow
--L.arrow_done = "DONE" -- Message when the arrow has hit
L.wave = "Ondata" -- Short for Haunting Wave
L.dread = "Terrore" -- Short for Crushing Dread
L.orbs = "Sfere" -- Dark Communion
L.curse = "Maledizione" -- Short for Curse of Lethargy
L.pools = "Pozze" -- Banshee's Bane
L.scream = "Urlo" -- Banshee Scream

L.knife_fling = "Coltelli!" -- "Death-touched blades fling out"
--L.bridges = "Bridges"
--L.rive_counter = "%s (%d/%d)"
--L.soaks = "Soaks" -- Merciless
--L.count_x = "%s (x%d)(%d)"
--L.shroud_active = "Shroud (%d) - %.1f%%!"
end

L = BigWigs:NewBossLocale("Sanctum of Domination Affixes", "itIT")
Expand Down
Loading

0 comments on commit d2933c9

Please sign in to comment.