Merge branch 'dev' into add-atziris-communion-support

Author: LocalIdentity

spec/System/TestImportReimport_spec.lua

@@ -187,6 +187,39 @@ Fireball 20/0  1
 		assert.is_false(groupsByGem.Fireball.enabled)
 	end)
 
+	it("imports item socketed jewels using jewel socket order instead of raw socket index", function()
+		build.importTab.controls.charImportItemsClearItems.state = true
+		build.importTab.controls.charImportItemsClearSkills.state = true
+
+		local gloves = makeImportItem("Linen Wraps", "Gloves", "test-import-gloves")
+		gloves.sockets = {
+			{ type = "rune" },
+			{ type = "jewel" },
+		}
+		gloves.socketedItems = {
+			{ baseType = "Greater Rune of Nobility" },
+			{
+				id = "test-import-jewel",
+				frameType = 2,
+				name = "Vivid Ornament",
+				typeLine = "Sapphire",
+				baseType = "Sapphire",
+				inventoryId = "PassiveJewels",
+				ilvl = DEFAULT_ITEM_LEVEL,
+				properties = {},
+				socket = 1,
+			},
+		}
+
+		build.importTab:ImportItemsAndSkills(buildImportPayload({ gloves }, {}))
+		runCallback("OnFrame")
+
+		local socketedJewel = build.itemsTab.items[build.itemsTab.slots["Gloves Jewel Socket 1"].selItemId]
+		assert.is_not_nil(socketedJewel)
+		assert.are.equal("test-import-jewel", socketedJewel.uniqueID)
+		assert.are.equal(0, build.itemsTab.slots["Gloves Jewel Socket 2"].selItemId)
+	end)
+
 	it("preserves skill part selection when reimporting items and skills", function()
 		assertReimportPreservesSkillSubstate("Twig Focus", "Offhand", "Dark Effigy", "skillPart", 2)
 	end)

spec/System/TestItemMods_spec.lua

@@ -33,6 +33,20 @@ describe("TetsItemMods", function()
 		assert.are.equals(2, legacyLines)
 	end)
 
