Merge branch 'dev'

Author: LocalIdentity

.github/workflows/spellcheck.yml

@@ -33,7 +33,7 @@ jobs:
             ${{ env.CONFIG_URL }}/contribs-dict.txt
 
       - name: Run cspell
-        uses: streetsidesoftware/cspell-action@v5
+        uses: streetsidesoftware/cspell-action@v6.9.0
         with:
           files: '**' # needed as workaround for non-incremental runs (overrides in config still work ok)
           config: "cspell.json"

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [v2.49.3](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.49.3) (2024/11/24)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.49.2...v2.49.3)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+### Fixed Bugs
+- Fix character import from accounts with a hyphen in them [\#8370](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8370) ([tarekis](https://github.com/tarekis))
+- Fix trade realms not sorting correctly [\#8367](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8367) ([Regisle](https://github.com/Regisle))
+
 ## [v2.49.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.49.2) (2024/11/19)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.49.1...v2.49.2)

changelog.txt

@@ -1,3 +1,9 @@
+VERSION[2.49.3][2024/11/24]
+
+--- Fixed Bugs ---
+* Fix character import from accounts with a hyphen in them (tarekis)
+* Fix trade realms not sorting correctly (Regisle)
+
 VERSION[2.49.2][2024/11/19]
 
 --- User Interface ---

manifest.xml

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

src/Classes/ImportTab.lua

@@ -63,11 +63,11 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
 		self:DownloadCharacterList()
 	end)
 	self.controls.accountNameGo.enabled = function()
-		return self.controls.accountName.buf:match("%S[#%-(%%23)]%d%d%d%d$")
+		return self.controls.accountName.buf:match("%S[#%-]%d%d%d%d$")
 	end
 	self.controls.accountNameGo.tooltipFunc = function(tooltip)
 		tooltip:Clear()
-		if not self.controls.accountName.buf:match("[#%-(%%23)]%d%d%d%d$") then
+		if not self.controls.accountName.buf:match("[#%-]%d%d%d%d$") then
 			tooltip:AddLine(16, "^7Missing discriminator e.g. " .. self.controls.accountName.buf .. "#1234")
 		end
 	end
@@ -99,7 +99,7 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
 
 	self.controls.accountNameMissingDiscriminator = new("LabelControl", {"BOTTOMLEFT",self.controls.accountNameUnicode,"TOPLEFT"}, {0, -4, 0, 18}, "^1Missing discriminator e.g. #1234")
 	self.controls.accountNameMissingDiscriminator.shown = function()
-		return not self.controls.accountName.buf:match("[#%-(%%23)]%d%d%d%d$")
+		return not self.controls.accountName.buf:match("[#%-]%d%d%d%d$")
 	end
 
 
@@ -423,8 +423,9 @@ function ImportTabClass:DownloadCharacterList()
 	else
 		accountName = self.controls.accountName.buf:gsub("^[%s?]+", ""):gsub("[%s?]+$", ""):gsub("%s", "+")
 	end
+	accountName = accountName:gsub("(.*)[#%-]", "%1#")
 	local sessionID = #self.controls.sessionInput.buf == 32 and self.controls.sessionInput.buf or (main.gameAccounts[accountName] and main.gameAccounts[accountName].sessionID)
-	launch:DownloadPage(realm.hostName.."character-window/get-characters?accountName="..accountName:gsub("-", "%%23"):gsub("#", "%%23").."&realm="..realm.realmCode, function(response, errMsg)
+	launch:DownloadPage(realm.hostName.."character-window/get-characters?accountName="..accountName:gsub("#", "%%23").."&realm="..realm.realmCode, function(response, errMsg)
 		if errMsg == "Response code: 401" then
 			self.charImportStatus = colorCodes.NEGATIVE.."Sign-in is required."
 			self.charImportMode = "GETSESSIONID"
@@ -468,9 +469,9 @@ function ImportTabClass:DownloadCharacterList()
 				self.charImportMode = "GETSESSIONID"
 				return
 			end
-			realAccountName = realAccountName:gsub("-", "#")
-			self.controls.accountName:SetText(realAccountName)
+			realAccountName = realAccountName:gsub("(.*)[#%-]", "%1#")
 			accountName = realAccountName
+			self.controls.accountName:SetText(realAccountName)
 			self.charImportStatus = "Character list successfully retrieved."
 			self.charImportMode = "SELECTCHAR"
 			self.lastRealm = realm.id

src/Classes/TradeQuery.lua

@@ -1118,7 +1118,10 @@ function TradeQueryClass:UpdateRealms()
 			end
 			self.realmIds = {}
 			for _, value in pairs(data.realms) do
-				self.realmIds[value.text] = value.id
+				-- filter out only Path of Exile one realms, as poe2 is not supported yet
+				if value.text:match("PoE 1 ") then
+					self.realmIds[value.text:gsub("PoE 1 ", "")] = value.id
+				end
 			end
 			setRealmDropList()
 

src/Data/ModItem.lua

@@ -663,6 +663,7 @@ return {
 	["LocalBaseEnergyShieldAndMana4"] = { type = "Prefix", affix = "Bishop's", "+(26-30) to maximum Energy Shield", "+(23-25) to maximum Mana", statOrderKey = "1419,1439", statOrder = { 1419, 1439 }, level = 78, group = "LocalBaseEnergyShieldAndMana", weightKey = { "shield", "boots", "gloves", "helmet", "int_armour", "str_int_armour", "dex_int_armour", "str_dex_int_armour", "default", }, weightVal = { 0, 0, 0, 0, 500, 250, 250, 166, 0 }, modTags = { "resource", "mana", "defences", "energy_shield" }, },
 	["MovementVelocity1"] = { type = "Prefix", affix = "Runner's", "10% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 1, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
 	["MovementVelocity2"] = { type = "Prefix", affix = "Sprinter's", "15% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 15, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
+	["MovementVelocity2Royale"] = { type = "Prefix", affix = "Sprinter's", "(15-25)% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 5, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
 	["MovementVelocity3"] = { type = "Prefix", affix = "Stallion's", "20% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 30, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
 	["MovementVelocity4"] = { type = "Prefix", affix = "Gazelle's", "25% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 40, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
 	["MovementVelocity5"] = { type = "Prefix", affix = "Cheetah's", "30% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 55, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
@@ -826,6 +827,7 @@ return {
 	["ItemFoundRarityIncreasePrefix4_"] = { type = "Prefix", affix = "Perandus'", "(25-28)% increased Rarity of Items found", statOrderKey = "1456", statOrder = { 1456 }, level = 84, group = "ItemFoundRarityIncreasePrefix", weightKey = { "ring", "amulet", "default", }, weightVal = { 1000, 1000, 0 }, modTags = { "drop" }, },
 	["IncreasedCastSpeed1"] = { type = "Suffix", affix = "of Talent", "(5-8)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 2, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, },
 	["IncreasedCastSpeed2"] = { type = "Suffix", affix = "of Nimbleness", "(9-12)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 15, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, },
+	["IncreasedCastSpeed2Royale"] = { type = "Suffix", affix = "of Nimbleness", "(8-15)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 4, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "sceptre", "amulet", "focus", "str_int_shield", "dex_int_shield", "gloves", "default", }, weightVal = { 1000, 0, 1000, 800, 1000, 1000, 1000, 500, 0 }, modTags = { "caster", "speed" }, },
 	["IncreasedCastSpeed3"] = { type = "Suffix", affix = "of Expertise", "(13-16)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 30, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, },
 	["IncreasedCastSpeed4"] = { type = "Suffix", affix = "of Legerdemain", "(17-20)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 40, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 0 }, modTags = { "caster", "speed" }, },
 	["IncreasedCastSpeed5"] = { type = "Suffix", affix = "of Prestidigitation", "(21-24)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 55, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 0 }, modTags = { "caster", "speed" }, },
@@ -847,6 +849,7 @@ return {
 	["IncreasedCastSpeedFishing"] = { type = "Suffix", affix = "of Casting", "(24-28)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 10, group = "IncreasedCastSpeedFishing", weightKey = { "fishing_rod", "default", }, weightVal = { 1000, 0 }, modTags = { "red_herring", "caster", "speed" }, },
 	["LocalIncreasedAttackSpeed1"] = { type = "Suffix", affix = "of Skill", "(5-7)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 1, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, },
 	["LocalIncreasedAttackSpeed2"] = { type = "Suffix", affix = "of Ease", "(8-10)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 11, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, },
+	["LocalIncreasedAttackSpeed2Royale____"] = { type = "Suffix", affix = "of Ease", "(15-25)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 4, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, },
 	["LocalIncreasedAttackSpeed3"] = { type = "Suffix", affix = "of Mastery", "(11-13)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 22, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, },
 	["LocalIncreasedAttackSpeed4"] = { type = "Suffix", affix = "of Renown", "(14-16)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 30, group = "LocalIncreasedAttackSpeed", weightKey = { "ranged", "weapon", "default", }, weightVal = { 500, 1000, 0 }, modTags = { "attack", "speed" }, },
 	["LocalIncreasedAttackSpeed5"] = { type = "Suffix", affix = "of Acclaim", "(17-19)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 37, group = "LocalIncreasedAttackSpeed", weightKey = { "ranged", "weapon", "default", }, weightVal = { 500, 1000, 0 }, modTags = { "attack", "speed" }, },
@@ -862,6 +865,7 @@ return {
 	["LocalIncreasedAttackSpeedRangedEnhancedMod_"] = { type = "Suffix", affix = "of Tacati", "Adds (23-36) to (49-61) Chaos Damage", "(14-16)% increased Attack Speed", statOrderKey = "1253,1276", statOrder = { 1253, 1276 }, level = 1, group = "LocalIncreasedAttackSpeedAddedChaos", weightKey = { "default", }, weightVal = { 0 }, modTags = { "chaos_damage", "damage", "chaos", "attack", "speed" }, },
 	["IncreasedAttackSpeed1"] = { type = "Suffix", affix = "of Skill", "(5-7)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 1, group = "IncreasedAttackSpeed", weightKey = { "ring", "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
 	["IncreasedAttackSpeed2"] = { type = "Suffix", affix = "of Ease", "(8-10)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 11, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
+	["IncreasedAttackSpeed2Royale"] = { type = "Suffix", affix = "of Ease", "(8-15)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 4, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
 	["IncreasedAttackSpeed3"] = { type = "Suffix", affix = "of Mastery", "(11-13)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 22, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
 	["IncreasedAttackSpeed4"] = { type = "Suffix", affix = "of Grandmastery", "(14-16)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 76, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
 	["IncreasedAttackSpeedEssenceGloves7"] = { type = "Suffix", affix = "of the Essence", "(17-18)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 82, group = "IncreasedAttackSpeed", weightKey = { "default", }, weightVal = { 0 }, modTags = { "attack", "speed" }, },

src/Data/QueryMods.lua

@@ -23506,12 +23506,16 @@ return {
 				["max"] = 32, 
 				["min"] = 5, 
 			}, 
+			["Gloves"] = {
+				["max"] = 15, 
+				["min"] = 8, 
+			}, 
 			["Ring"] = {
 				["max"] = 16, 
 				["min"] = 5, 
 			}, 
 			["Shield"] = {
-				["max"] = 9, 
+				["max"] = 15, 
 				["min"] = 6, 
 			}, 
 			["Staff"] = {
@@ -50013,7 +50017,7 @@ return {
 			}, 
 			["Gloves"] = {
 				["max"] = 10, 
-				["min"] = 7, 
+				["min"] = 4, 
 			}, 
 			["Staff"] = {
 				["max"] = 15,