Final fixes and updates for jewels, jewellery, and consumables

Author: Wires77

src/Data/Uniques/amulet.lua

@@ -1352,32 +1352,30 @@ Implicits: 1
 {variant:2}{tags:defences}+(50-100) to maximum Energy Shield
 {tags:resource}(40-60)% reduced maximum Mana
 {tags:resource,defences}Skills Cost Energy Shield instead of Mana or Life
-]],
-[[
+]],[[
 Bonemeld
 Marble Amulet
 Source: Drops from unique{Incarnation of Dread} in normal{Moment of Reverence}
 Requires Level 74
 Implicits: 1
-{tags:life}Regenerate (1.2-1.6)% of Life per second
-{tags:jewellery_attribute}+(10-20) to all Attributes
+{tags:resource}Regenerate (1.2-1.6)% of Life per second
+{tags:attribute}+(10-20) to all Attributes
 +(1-2) to Level of all Minion Skill Gems
-{tags:jewellery_resistance}-2% to all Resistances per Minion from your Non-Vaal Skills
-{tags:jewellery_defense}(3-4)% increased Defences per Minion from your Non-Vaal Skills
-{tags:jewellery_resistance}Minions gain added Resistances equal to 50% of your Resistances
-]],
-[[
+{tags:resistance}-2% to all Resistances per Minion from your Non-Vaal Skills
+{tags:defences}(3-4)% increased Defences per Minion from your Non-Vaal Skills
+{tags:resistance}Minions gain added Resistances equal to 50% of your Resistances
+]],[[
 Haunting Memories
 Turquoise Amulet
 Source: Drops from unique{Uber Incarnation of Neglect} in normal{Moment of Loneliness}
 Requires Level 64
 Implicits: 1
-{tags:jewellery_attribute}+(16-24) to Dexterity and Intelligence
+{tags:attribute}+(16-24) to Dexterity and Intelligence
 +(6-10)% chance to Suppress Spell Damage
 (50-100)% of Suppressed Spell Damage taken bypasses Energy Shield
 (50-100)% of Suppressed Spell Damage taken Recouped as Energy Shield
-{tags:jewellery_attribute}+(20-30) to Dexterity and Intelligence
-{tags:jewellery_defense}+(40-60) to maximum Energy Shield
-{tags:life}+(40-60) to maximum Life
+{tags:attribute}+(20-30) to Dexterity and Intelligence
+{tags:defences}+(40-60) to maximum Energy Shield
+{tags:resource}+(40-60) to maximum Life
 ]],
 }

src/Data/Uniques/belt.lua

