crafted mods parsing hotfix

PoE-TradeMacro · Mar 9, 2019 · 7e78b50 · 7e78b50
1 parent bbf1123
commit 7e78b50
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/data_trade/uniques.json b/data_trade/uniques.json
diff --git a/resources/Updates_Trade.txt b/resources/Updates_Trade.txt
@@ -1,5 +1,10 @@
 The following is a list of what has been updated, starting with 1.1.0
 
+2.14.1
+================================================================================================
+* Hotfixed the parsing of crafted mords (advanced search) which was broken in PoE 3.6.
+* Updated data files (uniques, supported mods).
+
 2.14.0
 ================================================================================================
 * Initial support for the Synthesis league (synthesised and fractured items):

diff --git a/resources/VersionTrade.txt b/resources/VersionTrade.txt
@@ -1,2 +1,2 @@
-TradeReleaseVersion := "v2.14.0"
+TradeReleaseVersion := "v2.14.1"
 TradeAHKVersionRequired := "1.1.26.00"
diff --git a/resources/ahk/POE-ItemInfo.ahk b/resources/ahk/POE-ItemInfo.ahk
@@ -3955,7 +3955,7 @@ ParseAffixes(ItemDataAffixes, Item)
 		; --- PRE-PASS ---
 		Loop, Parse, ItemDataChunk, `n, `r
 		{			
-			LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured\)$")
+			LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured|crafted\)$")
 			If StrLen(LoopField) = 0
 			{
 				Continue ; Not interested in blank lines
@@ -4210,7 +4210,7 @@ ParseAffixes(ItemDataAffixes, Item)
 		; --- PRE-PASS ---
 		Loop, Parse, ItemDataChunk, `n, `r
 		{
-			LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured\)$")
+			LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured|crafted\)$")
 			If StrLen(LoopField) = 0
 			{
 				Continue ; Not interested in blank lines
@@ -4252,7 +4252,7 @@ ParseAffixes(ItemDataAffixes, Item)
 
 	Loop, Parse, ItemDataChunk, `n, `r
 	{		
-		LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured\)$")
+		LoopField := RegExReplace(Trim(A_LoopField), "i) \(fractured|crafted\)$")
 		If StrLen(LoopField) = 0
 		{
 			Continue ; Not interested in blank lines
@@ -8636,7 +8636,7 @@ ModStringToObject(string, isImplicit) {
 	RegExMatch(val, "i) \((fractured)\)$", sType)
 	spawnType := sType1
 
-	val := RegExReplace(val, "i) \((fractured)\)$")
+	val := RegExReplace(val, "i) \((fractured|crafted)\)$")
 
 	; Collect all numeric values in the mod-string
 	Pos        := 0
@@ -8837,7 +8837,7 @@ CreatePseudoMods(mods, returnAllMods := False) {
 			mod.spawnType := spawnType1	
 		}		
 
-		mod.name := RegExReplace(mod.name, "i) \((fractured)\)$")
+		mod.name := RegExReplace(mod.name, "i) \((fractured|crafted)\)$")
 
 		; ### Base stats
 		; life and mana

diff --git a/resources/ahk/TradeMacro.ahk b/resources/ahk/TradeMacro.ahk
@@ -3517,7 +3517,7 @@ TradeFunc_RemoveAlternativeVersionsMods(_item, Affixes) {
 		spawnType := ""
 		For key, val in Affixes {
 			RegExMatch(Trim(val), "i)\((fractured)\)", sType)
-			val := RegExReplace(Trim(val), "i)\((fractured)\)")
+			val := RegExReplace(Trim(val), "i)\((fractured|crafted)\)")
 
 			; remove negative sign also			
 			t := TradeUtils.CleanUp(RegExReplace(val, "i)-?[\d\.]+", "#"))
@@ -3559,7 +3559,7 @@ TradeFunc_RemoveAlternativeVersionsMods(_item, Affixes) {
 	}
 
 	For key, val in Affixes {
-		val := RegExReplace(Trim(val), "i)\((fractured)\)")
+		val := RegExReplace(Trim(val), "i)\((fractured|crafted)\)")
 
 		t := TradeUtils.CleanUp(RegExReplace(val, "i)-?[\d\.]+", "#"))		
 		modFound := false
@@ -4003,7 +4003,7 @@ TradeFunc_GetModValueGivenPoeTradeMod(itemModifiers, poeTradeMod) {
 		{
 			Continue ; Not interested in blank lines
 		}		
-		LoopField := Trim(RegExReplace(A_LoopField, "i)\((fractured)\)"))
+		LoopField := Trim(RegExReplace(A_LoopField, "i)\((fractured|crafted)\)"))
 
 		ModStr := ""
 		CurrValues := []