Skip to content

Commit

Permalink
Update for renamed API
Browse files Browse the repository at this point in the history
  • Loading branch information
funkydude committed Sep 1, 2022
1 parent d36b430 commit 114f119
Show file tree
Hide file tree
Showing 40 changed files with 73 additions and 73 deletions.
4 changes: 2 additions & 2 deletions Antorus/Aggramar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ end
function mod:TaeshalachsReach(args)
local amount = args.amount or 1
if amount % 3 == 0 or amount > 7 then
self:StackMessage(args.spellId, args.destName, amount, "purple", amount > 7 and "alarm") -- Swap on 8+
self:StackMessageOld(args.spellId, args.destName, amount, "purple", amount > 7 and "alarm") -- Swap on 8+
end
end

Expand Down Expand Up @@ -567,7 +567,7 @@ do
end
playerList[#playerList+1] = args.destName
blazeProxList[#blazeProxList+1] = args.destName
self:TargetsMessage(args.spellId, "red", playerList, 5)
self:TargetsMessageOld(args.spellId, "red", playerList, 5)
if #playerList == 1 then
local cooldown = stage == 1 and 23.1 or 60.1 -- this cooldown should only trigger in stage 1+
if comboTime > GetTime() + cooldown then
Expand Down
12 changes: 6 additions & 6 deletions Antorus/Argus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ end
function mod:SweepingScytheStack(args)
if self:Me(args.destGUID) or (self:Tank() and self:Tank(args.destName)) then
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "yellow", self:Tank() and (amount > 2 and "alarm") or not self:Tank() and "warning") -- Warning sound for non-tanks, 3+ stacks warning for tanks
self:StackMessageOld(args.spellId, args.destName, amount, "yellow", self:Tank() and (amount > 2 and "alarm") or not self:Tank() and "warning") -- Warning sound for non-tanks, 3+ stacks warning for tanks
end
end

Expand Down Expand Up @@ -538,7 +538,7 @@ do
mod:TargetMessage(251570, "orange", bombName, CL.count:format(mod:SpellName(251570), soulBombCounter))
end
if isOnMe < 3 then -- No burst on you (0 or -1)
mod:TargetsMessage(250669, "red", mod:ColorName(burstList), #burstList)
mod:TargetsMessageOld(250669, "red", mod:ColorName(burstList), #burstList)
end
end
burstList = {}
Expand Down Expand Up @@ -721,7 +721,7 @@ do
self:Flash(args.spellId)
end
self:PlaySound(args.spellId, "warning", nil, playerList)
self:TargetsMessage(args.spellId, "orange", playerList, cosmicRaysBeingCast)
self:TargetsMessageOld(args.spellId, "orange", playerList, cosmicRaysBeingCast)
end
end

Expand Down Expand Up @@ -749,7 +749,7 @@ do
self:Flash(args.spellId)
end
self:PlaySound(args.spellId, "alarm", nil, playerList)
self:TargetsMessage(args.spellId, "orange", playerList, beaconsBeingCast)
self:TargetsMessageOld(args.spellId, "orange", playerList, beaconsBeingCast)
end
end

Expand Down Expand Up @@ -889,7 +889,7 @@ end
function mod:DeadlyScytheStack(args)
if self:Me(args.destGUID) or self:Tank() then -- Always Show for Tanks and when on Self
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "yellow", self:Tank() and (self:Me(args.destGUID) and "alarm") or not self:Tank() and "warning") -- Warning sound for non-tanks, only on self when a tank
self:StackMessageOld(args.spellId, args.destName, amount, "yellow", self:Tank() and (self:Me(args.destGUID) and "alarm") or not self:Tank() and "warning") -- Warning sound for non-tanks, only on self when a tank
end
end

Expand Down Expand Up @@ -998,7 +998,7 @@ end
function mod:SoulrendingScytheStack(args)
if self:Me(args.destGUID) or (self:Tank() and self:Tank(args.destName)) then
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "yellow", self:Tank() and (amount > 2 and "alarm") or "warning") -- Warning sound for non-tanks, 3+ stacks warning for tanks
self:StackMessageOld(args.spellId, args.destName, amount, "yellow", self:Tank() and (amount > 2 and "alarm") or "warning") -- Warning sound for non-tanks, 3+ stacks warning for tanks
end
end

Expand Down
10 changes: 5 additions & 5 deletions Antorus/CovenofShivarra.lua
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ end
function mod:FieryStrike(args)
local amount = args.amount or 1
if self:Me(args.destGUID) or amount > 2 then -- Swap above 2, always display stacks on self
self:StackMessage(args.spellId, args.destName, amount, "cyan", "info")
self:StackMessageOld(args.spellId, args.destName, amount, "cyan", "info")
end
end

Expand All @@ -420,7 +420,7 @@ do
self:PlaySound(args.spellId, "alarm")
end
playerList[#playerList+1] = args.destName
self:TargetsMessage(args.spellId, "red", playerList, 3)
self:TargetsMessageOld(args.spellId, "red", playerList, 3)
if #playerList == 1 then
self:Bar(args.spellId, 40.1)
end
Expand Down Expand Up @@ -448,7 +448,7 @@ end
function mod:Flashfreeze(args)
local amount = args.amount or 1
if self:Me(args.destGUID) then
self:StackMessage(args.spellId, args.destName, amount, "blue", "info")
self:StackMessageOld(args.spellId, args.destName, amount, "blue", "info")
end
end

Expand Down Expand Up @@ -494,7 +494,7 @@ do
self:PlaySound(args.spellId, "alarm")
end

self:TargetsMessage(args.spellId, "green", playerList, 3)
self:TargetsMessageOld(args.spellId, "green", playerList, 3)
if #playerList == 1 then
chilledBloodTime = GetTime() + 10
chilledBloodMaxAbsorb = args.amount
Expand Down Expand Up @@ -553,7 +553,7 @@ do

playerList[#playerList+1] = args.destName

self:TargetsMessage(args.spellId, "yellow", playerList, 2)
self:TargetsMessageOld(args.spellId, "yellow", playerList, 2)
if #playerList == 1 then
self:CDBar(args.spellId, 15)
if self:GetOption(cosmicGlareMarker) then
Expand Down
4 changes: 2 additions & 2 deletions Antorus/Eonar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ do
self:SayCountdown(args.spellId, 5)
self:PlaySound(args.spellId, "alarm")
end
self:TargetsMessage(args.spellId, "red", playerList, 6)
self:TargetsMessageOld(args.spellId, "red", playerList, 6)
if #playerList == 1 then
local t = GetTime()
if t-prev > 5 then -- prevent a wrong bar if Rain of Fel gets delayed late
Expand Down Expand Up @@ -396,6 +396,6 @@ end
function mod:FoulSteps(args)
local amount = args.amount or 1
if self:Me(args.destGUID) and amount % 3 == 0 then
self:StackMessage(args.spellId, args.destName, amount, "blue", amount > 5 and "alarm")
self:StackMessageOld(args.spellId, args.destName, amount, "blue", amount > 5 and "alarm")
end
end
4 changes: 2 additions & 2 deletions Antorus/Felhounds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ do
if self:Me(args.destGUID) then
self:PlaySound(args.spellId, "warning")
end
self:TargetsMessage(args.spellId, "yellow", playerList, 3)
self:TargetsMessageOld(args.spellId, "yellow", playerList, 3)
end
end

Expand All @@ -161,7 +161,7 @@ do
self:SayCountdown(args.spellId, 8)
end
self:PlaySound(args.spellId, "warning", nil, playerList)
self:TargetsMessage(args.spellId, "orange", playerList, 5)
self:TargetsMessageOld(args.spellId, "orange", playerList, 5)
end
end

Expand Down
4 changes: 2 additions & 2 deletions Antorus/Hasabel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ end

function mod:RealityTear(args)
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "orange", amount > 1 and "alarm", nil, nil, true)
self:StackMessageOld(args.spellId, args.destName, amount, "orange", amount > 1 and "alarm", nil, nil, true)
end

function mod:RealityTearSuccess(args)
Expand Down Expand Up @@ -417,7 +417,7 @@ end
function mod:Corrupt(args)
if self:Me(args.destGUID) then
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "yellow", amount > 2 and "warning") -- Sound when stacks are 3 or higher
self:StackMessageOld(args.spellId, args.destName, amount, "yellow", amount > 2 and "warning") -- Sound when stacks are 3 or higher
end
end

Expand Down
4 changes: 2 additions & 2 deletions Antorus/HighCommand.lua
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ end

function mod:ExploitWeaknessApplied(args)
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "purple", amount > 1 and "warning") -- Swap on 2
self:StackMessageOld(args.spellId, args.destName, amount, "purple", amount > 1 and "warning") -- Swap on 2
end

