Skip to content

Commit fe2ea13

Browse files
committed
fix toggle saving and accounting for new item has any influence at all
1 parent e0afa65 commit fe2ea13

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

src/Classes/ItemsTab.lua

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,12 +1594,16 @@ local function copyAnointsAndEldritchImplicits(newItem)
15941594
end
15951595
end
15961596

1597+
-- if the new item is a Normal, Magic, or Rare Helmet, Body Armour, Gloves, or Boots and does not have any eldritch implicits nor any other influence
1598+
-- and your current respective item does, apply those implicits and influence to the new item
15971599
local implicitBaseTypes = { "Helmet", "Body Armour", "Gloves", "Boots" }
15981600
local implicitRarities = { "NORMAL", "MAGIC", "RARE" }
1599-
-- if the new item is a Normal, Magic, or Rare Helmet, Body Armour, Gloves, or Boots and does not have any eldritch implicits
1600-
-- and your current respective item does, apply those implicits and influence to the new item
1601-
if main.migrateEldritchImplicits and isValueInTable(implicitBaseTypes, newItem.base.type) and isValueInTable(implicitRarities, newItem.rarity) and
1602-
not (newItem.tangle and newItem.cleansing) and (currentItem.cleansing or currentItem.tangle) then
1601+
for _, influence in ipairs(itemLib.influenceInfo.default) do
1602+
if newItem[influence.key] then
1603+
return
1604+
end
1605+
end
1606+
if main.migrateEldritchImplicits and isValueInTable(implicitBaseTypes, newItem.base.type) and isValueInTable(implicitRarities, newItem.rarity) and (currentItem.cleansing or currentItem.tangle) then
16031607
local currentImplicits = currentItem.implicitModLines
16041608
if currentImplicits then
16051609
newItem.implicitModLines = currentImplicits

src/Modules/Main.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ function main:Init()
107107
self.dpiScaleOverridePercent = GetDPIScaleOverridePercent and GetDPIScaleOverridePercent() or 0
108108
self.showWarnings = true
109109
self.slotOnlyTooltips = true
110+
self.migrateEldritchImplicits = true
110111
self.notSupportedModTooltips = true
111112
self.notSupportedTooltipText = " ^8(Not supported in PoB yet)"
112113
self.POESESSID = ""
@@ -632,6 +633,9 @@ function main:LoadSettings(ignoreBuild)
632633
if node.attrib.slotOnlyTooltips then
633634
self.slotOnlyTooltips = node.attrib.slotOnlyTooltips == "true"
634635
end
636+
if node.attrib.migrateEldritchImplicits then
637+
self.migrateEldritchImplicits = node.attrib.migrateEldritchImplicits == "true"
638+
end
635639
if node.attrib.notSupportedModTooltips then
636640
self.notSupportedModTooltips = node.attrib.notSupportedModTooltips == "true"
637641
end
@@ -782,6 +786,7 @@ function main:SaveSettings()
782786
lastExportedWebsite = self.lastExportedWebsite,
783787
showWarnings = tostring(self.showWarnings),
784788
slotOnlyTooltips = tostring(self.slotOnlyTooltips),
789+
migrateEldritchImplicits = tostring(self.migrateEldritchImplicits),
785790
notSupportedModTooltips = tostring(self.notSupportedModTooltips),
786791
POESESSID = self.POESESSID,
787792
invertSliderScrollDirection = tostring(self.invertSliderScrollDirection),
@@ -1118,6 +1123,7 @@ function main:OpenOptionsPopup()
11181123
local initialDefaultItemAffixQuality = self.defaultItemAffixQuality or 0.5
11191124
local initialShowWarnings = self.showWarnings
11201125
local initialSlotOnlyTooltips = self.slotOnlyTooltips
1126+
local initialMigrateEldritchImplicits = self.migrateEldritchImplicits
11211127
local initialNotSupportedModTooltips = self.notSupportedModTooltips
11221128
local initialInvertSliderScrollDirection = self.invertSliderScrollDirection
11231129
local initialDisableDevAutoSave = self.disableDevAutoSave
@@ -1174,6 +1180,7 @@ function main:OpenOptionsPopup()
11741180
self.defaultItemAffixQuality = initialDefaultItemAffixQuality
11751181
self.showWarnings = initialShowWarnings
11761182
self.slotOnlyTooltips = initialSlotOnlyTooltips
1183+
self.migrateEldritchImplicits = initialMigrateEldritchImplicits
11771184
self.notSupportedModTooltips = initialNotSupportedModTooltips
11781185
self.invertSliderScrollDirection = initialInvertSliderScrollDirection
11791186
self.disableDevAutoSave = initialDisableDevAutoSave

0 commit comments

Comments
 (0)