@@ -334,12 +334,16 @@ Debuffs on you expire (15-20)% faster
 ]],[[
 The Torrent's Reclamation
 Cloth Belt
+Variant: Pre 3.16.0
+Variant: Current
 LevelReq: 60
 Implicits: 1
 (15-25)% increased Stun and Block Recovery
 Grants Summon Greater Harbinger of Time Skill
-{tags:resource,defences}(15-20)% increased Energy Shield Recovery rate
-{tags:resource,defences}(15-20)% increased Life Recovery rate
+{variant:1}{tags:resource,defences}(15-20)% increased Energy Shield Recovery rate
+{variant:1}{tags:resource,defences}(15-20)% increased Life Recovery rate
+{variant:2}{tags:resource,defences}(10-15)% increased Energy Shield Recovery rate
+{variant:2}{tags:resource,defences}(10-15)% increased Life Recovery rate
 {tags:attack,caster,speed}(10-15)% increased Attack and Cast Speed
 (15-20)% increased Cooldown Recovery Rate
 Debuffs on you expire (15-20)% faster
@@ -828,12 +832,8 @@ Variant: Dexterity/Strength
 Variant: Strength/Intelligence
 Variant: Elemental Resistances
 Implicits: 24
-{variant:20}{tags:attribute}(12-18)% increased Strength
-{variant:21}{tags:attribute}(12-18)% increased Strength
 {variant:19}{tags:attribute}(12-18)% increased Dexterity
 {variant:20}{tags:attribute}(12-18)% increased Dexterity
-{variant:19}{tags:attribute}(12-18)% increased Intelligence
-{variant:21}{tags:attribute}(12-18)% increased Intelligence
 {variant:7}{tags:defences}(24-30)% increased maximum Energy Shield
 {variant:8}{tags:resource}(18-24)% increased maximum Life
 {variant:11}(9-15)% increased Quantity of Items found
@@ -852,6 +852,10 @@ Implicits: 24
 {variant:16}Discipline has (45-60)% increased Aura Effect
 {variant:17}Grace has (45-60)% increased Aura Effect
 {variant:18}Malevolence has (45-60)% increased Aura Effect
+{variant:19}(12-18)% increased Intelligence
+{variant:20}(12-18)% increased Strength
+{variant:21}(12-18)% increased Strength
+{variant:21}(12-18)% increased Intelligence
 {variant:22}{tags:resistance}+(42-48)% to all Elemental Resistances
 Implicit Modifier magnitudes are tripled
 Corrupted

src/Data/Uniques/flask.lua

@@ -66,15 +66,14 @@ League: Perandus
 50% increased Charges per use
 {variant:1}Grants Last Breath when you Use a Skill during Effect, for 800% of Mana Cost
 {variant:2}Grants Last Breath when you Use a Skill during Effect, for (450-600)% of Mana Cost
-]],
-[[
+]],[[
 Wellwater Phylactery
 Colossal Mana Flask
 Source: Drops from unique{Uber Incarnation of Dread} in normal{Moment of Reverence}
 Requires Level 64
 (200-300)% increased Charges per use
 (150-200)% increased Amount Recovered
-(60-40)% less Duration
+(40-60)% less Duration
 Removes (10-15)% of Life when Used
 Starts Energy Shield Recharge when Used
 Energy Shield Recharge is not delayed by Damage during Effect
@@ -345,8 +344,8 @@ League: Legion
 Implicits: 1
 Creates Consecrated Ground on Use
 {variant:2}Life Recovery from Flasks also applies to Energy Shield during Effect
-(25-50)% increased Duration
 {variant:2}Zealot's Oath during Effect
+(25-50)% increased Duration
 {variant:1}Zealot's Oath during Effect
 ]],[[
 Replica Sorrow of the Divine
@@ -356,8 +355,8 @@ Source: Steal from a unique{Curio Display} during a Grand Heist
 Implicits: 1
 Creates Consecrated Ground on Use
 Life Recovery from Flasks also applies to Energy Shield during Effect
-(25-50)% increased Duration
 Eldritch Battery during Effect
+(25-50)% increased Duration
 ]],[[
 Soul Catcher
 Quartz Flask

src/Data/Uniques/jewel.lua

@@ -76,8 +76,6 @@ Bloodnotch
 Crimson Jewel
 Variant: Pre 3.28.0
 Variant: Current
-Variant: Pre 3.28.0
-Variant: Current
 Limited to: 1
 {variant:1}(40-60)% of Damage taken from Stunning Hits is Recovered as Life
 {variant:2}(20-30)% of Damage taken from Stunning Hits is Recovered as Life
@@ -336,7 +334,8 @@ Adds Secrets of Suffering
 Intuitive Leap
 Viridian Jewel
 Radius: Small
-Passives in Radius can be Allocated without being connected to your tree
+Passive Skills in Radius can be Allocated without being connected to your tree
+Passage
 ]],[[
 Izaro's Turmoil
 Crimson Jewel
@@ -778,8 +777,9 @@ Radius: Variable
 Implicits: 0
 {variant:1}Only affects Passives in Small Ring
 {variant:5}Only affects Passives in Massive Ring
-Passives in Radius can be Allocated without being connected to your tree
 -(20-10)% to all Elemental Resistances
+Passive Skills in Radius can be Allocated without being connected to your tree
+Passage
 {variant:2}Only affects Passives in Medium Ring
 {variant:3}Only affects Passives in Large Ring
 {variant:4}Only affects Passives in Very Large Ring
@@ -1316,7 +1316,7 @@ Source: Use currency{Vaal Orb} on normal{Crimson Jewel}
 Variant: Pre 3.14.0
 Variant: Current
 Limited to: 1
-{variant:1,2}(15-20)% increased Vaal Skill Effect Duration
+{variant:1,2}Vaal Skills have (15-20)% increased Skill Effect Duration
 {variant:2}Vaal Skills have (15-20)% chance to regain consumed Souls when used
 Corrupted
 ]],[[

src/Export/Uniques/amulet.lua

@@ -201,7 +201,7 @@ LevelReq: 52
 Implicits: 1
 HybridStrInt
 IncreasedManaUniqueAmulet1
-MutatedUniqueAmulet8ChaosResistance
+ChaosResistUnique__27
 IncreasedMaximumResistsUnique__2
 ElementalDamageReductionChaosResistUnique__1
 {variant:2}MaximumEnduranceFrenzyPowerChargesIs0Unique__1
@@ -1241,7 +1241,7 @@ ItemFoundRarityIncreaseImplicitAmulet1
 DexterityImplicitAmulet1
 IncreasedLifeUnique__102
 ColdResistUnique__5
-MutatedUniqueAmulet40CannotBeChilled
+CannotBeChilledUnique__1
 {variant:1}LifeRegenerationWhileFrozenUnique__1[1200,1200]
 {variant:2}LifeRegenerationWhileFrozenUnique__1
 ]],[[
@@ -1345,4 +1345,30 @@ AttacksGainMinMaxAddedChaosDamageBasedOnManaUnique__1
 {variant:2}AddedEnergyShieldFlatUnique_1
 PercentReducedMaximumManaUnique_1
 SkillsCostEnergyShieldInsteadOfManaLifeUnique__1
-]],}
+]],[[
+Bonemeld
+Marble Amulet
+Source: Drops from unique{Incarnation of Dread} in normal{Moment of Reverence}
+Requires Level 74
+Implicits: 1
+LifeRegenerationImplicitAmulet2
+AllAttributesUniqueAmulet22
+GlobalIncreaseMinionSpellSkillGemLevelUnique__5
+AllResistancesReducedPerActiveNonVaalSkillMinionUnique_1
+GlobalDefensesIncreasedPerActiveNonVaalSkillMinionUnique_1
+MinionsGainPercentOfYourResistancesUnique_1
+]],[[
+Haunting Memories
+Turquoise Amulet
+Source: Drops from unique{Uber Incarnation of Neglect} in normal{Moment of Loneliness}
+Requires Level 64
+Implicits: 1
+HybridDexInt
+ChanceToDodgeSpellsUnique__1
+SuppressedDamageBypassEnergyShieldUnique_1
+SuppressedDamageRecoupedAsEnergyShield_1
+DexterityAndIntelligenceUnique_2
+IncreasedEnergyShieldUnique__13
+IncreasedLifeUnique__71
+]],
+}

