From a4d77f424cfe9131cb37fd5651ad161749e6fc45 Mon Sep 17 00:00:00 2001 From: Stewart Rogers Date: Tue, 31 Aug 2021 20:54:26 -0500 Subject: [PATCH 1/3] Added advanced option to lfdRole allowing selection of individual roles --- modules/indicators.lua | 7 ++-- options/config.lua | 93 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/modules/indicators.lua b/modules/indicators.lua index a4533c3e4..268b0b323 100755 --- a/modules/indicators.lua +++ b/modules/indicators.lua @@ -121,13 +121,14 @@ function Indicators:UpdateLFDRole(frame, event) role = specID and select(6, GetSpecializationInfoByID(specID)) end - if( role == "TANK" ) then + local lfdRole = ShadowUF.db.profile.units[frame.unitType].indicators.lfdRole + if( role == "TANK" and lfdRole.tank) then frame.indicators.lfdRole:SetTexCoord(0, 19/64, 22/64, 41/64) frame.indicators.lfdRole:Show() - elseif( role == "HEALER" ) then + elseif( role == "HEALER" and lfdRole.healer) then frame.indicators.lfdRole:SetTexCoord(20/64, 39/64, 1/64, 20/64) frame.indicators.lfdRole:Show() - elseif( role == "DAMAGER" ) then + elseif( role == "DAMAGER" and lfdRole.damage) then frame.indicators.lfdRole:SetTexCoord(20/64, 39/64, 22/64, 41/64) frame.indicators.lfdRole:Show() else diff --git a/options/config.lua b/options/config.lua index a2bd8b70f..72c9ae2ce 100755 --- a/options/config.lua +++ b/options/config.lua @@ -4730,6 +4730,99 @@ local function loadUnitOptions() Config.unitTable.args.indicators.args[indicator] = Config.indicatorTable end + Config.unitTable.args.indicators.args.lfdRole = { + order = 0, + name = function(info) + if( info[#(info)] == "status" and info[2] == "player" ) then + return L["Combat/resting status"] + end + + return getName(info) + end, + desc = function(info) return INDICATOR_DESC[info[#(info)]] end, + type = "group", + hidden = hideRestrictedOption, + args = { + enabled = { + order = 0, + type = "toggle", + name = L["Enable indicator"], + hidden = false, + arg = "indicators.$parent.enabled", + }, + sep1 = { + order = 1, + type = "description", + name = "", + width = "full", + hidden = function() return not ShadowUF.db.profile.advanced end, + }, + anchorPoint = { + order = 2, + type = "select", + name = L["Anchor point"], + values = positionList, + hidden = false, + arg = "indicators.$parent.anchorPoint", + }, + size = { + order = 4, + type = "range", + name = L["Size"], + min = 1, max = 40, step = 1, + hidden = hideAdvancedOption, + arg = "indicators.$parent.size", + }, + x = { + order = 5, + type = "range", + name = L["X Offset"], + min = -100, max = 100, step = 1, softMin = -50, softMax = 50, + hidden = false, + arg = "indicators.$parent.x", + }, + y = { + order = 6, + type = "range", + name = L["Y Offset"], + min = -100, max = 100, step = 1, softMin = -50, softMax = 50, + hidden = false, + arg = "indicators.$parent.y", + }, + roles = { + order = 7, + type = "group", + inline = true, + name = "Role", + -- width = "full", + hidden = function() return not ShadowUF.db.profile.advanced end, + args = { + tank = { + order = 1, + type = "toggle", + name = "Tank", + hidden = hideAdvancedOption, + arg = "indicators.$parentparent.tank", + }, + healer = { + order = 2, + type = "toggle", + name = "Healer", + hidden = hideAdvancedOption, + arg = "indicators.$parentparent.healer", + }, + damage = { + order = 3, + type = "toggle", + name = "Damage", + hidden = hideAdvancedOption, + arg = "indicators.$parentparent.damage", + }, + }, + }, + }, + } + -- Check for unit conflicts local function hideZoneConflict() for _, zone in pairs(ShadowUF.db.profile.visibility) do From 213b59f61e9ccd1c3b22ece72a1a5da9967a197c Mon Sep 17 00:00:00 2001 From: stew Date: Tue, 23 Nov 2021 07:01:33 -0600 Subject: [PATCH 2/3] localization --- .gitignore | 3 ++- options/config.lua | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 24b392cd1..002c97053 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ suf.tmproj -.DS_Store \ No newline at end of file +.DS_Store +.release \ No newline at end of file diff --git a/options/config.lua b/options/config.lua index 72c9ae2ce..88ba31076 100755 --- a/options/config.lua +++ b/options/config.lua @@ -4800,21 +4800,21 @@ local function loadUnitOptions() tank = { order = 1, type = "toggle", - name = "Tank", + name = L["TANK"], hidden = hideAdvancedOption, arg = "indicators.$parentparent.tank", }, healer = { order = 2, type = "toggle", - name = "Healer", + name = L["HEALER"], hidden = hideAdvancedOption, arg = "indicators.$parentparent.healer", }, damage = { order = 3, type = "toggle", - name = "Damage", + name = L["DAMAGER"], hidden = hideAdvancedOption, arg = "indicators.$parentparent.damage", }, From 2104618ff35f4a32d93fbfd590f5e49ec7b06d22 Mon Sep 17 00:00:00 2001 From: stew Date: Tue, 23 Nov 2021 08:20:45 -0600 Subject: [PATCH 3/3] Localization2 --- options/config.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/options/config.lua b/options/config.lua index 88ba31076..7eea77979 100755 --- a/options/config.lua +++ b/options/config.lua @@ -4793,8 +4793,7 @@ local function loadUnitOptions() order = 7, type = "group", inline = true, - name = "Role", - -- width = "full", + name = L["ROLE"], hidden = function() return not ShadowUF.db.profile.advanced end, args = { tank = {