Skip to content

Commit bcc357d

Browse files
derfloh205derfloh205
authored
Fix/bugfixes (#683)
* #603 * migration utility * news * #676 * #682 * news * #617 * #452 * debug removal * gear fix * #602
1 parent 87ee554 commit bcc357d

File tree

15 files changed

+79
-93
lines changed

15 files changed

+79
-93
lines changed

‎Classes/ProfessionGear.lua

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---@class CraftSim
22
local CraftSim = select(2, ...)
33

4+
local L = CraftSim.UTIL:GetLocalizer()
5+
46
---@class CraftSim.ProfessionGear : CraftSim.CraftSimObject
57
---@overload fun():CraftSim.ProfessionGear
68
CraftSim.ProfessionGear = CraftSim.CraftSimObject:extend()
@@ -46,6 +48,7 @@ function CraftSim.ProfessionGear:SetItem(itemLink)
4648
self.professionStats.multicraft.value = extractedStats.ITEM_MOD_MULTICRAFT_SHORT or 0
4749
self.professionStats.resourcefulness.value = extractedStats.ITEM_MOD_RESOURCEFULNESS_SHORT or 0
4850
self.professionStats.craftingspeed.value = extractedStats.ITEM_MOD_CRAFTING_SPEED_SHORT or 0
51+
self.professionStats.ingenuity.value = extractedStats.ITEM_MOD_INGENUITY_SHORT or 0
4952

5053
local itemID = self.item:GetItemID()
5154
if CraftSim.CONST.SPECIAL_TOOL_STATS[itemID] then
@@ -62,10 +65,11 @@ function CraftSim.ProfessionGear:SetItem(itemLink)
6265
resourcefulness = 0,
6366
multicraft = 0,
6467
}
65-
local equipMatchString = CraftSim.LOCAL:GetText(CraftSim.CONST.TEXT.EQUIP_MATCH_STRING)
66-
local enchantedMatchString = CraftSim.LOCAL:GetText(CraftSim.CONST.TEXT.ENCHANTED_MATCH_STRING)
67-
local resourcefulnessMatchString = CraftSim.LOCAL:GetText(CraftSim.CONST.TEXT.STAT_RESOURCEFULNESS)
68-
local multicraftMatchString = CraftSim.LOCAL:GetText(CraftSim.CONST.TEXT.STAT_MULTICRAFT)
68+
local equipMatchString = L(CraftSim.CONST.TEXT.EQUIP_MATCH_STRING)
69+
local enchantedMatchString = L(CraftSim.CONST.TEXT.ENCHANTED_MATCH_STRING)
70+
local resourcefulnessMatchString = L(CraftSim.CONST.TEXT.STAT_RESOURCEFULNESS)
71+
local multicraftMatchString = L(CraftSim.CONST.TEXT.STAT_MULTICRAFT)
72+
local ingenuityMatchString = L(CraftSim.CONST.TEXT.STAT_INGENUITY)
6973
--print("TooltipData lines:")
7074
--print(tooltipData.lines, true)
7175
for _, line in pairs(tooltipData.lines) do
@@ -82,6 +86,8 @@ function CraftSim.ProfessionGear:SetItem(itemLink)
8286
parsedEnchantingStats.resourcefulness = tonumber(string.match(lineText, "%+(%d+)")) or 0
8387
elseif string.find(lineText, multicraftMatchString) then
8488
parsedEnchantingStats.multicraft = tonumber(string.match(lineText, "%+(%d+)")) or 0
89+
elseif string.find(lineText, ingenuityMatchString) then
90+
parsedEnchantingStats.ingenuity = tonumber(string.match(lineText, "%+(%d+)")) or 0
8591
end
8692
end
8793
end
@@ -98,6 +104,10 @@ function CraftSim.ProfessionGear:SetItem(itemLink)
98104
if parsedEnchantingStats.multicraft then
99105
self.professionStats.multicraft.value = self.professionStats.multicraft.value + parsedEnchantingStats.multicraft
100106
end
107+
108+
if parsedEnchantingStats.ingenuity then
109+
self.professionStats.ingenuity.value = self.professionStats.ingenuity.value + parsedEnchantingStats.ingenuity
110+
end
101111
end
102112

103113
function CraftSim.ProfessionGear:Copy()

‎Classes/ReagentData.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,7 @@ function CraftSim.ReagentData:GetTooltipText(multiplier, crafterUID)
494494
local text = ""
495495

