Preserve skill selection on character reimport

spec/System/TestAilments_spec.lua

@@ -9,7 +9,7 @@ describe("TestAilments", function()
 
 	it("maximum shock value", function()
 		-- Shock Nova
-		build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nShock Nova 4/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nShock Nova 4/0  1\n")
 		runCallback("OnFrame")
 		assert.are.equals(round(50 + 10), build.calcsTab.mainOutput.MaximumShock)
 
@@ -23,7 +23,7 @@ describe("TestAilments", function()
 	it("bleed is buffed by bleed chance", function()
 		build.itemsTab:CreateDisplayItemFromRaw("New Item\nKarui Chopper")
 		build.itemsTab:AddDisplayItem()
-		build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nHeavy Strike 1/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nHeavy Strike 1/0  1\n")
 		build.configTab.input.customMods = "\z
 		attacks have 10% chance to cause bleeding\n\z
 		"

spec/System/TestDefence_spec.lua

@@ -132,8 +132,8 @@ describe("TestDefence", function()
 		build.configTab.input.enemyIsBoss = "None"
 		-- Petrified blood
 		build.skillsTab:PasteSocketGroup("\z
-		Petrified Blood 20/0 Default  1\n\z
-		Arrogance 21/0 Default  1\n\z
+		Petrified Blood 20/0  1\n\z
+		Arrogance 21/0  1\n\z
 		")  -- 50% petrified effect, when exactly half of the life is reserved, should make the life pool be equivalent to no petrified effect and full life.
 		build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
 		build.configTab.input.customMods = "\z
@@ -155,8 +155,8 @@ describe("TestDefence", function()
 		build.skillsTab.socketGroupList = {}
 
 		build.skillsTab:PasteSocketGroup("\z
-		Petrified Blood 20/0 Default  1\n\z
-		Arrogance 21/0 Default  1\n\z
+		Petrified Blood 20/0  1\n\z
+		Arrogance 21/0  1\n\z
 		")
 		build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
 		build.configTab.input.customMods = "\z
@@ -180,7 +180,7 @@ describe("TestDefence", function()
 		build.skillsTab.socketGroupList = {}
 
 		build.skillsTab:PasteSocketGroup("\z
-		Petrified Blood 20/0 Default  1\n\z
+		Petrified Blood 20/0  1\n\z
 		")  -- 80% petrified effect, starting from full life, should make the life pool be equivalent to 0.5 * life (unprotected upper half) and then 5 * 0.5 * life (protected lower half), making it 3* bigger in total
 		build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
 		build.configTab.input.customMods = "\z
@@ -238,8 +238,8 @@ describe("TestDefence", function()
 
 		-- Progenesis + petrified blood
 		build.skillsTab:PasteSocketGroup("\z
-		Petrified Blood 20/0 Default  1\n\z
-		Arrogance 21/0 Default  1\n\z
+		Petrified Blood 20/0  1\n\z
+		Arrogance 21/0  1\n\z
 		")
 		build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
 		build.configTab.input.customMods = "\z
@@ -263,7 +263,7 @@ describe("TestDefence", function()
 		build.skillsTab.socketGroupList = {}
 
 		build.skillsTab:PasteSocketGroup("\z
-		Petrified Blood 20/0 Default  1\n\z
+		Petrified Blood 20/0  1\n\z
 		")
 		build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
 		build.configTab.input.customMods = "\z
@@ -286,7 +286,7 @@ describe("TestDefence", function()
 		build.skillsTab.socketGroupList = {}
 
 		build.skillsTab:PasteSocketGroup("\z
-		Petrified Blood 20/0 Default  1\n\z
+		Petrified Blood 20/0  1\n\z
 		")
 		build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
 		build.configTab.input.customMods = "\z
@@ -315,7 +315,7 @@ describe("TestDefence", function()
 		assert.are.equals(20, poolsRemaining.LifeBelowHalfLossLostOverTime)
 
 		build.skillsTab:PasteSocketGroup("\z
-		Petrified Blood 20/0 Default  1\n\z
+		Petrified Blood 20/0  1\n\z
 		")
 		build.skillsTab:ProcessSocketGroup(build.skillsTab.socketGroupList[1])
 		build.configTab.input.customMods = "\z

spec/System/TestImpale_spec.lua

@@ -286,7 +286,7 @@ describe("TestAttacks", function()
 
 	it("impale dual wield simultaneous attack", function()
 		newBuild()
-		build.skillsTab:PasteSocketGroup("Cleave 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Cleave 20/0  1\n")
 		-- exactly 100
 		build.itemsTab:CreateDisplayItemFromRaw("New Item\nVaal Blade\nQuality: 0\nAdds 54 to 14 physical damage\n50% chance to Impale Enemies on Hit with Attacks")
 		build.itemsTab:AddDisplayItem()

spec/System/TestImportReimport_spec.lua

@@ -0,0 +1,226 @@
+describe("TestImportReimport", function()
+	local dkjson = require "dkjson"
+	local DEFAULT_CHARACTER_LEVEL = 12
+	local DEFAULT_ITEM_LEVEL = 10
+	local TEST_IMPORT_ITEM_ID = "test-import-item-1"
+	local DEFAULT_SOCKET_COLOR = "R"
+
+	before_each(function()
+		newBuild()
+	end)
+
+	local function makeGemProperties(level)
+		return {
+			{ name = "Level", values = { { tostring(level), 0 } } },
+			{ name = "Quality", values = { { "+0%", 0 } } },
+		}
+	end
+
+	local function makeSocketedGemEntry(socket, support, typeLine, level)
+		return {
+			socket = socket,
+			support = support,
+			typeLine = typeLine,
+			properties = makeGemProperties(level),
+		}
+	end
+
+	-- Build a minimal import item so the tests stay focused on state, not fixture noise.
+	local function makeImportItem(itemTypeLine, inventoryId, socketedItems, itemId)
+		local maxSocketIndex = 0
+		for _, socketedItem in ipairs(socketedItems) do
+			maxSocketIndex = math.max(maxSocketIndex, socketedItem.socket + 1)
+		end
+		local sockets = {}
+		for index = 1, maxSocketIndex do
+			sockets[index] = { group = 0, sColour = DEFAULT_SOCKET_COLOR }
+		end
+		return {
+			id = itemId or TEST_IMPORT_ITEM_ID,
+			frameType = 0,
+			name = "",
+			typeLine = itemTypeLine,
+			inventoryId = inventoryId,
+			ilvl = DEFAULT_ITEM_LEVEL,
+			properties = {},
+			sockets = sockets,
+			socketedItems = socketedItems,
+		}
+	end
+
+	-- Build a minimal import payload so the tests stay focused on state, not fixture noise.
+	local function buildImportPayload(items)
+		return dkjson.encode({
+			character = { level = DEFAULT_CHARACTER_LEVEL },
+			items = items,
+		})
+	end
+
+	local function reimportSocketedItemsWithOptions(itemTypeLine, inventoryId, socketedItems, clearItems)
+		build.importTab.controls.charImportItemsClearSkills.state = true
+		build.importTab.controls.charImportItemsClearItems.state = clearItems
+		build.importTab:ImportItemsAndSkills(buildImportPayload({
+			makeImportItem(itemTypeLine, inventoryId, socketedItems),
+		}))
+		runCallback("OnFrame")
+	end
+
+	local function reimportSingleSocketedGemWithOptions(itemTypeLine, inventoryId, gemName, clearItems)
+		reimportSocketedItemsWithOptions(itemTypeLine, inventoryId, {
+			makeSocketedGemEntry(0, false, gemName, 20),
+		}, clearItems)
+	end
+
+	local function reimportSingleSocketedGem(itemTypeLine, inventoryId, gemName)
+		reimportSingleSocketedGemWithOptions(itemTypeLine, inventoryId, gemName, false)
+	end
+
+	local function assertReimportPreservesSkillSubstate(slotName, itemTypeLine, inventoryId, gemName, fieldName, fieldValue)
+		build.skillsTab:PasteSocketGroup(string.format([[
+Slot: %s
+%s 20/0  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
+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
+		runCallback("OnFrame")
+
+		build.importTab.controls.charImportItemsClearSkills.state = true
+		build.importTab.controls.charImportItemsClearItems.state = false
+		build.importTab:ImportItemsAndSkills(buildImportPayload({
+			makeImportItem("Iron Hat", "Helm", {
+				makeSocketedGemEntry(0, false, "Cleave", 1),
+				makeSocketedGemEntry(1, false, "Heavy Strike", 1),
+				makeSocketedGemEntry(2, true, "Added Fire Damage Support", 2),
+			}),
+		}))
+		runCallback("OnFrame")
+
+		socketGroup = build.skillsTab.socketGroupList[1]
+		assert.are.equal("Helmet", socketGroup.slot)
+		assert.is_true(socketGroup.includeInFullDPS)
+		assert.are.equal(2, socketGroup.mainActiveSkill)
+		assert.are.equal(2, socketGroup.gemList[3].level)
+		assert.is_false(socketGroup.gemList[3].enabled)
+	end)
+
+	it("preserves full DPS state and disabled gems when reimporting with deleted equipment", 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
+		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),
+		}, true)
+
+		socketGroup = build.skillsTab.socketGroupList[1]
+		assert.are.equal("Helmet", socketGroup.slot)
+		assert.is_true(socketGroup.includeInFullDPS)
+		assert.are.equal(2, socketGroup.mainActiveSkill)
+		assert.are.equal(2, socketGroup.gemList[3].level)
+		assert.is_false(socketGroup.gemList[3].enabled)
+	end)
+
+	it("preserves two socket groups 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")
+
+		build.skillsTab:PasteSocketGroup([[
+Slot: Gloves
+Blight 20/0  1
+]])
+		runCallback("OnFrame")
+
+		local helmetGroup = build.skillsTab.socketGroupList[1]
+		helmetGroup.includeInFullDPS = true
+		helmetGroup.mainActiveSkill = 2
+		local glovesGroup = build.skillsTab.socketGroupList[2]
+		glovesGroup.enabled = false
+		runCallback("OnFrame")
+
+		build.importTab.controls.charImportItemsClearSkills.state = true
+		build.importTab.controls.charImportItemsClearItems.state = false
+		build.importTab:ImportItemsAndSkills(buildImportPayload({
+			makeImportItem("Iron Hat", "Helm", {
+				makeSocketedGemEntry(0, false, "Cleave", 1),
+				makeSocketedGemEntry(1, false, "Heavy Strike", 1),
+				makeSocketedGemEntry(2, true, "Added Fire Damage Support", 2),
+			}, "test-import-item-helmet"),
+			makeImportItem("Rawhide Gloves", "Gloves", {
+				makeSocketedGemEntry(0, false, "Blight", 20),
+			}, "test-import-item-gloves"),
+		}))
+		runCallback("OnFrame")
+
+		local groupsBySlot = {}
+		for _, socketGroup in ipairs(build.skillsTab.socketGroupList) do
+			groupsBySlot[socketGroup.slot] = socketGroup
+		end
+
+		assert.are.equal(2, #build.skillsTab.socketGroupList)
+		assert.is_not_nil(groupsBySlot.Helmet)
+		assert.is_not_nil(groupsBySlot.Gloves)
+		assert.is_true(groupsBySlot.Helmet.includeInFullDPS)
+		assert.are.equal(2, groupsBySlot.Helmet.mainActiveSkill)
+		assert.is_false(groupsBySlot.Gloves.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)
+
+	it("preserves minion skill when reimporting items and skills", function()
+		assertReimportPreservesSkillSubstate("Gloves", "Rawhide Gloves", "Gloves", "Summon Chaos Golem", "skillMinionSkill", 3)
+	end)
+end)