From 08a7819fcb68b39c56a4e57a8c2f50c7d80ff56b Mon Sep 17 00:00:00 2001 From: "Gnarfoz (Christian Wissel)" Date: Thu, 8 Dec 2022 21:48:12 +0100 Subject: [PATCH] Replace colors with Blizzard defaults. Remove manual hostility coloring, GetZonePVPInfo already covers this --- core.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/core.lua b/core.lua index 538d8d1..993a475 100755 --- a/core.lua +++ b/core.lua @@ -27,19 +27,23 @@ local function setPlayerCoords() child['playerCoords'] = playerCoords end local colorlist = { - ['friendly'] = "00ff00", - ['arena'] = "ffff00", - ['sanctuary'] = "9999ff", + ['arena'] = "ff1919", + ['combat'] = "ff1919", + ['hostile'] = "ff1919", + ['friendly'] = "19ff19", + ['sanctuary'] = "68ccef", + ['contested'] = "ffb200", } local function pvpColor(txt) local col local pvpType, isFFA, faction = GetZonePVPInfo() if(colorlist[pvpType]) then col = colorlist[pvpType] - elseif(pvpType == "hostile" or pvpType == "combat" or pvpType=="contested") then - col = faction == select(2,UnitFactionGroup('player')) and "886600" or "ff0000" else - return txt + col = "ffd100" + --ffecc1 from ZoneText.lua, the one in the middle of the screen when changing areas + --ffd100 from MiniMap.lua, which uses NORMAL_FONT_COLOR + --Which one is "more correct"? end return child:colorize(txt, col) end