Merge remote-tracking branch 'TheClassified/feature/poe2-build-export' into feature/poe2-build-export-improved

# Conflicts:
#	src/Classes/GemSelectControl.lua
#	src/Classes/ItemSetListControl.lua
#	src/Classes/SkillSetListControl.lua
#	src/Classes/SkillsTab.lua
#	src/Modules/Build.lua

Author: jay9297

src/Classes/ImportTab.lua

@@ -345,6 +345,24 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
 		end
 	end
 
+	-- Path of Exile 2 BuildPlanner export
+	local BuildExportPoE2 = require("Modules/BuildExportPoE2")
+	self.controls.sectionPoE2Export = new("SectionControl", {"TOPLEFT",self.controls.sectionBuild,"BOTTOMLEFT",true}, {0, 18, 650, 112}, "Export to Path of Exile 2 BuildPlanner")
+	self.controls.poe2ExportDesc = new("LabelControl", {"TOPLEFT",self.controls.sectionPoE2Export,"TOPLEFT"}, {6, 14, 0, 16}, "^7Save this build as a .build file the in-game BuildPlanner can load.")
+	self.controls.poe2ExportDesc2 = new("LabelControl", {"TOPLEFT",self.controls.poe2ExportDesc,"BOTTOMLEFT"}, {0, 2, 0, 14}, "^xAAAAAATree specs, item sets and skill sets are exported as level-bracketed loadouts.")
+	self.controls.poe2ExportDesc3 = new("LabelControl", {"TOPLEFT",self.controls.poe2ExportDesc2,"BOTTOMLEFT"}, {0, 2, 0, 14}, "^xAAAAAAEdit each set's level range in its Manage popup.")
+	self.poe2ExportStatus = ""
+	self.controls.poe2ExportPath = new("EditControl", {"TOPLEFT",self.controls.poe2ExportDesc3,"BOTTOMLEFT"}, {0, 8, 560, 20}, BuildExportPoE2.DefaultPath(self.build), "Path", nil, 260)
+	self.controls.poe2ExportSave = new("ButtonControl", {"LEFT",self.controls.poe2ExportPath,"RIGHT"}, {8, 0, 80, 20}, "Save", function()
+		self:DoPoE2Export(BuildExportPoE2, self.controls.poe2ExportPath.buf)
+	end)
+	self.controls.poe2ExportSave.enabled = function()
+		return self.controls.poe2ExportPath.buf and self.controls.poe2ExportPath.buf ~= ""
+	end
+	self.controls.poe2ExportStatusLabel = new("LabelControl", {"TOPLEFT",self.controls.poe2ExportPath,"BOTTOMLEFT"}, {0, 4, 0, 14}, function()
+		return self.poe2ExportStatus or ""
+	end)
+
 	-- validate the status of the api the first time
 	self:RefreshAuthStatus()
 end)
@@ -373,6 +391,26 @@ function ImportTabClass:SaveApiSettings()
 	main:SaveSettings()
 end
 
+function ImportTabClass:DoPoE2Export(Exporter, path)
+	local function doWrite()
+		local ok, err = Exporter.WriteFile(self.build, path)
+		if ok then
+			self.poe2ExportStatus = colorCodes.POSITIVE .. "Saved to " .. path
+		else
+			self.poe2ExportStatus = colorCodes.NEGATIVE .. (err or "Export failed")
+			main:OpenMessagePopup("Export Failed", err or "Unknown error")
+		end
+	end
+	-- Confirm overwrite if the file already exists.
+	local existing = io.open(path, "r")
+	if existing then
+		existing:close()
+		main:OpenConfirmPopup("Overwrite?", "A file already exists at:\n" .. path .. "\n\nOverwrite it?", "Overwrite", doWrite)
+	else
+		doWrite()
+	end
+end
+
 function ImportTabClass:Load(xml, fileName)
 	self.lastRealm = xml.attrib.lastRealm
 	self.controls.accountRealm:SelByValue(self.lastRealm or main.lastRealm or "PC", "id")

src/Classes/ItemSetListControl.lua

@@ -4,13 +4,21 @@
 -- Item set list control.
 --
 local t_insert = table.insert
