From e94ddf01b5440ad373223148f0da2f290e51325d Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Sat, 18 Jun 2022 12:16:22 +1000
Subject: [PATCH 01/13] Fixed a variety of incorrect catalyst scaling

The changes are based off some testing and work I did in 17/4/2021
So any recently changed mods or new uniques will not be guaranteed to be correct.
https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues/2521#issuecomment-821748654
https://docs.google.com/spreadsheets/d/11mOp3VLPXgbhJq562DdFmP34nx4tNqoF47LbrM-R93g/edit#gid=0

I have verified all of these either using trade or through in game but I haven't collated documentation due to the large number of changes.
---
 src/Data/Uniques/amulet.lua | 52 ++++++++++----------
 src/Data/Uniques/belt.lua   | 46 +++++++++---------
 src/Data/Uniques/ring.lua   | 96 ++++++++++++++++++-------------------
 3 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
index bc9d19ffc6..9c66a8a550 100644
--- a/src/Data/Uniques/amulet.lua
+++ b/src/Data/Uniques/amulet.lua
@@ -30,7 +30,7 @@ Araku Tiki
 Coral Amulet
 Implicits: 1
 {tags:life}(2-4) Life Regenerated per second
-{tags:jewellery_defense,life}You gain 100 Evasion Rating when on Low Life
+{tags:jewellery_defense}You gain 100 Evasion Rating when on Low Life
 {tags:life}+(30-50) to maximum Life
 {tags:jewellery_resistance}+(20-30)% to Fire Resistance
 {tags:life}1% of Life Regenerated per Second while on Low Life
@@ -42,7 +42,7 @@ Requires Level 36
 Implicits: 1
 {tags:life}(2-4) Life Regenerated per second
 {tags:jewellery_elemental}(50-70)% increased Fire Damage
-{tags:jewellery_defense,life}You gain 100 Evasion Rating when on Low Life
+{tags:jewellery_defense}You gain 100 Evasion Rating when on Low Life
 {tags:life}+(30-50) to maximum Life
 {tags:jewellery_resistance}+(20-30)% to Fire Resistance
 {tags:life}1% of Life Regenerated per Second while on Low Life
@@ -171,7 +171,7 @@ Implicits: 1
 +1 to Maximum Power Charges
 {tags:mana}10% increased Mana Regeneration Rate Per Power Charge
 {variant:2}(80-100)% increased Power Charge Duration
