From 73788635454503bf7f1f52f706f056261ee650b2 Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Thu, 26 Dec 2019 12:08:46 +1030
Subject: [PATCH 01/10] Make ammo/health indicators only show during live
 rounds

---
 .../Project-Aurora/Profiles/CSGO/CSGOProfile.cs     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index 8df13623e..7eb593ec8 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -1,5 +1,8 @@
-using Aurora.Settings;
+using Aurora.Profiles.CSGO.GSI.Nodes;
+using Aurora.Settings;
 using Aurora.Settings.Layers;
+using Aurora.Settings.Overrides.Logic;
+using Aurora.Settings.Overrides.Logic.Builder;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -43,7 +46,9 @@ public override void Reset()
                         _MaxVariablePath = "100"
                         },
 
-                }),
+                }, new OverrideLogicBuilder()
+                    .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Round/Phase", RoundPhase.Live))
+                ),
                 new Layer("Ammo Indicator", new PercentLayerHandler()
                 {
                     Properties = new PercentLayerHandlerProperties()
@@ -61,7 +66,9 @@ public override void Reset()
                         _VariablePath = "Player/Weapons/ActiveWeapon/AmmoClip",
                         _MaxVariablePath = "Player/Weapons/ActiveWeapon/AmmoClipMax"
                     },
-                }),
+                }, new OverrideLogicBuilder()
+                    .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Round/Phase", RoundPhase.Live))
+                ),
                 new Layer("CSGO Bomb Effect", new Layers.CSGOBombLayerHandler()),
                 new Layer("CSGO Burning Effect", new Layers.CSGOBurningLayerHandler()),
                 new Layer("CSGO Background", new Layers.CSGOBackgroundLayerHandler())

From d12312a0e8a70d22984c13b893ad0146bc2d93c4 Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Fri, 27 Dec 2019 13:14:03 +1030
Subject: [PATCH 02/10] Add new effects, customizations and enhancements to
 CS:GO

---
 .../Profiles/CSGO/CSGOApplication.cs          |   1 +
 .../Profiles/CSGO/CSGOProfile.cs              |   1 +
 .../CSGO/Layers/CSGOBackgroundLayerHandler.cs |  25 ++-
 .../CSGO/Layers/CSGOBombLayerHandler.cs       |  34 ----
 .../Layers/CSGOKillsIndicatorLayerHandler.cs  |   4 +-
 .../Layers/CSGOWinningTeamLayerHandler.cs     | 176 ++++++++++++++++++
 .../Layers/Control_CSGOBackgroundLayer.xaml   |   3 +
 .../Control_CSGOBackgroundLayer.xaml.cs       |  10 +
 .../CSGO/Layers/Control_CSGOBombLayer.xaml    |  17 +-
 .../CSGO/Layers/Control_CSGOBombLayer.xaml.cs |  21 ---
 .../Layers/Control_CSGOWinningTeamLayer.xaml  |  16 ++
 .../Control_CSGOWinningTeamLayer.xaml.cs      |  79 ++++++++
 .../Project-Aurora/Project-Aurora.csproj      |  12 +-
 13 files changed, 320 insertions(+), 79 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOWinningTeamLayerHandler.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml.cs

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOApplication.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOApplication.cs
index 34607b99d..2bb57aa6c 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOApplication.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOApplication.cs
@@ -26,6 +26,7 @@ public CSGO()
                 new LayerHandlerEntry("CSGOBurning", "CSGO Burning Effect Layer", typeof(CSGOBurningLayerHandler)),
                 new LayerHandlerEntry("CSGOFlashbang", "CSGO Flashbang Layer", typeof(CSGOFlashbangLayerHandler)),
                 new LayerHandlerEntry("CSGOTyping", "CSGO Typing Layer", typeof(CSGOTypingIndicatorLayerHandler)),
