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 all 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 @@ -538,8 +538,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
Loading