Tww/#297 recipe scan (#298)

* added new skilllineids

* migration for itemOptimizedCostsDB

* Fixed gear recognition in recipe data constructor

* consider reagent increase factor of 0

* depricated function fix

* migration fix

Author: derfloh205

Classes/CooldownData.lua

@@ -37,12 +37,12 @@ function CraftSim.CooldownData:Update()
     self.maxCharges = maxCharges or 0
 
     if self.isDayCooldown then
-        local _, maxCooldown = select(2, GetSpellCooldown(self.recipeID))
+        local _, maxCooldown = select(2, C_Spell.GetSpellCooldown(self.recipeID))
         self.maxCooldown = maxCooldown -- for day cooldowns only (cd reductions inclusive)
         local elapsedTimeSinceCooldownStart = (self.maxCooldown - currentCooldown)
         self.startTime = math.max(GetServerTime() - elapsedTimeSinceCooldownStart, 0)
     else
-        self.cooldownPerCharge = select(4, GetSpellCharges(self.recipeID))
+        self.cooldownPerCharge = select(4, C_Spell.GetSpellCharges(self.recipeID))
         if self.currentCharges < self.maxCharges then
             local elapsedTimeSinceCooldownStart = (self.cooldownPerCharge - currentCooldown)
             self.startTimeCurrentCharge = GetServerTime() - elapsedTimeSinceCooldownStart

Classes/ReagentData.lua

@@ -206,6 +206,10 @@ function CraftSim.ReagentData:GetMaxSkillFactor()
 
         local maxSkill = skillWithReagents - baseSkill
 
+        if maxSkill == 0 then
+            -- division by zero not possible so just configure that reagents do not influence skill at all by returning a factor of 0
+            return 0
+        end
         local maxReagentIncreaseFactor = self.recipeData.baseProfessionStats.recipeDifficulty.value / maxSkill
 
         print("ReagentData: maxReagentIncreaseFactor: " .. tostring(maxReagentIncreaseFactor))

Classes/RecipeData.lua

@@ -106,10 +106,15 @@ function CraftSim.RecipeData:new(recipeID, isRecraft, isWorkOrder, crafterData)
     self.relativeProfitCached = nil
     self.isQuestRecipe = tContains(CraftSim.CONST.QUEST_RECIPE_IDS, recipeID)
 
+    self.isGear = false
+
     if self.recipeInfo.hyperlink then
-        local subclassID = select(7, C_Item.GetItemInfoInstant(self.recipeInfo.hyperlink))
+        local itemInfoInstant = { C_Item.GetItemInfoInstant(self.recipeInfo.hyperlink) }
+        local subclassID = itemInfoInstant[7]
         ---@type number?
         self.subtypeID = subclassID
+        -- 4th return value is item equip slot, so if its of non type its not equipable, otherwise its gear
+        self.isGear = itemInfoInstant[4] ~= CraftSim.CONST.INVENTORY_TYPE_NON_EQUIP_IGNORE
     end
 
     self.isOldWorldRecipe = not self:IsDragonflightRecipe()
@@ -131,7 +136,7 @@ function CraftSim.RecipeData:new(recipeID, isRecraft, isWorkOrder, crafterData)
     ---@type string?
     self.allocationItemGUID = nil
     self.maxQuality = self.recipeInfo.maxQuality
-    self.isGear = self.recipeInfo.hasSingleItemOutput and self.recipeInfo.qualityIlvlBonuses ~= nil
+    --self.isGear = self.recipeInfo.hasSingleItemOutput and self.recipeInfo.qualityIlvlBonuses ~= nil
 
     self.supportsMulticraft = false
     self.supportsResourcefulness = false

Classes/ResultData.lua

@@ -62,14 +62,16 @@ function CraftSim.ResultData:UpdatePossibleResultItems()
             table.insert(self.itemsByQuality, Item:CreateFromItemLink(itemLink))
         end
     else
+        print("fetching quality ids itemids:", false, true)
         local itemIDs = CraftSim.UTIL:GetDifferentQualityIDsByCraftingReagentTbl(recipeData.recipeID,
             craftingReagentInfoTbl, recipeData.allocationItemGUID)
         for _, itemID in pairs(itemIDs) do
