various fixes (#789)

* more dvorak support * fixed advanced search ignoring names of unique jewels * data updates * notes/version
PoE-TradeMacro · Sep 5, 2018 · 1a3873c · 1a3873c
1 parent 8617d22
commit 1a3873c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/Fallback.exe b/Fallback.exe
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/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.10.9
+================================================================================================
+* Fixed an issue where the advanced search could ignore/omit the name of unique jewels.
+* Improved support for different keyboard layouts.
+
 2.10.8
 ================================================================================================
 * Added additional information to the predicted pricing results to show in what way the mods/properties contribute to the predicted price.

diff --git a/resources/VersionTrade.txt b/resources/VersionTrade.txt
@@ -1,2 +1,2 @@
-TradeReleaseVersion := "v2.10.8"
+TradeReleaseVersion := "v2.10.9"
 TradeAHKVersionRequired := "1.1.26.00"
diff --git a/resources/ahk/POE-ItemInfo.ahk b/resources/ahk/POE-ItemInfo.ahk
@@ -11684,8 +11684,9 @@ GetScanCodes() {
 	; 0xF002 = "Dvorak"
 	; 0xF01B = "Dvorak right handed"
 	; 0xF01A = "Dvorak left handed"
+	; 0xF01C0809 = some other Dvorak layout
 
-	If (RegExMatch(InputLocaleID, "i)^(0xF002|0xF01B|0xF01A).*")) {
+	If (RegExMatch(InputLocaleID, "i)^(0xF002|0xF01B|0xF01A|0xF01C0809).*")) {
 		; dvorak
 		sc := {"c" : "sc017", "v" : "sc034", "f" : "sc015", "a" : "sc01E", "enter" : "sc01C"}
 		project := Globals.Set("ProjectName")

diff --git a/resources/ahk/TradeMacro.ahk b/resources/ahk/TradeMacro.ahk
@@ -161,7 +161,7 @@ TradeFunc_OpenWikiHotkey(priceCheckTest = false, itemData = "") {
 			TradeFunc_OpenUrlInBrowser("http://poedb.tw/us/")
 		} Else {
 			TradeFunc_OpenUrlInBrowser("http://pathofexile.gamepedia.com/")	
-		}		
+		}	
 	}
 	Else {
 		UrlAffix := ""
@@ -421,7 +421,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 	/*
 		ignore item name in certain cases
 		*/ 
-	If (!Item.IsJewel and !Item.IsLeaguestone and Item.RarityLevel > 1 and Item.RarityLevel < 4 and !Item.IsFlask or (Item.IsJewel and isAdvancedPriceCheckRedirect)) {
+	If (!Item.IsJewel and !Item.IsLeaguestone and Item.RarityLevel > 1 and Item.RarityLevel < 4 and !Item.IsFlask or (Item.IsJewel and not Item.RarityLevel = 4 and isAdvancedPriceCheckRedirect)) {
 		IgnoreName := true
 	}
 	If (Item.RarityLevel > 0 and Item.RarityLevel < 4 and (Item.IsWeapon or Item.IsArmour or Item.IsRing or Item.IsBelt or Item.IsAmulet)) {
@@ -435,7 +435,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 			IgnoreName := false
 		} Else {
 			IgnoreName := true
-		}		
+		}
 	}
 
 	If (Item.IsLeagueStone) {
@@ -839,7 +839,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 			Item.UsedInSearch.Type := (Item.xtype) ? Item.GripType . " " . Item.SubType : Item.SubType	
 		}		
 	}
-
+	
 	/*
 		make sure to not look for unique items when searching rare/white/magic items
 		*/