+                new LayerHandlerEntry("CSGOWinningTeam", "CSGO Winning Team Effect Layer", typeof(CSGOWinningTeamLayerHandler)),
             };
 
             Global.LightingStateManager.RegisterLayerHandlers(extra, false);
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index 7eb593ec8..517e2350b 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -27,6 +27,7 @@ public override void Reset()
 
                 new Layer("CSGO Typing Indicator", new Layers.CSGOTypingIndicatorLayerHandler()),
                 new Layer("CSGO Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
+                new Layer("CSGO Winning Team Effect", new Layers.CSGOWinningTeamLayerHandler()),
                 new Layer("CSGO Flashbang Effect", new Layers.CSGOFlashbangLayerHandler()),
                 new Layer("Health Indicator", new PercentLayerHandler()
                 {
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBackgroundLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBackgroundLayerHandler.cs
index cfd1a79f7..f7c44deb9 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBackgroundLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBackgroundLayerHandler.cs
@@ -1,4 +1,5 @@
-using Aurora.EffectsEngine;
+
+using Aurora.EffectsEngine;
 using Aurora.Profiles.CSGO.GSI;
 using Aurora.Profiles.CSGO.GSI.Nodes;
 using Aurora.Settings;
@@ -41,6 +42,11 @@ public class CSGOBackgroundLayerHandlerProperties : LayerHandlerProperties2Color
         [JsonIgnore]
         public double DimDelay { get { return Logic._DimDelay ?? _DimDelay ?? 0.0; } }
 
+        public int? _DimAmount { get; set; }
+
+        [JsonIgnore]
+        public int DimAmount { get { return Logic._DimAmount ?? _DimAmount ?? 100; } }
+
         public CSGOBackgroundLayerHandlerProperties() : base() { }
 
         public CSGOBackgroundLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
@@ -50,10 +56,11 @@ public override void Default()
             base.Default();
 
             this._DefaultColor = Color.FromArgb(158, 205, 255);
-            this._CTColor = Color.FromArgb(158, 205, 255);
+            this._CTColor = Color.FromArgb(33, 155, 221);
             this._TColor = Color.FromArgb(221, 99, 33);
             this._DimEnabled = true;
             this._DimDelay = 15;
+            this._DimAmount = 20;
         }
 
     }
@@ -61,7 +68,7 @@ public override void Default()
     public class CSGOBackgroundLayerHandler : LayerHandler<CSGOBackgroundLayerHandlerProperties>
     {
         private bool isDimming = false;
-        private double dim_value = 1.0;
+        private double dim_value = 100.0;
         private long dim_bg_at = 15;
 
         public CSGOBackgroundLayerHandler() : base()
@@ -86,7 +93,7 @@ public override EffectLayer Render(IGameState state)
                 {
                     isDimming = false;
                     dim_bg_at = Utils.Time.GetMillisecondsSinceEpoch() + (long)(this.Properties.DimDelay * 1000D);
-                    dim_value = 1.0;
+                    dim_value = 100.0;
                 }
 
                 Color bg_color = this.Properties.DefaultColor;
@@ -108,12 +115,12 @@ public override EffectLayer Render(IGameState state)
                     if (dim_bg_at <= Utils.Time.GetMillisecondsSinceEpoch() || csgostate.Player.State.Health == 0)
                     {
                         isDimming = true;
-                        bg_color = Utils.ColorUtils.MultiplyColorByScalar(bg_color, getDimmingValue());
+                        bg_color = Utils.ColorUtils.MultiplyColorByScalar(bg_color, (getDimmingValue() / 100));
                     }
                     else
                     {
                         isDimming = false;
-                        dim_value = 1.0;
+                        dim_value = 100.0;
                     }
                 }
 
@@ -133,11 +140,11 @@ private double getDimmingValue()
         {
             if (isDimming && Properties.DimEnabled)
             {
-                dim_value -= 0.02;
-                return dim_value = (dim_value < 0.0 ? 0.0 : dim_value);
+                dim_value -= 2.0;
+                return dim_value = (dim_value < Math.Abs(Properties.DimAmount - 100) ? Math.Abs(Properties.DimAmount - 100) : dim_value);
             }
             else
-                return dim_value = 1.0;
+                return dim_value = 100.0;
         }
     }
 }
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBombLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBombLayerHandler.cs
index 8674adc8b..8987f81d6 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBombLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBombLayerHandler.cs
@@ -17,16 +17,6 @@ namespace Aurora.Profiles.CSGO.Layers
 {
     public class CSGOBombLayerHandlerProperties : LayerHandlerProperties2Color<CSGOBombLayerHandlerProperties>
     {
-        public Color? _CTColor { get; set; }
-
-        [JsonIgnore]
-        public Color CTColor { get { return Logic._CTColor ?? _CTColor ?? Color.Empty; } }
-
-        public Color? _TColor { get; set; }
-
-        [JsonIgnore]
-        public Color TColor { get { return Logic._TColor ?? _TColor ?? Color.Empty; } }
-
         public Color? _FlashColor { get; set; }
 
         [JsonIgnore]
@@ -61,8 +51,6 @@ public override void Default()
             base.Default();
 
             this._Sequence = new KeySequence(new Devices.DeviceKeys[] { Devices.DeviceKeys.NUM_LOCK, Devices.DeviceKeys.NUM_SLASH, Devices.DeviceKeys.NUM_ASTERISK, Devices.DeviceKeys.NUM_MINUS, Devices.DeviceKeys.NUM_SEVEN, Devices.DeviceKeys.NUM_EIGHT, Devices.DeviceKeys.NUM_NINE, Devices.DeviceKeys.NUM_PLUS, Devices.DeviceKeys.NUM_FOUR, Devices.DeviceKeys.NUM_FIVE, Devices.DeviceKeys.NUM_SIX, Devices.DeviceKeys.NUM_ONE, Devices.DeviceKeys.NUM_TWO, Devices.DeviceKeys.NUM_THREE, Devices.DeviceKeys.NUM_ZERO, Devices.DeviceKeys.NUM_PERIOD, Devices.DeviceKeys.NUM_ENTER });
-            this._CTColor = Color.FromArgb(158, 205, 255);
-            this._TColor = Color.FromArgb(221, 99, 33);
             this._FlashColor = Color.FromArgb(255, 0, 0);
             this._PrimedColor = Color.FromArgb(0, 255, 0);
             this._DisplayWinningTeamColor = true;
@@ -161,28 +149,6 @@ public override EffectLayer Render(IGameState state)
                     if (Properties.PeripheralUse)
                         bomb_effect_layer.Set(Devices.DeviceKeys.Peripheral, bombcolor);
                 }
-                else if (csgostate.Round.Bomb == BombState.Defused)
-                {
-                    bombtimer.Stop();
-                    if (Properties.DisplayWinningTeamColor)
-                    {
-                        bomb_effect_layer.Set(Properties.Sequence, Properties.CTColor);
-
-                        if (Properties.PeripheralUse)
-                            bomb_effect_layer.Set(Devices.DeviceKeys.Peripheral, Properties.CTColor);
-                    }
-                }
-                else if (csgostate.Round.Bomb == BombState.Exploded)
-                {
-                    bombtimer.Stop();
-                    if (Properties.DisplayWinningTeamColor)
-                    {
-                        bomb_effect_layer.Set(Properties.Sequence, Properties.TColor);
-
-                        if (Properties.PeripheralUse)
-                            bomb_effect_layer.Set(Devices.DeviceKeys.Peripheral, Properties.TColor);
-                    }
-                }
                 else
                 {
                     bombtimer.Stop();
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOKillsIndicatorLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOKillsIndicatorLayerHandler.cs
index 76ae29a79..84c848ab8 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOKillsIndicatorLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOKillsIndicatorLayerHandler.cs
@@ -36,8 +36,8 @@ public override void Default()
             base.Default();
 
             this._Sequence = new KeySequence(new Devices.DeviceKeys[] { Devices.DeviceKeys.G1, Devices.DeviceKeys.G2, Devices.DeviceKeys.G3, Devices.DeviceKeys.G4, Devices.DeviceKeys.G5 });
-            this._RegularKillColor = Color.FromArgb(0, 255, 0);
-            this._HeadshotKillColor = Color.FromArgb(255, 80, 0);
+            this._RegularKillColor = Color.FromArgb(255, 204, 0);
+            this._HeadshotKillColor = Color.FromArgb(255, 0, 0);
         }
 
     }
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOWinningTeamLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOWinningTeamLayerHandler.cs
new file mode 100644
index 000000000..398fff775
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOWinningTeamLayerHandler.cs
@@ -0,0 +1,176 @@
+using Aurora.EffectsEngine;
+using Aurora.EffectsEngine.Animations;
+using Aurora.Profiles.CSGO.GSI;
+using Aurora.Profiles.CSGO.GSI.Nodes;
+using Aurora.Settings;
+using Aurora.Settings.Layers;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Aurora.Profiles.CSGO.Layers
+{
+    public class CSGOWinningTeamLayerHandlerProperties : LayerHandlerProperties2Color<CSGOWinningTeamLayerHandlerProperties>
+    {
+        public Color? _CTColor { get; set; }
+
+        [JsonIgnore]
+        public Color CTColor { get { return Logic._CTColor ?? _CTColor ?? Color.Empty; } }
+
+        public Color? _TColor { get; set; }
+
+        [JsonIgnore]
+        public Color TColor { get { return Logic._TColor ?? _TColor ?? Color.Empty; } }
+
+        public CSGOWinningTeamLayerHandlerProperties() : base() { }
+
+        public CSGOWinningTeamLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
+
+        public override void Default()
+        {
+            base.Default();
+
+            this._CTColor = Color.FromArgb(33, 155, 221);
+            this._TColor = Color.FromArgb(221, 99, 33);
+        }
+
+    }
+
+    public class CSGOWinningTeamLayerHandler : LayerHandler<CSGOWinningTeamLayerHandlerProperties>
+    {
+        private readonly AnimationTrack[] tracks =
+        {
+            new AnimationTrack("Winning Team Track 0", 1.0f, 0.0f),
+            new AnimationTrack("Winning Team Track 1", 1.0f, 1.0f),
+            new AnimationTrack("Winning Team Track 2", 1.0f, 2.0f),
+            new AnimationTrack("Winning Team Track 3", 1.0f, 3.0f),
+            new AnimationTrack("Winning Team Track 4", 1.0f, 4.0f)
+        };
+
+        private long previoustime = 0;
+        private long currenttime = 0;
+
+        private static float winningTeamEffect_Keyframe = 0.0f;
+        private const float winningTeamEffect_AnimationTime = 5.0f;
+
+        private bool showAnimation = false;
+
+        public CSGOWinningTeamLayerHandler() : base()
+        {
+            _ID = "CSGOWinningTeam";
+        }
+
+        protected override UserControl CreateControl()
+        {
+            return new Control_CSGOWinningTeamLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            previoustime = currenttime;
+            currenttime = Utils.Time.GetMillisecondsSinceEpoch();
+
+            EffectLayer effectLayer = new EffectLayer("CSGO - Winning Team Effect");
+            AnimationMix animationMix = new AnimationMix();
+
+            if (state is GameState_CSGO)
+            {
+                GameState_CSGO csgostate = state as GameState_CSGO;
+                
+                // Block animations after end of round
+                if (csgostate.Map.Phase == MapPhase.Undefined || csgostate.Round.Phase != RoundPhase.Over)
+                {
+                    return effectLayer;
+                }
+
+                Color color = Color.White;
+
+                // Triggers directly after a team wins a round
+                if (csgostate.Round.WinTeam != RoundWinTeam.Undefined && csgostate.Previously.Round.WinTeam == RoundWinTeam.Undefined)
+                {
+                    // Determine round or game winner
+                    if (csgostate.Map.Phase == MapPhase.GameOver)
+                    {
+                        // End of match
+                        int tScore = csgostate.Map.TeamT.Score;
+                        int ctScore = csgostate.Map.TeamCT.Score;
+
+                        if (tScore > ctScore)
+                        {
+                            color = Properties.TColor;
+                        }
+                        else if (ctScore > tScore)
+                        {
+                            color = Properties.CTColor;
+                        }
+                    }
+                    else
+                    {
+                        // End of round
+                        if (csgostate.Round.WinTeam == RoundWinTeam.T) color = Properties.TColor;
+                        if (csgostate.Round.WinTeam == RoundWinTeam.CT) color = Properties.CTColor;
+                    }
+
+                    this.SetTracks(color);
+                    animationMix.Clear();
+                    showAnimation = true;
+                }
+
+                if (showAnimation)
+                {
+                    animationMix = new AnimationMix(tracks);
+
+                    effectLayer.Fill(color);
+                    animationMix.Draw(effectLayer.GetGraphics(), winningTeamEffect_Keyframe);
+                    winningTeamEffect_Keyframe += (currenttime - previoustime) / 1000.0f;
+
+                    if (winningTeamEffect_Keyframe >= winningTeamEffect_AnimationTime)
+                    {
+                        showAnimation = false;
+                        winningTeamEffect_Keyframe = 0;
+                    }
+                }
+            }
+
+            return effectLayer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            (Control as Control_CSGOWinningTeamLayer).SetProfile(profile);
+            base.SetApplication(profile);
+        }
+
+        private void SetTracks(Color playerColor)
+        {
+            for (int i = 0; i < tracks.Length; i++)
+            {
+                tracks[i].SetFrame(
+                    0.0f,
+                    new AnimationCircle(
+                        (int)(Effects.canvas_width_center * 0.9),
+                        Effects.canvas_height_center,
+                        0,
+                        Color.Black,
+                        4)
+                );
+
+                tracks[i].SetFrame(
+                    1.0f,
+                    new AnimationCircle(
+                        (int)(Effects.canvas_width_center * 0.9),
+                        Effects.canvas_height_center,
+                        Effects.canvas_biggest / 2.0f,
+                        Color.Black,
+                        4)
+                );
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml
index 9d1ed66aa..83921edd1 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml
@@ -17,5 +17,8 @@
         <Label HorizontalAlignment="Left" Margin="0,93,0,-41" Padding="0" Content="Dim delay:" VerticalAlignment="Top"/>
         <Slider x:Name="Slider_DimSelector" HorizontalAlignment="Left" Margin="61,93,0,-43" VerticalAlignment="Top" Width="130" Maximum="120" ValueChanged="Slider_DimSelector_ValueChanged" Value="15"/>
         <Label x:Name="TextBox_DimValue" HorizontalAlignment="Left" Margin="196,93,0,-41" Padding="0" Content="15s" VerticalAlignment="Top"/>
+        <Label HorizontalAlignment="Left" Margin="0,116,0,0" Padding="0" Content="Dim amount:" VerticalAlignment="Top"/>
+        <xctk:IntegerUpDown x:Name="IntegerUpDown_DimAmount" HorizontalAlignment="Left" Height="24" Margin="74,112,0,0" VerticalAlignment="Top" Width="50" Value="100" Maximum="100" Minimum="1" MouseWheelActiveOnFocus="True" ValueChanged="IntegerUpDown_DimAmount_ValueChanged"/>
+        <Label HorizontalAlignment="Left" Margin="129,116,0,0" Padding="0" Content="%" VerticalAlignment="Top" RenderTransformOrigin="0.6,0.542"/>
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml.cs
index 2023fb77a..955bddf77 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBackgroundLayer.xaml.cs
@@ -13,6 +13,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit;
 
 namespace Aurora.Profiles.CSGO.Layers
 {
@@ -46,6 +47,7 @@ public void SetSettings()
                 this.Checkbox_DimEnabled.IsChecked = (this.DataContext as CSGOBackgroundLayerHandler).Properties._DimEnabled;
                 this.TextBox_DimValue.Content = (int)(this.DataContext as CSGOBackgroundLayerHandler).Properties._DimDelay + "s";
                 this.Slider_DimSelector.Value = (this.DataContext as CSGOBackgroundLayerHandler).Properties._DimDelay.Value;
+                this.IntegerUpDown_DimAmount.Value = (this.DataContext as CSGOBackgroundLayerHandler).Properties._DimAmount.Value;
 
                 settingsset = true;
             }
@@ -101,5 +103,13 @@ private void Slider_DimSelector_ValueChanged(object sender, RoutedPropertyChange
                 this.TextBox_DimValue.Content = (int)(sender as Slider).Value + "s";
             }
         }
+
+        private void IntegerUpDown_DimAmount_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            if (IsLoaded && settingsset && this.DataContext is CSGOBackgroundLayerHandler && sender is IntegerUpDown)
+            {
+                (this.DataContext as CSGOBackgroundLayerHandler).Properties._DimAmount = (sender as IntegerUpDown).Value;
+            }
+        }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml
index f1768d684..fe62f04be 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml
@@ -8,17 +8,12 @@
              xmlns:Controls="clr-namespace:Aurora.Controls" x:Class="Aurora.Profiles.CSGO.Layers.Control_CSGOBombLayer"
              mc:Ignorable="d" Loaded="UserControl_Loaded">
     <Grid>
-        <xctk:ColorPicker x:Name="ColorPicker_CT" Margin="53,0,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="191" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_CT_SelectedColorChanged" />
-        <Label HorizontalAlignment="Left" Padding="0" Content="CT Color:" VerticalAlignment="Top" Margin="0,2,0,0"/>
-        <xctk:ColorPicker x:Name="ColorPicker_T" Margin="46,25,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="198" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_T_SelectedColorChanged" UsingAlphaChannel="True" />
-        <Label HorizontalAlignment="Left" Margin="0,27,0,0" Padding="0" Content="T Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="ColorPicker_Flash" Margin="101,50,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="143" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_Flash_SelectedColorChanged" UsingAlphaChannel="True" />
-        <Label HorizontalAlignment="Left" Margin="0,52,0,0" Padding="0" Content="Bomb Flash Color:" VerticalAlignment="Top"/>
-        <CheckBox x:Name="Checkbox_DisplayWinningTeam" Content="Display winning team color" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" Checked="Checkbox_DisplayWinningTeam_Checked" Unchecked="Checkbox_DisplayWinningTeam_Checked"/>
-        <xctk:ColorPicker x:Name="ColorPicker_Primed" Margin="112,75,0,-23" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="132" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_Primed_SelectedColorChanged" UsingAlphaChannel="True" />
-        <Label HorizontalAlignment="Left" Margin="0,77,0,-21" Padding="0" Content="Bomb Primed Color:" VerticalAlignment="Top"/>
-        <CheckBox x:Name="Checkbox_GradualEffect" Content="Use gradual effect" HorizontalAlignment="Left" Margin="0,126,0,0" VerticalAlignment="Top" Checked="Checkbox_GradualEffect_Checked" Unchecked="Checkbox_GradualEffect_Checked"/>
-        <CheckBox x:Name="Checkbox_DisplayOnPeripherals" Content="Display effect on peripheral devices" HorizontalAlignment="Left" Margin="0,147,0,0" Checked="Checkbox_DisplayOnPeripherals_Checked" Unchecked="Checkbox_DisplayOnPeripherals_Checked" Height="16" VerticalAlignment="Top"/>
+        <xctk:ColorPicker x:Name="ColorPicker_Flash" Margin="101,0,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="143" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_Flash_SelectedColorChanged" UsingAlphaChannel="True" />
+        <Label HorizontalAlignment="Left" Margin="0,2,0,0" Padding="0" Content="Bomb Flash Color:" VerticalAlignment="Top"/>
+        <xctk:ColorPicker x:Name="ColorPicker_Primed" Margin="112,25,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="132" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_Primed_SelectedColorChanged" UsingAlphaChannel="True" />
+        <Label HorizontalAlignment="Left" Margin="0,27,0,0" Padding="0" Content="Bomb Primed Color:" VerticalAlignment="Top"/>
+        <CheckBox x:Name="Checkbox_GradualEffect" Content="Use gradual effect" HorizontalAlignment="Left" Margin="0,48,0,0" VerticalAlignment="Top" Checked="Checkbox_GradualEffect_Checked" Unchecked="Checkbox_GradualEffect_Checked"/>
+        <CheckBox x:Name="Checkbox_DisplayOnPeripherals" Content="Display effect on peripheral devices" HorizontalAlignment="Left" Margin="0,68,0,0" Checked="Checkbox_DisplayOnPeripherals_Checked" Unchecked="Checkbox_DisplayOnPeripherals_Checked" Height="16" VerticalAlignment="Top"/>
         <Controls:KeySequence x:Name="KeySequence_keys" Margin="254,0,0,0" RecordingTag="CSGO - Bomb Effect" Title="Affected Keys" SequenceUpdated="KeySequence_keys_SequenceUpdated" HorizontalAlignment="Left" Width="230"/>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml.cs
index 096df9589..4d9ef9e4f 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOBombLayer.xaml.cs
@@ -40,11 +40,8 @@ public void SetSettings()
         {
             if (this.DataContext is CSGOBombLayerHandler && !settingsset)
             {
-                this.ColorPicker_CT.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as CSGOBombLayerHandler).Properties._CTColor ?? System.Drawing.Color.Empty);
-                this.ColorPicker_T.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as CSGOBombLayerHandler).Properties._TColor ?? System.Drawing.Color.Empty);
                 this.ColorPicker_Flash.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as CSGOBombLayerHandler).Properties._FlashColor ?? System.Drawing.Color.Empty);
                 this.ColorPicker_Primed.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as CSGOBombLayerHandler).Properties._PrimedColor ?? System.Drawing.Color.Empty);
