From f158acbb14bc938c26fc6e1211ac71a798f0f446 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Fri, 29 Jan 2016 22:21:44 +0100 Subject: [PATCH] Fixed Rocket League, fixed volume overlay --- Artemis/Artemis/App.config | 12 ++++++++ .../Modules/Effects/TypeWave/TypeWaveModel.cs | 2 +- .../Games/CounterStrike/CounterStrikeModel.cs | 4 +-- .../RocketLeague/RocketLeague.Designer.cs | 4 +-- .../Games/RocketLeague/RocketLeague.settings | 6 ++-- .../Games/RocketLeague/RocketLeagueModel.cs | 28 +++++++++++-------- .../RocketLeague/RocketLeagueSettings.cs | 14 +++++----- .../Overlays/VolumeDisplay/VolumeDisplay.cs | 17 ++++++----- .../VolumeDisplay/VolumeDisplayModel.cs | 2 +- Artemis/Artemis/Utilities/ColorHelpers.cs | 4 +-- .../Utilities/Keyboard/KeyboardRectangle.cs | 10 +++---- 11 files changed, 60 insertions(+), 43 deletions(-) diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config index f02ab8248..207d705fc 100644 --- a/Artemis/Artemis/App.config +++ b/Artemis/Artemis/App.config @@ -3,6 +3,7 @@ +
@@ -21,6 +22,17 @@ + + + True + + + #FFFF5000 + + + #FFFF0000 + + {"Game":"RocketLeague","GameVersion":"1.10","GameAddresses":[{"Description":"Boost","BasePointer":{"value":21998084},"Offsets":[88,1452,1780,540]}]} diff --git a/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs index 0442af258..0c4d68303 100644 --- a/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs +++ b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs @@ -117,7 +117,7 @@ namespace Artemis.Modules.Effects.TypeWave Waves.Add(Settings.IsRandomColors ? new Wave(new Point(keyMatch.PosX, keyMatch.PosY), 0, ColorHelpers.GetRandomRainbowColor()) : new Wave(new Point(keyMatch.PosX, keyMatch.PosY), 0, - ColorHelpers.MediaColorToDrawingColor(Settings.WaveColor))); + ColorHelpers.ToDrawingColor(Settings.WaveColor))); } } diff --git a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs index 862a6bec2..f6d059424 100644 --- a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs +++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs @@ -145,8 +145,8 @@ namespace Artemis.Modules.Games.CounterStrike AmmoRect.Width = ((int) Math.Floor((16/100.00)*ammoPercentage))*Scale; AmmoRect.Colors = new List { - ColorHelpers.MediaColorToDrawingColor(_counterStrikeSettings.AmmoMainColor), - ColorHelpers.MediaColorToDrawingColor(_counterStrikeSettings.AmmoSecondaryColor) + ColorHelpers.ToDrawingColor(_counterStrikeSettings.AmmoMainColor), + ColorHelpers.ToDrawingColor(_counterStrikeSettings.AmmoSecondaryColor) }; // Low ammo indicator diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.Designer.cs b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.Designer.cs index b9586a87a..60877516e 100644 --- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.Designer.cs +++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Artemis.Settings { +namespace Artemis.Modules.Games.RocketLeague { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -25,7 +25,7 @@ namespace Artemis.Settings { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] + [global::System.Configuration.DefaultSettingValueAttribute("True")] public bool Enabled { get { return ((bool)(this["Enabled"])); diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings index 0e65b8eb3..58f5de73e 100644 --- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings +++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings @@ -1,11 +1,9 @@  - - + - False + True #FFFF5000 diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs index 6fb88fa44..7f6c345ec 100644 --- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs +++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs @@ -17,9 +17,9 @@ namespace Artemis.Modules.Games.RocketLeague public class RocketLeagueModel : GameModel { private readonly RocketLeagueSettings _settings; - private KeyboardRectangle _boostRect; private int _boostAmount; private bool _boostGrowing; + private KeyboardRectangle _boostRect; private Memory _memory; private GamePointersCollectionModel _pointer; private int _previousBoost; @@ -44,14 +44,13 @@ namespace Artemis.Modules.Games.RocketLeague public override void Enable() { _boostRect = new KeyboardRectangle(MainModel.ActiveKeyboard, 0, 0, new List - { - ColorHelpers.MediaColorToDrawingColor(_settings.MainColor), - ColorHelpers.MediaColorToDrawingColor(_settings.SecondaryColor) - }, LinearGradientMode.Horizontal); + { + ColorHelpers.ToDrawingColor(_settings.MainColor), + ColorHelpers.ToDrawingColor(_settings.SecondaryColor) + }, LinearGradientMode.Horizontal); MemoryHelpers.GetPointers(); - _pointer = JsonConvert - .DeserializeObject(Offsets.Default.RocketLeague); + _pointer = JsonConvert.DeserializeObject(Offsets.Default.RocketLeague); var tempProcess = MemoryHelpers.GetProcessIfRunning(ProcessName); _memory = new Memory(tempProcess); @@ -77,7 +76,12 @@ namespace Artemis.Modules.Games.RocketLeague if (_boostAmount > 100) _boostAmount = 100; - _boostRect.Width = (int) Math.Ceiling(((Scale*21)/100.00)*_boostAmount); + _boostRect.Width = (int) Math.Ceiling(((MainModel.ActiveKeyboard.Width*Scale)/100.00)*_boostAmount); + _boostRect.Colors = new List + { + ColorHelpers.ToDrawingColor(_settings.MainColor), + ColorHelpers.ToDrawingColor(_settings.SecondaryColor) + }; Task.Run(() => GrowIfHigher()); } @@ -94,7 +98,7 @@ namespace Artemis.Modules.Games.RocketLeague var differenceStep = difference/amountOfSteps; var differenceStepRest = difference%amountOfSteps; _boostAmount = _previousBoost; - _boostRect.Width = (int) Math.Ceiling(((Scale*21)/100.00)*_boostAmount); + _boostRect.Width = (int) Math.Ceiling(((MainModel.ActiveKeyboard.Width*Scale)/100.00)*_boostAmount); for (var i = 0; i < amountOfSteps; i++) { @@ -102,10 +106,10 @@ namespace Artemis.Modules.Games.RocketLeague { differenceStepRest -= 1; _boostAmount += 1; - _boostRect.Width = (int) Math.Ceiling(((Scale*21)/100.00)*_boostAmount); + _boostRect.Width = (int) Math.Ceiling(((MainModel.ActiveKeyboard.Width*Scale)/100.00)*_boostAmount); } _boostAmount += differenceStep; - _boostRect.Width = (int) Math.Ceiling(((Scale*21)/100.00)*_boostAmount); + _boostRect.Width = (int) Math.Ceiling(((MainModel.ActiveKeyboard.Width*Scale)/100.00)*_boostAmount); Thread.Sleep(50); } @@ -115,7 +119,7 @@ namespace Artemis.Modules.Games.RocketLeague public override Bitmap GenerateBitmap() { - var bitmap = new Bitmap(Scale*21, Scale*8); + var bitmap = MainModel.ActiveKeyboard.KeyboardBitmap(Scale); using (var g = Graphics.FromImage(bitmap)) { diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueSettings.cs b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueSettings.cs index 074b80cd8..34de983a6 100644 --- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueSettings.cs +++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueSettings.cs @@ -16,18 +16,18 @@ namespace Artemis.Modules.Games.RocketLeague public override sealed void Load() { - Enabled = Settings.RocketLeague.Default.Enabled; - MainColor = Settings.RocketLeague.Default.MainColor; - SecondaryColor = Settings.RocketLeague.Default.SecondaryColor; + Enabled = RocketLeague.Default.Enabled; + MainColor = RocketLeague.Default.MainColor; + SecondaryColor = RocketLeague.Default.SecondaryColor; } public override sealed void Save() { - Settings.RocketLeague.Default.Enabled = Enabled; - Settings.RocketLeague.Default.MainColor = MainColor; - Settings.RocketLeague.Default.SecondaryColor = SecondaryColor; + RocketLeague.Default.Enabled = Enabled; + RocketLeague.Default.MainColor = MainColor; + RocketLeague.Default.SecondaryColor = SecondaryColor; - Settings.RocketLeague.Default.Save(); + RocketLeague.Default.Save(); } public override sealed void ToDefault() diff --git a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs index 54692b93a..59dc55d66 100644 --- a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs +++ b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Drawing; using System.Drawing.Drawing2D; using Artemis.Models; @@ -32,11 +31,15 @@ namespace Artemis.Modules.Overlays.VolumeDisplay public void Draw(Graphics g) { var volumeRect = new KeyboardRectangle(MainModel.ActiveKeyboard, 0, 0, new List - { - ColorHelpers.MediaColorToDrawingColor(Settings.MainColor), - ColorHelpers.MediaColorToDrawingColor(Settings.SecondaryColor) - }, - LinearGradientMode.Horizontal); + { + ColorHelpers.ToDrawingColor(Settings.SecondaryColor), + ColorHelpers.ToDrawingColor(Settings.MainColor) + }, + LinearGradientMode.Horizontal) + { + Width = (int) (100.00/(MainModel.ActiveKeyboard.Width*4)*Volume), + ContainedBrush = false + }; volumeRect.Draw(g); } } diff --git a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayModel.cs b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayModel.cs index 042d1d8be..dfea1fecf 100644 --- a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayModel.cs +++ b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayModel.cs @@ -72,7 +72,7 @@ namespace Artemis.Modules.Overlays.VolumeDisplay public override Bitmap GenerateBitmap() { - return GenerateBitmap(new Bitmap(21, 6)); + return GenerateBitmap(MainModel.ActiveKeyboard.KeyboardBitmap(4)); } public override Bitmap GenerateBitmap(Bitmap bitmap) diff --git a/Artemis/Artemis/Utilities/ColorHelpers.cs b/Artemis/Artemis/Utilities/ColorHelpers.cs index 14140be3e..7d2654773 100644 --- a/Artemis/Artemis/Utilities/ColorHelpers.cs +++ b/Artemis/Artemis/Utilities/ColorHelpers.cs @@ -70,12 +70,12 @@ namespace Artemis.Utilities return i; } - public static Color MediaColorToDrawingColor(System.Windows.Media.Color mColor) + public static Color ToDrawingColor(System.Windows.Media.Color mColor) { return Color.FromArgb(mColor.A, mColor.R, mColor.G, mColor.B); } - public static System.Windows.Media.Color DrawingColorToMediaColor(Color dColor) + public static System.Windows.Media.Color ToMediaColor(Color dColor) { return System.Windows.Media.Color.FromArgb(dColor.A, dColor.R, dColor.G, dColor.B); } diff --git a/Artemis/Artemis/Utilities/Keyboard/KeyboardRectangle.cs b/Artemis/Artemis/Utilities/Keyboard/KeyboardRectangle.cs index 833cf82bc..e0f320a6e 100644 --- a/Artemis/Artemis/Utilities/Keyboard/KeyboardRectangle.cs +++ b/Artemis/Artemis/Utilities/Keyboard/KeyboardRectangle.cs @@ -32,15 +32,15 @@ namespace Artemis.Utilities.Keyboard _rotationProgress = 0; _blinkWorker.DoWork += BlinkWorker_DoWork; - X = x; - Y = y; - Width = keyboard.Width; - Height = keyboard.Height; + Scale = 4; + X = x*Scale; + Y = y*Scale; + Width = keyboard.Width*Scale; + Height = keyboard.Height*Scale; Visible = true; Opacity = 255; ContainedBrush = true; - Scale = 4; GradientMode = gradientMode; Rotate = false; LoopSpeed = 1;