From c41aed42f5e73521e9af7a46dd66f182adb5ace7 Mon Sep 17 00:00:00 2001
From: ackis <ackis@dummy.example.com>
Date: Wed, 15 Apr 2009 17:56:05 +0000
Subject: [PATCH] Fix bug with recipe count being wrong for cooking and first
 aid.  Fix nil error in ARLFrame as well (I think)

---
 ARLFrame.lua              |  155 ++++-----------------------------------------
 AckisRecipeList.lua       |   42 ++++--------
 Locals/testdeDE.lua       |    3 +-
 Locals/testenUS.lua       |    1 +
 Locals/testesMX.lua       |    3 +-
 RecipeDB/ARL-Cook.lua     |   26 +-------
 RecipeDB/ARL-FirstAid.lua |   14 ----
 RecipeDB/ARL-Vendor.lua   |    5 --
 8 files changed, 35 insertions(+), 214 deletions(-)

diff --git a/ARLFrame.lua b/ARLFrame.lua
index 99e5f82..77a923b 100644
--- a/ARLFrame.lua
+++ b/ARLFrame.lua
@@ -174,9 +174,6 @@ StaticPopupDialogs["ARL_ALLEXCLUDED"] = {
 }
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon:CloseWindow()
 
@@ -286,9 +283,6 @@ local function SetSortString(recipeSkill, recStr)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 local function CheckDisplayFaction(filterDB, faction)
 
@@ -540,9 +534,6 @@ local function initDisplayStrings()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 local function ClearRecipeButtonTooltip(bIndex)
 
@@ -556,9 +547,7 @@ local function ClearRecipeButtonTooltip(bIndex)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
+
 -- converting from hex to rgb (Thanks Maldivia)
 
 local function toRGB(hex)
@@ -570,9 +559,7 @@ local function toRGB(hex)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
+
 -- I want to do a bit more comprehensive tooltip processing. Things like changing font sizes,
 -- adding padding to the left hand side, and using better color handling. So... this function
 -- will do that for me.
@@ -656,9 +643,6 @@ local function SetSpellTooltip(owner, loc)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
 
@@ -1028,11 +1012,7 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
 
 end
 
--- Description: 
--- Expected result: 
--- Input: 
--- Output: 
--- This sets the tooltip on the button during a recipelist update
+-- Description: This sets the tooltip on the button during a recipelist update
 
 local function SetRecipeButtonTooltip(bIndex)
 
@@ -1071,11 +1051,7 @@ local function SetRecipeButtonTooltip(bIndex)
 
 end
 
--- Description: 
--- Expected result: 
--- Input: 
--- Output: 
--- Scrollframe update stuff
+-- Description: Scrollframe update stuff
 
 local function RecipeList_Update()
 
@@ -1222,31 +1198,6 @@ local function SetProgressBar(playerData)
 		pbMax = pbMax - playerData.excluded_recipes_known
 	end
 
-	-- Lets remove cooking/first aid recipes from the totals/current
-	-- Cooking
-	if (playerData.playerProfession == GetSpellInfo(2550)) then
-		if (playerData.playerProfessionLevel > 300) then
-			pbCur = pbCur - 1
-			pbMax = pbMax - 1
-		end
-		if (playerData.playerProfessionLevel > 225) then
-			pbCur = pbCur - 1
-			pbMax = pbMax - 1
-		end
-	end
-
-	-- First Aid
-	if ((playerData.playerProfession == GetSpellInfo(746)) or (playerData.playerProfession == "Premiers soins")) then
-		if (playerData.playerProfessionLevel > 225) then
-			pbCur = pbCur - 1
-			pbMax = pbMax - 1
-		end
-		if (playerData.playerProfessionLevel > 150) then
-			pbCur = pbCur - 1
-			pbMax = pbMax - 1
-		end
-	end
-
 	ARL_ProgressBar:SetMinMaxValues(0, pbMax)
 	ARL_ProgressBar:SetValue(pbCur)
 
@@ -1261,9 +1212,6 @@ local function SetProgressBar(playerData)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon:ResetGUI()
 
@@ -1282,9 +1230,6 @@ end
 -- a new search occurred. Use this function to do all the dirty work
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 local function ReDisplay()
 
@@ -1373,9 +1318,6 @@ function addon:CreateScanButton()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon:ShowScanButton()
 
@@ -1416,9 +1358,6 @@ function addon:ShowScanButton()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon:TooltipDisplay(this, textLabel)
 
@@ -1439,9 +1378,6 @@ function addon:TooltipDisplay(this, textLabel)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.numFilters()
 
@@ -1468,9 +1404,6 @@ function addon.numFilters()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.resetTitle()
 
@@ -1495,9 +1428,6 @@ function addon.resetTitle()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.filterSwitch(val)
 
