Skip to content

Commit 0398fcb

Browse files
committed
visual fixes
1 parent eed0cfb commit 0398fcb

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

Classes/RecipeData.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ function CraftSim.RecipeData:new(options)
118118
return nil
119119
end
120120

121-
self.isBaseRecraftRecipe = GUTIL:Some(CraftSim.CONST.BASE_RECRAFT_RECIPE_IDS,
122-
function(id) return id == recipeID end)
121+
self.isBaseRecraftRecipe = self.recipeInfo.isRecraft and not self.recipeInfo.hasSingleItemOutput
123122
self.categoryID = self.recipeInfo.categoryID
124123
--- Will be set when something calculates the average profit of this recipe or updates the whole recipe, can be used to access it without recalculating everything
125124
---@type number | nil

Init/Init.lua

+15-2
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,11 @@ function CraftSim.INIT:HideAllModules(keepControlPanel)
507507
CraftSim.SIMULATION_MODE.UI.NO_WORKORDER.toggleButton:Hide()
508508
CraftSim.EXPLANATIONS.frame:Hide()
509509
CraftSim.STATISTICS.UI:SetVisible(false)
510+
511+
CraftSim.CRAFTQ.queueRecipeButton:Hide()
512+
CraftSim.CRAFTQ.queueRecipeButtonWO:Hide()
513+
CraftSim.CRAFTQ.queueRecipeButtonOptions:Hide()
514+
CraftSim.CRAFTQ.queueRecipeButtonOptionsWO:Hide()
510515
end
511516

512517
function CraftSim.INIT:TriggerModulesByRecipeType()
@@ -531,6 +536,14 @@ function CraftSim.INIT:TriggerModulesByRecipeType()
531536
local craftBuffsFrame = CraftSim.GGUI:GetFrame(CraftSim.INIT.FRAMES, CraftSim.CONST.FRAMES.CRAFT_BUFFS)
532537
local craftBuffsFrameWO = CraftSim.GGUI:GetFrame(CraftSim.INIT.FRAMES, CraftSim.CONST.FRAMES.CRAFT_BUFFS_WORKORDER)
533538

539+
-- pre hide
540+
CraftSim.CRAFTQ.queueRecipeButton:Hide()
541+
CraftSim.CRAFTQ.queueRecipeButtonWO:Hide()
542+
CraftSim.CRAFTQ.queueRecipeButtonOptions:Hide()
543+
CraftSim.CRAFTQ.queueRecipeButtonOptionsWO:Hide()
544+
CraftSim.SIMULATION_MODE.UI.WORKORDER.toggleButton:Hide()
545+
CraftSim.SIMULATION_MODE.UI.NO_WORKORDER.toggleButton:Hide()
546+
534547
if C_TradeSkillUI.IsNPCCrafting() or C_TradeSkillUI.IsRuneforging() or C_TradeSkillUI.IsTradeSkillLinked() or C_TradeSkillUI.IsTradeSkillGuild() then
535548
CraftSim.INIT:HideAllModules()
536549
return
@@ -545,7 +558,7 @@ function CraftSim.INIT:TriggerModulesByRecipeType()
545558

546559
local recipeInfo = C_TradeSkillUI.GetRecipeInfo(CraftSim.INIT.currentRecipeID)
547560

548-
if not recipeInfo or recipeInfo.isGatheringRecipe then
561+
if not recipeInfo or recipeInfo.isGatheringRecipe or recipeInfo.isDummyRecipe then
549562
-- hide all modules
550563
CraftSim.INIT:HideAllModules(true)
551564
return
@@ -635,7 +648,7 @@ function CraftSim.INIT:TriggerModulesByRecipeType()
635648
if not recipeData.isCooking and not recipeData.isOldWorldRecipe then
636649
showSpecInfo = true
637650
end
638-
showSimulationMode = not recipeData.isOldWorldRecipe
651+
showSimulationMode = not recipeData.isOldWorldRecipe and not recipeData.isBaseRecraftRecipe
639652

640653
showReagentOptimization = showReagentOptimization and CraftSim.DB.OPTIONS:Get("MODULE_REAGENT_OPTIMIZATION")
641654
showAverageProfit = showAverageProfit and CraftSim.DB.OPTIONS:Get("MODULE_AVERAGE_PROFIT")

Modules/CraftQueue/UI.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ function CraftSim.CRAFTQ.UI:Init()
993993
end,
994994
}
995995

996-
CraftSim.CRAFTQ.queueRecipeButtonOptions = GGUI.Button {
996+
CraftSim.CRAFTQ.queueRecipeButtonOptionsWO = GGUI.Button {
997997
parent = ProfessionsFrame.OrdersPage.OrderView.OrderDetails.SchematicForm,
998998
anchorPoints = { {
999999
anchorParent = CraftSim.CRAFTQ.queueRecipeButtonWO.frame,

0 commit comments

Comments
 (0)