fix: address PR #62 review — remove Ward double-count, hoist escapeGGGString, add non-authoritative test

Author: jay9297

spec/System/TestItemParse_spec.lua

@@ -728,4 +728,4 @@ describe("TestAdvancedItemParse #item", function()
 		item:BuildModList()
 		assert.are.equals(83, item.armourData.Ward)
 	end)
-end)
+end)

spec/System/TestWard_spec.lua

@@ -203,4 +203,28 @@ describe("TestWard", function()
 
 		assert.are.equals(10, build.calcsTab.calcsOutput.WardCoverOnMinionDeath)
 	end)
+
+	it("Non-authoritative Ward path: plain Ward mods scale correctly (no property line)", function()
+		-- Test that when Ward comes only from customMods (no property line),
+		-- the non-authoritative path in Item.lua applies INC and quality correctly.
+		-- Use a Runeforged item without a Runic Ward property line:
+		-- wardBase comes from mods, wardInc from mods, quality from item.
+		local item = new("Item", [[
+			Rarity: Rare
+			Mock Runeforged Coat
+			Runeforged Serpentscale Coat
+			--------
+			Quality: 20
+			--------
+			+65 to maximum Ward
+			30% increased Ward
+		]])
+		item:BuildModList()
+		-- Non-authoritative: no "Runic Ward" property line → armourData.Ward was nil on entry
+		-- wardBase = calcLocal(Ward,BASE,0) + base.armour.Ward = 65 + 0 = 65
+		-- wardInc = calcLocal(Ward,INC,0) = 30
+		-- quality = 20
+		-- Expected: round(65 * (1 + 30/100) * (1 + 20/100)) = round(65 * 1.3 * 1.2) = round(101.4) = 101
+		assert.are.equals(101, item.armourData.Ward)
+	end)
 end)

src/Classes/ImportTab.lua

@@ -1114,26 +1114,26 @@ function ImportTabClass:ImportItem(itemData, slotName)
 	end
 	if itemData.properties then
 		for _, property in pairs(itemData.properties) do
-			if escapeGGGString(property.name) == "Quality" then
+			local escapedPropertyName = escapeGGGString(property.name)
+			if escapedPropertyName == "Quality" then
 				item.quality = tonumber(property.values[1][1]:match("%d+"))
 			elseif property.name == "Radius" then
 				item.jewelRadiusLabel = property.values[1][1]
 			elseif property.name == "Limited to" then
 				item.limit = tonumber(property.values[1][1])
-			elseif escapeGGGString(property.name) == "Evasion Rating" then
+			elseif escapedPropertyName == "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 escapeGGGString(property.name) == "Energy Shield" then
+			elseif escapedPropertyName == "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
-			local escapedPropertyName = escapeGGGString(property.name)
 			if escapedPropertyName == "Energy Shield" or escapedPropertyName == "Ward" or escapedPropertyName == "Runic Ward" or escapedPropertyName == "Armour" or escapedPropertyName == "Evasion Rating" then
 				item.armourData = item.armourData or { }
 				local armourKey = escapedPropertyName:gsub(" Rating", ""):gsub(" ", "")

src/Classes/Item.lua

@@ -1793,7 +1793,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		if wardIsAuthoritative then
 			calcLocal(modList, "Ward", "BASE", 0)  -- consume flat rune ward mods (discard result)
 			calcLocal(modList, "Ward", "INC", 0)   -- consume INC rune ward mods (discard result)
-			wardBase = armourData.Ward + (self.base.armour.Ward or 0)
+			wardBase = armourData.Ward  -- property line is the final game value; base Ward is already baked in
 		else
 			wardBase = calcLocal(modList, "Ward", "BASE", 0) + (self.base.armour.Ward or 0)
 		end