Mercurial > wow > itemauditor

changeset 19:67f4151d535c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expanded the queue system to calculate what the new QA threshold would be and to consider buying items from vendors. It also sets a threshold so that items with less than 5g profit will not be crafted. I will turn this into an option later.
author Asa Ayers <Asa.Ayers@Gmail.com>
date Sun, 04 Jul 2010 07:24:12 -0700
parents c7b3585c73df
children ff9a698caebc
files Core.lua Modules/QuickAuctions.lua
diffstat 2 files changed, 50 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/Core.lua	Sat Jul 03 14:53:27 2010 -0700
+++ b/Core.lua	Sun Jul 04 07:24:12 2010 -0700
@@ -62,7 +62,7 @@
 
 function addon:Print(message)
 	local prefix = "|cFFA3CEFF"..tostring( self ).."|r: "
-	DEFAULT_CHAT_FRAME:AddMessage( prefix .. message)
+	DEFAULT_CHAT_FRAME:AddMessage( prefix .. tostring(message))
 end
 
 function addon:GetCurrentInventory()
--- a/Modules/QuickAuctions.lua	Sat Jul 03 14:53:27 2010 -0700
+++ b/Modules/QuickAuctions.lua	Sun Jul 04 07:24:12 2010 -0700
@@ -35,6 +35,25 @@
 	self:UpdateQAGroup(QAAPI:GetItemGroup(link))
 end
 
+addon.profit_margin = 1.15
+addon.minimum_profit = 50000
+
+local function calculateQAThreshold(copper)
+	if copper == 0 then
+		copper = 1
+	end
+	
+	-- add my minimum profit margin
+	copper = copper * addon.profit_margin 
+	
+	-- Adding the cost of mailing every item once.
+	copper = copper + 30
+	
+	-- add AH Cut
+	local keep = 1 - addon:GetAHCut()
+	return copper/keep
+end
+
 function addon:UpdateQAGroup(groupName)
 	if not addon.IsQAEnabled() then
 		return
@@ -48,19 +67,7 @@
 			threshold = max(threshold, itemCost)
 		end
 		
-		if threshold == 0 then
-			threshold = 1
-		end
-		
-		-- add my minimum profit margin
-		threshold = threshold * 1.10
-		
-		-- Adding the cost of mailing every item once.
-		threshold = threshold + 30
-		
-		-- add AH Cut
-		local keep = 1 - addon:GetAHCut()
-		threshold = threshold/keep
+		threshold = calculateQAThreshold(threshold)
 		
 		QAAPI:SetGroupThreshold(groupName, ceil(threshold))
 	end
@@ -92,40 +99,51 @@
 
 		local skillName, skillType, numAvailable, isExpanded, altVerb = GetTradeSkillInfo(i)
 		local recipeLink = GetTradeSkillRecipeLink(i)
-		local stackSize  = 0
+		local stackSize  = 1
 		if recipeLink ~= nil then
 			_, itemLink= GetItemInfo(itemId)
 			local QAGroup = QAAPI:GetItemGroup(itemLink)
 			if QAGroup ~= nil then
 				stackSize = QAAPI:GetGroupPostCap(QAGroup) * QAAPI:GetGroupPerAuction(QAGroup)
 				stackSize = stackSize / GetTradeSkillNumMade(i)
+				
+				-- bonus
+				stackSize = ceil(stackSize *1.25)
 			end
 
 			local count = Altoholic:GetItemCount(itemId)
 			
-			if count < stackSize then
+			if count < stackSize and itemLink ~= nil then
 				local found, _, skillString = string.find(recipeLink, "^|%x+|H(.+)|h%[.+%]")
 				local _, skillId = strsplit(":", skillString )
 				
-				
-				local totalCost = 0
+				local toQueue = stackSize - count
+				local newCost = 0
 				for reagentId = 1, GetTradeSkillNumReagents(i) do
 					_, _, reagentCount = GetTradeSkillReagentInfo(i, reagentId);
 					reagentLink = GetTradeSkillReagentItemLink(i, reagentId)
-					
-					totalCost = totalCost + addon:GetReagentCost(reagentLink, reagentCount)  
+					newCost = newCost + addon:GetReagentCost(reagentLink, reagentCount)  
 				end
 				
+				local currentInvested, _, currentCount = addon:GetItemCost(itemLink)
+				local newThreshold = (newCost + currentInvested) / (currentCount + toQueue)
+				
+				
+				newThreshold = calculateQAThreshold(newThreshold)
 				local currentPrice = GetAuctionBuyout(itemLink) or 0
 				
-				local toQueue = stackSize - count
+				
 				-- bonus?
 				
-				if totalCost < currentPrice then
-					self:Debug(format("Adding %s x%s to skillet queue.", itemLink, toQueue))
+				if newThreshold < currentPrice and (currentPrice - newThreshold) > addon.minimum_profit then
+					self:Debug(format("Adding %s x%s to skillet queue. Profit: %s", 
+						itemLink, 
+						toQueue, 
+						addon:FormatMoney(currentPrice - newThreshold)
+					))
 					self:AddToQueue(skillId,i, toQueue)
 				else
-					self:Debug(format("Skipping %s. Would cost %s to craft and sell for %s", itemLink, addon:FormatMoney(totalCost), addon:FormatMoney(currentPrice)))
+					self:Debug(format("Skipping %s x%s. Would lose %s ", itemLink, toQueue, addon:FormatMoney(currentPrice - newThreshold)))
 				end
 			end
 		  end
@@ -136,6 +154,14 @@
 
 function addon:GetReagentCost(link, total)
 	local totalCost = 0
+	
+	if Skillet:VendorSellsReagent(link) then
+		local _, _, _, _, _, _, _, _, _, _, itemVendorPrice = GetItemInfo (link);
+		totalCost = itemVendorPrice * total
+		total = 0
+	end
+
+	
 	local investedTotal, investedPerItem, count = addon:GetItemCost(link)
 	
 	if count > 0 then