Fix parsing for runeseekers call

Add scaling for the runes mod too

Author: LocalIdentity

spec/System/TestItemParse_spec.lua

@@ -476,6 +476,69 @@ describe("TestItemParse", function()
 		assert.are.equals("Bonded: +20 to maximum Mana", item.runeModLines[3].line)
 	end)
 
+	it("applies increased effect of socketed runes", 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
+			200% increased effect of Socketed Runes
+		]])
+		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(18, damageGainAsFire)
+	end)
+
+	it("does not double-scale imported socketed rune text", function()
+		local item = new("Item", [[
+			Runeseeker's Call
+			Runic Fork
+			Unique ID: bbcd083b0a9da5650f3ac0a001364b1c99d6b866c1f52f0568fafab863b44ccb
+			Item Level: 86
+			Quality: 20
+			Sockets: S S S S S S
+			Rune: Hedgewitch Assandra's Rune of Wisdom
+			Rune: Saqawal's Rune of the Sky
+			Rune: Perfect Iron Rune
+			Rune: Perfect Iron Rune
+			Rune: Perfect Vision Rune
+			Rune: Legacy of Lifesprig
+			LevelReq: 90
+			Implicits: 11
+			{enchant}{rune}210% increased Spell Damage
+			{enchant}{rune}+9 to Level of all Spell Skills
+			{enchant}{rune}84% increased Critical Hit Chance for Spells
+			{enchant}{rune}Gain 15% of Damage as Extra Damage of all Elements
+			{enchant}{rune}Bonded: 75% increased Critical Damage Bonus
+			{enchant}{rune}Bonded: 36% chance when collecting an Elemental Infusion to gain an
+			{enchant}{rune}additional Elemental Infusion of the same type
+			{enchant}{rune}Bonded: Archon recovery period expires 90% faster
+			{enchant}{rune}Bonded: Break Armour on Critical Hit with Spells equal to 72% of Physical Damage dealt
+			{enchant}{rune}Bonded: Leeches 3% of maximum Life when you Cast a Spell
+			Grants Skill: Level 20 The Stars Answer
+			Only Runes can be Socketed in this item
+			200% increased effect of Socketed Runes
+			Corrupted
+		]])
+		item:BuildAndParseRaw()
+
+		local spellDamage = 0
+		for _, mod in ipairs(item.slotModList[1]) do
+			if mod.name == "Damage" and mod.type == "INC" and mod.flags == ModFlag.Spell then
+				spellDamage = spellDamage + mod.value
+			end
+		end
+		assert.are.equals(210, spellDamage)
+	end)
+
 	it("multi-line rune mod", function()
 		-- Thruldana is Bow-only as well
 		local item = new("Item", [[
@@ -697,4 +760,4 @@ describe("TestAdvancedItemParse #item", function()
 			Note: ~b/o 2 chaos
 		]])
 	end)
-end)
+end)

src/Classes/Item.lua

@@ -1014,6 +1014,18 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 	if self.base then
 		if self.base.weapon or self.base.armour or self.base.tags.wand or self.base.tags.staff or self.base.tags.sceptre then
 			local shouldFixRunesOnItem = #self.runes == 0
+			if not shouldFixRunesOnItem and #self.runeModLines > 0 then
+				local canRebuildRunes = true
+				for _, rune in ipairs(self.runes) do
+					if rune ~= "None" and not data.itemMods.Runes[rune] then
+						canRebuildRunes = false
+						break
+					end
+				end
+				if canRebuildRunes then
+					self:UpdateRunes()
+				end
+			end
 
 			local function getRuneLineParts(modLine)
 				local values = { }
@@ -1105,17 +1117,17 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 			local broadItemType = self.base.weapon and "weapon" or (self.base.tags.wand or self.base.tags.staff) and "caster" or "armour" -- minor optimisation
 			local specificItemType = self.base.type:lower()
 			for runeName, runeMods in pairs(data.itemMods.Runes) do
-				local addModToGroupedRunes = function (modLine)
+				local addModToGroupedRunes = function (modLine, augmentType)
 					local runeStrippedModLine, runeValues = getRuneLineParts(modLine)
 					if statGroupedRunes[runeStrippedModLine] == nil then
 						statGroupedRunes[runeStrippedModLine] = { }
 					end
-					t_insert(statGroupedRunes[runeStrippedModLine], { name = runeName, values = runeValues })
+					t_insert(statGroupedRunes[runeStrippedModLine], { name = runeName, type = augmentType, values = runeValues })
 				end
 				for slotType, slotMod in pairs(runeMods) do
 					if slotType == broadItemType or slotType == specificItemType then
 						for _, mod in ipairs(slotMod) do
-							addModToGroupedRunes(mod)
+							addModToGroupedRunes(mod, slotMod.type)
 						end
 					end
 				end
@@ -1137,7 +1149,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 						remainingRunes = remainingRunes - numRunes
 						-- this code should probably be refactored to based off stored self.runes rather than the recomputed amounts off the runeModLines this
 						-- is too avoid having to run the relatively expensive recomputation every time the item is parsed even if we know the runes on the item already.
