From 9948521f8e5a16d8a99ec985f7206dc9c81b0329 Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 5 Sep 2020 00:17:44 +0930
Subject: [PATCH] Restore Legacy PD2 Layers

---
 .../Profiles/Payday 2/Control_PD2.xaml        |  23 --
 .../Profiles/Payday 2/Control_PD2.xaml.cs     |  74 -----
 .../Layers/Control_PD2BackgroundLayer.xaml.cs |  54 ++++
 .../Layers/Control_PD2FlashbangLayer.xaml     |  14 +
 .../Layers/Control_PD2FlashbangLayer.xaml.cs  |  65 +++++
 .../Layers/Control_PD2StatesLayer.xaml.cs     |  54 ++++
 .../Layers/PD2BackgroundLayerHandler.cs       | 253 ++++++++++++++++++
 .../Layers/PD2FlashbangLayerHandler.cs        |  75 ++++++
 .../Payday 2/Layers/PD2StatesLayerHandler.cs  | 120 +++++++++
 .../Profiles/Payday 2/PD2Application.cs       |   3 +
 10 files changed, 638 insertions(+), 97 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs

diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml
index 58d8607b4..cbc98a7ef 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml	
@@ -20,29 +20,6 @@
                     <Button x:Name="install_mod_button" Content="Install GSI for Payday 2" HorizontalAlignment="Left" Margin="10,145,0,0" VerticalAlignment="Top" Click="install_mod_button_Click" Width="160"/>
                     <CheckBox x:Name="game_enabled" Content="Enable Aurora to provide lighting effects with Payday 2" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Checked="game_enabled_Checked" Unchecked="game_enabled_Checked"/>
                 </Grid>
