fix salvage crafting cost

derfloh205 · Nov 19, 2024 · 880fbcf · 880fbcf
1 parent b7886bc
commit 880fbcf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Classes/PriceData.lua b/Classes/PriceData.lua
@@ -93,6 +93,7 @@ function CraftSim.PriceData:Update()
         self.craftingCosts = self.craftingCosts +
             reagentPriceInfo.itemPrice * reagentData.salvageReagentSlot.requiredQuantity
         self.craftingCostsRequired = self.craftingCosts
+        self.craftingCostsNoOrderReagents = self.craftingCosts
 
         if reagentPriceInfo.priceInfo.isExpectedCost then
             tinsert(self.selfCraftedReagents, itemID)

diff --git a/CraftSim.toc b/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.6.0
+## Version: 19.6.1
 ## X-Curse-Project-ID: 705015
 ## X-Wago-ID: 0mNwaPKo
 ## X-WoWI-ID: 26519

diff --git a/Data/News.lua b/Data/News.lua
@@ -17,6 +17,8 @@ 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.6.1"),
+        f.p .. "Fixed " .. f.bb("Craft Log") .. " not account for salvage crafting cost",
         newP("19.6.0"),
         f.P .. f.e("New Scrollbar Design") .. " for all lists!",
         f.P .. "Refactored " .. f.bb("Craft Results") .. " into " .. f.g("Craft Log"),

diff --git a/Modules/TopGear/TopGear.lua b/Modules/TopGear/TopGear.lua
@@ -211,11 +211,9 @@ end
 ---@return CraftSim.ProfessionGearSet[] topGearSets
 function CraftSim.TOPGEAR:GetProfessionGearCombinations(recipeData)
     local equippedGear = CraftSim.ProfessionGearSet(recipeData)
-    if recipeData:IsCrafter() then
-        equippedGear:LoadCurrentEquippedSet()
-    else
-        equippedGear:LoadCurrentEquippedSet(recipeData.crafterData)
-    end
+
+    equippedGear:LoadCurrentEquippedSet()
+
     local inventoryGear = CraftSim.TOPGEAR:GetProfessionGearFromInventory(recipeData)
 
     local equippedGearList = GUTIL:Filter(equippedGear:GetProfessionGearList(),
@@ -355,7 +353,7 @@ function CraftSim.TOPGEAR:OptimizeTopGear(recipeData, topGearMode)
         local relativeConcentrationValue = concentrationValue - concentrationValuePreviousGear
         local relativeStats = professionGearSet.professionStats:Copy()
         local expectedQuality = recipeData.resultData.expectedQuality
-        local expectedQualityUpgrade = recipeData.resultData.expectedQualityUpgrade
+        local expectedQualityUpgrade = recipeData.resultData.expectedQualityUpgrade -- TODO: Remove or change
         relativeStats:subtract(previousGear.professionStats)
         local result = CraftSim.TopGearResult(professionGearSet, averageProfit, relativeProfit, concentrationValue,
             relativeConcentrationValue, relativeStats,