+            print("itemID: " .. itemID)
             table.insert(self.itemsByQuality, Item:CreateFromItemID(itemID))
         end
     end
 
-    if not recipeData.isGear and self.itemsByQuality[1] and self.itemsByQuality[2] then
+    if not recipeData.isGear and self.itemsByQuality[1] and self.itemsByQuality[2] and not recipeData.supportsQualities then
         if self.itemsByQuality[1]:GetItemID() == self.itemsByQuality[2]:GetItemID() then
             self.itemsByQuality = { self.itemsByQuality[1] } -- force one of an item (illustrious insight e.g. has always 3 items in it for whatever reason)
         end

DB/itemOptimizedCostsDB.lua

@@ -58,6 +58,14 @@ function CraftSim.DB.ITEM_OPTIMIZED_COSTS:Migrate()
 
         CraftSimDB.itemOptimizedCostsDB.version = 2
     end
+
+    -- 2 -> 3 (17.0.0 - TWW)
+    if CraftSimDB.itemOptimizedCostsDB.version == 2 then
+        -- clear the db for a reset
+        self:ClearAll()
+
+        CraftSimDB.itemOptimizedCostsDB.version = 3
+    end
 end
 
 function CraftSim.DB.ITEM_OPTIMIZED_COSTS:ClearAll()
@@ -88,25 +96,16 @@ function CraftSim.DB.ITEM_OPTIMIZED_COSTS:Add(recipeData)
 
         -- only if reachable
         for qualityID, item in ipairs(recipeData.resultData.itemsByQuality) do
-            local chance = recipeData.resultData.chanceByQuality[qualityID] or 0
-            local minChance = recipeData.resultData.chancebyMinimumQuality[qualityID] or 0
-            if minChance > 0 then
-                print("Caching Optimized Costs Data for: " .. recipeData.recipeName)
-                local itemID = item:GetItemID()
-                CraftSimDB.itemOptimizedCostsDB.data[itemID] = CraftSimDB.itemOptimizedCostsDB.data[itemID] or {}
-
-                CraftSimDB.itemOptimizedCostsDB.data[itemID][recipeData:GetCrafterUID()] = {
-                    crafter = recipeData:GetCrafterUID(),
-                    qualityID = qualityID,
-                    craftingChance = chance,
-                    craftingChanceMin = minChance,
-                    expectedCosts = recipeData.priceData.expectedCostsByQuality[qualityID],
-                    expectedCostsMin = recipeData.priceData.expectedCostsByMinimumQuality[qualityID],
-                    expectedCrafts = recipeData.resultData.expectedCraftsByQuality[qualityID],
-                    expectedCraftsMin = recipeData.resultData.expectedCraftsByMinimumQuality[qualityID],
-                    profession = recipeData.professionData.professionInfo.profession,
-                }
-            end
+            print("Caching Optimized Costs Data for: " .. recipeData.recipeName)
+            local itemID = item:GetItemID()
+            CraftSimDB.itemOptimizedCostsDB.data[itemID] = CraftSimDB.itemOptimizedCostsDB.data[itemID] or {}
+
+            CraftSimDB.itemOptimizedCostsDB.data[itemID][recipeData:GetCrafterUID()] = {
+                crafter = recipeData:GetCrafterUID(),
+                qualityID = qualityID,
+                expectedCostsPerItem = recipeData.priceData.expectedCostsPerItem,
+                profession = recipeData.professionData.professionInfo.profession,
+            }
         end
     end
 end

DB/optionsDB.lua

@@ -208,10 +208,10 @@ function CraftSim.DB.OPTIONS:Migrate()
     end
 
     if CraftSimDB.optionsDB.version == 2 then
