Merge branch 'dev'

Author: LocalIdentity

CHANGELOG.md

@@ -1,3 +1,50 @@
+VERSION[0.3.0][20/01/2025]
+
+--- New to Path of Building ---
+* Add Emotion filtering to Anoint popup (Quxxy)
+	You can select Emootion's you have and PoB will tell you the anoints available to you
+* Add support for Sceptre 'Allies in your presence' mods (LocalIdentity)
+* Add the ability to custom change max node depth for heat map (DoubtinGiyov)
+* Add support for Buff Expiry Rate (igorwessel)
+* Add support for Critical Weakness debuff (Edvinas-Smita)
+* Add support for merging mods on nodes in radius of Time-Lost jewels (Peechey)
+* Add support for increased Effect of Small Passive Skills in Radius for Time-Lost Jewels (Peechey)
+* Add support for Armour Buff on Scavenged Plating (LocalIdentity)
+* Add support for Controlled Destruction (TPlant)
+* Add support for Charge consumed recently tree nodes (trompetin17)
+* Add support for Monk's Reality Rending node (Nostrademous)
+* Add support for Monk's Into the Breach and Lucid Dreaming Ascendancies (Nostrademous)
+* Add support for Unnatural Resilience notable (Peechey)
+* Add support for Harness the Elements notable and Electrocute to config tab (lrzp)
+* Add support for a bunch of tree mods (ltogniolli)
+* Add support for Grinning Immolation and Pain Attunement (etojuice)
+* Add support for 'You have no Elemental Resistances' modifier (etojuice)
+* Add support for Mask of The Stitched Demon (etojuice)
+* Add support for Kaom's Heart by (etojuice, ltogniolli)
+
+--- Fixed Crashes ---
+* Fix crash when hovering over breakdown for Minion skills (TPlant)
+
+--- Fixed Calculations ---
+* Fix +Levels to Gems on Quivers not working sometimes (hugocornago)
+* Fix Minion Spell skills doing 0 damage (LocalIdentity)
+* Fix Archmage Mana cost (TPlant)
+* Fix Scattershot Attack/Cast speed value (deathbeam)
+* Fix Penetration calculations (TPlant)
+* Fix Chain Support applying to all damage instead of just hits (TPlant)
+* Fix Herald interaction with Coming Calamity (xspirus)
+* Fix Maligaro's Virtuosity Critical Damage Bonus calculation (etojuice)
+
+--- Fixed Behaviours ---
+* Fix Concoction skills not being treated as Unarmed (Peechey)
+* Fix Passive Nodes not showing updated value when Hulking Form is allocated (trompetin17)
+* Fix Ingenuity Belt not working with reflected rings from Kalandra's Touch (etojuice)
+* Fix passive nodes being permanently attached to a Weapon Set (Peechey)
+* Fix projectile scaling for Bonestorm and Gas Arrow (Peechey)
+
+--- Accuracy Improvements ---
+* Fix value of Onslaught Movement Speed buff (OrderedSet86)
+
 VERSION[0.2.0][19/01/2025]
 
 --- New to Path of Building ---

changelog.txt

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <PoBVersion>
-	<Version number="0.2.0" />
+	<Version number="0.3.0" />
 	<Source part="default" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/{branch}/" />
 	<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/{branch}/runtime/" />
 	<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/{branch}/src/" />

manifest.xml

@@ -11,6 +11,7 @@ local CheckBoxClass = newClass("CheckBoxControl", "Control", "TooltipHost", func
 	self.labelWidth = DrawStringWidth(self.width - 4, "VAR", label or "") + 5
 	self.changeFunc = changeFunc
 	self.state = initialState
+	self.checkImage = nil
 end)
 
 function CheckBoxClass:IsMouseOver()
@@ -42,6 +43,8 @@ function CheckBoxClass:Draw(viewPort, noTooltip)
 	elseif self.borderFunc then
 		local r, g, b = self.borderFunc()
 		SetDrawColor(r, g, b)
+	elseif self.checkImage and self.state then
+		SetDrawColor(0.75, 0.75, 0.75)
 	else
 		SetDrawColor(0.5, 0.5, 0.5)
 	end
@@ -56,15 +59,30 @@ function CheckBoxClass:Draw(viewPort, noTooltip)
 		SetDrawColor(0, 0, 0)
 	end
 	DrawImage(nil, x + 1, y + 1, size - 2, size - 2)
