Skip to content

Commit 9948521

Browse files
committed
Restore Legacy PD2 Layers
1 parent 7c54cc3 commit 9948521

10 files changed

+638
-97
lines changed

Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,6 @@
2020
<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"/>
2121
<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"/>
2222
</Grid>
23-
</TabItem>
24-
<TabItem Header="Preview">
25-
<Grid>
26-
<Label Content="Level Phase:" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top"/>
27-
<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"/>
28-
<Label Content="Health:" HorizontalAlignment="Left" Margin="10,103,0,0" VerticalAlignment="Top"/>
29-
<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"/>
30-
<Label x:Name="preview_health_amount" Content="0%" HorizontalAlignment="Left" Margin="181,103,0,0" VerticalAlignment="Top"/>
31-
<Label Content="Ammo:" HorizontalAlignment="Left" Margin="10,134,0,0" VerticalAlignment="Top"/>
32-
<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"/>
33-
<Label x:Name="preview_ammo_amount" Content="0%" HorizontalAlignment="Left" Margin="181,134,0,0" VerticalAlignment="Top"/>
34-
<Label Content="Suspicion:" HorizontalAlignment="Left" Margin="10,165,0,0" VerticalAlignment="Top"/>
35-
<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"/>
36-
<Label x:Name="preview_suspicion_amount" Content="0%" HorizontalAlignment="Left" Margin="181,165,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.692,3.115"/>
37-
<Label Content="Player State:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top"/>
38-
<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"/>
39-
<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"/>
40-
<Label Content="Flashbang amount:" HorizontalAlignment="Left" Margin="10,216,0,0" VerticalAlignment="Top"/>
41-
<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"/>
42-
<Label x:Name="preview_flashbang_amount" Content="0%" HorizontalAlignment="Left" Margin="229,218,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.692,3.115"/>
43-
<Label Content="Game State:" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
44-
<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"/>
45-
</Grid>
4623
</TabItem>
4724
</TabControl>
4825
</Grid>

Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -92,80 +92,6 @@ private void install_mod_button_Click(object sender, RoutedEventArgs e)
9292
}
9393
}
9494