-        CraftSimDB.optionsDB.data[CraftSim.CONST.GENERAL_OPTIONS.MODULE_CUSTOMER_SERVICE] = nil
-        CraftSimDB.optionsDB.data[CraftSim.CONST.GENERAL_OPTIONS.CUSTOMER_SERVICE_WHISPER_FORMAT] = nil
-        CraftSimDB.optionsDB.data[CraftSim.CONST.GENERAL_OPTIONS.CUSTOMER_SERVICE_ALLOW_LIVE_PREVIEW] = nil
-        CraftSimDB.optionsDB.data[CraftSim.CONST.GENERAL_OPTIONS.CUSTOMER_SERVICE_ACTIVE_PREVIEW_IDS] = nil
+        CraftSimDB.optionsDB.data["MODULE_CUSTOMER_SERVICE"] = nil
+        CraftSimDB.optionsDB.data["CUSTOMER_SERVICE_WHISPER_FORMAT"] = nil
+        CraftSimDB.optionsDB.data["CUSTOMER_SERVICE_ALLOW_LIVE_PREVIEW"] = nil
+        CraftSimDB.optionsDB.data["CUSTOMER_SERVICE_ACTIVE_PREVIEW_IDS"] = nil
 
         CraftSimDB.optionsDB.version = 3
     end

Locals/enUS.lua

@@ -67,9 +67,9 @@ function CraftSim.LOCAL_EN:GetData()
         [CraftSim.CONST.TEXT.MULTICRAFT_EXPLANATION_TOOLTIP] =
         "Multicraft gives you a chance of crafting more items than you would usually produce with a recipe.\n\nThe additional amount is usually between 1 and 2.5y\nwhere y = the usual amount 1 craft yields.",
         [CraftSim.CONST.TEXT.REAGENTSKILL_EXPLANATION_TOOLTIP] =
-        "The quality of your materials can give you a maximum of 25% of the base recipe difficulty as bonus skill.\n\nAll Q1 Materials: 0% Bonus\nAll Q2 Materials: 12.5% Bonus\nAll Q3 Materials: 25% Bonus\n\nThe skill is calculated by the amount of materials of each quality weighted against their quality\nand a specific weight value that is unique to each individual dragon flight crafting material item\n\nThis is however different for recrafts. There the maximum the reagents can increase the quality\nis dependent on the quality of materials the item was originally crafted with.\nThe exact workings are not known.\nHowever, CraftSim internally compares the achieved skill with all q3 and calculates\nthe max skill increase based on that.",
+        "The quality of your materials can give you a maximum of 40% of the base recipe difficulty as bonus skill.\n\nAll Q1 Materials: 0% Bonus\nAll Q2 Materials: 20% Bonus\nAll Q3 Materials: 40% Bonus\n\nThe skill is calculated by the amount of materials of each quality weighted against their quality\nand a specific weight value that is unique to each individual dragon flight crafting material item\n\nThis is however different for recrafts. There the maximum the reagents can increase the quality\nis dependent on the quality of materials the item was originally crafted with.\nThe exact workings are not known.\nHowever, CraftSim internally compares the achieved skill with all q3 and calculates\nthe max skill increase based on that.",
         [CraftSim.CONST.TEXT.REAGENTFACTOR_EXPLANATION_TOOLTIP] =
-        "The maximum the materials can contribute to a recipe is most of the time 25% of the base recipe difficulty.\n\nHowever in the case of recrafting, this value can vary based on previous crafts\nand the quality of materials that were used.",
+        "The maximum the materials can contribute to a recipe is most of the time 40% of the base recipe difficulty.\n\nHowever in the case of recrafting, this value can vary based on previous crafts\nand the quality of materials that were used.",
 
         -- Simulation Mode
         [CraftSim.CONST.TEXT.SIMULATION_MODE_NONE] = "None",

Locals/frFR.lua

@@ -65,9 +65,9 @@ function CraftSim.LOCAL_FR:GetData()
         [CraftSim.CONST.TEXT.MULTICRAFT_EXPLANATION_TOOLTIP] =
         "Multicraft gives you a chance of crafting more items than you would usually produce with a recipe.\n\nThe additional amount is usually between 1 and 2.5y\nwhere y = the usual amount 1 craft yields.",
         [CraftSim.CONST.TEXT.REAGENTSKILL_EXPLANATION_TOOLTIP] =
