Exiles/coa-weakauras
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

from retail

Browse Source
This commit is contained in:
Bunny67
2020-06-09 23:31:40 +03:00
parent 7a5876526d
commit de72394bda
32 changed files with 313 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua
+9 -9
View File
@@ -4,7 +4,7 @@ local tinsert, tconcat, tremove, wipe = table.insert, table.concat, table.remove
local select, pairs, next, type, unpack = select, pairs, next, type, unpack
local tostring, error = tostring, error
local Type, Version = "WeakAurasDisplayButton", 53
local Type, Version = "WeakAurasDisplayButton", 54
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
@@ -1670,7 +1670,7 @@ local methods = {
return self.frame:IsEnabled();
end,
["OnRelease"] = function(self)
self:ReleaseThumnail()
self:ReleaseThumbnail()
self:SetViewRegion();
self:Enable();
self:SetGroup();
@@ -1695,8 +1695,8 @@ local methods = {
end
if self.data.regionType ~= self.thumbnailType then
self:ReleaseThumnail()
self:AcquireThumnail()
self:ReleaseThumbnail()
self:AcquireThumbnail()
else
local option = WeakAuras.regionOptions[self.thumbnailType]
if option and option.modifyThumbnail then
@@ -1704,7 +1704,7 @@ local methods = {
end
end
end,
["ReleaseThumnail"] = function(self)
["ReleaseThumbnail"] = function(self)
if not self.hasThumbnail then
return
end
@@ -1717,7 +1717,7 @@ local methods = {
self.thumbnail = nil
end
end,
["AcquireThumnail"] = function(self)
["AcquireThumbnail"] = function(self)
if self.hasThumbnail then
return
end
@@ -2044,9 +2044,9 @@ local function Constructor()
-- Update in group icon
groupUpdate = CreateFrame("BUTTON", nil, button)
button.groupUpdate = groupUpdate
local gtex = groupUpdate:CreateTexture(nil, "OVERLAY")
gtex:SetTexture([[Interface\AddOns\WeakAuras\Media\Textures\wagoupdate_logo.tga]])
gtex:SetAllPoints()
local gTex = groupUpdate:CreateTexture(nil, "OVERLAY")
gTex:SetTexture([[Interface\AddOns\WeakAuras\Media\Textures\wagoupdate_logo.tga]])
gTex:SetAllPoints()
groupUpdate:SetSize(16, 16)
groupUpdate:SetPoint("BOTTOM", button, "BOTTOM")
groupUpdate:SetPoint("LEFT", icon, "RIGHT", 20, 0)
WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasNewButton.lua
+4 -4
View File
@@ -1,6 +1,6 @@
if not WeakAuras.IsCorrectVersion() then return end
local Type, Version = "WeakAurasNewButton", 23
local Type, Version = "WeakAurasNewButton", 24
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
@@ -39,7 +39,7 @@ local methods = {
self.frame:SetScript("OnClick", func);
end,
["SetIcon"] = function(self, icon)
self:ReleaseThumnail()
self:ReleaseThumbnail()
if(type(icon) == "string" or type(icon) == "number") then
self.icon:SetTexture(icon);
self.icon:Show();
@@ -63,7 +63,7 @@ local methods = {
self.thumbnailType = regionType
end
end,
["ReleaseThumnail"] = function(self)
["ReleaseThumbnail"] = function(self)
if self.thumbnail then
local regionData = WeakAuras.regionOptions[self.thumbnailType]
if regionData and regionData.releaseThumbnail then
@@ -74,7 +74,7 @@ local methods = {
self.thumbnailType = nil
end,
["OnRelease"] = function(self)
self:ReleaseThumnail()
self:ReleaseThumbnail()
if(self.iconRegion and self.iconRegion.Hide) then
self.iconRegion:Hide();
end
WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasToolbarButton.lua
+20 -20
View File
@@ -2,7 +2,7 @@
ToolbarButton Widget, based on AceGUI Button
Graphical Button.
-------------------------------------------------------------------------------]]
local Type, Version = "WeakAurasToolbarButton", 3
local Type, Version = "WeakAurasToolbarButton", 4
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
@@ -40,7 +40,7 @@ local methods = {
self:SetWidth(32)
self:SetDisabled(false)
self:SetText()
self.htex:SetVertexColor(1, 1, 1, 0.1)
self.hTex:SetVertexColor(1, 1, 1, 0.1)
end,
-- ["OnRelease"] = nil,
@@ -70,9 +70,9 @@ local methods = {
end,
["SetStrongHighlight"] = function(self, enable)
if enable then
self.htex:SetVertexColor(1, 1, 1, 0.3)
self.hTex:SetVertexColor(1, 1, 1, 0.3)
else
self.htex:SetVertexColor(1, 1, 1, 0.1)
self.hTex:SetVertexColor(1, 1, 1, 0.1)
end
end
@@ -105,24 +105,24 @@ local function Constructor()
text:SetPoint("BOTTOMRIGHT", -4, 1)
text:SetJustifyV("MIDDLE")
--local ntex = frame:CreateTexture()
--ntex:SetTexture("Interface/Buttons/UI-Panel-Button-Up")
--ntex:SetTexCoord(0, 0.625, 0, 0.6875)
--ntex:SetAllPoints()
--frame:SetNormalTexture(ntex)
--local nTex = frame:CreateTexture()
--nTex:SetTexture("Interface/Buttons/UI-Panel-Button-Up")
--nTex:SetTexCoord(0, 0.625, 0, 0.6875)
--nTex:SetAllPoints()
--frame:SetNormalTexture(nTex)
local htex = frame:CreateTexture()
htex:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\Square_FullWhite")
htex:SetVertexColor(1, 1, 1, 0.1)
local hTex = frame:CreateTexture()
hTex:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\Square_FullWhite")
hTex:SetVertexColor(1, 1, 1, 0.1)
htex:SetAllPoints()
frame:SetHighlightTexture(htex)
hTex:SetAllPoints()
frame:SetHighlightTexture(hTex)
local ptex = frame:CreateTexture()
ptex:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\Square_FullWhite")
ptex:SetVertexColor(1, 1, 1, 0.2)
ptex:SetAllPoints()
frame:SetPushedTexture(ptex)
local pTex = frame:CreateTexture()
pTex:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\Square_FullWhite")
pTex:SetVertexColor(1, 1, 1, 0.2)
pTex:SetAllPoints()
frame:SetPushedTexture(pTex)
local widget = {
@@ -130,7 +130,7 @@ local function Constructor()
icon = icon,
frame = frame,
type = Type,
htex = htex
hTex = hTex
}
for method, func in pairs(methods) do
widget[method] = func
WeakAurasOptions/ActionOptions.lua
+7 -23
View File
@@ -102,7 +102,7 @@ function WeakAuras.AddActionOption(id, data)
name = "",
order = 3,
image = function() return "", 0, 0 end,
hidden = function() return not(data.actions.start.message_type == "WHISPER" or data.actions.start.message_type == "CHANNEL" or data.actions.start.message_type == "COMBAT" or data.actions.start.message_type == "PRINT") end
hidden = function() return not(data.actions.start.message_type == "WHISPER" or data.actions.start.message_type == "COMBAT" or data.actions.start.message_type == "PRINT") end
},
start_message_color = {
type = "color",
@@ -127,14 +127,6 @@ function WeakAuras.AddActionOption(id, data)
disabled = function() return not data.actions.start.do_message end,
hidden = function() return data.actions.start.message_type ~= "WHISPER" end
},
start_message_channel = {
type = "input",
width = WeakAuras.normalWidth,
name = L["Channel Number"],
order = 4,
disabled = function() return not data.actions.start.do_message end,
hidden = function() return data.actions.start.message_type ~= "CHANNEL" end
},
start_message = {
type = "input",
width = WeakAuras.doubleWidth,
@@ -489,7 +481,7 @@ function WeakAuras.AddActionOption(id, data)
name = "",
order = 23,
image = function() return "", 0, 0 end,
hidden = function() return not(data.actions.finish.message_type == "WHISPER" or data.actions.finish.message_type == "CHANNEL") end
hidden = function() return data.actions.finish.message_type ~= "WHISPER" end
},
finish_message_color = {
type = "color",
@@ -514,14 +506,6 @@ function WeakAuras.AddActionOption(id, data)
disabled = function() return not data.actions.finish.do_message end,
hidden = function() return data.actions.finish.message_type ~= "WHISPER" end
},
finish_message_channel = {
type = "input",
width = WeakAuras.normalWidth,
name = L["Channel Number"],
order = 24,
disabled = function() return not data.actions.finish.do_message end,
hidden = function() return data.actions.finish.message_type ~= "CHANNEL" end
},
finish_message = {
type = "input",
width = WeakAuras.doubleWidth,
@@ -836,19 +820,19 @@ function WeakAuras.AddActionOption(id, data)
},
}
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "init", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Actions",
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "init", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#on-init",
0.011, function() return not data.actions.init.do_custom end, {"actions", "init", "custom"}, true);
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "start_message", "https://github.com/WeakAuras/WeakAuras2/wiki/Text-Replacements",
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "start_message", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#chat-message---custom-code",
5.1, function() return not (data.actions.start.do_message and WeakAuras.ContainsCustomPlaceHolder(data.actions.start.message)) end, {"actions", "start", "message_custom"}, false);
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "start", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Actions",
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "start", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#on-show",
13, function() return not data.actions.start.do_custom end, {"actions", "start", "custom"}, true);
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "finish_message", "https://github.com/WeakAuras/WeakAuras2/wiki/Text-Replacements",
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "finish_message", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#chat-message---custom-code",
26, function() return not (data.actions.finish.do_message and WeakAuras.ContainsCustomPlaceHolder(data.actions.finish.message)) end, {"actions", "finish", "message_custom"}, false);
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "finish", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Actions",
WeakAuras.AddCodeOption(action.args, data, L["Custom Code"], "finish", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#on-hide",
32, function() return not data.actions.finish.do_custom end, {"actions", "finish", "custom"}, true);
return action;
WeakAurasOptions/AnimationOptions.lua
+15 -15
View File
@@ -846,93 +846,93 @@ function WeakAuras.AddAnimationOption(id, data)
local function hideStartAlphaFunc()
return data.animation.start.type ~= "custom" or data.animation.start.alphaType ~= "custom" or not data.animation.start.use_alpha
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_alphaFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_alphaFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#alpha-opacity",
35.3, hideStartAlphaFunc, {"animation", "start", "alphaFunc"}, false);
local function hideStartTranslate()
return data.animation.start.type ~= "custom" or data.animation.start.translateType ~= "custom" or not data.animation.start.use_translate
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_translateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_translateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#translate-position",
39.3, hideStartTranslate, {"animation", "start", "translateFunc"}, false);
local function hideStartScale()
return data.animation.start.type ~= "custom" or data.animation.start.scaleType ~= "custom" or not (data.animation.start.use_scale and WeakAuras.regions[id].region.Scale)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_scaleFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_scaleFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#scale-size",
43.3, hideStartScale, {"animation", "start", "scaleFunc"}, false);
local function hideStartRotateFunc()
return data.animation.start.type ~= "custom" or data.animation.start.rotateType ~= "custom" or not (data.animation.start.use_rotate and WeakAuras.regions[id].region.Rotate)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_rotateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_rotateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#rotate",
47.3, hideStartRotateFunc, {"animation", "start", "rotateFunc"}, false);
local function hideStartColorFunc()
return data.animation.start.type ~= "custom" or data.animation.start.colorType ~= "custom" or not (data.animation.start.use_color and WeakAuras.regions[id].region.Color)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_colorFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "start_colorFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#color",
48.7, hideStartColorFunc, {"animation", "start", "colorFunc"}, false);
-- Text Editors for "main"
local function hideMainAlphaFunc()
return data.animation.main.type ~= "custom" or data.animation.main.alphaType ~= "custom" or not data.animation.main.use_alpha
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_alphaFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_alphaFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#alpha-opacity",
55.3, hideMainAlphaFunc, {"animation", "main", "alphaFunc"}, false, nil, extraSetFunction);
local function hideMainTranslate()
return data.animation.main.type ~= "custom" or data.animation.main.translateType ~= "custom" or not data.animation.main.use_translate
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_translateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_translateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#translate-position",
59.3, hideMainTranslate, {"animation", "main", "translateFunc"}, false, nil, extraSetFunction);
local function hideMainScale()
return data.animation.main.type ~= "custom" or data.animation.main.scaleType ~= "custom" or not (data.animation.main.use_scale and WeakAuras.regions[id].region.Scale)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_scaleFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_scaleFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#scale-sizes",
63.3, hideMainScale, {"animation", "main", "scaleFunc"}, false, nil, extraSetFunction);
local function hideMainRotateFunc()
return data.animation.main.type ~= "custom" or data.animation.main.rotateType ~= "custom" or not (data.animation.main.use_rotate and WeakAuras.regions[id].region.Rotate)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_rotateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_rotateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#rotate",
67.3, hideMainRotateFunc, {"animation", "main", "rotateFunc"}, false, nil, extraSetFunction);
local function hideMainColorFunc()
return data.animation.main.type ~= "custom" or data.animation.main.colorType ~= "custom" or not (data.animation.main.use_color and WeakAuras.regions[id].region.Color)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_colorFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "main_colorFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#color",
68.7, hideMainColorFunc, {"animation", "main", "colorFunc"}, false, nil, extraSetFunction);
-- Text Editors for "finish"
local function hideFinishAlphaFunc()
return data.animation.finish.type ~= "custom" or data.animation.finish.alphaType ~= "custom" or not data.animation.finish.use_alpha
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_alphaFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_alphaFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#alpha-opacity",
75.3, hideFinishAlphaFunc, {"animation", "finish", "alphaFunc"}, false);
local function hideFinishTranslate()
return data.animation.finish.type ~= "custom" or data.animation.finish.translateType ~= "custom" or not data.animation.finish.use_translate
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_translateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_translateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#translate-position",
79.3, hideFinishTranslate, {"animation", "finish", "translateFunc"}, false);
local function hideFinishScale()
return data.animation.finish.type ~= "custom" or data.animation.finish.scaleType ~= "custom" or not (data.animation.finish.use_scale and WeakAuras.regions[id].region.Scale)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_scaleFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_scaleFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#scale-size",
83.3, hideFinishScale, {"animation", "finish", "scaleFunc"}, false);
local function hideFinishRotateFunc()
return data.animation.finish.type ~= "custom" or data.animation.finish.rotateType ~= "custom" or not (data.animation.finish.use_rotate and WeakAuras.regions[id].region.Rotate)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_rotateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_rotateFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#rotate",
87.3, hideFinishRotateFunc, {"animation", "finish", "rotateFunc"}, false);
local function hideFinishColorFunc()
return data.animation.finish.type ~= "custom" or data.animation.finish.colorType ~= "custom" or not (data.animation.finish.use_color and WeakAuras.regions[id].region.Color)
end
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_colorFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Animation-Functions",
WeakAuras.AddCodeOption(animation.args, data, L["Custom Function"], "finish_colorFunc", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#color",
88.7, hideFinishColorFunc, {"animation", "finish", "colorFunc"}, false);
return animation;
WeakAurasOptions/AuthorOptions.lua
+1 -1
View File
@@ -16,7 +16,7 @@
width (required) -> number between 0.1 and 2 (softMin of 0.5). Determines the width of the option.
useDesc (optional) -> bool. If false, then the tooltip will not be used.
desc (optional) -> string to be displayed in the option tooltip
When options are merged together (i.e. when the user multiselects and then opens the custom options tab), there is one additonal field:
When options are merged together (i.e. when the user multiselects and then opens the custom options tab), there is one additional field:
references -> childID <=> optionID map, used to dereference to the proper option table in setters
Supported option types, and additional fields that each type supports/requires:
group -> represents a group of options.
WeakAurasOptions/BuffTrigger2.lua
+16
View File
@@ -680,6 +680,22 @@ local function GetBuffTriggerOptions(data, optionTriggerChoices)
hidden = function() return not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party") and not trigger.useClass) end
},
ignoreDead = {
type = "toggle",
name = WeakAuras.newFeatureString .. L["Ignore Dead"],
order = 68.7,
width = WeakAuras.doubleWidth,
hidden = function() return not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party")) end
},
ignoreDisconnected = {
type = "toggle",
name = WeakAuras.newFeatureString .. L["Ignore Disconnected"],
order = 68.8,
width = WeakAuras.doubleWidth,
hidden = function() return not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party")) end
},
useGroup_count = {
type = "toggle",
width = WeakAuras.normalWidth,
WeakAurasOptions/ConditionOptions.lua
+7 -23
View File
@@ -20,7 +20,7 @@
-- - variable: Variable inside the trigger state to check
-- - op: Operator to use for check
-- - value: Value to check
-- - checks: Sub Checks for Combinations, each containg trigger, variable, op, value or checks
-- - checks: Sub Checks for Combinations, each containing trigger, variable, op, value or checks
-- - (for merged) references
-- - id => conditionIndex
-- => op
@@ -677,22 +677,6 @@ local function addControlsForChange(args, order, data, conditionVariable, condit
}
order = order + 1;
args["condition" .. i .. "value" .. j .. "message channel"] = {
type = "input",
width = WeakAuras.normalWidth,
name = blueIfNoValue2(data, conditions[i].changes[j], "value", "message_channel", L["Channel Number"], L["Channel Number"]),
desc = descIfNoValue2(data, conditions[i].changes[j], "value", "message_channel", propertyType),
order = order,
get = function()
return type(conditions[i].changes[j].value) == "table" and conditions[i].changes[j].value.message_channel;
end,
set = setValueComplex("message_channel"),
hidden = function()
return not anyMessageType("CHANNEL");
end
}
order = order + 1;
local descMessage = descIfNoValue2(data, conditions[i].changes[j], "value", "message", propertyType);
if (not descMessage and data ~= WeakAuras.tempGroup) then
descMessage = L["Dynamic text tooltip"] .. WeakAuras.GetAdditionalProperties(data)
@@ -743,9 +727,9 @@ local function addControlsForChange(args, order, data, conditionVariable, condit
local changeIndex = reference.changeIndex;
multipath[id] = {"conditions", conditionIndex, "changes", changeIndex, "value", "custom"};
end
WeakAuras.OpenTextEditor(data, multipath, nil, true);
WeakAuras.OpenTextEditor(data, multipath, nil, true, nil, nil, "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#chat-message---custom-code-1");
else
WeakAuras.OpenTextEditor(data, {"conditions", i, "changes", j, "value", "custom"});
WeakAuras.OpenTextEditor(data, {"conditions", i, "changes", j, "value", "custom"}, nil, nil, nil, nil, "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#chat-message---custom-code-1");
end
end
}
@@ -822,10 +806,10 @@ local function addControlsForChange(args, order, data, conditionVariable, condit
childData.conditions[conditionIndex].changes[changeIndex].value = childData.conditions[conditionIndex].changes[changeIndex].value or {};
multipath[id] = {"conditions", conditionIndex, "changes", changeIndex, "value", "custom"};
end
WeakAuras.OpenTextEditor(data, multipath, true, true);
WeakAuras.OpenTextEditor(data, multipath, true, true, nil, nil, "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#run-custom-code");
else
data.conditions[i].changes[j].value = data.conditions[i].changes[j].value or {};
WeakAuras.OpenTextEditor(data, {"conditions", i, "changes", j, "value", "custom"}, true);
WeakAuras.OpenTextEditor(data, {"conditions", i, "changes", j, "value", "custom"}, true, nil, nil, nil, "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#run-custom-code");
end
end
}
@@ -1957,7 +1941,7 @@ local function createConditionTemplates(data)
return conditionTemplates, conditionTemplateWithoutCombinations;
end
local function buildAllPotentialProperies(data, category)
local function buildAllPotentialProperties(data, category)
local allProperties = {};
allProperties.propertyMap = {};
if (data.controlledChildren) then
@@ -2276,7 +2260,7 @@ function WeakAuras.GetConditionOptions(data, args, conditionVariable, startorder
local conditionTemplates, conditionTemplateWithoutCombinations = createConditionTemplates(data);
-- Build potential properties structure
local allProperties = buildAllPotentialProperies(data, category);
local allProperties = buildAllPotentialProperties(data, category);
-- Build currently selected conditions
local conditions;
WeakAurasOptions/GenericTrigger.lua
+9 -9
View File
@@ -315,21 +315,21 @@ local function GetCustomTriggerOptions(data, optionTriggerChoices, trigger)
local function hideCustomTrigger()
return not (trigger.type == "custom")
end
WeakAuras.AddCodeOption(customOptions, data, L["Custom Trigger"], "custom_trigger", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Triggers",
WeakAuras.AddCodeOption(customOptions, data, L["Custom Trigger"], "custom_trigger", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-trigger",
10, hideCustomTrigger, appendToTriggerPath("custom"), false, true, extraSetFunction, nil, true);
local function hideCustomVariables()
return not (trigger.type == "custom" and trigger.custom_type == "stateupdate");
end
WeakAuras.AddCodeOption(customOptions, data, L["Custom Variables"], "custom_variables", "https://github.com/WeakAuras/WeakAuras2/wiki/Trigger-State-Updater-(TSU)#custom-variables",
WeakAuras.AddCodeOption(customOptions, data, L["Custom Variables"], "custom_variables", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-variables",
11, hideCustomVariables, appendToTriggerPath("customVariables"), false, true, extraSetFunctionReload, nil, true);
local function hideCustomUntrigger()
return not (trigger.type == "custom"
and (trigger.custom_type == "status" or (trigger.custom_type == "event" and trigger.custom_hide == "custom")))
end
WeakAuras.AddCodeOption(customOptions, data, L["Custom Untrigger"], "custom_untrigger", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Triggers",
WeakAuras.AddCodeOption(customOptions, data, L["Custom Untrigger"], "custom_untrigger", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-untrigger",
14, hideCustomUntrigger, appendToUntriggerPath("custom"), false, true, extraSetFunction);
local function hideCustomDuration()
@@ -337,7 +337,7 @@ local function GetCustomTriggerOptions(data, optionTriggerChoices, trigger)
and (trigger.custom_type == "status"
or (trigger.custom_type == "event" and (trigger.custom_hide ~= "timed" or trigger.dynamicDuration))))
end
WeakAuras.AddCodeOption(customOptions, data, L["Duration Info"], "custom_duration", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Triggers",
WeakAuras.AddCodeOption(customOptions, data, L["Duration Info"], "custom_duration", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#duration-info",
16, hideCustomDuration, appendToTriggerPath("customDuration"), false, true, extraSetFunctionReload);
local function hideIfTriggerStateUpdate()
@@ -379,17 +379,17 @@ local function GetCustomTriggerOptions(data, optionTriggerChoices, trigger)
}
}
WeakAuras.AddCodeOption(customOptions, data, string.format(L["Overlay %s Info"], i), "custom_overlay" .. i, "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Triggers",
WeakAuras.AddCodeOption(customOptions, data, string.format(L["Overlay %s Info"], i), "custom_overlay" .. i, "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#overlay-info",
17 + i / 10, hideOverlay, appendToTriggerPath("customOverlay" .. i), false, true, extraSetFunctionReload, extraFunctions);
end
WeakAuras.AddCodeOption(customOptions, data, L["Name Info"], "custom_name", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Triggers",
WeakAuras.AddCodeOption(customOptions, data, L["Name Info"], "custom_name", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#name-info",
18, hideIfTriggerStateUpdate, appendToTriggerPath("customName"), false, true, extraSetFunctionReload);
WeakAuras.AddCodeOption(customOptions, data, L["Icon Info"], "custom_icon", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Triggers",
WeakAuras.AddCodeOption(customOptions, data, L["Icon Info"], "custom_icon", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#icon-info",
20, hideIfTriggerStateUpdate, appendToTriggerPath("customIcon"), false, true, extraSetFunction);
WeakAuras.AddCodeOption(customOptions, data, L["Texture Info"], "custom_texture", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Triggers",
WeakAuras.AddCodeOption(customOptions, data, L["Texture Info"], "custom_texture", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#texture-info",
22, hideIfTriggerStateUpdate, appendToTriggerPath("customTexture"), false, true, extraSetFunction);
WeakAuras.AddCodeOption(customOptions, data, L["Stack Info"], "custom_stacks", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Triggers",
WeakAuras.AddCodeOption(customOptions, data, L["Stack Info"], "custom_stacks", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#stack-info",
23, hideIfTriggerStateUpdate, appendToTriggerPath("customStacks"), false, true, extraSetFunctionReload);
return customOptions;
WeakAurasOptions/OptionsFrames/CodeReview.lua
+1 -1
View File
@@ -27,7 +27,7 @@ local colorScheme = {
[IndentationLib.tokens.TOKEN_COMMENT_LONG] = "|c0000aa00",
[IndentationLib.tokens.TOKEN_NUMBER] = "|c00ff9900",
[IndentationLib.tokens.TOKEN_STRING] = "|c00999999",
-- ellipsis, curly braces, table acces
-- ellipsis, curly braces, table access
["..."] = tableColor,
["{"] = tableColor,
["}"] = tableColor,
WeakAurasOptions/OptionsFrames/MoverSizer.lua
+10 -10
View File
@@ -875,20 +875,20 @@ local function ConstructMoverSizer(parent)
end
local regionScale = self.moving.region:GetScale()
self.text:SetText(("(%.2f, %.2f)"):format(dX*1/regionScale, dY*1/regionScale))
local midx = (distance / 2) * cos(angle)
local midy = (distance / 2) * sin(angle)
self.text:SetPoint("CENTER", self.anchorPointIcon, "CENTER", midx, midy)
local midX = (distance / 2) * cos(angle)
local midY = (distance / 2) * sin(angle)
self.text:SetPoint("CENTER", self.anchorPointIcon, "CENTER", midX, midY)
local left, right, top, bottom, centerX, centerY = frame:GetLeft(), frame:GetRight(), frame:GetTop(), frame:GetBottom(), frame:GetCenter()
if (midx > 0 and (self.text:GetRight() or 0) > (left or 0))
or (midx < 0 and (self.text:GetLeft() or 0) < (right or 0))
if (midX > 0 and (self.text:GetRight() or 0) > (left or 0))
or (midX < 0 and (self.text:GetLeft() or 0) < (right or 0))
then
if midy > 0 and (self.text:GetTop() or 0) > (top or 0) then
midy = midy - ((self.text:GetTop() or 0) - (bottom or 0))
elseif midy < 0 and (self.text:GetBottom() or 0) < (top or 0) then
midy = midy + ((top or 0) - (self.text:GetBottom() or 0))
if midY > 0 and (self.text:GetTop() or 0) > (top or 0) then
midY = midY - ((self.text:GetTop() or 0) - (bottom or 0))
elseif midY < 0 and (self.text:GetBottom() or 0) < (top or 0) then
midY = midY + ((top or 0) - (self.text:GetBottom() or 0))
end
end
self.text:SetPoint("CENTER", self.anchorPointIcon, "CENTER", midx, midy)
self.text:SetPoint("CENTER", self.anchorPointIcon, "CENTER", midX, midY)
if self.isMoving then
if mover.align then
local ctrlDown = IsControlKeyDown()
WeakAurasOptions/OptionsFrames/OptionsFrame.lua
+8 -8
View File
@@ -226,13 +226,13 @@ function WeakAuras.CreateFrame()
local title = CreateFrame("Frame", nil, frame)
local titletext = title:CreateFontString(nil, "OVERLAY", "GameFontNormal")
local titleText = title:CreateFontString(nil, "OVERLAY", "GameFontNormal")
titletext:SetText("WeakAuras " .. WeakAuras.versionString)
titleText:SetText("WeakAuras " .. WeakAuras.versionString)
local titlebg = CreateDecorationWide(frame, max(120, titletext:GetWidth()))
titlebg:SetPoint("TOP", 0, 24)
titletext:SetPoint("TOP", titlebg, "TOP", 0, -14)
local titleBG = CreateDecorationWide(frame, max(120, titleText:GetWidth()))
titleBG:SetPoint("TOP", 0, 24)
titleText:SetPoint("TOP", titleBG, "TOP", 0, -14)
local function commitWindowChanges()
@@ -265,8 +265,8 @@ function WeakAuras.CreateFrame()
frame:StopMovingOrSizing()
commitWindowChanges()
end)
title:SetPoint("BOTTOMLEFT", titlebg, "BOTTOMLEFT", -25, 0)
title:SetPoint("TOPRIGHT", titlebg, "TOPRIGHT", 25, 0)
title:SetPoint("BOTTOMLEFT", titleBG, "BOTTOMLEFT", -25, 0)
title:SetPoint("TOPRIGHT", titleBG, "TOPRIGHT", 25, 0)
CreateFrameSizer(frame, commitWindowChanges, "BOTTOMLEFT")
CreateFrameSizer(frame, commitWindowChanges, "BOTTOMRIGHT")
@@ -562,7 +562,7 @@ function WeakAuras.CreateFrame()
return status.offset, status.offset + self.scrollframe:GetHeight()
end
-- override SetScroll to make childrens visible as needed
-- override SetScroll to make children visible as needed
local oldSetScroll = buttonsScroll.SetScroll
buttonsScroll.SetScroll = function(self, value)
if self:GetScrollPos() ~= value then
WeakAurasOptions/OptionsFrames/TextEditor.lua
+1 -1
View File
@@ -329,7 +329,7 @@ local function ConstructTextEditor(frame)
local heading1 = AceGUI:Create("Heading")
heading1:SetText(L["Premade Snippets"])
heading1:SetRelativeWidth(1)
heading1:SetRelativeWidth(0.7)
frame:AddChild(heading1)
-- Iterate premade snippets and make buttons for them
WeakAurasOptions/RegionOptions/AuraBar.lua
+1 -1
View File
@@ -459,7 +459,7 @@ local function modifyThumbnail(parent, borderframe, data, fullModify, width, hei
borderframe:SetParent(parent)
-- Defaut size
-- Default size
width = width or 26;
height = height or 15;
WeakAurasOptions/RegionOptions/Text.lua
+1 -1
View File
@@ -266,7 +266,7 @@ local function createOptions(id, data)
},
};
WeakAuras.AddCodeOption(options, data, L["Custom Function"], "customText", "https://github.com/WeakAuras/WeakAuras2/wiki/Text-Replacements",
WeakAuras.AddCodeOption(options, data, L["Custom Function"], "customText", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-text",
37, function() return not WeakAuras.ContainsCustomPlaceHolder(data.displayText) end, {"customText"}, false);
return {
WeakAurasOptions/SubRegionOptions/SubText.lua
+1 -1
View File
@@ -475,7 +475,7 @@ local function createOptions(parentData, data, index, subIndex)
},
}
WeakAuras.AddCodeOption(commonTextOptions, parentData, L["Custom Function"], "customText", "https://github.com/WeakAuras/WeakAuras2/wiki/Text-Replacements",
WeakAuras.AddCodeOption(commonTextOptions, parentData, L["Custom Function"], "customText", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-text",
4, hideCustomTextOption, {"customText"}, false)
return options, commonTextOptions
WeakAurasOptions/WeakAurasOptions.lua
+15 -15
View File
@@ -2827,7 +2827,7 @@ end
scheduleRefillFrame.ids = {}
-- TODO replace older ReloadOptions, SchduleReloadOptions, ReloadTriggerOptions, ReloadGroupRegionOptions
-- TODO replace older ReloadOptions, ScheduleReloadOptions, ReloadTriggerOptions, ReloadGroupRegionOptions
-- automatically clear parent/tempGroup ?
function WeakAuras.ReloadOptions2(id, data)
displayOptions[id] = nil
@@ -2838,7 +2838,7 @@ function WeakAuras.RefillOptions()
frame:RefillOptions()
end
function WeakAuras.SchduleRefillOptions()
function WeakAuras.ScheduleRefillOptions()
scheduleRefillFrame:ScheduleRefillOnly()
end
@@ -3329,7 +3329,7 @@ function WeakAuras.ReloadTriggerOptions(data)
local function hideTriggerCombiner()
return not (data.triggers.disjunctive == "custom")
end
WeakAuras.AddCodeOption(trigger_options, data, L["Custom"], "custom_trigger_combination", "https://github.com/WeakAuras/WeakAuras2/wiki/Aura-Activation-and-Deactivation",
WeakAuras.AddCodeOption(trigger_options, data, L["Custom"], "custom_trigger_combination", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-activation",
0.1, hideTriggerCombiner, {"triggers", "customTriggerLogic"}, false);
local order = 81;
@@ -3848,7 +3848,7 @@ function WeakAuras.PositionOptions(id, data, _, hideWidthHeight, disableSelfPoin
type = "toggle",
width = WeakAuras.normalWidth,
name = L["Set Parent to Anchor"],
desc = L["Sets the anchored frame as the aura's parent, causing the aura to inherit attributes such as visiblility and scale."],
desc = L["Sets the anchored frame as the aura's parent, causing the aura to inherit attributes such as visibility and scale."],
order = 77,
get = function()
return data.anchorFrameParent or data.anchorFrameParent == nil;
@@ -3875,7 +3875,7 @@ function WeakAuras.PositionOptions(id, data, _, hideWidthHeight, disableSelfPoin
end
},
};
WeakAuras.AddCodeOption(positionOptions, data, L["Custom Anchor"], "custom_anchor", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Anchor",
WeakAuras.AddCodeOption(positionOptions, data, L["Custom Anchor"], "custom_anchor", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-anchor-function",
72.1, function() return not(data.anchorFrameType == "CUSTOM" and not IsParentDynamicGroup()) end, {"customAnchor"}, nil, nil, nil, nil, nil, true)
return positionOptions;
end
@@ -4134,8 +4134,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
for _, child in ipairs(to_sort) do
child.frame:Show();
if child.AcquireThumnail then
child:AcquireThumnail()
if child.AcquireThumbnail then
child:AcquireThumbnail()
end
tinsert(frame.buttonsScroll.children, child);
local controlledChildren = children[child:GetTitle()];
@@ -4144,8 +4144,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
for _, groupchild in ipairs(controlledChildren) do
if(child:GetExpanded() and visible[groupchild]) then
displayButtons[groupchild].frame:Show();
if displayButtons[groupchild].AcquireThumnail then
displayButtons[groupchild]:AcquireThumnail()
if displayButtons[groupchild].AcquireThumbnail then
displayButtons[groupchild]:AcquireThumbnail()
end
tinsert(frame.buttonsScroll.children, displayButtons[groupchild]);
end
@@ -4199,8 +4199,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
for _, child in ipairs(to_sort) do
child.frame:Show();
if child.AcquireThumnail then
child:AcquireThumnail()
if child.AcquireThumbnail then
child:AcquireThumbnail()
end
tinsert(frame.buttonsScroll.children, child);
local controlledChildren = children[child:GetTitle()];
@@ -4209,8 +4209,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
for _, groupchild in ipairs(controlledChildren) do
if(child:GetExpanded() and visible[groupchild]) then
displayButtons[groupchild].frame:Show();
if displayButtons[groupchild].AcquireThumnail then
displayButtons[groupchild]:AcquireThumnail()
if displayButtons[groupchild].AcquireThumbnail then
displayButtons[groupchild]:AcquireThumbnail()
end
tinsert(frame.buttonsScroll.children, displayButtons[groupchild]);
end
@@ -4224,8 +4224,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
local groupVisible = not group or visible[group] and displayButtons[group]:GetExpanded()
if(not groupVisible or not visible[id]) then
child.frame:Hide();
if child.ReleaseThumnail then
child:ReleaseThumnail()
if child.ReleaseThumbnail then
child:ReleaseThumbnail()
end
end
end
WeakAurasOptions/WeakAurasOptions.toc
+2 -2
View File
@@ -1,7 +1,7 @@
## Interface: 80300
## Interface: 30300
## Title: WeakAuras Options
## Author: Mirrored and the WeakAuras Team
## Version: 2.17.4
## Version: 2.17.5
## Notes: Options for WeakAuras
## Notes-esES: Opciones para WeakAuras
## Notes-deDE: Optionen für WeakAuras