fixed crusader influence type request params; converted files to UTF-…

…8 BOM (#1061) * fixed incorrect crusader influence type request param; changed file encodings to utf-8 bom * updated data files, notes
PoE-TradeMacro · Dec 16, 2019 · a300320 · a300320
1 parent cfcf89e
commit a300320
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 32 deletions.
diff --git a/Run_TradeMacro.ahk b/Run_TradeMacro.ahk
@@ -1,4 +1,4 @@
-; #####################################################################################################################
+; #####################################################################################################################
 ; # This script checks if the right AHK version is installed and runs the TradeMacro merge script.
 ; #####################################################################################################################
 #SingleInstance, Force

diff --git a/data_trade/currency_tags.json b/data_trade/currency_tags.json
diff --git a/data_trade/uniques.json b/data_trade/uniques.json
diff --git a/lib/AssociatedProgram.ahk b/lib/AssociatedProgram.ahk
@@ -1,4 +1,4 @@
-;-- Function: AssociatedProgram
+;-- Function: AssociatedProgram
 ;-- Description: Returns the full path of the program (if any) associated to
 ;   a file extension (p_FileExt).
 ;-- Original author: TheGood

diff --git a/lib/Class_AdvancedToolTipGui.ahk b/lib/Class_AdvancedToolTipGui.ahk
@@ -1,4 +1,4 @@
-; AutoHotkey
+; AutoHotkey
 ; Language:       	English 
 ; Authors:		Eruyome |	https://github.com/eruyome
 ;

diff --git a/lib/Class_ColorPicker.ahk b/lib/Class_ColorPicker.ahk
@@ -1,4 +1,4 @@
-; AutoHotkey Version: 1.1.12.00
+; AutoHotkey Version: 1.1.12.00
 ; Language:       	English
 ; Dev Platform:   	Windows 7 Home Premium x64
 ; Original Author:	Joe DF  |  http://joedf.co.nr  |  joedf@users.sourceforge.net

diff --git a/lib/Class_Console.ahk b/lib/Class_Console.ahk
@@ -1,4 +1,4 @@
-/*
+/*
 Name:			[Class] Console
 Version:			1.8 (Tue March 11, 2014)
 Created:		Tue February 11, 2014

diff --git a/lib/Class_GdipTooltip.ahk b/lib/Class_GdipTooltip.ahk
@@ -1,4 +1,4 @@
-; AutoHotkey
+; AutoHotkey
 ; Language:       	English 
 ; Authors:		esunder | https://github.com/esunder
 ;				Eruyome |	https://github.com/eruyome

diff --git a/lib/DebugPrintArray.ahk b/lib/DebugPrintArray.ahk
@@ -1,4 +1,4 @@
-DebugPrintArray(Array, Display=1, Level=0, guiWidth=800, guiHeight=900)
+DebugPrintArray(Array, Display=1, Level=0, guiWidth=800, guiHeight=900)
 {
 	Global DebugPrintArray
 

diff --git a/lib/EasyIni.ahk b/lib/EasyIni.ahk
@@ -1,4 +1,4 @@
-; #############################################################################################################
+; #############################################################################################################
 ; # Verdlin's INI library
 ; # Original thread: https://autohotkey.com/board/topic/91578-class-easyini-native-syntax-inisectionkey-val-formatting-retained/
 ; # Original source code: https://github.com/Aatoz/AutoHotKey/blob/master/Lib/class_EasyIni.ahk

diff --git a/lib/Gdip2.ahk b/lib/Gdip2.ahk
@@ -1,4 +1,4 @@
-class Gdip
+class Gdip
 {
 	__New()
 	{

diff --git a/lib/IEComObjectTestCall.ahk b/lib/IEComObjectTestCall.ahk
@@ -1,4 +1,4 @@
-#SingleInstance, force
+#SingleInstance, force
 
 userFolderPath = %1%
 

diff --git a/lib/JSON.ahk b/lib/JSON.ahk
@@ -1,4 +1,4 @@
-/**
+/**
  * Lib: JSON.ahk
  *     JSON lib for AutoHotkey.
  * Version:

diff --git a/lib/PoEScripts_DownloadLanguageFiles.ahk b/lib/PoEScripts_DownloadLanguageFiles.ahk
@@ -1,4 +1,4 @@
-PoEScripts_DownloadLanguageFiles(ByRef currentLocale, dlAll = false, SplashTitle = "", SplashText = "", onlyParseFiles = false) {
+PoEScripts_DownloadLanguageFiles(ByRef currentLocale, dlAll = false, SplashTitle = "", SplashText = "", onlyParseFiles = false) {
 	; onlyParseFiles = skip downloading anything for development purposes (if the data files exist).
 	currentLocale := PoEScripts_GetClientLanguage()
 	If (currentLocale = "en" or not currentLocale) {

diff --git a/lib/_Struct.ahk b/lib/_Struct.ahk
@@ -1,4 +1,4 @@
-;: Title: _Struct by HotKeyIt
+;: Title: _Struct by HotKeyIt
 ;
 
 ; Function: _Struct

diff --git a/lib/sizeof.ahk b/lib/sizeof.ahk
@@ -1,4 +1,4 @@
-;: Title: sizeof function by HotKeyIt
+;: Title: sizeof function by HotKeyIt
 ;
 
 ; Function: sizeof

diff --git a/lib/tooltip.ahk b/lib/tooltip.ahk
@@ -1,4 +1,4 @@
-
+
 Gosub, Example1 ;Simple ToolTip
 
 Gosub, Example2 ;Links in ToolTip

diff --git a/resources/AUTHORS.txt b/resources/AUTHORS.txt
@@ -1,4 +1,4 @@
-mcpower
+mcpower
 Immo
 olop4444
 Aeons

diff --git a/resources/AUTHORS_Trade.txt b/resources/AUTHORS_Trade.txt
@@ -1,4 +1,4 @@
-Eruyome
+Eruyome
 thirdy
 mktums
 jn64

diff --git a/resources/Updates.txt b/resources/Updates.txt
@@ -1,4 +1,4 @@
-The following is a list of what has been updated, starting with 1.9.3.
+The following is a list of what has been updated, starting with 1.9.3.
 Current Script Caretaker: aRTy (GitHub/PoE Account: aRTy42, Reddit: -aRTy-)
 
 3.5.00

diff --git a/resources/Updates_Trade.txt b/resources/Updates_Trade.txt
@@ -1,4 +1,10 @@
-The following is a list of what has been updated, starting with 1.1.0
+The following is a list of what has been updated, starting with 1.1.0
+
+2.15.6
+================================================================================================
+* Fixed incorrect request parameter for the Crusader influence on items.
+* Converted all files to UTF-8 BOM to improve support for korean characters.
+* Updated data files (uniques etc).
 
 2.15.5
 ================================================================================================

diff --git a/resources/Version.txt b/resources/Version.txt
@@ -1,2 +1,2 @@
-ReleaseVersion := "3.5.00"
+ReleaseVersion := "3.5.00"
 AHKVersionRequired := "1.1.26"
diff --git a/resources/VersionTrade.txt b/resources/VersionTrade.txt
@@ -1,2 +1,2 @@
-TradeReleaseVersion := "v2.15.5"
+TradeReleaseVersion := "v2.15.6"
 TradeAHKVersionRequired := "1.1.26.00"
diff --git a/resources/ahk/AdditionalMacros.ahk b/resources/ahk/AdditionalMacros.ahk
@@ -1,4 +1,4 @@
-;###########----------------------- Additional Macros -------------------------###########
+;###########----------------------- Additional Macros -------------------------###########
 ;# Use AdditionaMacros.ini in the user folder to enable/disable hotkeys and set a key    #
 ;# combination.                                                                          #
 ;#                                                                                       #

diff --git a/resources/ahk/TradeMacro.ahk b/resources/ahk/TradeMacro.ahk
@@ -646,7 +646,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 			}
 		}
 
-		; special bases (elder/shaper/fractured/synthesised/redeemer/hunter/conquerer/warlord)
+		; special bases (elder/shaper/fractured/synthesised/redeemer/hunter/crusader/warlord)
 		If (Item.HasInfluence.length() or Item.isFracturedBase or Item.isSynthesisedBase) {
 			If (Item.HasInfluence.length()) {
 				Item.UsedInSearch.specialBase := ""
@@ -802,7 +802,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 			RequestParams.corrupted := "0"
 		}
 
-		; special bases (elder/shaper/synthesised/fractured/conquerer/warlord/redeemer/hunter)
+		; special bases (elder/shaper/synthesised/fractured/crusader/warlord/redeemer/hunter)
 		If (s.useSpecialBase) {
 			If (Item.HasInfluence.length()) {
 				For key, val in Item.HasInfluence {
@@ -818,7 +818,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 		} Else {
 			RequestParams.Shaper	:= ""
 			RequestParams.Elder		:= ""
-			RequestParams.Conquerer	:= ""
+			RequestParams.crusader	:= ""
 			RequestParams.Warlord	:= ""
 			RequestParams.Redeemer	:= ""
 			RequestParams.Hunter	:= ""			
@@ -969,7 +969,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
 		If (isAdvancedPriceCheckRedirect and not TradeGlobals.Get("AdvancedPriceCheckItem").useSpecialBase) {
 			RequestParams.Shaper	:= ""
 			RequestParams.Elder		:= ""
-			RequestParams.Conquerer	:= ""
+			RequestParams.crusader	:= ""
 			RequestParams.Warlord	:= ""
 			RequestParams.Redeemer	:= ""
 			RequestParams.Hunter	:= ""
@@ -3487,7 +3487,7 @@ class RequestParams_ {
 	shaper		:= ""
 	elder		:= ""
 	hunter		:= ""	; check todo
-	conquerer		:= ""	; check
+	crusader		:= ""	; check
 	redeemer		:= ""	; check
 	warlord		:= ""	; check
 	synthesised	:= ""
@@ -3881,7 +3881,7 @@ TradeFunc_GetItemsPoeTradeMods(_item, isMap = false) {
 				_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["hunter"], _item.mods[k])
 			}
 			If (StrLen(_item.mods[k]["param"]) < 1 and not isMap) {
-				_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["conquerer"], _item.mods[k])
+				_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["crusader"], _item.mods[k])
 			}
 			If (StrLen(_item.mods[k]["param"]) < 1 and not isMap) {
 				_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["redeemer"], _item.mods[k])
@@ -5181,7 +5181,7 @@ TradeFunc_AdvancedPriceCheckGui(advItem, Stats, Sockets, Links, UniqueStats = ""
 	iLvlValue		:= ""
 	If (advItem.specialBase or advItem.IsBeast) {
 		iLvlCheckState := TradeOpts.AdvancedSearchCheckILVL ? "Checked" : ""
-		iLvlValue := advItem.iLvl 											; use itemlevel to fill the box in any case (elder/shaper/conquerer/redeemer/hunter/warlord)
+		iLvlValue := advItem.iLvl 											; use itemlevel to fill the box in any case (elder/shaper/crusader/redeemer/hunter/warlord)
 	}
 	Else If (TradeOpts.AdvancedSearchCheckILVL) {
 		iLvlCheckState := "Checked"

diff --git a/resources/ahk/jsonData.ahk b/resources/ahk/jsonData.ahk
@@ -1,4 +1,4 @@
-; Can't get JSON load working inside any Function/Class or in TradeMacroInit
+; Can't get JSON load working inside any Function/Class or in TradeMacroInit
 ; Works here, though.
 ; Data is available via global variables
 ; json scraped with https://github.com/Eruyome/scrapeVariableUniqueItems/
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@


		Gosub, Example1 ;Simple ToolTip

		Gosub, Example2 ;Links in ToolTip
Expand Down
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    mcpower
+    mcpower
     Immo
     olop4444
     Aeons
@@ Expand Down @@