Skip to content

Commit 7e78b50

Browse files
committed
crafted mods parsing hotfix
1 parent bbf1123 commit 7e78b50

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

data_trade/uniques.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

resources/Updates_Trade.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
The following is a list of what has been updated, starting with 1.1.0
22

3+
2.14.1
4+
================================================================================================
5+
* Hotfixed the parsing of crafted mords (advanced search) which was broken in PoE 3.6.
6+
* Updated data files (uniques, supported mods).
7+
38
2.14.0
49
================================================================================================
510
* Initial support for the Synthesis league (synthesised and fractured items):

resources/VersionTrade.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
TradeReleaseVersion := "v2.14.0"
1+
TradeReleaseVersion := "v2.14.1"
22
TradeAHKVersionRequired := "1.1.26.00"

resources/ahk/POE-ItemInfo.ahk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3955,7 +3955,7 @@ ParseAffixes(ItemDataAffixes, Item)
39553955
; --- PRE-PASS ---
39563956
Loop, Parse, ItemDataChunk, `n, `r
39573957
{
3958-
LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured\)$")
3958+
LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured|crafted\)$")
39593959
If StrLen(LoopField) = 0
39603960
{
39613961
Continue ; Not interested in blank lines
@@ -4210,7 +4210,7 @@ ParseAffixes(ItemDataAffixes, Item)
42104210
; --- PRE-PASS ---
42114211
Loop, Parse, ItemDataChunk, `n, `r
42124212
{
4213-
LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured\)$")
4213+
LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured|crafted\)$")
42144214
If StrLen(LoopField) = 0
42154215
{
42164216
Continue ; Not interested in blank lines
@@ -4252,7 +4252,7 @@ ParseAffixes(ItemDataAffixes, Item)
42524252

42534253
Loop, Parse, ItemDataChunk, `n, `r
42544254
{
4255-
LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured\)$")
4255+
LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured|crafted\)$")
42564256
If StrLen(LoopField) = 0
42574257
{
42584258
Continue ; Not interested in blank lines
@@ -8636,7 +8636,7 @@ ModStringToObject(string, isImplicit) {
86368636
RegExMatch(val, "i) \((fractured)\)$", sType)
86378637
spawnType := sType1
86388638

8639-
val := RegExReplace(val, "i) \((fractured)\)$")
8639+
val := RegExReplace(val, "i) \((fractured|crafted)\)$")
86408640

86418641
; Collect all numeric values in the mod-string
86428642
Pos := 0
@@ -8837,7 +8837,7 @@ CreatePseudoMods(mods, returnAllMods := False) {
88378837
mod.spawnType := spawnType1
88388838
}
88398839

8840-
mod.name := RegExReplace(mod.name, "i) \((fractured)\)$")
8840+
mod.name := RegExReplace(mod.name, "i) \((fractured|crafted)\)$")
88418841

88428842
; ### Base stats
88438843
; life and mana

resources/ahk/TradeMacro.ahk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3517,7 +3517,7 @@ TradeFunc_RemoveAlternativeVersionsMods(_item, Affixes) {
35173517
spawnType := ""
35183518
For key, val in Affixes {
35193519
RegExMatch(Trim(val), "i)\((fractured)\)", sType)
3520-
val := RegExReplace(Trim(val), "i)\((fractured)\)")
3520+
val := RegExReplace(Trim(val), "i)\((fractured|crafted)\)")
35213521

35223522
; remove negative sign also
35233523
t := TradeUtils.CleanUp(RegExReplace(val, "i)-?[\d\.]+", "#"))
@@ -3559,7 +3559,7 @@ TradeFunc_RemoveAlternativeVersionsMods(_item, Affixes) {
35593559
}
35603560

35613561
For key, val in Affixes {
3562-
val := RegExReplace(Trim(val), "i)\((fractured)\)")
3562+
val := RegExReplace(Trim(val), "i)\((fractured|crafted)\)")
35633563

35643564
t := TradeUtils.CleanUp(RegExReplace(val, "i)-?[\d\.]+", "#"))
35653565
modFound := false
@@ -4003,7 +4003,7 @@ TradeFunc_GetModValueGivenPoeTradeMod(itemModifiers, poeTradeMod) {
40034003
{
40044004
Continue ; Not interested in blank lines
40054005
}
4006-
LoopField := Trim(RegExReplace(A_LoopField, "i)\((fractured)\)"))
4006+
LoopField := Trim(RegExReplace(A_LoopField, "i)\((fractured|crafted)\)"))
40074007

40084008
ModStr := ""
40094009
CurrValues := []

0 commit comments

Comments
 (0)