+local t_remove = table.remove
+local m_max = math.max
+local s_format = string.format
 
 local ItemSetListClass = newClass("ItemSetListControl", "ListControl", function(self, anchor, rect, itemsTab)
 	self.ListControl(anchor, rect, 16, "VERTICAL", true, itemsTab.itemSetOrderList)
 	self.itemsTab = itemsTab
-	self.itemSetService = new("ItemSetService", itemsTab)
 	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function()
-		self:CopyItemSet(self.selValue)
+		local newSet = copyTable(itemsTab.itemSets[self.selValue])
+		newSet.id = 1
+		while itemsTab.itemSets[newSet.id] do
+			newSet.id = newSet.id + 1
+		end
+		itemsTab.itemSets[newSet.id] = newSet
+		self:RenameSet(newSet, true)
 	end)
 	self.controls.copy.enabled = function()
 		return self.selValue ~= nil
@@ -22,68 +30,48 @@ local ItemSetListClass = newClass("ItemSetListControl", "ListControl", function(
 		return self.selValue ~= nil and #self.list > 1
 	end
 	self.controls.rename = new("ButtonControl", {"BOTTOMRIGHT",self,"TOP"}, {-2, -4, 60, 18}, "Rename", function()
-		self:RenameItemSet(self.selValue)
+		self:RenameSet(itemsTab.itemSets[self.selValue])
 	end)
 	self.controls.rename.enabled = function()
 		return self.selValue ~= nil
 	end
 	self.controls.new = new("ButtonControl", {"RIGHT",self.controls.rename,"LEFT"}, {-4, 0, 60, 18}, "New", function()
-		self:CreateItemSet()
+		local existing = { }
+		for _, id in ipairs(itemsTab.itemSetOrderList) do
+			t_insert(existing, itemsTab.itemSets[id])
+		end
+		local newSet = itemsTab:NewItemSet()
+		require("Modules/BuildExportPoE2").PresetNextLevels(existing, newSet)
+		self:RenameSet(newSet, true)
 	end)
 end)
 
-function ItemSetListClass:CreateItemSet()
-	local controls = {}
-	controls.label = new("LabelControl", nil, { 0, 20, 0, 16 }, "^7Enter name for new item set:")
-	controls.edit = new("EditControl", nil, { 0, 40, 350, 20 }, "New Item Set", nil, nil, 100, function(buf)
-		controls.save.enabled = buf:match("%S")
-	end)
-	controls.save = new("ButtonControl", nil, { -45, 70, 80, 20 }, "Save", function()
-		self.itemSetService:NewItemSet(controls.edit.buf)
-		main:ClosePopup()
-	end)
-	controls.save.enabled = false
-	controls.cancel = new("ButtonControl", nil, { 45, 70, 80, 20 }, "Cancel", function()
-		main:ClosePopup()
-	end)
-	main:OpenPopup(370, 100, "Create Item Set", controls, "save", "edit", "cancel")
-end
-
-function ItemSetListClass:CopyItemSet(selValue)
-	local itemSet = self.itemsTab.itemSets[selValue]
-	local controls = {}
-	controls.label = new("LabelControl", nil, { 0, 20, 0, 16 }, "^7Enter name for this item set:")
-	controls.edit = new("EditControl", nil, { 0, 40, 350, 20 }, itemSet.title or "Default", nil, nil, 100, function(buf)
-		controls.save.enabled = buf:match("%S")
-	end)
-	controls.save = new("ButtonControl", nil, { -45, 70, 80, 20 }, "Save", function()
-		self.itemSetService:CopyItemSet(selValue, controls.edit.buf)
-		main:ClosePopup()
-	end)
-	controls.save.enabled = false
-	controls.cancel = new("ButtonControl", nil, { 45, 70, 80, 20 }, "Cancel", function()
-		main:ClosePopup()
-	end)
-	main:OpenPopup(370, 100, "Copy Item Set", controls, "save", "edit", "cancel")
-end
-
-function ItemSetListClass:RenameItemSet(selValue)
-	local itemSet = self.itemsTab.itemSets[selValue]
-	local controls = {}
-	local setName = itemSet.title or "Default"
-	controls.label = new("LabelControl", nil, { 0, 20, 0, 16 }, "^7Enter name for this item set:")
-	controls.edit = new("EditControl", nil, { 0, 40, 350, 20 }, setName, nil, nil, 100, function(buf)
+function ItemSetListClass:RenameSet(itemSet, addOnName)
+	local controls = { }
+	controls.label = new("LabelControl", nil, {0, 20, 0, 16}, "^7Enter name for this item set:")
+	controls.edit = new("EditControl", nil, {0, 40, 350, 20}, itemSet.title, nil, nil, 100, function(buf)
 		controls.save.enabled = buf:match("%S")
 	end)
-	controls.save = new("ButtonControl", nil, { -45, 70, 80, 20 }, "Save", function()
-		self.itemSetService:RenameItemSet(selValue, controls.edit.buf)
+	controls.save = new("ButtonControl", nil, {-45, 70, 80, 20}, "Save", function()
+		itemSet.title = controls.edit.buf
+		self.itemsTab.modFlag = true
+		if addOnName then
+			t_insert(self.list, itemSet.id)
+			self.selIndex = #self.list
+			self.selValue = itemSet.id
+		end
+		self.itemsTab:AddUndoState()
+		self.itemsTab.build:SyncLoadouts()
 		main:ClosePopup()
 	end)
 	controls.save.enabled = false
-	controls.cancel = new("ButtonControl", nil, { 45, 70, 80, 20 }, "Cancel", function()
+	controls.cancel = new("ButtonControl", nil, {45, 70, 80, 20}, "Cancel", function()
+		if addOnName then
+			self.itemsTab.itemSets[itemSet.id] = nil
+		end
 		main:ClosePopup()
 	end)
-	main:OpenPopup(370, 100, setName and "Rename Item Set" or "Set Name", controls, "save", "edit", "cancel")
+	main:OpenPopup(370, 100, itemSet.title and "Rename" or "Set Name", controls, "save", "edit", "cancel")
 end
 
 function ItemSetListClass:GetRowValue(column, index, itemSetId)
@@ -109,7 +97,7 @@ end
 
 function ItemSetListClass:ReceiveDrag(type, value, source)
 	if type == "SharedItemList" then
-		local itemSet = self.itemsTab:CreateItemSet()
+		local itemSet = self.itemsTab:NewItemSet()
 		itemSet.title = value.title
 		for slotName, item in pairs(value.slots) do
 			local newItem = new("Item", item.raw)
@@ -136,18 +124,23 @@ end
 function ItemSetListClass:OnSelDelete(index, itemSetId)
 	local itemSet = self.itemsTab.itemSets[itemSetId]
 	if #self.list > 1 then
-		main:OpenConfirmPopup("Delete Item Set",
-			"Are you sure you want to delete '" ..
-			(itemSet.title or "Default") .. "'?\nThis will not delete any items used by the set.", "Delete", function()
-				self.itemSetService:DeleteItemSet(itemSetId, index)
-				self.selIndex = nil
-				self.selValue = nil
-			end)
+		main:OpenConfirmPopup("Delete Item Set", "Are you sure you want to delete '"..(itemSet.title or "Default").."'?\nThis will not delete any items used by the set.", "Delete", function()
+			t_remove(self.list, index)
+			self.itemsTab.itemSets[itemSetId] = nil
+			self.selIndex = nil
+			self.selValue = nil
+			if itemSetId == self.itemsTab.activeItemSetId then 
+				self.itemsTab:SetActiveItemSet(self.list[m_max(1, index - 1)])
+			end
+			self.itemsTab:AddUndoState()
+			self.itemsTab.build:SyncLoadouts()
+		end)
 	end
 end
 
 function ItemSetListClass:OnSelKeyDown(index, itemSetId, key)
+	local itemSet = self.itemsTab.itemSets[itemSetId]
 	if key == "F2" then
-		self:RenameItemSet(itemSetId)
+		self:RenameSet(itemSet)
 	end
 end

src/Classes/ItemsTab.lua

@@ -1120,6 +1120,8 @@ function ItemsTabClass:Load(xml, dbFileName)
 		elseif node.elem == "ItemSet" then
 			local itemSet = self:CreateItemSet(tonumber(node.attrib.id), node.attrib.title or "Default")
 			itemSet.useSecondWeaponSet = node.attrib.useSecondWeaponSet == "true"
+			itemSet.levelMin = tonumber(node.attrib.levelMin)
+			itemSet.levelMax = tonumber(node.attrib.levelMax)
 			for _, child in ipairs(node) do
 				if child.elem == "Slot" then
 					local slotName = child.attrib.name or ""
@@ -1208,7 +1210,7 @@ function ItemsTabClass:Save(xml)
 	end
 	for _, itemSetId in ipairs(self.itemSetOrderList) do
 		local itemSet = self.itemSets[itemSetId]
-		local child = { elem = "ItemSet", attrib = { id = tostring(itemSetId), title = itemSet.title, useSecondWeaponSet = tostring(itemSet.useSecondWeaponSet) } }
+		local child = { elem = "ItemSet", attrib = { id = tostring(itemSetId), title = itemSet.title, useSecondWeaponSet = tostring(itemSet.useSecondWeaponSet), levelMin = itemSet.levelMin and tostring(itemSet.levelMin) or nil, levelMax = itemSet.levelMax and tostring(itemSet.levelMax) or nil } }
 		for slotName, slot in pairs(self.slots) do
 			if not slot.parentSlot or itemSet[slotName].selItemId ~= 0 then
 				if not slot.nodeId then
@@ -2268,7 +2270,49 @@ function ItemsTabClass:OpenItemSetManagePopup()
 	controls.sharedList = new("SharedItemSetListControl", nil, {155, 50, 300, 200}, self)
 	controls.setList.dragTargetList = { controls.sharedList }
 	controls.sharedList.dragTargetList = { controls.setList }
-	controls.close = new("ButtonControl", nil, {0, 260, 90, 20}, "Done", function()
+
+	-- Level bracket inputs for the .build (PoE2 BuildPlanner) export.
+	-- Bound to the row currently selected in the local item-set list.
+	local function clampLvl(buf)
+		local n = tonumber(buf)
+		if not n then return nil end
+		n = m_floor(n)
+		if n < 0 then n = 0 end
+		if n > 100 then n = 100 end
+		return n
+	end
+	local function selectedSet()
+		return self.itemSets[controls.setList.selValue]
+	end
+	controls.lvlLabel = new("LabelControl", nil, {-225, 260, 0, 16}, "^7.build export level range:")
+	controls.lvlMin = new("EditControl", nil, {-95, 260, 60, 20}, nil, nil, "%D", 3, function(buf)
+		local set = selectedSet()
+		if set then
+			set.levelMin = clampLvl(buf)
+			self.modFlag = true
+		end
+	end)
+	controls.lvlMin.tooltipText = "Lowest character level this item set applies to in the exported .build (1-100). Leave blank to auto-split across item sets."
+	controls.lvlDash = new("LabelControl", nil, {-30, 260, 0, 16}, "^7-")
+	controls.lvlMax = new("EditControl", nil, {30, 260, 60, 20}, nil, nil, "%D", 3, function(buf)
+		local set = selectedSet()
+		if set then
+			set.levelMax = clampLvl(buf)
+			self.modFlag = true
+		end
+	end)
+	controls.lvlMax.tooltipText = "Highest character level this item set applies to in the exported .build (1-100). Leave blank to auto-split across item sets."
+	local function refreshLvl()
+		local set = selectedSet()
+		controls.lvlMin:SetText(set and set.levelMin and tostring(set.levelMin) or "")
+		controls.lvlMax:SetText(set and set.levelMax and tostring(set.levelMax) or "")
+	end
+	controls.setList.OnSelClick = function(listSelf, index, value, doubleClick)
+		refreshLvl()
+	end
+	refreshLvl()
+
+	controls.close = new("ButtonControl", nil, {180, 260, 90, 20}, "Done", function()
 		main:ClosePopup()
 	end)
 	main:OpenPopup(630, 290, "Manage Item Sets", controls)

src/Classes/PassiveSpec.lua

@@ -97,10 +97,17 @@ function PassiveSpecClass:Init(treeVersion, convert)
 
 	-- Keys are node IDs, values are the replacement node
 	self.hashOverrides = { }
+
+	-- Author notes attached to allocated nodes (Shift+Right-Click on a node to
+	-- set one). Keyed by node id; emitted into the PoE2 .build export as the
+	-- node's additional_text.
+	self.nodeNotes = { }
 end
 
 function PassiveSpecClass:Load(xml, dbFileName)
 	self.title = xml.attrib.title
+	self.levelMin = tonumber(xml.attrib.levelMin)
+	self.levelMax = tonumber(xml.attrib.levelMax)
 	local weaponSets = {}
 	local url
 	for _, node in pairs(xml) do
@@ -143,6 +150,17 @@ function PassiveSpecClass:Load(xml, dbFileName)
 				for nodeId in node.attrib.nodes:gmatch("%d+") do
 					weaponSets[tonumber(nodeId)] = weaponSet
 				end
+			elseif node.elem == "Notes" then
+				for _, child in ipairs(node) do
+					if child.elem == "Note" and child.attrib.nodeId then
+						local nid = tonumber(child.attrib.nodeId)
+						-- Note text lives in the element body (preserves newlines, no XML attribute escaping headaches).
+						local text = type(child[1]) == "string" and child[1] or child.attrib.text
+						if nid and text and text ~= "" then
+							self.nodeNotes[nid] = text
+						end
+					end
+				end
 			end
 		end
 	end
@@ -259,7 +277,9 @@ function PassiveSpecClass:Save(xml)
 		ascendancyInternalId = tostring(ascendancyInternalId),
 		secondaryAscendClassId = tostring(self.curSecondaryAscendClassId),
 		nodes = table.concat(allocNodeIdList, ","),
-		masteryEffects = table.concat(masterySelections, ",")
+		masteryEffects = table.concat(masterySelections, ","),
+		levelMin = self.levelMin and tostring(self.levelMin) or nil,
+		levelMax = self.levelMax and tostring(self.levelMax) or nil,
 	}
 	t_insert(xml, {
 		-- Legacy format
@@ -309,6 +329,17 @@ function PassiveSpecClass:Save(xml)
 	end
 	t_insert(xml, overrides)
 
+	-- Per-node author notes (Shift+Right-Click on a node). Stored as element
+	-- body text so multi-line notes survive without XML attribute escaping.
+	local notesElem = { elem = "Notes" }
+	local hasNotes = false
+	for nodeId, note in pairs(self.nodeNotes) do
+		if note and note ~= "" then
+			hasNotes = true
+			t_insert(notesElem, { elem = "Note", attrib = { nodeId = tostring(nodeId) }, [1] = note })
+		end
+	end
+	if hasNotes then t_insert(xml, notesElem) end
 end
 
 function PassiveSpecClass:PostLoad()

src/Classes/PassiveSpecListControl.lua

@@ -39,6 +39,7 @@ local PassiveSpecListClass = newClass("PassiveSpecListControl", "ListControl", f
 		newSpec:SelectClass(treeTab.build.spec.curClassId)
 		newSpec:SelectAscendClass(treeTab.build.spec.curAscendClassId)
 		newSpec:SelectSecondaryAscendClass(treeTab.build.spec.curSecondaryAscendClassId)
+		require("Modules/BuildExportPoE2").PresetNextLevels(treeTab.specList, newSpec)
 		self:RenameSpec(newSpec, "New Tree", true)
 	end)
 	self:UpdateItemsTabPassiveTreeDropdown()

src/Classes/PassiveTreeView.lua

@@ -539,7 +539,16 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 	elseif treeClick == "RIGHT" then
 		-- User right-clicked on a node
 		if hoverNode then
-			if hoverNode.alloc and (hoverNode.type == "Socket" or hoverNode.containJewelSocket) then
+			if IsKeyDown("SHIFT") then
+				-- Shift+Right-Click: open a popup to edit the per-node author note
+				-- (consumed by the PoE2 .build export as the node's additional_text).
+				local nodeId = hoverNode.id
+				local title = "Note: " .. (hoverNode.dn or hoverNode.name or "Passive")
+				main:OpenNoteEditPopup(title, spec.nodeNotes[nodeId], function(text)
+					spec.nodeNotes[nodeId] = text
+					build.modFlag = true
+				end)
+			elseif hoverNode.alloc and (hoverNode.type == "Socket" or hoverNode.containJewelSocket) then
 				local slot = build.itemsTab.sockets[hoverNode.id]
 				if slot:IsEnabled() then
 					-- User right-clicked a jewel socket, jump to the item page and focus the corresponding item slot control
@@ -1986,6 +1995,15 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
 		tooltip:AddLine(14, colorCodes.TIP.."Tip: Hold Ctrl to hide this tooltip.")
 		tooltip:AddLine(14, colorCodes.TIP.."Tip: Press Ctrl+C to copy this node's text.")
 	end
+	-- Per-node author note (Shift+Right-Click to set/edit) emitted into the PoE2 .build export.
+	if node.id and build.spec and build.spec.nodeNotes then
+		local existing = build.spec.nodeNotes[node.id]
+		tooltip:AddSeparator(10)
+		tooltip:AddLine(14, colorCodes.TIP.."Shift + Right-Click to add a build note (PoE2 .build export)")
+		if existing and existing ~= "" then
+			tooltip:AddLine(14, "^7Note: "..existing)
+		end
+	end
 end
 
 -- Helper function to check if a node is connected to weapon set nodes