From 18319d78b4dbc4e3aa63ada42038aceeed1362ef Mon Sep 17 00:00:00 2001 From: Ackis Date: Tue, 21 Oct 2008 15:41:11 +0000 Subject: [PATCH] Fix for the faction colours being wrong, was a my bad Zhinjio, but I'll blame you anyways. --- ARLColour.lua | 3 ++- ARLFrame.lua | 10 +++++----- AckisRecipeList.lua | 4 ++-- RecipeDB/ARL-Vendor.lua | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ARLColour.lua b/ARLColour.lua index 22bfd12..c607a1d 100644 --- a/ARLColour.lua +++ b/ARLColour.lua @@ -63,7 +63,7 @@ local ARTIFACT = "e5cc80" local HIGH = WHITE local NORMAL = "ffd100" -local HORDE = "ff0000" +local HORDE = RED local ALLIANCE = "00ffff" --[[ @@ -299,6 +299,7 @@ function addon:hexcolor( colorstring ) elseif ( colorstring == "YELLOW" ) then return YELLOW elseif ( colorstring == "GREY") then return GREY elseif ( colorstring == "MIDGREY") then return MIDGREY + elseif ( colorstring == "RED") then return RED elseif ( colorstring == "HIGH" ) then return HIGH -- elseif ( colorstring == "NORMAL" ) then return NORMAL diff --git a/ARLFrame.lua b/ARLFrame.lua index cd82a24..4f8c1ec 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -890,15 +890,15 @@ function SetRecipeButtonTooltip ( bIndex ) gttAdd( 0, 1, 0, 0, recipeDB[rIndex]["Name"], addon:hexcolor( "HIGH" ) ) -- check if the recipe is excluded if ( exclude[rIndex] == true ) then - clr1 = addon:hexcolor( "HORDE" ) + clr1 = addon:hexcolor( "RED" ) gttAdd( 0, -1, 1, 0, L["RECIPE_EXCLUDED"], clr1 ) end -- Add in skill level requirement, colored correctly clr1 = addon:hexcolor( "NORMAL" ) local recipeSkill = recipeDB[rIndex]["Level"] local playerSkill = playerData.playerProfessionLevel - if ( recipeSkill > playerSkill ) then - clr2 = addon:hexcolor( "HORDE" ) + if (recipeSkill > playerSkill) then + clr2 = addon:hexcolor("RED") elseif ( ( playerSkill - recipeSkill ) < 20 ) then clr2 = addon:hexcolor( "ORANGE" ) elseif ( ( playerSkill - recipeSkill ) < 30 ) then @@ -938,10 +938,10 @@ function SetRecipeButtonTooltip ( bIndex ) local vndr = vendorDB[v["ID"]] local cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")" clr1 = addon:hexcolor( "VENDOR" ) - if ( vndr["Faction"] == BFAC["Horde"] ) then + if (vndr["Faction"] == BFAC["Horde"]) then clr2 = addon:hexcolor( "HORDE" ) elseif ( vndr["Faction"] == BFAC["Alliance"] ) then - clr2 = addon:hexcolor( "ALLIANCE" ) + clr2 = addon:hexcolor("ALLIANCE") else clr2 = addon:hexcolor( "NEUTRAL" ) end diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua index 51f2c5f..cfd6af8 100644 --- a/AckisRecipeList.lua +++ b/AckisRecipeList.lua @@ -596,11 +596,11 @@ function addon:addLookupList(DB, ID, Name, Loc, Coordx, Coordy, Faction) if (Faction == 1) then - DB[ID]["Faction"] = BFAC["Horde"] + DB[ID]["Faction"] = BFAC["Alliance"] elseif (Faction == 2) then - DB[ID]["Faction"] = BFAC["Alliance"] + DB[ID]["Faction"] = BFAC["Horde"] elseif (Faction == 3) then diff --git a/RecipeDB/ARL-Vendor.lua b/RecipeDB/ARL-Vendor.lua index 5de4736..572377b 100644 --- a/RecipeDB/ARL-Vendor.lua +++ b/RecipeDB/ARL-Vendor.lua @@ -30,7 +30,6 @@ local MODNAME = "Ackis Recipe List" local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME) local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) -local BFAC = LibStub("LibBabble-Faction-3.0"):GetLookupTable() local BZONE = LibStub("LibBabble-Zone-3.0"):GetLookupTable() function addon:InitVendor(VendorDB) -- 1.7.9.5