From ac9f975c004cbb013f96731270904b1efc81b363 Mon Sep 17 00:00:00 2001
From: Eruyome <prinzeru@gmail.com>
Date: Sun, 18 Nov 2018 17:20:51 +0100
Subject: [PATCH] forcing abyssal sockets for the default search

---
 Fallback.exe                   | Bin 1918464 -> 1918976 bytes
 resources/Updates_Trade.txt    |   1 +
 resources/ahk/POE-ItemInfo.ahk |  12 +++++++-----
 resources/ahk/TradeMacro.ahk   |  14 +++++++++++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Fallback.exe b/Fallback.exe
index 017016c223b01c469e4d8f8e56dfcc913116a64a..f59d975532f15aaf0bbb7ebba4e9192d7d0c536b 100644
GIT binary patch
delta 739
zcmZqZDQ%cgy1|i=QEIXiqdud+<RV5dCYgtu_c10ha>+d8VPH@YWMFvIti{}}#morA
zOh61`vj8zG5VHX>I}mdKF((jn0Wmia^8hg~5c2^s|8^~AfvB|l+3R>1p0F^0fyysg
z1|=X1#`gg7MUeP0X#4^+ehV6Z29W=U5n<kxKe7z%K)Yb(^E24BGiM0^vEX#(ETJco
zo_U!inTa`>RhfC|3dPAqnFS?!dU{Ga3e%ru36+@YC@2M&Bo>u`WOMVAGILTD5(^3-
zDwI4*^S~0t`MIeI`8g>HX+@c-c`3#1VcA04!?K0{DYH8!RTdW~=1kY^7nW>~>K6uL
z5g--?VzKQ}{o=|gVmb;=l|iX#3Q(oN`N`R-CB@TgKZ{?OF8oDYPTVmT=o}>=Mpd!h
z`-`}Snuv~qXGv-<s?_viDG5zkR51lBTV$2({ZbM@EV;d3N@|w(^hy5&g{BL{NlA-)
zrYUHEOw>cwKAo>dN^JUtP$>@n#Q5CIJeYBMj?)#QrF40awM^eoBqimBsvo2to4E>h
z3I>`A_F$)>S*c(J^!0XyG^vE+e5i&^H#Cx#l|mI$&{I%?gpfk;^gu&tmG%Z*X&{!_
K-k>YXBLM(sGTUeX

delta 356
zcmZpeP}<N_y1|i=QDU+aqdp_U<RV5drWN-#?_*42<XUl$hk-#skb&Vrvler^7BeFd
zGXXJ(%>u-%K+Fcj>_E%`#GF9P1;pGy%mc){K+Ffk{M)sd1)|dG)z|PaJYit~gALzh
z8I*u582<{8FM`B>fyV!X#uxa3s$K=i|HFtdPvMs=Lp#tenECt+cJ0hr0zfP{ojFVB
z$#lkSq2l(n*+SdbW()sPZa>&B48$TpEDFS8+Yk1OYo<*5B7R{z`&V%_wduBY6717G
zq$QNvr$|cxvE=qC(o((N(_1s76sAkXNpWwF&ydnN-u^{j8i-}Kf6<rak(h4aE?WWs
DYI9vf

diff --git a/resources/Updates_Trade.txt b/resources/Updates_Trade.txt
index b5bac002..3ccbec2c 100644
--- a/resources/Updates_Trade.txt
+++ b/resources/Updates_Trade.txt
@@ -8,6 +8,7 @@ The following is a list of what has been updated, starting with 1.1.0
 	** Requires a successfully loaded custom loot filter.
 	** This feature is part of `Additional Macros` and can be changed/disabled in the respective settings tab.
 	** Probably not bug-free at this point.
+* Changed the default search to force the number of Abyssal Sockets if the item has any. So far this was only possible by using the advanced search.
 * Updated all data files, as usual (uniques etc).
 * Changed requests to poe.ninja to use HTTPS instead of HTTP.
 
diff --git a/resources/ahk/POE-ItemInfo.ahk b/resources/ahk/POE-ItemInfo.ahk
index 811277f1..b9e2741b 100644
--- a/resources/ahk/POE-ItemInfo.ahk
+++ b/resources/ahk/POE-ItemInfo.ahk
@@ -330,6 +330,7 @@ class Item_ {
 		This.MapTier		:= ""
 		This.MaxSockets	:= ""
 		This.Sockets		:= ""
+		This.AbyssalSockets	:= ""
 		This.SocketGroups	:= []
 		This.Links		:= ""
 		This.SubType		:= ""		
@@ -7429,7 +7430,7 @@ ParseLinks(ItemDataText)
 	return HighestLink
 }
 
-ParseSockets(ItemDataText)
+ParseSockets(ItemDataText, ByRef AbyssalSockets)
 {
 	SocketsCount := 0
 	
@@ -7438,11 +7439,11 @@ ParseSockets(ItemDataText)
 		If (RegExMatch(A_LoopField, "i)^Sockets\s?+:"))
 		{
 			LinksString	:= GetColonValue(A_LoopField)
-			RegExReplace(LinksString, "i)[RGBWDA]", "", SocketsCount) ; "D" is being used for Resonator sockets, "A" for Abyssal Sockets
+			RegExReplace(LinksString, "i)[RGBWDA]", "", SocketsCount) 	; "D" is being used for Resonator sockets, "A" for Abyssal Sockets
+			RegExReplace(LinksString, "i)[A]", "", AbyssalSockets) 	; "A" for Abyssal Sockets
 			Break
 		}
 	}
-
 	return SocketsCount
 }
 
@@ -7932,9 +7933,10 @@ ParseItemData(ItemDataText, ByRef RarityLevel="")
 	
 	ItemData.Links		:= ParseLinks(ItemDataText)
 	Item.Links		:= ItemData.Links
-	ItemData.Sockets	:= ParseSockets(ItemDataText)	
+	ItemData.Sockets	:= ParseSockets(ItemDataText, ItemAbyssalSockets)
 	Item.Sockets		:= ItemData.Sockets
-	Item.SocketGroups	:= ParseSocketGroups(ItemDataText)
+	Item.AbyssalSockets := ItemAbyssalSockets
+	Item.SocketGroups	:= ParseSocketGroups(ItemDataText) 
 
 	Item.Charges		:= ParseCharges(ItemData.Stats)
 
diff --git a/resources/ahk/TradeMacro.ahk b/resources/ahk/TradeMacro.ahk
index 53d0fb6b..0bd81bff 100644
--- a/resources/ahk/TradeMacro.ahk
+++ b/resources/ahk/TradeMacro.ahk
@@ -840,6 +840,17 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 		}		
 	}
 	
+	/*
+		handle abyssal sockets for the default search
+		*/
+	If (AdvancedPriceCheckItem.mods.length() <= 0) {
+		If (Item.AbyssalSockets > 0) {
+			RequestParams.sockets_a_min := Item.AbyssalSockets
+			RequestParams.sockets_a_max := Item.AbyssalSockets
+			Item.UsedInSearch.AbyssalSockets := (Item.AbyssalSockets > 0) ? Item.AbyssalSockets : ""
+		}	
+	}
+	
 	/*
 		make sure to not look for unique items when searching rare/white/magic items
 		*/
@@ -862,7 +873,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 		
 		/*
 			add genus
-			*/		
+			*/
 		If (not isAdvancedPriceCheckRedirect) {
 			modParam := new _ParamMod()
 			modParam.mod_name := TradeFunc_FindInModGroup(TradeGlobals.Get("ModsData")["bestiary"], Item.BeastData.GenusMod)
@@ -2640,6 +2651,7 @@ TradeFunc_ParseHtml(html, payload, iLvl = "", ench = "", isItemAgeRequest = fals
 			Title .= (Item.UsedInSearch.Enchantment)  ? "Enchantment " : ""
 			Title .= (Item.UsedInSearch.CorruptedMod) ? "Corr. Implicit " : ""
 			Title .= (Item.UsedInSearch.Sockets)      ? "| " . Item.UsedInSearch.Sockets . "S " : ""
+			Title .= (Item.UsedInSearch.AbyssalSockets) ? "| " . Item.UsedInSearch.AbyssalSockets . " Abyss Sockets " : ""
 			Title .= (Item.UsedInSearch.Links)        ? "| " . Item.UsedInSearch.Links   . "L " : ""
 			If (Item.UsedInSearch.iLvl.min and Item.UsedInSearch.iLvl.max) {
 				Title .= "| iLvl (" . Item.UsedInSearch.iLvl.min . "-" . Item.UsedInSearch.iLvl.max . ")"