Merge branch 'PathOfBuildingCommunity:dev' into show-flavour-text-on-uniques

Author: Blitz54

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/Data/Bases/flail.lua

@@ -44,7 +44,7 @@ itemBases["Twin Flail"] = {
 	socketLimit = 2,
 	tags = { maraketh_basetype = true, onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
 	implicit = "Forks Critical Hits",
-	implicitModTypes = { {  }, },
+	implicitModTypes = { { "critical" }, },
 	weapon = { PhysicalMin = 8, PhysicalMax = 18, CritChanceBase = 10, AttackRateBase = 1.4, Range = 11, },
 	req = { level = 20, str = 37, int = 16, },
 }

src/Data/Bases/staff.lua

@@ -106,6 +106,14 @@ itemBases["Dark Staff"] = {
 	implicitModTypes = { },
 	req = { },
 }
+itemBases["Permafrost Staff"] = {
+	type = "Staff",
+	quality = 20,
+	tags = { default = true, twohand = true, staff = true, },
+	implicit = "Grants Skill: Level (1-20) Heart of Ice",
+	implicitModTypes = { },
+	req = { },
+}
 
 itemBases["Wrapped Quarterstaff"] = {
 	type = "Staff",