Quantcast

Merge remote branch 'origin/master'

mike [06-29-11 - 05:28]
Merge remote branch 'origin/master'
Filename
Core.lua
Interface/List.lua
Locales/devel-enUS.lua
Recipe.lua
Waypoint.lua
diff --git a/Core.lua b/Core.lua
index c2572b6..08421aa 100644
--- a/Core.lua
+++ b/Core.lua
@@ -576,7 +576,7 @@ function addon:OnInitialize()
 					       if ((not recipe:HasState("KNOWN") and has_level) or shifted) and player:HasRecipeFaction(recipe) then
 						       local _, _, _, hex = _G.GetItemQualityColor(recipe.quality)

-						       self:AddLine(("%s: %s%s|r (%d)"):format(recipe.profession, hex, recipe.name, recipe.skill_level))
+						       self:AddLine(("%s: |c%s%s|r (%d)"):format(recipe.profession, hex, recipe.name, recipe.skill_level))
 						       count = count + 1
 					       end
 				       end
diff --git a/Interface/List.lua b/Interface/List.lua
index b775b90..31d0dad 100644
--- a/Interface/List.lua
+++ b/Interface/List.lua
@@ -1240,7 +1240,7 @@ function private.InitializeListFrame()
 		end
 		local t = AcquireTable()

-		t.text = string.format("%s%s%s|r%s", PADDING, select(4, _G.GetItemQualityColor(private.recipe_list[recipe_id].quality)), L["World Drop"], drop_location)
+		t.text = string.format("%s|c%s%s|r%s", PADDING, select(4, _G.GetItemQualityColor(private.recipe_list[recipe_id].quality)), L["World Drop"], drop_location)
 		t.recipe_id = recipe_id

 		return ListFrame:InsertEntry(t, parent_entry, entry_index, entry_type, true)
@@ -1686,7 +1686,7 @@ do
 			local recipe = private.recipe_list[recipe_id]
 			local recipe_item_id = recipe:RecipeItemID()
 			local recipe_item_level = recipe_item_id and select(4, _G.GetItemInfo(recipe_item_id))
-			local quality_color = string.gsub(select(4, _G.GetItemQualityColor(recipe.quality)), "|cff", "")
+			local quality_color = string.sub(select(4, _G.GetItemQualityColor(recipe.quality)), 3)
 			local location_text

 			if recipe_item_level then
@@ -1849,7 +1849,7 @@ do
 		InitializeTooltips(recipe.spell_id)

 		acquire_tip:AddHeader()
-		acquire_tip:SetCell(1, 1, select(4, _G.GetItemQualityColor(recipe.quality))..recipe.name, "CENTER", 2)
+		acquire_tip:SetCell(1, 1, "|c"..select(4, _G.GetItemQualityColor(recipe.quality))..recipe.name, "CENTER", 2)

 		if addon.db.profile.exclusionlist[list_entry.recipe_id] then
 			ttAdd(0, -1, true, L["RECIPE_EXCLUDED"], "ff0000")
diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua
index c392fde..863523b 100644
--- a/Locales/devel-enUS.lua
+++ b/Locales/devel-enUS.lua
@@ -1311,5 +1311,4 @@ L["Zula Slagfury"] = "Zula Slagfury"
 L["Zurai"] = "Zurai"
 L["Zurii"] = "Zurii"

-
 L["Ayla Shadowstorm"] = "Ayla Shadowstorm"
\ No newline at end of file
diff --git a/Recipe.lua b/Recipe.lua
index 3ed70d5..bd9a466 100644
--- a/Recipe.lua
+++ b/Recipe.lua
@@ -207,7 +207,7 @@ do
 		else
 			diff_color = "trivial"
 		end
-		local display_name = ("%s%s|r"):format(quality_color, recipe_name)
+		local display_name = ("|c%s%s|r"):format(quality_color, recipe_name)
 		local level_text = private.SetTextColor(private.difficulty_colors[diff_color], SKILL_LEVEL_FORMAT):format(recipe_level)

 		if addon.db.profile.skill_view then
diff --git a/Waypoint.lua b/Waypoint.lua
index 266c17e..0fab96e 100644
--- a/Waypoint.lua
+++ b/Waypoint.lua
@@ -497,9 +497,9 @@ function addon:AddWaypoint(recipe_id, acquire_id, location_id, npc_id)
 		local color_code = private.category_colors[acquire_str] or "ffffff"

 		if waypoint.acquire_type == A.QUEST then
-			name = string.format("Quest: |cff%s%s|r (%s%s|r)", color_code, private.quest_names[waypoint.reference_id], quality_color, recipe.name)
+			name = string.format("Quest: |cff%s%s|r (|c%s%s|r)", color_code, private.quest_names[waypoint.reference_id], quality_color, recipe.name)
 		else
-			name = string.format("|cff%s%s|r (%s%s|r)", color_code, waypoint.name or _G.UNKNOWN, quality_color, recipe.name)
+			name = string.format("|cff%s%s|r (|c%s%s|r)", color_code, waypoint.name or _G.UNKNOWN, quality_color, recipe.name)
 		end
 		waypoint.acquire_type = nil
 		waypoint.reference_id = nil