Merge branch 'dev'

Author: LocalIdentity

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v2.53.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.53.1) (2025/06/13)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.53.0...v2.53.1)
+
+## What's Changed
+### User Interface
+- Enable Sorting of folders by date and inherit the sort order in the build save dialogue [\#8624](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8624) ([Noologos](https://github.com/Noologos))
+### Fixed Calculations
+- Fix CWC not supporting triggerbots [\#8671](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8671) ([Paliak](https://github.com/Paliak))
+### Fixed Behaviours
+- Fix Champions' new maximum Fortification mod not working [\#8668](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8668) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Nebulis and similar mods being treated as uncapped [\#8666](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8666) ([Paliak](https://github.com/Paliak))
+
+
 ## [v2.53.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.53.0) (2025/06/13)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.52.3...v2.53.0)

changelog.txt

@@ -1,3 +1,15 @@
+VERSION[2.53.1][2025/06/13]
+
+--- User Interface ---
+* Enable Sorting of folders by date and inherit the sort order in the build save dialogue (Noologos)
+
+--- Fixed Calculations ---
+* Fix CWC not supporting triggerbots (Paliak)
+
+--- Fixed Behaviours ---
+* Fix Champions' new maximum Fortification mod not working (LocalIdentity)
+* Fix Nebulis and similar mods being treated as uncapped (Paliak)
+
 VERSION[2.53.0][2025/06/13]
 
 --- 3.26 Mercenaries of Trarthus ---

manifest.xml

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

spec/System/TestItemMods_spec.lua

@@ -509,4 +509,48 @@ describe("TetsItemMods", function()
 
 		assert.are_not.equals(baseLife, build.calcsTab.mainOutput.Life)
 	end)
+
+	it("globalLimit mods", function()
+		build.configTab.input.customMods = [[
+			-1000% to cold resistance
+		]]
+		build.configTab:BuildModList()
+		build.itemsTab:CreateDisplayItemFromRaw([[Replica Nebulis
+			Void Sceptre
+			League: Heist
+			Quality: 20
+			Sockets: B-B-B
+			LevelReq: 68
+			Implicits: 1
+			40% increased Elemental Damage
+			{fractured}{range:1}(15-20)% increased Cast Speed
+			{range:1}(15-20)% increased Cold Damage per 1% Missing Cold Resistance, up to a maximum of 300%
+			{range:1}(15-20)% increased Fire Damage per 1% Missing Fire Resistance, up to a maximum of 300%]])
+		build.itemsTab:AddDisplayItem()
+		build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nFireball 20/0 Default  1\n")
+		runCallback("OnFrame")
+
+		assert.are_not.equals(340, build.calcsTab.mainEnv.modDB:Sum("INC", "FireDamage"))
+		assert.are_not.equals(340, build.calcsTab.mainEnv.modDB:Sum("INC", "ColdDamage"))
+
+		newBuild()
+
+		build.configTab.input.customMods = [[
+			Gain 25% increased Armour per 5 Power for 8 seconds when you Warcry, up to a maximum of 100%
+			Warcries have infinite Power
+			warcries grant arcane surge to you and allies, with 10% increased effect per 5 power, up to 100%
+		]]
+		build.configTab:BuildModList()
+		build.itemsTab:CreateDisplayItemFromRaw([[
+			New Item
+			Plate Vest
+			Armour: 32
+		]])
+		build.itemsTab:AddDisplayItem()
+		build.skillsTab:PasteSocketGroup("Arc 20/0 Default  1")
+
+		assert.are_not.equals(40, build.calcsTab.mainEnv.modDB:Sum("INC", { flags = ModFlag.Cast }, "Speed"))
+		assert.are_not.equals(64, build.calcsTab.mainOutput.Armour)
+		runCallback("OnFrame")
+	end)
 end)

spec/System/TestTriggers_spec.lua

@@ -1359,4 +1359,54 @@ describe("TestTriggers", function()
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
 	end)
+
+	it("Triggerbots CWCHandler", function()
+		build.skillsTab:PasteSocketGroup("Arc 20/0 Default  1\nCast while Channelling 20/0 Default  1\nBlight 20/0 Default  1\n")
+		runCallback("OnFrame")
+		local baseRate = build.calcsTab.mainOutput.SkillTriggerRate
+		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
+
+		build.configTab.input.customMods = [[
+			Triggers Level 20 Summon Triggerbots when Allocated
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		assert.are.not_equals(math.floor(build.calcsTab.mainOutput.SkillTriggerRate * 100), math.floor(baseRate * 100))
+	end)
+
+	it("Triggerbots defaultHandler", function()
+		build.itemsTab:CreateDisplayItemFromRaw([[Elemental 1H Sword
+		Eternal Sword
+		Crafted: true
+		Prefix: {range:0.5}WeaponElementalDamageOnWeapons4
+		Prefix: None
+		Prefix: None
+		Suffix: {range:0.5}LocalIncreasedAttackSpeed3
+		Suffix: {range:0.5}LocalCriticalStrikeChance3
+		Suffix: {range:0.5}LocalCriticalMultiplier4
+		Quality: 20
+		Sockets: G-G-G
+		LevelReq: 66
+		Implicits: 1
+		{tags:attack}+475 to Accuracy Rating
+		12% increased Attack Speed
+		22% increased Critical Strike Chance
+		+27% to Global Critical Strike Multiplier
+		40% increased Elemental Damage with Attack Skills]])
+		build.itemsTab:AddDisplayItem()
+		runCallback("OnFrame")
+
+		build.skillsTab:PasteSocketGroup("Cast On Critical Strike 20/0 Default  1\nArc 20/0 Default  1\nCyclone 20/0 Default  1\n")
+		runCallback("OnFrame")
+
+		local baseRate = build.calcsTab.mainOutput.SkillTriggerRate
+		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
+
+		build.configTab.input.customMods = [[
+			Triggers Level 20 Summon Triggerbots when Allocated
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		assert.are.not_equals(math.floor(build.calcsTab.mainOutput.SkillTriggerRate * 100), math.floor(baseRate * 100))
+	end)
 end)

src/Classes/FolderListControl.lua

@@ -9,18 +9,38 @@ local t_insert = table.insert
 local FolderListClass = newClass("FolderListControl", "ListControl", function(self, anchor, rect, subPath, onChange)
 	self.ListControl(anchor, rect, 16, "VERTICAL", false, { })
 	self.subPath = subPath or ""
-	self.controls.path = new("PathControl", {"BOTTOM",self,"TOP"}, {0, -2, self.width, 24}, main.buildPath, self.subPath, function(subPath)
-		self.subPath = subPath
+	self.onChangeCallback = onChange
+
+	self.controls.path = new("PathControl", {"BOTTOM",self,"TOP"}, {0, -2, self.width, 24}, main.buildPath, self.subPath, function(newSubPath)
+		self.subPath = newSubPath
 		self:BuildList()
 		self.selIndex = nil
 		self.selValue = nil
-		if onChange then
-			onChange(subPath)
+		if self.onChangeCallback then
+			self.onChangeCallback(newSubPath)
 		end
 	end)
 	self:BuildList()
 end)
 
+function FolderListClass:SortList()
+	if not self.list then return end
+	local sortMode = main.buildSortMode or "NAME"
+
+	table.sort(self.list, function(a, b)
+		if sortMode == "EDITED" then
+			local modA = a.modified or 0 
+			local modB = b.modified or 0
+			if modA ~= modB then
+				return modA > modB
+			end
+			return naturalSortCompare(a.name, b.name)
+		else
+			return naturalSortCompare(a.name, b.name)
+		end
+	end)
+end
+
 function FolderListClass:BuildList()
 	wipeTable(self.list)
 	local handle = NewFileSearch(main.buildPath..self.subPath.."*", true)
@@ -29,11 +49,17 @@ function FolderListClass:BuildList()
 		t_insert(self.list, { 
 			name = fileName,
 			fullFileName = main.buildPath..self.subPath..fileName,
+			modified = handle:GetFileModifiedTime()
 		})
 		if not handle:NextFile() then
 			break
 		end
 	end
+	if handle and handle.Close then handle:Close() end
+
+	self:SortList()
+	if self.UpdateScrollbar then self:UpdateScrollbar() end
+	if self.Redraw then self:Redraw() end
 end
 
 function FolderListClass:OpenFolder(folderName)
@@ -61,7 +87,7 @@ function FolderListClass:OnSelDelete(index, folder)
 			main:OpenMessagePopup("Error", "Couldn't delete '"..folder.fullFileName.."': "..msg)
 			return
 		end
-		self:BuildList()
+		self:BuildList() 
 		self.selIndex = nil
 		self.selValue = nil
 	end

src/Classes/ListControl.lua

@@ -346,10 +346,12 @@ function ListClass:OnKeyDown(key, doubleClick)
 				newSelect = index
 			end
 		else
+			local scrollOffsetH = self.controls.scrollBarH.offset
 			for colIndex, column in ipairs(self.colList) do
 				local relX = cursorX - (x + 2)
 				local relY = cursorY - (y + 2)
-				local mOver = relX >= column._offset and relX <= column._offset + column._width and relY >= 0 and relY <= 18
+				local adjustedRelX = relX + scrollOffsetH
+				local mOver = adjustedRelX >= column._offset and adjustedRelX <= column._offset + column._width and relY >= 0 and relY <= 18
 				if self:GetColumnProperty(column, "sortable") and mOver and self.ReSort then
 					self:ReSort(colIndex)
 				end

src/Classes/ModStore.lua

@@ -267,15 +267,6 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
 			local target = self
 			local limitTarget = self
 
-			if globalLimits and tag.globalLimit and tag.globalLimitKey then
-				value = value or 0
-				globalLimits[tag.globalLimitKey] = globalLimits[tag.globalLimitKey] or 0
-				if globalLimits[tag.globalLimitKey] + value > tag.globalLimit then
-					value = tag.globalLimit - globalLimits[tag.globalLimitKey]
-				end
-				globalLimits[tag.globalLimitKey] = globalLimits[tag.globalLimitKey] + value
-			end
-
 			-- Allow limiting a self multiplier on a parent multiplier (eg. Agony Crawler on player virulence)
 			-- This explicit target is necessary because even though the GetMultiplier method does call self.parent.GetMultiplier, it does so with noMod = true,
 			-- disabling the summation (3rd part): (not noMod and self:Sum("BASE", cfg, multiplierName[var]) or 0)
@@ -824,6 +815,18 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
 				return
 			end
 		end
-	end	
+	end
+
+	-- Apply global limits
+	for _, tag in ipairs(mod) do
+		if globalLimits and tag.globalLimit and tag.globalLimitKey then
+			value = value or 0
+			globalLimits[tag.globalLimitKey] = globalLimits[tag.globalLimitKey] or 0
+			if globalLimits[tag.globalLimitKey] + value > tag.globalLimit then
+				value = tag.globalLimit - globalLimits[tag.globalLimitKey]
+			end
+			globalLimits[tag.globalLimitKey] = globalLimits[tag.globalLimitKey] + value
+		end
+	end
 	return value
 end

src/Data/ModCache.lua

@@ -11920,7 +11920,7 @@ c["You have Zealot's Oath if you haven't been hit recently"]={{[1]={[1]={neg=tru
 c["You have no Armour or Maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="MORE",value=-100},[2]={flags=0,keywordFlags=0,name="EnergyShield",type="MORE",value=-100}},nil}
 c["You have no Intelligence"]={{[1]={flags=0,keywordFlags=0,name="Int",type="MORE",value=-100}},nil}
 c["You have no Life Regeneration"]={{[1]={flags=0,keywordFlags=0,name="NoLifeRegen",type="FLAG",value=true}},nil}
-c["You have your maximum Fortification"]={nil,"your maximum Fortification "}
+c["You have your maximum Fortification"]={{[1]={flags=0,keywordFlags=0,name="Condition:Fortified",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="Condition:HaveMaxFortification",type="FLAG",value=true}},nil}
 c["You lose all Endurance Charges on reaching maximum Endurance Charges"]={nil,"You lose all Endurance Charges on reaching maximum Endurance Charges "}
 c["You lose all Endurance Charges on reaching maximum Endurance Charges Cannot Block"]={nil,"You lose all Endurance Charges on reaching maximum Endurance Charges Cannot Block "}
 c["You lose all Endurance Charges when Hit"]={nil,"You lose all Endurance Charges when Hit "}

src/Export/Classes/DatListControl.lua

@@ -4,9 +4,27 @@
 -- Dat list control.
 --
 local DatListClass = newClass("DatListControl", "ListControl", function(self, anchor, rect)
-	self.ListControl(anchor, rect, 14, "VERTICAL", false, main.datFileList)
+	self.originalList = main.datFileList
+	self.searchBuf = ""
+	self.filteredList = self.originalList
+	self.ListControl(anchor, rect, 14, "VERTICAL", false, self.filteredList)
 end)
 
+function DatListClass:BuildFilteredList()
+	local search = self.searchBuf:lower()
+	if search == "" then
+		self.filteredList = self.originalList
+	else
+		self.filteredList = {}
+		for _, file in ipairs(self.originalList) do
+			if file.name:lower():find(search, 1, true) then
+				table.insert(self.filteredList, file)
+			end
+		end
+	end
+	self.list = self.filteredList
+end
+
 function DatListClass:GetRowValue(column, index, datFile)
 	if column == 1 then
 		return "^7"..datFile.name