@@ -1708,9 +1638,6 @@ function addon.filterSwitch(val)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 local function HideARL_ExpOptCB(ignorevalue)
 
@@ -1802,9 +1729,6 @@ local function HideARL_ExpOptCB(ignorevalue)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.ToggleFilters()
 
@@ -1879,9 +1803,6 @@ function addon.ToggleFilters()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon:GenericMakeCB(cButton, anchorFrame, ttText, scriptVal, row, col, misc)
 
@@ -1909,9 +1830,6 @@ function addon:GenericMakeCB(cButton, anchorFrame, ttText, scriptVal, row, col,
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon:GenericCreateButton(
 	bName, parentFrame,	bHeight, bWidth,
@@ -2034,11 +1952,7 @@ function addon:GenericCreateButton(
 
 end
 
--- Description: 
--- Expected result: 
--- Input: 
--- Output: 
--- Generic function for creating my expanded panel buttons
+-- Description: Generic function for creating my expanded panel buttons
 
 function addon:CreateExpCB(bName, bTex, panelIndex)
 	local ExpTextureSize = 34
@@ -2184,11 +2098,7 @@ do
 
 end
 
--- Description: 
--- Expected result: 
--- Input: 
--- Output: 
--- Set the texture on the switcher button.
+-- Description: Set the texture on the switcher button.
 
 local function SetSwitcherTexture(tex)
 
@@ -2215,10 +2125,7 @@ local function SetSwitcherTexture(tex)
 
 end
 
-	-- Description: Switch the displayed profession in the main panel
-	-- Expected result: 
-	-- Input: 
-	-- Output: 
+-- Description: Switch the displayed profession in the main panel
 
 function addon:SwitchProfs(button)
 	-- Known professions should be in playerData["Professions"]
@@ -2337,9 +2244,6 @@ function addon:SwitchProfs(button)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 local function expandEntry(dsIndex)
 
@@ -2694,9 +2598,6 @@ local function expandEntry(dsIndex)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.RecipeItem_OnClick(button)
 
@@ -2787,11 +2688,7 @@ function addon.RecipeItem_OnClick(button)
 
 end
 
--- Rep Filtering panel switcher
--- Description: 
--- Expected result: 
--- Input: 
--- Output: 
+-- Description: Rep Filtering panel switcher
 
 function addon.RepFilterSwitch(whichrep)
 	-- 1	ARL_RepOldWorldCB		Old World Rep
@@ -2885,9 +2782,6 @@ function addon.RepFilterSwitch(whichrep)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.setFlyawayState()
 
@@ -3043,9 +2937,6 @@ function addon.setFlyawayState()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output:
 
 local function recursiveReset(t)
 
@@ -3068,9 +2959,6 @@ local function recursiveReset(t)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.resetFilters() 
 
@@ -3114,9 +3002,6 @@ function addon.resetFilters()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.DoFlyaway(panel)
 
@@ -3348,11 +3233,7 @@ function addon.DoFlyaway(panel)
 
 end
 
--- Description: 
--- Expected result: 
--- Input: 
--- Output: 
--- This does an initial fillup of the DisplayStrings, as above.
+-- Description: This does an initial fillup of the DisplayStrings, as above.
 -- However, in this case, it expands every recipe
 
 local function expandallDisplayStrings()
@@ -3412,9 +3293,6 @@ local function expandallDisplayStrings()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 function addon.ExpandAll_Clicked()
 
@@ -3432,6 +3310,8 @@ function addon.ExpandAll_Clicked()
 
 end
 
+-- Description: 
+
 local function SetSortName()
 
 	local sorttype = addon.db.profile.sorting
@@ -3451,9 +3331,6 @@ local function SetSortName()
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 local function ARL_DD_Sort_OnClick(button, value)
 	CloseDropDownMenus()
@@ -3463,13 +3340,11 @@ local function ARL_DD_Sort_OnClick(button, value)
 end
 
 -- Description: 
--- Expected result: 
--- Input: 
--- Output: 
 
 local function ARL_DD_Sort_Initialize()
 
 	local k
+	local info = UIDropDownMenu_CreateInfo()
 
 	k = "Name"
 		info.text = k
@@ -3522,11 +3397,7 @@ local function SaveFramePosition()
 
 end
 
--- Description: 
--- Expected result: 
--- Input: 
--- Output: 
--- Creates the initial frame to display recipes into
+-- Description: Creates the initial frame to display recipes into
 
 function addon:CreateFrame(
 
diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua
index 54ad1b6..6d66c0c 100644
--- a/AckisRecipeList.lua
+++ b/AckisRecipeList.lua
@@ -573,7 +573,7 @@ end
 --- Adds a tradeskill recipe into the specified recipe database.
 -- @name AckisRecipeList:addTradeSkill
 -- @usage AckisRecipeList:addTradeSkill(RecipeDB,2329,1,2454,1,2259)
--- @param RecipeDB RecipeDB The database (array) which you wish to add data too.
+-- @param RecipeDB The database (array) which you wish to add data too.
 -- @param SpellID The [http://www.wowwiki.com/SpellLink Spell ID] of the recipe being added to the database.
 -- @param SkillLevel The skill level at which the recipe may be learned.
 -- @param ItemID The [http://www.wowwiki.com/ItemLink Item ID] that is created by the recipe, or nil
@@ -650,7 +650,7 @@ end
 --- Adds filtering flags to a specific tradeskill.
 -- @name AckisRecipeList:addTradeFlags
 -- @usage AckisRecipeList:addTradeFlags(RecipeDB,2329,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,51,52)
--- @param RecipeDB RecipeDB The database (array) which you wish to add flags too.
+-- @param RecipeDB The database (array) which you wish to add flags too.
 -- @param SpellID The [http://www.wowwiki.com/SpellLink Spell ID] of the recipe which flags are being added to.
 -- @param ... A listing of filtering flags.  See [[database-documentation]] for a listing of filtering flags.
 -- @return None, array is passed as a reference.
@@ -679,7 +679,7 @@ end
 --- Adds acquire methods to a specific tradeskill.
 -- @name AckisRecipeList:addTradeAcquire
 -- @usage AckisRecipeList:addTradeAcquire:(RecipeDB,2329,8,8)
--- @param RecipeDB RecipeDB The database (array) which you wish to add acquire methods too.
+-- @param RecipeDB The database (array) which you wish to add acquire methods too.
 -- @param SpellID The [http://www.wowwiki.com/SpellLink Spell ID] of the recipe which acquire methods are being added to.
 -- @param ... A listing of acquire methods.  See [[database-documentation]] for a listing of acquire methods and how they behave.
 -- @return None, array is passed as a reference.
@@ -726,8 +726,17 @@ function addon:addTradeAcquire(RecipeDB, SpellID, ...)
 
 end
 
--- Description: Adds a specific entry (ie: vendor, mob, etc) to the lookup list
-
+--- Adds an item to a specific database listing (ie: vendor, mob, etc)
+-- @name AckisRecipeList:addLookupList
+-- @usage AckisRecipeList:addLookupList:(VendorDB,NPC ID, NPC Name, NPC Location, X Coord, Y Coord, Faction)
+-- @param DB Database which the entry will be stored.
+-- @param ID Unique identified for the entry.
+-- @param Name Name of the entry.
+-- @param Loc Location of the entry in the world.
+-- @param Coordx X coordinate of where the entry is found.
+-- @param Coordy Y coordinate of where the entry is found.
+-- @param Faction Faction identifier for the entry.
+-- @return None, array is passed as a reference.
 function addon:addLookupList(DB, ID, Name, Loc, Coordx, Coordy, Faction)
 
 	--[[
@@ -840,29 +849,6 @@ do
 
 		playerData.foundRecipes = foundRecipes
 
-		-- If we're still in 3.0.x
-		if select(4, GetBuildInfo()) < 30100 then
-			-- Cooking
-			if (playerData.playerProfession == GetSpellInfo(2550)) then
-				if (playerData.playerProfessionLevel > 300) then
-					RecipeDB[33359]["Known"] = true
-				end
-				if (playerData.playerProfessionLevel > 225) then
-					RecipeDB[3413]["Known"] = true
-				end
-			end
-
-			-- First Aid
-			if ((playerData.playerProfession == GetSpellInfo(746)) or (playerData.playerProfession == "Premiers soins")) then
-				if (playerData.playerProfessionLevel > 225) then
-					RecipeDB[10846]["Known"] = true
-				end
-				if (playerData.playerProfessionLevel > 150) then
-					RecipeDB[7924]["Known"] = true
-				end
-			end
-		end
-
 	end
 
 end
diff --git a/Locals/testdeDE.lua b/Locals/testdeDE.lua
index 29d3e2b..6f4f8f1 100644
--- a/Locals/testdeDE.lua
+++ b/Locals/testdeDE.lua
@@ -1599,4 +1599,5 @@ L["Zulian Tiger"] = "Zulianischer Tiger"
 L["Zurai"] = "Zurai"
 L["Northern Cooking"] = true
 
-L["Custom40"] = "Discovered randomly by reading the Book of Glyph Mastery."
\ No newline at end of file
+L["Custom40"] = "Discovered randomly by reading the Book of Glyph Mastery."
+L["Clamlette Surprise"] = true
diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua
index 525e534..24101f4 100644
--- a/Locals/testenUS.lua
+++ b/Locals/testenUS.lua
@@ -1709,3 +1709,4 @@ L["Rartar"] = true
 L["Bryan Landers"] = true
 L["Prospector Khazgorm"] = true
 L["Northern Cooking"] = true
+L["Clamlette Surprise"] = true
diff --git a/Locals/testesMX.lua b/Locals/testesMX.lua
index 78a1212..4426105 100644
--- a/Locals/testesMX.lua
+++ b/Locals/testesMX.lua
@@ -1580,4 +1580,5 @@ L["Zulian Tiger"] = "Tigre Zulian"
 L["Zurai"] = "Zurai"
 L["Northern Cooking"] = true
 
-L["Custom40"] = "Discovered randomly by reading the Book of Glyph Mastery."
\ No newline at end of file
+L["Custom40"] = "Discovered randomly by reading the Book of Glyph Mastery."
+L["Clamlette Surprise"] = true
diff --git a/RecipeDB/ARL-Cook.lua b/RecipeDB/ARL-Cook.lua
index 79feef2..7416241 100644
--- a/RecipeDB/ARL-Cook.lua
+++ b/RecipeDB/ARL-Cook.lua
@@ -992,32 +992,14 @@ function addon:InitCooking(RecipeDB)
 	self:addTradeFlags(RecipeDB,58528,1,2,4,21,22,23,24,25,26,27,28,29,30,37,41)
 	self:addTradeAcquire(RecipeDB,58528,2,31031,2,31032)
 
-	if select(4, GetBuildInfo()) < 30100 then
-	-- Dig Rat Stew -- 6417
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,6417,90,5478,1,2550)
-	self:addTradeFlags(RecipeDB,6417,2,8,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,6417,4,862)
-
-	-- Expert Cooking -- 3413 - 225 Cooking
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,3413,125,16072,1,2550)
-	self:addTradeFlags(RecipeDB,3413,1,2,4,21,22,23,24,25,26,27,28,29,30)
-	self:addTradeAcquire(RecipeDB,3413,2,3955,2,12033)
-
-	-- Master Cooking -- 33359 - 300 cooking
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,33359,300,27736,1,2550)
-	self:addTradeFlags(RecipeDB,33359,1,2,4,21,22,23,24,25,26,27,28,29,30)
-	self:addTradeAcquire(RecipeDB,33359,2,18988,2,18987,2,18993)
-
-	else
-
 	-- Dig Rat Stew -- 6417
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,6417,90,44977,1,2550)
 	self:addTradeFlags(RecipeDB,6417,1,2,4,8,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,6417,4,862,2,3392)
+	--self:addTradeSkill(RecipeDB,6417,90,5478,1,2550)
+	--self:addTradeFlags(RecipeDB,6417,2,8,21,22,23,24,25,26,27,28,29,30,36,40)
+	--self:addTradeAcquire(RecipeDB,6417,4,862)
 
 	-- Black Jelly -- 64358
 	recipecount = recipecount + 1
@@ -1049,8 +1031,6 @@ function addon:InitCooking(RecipeDB)
 	self:addTradeFlags(RecipeDB,62051,1,2,7,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,62051,5,5)
 
-	end
-
 	return recipecount
 
 end
diff --git a/RecipeDB/ARL-FirstAid.lua b/RecipeDB/ARL-FirstAid.lua
index 16407a4..d3a4f3d 100644
--- a/RecipeDB/ARL-FirstAid.lua
+++ b/RecipeDB/ARL-FirstAid.lua
@@ -134,20 +134,6 @@ function addon:InitFirstAid(RecipeDB)
 	self:addTradeFlags(RecipeDB,45546,1,2,10,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,45546,7,2)
 
-	if select(4, GetBuildInfo()) < 30100 then
-	-- Expert First Aid -- 7924 (150 training)
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,7924,125,16084,1,746)
-	self:addTradeFlags(RecipeDB,7924,1,2,4,21,22,23,24,25,26,27,28,29,30)
-	self:addTradeAcquire(RecipeDB,7924,2,2805,2,13476)
-
-	-- Artisan First Aid -- 10846 (225 training)
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,10846,225,nil,1,746)
-	self:addTradeFlags(RecipeDB,10846,1,2,8,21,22,23,24,25,26,27,28,29,30)
-	self:addTradeAcquire(RecipeDB,10846,4,6622,4,6624)
-	end
-
 	return recipecount
 
 end
diff --git a/RecipeDB/ARL-Vendor.lua b/RecipeDB/ARL-Vendor.lua
index 3e3e016..efa8fe8 100644
--- a/RecipeDB/ARL-Vendor.lua
+++ b/RecipeDB/ARL-Vendor.lua
@@ -6,11 +6,6 @@ ARL-Vendor.lua
 
 Vendor data for all of Ackis Recipe List
 
-Originally auto-generated.
-Auto-generated using ARLDataminer.rb
-
-322 found from data mining.  0 ignored.
-
 ************************************************************************
 
 File date: @file-date-iso@ 
-- 
1.7.9.5