Fixes and Metamorph league prep (#1052)

* data file updates * Added update version check exception GUI instead of msgbox * fixed a typo and the exact currency search fallback not working * workaround for poe.trade not knowing about warstaves * fixed abyssal sockets issues when including max sockets * updated curl.exe * changed affixlookup to use poedb * improved warstaff/runde dagger item type workaround * updated gemlist * ItemInfo new influence parsing * initial support for multiple incluences on items ("special base") * always add map tier to support new atlas * ring/amulet (catalyst) quality parsing * basic search implementation for jewelry quality * updated version and notes * improved implicit parsing * more data file updates
PoE-TradeMacro · Dec 13, 2019 · 5ea4431 · 5ea4431
1 parent a2f6e73
commit 5ea4431
Show file tree

Hide file tree

Showing 14 changed files with 610 additions and 388 deletions.
diff --git a/data/DivinationCardList.txt b/data/DivinationCardList.txt
diff --git a/data/GemQualityList.txt b/data/GemQualityList.txt
diff --git a/data/MapList.txt b/data/MapList.txt
diff --git a/data_trade/helmet_enchantment_mods.txt b/data_trade/helmet_enchantment_mods.txt
@@ -512,6 +512,7 @@ Lightning Golems deal #% increased Damage
 Summoned Raging Spirits deal #% increased Damage
 Skeletons deal #% increased Damage
 #% chance to Summon an additional Skeleton Warrior with Summon Skeleton
+#% chance to Summon an additional Skeleton Warrior with Summon Skeletons
 Summoned Skitterbots have #% increased Area of Effect
 Summon Skitterbots has #% reduced Mana Reservation
 Stone Golems deal #% increased Damage

diff --git a/data_trade/item_bases_armour.json b/data_trade/item_bases_armour.json
diff --git a/data_trade/mods.json b/data_trade/mods.json
diff --git a/data_trade/prophecy_details.json b/data_trade/prophecy_details.json
diff --git a/data_trade/uniques.json b/data_trade/uniques.json
diff --git a/lib/PoEScripts_Update.ahk b/lib/PoEScripts_Update.ahk
@@ -94,7 +94,7 @@ GetLatestRelease(user, repo, ReleaseVersion, ShowUpdateNotification, userDirecto
 		description := LatestRelease.body
 
 		RegExReplace(releaseTag, "^v", releaseTag)
-		versions := ParseVersionStringsToObject(releaseTag, ReleaseVersion)
+		versions := ParseVersionStringsToObject(releaseTag, ReleaseVersion, repo)
 
 		newRelease := CompareVersions(versions.latest, versions.current)
 		If (newRelease and repo = "PoE-TradeMacro") {
@@ -251,7 +251,7 @@ RemoveLeadingZeros(in) {
 	Return LTrim(in, "0")
 }
 
-ParseVersionStringsToObject(latest, current) {
+ParseVersionStringsToObject(latest, current, repo) {
      ; requires valid semantic versioning
 	; x.x.x
 	; vx.x.x
@@ -262,7 +262,13 @@ ParseVersionStringsToObject(latest, current) {
 	RegExMatch(current, "(\d+).(\d+).(\d+)(.*)", currentVersion)
 
 	If (StrLen(latest) < 1) {
-		MsgBox, 16,, % "Exception thrown! Parsing release information from Github failed."
+		Gui, UpdateVersionException:New
+		Gui, UpdateVersionException:Font, Verdana
+		Gui, UpdateVersionException:Add, Text, , % "Exception thrown while checking for updates!`n`nParsing release information from Github failed."
+		Gui, UpdateVersionException:Show, NA w300, %repo% - Error 
+
+		;TrayTip, %repo%, % "Update check failed while parsing`nrelease information from Github."
+		;MsgBox, 16,, % "Exception thrown! Parsing release information from Github failed."
 	}
 
 	versions := {}

diff --git a/lib/curl.exe b/lib/curl.exe
diff --git a/resources/Updates_Trade.txt b/resources/Updates_Trade.txt
@@ -1,5 +1,19 @@
 The following is a list of what has been updated, starting with 1.1.0
 
+2.15.4
+================================================================================================
+* Added parsing and search options for the new influence types (Hunter, Redeemer, Warlord, Crusader).
+* Added support for multiple influences on items.
+* Added basic search options for quality (catalysed) on rings and amulets.
+* Maps now have always their map tier included in searches.
+* Searches using the item type now use "Staff"/"Dagger" instead of "Warstaff"/"Rune Dagger" as a bad workaround for poe.trade not knowing these types exist.
+* Changed the item affix lookup macro to now use poedb.tw instead of poeaffix.net.
+* Updated cURL.
+* Fixed rare items with abyssal sockets not being parsed correctly for the advanced search.
+* Fixed wrong number of normal sockets being included in the advanced search when an item has an abyssal socket.
+* Fixed macro update version check exception/error message activate focused, which could unfocus the game. Which is bad.
+* Updated data files (uniques etc.).
+
 2.15.3
 ================================================================================================
 * Changed the default (main) hotkeys from using "ctrl" to using "alt" to prevent conflicts with PoEs new second skillbar hotkeys. This will not change any settings of existing TradeMacro installations.

diff --git a/resources/VersionTrade.txt b/resources/VersionTrade.txt
@@ -1,2 +1,2 @@
-TradeReleaseVersion := "v2.15.3"
+TradeReleaseVersion := "v2.15.4"
 TradeAHKVersionRequired := "1.1.26.00"