496496
-- TODO: Remove after 11.0.5
497-
local excludeWarbankTemp = self.recipeData.orderData and
498-
CraftSim.DB.OPTIONS:Get("CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK")
497+
local excludeWarbankTemp = false
499498

500499
for _, requiredReagent in pairs(self.requiredReagents) do
501500
local reagentIcon = requiredReagent.items[1].item:GetItemIcon()

‎Classes/RecipeData.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ function CraftSim.RecipeData:CanCraft(amount)
14851485
end
14861486

14871487
-- TODO: Remove after 11.0.5
1488-
local excludeWarbankTemp = self.orderData and CraftSim.DB.OPTIONS:Get("CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK")
1488+
local excludeWarbankTemp = false
14891489

14901490
-- check amount of reagents in players inventory + bank
14911491
local hasEnoughReagents = self.reagentData:HasEnough(amount, self:GetCrafterUID(), excludeWarbankTemp)

‎DB/DB.lua

+11
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,14 @@ function CraftSim.DB:ClearAll()
7272
repository:ClearAll()
7373
end
7474
end
75+
76+
---@param db CraftSimDB.Database
77+
---@return fun(from: number, to:number, migrate: function)
78+
function CraftSim.DB:GetMigrateFunction(db)
79+
return function(from, to, migrate)
80+
if db.version == from then
81+
migrate()
82+
db.version = to
83+
end
84+
end
85+
end

‎DB/optionsDB.lua

+29-60
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ function CraftSim.DB.OPTIONS:Init()
2525
end
2626

2727
function CraftSim.DB.OPTIONS:Migrate()
28-
-- 0 -> 1
29-
if CraftSimDB.optionsDB.version == 0 then
30-
-- move old saved variable to new db if it exists, otherwise init new table
28+
local migrate = CraftSim.DB:GetMigrateFunction(CraftSimDB.optionsDB)
29+
30+
31+
migrate(0, 1, function()
3132
CraftSimDB.optionsDB.data = {}
3233
local CraftSimOptions = _G["CraftSimOptions"]
3334
if CraftSimOptions then
@@ -189,96 +190,61 @@ function CraftSim.DB.OPTIONS:Migrate()
189190
CraftSimDB.optionsDB.data[CraftSim.CONST.GENERAL_OPTIONS.DEBUG_AUTO_SCROLL] =
190191
CraftSimOptions.debugAutoScroll
191192
end
193+
end)
192194

193-
194-
CraftSimDB.optionsDB.version = 1
195-
end
196-
197-
-- 1 -> 2
198-
if CraftSimDB.optionsDB.version == 1 then
195+
migrate(1, 2, function()
199196
if _G["CraftSimGGUIConfig"] then
200197
self:Save("GGUI_CONFIG", _G["CraftSimGGUIConfig"])
201198
end
202199
if _G["CraftSimLibIconDB"] then
203200
self:Save("LIB_ICON_DB", _G["CraftSimLibIconDB"])
204201
end
205-
CraftSimDB.optionsDB.version = 2
206-
end
202+
end)
207203

208-
if CraftSimDB.optionsDB.version == 2 then
204+
migrate(2, 3, function()
209205
CraftSimDB.optionsDB.data["MODULE_CUSTOMER_SERVICE"] = nil
210206
CraftSimDB.optionsDB.data["CUSTOMER_SERVICE_WHISPER_FORMAT"] = nil
211207
CraftSimDB.optionsDB.data["CUSTOMER_SERVICE_ALLOW_LIVE_PREVIEW"] = nil
212208
CraftSimDB.optionsDB.data["CUSTOMER_SERVICE_ACTIVE_PREVIEW_IDS"] = nil
209+
end)
213210

214-
CraftSimDB.optionsDB.version = 3
215-
end
216-
217-
if CraftSimDB.optionsDB.version == 3 then
211+
migrate(3, 4, function()
218212
CraftSimDB.optionsDB.data["RECIPESCAN_SORT_MODE"] = "PROFIT"
219213
CraftSimDB.optionsDB.data["RECIPESCAN_SORT_BY_PROFIT_MARGIN"] = nil
220-
221-
CraftSimDB.optionsDB.version = 4
222-
end
223-
224-
if CraftSimDB.optionsDB.version == 4 then
214+
end)
215+
migrate(4, 5, function()
225216
CraftSimDB.optionsDB.data["CRAFTQUEUE_SHOPPING_LIST_TARGET_MODE"] = nil
226217
CraftSimDB.optionsDB.data["CRAFTQUEUE_GENERAL_RESTOCK_TARGET_MODE_CRAFTOFFSET"] = nil
218+
end)
227219