-            </TabItem>
-			<TabItem Header="Preview">
-                <Grid>
-                    <Label Content="Level Phase:" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_levelphase" HorizontalAlignment="Left" Margin="90,43,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{u:EnumToItemsSource {x:Type e:LevelPhase}}" DisplayMemberPath="Text" SelectedValuePath="Value" SelectionChanged="preview_levelphase_SelectionChanged"/>
-                    <Label Content="Health:" HorizontalAlignment="Left" Margin="10,103,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_health_slider" HorizontalAlignment="Left" Margin="62,107,0,0" VerticalAlignment="Top" Width="114" Maximum="100" SmallChange="1" ValueChanged="preview_health_slider_ValueChanged"/>
-                    <Label x:Name="preview_health_amount" Content="0%" HorizontalAlignment="Left" Margin="181,103,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Ammo:" HorizontalAlignment="Left" Margin="10,134,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_ammo_slider" HorizontalAlignment="Left" Margin="62,138,0,0" VerticalAlignment="Top" Width="114" Maximum="100" SmallChange="1" ValueChanged="preview_ammo_slider_ValueChanged"/>
-                    <Label x:Name="preview_ammo_amount" Content="0%" HorizontalAlignment="Left" Margin="181,134,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Suspicion:" HorizontalAlignment="Left" Margin="10,165,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_suspicion_slider" HorizontalAlignment="Left" Margin="78,169,0,0" VerticalAlignment="Top" Width="98" Maximum="100" SmallChange="1" ValueChanged="preview_suspicion_slider_ValueChanged"/>
-                    <Label x:Name="preview_suspicion_amount" Content="0%" HorizontalAlignment="Left" Margin="181,165,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.692,3.115"/>
-                    <Label Content="Player State:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_playerstate" HorizontalAlignment="Left" Margin="90,74,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{u:EnumToItemsSource {x:Type e:PlayerState}}" DisplayMemberPath="Text" SelectedValuePath="Value" SelectionChanged="preview_playerstate_SelectionChanged"/>
-                    <CheckBox x:Name="preview_swansong" Content="Is player in Swan Song" HorizontalAlignment="Left" Margin="13,196,0,0" VerticalAlignment="Top" Checked="preview_swansong_Checked" Unchecked="preview_swansong_Checked"/>
-                    <Label Content="Flashbang amount:" HorizontalAlignment="Left" Margin="10,216,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_flashbang_slider" HorizontalAlignment="Left" Margin="126,222,0,0" VerticalAlignment="Top" Width="98" Maximum="100" SmallChange="1" ValueChanged="preview_flashbang_slider_ValueChanged"/>
-                    <Label x:Name="preview_flashbang_amount" Content="0%" HorizontalAlignment="Left" Margin="229,218,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.692,3.115"/>
-                    <Label Content="Game State:" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_gamestate" HorizontalAlignment="Left" Margin="90,12,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{u:EnumToItemsSource {x:Type e:GameStates}}" DisplayMemberPath="Text" SelectedValuePath="Value" SelectionChanged="preview_gamestate_SelectionChanged"/>
-                </Grid>
             </TabItem>
         </TabControl>
     </Grid>
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs
index 81ecf8867..80e008f26 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs	
@@ -92,80 +92,6 @@ private void install_mod_button_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void preview_gamestate_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Game.State = (GSI.Nodes.GameStates)preview_gamestate.SelectedValue;
-            }
-        }
-
-        private void preview_levelphase_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Level.Phase = (GSI.Nodes.LevelPhase)preview_levelphase.SelectedValue;
-            }
-        }
-
-        private void preview_playerstate_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.State = (GSI.Nodes.PlayerState)preview_playerstate.SelectedValue;
-            }
-        }
-
-        private void preview_health_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            int hp_val = (int)this.preview_health_slider.Value;
-            if (this.preview_health_amount is Label)
-            {
-                this.preview_health_amount.Content = hp_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Health.Current = hp_val;
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Health.Max = 100;
-            }
-        }
-
-        private void preview_ammo_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            int ammo_val = (int)this.preview_ammo_slider.Value;
-            if (this.preview_ammo_amount is Label)
-            {
-                this.preview_ammo_amount.Content = ammo_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Weapons.SelectedWeapon.Current_Clip = ammo_val;
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Weapons.SelectedWeapon.Max_Clip = 100;
-            }
-        }
-
-        private void preview_suspicion_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            float susp_val = (float)this.preview_suspicion_slider.Value;
-            if (this.preview_suspicion_amount is Label)
-            {
-                this.preview_suspicion_amount.Content = (int)susp_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.SuspicionAmount = susp_val / 100.0f;
-            }
-        }
-
-        private void preview_flashbang_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            float flash_val = (float)this.preview_flashbang_slider.Value;
-            if (this.preview_flashbang_amount is Label)
-            {
-                this.preview_flashbang_amount.Content = (int)flash_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.FlashAmount = flash_val / 100.0f;
-            }
-        }
-
-        private void preview_swansong_Checked(object sender, RoutedEventArgs e)
-        {
-            if (IsLoaded && sender is CheckBox && (sender as CheckBox).IsChecked.HasValue)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.IsSwanSong = (sender as CheckBox).IsChecked.Value;
-            }
-        }
-
         private void get_lib_button_Click(object sender, RoutedEventArgs e)
         {
             System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(@"https://modworkshop.net/mod/14924"));
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs
new file mode 100644
index 000000000..ed19aa1fe
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs	
@@ -0,0 +1,54 @@
+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.Payday_2.Layers
+{
+    /// <summary>
+    /// Interaction logic for Control_CSGOBackgroundLayer.xaml
+    /// </summary>
+    public partial class Control_PD2BackgroundLayer : UserControl
+    {
+        private bool settingsset = false;
+        private bool profileset = false;
+
+        public Control_PD2BackgroundLayer()
+        {
+            InitializeComponent();
+        }
+
+        public Control_PD2BackgroundLayer(PD2BackgroundLayerHandler datacontext)
+        {
+            this.DataContext = datacontext.Properties;
+            InitializeComponent();
+        }
+
+
+        internal void SetProfile(Application profile)
+        {
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+
+            this.Loaded -= UserControl_Loaded;
+        }
+
+        private void sldAssaultSpeed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            this.lblAssaultSpeed.Content = $"x {sldAssaultSpeed.Value.ToString("0.00")}";
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml
new file mode 100644
index 000000000..572d41494
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml	
@@ -0,0 +1,14 @@
+<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.Payday_2.Layers"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:Controls="clr-namespace:Aurora.Controls" x:Class="Aurora.Profiles.Payday_2.Layers.Control_PD2FlashbangLayer"
+             mc:Ignorable="d" Loaded="UserControl_Loaded">
+    <Grid>
+        <xctk:ColorPicker x:Name="ColorPicker_Flashbang" Margin="93,0,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="151" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_Flashbang_SelectedColorChanged" />
+        <Label HorizontalAlignment="Left" Padding="0" Content="Flashbang Color:" VerticalAlignment="Top" Margin="0,2,0,0"/>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs
new file mode 100644
index 000000000..9953ebb61
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs	
@@ -0,0 +1,65 @@
+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.Payday_2.Layers
+{
+    /// <summary>
+    /// Interaction logic for Control_PD2FlashbangLayer.xaml
+    /// </summary>
+    public partial class Control_PD2FlashbangLayer : UserControl
+    {
+        private bool settingsset = false;
+
+        public Control_PD2FlashbangLayer()
+        {
+            InitializeComponent();
+        }
+
+        public Control_PD2FlashbangLayer(PD2FlashbangLayerHandler datacontext)
+        {
+            InitializeComponent();
+
+            this.DataContext = datacontext;
+        }
+
+        public void SetSettings()
+        {
+            if (this.DataContext is PD2FlashbangLayerHandler && !settingsset)
+            {
+                this.ColorPicker_Flashbang.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as PD2FlashbangLayerHandler).Properties._FlashbangColor ?? System.Drawing.Color.Empty);
+
+                settingsset = true;
+            }
+        }
+
+        internal void SetProfile(Application profile)
+        {
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            SetSettings();
+
+            this.Loaded -= UserControl_Loaded;
+        }
+
+        private void ColorPicker_Flashbang_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            if (IsLoaded && settingsset && this.DataContext is PD2FlashbangLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
+                (this.DataContext as PD2FlashbangLayerHandler).Properties._FlashbangColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs
new file mode 100644
index 000000000..4c152471f
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs	
@@ -0,0 +1,54 @@
+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.Payday_2.Layers
+{
+    /// <summary>
+    /// Interaction logic for Control_PD2StatesLayer.xaml
+    /// </summary>
+    public partial class Control_PD2StatesLayer : UserControl
+    {
+        private bool settingsset = false;
+        private bool profileset = false;
+
+        public Control_PD2StatesLayer()
+        {
+            InitializeComponent();
+        }
+
+        public Control_PD2StatesLayer(PD2StatesLayerHandler datacontext)
+        {
+            this.DataContext = datacontext.Properties;
+            InitializeComponent();
+        }
+
+
+        internal void SetProfile(Application profile)
+        {
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+
+            this.Loaded -= UserControl_Loaded;
+        }
+
+        private void sldSwanSongSpeed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            this.lblSwanSongSpeed.Content = $"x {sldSwanSongSpeed.Value.ToString("0.00")}";
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs
new file mode 100644
index 000000000..071249136
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs	
@@ -0,0 +1,253 @@
+using Aurora.EffectsEngine;
+using Aurora.Profiles.Payday_2.GSI;
+using Aurora.Profiles.Payday_2.GSI.Nodes;
+using Aurora.Settings;
+using Aurora.Settings.Layers;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    [Obsolete]
+    public class PD2BackgroundLayerHandlerProperties : LayerHandlerProperties2Color<PD2BackgroundLayerHandlerProperties>
+    {
+        public Color? _AmbientColor { get; set; }
+
+        [JsonIgnore]
+        public Color AmbientColor { get { return Logic._AmbientColor ?? _AmbientColor ?? Color.Empty; } }
+
+        public Color? _AssaultColor { get; set; }
+
+        [JsonIgnore]
+        public Color AssaultColor { get { return Logic._AssaultColor ?? _AssaultColor ?? Color.Empty; } }
+
+        public Color? _WintersColor { get; set; }
+
+        [JsonIgnore]
+        public Color WintersColor { get { return Logic._WintersColor ?? _WintersColor ?? Color.Empty; } }
+
+        public float? _AssaultSpeedMultiplier { get; set; }
+
+        [JsonIgnore]
+        public float AssaultSpeedMultiplier { get { return Logic._AssaultSpeedMultiplier ?? _AssaultSpeedMultiplier ?? 0.0F; } }
+
+        public Color? _AssaultFadeColor { get; set; }
+
+        [JsonIgnore]
+        public Color AssaultFadeColor { get { return Logic._AssaultFadeColor ?? _AssaultFadeColor ?? Color.Empty; } }
+
+        public bool? _AssaultAnimationEnabled { get; set; }
+
+        [JsonIgnore]
+        public bool AssaultAnimationEnabled { get { return Logic._AssaultAnimationEnabled ?? _AssaultAnimationEnabled ?? false; } }
+
+        public Color? _LowSuspicionColor { get; set; }
+
+        [JsonIgnore]
+        public Color LowSuspicionColor { get { return Logic._LowSuspicionColor ?? _LowSuspicionColor ?? Color.Empty; } }
+
+        public Color? _MediumSuspicionColor { get; set; }
+
+        [JsonIgnore]
+        public Color MediumSuspicionColor { get { return Logic._MediumSuspicionColor ?? _MediumSuspicionColor ?? Color.Empty; } }
+
+        public Color? _HighSuspicionColor { get; set; }
+
+        [JsonIgnore]
+        public Color HighSuspicionColor { get { return Logic._HighSuspicionColor ?? _HighSuspicionColor ?? Color.Empty; } }
+
+        public bool? _ShowSuspicion { get; set; }
+
+        [JsonIgnore]
+        public bool ShowSuspicion { get { return Logic._ShowSuspicion ?? _ShowSuspicion ?? false; } }
+
+        public PercentEffectType? _SuspicionEffectType { get; set; }
+
+        public PercentEffectType SuspicionEffectType { get { return Logic._SuspicionEffectType ?? _SuspicionEffectType ?? PercentEffectType.AllAtOnce; } }
+
+        public bool? _PeripheralUse { get; set; }
+
+        [JsonIgnore]
+        public bool PeripheralUse { get { return Logic._PeripheralUse ?? _PeripheralUse ?? false; } }
+
+
+        public PD2BackgroundLayerHandlerProperties() : base() { }
+
+        public PD2BackgroundLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
+
+        public override void Default()
+        {
+            base.Default();
+
+            _AmbientColor = Color.FromArgb(158, 205, 255);
+            _AssaultColor = Color.FromArgb(158, 205, 255);
+            _WintersColor = Color.FromArgb(221, 99, 33);
+            _AssaultSpeedMultiplier = 1.0f;
+            _AssaultFadeColor = Color.FromArgb(255, 255, 255);
+            _AssaultAnimationEnabled = true;
+            _LowSuspicionColor = Color.FromArgb(0, 0, 0, 255);
+            _MediumSuspicionColor = Color.FromArgb(255, 0, 0, 255);
+            _HighSuspicionColor = Color.FromArgb(255, 255, 0, 0);
+            _ShowSuspicion = true;
+            _SuspicionEffectType = PercentEffectType.Progressive;
+            _PeripheralUse = true;
+        }
+
+    }
+
+    [Obsolete]
+    public class PD2BackgroundLayerHandler : LayerHandler<PD2BackgroundLayerHandlerProperties>
+    {
+        private float no_return_flashamount = 1.0f;
+        private float no_return_timeleft;
+
+        protected override UserControl CreateControl()
+        {
+            return new Control_PD2BackgroundLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            EffectLayer bg_layer = new EffectLayer("Payday 2 - Background");
+
+            if (state is GameState_PD2)
+            {
+
+                GameState_PD2 pd2 = (GameState_PD2)state;
+
+                Color bg_color = Properties.AmbientColor;
+
+                long currenttime = Utils.Time.GetMillisecondsSinceEpoch();
+
+                if ((pd2.Level.Phase == LevelPhase.Assault || pd2.Level.Phase == LevelPhase.Winters) && pd2.Game.State == GameStates.Ingame)
+                {
+                    if (pd2.Level.Phase == LevelPhase.Assault)
+                        bg_color = Properties.AssaultColor;
+                    else if (pd2.Level.Phase == LevelPhase.Winters)
+                        bg_color = Properties.WintersColor;
+
+                    double blend_percent = Math.Pow(Math.Sin(((currenttime % 1300L) / 1300.0D) * Properties.AssaultSpeedMultiplier * 2.0D * Math.PI), 2.0D);
+
+                    bg_color = Utils.ColorUtils.BlendColors(Properties.AssaultFadeColor, bg_color, blend_percent);
+
+                    if (Properties.AssaultAnimationEnabled)
+                    {
+
+                        Color effect_contours = Color.FromArgb(200, Color.Black);
+                        float animation_stage_yoffset = 20.0f;
+                        float animation_repeat_keyframes = 250.0f; //Effects.canvas_width * 2.0f;
+
+                        /* Effect visual:
+
+                        / /  ----  / /
+
+                        */
+
+                        /*
+                         * !!!NOTE: TO BE REWORKED INTO ANIMATIONS!!!
+
+                        EffectColorFunction line1_col_func = new EffectColorFunction(
+                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + animation_stage_yoffset),
+                            new ColorSpectrum(effect_contours),
+                            2);
+
+                        EffectColorFunction line2_col_func = new EffectColorFunction(
+                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 9.0f + animation_stage_yoffset),
+                            new ColorSpectrum(effect_contours),
+                            2);
+
+                        EffectColorFunction line3_col_func = new EffectColorFunction(
+                            new EffectLine(new EffectPoint(Effects.canvas_width + assault_yoffset + 17.0f + animation_stage_yoffset, Effects.canvas_height / 2.0f), new EffectPoint(Effects.canvas_width + assault_yoffset + 34.0f + animation_stage_yoffset, Effects.canvas_height / 2.0f), true),
+                            new ColorSpectrum(effect_contours),
+                            6);
+
+                        EffectColorFunction line4_col_func = new EffectColorFunction(
+                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 52.0f + animation_stage_yoffset),
+                            new ColorSpectrum(effect_contours),
+                            2);
+
+                        EffectColorFunction line5_col_func = new EffectColorFunction(
+                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 61.0f + animation_stage_yoffset),
+                            new ColorSpectrum(effect_contours),
+                            2);
+
+                        assault_yoffset -= 0.50f;
+                        assault_yoffset = assault_yoffset % animation_repeat_keyframes;
+
+                        bg_layer.AddPostFunction(line1_col_func);
+                        bg_layer.AddPostFunction(line2_col_func);
+                        //bg_layer.AddPostFunction(line3_col_func);
+                        bg_layer.AddPostFunction(line4_col_func);
+                        bg_layer.AddPostFunction(line5_col_func);
+
+                        */
+                    }
+
+                    bg_layer.Fill(bg_color);
+
+                    if (Properties.PeripheralUse)
+                        bg_layer.Set(Devices.DeviceKeys.Peripheral, bg_color);
+                }
+                else if (pd2.Level.Phase == LevelPhase.Stealth && pd2.Game.State == GameStates.Ingame)
+                {
+                    if (Properties.ShowSuspicion)
+                    {
+                        double percentSuspicious = ((double)pd2.Players.LocalPlayer.SuspicionAmount / (double)1.0);
+
+                        ColorSpectrum suspicion_spec = new ColorSpectrum(Properties.LowSuspicionColor, Properties.HighSuspicionColor);
+                        suspicion_spec.SetColorAt(0.5f, Properties.MediumSuspicionColor);
+
+                        Settings.KeySequence suspicionSequence = new Settings.KeySequence(new Settings.FreeFormObject(0, 0, 1.0f / (Effects.editor_to_canvas_width / Effects.canvas_width), 1.0f / (Effects.editor_to_canvas_height / Effects.canvas_height)));
+
+                        bg_layer.PercentEffect(suspicion_spec, suspicionSequence, percentSuspicious, 1.0D, Properties.SuspicionEffectType);
+
+                        if (Properties.PeripheralUse)
+                            bg_layer.Set(Devices.DeviceKeys.Peripheral, suspicion_spec.GetColorAt((float)percentSuspicious));
+                    }
+                }
+                else if (pd2.Level.Phase == LevelPhase.Point_of_no_return && pd2.Game.State == GameStates.Ingame)
+                {
+                    ColorSpectrum no_return_spec = new ColorSpectrum(Color.Red, Color.Yellow);
+                    if (pd2.Level.NoReturnTime != no_return_timeleft)
+                    {
+                        no_return_timeleft = pd2.Level.NoReturnTime;
+                        no_return_flashamount = 1.0f;
+                    }
+
+                    Color no_return_color = no_return_spec.GetColorAt(no_return_flashamount);
+                    no_return_flashamount -= 0.05f;
+
+                    if (no_return_flashamount < 0.0f)
+                        no_return_flashamount = 0.0f;
+
+                    bg_layer.Fill(no_return_color);
+
+                    if (Properties.PeripheralUse)
+                        bg_layer.Set(Devices.DeviceKeys.Peripheral, no_return_color);
+                }
+                else
+                {
+                    bg_layer.Fill(bg_color);
+
+                    if (Properties.PeripheralUse)
+                        bg_layer.Set(Devices.DeviceKeys.Peripheral, bg_color);
+                }
+
+            }
+
+            return bg_layer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            (_Control as Control_PD2BackgroundLayer)?.SetProfile(profile);
+            base.SetApplication(profile);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs
new file mode 100644
index 000000000..2ac8715d8
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs	
@@ -0,0 +1,75 @@
+using Aurora.EffectsEngine;
+using Aurora.Profiles.CSGO.GSI;
+using Aurora.Profiles.CSGO.GSI.Nodes;
+using Aurora.Profiles.Payday_2.GSI;
+using Aurora.Profiles.Payday_2.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.Payday_2.Layers
+{
+    [Obsolete]
+    public class PD2FlashbangLayerHandlerProperties : LayerHandlerProperties2Color<PD2FlashbangLayerHandlerProperties>
+    {
+        public Color? _FlashbangColor { get; set; }
+
+        [JsonIgnore]
+        public Color FlashbangColor { get { return Logic._FlashbangColor ?? _FlashbangColor ?? Color.Empty; } }
+
+        public PD2FlashbangLayerHandlerProperties() : base() { }
+
+        public PD2FlashbangLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
+
+        public override void Default()
+        {
+            base.Default();
+
+            this._FlashbangColor = Color.FromArgb(255, 255, 255);
+        }
+
+    }
+
+    [Obsolete]
+    public class PD2FlashbangLayerHandler : LayerHandler<PD2FlashbangLayerHandlerProperties>
+    {
+        protected override UserControl CreateControl()
+        {
+            return new Control_PD2FlashbangLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            EffectLayer flashed_layer = new EffectLayer("Payday 2 - Flashed");
+
+            if (state is GameState_PD2)
+            {
+                GameState_PD2 pd2state = state as GameState_PD2;
+
+                //Update Flashed
+                if (pd2state.Game.State == GameStates.Ingame && pd2state.LocalPlayer.FlashAmount > 0)
+                {
+                    Color flash_color = Utils.ColorUtils.MultiplyColorByScalar(Properties.FlashbangColor, pd2state.LocalPlayer.FlashAmount);
+
+                    flashed_layer.Fill(flash_color);
+                }
+            }
+
+            return flashed_layer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            (Control as Control_PD2FlashbangLayer).SetProfile(profile);
+            base.SetApplication(profile);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs
new file mode 100644
index 000000000..abe3b41ea
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs	
@@ -0,0 +1,120 @@
+using Aurora.EffectsEngine;
+using Aurora.Profiles.Payday_2.GSI;
+using Aurora.Profiles.Payday_2.GSI.Nodes;
+using Aurora.Settings;
+using Aurora.Settings.Layers;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    [Obsolete]
+    public class PD2StatesLayerHandlerProperties : LayerHandlerProperties2Color<PD2StatesLayerHandlerProperties>
+    {
+        public Color? _DownedColor { get; set; }
+
+        [JsonIgnore]
+        public Color DownedColor { get { return Logic._DownedColor ?? _DownedColor ?? Color.Empty; } }
+
+        public Color? _ArrestedColor { get; set; }
+
+        [JsonIgnore]
+        public Color ArrestedColor { get { return Logic._ArrestedColor ?? _ArrestedColor ?? Color.Empty; } }
+
+        public Color? _SwanSongColor { get; set; }
+
+        [JsonIgnore]
+        public Color SwanSongColor { get { return Logic._SwanSongColor ?? _SwanSongColor ?? Color.Empty; } }
+
+        public bool? _ShowSwanSong { get; set; }
+
+        [JsonIgnore]
+        public bool ShowSwanSong { get { return Logic._ShowSwanSong ?? _ShowSwanSong ?? false; } }
+
+        public float? _SwanSongSpeedMultiplier { get; set; }
+
+        [JsonIgnore]
+        public float SwanSongSpeedMultiplier { get { return Logic._SwanSongSpeedMultiplier ?? _SwanSongSpeedMultiplier ?? 0.0F; } }
+
+        public PD2StatesLayerHandlerProperties() : base() { }
+
+        public PD2StatesLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
+
+        public override void Default()
+        {
+            base.Default();
+
+            _DownedColor = Color.White;
+            _ArrestedColor = Color.DarkRed;
+            _ShowSwanSong = true;
+            _SwanSongColor = Color.FromArgb(158, 205, 255);
+            _SwanSongSpeedMultiplier = 1.0f;
+        }
+
+    }
+
+    [Obsolete]
+    public class PD2StatesLayerHandler : LayerHandler<PD2StatesLayerHandlerProperties>
+    {
+        protected override UserControl CreateControl()
+        {
+            return new Control_PD2StatesLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            EffectLayer states_layer = new EffectLayer("Payday 2 - States");
+
+            if (state is GameState_PD2)
+            {
+                GameState_PD2 pd2state = (GameState_PD2)state;
+
+                if (pd2state.Game.State == GameStates.Ingame)
+                {
+                    if (pd2state.LocalPlayer.State == PlayerState.Incapacitated || pd2state.LocalPlayer.State == PlayerState.Bleed_out || pd2state.LocalPlayer.State == PlayerState.Fatal)
+                    {
+                        int incapAlpha = (int)(pd2state.LocalPlayer.DownTime > 10 ? 0 : 255 * (1.0D - (double)pd2state.LocalPlayer.DownTime / 10.0D));
+
+                        if (incapAlpha > 255)
+                            incapAlpha = 255;
+                        else if (incapAlpha < 0)
+                            incapAlpha = 0;
+
+                        Color incapColor = Color.FromArgb(incapAlpha, Properties.DownedColor);
+
+                        states_layer.Fill(incapColor).Set(Devices.DeviceKeys.Peripheral, incapColor);
+                    }
+                    else if (pd2state.LocalPlayer.State == PlayerState.Arrested)
+                    {
+                        states_layer.Fill(Properties.ArrestedColor).Set(Devices.DeviceKeys.Peripheral, Properties.ArrestedColor);
+                    }
+
+                    if (pd2state.LocalPlayer.IsSwanSong && Properties.ShowSwanSong)
+                    {
+                        double blend_percent = Math.Pow(Math.Cos((Utils.Time.GetMillisecondsSinceEpoch() % 1300L) / 1300.0D * Properties.SwanSongSpeedMultiplier * 2.0D * Math.PI), 2.0D);
+
+                        Color swansongColor = Utils.ColorUtils.MultiplyColorByScalar(Properties.SwanSongColor, blend_percent);
+
+                        EffectLayer swansong_layer = new EffectLayer("Payday 2 - Swansong", swansongColor).Set(Devices.DeviceKeys.Peripheral, swansongColor);
+
+                        states_layer += swansong_layer;
+                    }
+                }
+            }
+
+            return states_layer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            (_Control as Control_PD2StatesLayer)?.SetProfile(profile);
+            base.SetApplication(profile);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs
index 337820bb7..8b01f7743 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs	
@@ -17,6 +17,9 @@ public PD2()
                 IconURI = "Resources/pd2_64x64.png"
             })
         {
+            AllowLayer<PD2BackgroundLayerHandler>();
+            AllowLayer<PD2FlashbangLayerHandler>();
+            AllowLayer<PD2StatesLayerHandler>();
             AllowLayer<PD2MaskOnAnimationLayerHandler>();
         }
     }