-                this.Checkbox_DisplayWinningTeam.IsChecked = (this.DataContext as CSGOBombLayerHandler).Properties._DisplayWinningTeamColor;
                 this.Checkbox_GradualEffect.IsChecked = (this.DataContext as CSGOBombLayerHandler).Properties._GradualEffect;
                 this.Checkbox_DisplayOnPeripherals.IsChecked = (this.DataContext as CSGOBombLayerHandler).Properties._PeripheralUse;
                 this.KeySequence_keys.Sequence = (this.DataContext as CSGOBombLayerHandler).Properties._Sequence;
@@ -70,18 +67,6 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
             this.Loaded -= UserControl_Loaded;
         }
 
-        private void ColorPicker_CT_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
-        {
-            if (IsLoaded && settingsset && this.DataContext is CSGOBombLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
-                (this.DataContext as CSGOBombLayerHandler).Properties._CTColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
-        }
-
-        private void ColorPicker_T_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
-        {
-            if (IsLoaded && settingsset && this.DataContext is CSGOBombLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
-                (this.DataContext as CSGOBombLayerHandler).Properties._TColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
-        }
-
         private void ColorPicker_Flash_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
         {
             if (IsLoaded && settingsset && this.DataContext is CSGOBombLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
@@ -94,12 +79,6 @@ private void ColorPicker_Primed_SelectedColorChanged(object sender, RoutedProper
                 (this.DataContext as CSGOBombLayerHandler).Properties._PrimedColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
         }
 
-        private void Checkbox_DisplayWinningTeam_Checked(object sender, RoutedEventArgs e)
-        {
-            if (IsLoaded && settingsset && this.DataContext is CSGOBombLayerHandler && sender is CheckBox && (sender as CheckBox).IsChecked.HasValue)
-                (this.DataContext as CSGOBombLayerHandler).Properties._DisplayWinningTeamColor = (sender as CheckBox).IsChecked.Value;
-        }
-
         private void Checkbox_GradualEffect_Checked(object sender, RoutedEventArgs e)
         {
             if (IsLoaded && settingsset && this.DataContext is CSGOBombLayerHandler && sender is CheckBox && (sender as CheckBox).IsChecked.HasValue)
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml
new file mode 100644
index 000000000..e554f3f2c
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml
@@ -0,0 +1,16 @@
+<UserControl
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Aurora.Profiles.CSGO.Layers"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:Controls="clr-namespace:Aurora.Controls" x:Class="Aurora.Profiles.CSGO.Layers.Control_CSGOWinningTeamLayer"
+             mc:Ignorable="d" Loaded="UserControl_Loaded">
+    <Grid>
+        <xctk:ColorPicker x:Name="ColorPicker_CT" Margin="53,0,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="191" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_CT_SelectedColorChanged" />
+        <Label HorizontalAlignment="Left" Padding="0" Content="CT Color:" VerticalAlignment="Top" Margin="0,2,0,0"/>
+        <xctk:ColorPicker x:Name="ColorPicker_T" Margin="46,25,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="198" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_T_SelectedColorChanged" UsingAlphaChannel="True" />
+        <Label HorizontalAlignment="Left" Margin="0,27,0,0" Padding="0" Content="T Color:" VerticalAlignment="Top"/>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml.cs
new file mode 100644
index 000000000..f9b004ce3
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGOWinningTeamLayer.xaml.cs
@@ -0,0 +1,79 @@
+using Aurora.Settings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Aurora.Profiles.CSGO.Layers
+{
+    /// <summary>
+    /// Interaction logic for Control_WinningTeamLayer.xaml
+    /// </summary>
+    public partial class Control_CSGOWinningTeamLayer : UserControl
+    {
+        private bool settingsset = false;
+        private bool profileset = false;
+
+        public Control_CSGOWinningTeamLayer()
+        {
+            InitializeComponent();
+        }
+
+        public Control_CSGOWinningTeamLayer(CSGOWinningTeamLayerHandler datacontext)
+        {
+            InitializeComponent();
+
+            this.DataContext = datacontext;
+        }
+
+        public void SetSettings()
+        {
+            if (this.DataContext is CSGOWinningTeamLayerHandler && !settingsset)
+            {
+                this.ColorPicker_CT.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as CSGOWinningTeamLayerHandler).Properties._CTColor ?? System.Drawing.Color.Empty);
+                this.ColorPicker_T.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as CSGOWinningTeamLayerHandler).Properties._TColor ?? System.Drawing.Color.Empty);
+
+                settingsset = true;
+            }
+        }
+
+        internal void SetProfile(Application profile)
+        {
+            if (profile != null && !profileset)
+            {
+                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
+
+                profileset = true;
+            }
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            SetSettings();
+
+            this.Loaded -= UserControl_Loaded;
+        }
+
+        private void ColorPicker_CT_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            if (IsLoaded && settingsset && this.DataContext is CSGOWinningTeamLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
+                (this.DataContext as CSGOWinningTeamLayerHandler).Properties._CTColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
+        }
+
+        private void ColorPicker_T_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            if (IsLoaded && settingsset && this.DataContext is CSGOWinningTeamLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
+                (this.DataContext as CSGOWinningTeamLayerHandler).Properties._TColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index 9d5bee45e..3061f34c3 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -376,6 +376,10 @@
       <DependentUpon>Control_FieldPresenter.xaml</DependentUpon>
     </Compile>
     <Compile Include="Devices\UnifiedHID\RoccatTyon.cs" />
+    <Compile Include="Profiles\CSGO\Layers\Control_CSGOWinningTeamLayer.xaml.cs">
+      <DependentUpon>Control_CSGOWinningTeamLayer.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Profiles\CSGO\Layers\CSGOWinningTeamLayerHandler.cs" />
     <Compile Include="Profiles\Discord\Control_Discord.xaml.cs">
       <DependentUpon>Control_Discord.xaml</DependentUpon>
     </Compile>
@@ -403,8 +407,8 @@
     <Compile Include="Profiles\Terraria\GSI\Nodes\WorldNode.cs" />
     <Compile Include="Profiles\Terraria\TerrariaApplication.cs" />
     <Compile Include="Profiles\Terraria\TerrariaProfile.cs" />
-	<Compile Include="Profiles\Terraria\Control_Terraria.xaml.cs">
-	  <DependentUpon>Control_Terraria.xaml</DependentUpon>
+    <Compile Include="Profiles\Terraria\Control_Terraria.xaml.cs">
+      <DependentUpon>Control_Terraria.xaml</DependentUpon>
     </Compile>
     <Compile Include="Settings\Control_LayerList.xaml.cs">
       <DependentUpon>Control_LayerList.xaml</DependentUpon>
@@ -1722,6 +1726,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Profiles\CSGO\Layers\Control_CSGOWinningTeamLayer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Profiles\Discord\Control_Discord.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

From 650d6a211dc2505b3fcae03a0a52785dc25dfe0e Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Mon, 30 Dec 2019 17:57:04 +1030
Subject: [PATCH 03/10] Add Death Effect Layer into CS:GO

---
 .../Profiles/CSGO/CSGOApplication.cs          |   1 +
 .../Profiles/CSGO/CSGOProfile.cs              |   3 +-
 .../CSGO/Layers/CSGODeathLayerHandler.cs      | 124 ++++++++++++++++++
 .../CSGO/Layers/Control_CSGODeathLayer.xaml   |  17 +++
 .../Layers/Control_CSGODeathLayer.xaml.cs     |  81 ++++++++++++
 .../Project-Aurora/Project-Aurora.csproj      |   8 ++
 6 files changed, 233 insertions(+), 1 deletion(-)
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGODeathLayerHandler.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml.cs

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOApplication.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOApplication.cs
index 2bb57aa6c..f7aed4695 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOApplication.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOApplication.cs
@@ -27,6 +27,7 @@ public CSGO()
                 new LayerHandlerEntry("CSGOFlashbang", "CSGO Flashbang Layer", typeof(CSGOFlashbangLayerHandler)),
                 new LayerHandlerEntry("CSGOTyping", "CSGO Typing Layer", typeof(CSGOTypingIndicatorLayerHandler)),
                 new LayerHandlerEntry("CSGOWinningTeam", "CSGO Winning Team Effect Layer", typeof(CSGOWinningTeamLayerHandler)),
+                new LayerHandlerEntry("CSGODeathEffect", "CSGO Death Effect Layer", typeof(CSGODeathLayerHandler)),
             };
 
             Global.LightingStateManager.RegisterLayerHandlers(extra, false);
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index 517e2350b..252683187 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -25,9 +25,10 @@ public override void Reset()
             Layers = new System.Collections.ObjectModel.ObservableCollection<Layer>()
             {
 
-                new Layer("CSGO Typing Indicator", new Layers.CSGOTypingIndicatorLayerHandler()),
+                new Layer("CSGO Death Effect", new Layers.CSGODeathLayerHandler()),
                 new Layer("CSGO Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
                 new Layer("CSGO Winning Team Effect", new Layers.CSGOWinningTeamLayerHandler()),
+                new Layer("CSGO Typing Indicator", new Layers.CSGOTypingIndicatorLayerHandler()),
                 new Layer("CSGO Flashbang Effect", new Layers.CSGOFlashbangLayerHandler()),
                 new Layer("Health Indicator", new PercentLayerHandler()
                 {
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGODeathLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGODeathLayerHandler.cs
new file mode 100644
index 000000000..9f8f4db9b
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGODeathLayerHandler.cs
@@ -0,0 +1,124 @@
+using Aurora.EffectsEngine;
+using Aurora.Profiles.CSGO.GSI;
+using Aurora.Profiles.CSGO.GSI.Nodes;
+using Aurora.Settings;
+using Aurora.Settings.Layers;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Aurora.Profiles.CSGO.Layers
+{
+    public class CSGODeathLayerHandlerProperties : LayerHandlerProperties2Color<CSGODeathLayerHandlerProperties>
+    {
+        public Color? _DeathColor { get; set; }
+
+        [JsonIgnore]
+        public Color DeathColor { get { return Logic._DeathColor ?? _DeathColor ?? Color.Empty; } }
+
+        public int? _FadeOutAfter { get; set; }
+
+        [JsonIgnore]
+        public int FadeOutAfter { get { return Logic._FadeOutAfter ?? _FadeOutAfter ?? 5; } }
+
+        public CSGODeathLayerHandlerProperties() : base() { }
+
+        public CSGODeathLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
+
+        public override void Default()
+        {
+            base.Default();
+
+            this._DeathColor = Color.Red;
+            this._FadeOutAfter = 3;
+        }
+
+    }
+
+    public class CSGODeathLayerHandler : LayerHandler<CSGODeathLayerHandlerProperties>
+    {
+        private bool isDead = false;
+        private long fadeStartAt = 15;
+        private int fadeAlpha = 255;
+
+        public CSGODeathLayerHandler() : base()
+        {
+            _ID = "CSGODeathEffect";
+        }
+
+        protected override UserControl CreateControl()
+        {
+            return new Control_CSGODeathLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            EffectLayer effectLayer = new EffectLayer("CSGO - Death Effect");
+
+            if (state is GameState_CSGO)
+            {
+                GameState_CSGO gameState = state as GameState_CSGO;
+                Color deathColor = this.Properties.DeathColor;
+
+                // Confirm if CS:GO Player is correct
+                if (gameState.Provider.SteamID.Equals(gameState.Player.SteamID))
+                {
+
+                    // Are they dead?
+                    if (!isDead && gameState.Player.State.Health <= 0 && gameState.Previously.Player.State.Health > 0)
+                    {
+                        isDead = true;
+
+                        fadeAlpha = 255;
+                        fadeStartAt = Utils.Time.GetMillisecondsSinceEpoch() + (long)(this.Properties.FadeOutAfter * 1000D);
+                    } else if (gameState.Player.State.Health > 0)
+                    {
+                        isDead = false;
+                        return effectLayer;
+                    }
+
+                    // If so...
+                    if (isDead)
+                    {
+
+                        Global.logger.Info("IsDead");
+                        if (fadeStartAt <= Utils.Time.GetMillisecondsSinceEpoch())
+                        {
+                            int fadeAlpha = getFadeAlpha();
+                            Global.logger.Info(fadeAlpha);
+
+                            deathColor = Color.FromArgb(fadeAlpha, deathColor.R, deathColor.G, deathColor.B);
+
+                            if (fadeAlpha == 0)
+                            {
+                                isDead = false;
+                            }
+                        }
+
+                        effectLayer.Fill(deathColor);
+                    }
+                }
+            }
+
+            return effectLayer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            (Control as Control_CSGODeathLayer).SetProfile(profile);
+            base.SetApplication(profile);
+        }
+
+        private int getFadeAlpha()
+        {
+            fadeAlpha -= 15;
+            return fadeAlpha = (fadeAlpha < 0 ? 0 : fadeAlpha);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml
new file mode 100644
index 000000000..1adf30de0
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml
@@ -0,0 +1,17 @@
+<UserControl
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Aurora.Profiles.CSGO.Layers"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:Controls="clr-namespace:Aurora.Controls" x:Class="Aurora.Profiles.CSGO.Layers.Control_CSGODeathLayer"
+             mc:Ignorable="d" Loaded="UserControl_Loaded">
+    <Grid>
+        <xctk:ColorPicker x:Name="ColorPicker_DeathColor" Margin="71,0,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="151" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_DeathColor_SelectedColorChanged" />
+        <Label HorizontalAlignment="Left" Padding="0" Content="Death Color:" VerticalAlignment="Top" Margin="0,2,0,0"/>
+        <Label HorizontalAlignment="Left" Margin="0,28,0,0" Padding="0" Content="Fade out after:" VerticalAlignment="Top"/>
+        <xctk:IntegerUpDown x:Name="IntegerUpDown_FadeOutAfter" HorizontalAlignment="Left" Height="24" Margin="81,25,0,0" VerticalAlignment="Top" Width="50" Value="3" Maximum="20" Minimum="1" MouseWheelActiveOnFocus="True" ValueChanged="IntegerUpDown_FadeOutAfter_ValueChanged"/>
+        <Label HorizontalAlignment="Left" Margin="136,28,0,0" Padding="0" Content="sec" VerticalAlignment="Top"/>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml.cs
new file mode 100644
index 000000000..109f591f0
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/Control_CSGODeathLayer.xaml.cs
@@ -0,0 +1,81 @@
+using Aurora.Settings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Aurora.Profiles.CSGO.Layers
+{
+    /// <summary>
+    /// Interaction logic for Control_CSGODeathLayer.xaml
+    /// </summary>
+    public partial class Control_CSGODeathLayer : UserControl
+    {
+        private bool settingsset = false;
+        private bool profileset = false;
+
+        public Control_CSGODeathLayer()
+        {
+            InitializeComponent();
+        }
+
+        public Control_CSGODeathLayer(CSGODeathLayerHandler datacontext)
+        {
+            InitializeComponent();
+
+            this.DataContext = datacontext;
+        }
+
+        public void SetSettings()
+        {
+            if (this.DataContext is CSGODeathLayerHandler && !settingsset)
+            {
+                CSGODeathLayerHandlerProperties properties = (this.DataContext as CSGODeathLayerHandler).Properties;
+
+                this.ColorPicker_DeathColor.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor(properties._DeathColor ?? System.Drawing.Color.Empty);
+                this.IntegerUpDown_FadeOutAfter.Value = properties.FadeOutAfter;
+
+                settingsset = true;
+            }
+        }
+
+        internal void SetProfile(Application profile)
+        {
+            if (profile != null && !profileset)
+            {
+                var var_types_numerical = profile.ParameterLookup?.Where(kvp => Utils.TypeUtils.IsNumericType(kvp.Value.Item1));
+
+                profileset = true;
+            }
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            SetSettings();
+
+            this.Loaded -= UserControl_Loaded;
+        }
+
+        private void ColorPicker_DeathColor_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            if (IsLoaded && settingsset && this.DataContext is CSGODeathLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
+                (this.DataContext as CSGODeathLayerHandler).Properties._DeathColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
+        }
+
+        private void IntegerUpDown_FadeOutAfter_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            if (IsLoaded && settingsset && this.DataContext is CSGODeathLayerHandler && sender is Xceed.Wpf.Toolkit.IntegerUpDown && (sender as Xceed.Wpf.Toolkit.IntegerUpDown).Value.HasValue)
+                (this.DataContext as CSGODeathLayerHandler).Properties._FadeOutAfter = (sender as Xceed.Wpf.Toolkit.IntegerUpDown).Value;
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index 3061f34c3..57d1355ba 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -376,9 +376,13 @@
       <DependentUpon>Control_FieldPresenter.xaml</DependentUpon>
     </Compile>
     <Compile Include="Devices\UnifiedHID\RoccatTyon.cs" />
+    <Compile Include="Profiles\CSGO\Layers\Control_CSGODeathLayer.xaml.cs">
+      <DependentUpon>Control_CSGODeathLayer.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Profiles\CSGO\Layers\Control_CSGOWinningTeamLayer.xaml.cs">
       <DependentUpon>Control_CSGOWinningTeamLayer.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Profiles\CSGO\Layers\CSGODeathLayerHandler.cs" />
     <Compile Include="Profiles\CSGO\Layers\CSGOWinningTeamLayerHandler.cs" />
     <Compile Include="Profiles\Discord\Control_Discord.xaml.cs">
       <DependentUpon>Control_Discord.xaml</DependentUpon>
@@ -1726,6 +1730,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Profiles\CSGO\Layers\Control_CSGODeathLayer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Profiles\CSGO\Layers\Control_CSGOWinningTeamLayer.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

From 7621dc74c3bc3cbebc40da2d2c996148682dbdbd Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 11 Jan 2020 10:25:36 +1030
Subject: [PATCH 04/10] Remove CSGO prefix from layer names

---
 .../Project-Aurora/Profiles/CSGO/CSGOProfile.cs  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index 252683187..acbcb5d53 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -25,11 +25,11 @@ public override void Reset()
             Layers = new System.Collections.ObjectModel.ObservableCollection<Layer>()
             {
 
-                new Layer("CSGO Death Effect", new Layers.CSGODeathLayerHandler()),
-                new Layer("CSGO Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
-                new Layer("CSGO Winning Team Effect", new Layers.CSGOWinningTeamLayerHandler()),
-                new Layer("CSGO Typing Indicator", new Layers.CSGOTypingIndicatorLayerHandler()),
-                new Layer("CSGO Flashbang Effect", new Layers.CSGOFlashbangLayerHandler()),
+                new Layer("Death Effect", new Layers.CSGODeathLayerHandler()),
+                new Layer("Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
+                new Layer("Winning Team Effect", new Layers.CSGOWinningTeamLayerHandler()),
+                new Layer("Typing Indicator", new Layers.CSGOTypingIndicatorLayerHandler()),
+                new Layer("Flashbang Effect", new Layers.CSGOFlashbangLayerHandler()),
                 new Layer("Health Indicator", new PercentLayerHandler()
                 {
                     Properties = new PercentLayerHandlerProperties()
@@ -71,9 +71,9 @@ public override void Reset()
                 }, new OverrideLogicBuilder()
                     .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Round/Phase", RoundPhase.Live))
                 ),
-                new Layer("CSGO Bomb Effect", new Layers.CSGOBombLayerHandler()),
-                new Layer("CSGO Burning Effect", new Layers.CSGOBurningLayerHandler()),
-                new Layer("CSGO Background", new Layers.CSGOBackgroundLayerHandler())
+                new Layer("Bomb Effect", new Layers.CSGOBombLayerHandler()),
+                new Layer("Burning Effect", new Layers.CSGOBurningLayerHandler()),
+                new Layer("Background", new Layers.CSGOBackgroundLayerHandler())
             };
         }
     }

From 35e82c45adc26a35cb3cd855afb824b30cf2134e Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 11 Jan 2020 12:06:38 +1030
Subject: [PATCH 05/10] Update CSGOProfile.cs

Move typing layer to the top
Replace flashbang with conditional layer
Add smoke conditional layer effect
---
 .../Profiles/CSGO/CSGOProfile.cs              | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index acbcb5d53..db5ba91ad 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -24,12 +24,26 @@ public override void Reset()
             base.Reset();
             Layers = new System.Collections.ObjectModel.ObservableCollection<Layer>()
             {
-
+                new Layer("Typing Indicator", new Layers.CSGOTypingIndicatorLayerHandler()),
                 new Layer("Death Effect", new Layers.CSGODeathLayerHandler()),
                 new Layer("Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
                 new Layer("Winning Team Effect", new Layers.CSGOWinningTeamLayerHandler()),
-                new Layer("Typing Indicator", new Layers.CSGOTypingIndicatorLayerHandler()),
-                new Layer("Flashbang Effect", new Layers.CSGOFlashbangLayerHandler()),
+                new Layer("Flashbang Effect", new SolidFillLayerHandler() {
+                    Properties = new SolidFillLayerHandlerProperties()
+                    {
+                        _PrimaryColor = Color.FromArgb(255, 255, 255)
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetDynamicFloat("_LayerOpacity", new NumberMathsOperation(new NumberGSINumeric("Player/State/Flashed"), MathsOperator.Div, 255))
+                ),
+                new Layer("Smoke Effect", new SolidFillLayerHandler() {
+                    Properties = new SolidFillLayerHandlerProperties()
+                    {
+                        _PrimaryColor = Color.FromArgb(255, 255, 255)
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetDynamicFloat("_LayerOpacity", new NumberMathsOperation(new NumberGSINumeric("Player/State/Smoked"), MathsOperator.Div, 255))
+                ),
                 new Layer("Health Indicator", new PercentLayerHandler()
                 {
                     Properties = new PercentLayerHandlerProperties()

From 019c247f882b12976b4ed374740a5933db178531 Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 11 Jan 2020 12:30:52 +1030
Subject: [PATCH 06/10] Make typing indicator an override

---
 .../Project-Aurora/Profiles/CSGO/CSGOProfile.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index db5ba91ad..5ea122443 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -24,7 +24,22 @@ public override void Reset()
             base.Reset();
             Layers = new System.Collections.ObjectModel.ObservableCollection<Layer>()
             {
-                new Layer("Typing Indicator", new Layers.CSGOTypingIndicatorLayerHandler()),
+                new Layer("Typing Indicator", new SolidColorLayerHandler()
+                {
+                    Properties = new LayerHandlerProperties()
+                    {
+                        _PrimaryColor = Color.FromArgb(0, 255, 0),
+                        _Sequence = new KeySequence(new Devices.DeviceKeys[] { Devices.DeviceKeys.TILDE, Devices.DeviceKeys.ONE, Devices.DeviceKeys.TWO, Devices.DeviceKeys.THREE, Devices.DeviceKeys.FOUR, Devices.DeviceKeys.FIVE, Devices.DeviceKeys.SIX, Devices.DeviceKeys.SEVEN, Devices.DeviceKeys.EIGHT, Devices.DeviceKeys.NINE, Devices.DeviceKeys.ZERO, Devices.DeviceKeys.MINUS, Devices.DeviceKeys.EQUALS, Devices.DeviceKeys.BACKSPACE,
+                                                    Devices.DeviceKeys.TAB, Devices.DeviceKeys.Q, Devices.DeviceKeys.W, Devices.DeviceKeys.E, Devices.DeviceKeys.R, Devices.DeviceKeys.T, Devices.DeviceKeys.Y, Devices.DeviceKeys.U, Devices.DeviceKeys.I, Devices.DeviceKeys.O, Devices.DeviceKeys.P, Devices.DeviceKeys.CLOSE_BRACKET, Devices.DeviceKeys.OPEN_BRACKET, Devices.DeviceKeys.BACKSLASH,
+                                                    Devices.DeviceKeys.CAPS_LOCK, Devices.DeviceKeys.A, Devices.DeviceKeys.S, Devices.DeviceKeys.D, Devices.DeviceKeys.F, Devices.DeviceKeys.G, Devices.DeviceKeys.H, Devices.DeviceKeys.J, Devices.DeviceKeys.K, Devices.DeviceKeys.L, Devices.DeviceKeys.SEMICOLON, Devices.DeviceKeys.APOSTROPHE, Devices.DeviceKeys.HASHTAG, Devices.DeviceKeys.ENTER,
+                                                    Devices.DeviceKeys.LEFT_SHIFT, Devices.DeviceKeys.BACKSLASH_UK, Devices.DeviceKeys.Z, Devices.DeviceKeys.X, Devices.DeviceKeys.C, Devices.DeviceKeys.V, Devices.DeviceKeys.B, Devices.DeviceKeys.N, Devices.DeviceKeys.M, Devices.DeviceKeys.COMMA, Devices.DeviceKeys.PERIOD, Devices.DeviceKeys.FORWARD_SLASH, Devices.DeviceKeys.RIGHT_SHIFT,
+                                                    Devices.DeviceKeys.LEFT_CONTROL, Devices.DeviceKeys.LEFT_WINDOWS, Devices.DeviceKeys.LEFT_ALT, Devices.DeviceKeys.SPACE, Devices.DeviceKeys.RIGHT_ALT, Devices.DeviceKeys.RIGHT_WINDOWS, Devices.DeviceKeys.APPLICATION_SELECT, Devices.DeviceKeys.RIGHT_CONTROL,
+                                                    Devices.DeviceKeys.ARROW_UP, Devices.DeviceKeys.ARROW_LEFT, Devices.DeviceKeys.ARROW_DOWN, Devices.DeviceKeys.ARROW_RIGHT, Devices.DeviceKeys.ESC
+                                                  })
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Player/Activity", PlayerActivity.TextInput))
+                ),
                 new Layer("Death Effect", new Layers.CSGODeathLayerHandler()),
                 new Layer("Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
                 new Layer("Winning Team Effect", new Layers.CSGOWinningTeamLayerHandler()),

From 11adda01d63ade6b816d7fc04dc66a314671b570 Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 11 Jan 2020 12:34:36 +1030
Subject: [PATCH 07/10] Add Obsolete messages

---
 .../Profiles/CSGO/Layers/CSGOFlashbangLayerHandler.cs            | 1 +
 .../Profiles/CSGO/Layers/CSGOTypingIndicatorLayerHandler.cs      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOFlashbangLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOFlashbangLayerHandler.cs
index 44e0f4c38..1d4e4b5f2 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOFlashbangLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOFlashbangLayerHandler.cs
@@ -35,6 +35,7 @@ public override void Default()
 
     }
 
+    [Obsolete("This layer is obselete and has been replaced by the Overrides system.")]
     public class CSGOFlashbangLayerHandler : LayerHandler<CSGOFlashbangLayerHandlerProperties>
     {
         public CSGOFlashbangLayerHandler() : base()
diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOTypingIndicatorLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOTypingIndicatorLayerHandler.cs
index ebc877e7a..5dae18abb 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOTypingIndicatorLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOTypingIndicatorLayerHandler.cs
@@ -41,6 +41,7 @@ public override void Default()
         }
     }
 
+    [Obsolete("This layer is obselete and has been replaced by the Overrides system.")]
     public class CSGOTypingIndicatorLayerHandler : LayerHandler<CSGOTypingIndicatorLayerHandlerProperties>
     {
         public CSGOTypingIndicatorLayerHandler() : base()

From 19e0e362812abecd3b1885b1c9c5c20c2603dd72 Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 11 Jan 2020 12:41:24 +1030
Subject: [PATCH 08/10] Update CSGOProfile.cs

---
 Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index 5ea122443..be05ceaa2 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -54,7 +54,7 @@ public override void Reset()
                 new Layer("Smoke Effect", new SolidFillLayerHandler() {
                     Properties = new SolidFillLayerHandlerProperties()
                     {
-                        _PrimaryColor = Color.FromArgb(255, 255, 255)
+                        _PrimaryColor = Color.FromArgb(200, 200, 200)
                     }
                 }, new OverrideLogicBuilder()
                     .SetDynamicFloat("_LayerOpacity", new NumberMathsOperation(new NumberGSINumeric("Player/State/Smoked"), MathsOperator.Div, 255))

From cf47801d8c01132609044055c8df2a048b35df3c Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 11 Jan 2020 18:38:34 +1030
Subject: [PATCH 09/10] Update CSGOProfile.cs

---
 Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index be05ceaa2..a7a7cb44c 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -41,8 +41,8 @@ public override void Reset()
                     .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Player/Activity", PlayerActivity.TextInput))
                 ),
                 new Layer("Death Effect", new Layers.CSGODeathLayerHandler()),
-                new Layer("Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
                 new Layer("Winning Team Effect", new Layers.CSGOWinningTeamLayerHandler()),
+                new Layer("Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
                 new Layer("Flashbang Effect", new SolidFillLayerHandler() {
                     Properties = new SolidFillLayerHandlerProperties()
                     {

From dd027c1bbe64845c451a07bac617d2a0f84a14f9 Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 11 Jan 2020 18:38:46 +1030
Subject: [PATCH 10/10] Update CSGOProfile.cs

---
 Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
index a7a7cb44c..2c8d9189e 100644
--- a/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/CSGO/CSGOProfile.cs
@@ -40,8 +40,8 @@ public override void Reset()
                 }, new OverrideLogicBuilder()
                     .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Player/Activity", PlayerActivity.TextInput))
                 ),
-                new Layer("Death Effect", new Layers.CSGODeathLayerHandler()),
                 new Layer("Winning Team Effect", new Layers.CSGOWinningTeamLayerHandler()),
+                new Layer("Death Effect", new Layers.CSGODeathLayerHandler()),
                 new Layer("Kills Indicator", new Layers.CSGOKillIndicatorLayerHandler()),
                 new Layer("Flashbang Effect", new SolidFillLayerHandler() {
                     Properties = new SolidFillLayerHandlerProperties()