Update how Influences are handled (#8257)

Author: Regisle

src/Classes/Item.lua

@@ -48,7 +48,7 @@ local function getCatalystScalar(catalystId, tags, quality)
 	return 1
 end
 
-local influenceInfo = itemLib.influenceInfo
+local influenceInfo = itemLib.influenceInfo.all
 
 local ItemClass = newClass("Item", function(self, raw, rarity, highQuality)
 	if raw then
@@ -757,6 +757,13 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 					self.canHaveTwoEnchants = true
 					self.canHaveThreeEnchants = true
 					self.canHaveFourEnchants = true
+				elseif lineLower == "has elder, shaper and all conqueror influences" then
+					self.HasElderShaperAndAllConquerorInfluences = true
+					for _, curInfluenceInfo in ipairs(itemLib.influenceInfo.default) do
+						self[curInfluenceInfo.key] = true
+					end
+				elseif lineLower:match("if the eater of worlds is dominant") then
+					self.canHaveEldritchInfluence = true
 				elseif lineLower == "has a crucible passive skill tree with only support passive skills" then
 					self.canHaveOnlySupportSkillsCrucibleTree = true
 				elseif lineLower == "has a crucible passive skill tree" then

src/Classes/ItemsTab.lua

@@ -32,7 +32,7 @@ local socketDropList = {
 
 local baseSlots = { "Weapon 1", "Weapon 2", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring 1", "Ring 2", "Belt", "Flask 1", "Flask 2", "Flask 3", "Flask 4", "Flask 5" }
 
-local influenceInfo = itemLib.influenceInfo
+local influenceInfo = itemLib.influenceInfo.all
 
 local catalystQualityFormat = {
 	"^x7F7F7FQuality (Attack Modifiers): "..colorCodes.MAGIC.."+%d%% (augmented)",
@@ -505,9 +505,15 @@ holding Shift will put it in the second.]])
 	end
 	local function setDisplayItemInfluence(influenceIndexList)
 		self.displayItem:ResetInfluence()
-		for _, index in ipairs(influenceIndexList) do
-			if index > 0 then
-				self.displayItem[influenceInfo[index].key] = true;
+		if self.displayItem.HasElderShaperAndAllConquerorInfluences then
+			for i, curInfluenceInfo in ipairs(itemLib.influenceInfo.default) do
+				self.displayItem[influenceInfo[i].key] = true
+			end
+		else
+			for _, index in ipairs(influenceIndexList) do
+				if index > 0 then
+					self.displayItem[influenceInfo[index].key] = true
+				end
 			end
 		end
 
@@ -1567,6 +1573,12 @@ function ItemsTabClass:SetDisplayItem(item)
 		-- Set both influence dropdowns
 		local influence1 = 1
 		local influence2 = 1
+		local influenceDisplayList = { "Influence" }
+		for i, curInfluenceInfo in ipairs((item.canHaveEldritchInfluence or item.type == "Helmet" or item.type == "Body Armour" or item.type == "Gloves" or item.type == "Boots") and itemLib.influenceInfo.all or itemLib.influenceInfo.default) do
+			influenceDisplayList[i + 1] = curInfluenceInfo.display
+		end
+		self.controls.displayItemInfluence.list = influenceDisplayList
+		self.controls.displayItemInfluence2.list = influenceDisplayList
 		for i, curInfluenceInfo in ipairs(influenceInfo) do
 			if item[curInfluenceInfo.key] then
 				if influence1 == 1 then

src/Data/ModCache.lua

@@ -8913,7 +8913,7 @@ c["Has 3 Sockets"]={{[1]={flags=0,keywordFlags=0,name="SocketCount",type="BASE",
 c["Has 4 Abyssal Sockets"]={{[1]={flags=0,keywordFlags=0,name="AbyssalSocketCount",type="BASE",value=4}},nil}
 c["Has 6 Abyssal Sockets"]={{[1]={flags=0,keywordFlags=0,name="AbyssalSocketCount",type="BASE",value=6}},nil}
 c["Has 6 Sockets"]={{[1]={flags=0,keywordFlags=0,name="SocketCount",type="BASE",value=6}},nil}
-c["Has Elder, Shaper and all Conqueror Influences"]={nil,"Has Elder, Shaper and all Conqueror Influences "}
+c["Has Elder, Shaper and all Conqueror Influences"]={{},nil}
 c["Has a Crucible Passive Skill Tree"]={{},nil}
 c["Has a Crucible Passive Skill Tree with only Support Passive Skills"]={{},nil}
 c["Has a Two Handed Sword Crucible Passive Skill Tree"]={{},nil}

src/Modules/ItemTools.lua

@@ -13,14 +13,24 @@ itemLib = { }
 
 -- Info table for all types of item influence
 itemLib.influenceInfo = {
-	{ key="shaper", display="Shaper", color=colorCodes.SHAPER },
-	{ key="elder", display="Elder", color=colorCodes.ELDER },
-	{ key="adjudicator", display="Warlord", color=colorCodes.ADJUDICATOR },
-	{ key="basilisk", display="Hunter", color=colorCodes.BASILISK },
-	{ key="crusader", display="Crusader", color=colorCodes.CRUSADER },
-	{ key="eyrie", display="Redeemer", color=colorCodes.EYRIE },
-	{ key="cleansing", display="Searing Exarch", color=colorCodes.CLEANSING },
-	{ key="tangle", display="Eater of Worlds", color=colorCodes.TANGLE },
+	["all"] = {
+		{ key="shaper", display="Shaper", color=colorCodes.SHAPER },
+		{ key="elder", display="Elder", color=colorCodes.ELDER },
+		{ key="adjudicator", display="Warlord", color=colorCodes.ADJUDICATOR },
+		{ key="basilisk", display="Hunter", color=colorCodes.BASILISK },
+		{ key="crusader", display="Crusader", color=colorCodes.CRUSADER },
+		{ key="eyrie", display="Redeemer", color=colorCodes.EYRIE },
+		{ key="cleansing", display="Searing Exarch", color=colorCodes.CLEANSING },
+		{ key="tangle", display="Eater of Worlds", color=colorCodes.TANGLE },
+	},
+	["default"] = {
+		{ key="shaper", display="Shaper", color=colorCodes.SHAPER },
+		{ key="elder", display="Elder", color=colorCodes.ELDER },
+		{ key="adjudicator", display="Warlord", color=colorCodes.ADJUDICATOR },
+		{ key="basilisk", display="Hunter", color=colorCodes.BASILISK },
+		{ key="crusader", display="Crusader", color=colorCodes.CRUSADER },
+		{ key="eyrie", display="Redeemer", color=colorCodes.EYRIE },
+	}
 }
 
 -- Apply a value scalar to the first n of any numbers present

src/Modules/ModParser.lua

@@ -5132,6 +5132,7 @@ local specialModList = {
 	["this item can be anointed by cassia"] = { },
 	["implicit modifiers cannot be changed"] = { },
 	["has a crucible passive skill tree"] = { },
+	["has elder, shaper and all conqueror influences"] = { },
 	["has a two handed sword crucible passive skill tree"] = { },
 	["has a crucible passive skill tree with only support passive skills"] = { },
 	["crucible passive skill tree is removed if this modifier is removed"] = { },