diff --git a/api/config.lua b/api/config.lua index 17637fd6..5a5f1948 100644 --- a/api/config.lua +++ b/api/config.lua @@ -285,6 +285,19 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("unitframes", "ttarget", "txthpright", "none") pfUI:UpdateConfig("unitframes", "ttarget", "overhealperc", "10") + pfUI:UpdateConfig("unitframes", "tttarget", "visible", "0") + pfUI:UpdateConfig("unitframes", "tttarget", "width", "100") + pfUI:UpdateConfig("unitframes", "tttarget", "height", "17") + pfUI:UpdateConfig("unitframes", "tttarget", "pheight", "3") + pfUI:UpdateConfig("unitframes", "tttarget", "buffs", "off") + pfUI:UpdateConfig("unitframes", "tttarget", "buffsize", "16") + pfUI:UpdateConfig("unitframes", "tttarget", "debuffs", "off") + pfUI:UpdateConfig("unitframes", "tttarget", "debuffsize", "16") + pfUI:UpdateConfig("unitframes", "tttarget", "txthpleft", "none") + pfUI:UpdateConfig("unitframes", "tttarget", "txthpcenter", "name") + pfUI:UpdateConfig("unitframes", "tttarget", "txthpright", "none") + pfUI:UpdateConfig("unitframes", "tttarget", "overhealperc", "10") + pfUI:UpdateConfig("unitframes", "pet", "happinessicon", "0") pfUI:UpdateConfig("unitframes", "pet", "width", "100") pfUI:UpdateConfig("unitframes", "pet", "height", "14") @@ -308,7 +321,7 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("unitframes", "ptarget", "txthpright", "none") pfUI:UpdateConfig("unitframes", "ptarget", "overhealperc", "10") - local ufs = { "player", "target", "focus", "group", "grouptarget", "grouppet", "raid", "ttarget", "pet", "ptarget", "fallback" } + local ufs = { "player", "target", "focus", "group", "grouptarget", "grouppet", "raid", "ttarget", "pet", "ptarget", "fallback", "tttarget" } for _, unit in pairs(ufs) do pfUI:UpdateConfig("unitframes", unit, "visible", "1") pfUI:UpdateConfig("unitframes", unit, "showPVP", "0") @@ -757,7 +770,7 @@ function pfUI:MigrateConfig() -- migrating glow settings (> 3.5.1) if checkversion(3, 5, 0) then - local common = { "player", "target", "ttarget", "pet", "ptarget"} + local common = { "player", "target", "ttarget", "pet", "ptarget", "tttarget"} for _, unitframe in pairs(common) do if pfUI_config.appearance.infight.group == "1" then pfUI_config.unitframes[unitframe].glowcombat = "1" diff --git a/api/unitframes.lua b/api/unitframes.lua index d7c31d0c..210bcdef 100644 --- a/api/unitframes.lua +++ b/api/unitframes.lua @@ -1187,7 +1187,7 @@ function pfUI.uf:RefreshUnit(unit, component) local component = component or "" -- don't update scanner activity - if unit.label == "target" or unit.label == "targettarget" then + if unit.label == "target" or unit.label == "targettarget" or unit.label == "targettargettarget" then if pfScanActive == true then return end end diff --git a/env/profiles.lua b/env/profiles.lua index aea4ac72..ba64e77e 100644 --- a/env/profiles.lua +++ b/env/profiles.lua @@ -137,6 +137,13 @@ f:SetScript("OnEvent", function() ["pspace"] = "-1", ["width"] = "125", }, + ["tttarget"] = { + ["portrait"] = "off", + ["pheight"] = "6", + ["height"] = "16", + ["pspace"] = "-1", + ["width"] = "125", + }, ["ptarget"] = { ["portrait"] = "off", ["pheight"] = "-1", @@ -198,6 +205,13 @@ f:SetScript("OnEvent", function() ["width"] = "125", ["pheight"] = "6", }, + ["tttarget"] = { + ["portrait"] = "off", + ["height"] = "16", + ["pspace"] = "-1", + ["width"] = "125", + ["pheight"] = "6", + }, ["ptarget"] = { ["portrait"] = "off", ["height"] = "8", diff --git a/env/translations_enUS.lua b/env/translations_enUS.lua index 56cf5fde..06370c2e 100644 --- a/env/translations_enUS.lua +++ b/env/translations_enUS.lua @@ -577,6 +577,7 @@ pfUI_translation["enUS"] = { ["Target Castbar"] = nil, ["Target Debuff Bar"] = nil, ["Target-Target"] = nil, + ["Target-Target-Target"] = nil, ["Text Color"] = nil, ["Text Colors"] = nil, ["The addon \"|cff33ffcc%s|r\" doesn't work with pfUI and has been disabled."] = nil, diff --git a/init/modules.xml b/init/modules.xml index 927c822e..5e7cb1e5 100644 --- a/init/modules.xml +++ b/init/modules.xml @@ -18,6 +18,7 @@ + diff --git a/modules/gui.lua b/modules/gui.lua index 9751d5b7..454771b3 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -1505,9 +1505,10 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function () [1] = { "player", T["Player"] }, [2] = { "target", T["Target"] }, [3] = { "ttarget", T["Target-Target"]}, - [4] = { "pet", T["Pet"] }, - [5] = { "ptarget", T["Pet-Target"]}, - [6] = { "focus", T["Focus"] }, + [4] = { "tttarget", T["Target-Target-Target"]}, + [5] = { "pet", T["Pet"] }, + [6] = { "ptarget", T["Pet-Target"]}, + [7] = { "focus", T["Focus"] }, }, ["gf"] = { @@ -1527,6 +1528,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function () CreateGUIEntry(label == "uf" and T["Unit Frames"] or T["Group Frames"], t, function() -- link Update tables U.ttarget = U["targettarget"] + U.tttarget = U["targettargettarget"] U.ptarget = U["pettarget"] U.grouptarget = U["group"] U.grouppet = U["group"] diff --git a/modules/targettargettarget.lua b/modules/targettargettarget.lua new file mode 100644 index 00000000..6e912b3b --- /dev/null +++ b/modules/targettargettarget.lua @@ -0,0 +1,9 @@ +pfUI:RegisterModule("targettargettarget", "vanilla:tbc", function () + -- do not go further on disabled UFs + if C.unitframes.disable == "1" then return end + + pfUI.uf.targettargettarget = pfUI.uf:CreateUnitFrame("TargetTargetTarget", nil, C.unitframes.tttarget, .2) + pfUI.uf.targettargettarget:UpdateFrameSize() + pfUI.uf.targettargettarget:SetPoint("BOTTOM", UIParent , "BOTTOM", 0, 200) + UpdateMovable(pfUI.uf.targettargettarget) +end) diff --git a/modules/unlock.lua b/modules/unlock.lua index 7e3dee42..c775c639 100644 --- a/modules/unlock.lua +++ b/modules/unlock.lua @@ -21,12 +21,13 @@ pfUI:RegisterModule("unlock", "vanilla:tbc", function () -- frame labels and their config section relation local frame_configs = { -- unitframes - ["Player"] = { T["Unit Frames"], T["Player"] }, - ["Target"] = { T["Unit Frames"], T["Target"] }, - ["TargetTarget"] = { T["Unit Frames"], T["Target-Target"] }, - ["Pet"] = { T["Unit Frames"], T["Pet"] }, - ["PetTarget"] = { T["Unit Frames"], T["Pet-Target"] }, - ["Focus"] = { T["Unit Frames"], T["Focus"] }, + ["Player"] = { T["Unit Frames"], T["Player"] }, + ["Target"] = { T["Unit Frames"], T["Target"] }, + ["TargetTarget"] = { T["Unit Frames"], T["Target-Target"] }, + ["TargetTargetTarget"] = { T["Unit Frames"], T["Target-Target-Target"] }, + ["Pet"] = { T["Unit Frames"], T["Pet"] }, + ["PetTarget"] = { T["Unit Frames"], T["Pet-Target"] }, + ["Focus"] = { T["Unit Frames"], T["Focus"] }, -- combopoints ["Combo%d"] = { T["Unit Frames"], T["General"] },