diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs index 45994c075..40d426ccb 100644 --- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs +++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs @@ -20,8 +20,9 @@ namespace Artemis.Modules.Games.RocketLeague private int _boostAmount; private bool _boostGrowing; private KeyboardRectangle _boostRect; + private bool _contextualColor; private Memory _memory; - private GamePointersCollectionModel _pointer; + private GamePointersCollection _pointer; private int _previousBoost; public RocketLeagueModel(MainManager mainManager, RocketLeagueSettings settings) : base(mainManager) @@ -32,13 +33,11 @@ namespace Artemis.Modules.Games.RocketLeague Scale = 4; Enabled = Settings.Enabled; Initialized = false; - } public RocketLeagueSettings Settings { get; set; } public int Scale { get; set; } - public bool ContextualColor { get; set; } public override void Dispose() { @@ -57,7 +56,7 @@ namespace Artemis.Modules.Games.RocketLeague }, LinearGradientMode.Horizontal); Updater.GetPointers(); - _pointer = JsonConvert.DeserializeObject(Offsets.Default.RocketLeague); + _pointer = JsonConvert.DeserializeObject(Offsets.Default.RocketLeague); var tempProcess = MemoryHelpers.GetProcessIfRunning(ProcessName); _memory = new Memory(tempProcess); @@ -89,24 +88,15 @@ namespace Artemis.Modules.Games.RocketLeague _boostRect.Width = (int) Math.Ceiling(MainManager.KeyboardManager.ActiveKeyboard.Width*Scale/100.00*_boostAmount); - if (ContextualColor) + if (_contextualColor) { - if(_boostAmount < 33) - _boostRect.Colors = new List{ Color.Red }; - else if(_boostAmount >= 33 && _boostAmount < 66) - _boostRect.Colors = new List { Color.Yellow }; - else if(_boostAmount >= 66) - _boostRect.Colors = new List { Color.Lime }; + if (_boostAmount < 33) + _boostRect.Colors = new List {Color.Red}; + else if (_boostAmount >= 33 && _boostAmount < 66) + _boostRect.Colors = new List {Color.Yellow}; + else if (_boostAmount >= 66) + _boostRect.Colors = new List {Color.Lime}; } - else - { - _boostRect.Colors = new List - { - ColorHelpers.ToDrawingColor(Settings.MainColor), - ColorHelpers.ToDrawingColor(Settings.SecondaryColor) - }; - } - Task.Run(() => GrowIfHigher()); }