Cleanup pvpColor function

Merge pull request 'Replace colors with Blizzard defaults. Remove manual hostility coloring, GetZonePVPInfo already covers this' (#1 ) from Gnarfoz/zz_Coords:master into master
Reviewed-on: rilgamon/zz_Coords#1
2022-12-09 17:04:08 +01:00 · 2022-12-09 15:57:30 +01:00 · 2022-12-08 21:48:12 +01:00
1 changed files with 9 additions and 11 deletions
--- a/core.lua
+++ b/core.lua
@ -27,21 +27,19 @@ 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()
+	local pvpType = 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
+		return child:colorize(txt, colorlist[pvpType])
 	end
-	return child:colorize(txt, col)
+	return txt
 end
 local function OnDataUpdate()
 	setPlayerCoords()
Author	SHA1	Message	Date
Robin Hüskes	ff37e7abcb	Cleanup pvpColor function	2022-12-09 17:04:08 +01:00
robin	997d689db5	Merge pull request 'Replace colors with Blizzard defaults. Remove manual hostility coloring, GetZonePVPInfo already covers this' (#1 ) from Gnarfoz/zz_Coords:master into master Reviewed-on: rilgamon/zz_Coords#1	2022-12-09 15:57:30 +01:00
Gnarfoz (Christian Wissel)	08a7819fcb	Replace colors with Blizzard defaults. Remove manual hostility coloring, GetZonePVPInfo already covers this	2022-12-08 21:48:12 +01:00