Concentration Toggle (#374)

Author: derfloh205

CraftSim.toc

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

Data/News.lua

@@ -15,7 +15,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("17.0.10"),
+        newP("17.1.0"),
+        f.P .. f.bb("RecipeScan") .. " now has a " .. f.gold("Concentration ") .. "Toggle",
         f.p .. "Fixed " .. f.bb("OptionalReagents") .. " difficulty in simulation mode",
         newP("17.0.9"),
         f.p .. "Fixed " .. f.bb("TSM Price Expression ") .. "for Results used for Materials",

Modules/AverageProfit/AverageProfit.lua

@@ -69,6 +69,7 @@ end
 ---@param recipeData CraftSim.RecipeData
 ---@param baseAverageProfit number
 ---@return number statWeight
+---@return number averageProfitConcentration
 function CraftSim.AVERAGEPROFIT:GetConcentrationWeight(recipeData, baseAverageProfit)
     if not recipeData.supportsQualities or recipeData.concentrating or recipeData.concentrationCost <= 0 then
         return 0
@@ -81,7 +82,7 @@ function CraftSim.AVERAGEPROFIT:GetConcentrationWeight(recipeData, baseAveragePr
     local profitDiff = averageProfitConcentration - baseAverageProfit
     local statWeight = profitDiff / recipeData.concentrationCost
     recipeData.concentrating = false
-    return statWeight
+    return statWeight, averageProfitConcentration
 end
 
 ---@param recipeData CraftSim.RecipeData

Modules/RecipeScan/UI.lua

@@ -340,6 +340,16 @@ function CraftSim.RECIPE_SCAN.UI:CreateProfessionTabContent(row, content)
         end
     })
 
+    content.concentrationToggleCB = GGUI.Checkbox {
+        parent = content, anchorParent = content.cancelScanButton.frame, anchorA = "LEFT", anchorB = "RIGHT",
+        labelOptions = { text = GUTIL:IconToText(CraftSim.CONST.CONCENTRATION_ICON, 20, 20) .. " Concentration" },
+        tooltip = "Toggle Concentration",
+        initialValue = CraftSim.DB.OPTIONS:Get("RECIPESCAN_ENABLE_CONCENTRATION"),
+        clickCallback = function(_, checked)
+            CraftSim.DB.OPTIONS:Save("RECIPESCAN_ENABLE_CONCENTRATION", checked)
+        end
+    }
+
     content.resultAmount = GGUI.Text {
         parent = content, anchorParent = content.scanButton.frame, anchorA = "RIGHT", anchorB = "LEFT",
         offsetX = -15, justifyOptions = { type = "H", align = "RIGHT" }, text = "",
@@ -477,12 +487,16 @@ function CraftSim.RECIPE_SCAN.UI:CreateProfessionTabContent(row, content)
                 parent = concentrationCostColumn,
                 anchorParent = concentrationCostColumn,
                 anchorA = "LEFT",
-                anchorB = "LEFT"
+                anchorB = "LEFT",
+                scale = 0.95,
             })
 
