fix: preserve skill substate on reimport

Author: mcagnion

spec/System/TestImportReimport_spec.lua

@@ -3,6 +3,67 @@ describe("TestImportReimport", function()
 		newBuild()
 	end)
 
+	local function reimportSingleSocketedGem(itemTypeLine, inventoryId, gemName)
+		build.importTab.controls.charImportItemsClearSkills.state = true
+		build.importTab.controls.charImportItemsClearItems.state = false
+		build.importTab:ImportItemsAndSkills(string.format([=[
+{
+	"character": {
+		"level": 12
+	},
+	"items": [
+		{
+			"id": "item-1",
+			"frameType": 0,
+			"name": "",
+			"typeLine": "%s",
+			"inventoryId": "%s",
+			"ilvl": 10,
+			"properties": [],
+			"sockets": [
+				{ "group": 0, "sColour": "R" }
+			],
+			"socketedItems": [
+				{
+					"socket": 0,
+					"support": false,
+					"typeLine": "%s",
+					"properties": [
+						{ "name": "Level", "values": [["20", 0]] },
+						{ "name": "Quality", "values": [["+0%%", 0]] }
+					]
+				}
+			]
+		}
+	]
+}
+]=], itemTypeLine, inventoryId, gemName))
+		runCallback("OnFrame")
+	end
+
+	local function assertReimportPreservesSkillSubstate(slotName, itemTypeLine, inventoryId, gemName, fieldName, fieldValue)
+		build.skillsTab:PasteSocketGroup(string.format([[
+Slot: %s
+%s 20/0 Default  1
+]], slotName, gemName))
+		runCallback("OnFrame")
+
+		local socketGroup = build.skillsTab.socketGroupList[1]
+		local srcInstance = socketGroup.displaySkillList[1].activeEffect.srcInstance
+		srcInstance[fieldName] = fieldValue
+		srcInstance[fieldName.."Calcs"] = fieldValue
+		build.modFlag = true
+		build.buildFlag = true
+		runCallback("OnFrame")
+
+		reimportSingleSocketedGem(itemTypeLine, inventoryId, gemName)
+
+		socketGroup = build.skillsTab.socketGroupList[1]
+		srcInstance = socketGroup.displaySkillList[1].activeEffect.srcInstance
+		assert.are.equal(fieldValue, srcInstance[fieldName])
+		assert.are.equal(fieldValue, srcInstance[fieldName.."Calcs"])
+	end
+
 	it("preserves full DPS state and manually disabled gems when reimporting items and skills", function()
 		build.skillsTab:PasteSocketGroup([[
 Slot: Helmet
@@ -80,4 +141,16 @@ Added Fire Damage 1/0 Default DISABLED 1
 		assert.are.equal(2, socketGroup.gemList[3].level)
 		assert.is_false(socketGroup.gemList[3].enabled)
 	end)
+
+	it("preserves skill part selection when reimporting items and skills", function()
+		assertReimportPreservesSkillSubstate("Helmet", "Iron Hat", "Helm", "Blight", "skillPart", 2)
+	end)
+
+	it("preserves stage count when reimporting items and skills", function()
+		assertReimportPreservesSkillSubstate("Weapon 1", "Driftwood Wand", "Weapon", "Scorching Ray", "skillStageCount", 8)
+	end)
+
+	it("preserves mine count when reimporting items and skills", function()
+		assertReimportPreservesSkillSubstate("Gloves", "Rawhide Gloves", "Gloves", "Pyroclast Mine", "skillMineCount", 12)
+	end)
 end)

src/Classes/ImportTab.lua

@@ -746,9 +746,17 @@ local function getSocketGroupReimportKey(socketGroup)
 end
 
 local function snapshotSocketGroupReimportState(socketGroup, isMainGroup)
-	local gemEnabledStates = { }
+	local gemStates = { }
 	for gemIndex, gem in ipairs(socketGroup.gemList) do
-		gemEnabledStates[gemIndex] = gem.enabled
+		gemStates[gemIndex] = {
+			enabled = gem.enabled,
+			skillPart = gem.skillPart,
+			skillPartCalcs = gem.skillPartCalcs,
+			skillStageCount = gem.skillStageCount,
+			skillStageCountCalcs = gem.skillStageCountCalcs,
+			skillMineCount = gem.skillMineCount,
+			skillMineCountCalcs = gem.skillMineCountCalcs,
+		}
 	end
 	return {
 		enabled = socketGroup.enabled,
@@ -757,22 +765,32 @@ local function snapshotSocketGroupReimportState(socketGroup, isMainGroup)
 		label = socketGroup.label,
 		mainActiveSkill = socketGroup.mainActiveSkill,
 		mainActiveSkillCalcs = socketGroup.mainActiveSkillCalcs,
-		gemEnabledStates = gemEnabledStates,
+		gemStates = gemStates,
 		isMainGroup = isMainGroup,
 	}
 end
 
+local function applyGemReimportState(gem, state)
+	gem.enabled = state.enabled
+	gem.skillPart = state.skillPart
+	gem.skillPartCalcs = state.skillPartCalcs
+	gem.skillStageCount = state.skillStageCount
+	gem.skillStageCountCalcs = state.skillStageCountCalcs
+	gem.skillMineCount = state.skillMineCount
+	gem.skillMineCountCalcs = state.skillMineCountCalcs
+end
+
 local function applySocketGroupReimportState(socketGroup, state)
 	socketGroup.enabled = state.enabled
 	socketGroup.includeInFullDPS = state.includeInFullDPS
 	socketGroup.groupCount = state.groupCount
 	socketGroup.label = state.label
 	socketGroup.mainActiveSkill = state.mainActiveSkill
 	socketGroup.mainActiveSkillCalcs = state.mainActiveSkillCalcs
-	if state.gemEnabledStates then
-		for gemIndex, enabled in ipairs(state.gemEnabledStates) do
+	if state.gemStates then
+		for gemIndex, gemState in ipairs(state.gemStates) do
 			if socketGroup.gemList[gemIndex] then
-				socketGroup.gemList[gemIndex].enabled = enabled
+				applyGemReimportState(socketGroup.gemList[gemIndex], gemState)
 			end
 		end
 	end