Parse unscalable mods, increase mod precision, remove invalid mods from consideration, add more tests

Author: Wires77

spec/System/TestItemParse_spec.lua

@@ -523,37 +523,37 @@ describe("TestAdvancedItemParse #item", function()
 
 		assert.are.equals(advancedItem:BuildRaw(), equivalentCraftItem:BuildRaw())
 
-		local catalyst = new("Item", [[
+		local vaaledCatalyst = new("Item", [[
 			Item Class: Amulets
 			Rarity: Unique
 			Astramentis
 			Onyx Amulet
 			--------
-			Quality (Attribute Modifiers): +20% (augmented)
+			Quality (Attribute Modifiers): +19% (augmented)
 			--------
 			Requirements:
 			Level: 20
 			--------
-			Item Level: 80
-			--------
-			Allocates Weathered Hunter (enchant)
+			Item Level: 84
 			--------
-			{ Implicit Modifier — Attribute  — 20% Increased }
+			{ Implicit Modifier — Attribute  — 19% Increased }
 			+16(10-16) to all Attributes
 			(Attributes are Strength, Dexterity, and Intelligence)
 			--------
-			{ Unique Modifier — Attribute  — 20% Increased }
-			+86(80-100) to all Attributes
+			{ Unique Modifier — Attribute  — 19% Increased }
+			+120(80-100) to all Attributes
 			(Attributes are Strength, Dexterity, and Intelligence)
 			{ Unique Modifier — Physical, Attack }
-			-4 Physical Damage taken from Attack Hits
+			-3(-4) Physical Damage taken from Attack Hits
 			--------
 			Mindless rage will shake the world,
 			Cunning lies will bend it.
 			Reckless haste will break the world,
 			And into darkness send it.
 			--------
-			Note: ~b/o 50 chaos
+			Corrupted
+			--------
+			Note: ~b/o 1 mirror
 			]])
 
 		local equivalentCatalystItem = new("Item", [[
@@ -566,76 +566,196 @@ describe("TestAdvancedItemParse #item", function()
 			Implicits: 2
 			{crafted}Allocates Weathered Hunter
 			{tags:attribute}{range:1}+(10-16) to all Attributes
-			{tags:attribute}{range:0.3}+(80-100) to all Attributes
+			{tags:attribute}+120 to all Attributes
 			{tags:physical,attack}-4 Physical Damage taken from Attack Hits
 		]])
 
 		assert.are.equals(catalyst:BuildRaw(), equivalentCatalystItem:BuildRaw())
-		local godTestItem = new("Item", [[
-			Item Class: Sceptres
-			Rarity: Unique
-			Nebulis
-			Synthesised Void Sceptre
+
+		local craftedWeapon = new("Item", [[
+			Item Class: Staves
+			Rarity: Rare
+			Grim Beam
+			Royal Staff
 			--------
-			Sceptre
-			Physical Damage: 50-76
-			Critical Strike Chance: 7.30%
-			Attacks per Second: 1.25
-			Weapon Range: 1.1 metres
-			Memory Strands: 58
+			Staff
+			Physical Damage: 44-133 (augmented)
+			Critical Strike Chance: 8.50%
+			Attacks per Second: 1.15
+			Weapon Range: 1.3 metres
 			--------
 			Requirements:
-			Level: 68
-			Str: 104
-			Int: 122
+			Level: 51
+			Str: 51
+			Int: 51
 			--------
-			Sockets: B R 
+			Sockets: G 
 			--------
-			Item Level: 87
+			Item Level: 68
 			--------
-			+30% to Fire Resistance (scourge)
-			22% reduced Global Defences (scourge)
-			(Armour, Evasion Rating and Energy Shield are the standard Defences) (scourge)
+			{ Implicit Modifier }
+			+20% Chance to Block Spell Damage while wielding a Staff
+			(Warstaves are considered Staves)
 			--------
-			8% increased Explicit Cold Modifier magnitudes (enchant)
-			Has 1 White Socket (enchant)
+			{ Prefix Modifier "Warlock's" (Tier: 4) — Mana, Damage, Caster }
+			32(30-37)% increased Spell Damage
+			+46(42-47) to maximum Mana
+			{ Prefix Modifier "Freezing" (Tier: 5) — Damage, Elemental, Cold, Caster }
+			Adds 30(24-30) to 48(45-53) Cold Damage to Spells
+			{ Prefix Modifier "Serrated" (Tier: 7) — Damage, Physical, Attack }
+			64(50-64)% increased Physical Damage
+			{ Suffix Modifier "of Anger" (Tier: 5) — Damage, Critical }
+			+18(15-19)% to Global Critical Strike Multiplier
+			{ Suffix Modifier "of Bliss" (Tier: 3) — Mana }
+			71(59-72)% increased Mana Regeneration Rate
+			{ Suffix Modifier "of Discharge" (Tier: 2) — Damage, Elemental, Lightning }
+			40(40-44)% increased Lightning Damage
 			--------
-			{ Searing Exarch Implicit Modifier (Lesser) }
-			Tempest Shield has 15(15-17)% increased Buff Effect
-			{ Implicit Modifier — Damage, Critical  — 106% Increased }
-			+15(15-17)% to Global Critical Strike Multiplier
+			Corrupted
 			--------
-			{ Prefix Modifier "Freezing" (Tier: 5) — Damage, Elemental, Cold, Caster  — 8% Increased }
-			Adds 17(16-20) to 35(30-36) Cold Damage to Spells
-			{ Prefix Modifier "Beetle's" (Tier: 6) — Defences, Armour }
-			9(6-13)% increased Armour
-			7(6-7)% increased Stun and Block Recovery
-			{ Master Crafted Prefix Modifier "Upgraded" — Life, Defences, Armour }
-			21(18-21)% increased Armour
-			+18(17-19) to maximum Life
-			{ Unique Modifier }
-			106(60-120)% increased Implicit Modifier magnitudes — Unscalable Value
-			(Implicit Modifiers are those that come from an item's type, rather than its random properties)
-			{ Master Crafted Suffix Modifier "of Craft" (Rank: 3) — Elemental, Cold, Resistance }
-			+35(29-35)% to Cold Resistance
-			{ Fractured Prefix Modifier "Thorny" (Tier: 2) — Damage, Physical }
-			Reflects 3(1-4) Physical Damage to Melee Attackers
-			{ Prefix Modifier "Veiled" }
-			Veiled Prefix
-			Searing Exarch Item
+			Note: ~b/o 1 alch
+		]])
+
+		-- This gives a range to maximum mana, because GGG rolls multi-line mods separately, while we don't (for now?)
+		local equivCraftedWeapon = new("Item", [[
+			Grim Beam
+			Royal Staff
+			Crafted: true
+			Prefix: {range:0.286}SpellDamageAndManaOnTwoHandWeapon4
+			Prefix: {range:0.375}LocalAddedColdDamageTwoHand5
+			Prefix: {range:1}LocalIncreasedPhysicalDamagePercent2
+			Suffix: {range:0.75}LocalCriticalMultiplier2
+			Suffix: {range:0.923}ManaRegenerationTwoHand4
+			Suffix: {range:0}LightningDamagePercentTwoHand5
+			Item Level: 68
+			Quality: 0
+			Sockets: G
+			LevelReq: 28
+			Implicits: 1
+			+20% Chance to Block Spell Damage while wielding a Staff
+			{tags:mana,damage,caster}32% increased Spell Damage
+			{tags:mana,damage,caster}{range:0.8}+(42-47) to maximum Mana
+			{tags:damage,elemental,cold,caster}Adds 30 to 48 Cold Damage to Spells
+			{tags:damage,physical,attack}64% increased Physical Damage
+			{tags:damage,critical}+18% to Global Critical Strike Multiplier
+			{tags:mana}71% increased Mana Regeneration Rate
+			{tags:damage,elemental,lightning}40% increased Lightning Damage
+			Corrupted
+		]])
+
+		assert.are.equals(craftedWeapon:BuildRaw(), equivCraftedWeapon:BuildRaw())
+
+		local badUnique = new("Item", [[
+			Item Class: Amulets
+			Rarity: Unique
+			Astramentis
+			Onyx Amulet
 			--------
-			{ Allocated Crucible Passive Skill (Tier: 2) }
-			Adds 2 to 6 Physical Damage to Spells
+			Requirements:
+			Level: 20
 			--------
-			Synthesised Item
+			Item Level: 84
 			--------
-			Corrupted
+			{ Implicit Modifier — Attribute }
+			+12(10-16) to all Attributes
+			(Attributes are Strength, Dexterity, and Intelligence)
 			--------
-			Scourged
+			{ Unique Modifier — Attribute }
+			+69(80-100) to all Attributes
+			(Attributes are Strength, Dexterity, and Intelligence)
+			{ Unique Modifier — Physical, Attack }
+			-4 Physical Damage taken from Attack Hits
 			--------
-			Hinekora's Lock
+			Mindless rage will shake the world,
+			Cunning lies will bend it.
+			Reckless haste will break the world,
+			And into darkness send it.
 			--------
-			Note: ~b/o 2 chaos
+			Corrupted
+			--------
+			Note: ~b/o 69 mirror
+]])
+
+		local equivBadUnique = new("Item", [[
+			Astramentis
+			Onyx Amulet
+			Item Level: 84
+			LevelReq: 20
+			Implicits: 1
+			{tags:attribute}{range:0.333}+(10-16) to all Attributes
+			{tags:attribute}+69 to all Attributes
+			{tags:physical,attack}-4 Physical Damage taken from Attack Hits
+			Corrupted
+		]])
+
+		assert.are.equals(badUnique:BuildRaw(), equivBadUnique:BuildRaw())
+
+
+		local godTestItem = new("Item", [[
+Item Class: Sceptres
+Rarity: Unique
+Nebulis
+Synthesised Void Sceptre
+--------
+Sceptre
+Physical Damage: 50-76
+Critical Strike Chance: 7.30%
+Attacks per Second: 1.25
+Weapon Range: 1.1 metres
+Memory Strands: 58
+--------
+Requirements:
+Level: 68
+Str: 104
+Int: 122
+--------
+Sockets: B R 
+--------
+Item Level: 87
+--------
++30% to Fire Resistance (scourge)
+22% reduced Global Defences (scourge)
+(Armour, Evasion Rating and Energy Shield are the standard Defences) (scourge)
+--------
+8% increased Explicit Cold Modifier magnitudes (enchant)
+Has 1 White Socket (enchant)
+--------
+{ Searing Exarch Implicit Modifier (Lesser) }
+Tempest Shield has 15(15-17)% increased Buff Effect
+{ Implicit Modifier — Damage, Critical  — 106% Increased }
++15(15-17)% to Global Critical Strike Multiplier
+--------
+{ Prefix Modifier "Freezing" (Tier: 5) — Damage, Elemental, Cold, Caster  — 8% Increased }
+Adds 17(16-20) to 35(30-36) Cold Damage to Spells
+{ Prefix Modifier "Beetle's" (Tier: 6) — Defences, Armour }
+9(6-13)% increased Armour
+7(6-7)% increased Stun and Block Recovery
+{ Master Crafted Prefix Modifier "Upgraded" — Life, Defences, Armour }
+21(18-21)% increased Armour
++18(17-19) to maximum Life
+{ Unique Modifier }
+106(60-120)% increased Implicit Modifier magnitudes — Unscalable Value
+(Implicit Modifiers are those that come from an item's type, rather than its random properties)
+{ Master Crafted Suffix Modifier "of Craft" (Rank: 3) — Elemental, Cold, Resistance }
++35(29-35)% to Cold Resistance
+{ Fractured Prefix Modifier "Thorny" (Tier: 2) — Damage, Physical }
+Reflects 3(1-4) Physical Damage to Melee Attackers
+{ Prefix Modifier "Veiled" }
+Veiled Prefix
+Searing Exarch Item
+--------
+{ Allocated Crucible Passive Skill (Tier: 2) }
+Adds 2 to 6 Physical Damage to Spells
+--------
+Synthesised Item
+--------
+Corrupted
+--------
+Scourged
+--------
+Hinekora's Lock
+--------
+Note: ~b/o 2 chaos
 		]])
 	end)
 end)