+	it("shows a fallback tooltip when an item's base is no longer supported", function()
+		local item = new("Item", [[
+			Rarity: Unique
+			Legacy Item
+			Removed Base
+		]])
+		local tooltip = new("Tooltip")
+
+		assert.has_no.errors(function()
+			build.itemsTab:AddItemTooltip(tooltip, item)
+		end)
+		assert.is_truthy(tooltip.lines[#tooltip.lines].text:find("Item base is not supported", 1, true))
+	end)
+
 	it("aggregates matching ring item rarity lines before applying ring bonus effect", function()
 		build.configTab.input.customMods = "30% increased bonuses gained from left Equipped Ring"
 		build.configTab:BuildModList()

spec/System/TestItemParse_spec.lua

@@ -591,6 +591,28 @@ describe("TestItemParse", function()
 		assert.is_not_nil(item:BuildRaw():match("{enchant}{rune}Gain 18%% of Damage as Extra Fire Damage"))
 	end)
 
+	it("applies increased effect of socketed augment items", function()
+		local item = new("Item", [[
+			Test Wand
+			Runic Fork
+			Sockets: S
+			Rune: Lesser Desert Rune
+			Implicits: 1
+			{enchant}{rune}Gain 6% of Damage as Extra Fire Damage
+			100% increased effect of Socketed Augment Items
+		]])
+		item:BuildAndParseRaw()
+
+		local damageGainAsFire = 0
+		for _, mod in ipairs(item.slotModList[1]) do
+			if mod.name == "DamageGainAsFire" and mod.type == "BASE" then
+				damageGainAsFire = damageGainAsFire + mod.value
+			end
+		end
+		assert.are.equals(12, damageGainAsFire)
+		assert.is_not_nil(item:BuildRaw():match("{enchant}{rune}Gain 12%% of Damage as Extra Fire Damage"))
+	end)
+
 	it("does not double-scale imported socketed rune text", function()
 		local item = new("Item", [[
 			Runeseeker's Call

spec/System/TestSkills_spec.lua

@@ -28,6 +28,41 @@ describe("TestSkills", function()
 		end
 	end
 
+	local function assertGemSupportLevel(gemName, expectedLevel, expectedCount)
+		local count = 0
+		for _, activeSkill in ipairs(build.calcsTab.calcsEnv.player.activeSkillList) do
+			if activeSkill.activeEffect.gemData and activeSkill.activeEffect.gemData.name == gemName then
+				count = count + 1
+				assert.are.equals(expectedLevel, activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "GemSupportLevel"))
+			end
+		end
+		assert.are.equals(expectedCount, count)
+	end
+
+	it("evaluates GemTag mod tags against active skill gem tags", function()
+		local modDB = build.calcsTab.mainEnv.modDB
+
+		modDB:NewMod("Damage", "INC", 10, "Test Fire GemTag", { type = "GemTag", gemTag = "Fire" })
+		modDB:NewMod("Damage", "INC", 20, "Test Elemental GemTagList", { type = "GemTag", gemTagList = { "Cold", "Lightning" } })
+		modDB:NewMod("Damage", "INC", 40, "Test Not Minion GemTag", { type = "GemTag", gemTag = "Minion", neg = true })
+
+		assert.are.equals(50, modDB:Sum("INC", { skillGem = { tags = { fire = true } } }, "Damage"))
+		assert.are.equals(60, modDB:Sum("INC", { skillGem = { tags = { cold = true } } }, "Damage"))
+		assert.are.equals(0, modDB:Sum("INC", { skillGem = { tags = { minion = true } } }, "Damage"))
+	end)
+
+	it("applies Fire Mastery level to Apocalypse through the source gem tag", function()
+		build.skillsTab:PasteSocketGroup("Apocalypse 20/0  1\nFire Mastery 1/0  1")
+		runCallback("OnFrame")
+		assertGemSupportLevel("Apocalypse", 1, 4)
+	end)
+
+	it("evaluates conditional gem levels using the source gem support count", function()
+		build.skillsTab:PasteSocketGroup("Apocalypse 20/0  1\nFire Mastery 1/0  1\nUhtred's Omen 1/0  1")
+		runCallback("OnFrame")
+		assertGemSupportLevel("Apocalypse", 3, 4)
+	end)
+
 
 	it("uses granted effect minion list when active skill minion list is missing", function()
 		local srcInstance = { statSet = { }, skillPart = { }, nameSpec = "Spectre: Test" }
@@ -111,6 +146,17 @@ describe("TestSkills", function()
 		assert.are.equals(20, build.calcsTab.mainOutput.LifeReservedPercent)
 	end)
 
+	it("rounds Blasphemy curse magnitudes to the nearest integer", function()
+		build.configTab.input.customMods = "79% increased Curse Magnitudes"
+		build.configTab.input.enemyIsBoss = "None"
+		build.configTab:BuildModList()
+		build.skillsTab:PasteSocketGroup("Blasphemy 10/0  1\nDespair 12/0  1\n")
+
+		runCallback("OnFrame")
+
+		assert.are.equals(-42, build.calcsTab.mainEnv.enemyDB:Sum("BASE", nil, "ChaosResist"))
+	end)
+
 	it("applies active skill reservation multiplier to linked buff spirit reservation", function()
 		build.skillsTab:PasteSocketGroup("Purity of Fire 20/0  1\nVitality II 1/0  1\n")
 		runCallback("OnFrame")

src/Classes/CalcBreakdownControl.lua

@@ -481,6 +481,8 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 					else
 						desc = "Skill type: "..(tag.neg and "Not " or "")..self:FormatModName(SkillTypeName[tag.skillType])
 					end
+				elseif tag.type == "GemTag" then
+					desc = "Gem tag: "..(tag.neg and "Not " or "")..self:FormatVarNameOrList(tag.gemTag, tag.gemTagList)
 				elseif tag.type == "BaseFlag" then
 					desc = "Base flag: "..(tag.neg and "Not " or "")..self:FormatModName(tostring(tag.baseFlag))
 				elseif tag.type == "SlotNumber" then

src/Classes/ImportTab.lua

@@ -328,8 +328,9 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
 		end
 
 		if self.importCodeJson then
-			self:ImportItemsAndSkills(self.importCodeJson)
 			self:ImportPassiveTreeAndJewels(self.importCodeJson)
+			self.build.calcsTab:BuildOutput()
+			self:ImportItemsAndSkills(self.importCodeJson)
 			return
 		end
 
@@ -1286,7 +1287,7 @@ function ImportTabClass:ImportItem(itemData, slotName)
 
 	item.runes = { }
 	if itemData.socketedItems then
-		self:ImportSocketedItems(item, itemData.socketedItems, slotName)
+		self:ImportSocketedItems(item, itemData.socketedItems, slotName, itemData.sockets)
 	end
 	if itemData.requirements and (not itemData.socketedItems or not itemData.socketedItems[1]) then
 		-- Requirements cannot be trusted if there are socketed gems, as they may override the item's natural requirements
@@ -1437,11 +1438,19 @@ function ImportTabClass:ImportItem(itemData, slotName)
 	end
 end
 
-function ImportTabClass:ImportSocketedItems(item, socketedItems, slotName)
+function ImportTabClass:ImportSocketedItems(item, socketedItems, slotName, sockets)
 	-- Build socket group list
 	for _, socketedItem in ipairs(socketedItems) do
 		if isValueInTable({ "Diamond", "Emerald", "Ruby", "Sapphire" }, socketedItem.baseType) then
-			self:ImportItem(socketedItem, slotName .. " Jewel Socket "..socketedItem.socket + 1)
+			local jewelSocketIndex = socketedItem.socket + 1
+			if sockets then
+				for index = 1, socketedItem.socket + 1 do
+					if sockets[index] and sockets[index].type ~= "jewel" then
+						jewelSocketIndex = jewelSocketIndex - 1
+					end
+				end
+			end
+			self:ImportItem(socketedItem, slotName .. " Jewel Socket "..jewelSocketIndex)
 		else
 			t_insert(item.runes, socketedItem.baseType)
 		end

src/Classes/Item.lua

@@ -1140,13 +1140,13 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 				table.sort(runes,  function(a, b) return compareRuneValueSets(a.values, b.values) end)
 			end
 
-			local gameSocketedRuneEffectModifier = 0
+			local gameSocketedAugmentEffectModifier = 0
 			if mode == "GAME" and shouldFixRunesOnItem then
 				for _, modLines in ipairs({ self.enchantModLines, self.implicitModLines, self.explicitModLines }) do
 					for _, effectModLine in ipairs(modLines) do
 						for _, mod in ipairs(effectModLine.modList or { }) do
-							if mod.name == "SocketedRuneEffect" and mod.type == "INC" then
-								gameSocketedRuneEffectModifier = gameSocketedRuneEffectModifier + mod.value / 100
+							if (mod.name == "SocketedRuneEffect" or mod.name == "SocketedAugmentItemEffect") and mod.type == "INC" then
+								gameSocketedAugmentEffectModifier = gameSocketedAugmentEffectModifier + mod.value / 100
 							end
 						end
 					end
@@ -1160,10 +1160,10 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 				if groupedRunes and not modLine.bonded then -- found the rune category with the relevant stat.
 					local result, numRunes
 					local socketedRuneEffectAlreadyApplied
-					if gameSocketedRuneEffectModifier ~= 0 then
+					if gameSocketedAugmentEffectModifier ~= 0 then
 						local unscaledTargetValues = { }
 						for valueIndex, value in ipairs(targetValues) do
-							unscaledTargetValues[valueIndex] = value / (1 + gameSocketedRuneEffectModifier)
+							unscaledTargetValues[valueIndex] = value / (1 + gameSocketedAugmentEffectModifier)
 						end
 						result, numRunes = findRuneCombination(groupedRunes, unscaledTargetValues, remainingRunes)
 						socketedRuneEffectAlreadyApplied = result ~= nil
@@ -1604,8 +1604,12 @@ end
 
 function ItemClass:ApplySocketedRuneDisplayScalars()
 	for _, modLine in ipairs(self.runeModLines or { }) do
-		local effectModifier = modLine.augmentType == "SoulCore" and (self.socketedSoulCoreEffectModifier or 0)
-			or modLine.augmentType == "Rune" and (self.socketedRuneEffectModifier or 0)
+		local effectModifier = self.socketedAugmentItemEffectModifier or 0
+		if modLine.augmentType == "SoulCore" then
+			effectModifier = effectModifier + (self.socketedSoulCoreEffectModifier or 0)
+		elseif modLine.augmentType == "Rune" then
+			effectModifier = effectModifier + (self.socketedRuneEffectModifier or 0)
+		end
 		if effectModifier and effectModifier ~= 0 and not modLine.socketedRuneEffectAlreadyApplied then
 			modLine.displayValueScalar = 1 + effectModifier
 		else
@@ -2105,12 +2109,17 @@ function ItemClass:BuildModList()
 	end
 	self.socketedSoulCoreEffectModifier = calcLocal(baseList, "SocketedSoulCoreEffect", "INC", 0) / 100
 	self.socketedRuneEffectModifier = calcLocal(baseList, "SocketedRuneEffect", "INC", 0) / 100
+	self.socketedAugmentItemEffectModifier = calcLocal(baseList, "SocketedAugmentItemEffect", "INC", 0) / 100
 	if self.runeModLines[1] then
 		self:ApplySocketedRuneDisplayScalars()
 	end
 	for _, modLine in ipairs(self.runeModLines) do
-		local effectModifier = modLine.augmentType == "SoulCore" and self.socketedSoulCoreEffectModifier
-			or modLine.augmentType == "Rune" and self.socketedRuneEffectModifier
+		local effectModifier = self.socketedAugmentItemEffectModifier or 0
+		if modLine.augmentType == "SoulCore" then
+			effectModifier = effectModifier + self.socketedSoulCoreEffectModifier
+		elseif modLine.augmentType == "Rune" then
+			effectModifier = effectModifier + self.socketedRuneEffectModifier
+		end
 		if effectModifier and effectModifier ~= 0 and self:CheckModLineVariant(modLine) and not modLine.extra and not modLine.socketedRuneEffectAlreadyApplied then
 			for _, mod in ipairs(modLine.modList) do
 				baseList:ScaleAddMod(mod, effectModifier)
@@ -2226,4 +2235,4 @@ function ItemClass:BuildModList()
 	else
 		self.modList = self:BuildModListForSlotNum(baseList)
 	end
-end
+end

src/Classes/ItemsTab.lua

@@ -3232,6 +3232,13 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
 	tooltip.tooltipHeader = item.rarity
 	tooltip.center = true
 	tooltip.color = rarityCode
+	-- Shared items can use old base names that no longer exist. Add a tooltip so they can be copied or removed without causing a crash.
+	if not item.base or not item.baseName then
+		tooltip:AddLine(fontSizeTitle, rarityCode..(item.title or item.name or "Unknown Item"), "FONTIN SC")
+		tooltip:AddSeparator(30)
+		tooltip:AddLine(fontSizeTitle, colorCodes.NEGATIVE.."Item base is not supported by the current version.", "FONTIN SC")
+		return
+	end
 	-- Item name
 	if item.title then
 		tooltip:AddLine(fontSizeTitle, rarityCode..item.title, "FONTIN SC")

src/Classes/ModStore.lua

@@ -42,7 +42,8 @@ local function getActor(self, actorType)
 	end
 end
 
-function ModStoreClass:ScaleAddMod(mod, scale)
+-- roundToNearest is reserved for effects that the game rounds instead of truncates.
+function ModStoreClass:ScaleAddMod(mod, scale, roundToNearest)
 	local unscalable = false
 	for _, effects in ipairs(mod) do
 		if effects.unscalable then
@@ -71,6 +72,8 @@ function ModStoreClass:ScaleAddMod(mod, scale)
 			if precision then
 				local power = 10 ^ precision
 				subMod.value = m_floor(subMod.value * scale * power) / power
+			elseif roundToNearest then
+				subMod.value = roundSymmetric(subMod.value * scale)
 			else
 				subMod.value = m_modf(round(subMod.value * scale, 2))
 			end
@@ -85,12 +88,12 @@ function ModStoreClass:CopyList(modList)
 	end
 end
 
-function ModStoreClass:ScaleAddList(modList, scale)
+function ModStoreClass:ScaleAddList(modList, scale, roundToNearest)
 	if scale == 1 then
 		self:AddList(modList)
 	else
 		for i = 1, #modList do
-			self:ScaleAddMod(modList[i], scale)
+			self:ScaleAddMod(modList[i], scale, roundToNearest)
 		end
 	end
 end
@@ -557,8 +560,8 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
 			local stat
 			if tag.statList then
 				stat = 0
-				for _, stat in ipairs(tag.statList) do
-					stat = stat + GetStat(self, stat, cfg)
+				for _, statName in ipairs(tag.statList) do
+					stat = stat + GetStat(self, statName, cfg)
 				end
 			else
 				stat = GetStat(self, tag.stat, cfg)
@@ -827,6 +830,25 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
 			if not match then
 				return
 			end
+		elseif tag.type == "GemTag" then
+			local match = false
+			local gemTags = cfg and cfg.skillGem and cfg.skillGem.tags
+			if tag.gemTagList then
+				for _, gemTag in pairs(tag.gemTagList) do
+					if gemTags and gemTags[gemTag:lower()] then
+						match = true
+						break
+					end
+				end
+			else
+				match = gemTags and gemTags[tag.gemTag:lower()]
+			end
+			if tag.neg then
+				match = not match
+			end
+			if not match then
+				return
+			end
 		elseif tag.type == "BaseFlag" then
 			local match = false
 			if cfg and cfg.skillGem and cfg.skillGem.grantedEffect and cfg.skillGem.grantedEffect.statSets and cfg.skillGem.grantedEffect.statSets[1] then