Add support for Runic ward

spec/System/TestCustomModControl_spec.lua

@@ -151,6 +151,29 @@ describe("Custom modifier controls", function()
 		end
 	end)
 
+	it("distinguishes missing and empty runic ward conditions", function()
+		local missingMods, missingExtra = modLib.parseMod("10% increased Attack Speed while missing Runic Ward")
+		local missingCondition
+		for _, tag in ipairs(missingMods[1]) do
+			if tag.type == "Condition" then
+				missingCondition = tag
+			end
+		end
+		assert.is_nil(missingExtra)
+		assert.are.equals("MissingRunicWard", missingCondition.var)
+		assert.is_nil(missingCondition.neg)
+
+		local noWardMods, noWardExtra = modLib.parseMod("Lose 5% Life per second while you have no Runic Ward during Effect")
+		local noWardCondition
+		for _, tag in ipairs(noWardMods[1]) do
+			if tag.type == "Condition" and tag.var == "NoRunicWard" then
+				noWardCondition = tag
+			end
+		end
+		assert.is_nil(noWardExtra)
+		assert.is_not_nil(noWardCondition)
+	end)
+
 	it("uses the expanded browser dimensions", function()
 		local popup = openModBrowser()
 		local listWidth, listHeight = popup.controls.listControl:GetSize()

spec/System/TestDefence_spec.lua

@@ -49,6 +49,148 @@ describe("TestDefence", function()
 		assert.are.equals(manaWithoutTotalEnergyShield + 100, player.output.Mana)
 	end)
 
+	it("applies energy shield modifiers to runic ward when redirected", function()
+		build.configTab.input.customMods = [[
+			+100 to maximum Runic Ward
+			100% increased maximum Runic Ward
+			100% increased maximum Energy Shield
+			Increases and Reductions to maximum Energy Shield instead apply to Ward
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(300, build.calcsTab.mainOutput.Ward)
+	end)
+
+	it("does not apply energy shield more modifiers to redirected runic ward", function()
+		build.configTab.input.customMods = [[
+			+100 to maximum Runic Ward
+			100% more maximum Energy Shield
+			Increases and Reductions to maximum Energy Shield instead apply to Ward
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(100, build.calcsTab.mainOutput.Ward)
+	end)
+
+	it("applies mana regeneration to runic ward before mana degeneration", function()
+		build.configTab.input.customMods = "+100 to maximum Runic Ward\nLose 5% of maximum Mana per Second"
+		build.configTab:BuildModList()
+		build.itemsTab:CreateDisplayItemFromRaw([[
+			Test Wand
+			Runic Fork
+			Sockets: S
+			Rune: Warding Rune of Equinox
+			Implicits: 3
+			{enchant}{rune}40% less Mana Regeneration Rate
+			{enchant}{rune}Mana Recovery from Regeneration is also applied to Runic Ward
+			{enchant}{rune}Bonded: 20% increased Runic Ward Regeneration Rate if you've dealt a Critical Hit Recently
+		]])
+		build.itemsTab:AddDisplayItem()
+		runCallback("OnFrame")
+
+		local output = build.calcsTab.mainOutput
+		assert.is_true(output.ManaDegen > 0)
+		assert.are.near(output.ManaRegen, output.WardRecovery, 0.1)
+		assert.are.near(output.ManaRegen - output.ManaDegen, output.ManaRegenRecovery, 0.1)
+	end)
+
+	it("applies life flask recovery to runic ward through Warding Rune of Nourishment", function()
+		build.skillsTab:PasteSocketGroup("Ball Lightning 1/0  1")
+		build.itemsTab:CreateDisplayItemFromRaw([[
+			Test Gloves
+			Runeforged Stocky Mitts
+			Sockets: S
+			Rune: Warding Rune of Nourishment
+			Implicits: 2
+			{enchant}{rune}15% Life Recovery from Flasks also applies to Runic Ward
+			{enchant}{rune}Bonded: 15% increased Life Recovery from Flasks
+		]])
+		build.itemsTab:AddDisplayItem()
+		build.itemsTab:CreateDisplayItemFromRaw([[
+			Test Flask
+			Ultimate Life Flask
+			Life Flask Effects are not removed when Unreserved Life is Filled
+		]])
+		build.itemsTab:AddDisplayItem()
+		build.itemsTab:EquipItemInSet(build.itemsTab.items[2], build.itemsTab.activeItemSetId)
+		build.itemsTab.slots["Flask 1"].active = true
+		runCallback("OnFrame")
+
+		local output = build.calcsTab.calcsOutput
+		assert.are.equals(15, build.calcsTab.calcsEnv.player.modDB:Sum("BASE", nil, "LifeFlaskRecoveryAppliesToWard"))
+		assert.is_true(output.LifeRecovery > 0)
+		assert.is_true(output.WardRecovery > 0)
+		assert.are.near(output.LifeRecovery * 0.15, output.WardRecovery, 0.01)
+	end)
+
+	it("includes runic ward in comprehensive net recovery", function()
+		build.configTab.input.customMods = "+100 to maximum Runic Ward"
+		build.configTab.input.enemyDamageType = "DamageOverTime"
+		build.configTab.input.enemyFireDamage = 100
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		local output = build.calcsTab.calcsOutput
+		assert.are.equals(output.ComprehensiveNetLifeRegen + output.ComprehensiveNetManaRegen + output.ComprehensiveNetWardRegen + output.ComprehensiveNetEnergyShieldRegen, output.ComprehensiveTotalNetRegen)
+	end)
+
+	it("does not count fully bypassed runic ward as a hit pool", function()
+		build.configTab.input.customMods = "All damage taken bypasses Runic Ward"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		local withoutWard = build.calcsTab.calcsOutput.FireTotalHitPool
+
+		build.configTab.input.customMods = "+100 to maximum Runic Ward\nAll damage taken bypasses Runic Ward"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		local output = build.calcsTab.calcsOutput
+		assert.are.equals(withoutWard, output.FireTotalHitPool)
+		assert.is_true(output.NumberOfDamagingHits < data.misc.ehpCalcMaxIterationsToCalc)
+	end)
+
+	it("adds non-bypassed runic ward to damage over time pool", function()
+		build.configTab.input.customMods = ""
+		build.configTab.input.enemyDamageType = "DamageOverTime"
+		build.configTab.input.enemyFireDamage = 100
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		local withoutWard = build.calcsTab.calcsOutput.FireTotalPool
+
+		build.configTab.input.customMods = "+100 to maximum Runic Ward"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(withoutWard + 100, build.calcsTab.calcsOutput.FireTotalPool)
+
+		build.configTab.input.customMods = "+100 to maximum Runic Ward\nAll damage taken bypasses Runic Ward"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(withoutWard, build.calcsTab.calcsOutput.FireTotalPool)
+	end)
+
+	it("includes remaining runic ward in hit pool tracking", function()
+		build.configTab.input.customMods = "+100 to maximum Runic Ward"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		local output = build.calcsTab.calcsOutput
+		local poolsRemaining = build.calcsTab.calcs.reducePoolsByDamage(nil, { Physical = 1 }, build.calcsTab.calcsEnv.player)
+
+		assert.are.near(output.PhysicalTotalHitPool - 1, poolsRemaining.hitPoolRemaining, 0.01)
+
+		build.configTab.input.customMods = "+100 to maximum Runic Ward\nAll damage taken bypasses Runic Ward"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		output = build.calcsTab.calcsOutput
+		poolsRemaining = build.calcsTab.calcs.reducePoolsByDamage(nil, { Physical = 1 }, build.calcsTab.calcsEnv.player)
+		assert.are.near(output.PhysicalTotalHitPool - 1, poolsRemaining.hitPoolRemaining, 0.01)
+	end)
+
 	it("no armour max hits", function()
 		build.configTab.input.enemyIsBoss = "None"
 		build.configTab.input.customMods = ""

spec/System/TestImportTab_spec.lua

@@ -94,6 +94,21 @@ describe("ImportTab", function()
 		assert.True(importedSpec.nodes[templarStartPassive.id].alloc)
 		assert.True(importedSpec.nodes[templarStartPassive.id].connectedToStart)
 	end)
+
+	it("imports the Runic Ward item property", function()
+		build.importTab:ImportItem({
+			id = "runic-ward-test",
+			frameType = 0,
+			name = "",
+			typeLine = "Runeforged Sentinel Greathelm",
+			inventoryId = "Helm",
+			ilvl = 52,
+			properties = { { name = "[Ward|Runic Ward]", values = { { "180", 0 } } } },
+		})
+
+		local item = build.itemsTab.items[build.itemsTab.slots["Helmet"].selItemId]
+		assert.is_truthy(item.raw:match("Runic Ward: 180"))
+	end)
 end)
 
 describe("ImportTab BuildPlanner export option", function()

spec/System/TestItemMods_spec.lua

@@ -14,6 +14,12 @@ describe("TetsItemMods", function()
 		assert.is_nil(mod.weightMultiplierKey)
 	end)
 
+	it("does not colour a stat as modified without a base value", function()
+		assert.are.equals("^7", main:StatColor(10, nil, 90))
+		assert.are.equals(colorCodes.MAGIC, main:StatColor(10, 5, 90))
+		assert.are.equals(colorCodes.NEGATIVE, main:StatColor(100, nil, 90))
+	end)
+
 	it("shows duplicate selected variants in item tooltips when enabled", function()
 		local item = new("Item"):Item([[
 			Rarity: Unique

spec/System/TestItemParse_spec.lua

@@ -26,6 +26,13 @@ describe("TestItemParse", function()
 	--	assert.are.equals(180, item.armourData.Ward)
 	--end)
 
+	it("Ward defence", function()
+		local item = new("Item"):Item(raw("Ward: 180", "Runic Crown"))
+		assert.are.equals(180, item.armourData.Ward)
+		item = new("Item"):Item(raw("Runic Ward: 180", "Runic Crown"))
+		assert.are.equals(180, item.armourData.Ward)
+	end)
+
 	it("Title", function()
 		local item = new("Item"):Item([[
 			Rarity: Rare

spec/System/TestSkills_spec.lua

@@ -63,6 +63,47 @@ describe("TestSkills", function()
 		assertGemSupportLevel("Apocalypse", 3, 4)
 	end)
 
+	it("applies Leylines Runic Ward degeneration", function()
+		build.skillsTab:PasteSocketGroup("Leylines 1/0  1")
+		build.configTab.input.onLeyline = true
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		local output = build.calcsTab.mainOutput
+		assert.are.near(206 / 60, output.WardDegen, 0.01)
+		assert.are.near(output.WardRegen - output.WardDegen, output.WardRegenRecovery, 0.01)
+	end)
+
+	it("calculates Scouring Flame runic ward cost and efficiency", function()
+		build.skillsTab:PasteSocketGroup("Ball Lightning 1/0  1\nScouring Flame 1/0  1")
+		runCallback("OnFrame")
+		assert.are.equals(2, build.calcsTab.mainOutput.WardCost)
+
+		build.configTab.input.customMods = "100% increased Runic Ward Cost Efficiency"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		assert.are.equals(1, build.calcsTab.mainOutput.WardCost)
+	end)
+
+	it("calculates runic infusion support costs from maximum runic ward", function()
+		for _, support in ipairs({ "Runic Infusion", "Olroth's Hubris" }) do
+			newBuild()
+			build.configTab.input.customMods = "+100 to maximum Runic Ward"
+			build.configTab:BuildModList()
+			build.itemsTab:CreateDisplayItemFromRaw("New Item\nMarauding Mace")
+			build.itemsTab:AddDisplayItem()
+			build.skillsTab:PasteSocketGroup("Leap Slam 1/0  1\n" .. support .. " 1/0  1")
+			runCallback("OnFrame")
+			assert.are.equals(20, build.calcsTab.mainOutput.WardCost)
+		end
+	end)
+
+	it("calculates Runic Reprieve's ongoing runic ward cost", function()
+		build.skillsTab:PasteSocketGroup("Runic Reprieve 1/0  1")
+		runCallback("OnFrame")
+		assert.are.equals(3, build.calcsTab.mainOutput.WardPerSecondCost)
+	end)
+
 	it("applies Advanced Thaumaturgy quality stats only when enabled", function()
 		local advancedThaumaturgy = build.spec.nodes[14429]
 		assert.is_not_nil(advancedThaumaturgy)

src/Classes/CompareBuySimilar.lua

@@ -317,7 +317,7 @@ function M.openPopup(item, slotName, primaryBuild)
 			{ key = "Armour", label = "Armour", tradeKey = "ar" },
 			{ key = "Evasion", label = "Evasion", tradeKey = "ev" },
 			{ key = "EnergyShield", label = "Energy Shield", tradeKey = "es" },
-			{ key = "Ward", label = "Ward", tradeKey = "ward" },
+			{ key = "Ward", label = "Runic Ward", tradeKey = "ward" },
 		}
 		for _, def in ipairs(defences) do
 			local val = item.armourData[def.key]
@@ -497,7 +497,7 @@ function M.openPopup(item, slotName, primaryBuild)
 			end
 			displayTexts[index] = displayText
 		end
-		
+
 
 		local displayText = table.concat(displayTexts, "\n")
 		-- labels anchor based on the first row instead of the middle row, so adjust upwards

src/Classes/CompareTab.lua

@@ -3554,7 +3554,7 @@ function CompareTabClass:DrawItemExpanded(item, x, startY, colWidth, otherModMap
 					drawY = drawY + lineHeight
 				end
 				if ward > 0 then
-					DrawString(x, drawY, "LEFT", fontSize, "VAR", s_format("^x7F7F7FWard: " .. colorCodes.MAGIC .. "%d", ward))
+					DrawString(x, drawY, "LEFT", fontSize, "VAR", s_format("^x7F7F7FRunic Ward: " .. colorCodes.MAGIC .. "%d", ward))
 					drawY = drawY + lineHeight
 				end
 				if armourData.BlockChance and armourData.BlockChance > 0 then

src/Classes/ImportTab.lua

@@ -1419,29 +1419,31 @@ function ImportTabClass:ImportItem(itemData, slotName)
 	end
 	if itemData.properties then
 		for _, property in pairs(itemData.properties) do
-			if escapeGGGString(property.name) == "Quality" then
+			local propertyName = escapeGGGString(property.name)
+			if propertyName == "Quality" then
 				item.quality = tonumber(property.values[1][1]:match("%d+"))
-			elseif property.name == "Radius" then
+			elseif propertyName == "Radius" then
 				item.jewelRadiusLabel = property.values[1][1]
-			elseif property.name == "Limited to" then
+			elseif propertyName == "Limited to" then
 				item.limit = tonumber(property.values[1][1])
-			elseif property.name == "Evasion Rating" then
+			elseif propertyName == "Evasion Rating" then
 				if item.baseName == "Two-Toned Boots (Armour/Energy Shield)" then
 					-- Another hack for Two-Toned Boots
 					item.baseName = "Two-Toned Boots (Armour/Evasion)"
 					item.base = self.build.data.itemBases[item.baseName]
 				end
-			elseif property.name == "Energy Shield" then
+			elseif propertyName == "Energy Shield" then
 				if item.baseName == "Two-Toned Boots (Armour/Evasion)" then
 					-- Yet another hack for Two-Toned Boots
 					item.baseName = "Two-Toned Boots (Evasion/Energy Shield)"
 					item.base = self.build.data.itemBases[item.baseName]
 				end
 			end
-			if property.name == "Energy Shield" or property.name == "Ward" or property.name == "Armour" or property.name == "Evasion Rating" then
+			if propertyName == "Energy Shield" or propertyName == "Runic Ward" or propertyName == "Armour" or propertyName == "Evasion Rating" then
 				item.armourData = item.armourData or { }
+				local defenceType = propertyName:gsub("Runic Ward", "Ward"):gsub(" Rating", ""):gsub(" ", "")
 				for _, value in ipairs(property.values) do
-					item.armourData[property.name:gsub(" Rating", ""):gsub(" ", "")] = (item.armourData[property.name:gsub(" Rating", ""):gsub(" ", "")] or 0) + tonumber(value[1])
+					item.armourData[defenceType] = (item.armourData[defenceType] or 0) + tonumber(value[1])
 				end
 			end
 		end

src/Classes/Item.lua

@@ -832,7 +832,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 					-- Parsed before item lines so tagged bases and modifiers see the final selection.
 				elseif specName == "Talisman Tier" then
 					self.talismanTier = specToNumber(specVal)
-				elseif specName == "Armour" or specName == "Evasion Rating" or specName == "Evasion" or specName == "Energy Shield" or specName == "Ward" then
+				elseif specName == "Armour" or specName == "Evasion Rating" or specName == "Evasion" or specName == "Energy Shield" or specName == "Ward" or specName == "Runic Ward" then
 					if specName == "Evasion Rating" then
 						specName = "Evasion"
 						if self.baseName == "Two-Toned Boots (Armour/Energy Shield)" then
@@ -847,6 +847,8 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 							self.baseName = "Two-Toned Boots (Evasion/Energy Shield)"
 							self.base = data.itemBases[self.baseName]
 						end
+					elseif specName == "Runic Ward" then
+						specName = "Ward"
 					end
 					self.armourData = self.armourData or { }
 					self.armourData[specName] = specToNumber(specVal)
@@ -1841,7 +1843,7 @@ function ItemClass:BuildRaw()
 	if self.armourData then
 		for _, type in ipairs({ "Armour", "Evasion", "EnergyShield", "Ward" }) do
 			if self.armourData[type] and self.armourData[type] > 0 then
-				t_insert(rawLines, type:gsub("EnergyShield", "Energy Shield") .. ": " .. self.armourData[type])
+				t_insert(rawLines, type:gsub("EnergyShield", "Energy Shield"):gsub("Ward", "Runic Ward") .. ": " .. self.armourData[type])
 			end
 		end
 	end

src/Data/Costs.lua

@@ -29,7 +29,7 @@ return {
 	[5] = {
 		Resource = "Ward",
 		Stat = "base_ward_cost",
-		ResourceString = "{0} Ward",
+		ResourceString = "{0} Runic Ward",
 		Divisor = 1,
 	},
 	[6] = {
@@ -47,7 +47,7 @@ return {
 	[8] = {
 		Resource = "WardPercent",
 		Stat = "base_ward_cost_%",
-		ResourceString = "{0}% Ward",
+		ResourceString = "{0}% Runic Ward",
 		Divisor = 1,
 	},
 	[9] = {
@@ -107,7 +107,7 @@ return {
 	[18] = {
 		Resource = "WardPerMinute",
 		Stat = "base_ward_cost_per_minute",
-		ResourceString = "{0} Ward per second",
+		ResourceString = "{0} Runic Ward per second",
 		Divisor = 60,
 	},
 	[19] = {