228-
CraftSimDB.optionsDB.version = 5
229-
end
230-
231-
-- migrate constant change
232-
if CraftSimDB.optionsDB.version == 5 then
220+
migrate(5, 6, function()
233221
if CraftSimDB.optionsDB.data["PROFIT_CALCULATION_MULTICRAFT_CONSTANT"] == 2.5 then
234222
CraftSimDB.optionsDB.data["PROFIT_CALCULATION_MULTICRAFT_CONSTANT"] = 2.5
235223
end
236-
237-
CraftSimDB.optionsDB.version = 6
238-
end
239-
240-
-- migrate constant change .. again
241-
if CraftSimDB.optionsDB.version == 6 then
224+
end)
225+
migrate(6, 7, function()
242226
if CraftSimDB.optionsDB.data["PROFIT_CALCULATION_MULTICRAFT_CONSTANT"] == 2.2 then
243227
CraftSimDB.optionsDB.data["PROFIT_CALCULATION_MULTICRAFT_CONSTANT"] = 2.5
244228
end
245-
246-
CraftSimDB.optionsDB.version = 7
247-
end
248-
249-
-- migrate constant change .. again .. let it take default
250-
if CraftSimDB.optionsDB.version == 7 then
229+
end)
230+
migrate(7, 8, function()
251231
CraftSimDB.optionsDB.data["PROFIT_CALCULATION_MULTICRAFT_CONSTANT"] = nil
252-
253-
CraftSimDB.optionsDB.version = 8
254-
end
255-
256-
-- option removal
257-
if CraftSimDB.optionsDB.version == 8 then
232+
end)
233+
migrate(8, 9, function()
258234
CraftSimDB.optionsDB.data["CRAFTQUEUE_SHOPPING_LIST_PER_CHARACTER"] = nil
259-
CraftSimDB.optionsDB.version = 9
260-
end
261-
262-
-- rename material -> reagent
263-
if CraftSimDB.optionsDB.version == 8 then
264235
CraftSimDB.optionsDB.data["TSM_PRICE_KEY_REAGENTS"] = CraftSimDB.optionsDB.data["TSM_PRICE_KEY_MATERIALS"]
265236
CraftSimDB.optionsDB.data["MODULE_REAGENT_OPTIMIZATION"] = CraftSimDB.optionsDB.data["MODULE_MATERIALS"]
266-
CraftSimDB.optionsDB.version = 9
267-
end
268-
269-
-- option removal
270-
if CraftSimDB.optionsDB.version == 9 then
237+
end)
238+
migrate(9, 10, function()
271239
CraftSimDB.optionsDB.data["RECIPESCAN_IMPORT_ALL_PROFESSIONS"] = nil
272240
CraftSimDB.optionsDB.data["CRAFTQUEUE_GENERAL_RESTOCK_RESTOCK_AMOUNT"] = nil
273241
CraftSimDB.optionsDB.data["CRAFTQUEUE_GENERAL_RESTOCK_PROFIT_MARGIN_THRESHOLD"] = nil
274242
CraftSimDB.optionsDB.data["CRAFTQUEUE_GENERAL_RESTOCK_SALE_RATE_THRESHOLD"] = nil
275243
CraftSimDB.optionsDB.data["CRAFTQUEUE_GENERAL_RESTOCK_TARGET_MODE_CRAFTOFFSET"] = nil
276244
CraftSimDB.optionsDB.data["CRAFTQUEUE_RESTOCK_PER_RECIPE_OPTIONS"] = nil
277-
CraftSimDB.optionsDB.version = 10
278-
end
245+
end)
279246

280-
if CraftSimDB.optionsDB.version == 10 then
281-
--CraftSimDB.optionsDB.data["CRAFTQUEUE_WORK_ORDERS_ORDER_TYPE"] = CraftSimDB.optionsDB.data["CRAFTQUEUE_PATRON_ORDERS_ORDER_TYPE"]
247+
migrate(10, 11, function()
282248
CraftSimDB.optionsDB.data["CRAFTQUEUE_WORK_ORDERS_FORCE_CONCENTRATION"] = CraftSimDB.optionsDB.data
283249
["CRAFTQUEUE_PATRON_ORDERS_FORCE_CONCENTRATION"]
284250
CraftSimDB.optionsDB.data["CRAFTQUEUE_PATRON_ORDERS_FORCE_CONCENTRATION"] = nil
@@ -290,8 +256,11 @@ function CraftSim.DB.OPTIONS:Migrate()
290256
CraftSimDB.optionsDB.data["CRAFTQUEUE_WORK_ORDERS_ALLOW_CONCENTRATION"] = CraftSimDB.optionsDB.data
291257
["CRAFTQUEUE_PATRON_ORDERS_ALLOW_CONCENTRATION"]
292258
CraftSimDB.optionsDB.data["CRAFTQUEUE_PATRON_ORDERS_ALLOW_CONCENTRATION"] = nil
293-
CraftSimDB.optionsDB.version = 11
294-
end
259+
end)
260+
261+
migrate(11, 12, function()
262+
CraftSimDB.optionsDB.data["CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK"] = nil
263+
end)
295264
end
296265

