Fix FullDPS count and Minion selections not persisting

The fullDPS count wasn't persisting when importing
Minion Item sets selections and also minion index were not persisting

Author: LocalIdentity

spec/System/TestImportReimport_spec.lua

@@ -131,6 +131,33 @@ Added Fire Damage 1/0 DISABLED 1
 		assert.is_false(socketGroup.gemList[3].enabled)
 	end)
 
+	it("preserves active skill count when reimporting items and skills", function()
+		build.skillsTab:PasteSocketGroup([[
+Slot: Helmet
+Cleave 1/0  1
+Heavy Strike 1/0  1
+Added Fire Damage 1/0 DISABLED 1
+]])
+		runCallback("OnFrame")
+
+		local socketGroup = build.skillsTab.socketGroupList[1]
+		socketGroup.includeInFullDPS = true
+		socketGroup.mainActiveSkill = 2
+		socketGroup.gemList[2].count = 7
+		runCallback("OnFrame")
+
+		reimportSocketedItemsWithOptions("Iron Hat", "Helm", {
+			makeSocketedGemEntry(0, false, "Cleave", 1),
+			makeSocketedGemEntry(1, false, "Heavy Strike", 1),
+			makeSocketedGemEntry(2, true, "Added Fire Damage Support", 2),
+		}, false)
+
+		socketGroup = build.skillsTab.socketGroupList[1]
+		assert.are.equal("Helmet", socketGroup.slot)
+		assert.are.equal(2, socketGroup.mainActiveSkill)
+		assert.are.equal(7, socketGroup.gemList[2].count)
+	end)
+
 	it("preserves full DPS state and disabled gems when reimporting with deleted equipment", function()
 		build.skillsTab:PasteSocketGroup([[
 Slot: Helmet
@@ -223,4 +250,14 @@ Blight 20/0  1
 	it("preserves minion skill when reimporting items and skills", function()
 		assertReimportPreservesSkillSubstate("Gloves", "Rawhide Gloves", "Gloves", "Summon Chaos Golem", "skillMinionSkill", 3)
 	end)
+
+	it("preserves minion type selection when reimporting items and skills", function()
+		assertReimportPreservesSkillSubstate("Gloves", "Rawhide Gloves", "Gloves", "Summon Skeletons", "skillMinion", "RaisedSkeletonCaster")
+	end)
+
+	it("preserves minion item set selection when reimporting items and skills", function()
+		local itemSet = build.itemsTab:NewItemSet()
+		table.insert(build.itemsTab.itemSetOrderList, itemSet.id)
+		assertReimportPreservesSkillSubstate("Weapon 1", "Driftwood Wand", "Weapon", "Animate Weapon", "skillMinionItemSet", itemSet.id)
+	end)
 end)

src/Classes/ImportTab.lua

@@ -808,12 +808,17 @@ local function snapshotSocketGroupReimportState(socketGroup, isMainGroup)
 	for gemIndex, gem in ipairs(socketGroup.gemList) do
 		gemStates[gemIndex] = {
 			enabled = gem.enabled,
+			count = gem.count,
 			skillPart = gem.skillPart,
 			skillPartCalcs = gem.skillPartCalcs,
 			skillStageCount = gem.skillStageCount,
 			skillStageCountCalcs = gem.skillStageCountCalcs,
 			skillMineCount = gem.skillMineCount,
 			skillMineCountCalcs = gem.skillMineCountCalcs,
+			skillMinion = gem.skillMinion,
+			skillMinionCalcs = gem.skillMinionCalcs,
+			skillMinionItemSet = gem.skillMinionItemSet,
+			skillMinionItemSetCalcs = gem.skillMinionItemSetCalcs,
 			skillMinionSkill = gem.skillMinionSkill,
 			skillMinionSkillCalcs = gem.skillMinionSkillCalcs,
 			enableGlobal1 = gem.enableGlobal1,
@@ -834,12 +839,17 @@ end
 
 local function applyGemReimportState(gem, state)
 	gem.enabled = state.enabled
+	gem.count = state.count
 	gem.skillPart = state.skillPart
 	gem.skillPartCalcs = state.skillPartCalcs
 	gem.skillStageCount = state.skillStageCount
 	gem.skillStageCountCalcs = state.skillStageCountCalcs
 	gem.skillMineCount = state.skillMineCount
 	gem.skillMineCountCalcs = state.skillMineCountCalcs
+	gem.skillMinion = state.skillMinion
+	gem.skillMinionCalcs = state.skillMinionCalcs
+	gem.skillMinionItemSet = state.skillMinionItemSet
+	gem.skillMinionItemSetCalcs = state.skillMinionItemSetCalcs
 	gem.skillMinionSkill = state.skillMinionSkill
 	gem.skillMinionSkillCalcs = state.skillMinionSkillCalcs
 	gem.enableGlobal1 = state.enableGlobal1