Merge branch 'dev' into runic-ward

Author: Blitz54

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [v0.21.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v0.21.1) (2026/06/20)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/compare/v0.21.0...v0.21.1)
+
+
+## What's Changed
+### Fixed Crashes
+- Fix crash when trying to use PoB trader after 0.5.3 [\#2238](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2238) ([vaisest](https://github.com/vaisest))
+### Fixed Calculations
+- Fix more Maximum Rage mod not working [\#2228](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2228) ([Blitz54](https://github.com/Blitz54))
+- Fix general Grenade mods not working [\#2196](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2196) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Blazing Critical not applying as a global buff [\#2221](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2221) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Sine Aequo Immobilisation buildup calculation [\#2222](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2222) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Daze not applying 50% more Stun Buildup [\#2223](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2223) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Overwhelming Presence quality mod multiplying Aura magnitude [\#2224](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2224) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix "+% to Critical Damage Bonus"  mods on weapons applying to Spells [\#2247](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2247) ([luther-rotmg](https://github.com/luther-rotmg))
+### Fixed Behaviours
+- Fix Ice Bite and Innervate only supporting Attacks [\#2207](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2207) ([vaisest](https://github.com/vaisest))
+- Fix power report and trade search not working with Minions [\#2219](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2219) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Bloodhounds Mark not counting the enemy as Marked [\#2220](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2220) ([LocalIdentity](https://github.com/LocalIdentity))
+
+
 ## [v0.21.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v0.21.0) (2026/06/13)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/compare/v0.20.0...v0.21.0)

changelog.txt

@@ -1,3 +1,22 @@
+VERSION[0.21.1][2026/06/20]
+
+--- Fixed Crashes ---
+* Fix crash when trying to use PoB trader after 0.5.3 (vaisest)
+
+--- Fixed Calculations ---
+* Fix more Maximum Rage mod not working (Blitz54)
+* Fix general Grenade mods not working (LocalIdentity)
+* Fix Blazing Critical not applying as a global buff (LocalIdentity)
+* Fix Sine Aequo Immobilisation buildup calculation (LocalIdentity)
+* Fix Daze not applying 50% more Stun Buildup (LocalIdentity)
+* Fix Overwhelming Presence quality mod multiplying Aura magnitude (LocalIdentity)
+* Fix "+% to Critical Damage Bonus"  mods on weapons applying to Spells (luther-rotmg)
+
+--- Fixed Behaviours ---
+* Fix Ice Bite and Innervate only supporting Attacks (vaisest)
+* Fix power report and trade search not working with Minions (LocalIdentity)
+* Fix Bloodhounds Mark not counting the enemy as Marked (LocalIdentity)
+
 VERSION[0.21.0][2026/06/13]
 
 --- New to Path of Building ---

manifest.xml

@@ -30,6 +30,35 @@ describe("TestAttacks", function()
 		assert.are.equals(2 + 0.25, build.calcsTab.mainOutput.CritMultiplier)
 	end)
 
+	it("local Critical Damage Bonus on a weapon does not apply to spells (issue #2199)", function()
+		-- baseline: a spell's crit multi with a plain quarterstaff (no local crit damage)
+		build.itemsTab:CreateDisplayItemFromRaw([[
+			New Item
+			Razor Quarterstaff
+		]])
+		build.itemsTab:AddDisplayItem()
+		build.skillsTab:PasteSocketGroup("Fireball 20/0  1")
+		build.mainSocketGroup = 1
+		runCallback("OnFrame")
+		local baseSpellCritMulti = build.calcsTab.mainOutput.CritMultiplier
+
+		newBuild()
+
+		-- same spell + quarterstaff, now with a local "+X% to Critical Damage Bonus" affix
+		build.itemsTab:CreateDisplayItemFromRaw([[
+			New Item
+			Razor Quarterstaff
+			+50% to Critical Damage Bonus
+		]])
+		build.itemsTab:AddDisplayItem()
+		build.skillsTab:PasteSocketGroup("Fireball 20/0  1")
+		build.mainSocketGroup = 1
+		runCallback("OnFrame")
+
+		-- the weapon-local crit damage must NOT reach the spell (it isn't using the weapon)
+		assert.are.equals(baseSpellCritMulti, build.calcsTab.mainOutput.CritMultiplier)
+	end)
+
 	it("correctly converts spell damage per stat to attack damage", function()
 		assert.are.equals(0, build.calcsTab.mainEnv.player.modDB:Sum("INC", { flags = ModFlag.Attack }, "Damage"))
 		build.itemsTab:CreateDisplayItemFromRaw([[
@@ -389,4 +418,166 @@ describe("TestAttacks", function()
 		assert.is_true(math.abs(bifurcateChance - build.calcsTab.mainOutput.MainHand.CritBifurcates) < 0.000001)
 		assert.are.equals(1 + critBonusMultiplier, build.calcsTab.mainOutput.MainHand.AverageHit)
 	end)
+
+	-- Dual Wield tests
+	local setupDualWieldTestConditions = function()
+		local slowHighDmgMace = [[  
+			Slow High Crit High Damage Mace
+			Marauding Mace
+			Quality: 0
+			200% increased physical damage
+			100% increased critical hit chance
+			-25% increased attack speed
+		]]
+
+		local fastLowDmgMace = [[  
+			Fast Low Crit Low Damage Mace
+			Marauding Mace
+			Quality: 0
+			-50% increased physical damage
+			-100% increased critical hit chance
+			50% increased attack speed
+		]]
+		
+		build.itemsTab:CreateDisplayItemFromRaw(slowHighDmgMace)
+		build.itemsTab:AddDisplayItem()
+		runCallback("OnFrame")
+		build.itemsTab.slots["Weapon 1"]:SetSelItemId(build.itemsTab.items[1].id)
+
+		build.itemsTab:CreateDisplayItemFromRaw(fastLowDmgMace)
+		build.itemsTab:AddDisplayItem()
+		runCallback("OnFrame")
+		build.itemsTab.slots["Weapon 2"]:SetSelItemId(build.itemsTab.items[2].id)
+
+		build.configTab.input.customMods = [[
+			nearby enemies have 100% less armour
+			your hits can't be evaded
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+	end
+
+	local function harmonicMean(a, b)
+		return 2 / (1/a + 1/b)
+	end
+	
+	it("correctly calculates dual wield DPS for double hits", function()
+		setupDualWieldTestConditions()
+		build.skillsTab:PasteSocketGroup("skillId:MeleeMaceMacePlayer Mace Strike 20/0  1")
+		runCallback("OnFrame")
+		build.calcsTab:BuildOutput()
+		runCallback("OnFrame")
+
+		-- Attack Speed
+		local mainHandSpeed = build.calcsTab.mainOutput.MainHand.Speed
+		local offHandSpeed = build.calcsTab.mainOutput.OffHand.Speed
+		local combinedSpeed = harmonicMean(mainHandSpeed, offHandSpeed)
+		assert.are.equals(round(combinedSpeed, 4), round(build.calcsTab.mainOutput.Speed, 4))
+
+		-- Average Hit
+		local mainHandAvgDmg = build.calcsTab.mainOutput.MainHand.AverageDamage
+		local offHandAvgDmg = build.calcsTab.mainOutput.OffHand.AverageDamage
+		local combinedAvgDmg = build.calcsTab.mainOutput.AverageDamage
+		assert.are.equals(round((mainHandAvgDmg + offHandAvgDmg) / 2, 4), round(combinedAvgDmg, 4))
+
+		-- DPS (hits twice per attack)
+		local combinedDPS = build.calcsTab.mainOutput.TotalDPS
+		assert.are.equals(round(combinedAvgDmg * combinedSpeed * 2,4), round(combinedDPS,4))
+	end)
+
+	it("correctly calculates dual wield crit chance for double hits", function()
+		setupDualWieldTestConditions()
+		build.skillsTab:PasteSocketGroup("skillId:MeleeMaceMacePlayer Mace Strike 20/0  1")
+		runCallback("OnFrame")
+		build.calcsTab:BuildOutput()
+		runCallback("OnFrame")
+
+		-- Double hits roll crit individually per weapon, so should be average
+		local mainHandCritChance = build.calcsTab.mainOutput.MainHand.CritChance
+		local offHandCritChance = build.calcsTab.mainOutput.OffHand.CritChance
+		local combinedCritChance = (mainHandCritChance + offHandCritChance) / 2
+		assert.are.equals(combinedCritChance, build.calcsTab.mainOutput.CritChance)
+	end)
+
+	it("correctly calculates dual wield DPS for alternating hits", function()
+		setupDualWieldTestConditions()
+		build.skillsTab:PasteSocketGroup("Armour Breaker 20/0  1")
+		runCallback("OnFrame")
+		build.calcsTab:BuildOutput()
+		runCallback("OnFrame")
+
+		-- Attack Speed
+		local mainHandSpeed = build.calcsTab.mainOutput.MainHand.Speed
+		local offHandSpeed = build.calcsTab.mainOutput.OffHand.Speed
+		local combinedSpeed = harmonicMean(mainHandSpeed, offHandSpeed)
+		assert.are.equals(round(combinedSpeed, 4), round(build.calcsTab.mainOutput.Speed, 4))
+
+		-- Average Hit
+		local mainHandAvgDmg = build.calcsTab.mainOutput.MainHand.AverageDamage
+		local offHandAvgDmg = build.calcsTab.mainOutput.OffHand.AverageDamage
+		local combinedAvgDmg = build.calcsTab.mainOutput.AverageDamage
+		assert.are.equals(round((mainHandAvgDmg + offHandAvgDmg) / 2, 4), round(combinedAvgDmg, 4))
+
+		-- DPS (hits once per attack)
+		local combinedDPS = build.calcsTab.mainOutput.TotalDPS
+		assert.are.equals(round(combinedAvgDmg * combinedSpeed, 4), round(combinedDPS, 4))
+	end)
+
+	it("correctly calculates dual wield crit chance for alternating hits", function()
+		setupDualWieldTestConditions()
+		build.skillsTab:PasteSocketGroup("Armour Breaker 20/0  1")
+		runCallback("OnFrame")
+		build.calcsTab:BuildOutput()
+		runCallback("OnFrame")
+
+		-- Alternating hits roll crit individually per weapon, so should be average
+		local mainHandCritChance = build.calcsTab.mainOutput.MainHand.CritChance
+		local offHandCritChance = build.calcsTab.mainOutput.OffHand.CritChance
+		local combinedCritChance = (mainHandCritChance + offHandCritChance) / 2
+		assert.are.equals(combinedCritChance, build.calcsTab.mainOutput.CritChance)
+	end)
+
+	--[[
+		NOTE: the following section contains tests for "combined hits", which PoE2 doesn't have as of 2026-06-02,
+		which means the tests were written for a temporary test skill that will not be committed.
+		The test can be updated by simply replacing `"skillId:MeleeMaceMacePlayerCombinedTEST Mace Strike TEST 20/0  1"`
+		with actual skill data once available
+	]]
+	--[[ it("correctly calculates dual wield DPS for combined hits", function()
+		setupDualWieldTestConditions()
+		build.skillsTab:PasteSocketGroup("skillId:MeleeMaceMacePlayerCombinedTEST Mace Strike TEST 20/0  1")
+		runCallback("OnFrame")
+		build.calcsTab:BuildOutput()
+		runCallback("OnFrame")
+
+		-- Attack Speed
+		local mainHandSpeed = build.calcsTab.mainOutput.MainHand.Speed
+		local offHandSpeed = build.calcsTab.mainOutput.OffHand.Speed
+		local combinedSpeed = harmonicMean(mainHandSpeed, offHandSpeed)
+		assert.are.equals(round(combinedSpeed, 4), round(build.calcsTab.mainOutput.Speed, 4))
+
+		-- Average Hit
+		local mainHandAvgDmg = build.calcsTab.mainOutput.MainHand.AverageDamage
+		local offHandAvgDmg = build.calcsTab.mainOutput.OffHand.AverageDamage
+		local combinedAvgDmg = build.calcsTab.mainOutput.AverageDamage
+		assert.are.equals(round((mainHandAvgDmg + offHandAvgDmg), 4), round(combinedAvgDmg, 4))
+
+		-- DPS (hits twice per attack)
+		local combinedDPS = build.calcsTab.mainOutput.TotalDPS
+		assert.are.equals(round(combinedAvgDmg * combinedSpeed, 4), round(combinedDPS,4))
+	end)
+
+	it("correctly calculates dual wield crit chance for combined hits", function()
+		setupDualWieldTestConditions()
+		build.skillsTab:PasteSocketGroup("skillId:MeleeMaceMacePlayerCombinedTEST Mace Strike TEST 20/0  1")
+		runCallback("OnFrame")
+		build.calcsTab:BuildOutput()
+		runCallback("OnFrame")
+
+		-- combined hits count whole attack as crit, as long as one hand rolls crit)
+		local mainHandCritChance = build.calcsTab.mainOutput.MainHand.CritChance
+		local offHandCritChance = build.calcsTab.mainOutput.OffHand.CritChance
+		local combinedCritChance = mainHandCritChance + offHandCritChance - (mainHandCritChance * offHandCritChance / 100)
+		assert.are.equals(combinedCritChance, build.calcsTab.mainOutput.CritChance)
+	end) ]]
 end)

spec/System/TestAttacks_spec.lua

@@ -0,0 +1,89 @@
+describe("Buy similar mod stat matching", function()
+	local bs = LoadModule("Classes/CompareBuySimilar")
+
+	describe("addModEntries mod matching", function()
+		it("matches from nothing mods as options", function()
+			local fromNothing = new("Item", [[
+From Nothing
+Diamond
+LevelReq: 0
+Radius: Small
+Limited to: 1
+Implicits: 0
+Passives in radius of Zealot's Oath can be Allocated without being connected to your tree
+Corrupted]])
+
+			local modSources = {
+				{ list = fromNothing.explicitModLines, type = "explicit" }
+			}
+			local modEntries = bs.addModEntries(fromNothing, modSources)
+			assert.equal(1, #modEntries)
+			assert.same(
+				{
+					formattedLines = { colorCodes.MAGIC.."Passives in radius of Zealot's Oath can be Allocated without being connected to your tree" },
+					type =
+					"explicit",
+					isOption = true,
+					invert = false,
+					tradeIds = { "explicit.stat_2422708892|52" },
+					value = nil
+				},
+				modEntries[1])
+		end)
+
+		it("combines mods that are the same stat", function()
+			local lifeDiamond = new("Item", [[
+Test Subject
+Diamond
+Implicits: 0
++100 to Maximum Life
++50 to Maximum Life
++50% to Fire Resistance]])
+
+			local entries = bs.addModEntries(lifeDiamond, { { list = lifeDiamond.explicitModLines, type = "explicit" } })
+			assert.equal(2, #entries)
+			assert.equal(2, #entries[1].formattedLines)
+			assert.equal("+100 to Maximum Life", StripEscapes(entries[1].formattedLines[1]))
+			assert.equal("+50 to Maximum Life", StripEscapes(entries[1].formattedLines[2]))
+			assert.equal(150, entries[1].value)
+
+			local lifelessDiamond = new("Item", [[
+Test Subject
+Diamond
+Implicits: 0
+-100 to Maximum Life
++50 to Maximum Life
++50% to Fire Resistance]])
+			local entries = bs.addModEntries(lifelessDiamond,
+				{ { list = lifelessDiamond.explicitModLines, type = "explicit" } })
+			assert.equal(2, #entries)
+			assert.equal(2, #entries[1].formattedLines)
+			assert.equal(-50, entries[1].value)
+		end)
+
+		it("is not case-sensitive", function ()
+			local funnyItem = new("Item", [[
+Test Subject
+Diamond
+Implicits: 1
++50 tO MaxIMum lifE]])
+
+			local entries = bs.addModEntries(funnyItem, {{list = funnyItem.implicitModLines, type = "implicit"}})
+			assert.equal(1, #entries)
+		end)
+
+		it("does not combine implicit and explicit mods", function()
+			local lifelessDiamond = new("Item", [[
+Test Subject
+Diamond
+Implicits: 1
+-100 to Maximum Life
++50 to Maximum Life]])
+			local entries = bs.addModEntries(lifelessDiamond,
+				{ { list = lifelessDiamond.implicitModLines, type = "implicit" }, { list = lifelessDiamond.explicitModLines, type = "explicit" } })
+			assert.equal(2, #entries)
+			assert.equal(-100, entries[1].value)
+			assert.equal(50, entries[2].value)
+		end)
+	end)
+end)