-{tags:mana}1% of Damage is taken from Mana before Life per Power Charge
+{tags:mana,life}1% of Damage is taken from Mana before Life per Power Charge
 {tags:critical}40% reduced Critical Strike Chance per Power Charge
 ]],[[
 Badge of the Brotherhood
@@ -227,7 +227,7 @@ Implicits: 1
 Grants level 10 Gluttony of Elements Skill
 {tags:attack,chaos}Adds 19-43 Chaos Damage to Attacks
 {tags:jewellery_resistance}−(10-5)% to all Elemental Resistances
-{tags:chaos,jewellery_resistance}+(17-29)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-29)% to Chaos Resistance
 Corrupted
 ]],[[
 Bloodgrip
@@ -294,9 +294,9 @@ Implicits: 1
 {tags:jewellery_defense}50% reduced maximum Energy Shield
 {tags:jewellery_resistance}+(30-40)% to Fire Resistance
 {tags:jewellery_resistance}+(30-40)% to Cold Resistance
-{tags:life,speed}10% increased Movement Speed when on Full Life
+{tags:speed}10% increased Movement Speed when on Full Life
 {tags:attack}+2 to Melee Weapon and Unarmed range
-{tags:attack,life}60% increased Melee Damage when on Full Life
+{tags:attack}60% increased Melee Damage when on Full Life
 ]],[[
 The Ephemeral Bond
 Lapis Amulet
@@ -322,8 +322,8 @@ Implicits: 1
 5% chance to grant Onslaught to nearby Enemies on Kill
 {variant:1}5% chance to gain Unholy Might for 10 seconds on Kill
 {variant:2}10% chance to gain Unholy Might for 10 seconds on Kill
-{variant:1}{tags:caster,attack}5% chance to gain Onslaught for 10 seconds on Kill
-{variant:2}{tags:caster,attack}10% chance to gain Onslaught for 10 seconds on Kill
+{variant:1}5% chance to gain Onslaught for 10 seconds on Kill
+{variant:2}10% chance to gain Onslaught for 10 seconds on Kill
 {tags:life}Recover 1% of Life on Kill
 ]],[[
 Eye of Chayula
@@ -344,7 +344,7 @@ Requires Level 60
 Implicits: 1
 {tags:jewellery_attribute}+(10-16) to all Attributes
 30% increased Rarity of Items found
-{tags:chaos,jewellery_resistance}+60% to Chaos Resistance
+{tags:jewellery_resistance}+60% to Chaos Resistance
 Cannot be Stunned
 {tags:jewellery_defense,life}20% of Maximum Life Converted to Energy Shield
 ]],[[
@@ -354,7 +354,7 @@ Source: Drops from unique{Guardian of the Phoenix}
 Requires Level 68
 Implicits: 1
 {tags:jewellery_attribute}+(16-24) to Strength and Dexterity
-{tags:jewellery_elemental}10% chance to Ignite
+10% chance to Ignite
 (50-70)% increased Damage while Ignited
 {tags:jewellery_elemental}Take 100 Fire Damage when you Ignite an Enemy
 {tags:life}2% of Fire Damage Leeched as Life while Ignited
@@ -482,7 +482,7 @@ Implicits: 1
 {tags:jewellery_elemental}(10-20)% increased Cold Damage
 {tags:jewellery_resistance}+(35-40)% to Cold Resistance
 30% increased Freeze Duration on Enemies
-{tags:jewellery_elemental}10% chance to Freeze
+10% chance to Freeze
 60% increased Damage if you've Frozen an Enemy Recently
 ]],[[
 The Pandemonius
@@ -527,7 +527,7 @@ Grants Level 22 Precision Skill
 +(23-28)% to Global Critical Strike Multiplier
 {tags:attack,life,physical}(0.8-1)% of Physical Attack Damage Leeched as Life
 {variant:1}Precision has 50% less Reservation
-{variant:2}Precision has 100% increased Mana Reservation Efficiency
+{variant:2}{tags:mana}Precision has 100% increased Mana Reservation Efficiency
 ]],[[
 Replica Hyrri's Truth
 Jade Amulet
@@ -544,7 +544,7 @@ Grants Level 22 Hatred Skill
 {tags:critical}+(23-28)% to Global Critical Strike Multiplier
 {tags:life}(0.8-1.0)% of Cold Damage Leeched as Life
 {variant:1}Hatred has 50% less Reservation
-{variant:2}Hatred has 100% increased Mana Reservation Efficiency
+{variant:2}{tags:mana}Hatred has 100% increased Mana Reservation Efficiency
 ]],[[
 The Ignomon
 Gold Amulet
@@ -569,7 +569,7 @@ Implicits: 1
 {tags:jewellery_defense}+(100-150) to Evasion Rating
 {tags:jewellery_resistance}+20% to Fire Resistance
 Your Hits can't be Evaded by Blinded Enemies
-Damage Penetrates 10% Fire Resistance against Blinded Enemies
+{tags:jewellery_elemental}Damage Penetrates 10% Fire Resistance against Blinded Enemies
 ]],[[
 Impresence
 Onyx Amulet
@@ -597,7 +597,7 @@ Implicits: 1
 {variant:2}{tags:jewellery_resistance}+(20-25)% to Fire Resistance
 {variant:3}{tags:jewellery_resistance}+(20-25)% to Cold Resistance
 {variant:4}{tags:jewellery_resistance}+(20-25)% to Lightning Resistance
-{variant:5}{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{variant:5}{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1}Vulnerability has no Reservation if Cast as an Aura
 {variant:2}Flammability has no Reservation if Cast as an Aura
 {variant:3}Frostbite has no Reservation if Cast as an Aura
@@ -678,7 +678,7 @@ Requires Level 48
 Implicits: 1
 {tags:jewellery_attribute}+(16-24) to Strength and Dexterity
 {tags:jewellery_attribute}+(30-40) to Intelligence
-{tags:chaos,jewellery_resistance}+(23-31)% to Chaos Resistance
+{tags:jewellery_resistance}+(23-31)% to Chaos Resistance
 {variant:1}{tags:caster}(10-15)% increased Effect of your Curses
 {variant:2}{tags:caster}(5-10)% increased Effect of your Curses
 {variant:1}(10-15)% increased effect of Non-Curse Auras from your Skills
@@ -767,9 +767,9 @@ Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Dexterity
 {tags:life}+(40-80) to maximum Life
 {tags:mana}+(20-40) to maximum Mana
-{tags:jewellery_elemental}20% increased Duration of Elemental Ailments on Enemies
+20% increased Duration of Elemental Ailments on Enemies
 Items and Gems have 10% reduced Attribute Requirements
-{tags:jewellery_elemental}5% chance to Freeze, Shock and Ignite
+5% chance to Freeze, Shock and Ignite
 Cannot gain Power Charges
 ]],[[
 Retaliation Charm
@@ -853,7 +853,7 @@ Variant: Current
 Implicits: 1
 {tags:mana}(20-30)% increased Mana Regeneration Rate
 {tags:jewellery_resistance}+25% to Cold Resistance
-{variant:1,2}0.2% of Physical Attack Damage Leeched as Mana
+{tags:mana,physical,attack}{variant:1,2}0.2% of Physical Attack Damage Leeched as Mana
 {tags:life}Minions have (10-15)% increased maximum Life
 {tags:speed}Minions have (10-15)% increased Movement Speed
 {tags:jewellery_elemental}{variant:3}Minions deal 6 to 13 additional Cold Damage
@@ -873,7 +873,7 @@ Implicits: 1
 {tags:life}+(50-70) to maximum Life
 {variant:1}{tags:mana}(2-3) Mana Regenerated per second
 {variant:2}{tags:mana}(8-10) Mana Regenerated per second
-{tags:mana}Temporal Chains has no Reservation if Cast as an Aura
+Temporal Chains has no Reservation if Cast as an Aura
 Gain Shaper's Presence for 10 seconds when you kill a Rare or Unique Enemy
 ]],[[
 Star of Wraeclast
@@ -923,7 +923,7 @@ Requires Level 54
 Implicits: 1
 {tags:life}(2.0-4.0) Life regenerated per second
 {tags:jewellery_attribute}+(30-40) to Intelligence
-{tags:chaos,jewellery_resistance}Minions have (-17-17)% to Chaos Resistance
+Minions have (-17-17)% to Chaos Resistance
 Summon Raging Spirit has (20-30)% increased Duration
 Summoned Raging Spirits deal (60-80)% increased Damage
 {tags:life}Summoned Raging Spirits have (80-100)% increased maximum Life
@@ -966,7 +966,7 @@ Socketed Support Gems can also Support Skills from your Body Armour
 {tags:jewellery_resistance}+(-30-30)% to Fire Resistance
 {tags:jewellery_resistance}+(-30-30)% to Cold Resistance
 {tags:jewellery_resistance}+(-30-30)% to Lightning Resistance
-{tags:chaos,jewellery_resistance}+(-23-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(-23-23)% to Chaos Resistance
 ]],[[
 Victario's Acuity
 Turquoise Amulet
@@ -975,7 +975,7 @@ Requires Level 16
 Implicits: 1
 {tags:jewellery_attribute}+(16-24) to Dexterity and Intelligence
 {tags:jewellery_resistance}+(30-40)% to Lightning Resistance
-{tags:chaos,jewellery_resistance}+(8-10)% to Chaos Resistance
+{tags:jewellery_resistance}+(8-10)% to Chaos Resistance
 10% chance to gain a Frenzy Charge on Kill
 10% chance to gain a Power Charge on Kill
 {tags:speed}5% increased Projectile Speed per Frenzy Charge
@@ -1041,7 +1041,7 @@ Implicits: 1
 {tags:speed}12% increased Movement Speed
 {variant:1}(8-12)% reduced Skill Effect Duration
 {variant:2}(10-15)% reduced Skill Effect Duration
-30% increased total Recovery per second from Life, Mana, or Energy Shield Leech
+{tags:life,jewellery_defense}30% increased total Recovery per second from Life, Mana, or Energy Shield Leech
 ]],[[
 Willowgift
 Jade Amulet
@@ -1077,7 +1077,7 @@ Implicits: 1
 (12-20)% increased Rarity of Items found
 {tags:jewellery_attribute}+(20-30) to Dexterity
 {tags:jewellery_defense}+(50-70) to maximum Energy Shield
-{tags:jewellery_elemental}+75% to Lightning Resistance
+{tags:jewellery_resistance}+75% to Lightning Resistance
 {tags:jewellery_defense}Regenerate 5% of Energy Shield per second while Shocked
 Unaffected by Shock
 ]],[[
@@ -1119,7 +1119,7 @@ Implicits: 1
 {tags:jewellery_resistance}+(10-20)% to Cold Resistance
 {tags:jewellery_resistance}+(20-40)% to Lightning Resistance
 30% reduced Duration of Ailments on Enemies
-{tags:jewellery_elemental}(5-10)% chance to Shock
+(5-10)% chance to Shock
 Enemies take 5% increased Damage for each type of Ailment you have inflicted on them
 Your Elemental Damage can Shock
 ]],
diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
index c4a02a1ae6..75073cb850 100644
--- a/src/Data/Uniques/belt.lua
+++ b/src/Data/Uniques/belt.lua
@@ -60,8 +60,8 @@ Implicits: 1
 {tags:mana}+(45-55) to maximum Mana
 {tags:jewellery_defense}+(60-70) to maximum Energy Shield
 {tags:attack,mana,physical}0.2% of Attack Damage Leeched as Mana per Power Charge
-{variant:1}{tags:jewellery_defense}Chill Effect and Freeze duration on you is based on 65% of Energy Shield
-{variant:2}{tags:jewellery_defense}Chill Effect and Freeze duration on you is based on 100% of Energy Shield
+{variant:1}Chill Effect and Freeze duration on you is based on 65% of Energy Shield
+{variant:2}Chill Effect and Freeze duration on you is based on 100% of Energy Shield
 ]],[[
 Bated Breath
 Chain Belt
@@ -132,7 +132,7 @@ Requires Level 61
 Implicits: 1
 {tags:jewellery_defense}+(9-20) to maximum Energy Shield
 {tags:life}+(60-80) to maximum Life
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 Enemy Hits inflict Temporal Chains on you
 When you lose Temporal Chains you gain maximum Rage
 Immune to Curses while you have at least 25 Rage
@@ -178,7 +178,7 @@ Implicits: 1
 Cannot be Frozen if Dexterity is higher than Intelligence
 Cannot be Ignited if Strength is higher than Dexterity
 Cannot be Shocked if Intelligence is higher than Strength
-{tags:life}1% increased Damage per 5 of your lowest Attribute
+1% increased Damage per 5 of your lowest Attribute
 Elder Item
 ]],[[
 Darkness Enthroned
@@ -217,12 +217,12 @@ Implicits: 1
 {variant:1,2,3,5,6,7}{tags:jewellery_resistance}+(30-35)% to Lightning Resistance
 {variant:1}{tags:life,physical}0.2% of Physical Damage Leeched as Life
 {variant:5}{tags:life,physical}0.6% of Physical Damage Leeched as Life
-{variant:2}{tags:life,jewellery_elemental}0.2% of Fire Damage Leeched as Life
-{variant:6}{tags:life,jewellery_elemental}0.6% of Fire Damage Leeched as Life
-{variant:3}{tags:life,jewellery_elemental}0.2% of Cold Damage Leeched as Life
-{variant:7}{tags:life,jewellery_elemental}0.6% of Cold Damage Leeched as Life
-{variant:4}{tags:life,jewellery_elemental}0.2% of Lightning Damage Leeched as Life
-{variant:8}{tags:life,jewellery_elemental}0.6% of Lightning Damage Leeched as Life
+{variant:2}{tags:life}0.2% of Fire Damage Leeched as Life
+{variant:6}{tags:life}0.6% of Fire Damage Leeched as Life
+{variant:3}{tags:life}0.2% of Cold Damage Leeched as Life
+{variant:7}{tags:life}0.6% of Cold Damage Leeched as Life
+{variant:4}{tags:life}0.2% of Lightning Damage Leeched as Life
+{variant:8}{tags:life}0.6% of Lightning Damage Leeched as Life
 {variant:1,5}Your Flasks grant 25% reduced Enemy Stun Threshold during any Flask Effect
 {variant:2}Your Flasks grant 10% chance to Ignite during any Flask Effect
 {variant:6}Your Flasks grant (20-30)% chance to Ignite during any Flask Effect
@@ -405,9 +405,9 @@ Chill nearby Enemies when you Focus, causing 30% reduced Action Speed
 {variant:11,12,13,14,15,16,17,18,19,20}Focus has (30-50)% increased Cooldown Recovery Rate
 (50-70)% increased Damage with Hits and Ailments against Chilled Enemies
 {variant:1,11}{crafted}{tags:life}(1.0-2.0)% of Life Regenerated per second during any Flask Effect
-{variant:2,12}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
-{variant:3,13}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
-{variant:4,14}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
+{variant:2,12}{crafted}{tags:jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
+{variant:3,13}{crafted}{tags:jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
+{variant:4,14}{crafted}{tags:jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
 {variant:5,15}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Dexterity
 {variant:6,16}{crafted}{tags:jewellery_attribute}+(6-17) to Dexterity and Intelligence
 {variant:7,17}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Intelligence
@@ -426,10 +426,10 @@ Implicits: 1
 {tags:life}+(75-100) to maximum Life
 {tags:life}(67-75) Life Regenerated per second
 {tags:mana}(8-10) Mana Regenerated per second
-{variant:1}−40% to all Elemental Resistances
-{variant:3}−(15-25)% to all Elemental Resistances
-{variant:1}−10% to all maximum Resistances
-{variant:2}−5% to all maximum Resistances
+{variant:1}{tags:jewellery_resistance}−40% to all Elemental Resistances
+{variant:3}{tags:jewellery_resistance}−(15-25)% to all Elemental Resistances
+{variant:1}{tags:jewellery_resistance}−10% to all maximum Resistances
+{variant:2}{tags:jewellery_resistance}−5% to all maximum Resistances
 {tags:physical}−(50-40) Physical Damage taken from Attacks
 {tags:jewellery_defense}40% increased Armour while not Ignited, Frozen or Shocked
 ]],[[
@@ -570,7 +570,7 @@ Implicits: 1
 {tags:life}(4-8)% increased maximum Life
 {tags:jewellery_resistance}+(20-40)% to Cold Resistance
 {tags:attack}1% increased Attack Damage per 200 of the lowest of Armour and Evasion Rating
-{variant:1}{tags:attack}14-20% chance to gain Fortify when you Stun an Enemy with Melee Damage
+{variant:1}14-20% chance to gain Fortify when you Stun an Enemy with Melee Damage
 {variant:2}{tags:attack}Melee Hits which Stun Fortify
 You have Onslaught while you have Fortify
 ]],[[
@@ -581,7 +581,7 @@ Variant: Current
 Requires Level 25
 Implicits: 1
 {tags:physical}(12-24)% increased Physical Damage
-10% increased Elemental Damage with Attack Skills
+{tags:jewellery_elemental,attack}10% increased Elemental Damage with Attack Skills
 {variant:1}{tags:jewellery_elemental,attack}Adds (3-4) to (7-8) Fire Damage to Attacks
 {variant:2}{tags:jewellery_elemental,attack}Adds (7-8) to (15-16) Fire Damage to Attacks
 {variant:1}{tags:jewellery_elemental,attack}Adds (2-3) to (5-7) Cold Damage to Attacks
@@ -654,8 +654,8 @@ Implicits: 1
 {tags:jewellery_attribute}+(25-35) to Strength
 {tags:jewellery_defense}(6-10)% increased maximum Energy Shield
 {tags:life}(6-10)% increased maximum Life
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
-Minions have 5% chance to Taunt on Hit with Attacks
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:attack}Minions have 5% chance to Taunt on Hit with Attacks
 Your Minions spread Caustic Ground on Death, dealing 20% of their maximum Life as Chaos Damage per second
 ]],[[
 Replica Siegebreaker
@@ -667,7 +667,7 @@ Implicits: 1
 {tags:jewellery_defense}(6-10)% increased maximum Energy Shield
 {tags:life}(6-10)% increased maximum Life
 {tags:jewellery_resistance}+(15-25)% to Fire Resistance
-Your Minions spread Burning Ground on Death, dealing 20% of their maximum Life as Fire Damage per second
+{tags:jewellery_elemental}Your Minions spread Burning Ground on Death, dealing 20% of their maximum Life as Fire Damage per second
 {tags:attack}Minions have 5% chance to Maim Enemies on Hit with Attacks
 ]],[[
 Soul Tether
@@ -694,7 +694,7 @@ Requires Level 48
 Implicits: 1
 (15-25)% increased Stun and Block Recovery
 {tags:jewellery_attribute}+(20-40) to Strength
-{tags:jewellery_defense}Gain (4-6)% of Maximum Life as Extra Maximum Energy Shield
+{tags:jewellery_defense,life}Gain (4-6)% of Maximum Life as Extra Maximum Energy Shield
 Corrupted Soul
 ]],[[
 Soulthirst
diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index 7623c4559e..e29204ff45 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -75,7 +75,7 @@ Implicits: 1
 {variant:2,3}{tags:life}1% of Damage Leeched as Life against Shocked Enemies
 {variant:1}{tags:mana}1% of Damage Leeched as Mana against Shocked Enemies
 {variant:2}{tags:mana}1% of Damage Leeched as Mana against Frozen Enemies
-{variant:3}1% of Damage Leeched as Energy Shield against Frozen Enemies
+{variant:3}{tags:jewellery_defense}1% of Damage Leeched as Energy Shield against Frozen Enemies
 ]],[[
 Berek's Pass
 Two-Stone Ring
@@ -116,13 +116,13 @@ Amethyst Ring
 League: Ritual
 Requires Level 49
 Implicits: 1
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {tags:jewellery_elemental}+(8-12)% to Fire Damage over Time Multiplier
 50% reduced Ignite Duration on Enemies
 (10-15)% chance to Ignite
 Enemies Ignited by you take Chaos Damage instead of Fire Damage from Ignite
 Withered does not expire on Enemies Ignited by you
-{tags:chaos,jewellery_resistance}+(20-25)% to Fire and Chaos Resistances
+{tags:jewellery_resistance}+(20-25)% to Fire and Chaos Resistances
 ]],[[
 Blackheart
 Iron Ring
@@ -150,7 +150,7 @@ Implicits: 1
 {variant:1}Melee Attacks cause Bleeding
 {variant:2}{tags:attack,physical}(30-50)% chance to cause Bleeding on Melee Hit
 {variant:1}Melee Attacks Poison on Hit
-{variant:2}{tags:attack,chaos}(20-40)% chance to Poison on Melee Hit
+{variant:2}{tags:attack}(20-40)% chance to Poison on Melee Hit
 ]],[[
 Bloodboil
 Coral Ring
@@ -164,8 +164,8 @@ Implicits: 1
 {variant:2}{tags:jewellery_elemental,attack}Adds (12-15) to (25-30) Fire Damage to Attacks
 {tags:life}+(20-40) to maximum Life
 {tags:jewellery_resistance}+(10-15)% to Cold Resistance
-{variant:1}{tags:jewellery_elemental}45% reduced Effect of Chill on You
-{variant:2}{tags:jewellery_elemental}75% reduced Effect of Chill on You
+{variant:1}45% reduced Effect of Chill on You
+{variant:2}75% reduced Effect of Chill on You
 {variant:1}100% increased Ignite Duration on You
 {variant:2}{tags:speed}10% increased Movement Speed while Ignited
 ]],[[
@@ -193,7 +193,7 @@ Has 1 Socket
 {variant:2}+3 to Level of Socketed Golem Gems
 {variant:1}Socketed Gems are Supported by Level 15 Concentrated Effect
 {variant:2}25% increased Effect of Buffs granted by Socketed Golem Skills
-{variant:2}{tags:jewellery_defense}Socketed Golem Skills gain 20% of Maximum Life as Extra Maximum Energy Shield
+{variant:2}Socketed Golem Skills gain 20% of Maximum Life as Extra Maximum Energy Shield
 {variant:1}{tags:caster}(10-25)% increased Spell Damage
 {variant:2}{tags:caster}(20-25)% increased Spell Damage
 {tags:jewellery_defense}+(15-25) to maximum Energy Shield
@@ -232,8 +232,8 @@ Variant: Fire Resistance
 {fractured}{tags:jewellery_attribute}+(20-30) to Strength
 {tags:jewellery_elemental}Adds (20-25) to (26-35) Fire Damage
 {tags:jewellery_resistance}+(20-30)% to Fire Resistance
-{variant:1}Herald of Ash has (60-80)% increased Mana Reservation Efficiency
-{variant:2}Herald of Ash has (30-40)% increased Mana Reservation Efficiency
+{variant:1}{tags:mana}Herald of Ash has (60-80)% increased Mana Reservation Efficiency
+{variant:2}{tags:mana}Herald of Ash has (30-40)% increased Mana Reservation Efficiency
 {variant:3}{tags:jewellery_elemental}(40-60)% increased Fire Damage while affected by Herald of Ash
 {variant:4}Herald of Ash has (70-100)% increased Buff Effect
 {variant:5}Herald of Ash has (40-60)% increased Buff Effect
@@ -258,8 +258,8 @@ Variant: Cold Resistance
 {fractured}{tags:jewellery_attribute}+(20-30) to Dexterity
 {tags:jewellery_elemental}Adds (20-25) to (26-35) Cold Damage
 {tags:jewellery_resistance}+(20-30)% to Cold Resistance
-{variant:1}Herald of Ice has (60-80)% increased Mana Reservation Efficiency
-{variant:2}Herald of Ice has (30-40)% increased Mana Reservation Efficiency
+{variant:1}{tags:mana}Herald of Ice has (60-80)% increased Mana Reservation Efficiency
+{variant:2}{tags:mana}Herald of Ice has (30-40)% increased Mana Reservation Efficiency
 {variant:3}{tags:jewellery_elemental}(40-60)% increased Cold Damage while affected by Herald of Ice
 {variant:4}Herald of Ice has (70-100)% increased Buff Effect
 {variant:5}Herald of Ice has (40-60)% increased Buff Effect
@@ -284,8 +284,8 @@ Variant: Damage Reduction
 {fractured}{tags:jewellery_attribute}+(10-20) to all Attributes
 {tags:physical}Adds (8-10) to (13-15) Physical Damage
 {tags:jewellery_defense}+(350-400) to Armour
-{variant:1}Herald of Purity has (60-80)% increased Mana Reservation Efficiency
-{variant:2}Herald of Purity has (30-40)% increased Mana Reservation Efficiency
+{variant:1}{tags:mana}Herald of Purity has (60-80)% increased Mana Reservation Efficiency
+{variant:2}{tags:mana}Herald of Purity has (30-40)% increased Mana Reservation Efficiency
 {variant:3}{tags:physical}(40-60)% increased Physical Damage while affected by Herald of Purity
 {variant:4}Herald of Purity has (70-100)% increased Buff Effect
 {variant:5}Herald of Purity has (40-60)% increased Buff Effect
@@ -306,17 +306,17 @@ Variant: Buff Effect (Pre 3.11.0)
 Variant: Buff Effect (Current)
 Variant: Agony Damage
 Variant: Chaos Resistance
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {fractured}{tags:jewellery_attribute}+(10-20) to all Attributes
 {tags:chaos}Adds (15-20) to (21-30) Chaos Damage
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
-{variant:1}Herald of Agony has (60-80)% increased Mana Reservation Efficiency
-{variant:2}Herald of Agony has (30-40)% increased Mana Reservation Efficiency
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{variant:1}{tags:mana}Herald of Agony has (60-80)% increased Mana Reservation Efficiency
+{variant:2}{tags:mana}Herald of Agony has (30-40)% increased Mana Reservation Efficiency
 {variant:3}{tags:chaos}(40-60)% increased Chaos Damage while affected by Herald of Agony
 {variant:4}Herald of Agony has (70-100)% increased Buff Effect
 {variant:5}Herald of Agony has (40-60)% increased Buff Effect
 {variant:6}Agony Crawler deals (70-100)% increased Damage
-{variant:7}{tags:chaos,jewellery_resistance}+(31-43)% to Chaos Resistance while affected by Herald of Agony
+{variant:7}{tags:jewellery_resistance}+(31-43)% to Chaos Resistance while affected by Herald of Agony
 ]],[[
 Circle of Regret
 Topaz Ring
@@ -336,8 +336,8 @@ Variant: Lightning Resistance
 {fractured}{tags:jewellery_attribute}+(20-30) to Intelligence
 {tags:jewellery_elemental}Adds 1 to (48-60) Lightning Damage
 {tags:jewellery_resistance}+(20-30)% to Lightning Resistance
-{variant:1}Herald of Thunder has (60-80)% increased Mana Reservation Efficiency
-{variant:2}Herald of Thunder has (30-40)% increased Mana Reservation Efficiency
+{variant:1}{tags:mana}Herald of Thunder has (60-80)% increased Mana Reservation Efficiency
+{variant:2}{tags:mana}Herald of Thunder has (30-40)% increased Mana Reservation Efficiency
 {variant:3}{tags:jewellery_elemental}(40-60)% increased Lightning Damage while affected by Herald of Thunder
 {variant:4}Herald of Thunder has (70-100)% increased Buff Effect
 {variant:5}Herald of Thunder has (40-60)% increased Buff Effect
@@ -351,12 +351,12 @@ Variant: Pre 2.6.0
 Variant: Current
 Requires Level 46
 Implicits: 1
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {tags:attack}+(300-350) to Accuracy Rating
 {tags:jewellery_defense}{variant:1}+(60-80) to Armour
 {tags:jewellery_defense}{variant:2}+(260-300) to Armour
 {variant:2}{tags:life}+(40-50) to maximum Life
-{tags:chaos,jewellery_resistance}+(15-20)% to Chaos Resistance
+{tags:jewellery_resistance}+(15-20)% to Chaos Resistance
 {tags:attack,life,physical}(0.6-0.8)% of Physical Attack Damage Leeched as Life
 {variant:1}You gain Onslaught for 2 seconds on Kill
 {variant:2}You gain Onslaught for 4 seconds on Kill
@@ -409,8 +409,8 @@ Implicits: 1
 {variant:1}{tags:jewellery_elemental}(15-25)% increased Fire Damage
 {variant:2,3,4}{tags:jewellery_elemental}(30-40)% increased Fire Damage
 {tags:caster,speed}(5-10)% increased Cast Speed
-{variant:1}{tags:jewellery_elemental}5% chance to Ignite
-{variant:2,3,4}{tags:jewellery_elemental}10% chance to Ignite
+{variant:1}5% chance to Ignite
+{variant:2,3,4}10% chance to Ignite
 You can inflict an additional Ignite on an Enemy
 {variant:1}Your Critical Strikes do not deal extra Damage
 {variant:1}{tags:jewellery_elemental}Ignited Enemies Burn 80% slower
@@ -477,7 +477,7 @@ Implicits: 1
 {tags:jewellery_defense}+(15-25) to maximum Energy Shield
 {tags:life}(10-15) Life Regenerated per second
 {tags:mana}(20-40)% increased Mana Regeneration Rate
-Minions have 15% increased maximum Life
+{tags:life}Minions have 15% increased maximum Life
 Minions have 10% increased Area of Effect of Area Skills
 350 Physical Damage taken on Minion Death
 ]],[[
@@ -584,7 +584,7 @@ Implicits: 2
 {tags:jewellery_resistance}+10% to all Elemental Resistances
 {tags:speed}(6-8)% increased Movement Speed when on Low Life
 31% increased Light Radius
-{tags:chaos,jewellery_defense,life}+(20-25)% Chaos Resistance when on Low Life
+{tags:jewellery_resistance}+(20-25)% Chaos Resistance when on Low Life
 While on Low Life, Enemies are Unlucky when Damaging you
 ]],[[
 Malachai's Artifice
@@ -658,14 +658,14 @@ Variant: Pre 3.0.0
 Variant: Current
 Requires Level 69
 Implicits: 1
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1}{tags:life}15% reduced maximum Life
 {variant:2}{tags:life}10% reduced maximum Life
 {variant:3}{tags:life}(5-10)% reduced maximum Life
 {variant:1}{tags:jewellery_defense}15% reduced maximum Energy Shield
 {variant:2}{tags:jewellery_defense}10% reduced maximum Energy Shield
 {variant:3}{tags:jewellery_defense}(5-10)% reduced maximum Energy Shield
-{tags:chaos,jewellery_resistance}+(40-50)% to Chaos Resistance
+{tags:jewellery_resistance}+(40-50)% to Chaos Resistance
 {tags:chaos,physical}Gain 20% of Physical Damage as Extra Chaos Damage
 ]],[[
 Mokou's Embrace
@@ -675,10 +675,10 @@ Implicits: 1
 {tags:jewellery_resistance}+(20-30)% to Fire Resistance
 {tags:jewellery_elemental}(15-25)% increased Fire Damage
 {tags:jewellery_resistance}+(25-40)% to Cold Resistance
-{tags:jewellery_elemental}(5-10)% chance to Ignite
+(5-10)% chance to Ignite
 {tags:attack,speed}20% increased Attack Speed while Ignited
 {tags:caster,speed}20% increased Cast Speed while Ignited
-{tags:jewellery_elemental}+25% chance to be Ignited
++25% chance to be Ignited
 ]],[[
 Mutewind Seal
 Unset Ring
@@ -692,7 +692,7 @@ Has 1 Socket
 {variant:1}+2 to Level of Socketed Golem Gems
 {variant:2,3}+3 to Level of Socketed Golem Gems
 {variant:1}Socketed Gems are Supported by Level 13 Faster Attacks
-{variant:2,3}{tags:attack,caster,speed}Socketed Golem Skills have 20% increased Attack and Cast Speed
+{variant:2,3}Socketed Golem Skills have 20% increased Attack and Cast Speed
 {tags:attack,physical}Adds (5-10) to (11-15) Physical Damage to Attacks
 {tags:attack,speed}(5-10)% increased Attack Speed
 {variant:1}(1-2)% chance to Dodge Attack Hits
@@ -714,8 +714,8 @@ Implicits: 1
 {variant:1}{tags:life}+(4-5) Life gained for each Ignited Enemy hit by your Attacks
 {variant:2}{tags:life}Recover (20-30) Life when you Ignite an Enemy
 15% increased Ignite Duration on Enemies
-{variant:1}{tags:jewellery_elemental}5% chance to Ignite
-{variant:2}{tags:jewellery_elemental}10% chance to Ignite
+{variant:1}5% chance to Ignite
+{variant:2}10% chance to Ignite
 ]],[[
 The Pariah
 Unset Ring
@@ -968,10 +968,10 @@ Implicits: 1
 {tags:jewellery_resistance}+(20-30)% to Lightning Resistance
 {tags:jewellery_attribute}+(20-30) to Intelligence
 {tags:jewellery_elemental}(20-30)% increased Lightning Damage
-{tags:jewellery_elemental}(10-15)% chance to Shock
+(10-15)% chance to Shock
 Herald of Thunder also creates a storm when you Shock an Enemy
 Herald of Thunder's Storms Hit Enemies with (30-50)% increased Frequency
-Take 250 Lightning Damage when Herald of Thunder Hits an Enemy
+{tags:jewellery_elemental}Take 250 Lightning Damage when Herald of Thunder Hits an Enemy
 ]],[[
 The Taming
 Prismatic Ring
@@ -988,10 +988,10 @@ Implicits: 1
 {variant:2}{tags:jewellery_resistance}+(20-30)% to all Elemental Resistances
 {variant:1}{tags:jewellery_elemental}15% increased Elemental Damage
 {variant:2}{tags:jewellery_elemental}30% increased Elemental Damage
-{variant:1}{tags:jewellery_elemental}5% chance to Freeze, Shock and Ignite
-{variant:2}{tags:jewellery_elemental}10% chance to Freeze, Shock and Ignite
-{variant:1}{tags:jewellery_elemental}10% increased Damage per Freeze, Shock and Ignite on Enemy
-{variant:2}{tags:jewellery_elemental}20% increased Damage with Hits and Ailments per Freeze, Shock and Ignite on Enemy
+{variant:1}5% chance to Freeze, Shock and Ignite
+{variant:2}10% chance to Freeze, Shock and Ignite
+{variant:1}10% increased Damage per Freeze, Shock and Ignite on Enemy
+{variant:2}20% increased Damage with Hits and Ailments per Freeze, Shock and Ignite on Enemy
 ]],[[
 Tasalio's Sign
 Sapphire Ring
@@ -1008,8 +1008,8 @@ Implicits: 1
 {tags:jewellery_defense}+(200-300) to Evasion Rating
 {variant:1}20% reduced Chill Duration on You
 {variant:2}50% chance to Avoid being Chilled
-{variant:1}{tags:jewellery_elemental}5% chance to Freeze
-{variant:2}{tags:jewellery_elemental}10% chance to Freeze
+{variant:1}5% chance to Freeze
+{variant:2}10% chance to Freeze
 ]],[[
 Replica Tasalio's Sign
 Sapphire Ring
@@ -1163,9 +1163,9 @@ Implicits: 1
 {tags:mana}+(20-40) to maximum Mana
 {variant:1,2}{tags:life}0.2% of Damage Leeched as Life against Shocked Enemies
 {variant:3}{tags:life}1% of Damage Leeched as Life against Shocked Enemies
-{variant:1}{tags:jewellery_elemental}5% chance to Shock
-{variant:2}{tags:jewellery_elemental}10% chance to Shock
-{variant:3}{tags:jewellery_elemental}25% chance to Shock
+{variant:1}5% chance to Shock
+{variant:2}10% chance to Shock
+{variant:3}25% chance to Shock
 ]],[[
 Valyrium
 Moonstone Ring
@@ -1240,9 +1240,9 @@ Has 1 Socket
 {tags:jewellery_attribute}+(15-25) to all Attributes
 {tags:life}15 Life Regenerated per second for each Uncorrupted Item Equipped
 {tags:mana}-2 to Total Mana Cost of Skills for each Corrupted Item Equipped
-{variant:1,12}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
-{variant:2,13}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
-{variant:3,14}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
+{variant:1,12}{crafted}{tags:jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
+{variant:2,13}{crafted}{tags:jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
+{variant:3,14}{crafted}{tags:jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
 {variant:4,15}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Dexterity
 {variant:5,16}{crafted}{tags:jewellery_attribute}+(6-17) to Dexterity and Intelligence
 {variant:6,17}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Intelligence
@@ -1286,7 +1286,7 @@ Implicits: 1
 {tags:jewellery_attribute}+(30-50) to Strength
 {tags:attack}(20-25)% increased Melee Damage
 30% chance to Avoid being Stunned
-{tags:speed}20% less Attack Speed
+{tags:attack,speed}20% less Attack Speed
 Strike Skills also target the previous location they were Used
 ]],
 }

From 4b212e533bc2bbd9cf552ff88a4c5c88cb593ac4 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Sat, 18 Jun 2022 19:32:39 +1000
Subject: [PATCH 02/13] Update amulet.lua

fix accidently removing jewellery res from Tavukai
---
 src/Data/Uniques/amulet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
index 9c66a8a550..7eba23486a 100644
--- a/src/Data/Uniques/amulet.lua
+++ b/src/Data/Uniques/amulet.lua
@@ -923,7 +923,7 @@ Requires Level 54
 Implicits: 1
 {tags:life}(2.0-4.0) Life regenerated per second
 {tags:jewellery_attribute}+(30-40) to Intelligence
-Minions have (-17-17)% to Chaos Resistance
+{tags:jewellery_resistance}Minions have (-17-17)% to Chaos Resistance
 Summon Raging Spirit has (20-30)% increased Duration
 Summoned Raging Spirits deal (60-80)% increased Damage
 {tags:life}Summoned Raging Spirits have (80-100)% increased maximum Life

From 5d8475758f4ceb20412bd9bde0aeb43d95bc4c7a Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Thu, 23 Jun 2022 19:05:19 +1000
Subject: [PATCH 03/13] Update Noxious to damage

---
 src/Classes/Item.lua        |  2 +-
 src/Classes/ItemsTab.lua    |  4 +-
 src/Data/Uniques/amulet.lua | 54 +++++++++++++-------------
 src/Data/Uniques/belt.lua   | 48 +++++++++++------------
 src/Data/Uniques/ring.lua   | 76 ++++++++++++++++++-------------------
 5 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/Classes/Item.lua b/src/Classes/Item.lua
index 11b3f84756..4994b4b94a 100644
--- a/src/Classes/Item.lua
+++ b/src/Classes/Item.lua
@@ -18,7 +18,7 @@ local catalystTags = {
 	{ "life", "mana", "resource" },
 	{ "caster" },
 	{ "jewellery_attribute", "attribute" },
-	{ "physical", "chaos" },
+	{ "physical_damage", "chaos_damage" },
 	{ "jewellery_resistance", "resistance" },
 	{ "jewellery_defense", "defences" },
 	{ "jewellery_elemental" ,"elemental_damage" },
diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua
index eeec102fc2..422e6ac13f 100644
--- a/src/Classes/ItemsTab.lua
+++ b/src/Classes/ItemsTab.lua
@@ -518,8 +518,8 @@ holding Shift will put it in the second.]])
 	self.controls.displayItemSectionCatalyst = new("Control", {"TOPLEFT",self.controls.displayItemSectionInfluence,"BOTTOMLEFT"}, 0, 0, 0, function()
 		return (self.controls.displayItemCatalyst:IsShown() or self.controls.displayItemCatalystQualitySlider:IsShown()) and 28 or 0
 	end)
-	self.controls.displayItemCatalyst = new("DropDownControl", {"TOPLEFT",self.controls.displayItemSectionCatalyst,"TOPRIGHT"}, 0, 0, 180, 20,
-		{"Catalyst","Abrasive (Attack)","Accelerating (Speed)","Fertile (Life & Mana)","Imbued (Caster)","Intrinsic (Attribute)","Noxious (Physical & Chaos)",
+	self.controls.displayItemCatalyst = new("DropDownControl", {"TOPLEFT",self.controls.displayItemSectionCatalyst,"TOPRIGHT"}, 0, 0, 250, 20,
+		{"Catalyst","Abrasive (Attack)","Accelerating (Speed)","Fertile (Life & Mana)","Imbued (Caster)","Intrinsic (Attribute)","Noxious (Physical & Chaos Damage)",
 		 "Prismatic (Resistance)","Tempering (Defense)","Turbulent (Elemental)","Unstable (Critical)"},
 		function(index, value)
 			self.displayItem.catalyst = index - 1
diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
index 7eba23486a..1fae6f8028 100644
--- a/src/Data/Uniques/amulet.lua
+++ b/src/Data/Uniques/amulet.lua
@@ -23,8 +23,8 @@ Implicits: 1
 +3% to maximum Block Chance
 {variant:1}10% Chance to Block
 {variant:2,3}8% Chance to Block
-{tags:physical}{variant:1}Reflects 200 to 250 Physical Damage to Attackers on Block
-{tags:physical}{variant:2,3}Reflects 240 to 300 Physical Damage to Attackers on Block
+{tags:physical_damage}{variant:1}Reflects 200 to 250 Physical Damage to Attackers on Block
+{tags:physical_damage}{variant:2,3}Reflects 240 to 300 Physical Damage to Attackers on Block
 ]],[[
 Araku Tiki
 Coral Amulet
@@ -72,7 +72,7 @@ Requires Level 20
 Implicits: 1
 {tags:jewellery_attribute}+(10-16) to all Attributes
 {tags:jewellery_attribute}+(80-100) to all Attributes
-{tags:attack,physical}-4 Physical Damage taken from Attacks
+{tags:attack,physical_damage}-4 Physical Damage taken from Attacks
 ]],[[
 Atziri's Foible
 Paua Amulet
@@ -225,9 +225,9 @@ Requires Level 20
 Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Strength
 Grants level 10 Gluttony of Elements Skill
-{tags:attack,chaos}Adds 19-43 Chaos Damage to Attacks
+{tags:attack,chaos_damage}Adds 19-43 Chaos Damage to Attacks
 {tags:jewellery_resistance}−(10-5)% to all Elemental Resistances
-{tags:jewellery_resistance}+(17-29)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(17-29)% to Chaos Resistance
 Corrupted
 ]],[[
 Bloodgrip
@@ -237,7 +237,7 @@ Variant: Current
 Requires Level 55
 Implicits: 1
 {tags:life}(2.0-4.0) Life Regenerated per second
-{tags:attack,physical}Adds 10 to 20 Physical Damage to Attacks
+{tags:attack,physical_damage}Adds 10 to 20 Physical Damage to Attacks
 {tags:life}+(60-70) to maximum Life
 {variant:1}{tags:life}Regenerate (8.0-12.0) Life per second
 {variant:2}{tags:life}Regenerate (16.0-24.0) Life per second
@@ -251,7 +251,7 @@ Variant: Current
 Requires Level 74
 Implicits: 1
 {tags:life}(1.2-1.6)% of Life Regenerated per second
-{tags:attack,physical}Adds 10 to 20 Physical Damage to Attacks
+{tags:attack,physical_damage}Adds 10 to 20 Physical Damage to Attacks
 {tags:life}+(60-70) to maximum Life
 {variant:1}{tags:life}Regenerate (8.0-12.0) Life per second
 {variant:2}{tags:life}Regenerate (16.0-24.0) Life per second
@@ -269,7 +269,7 @@ Implicits: 1
 {tags:life}{variant:1}25% reduced maximum Life
 {tags:jewellery_defense}{variant:1}25% reduced maximum Energy Shield
 {tags:jewellery_resistance}+(10-20)% to all Elemental Resistances
-{tags:attack,life,physical}(1.2-2)% of Physical Attack Damage Leeched as Life
+{tags:attack,life,physical_damage}(1.2-2)% of Physical Attack Damage Leeched as Life
 {tags:life}{variant:2}(30-40)% increased Damage while Leeching
 {tags:life}{variant:2}50% increased Life Leeched per second
 Extra Gore
@@ -344,7 +344,7 @@ Requires Level 60
 Implicits: 1
 {tags:jewellery_attribute}+(10-16) to all Attributes
 30% increased Rarity of Items found
-{tags:jewellery_resistance}+60% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+60% to Chaos Resistance
 Cannot be Stunned
 {tags:jewellery_defense,life}20% of Maximum Life Converted to Energy Shield
 ]],[[
@@ -463,13 +463,13 @@ Variant: Current
 Requires Level 77
 Implicits: 1
 {tags:mana}(48-56)% increased Mana Regeneration Rate
-{tags:life}0.5% of Chaos Damage Leeched as Life
+{tags:life,chaos}0.5% of Chaos Damage Leeched as Life
 {tags:caster,life}Lose (10-15) Life for each Enemy hit by your Spells
 {tags:attack,life}Lose (20-25) Life for each Enemy hit by your Attacks
 Skills Chain +1 times
 {tags:speed}{variant:2}(30-40)% increased Projectile Speed
-{variant:1}{tags:chaos}Projectiles gain (15-20)% of Non-Chaos Damage as extra Chaos Damage per Chain
-{variant:2}{tags:chaos}Projectiles that have Chained gain (20-35)% of Non-Chaos Damage as extra Chaos Damage
+{variant:1}{tags:chaos_damage}Projectiles gain (15-20)% of Non-Chaos Damage as extra Chaos Damage per Chain
+{variant:2}{tags:chaos_damage}Projectiles that have Chained gain (20-35)% of Non-Chaos Damage as extra Chaos Damage
 ]],[[
 The Halcyon
 Jade Amulet
@@ -522,10 +522,10 @@ Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Dexterity
 Grants Level 22 Precision Skill
 {tags:jewellery_attribute}+(25-35) to Dexterity
-{tags:attack,physical}Adds (12-15) to (24-28) Physical Damage to Attacks
+{tags:attack,physical_damage}Adds (12-15) to (24-28) Physical Damage to Attacks
 {tags:jewellery_elemental,attack}Adds (11-15) to (23-28) Cold Damage to Attacks
 +(23-28)% to Global Critical Strike Multiplier
-{tags:attack,life,physical}(0.8-1)% of Physical Attack Damage Leeched as Life
+{tags:attack,life,physical_damage}(0.8-1)% of Physical Attack Damage Leeched as Life
 {variant:1}Precision has 50% less Reservation
 {variant:2}{tags:mana}Precision has 100% increased Mana Reservation Efficiency
 ]],[[
@@ -539,7 +539,7 @@ Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Dexterity
 Grants Level 22 Hatred Skill
 {tags:jewellery_attribute}+(25-35) to Dexterity
-{tags:attack,physical}Adds (12-15) to (24-28) Physical Damage to Attacks
+{tags:attack,physical_damage}Adds (12-15) to (24-28) Physical Damage to Attacks
 {tags:jewellery_elemental,attack}Adds (11-15) to (23-28) Cold Damage to Attacks
 {tags:critical}+(23-28)% to Global Critical Strike Multiplier
 {tags:life}(0.8-1.0)% of Cold Damage Leeched as Life
@@ -582,11 +582,11 @@ Variant: Chaos
 Requires Level 64
 Implicits: 1
 {tags:jewellery_attribute}+(10-16) to all Attributes
-{variant:1}{tags:attack,physical}Adds (12-16) to (20-25) Physical Damage
+{variant:1}{tags:attack,physical_damage}Adds (12-16) to (20-25) Physical Damage
 {variant:2}{tags:jewellery_elemental}Adds (20-24) to (33-36) Fire Damage
 {variant:3}{tags:jewellery_elemental}Adds (20-24) to (33-36) Cold Damage
 {variant:4}{tags:jewellery_elemental}Adds (10-13) to (43-47) Lightning Damage
-{variant:5}{tags:chaos}Adds (17-19) to (23-29) Chaos Damage
+{variant:5}{tags:chaos_damage}Adds (17-19) to (23-29) Chaos Damage
 {tags:life}+(50-70) to maximum Life
 {variant:1}{tags:jewellery_defense}+(400-500) to Armour
 {variant:2}{tags:life}Regenerate 1% of Life per second
@@ -597,7 +597,7 @@ Implicits: 1
 {variant:2}{tags:jewellery_resistance}+(20-25)% to Fire Resistance
 {variant:3}{tags:jewellery_resistance}+(20-25)% to Cold Resistance
 {variant:4}{tags:jewellery_resistance}+(20-25)% to Lightning Resistance
-{variant:5}{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{variant:5}{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1}Vulnerability has no Reservation if Cast as an Aura
 {variant:2}Flammability has no Reservation if Cast as an Aura
 {variant:3}Frostbite has no Reservation if Cast as an Aura
@@ -667,8 +667,8 @@ Implicits: 1
 {tags:life}(4-8)% increased maximum Life
 (25-30)% chance to gain a Frenzy Charge on Killing an Enemy affected by 5 or more Poisons
 (12-15)% chance to gain a Power Charge on Killing an Enemy affected by fewer than 5 Poisons
-{tags:chaos}10% increased Damage with Poison per Frenzy Charge
-{tags:chaos}3% increased Poison Duration per Power Charge
+{tags:chaos_damage}10% increased Damage with Poison per Frenzy Charge
+{tags:chaos_damage}3% increased Poison Duration per Power Charge
 ]],[[
 The Jinxed Juju
 Citrine Amulet
@@ -678,7 +678,7 @@ Requires Level 48
 Implicits: 1
 {tags:jewellery_attribute}+(16-24) to Strength and Dexterity
 {tags:jewellery_attribute}+(30-40) to Intelligence
-{tags:jewellery_resistance}+(23-31)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(23-31)% to Chaos Resistance
 {variant:1}{tags:caster}(10-15)% increased Effect of your Curses
 {variant:2}{tags:caster}(5-10)% increased Effect of your Curses
 {variant:1}(10-15)% increased effect of Non-Curse Auras from your Skills
@@ -826,7 +826,7 @@ Variant: Current
 Requires Level 70
 Implicits: 1
 {tags:mana}(20-30)% increased Mana Regeneration Rate
-{tags:chaos}Adds (48-53) to (58-60) Chaos Damage
+{tags:chaos_damage}Adds (48-53) to (58-60) Chaos Damage
 {tags:jewellery_attribute}Items and Gems have 50% increased Attribute Requirements
 Chaos Damage can Ignite, Chill and Shock
 {variant:1}Gain Soul Eater for 10 seconds when you use a Vaal Skill
@@ -853,7 +853,7 @@ Variant: Current
 Implicits: 1
 {tags:mana}(20-30)% increased Mana Regeneration Rate
 {tags:jewellery_resistance}+25% to Cold Resistance
-{tags:mana,physical,attack}{variant:1,2}0.2% of Physical Attack Damage Leeched as Mana
+{tags:mana,physical_damage,attack}{variant:1,2}0.2% of Physical Attack Damage Leeched as Mana
 {tags:life}Minions have (10-15)% increased maximum Life
 {tags:speed}Minions have (10-15)% increased Movement Speed
 {tags:jewellery_elemental}{variant:3}Minions deal 6 to 13 additional Cold Damage
@@ -923,11 +923,11 @@ Requires Level 54
 Implicits: 1
 {tags:life}(2.0-4.0) Life regenerated per second
 {tags:jewellery_attribute}+(30-40) to Intelligence
-{tags:jewellery_resistance}Minions have (-17-17)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}Minions have (-17-17)% to Chaos Resistance
 Summon Raging Spirit has (20-30)% increased Duration
 Summoned Raging Spirits deal (60-80)% increased Damage
 {tags:life}Summoned Raging Spirits have (80-100)% increased maximum Life
-{tags:chaos}Summoned Raging Spirits take 20% of their Maximum Life per second as Chaos Damage
+{tags:chaos_damage}Summoned Raging Spirits take 20% of their Maximum Life per second as Chaos Damage
 ]],[[
 Tear of Purity
 Lapis Amulet
@@ -966,7 +966,7 @@ Socketed Support Gems can also Support Skills from your Body Armour
 {tags:jewellery_resistance}+(-30-30)% to Fire Resistance
 {tags:jewellery_resistance}+(-30-30)% to Cold Resistance
 {tags:jewellery_resistance}+(-30-30)% to Lightning Resistance
-{tags:jewellery_resistance}+(-23-23)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(-23-23)% to Chaos Resistance
 ]],[[
 Victario's Acuity
 Turquoise Amulet
@@ -975,7 +975,7 @@ Requires Level 16
 Implicits: 1
 {tags:jewellery_attribute}+(16-24) to Dexterity and Intelligence
 {tags:jewellery_resistance}+(30-40)% to Lightning Resistance
-{tags:jewellery_resistance}+(8-10)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(8-10)% to Chaos Resistance
 10% chance to gain a Frenzy Charge on Kill
 10% chance to gain a Power Charge on Kill
 {tags:speed}5% increased Projectile Speed per Frenzy Charge
diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
index 75073cb850..bdc6f290c9 100644
--- a/src/Data/Uniques/belt.lua
+++ b/src/Data/Uniques/belt.lua
@@ -132,7 +132,7 @@ Requires Level 61
 Implicits: 1
 {tags:jewellery_defense}+(9-20) to maximum Energy Shield
 {tags:life}+(60-80) to maximum Life
-{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
 Enemy Hits inflict Temporal Chains on you
 When you lose Temporal Chains you gain maximum Rage
 Immune to Curses while you have at least 25 Rage
@@ -405,9 +405,9 @@ Chill nearby Enemies when you Focus, causing 30% reduced Action Speed
 {variant:11,12,13,14,15,16,17,18,19,20}Focus has (30-50)% increased Cooldown Recovery Rate
 (50-70)% increased Damage with Hits and Ailments against Chilled Enemies
 {variant:1,11}{crafted}{tags:life}(1.0-2.0)% of Life Regenerated per second during any Flask Effect
-{variant:2,12}{crafted}{tags:jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
-{variant:3,13}{crafted}{tags:jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
-{variant:4,14}{crafted}{tags:jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
+{variant:2,12}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
+{variant:3,13}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
+{variant:4,14}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
 {variant:5,15}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Dexterity
 {variant:6,16}{crafted}{tags:jewellery_attribute}+(6-17) to Dexterity and Intelligence
 {variant:7,17}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Intelligence
@@ -430,7 +430,7 @@ Implicits: 1
 {variant:3}{tags:jewellery_resistance}−(15-25)% to all Elemental Resistances
 {variant:1}{tags:jewellery_resistance}−10% to all maximum Resistances
 {variant:2}{tags:jewellery_resistance}−5% to all maximum Resistances
-{tags:physical}−(50-40) Physical Damage taken from Attacks
+{tags:physical_damage}−(50-40) Physical Damage taken from Attacks
 {tags:jewellery_defense}40% increased Armour while not Ignited, Frozen or Shocked
 ]],[[
 Leash of Oblation
@@ -450,7 +450,7 @@ Variant: Current
 Requires Level 16
 Implicits: 1
 (20-30)% increased Stun Duration on Enemies
-{tags:physical}(25-40)% increased Physical Damage
+{tags:physical_damage}(25-40)% increased Physical Damage
 {tags:jewellery_attribute}+(40-50) to Strength
 50% increased Flask Charges gained
 {variant:2}{tags:jewellery_resistance}+(20-25)% to all Elemental Resistances while you have at least 200 Strength
@@ -461,7 +461,7 @@ Source: Drops from any endgame map boss
 Requires Level 48
 Implicits: 1
 (20-30)% increased Stun Duration on Enemies
-{tags:physical}(25-40)% increased Global Physical Damage
+{tags:physical_damage}(25-40)% increased Global Physical Damage
 {tags:jewellery_attribute}+(40-50) to Strength
 {tags:jewellery_attribute}+(40-50) to Dexterity
 50% increased Flask Charges gained
@@ -474,7 +474,7 @@ Source: Drops from any endgame map boss
 Requires Level 48
 Implicits: 1
 (20-30)% increased Stun Duration on Enemies
-{tags:physical}(25-40)% increased Global Physical Damage
+{tags:physical_damage}(25-40)% increased Global Physical Damage
 {tags:jewellery_attribute}+(40-50) to Strength
 {tags:jewellery_attribute}+(40-50) to Intelligence
 50% increased Flask Charges gained
@@ -511,8 +511,8 @@ Variant: Current
 Requires Level 8
 Implicits: 1
 {tags:jewellery_attribute}+(25-35) to Strength
-{variant:1}{tags:attack,physical}Adds 10 to 20 Physical Damage to Attacks
-{variant:2}{tags:attack,physical}Adds 5 to 15 Physical Damage to Attacks
+{variant:1}{tags:attack,physical_damage}Adds 10 to 20 Physical Damage to Attacks
+{variant:2}{tags:attack,physical_damage}Adds 5 to 15 Physical Damage to Attacks
 {tags:jewellery_attribute}+25 to Strength
 {tags:life}10% increased maximum Life
 {tags:jewellery_resistance}+(10-20)% to Cold Resistance
@@ -558,7 +558,7 @@ Implicits: 1
 {variant:2}(6-8)% increased Quantity of Items found
 {tags:jewellery_resistance}+20% to Fire Resistance
 20% increased Flask effect duration
-{tags:physical}−2 Physical Damage taken from Attacks
+{tags:physical_damage}−2 Physical Damage taken from Attacks
 ]],[[
 Perseverance
 Vanguard Belt
@@ -580,7 +580,7 @@ Variant: Pre 2.6.0
 Variant: Current
 Requires Level 25
 Implicits: 1
-{tags:physical}(12-24)% increased Physical Damage
+{tags:physical_damage}(12-24)% increased Physical Damage
 {tags:jewellery_elemental,attack}10% increased Elemental Damage with Attack Skills
 {variant:1}{tags:jewellery_elemental,attack}Adds (3-4) to (7-8) Fire Damage to Attacks
 {variant:2}{tags:jewellery_elemental,attack}Adds (7-8) to (15-16) Fire Damage to Attacks
@@ -596,7 +596,7 @@ Rustic Sash
 League: Heist
 Requires Level 25
 Implicits: 1
-{tags:physical}(12-24)% increased Global Physical Damage
+{tags:physical_damage}(12-24)% increased Global Physical Damage
 {tags:jewellery_elemental,caster}Adds (7-8) to (15-16) Fire Damage to Spells
 {tags:jewellery_elemental,caster}Adds (5-6) to (12-14) Cold Damage to Spells
 {tags:jewellery_elemental,caster}Adds 1 to (30-34) Lightning Damage to Spells
@@ -622,13 +622,13 @@ League: Talisman Standard, Talisman Hardcore
 Source: Vendor recipe
 Requires Level 44
 Implicits: 1
-{tags:physical}(12-24)% increased Physical Damage
+{tags:physical_damage}(12-24)% increased Physical Damage
 {tags:life}+(60-80) to maximum Life
 {tags:jewellery_resistance}+(25-40)% to Cold Resistance
-{tags:attack,life,physical}0.4% of Physical Attack Damage Leeched as Life
+{tags:attack,life,physical_damage}0.4% of Physical Attack Damage Leeched as Life
 60% increased Flask Effect Duration
 30% reduced Flask Charges gained while using a Flask
-{tags:chaos,life}200% of Life Leech applies to enemies as Chaos Damage
+{tags:chaos_damage,life}200% of Life Leech applies to enemies as Chaos Damage
 {tags:speed}15% increased Movement Speed while using a Flask
 ]],[[
 Ryslatha's Coil
@@ -640,12 +640,12 @@ Implicits: 1
 (20-30)% increased Stun Duration on Enemies
 {variant:2}{tags:life}+(80-100) to maximum Life
 {tags:jewellery_attribute}+(20-40) to Strength
-{tags:attack,physical}Adds 1 to (15-20) Physical Damage to Attacks
+{tags:attack,physical_damage}Adds 1 to (15-20) Physical Damage to Attacks
 {tags:life}Gain 50 Life when you Stun an Enemy
-{variant:1}{tags:attack,physical}20% less Minimum Physical Attack Damage
-{variant:2}{tags:attack,physical}(30-40)% less Minimum Physical Attack Damage
-{variant:1}{tags:attack,physical}20% more Maximum Physical Attack Damage
-{variant:2}{tags:attack,physical}(30-40)% more Maximum Physical Attack Damage
+{variant:1}{tags:attack,physical_damage}20% less Minimum Physical Attack Damage
+{variant:2}{tags:attack,physical_damage}(30-40)% less Minimum Physical Attack Damage
+{variant:1}{tags:attack,physical_damage}20% more Maximum Physical Attack Damage
+{variant:2}{tags:attack,physical_damage}(30-40)% more Maximum Physical Attack Damage
 ]],[[
 Siegebreaker
 Heavy Belt
@@ -654,7 +654,7 @@ Implicits: 1
 {tags:jewellery_attribute}+(25-35) to Strength
 {tags:jewellery_defense}(6-10)% increased maximum Energy Shield
 {tags:life}(6-10)% increased maximum Life
-{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
 {tags:attack}Minions have 5% chance to Taunt on Hit with Attacks
 Your Minions spread Caustic Ground on Death, dealing 20% of their maximum Life as Chaos Damage per second
 ]],[[
@@ -805,7 +805,7 @@ Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Strength
 {tags:jewellery_attribute}+(20-30) to Intelligence
 {tags:jewellery_resistance}+(10-20)% to Cold Resistance
-{tags:attack,life,physical}0.4% of Physical Attack Damage Leeched as Life
-{tags:attack,mana,physical}0.4% of Physical Attack Damage Leeched as Mana
+{tags:attack,life,physical_damage}0.4% of Physical Attack Damage Leeched as Life
+{tags:attack,mana,physical_damage}0.4% of Physical Attack Damage Leeched as Mana
 ]],
 }
diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index e29204ff45..4f9202ee25 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -116,20 +116,20 @@ Amethyst Ring
 League: Ritual
 Requires Level 49
 Implicits: 1
-{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
 {tags:jewellery_elemental}+(8-12)% to Fire Damage over Time Multiplier
 50% reduced Ignite Duration on Enemies
 (10-15)% chance to Ignite
 Enemies Ignited by you take Chaos Damage instead of Fire Damage from Ignite
 Withered does not expire on Enemies Ignited by you
-{tags:jewellery_resistance}+(20-25)% to Fire and Chaos Resistances
+{tags:chaos,jewellery_resistance}+(20-25)% to Fire and Chaos Resistances
 ]],[[
 Blackheart
 Iron Ring
 Implicits: 1
-{tags:attack,physical}Adds 1 to 4 Physical Damage to Attacks
-{tags:physical}5% increased Physical Damage
-{tags:attack,chaos}Adds 1 to 3 Chaos Damage to Attacks
+{tags:attack,physical_damage}Adds 1 to 4 Physical Damage to Attacks
+{tags:physical_damage}5% increased Physical Damage
+{tags:attack,chaos_damage}Adds 1 to 3 Chaos Damage to Attacks
 {tags:life}+(20-30) to maximum Life
 {tags:life}(2-4) Life Regenerated per second
 10% chance to Cause Monsters to Flee
@@ -141,14 +141,14 @@ Variant: Pre 2.4.0
 Variant: Pre 3.17.0
 Requires Level 48
 Implicits: 1
-{tags:attack,physical}Adds 1 to 4 Physical Damage to Attacks
-{tags:physical}5% increased Physical Damage
-{tags:attack,chaos}Adds 1 to 3 Chaos Damage to Attacks
+{tags:attack,physical_damage}Adds 1 to 4 Physical Damage to Attacks
+{tags:physical_damage}5% increased Physical Damage
+{tags:attack,chaos_damage}Adds 1 to 3 Chaos Damage to Attacks
 {tags:life}+(20-30) to maximum Life
 {tags:life}(2-4) Life Regenerated per second
 10% chance to Cause Monsters to Flee
 {variant:1}Melee Attacks cause Bleeding
-{variant:2}{tags:attack,physical}(30-50)% chance to cause Bleeding on Melee Hit
+{variant:2}{tags:attack,physical_damage}(30-50)% chance to cause Bleeding on Melee Hit
 {variant:1}Melee Attacks Poison on Hit
 {variant:2}{tags:attack}(20-40)% chance to Poison on Melee Hit
 ]],[[
@@ -280,13 +280,13 @@ Variant: Buff Effect (Pre 3.11.0)
 Variant: Buff Effect (Current)
 Variant: Sentinel Damage
 Variant: Damage Reduction
-{tags:attack,physical}Adds 1 to 4 Physical Damage to Attacks
+{tags:attack,physical_damage}Adds 1 to 4 Physical Damage to Attacks
 {fractured}{tags:jewellery_attribute}+(10-20) to all Attributes
-{tags:physical}Adds (8-10) to (13-15) Physical Damage
+{tags:physical_damage}Adds (8-10) to (13-15) Physical Damage
 {tags:jewellery_defense}+(350-400) to Armour
 {variant:1}{tags:mana}Herald of Purity has (60-80)% increased Mana Reservation Efficiency
 {variant:2}{tags:mana}Herald of Purity has (30-40)% increased Mana Reservation Efficiency
-{variant:3}{tags:physical}(40-60)% increased Physical Damage while affected by Herald of Purity
+{variant:3}{tags:physical_damage}(40-60)% increased Physical Damage while affected by Herald of Purity
 {variant:4}Herald of Purity has (70-100)% increased Buff Effect
 {variant:5}Herald of Purity has (40-60)% increased Buff Effect
 {variant:6}Sentinels of Purity deal (70-100)% increased Damage
@@ -306,17 +306,17 @@ Variant: Buff Effect (Pre 3.11.0)
 Variant: Buff Effect (Current)
 Variant: Agony Damage
 Variant: Chaos Resistance
-{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
 {fractured}{tags:jewellery_attribute}+(10-20) to all Attributes
-{tags:chaos}Adds (15-20) to (21-30) Chaos Damage
-{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:chaos_damage}Adds (15-20) to (21-30) Chaos Damage
+{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1}{tags:mana}Herald of Agony has (60-80)% increased Mana Reservation Efficiency
 {variant:2}{tags:mana}Herald of Agony has (30-40)% increased Mana Reservation Efficiency
-{variant:3}{tags:chaos}(40-60)% increased Chaos Damage while affected by Herald of Agony
+{variant:3}{tags:chaos_damage}(40-60)% increased Chaos Damage while affected by Herald of Agony
 {variant:4}Herald of Agony has (70-100)% increased Buff Effect
 {variant:5}Herald of Agony has (40-60)% increased Buff Effect
 {variant:6}Agony Crawler deals (70-100)% increased Damage
-{variant:7}{tags:jewellery_resistance}+(31-43)% to Chaos Resistance while affected by Herald of Agony
+{variant:7}{tags:chaos,jewellery_resistance}+(31-43)% to Chaos Resistance while affected by Herald of Agony
 ]],[[
 Circle of Regret
 Topaz Ring
@@ -351,13 +351,13 @@ Variant: Pre 2.6.0
 Variant: Current
 Requires Level 46
 Implicits: 1
-{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
 {tags:attack}+(300-350) to Accuracy Rating
 {tags:jewellery_defense}{variant:1}+(60-80) to Armour
 {tags:jewellery_defense}{variant:2}+(260-300) to Armour
 {variant:2}{tags:life}+(40-50) to maximum Life
-{tags:jewellery_resistance}+(15-20)% to Chaos Resistance
-{tags:attack,life,physical}(0.6-0.8)% of Physical Attack Damage Leeched as Life
+{tags:chaos,jewellery_resistance}+(15-20)% to Chaos Resistance
+{tags:attack,life,physical_damage}(0.6-0.8)% of Physical Attack Damage Leeched as Life
 {variant:1}You gain Onslaught for 2 seconds on Kill
 {variant:2}You gain Onslaught for 4 seconds on Kill
 ]],[[
@@ -479,7 +479,7 @@ Implicits: 1
 {tags:mana}(20-40)% increased Mana Regeneration Rate
 {tags:life}Minions have 15% increased maximum Life
 Minions have 10% increased Area of Effect of Area Skills
-350 Physical Damage taken on Minion Death
+{tags:physical_damage}350 Physical Damage taken on Minion Death
 ]],[[
 The Highwayman
 Gold Ring
@@ -507,7 +507,7 @@ Iron Ring
 Requires Level: 49
 Implicits: 1
 League: Blight
-{tags:attack,physical}Adds 1 to 4 Physical Damage to Attacks
+{tags:attack,physical_damage}Adds 1 to 4 Physical Damage to Attacks
 {tags:jewellery_attribute}+(20-30) to Dexterity
 {tags:chaos}25% chance to Poison on Hit
 {tags:chaos}(40-60)% increased Damage with Poison
@@ -522,7 +522,7 @@ Variant: Current
 Implicits: 1
 {tags:life}+(20-30) to maximum Life
 {tags:jewellery_attribute}+(10-20) to Strength
-{variant:1}{tags:attack,life,physical}0.4% of Physical Attack Damage Leeched as Life
+{variant:1}{tags:attack,life,physical_damage}0.4% of Physical Attack Damage Leeched as Life
 {variant:2}{tags:attack,life}+(2-4) Life gained for each Enemy hit by your Attacks
 +1 Maximum Endurance Charge
 ]],[[
@@ -563,7 +563,7 @@ Variant: Pre 2.6.0
 Variant: Current
 Requires Level 24
 Implicits: 1
-{tags:attack,physical}Adds 1 to 4 Physical Damage to Attacks
+{tags:attack,physical_damage}Adds 1 to 4 Physical Damage to Attacks
 {variant:1}(10-20)% increased Damage
 {variant:2}(10-30)% increased Damage
 {variant:1}{tags:jewellery_attribute}+(10-20) to all Attributes
@@ -628,7 +628,7 @@ Steel Ring
 Source: Drops from unique{The Elder} (Uber)
 Requires Level 80
 Implicits: 1
-{tags:attack,physical}Adds (3-4) to (10-14) Physical Damage to Attacks
+{tags:attack,physical_damage}Adds (3-4) to (10-14) Physical Damage to Attacks
 {tags:jewellery_elemental,attack}Adds (26-32) to (42-48) Cold Damage to Attacks
 {tags:jewellery_defense}(6-10)% increased maximum Energy Shield
 {tags:life}(6-10)% increased maximum Life
@@ -658,15 +658,15 @@ Variant: Pre 3.0.0
 Variant: Current
 Requires Level 69
 Implicits: 1
-{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1}{tags:life}15% reduced maximum Life
 {variant:2}{tags:life}10% reduced maximum Life
 {variant:3}{tags:life}(5-10)% reduced maximum Life
 {variant:1}{tags:jewellery_defense}15% reduced maximum Energy Shield
 {variant:2}{tags:jewellery_defense}10% reduced maximum Energy Shield
 {variant:3}{tags:jewellery_defense}(5-10)% reduced maximum Energy Shield
-{tags:jewellery_resistance}+(40-50)% to Chaos Resistance
-{tags:chaos,physical}Gain 20% of Physical Damage as Extra Chaos Damage
+{tags:chaos,jewellery_resistance}+(40-50)% to Chaos Resistance
+{tags:chaos_damage,physical_damage}Gain 20% of Physical Damage as Extra Chaos Damage
 ]],[[
 Mokou's Embrace
 Ruby Ring
@@ -693,7 +693,7 @@ Has 1 Socket
 {variant:2,3}+3 to Level of Socketed Golem Gems
 {variant:1}Socketed Gems are Supported by Level 13 Faster Attacks
 {variant:2,3}Socketed Golem Skills have 20% increased Attack and Cast Speed
-{tags:attack,physical}Adds (5-10) to (11-15) Physical Damage to Attacks
+{tags:attack,physical_damage}Adds (5-10) to (11-15) Physical Damage to Attacks
 {tags:attack,speed}(5-10)% increased Attack Speed
 {variant:1}(1-2)% chance to Dodge Attack Hits
 {variant:2}(3-5)% chance to Dodge Attack Hits
@@ -872,7 +872,7 @@ Implicits: 1
 {tags:critical}{variant:2}+(10-15)% to Global Critical Strike Multiplier
 {tags:critical}{variant:3}+(15-25)% to Global Critical Strike Multiplier
 {tags:mana}+(40-60) to maximum Mana
-{tags:attack,mana,physical}0.4% of Physical Attack Damage Leeched as Mana
+{tags:attack,mana,physical_damage}0.4% of Physical Attack Damage Leeched as Mana
 Gain a Power Charge on non-Critical Strike
 Lose all Power Charges on Critical Strike
 ]],[[
@@ -1001,7 +1001,7 @@ Variant: Current
 Requires Level 20
 Implicits: 1
 {tags:jewellery_resistance}+(20-30)% to Cold Resistance
-{variant:1}{tags:attack,jewellery_elemental,physical}Adds 10 to 15 Physical Damage to Attacks against Frozen Enemies
+{variant:1}{tags:attack,jewellery_elemental,physical_damage}Adds 10 to 15 Physical Damage to Attacks against Frozen Enemies
 {variant:2}{tags:jewellery_elemental}Adds 40 to 60 Cold Damage against Chilled Enemies
 {variant:1}{tags:jewellery_elemental,attack}Adds (5-6) to (7-9) Cold Damage to Attacks
 {variant:2}{tags:jewellery_elemental,attack,caster}Adds (7-10) to (15-20) Cold Damage to Spells and Attacks
@@ -1186,10 +1186,10 @@ Iron Ring
 Requires Level: 49
 Implicits: 1
 League: Blight
-{tags:attack,physical}Adds 1 to 4 Physical Damage to Attacks
+{tags:attack,physical_damage}Adds 1 to 4 Physical Damage to Attacks
 {tags:jewellery_attribute}+(20-30) to Strength
 {tags:attack,physical}25% chance to cause Bleeding on Hit
-{tags:attack,physical}(40-60)% increased Damage with Bleeding
+{tags:attack,physical_damage}(40-60)% increased Damage with Bleeding
 You are Chilled while you are Bleeding
 Non-Chilled Enemies you inflict Bleeding on are Chilled
 Bleeding Enemies you Kill with Hits Shatter
@@ -1240,9 +1240,9 @@ Has 1 Socket
 {tags:jewellery_attribute}+(15-25) to all Attributes
 {tags:life}15 Life Regenerated per second for each Uncorrupted Item Equipped
 {tags:mana}-2 to Total Mana Cost of Skills for each Corrupted Item Equipped
-{variant:1,12}{crafted}{tags:jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
-{variant:2,13}{crafted}{tags:jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
-{variant:3,14}{crafted}{tags:jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
+{variant:1,12}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
+{variant:2,13}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
+{variant:3,14}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
 {variant:4,15}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Dexterity
 {variant:5,16}{crafted}{tags:jewellery_attribute}+(6-17) to Dexterity and Intelligence
 {variant:6,17}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Intelligence
@@ -1272,8 +1272,8 @@ The Warden's Brand
 Iron Ring
 Requires Level 30
 Implicits: 1
-{tags:attack,physical}Adds 1 to 4 Physical Damage to Attacks
-{tags:attack,physical}Adds (5-15) to (25-50) Physical Damage to Attacks
+{tags:attack,physical_damage}Adds 1 to 4 Physical Damage to Attacks
+{tags:attack,physical_damage}Adds (5-15) to (25-50) Physical Damage to Attacks
 {tags:attack,speed}30% reduced Attack Speed
 15% chance to gain a Frenzy Charge when you Stun an Enemy
 ]],[[

From f662ba80832efd20ae2719f9297d3184a635dd09 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Thu, 23 Jun 2022 21:26:05 +1000
Subject: [PATCH 04/13] Couple minor fixes to legacy voidheart and forgeting to
 readd chaos to Lori lantern

---
 src/Data/Uniques/ring.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index 4f9202ee25..a09fce2301 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -148,9 +148,9 @@ Implicits: 1
 {tags:life}(2-4) Life Regenerated per second
 10% chance to Cause Monsters to Flee
 {variant:1}Melee Attacks cause Bleeding
-{variant:2}{tags:attack,physical_damage}(30-50)% chance to cause Bleeding on Melee Hit
+{variant:2}{tags:attack,physical}(30-50)% chance to cause Bleeding on Melee Hit
 {variant:1}Melee Attacks Poison on Hit
-{variant:2}{tags:attack}(20-40)% chance to Poison on Melee Hit
+{variant:2}{tags:attack,chaos}(20-40)% chance to Poison on Melee Hit
 ]],[[
 Bloodboil
 Coral Ring
@@ -584,7 +584,7 @@ Implicits: 2
 {tags:jewellery_resistance}+10% to all Elemental Resistances
 {tags:speed}(6-8)% increased Movement Speed when on Low Life
 31% increased Light Radius
-{tags:jewellery_resistance}+(20-25)% Chaos Resistance when on Low Life
+{tags:chaos,jewellery_resistance}+(20-25)% Chaos Resistance when on Low Life
 While on Low Life, Enemies are Unlucky when Damaging you
 ]],[[
 Malachai's Artifice

From 2cb26c889425dd2f973b52acce3e3430ab28b66e Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Thu, 23 Jun 2022 21:57:07 +1000
Subject: [PATCH 05/13] fix missing updating physical damage on unique belts.

---
 src/Data/Uniques/belt.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
index bdc6f290c9..a72382d79a 100644
--- a/src/Data/Uniques/belt.lua
+++ b/src/Data/Uniques/belt.lua
@@ -45,7 +45,7 @@ Implicits: 1
 {tags:attack,jewellery_elemental}(10-20)% increased Elemental Damage with Attack Skills
 {tags:mana}+(45-55) to maximum Mana
 {tags:jewellery_defense}+(60-70) to maximum Energy Shield
-{tags:attack,mana,physical}0.2% of Physical Attack Damage Leeched as Mana per Power Charge
+{tags:attack,mana,physical_damage}0.2% of Physical Attack Damage Leeched as Mana per Power Charge
 Chill and Freeze duration on you is based on 65% of Energy Shield
 ]],[[
 Auxium
@@ -59,7 +59,7 @@ Implicits: 1
 {variant:2}{tags:attack,jewellery_elemental}(20-25)% increased Elemental Damage with Attack Skills per Power Charge
 {tags:mana}+(45-55) to maximum Mana
 {tags:jewellery_defense}+(60-70) to maximum Energy Shield
-{tags:attack,mana,physical}0.2% of Attack Damage Leeched as Mana per Power Charge
+{tags:attack,mana,physical_damage}0.2% of Attack Damage Leeched as Mana per Power Charge
 {variant:1}Chill Effect and Freeze duration on you is based on 65% of Energy Shield
 {variant:2}Chill Effect and Freeze duration on you is based on 100% of Energy Shield
 ]],[[
@@ -94,10 +94,10 @@ League: Harvest
 Requires Level 68
 Implicits: 1
 {tags:life}+(25-40) to maximum Life
-{tags:attack,physical}Adds (5-7) to (11-12) Physical Damage to Attacks
+{tags:attack,physical_damage}Adds (5-7) to (11-12) Physical Damage to Attacks
 (20-30)% increased Stun Duration on Enemies
 Nearby Enemies are Crushed while you have at least 25 Rage
-{tags:physical}(4-6)% increased Physical Damage per 10 Rage
+{tags:physical_damage}(4-6)% increased Physical Damage per 10 Rage
 +20 to Maximum Rage
 ]],[[
 Belt of the Deceiver
@@ -108,7 +108,7 @@ Requires Level 20
 Implicits: 1
 {tags:jewellery_attribute}+(25-35) to Strength
 {variant:1}10% reduced Chance to Block Attacks and Spells
-{tags:physical}(15-25)% increased Physical Damage
+{tags:physical_damage}(15-25)% increased Physical Damage
 {tags:critical}You take 30% reduced Extra Damage from Critical Strikes
 {tags:life}+(30-40) to maximum Life
 {variant:1}{tags:jewellery_resistance}+(6-10)% to all Elemental Resistances
@@ -207,7 +207,7 @@ Variant: Current (Lightning)
 Requires Level 68
 Implicits: 1
 {tags:jewellery_attribute}+(25-35) to Strength
-{variant:1,5}{tags:physical}(20-30)% increased Physical Damage
+{variant:1,5}{tags:physical_damage}(20-30)% increased Physical Damage
 {variant:2,6}{tags:jewellery_elemental}(20-30)% increased Fire Damage
 {variant:3,7}{tags:jewellery_elemental}(20-30)% increased Cold Damage
 {variant:4,8}{tags:jewellery_elemental}(20-30)% increased Lightning Damage
@@ -215,8 +215,8 @@ Implicits: 1
 {variant:1,3,4,5,7,8}{tags:jewellery_resistance}+(30-35)% to Fire Resistance
 {variant:1,2,4,5,6,8}{tags:jewellery_resistance}+(30-35)% to Cold Resistance
 {variant:1,2,3,5,6,7}{tags:jewellery_resistance}+(30-35)% to Lightning Resistance
-{variant:1}{tags:life,physical}0.2% of Physical Damage Leeched as Life
-{variant:5}{tags:life,physical}0.6% of Physical Damage Leeched as Life
+{variant:1}{tags:life,physical_damage}0.2% of Physical Damage Leeched as Life
+{variant:5}{tags:life,physical_damage}0.6% of Physical Damage Leeched as Life
 {variant:2}{tags:life}0.2% of Fire Damage Leeched as Life
 {variant:6}{tags:life}0.6% of Fire Damage Leeched as Life
 {variant:3}{tags:life}0.2% of Cold Damage Leeched as Life
@@ -265,7 +265,7 @@ Rustic Sash
 League: Talisman Standard, Talisman Hardcore
 Requires Level 18
 Implicits: 1
-{tags:physical}(12-24)% increased Physical Damage
+{tags:physical_damage}(12-24)% increased Physical Damage
 {tags:jewellery_resistance}+(20-30)% to Cold Resistance
 60% increased Flask effect duration
 Deals 50 Chaos Damage per second to nearby Enemies
@@ -277,10 +277,10 @@ Rustic Sash
 League: Talisman Standard, Talisman Hardcore
 Requires Level 11
 Implicits: 1
-{tags:physical}(12-24)% increased Physical Damage
-{tags:attack,physical}Adds 5 to 10 Physical Damage to Attacks
+{tags:physical_damage}(12-24)% increased Physical Damage
+{tags:attack,physical_damage}Adds 5 to 10 Physical Damage to Attacks
 {tags:life}+(20-40) to maximum Life
-{tags:attack,life,physical}0.2% of Physical Attack Damage Leeched as Life
+{tags:attack,life,physical_damage}0.2% of Physical Attack Damage Leeched as Life
 50% increased Flask Charges gained while using a Flask
 {tags:mana}50% increased Mana Regeneration while using a Flask
 ]],[[
@@ -329,7 +329,7 @@ Implicits: 1
 {variant:2}You have Culling Strike against Cursed Enemies
 {variant:2}(20-28) Life gained for each Cursed Enemy hit by your Attacks
 {variant:2}(10-14) Mana gained for each Cursed Enemy hit by your Attacks
-{tags:physical}Take (100-200) Physical Damage when you use a Movement Skill
+{tags:physical_damage}Take (100-200) Physical Damage when you use a Movement Skill
 You have no Armour or Maximum Energy Shield
 ]],[[
 Graven's Secret

From 1b2ce62a3d48a2d29cc07cb7fe1a93a684106368 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Fri, 9 Dec 2022 22:37:02 +1100
Subject: [PATCH 06/13] fix typo

---
 src/Data/Uniques/amulet.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
index 1736e735e8..f1c2852a0c 100644
--- a/src/Data/Uniques/amulet.lua
+++ b/src/Data/Uniques/amulet.lua
@@ -537,7 +537,7 @@ Implicits: 1
 {variant:3}Bow Attacks have Culling Strike
 {variant:1,2}{tags:attack,life,physical_damage}(0.8-1)% of Physical Attack Damage Leeched as Life
 {variant:1}Precision has 50% less Reservation
-{variant:2,3}{tags:mana}PPrecision has 100% increased Mana Reservation Efficiency
+{variant:2,3}{tags:mana}Precision has 100% increased Mana Reservation Efficiency
 ]],[[
 Replica Hyrri's Truth
 Jade Amulet

From b5866bdb97954aec902ea6d84c8ca92b25bedc02 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Sat, 14 Jan 2023 19:03:26 +1100
Subject: [PATCH 07/13] Just make the resistances a bit cleaner

^(\{variant:.+?\})?(\{tags:.+?\})?([^{}]+?)% to (.+?) Resistance
$1{tags:jewellery_resistance}$3% to $4 Resistance
---
 src/Data/Uniques/amulet.lua | 24 ++++++++++++------------
 src/Data/Uniques/belt.lua   | 10 +++++-----
 src/Data/Uniques/ring.lua   | 26 +++++++++++++-------------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
index 78df7e5164..e9b64daf71 100644
--- a/src/Data/Uniques/amulet.lua
+++ b/src/Data/Uniques/amulet.lua
@@ -229,8 +229,8 @@ Requires Level 28
 Implicits: 1
 (15-25)% increased Global Defences
 +(20-30) to maximum Energy Shield
-+(15-30)% to Fire Resistance
-+(15-30)% to Lightning Resistance
+{tags:jewellery_resistance}+(15-30)% to Fire Resistance
+{tags:jewellery_resistance}+(15-30)% to Lightning Resistance
 {variant:1}30% slower start of Energy Shield Recharge during any Flask Effect
 {variant:2}50% slower start of Energy Shield Recharge during any Flask Effect
 {variant:1}400% increased Energy Shield Recharge Rate during any Flask Effect
@@ -246,7 +246,7 @@ Implicits: 1
 Grants Level 10 Gluttony of Elements Skill
 {tags:attack,chaos_damage}Adds 19-43 Chaos Damage to Attacks
 {tags:jewellery_resistance}-(10-5)% to all Elemental Resistances
-{tags:chaos,jewellery_resistance}+(17-29)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-29)% to Chaos Resistance
 Corrupted
 ]],[[
 Bloodgrip
@@ -289,7 +289,7 @@ Requires Level 61
 Implicits: 1
 {tags:jewellery_attribute}+(10-16) to all Attributes
 Modifiers to Attributes instead Apply to Omniscience
-+1% to All Elemental Resistances per 15 Omniscience
+{tags:jewellery_resistance}+1% to All Elemental Resistances per 15 Omniscience
 Penetrate 1% Elemental Resistances per 15 Omniscience
 Attribute Requirements can be satisfied by (15-25)% of Omniscience
 ]],[[
@@ -361,7 +361,7 @@ Requires Level 60
 Implicits: 1
 {tags:jewellery_attribute}+(10-16) to all Attributes
 30% increased Rarity of Items found
-{tags:chaos,jewellery_resistance}+60% to Chaos Resistance
+{tags:jewellery_resistance}+60% to Chaos Resistance
 Cannot be Stunned
 {tags:jewellery_defense,life}20% of Maximum Life Converted to Energy Shield
 ]],[[
@@ -634,7 +634,7 @@ Implicits: 1
 {variant:2}{tags:jewellery_resistance}+(20-25)% to Fire Resistance
 {variant:3}{tags:jewellery_resistance}+(20-25)% to Cold Resistance
 {variant:4}{tags:jewellery_resistance}+(20-25)% to Lightning Resistance
-{variant:5}{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{variant:5}{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1}Vulnerability has no Reservation if Cast as an Aura
 {variant:2}Flammability has no Reservation if Cast as an Aura
 {variant:3}Frostbite has no Reservation if Cast as an Aura
@@ -718,7 +718,7 @@ Requires Level 48
 Implicits: 1
 {tags:jewellery_attribute}+(16-24) to Strength and Dexterity
 {tags:jewellery_attribute}+(30-40) to Intelligence
-{tags:chaos,jewellery_resistance}+(23-31)% to Chaos Resistance
+{tags:jewellery_resistance}+(23-31)% to Chaos Resistance
 {variant:1}{tags:caster}(10-15)% increased Effect of your Curses
 {variant:2}{tags:caster}(5-10)% increased Effect of your Curses
 {variant:1,3}(10-15)% increased effect of Non-Curse Auras from your Skills
@@ -986,7 +986,7 @@ Requires Level 54
 Implicits: 1
 {tags:life}Regenerate (2-4) Life per second
 {tags:jewellery_attribute}+(30-40) to Intelligence
-{tags:chaos,jewellery_resistance}Minions have (-17-17)% to Chaos Resistance
+{tags:jewellery_resistance}Minions have (-17-17)% to Chaos Resistance
 Summon Raging Spirit has (20-30)% increased Duration
 {variant:1}Summoned Raging Spirits deal (60-80)% increased Damage
 {variant:2}Summoned Raging Spirits deal (25-40)% increased Damage
@@ -1007,8 +1007,8 @@ Grants Level 10 Purity of Elements Skill
 {variant:3}{tags:jewellery_attribute}+(10-20) to all Attributes
 {tags:life}+(20-40) to maximum Life
 {variant:1}5% chance to avoid Elemental Ailments
-{variant:2}+5% to all Elemental Resistances
-{variant:3}+(5-10)% to all Elemental Resistances
+{variant:2}{tags:jewellery_resistance}+5% to all Elemental Resistances
+{variant:3}{tags:jewellery_resistance}+(5-10)% to all Elemental Resistances
 ]],[[
 Ungil's Harmony
 Turquoise Amulet
@@ -1034,7 +1034,7 @@ Socketed Support Gems can also Support Skills from your Body Armour
 {tags:jewellery_resistance}+(-30-30)% to Fire Resistance
 {tags:jewellery_resistance}+(-30-30)% to Cold Resistance
 {tags:jewellery_resistance}+(-30-30)% to Lightning Resistance
-{tags:chaos,jewellery_resistance}+(-23-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(-23-23)% to Chaos Resistance
 ]],[[
 Victario's Acuity
 Turquoise Amulet
@@ -1043,7 +1043,7 @@ Requires Level 16
 Implicits: 1
 {tags:jewellery_attribute}+(16-24) to Dexterity and Intelligence
 {tags:jewellery_resistance}+(30-40)% to Lightning Resistance
-{tags:chaos,jewellery_resistance}+(8-10)% to Chaos Resistance
+{tags:jewellery_resistance}+(8-10)% to Chaos Resistance
 10% chance to gain a Frenzy Charge on Kill
 10% chance to gain a Power Charge on Kill
 {tags:speed}5% increased Projectile Speed per Frenzy Charge
diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
index 8d1234c828..23304adff9 100644
--- a/src/Data/Uniques/belt.lua
+++ b/src/Data/Uniques/belt.lua
@@ -142,7 +142,7 @@ LevelReq: 61
 Implicits: 1
 {tags:jewellery_defense}+(9-20) to maximum Energy Shield
 {tags:life}+(60-80) to maximum Life
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 Enemy Hits inflict Temporal Chains on you
 When you lose Temporal Chains you gain maximum Rage
 Immune to Curses while you have at least 25 Rage
@@ -419,9 +419,9 @@ Chill nearby Enemies when you Focus, causing 30% reduced Action Speed
 {variant:11,12,13,14,15,16,17,18,19,20}Focus has (30-50)% increased Cooldown Recovery Rate
 (50-70)% increased Damage with Hits and Ailments against Chilled Enemies
 {variant:1,11}{crafted}{tags:life}Regenerate 2% of Life per second during any Flask Effect
-{variant:2,12}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
-{variant:3,13}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
-{variant:4,14}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
+{variant:2,12}{crafted}{tags:jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
+{variant:3,13}{crafted}{tags:jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
+{variant:4,14}{crafted}{tags:jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
 {variant:5,15}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Dexterity
 {variant:6,16}{crafted}{tags:jewellery_attribute}+(6-17) to Dexterity and Intelligence
 {variant:7,17}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Intelligence
@@ -685,7 +685,7 @@ Implicits: 1
 {tags:jewellery_attribute}+(25-35) to Strength
 {tags:jewellery_defense}(6-10)% increased maximum Energy Shield
 {tags:life}(6-10)% increased maximum Life
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {tags:attack}Minions have 5% chance to Taunt on Hit with Attacks
 Your Minions spread Caustic Ground on Death, dealing 20% of their maximum Life as Chaos Damage per second
 ]],[[
diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index 8767ef05c4..91e3ce4bf5 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -118,13 +118,13 @@ League: Ritual
 Source: Purchase from Ritual Reward
 Requires Level 49
 Implicits: 1
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {tags:jewellery_elemental}+(8-12)% to Fire Damage over Time Multiplier
 50% reduced Ignite Duration on Enemies
 (10-15)% chance to Ignite
 Enemies Ignited by you take Chaos Damage instead of Fire Damage from Ignite
 Withered does not expire on Enemies Ignited by you
-{tags:chaos,jewellery_resistance}+(20-25)% to Fire and Chaos Resistances
+{tags:jewellery_resistance}+(20-25)% to Fire and Chaos Resistances
 ]],[[
 Blackheart
 Iron Ring
@@ -312,17 +312,17 @@ Variant: Buff Effect (Pre 3.11.0)
 Variant: Buff Effect (Current)
 Variant: Agony Damage
 Variant: Chaos Resistance
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {fractured}{tags:jewellery_attribute}+(10-20) to all Attributes
 {tags:chaos_damage}Adds (15-20) to (21-30) Chaos Damage
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1}{tags:mana}Herald of Agony has (60-80)% increased Mana Reservation Efficiency
 {variant:2}{tags:mana}Herald of Agony has (30-40)% increased Mana Reservation Efficiency
 {variant:3}{tags:chaos_damage}(40-60)% increased Chaos Damage while affected by Herald of Agony
 {variant:4}Herald of Agony has (70-100)% increased Buff Effect
 {variant:5}Herald of Agony has (40-60)% increased Buff Effect
 {variant:6}Agony Crawler deals (70-100)% increased Damage
-{variant:7}{tags:chaos,jewellery_resistance}+(31-43)% to Chaos Resistance while affected by Herald of Agony
+{variant:7}{tags:jewellery_resistance}+(31-43)% to Chaos Resistance while affected by Herald of Agony
 ]],[[
 Circle of Regret
 Topaz Ring
@@ -358,12 +358,12 @@ Variant: Pre 3.19.0
 Variant: Current
 Requires Level 46
 Implicits: 1
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1,2}{tags:attack}+(300-350) to Accuracy Rating
 {variant:1}{tags:jewellery_defense}+(60-80) to Armour
 {variant:2}{tags:jewellery_defense}}+(260-300) to Armour
 {variant:2}{tags:life}+(40-50) to maximum Life
-{variant:1,2}{tags:chaos,jewellery_resistance}+(15-20)% to Chaos Resistance
+{variant:1,2}{tags:jewellery_resistance}+(15-20)% to Chaos Resistance
 {variant:1,2}{tags:attack,life,physical_damage}(0.6-0.8)% of Physical Attack Damage Leeched as Life
 {variant:1}You gain Onslaught for 2 seconds on Kill
 {variant:2}You gain Onslaught for 4 seconds on Kill
@@ -376,7 +376,7 @@ League: Sanctum
 Source: Drops from unique{Lycia, Herald of the Scourge} in normal{The Beyond} while unique{The Original Scripture} is active in the normal{Relic Altar}
 LevelReq: 52
 Implicits: 1
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 All Elemental Damage Converted to Chaos Damage
 Nearby Enemies' Chaos Resistance is 0
 ]],[[
@@ -720,7 +720,7 @@ Variant: Pre 3.19.0
 Variant: Current
 Requires Level 69
 Implicits: 1
-{tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance
+{tags:jewellery_resistance}+(17-23)% to Chaos Resistance
 {variant:1}{tags:life}15% reduced maximum Life
 {variant:2}{tags:life}10% reduced maximum Life
 {variant:3}{tags:life}(5-10)% reduced maximum Life
@@ -729,7 +729,7 @@ Implicits: 1
 {variant:2}{tags:jewellery_defense}10% reduced maximum Energy Shield
 {variant:3}{tags:jewellery_defense}(5-10)% reduced maximum Energy Shield
 {variant:4}{tags:jewellery_defense}25% reduced maximum Energy Shield
-{tags:chaos,jewellery_resistance}+(40-50)% to Chaos Resistance
+{tags:jewellery_resistance}+(40-50)% to Chaos Resistance
 {variant:1,2,3}{tags:chaos_damage,physical_damage}Gain 20% of Physical Damage as Extra Chaos Damage
 {variant:4}{tags:chaos_damage,physical_damage}Gain (40-60)% of Physical Damage as Extra Chaos Damage
 ]],[[
@@ -1336,9 +1336,9 @@ Has 1 Socket
 {tags:jewellery_attribute}+(15-25) to all Attributes
 {tags:life}Regenerate 15 Life per second for each Uncorrupted Item Equipped
 {tags:mana}-2 to Total Mana Cost of Skills for each Corrupted Item Equipped
-{variant:1,12}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
-{variant:2,13}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
-{variant:3,14}{crafted}{tags:chaos,jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
+{variant:1,12}{crafted}{tags:jewellery_resistance}+(8-15)% to Fire and Chaos Resistances
+{variant:2,13}{crafted}{tags:jewellery_resistance}+(8-15)% to Cold and Chaos Resistances
+{variant:3,14}{crafted}{tags:jewellery_resistance}+(8-15)% to Lightning and Chaos Resistances
 {variant:4,15}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Dexterity
 {variant:5,16}{crafted}{tags:jewellery_attribute}+(6-17) to Dexterity and Intelligence
 {variant:6,17}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Intelligence

From f47aee6fb598627d47c677e86a5b6d32f1c0d3d0 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Sat, 14 Jan 2023 19:31:26 +1100
Subject: [PATCH 08/13] Cleanup and fix leech

---
 src/Data/Uniques/amulet.lua |  6 +++---
 src/Data/Uniques/belt.lua   | 18 +++++++++---------
 src/Data/Uniques/ring.lua   |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
index e9b64daf71..7bb4cf5b8a 100644
--- a/src/Data/Uniques/amulet.lua
+++ b/src/Data/Uniques/amulet.lua
@@ -277,7 +277,7 @@ Implicits: 1
 {tags:life}{variant:1}25% reduced maximum Life
 {tags:jewellery_defense}{variant:1}25% reduced maximum Energy Shield
 {tags:jewellery_resistance}+(10-20)% to all Elemental Resistances
-{tags:attack,life,physical_damage}(1.2-2)% of Physical Attack Damage Leeched as Life
+{tags:attack,life}(1.2-2)% of Physical Attack Damage Leeched as Life
 {tags:life}{variant:2}(30-40)% increased Damage while Leeching
 {tags:life}{variant:2}50% increased Life Leeched per second
 Extra Gore
@@ -552,7 +552,7 @@ Implicits: 1
 {variant:1,2}{tags:critical}+(23-28)% to Global Critical Strike Multiplier
 {variant:3}{tags:critical}+(25-50)% to Global Critical Strike Multiplier
 {variant:3}Bow Attacks have Culling Strike
-{variant:1,2}{tags:attack,life,physical_damage}(0.8-1)% of Physical Attack Damage Leeched as Life
+{variant:1,2}{tags:attack,life}(0.8-1)% of Physical Attack Damage Leeched as Life
 {variant:1}Precision has 50% less Reservation
 {variant:2,3}{tags:mana}Precision has 100% increased Mana Reservation Efficiency
 ]],[[
@@ -908,7 +908,7 @@ Variant: Current
 Implicits: 1
 {tags:mana}(20-30)% increased Mana Regeneration Rate
 {tags:jewellery_resistance}+25% to Cold Resistance
-{tags:mana,physical_damage,attack}{variant:1,2}0.2% of Physical Attack Damage Leeched as Mana
+{tags:mana,attack}{variant:1,2}0.2% of Physical Attack Damage Leeched as Mana
 {tags:life}Minions have (10-15)% increased maximum Life
 {variant:1,2,3}{tags:speed}Minions have (10-15)% increased Movement Speed
 {variant:4}Minions convert 50% of Physical Damage to Cold Damage
diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
index 23304adff9..4d2da9406d 100644
--- a/src/Data/Uniques/belt.lua
+++ b/src/Data/Uniques/belt.lua
@@ -50,7 +50,7 @@ Implicits: 2
 {variant:3,4}{tags:jewellery_defense}+(60-80) to maximum Energy Shield
 {tags:jewellery_defense}+(60-70) to maximum Energy Shield
 {tags:mana}+(45-55) to maximum Mana
-{variant:1}{tags:attack,mana,physical_damage}0.2% of Physical Attack Damage Leeched as Mana per Power Charge
+{variant:1}{tags:attack,mana}0.2% of Physical Attack Damage Leeched as Mana per Power Charge
 {variant:2,3}Chill Effect and Freeze Duration on you are based on 65% of Energy Shield
 {variant:4}Chill Effect and Freeze Duration on you are based on 100% of Energy Shield
 {variant:1}{tags:attack,jewellery_elemental}(20-30)% increased Elemental Damage with Attack Skills
@@ -226,8 +226,8 @@ Implicits: 1
 {variant:1,3,4,5,7,8}{tags:jewellery_resistance}+(30-35)% to Fire Resistance
 {variant:1,2,4,5,6,8}{tags:jewellery_resistance}+(30-35)% to Cold Resistance
 {variant:1,2,3,5,6,7}{tags:jewellery_resistance}+(30-35)% to Lightning Resistance
-{variant:1}{tags:life,physical_damage}0.2% of Physical Damage Leeched as Life
-{variant:5}{tags:life,physical_damage}0.6% of Physical Damage Leeched as Life
+{variant:1}{tags:life}0.2% of Physical Damage Leeched as Life
+{variant:5}{tags:life}0.6% of Physical Damage Leeched as Life
 {variant:2}{tags:life}0.2% of Fire Damage Leeched as Life
 {variant:6}{tags:life}0.6% of Fire Damage Leeched as Life
 {variant:3}{tags:life}0.2% of Cold Damage Leeched as Life
@@ -291,7 +291,7 @@ Implicits: 1
 {tags:physical_damage}(12-24)% increased Global Physical Damage
 {tags:attack,physical_damage}Adds 5 to 10 Physical Damage to Attacks
 {tags:life}+(20-40) to maximum Life
-{tags:attack,life,physical_damage}0.2% of Physical Attack Damage Leeched as Life
+{tags:attack,life}0.2% of Physical Attack Damage Leeched as Life
 50% increased Flask Charges gained during any Flask Effect
 {tags:mana}50% increased Mana Regeneration Rate during any Flask Effect
 ]],[[
@@ -656,7 +656,7 @@ Implicits: 1
 {tags:physical_damage}(12-24)% increased Global Physical Damage
 {tags:life}+(60-80) to maximum Life
 {tags:jewellery_resistance}+(25-40)% to Cold Resistance
-{tags:attack,life,physical_damage}0.4% of Physical Attack Damage Leeched as Life
+{tags:attack,life}0.4% of Physical Attack Damage Leeched as Life
 60% increased Flask Effect Duration
 30% reduced Flask Charges gained during any Flask Effect
 {tags:chaos_damage,life}200% of Life Leech applies to enemies as Chaos Damage
@@ -839,10 +839,10 @@ Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Intelligence
 {variant:1}{tags:jewellery_resistance}+(10-20)% to Cold Resistance
 {variant:2}{tags:jewellery_resistance}+(20-30)% to Cold Resistance
-{variant:1}{tags:attack,life,physical_damage}0.4% of Physical Attack Damage Leeched as Life
-{variant:2}{tags:attack,life,physical_damage}2% of Physical Attack Damage Leeched as Life
-{variant:1}{tags:attack,mana,physical_damage}0.4% of Physical Attack Damage Leeched as Mana
-{variant:2}{tags:attack,mana,physical_damage}2% of Physical Attack Damage Leeched as Mana
+{variant:1}{tags:attack,life}0.4% of Physical Attack Damage Leeched as Life
+{variant:2}{tags:attack,life}2% of Physical Attack Damage Leeched as Life
+{variant:1}{tags:attack,mana}0.4% of Physical Attack Damage Leeched as Mana
+{variant:2}{tags:attack,mana}2% of Physical Attack Damage Leeched as Mana
 {variant:2}(500-1000)% increased total Recovery per second from Life Leech
 {variant:2}(500-1000)% increased total Recovery per second from Mana Leech
 ]],
diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index 91e3ce4bf5..a179043ae2 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -364,7 +364,7 @@ Implicits: 1
 {variant:2}{tags:jewellery_defense}}+(260-300) to Armour
 {variant:2}{tags:life}+(40-50) to maximum Life
 {variant:1,2}{tags:jewellery_resistance}+(15-20)% to Chaos Resistance
-{variant:1,2}{tags:attack,life,physical_damage}(0.6-0.8)% of Physical Attack Damage Leeched as Life
+{variant:1,2}{tags:attack,life}(0.6-0.8)% of Physical Attack Damage Leeched as Life
 {variant:1}You gain Onslaught for 2 seconds on Kill
 {variant:2}You gain Onslaught for 4 seconds on Kill
 {variant:3}Recover 5% of Life on Kill
@@ -534,7 +534,7 @@ Implicits: 1
 {variant:1}{tags:speed}5% increased Movement Speed
 {variant:2}{tags:speed}(5-10)% increased Movement Speed
 {variant:1}25% chance to Steal Power, Frenzy, and Endurance Charges on Hit
-{variant:1}0.5% of Damage Leeched as Life while you have at least 5 total Endurance, Frenzy and Power Charges
+{variant:1}{tags:life}0.5% of Damage Leeched as Life while you have at least 5 total Endurance, Frenzy and Power Charges
 {variant:2}Steal Power, Frenzy, and Endurance Charges on Hit
 Total Recovery per second from Life Leech is Doubled
 ]],[[
@@ -569,7 +569,7 @@ Implicits: 1
 {tags:life}+(20-30) to maximum Life
 {variant:3}Grants Level 10 Enduring Cry Skill
 {tags:jewellery_attribute}+(10-20) to Strength
-{variant:1}{tags:attack,life,physical_damage}0.4% of Physical Attack Damage Leeched as Life
+{variant:1}{tags:attack,life}0.4% of Physical Attack Damage Leeched as Life
 {variant:2}{tags:attack,life}Gain (2-4) Life per Enemy Hit with Attacks
 +1 to Maximum Endurance Charge
 ]],[[
@@ -946,7 +946,7 @@ Implicits: 1
 {tags:critical}{variant:2}+(10-15)% to Global Critical Strike Multiplier
 {tags:critical}{variant:3}+(15-25)% to Global Critical Strike Multiplier
 {tags:mana}+(40-60) to maximum Mana
-{tags:attack,mana,physical_damage}0.4% of Physical Attack Damage Leeched as Mana
+{tags:attack,mana}0.4% of Physical Attack Damage Leeched as Mana
 Gain a Power Charge on non-Critical Strike
 Lose all Power Charges on Critical Strike
 ]],[[

From b7af53a85bad8c87980dc0146dd6271ea4d28c77 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Sat, 14 Jan 2023 19:45:59 +1100
Subject: [PATCH 09/13] Fix typo

---
 src/Data/Uniques/belt.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
index 4d2da9406d..1e5d999984 100644
--- a/src/Data/Uniques/belt.lua
+++ b/src/Data/Uniques/belt.lua
@@ -116,7 +116,7 @@ Variant: Current
 LevelReq: 20
 Implicits: 1
 {tags:jewellery_attribute}+(25-35) to Strength
-{variant:1}10% reduced Chance to Block Attacks and Spells
+{variant:1}10% reduced Chance to Block Attack and Spell Damage
 {tags:physical_damage}(15-25)% increased Global Physical Damage
 {tags:critical}You take 30% reduced Extra Damage from Critical Strikes
 {tags:life}+(30-40) to maximum Life

From 9b2097bc2d6e4b8578b3c2619686330f9c55fa73 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Sun, 15 Jan 2023 13:02:57 +1100
Subject: [PATCH 10/13] Fixup missing speed tags

---
 src/Data/Uniques/amulet.lua | 6 +++---
 src/Data/Uniques/belt.lua   | 2 +-
 src/Data/Uniques/ring.lua   | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
index 7bb4cf5b8a..abb1a01f4a 100644
--- a/src/Data/Uniques/amulet.lua
+++ b/src/Data/Uniques/amulet.lua
@@ -459,7 +459,7 @@ Implicits: 1
 {tags:caster,speed}(10-15)% increased Cast Speed
 (10-15)% increased Area of Effect
 {variant:1}{tags:caster}Enemies Cursed by you are Hindered with 25% reduced Movement Speed if 25% of Curse Duration expired
-{variant:2}{tags:caster}Enemies Cursed by you are Hindered with 30% reduced Movement Speed if 25% of Curse Duration expired
+{variant:2}{tags:caster}Enemies Cursed by you are Hindered if 25% of Curse Duration expired
 {tags:caster}Your Curses have 25% increased Effect if 50% of Curse Duration expired
 {variant:1}{tags:caster}Enemies Cursed by you take 25% increased Damage if 75% of Curse Duration expired
 {variant:2}{tags:caster}Enemies Cursed by you take 35% increased Damage if 75% of Curse Duration expired
@@ -964,8 +964,8 @@ Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Intelligence
 {variant:1}+15% Chance to Block Spell Damage
 {variant:2,3}+(12-15)% Chance to Block Spell Damage
-{variant:1,2}{tags:caster}(10-15)% increased Cast Speed
-{variant:3}{tags:caster}(15-20)% increased Cast Speed
+{variant:1,2}{tags:caster,speed}(10-15)% increased Cast Speed
+{variant:3}{tags:caster,speed}(15-20)% increased Cast Speed
 {variant:1,2}{tags:mana}+(30-50) to maximum Mana
 {variant:3}{tags:mana}+(40-70) to maximum Mana
 ]],[[
diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
index 1e5d999984..0dc55e2691 100644
--- a/src/Data/Uniques/belt.lua
+++ b/src/Data/Uniques/belt.lua
@@ -425,7 +425,7 @@ Chill nearby Enemies when you Focus, causing 30% reduced Action Speed
 {variant:5,15}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Dexterity
 {variant:6,16}{crafted}{tags:jewellery_attribute}+(6-17) to Dexterity and Intelligence
 {variant:7,17}{crafted}{tags:jewellery_attribute}+(6-17) to Strength and Intelligence
-{variant:8,18}{crafted}(7-12)% increased Trap Throwing Speed
+{variant:8,18}{crafted}{tags:speed}(7-12)% increased Trap Throwing Speed
 {variant:9,19}{crafted}{tags:jewellery_defense}Regenerate 120 Energy Shield per second while a Rare or Unique Enemy is Nearby
 {variant:10,20}{crafted}Your Critical Strike Chance is Lucky while Focused
 ]],[[
diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index a179043ae2..86f04a4671 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -517,7 +517,7 @@ LevelReq: 49
 Implicits: 1
 {tags:jewellery_defense}+(15-25) to maximum Energy Shield
 {tags:jewellery_attribute}+(30-40) to Intelligence
-{tags:caster}(10-15)% increased Cast Speed
+{tags:caster,speed}(10-15)% increased Cast Speed
 (10-20)% chance to gain a Power Charge when you Cast a Curse Spell
 Your Curse Limit is equal to your maximum Power Charges
 ]],[[
@@ -765,8 +765,8 @@ Has 1 Socket
 {variant:2,3}Socketed Golem Skills have 20% increased Attack and Cast Speed
 {tags:attack,physical_damage}Adds (5-10) to (11-15) Physical Damage to Attacks
 {tags:attack,speed}(5-10)% increased Attack Speed
-{variant:1}(1-2)% increased Movement Speed
-{variant:2}(3-5)% increased Movement Speed
+{variant:1}{tags:speed}(1-2)% increased Movement Speed
+{variant:2}{tags:speed}(3-5)% increased Movement Speed
 {variant:1}Socketed Gems are Supported by Level 16 Increased Minion Speed
 {variant:2,3}Gain Onslaught for 10 seconds when you Cast Socketed Golem Skill
 ]],[[
@@ -1203,7 +1203,7 @@ Has 1 Socket
 {variant:6}Socketed Vaal Skills grant Elusive when Used
 {variant:7}You have Tailwind if you've used a Socketed Vaal Skill Recently
 {variant:8}Socketed Vaal Skills have 60% increased Area of Effect
-{variant:9}Socketed Vaal Skills have 80% increased Projectile Speed
+{variant:9}{tags:speed}Socketed Vaal Skills have 80% increased Projectile Speed
 {variant:10}Socketed Vaal Skills have 80% increased Skill Effect Duration
 {variant:11}Socketed Vaal Skills have 30% reduced Soul Gain Prevention Duration
 {variant:12}Damage with Hits from Socketed Vaal Skills is Lucky

From d4083493136a035ef40f2070e80169176caf5473 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Sun, 15 Jan 2023 13:17:47 +1100
Subject: [PATCH 11/13] Variants Before Tags

\{tags:(.+)\}\{variant:(.+)\}
{variant:$2}{tags:$1}
---
 src/Data/Uniques/amulet.lua | 32 ++++++++++++++++----------------
 src/Data/Uniques/ring.lua   |  6 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
index abb1a01f4a..4f48de85cf 100644
--- a/src/Data/Uniques/amulet.lua
+++ b/src/Data/Uniques/amulet.lua
@@ -146,7 +146,7 @@ Implicits: 1
 {variant:1,2,3,4,5}10% reduced Stun and Block Recovery
 {variant:6,7,8,9}Nearby Enemies grant 25% increased Flask Charges
 {variant:1,2,3,4,5}Nearby Enemies have 10% reduced Stun and Block Recovery
-{tags:critical}{variant:10,11,12,13,14,15,16}Hits against Nearby Enemies have 50% increased Critical Strike Chance
+{variant:10,11,12,13,14,15,16}{tags:critical}Hits against Nearby Enemies have 50% increased Critical Strike Chance
 {variant:17}{tags:jewellery_defense}(15-20)% increased Global Defences
 {variant:1}Anger has no Reservation
 {variant:2}Determination has no Reservation
@@ -274,12 +274,12 @@ Requires Level 20
 Implicits: 1
 {tags:jewellery_attribute}+(10-16) to all Attributes
 {tags:jewellery_attribute}+(20-40) to all Attributes
-{tags:life}{variant:1}25% reduced maximum Life
-{tags:jewellery_defense}{variant:1}25% reduced maximum Energy Shield
+{variant:1}{tags:life}25% reduced maximum Life
+{variant:1}{tags:jewellery_defense}25% reduced maximum Energy Shield
 {tags:jewellery_resistance}+(10-20)% to all Elemental Resistances
 {tags:attack,life}(1.2-2)% of Physical Attack Damage Leeched as Life
-{tags:life}{variant:2}(30-40)% increased Damage while Leeching
-{tags:life}{variant:2}50% increased Life Leeched per second
+{variant:2}{tags:life}(30-40)% increased Damage while Leeching
+{variant:2}{tags:life}50% increased Life Leeched per second
 Extra Gore
 ]],[[
 Crystallised Omniscience
@@ -488,7 +488,7 @@ Implicits: 1
 {tags:caster,life}Lose (10-15) Life per Enemy Hit with Spells
 {tags:attack,life}Lose (20-25) Life per Enemy Hit with Attacks
 Skills Chain +1 times
-{tags:speed}{variant:2}(30-40)% increased Projectile Speed
+{variant:2}{tags:speed}(30-40)% increased Projectile Speed
 {variant:1}{tags:chaos_damage}Projectiles gain (15-20)% of Non-Chaos Damage as extra Chaos Damage per Chain
 {variant:2}{tags:chaos_damage}Projectiles that have Chained gain (20-35)% of Non-Chaos Damage as extra Chaos Damage
 ]],[[
@@ -677,8 +677,8 @@ Requires Level 24
 Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Dexterity
 {tags:jewellery_attribute}+(20-30) to Strength
-{tags:attack,speed}{variant:1}(15-20)% increased Attack Speed
-{tags:attack,speed}{variant:2}(5-10)% increased Attack Speed
+{variant:1}{tags:attack,speed}(15-20)% increased Attack Speed
+{variant:2}{tags:attack,speed}(5-10)% increased Attack Speed
 {tags:attack}+100 to Accuracy Rating
 {variant:2}30% increased Projectile Damage
 {tags:speed}30% increased Projectile Speed
@@ -737,15 +737,15 @@ Requires Level 40
 Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Intelligence
 {tags:attack}+(80-120) to Accuracy Rating
-{tags:critical}{variant:1,2,3}+(140-160)% to Global Critical Strike Multiplier
-{tags:critical}{variant:4,5}+(210-240)% to Global Critical Strike Multiplier
+{variant:1,2,3}{tags:critical}+(140-160)% to Global Critical Strike Multiplier
+{variant:4,5}{tags:critical}+(210-240)% to Global Critical Strike Multiplier
 {tags:jewellery_defense}+(80-100) to Evasion Rating
 (10-15)% increased Light Radius
 {variant:1,2}Non-critical strikes deal 25% Damage
 {variant:3,4}Non-critical strikes deal 40% Damage
-{tags:critical}{variant:1}60% less Critical Strike Chance
-{tags:critical}{variant:2}50% less Critical Strike Chance
-{tags:critical}{variant:3,4,5}40% less Critical Strike Chance
+{variant:1}{tags:critical}60% less Critical Strike Chance
+{variant:2}{tags:critical}50% less Critical Strike Chance
+{variant:3,4,5}{tags:critical}40% less Critical Strike Chance
 {variant:1,2,3,4}Your Critical Strikes have Culling Strike
 {variant:5}Critical Strikes have Culling Strike
 ]],[[
@@ -908,7 +908,7 @@ Variant: Current
 Implicits: 1
 {tags:mana}(20-30)% increased Mana Regeneration Rate
 {tags:jewellery_resistance}+25% to Cold Resistance
-{tags:mana,attack}{variant:1,2}0.2% of Physical Attack Damage Leeched as Mana
+{variant:1,2}{tags:mana,attack}0.2% of Physical Attack Damage Leeched as Mana
 {tags:life}Minions have (10-15)% increased maximum Life
 {variant:1,2,3}{tags:speed}Minions have (10-15)% increased Movement Speed
 {variant:4}Minions convert 50% of Physical Damage to Cold Damage
@@ -1017,8 +1017,8 @@ Variant: Current
 Requires Level 23
 Implicits: 1
 {tags:jewellery_attribute}+(16-24) to Dexterity and Intelligence
-{tags:critical}{variant:1}100% increased Global Critical Strike Chance
-{tags:critical}{variant:2}(250-350)% increased Global Critical Strike Chance
+{variant:1}{tags:critical}100% increased Global Critical Strike Chance
+{variant:2}{tags:critical}(250-350)% increased Global Critical Strike Chance
 {tags:life}+(30-50) to maximum Life
 {tags:mana}+(30-50) to maximum Mana
 40% increased Stun and Block Recovery
diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index 86f04a4671..5e649f3ff1 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -942,9 +942,9 @@ Requires Level 60
 Implicits: 1
 {tags:critical}(20-30)% increased Global Critical Strike Chance
 {tags:attack}+333 to Accuracy Rating
-{tags:critical}{variant:1}+(10-20)% to Global Critical Strike Multiplier
-{tags:critical}{variant:2}+(10-15)% to Global Critical Strike Multiplier
-{tags:critical}{variant:3}+(15-25)% to Global Critical Strike Multiplier
+{variant:1}{tags:critical}+(10-20)% to Global Critical Strike Multiplier
+{variant:2}{tags:critical}+(10-15)% to Global Critical Strike Multiplier
+{variant:3}{tags:critical}+(15-25)% to Global Critical Strike Multiplier
 {tags:mana}+(40-60) to maximum Mana
 {tags:attack,mana}0.4% of Physical Attack Damage Leeched as Mana
 Gain a Power Charge on non-Critical Strike

From 679a20a541e4e132a972789c6e3e1975415d0354 Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Wed, 15 Feb 2023 09:46:13 +1100
Subject: [PATCH 12/13] Rotblood

---
 src/Data/Uniques/ring.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index 5e649f3ff1..d72be7a896 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -961,8 +961,8 @@ Implicits: 1
 Has 1 Socket
 Socketed Gems are Supported by Level 20 Blasphemy
 Curse Auras from Socketed Skills also affect you
-{variant:1}{tags:caster}Socketed Curse Gems have 100% increased Mana Reservation Efficiency
-{variant:2}{tags:caster}Socketed Curse Gems have 80% increased Reservation Efficiency
+{variant:1}Socketed Curse Gems have 50% increased Reservation Efficiency
+{variant:2}Socketed Curse Gems have 80% increased Reservation Efficiency
 {tags:jewellery_attribute}+(20-30) to Intelligence
 {tags:caster}20% reduced Effect of Curses on you
 (15-25)% increased Damage with Hits and Ailments against Cursed Enemies

From 29317053c152227fcff8f17bac41c4a3d6240e8c Mon Sep 17 00:00:00 2001
From: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date: Wed, 15 Feb 2023 12:51:48 +1100
Subject: [PATCH 13/13] Update ring.lua

---
 src/Data/Uniques/ring.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index d72be7a896..66c25915ae 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -917,7 +917,7 @@ Has 1 Socket
 {variant:1}Socketed Gems are Supported by Level 12 Lesser Multiple Projectiles
 {variant:2}Socketed Golem Skills have 25% chance to Taunt on Hit
 {variant:1}Socketed Gems are Supported by Level 17 Increased Minion Damage
-{variant:2}{tags:life}Socketed Golem Skills have Minions Regenerate 5% Life per second
+{variant:2}Socketed Golem Skills have Minions Regenerate 5% Life per second
 ]],[[
 Rigwald's Crest
 Two-Stone Ring