Skip to content

Commit ac9f975

Browse files
committed
forcing abyssal sockets for the default search
1 parent 8094b4c commit ac9f975

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

Fallback.exe

512 Bytes
Binary file not shown.

resources/Updates_Trade.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The following is a list of what has been updated, starting with 1.1.0
88
** Requires a successfully loaded custom loot filter.
99
** This feature is part of `Additional Macros` and can be changed/disabled in the respective settings tab.
1010
** Probably not bug-free at this point.
11+
* 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.
1112
* Updated all data files, as usual (uniques etc).
1213
* Changed requests to poe.ninja to use HTTPS instead of HTTP.
1314

resources/ahk/POE-ItemInfo.ahk

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ class Item_ {
330330
This.MapTier := ""
331331
This.MaxSockets := ""
332332
This.Sockets := ""
333+
This.AbyssalSockets := ""
333334
This.SocketGroups := []
334335
This.Links := ""
335336
This.SubType := ""
@@ -7429,7 +7430,7 @@ ParseLinks(ItemDataText)
74297430
return HighestLink
74307431
}
74317432

7432-
ParseSockets(ItemDataText)
7433+
ParseSockets(ItemDataText, ByRef AbyssalSockets)
74337434
{
74347435
SocketsCount := 0
74357436

@@ -7438,11 +7439,11 @@ ParseSockets(ItemDataText)
74387439
If (RegExMatch(A_LoopField, "i)^Sockets\s?+:"))
74397440
{
74407441
LinksString := GetColonValue(A_LoopField)
7441-
RegExReplace(LinksString, "i)[RGBWDA]", "", SocketsCount) ; "D" is being used for Resonator sockets, "A" for Abyssal Sockets
7442+
RegExReplace(LinksString, "i)[RGBWDA]", "", SocketsCount) ; "D" is being used for Resonator sockets, "A" for Abyssal Sockets
7443+
RegExReplace(LinksString, "i)[A]", "", AbyssalSockets) ; "A" for Abyssal Sockets
74427444
Break
74437445
}
74447446
}
7445-
74467447
return SocketsCount
74477448
}
74487449

@@ -7932,9 +7933,10 @@ ParseItemData(ItemDataText, ByRef RarityLevel="")
79327933

79337934
ItemData.Links := ParseLinks(ItemDataText)
79347935
Item.Links := ItemData.Links
7935-
ItemData.Sockets := ParseSockets(ItemDataText)
7936+
ItemData.Sockets := ParseSockets(ItemDataText, ItemAbyssalSockets)
79367937
Item.Sockets := ItemData.Sockets
7937-
Item.SocketGroups := ParseSocketGroups(ItemDataText)
7938+
Item.AbyssalSockets := ItemAbyssalSockets
7939+
Item.SocketGroups := ParseSocketGroups(ItemDataText)
79387940

79397941
Item.Charges := ParseCharges(ItemData.Stats)
79407942

resources/ahk/TradeMacro.ahk

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,17 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
840840
}
841841
}
842842

843+
/*
844+
handle abyssal sockets for the default search
845+
*/
846+
If (AdvancedPriceCheckItem.mods.length() <= 0) {
847+
If (Item.AbyssalSockets > 0) {
848+
RequestParams.sockets_a_min := Item.AbyssalSockets
849+
RequestParams.sockets_a_max := Item.AbyssalSockets
850+
Item.UsedInSearch.AbyssalSockets := (Item.AbyssalSockets > 0) ? Item.AbyssalSockets : ""
851+
}
852+
}
853+
843854
/*
844855
make sure to not look for unique items when searching rare/white/magic items
845856
*/
@@ -862,7 +873,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
862873

863874
/*
864875
add genus
865-
*/
876+
*/
866877
If (not isAdvancedPriceCheckRedirect) {
867878
modParam := new _ParamMod()
868879
modParam.mod_name := TradeFunc_FindInModGroup(TradeGlobals.Get("ModsData")["bestiary"], Item.BeastData.GenusMod)
@@ -2640,6 +2651,7 @@ TradeFunc_ParseHtml(html, payload, iLvl = "", ench = "", isItemAgeRequest = fals
26402651
Title .= (Item.UsedInSearch.Enchantment) ? "Enchantment " : ""
26412652
Title .= (Item.UsedInSearch.CorruptedMod) ? "Corr. Implicit " : ""
26422653
Title .= (Item.UsedInSearch.Sockets) ? "| " . Item.UsedInSearch.Sockets . "S " : ""
2654+
Title .= (Item.UsedInSearch.AbyssalSockets) ? "| " . Item.UsedInSearch.AbyssalSockets . " Abyss Sockets " : ""
26432655
Title .= (Item.UsedInSearch.Links) ? "| " . Item.UsedInSearch.Links . "L " : ""
26442656
If (Item.UsedInSearch.iLvl.min and Item.UsedInSearch.iLvl.max) {
26452657
Title .= "| iLvl (" . Item.UsedInSearch.iLvl.min . "-" . Item.UsedInSearch.iLvl.max . ")"

0 commit comments

Comments
 (0)