From 31b8f11dc0bf3570d8560d2dd7d688e76779f12c Mon Sep 17 00:00:00 2001 From: "Cameron Weaver (Clutch)" Date: Sun, 12 Mar 2023 17:31:09 +0000 Subject: [PATCH] nameplates: add option for friendly text class color --- api/config.lua | 1 + env/translations_deDE.lua | 1 + env/translations_enUS.lua | 1 + env/translations_esES.lua | 1 + env/translations_frFR.lua | 1 + env/translations_koKR.lua | 1 + env/translations_ruRU.lua | 1 + env/translations_zhCN.lua | 1 + env/translations_zhTW.lua | 1 + modules/gui.lua | 1 + modules/nameplates.lua | 5 +++++ 11 files changed, 15 insertions(+) diff --git a/api/config.lua b/api/config.lua index 74392291..c027b817 100644 --- a/api/config.lua +++ b/api/config.lua @@ -678,6 +678,7 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("nameplates", nil, "clickthreshold", "0.5") pfUI:UpdateConfig("nameplates", nil, "enemyclassc", "1") pfUI:UpdateConfig("nameplates", nil, "friendclassc", "1") + pfUI:UpdateConfig("nameplates", nil, "friendclassnamec", "0") pfUI:UpdateConfig("nameplates", nil, "raidiconsize", "16") pfUI:UpdateConfig("nameplates", nil, "raidiconpos", "CENTER") pfUI:UpdateConfig("nameplates", nil, "raidiconoffx", "0") diff --git a/env/translations_deDE.lua b/env/translations_deDE.lua index 6c8ced4c..af480c52 100644 --- a/env/translations_deDE.lua +++ b/env/translations_deDE.lua @@ -244,6 +244,7 @@ pfUI_translation["deDE"] = { ["Enable Class Colors"] = nil, ["Enable Class Colors On Enemies"] = nil, ["Enable Class Colors On Friends"] = nil, + ["Enable Class Colors On Friends Name"] = nil, ["Enable Clickthrough"] = nil, ["Enable Combat Glow"] = nil, ["Enable Combat Glow Effects On Screen Edges"] = nil, diff --git a/env/translations_enUS.lua b/env/translations_enUS.lua index a0096451..e387f775 100644 --- a/env/translations_enUS.lua +++ b/env/translations_enUS.lua @@ -244,6 +244,7 @@ pfUI_translation["enUS"] = { ["Enable Class Colors"] = nil, ["Enable Class Colors On Enemies"] = nil, ["Enable Class Colors On Friends"] = nil, + ["Enable Class Colors On Friends Name"] = nil, ["Enable Clickthrough"] = nil, ["Enable Combat Glow"] = nil, ["Enable Combat Glow Effects On Screen Edges"] = nil, diff --git a/env/translations_esES.lua b/env/translations_esES.lua index 115aba32..945b2ef6 100644 --- a/env/translations_esES.lua +++ b/env/translations_esES.lua @@ -244,6 +244,7 @@ pfUI_translation["esES"] = { ["Enable Class Colors"] = "Activar colores de clase", ["Enable Class Colors On Enemies"] = "Activar colores de clase en enemigos", ["Enable Class Colors On Friends"] = "Activar colores de Clase en amigos", + ["Enable Class Colors On Friends Name"] = nil, ["Enable Clickthrough"] = "Atravesar al hacer clic", ["Enable Combat Glow"] = "Activar brillo al estar en combate", ["Enable Combat Glow Effects On Screen Edges"] = "Activar efectos de brillo en los bordes de la pantalla al estar en combate", diff --git a/env/translations_frFR.lua b/env/translations_frFR.lua index d1ce3511..a2299062 100644 --- a/env/translations_frFR.lua +++ b/env/translations_frFR.lua @@ -244,6 +244,7 @@ pfUI_translation["frFR"] = { ["Enable Class Colors"] = "Activer la couleur en fonction de la classe", ["Enable Class Colors On Enemies"] = "Activer la couleur de la classe sur les cibles ennemies", ["Enable Class Colors On Friends"] = "Activer la couleur de la classe sur les cibles alliées", + ["Enable Class Colors On Friends Name"] = nil, ["Enable Clickthrough"] = "Activer le clic au travers de l'interface", ["Enable Combat Glow"] = "Activer la lueur de combat", ["Enable Combat Glow Effects On Screen Edges"] = "Activer la lueur de combat sur les bords de l'écran", diff --git a/env/translations_koKR.lua b/env/translations_koKR.lua index fa549108..18db937a 100644 --- a/env/translations_koKR.lua +++ b/env/translations_koKR.lua @@ -244,6 +244,7 @@ pfUI_translation["koKR"] = { ["Enable Class Colors"] = "클래스(직업) 색상 활성화", ["Enable Class Colors On Enemies"] = "적대적 클래스(직업)색상 활성화", ["Enable Class Colors On Friends"] = "우호적 클래스(직업)색상 활성화", + ["Enable Class Colors On Friends Name"] = nil, ["Enable Clickthrough"] = "Clickthrough 활성화", ["Enable Combat Glow"] = nil, ["Enable Combat Glow Effects On Screen Edges"] = "전투시 화면 가장자리에 글로우효과 사용", diff --git a/env/translations_ruRU.lua b/env/translations_ruRU.lua index 793af07b..e4ad3e2e 100644 --- a/env/translations_ruRU.lua +++ b/env/translations_ruRU.lua @@ -244,6 +244,7 @@ pfUI_translation["ruRU"] = { ["Enable Class Colors"] = "Включить цвета классов", ["Enable Class Colors On Enemies"] = "Включить цвета классов на врагах", ["Enable Class Colors On Friends"] = "Включить цвета классов на друзьях", + ["Enable Class Colors On Friends Name"] = nil, ["Enable Clickthrough"] = "Включить порог нажатия", --? ["Enable Combat Glow"] = "Включить свечение боя", ["Enable Combat Glow Effects On Screen Edges"] = "Включить эффект свечения боя по краю экрана", diff --git a/env/translations_zhCN.lua b/env/translations_zhCN.lua index 91ef53ee..f6c58a65 100644 --- a/env/translations_zhCN.lua +++ b/env/translations_zhCN.lua @@ -244,6 +244,7 @@ pfUI_translation["zhCN"] = { ["Enable Class Colors"] = "使用职业颜色", ["Enable Class Colors On Enemies"] = "显示敌军职业颜色", ["Enable Class Colors On Friends"] = "显示友军职业颜色", + ["Enable Class Colors On Friends Name"] = nil, ["Enable Clickthrough"] = "启用点击", ["Enable Combat Glow"] = "启用战斗闪光", ["Enable Combat Glow Effects On Screen Edges"] = "全屏显示战斗报警", diff --git a/env/translations_zhTW.lua b/env/translations_zhTW.lua index a68eaa8a..19af113c 100644 --- a/env/translations_zhTW.lua +++ b/env/translations_zhTW.lua @@ -244,6 +244,7 @@ pfUI_translation["zhTW"] = { ["Enable Class Colors"] = "使用職業顏色", ["Enable Class Colors On Enemies"] = "顯示敵軍職業顏色", ["Enable Class Colors On Friends"] = "顯示友軍職業顏色", + ["Enable Class Colors On Friends Name"] = nil, ["Enable Clickthrough"] = "啟用點擊", ["Enable Combat Glow"] = "啟用戰鬥閃光", ["Enable Combat Glow Effects On Screen Edges"] = "全屏顯示戰鬥報警", diff --git a/modules/gui.lua b/modules/gui.lua index fff656b8..9c2c92fe 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -2189,6 +2189,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function () CreateConfig(U["nameplates"], T["Nameplate Width"], C.nameplates, "width") CreateConfig(U["nameplates"], T["Enable Class Colors On Enemies"], C.nameplates, "enemyclassc", "checkbox") CreateConfig(U["nameplates"], T["Enable Class Colors On Friends"], C.nameplates, "friendclassc", "checkbox") + CreateConfig(U["nameplates"], T["Enable Class Colors On Friends Name"], C.nameplates, "friendclassnamec", "checkbox") CreateConfig(U["nameplates"], T["Enable Combo Point Display"], C.nameplates, "cpdisplay", "checkbox") CreateConfig(U["nameplates"], T["Enable Clickthrough"], C.nameplates, "clickthrough", "checkbox", nil, nil, nil, nil, "vanilla") CreateConfig(U["nameplates"], T["Enable Overlap"], C.nameplates, "overlap", "checkbox", nil, nil, nil, nil, "vanilla") diff --git a/modules/nameplates.lua b/modules/nameplates.lua index ca337dd8..a9f1656c 100644 --- a/modules/nameplates.lua +++ b/modules/nameplates.lua @@ -634,6 +634,11 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function () plate.cache.r, plate.cache.g, plate.cache.b = r, g, b end + if r + g + b ~= plate.cache.namecolor and unittype == "FRIENDLY_PLAYER" and C.nameplates["friendclassnamec"] == "1" and class and RAID_CLASS_COLORS[class] then + plate.name:SetTextColor(r, g, b, a) + plate.cache.namecolor = r + g + b + end + -- update combopoints for i=1, 5 do plate.combopoints[i]:Hide() end if target and C.nameplates.cpdisplay == "1" then