nil checks, update to check for newItem base implicits, wording on toggle tooltip

Author: Peechey

src/Classes/ItemsTab.lua

@@ -1539,34 +1539,37 @@ function ItemsTabClass:DeleteItem(item, deferUndoState)
 end
 
 local function copyAnointsAndEldritchImplicits(self, newItem)
-	local currentItem = self.items[self.activeItemSet[newItem.base.type].selItemId]
-	-- if you don't have an equipped item that matches the type of the newItem, no need to do anything
-	if currentItem then
-		-- if the new item is an amulet and does not have an anoint and your current amulet does, apply that anoint to the new item
-		if newItem.base.type == "Amulet" and #newItem.enchantModLines == 0 then
-			local currentAnoint = currentItem.enchantModLines
-			if currentAnoint and #currentAnoint == 1 then -- skip if amulet has more than one anoint e.g. Stranglegasp
-				newItem.enchantModLines = currentAnoint
-			end
-		end
-		-- if the new item is a Normal, Magic, or Rare Helmet, Body Armour, Gloves, or Boots and does not have any influence
-		-- and your current respective item has Eater and/or Exarch, apply those implicits and influence to the new item
-		local implicitBaseTypes = { "Helmet", "Body Armour", "Gloves", "Boots" }
-		local implicitRarities = { "NORMAL", "MAGIC", "RARE" }
-		for _, influence in ipairs(itemLib.influenceInfo.default) do
-			if newItem[influence.key] then
-				return
-			end
-		end
-		if main.migrateEldritchImplicits and isValueInTable(implicitBaseTypes, newItem.base.type) and isValueInTable(implicitRarities, newItem.rarity) and (currentItem.cleansing or currentItem.tangle) then
-			local currentImplicits = currentItem.implicitModLines
-			if currentImplicits then
-				newItem.implicitModLines = currentImplicits
-				newItem.tangle = currentItem.tangle
-				newItem.cleansing = currentItem.cleansing
-			end
-		end
-		newItem:BuildAndParseRaw()
+	if newItem.base and self.activeItemSet[newItem.base.type] then
+		local currentItem = self.activeItemSet[newItem.base.type].selItemId and self.items[self.activeItemSet[newItem.base.type].selItemId]
+		-- if you don't have an equipped item that matches the type of the newItem, no need to do anything
+		if currentItem then
+			-- if the new item is an amulet and does not have an anoint and your current amulet does, apply that anoint to the new item
+			if newItem.base.type == "Amulet" and #newItem.enchantModLines == 0 then
+				local currentAnoint = currentItem.enchantModLines
+				if currentAnoint and #currentAnoint == 1 then -- skip if amulet has more than one anoint e.g. Stranglegasp
+					newItem.enchantModLines = currentAnoint
+				end
+			end
+			-- if the new item is a Normal, Magic, or Rare Helmet, Body Armour, Gloves, or Boots and does not have any influence
+			-- and your current respective item has Eater and/or Exarch, apply those implicits and influence to the new item
+			local implicitBaseTypes = { "Helmet", "Body Armour", "Gloves", "Boots" }
+			local implicitRarities = { "NORMAL", "MAGIC", "RARE" }
+			for _, influence in ipairs(itemLib.influenceInfo.default) do
+				if newItem[influence.key] then
+					return
+				end
+			end
+			if main.migrateEldritchImplicits and isValueInTable(implicitBaseTypes, newItem.base.type) and isValueInTable(implicitRarities, newItem.rarity)
+				and #newItem.implicitModLines == 0 and (currentItem.cleansing or currentItem.tangle) then
+				local currentImplicits = currentItem.implicitModLines
+				if currentImplicits then
+					newItem.implicitModLines = currentImplicits
+					newItem.tangle = currentItem.tangle
+					newItem.cleansing = currentItem.cleansing
+				end
+			end
+			newItem:BuildAndParseRaw()
+		end
 	end
 end
 

src/Modules/Main.lua

@@ -1040,7 +1040,7 @@ function main:OpenOptionsPopup()
 	controls.migrateEldritchImplicits = new("CheckBoxControl", { "TOPLEFT", nil, "TOPLEFT" }, { defaultLabelPlacementX, currentY, 20 }, "^7Copy Eldritch Implicits onto Display Item:", function(state)
 		self.migrateEldritchImplicits = state
 	end)
-	controls.migrateEldritchImplicits.tooltipText = "Carry over Eldritch Implicits from current gear when comparing new gear, given the new item does not already have Eldritch Implicits"
+	controls.migrateEldritchImplicits.tooltipText = "Apply Eldritch Implicits from current gear when comparing new gear, given the new item doesn't have any influence"
 	controls.migrateEldritchImplicits.state = self.migrateEldritchImplicits
 
 	nextRow()