Merge pull request #30 from GerRudi/dev

Update to 1.2.0

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog of SimpleR
 
+## [v1.2.0] - 2018-01-21
+### Added
+- disabled possibility to resize window by dragging the edges
+- displays a warning message if memory usege of RotMG gets too high (which results in crashes)
+- disabled Ctrl + W and Ctrl + Q to avoid accidently closing the game
+- direct links for Pfiffel.com tools / some of them open directly in flash projector
+- key redirect feature to bind mouse keys to ingame actions
+
+### Changed
+- simplified the process to set up your account for Kongregate
+- improved screenshot quality
+
+### Fixed
+- several issues with certain keys not working as hotkeys (breaks previous configs!)
+
+
 ## [v1.1.0] - 2017-11-25
 ### Added
 - changelog

README.md

@@ -24,6 +24,8 @@ A convenient way to play Realm of the Mad God on Windows
 
 
 # Download
+Current version: 1.2.0 - 2018-01-21 - [Changelog](./CHANGELOG.md)
+
 See [Releases](../../releases/latest) for download
 
 If you have trouble setting it up, please check out the [Wiki](../../wiki).

source/Include/IsPressed_UDF.au3

@@ -353,15 +353,15 @@ Func __GetKeyType($iKeyIn, $Type = 0)
 	If $iKeyIn = '' Then Return -1
 
 	Local $s_String = '01LeftMouse|02RightMouse|04MiddleMouse|05X1Mouse|06X2Mouse|08BACKSPACE|09TAB|0CCLEAR|' & _
-			'0DENTER|10SHIFT|11CTRL|12ALT|13PAUSE|14CAPS LOCK|1BESC|20SPACEBAR|21PAGE UP|22PAGE DOWN|' & _
-			'23END|24HOME|25LEFT|26UP|27RIGHT|28DOWN|29SELECT|2APRINT|2BEXECUTE|2CPRINT SCREEN|2DINS|2EDEL|' & _
+			'0DENTER|10SHIFT|11CTRL|12ALT|13PAUSE|14CAPSLOCK|1BESC|20SPACE|21PGUP|22PGDN|' & _
+			'23END|24HOME|25LEFT|26UP|27RIGHT|28DOWN|29SELECT|2APRINT|2BEXECUTE|2CPRINTSCREEN|2DINS|2EDELETE|' & _
 			'300|311|322|333|344|355|366|377|388|399|41A|42B|43C|44D|45E|46F|47G|48H|49I|4AJ|4BK|4CL|4DM|4EN|' & _
-			'4FO|50P|51Q|52R|53S|54T|55U|56V|57W|58X|59Y|5AZ|5BLeft Windows|5CRight Windows|60Num 0|61Num 1|' & _
-			'62Num 2|63Num 3|64Num 4|65Num 5|66Num 6|67Num 7|68Num 8|69Num 9|6AMultiply|6BAdd|' & _
-			'6CSeparator|6DSubtract|6EDecimal|6FDivide|70F1|71F2|72F3|73F4|74F5|75F6|76F7|77F8|78F9|' & _
+			'4FO|50P|51Q|52R|53S|54T|55U|56V|57W|58X|59Y|5AZ|5BLWIN|5CRWIN|60Numpad0|61Numpad1|' & _
+			'62Numpad2|63Numpad3|64Numpad4|65Numpad5|66Numpad6|67Numpad7|68Numpad8|69Numpad9|6ANUMPADMULT|6BNUMPADADD|' & _
+			'6CNUMPADENTER|6DNUMPADSUB|6ENUMPADDOT|6FNUMPADDIV|70F1|71F2|72F3|73F4|74F5|75F6|76F7|77F8|78F9|' & _
 			'79F10|7AF11|7BF12|7CF13|7DF14|7EF15|7FF16|80HF17|81HF18|82HF19|83HF20|84HF21|85HF22|' & _
-			'86HF23|87HF24|90NUM LOCK|91SCROLL LOCK|A0Left SHIFT|A1Right SHIFT|A2Left CTRL|A3Right CTRL|' & _
-			'A4Left MENU|A5Right Menu|BA;|BB=|BC,|BD-|BE.|BF/|C0`|DB[|DC\|DD]'
+			'86HF23|87HF24|90NUMLOCK|91SCROLLLOCK|A0Left SHIFT|A1Right SHIFT|A2LCTRL|A3RCTRL|' & _
+			'A4LALT|A5RALT|BA;|BB=|BC,|BD-|BE.|BF/|C0`|DB[|DC\|DD]'
 
 	If $Type == 0 Then
 		$iKeyIn = StringTrimLeft($s_String, (StringInStr($s_String, $iKeyIn) + StringLen($iKeyIn) - 1))