function mod:Pyroblast(args)
Expand Down Expand Up @@ -243,7 +243,7 @@ function mod:PsychicAssault(args)
if self:Me(args.destGUID) then
local amount = args.amount or 1
if (amount > 10 and amount % 5 == 0) or (amount > 20 and amount % 2 == 0) then
self:StackMessage(args.spellId, args.destName, amount, "blue", amount > 15 and "warning")
self:StackMessageOld(args.spellId, args.destName, amount, "blue", amount > 15 and "warning")
end
end
end
Expand Down
10 changes: 5 additions & 5 deletions Antorus/Imonar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ do
end

if self:Easy() or (isOnMe and name == self:UnitName("player")) then -- Not warning for others when on you
self:TargetsMessage(254244, "red", playerList, 1)
self:TargetsMessageOld(254244, "red", playerList, 1)
elseif not isOnMe then
self:TargetsMessage(254244, "red", playerList, 2)
self:TargetsMessageOld(254244, "red", playerList, 2)
end
end
self:OpenProximity(254244, 10, canisterProxList)
Expand Down Expand Up @@ -262,7 +262,7 @@ end
--[[ Stage One: Attack Force ]]--
function mod:ShockLance(args)
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "purple", amount > 6 and "warning" or amount > 4 and "alarm") -- Swap on 5, increase warning at 7
self:StackMessageOld(args.spellId, args.destName, amount, "purple", amount > 6 and "warning" or amount > 4 and "alarm") -- Swap on 5, increase warning at 7
end