src/Export/Uniques/belt.lua

@@ -317,8 +317,7 @@ Cloth Belt
 Variant: Pre 3.16.0
 Variant: Current
 League: Harbinger
-Source: Created from item parts obtained from Boss in The Beachhead
-Upgrade: Upgrades to unique{The Torrent's Reclamation} via currency{Time-light Scroll}
+Source: No longer obtainable
 LevelReq: 60
 Implicits: 1
 StunRecoveryImplicitBelt1

src/Export/Uniques/flask.lua

@@ -63,6 +63,17 @@ League: Perandus
 FlaskChargesUsedUnique__3
 {variant:1}FlaskLifeGainOnSkillUseUnique__1[800,800]
 {variant:2}FlaskLifeGainOnSkillUseUnique__1
+]],[[
+Wellwater Phylactery
+Colossal Mana Flask
+Source: Drops from unique{Uber Incarnation of Dread} in normal{Moment of Reverence}
+Requires Level 64
+LocalFlaskChargesUsedUniqueFlask36
+FlaskIncreasedRecoveryAmountUnique__2
+FlaskLessDurationUnique2
+LocalFlaskRemovePercentOfLifeOnUseUnique_7
+LocalFlaskStartEnergyShieldRechargeUnique_1
+LocalFlaskEnergyShieldRechargeNotDelayedByDamageDuringEffectUnique_1
 ]],
 -- Flask: Hybrid
 [[

src/Export/Uniques/jewel.lua

@@ -1729,7 +1729,6 @@ Brutal Restraint
 Timeless Jewel
 League: Legion
 Source: Drops from Maraketh Legion
-Requires Level: 20
 Limited to: 1 Historic
 Variant: Asenath (Dance with Death)
 Variant: Deshret (Wind Dancer) (Pre 3.11.0)
@@ -1747,7 +1746,6 @@ Elegant Hubris
 Timeless Jewel
 League: Legion
 Source: Drops from Eternal Legion
-Requires Level: 20
 Limited to: 1 Historic
 Variant: Cadiro (Supreme Decadence)
 Variant: Chitus (Supreme Ego) (Pre 3.11.0)
@@ -1766,7 +1764,6 @@ Glorious Vanity
 Timeless Jewel
 League: Legion
 Source: Drops from Vaal Legion
-Requires Level: 20
 Limited to: 1 Historic
 Variant: Doryani (Corrupted Soul)
 Variant: Xibaqua (Divine Flesh)
@@ -1781,11 +1778,26 @@ Implicits: 0
 Passives in radius are Conquered by the Vaal
 Historic
 ]],[[
+Heroic Tragedy
+Timeless Jewel
+League: Legion
+Source: Drops from Legion in Mirage
+Limited to: 1 Historic
+Variant: Vorana (Black Scythe Training)
+Variant: Uhtred (Celestial Mathematics)
+Variant: Medved (The Unbreaking Circle)
+Radius: Large
+Implicits: 0
+{variant:1}Remembrancing (100-8000) songworthy deeds by the line of Vorana
+{variant:2}Remembrancing (100-8000) songworthy deeds by the line of Uhtred
+{variant:3}Remembrancing (100-8000) songworthy deeds by the line of Medved
+Passives in radius are Conquered by the Kalguur
+Historic
+]],[[
 Lethal Pride
 Timeless Jewel
 League: Legion
 Source: Drops from Karui Legion
-Requires Level: 20
 Limited to: 1 Historic
 Variant: Kaom (Strength of Blood)
 Variant: Kiloava (Glancing Blows) (Pre 3.11.0)
@@ -1804,7 +1816,6 @@ Militant Faith
 Timeless Jewel
 League: Legion
 Source: Drops from Templar Legion
-Requires Level: 20
 Limited to: 1 Historic
 Has Alt Variant: true
 Has Alt Variant Two: true

src/Export/Uniques/shield.lua

@@ -95,7 +95,7 @@ Variant: Pre 3.16.0
 Variant: Current
 Implicits: 1
 {variant:3,4}IncreasedLifeImplicitShield2
-{variant:1,2,3}LocalIncreasedArmourPercentAndStunRecoveryUniqueShieldStr1[200,250]
+{variant:1,2,3}LocalIncreasedArmourPercentAndStunRecoveryUniqueShieldStr1[200,250][20,20]
 {variant:4}LocalIncreasedArmourPercentAndStunRecoveryUniqueShieldStr1
 {variant:1}IncreasedLifeUniqueShieldStr1[80,100]
 {variant:2,3,4}IncreasedLifeUniqueShieldStr1