-						modLine.soulCore = groupedRunes[1].name:match("Soul Core") ~= nil
+						modLine.augmentType = groupedRunes[1].type
 						modLine.runeCount = numRunes
 
 						if shouldFixRunesOnItem then
@@ -1526,7 +1538,7 @@ function ItemClass:UpdateRunes()
 			for _, mod in ipairs(gatheredMods) do
 				for i, modLine in ipairs(mod) do
 					local order = mod.statOrder[i]
-					local orderKey = modLine:match("^Bonded:") and "Bonded:"..order or order
+					local orderKey = mod.type .. ":" .. (modLine:match("^Bonded:") and "Bonded:"..order or order)
 					if statOrder[orderKey] then
 						-- Combine stats
 						local start = 1
@@ -1535,8 +1547,12 @@ function ItemClass:UpdateRunes()
 							start = e + 1
 							return tonumber(num) + tonumber(other)
 						end)
+						local modList, extra = modLib.parseMod(statOrder[orderKey].line)
+						statOrder[orderKey].modList = modList or { }
+						statOrder[orderKey].extra = extra
 					else
-						local modLine = { line = modLine, order = order, rune = true, enchant = true }
+						local modList, extra = modLib.parseMod(modLine)
+						local modLine = { line = modLine, order = order, modList = modList or { }, extra = extra, rune = true, enchant = true, augmentType = mod.type }
 						for l = 1, #self.runeModLines + 1 do
 							if not self.runeModLines[l] or self.runeModLines[l].order > order then
 								t_insert(self.runeModLines, l, modLine)
@@ -2020,6 +2036,17 @@ function ItemClass:BuildModList()
 	for _, modLine in ipairs(self.explicitModLines) do
 		processModLine(modLine)
 	end
+	self.socketedSoulCoreEffectModifier = calcLocal(baseList, "SocketedSoulCoreEffect", "INC", 0) / 100
+	self.socketedRuneEffectModifier = calcLocal(baseList, "SocketedRuneEffect", "INC", 0) / 100
+	for _, modLine in ipairs(self.runeModLines) do
+		local effectModifier = modLine.augmentType == "SoulCore" and self.socketedSoulCoreEffectModifier
+			or modLine.augmentType == "Rune" and self.socketedRuneEffectModifier
+		if effectModifier and effectModifier ~= 0 and self:CheckModLineVariant(modLine) and not modLine.extra then
+			for _, mod in ipairs(modLine.modList) do
+				baseList:ScaleAddMod(mod, effectModifier)
+			end
+		end
+	end
 	self.grantedSkills = { }
 	for _, skill in ipairs(baseList:List(nil, "ExtraSkill")) do
 		if skill.name ~= "Unknown" then
@@ -2129,5 +2156,4 @@ function ItemClass:BuildModList()
 	else
 		self.modList = self:BuildModListForSlotNum(baseList)
 	end
-	self.socketedSoulCoreEffectModifier = calcLocal(baseList, "SocketedSoulCoreEffect", "INC", 0) / 100
 end

src/Classes/ItemsTab.lua

@@ -1918,6 +1918,14 @@ end)
 
 function ItemsTabClass:GetValidRunesForItem(item)
 	local runes = { }
+	local socketedItemType
+	if item.baseModList then
+		if item.baseModList:Flag(nil, "SocketedSoulCoresOnly") then
+			socketedItemType = "SoulCore"
+		elseif item.baseModList:Flag(nil, "SocketedRunesOnly") then
+			socketedItemType = "Rune"
+		end
+	end
 	for _, rune in pairs(runeModLines) do
 		local subType = item.base.subType and item.base.subType:lower()
 		local itemType = item.base.type:lower()
@@ -1939,17 +1947,9 @@ function ItemsTabClass:GetValidRunesForItem(item)
 			end
 		end
 		if isRuneValidForSlot(rune.slot) then
-				if item.title == "Atziri's Splendour" then
-					if rune.slot == "None" or rune.type == "SoulCore" then
-						table.insert(runes, rune)
-					end
-				elseif item.title == "Runeseeker's Call" then
-					if rune.slot == "None" or rune.type == "Rune" then
-						table.insert(runes, rune)
-					end
-				else
-					table.insert(runes, rune)
-				end
+			if rune.slot == "None" or not socketedItemType or rune.type == socketedItemType then
+				table.insert(runes, rune)
+			end
 		end
 	end
 	return runes

src/Data/ModCache.lua

