From 7bf881f9f51f9dd64ae6a523cfb8e589750c79c8 Mon Sep 17 00:00:00 2001
From: Manuel Schermuly <prinzeru@gmail.com>
Date: Mon, 11 Dec 2017 17:01:36 +0100
Subject: [PATCH] map search fix

---
 Fallback.exe                 | Bin 1828352 -> 1828352 bytes
 resources/Updates_Trade.txt  |   4 ++++
 resources/VersionTrade.txt   |   2 +-
 resources/ahk/TradeMacro.ahk |  21 +++++++++++++++++----
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Fallback.exe b/Fallback.exe
index c25a3a7d3576cbd3bf3a8672dc43d7ef48390bf9..9e02c8a22b8718f530e9083fd3a2ddd1d1e5d2ee 100644
GIT binary patch
delta 581
zcmZoTlizSAf5RR|rYG|^?_*2?(alQC?MlpyK+FWhAT|pSvjQ<25VHd@2M}`tF&7YX
z12GQ}^8zs+5c6+WVirhpt53@1W_ZHF00wVX$S^1YSuno9N*M+bB)$q7-vW*AgT_w)
z^8YX*%!^qq!_W@23uZn)gIznbm%w&rFTofYM&tH`G(jL10%Bnx76D>WAQs!6kS2b<
zdHTXv;ttcj8zec~dtQle?|CJ$uPo6mzepiFwNgi+EHOtRGf%;@BsEtrv^X`zGcPzb
zu_!r1p_<DxO+h2G*gq*NHMv9ss7_N8BnVU(4b&N{U}dXNUCULg;F?pMiYCET%eCDj
zQ8L14x~QHM|MUgXl3dddPL@=h{_wqo$n-v-Q`|%Ivh(uG^Avm&3zT#eGK-;nAXgJ?
zabA82P}C!_C@C{9J+%lZu8^3Qq5u&_D4x#PBB?O_^h`<4>D*H!!>89xk=!f-a(Hk_
zkxyzK(EU)g)9+1|RGIGE0(41Fy`-RMNo7GQ$O~YPJ0%vU`X%P3w(Cum1Y)V}dQ+tj
Pc`yYyZvSvsT7(?{s*$Pe

delta 623
zcmZoTlizSAf5RR|rWf-z?_*2?(alQC?MlpyK+FWhAT|pSvjQ<25VHd@2M}`tF&7YX
z12GQ}^8zs+5c6+WVirhptIx>cW_ZHF00tkH%P=SbSunoH3K<3wB)$e3-v*5zfW}V&
z^8YX*%u84$!_W@23uZn)gIznbm%w&rFTofYMx*wGG(jL10%Bnx76D>WAQs!6kS2b<
zSwtbfNWrrtHCNBG*fl35wa6*4IJI5>mH2l3R}$>y+h-<9h8a!YQZFGq{nunk{pspc
zC55KXpCXwjot&RnoS&1bmy@5aky-4KSd^5Rm!4YWn^>SZooA}#mUiuFl0YoAU3;4J
kevj>M?n#TV*SmQ7xd%A9fT)NFD1(mtTCmM@v=GHU0M*p0^8f$<

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) {