source/Include/LoadSettings.au3

@@ -81,7 +81,19 @@ Func GetHotkeys($uselocal = 1)
 	Return $array
 EndFunc   ;==>GetHotkeys
 
+Func GetRedirects($uselocal = 1)
+	Local $array
+	Local $arrayDefault = DefaultRedirects()
 
+	If FileExists($pathRedirects) And $uselocal = 1 Then
+		$array = _LoadFromCSV2D($pathRedirects)
+		$array = _UpdateArray($array, $arrayDefault, $pathRedirects)
+	Else
+		$array=$arrayDefault
+		_SaveToCSV($pathRedirects, $arrayDefault)
+	EndIf
+	Return $array
+EndFunc   ;==>GetHotkeys
 
 #Region DefaultSettings
 Func DefaultGeneral()
@@ -174,7 +186,7 @@ EndFunc   ;==>DefaultMacros
 Func DefaultIngame()
 	Local $SettingsIngame[][] = [ _
 			["Chat", "1", "ENTER"], _
-			["Ability", "1", "SPACEBAR"], _
+			["Ability", "1", "SPACE"], _
 			["Command", "1", "/"], _
 			["Tell", "1", "TAB"], _
 			["reserved", "0", "Key"], _
@@ -193,11 +205,11 @@ Func DefaultHotkeys()
 	Local $SettingsHotkeys[][] = [ _
 			["ResetSize", "1", "F6"], _
 			["43Maximize", "1", "F7"], _
-			["Screenshot", "1", "Print Screen"], _
+			["Screenshot", "1", "PRINTSCREEN"], _
 			["SetAnchor", "1", "F8"], _
 			["TPAnchor", "1", "F9"], _
 			["IgnorePM", "1", "F11"], _
-			["ToggleFocus", "0", "Num 9"], _
+			["ToggleFocus", "0", "Numpad9"], _
 			["ActualFullscreen", "0", "F12"], _
 			["HotkeyR", "0", "Key"], _
 			["HotkeyR", "0", "Key"], _
@@ -212,6 +224,22 @@ Func DefaultHotkeys()
 EndFunc   ;==>DefaultHotkeys
 
 
+Func DefaultRedirects()
+	Local $SettingsRedirects[][] = [ _
+			["Redirect1", "0", "X2Mouse","0"], _
+			["Redirect2", "0", "X1Mouse", "F5"], _
+			["RedirectR", "0", "Mousekey", "Key"], _
+			["RedirectR", "0", "Mousekey", "Key"], _
+			["RedirectR", "0", "Mousekey", "Key"], _
+			["RedirectR", "0", "Mousekey", "Key"], _
+			["RedirectR", "0", "Mousekey", "Key"], _
+			["RedirectR", "0", "Mousekey", "Key"], _
+			["RedirectR", "0", "Mousekey", "Key"], _
+			["RedirectR", "0", "Mousekey", "Key"]]
+	Return $SettingsRedirects
+EndFunc   ;==>DefaultHotkeys
+
+
 #EndRegion DefaultSettings
 
 

source/Include/SimpleR_Constants.au3

@@ -10,15 +10,17 @@ $pathPaths = @ScriptDir & "\data\Paths.csv"
 $pathMacros = @ScriptDir & "\data\Macros.csv"
 $pathIngame = @ScriptDir & "\data\Ingame.csv"
 $pathHotkeys = @ScriptDir & "\data\Hotkeys.csv"
+$pathRedirects = @ScriptDir & "\data\Redirects.csv"
 $pathSettings = @ScriptDir & "\Settings.exe"
 
+
 ;Array indexes
 Global const $cAIdescription = 0
 Global const $cAIactive = 1
 Global const $cAIcontent = 1
 Global const $cAIKey = 2
 Global const $cAImacrotext = 3
-
+Global const $cAIRedirect = 3
 ;Settings
 ;GENERAL
 Global const $bTesting = 0
@@ -72,6 +74,11 @@ Global const $hkToggleFocus = 6
 Global const $hkActualFullscreen = 7
 ;~  Reserved 9-17
 
+;REDIRECTS
+Global const $credirect1 = 0
+Global const $credirect2 = 1
+;~  Reserved 2 - 9
+
 ;SWF
 Global const $cSWFtesting = 1
 Global const $cSWFproduction = 0