from retail

This commit is contained in:
NoM0Re
2025-01-05 15:08:50 +01:00
parent 95db2e326e
commit 8375cfa0a7
115 changed files with 332 additions and 261 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
-- Animations
+1 -1
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local WeakAuras = WeakAuras
+1 -1
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local WeakAuras = WeakAuras
+1 -1
View File
@@ -2,7 +2,7 @@
This used to contains the "aura" trigger for buffs and debuffs. Nowadays all functions do essentially nothing
]]--
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local L = WeakAuras.L
+2 -2
View File
@@ -50,7 +50,7 @@ Returns the tooltip text for additional properties.
GetTriggerConditions(data, triggernum)
Returns the potential conditions for a trigger
]]--
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
-- Lua APIs
@@ -1708,7 +1708,7 @@ local function RecheckActiveForUnitType(unitType, unit, unitsToRemoveScan)
end
end
local frame = CreateFrame("FRAME")
local frame = CreateFrame("Frame")
WeakAuras.frames["WeakAuras Buff2 Frame"] = frame
local function EventHandler(frame, event, arg1, arg2, ...)
+4 -4
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local L = WeakAuras.L
@@ -843,7 +843,7 @@ function Private.RegisterForGlobalConditions(uid)
end
if (next(register) and not dynamicConditionsFrame) then
dynamicConditionsFrame = CreateFrame("FRAME");
dynamicConditionsFrame = CreateFrame("Frame");
dynamicConditionsFrame:SetScript("OnEvent", handleDynamicConditions);
dynamicConditionsFrame.units = {}
WeakAuras.frames["Rerun Conditions Frame"] = dynamicConditionsFrame
@@ -860,7 +860,7 @@ function Private.RegisterForGlobalConditions(uid)
if unitEvent and unit then
unit = unit:lower()
if not dynamicConditionsFrame.units[unit] then
dynamicConditionsFrame.units[unit] = CreateFrame("FRAME");
dynamicConditionsFrame.units[unit] = CreateFrame("Frame");
dynamicConditionsFrame.units[unit]:SetScript("OnEvent", handleDynamicConditionsPerUnit);
end
dynamicConditionsFrame.units[unit].unit = unit;
@@ -909,7 +909,7 @@ function Private.UnloadAllConditions()
dynamicConditions = {}
if dynamicConditionsFrame then
dynamicConditionsFrame:UnregisterAllEvents()
for unit, frame in pairs(dynamicConditionsFrame.units) do
for _, frame in pairs(dynamicConditionsFrame.units) do
frame:UnregisterAllEvents()
end
dynamicConditionsFrame:SetScript("OnUpdate", nil)
+10 -10
View File
@@ -49,7 +49,7 @@ Returns the a tooltip for the additional properties.
GetTriggerConditions(data, triggernum)
Returns potential conditions that this trigger provides.
]]--
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
-- Lua APIs
@@ -1086,7 +1086,7 @@ end
local genericTriggerRegisteredEvents = {};
local genericTriggerRegisteredUnitEvents = {};
local frame = CreateFrame("FRAME");
local frame = CreateFrame("Frame");
frame.unitFrames = {};
WeakAuras.frames["WeakAuras Generic Trigger Frame"] = frame;
frame:RegisterEvent("PLAYER_ENTERING_WORLD");
@@ -1631,7 +1631,7 @@ do
update_clients_num = update_clients_num + 1;
end
if not(update_frame) then
update_frame = CreateFrame("FRAME");
update_frame = CreateFrame("Frame");
end
if not(updating) then
update_frame:SetScript("OnUpdate", function()
@@ -1885,7 +1885,7 @@ do
function WeakAuras.InitSwingTimer()
if not(swingTimerFrame) then
swingTimerFrame = CreateFrame("frame");
swingTimerFrame = CreateFrame("Frame");
swingTimerFrame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED");
swingTimerFrame:RegisterEvent("PLAYER_ENTER_COMBAT");
swingTimerFrame:RegisterEvent("UNIT_ATTACK_SPEED");
@@ -2084,7 +2084,7 @@ do
local spellDetails = {}
function WeakAuras.InitCooldownReady()
cdReadyFrame = CreateFrame("FRAME");
cdReadyFrame = CreateFrame("Frame");
WeakAuras.frames["Cooldown Trigger Handler"] = cdReadyFrame
cdReadyFrame:RegisterEvent("RUNE_POWER_UPDATE");
cdReadyFrame:RegisterEvent("RUNE_TYPE_UPDATE");
@@ -3350,7 +3350,7 @@ do
WeakAuras.frames["Pet Use Handler"] = petFrame;
function WeakAuras.WatchForPetDeath()
if not(petFrame) then
petFrame = CreateFrame("frame");
petFrame = CreateFrame("Frame");
petFrame:RegisterEvent("UNIT_PET")
petFrame:SetScript("OnEvent", function(_, event, unit)
if unit ~= "player" then return end
@@ -3445,7 +3445,7 @@ do
function WeakAuras.WatchForMounts()
if not(mountedFrame) then
mountedFrame = CreateFrame("frame");
mountedFrame = CreateFrame("Frame");
WeakAuras.frames["Mount Use Handler"] = mountedFrame;
mountedFrame:RegisterEvent("COMPANION_UPDATE");
mountedFrame:SetScript("OnEvent", function()
@@ -3472,7 +3472,7 @@ do
function WeakAuras.WatchPlayerMoveSpeed()
if not (playerMovingFrame) then
playerMovingFrame = CreateFrame("frame");
playerMovingFrame = CreateFrame("Frame");
WeakAuras.frames["Player Moving Frame"] = playerMovingFrame;
end
playerMovingFrame.speed = GetUnitSpeed("player")
@@ -3567,7 +3567,7 @@ end
local itemCountWatchFrame;
function WeakAuras.RegisterItemCountWatch()
if not(itemCountWatchFrame) then
itemCountWatchFrame = CreateFrame("frame");
itemCountWatchFrame = CreateFrame("Frame");
itemCountWatchFrame:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED");
itemCountWatchFrame:SetScript("OnEvent", function(_, _, unit)
if unit ~= "player" then return end
@@ -3604,7 +3604,7 @@ do
function WeakAuras.WatchQueuedAction()
if not(queuedActionFrame) then
queuedActionFrame = CreateFrame("frame");
queuedActionFrame = CreateFrame("Frame");
WeakAuras.frames["Queued Action Frame"] = queuedActionFrame
for slotID = 1, 120 do
local spellID = GetActionSpellID(slotID)
+1 -1
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local WeakAuras = WeakAuras
+54 -3
View File
@@ -33,13 +33,64 @@ WeakAuras.prettyPrint = function(...)
print("|cff9900ffWeakAuras:|r ", ...)
end
-- Force enable WeakAurasCompanion and Archive because some addon managers interfere with it
EnableAddOn("WeakAurasCompanion")
EnableAddOn("WeakAurasArchive")
local libsAreOk = true
do
local StandAloneLibs = {
"Archivist",
"LibStub"
}
local LibStubLibs = {
"CallbackHandler-1.0",
"AceConfig-3.0",
"AceConsole-3.0",
"AceGUI-3.0",
"AceEvent-3.0",
"AceGUISharedMediaWidgets-1.0",
"AceTimer-3.0",
"AceSerializer-3.0",
"AceComm-3.0",
"LibSharedMedia-3.0",
"LibDataBroker-1.1",
"LibCompress",
"SpellRange-1.0",
"LibCustomGlow-1.0",
"LibDBIcon-1.0",
"LibGetFrame-1.0",
"LibSerialize",
}
for _, lib in ipairs(StandAloneLibs) do
if not lib then
libsAreOk = false
WeakAuras.prettyPrint("Missing library:", lib)
end
end
if LibStub then
for _, lib in ipairs(LibStubLibs) do
if not LibStub:GetLibrary(lib, true) then
libsAreOk = false
WeakAuras.prettyPrint("Missing library:", lib)
end
end
else
libsAreOk = false
end
end
function WeakAuras.IsLibsOK()
return libsAreOk
end
if versionString ~= versionStringFromToc and versionStringFromToc ~= "Dev" then
WeakAuras.prettyPrint("You need to restart your game client to complete the WeakAuras update!")
end
-- Force enable WeakAurasCompanion and Archive because some addon managers interfere with it
EnableAddOn("WeakAurasCompanion")
EnableAddOn("WeakAurasArchive")
if not WeakAuras.IsLibsOK() then
WeakAuras.prettyPrint("WeakAuras is missing necessary libraries. Please reinstall a proper package.")
end
-- These function stubs are defined here to reduce the number of errors that occur if WeakAuras.lua fails to compile
function WeakAuras.RegisterRegionType()
@@ -713,7 +713,7 @@ do
button:SetScript("OnLeave",Control_OnLeave)
button:SetScript("OnClick",Dropdown_TogglePullout)
local button_cover = CreateFrame("BUTTON",nil,self.frame)
local button_cover = CreateFrame("Button",nil,self.frame)
self.button_cover = button_cover
button_cover.obj = self
button_cover:SetPoint("TOPLEFT",self.frame,"BOTTOMLEFT",0,25)
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "deDE") then
if GetLocale() ~= "deDE" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "esES") then
if GetLocale() ~= "esES" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "esMX") then
if GetLocale() ~= "esMX" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "frFR") then
if GetLocale() ~= "frFR" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "itIT") then
if GetLocale() ~= "itIT" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "koKR") then
if GetLocale() ~= "koKR" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "ptBR") then
if GetLocale() ~= "ptBR" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "ruRU") then
if GetLocale() ~= "ruRU" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "zhCN") then
if GetLocale() ~= "zhCN" then
return
end
+1 -1
View File
@@ -1,4 +1,4 @@
if not(GetLocale() == "zhTW") then
if GetLocale() ~= "zhTW" then
return
end
+12 -1
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local L = WeakAuras.L
@@ -1160,6 +1160,17 @@ function Private.Modernize(data)
end
end
if (data.internalVersion < 51) then
for _, triggerData in ipairs(data.triggers) do
if triggerData.trigger.event == "Threat Situation" then
triggerData.trigger.unit = triggerData.trigger.threatUnit
triggerData.trigger.use_unit = triggerData.trigger.use_threatUnit
triggerData.trigger.threatUnit = nil
triggerData.trigger.use_threatUnit = nil
end
end
end
if (data.internalVersion < 52) then
local function matchTarget(input)
return input == "target" or input == "'target'" or input == "\"target\"" or input == "%t" or input == "'%t'" or input == "\"%t\""
+12 -8
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local WeakAuras = WeakAuras
@@ -446,14 +446,10 @@ function WeakAuras.PrintProfile()
PrintOneProfile(popup, "|cff9900ffTotal time:|r", profileData.systems.time)
PrintOneProfile(popup, "|cff9900ffTime inside WA:|r", profileData.systems.wa)
popup:AddText(string.format("|cff9900ffTime spent inside WA:|r %.2f%%", 100 * profileData.systems.wa.elapsed / profileData.systems.time.elapsed))
popup:AddText("")
popup:AddText("|cff9900ffSystems:|r")
for i, k in ipairs(SortProfileMap(profileData.systems)) do
if (k ~= "time" and k ~= "wa") then
PrintOneProfile(popup, k, profileData.systems[k], profileData.systems.wa.elapsed)
end
end
popup:AddText("")
popup:AddText("Note: Not every aspect of each aura can be tracked.")
popup:AddText("You can ask on our discord https://discord.gg/weakauras for help interpreting this output.")
popup:AddText("")
popup:AddText("|cff9900ffAuras:|r")
@@ -462,6 +458,14 @@ function WeakAuras.PrintProfile()
for i, k in ipairs(SortProfileMap(profileData.auras)) do
PrintOneProfile(popup, k, profileData.auras[k], total)
end
popup:AddText("")
popup:AddText("|cff9900ffSystems:|r")
for i, k in ipairs(SortProfileMap(profileData.systems)) do
if (k ~= "time" and k ~= "wa") then
PrintOneProfile(popup, k, profileData.systems[k], profileData.systems.wa.elapsed)
end
end
popup:Show()
end
+23 -18
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
-- Lua APIs
@@ -133,7 +133,7 @@ Private.function_strings = {
]]
};
local hsvFrame = CreateFrame("Colorselect")
local hsvFrame = CreateFrame("ColorSelect")
-- HSV transition, for a much prettier color transition in many cases
-- see http://www.wowinterface.com/forums/showthread.php?t=48236
@@ -1084,7 +1084,7 @@ Private.load_prototype = {
multiEntry = {
operator = "or"
},
test = "IsEquippedItem(%s)",
test = "IsEquippedItem(GetItemInfo(%s))",
events = { "UNIT_INVENTORY_CHANGED", "PLAYER_EQUIPMENT_CHANGED"}
},
{
@@ -1094,7 +1094,7 @@ Private.load_prototype = {
multiEntry = {
operator = "or"
},
test = "not IsEquippedItem(%s)",
test = "not IsEquippedItem(GetItemInfo(%s))",
events = { "UNIT_INVENTORY_CHANGED", "PLAYER_EQUIPMENT_CHANGED"}
},
}
@@ -5440,7 +5440,7 @@ Private.event_prototypes = {
local ret = [[
local inverse = %s;
local equipped = IsEquippedItem(%s);
local equipped = IsEquippedItem(GetItemInfo(%s));
]];
return ret:format(trigger.use_inverse and "true" or "false", itemName);
@@ -5555,18 +5555,20 @@ Private.event_prototypes = {
["Threat Situation"] = {
type = "unit",
events = function(trigger)
local unit = trigger.unit
local result = {}
if trigger.threatUnit and trigger.threatUnit ~= "none" then
AddUnitEventForEvents(result, trigger.threatUnit, "UNIT_THREAT_LIST_UPDATE")
if unit and unit ~= "none" then
AddUnitEventForEvents(result, unit, "UNIT_THREAT_LIST_UPDATE")
else
AddUnitEventForEvents(result, "player", "UNIT_THREAT_SITUATION_UPDATE")
end
return result
end,
internal_events = function(trigger)
local unit = trigger.unit
local result = {}
if trigger.threatUnit and trigger.threatUnit ~= "none" then
AddUnitChangeInternalEvents(trigger.threatUnit, result)
if unit and unit ~= "none" then
AddUnitChangeInternalEvents(unit, result)
end
return result
end,
@@ -5576,14 +5578,15 @@ Private.event_prototypes = {
AddWatchedUnits(unit)
end
end,
force_events = "UNIT_THREAT_LIST_UPDATE",
force_events = unitHelperFunctions.UnitChangedForceEvents,
name = L["Threat Situation"],
init = function(trigger)
trigger.unit = trigger.unit or "target";
local ret = [[
local unit = %s
unit = string.lower(unit)
local ok = true
local aggro, status, threatpct, rawthreatpct, threatvalue, threattotal
if unit then
if unit and unit ~= "none" then
aggro, status, threatpct, rawthreatpct, threatvalue = WeakAuras.UnitDetailedThreatSituation('player', unit)
threattotal = (threatvalue or 0) * 100 / (threatpct ~= 0 and threatpct or 1)
else
@@ -5592,18 +5595,20 @@ Private.event_prototypes = {
threatpct, rawthreatpct, threatvalue, threattotal = 100, 100, 0, 100
end
]];
return ret:format(trigger.threatUnit and trigger.threatUnit ~= "none" and "[["..trigger.threatUnit.."]]" or "nil");
return ret;
end,
canHaveDuration = true,
statesParameter = "one",
statesParameter = "unit",
args = {
{
name = "threatUnit",
name = "unit",
display = L["Unit"],
required = true,
type = "unit",
init = "arg",
values = "threat_unit_types",
test = "true",
store = true,
default = "target"
},
{
@@ -5628,7 +5633,7 @@ Private.event_prototypes = {
type = "number",
store = true,
conditionType = "number",
enable = function(trigger) return trigger.threatUnit ~= "none" end,
enable = function(trigger) return trigger.unit ~= "none" end,
multiEntry = {
operator = "and",
limit = 2
@@ -5641,7 +5646,7 @@ Private.event_prototypes = {
type = "number",
store = true,
conditionType = "number",
enable = function(trigger) return trigger.threatUnit ~= "none" end,
enable = function(trigger) return trigger.unit ~= "none" end,
multiEntry = {
operator = "and",
limit = 2
@@ -5654,7 +5659,7 @@ Private.event_prototypes = {
type = "number",
store = true,
conditionType = "number",
enable = function(trigger) return trigger.threatUnit ~= "none" end,
enable = function(trigger) return trigger.unit ~= "none" end,
multiEntry = {
operator = "and",
limit = 2
+6 -6
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -1004,19 +1004,19 @@ end
-- Called when first creating a new region/display
local function create(parent)
-- Create overall region (containing everything else)
local region = CreateFrame("FRAME", nil, parent);
local region = CreateFrame("Frame", nil, parent);
region.regionType = "aurabar"
region:SetMovable(true);
region:SetResizable(true);
region:SetMinResize(1, 1);
-- Create statusbar (inherit prototype)
local bar = CreateFrame("FRAME", nil, region);
local bar = CreateFrame("Frame", nil, region);
WeakAuras.Mixin(bar, SmoothStatusBarMixin);
local fg = bar:CreateTexture(nil, "BORDER");
local bg = bar:CreateTexture(nil, "BACKGROUND");
bg:SetAllPoints();
local fgFrame = CreateFrame("FRAME", nil, bar)
local fgFrame = CreateFrame("Frame", nil, bar)
local spark = bar:CreateTexture(nil, "ARTWORK");
bar.fg = fg;
bar.fgFrame = fgFrame
@@ -1031,7 +1031,7 @@ local function create(parent)
region.bar = bar;
-- Create icon
local iconFrame = CreateFrame("FRAME", nil, region);
local iconFrame = CreateFrame("Frame", nil, region);
region.iconFrame = iconFrame;
local icon = iconFrame:CreateTexture(nil, "OVERLAY");
region.icon = icon;
@@ -1187,7 +1187,7 @@ local function modify(parent, region, data)
if tooltipType and data.useTooltip then
-- Create and enable tooltip-hover frame
if not region.tooltipFrame then
region.tooltipFrame = CreateFrame("frame", nil, region);
region.tooltipFrame = CreateFrame("Frame", nil, region);
region.tooltipFrame:SetAllPoints(icon);
region.tooltipFrame:SetScript("OnEnter", function()
Private.ShowMouseoverTooltip(region, region.tooltipFrame);
+4 -4
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local WeakAuras = WeakAuras
@@ -79,7 +79,7 @@ local controlPointFunctions = {
}
local function createControlPoint(self)
local controlPoint = CreateFrame("FRAME", nil, self.parent)
local controlPoint = CreateFrame("Frame", nil, self.parent)
WeakAuras.Mixin(controlPoint, controlPointFunctions)
controlPoint:SetWidth(16)
@@ -103,14 +103,14 @@ local function releaseControlPoint(self, controlPoint)
end
local function create(parent)
local region = CreateFrame("FRAME", nil, parent)
local region = CreateFrame("Frame", nil, parent)
region.regionType = "dynamicgroup"
region:SetSize(16, 16)
region:SetMovable(true)
region.sortedChildren = {}
region.controlledChildren = {}
region.updatedChildren = {}
local background = CreateFrame("frame", nil, region)
local background = CreateFrame("Frame", nil, region)
region.background = background
region.selfPoint = "TOPLEFT"
region.controlPoints = CreateObjectPool(createControlPoint, releaseControlPoint)
+3 -3
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -25,14 +25,14 @@ local default = {
-- Called when first creating a new region/display
local function create(parent)
-- Main region
local region = CreateFrame("FRAME", nil, parent);
local region = CreateFrame("Frame", nil, parent);
region.regionType = "group"
region:SetMovable(true);
region:SetWidth(2);
region:SetHeight(2);
-- Border region
local border = CreateFrame("frame", nil, region);
local border = CreateFrame("Frame", nil, region);
region.border = border;
WeakAuras.regionPrototype.create(region);
+6 -6
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -143,7 +143,7 @@ local function AnchorSubRegion(self, subRegion, anchorType, selfPoint, anchorPoi
local anchorRegion = self.icon
if anchorPoint:sub(1, 6) == "INNER_" then
if not self.inner then
self.inner = CreateFrame("FRAME", nil, self)
self.inner = CreateFrame("Frame", nil, self)
self.inner:SetPoint("CENTER")
self.UpdateInnerOuterSize()
end
@@ -151,7 +151,7 @@ local function AnchorSubRegion(self, subRegion, anchorType, selfPoint, anchorPoi
anchorPoint = anchorPoint:sub(7)
elseif anchorPoint:sub(1, 6) == "OUTER_" then
if not self.outer then
self.outer = CreateFrame("FRAME", nil, self)
self.outer = CreateFrame("Frame", nil, self)
self.outer:SetPoint("CENTER")
self.UpdateInnerOuterSize()
end
@@ -243,7 +243,7 @@ end
local function create(parent, data)
local font = "GameFontHighlight";
local region = CreateFrame("FRAME", nil, parent);
local region = CreateFrame("Frame", nil, parent);
region.regionType = "icon"
region:SetMovable(true);
region:SetResizable(true);
@@ -312,7 +312,7 @@ local function create(parent, data)
end
region.frameId = frameId;
local cooldown = CreateFrame("COOLDOWN", "WeakAurasCooldown"..frameId, region, "CooldownFrameTemplate");
local cooldown = CreateFrame("Cooldown", "WeakAurasCooldown"..frameId, region, "CooldownFrameTemplate");
region.cooldown = cooldown;
cooldown:SetAllPoints(icon);
@@ -428,7 +428,7 @@ local function modify(parent, region, data)
local tooltipType = Private.CanHaveTooltip(data);
if(tooltipType and data.useTooltip) then
if not region.tooltipFrame then
region.tooltipFrame = CreateFrame("frame", nil, region);
region.tooltipFrame = CreateFrame("Frame", nil, region);
region.tooltipFrame:SetAllPoints(region);
region.tooltipFrame:SetScript("OnEnter", function()
Private.ShowMouseoverTooltip(region, region);
+3 -3
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -69,14 +69,14 @@ local regionFunctions = {
-- Called when first creating a new region/display
local function create(parent)
-- Main region
local region = CreateFrame("FRAME", nil, UIParent);
local region = CreateFrame("Frame", nil, UIParent);
region.regionType = "model"
region:SetMovable(true);
region:SetResizable(true);
region:SetMinResize(1, 1);
-- Border region
local border = CreateFrame("frame", nil, region);
local border = CreateFrame("Frame", nil, region);
region.border = border;
WeakAuras.regionPrototype.create(region);
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local L = WeakAuras.L;
@@ -424,7 +424,7 @@ WeakAuras.createSpinner = createSpinner;
local function create(parent)
local font = "GameFontHighlight";
local region = CreateFrame("FRAME", nil, parent);
local region = CreateFrame("Frame", nil, parent);
region.regionType = "progresstexture"
region:SetMovable(true);
region:SetResizable(true);
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local WeakAuras = WeakAuras;
@@ -624,7 +624,7 @@ end
local regionsForFrameTick = {}
local frameForFrameTick = CreateFrame("FRAME");
local frameForFrameTick = CreateFrame("Frame");
WeakAuras.frames["Frame Tick Frame"] = frameForFrameTick
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local texture_types = WeakAuras.StopMotion.texture_types;
@@ -90,7 +90,7 @@ local properties = {
WeakAuras.regionPrototype.AddProperties(properties, default);
local function create(parent)
local frame = CreateFrame("FRAME", nil, UIParent);
local frame = CreateFrame("Frame", nil, UIParent);
frame.regionType = "stopmotion"
frame:SetMovable(true);
frame:SetResizable(true);
+3 -3
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -54,7 +54,7 @@ local function GetProperties(data)
end
local function create(parent)
local region = CreateFrame("FRAME", nil, parent);
local region = CreateFrame("Frame", nil, parent);
region.regionType = "text"
region:SetMovable(true);
@@ -98,7 +98,7 @@ local function modify(parent, region, data)
local tooltipType = Private.CanHaveTooltip(data);
if(tooltipType and data.useTooltip) then
if not region.tooltipFrame then
region.tooltipFrame = CreateFrame("frame", nil, region);
region.tooltipFrame = CreateFrame("Frame", nil, region);
region.tooltipFrame:SetAllPoints(region);
region.tooltipFrame:SetScript("OnEnter", function()
Private.ShowMouseoverTooltip(region, region);
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local L = WeakAuras.L;
@@ -68,7 +68,7 @@ local properties = {
WeakAuras.regionPrototype.AddProperties(properties, default);
local function create(parent)
local region = CreateFrame("FRAME", nil, UIParent);
local region = CreateFrame("Frame", nil, UIParent);
region.regionType = "texture"
region:SetMovable(true);
region:SetResizable(true);
+1 -1
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local L = WeakAuras.L;
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -34,7 +34,7 @@ local properties = {
local function create()
return CreateFrame("FRAME", nil, UIParent)
return CreateFrame("Frame", nil, UIParent)
end
local function onAcquire(subRegion)
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -297,7 +297,7 @@ local funcs = {
}
local function create()
local region = CreateFrame("FRAME", nil, UIParent)
local region = CreateFrame("Frame", nil, UIParent)
for name, func in pairs(funcs) do
region[name] = func
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -155,7 +155,7 @@ local funcs = {
}
local function create()
local subRegion = CreateFrame("FRAME", nil, UIParent)
local subRegion = CreateFrame("Frame", nil, UIParent)
--subRegion:SetClipsChildren(true)
for k, v in pairs(funcs) do
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -101,7 +101,7 @@ local properties = {
}
local function create()
local region = CreateFrame("FRAME", nil, UIParent);
local region = CreateFrame("Frame", nil, UIParent);
local text = region:CreateFontString(nil, "OVERLAY");
region.text = text;
+2 -2
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local SharedMedia = LibStub("LibSharedMedia-3.0");
@@ -107,7 +107,7 @@ local auraBarAnchorInverse = {
}
local function create()
local subRegion = CreateFrame("FRAME", nil, UIParent)
local subRegion = CreateFrame("Frame", nil, UIParent)
subRegion.texture = subRegion:CreateTexture()
subRegion.texture:SetDrawLayer("ARTWORK", 3)
subRegion.texture:SetAllPoints(subRegion)
+1 -1
View File
@@ -18,7 +18,7 @@ Imports an aura from a table, which may or may not be encoded as a B64 string.
If target is installed data, or is a uid which points to installed data, then the import will be an update to that aura
]]--
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
-- Lua APIs
+5 -5
View File
@@ -1,4 +1,4 @@
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
local AddonName, Private = ...
local WeakAuras = WeakAuras;
@@ -150,8 +150,8 @@ local simpleFormatters = {
local fmt, time = SecondsToTimeAbbrev(value)
-- Remove the space between the value and unit
return fmt:gsub(" ", ""):format(time)
end
}
end,
},
}
Private.format_types = {
@@ -257,7 +257,7 @@ Private.format_types = {
if value < threshold then
return string.format(formatString, value)
else
return mainFormater(value, state)
return mainFormater(value)
end
end
end
@@ -874,7 +874,7 @@ local function update_forms()
end
end
end
local form_frame = CreateFrame("frame");
local form_frame = CreateFrame("Frame");
form_frame:RegisterEvent("UPDATE_SHAPESHIFT_FORMS")
form_frame:RegisterEvent("PLAYER_LOGIN")
form_frame:SetScript("OnEvent", update_forms);
+12 -12
View File
@@ -30,7 +30,7 @@ LibStub("AceTimer-3.0"):Embed(WeakAurasTimers)
Private.watched_trigger_events = {}
-- The worlds simplest callback system
-- The worlds simplest callback system.
-- That supports 1:N, but no deregistration and breaks if registrating in a callback
Private.callbacks = {}
Private.callbacks.events = {}
@@ -141,7 +141,7 @@ function SlashCmdList.WEAKAURAS(input)
end
end
if not WeakAuras.IsCorrectVersion() then return end
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
function Private.ToggleMinimap()
WeakAurasSaved.minimap.hide = not WeakAurasSaved.minimap.hide
@@ -913,7 +913,7 @@ local function tooltip_draw()
tooltip:Show();
end
local colorFrame = CreateFrame("frame");
local colorFrame = CreateFrame("Frame");
WeakAuras.frames["LDB Icon Recoloring"] = colorFrame;
local colorElapsed = 0;
@@ -921,7 +921,7 @@ local colorDelay = 2;
local r, g, b = 0.8, 0, 1;
local r2, g2, b2 = random(2)-1, random(2)-1, random(2)-1;
local tooltip_update_frame = CreateFrame("FRAME");
local tooltip_update_frame = CreateFrame("Frame");
WeakAuras.frames["LDB Tooltip Updater"] = tooltip_update_frame;
-- function copied from LibDBIcon-1.0.lua
@@ -1102,12 +1102,12 @@ function Private.Login(initialTime, takeNewSnapshots)
end
end
local WeakAurasFrame = CreateFrame("FRAME", "WeakAurasFrame", UIParent);
local WeakAurasFrame = CreateFrame("Frame", "WeakAurasFrame", UIParent);
WeakAuras.frames["WeakAuras Main Frame"] = WeakAurasFrame;
WeakAurasFrame:SetAllPoints(UIParent);
WeakAurasFrame:SetFrameStrata("BACKGROUND");
local loadedFrame = CreateFrame("FRAME");
local loadedFrame = CreateFrame("Frame");
WeakAuras.frames["Addon Initialization Handler"] = loadedFrame;
loadedFrame:RegisterEvent("ADDON_LOADED");
loadedFrame:RegisterEvent("PLAYER_LOGIN");
@@ -1446,7 +1446,7 @@ function Private.ScanForLoads(toCheck, event, arg1, ...)
scanForLoadsImpl(toCheck, event, arg1, ...)
end
local loadFrame = CreateFrame("FRAME");
local loadFrame = CreateFrame("Frame");
WeakAuras.loadFrame = loadFrame;
WeakAuras.frames["Display Load Handling"] = loadFrame;
@@ -1473,7 +1473,7 @@ loadFrame:RegisterEvent("PLAYER_UNGHOST")
loadFrame:RegisterEvent("PLAYER_FLAGS_CHANGED")
loadFrame:RegisterEvent("PARTY_LEADER_CHANGED")
local unitLoadFrame = CreateFrame("FRAME");
local unitLoadFrame = CreateFrame("Frame");
WeakAuras.unitLoadFrame = unitLoadFrame;
WeakAuras.frames["Display Load Handling 2"] = unitLoadFrame;
@@ -3564,7 +3564,7 @@ end
local dynFrame = {};
do
-- Internal data
dynFrame.frame = CreateFrame("frame");
dynFrame.frame = CreateFrame("Frame");
dynFrame.update = {};
dynFrame.size = 0;
@@ -4474,12 +4474,12 @@ local function ensureMouseFrame()
if (mouseFrame) then
return;
end
mouseFrame = CreateFrame("FRAME", "WeakAurasAttachToMouseFrame", UIParent);
mouseFrame = CreateFrame("Frame", "WeakAurasAttachToMouseFrame", UIParent);
mouseFrame.attachedVisibleFrames = {};
mouseFrame:SetWidth(1);
mouseFrame:SetHeight(1);
local moverFrame = CreateFrame("FRAME", "WeakAurasMousePointerFrame", mouseFrame);
local moverFrame = CreateFrame("Frame", "WeakAurasMousePointerFrame", mouseFrame);
mouseFrame.moverFrame = moverFrame;
moverFrame:SetPoint("TOPLEFT", mouseFrame, "CENTER");
moverFrame:SetWidth(32);
@@ -4794,7 +4794,7 @@ local function postponeAnchor(id)
end
end
local HiddenFrames = CreateFrame("FRAME", "WeakAurasHiddenFrames")
local HiddenFrames = CreateFrame("Frame", "WeakAurasHiddenFrames")
HiddenFrames:Hide()
WeakAuras.HiddenFrames = HiddenFrames