function mod:ShockLanceSuccess(args)
Expand All @@ -277,7 +277,7 @@ end
--[[ Stage Two: Contract to Kill ]]--
function mod:Sever(args)
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "purple", amount > 3 and "warning" or amount > 1 and "alarm") -- Swap on 2
self:StackMessageOld(args.spellId, args.destName, amount, "purple", amount > 3 and "warning" or amount > 1 and "alarm") -- Swap on 2
end

function mod:SeverSuccess(args)
Expand All @@ -298,7 +298,7 @@ end
--[[ Stage Three: The Perfect Weapon ]]--
function mod:EmpoweredShockLance(args)
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "purple", amount % 2 == 0 and "alarm")
self:StackMessageOld(args.spellId, args.destName, amount, "purple", amount % 2 == 0 and "alarm")
end

function mod:EmpoweredShockLanceSuccess(args)
Expand Down
8 changes: 4 additions & 4 deletions Antorus/Kingaroth.lua
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ end

function mod:ForgingStrikeApplied(args)
local amount = args.amount or 1
self:StackMessage(254919, args.destName, amount, "purple", "warning")
self:StackMessageOld(254919, args.destName, amount, "purple", "warning")
end

do
Expand Down Expand Up @@ -264,7 +264,7 @@ do
self:PlaySound(args.spellId, "warning")
end
playerList[#playerList+1] = args.destName
self:TargetsMessage(args.spellId, "orange", playerList, numDemolish, nil, nil, 0.5)
self:TargetsMessageOld(args.spellId, "orange", playerList, numDemolish, nil, nil, 0.5)
end

function mod:DemolishSuccess(args)
Expand All @@ -283,7 +283,7 @@ do
self:SayCountdown(246686, 6)
self:PlaySound(246686, "warning")
end
self:TargetsMessage(246686, "orange", playerList, numDecimation)
self:TargetsMessageOld(246686, "orange", playerList, numDecimation)
end
end

Expand Down Expand Up @@ -329,6 +329,6 @@ do
self:SayCountdown(args.spellId, 4)
self:PlaySound(args.spellId, "warning")
end
self:TargetsMessage(args.spellId, "orange", playerList, numDecimation)
self:TargetsMessageOld(args.spellId, "orange", playerList, numDecimation)
end
end
6 changes: 3 additions & 3 deletions Antorus/Trash.lua
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ do
if self:Dispeller("magic") then
self:PlaySound(args.spellId, "alarm", nil, list)
end
self:TargetsMessage(args.spellId, "orange", list, 2)
self:TargetsMessageOld(args.spellId, "orange", list, 2)
end
end

Expand Down Expand Up @@ -308,7 +308,7 @@ function mod:Demolish(args)
self:PlaySound(args.spellId, "warning")
end
list[#list+1] = args.destName
self:TargetsMessage(args.spellId, "orange", list, self:LFR() and 1 or 2)
self:TargetsMessageOld(args.spellId, "orange", list, self:LFR() and 1 or 2)
end

function mod:DemolishRemoved(args)
Expand Down Expand Up @@ -346,7 +346,7 @@ do
end
end
list[#list+1] = self:UnitName(unit)
self:TargetsMessage(252797, "orange", list, 2)
self:TargetsMessageOld(252797, "orange", list, 2)
end
elseif players[self:UnitGUID(unit)] then
players[self:UnitGUID(unit)] = nil
Expand Down
2 changes: 1 addition & 1 deletion Antorus/Varimathras.lua
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ do

local function warn()
if not isOnMe then
mod:TargetsMessage(244094, "orange", playerList, #playerList) -- Necrotic Embrace
mod:TargetsMessageOld(244094, "orange", playerList, #playerList) -- Necrotic Embrace
mod:OpenProximity(244094, 10, proxList)
else
playerList = mod:NewTargetList()
Expand Down
2 changes: 1 addition & 1 deletion ArgusInvasionPoints/Alluradel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ end
function mod:Sadist(args)
local amount = args.amount or 1
if amount % 2 == 0 then
self:StackMessage(args.spellId, args.destName, amount, "orange", amount > 5 and "alert")
self:StackMessageOld(args.spellId, args.destName, amount, "orange", amount > 5 and "alert")
end
end

Expand Down
2 changes: 1 addition & 1 deletion ArgusInvasionPoints/Folnuna.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ end
function mod:InfectedClaws(args)
local amount = args.amount or 1
if amount % 2 == 0 then
self:StackMessage(args.spellId, args.destName, amount, "cyan", amount > 5 and "alarm")
self:StackMessageOld(args.spellId, args.destName, amount, "cyan", amount > 5 and "alarm")
end
end

Expand Down
2 changes: 1 addition & 1 deletion ArgusInvasionPoints/Meto.lua
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ end
function mod:SowApplied(args)
if self:Me(args.destGUID) then
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "blue", "warning")
self:StackMessageOld(args.spellId, args.destName, amount, "blue", "warning")
end
end

Expand Down
2 changes: 1 addition & 1 deletion ArgusInvasionPoints/Occularus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ end

function mod:GushingWound(args)
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "red", "alarm")
self:StackMessageOld(args.spellId, args.destName, amount, "red", "alarm")
end

function mod:Lash(args)
Expand Down
2 changes: 1 addition & 1 deletion ArgusInvasionPoints/Sotanathor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ end

function mod:ClovenSoul(args)
local amount = args.amount or 1
self:StackMessage(247410, args.destName, amount, "cyan", amount > 1 and "warning" or "info", args.spellId)
self:StackMessageOld(247410, args.destName, amount, "cyan", amount > 1 and "warning" or "info", args.spellId)
end

function mod:Cavitation(args)
Expand Down
2 changes: 1 addition & 1 deletion ArgusInvasionPoints/Vilemus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ end
function mod:DrainStacks(args)
if self:Me(args.destGUID) or (self:Tank() and self:Tank(args.destName)) then
local amount = args.amount or 1
self:StackMessage(247739, args.destName, amount, "cyan", amount % 2 == 0 and "alarm", args.spellId)
self:StackMessageOld(247739, args.destName, amount, "cyan", amount % 2 == 0 and "alarm", args.spellId)
end
end

Expand Down
4 changes: 2 additions & 2 deletions Nighthold/Aluriel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ end
function mod:AnnihilateApplied(args)
if self:Tank() then
local amount = args.amount or 1
self:StackMessage(212492, args.destName, amount, "red", amount > 1 and "warning") -- check sound amount
self:StackMessageOld(212492, args.destName, amount, "red", amount > 1 and "warning") -- check sound amount
end
end

Expand Down Expand Up @@ -339,7 +339,7 @@ end
function mod:Frostbitten(args)
local amount = args.amount or 1
if self:Me(args.destGUID) and amount % 2 == 0 and amount > 5 then
self:StackMessage(args.spellId, args.destName, amount, "red", amount > 7 and "warning")
self:StackMessageOld(args.spellId, args.destName, amount, "red", amount > 7 and "warning")
end

frostbittenStacks[args.destName] = amount
Expand Down
2 changes: 1 addition & 1 deletion Nighthold/ChronomaticAnomaly.lua
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ end
function mod:ChronometricParticles(args)
local amount = args.amount or 1
if amount % 2 == 0 or amount > 6 then -- might be different for each speed
self:StackMessage(args.spellId, args.destName, amount, "red", amount > 6 and "warning")
self:StackMessageOld(args.spellId, args.destName, amount, "red", amount > 6 and "warning")
end
end

Expand Down
4 changes: 2 additions & 2 deletions Nighthold/Elisande.lua
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ end
function mod:Ablation(args)
local amount = args.amount or 1
if amount % 2 == 1 or amount > 3 then
self:StackMessage(args.spellId, args.destName, amount, "orange", amount > 3 and "warning")
self:StackMessageOld(args.spellId, args.destName, amount, "orange", amount > 3 and "warning")
end
end

Expand Down Expand Up @@ -766,5 +766,5 @@ end

function mod:Ablated(args)
local amount = args.amount or 1
self:StackMessage(args.spellId, args.destName, amount, "orange", amount > 4 and "warning")
self:StackMessageOld(args.spellId, args.destName, amount, "orange", amount > 4 and "warning")
end
Loading

0 comments on commit 114f119

Please sign in to comment.