Merge branch 'dev' into sustainablePractices

Author: LocalIdentity

spec/System/TestAttacks_spec.lua

@@ -72,9 +72,9 @@ describe("TestAttacks", function()
 		runCallback("OnFrame")
 		-- Add 2 skills with 1 red, 1 blue, 1 green support each
 		-- Test against Quarterstaff Strike (skill slot 1)
-		build.skillsTab:PasteSocketGroup("Quarterstaff Strike 1/0  1\nSplinter 1/0  1\nConduction 1/0  1\nBiting Frost 1/0  1")
+		build.skillsTab:PasteSocketGroup("Quarterstaff Strike 1/0  1\nArmour Break I 1/0  1\nShock 1/0  1\nBiting Frost 1/0  1")
 		runCallback("OnFrame")
-		build.skillsTab:PasteSocketGroup("Falling Thunder 1/0  1\nIgnition 1/0  1\nDiscombobulate 1/0  1\nCoursing Current 1/0  1")
+		build.skillsTab:PasteSocketGroup("Falling Thunder 1/0  1\nIgnite I 1/0  1\nDaze 1/0  1\nShock Conduction 1/0  1")
 		runCallback("OnFrame")
 
 		build.configTab:BuildModList()

spec/System/TestItemParse_spec.lua

@@ -146,8 +146,10 @@ describe("TestItemParse", function()
 		assert.truthy(item.mirrored)
 		item = new("Item", raw("Corrupted"))
 		assert.truthy(item.corrupted)
-		item = new("Item", raw("Fractured Item"))
+		item = new("Item", raw("Leech 6.61% of Physical Attack Damage as Mana (fractured)"))
 		assert.truthy(item.fractured)
+		item = new("Item", raw("Adds 36 to 48 Fire Damage (desecrated)"))
+		assert.truthy(item.desecrated)
 		item = new("Item", raw("Crafted: true"))
 		assert.truthy(item.crafted)
 		item = new("Item", raw("Unreleased: true"))

src/Assets/fractureditemsymbol.png

@@ -542,6 +542,9 @@ function GemSelectClass:AddGemTooltip(gemInstance)
 	if gemInstance.gemData.tagString ~= "" then
 		self.tooltip:AddLine(16, "^x7F7F7F" .. gemInstance.gemData.tagString)
 	end
+	if gemInstance.gemData.gemFamily then
+		self.tooltip:AddLine(16, "^x7F7F7FCategory: ^7" .. gemInstance.gemData.gemFamily)
+	end
 	-- Will need rework if a gem can have 2+ additional supports
 	self:AddGrantedEffectInfo(gemInstance, grantedEffect, true)
 	for _, statSet in ipairs(grantedEffect.statSets) do
@@ -566,7 +569,7 @@ end
 function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
 	local displayInstance = gemInstance.displayEffect or gemInstance
 	local grantedEffectLevel = grantedEffect.levels[displayInstance.level] or { }
-	if gemInstance.gemData.Tier then
+	if gemInstance.gemData.Tier and not grantedEffect.isLineage then
 			self.tooltip:AddLine(16, string.format("^x7F7F7FTier: ^7%d", gemInstance.gemData.Tier))
 		end
 	if addReq and not grantedEffect.support then

src/Assets/veileditemsymbol.png

@@ -381,9 +381,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 			self.mirrored = true
 		elseif line == "Corrupted" then
 			self.corrupted = true
-		elseif line == "Fractured Item" then
-			self.fractured = true
-		elseif line == "Desecrated Item" then
+		elseif line == "Desecrated Prefix" or line == "Desecrated Suffix" then
 			self.desecrated = true
 		elseif line == "Requirements:" then
 			-- nothing to do
@@ -620,6 +618,12 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 				if modLine.enchant then
 					modLine.implicit = true
 				end
+				if modLine.desecrated then
+					self.desecrated = true
+				end
+				if modLine.fractured then
+					self.fractured = true
+				end
 				local baseName
 				if not self.base and (self.rarity == "NORMAL" or self.rarity == "MAGIC") then
 					-- Exact match (affix-less magic and normal items)

src/Classes/GemSelectControl.lua

@@ -2585,6 +2585,27 @@ function ItemsTabClass:AddItemSetTooltip(tooltip, itemSet)
 	end
 end
 
+function ItemsTabClass:SetTooltipHeaderInfluence(tooltip, item)
+	tooltip.influenceHeader1 = nil
+	tooltip.influenceHeader2 = nil
+	-- Fractured items don't have the icon now, they did on trade before 0.3. Maybe they will return.
+	--if item.fractured then
+	--	tooltip.influenceHeader1 = "Fractured"
+	--end
+	if item.desecrated then
+		if not tooltip.influenceHeader1 then
+			tooltip.influenceHeader1 = "Desecrated"
+		else
+			tooltip.influenceHeader2 = "Desecrated"
+		end
+	end
+
+	-- If only one influence, we copy to second header. Preparing for dual influence mods like in first game.
+	if tooltip.influenceHeader1 and not tooltip.influenceHeader2 then
+		tooltip.influenceHeader2 = tooltip.influenceHeader1
+	end
+end
+
 function ItemsTabClass:FormatItemSource(text)
 	return text:gsub("unique{([^}]+)}",colorCodes.UNIQUE.."%1"..colorCodes.SOURCE)
 			   :gsub("normal{([^}]+)}",colorCodes.NORMAL.."%1"..colorCodes.SOURCE)
@@ -2599,6 +2620,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 	tooltip.tooltipHeader = item.rarity
 	tooltip.center = true
 	tooltip.color = rarityCode
+	self:SetTooltipHeaderInfluence(tooltip, item)
 	if item.title then
 		tooltip:AddLine(20, rarityCode..item.title)
 		tooltip:AddLine(20, rarityCode..item.baseName:gsub(" %(.+%)",""))

src/Classes/Item.lua

@@ -407,6 +407,9 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
 			else
 				base = target:GetStat(tag.stat, cfg)
 			end
+			if tag.divVar then
+				tag.div = self:GetMultiplier(tag.divVar, cfg)
+			end
 			local mult = m_floor(base / (tag.div or 1) + 0.0001)
 			local limitTotal
 			if tag.limit or tag.limitVar then

src/Classes/ItemsTab.lua

@@ -972,8 +972,12 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 		-- ignore cluster jewel nodes that don't have an id in the tree
 		if self.tree.nodes[id] then
 			local nodeToReplace = self.tree.nodes[id]
-			if self.tree.nodes[id].isSwitchable and self.tree.nodes[id].options[self.curClassName] then
-				nodeToReplace = self.tree.nodes[id].options[self.curClassName]
+			if self.tree.nodes[id].isSwitchable then
+				if self.tree.nodes[id].options[self.curClassName] then
+					nodeToReplace = self.tree.nodes[id].options[self.curClassName]
+				elseif self.tree.nodes[id].options[self.curAscendClassName] then
+					nodeToReplace = self.tree.nodes[id].options[self.curAscendClassName]
+				end
 				self.switchableNodes[nodeToReplace.id] = node
 			end
 			self:ReplaceNode(node, nodeToReplace)
@@ -1415,6 +1419,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 end
 
 function PassiveSpecClass:ReplaceNode(old, newNode)
+	old.overlay = newNode.overlay
+	old.icon = newNode.icon
 	-- Edited nodes can share a name
 	if old.sd == newNode.sd then
 		return 1
@@ -1426,8 +1432,6 @@ function PassiveSpecClass:ReplaceNode(old, newNode)
 	old.modList = new("ModList")
 	old.modList:AddList(newNode.modList)
 	old.keystoneMod = newNode.keystoneMod
-	old.icon = newNode.icon
-	old.spriteId = newNode.spriteId
 	old.activeEffectImage = newNode.activeEffectImage
 	old.reminderText = newNode.reminderText or { }
 end

src/Classes/ModStore.lua

@@ -230,6 +230,12 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 			node.type = "AscendClassStart"
 			local ascendClass = self.ascendNameMap[node.ascendancyName].ascendClass
 			ascendClass.startNodeId = node.id
+			if node.isSwitchable then
+				for ascName, _ in pairs(node.options) do
+					local option = self.ascendNameMap[ascName].ascendClass
+					option.startNodeId = node.id
+				end
+			end
 		elseif node.isOnlyImage then
 			node.type = "OnlyImage"
 		elseif node.isJewelSocket then
@@ -550,6 +556,16 @@ function PassiveTreeClass:ProcessNode(node)
 			switchNode.dn = switchNode.name
 			switchNode.sd = switchNode.stats
 
+			if switchNode.jewelOverlay then
+				ConPrintf("SwitchNode with jewelOverlay found: "..switchNode.name)
+				switchNode.overlay = switchNode.jewelOverlay
+				if switchNode.overlay then
+					local size = node.targetSize["overlay"] and node.targetSize["overlay"].width or node.targetSize.width
+					switchNode.rsq = size * size
+					switchNode.size = size
+				end
+			end
+
 			self:ProcessStats(switchNode)
 		end
 	end