297266
function CraftSim.DB.OPTIONS:CleanUp()

‎Data/News.lua

+7
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ function CraftSim.NEWS:GET_NEWS(itemMap)
1818
f.bb(" Hello and thank you for using CraftSim!\n"),
1919
f.bb(" ( You are awesome! )"),
2020
newP("19.4.1"),
21+
f.p .. "Fixed " .. f.bb("Profession Gear") .. " Ingenuity Recognition",
22+
f.p .. "Fixed " .. f.bb("CraftQueue") .. " Include Augment Rune Option",
23+
f.p .. "Fixed " .. f.bb("Recipe Scan") .. " Reagent Allocation Radio Buttons",
24+
f.p .. "Fixed " .. f.bb("Shopping List Creation") .. " Optional Reagents Count",
25+
f.p .. "Fixed " .. f.bb("Concentration Tracker") .. " Position Memory",
26+
f.p .. "Fixed " .. f.bb("Cooldowns Module") .. " Position Memory",
27+
f.p .. "Removed Workaround Option for 11.0.5",
2128
f.p .. "Locals Update",
2229
f.a .. "- " .. f.bb("frFR") .. " by: " .. f.bb("https://github.com/netouss"),
2330
newP("19.4.0"),

‎Libs/GGUI

Submodule GGUI updated 1 file

‎Locals/enUS.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ function CraftSim.LOCAL_EN:GetData()
186186
[CraftSim.CONST.TEXT.SPEC_INFO_TITLE] = "CraftSim Specialization Info",
187187
[CraftSim.CONST.TEXT.SPEC_INFO_SIMULATE_KNOWLEDGE_DISTRIBUTION] = "Simulate Knowledge Distribution",
188188
[CraftSim.CONST.TEXT.SPEC_INFO_NODE_TOOLTIP] = "This node grants you following stats for this recipe:",
189-
[CraftSim.CONST.TEXT.SPEC_INFO_WORK_IN_PROGRESS] = "Specialization Info\nWork in Progress",
189+
[CraftSim.CONST.TEXT.SPEC_INFO_WORK_IN_PROGRESS] = "No Data Available",
190190

191191
-- Crafting Results Frame
192192
[CraftSim.CONST.TEXT.CRAFT_RESULTS_TITLE] = "CraftSim Crafting Results",

‎Modules/CraftQueue/CraftQueue.lua

+5-4
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function CraftSim.CRAFTQ:CRAFTINGORDERS_CLAIMED_ORDER_REMOVED()
127127
self.UI:UpdateDisplay()
128128
end
129129

130-
function CraftSim.CRAFTQ:QueuePatronOrders()
130+
function CraftSim.CRAFTQ:QueueWorkOrders()
131131
local profession = C_TradeSkillUI.GetChildProfessionInfo().profession
132132
local orderType = CraftSim.DB.OPTIONS:Get("CRAFTQUEUE_WORK_ORDERS_ORDER_TYPE")
133133
if C_TradeSkillUI.IsNearProfessionSpellFocus(profession) then
@@ -202,7 +202,7 @@ function CraftSim.CRAFTQ:QueuePatronOrders()
202202
CraftSim.CONST.PATRON_ORDERS_KNOWLEDGE_REWARD_ITEMS,
203203
itemID)
204204
local acuityContained = itemID == 210814
205-
local runeContained = itemID == 224672
205+
local runeContained = itemID == 224572
206206
if not acuityAllowed and acuityContained then
207207
return false
208208
end
@@ -551,7 +551,7 @@ function CraftSim.CRAFTQ.CreateAuctionatorShoppingList()
551551
reagentMap[itemID] = reagentMap[itemID] or {
552552
itemName = optionalReagent.item:GetItemName(),
553553
qualityID = qualityID,
554-
quantity = allocatedQuantity
554+
quantity = 0
555555
}
556556
reagentMap[itemID].quantity = reagentMap[itemID]
557557
.quantity + allocatedQuantity * craftQueueItem.amount
@@ -566,7 +566,7 @@ function CraftSim.CRAFTQ.CreateAuctionatorShoppingList()
566566
local crafterUIDs = GUTIL:ToSet(crafterUIDs)
567567