@@ -2200,7 +2200,7 @@ c["200% increased Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="Physical
 c["200% increased Stun Recovery"]={{[1]={flags=0,keywordFlags=0,name="StunRecovery",type="INC",value=200}},nil}
 c["200% increased amount of Life Leeched"]={{[1]={flags=0,keywordFlags=0,name="MaxLifeLeechRate",type="INC",value=200}},nil}
 c["200% increased bonuses gained from Equipped Quiver"]={{[1]={flags=0,keywordFlags=0,name="EffectOfBonusesFromQuiver",type="INC",value=200}},nil}
-c["200% increased effect of Socketed Runes"]={{[1]={flags=0,keywordFlags=0,name="LocalEffect",type="INC",value=200}},"  of Socketed Runes "}
+c["200% increased effect of Socketed Runes"]={{[1]={flags=0,keywordFlags=0,name="SocketedRuneEffect",type="INC",value=200}},nil}
 c["200% increased effect of Socketed Soul Cores"]={{[1]={flags=0,keywordFlags=0,name="SocketedSoulCoreEffect",type="INC",value=200}},nil}
 c["21% increased Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="ChaosDamage",type="INC",value=21}},nil}
 c["21% increased Elemental Ailment Threshold"]={{[1]={flags=0,keywordFlags=0,name="AilmentThreshold",type="INC",value=21}},nil}
@@ -6336,8 +6336,8 @@ c["On Hitting an Enemy while a Life Flask is at full Charges, 40% of its Charges
 c["On Hitting an enemy, gains maximum added Lightning damage equal to"]={nil,"On Hitting an enemy, gains maximum added Lightning damage equal to "}
 c["On Hitting an enemy, gains maximum added Lightning damage equal to the enemy's Power for 20 seconds, up to a total of 500"]={nil,"On Hitting an enemy, gains maximum added Lightning damage equal to the enemy's Power for 20 seconds, up to a total of 500 "}
 c["On-Kill Effects happen twice"]={nil,"On-Kill Effects happen twice "}
-c["Only Runes can be Socketed in this item"]={{},nil}
-c["Only Soul Cores can be Socketed in this item"]={{},nil}
+c["Only Runes can be Socketed in this item"]={{[1]={flags=0,keywordFlags=0,name="SocketedRunesOnly",type="FLAG",value=true}},nil}
+c["Only Soul Cores can be Socketed in this item"]={{[1]={flags=0,keywordFlags=0,name="SocketedSoulCoresOnly",type="FLAG",value=true}},nil}
 c["Only affects Passives in Large Ring"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="radiusIndex",value=10}}},nil}
 c["Only affects Passives in Massive Ring"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="radiusIndex",value=12}}},nil}
 c["Only affects Passives in Medium Ring"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="radiusIndex",value=8}}},nil}

src/Modules/CalcSetup.lua

@@ -1117,20 +1117,6 @@ function calcs.initEnv(build, mode, override, specEnv)
 				end
 				env.itemModDB.multipliers["RunesSocketedIn"..slotName] = socketed
 
-				if item.socketedSoulCoreEffectModifier ~= 0 then
-					for _, modLine in ipairs(item.runeModLines) do
-						if modLine.soulcore then
-							for _, mod in ipairs(modLine.modList) do
-								local modCopy = copyTable(mod)
-								modCopy.value = round(modCopy.value / modLine.runeCount)
-								for i = 1, modLine.runeCount do
-									env.itemModDB:ScaleAddMod(modCopy, item.socketedSoulCoreEffectModifier)
-								end
-							end
-						end
-					end
-				end
-
 				if item.type == "Jewel" and item.base.subType == "Abyss" then
 					-- Update Abyss Jewel conditions/multipliers
 					local cond = "Have"..item.baseName:gsub(" ","")

src/Modules/ModParser.lua

@@ -896,6 +896,7 @@ local modNameList = {
 	["effect of the socketed jewel"] = "SocketedJewelEffect",
 	["effect of socketed abyss jewels"] = "SocketedJewelEffect",
 	["effect of socketed soul cores"] = "SocketedSoulCoreEffect",
+	["effect of socketed runes"] = "SocketedRuneEffect",
 	["to inflict fire exposure on hit"] = "FireExposureChance",
 	["to apply fire exposure on hit"] = "FireExposureChance",
 	["to inflict cold exposure on hit"] = "ColdExposureChance",
@@ -3432,17 +3433,13 @@ local specialModList = {
 		-- Display only. For Breach Rings and Serle's Grit.
 	},
 	["can have (%d+) additional instilled modifiers?"] = function(num) return {
-		-- Display only. For Strugglescream.
+		-- For Strugglescream. Handled in Item.lua
 	} end,
 	["can have an additional instilled modifier"] = function(num) return {
-		-- Display only.
-	} end,
-	["only soul cores can be socketed in this item"] = function(num) return {
-		-- Display only.
-	} end,
-	["only runes can be socketed in this item"] = function(num) return {
-		-- Display only.
+		-- Handled in Item.lua
 	} end,
+	["only soul cores can be socketed in this item"] = { flag("SocketedSoulCoresOnly") },
+	["only runes can be socketed in this item"] = { flag("SocketedRunesOnly") },
 	["has (%d+) sockets?"] = function(num) return { mod("SocketCount", "BASE", num) } end,
 	["no physical damage"] = { mod("WeaponData", "LIST", { key = "PhysicalMin" }), mod("WeaponData", "LIST", { key = "PhysicalMax" }), mod("WeaponData", "LIST", { key = "PhysicalDPS" }) },
 	["cannot load or fire ammunition"] = { mod("WeaponData", "LIST", { key = "cannotUseGemTag", value = "ammunition" }) },