-            ---@type GGUI.Text
             averageProfitColumn.text = GGUI.Text({
-                parent = averageProfitColumn, anchorParent = averageProfitColumn, anchorA = "LEFT", anchorB = "LEFT"
+                parent = averageProfitColumn,
+                anchorParent = averageProfitColumn,
+                anchorA = "LEFT",
+                anchorB = "LEFT",
+                scale = 0.95,
             })
 
             topGearColumn.gear2Icon = GGUI.Icon({
@@ -800,6 +814,8 @@ function CraftSim.RECIPE_SCAN.UI:AddRecipe(row, recipeData)
 
             row.recipeData = recipeData
 
+            local enableConcentration = CraftSim.DB.OPTIONS:Get("RECIPESCAN_ENABLE_CONCENTRATION")
+
             local recipeRarity = recipeData.resultData.expectedItem:GetItemQualityColor()
 
             local cooldownInfoText = ""
@@ -811,27 +827,39 @@ function CraftSim.RECIPE_SCAN.UI:AddRecipe(row, recipeData)
                     "(" .. currentCharges .. "/" .. cooldownData.maxCharges .. ")"
             end
 
-
             recipeColumn.text:SetText(recipeRarity.hex .. recipeData.recipeName .. "|r" .. cooldownInfoText)
 
             learnedColumn:SetLearned(recipeData.learned)
 
-            expectedResultColumn.itemIcon:SetItem(recipeData.resultData.expectedItem)
+            if enableConcentration then
+                expectedResultColumn.itemIcon:SetItem(recipeData.resultData.expectedItemConcentration)
+            else
+                expectedResultColumn.itemIcon:SetItem(recipeData.resultData.expectedItem)
+            end
+
 
-            local averageProfit = recipeData:GetAverageProfit()
             local relativeTo = nil
             if showProfit then
                 relativeTo = recipeData.priceData.craftingCosts
             end
-            averageProfitColumn.text:SetText(GUTIL:FormatMoney(averageProfit, true, relativeTo, true))
+
+            local averageProfit = recipeData:GetAverageProfit()
+            row.concentrationWeight, row.concentrationProfit = CraftSim.AVERAGEPROFIT:GetConcentrationWeight(recipeData,
+                averageProfit)
+
+            if enableConcentration and row.concentrationProfit then
+                averageProfit = row.concentrationProfit
+            end
+
             row.averageProfit = averageProfit
             row.relativeProfit = GUTIL:GetPercentRelativeTo(averageProfit, recipeData.priceData.craftingCosts)
-            row.concentrationWeight = CraftSim.AVERAGEPROFIT:GetConcentrationWeight(recipeData, averageProfit)
             recipeData.resultData:Update() -- switch back
             row.concentrationCost = recipeData.concentrationCost
             concentrationCostColumn.text:SetText(row.concentrationCost)
             concentrationValueColumn.text:SetText(GUTIL:FormatMoney(row.concentrationWeight, true))
 
+            averageProfitColumn.text:SetText(GUTIL:FormatMoney(averageProfit, true, relativeTo, true))
+
             if CraftSim.DB.OPTIONS:Get("RECIPESCAN_OPTIMIZE_PROFESSION_TOOLS") then
                 if recipeData.professionGearSet:IsEquipped() then
                     topGearColumn.equippedText:Show()

Util/Const.lua

@@ -348,6 +348,7 @@ CraftSim.CONST.GENERAL_OPTIONS = {
     RECIPESCAN_OPTIMIZE_SUBRECIPES = "RECIPESCAN_OPTIMIZE_SUBRECIPES",
     RECIPESCAN_USE_INSIGHT = "RECIPESCAN_USE_INSIGHT",
     RECIPESCAN_INCLUDED_PROFESSIONS = "RECIPESCAN_INCLUDED_PROFESSIONS",
+    RECIPESCAN_ENABLE_CONCENTRATION = "RECIPESCAN_ENABLE_CONCENTRATION",
 
     -- PROFIT CALCULATION
     PROFIT_CALCULATION_MULTICRAFT_CONSTANT = "PROFIT_CALCULATION_MULTICRAFT_CONSTANT",
@@ -436,6 +437,7 @@ CraftSim.CONST.GENERAL_OPTIONS_DEFAULTS = {
     [CraftSim.CONST.GENERAL_OPTIONS.RECIPESCAN_OPTIMIZE_SUBRECIPES] = false,
     [CraftSim.CONST.GENERAL_OPTIONS.RECIPESCAN_USE_INSIGHT] = false,
     [CraftSim.CONST.GENERAL_OPTIONS.RECIPESCAN_INCLUDED_PROFESSIONS] = {},
+    [CraftSim.CONST.GENERAL_OPTIONS.RECIPESCAN_ENABLE_CONCENTRATION] = true,
 
     -- PROFIT CALCULATION
     [CraftSim.CONST.GENERAL_OPTIONS.PROFIT_CALCULATION_MULTICRAFT_CONSTANT] = CraftSim.CONST.MULTICRAFT_CONSTANT,