-        "The quality of your materials can give you a maximum of 25% of the base recipe difficulty as bonus skill.\n\nAll Q1 Materials: 0% Bonus\nAll Q2 Materials: 12.5% Bonus\nAll Q3 Materials: 25% Bonus\n\nThe skill is calculated by the amount of materials of each quality weighted against their quality\nand a specific weight value that is unique to each individual dragon flight crafting material item\n\nThis is however different for recrafts. There the maximum the reagents can increase the quality\nis dependent on the quality of materials the item was originally crafted with.\nThe exact workings are not known.\nHowever, CraftSim internally compares the achieved skill with all q3 and calculates\nthe max skill increase based on that.",
+        "The quality of your materials can give you a maximum of 40% of the base recipe difficulty as bonus skill.\n\nAll Q1 Materials: 0% Bonus\nAll Q2 Materials: 20% Bonus\nAll Q3 Materials: 40% Bonus\n\nThe skill is calculated by the amount of materials of each quality weighted against their quality\nand a specific weight value that is unique to each individual dragon flight crafting material item\n\nThis is however different for recrafts. There the maximum the reagents can increase the quality\nis dependent on the quality of materials the item was originally crafted with.\nThe exact workings are not known.\nHowever, CraftSim internally compares the achieved skill with all q3 and calculates\nthe max skill increase based on that.",
         [CraftSim.CONST.TEXT.REAGENTFACTOR_EXPLANATION_TOOLTIP] =
-        "The maximum the materials can contribute to a recipe is most of the time 25% of the base recipe difficulty.\n\nHowever in the case of recrafting, this value can vary based on previous crafts\nand the quality of materials that were used.",
+        "The maximum the materials can contribute to a recipe is most of the time 40% of the base recipe difficulty.\n\nHowever in the case of recrafting, this value can vary based on previous crafts\nand the quality of materials that were used.",
 
         -- Simulation Mode
         [CraftSim.CONST.TEXT.SIMULATION_MODE_NONE] = "None",

Locals/itIT.lua

@@ -32,9 +32,9 @@ function CraftSim.LOCAL_IT:GetData()
         [CraftSim.CONST.TEXT.MULTICRAFT_EXPLANATION_TOOLTIP] =
         "Creazione multipla ti permette di creare occasionalmente più oggetti del solito.\n\nLa quantità aggiuntiva è stimata tra 1 e 2.5y,\ndove y è la quantità che si ottiene normalmente con una singola operazione di crezione.",
         [CraftSim.CONST.TEXT.REAGENTSKILL_EXPLANATION_TOOLTIP] =
-        "La qualità dei reagenti utilizzati può aumentare la Competenza fino a 25% della Difficoltà ricetta di base.\n\nSolo reagenti di Grado 1: bonus dello 0%\nSolo reagenti di Grado 2: bonus del 12.5%\nSolo reagenti di Grado 3: bonus del 25%\n\nLa Competenza bonus è uguale alla quantità di reagenti di ogni qualità moltiplicata per le rispettive qualità\ne per un punteggio specifico per ogni tipo di reagente.\n\nNel caso di una ricreazione, invece, la Competenza bonus ottenibile dipende anche dai reagenti utilizzati per la creazione originale e per le ricreazioni precedenti.\nIl funzionamento esatto non è conosciuto.\nComunque, CraftSim confronta internamente la Competenza raggiunta con tutti i reagenti di Grado 3 e usa quei valori per calcolare la Competenza bonus reagenti massima.",
+        "La qualità dei reagenti utilizzati può aumentare la Competenza fino a 40% della Difficoltà ricetta di base.\n\nSolo reagenti di Grado 1: bonus dello 0%\nSolo reagenti di Grado 2: bonus del 20%\nSolo reagenti di Grado 3: bonus del 40%\n\nLa Competenza bonus è uguale alla quantità di reagenti di ogni qualità moltiplicata per le rispettive qualità\ne per un punteggio specifico per ogni tipo di reagente.\n\nNel caso di una ricreazione, invece, la Competenza bonus ottenibile dipende anche dai reagenti utilizzati per la creazione originale e per le ricreazioni precedenti.\nIl funzionamento esatto non è conosciuto.\nComunque, CraftSim confronta internamente la Competenza raggiunta con tutti i reagenti di Grado 3 e usa quei valori per calcolare la Competenza bonus reagenti massima.",
         [CraftSim.CONST.TEXT.REAGENTFACTOR_EXPLANATION_TOOLTIP] =
