Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
LocalIdentity committed Jan 26, 2024
2 parents ada6ce1 + 045d0ae commit a70ee00
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 6 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## [v2.39.3](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.39.3) (2024/01/26)

[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.39.2...v2.39.3)

<!-- Release notes generated using configuration in .github/release.yml at dev -->

## What's Changed
### Fixed Crashes
- Fix crash when sorting gems on a disabled socket group [\#7317](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7317) ([Paliak](https://github.com/Paliak))
- Fix crash when hovering over Buffs section [\#7315](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7315) ([Wires77](https://github.com/Wires77))

### Fixed Bugs
- Fix Utula's Hunger not working with Soultether, Legacy of Fury and Exarch Helmet implicit [\#7313](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7313) ([Peechey](https://github.com/Peechey))



## [v2.39.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.39.2) (2024/01/25)

[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.39.1...v2.39.2)
Expand Down
9 changes: 9 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
VERSION[2.39.3][2024/01/26]

--- Fixed Crashes ---
* Fix crash when sorting gems on a disabled socket group (Paliak)
* Fix crash when hovering over Buffs section (Wires77)

--- Fixed Bugs ---
* Fix Utula's Hunger not working with Soultether, Legacy of Fury and Exarch Helmet implicit (Peechey)

VERSION[2.39.2][2024/01/25]

--- Fixed Crashes ---
Expand Down
4 changes: 2 additions & 2 deletions src/Classes/CalcBreakdownControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,14 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
-- Sort modifiers by type
table.sort(rowList, function(a, b)
if a.mod.type == b.mod.type then
return a.mod.name > b.mod.name or a.mod.name == b.mod.name and a.value > b.value
return a.mod.name > b.mod.name or (a.mod.name == b.mod.name and type(a.value) == "number" and type(b.value) == "number") and a.value > b.value
else
return a.mod.type < b.mod.type
end
end)
else -- Sort modifiers by value
table.sort(rowList, function(a, b)
return a.mod.name > b.mod.name or a.mod.name == b.mod.name and a.value > b.value
return a.mod.name > b.mod.name or (a.mod.name == b.mod.name and type(a.value) == "number" and type(b.value) == "number") and a.value > b.value
end)
end

Expand Down
2 changes: 1 addition & 1 deletion src/Modules/CalcSetup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,7 @@ function calcs.initEnv(build, mode, override, specEnv)
end

-- Determine main skill group
if env.mode == "CALCS" or env.mode == "CACHE" then
if env.mode == "CALCS" then
env.calcsInput.skill_number = m_min(m_max(#build.skillsTab.socketGroupList, 1), env.calcsInput.skill_number or 1)
env.mainSocketGroup = env.calcsInput.skill_number
else
Expand Down
7 changes: 4 additions & 3 deletions src/Modules/CalcTriggers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -528,11 +528,12 @@ local function defaultTriggerHandler(env, config)

-- Handling for mana spending rate for Manaforged Arrows Support
if actor.mainSkill.skillData.triggeredByManaforged and trigRate > 0 then
local mode = env.mode == "CALCS" and "CALCS" or "MAIN"
local triggeredUUID = cacheSkillUUID(actor.mainSkill, env)
if not GlobalCache.cachedData["CACHE"][triggeredUUID] then
calcs.buildActiveSkill(env, "CACHE", actor.mainSkill, {[triggeredUUID] = true})
if not GlobalCache.cachedData[mode][triggeredUUID] then
calcs.buildActiveSkill(env, mode, actor.mainSkill, {[triggeredUUID] = true})
end
local triggeredManaCost = GlobalCache.cachedData["CACHE"][triggeredUUID].Env.player.output.ManaCost or 0
local triggeredManaCost = GlobalCache.cachedData[mode][triggeredUUID].Env.player.output.ManaCost or 0
if triggeredManaCost > 0 then
local manaSpentThreshold = triggeredManaCost * actor.mainSkill.skillData.ManaForgedArrowsPercentThreshold
local sourceManaCost = GlobalCache.cachedData["CACHE"][uuid].Env.player.output.ManaCost or 0
Expand Down
9 changes: 9 additions & 0 deletions src/Modules/Data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,15 @@ data.itemTagSpecialExclusionPattern = {
"Life From You",
"^Socketed Gems are Supported by Level"
},
["boots"] = {
"Enemy's Life", -- Legacy of Fury
},
["belt"] = {
"Life as Extra Maximum Energy Shield", -- Soul Tether
},
["helmet"] = {
"Recouped as Life", -- Flame Exarch
},
},
["evasion"] = {
["ring"] = {
Expand Down

0 comments on commit a70ee00

Please sign in to comment.