-	if self.state then
-		if not enabled then
-			SetDrawColor(0.33, 0.33, 0.33)
-		elseif mOver then
-			SetDrawColor(1, 1, 1)
+	if self.checkImage then
+		if self.state then
+			if not enabled then
+				SetDrawColor(0.33, 0.33, 0.33)
+			elseif mOver then
+				SetDrawColor(2, 2, 2)
+			else
+				SetDrawColor(1, 1, 1)
+			end
 		else
-			SetDrawColor(0.75, 0.75, 0.75)
+			SetDrawColor(0.5, 0.5, 0.5)
+		end
+		DrawImage(self.checkImage.handle, x + 1, y + 1, size - 2, size - 2, self.checkImage[1])
+	else
+		if self.state then
+			if not enabled then
+				SetDrawColor(0.33, 0.33, 0.33)
+			elseif mOver then
+				SetDrawColor(1, 1, 1)
+			else
+				SetDrawColor(0.75, 0.75, 0.75)
+			end
+			main:DrawCheckMark(x + size/2, y + size/2, size * 0.8)
 		end
-		main:DrawCheckMark(x + size/2, y + size/2, size * 0.8)
 	end
 	if enabled then
 		SetDrawColor(1, 1, 1)
@@ -106,3 +124,8 @@ function CheckBoxClass:OnKeyUp(key)
 	end
 	self.clicked = false
 end
+
+---@param image table @The image to display instead of a check.  Expects a `handle` field with an image handle, and the sprite position at index `1`.  All other fields are ignored.  Set to `nil` to draw a normal check.
+function CheckBoxClass:SetCheckImage(image)
+	self.checkImage = image
+end

src/Classes/CheckBoxControl.lua

@@ -2110,7 +2110,7 @@ function ItemsTabClass:AnointDisplayItem(enchantSlot)
 	self.anointEnchantSlot = enchantSlot or 1
 
 	local controls = { } 
-	controls.notableDB = new("NotableDBControl", {"TOPLEFT",nil,"TOPLEFT"}, {10, 60, 360, 360}, self, self.build.spec.tree.nodes, "ANOINT")
+	controls.notableDB = new("NotableDBControl", {"TOPLEFT",nil,"TOPLEFT"}, {10, 20, 360, 400}, self, self.build.spec.tree.nodes, "ANOINT")
 
 	local function saveLabel()
 		local node = controls.notableDB.selValue

src/Classes/ItemsTab.lua

@@ -52,7 +52,11 @@ function ModStoreClass:ScaleAddMod(mod, scale)
 			if scaledMod.value.mod then
 				subMod = scaledMod.value.mod
 			elseif scaledMod.value.keyOfScaledMod then
-				scaledMod.value[scaledMod.value.keyOfScaledMod] = round(scaledMod.value[scaledMod.value.keyOfScaledMod] * scale, 2)
+				if scaledMod.value.key == "level" then -- +Levels can't get scaled with decimals
+					scaledMod.value[scaledMod.value.keyOfScaledMod] = m_floor(scaledMod.value[scaledMod.value.keyOfScaledMod] * scale)
+				else
+					scaledMod.value[scaledMod.value.keyOfScaledMod] = round(scaledMod.value[scaledMod.value.keyOfScaledMod] * scale, 2)
+				end
 			end
 		end
 		if type(subMod.value) == "number" then

src/Classes/ModStore.lua

@@ -12,6 +12,8 @@ local m_floor = math.floor
 local m_huge = math.huge
 local s_format = string.format
 
+local emotionList = {"Ire", "Guilt", "Greed", "Paranoia", "Envy", "Disgust", "Despair", "Fear", "Suffering", "Isolation" }
+
 ---@param node table
 ---@return boolean
 local function IsAnointableNode(node)
