diff --git a/Fallback.exe b/Fallback.exe index c25a3a7d..9e02c8a2 100644 Binary files a/Fallback.exe and b/Fallback.exe differ diff --git a/resources/Updates_Trade.txt b/resources/Updates_Trade.txt index 55aa6c53..177797a3 100644 --- a/resources/Updates_Trade.txt +++ b/resources/Updates_Trade.txt @@ -1,5 +1,9 @@ The following is a list of what has been updated, starting with 1.1.0 +2.6.3 +================================================================================================ +Fixed an issue that caused the new maps not being searched correctly. + 2.6.2 ================================================================================================ Added the new mods available on poe.trade. diff --git a/resources/VersionTrade.txt b/resources/VersionTrade.txt index 5e9f233f..d64a1b50 100644 --- a/resources/VersionTrade.txt +++ b/resources/VersionTrade.txt @@ -1,2 +1,2 @@ -TradeReleaseVersion := "v2.6.2" +TradeReleaseVersion := "v2.6.3" TradeAHKVersionRequired := "1.1.26.00" diff --git a/resources/ahk/TradeMacro.ahk b/resources/ahk/TradeMacro.ahk index d1135425..2c996683 100644 --- a/resources/ahk/TradeMacro.ahk +++ b/resources/ahk/TradeMacro.ahk @@ -199,6 +199,13 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva Item.xtype := "" Item.UsedInSearch := {} Item.UsedInSearch.iLvl := {} + For key, val in Item.UsedInSearch { + If (isObject(val)) { + Item[key] := {} + } Else { + Item[key] := + } + } RequestParams := new RequestParams_() RequestParams.league := LeagueName @@ -638,17 +645,19 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva If (Item.IsMap) { ; add Item.subtype to make sure to only find maps - If (not RegExMatch(Item.Name, "i)The Beachhead.*", isHarbingerMap)) { + RegExMatch(Item.Name, "i)The Beachhead.*", isHarbingerMap) + RegExMatch(Item.SubType, "i)Unknown Map", isUnknownMap) + If (not isHarbingerMap and not isUnknownMap) { RequestParams.xbase := Item.SubType } Else { RequestParams.xbase := "" } + RequestParams.xtype := "" If (not Item.IsUnique) { - console.log(isHarbingerMap) If (StrLen(isHarbingerMap)) { ; Beachhead Map workaround (unique but not flagged as such on poe.trade) - RequestParams.name := Item.Name + RequestParams.name := Item.Name } Else { RequestParams.name := "" } @@ -658,6 +667,11 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva If (InStr(Name, "Ivory Temple")){ RequestParams.xbase := "Ivory Temple Map" } + + If (StrLen(isUnknownMap)) { + RequestParams.xbase := Item.BaseName + Item.UsedInSearch.type := Item.BaseName + } } ; handle gems @@ -748,7 +762,6 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva If (TradeOpts.Debug) { ;console.log(RequestParams) } - Payload := RequestParams.ToPayload() If (openSearchInBrowser) {