Merge branch 'dev'

Author: LocalIdentity

.github/tweak_changelogs.sh

@@ -2,8 +2,8 @@
 
 RELEASE_VERSION="$1"
 
-# Delete until the first line containing "--"
-sed -i '1,/--/d' temp_change.md
+# Delete until and including the first line containing "<!-- Release notes generated"
+sed -i '1,/^<!-- Release notes generated/d' temp_change.md
 # Reverse the order of lines in the file (last line becomes first, etc.)
 sed -i '1h;1d;$!H;$!d;G' temp_change.md
 # Convert "**Full Changelog**: URL" format to markdown link format "[Full Changelog](URL)"

CHANGELOG.md

@@ -1,10 +1,22 @@
 # Changelog
 
+## [v0.12.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v0.12.1) (2025/09/15)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/compare/v0.12.0...v0.12.1)
+
+
+## What's Changed
+### User Interface
+- Add Passive Tree search tip when looking for multiple mods [\#1388](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1388) ([Nightblade](https://github.com/Nightblade))
+### Fixed Calculations
+- Fix Damage "Gain as" when using Conversion mods on gear / tree [\#1390](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1390) ([LocalIdentity](https://github.com/LocalIdentity))
+
+
+
 ## [v0.12.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v0.12.0) (2025/09/14)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/compare/v0.11.2...v0.12.0)
 
-<!-- Release notes generated using configuration in .github/release.yml at dev -->
 
 ## What's Changed
 ### The Third Edict

changelog.txt

@@ -1,3 +1,12 @@
+VERSION[0.12.1][2025/09/15]
+
+--- User Interface ---
+* Add Passive Tree search tip when looking for multiple mods (Nightblade)
+
+--- Fixed Calculations ---
+* Fix Damage "Gain as" when using Conversion mods on gear / tree (LocalIdentity)
+
+
 VERSION[0.12.0][2025/09/14]
 
 --- The Third Edict ---

manifest.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <PoBVersion>
-	<Version number="0.12.0" />
+	<Version number="0.12.1" />
 	<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/" />

spec/System/TestAttacks_spec.lua

@@ -83,19 +83,19 @@ describe("TestAttacks", function()
 		runCallback("OnFrame")
 	end
 	it("correctly calculates increased damage with gemling integrated efficiency", function()
-		integratedEfficiencyLoadout("skills gain 99% increased damage per socketed red support gem")
+		integratedEfficiencyLoadout("skills deal 99% increased damage per connected red support gem")
 		local incDmg = build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("INC", nil, "Damage")
 		assert.are.equals(incDmg, 99)
 	end)
 
 	it("correctly calculates crit chance with gemling integrated efficiency", function()
-		integratedEfficiencyLoadout("skills gain 99% increased critical hit chance per socketed blue support gem")
+		integratedEfficiencyLoadout("skills have 99% increased critical hit chance per connected blue support gem")
 		local incCritChance = build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("INC", nil, "CritChance")
 		assert.are.equals(incCritChance, 99)
 	end)
 
 	it("correctly calculates increased skill speed with gemling integrated efficiency", function()
-		integratedEfficiencyLoadout("skills gain 99% increased skill speed per socketed green support gem")
+		integratedEfficiencyLoadout("skills have 99% increased skill speed per connected green support gem")
 		local incSpeed = build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("INC", nil, "Speed")
 		assert.are.equals(incSpeed, 99)
 	end)

src/Classes/TreeTab.lua

@@ -157,7 +157,7 @@ local TreeTabClass = newClass("TreeTab", "ControlHost", function(self, build)
 		self.viewer.searchStr = buf
 		self.searchFlag = buf ~= self.viewer.searchStrSaved
 	end, nil, nil, true)
-	self.controls.treeSearch.tooltipText = "Uses Lua pattern matching for complex searches\nPrefix your search with \"oil:\" to search by anoint recipe"
+	self.controls.treeSearch.tooltipText = "Uses Lua pattern matching for complex searches.\nPrefix your search with \"oil:\" to search by anoint recipe.\nTo search for multiple terms: (increased.fire.damage|increased.area.of.effect|etc)"
 
 	self.tradeLeaguesList = { }
 	-- Find Timeless Jewel Button

src/Modules/CalcOffence.lua

@@ -88,8 +88,8 @@ local function calcGainedDamage(activeSkill, output, cfg, damageType)
 
 	local gainedMin, gainedMax = 0, 0
 	for _, otherType in ipairs(dmgTypeList) do
-		local baseMin = m_floor(output[otherType.."MinBase"] * activeSkill.skillConversionTable[otherType].mult)
-		local baseMax = m_floor(output[otherType.."MaxBase"] * activeSkill.skillConversionTable[otherType].mult)
+		local baseMin = m_floor(output[otherType.."MinBase"] * activeSkill.conversionTable[otherType].mult)
+		local baseMax = m_floor(output[otherType.."MaxBase"] * activeSkill.conversionTable[otherType].mult)
 		local gainMult = gainTable[otherType][damageType]
 		if gainMult and gainMult > 0 then
 			-- Damage is being converted/gained from the other damage type
@@ -2045,18 +2045,15 @@ function calcs.offence(env, actor, activeSkill)
 	end
 
 	-- Calculate damage conversion percentages
-	activeSkill.skillConversionTable = wipeTable(activeSkill.skillConversionTable)
 	activeSkill.conversionTable = wipeTable(activeSkill.conversionTable)
 	activeSkill.gainTable = wipeTable(activeSkill.gainTable)
 
 	-- Initialize conversion tables
 	for _, type in ipairs(dmgTypeList) do
-		activeSkill.skillConversionTable[type] = {}
 		activeSkill.conversionTable[type] = {}
 		activeSkill.gainTable[type] = {}
 		for _, otherType in ipairs(dmgTypeList) do
 			activeSkill.conversionTable[type][otherType] = 0
-			activeSkill.skillConversionTable[type][otherType] = 0
 		end
 	end
 
@@ -2103,7 +2100,6 @@ function calcs.offence(env, actor, activeSkill)
 			activeSkill.conversionTable[damageType][toType] = amount
 		end
 		activeSkill.conversionTable[damageType].mult = 1 - m_min(skillTotal / 100, 1)
-		activeSkill.skillConversionTable[damageType].mult = 1 - m_min(skillTotal / 100, 1)
 	end
 
 	-- Second step: Process global conversion and gains