Skip to content

Fixed a variety of incorrect catalyst scaling #4467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LocalIdentity merged 16 commits into from
Feb 18, 2023
Merged

Fixed a variety of incorrect catalyst scaling #4467

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e94ddf0
Fixed a variety of incorrect catalyst scaling
QuickStick123 Jun 18, 2022
4b212e5
Update amulet.lua
QuickStick123 Jun 18, 2022
5d84757
Update Noxious to damage
QuickStick123 Jun 23, 2022
f662ba8
Couple minor fixes to legacy voidheart and forgeting to readd chaos t…
QuickStick123 Jun 23, 2022
2cb26c8
fix missing updating physical damage on unique belts.
QuickStick123 Jun 23, 2022
d2da52e
Merge branch 'dev' into Assorted-Catalyst-Changes
QuickStick123 Dec 9, 2022
4a1ecb1
Merge branch 'dev' into Assorted-Catalyst-Changes
QuickStick123 Dec 9, 2022
1b2ce62
fix typo
QuickStick123 Dec 9, 2022
7eacc38
Merge branch 'dev' into Assorted-Catalyst-Changes
QuickStick123 Jan 14, 2023
b5866bd
Just make the resistances a bit cleaner
QuickStick123 Jan 14, 2023
f47aee6
Cleanup and fix leech
QuickStick123 Jan 14, 2023
b7af53a
Fix typo
QuickStick123 Jan 14, 2023
9b2097b
Fixup missing speed tags
QuickStick123 Jan 15, 2023
d408349
Variants Before Tags
QuickStick123 Jan 15, 2023
679a20a
Rotblood
QuickStick123 Feb 14, 2023
2931705
Update ring.lua
QuickStick123 Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Classes/Item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
4 changes: 2 additions & 2 deletions src/Classes/ItemsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
76 changes: 38 additions & 38 deletions src/Data/Uniques/amulet.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ 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
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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -225,7 +225,7 @@ 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:chaos,jewellery_resistance}+(17-29)% to Chaos Resistance
Corrupted
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -522,12 +522,12 @@ 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}Precision has 100% increased Mana Reservation Efficiency
{variant:2}{tags:mana}Precision has 100% increased Mana Reservation Efficiency
]],[[
Replica Hyrri's Truth
Jade Amulet
Expand All @@ -539,12 +539,12 @@ 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
{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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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_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
Expand All @@ -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
Expand Down Expand Up @@ -927,7 +927,7 @@ Implicits: 1
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
]],[[
Expand Down Expand Up @@ -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
]],
Expand Down
Loading