diff --git a/Classes/PriceData.lua b/Classes/PriceData.lua index 8fb6ea16..babff10b 100644 --- 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 index 2cd47706..6f70f624 100644 --- 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 index 98372527..be78a309 100644 --- 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 index 2583d9c6..72795bfb 100644 --- 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,