568568
-- TODO: Remove after 11.0.5
569-
local excludeWarbankTemp = CraftSim.DB.OPTIONS:Get("CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK")
569+
local excludeWarbankTemp = false
570570

571571
--- convert to Auctionator Search Strings and deduct item count (of all crafters total)
572572
local searchStrings = GUTIL:Map(reagentMap, function(info, itemID)
@@ -588,6 +588,7 @@ function CraftSim.CRAFTQ.CreateAuctionatorShoppingList()
588588
tier = info.qualityID,
589589
quantity = math.max(info.quantity - (tonumber(totalItemCount) or 0), 0),
590590
isExact = true,
591+
debug = tostring(info.quantity) .. " - " .. tostring((tonumber(totalItemCount) or 0)),
591592
}
592593
if searchTerm.quantity == 0 then
593594
return nil -- do not put into table

‎Modules/CraftQueue/UI.lua

+1-15
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ function CraftSim.CRAFTQ.UI:Init()
574574
sizeX = fixedButtonWidth,
575575
label = L(CraftSim.CONST.TEXT.CRAFT_QUEUE_ADD_WORK_ORDERS_BUTTON_LABEL),
576576
clickCallback = function()
577-
CraftSim.CRAFTQ:QueuePatronOrders()
577+
CraftSim.CRAFTQ:QueueWorkOrders()
578578
end
579579
})
580580

@@ -687,20 +687,6 @@ function CraftSim.CRAFTQ.UI:Init()
687687
GameTooltip_AddInstructionLine(tooltip,
688688
"Include Orders with Augment Rune Rewards");
689689
end);
690-
691-
local warbankCB = rootDescription:CreateCheckbox(
692-
"Exclude " .. f.bb("Warbank") .. " Reagents from Shopping List (Temp)",
693-
function()
694-
return CraftSim.DB.OPTIONS:Get("CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK")
695-
end, function()
696-
local value = CraftSim.DB.OPTIONS:Get("CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK")
697-
CraftSim.DB.OPTIONS:Save("CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK", not value)
698-
end)
699-
700-
warbankCB:SetTooltip(function(tooltip, elementDescription)
701-
GameTooltip_AddInstructionLine(tooltip,
702-
"Ignore Warbank Reagents when creating Shopping List (Temporary Workaround until 11.0.5)");
703-
end);
704690
end)
705691
end
706692
}

‎Modules/Explanations/UI.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function CraftSim.EXPLANATIONS.UI:Init()
4242
frame.content.profitExplanationTab.content.description = GGUI.Text {
4343
parent = frame.content.profitExplanationTab.content, anchorParent = frame.content.profitExplanationTab.content,
4444
text = L(CraftSim.CONST.TEXT.EXPLANATIONS_PROFIT_CALCULATION_EXPLANATION), anchorA = "TOPLEFT", anchorB = "TOPLEFT",
45-
offsetY = -20, justifyOptions = { type = "H", align = "LEFT" }
45+
offsetY = -20, justifyOptions = { type = "H", align = "LEFT" }, wrap = true
4646
}
4747

4848

‎Modules/RecipeScan/UI.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -535,9 +535,9 @@ function CraftSim.RECIPE_SCAN.UI:CreateProfessionTabContent(row, content)
535535
end)
536536

537537
reagentAllocation:CreateRadio("All " .. GUTIL:GetQualityIconString(3, 20, 20), function()
538-
return CraftSim.DB.OPTIONS:Get("RECIPESCAN_SCAN_MODE") == CraftSim.RECIPE_SCAN.SCAN_MODES.Q2
538+
return CraftSim.DB.OPTIONS:Get("RECIPESCAN_SCAN_MODE") == CraftSim.RECIPE_SCAN.SCAN_MODES.Q3
539539
end, function()
540-
CraftSim.DB.OPTIONS:Save("RECIPESCAN_SCAN_MODE", CraftSim.RECIPE_SCAN.SCAN_MODES.Q2)
540+
CraftSim.DB.OPTIONS:Save("RECIPESCAN_SCAN_MODE", CraftSim.RECIPE_SCAN.SCAN_MODES.Q3)
541541
end)
542542