-        "La qualità dei reagenti utilizzati può aumentare la Competenza fino a 25% della Difficoltà ricetta di base.\n\nNel caso di una ricreazione, però, questo valore può variare in base alla qualità dei reagenti utilizzati per la creazione originale e per le ricreazioni precedenti.",
+        "La qualità dei reagenti utilizzati può aumentare la Competenza fino a 40% della Difficoltà ricetta di base.\n\nNel caso di una ricreazione, però, questo valore può variare in base alla qualità dei reagenti utilizzati per la creazione originale e per le ricreazioni precedenti.",
 
         -- Simulation Mode
         [CraftSim.CONST.TEXT.SIMULATION_MODE_NONE] = "Nessuno",

Locals/ruRU.lua

@@ -65,9 +65,9 @@ function CraftSim.LOCAL_RU:GetData()
         [CraftSim.CONST.TEXT.MULTICRAFT_EXPLANATION_TOOLTIP] =
         "Перепроизводство дает вам возможность создать больше предметов, чем вы обычно производите по рецепту.\n\nДополнительная сумма обычно составляет от 1 до 2.5y\nгде y = обычная сумма, которую дает 1 крафт.",
         [CraftSim.CONST.TEXT.REAGENTSKILL_EXPLANATION_TOOLTIP] =
-        "Качество ваших материалов может дать вам максимум 25% от базовой сложности рецепта в качестве бонусного навыка.\n\nВсе материалы Q1: бонус 0%\nВсе материалы Q2: бонус 12,5%\nВсе материалы Q3: бонус 25%\n n\nНавык рассчитывается по количеству материалов каждого качества, взвешенному по отношению к их качеству\n и конкретному значению веса, которое уникально для каждого отдельного материала для крафта Dragonflight\n\nОднако для переделок это отличается. Существует предел того, насколько реагенты могут увеличить качество,\nон зависит от качества материалов, из которых изначально был создан предмет.\nТочные принципы работы неизвестны.\nОднако CraftSim внутренне сравнивает достигнутый навык со всеми q3 и рассчитывает\nмаксимальное увеличение навыка на основе этого.",
+        "Качество ваших материалов может дать вам максимум 40% от базовой сложности рецепта в качестве бонусного навыка.\n\nВсе материалы Q1: бонус 0%\nВсе материалы Q2: бонус 20%\nВсе материалы Q3: бонус 40%\n n\nНавык рассчитывается по количеству материалов каждого качества, взвешенному по отношению к их качеству\n и конкретному значению веса, которое уникально для каждого отдельного материала для крафта Dragonflight\n\nОднако для переделок это отличается. Существует предел того, насколько реагенты могут увеличить качество,\nон зависит от качества материалов, из которых изначально был создан предмет.\nТочные принципы работы неизвестны.\nОднако CraftSim внутренне сравнивает достигнутый навык со всеми q3 и рассчитывает\nмаксимальное увеличение навыка на основе этого.",
         [CraftSim.CONST.TEXT.REAGENTFACTOR_EXPLANATION_TOOLTIP] =
-        "Наибольший вклад, который материалы могут внести в рецепт, в большинстве случаев составляет 25% от базовой сложности рецепта.\n\nОднако в случае переделки это значение может варьироваться в зависимости от предыдущих крафтов\n и качества использованных ранее материалов.",
+        "Наибольший вклад, который материалы могут внести в рецепт, в большинстве случаев составляет 40% от базовой сложности рецепта.\n\nОднако в случае переделки это значение может варьироваться в зависимости от предыдущих крафтов\n и качества использованных ранее материалов.",
 
         -- Simulation Mode
         [CraftSim.CONST.TEXT.SIMULATION_MODE_NONE] = "Нет",