@@ -20,7 +22,9 @@ end
 
 ---@class NotableDBControl : ListControl
 local NotableDBClass = newClass("NotableDBControl", "ListControl", function(self, anchor, rect, itemsTab, db, dbType)
-	self.ListControl(anchor, rect, 16, "VERTICAL", false)
+	local headerHeight = 68
+	local innerRect = {rect[1], rect[2]+headerHeight, rect[3], rect[4]-headerHeight}
+	self.ListControl(anchor, innerRect, 16, "VERTICAL", false)
 	self.itemsTab = itemsTab
 	self.db = db
 	self.dbType = dbType
@@ -32,15 +36,52 @@ local NotableDBClass = newClass("NotableDBControl", "ListControl", function(self
 	self.sortDropList = { }
 	self.sortOrder = { }
 	self.sortMode = "NAME"
-	self.controls.sort = new("DropDownControl", {"BOTTOMLEFT",self,"TOPLEFT"}, {0, -22, 360, 18}, self.sortDropList, function(index, value)
+	self.controls.sort = new("DropDownControl", {"TOPLEFT",self,"TOPLEFT"}, {0, -headerHeight, 360, 18}, self.sortDropList, function(index, value)
 		self:SetSortMode(value.sortMode)
 	end)
-	self.controls.search = new("EditControl", {"BOTTOMLEFT",self,"TOPLEFT"}, {0, -2, 258, 18}, "", "Search", "%c", 100, function()
+	self.controls.search = new("EditControl", {"TOPLEFT",self.controls.sort,"BOTTOMLEFT"}, {0, 2, 258, 18}, "", "Search", "%c", 100, function()
 		self.listBuildFlag = true
 	end, nil, nil, true)
 	self.controls.searchMode = new("DropDownControl", {"LEFT",self.controls.search,"RIGHT"}, {2, 0, 100, 18}, { "Anywhere", "Names", "Modifiers" }, function(index, value)
 		self.listBuildFlag = true
 	end)
+
+	-- Create and set up emotion filters.
+	local function getEmotionImages()
+		local tree = main:LoadTree(latestTreeVersion)
+		local images = {}
+		for _, emotionName in ipairs(emotionList) do
+			images[emotionName] = tree:GetAssetByName(emotionName)
+		end
+
+		return images
+	end
+	self.emotionImages = getEmotionImages()
+
+	self.controls.emotionLabel = new("LabelControl", {"TOPLEFT", self.controls.search, "BOTTOMLEFT"}, {0, 6, 100, 16}, "Emotions: ")
+	self.emotionsAvailable = { }
+	local function emoCheckOnChange(name)
+		self.emotionsAvailable[name] = true
+		return function(state)
+			self.emotionsAvailable[name] = state
+			self.listBuildFlag = true
+		end
+	end
+	local function emoCheck(name, relTo)
+		local anchor = {"LEFT", relTo, "RIGHT"}
+		local rect = {2, 0, 26, 26}
+		local ctl = new("CheckBoxControl", anchor, rect, "", emoCheckOnChange(name), "Distilled "..name, true)
+		if self.emotionImages then ctl:SetCheckImage(self.emotionImages[name]) end
+		return ctl
+	end
+
+	local emotionCheckBoxes = {}
+	for i,emo in ipairs(emotionList) do
+		local emoCtl = emoCheck(emo, emotionCheckBoxes[i-1] or self.controls.emotionLabel)
+		emotionCheckBoxes[i] = emoCtl
+		self.controls["emotionCheckbox"..emo] = emoCtl
+	end
+
 	self:BuildSortOrder()
 	self.listBuildFlag = true
 end)
@@ -52,6 +93,13 @@ function NotableDBClass:DoesNotableMatchFilters(node)
 		return false
 	end
 
+	-- Exclude notables the player doesn't have the emotions for.
+	for _,emo in ipairs(node.recipe) do
+		if not self.emotionsAvailable[emo] then
+			return false
+		end
+	end
+
 	local searchStr = self.controls.search.buf:lower():gsub("[%-%.%+%[%]%$%^%%%?%*]", "%%%0")
 	if searchStr:match("%S") then
 		local found = false

src/Classes/NotableDBControl.lua

@@ -53,6 +53,8 @@ function PassiveSpecClass:Init(treeVersion, convert)
 		end
 	end
 	for id, node in pairs(self.nodes) do
+		-- init all nodes as normal allocationMode
+		node.allocMode = 0
 		-- if the node is allocated and between the old and new tree has the same ID but does not share the same name, add to list of nodes to be ignored
 		if convert and previousTreeNodes[id] and self.build.spec.allocNodes[id] and node.name ~= previousTreeNodes[id].name then
 			self.ignoredNodes[id] = previousTreeNodes[id]
@@ -304,6 +306,7 @@ function PassiveSpecClass:ImportFromNodeList(classId, ascendClassId, secondaryAs
 		local node = self.nodes[id]
 		if node then
 			node.alloc = true
+			node.allocMode = weaponSets[id] or 0
 			self.allocNodes[id] = node
 		end
 	end
@@ -728,7 +731,7 @@ end
 
 function PassiveSpecClass:DeallocSingleNode(node)
 	node.alloc = false
-	node.allocMode = nil
+	node.allocMode = 0
 	self.allocNodes[node.id] = nil
 	if node.type == "Mastery" then
 		self:AddMasteryEffectOptionsToNode(node)
@@ -771,9 +774,9 @@ function PassiveSpecClass:CountAllocNodes()
 			end
 		end
 
-		if node.allocMode and node.allocMode == 1 then
+		if node.allocMode == 1 then
 			weaponSet1Used = weaponSet1Used + 1
-		elseif node.allocMode and node.allocMode == 2 then
+		elseif node.allocMode == 2 then
 			weaponSet2Used = weaponSet2Used + 1
 		end
 	end

src/Classes/PassiveSpec.lua

@@ -742,10 +742,7 @@ function PassiveTreeClass:CalcOrbitAngles(nodesInOrbit)
 end
 
 function PassiveTreeClass:GetAssetByName(name, type)
-	if self.ddsMap[name] then
-		return self.ddsMap[name]
-	end
-	return self.assets[name]
+	return self.ddsMap[name] or self.assets[name]
 end
 
 function PassiveTreeClass:GetNodeTargetSize(node)

src/Classes/PassiveTree.lua

@@ -558,6 +558,12 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 		end
 	end
 
+	-- calculate inc from SmallPassiveSkillEffect
+	local incSmallPassiveSkillEffect = 0
+	for _, node in pairs(spec.allocNodes) do
+		incSmallPassiveSkillEffect = incSmallPassiveSkillEffect + node.modList:Sum("INC", nil ,"SmallPassiveSkillEffect")
+	end
+
 	-- Draw the nodes
 	for nodeId, node in pairs(spec.nodes) do
 		-- Determine the base and overlay images for this node based on type and state
@@ -820,7 +826,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 			SetDrawLayer(nil, 100)
 			local size = m_floor(node.size * scale)
 			if self.tooltip:CheckForUpdate(node, self.showStatDifferences, self.tracePath, launch.devModeAlt, build.outputRevision) then
-				self:AddNodeTooltip(self.tooltip, node, build)
+				self:AddNodeTooltip(self.tooltip, node, build, incSmallPassiveSkillEffect)
 			end
 			self.tooltip:Draw(m_floor(scrX - size), m_floor(scrY - size), size * 2, size * 2, viewPort)
 		end
@@ -1083,7 +1089,7 @@ function PassiveTreeViewClass:AddNodeName(tooltip, node, build)
 	end
 end
 
-function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
+function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassiveSkillEffect)
 	-- Special case for sockets
 	if node.type == "Socket" and node.alloc then
 		local socket, jewel = build.itemsTab:GetSocketAndJewelForNodeID(node.id)
@@ -1120,7 +1126,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
 		tooltip:AddLine(16, string.format("Angle: %f", node.angle))
 		tooltip:AddLine(16, string.format("Orbit: %d, Orbit Index: %d", node.orbit, node.orbitIndex))
 		tooltip:AddLine(16, string.format("Group: %d", node.g))
-		tooltip:AddLine(16, string.format("AllocMode: %d", node.allocMode or 0))
+		tooltip:AddLine(16, string.format("AllocMode: %d", node.allocMode))
 		tooltip:AddSeparator(14)
 
 		-- add connection info for debugging
@@ -1146,6 +1152,25 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
 					line = line .. "  " .. modStr
 				end
 			end
+
+			-- Apply Inc Node scaling from Hulking Form only visually
+			if incSmallPassiveSkillEffect > 0 and node.type == "Normal" and not node.isAttribute and not node.ascendancyName and node.mods[i].list then
+				local scale = 1 + incSmallPassiveSkillEffect / 100
+				local scaledList = new("ModList")
+				scaledList:ScaleAddList(node.mods[i].list, scale)
+				local number =  line:match("%d*%.?%d+")
+				for j, mod in ipairs(scaledList) do
+					local newValue = 0
+					if type(mod.value) == "number" then
+						newValue = mod.value
+					elseif type(mod.value) == "table" then
+						newValue = mod.value.mod.value
+					end
+					line = line:gsub("%d*%.?%d+",math.abs(newValue))
+				end
+				-- line = line .. "  ^8(Effect increased by "..incSmallPassiveSkillEffect.."%)"
+			end
+
 			tooltip:AddLine(16, ((node.mods[i].extra or not node.mods[i].list) and colorCodes.UNSUPPORTED or colorCodes.MAGIC)..line)
 		end
 	end