Fix minion imports

Author: LocalIdentity

spec/System/TestImportReimport_spec.lua

@@ -88,6 +88,7 @@ describe("TestImportReimport", function()
 
 	it("preserves full DPS state and manually disabled gems when reimporting items and skills", function()
 		build.skillsTab:PasteSocketGroup([[
+Slot: Gloves
 Dark Effigy 1/0  1
 Controlled Destruction 1/0 DISABLED 1
 ]])
@@ -197,4 +198,31 @@ Fireball 20/0  1
 	it("preserves minion skill when reimporting items and skills", function()
 		assertReimportPreservesSkillSubstate("Linen Wraps", "Gloves", "Skeletal Sniper", "skillMinionSkill", 2)
 	end)
+
+	it("preserves minion skill stat set when reimporting items and skills", function()
+		build.skillsTab:PasteSocketGroup([[
+Skeletal Sniper 20/0  1
+]])
+		runCallback("OnFrame")
+
+		local socketGroup = build.skillsTab.socketGroupList[1]
+		local activeEffect = socketGroup.displaySkillList[1].activeEffect
+		local grantedEffectId = activeEffect.grantedEffect.id
+		local srcInstance = activeEffect.srcInstance
+		srcInstance.skillMinionSkill = 2
+		srcInstance.skillMinionSkillCalcs = 2
+		srcInstance.skillMinionSkillStatSetIndexLookup = { [grantedEffectId] = { [2] = 3 } }
+		srcInstance.skillMinionSkillStatSetIndexLookupCalcs = { [grantedEffectId] = { [2] = 2 } }
+
+		reimportSingleGem("Linen Wraps", "Gloves", "Skeletal Sniper")
+
+		socketGroup = build.skillsTab.socketGroupList[1]
+		activeEffect = socketGroup.displaySkillList[1].activeEffect
+		grantedEffectId = activeEffect.grantedEffect.id
+		srcInstance = activeEffect.srcInstance
+		assert.are.equal(2, srcInstance.skillMinionSkill)
+		assert.are.equal(2, srcInstance.skillMinionSkillCalcs)
+		assert.are.equal(3, srcInstance.skillMinionSkillStatSetIndexLookup[grantedEffectId][2])
+		assert.are.equal(2, srcInstance.skillMinionSkillStatSetIndexLookupCalcs[grantedEffectId][2])
+	end)
 end)

src/Classes/ImportTab.lua

@@ -825,8 +825,6 @@ local function getSocketGroupReimportKey(socketGroup)
 		t_insert(gemNameParts, (gem.nameSpec or ""):lower())
 	end
 	return table.concat({
-		socketGroup.slot or "",
-		socketGroup.source or "",
 		tostring(#socketGroup.gemList),
 		table.concat(gemNameParts, SOCKET_GROUP_REIMPORT_KEY_SEPARATOR),
 	}, SOCKET_GROUP_REIMPORT_KEY_SEPARATOR)
@@ -850,6 +848,8 @@ local function snapshotSocketGroupReimportState(socketGroup, isMainGroup)
 			skillMinionItemSetCalcs = gem.skillMinionItemSetCalcs,
 			skillMinionSkill = gem.skillMinionSkill,
 			skillMinionSkillCalcs = gem.skillMinionSkillCalcs,
+			skillMinionSkillStatSetIndexLookup = gem.skillMinionSkillStatSetIndexLookup and copyTable(gem.skillMinionSkillStatSetIndexLookup),
+			skillMinionSkillStatSetIndexLookupCalcs = gem.skillMinionSkillStatSetIndexLookupCalcs and copyTable(gem.skillMinionSkillStatSetIndexLookupCalcs),
 			enableGlobal1 = gem.enableGlobal1,
 			enableGlobal2 = gem.enableGlobal2,
 		}
@@ -881,6 +881,8 @@ local function applyGemReimportState(gem, state)
 	gem.skillMinionItemSetCalcs = state.skillMinionItemSetCalcs
 	gem.skillMinionSkill = state.skillMinionSkill
 	gem.skillMinionSkillCalcs = state.skillMinionSkillCalcs
+	gem.skillMinionSkillStatSetIndexLookup = state.skillMinionSkillStatSetIndexLookup and copyTable(state.skillMinionSkillStatSetIndexLookup)
+	gem.skillMinionSkillStatSetIndexLookupCalcs = state.skillMinionSkillStatSetIndexLookupCalcs and copyTable(state.skillMinionSkillStatSetIndexLookupCalcs)
 	gem.enableGlobal1 = state.enableGlobal1
 	gem.enableGlobal2 = state.enableGlobal2
 end