Skip to content

Commit 1e6e3c5

Browse files
author
LocalIdentity
committed
Merge branch 'dev'
2 parents 8ae755e + 380d823 commit 1e6e3c5

File tree

7 files changed

+55
-56
lines changed

7 files changed

+55
-56
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [v2.59.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v2.59.2) (2025/11/23)
4+
5+
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.59.1...v2.59.2)
6+
7+
8+
## What's Changed
9+
### Fixed Crashes
10+
- Fix crash on adding support gems and importing items to many builds [\#9340](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9340) ([LocalIdentity](https://github.com/LocalIdentity))
11+
### Fixed Behaviours
12+
- Fix Party Tab max Fortify override not working [\#9342](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9342) ([LocalIdentity](https://github.com/LocalIdentity))
13+
14+
15+
316
## [v2.59.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v2.59.1) (2025/11/22)
417

518
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.59.0...v2.59.1)
@@ -68,7 +81,7 @@
6881
- Fix Righteous Fire of Arcane Devotion still applying when using Blood Magic [\#9206](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9206) ([LocalIdentity](https://github.com/LocalIdentity))
6982
- Fix Sacred Wisps applying to non-Wand Attacks [\#9272](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9272) ([Peechey](https://github.com/Peechey))
7083
- Fix Beacon of Madness explode mod disabling life from Utula's Hunger [\#9231](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9231) ([ATRussell63](https://github.com/ATRussell63))
71-
- Fix Spiritblade conversion and Moonbenders Wing gain mods always applying [\#9221](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9221) ([LocalIdentity](https://github.com/LocalIdentity))
84+
- Fix Spiritblade conversion and Moonbender's Wing gain mods always applying [\#9221](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9221) ([LocalIdentity](https://github.com/LocalIdentity))
7285
- Fix Foulborn Dialla's Malefaction not importing gems in correct order [\#9280](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9280) ([LocalIdentity](https://github.com/LocalIdentity))
7386
- Fix comparison showing for Ring 3 when Ascendancy was not allocated [\#9266](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9266) ([Peechey](https://github.com/Peechey))
7487
- Fix Ring 3 visibility and Weapon Swap searching in Trader [\#9310](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9310) ([Peechey](https://github.com/Peechey))

‎changelog.txt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
VERSION[2.59.2][2025/11/23]
2+
3+
--- Fixed Crashes ---
4+
* Fix crash on adding support gems and importing items to many builds (LocalIdentity)
5+
6+
--- Fixed Behaviours ---
7+
* Fix Party Tab max Fortify override not working (LocalIdentity)
8+
9+
110
VERSION[2.59.1][2025/11/22]
211

312
--- Fixed Bugs ---
@@ -62,7 +71,7 @@ VERSION[2.59.0][2025/11/22]
6271
* Fix Righteous Fire of Arcane Devotion still applying when using Blood Magic (LocalIdentity)
6372
* Fix Sacred Wisps applying to non-Wand Attacks (Peechey)
6473
* Fix Beacon of Madness explode mod disabling life from Utula's Hunger (ATRussell63)
65-
* Fix Spiritblade conversion and Moonbenders Wing gain mods always applying (LocalIdentity)
74+
* Fix Spiritblade conversion and Moonbender's Wing gain mods always applying (LocalIdentity)
6675
* Fix Foulborn Dialla's Malefaction not importing gems in correct order (LocalIdentity)
6776
* Fix comparison showing for Ring 3 when Ascendancy was not allocated (Peechey)
6877
* Fix Ring 3 visibility and Weapon Swap searching in Trader (Peechey)

‎manifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<PoBVersion>
3-
<Version number="2.59.1" />
3+
<Version number="2.59.2" />
44
<Source part="default" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/" />
55
<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/runtime/" />
66
<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/src/" />

‎src/Modules/CalcActiveSkill.lua‎

Lines changed: 25 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -107,36 +107,15 @@ function calcs.createActiveSkill(activeEffect, supportList, actor, socketGroup,
107107
activeSkill.effectList = { activeEffect }
108108
local rejectedSupportsIndices = {}
109109

110-
-- Return first compatible support grantedEffect plus a flag indicating the support has a support component
111-
local function getGrantedSupportEffect(supportEffect)
112-
local hasSupport = false
113-
if supportEffect.gemData then
114-
for _, grantedEffect in ipairs(supportEffect.gemData.grantedEffectList) do
115-
if grantedEffect and grantedEffect.support then
116-
hasSupport = true
117-
if calcLib.canGrantedEffectSupportActiveSkill(grantedEffect, activeSkill) then
118-
return grantedEffect, true
119-
end
120-
end
121-
end
122-
elseif supportEffect.grantedEffect then
123-
hasSupport = true
124-
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
125-
return supportEffect.grantedEffect, true
126-
end
127-
end
128-
return nil, hasSupport
129-
end
130-
131110
for index, supportEffect in ipairs(supportList) do
132-
-- Loop through grantedEffectList until we find a support gem if the gem has an active and support component e.g. Autoexertion
133-
local grantedSupportEffect, hasSupport = getGrantedSupportEffect(supportEffect)
134-
if grantedSupportEffect then
135-
-- Pass 1: Add skill types from compatible supports
136-
for _, skillType in pairs(grantedSupportEffect.addSkillTypes) do
137-
activeSkill.skillTypes[skillType] = true
111+
-- Pass 1: Add skill types from compatible supports
112+
if supportEffect.grantedEffect.support then
113+
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
114+
for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
115+
activeSkill.skillTypes[skillType] = true
116+
end
138117
end
139-
elseif hasSupport then
118+
else
140119
t_insert(rejectedSupportsIndices, index)
141120
end
142121
end
@@ -148,29 +127,31 @@ function calcs.createActiveSkill(activeEffect, supportList, actor, socketGroup,
148127
notAddedNewSupport = true
149128
for index, supportEffectIndex in ipairs(rejectedSupportsIndices) do
150129
local supportEffect = supportList[supportEffectIndex]
151-
local grantedSupportEffect = getGrantedSupportEffect(supportEffect)
152-
if grantedSupportEffect then
153-
notAddedNewSupport = false
154-
rejectedSupportsIndices[index] = nil
155-
for _, skillType in pairs(grantedSupportEffect.addSkillTypes) do
156-
activeSkill.skillTypes[skillType] = true
130+
if supportEffect.grantedEffect.support then
131+
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
132+
notAddedNewSupport = false
133+
rejectedSupportsIndices[index] = nil
134+
for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
135+
activeSkill.skillTypes[skillType] = true
136+
end
157137
end
158138
end
159139
end
160140
until (notAddedNewSupport)
161141

162142
for _, supportEffect in ipairs(supportList) do
163143
-- Pass 2: Add all compatible supports
164-
local grantedSupportEffect = getGrantedSupportEffect(supportEffect)
165-
if grantedSupportEffect then
166-
t_insert(activeSkill.effectList, supportEffect)
167-
if supportEffect.isSupporting and activeEffect.srcInstance then
168-
supportEffect.isSupporting[activeEffect.srcInstance] = true
169-
end
170-
if grantedSupportEffect.addFlags and not summonSkill then
171-
-- Support skill adds flags to supported skills (eg. Remote Mine adds 'mine')
172-
for k in pairs(grantedSupportEffect.addFlags) do
173-
skillFlags[k] = true
144+
if supportEffect.grantedEffect.support then
145+
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
146+
t_insert(activeSkill.effectList, supportEffect)
147+
if supportEffect.isSupporting and activeEffect.srcInstance then
148+
supportEffect.isSupporting[activeEffect.srcInstance] = true
149+
end
150+
if supportEffect.grantedEffect.addFlags and not summonSkill then
151+
-- Support skill adds flags to supported skills (eg. Remote Mine adds 'mine')
152+
for k in pairs(supportEffect.grantedEffect.addFlags) do
153+
skillFlags[k] = true
154+
end
174155
end
175156
end
176157
end

‎src/Modules/CalcPerform.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,9 +616,9 @@ local function doActorMisc(env, actor)
616616
if modDB:Flag(nil, "Fortified") or modDB:Sum("BASE", nil, "Multiplier:Fortification") > 0 then
617617
local skillModList = actor.mainSkill and actor.mainSkill.skillModList or actor.modDB
618618
local skillCfg = actor.mainSkill and actor.mainSkill.skillCfg
619-
local maxStacks = modDB:Override(nil, "MaximumFortification") or modDB:Sum("BASE", skillCfg, "MaximumFortification")
619+
local maxStacks = m_max(modDB:Override(nil, "MaximumFortification") or modDB:Sum("BASE", skillCfg, "MaximumFortification"), alliedFortify)
620620
local minStacks = m_min(modDB:Flag(nil, "Condition:HaveMaxFortification") and maxStacks or modDB:Sum("BASE", nil, "MinimumFortification"), maxStacks)
621-
local stacks = m_min(modDB:Override(nil, "FortificationStacks") or (alliedFortify > 0 and alliedFortify) or (minStacks > 0 and minStacks) or maxStacks, maxStacks)
621+
local stacks = m_min(modDB:Override(nil, "FortificationStacks") or (minStacks > 0 and minStacks) or maxStacks, maxStacks)
622622
local increasedDuration = skillModList:Sum("INC", nil, "FortifyDuration")
623623
output.MaximumFortification = maxStacks
624624
output.MinimumFortification = minStacks

‎src/Modules/CalcSetup.lua‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,12 +1580,8 @@ function calcs.initEnv(build, mode, override, specEnv)
15801580
for _, otherSocketGroup in ipairs(build.skillsTab.socketGroupList) do
15811581
if otherSocketGroup.slot and otherSocketGroup.slot == group.slot and not (otherSocketGroup.source and otherSocketGroup.source == group.source) then
15821582
for _, gem in ipairs(otherSocketGroup.gemList) do
1583-
if gem.gemData and gem.gemData.grantedEffectList then
1584-
for _, grantedEffect in ipairs(gem.gemData.grantedEffectList) do
1585-
if grantedEffect.support then
1586-
t_insert(group.displayGemList, gem)
1587-
end
1588-
end
1583+
if gem.gemData and gem.gemData.grantedEffect and gem.gemData.grantedEffect.support then
1584+
t_insert(group.displayGemList, gem)
15891585
end
15901586
end
15911587
end

‎src/Modules/Main.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ function main:Init()
227227
end
228228
self.controls.versionLabel = new("LabelControl", {"BOTTOMLEFT",self.anchorMain,"BOTTOMLEFT"}, {148, -2, 0, 16}, "")
229229
self.controls.versionLabel.label = function()
230-
return "^8Version: "..launch.versionNumber..(launch.versionBranch == "dev" and " (Dev)" or launch.versionBranch == "beta" and " (Beta)" or "")
230+
return "^8" .. (launch.versionBranch == "beta" and "Beta: " or "Version: ") .. launch.versionNumber .. (launch.versionBranch == "dev" and " (Dev)" or "")
231231
end
232232
self.controls.devMode = new("LabelControl", {"BOTTOMLEFT",self.anchorMain,"BOTTOMLEFT"}, {0, -26, 0, 20}, colorCodes.NEGATIVE.."Dev Mode")
233233
self.controls.devMode.shown = function()

0 commit comments

Comments
 (0)