543543
reagentAllocation:CreateRadio(L("RECIPE_SCAN_MODE_OPTIMIZE"), function()

‎Modules/SpecializationInfo/UI.lua

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ function CraftSim.SPECIALIZATION_INFO.UI:Init()
8989
justifyOptions = { type = 'H', align = "LEFT" },
9090
offsetX = 20,
9191
offsetY = -35,
92+
wrap = true,
9293
})
9394

9495
frame.content.nodeList = GGUI.FrameList {
@@ -120,6 +121,7 @@ function CraftSim.SPECIALIZATION_INFO.UI:Init()
120121
nameColumn.text = GGUI.Text {
121122
parent = nameColumn, anchorParent = nameColumn.iconTexture.frame, justifyOptions = { type = "H", align = "LEFT" },
122123
anchorA = "LEFT", anchorB = "RIGHT", offsetX = 2,
124+
fixedWidth = 170,
123125
}
124126

125127
rankColumn.text = GGUI.Text {

‎Util/Const.lua

-2
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ CraftSim.CONST.GENERAL_OPTIONS = {
386386
CRAFTQUEUE_PATRON_ORDERS_KNOWLEDGE_POINTS = "CRAFTQUEUE_PATRON_ORDERS_KNOWLEDGE_POINTS",
387387
CRAFTQUEUE_PATRON_ORDERS_ACUITY = "CRAFTQUEUE_PATRON_ORDERS_ACUITY",
388388
CRAFTQUEUE_PATRON_ORDERS_POWER_RUNE = "CRAFTQUEUE_PATRON_ORDERS_POWER_RUNE",
389-
CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK = "CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK",
390389
CRAFTQUEUE_WORK_ORDERS_ALLOW_CONCENTRATION = "CRAFTQUEUE_WORK_ORDERS_ALLOW_CONCENTRATION",
391390
CRAFTQUEUE_WORK_ORDERS_FORCE_CONCENTRATION = "CRAFTQUEUE_WORK_ORDERS_FORCE_CONCENTRATION",
392391
CRAFTQUEUE_WORK_ORDERS_ORDER_TYPE = "CRAFTQUEUE_WORK_ORDERS_ORDER_TYPE",
@@ -522,7 +521,6 @@ CraftSim.CONST.GENERAL_OPTIONS_DEFAULTS = {
522521
[CraftSim.CONST.GENERAL_OPTIONS.CRAFTQUEUE_PATRON_ORDERS_KNOWLEDGE_POINTS] = true,
523522
[CraftSim.CONST.GENERAL_OPTIONS.CRAFTQUEUE_PATRON_ORDERS_ACUITY] = true,
524523
[CraftSim.CONST.GENERAL_OPTIONS.CRAFTQUEUE_PATRON_ORDERS_POWER_RUNE] = true,
525-
[CraftSim.CONST.GENERAL_OPTIONS.CRAFTQUEUE_PATRON_ORDERS_EXCLUDE_WARBANK] = true,
526524
[CraftSim.CONST.GENERAL_OPTIONS.CRAFTQUEUE_WORK_ORDERS_ALLOW_CONCENTRATION] = true,
527525
[CraftSim.CONST.GENERAL_OPTIONS.CRAFTQUEUE_WORK_ORDERS_FORCE_CONCENTRATION] = false,
528526
[CraftSim.CONST.GENERAL_OPTIONS.CRAFTQUEUE_WORK_ORDERS_ORDER_TYPE] = Enum.CraftingOrderType.Npc,

‎Util/Frames.lua

+3
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ function CraftSim.FRAME:RestoreModulePositions()
8181
CraftSim.STATISTICS.frameNO_WO:RestoreSavedConfig(ProfessionsFrame.CraftingPage)
8282
CraftSim.STATISTICS.frameWO:RestoreSavedConfig(ProfessionsFrame.OrdersPage.OrderView.OrderDetails.SchematicForm)
8383
CraftSim.EXPLANATIONS.frame:RestoreSavedConfig(ProfessionsFrame)
84+
CraftSim.COOLDOWNS.frame:RestoreSavedConfig(ProfessionsFrame)
85+
86+
CraftSim.CONCENTRATION_TRACKER.trackerFrame:RestoreSavedConfig(CraftSim.CONCENTRATION_TRACKER.frame.frame)
8487
end
8588

8689
function CraftSim.FRAME:ResetFrames()

0 commit comments

Comments
 (0)