Add saving and item set functionality to rune selectors

Author: vaisest

src/Classes/DropDownControl.lua

@@ -127,16 +127,22 @@ function DropDownClass:DrawSearchHighlights(label, searchInfo, x, y, width, heig
 end
 
 
-function DropDownClass:SelByValue(value, key)
+function DropDownClass:SelByValue(value, key, callSelFunc)
 	for index, listVal in ipairs(self.list) do
 		if type(listVal) == "table" then
 			if listVal[key] == value then
 				self.selIndex = index
+				if callSelFunc and self.selFunc then
+					self.selFunc(index, self.list[index])
+				end
 				return
 			end
 		else
 			if listVal == value then
 				self.selIndex = index
+				if callSelFunc and self.selFunc then
+					self.selFunc(index, self.list[index])
+				end
 				return
 			end
 		end

src/Classes/ImportTab.lua

@@ -1027,7 +1027,7 @@ function ImportTabClass:ImportChakra(slotName, runeName)
 	local slot = self.build.itemsTab.runeSlots[slotName]
 	-- note that if the rune is not in ModRunes.lua, this will not select it
 	if slot then
-		slot:SelByValue(runeName, "name")
+		slot:SelByValue(runeName, "name", true)
 	end
 end
 

src/Classes/ItemsTab.lua

@@ -274,7 +274,8 @@ local ItemsTabClass = newClass("ItemsTab", "UndoHandler", "ControlHost", "Contro
 				local slotName = s_format("%s Rune #%d", slot.type, i)
 				local label = slotName:gsub(" Armour", ""):gsub("#", "")
 
-				local runeSlot = new("DropDownControl", { "TOPLEFT", prevSlot, "BOTTOMLEFT" }, {0, 2, 310, 20}, runeList[slot.type:lower()], function ()
+				local runeSlot = new("DropDownControl", { "TOPLEFT", prevSlot, "BOTTOMLEFT" }, {0, 2, 310, 20}, runeList[slot.type:lower()], function (_, value)
+					self.activeItemSet[slotName] = { runeName = value.name }
 					self.build.buildFlag = true
 				end)
 				runeSlot.anchor.collapse = true
@@ -1260,6 +1261,13 @@ function ItemsTabClass:Load(xml, dbFileName)
 						itemSet[slotName].active = child.attrib.active == "true"
 						itemSet[slotName].pbURL = child.attrib.itemPbURL or ""
 					end
+				elseif child.elem == "RuneSlot" then
+					local slotName = child.attrib.slotName or ""
+					local slot = itemSet[slotName]
+					if slot then
+						local runeName = child.attrib.runeName or "None"
+						slot.runeName = runeName
+					end
 				elseif child.elem == "SocketIdURL" then
 					local id = tonumber(child.attrib.nodeId)
 					itemSet[id] = { pbURL = child.attrib.itemPbURL or "" }
@@ -1352,6 +1360,11 @@ function ItemsTabClass:Save(xml)
 				end
 			end
 		end
+		for slotName, _ in pairs(self.runeSlots) do
+			local runeName = (itemSet[slotName] and itemSet[slotName].runeName) or "None"
+			local node = { elem = "RuneSlot", attrib = { slotName = slotName, runeName = runeName } }
+			t_insert(child, node)
+		end
 		t_insert(xml, child)
 	end
 	if self.tradeQuery.statSortSelectionList then
@@ -1525,6 +1538,9 @@ function ItemsTabClass:CreateItemSet(itemSetId, name)
 			itemSet[slotName] = { selItemId = 0 }
 		end
 	end
+	for slotName, _ in pairs(self.runeSlots) do
+		itemSet[slotName] = { runeName = "None" }
+	end
 	self.itemSets[itemSet.id] = itemSet
 	return itemSet
 end
@@ -1592,6 +1608,15 @@ function ItemsTabClass:SetActiveItemSet(itemSetId, deferSync)
 			end
 		end
 	end
+	for slotName, slot in pairs(self.runeSlots) do
+		if prevSet then
+			-- Update the previous set
+			prevSet[slotName] = { runeName = slot:GetSelValue().name }
+		end
+		-- Equip incoming set's rune
+		local currentRune = curSet[slotName] and curSet[slotName].runeName or "None"
+		slot:SelByValue(currentRune, "name", true)
+	end
 	self.build.buildFlag = true
 	self:PopulateSlots()
 	if not deferSync then

src/Modules/CalcSetup.lua

@@ -1327,7 +1327,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 		end
 
 		for augmentName, count in pairs(augmentCounts) do
-			local dbAugment = data.itemMods.Runes[augmentName]
+			local dbAugment = data.itemMods.Runes[augmentName] or {}
 			local _, dbMod = next(dbAugment)
 			if dbMod and dbMod.limit and count > dbMod.limit then
 				-- warn for going over augment limits