forked from rilgamon/zz_Coords
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
This commit is contained in:
commit
997d689db5
16
core.lua
16
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
|
||||
|
|
Loading…
Reference in New Issue