Skip to content

Commit 1b0084c

Browse files
Fixed a variety of incorrect catalyst scaling (#4467)
* 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. #2521 (comment) 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. * Update amulet.lua fix accidently removing jewellery res from Tavukai * Update Noxious to damage * Couple minor fixes to legacy voidheart and forgeting to readd chaos to Lori lantern * fix missing updating physical damage on unique belts. * fix typo * Just make the resistances a bit cleaner ^(\{variant:.+?\})?(\{tags:.+?\})?([^{}]+?)% to (.+?) Resistance $1{tags:jewellery_resistance}$3% to $4 Resistance * Cleanup and fix leech * Fix typo * Fixup missing speed tags * Variants Before Tags \{tags:(.+)\}\{variant:(.+)\} {variant:$2}{tags:$1} * Rotblood * Update ring.lua
1 parent ebc5269 commit 1b0084c

File tree

5 files changed

+214
-214
lines changed

5 files changed

+214
-214
lines changed

src/Classes/Item.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ local catalystTags = {
1818
{ "life", "mana", "resource" },
1919
{ "caster" },
2020
{ "jewellery_attribute", "attribute" },
21-
{ "physical", "chaos" },
21+
{ "physical_damage", "chaos_damage" },
2222
{ "jewellery_resistance", "resistance" },
2323
{ "jewellery_defense", "defences" },
2424
{ "jewellery_elemental" ,"elemental_damage" },

src/Classes/ItemsTab.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@ holding Shift will put it in the second.]])
538538
self.controls.displayItemSectionCatalyst = new("Control", {"TOPLEFT",self.controls.displayItemSectionInfluence,"BOTTOMLEFT"}, 0, 0, 0, function()
539539
return (self.controls.displayItemCatalyst:IsShown() or self.controls.displayItemCatalystQualitySlider:IsShown()) and 28 or 0
540540
end)
541-
self.controls.displayItemCatalyst = new("DropDownControl", {"TOPLEFT",self.controls.displayItemSectionCatalyst,"TOPRIGHT"}, 0, 0, 180, 20,
542-
{"Catalyst","Abrasive (Attack)","Accelerating (Speed)","Fertile (Life & Mana)","Imbued (Caster)","Intrinsic (Attribute)","Noxious (Physical & Chaos)",
541+
self.controls.displayItemCatalyst = new("DropDownControl", {"TOPLEFT",self.controls.displayItemSectionCatalyst,"TOPRIGHT"}, 0, 0, 250, 20,
542+
{"Catalyst","Abrasive (Attack)","Accelerating (Speed)","Fertile (Life & Mana)","Imbued (Caster)","Intrinsic (Attribute)","Noxious (Physical & Chaos Damage)",
543543
"Prismatic (Resistance)","Tempering (Defense)","Turbulent (Elemental)","Unstable (Critical)"},
544544
function(index, value)
545545
self.displayItem.catalyst = index - 1

0 commit comments

Comments
 (0)