Port unique updater scripts from PoB2

src/Classes/Item.lua

@@ -104,12 +104,12 @@ local function getTagBasedModifiers(tagName, itemSlotName)
 									if data.itemTagSpecial[tagName] and data.itemTagSpecial[tagName][itemSlotName] then
 										for _, specialMod in ipairs(data.itemTagSpecial[tagName][itemSlotName]) do
 											if dv:lower():find(specialMod:lower()) then
-												exclude = true
+												excluded = true
 												break
 											end
 										end
 									end
-									if exclude then
+									if excluded then
 										found = true
 										break
 									end
@@ -131,12 +131,12 @@ local function getTagBasedModifiers(tagName, itemSlotName)
 							if data.itemTagSpecial[tagName] and data.itemTagSpecial[tagName][itemSlotName] then
 								for _, specialMod in ipairs(data.itemTagSpecial[tagName][itemSlotName]) do
 									if dv:lower():find(specialMod:lower()) then
-										exclude = true
+										excluded = true
 										break
 									end
 								end
 							end
-							if exclude then
+							if excluded then
 								found = true
 								break
 							end
@@ -444,16 +444,16 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 						end
 					end
 				elseif specName == "Radius" and self.type == "Jewel" then
-					self.jewelRadiusLabel = specVal:match("^%a+")
-					if specVal:match("^%a+") == "Variable" then
-                        -- Jewel radius is variable and must be read from it's mods instead after they are parsed
-                        deferJewelRadiusIndexAssignment = true
-                    else
-                        for index, data in pairs(data.jewelRadius) do
-                            if specVal:match("^%a+") == data.label then
-                                self.jewelRadiusIndex = index
-                                break
-                            end
+					self.jewelRadiusLabel = specVal:match("^[%a ]+")
+					if specVal:match("^[%a ]+") == "Variable" then
+						-- Jewel radius is variable and must be read from it's mods instead after they are parsed
+						deferJewelRadiusIndexAssignment = true
+					else
+						for index, data in pairs(data.jewelRadius) do
+							if specVal:match("^[%a ]+") == data.label then
+								self.jewelRadiusIndex = index
+								break
+							end
 						end
 					end
 				elseif specName == "Limited to" and self.type == "Jewel" then

src/Data/Uniques/amulet.lua

@@ -21,7 +21,7 @@ Implicits: 1
 {variant:1}{tags:life}(30-40) Life gained when you Block
 {variant:2,3,4}{tags:life}(34-48) Life gained when you Block
 {variant:1}{tags:mana}(10-20) Mana gained when you Block
-{variant:2,3,4}{tags:mana}(10-24) Mana gained when you Block
+{variant:2,3,4}{tags:mana}(18-24) Mana gained when you Block
 {variant:1}{tags:speed}20% reduced Movement Speed
 {variant:2}{tags:speed}10% reduced Movement Speed
 +3% to maximum Chance to Block Attack Damage

src/Export/Scripts/mods.lua

@@ -33,8 +33,6 @@ local function writeMods(outName, condFunc)
 					print("[Jewel]: Skipping '" .. mod.Id .. "'")
 					goto continue
 				end
-			elseif mod.Family[1] and mod.Family[1].Id ~= "AuraBonus" and mod.Family[1].Id ~= "ArbalestBonus" and mod.GenerationType == 3 and not (mod.Domain == 16 or (mod.Domain == 1 and mod.Id:match("^Synthesis") or mod.Id:match("^MutatedUnique") or (mod.Family[2] and mod.Family[2].Id:match("MatchedInfluencesTier")))) then
-				goto continue
 			end
 			local stats, orders = describeMod(mod)
 			if #orders > 0 then
