Skip to content

Commit bfb8acc

Browse files
committed
nil checks, update to check for newItem base implicits, wording on toggle tooltip
1 parent c11e602 commit bfb8acc

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/Classes/ItemsTab.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,7 +1602,8 @@ local function copyAnointsAndEldritchImplicits(newItem)
16021602
return
16031603
end
16041604
end
1605-
if main.migrateEldritchImplicits and isValueInTable(implicitBaseTypes, newItem.base.type) and isValueInTable(implicitRarities, newItem.rarity) and (currentItem.cleansing or currentItem.tangle) then
1605+
if main.migrateEldritchImplicits and isValueInTable(implicitBaseTypes, newItem.base.type) and isValueInTable(implicitRarities, newItem.rarity)
1606+
and #newItem.implicitModLines == 0 and (currentItem.cleansing or currentItem.tangle) then
16061607
local currentImplicits = currentItem.implicitModLines
16071608
if currentImplicits then
16081609
newItem.implicitModLines = currentImplicits
@@ -1618,7 +1619,7 @@ end
16181619
function ItemsTabClass:CreateDisplayItemFromRaw(itemRaw, normalise)
16191620
local newItem = new("Item", itemRaw)
16201621
if newItem.base then
1621-
copyAnointsAndEldritchImplicits(self, newItem)
1622+
copyAnointsAndEldritchImplicits(newItem)
16221623
if normalise then
16231624
newItem:NormaliseQuality()
16241625
newItem:BuildModList()

src/Modules/Main.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ function main:OpenOptionsPopup()
10741074
controls.migrateEldritchImplicits = new("CheckBoxControl", { "TOPLEFT", nil, "TOPLEFT" }, { defaultLabelPlacementX, currentY, 20 }, "^7Copy Eldritch Implicits onto Display Item:", function(state)
10751075
self.migrateEldritchImplicits = state
10761076
end)
1077-
controls.migrateEldritchImplicits.tooltipText = "Carry over Eldritch Implicits from current gear when comparing new gear, given the new item does not already have Eldritch Implicits"
1077+
controls.migrateEldritchImplicits.tooltipText = "Apply Eldritch Implicits from current gear when comparing new gear, given the new item doesn't have any influence"
10781078
controls.migrateEldritchImplicits.state = self.migrateEldritchImplicits
10791079

10801080
nextRow()

0 commit comments

Comments
 (0)