Fix/#758 kp cost (#759)

* fixed kp cost calculation

* version and news

Author: derfloh205

CraftSim.toc

@@ -4,7 +4,7 @@
 ## Title: CraftSim
 ## Notes: Calculates the average profit based on your profession stats and other tools for the war within gold making
 ## Author: genju
-## Version: 19.7.0
+## Version: 19.7.1
 ## X-Curse-Project-ID: 705015
 ## X-Wago-ID: 0mNwaPKo
 ## X-WoWI-ID: 26519

Data/News.lua

@@ -17,6 +17,9 @@ function CraftSim.NEWS:GET_NEWS(itemMap)
     local news = {
         f.bb("                   Hello and thank you for using CraftSim!\n"),
         f.bb("                                 ( You are awesome! )"),
+        newP("19.7.1"),
+        f.p .. f.bb("CraftQueue - Queue Work Orders"),
+        f.p .. "- Fixed " .. f.bb("KP Cost") .. " being checked before optimization",
         newP("19.7.0"),
         f.P .. "New Feature: " .. f.g("Quick Buy"),
         f.p .. "- Works only with " .. f.bb("Auctionator Shopping List"),

Modules/CraftQueue/CraftQueue.lua

@@ -175,12 +175,17 @@ function CraftSim.CRAFTQ:CRAFTINGORDERS_CLAIMED_ORDER_REMOVED()
 end
 
 function CraftSim.CRAFTQ:QueueWorkOrders()
+    local print = CraftSim.DEBUG:RegisterDebugID("Modules.CraftQueue.QueueWorkOrders")
+    print("QueueWorkOrders", false, true)
     local profession = C_TradeSkillUI.GetChildProfessionInfo().profession
     local normalizedRealmName = GetNormalizedRealmName()
     local realmName = GetRealmName()
     local cleanedCrafterUIDs = GUTIL:Map(CraftSim.DB.CRAFTER:GetCrafterUIDs(), function(crafterUID)
         return select(1, gsub(crafterUID, "-" .. normalizedRealmName, ""))
     end)
+
+    local maxKPCost = CraftSim.DB.OPTIONS:Get("CRAFTQUEUE_QUEUE_PATRON_ORDERS_KP_MAX_COST")
+
     --TODO: Public Orders
     local workOrderTypes = {
         CraftSim.DB.OPTIONS:Get("CRAFTQUEUE_WORK_ORDERS_INCLUDE_PATRON_ORDERS") and Enum.CraftingOrderType.Npc,
@@ -325,16 +330,22 @@ function CraftSim.CRAFTQ:QueueWorkOrders()
                                         recipeData:SetCheapestQualityReagentsMax() -- considers patron reagents
                                         recipeData:Update()
 
-                                        if isPatronOrder and knowledgePointsRewarded > 0 and recipeData.averageProfitCached < 0 then
-                                            local maxKPCost = CraftSim.DB.OPTIONS:Get(
-                                                "CRAFTQUEUE_QUEUE_PATRON_ORDERS_KP_MAX_COST")
-                                            local kpCost = math.abs(recipeData.averageProfitCached /
-                                                knowledgePointsRewarded)
+                                        print("- Knowledge Points Rewarded: " .. tostring(knowledgePointsRewarded))
 
-                                            if kpCost >= maxKPCost then
-                                                distributor:Continue()
-                                                return
+
+                                        local function withinKPCost(averageProfit)
+                                            if isPatronOrder and knowledgePointsRewarded > 0 and averageProfit < 0 then
+                                                
+                                                local kpCost = math.abs(averageProfit / knowledgePointsRewarded)
+    
+                                                    print("- kpCost: " .. GUTIL:FormatMoney(kpCost, true, nil, true))
+    
+                                                if kpCost >= maxKPCost then
+                                                    return false
+                                                end
+                                                return true
                                             end
+                                            return true
                                         end
 
                                         local function queueRecipe()
@@ -343,16 +354,23 @@ function CraftSim.CRAFTQ:QueueWorkOrders()
                                             local forceConcentration = CraftSim.DB.OPTIONS:Get(
                                                 "CRAFTQUEUE_WORK_ORDERS_FORCE_CONCENTRATION")
                                             -- check if the min quality is reached, if not do not queue
+                                            local queueAble = false
                                             if recipeData.resultData.expectedQuality >= order.minQuality then
-                                                CraftSim.CRAFTQ:AddRecipe { recipeData = recipeData }
+                                                queueAble = true
                                             end
 
                                             if (forceConcentration or allowConcentration) and
                                                 recipeData.resultData.expectedQualityConcentration == order.minQuality then
                                                 -- use concentration to reach and then queue
                                                 recipeData.concentrating = true
                                                 recipeData:Update()
-                                                CraftSim.CRAFTQ:AddRecipe { recipeData = recipeData }
+                                                queueAble = true
+                                            end
+
+                                            if queueAble then
+                                                if withinKPCost(recipeData.averageProfitCached) then
+                                                    CraftSim.CRAFTQ:AddRecipe { recipeData = recipeData }
+                                                end
                                             end
 
                                             distributor:Continue()

Util/Const.lua

@@ -1475,7 +1475,7 @@ CraftSim.CONST.FONT_FILES = {
 
 CraftSim.CONST.PATRON_ORDERS_KNOWLEDGE_REWARD_ITEMS = {
     CATCHUP = {
-        228725, -- alchemy
+        228724, -- alchemy
         228726, --blacksmithing
         228728, --enchanting
         228730, --engineering
@@ -1485,7 +1485,7 @@ CraftSim.CONST.PATRON_ORDERS_KNOWLEDGE_REWARD_ITEMS = {
         228738, --tailoring
     },
     WEEKLY = {
-        228724, -- alchemy
+        228725, --alchemy
         228727, --blacksmithing
         228729, --enchanting
         228731, --engineering