95-
private void preview_gamestate_SelectionChanged(object sender, SelectionChangedEventArgs e)
96-
{
97-
if (IsLoaded)
98-
{
99-
(profile_manager.Config.Event._game_state as GameState_PD2).Game.State = (GSI.Nodes.GameStates)preview_gamestate.SelectedValue;
100-
}
101-
}
102-
103-
private void preview_levelphase_SelectionChanged(object sender, SelectionChangedEventArgs e)
104-
{
105-
if (IsLoaded)
106-
{
107-
(profile_manager.Config.Event._game_state as GameState_PD2).Level.Phase = (GSI.Nodes.LevelPhase)preview_levelphase.SelectedValue;
108-
}
109-
}
110-
111-
private void preview_playerstate_SelectionChanged(object sender, SelectionChangedEventArgs e)
112-
{
113-
if (IsLoaded)
114-
{
115-
(profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.State = (GSI.Nodes.PlayerState)preview_playerstate.SelectedValue;
116-
}
117-
}
118-
119-
private void preview_health_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
120-
{
121-
int hp_val = (int)this.preview_health_slider.Value;
122-
if (this.preview_health_amount is Label)
123-
{
124-
this.preview_health_amount.Content = hp_val + "%";
125-
(profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Health.Current = hp_val;
126-
(profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Health.Max = 100;
127-
}
128-
}
129-
130-
private void preview_ammo_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
131-
{
132-
int ammo_val = (int)this.preview_ammo_slider.Value;
133-
if (this.preview_ammo_amount is Label)
134-
{
135-
this.preview_ammo_amount.Content = ammo_val + "%";
136-
(profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Weapons.SelectedWeapon.Current_Clip = ammo_val;
137-
(profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Weapons.SelectedWeapon.Max_Clip = 100;
138-
}
139-
}
140-
141-
private void preview_suspicion_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
142-
{
143-
float susp_val = (float)this.preview_suspicion_slider.Value;
144-
if (this.preview_suspicion_amount is Label)
145-
{
146-
this.preview_suspicion_amount.Content = (int)susp_val + "%";
147-
(profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.SuspicionAmount = susp_val / 100.0f;
148-
}
149-
}
150-
151-
private void preview_flashbang_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
152-
{
153-
float flash_val = (float)this.preview_flashbang_slider.Value;
154-
if (this.preview_flashbang_amount is Label)
155-
{
156-
this.preview_flashbang_amount.Content = (int)flash_val + "%";
157-
(profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.FlashAmount = flash_val / 100.0f;
158-
}
159-
}
160-
161-
private void preview_swansong_Checked(object sender, RoutedEventArgs e)
162-
{
163-
if (IsLoaded && sender is CheckBox && (sender as CheckBox).IsChecked.HasValue)
164-
{
165-
(profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.IsSwanSong = (sender as CheckBox).IsChecked.Value;
166-
}
167-
}
168-
16995
private void get_lib_button_Click(object sender, RoutedEventArgs e)
17096
{
17197
System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(@"https://modworkshop.net/mod/14924"));
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
using Aurora.Settings;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
using System.Windows;
8+
using System.Windows.Controls;
9+
using System.Windows.Data;
10+
using System.Windows.Documents;
11+
using System.Windows.Input;
12+
using System.Windows.Media;
13+
using System.Windows.Media.Imaging;
14+
using System.Windows.Navigation;
15+
using System.Windows.Shapes;
16+
17+
namespace Aurora.Profiles.Payday_2.Layers
18+
{
19+
/// <summary>
20+
/// Interaction logic for Control_CSGOBackgroundLayer.xaml
21+
/// </summary>
22+
public partial class Control_PD2BackgroundLayer : UserControl
23+
{
24+
private bool settingsset = false;
25+
private bool profileset = false;
26+
27+
public Control_PD2BackgroundLayer()
28+
{
29+
InitializeComponent();
30+
}
31+
32+
public Control_PD2BackgroundLayer(PD2BackgroundLayerHandler datacontext)
33+
{
34+
this.DataContext = datacontext.Properties;
35+
InitializeComponent();
36+
}
37+
38+
39+
internal void SetProfile(Application profile)
40+
{
41+
}
42+
43+
private void UserControl_Loaded(object sender, RoutedEventArgs e)
44+
{
45+
46+
this.Loaded -= UserControl_Loaded;
47+
}
48+
49+
private void sldAssaultSpeed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
50+
{
51+
this.lblAssaultSpeed.Content = $"x {sldAssaultSpeed.Value.ToString("0.00")}";
52+
}
53+
}
54+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<UserControl
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:Aurora.Profiles.Payday_2.Layers"
7+
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
8+
xmlns:Controls="clr-namespace:Aurora.Controls" x:Class="Aurora.Profiles.Payday_2.Layers.Control_PD2FlashbangLayer"
9+
mc:Ignorable="d" Loaded="UserControl_Loaded">
10+
<Grid>
11+
<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" />
12+
<Label HorizontalAlignment="Left" Padding="0" Content="Flashbang Color:" VerticalAlignment="Top" Margin="0,2,0,0"/>
13+
</Grid>
14+
</UserControl>
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
using Aurora.Settings;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
using System.Windows;
8+
using System.Windows.Controls;
9+
using System.Windows.Data;
10+
using System.Windows.Documents;
11+
using System.Windows.Input;
12+
using System.Windows.Media;
13+
using System.Windows.Media.Imaging;
14+
using System.Windows.Navigation;
15+
using System.Windows.Shapes;
16+
17+
namespace Aurora.Profiles.Payday_2.Layers
18+
{
19+
/// <summary>
20+
/// Interaction logic for Control_PD2FlashbangLayer.xaml
21+
/// </summary>
22+
public partial class Control_PD2FlashbangLayer : UserControl
23+
{
24+
private bool settingsset = false;
25+
26+
public Control_PD2FlashbangLayer()
27+
{
28+
InitializeComponent();
29+
}
30+
31+
public Control_PD2FlashbangLayer(PD2FlashbangLayerHandler datacontext)
32+
{
33+
InitializeComponent();
34+
35+
this.DataContext = datacontext;
36+
}
37+
38+
public void SetSettings()
39+
{
40+
if (this.DataContext is PD2FlashbangLayerHandler && !settingsset)
41+
{
42+
this.ColorPicker_Flashbang.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as PD2FlashbangLayerHandler).Properties._FlashbangColor ?? System.Drawing.Color.Empty);
43+
44+
settingsset = true;
45+
}
46+
}
47+
48+
internal void SetProfile(Application profile)
49+
{
50+
}
51+
52+
private void UserControl_Loaded(object sender, RoutedEventArgs e)
53+
{
54+
SetSettings();
55+
56+
this.Loaded -= UserControl_Loaded;
57+
}
58+
59+
private void ColorPicker_Flashbang_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
60+
{
61+
if (IsLoaded && settingsset && this.DataContext is PD2FlashbangLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
62+
(this.DataContext as PD2FlashbangLayerHandler).Properties._FlashbangColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
63+
}
64+
}
65+
}
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
using Aurora.Settings;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
using System.Windows;
8+
using System.Windows.Controls;
9+
using System.Windows.Data;
10+
using System.Windows.Documents;
11+
using System.Windows.Input;
12+
using System.Windows.Media;
13+
using System.Windows.Media.Imaging;
14+
using System.Windows.Navigation;
15+
using System.Windows.Shapes;
16+
17+
namespace Aurora.Profiles.Payday_2.Layers
18+
{
19+
/// <summary>
20+
/// Interaction logic for Control_PD2StatesLayer.xaml
21+
/// </summary>
22+
public partial class Control_PD2StatesLayer : UserControl
23+
{
24+
private bool settingsset = false;
25+
private bool profileset = false;
26+
27+
public Control_PD2StatesLayer()
28+
{
29+
InitializeComponent();
30+
}
31+
32+
public Control_PD2StatesLayer(PD2StatesLayerHandler datacontext)
33+
{
34+
this.DataContext = datacontext.Properties;
35+
InitializeComponent();
36+
}
37+
38+
39+
internal void SetProfile(Application profile)
40+
{
41+
}
42+
43+
private void UserControl_Loaded(object sender, RoutedEventArgs e)
44+
{
45+
46+
this.Loaded -= UserControl_Loaded;
47+
}
48+
49+
private void sldSwanSongSpeed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
50+
{
51+
this.lblSwanSongSpeed.Content = $"x {sldSwanSongSpeed.Value.ToString("0.00")}";
52+
}
53+
}
54+
}

0 commit comments

Comments
 (0)