@@ -137,8 +135,10 @@ end
 
 writeMods("../Data/ModItem.lua", function(mod)
 	return (mod.Domain == 1 or mod.Domain == 16)
-			and (mod.GenerationType == 1 or mod.GenerationType == 2 or (mod.GenerationType == 3 and (not mod.Id:match("^MutatedUnique")) and (mod.Id:match("^Synthesis") or (mod.Family[1].Id ~= "AuraBonus" and mod.Family[1].Id ~= "ArbalestBonus") and not (mod.Family[2] and mod.Family[2].Id:match("MatchedInfluencesTier")))) or mod.GenerationType == 5
-			 or mod.GenerationType == 25 or mod.GenerationType == 24 or mod.GenerationType == 28 or mod.GenerationType == 29)
+			and (mod.GenerationType == 1 or mod.GenerationType == 2
+			or (mod.GenerationType == 3 and mod.Domain == 1 and mod.Id:match("^Synthesis"))
+			or (mod.GenerationType == 3 and mod.Domain == 16)
+			or mod.GenerationType == 5 or mod.GenerationType == 25 or mod.GenerationType == 24 or mod.GenerationType == 28 or mod.GenerationType == 29)
 			and not mod.Id:match("^Hellscape[UpDown]+sideMap") -- Exclude Scourge map mods
 			and not mod.Id:match("Royale")
 			and #mod.AuraFlags == 0
@@ -147,7 +147,7 @@ writeMods("../Data/ModFlask.lua", function(mod)
 	return mod.Domain == 2 and (mod.GenerationType == 1 or mod.GenerationType == 2)
 end)
 writeMods("../Data/ModTincture.lua", function(mod)
-	return (mod.Domain == 34) and (mod.GenerationType == 1 or mod.GenerationType == 2 or mod.GenerationType == 3)
+	return (mod.Domain == 34) and (mod.GenerationType == 1 or mod.GenerationType == 2)
 end)
 writeMods("../Data/ModJewel.lua", function(mod)
 	return (mod.Domain == 10 or mod.Domain == 16) and (mod.GenerationType == 1 or mod.GenerationType == 2 or mod.GenerationType == 5)
@@ -173,6 +173,11 @@ end)
 writeMods("../Data/ModNecropolis.lua", function(mod)
 	return mod.Domain == 1 and mod.Id:match("^NecropolisCrafting")
 end)
+writeMods("../Data/ModItemExclusive.lua", function(mod) -- contains primarily uniques and items implicits but also other mods only available on a single base or unique.
+	return (mod.Domain == 1 or mod.Domain == 2 or mod.Domain == 10 or mod.Domain == 21 or mod.Domain == 34) and mod.GenerationType == 3
+	and (mod.Family[1] and mod.Family[1].Id ~= "AuraBonus")
+	and not mod.Id:match("^Synthesis") and not mod.Id:match("Royale") and not mod.Id:match("Cowards") and not mod.Id:match("Map") and not mod.Id:match("Ultimatum")
+end)
 writeMods("../Data/ModGraft.lua", function(mod)
 	return mod.Domain == 38 and (mod.GenerationType == 1 or mod.GenerationType == 2 or mod.GenerationType == 5)
 end)
@@ -183,4 +188,37 @@ writeMods("../Data/ModFoulborn.lua", function(mod)
 	return mod.Domain == 1 and mod.GenerationType == 3 and mod.Id:match("^MutatedUnique")
 end)
 
+-- Generate unique mod mappings from text to mod
+local out = io.open("Uniques/ModTextMap.lua", "w")
+local modTextMap = {}
+out:write('-- This file is automatically generated, do not edit!\n')
+out:write('-- Item data (c) Grinding Gear Games\n\nreturn {\n')
+for modName, mod in pairs(LoadModule("../Data/ModItemExclusive.lua")) do
+	if modTextMap[mod[1]:lower()] then
+		table.insert(modTextMap[mod[1]:lower()], modName)
+	else
+		modTextMap[mod[1]:lower()] = { modName }
+	end
+	-- Add generic mod for matching legacy values
+	if mod[1]:match('%d+') then
+		local genericText = mod[1]:gsub('(%-*%d*%.*%d+%-*%-*%d*%.*%d+)', '#')
+		if genericText ~= mod[1] then
+			if modTextMap[genericText:lower()] then
+				table.insert(modTextMap[genericText:lower()], modName)
+			else
+				modTextMap[genericText:lower()] = { modName }
+			end
+		end
+	end
+end
+for key, value in pairs(modTextMap) do
+	out:write('\t["' .. key .. '"] = { ')
+	for _, modName in ipairs(value) do
+		out:write('"' .. modName .. '", ')
+	end
+	out:write('},\n')
+end
+out:write('\n}')
+out:close()
+
 print("Mods exported.")

src/Export/Scripts/uModsToText.lua

@@ -0,0 +1,178 @@
+if not table.containsId then
+	dofile("Scripts/mods.lua")
+end
+local catalystTags = {
+	["elemental_damage"] = true,
+	["caster"] = true,
+	["attack"] = true,
+	["defences"] = true,
+	["resource"] = true,
+	["resistance"] = true,
+	["attribute"] = true,
+	["physical_damage"] = true,
+	["chaos_damage"] = true,
+	["speed"] = true,
+	["critical"] = true,
+}
+local itemTypes = {
+	-- "axe",
+	-- "bow",
+	-- "claw",
+	-- "dagger",
+	-- "fishing",
+	-- "mace",
+	-- "staff",
+	-- "sword",
+	-- "wand",
+	-- "helmet",
+	-- "body",
+	-- "gloves",
+	-- "boots",
+	-- "shield",
+	-- "quiver",
+	"amulet",
+	-- "ring",
+	-- "belt",
+	-- "jewel",
+	-- "flask",
+	-- "tincture",
+}
+local function writeMods(out, statOrder)
+	local orders = { }
+	for order, _ in pairs(statOrder) do
+		table.insert(orders, order)
+	end
+	table.sort(orders)
+	for _, order in pairs(orders) do
+		for _, line in ipairs(statOrder[order]) do
+			out:write(line, "\n")
+		end
+	end
+end
+
+local uniqueMods = LoadModule("../Data/ModItemExclusive.lua")
+for _, name in ipairs(itemTypes) do
+	local out = io.open("../Data/Uniques/"..name..".lua", "w")
+	local statOrder = {}
+	local postModLines = {}
+	local modLines = 0
+	local implicits
+	local nextOrder = 100000
+	for line in io.lines("Uniques/"..name..".lua") do
+		if implicits then -- remove 1 downs to 0
+			implicits = implicits - 1
+		end
+		local specName, specVal = line:match("^([%a ]+): (.+)$")
+		if line:match("]],") then -- start new unique
+			writeMods(out, statOrder)
+			for _, line in ipairs(postModLines) do
+				out:write(line, "\n")
+			end
+			out:write(line, "\n")
+			statOrder = { }
+			postModLines = { }
+			modLines = 0
+			nextOrder = 100000
+		elseif not specName then
+			local prefix = ""
+			local variantString = line:match("({variant:[%d,]+})")
+			local fractured = line:match("({fractured})") or ""
+			local cleanLine = line:gsub("{.-}", "")
+			-- Check if this is a mod ID: purely alphanumeric+underscore, optionally followed by [num,num] ranges
+			local modName = cleanLine:match("^([%a%d_]+)%[") or cleanLine:match("^([%a%d_]+)$")
+			local legacy = modName and cleanLine:sub(#modName + 1) or ""
+			-- Legacy ranges must contain actual brackets, not just stray characters
+			if legacy ~= "" and not legacy:match("%[") then
+				legacy = ""
+				modName = nil
+			end
+			local mod = modName and uniqueMods[modName]
+			if mod or (modName and legacy ~= "") then
+				modLines = modLines + 1
+				if variantString then
+					prefix = prefix ..variantString
+				end
+
+				local tags = {}
+				if mod then
+					if isValueInArray({"amulet", "ring", "belt"}, name) then
+						for _, tag in ipairs(mod.modTags) do
+							if catalystTags[tag] then
+								table.insert(tags, tag)
+							end
+						end
+					end
+				end
+				if tags[1] then
+					prefix = prefix.."{tags:"..table.concat(tags, ",").."}"
+				end
+				prefix = prefix..fractured
+				local legacyMod
+				if legacy ~= "" then
+					local values = { }
+					for range in legacy:gmatch("%b[]") do
+						local min, max = range:match("%[([%d%-]+),([%d%-]+)%]")
+						table.insert(values, { min = tonumber(min), max = tonumber(max) })
+					end
+					local mod = dat("Mods"):GetRow("Id", modName)
+					if mod then
+						local stats = { }
+						for i = 1, 6 do
+							if mod["Stat"..i] then
+								stats[mod["Stat"..i].Id] = values[i]
+							end
+						end
+						if mod.Type then
+							stats.Type = mod.Type
+						end
+						legacyMod = describeStats(stats)
+					else
+						ConPrintf("Warning: Could not find mod data for legacy mod '%s' in %s", modName, name)
+					end
+				end
+				local modText = legacyMod or mod
+				if modText then
+					for i, line in ipairs(modText) do
+						local order = mod and mod.statOrder and mod.statOrder[i] or (nextOrder)
+						nextOrder = nextOrder + 1
+						if statOrder[order] then
+							table.insert(statOrder[order], prefix..line)
+						else
+							statOrder[order] = { prefix..line }
+						end
+					end
+				end
+			else
+				if modLines > 0 then -- treat as post line e.g. mirrored, or unresolved text mod
+					-- Unresolved text lines get a sequential order to preserve position among mods
+					if statOrder[nextOrder] then
+						table.insert(statOrder[nextOrder], line)
+					else
+						statOrder[nextOrder] = { line }
+					end
+					nextOrder = nextOrder + 1
+				else
+					out:write(line, "\n")
+				end
+			end
+		else
+			if specName == "Implicits" then
+				implicits = tonumber(specVal)
+			end
+			out:write(line, "\n")
+		end
+		if implicits and implicits == 0 then
+			writeMods(out, statOrder)
+			implicits = nil
+			statOrder = { }
+			modLines = 0
+		end
+	end
+	writeMods(out, statOrder)
+	for _, line in ipairs(postModLines) do
+		out:write(line, "\n")
+	end
+	out:close()
+end
+
+print("Unique text updated.")