From 7bc87f354ea4e969a218f17b033a7286c2a0343e Mon Sep 17 00:00:00 2001 From: Logan Saso Date: Sun, 28 Feb 2016 02:14:13 -0800 Subject: [PATCH] Broken Commit - Added if statement for colors hurrah --- .../Games/RocketLeague/RocketLeagueModel.cs | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs index 6f2ca18fe..9cb040daa 100644 --- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs +++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs @@ -32,11 +32,13 @@ namespace Artemis.Modules.Games.RocketLeague Scale = 4; Enabled = Settings.Enabled; Initialized = false; + ContextualColor = Settings.ContextualColor; } public RocketLeagueSettings Settings { get; set; } public int Scale { get; set; } + public bool ContextualColor { get; set; } public override void Dispose() { @@ -85,11 +87,25 @@ namespace Artemis.Modules.Games.RocketLeague _boostRect.Width = (int) Math.Ceiling(MainManager.KeyboardManager.ActiveKeyboard.Width*Scale/100.00*_boostAmount); - _boostRect.Colors = new List + + if (ContextualColor) { - ColorHelpers.ToDrawingColor(Settings.MainColor), - ColorHelpers.ToDrawingColor(Settings.SecondaryColor) - }; + 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()); }