From b1709e9606f1889288cf124b96dd8bdba44986f6 Mon Sep 17 00:00:00 2001 From: Robert Beekman Date: Tue, 26 Apr 2016 09:44:23 +0200 Subject: [PATCH 1/3] Update pointers for Rocket League 1.17 --- pointers.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pointers.json b/pointers.json index 83e812568..bf3a16fcb 100644 --- a/pointers.json +++ b/pointers.json @@ -2,18 +2,18 @@ [ { "Game":"RocketLeague", - "GameVersion":"1.16", + "GameVersion":"1.17", "GameAddresses":[ { "Description":"Boost", "BasePointer":{ - "value":22411984 + "value":22531104 }, "Offsets":[ - 1632, + 1648, 64, - 1636, - 1800, + 484, + 1828, 540 ] } From cf38247fc6db2e69175cd613c314dfa6aae01bfb Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Wed, 27 Apr 2016 20:08:24 +0200 Subject: [PATCH 2/3] Added BlackWidow keyboard regions (they might be misaligned though) --- .../KeyboardProviders/Razer/BlackWidow.cs | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Artemis/Artemis/KeyboardProviders/Razer/BlackWidow.cs b/Artemis/Artemis/KeyboardProviders/Razer/BlackWidow.cs index fb9881738..b768683c0 100644 --- a/Artemis/Artemis/KeyboardProviders/Razer/BlackWidow.cs +++ b/Artemis/Artemis/KeyboardProviders/Razer/BlackWidow.cs @@ -1,9 +1,10 @@ -using System; +using System.Collections.Generic; using System.Drawing; using Artemis.KeyboardProviders.Razer.Utilities; using Corale.Colore.Core; -using Corale.Colore.Razer.Keyboard; +using Corale.Colore.Razer; using ColoreColor = Corale.Colore.Core.Color; +using Constants = Corale.Colore.Razer.Keyboard.Constants; using KeyboardCustom = Corale.Colore.Razer.Keyboard.Effects.Custom; namespace Artemis.KeyboardProviders.Razer @@ -16,6 +17,13 @@ namespace Artemis.KeyboardProviders.Razer CantEnableText = "Couldn't connect to your Razer BlackWidow Chroma.\n " + "Please check your cables and try updating Razer Synapse.\n\n " + "If needed, you can select a different keyboard in Artemis under settings."; + + KeyboardRegions = new List + { + new KeyboardRegion("TopRow", new Point(0, 0), new Point(19, 0)), + new KeyboardRegion("NumPad", new Point(20, 1), new Point(23, 6)), + new KeyboardRegion("QWER", new Point(2, 2), new Point(5, 2)) + }; } public override bool CanEnable() @@ -24,9 +32,9 @@ namespace Artemis.KeyboardProviders.Razer return false; // Some people have Synapse installed, but not a Chroma keyboard, deal with this - var blackWidowFound = Chroma.Instance.Query(Corale.Colore.Razer.Devices.Blackwidow).Connected; - var blackWidowTeFound = Chroma.Instance.Query(Corale.Colore.Razer.Devices.BlackwidowTe).Connected; - return (blackWidowFound || blackWidowTeFound); + var blackWidowFound = Chroma.Instance.Query(Devices.Blackwidow).Connected; + var blackWidowTeFound = Chroma.Instance.Query(Devices.BlackwidowTe).Connected; + return blackWidowFound || blackWidowTeFound; } public override void Enable() @@ -34,10 +42,6 @@ namespace Artemis.KeyboardProviders.Razer Chroma.Instance.Initialize(); Height = Constants.MaxRows; Width = Constants.MaxColumns; - - KeyboardRegions.Add(new KeyboardRegion("TopRow", new Point(0, 0), new Point(19, 0))); - KeyboardRegions.Add(new KeyboardRegion("NumPad", new Point(20, 1), new Point(23, 6))); - KeyboardRegions.Add(new KeyboardRegion("QWER", new Point(2, 2), new Point(5, 2))); } public override void Disable() @@ -48,7 +52,7 @@ namespace Artemis.KeyboardProviders.Razer public override void DrawBitmap(Bitmap bitmap) { var razerArray = RazerUtilities.BitmapColorArray(bitmap, Height, Width); - + Chroma.Instance.Keyboard.SetCustom(razerArray); } } From 7cb80f7234f2e218ae161df395f93cdf1364a7bd Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Wed, 27 Apr 2016 20:19:51 +0200 Subject: [PATCH 3/3] Fixed a bug where the program would get stuck trying to connect to an unconnected keyboard --- Artemis/Artemis/Managers/KeyboardManager.cs | 2 ++ .../Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Artemis/Artemis/Managers/KeyboardManager.cs b/Artemis/Artemis/Managers/KeyboardManager.cs index f6e7c9d1f..7833663c8 100644 --- a/Artemis/Artemis/Managers/KeyboardManager.cs +++ b/Artemis/Artemis/Managers/KeyboardManager.cs @@ -52,6 +52,8 @@ namespace Artemis.Managers if (!keyboardProvider.CanEnable()) { _mainManager.DialogService.ShowErrorMessageBox(keyboardProvider.CantEnableText); + General.Default.LastKeyboard = null; + General.Default.Save(); return; } diff --git a/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs b/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs index 192b1f0a3..0489064a0 100644 --- a/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs +++ b/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs @@ -126,9 +126,9 @@ namespace Artemis.ViewModels.Flyouts protected override void HandleOpen() { - SelectedKeyboardProvider = General.Default.LastKeyboard.Length > 0 - ? General.Default.LastKeyboard - : "None"; + SelectedKeyboardProvider = string.IsNullOrEmpty(General.Default.LastKeyboard) + ? "None" + : General.Default.LastKeyboard; } } } \ No newline at end of file