Skip to content

Commit

Permalink
Cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
funkydude committed Jan 16, 2024
1 parent 8c35996 commit 5039986
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion BlackrockFoundry/Darmac.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function mod:GetOptions()
[155061] = -9301, -- Cruelfang
[155030] = -9302, -- Dreadwing
[155236] = -9303, -- Ironcrusher
[155284] = ("%s (%s)"):format(self:SpellName(-9304), CL.mythic), -- Faultline (Mythic)
[159043] = ("%s (%s)"):format(self:SpellName(-9304), CL.mythic), -- Faultline (Mythic)
[154960] = "general",
}
end
Expand Down
1 change: 0 additions & 1 deletion BlackrockFoundry/Kagraz.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ function mod:GetOptions()
{155074, "TANK_HEALER"}, -- Charring Breath
155064, -- Rekindle
"proximity",
"berserk",
}, {
[156018] = -9354, -- Aknor Steelbringer
[155318] = -9350, -- Ka'graz
Expand Down
4 changes: 2 additions & 2 deletions BlackrockFoundry/Trash.lua
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ do
end

local wound = self:SpellName(16405) -- Wound
scheduledPrints[args.destGUID] = self:ScheduleTimer("StackMessage", 0.2, args.spellId, args.destName, args.amount, "orange", "warning", wound, nil, true)
scheduledPrints[args.destGUID] = self:ScheduleTimer("StackMessageOld", 0.2, args.spellId, args.destName, args.amount, "orange", "warning", wound, nil, true)
self:TargetBar(args.spellId, 60, args.destName, wound)
end

Expand Down Expand Up @@ -187,7 +187,7 @@ end
--[[ Slagshop Brute ]]--

function mod:LumberingStrength(args)
local icon = CombatLog_String_GetIcon(args.destRaidFlags)
local icon = self:GetIconTexture(self:GetIcon(args.destRaidFlags)) or ""
local warn = false
local npcUnit = self:GetUnitIdByGUID(args.destGUID)
if npcUnit then
Expand Down
4 changes: 2 additions & 2 deletions HellfireCitadel/HellfireAssault.lua
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,15 @@ function mod:GetOptions()
--[[ Mar'tak ]]--
{184369, "FLASH", "SAY", "PROXIMITY"}, -- Howling Axe
184394, -- Shockwave
185090, -- Inspiring Presence
--185090, -- Inspiring Presence
--[[ Reinforcements ]]--
"adds",
{184243, "TANK"}, -- Slam
184238, -- Cower!
185816, -- Repair
185806, -- Conducted Shock Pulse
181968, -- Metamorphosis
180417, -- Felfire Volley
--180417, -- Felfire Volley
--[[ Siege Vehicles ]]--
"siegevehicles",
180945, -- Siege Nova
Expand Down
2 changes: 1 addition & 1 deletion HellfireCitadel/KilroggDeadeye.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function mod:GetOptions()
--[[ Visions of Death ]]--
180618, -- Fel Blaze (Hellblaze Imp)
180033, -- Cinder Breath (Hellblaze Mistress)
180570, -- Fel Flames (Hellblaze Fiend)
--180570, -- Fel Flames (Hellblaze Fiend)
--[[ Add Spawn Warnings ]]--
-11269, -- Hulking Terror
-11266, -- Salivating Bloodthirster
Expand Down
6 changes: 2 additions & 4 deletions HellfireCitadel/Locales/itIT.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ L = BigWigs:NewBossLocale("Shadow-Lord Iskar", "itIT")
if L then
-- L.bindings_removed = "Bindings removed (%d/3)"
-- L.custom_off_binding_marker = "Dark Bindings marker"
--[==[ L.custom_off_binding_marker_desc = [=[Mark the Dark Bindings targets with {rt1}{rt2}{rt3}{rt4}{rt5}{rt6}, requires promoted or leader.
|cFFFF0000Only 1 person in the raid should have this enabled to prevent marking conflicts.|r]=] ]==]
-- L.custom_off_binding_marker_desc = "Mark the Dark Bindings targets with {rt1}{rt2}{rt3}{rt4}{rt5}{rt6}, requires promoted or leader.\n|cFFFF0000Only 1 person in the raid should have this enabled to prevent marking conflicts.|r"
-- L.custom_off_wind_marker = "Phantasmal Winds marker"
--[==[ L.custom_off_wind_marker_desc = [=[Marks Phantasmal Winds targets with {rt1}{rt2}{rt3}{rt4}{rt5}, requires promoted or leader.
|cFFFF0000Only 1 person in the raid should have this enabled to prevent marking conflicts.|r]=] ]==]
-- L.custom_off_wind_marker_desc = "Marks Phantasmal Winds targets with {rt1}{rt2}{rt3}{rt4}{rt5}, requires promoted or leader.\n|cFFFF0000Only 1 person in the raid should have this enabled to prevent marking conflicts.|r"

end

Expand Down
2 changes: 2 additions & 0 deletions HellfireCitadel/Locales/ruRU.lua
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ end
L = BigWigs:NewBossLocale("Archimonde", "ruRU")
if L then
L.torment_removed = "Страдание снято (%d/%d)"
--L.chaos_bar = "%s -> %s"
L.chaos_from = "%s от %s"
L.chaos_to = "%s к %s"
--L.infernal_count = "%s (%d/%d)"

L.custom_off_torment_marker = "Маркировка Скованного страдания"
L.custom_off_torment_marker_desc = "Отмечать цели Скованного страдания метками {rt1}{rt2}{rt3}, требуется быть помощником или лидером рейда."
Expand Down
2 changes: 1 addition & 1 deletion HellfireCitadel/ShadowLordIskar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ end
function mod:EyeOfAnzu(args)
eyeTarget = args.destGUID
--self:TargetMessageOld(args.spellId, args.destName, "green") -- XXX info display instead?
if self:Me(eyeTarget) then
if self:Me(args.destGUID) then
self:TargetMessageOld(args.spellId, args.destName, "blue", #windTargets > 0 and "warning" or "info")
self:Flash(args.spellId)
end
Expand Down
4 changes: 2 additions & 2 deletions Highmaul/Koragh.lua
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ do

function mod:ExpelMagicFelRemoved(args)
tDeleteItem(felMarks, args.destName)
if self:Me(args.destName) then
self:StopBar(args.spellId, args.destName)
if self:Me(args.destGUID) then
self:StopBar(args.spellName, args.destName)
end
if self.db.profile.custom_off_fel_marker then
self:CustomIcon(false, args.destName)
Expand Down
1 change: 0 additions & 1 deletion Highmaul/Locales/ruRU.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ if not L then return end
if L then
L.blade_dance_bar = "Танцуем"

L.arena_sweeper = "Чистка арены"
L.arena_sweeper_desc = "Время, через которое вас выкинут с трибун после Удара Цепью."
end

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

function mod:Accretion(args)
if self:MobId(args.sourceGUID) ~= 80557 and self:UnitGUID("target") == args.sourceGUID and args.amount > 3 then
local raidIcon = CombatLog_String_GetIcon(args.sourceRaidFlags)
local raidIcon = self:GetIconTexture(self:GetIcon(args.sourceRaidFlags)) or ""
self:MessageOld(args.spellId, "yellow", nil, raidIcon..CL.count:format(args.spellName, args.amount))
end
end
Expand Down Expand Up @@ -227,7 +227,7 @@ do
local t = GetTime()
local id = self:MobId(args.sourceGUID)
if id ~= 80557 or t-prev > 5 then -- not Mote or first Mote cast in 5s
local raidIcon = CombatLog_String_GetIcon(args.sourceRaidFlags)
local raidIcon = self:GetIconTexture(self:GetIcon(args.sourceRaidFlags)) or ""
self:MessageOld(args.spellId, "green", "long", CL.other:format(raidIcon .. names[id], args.spellName))
if id == 80557 then prev = t end
end
Expand Down

0 comments on commit 5039986

Please sign in to comment.