diff --git a/Docs/Images/Bulk Launcher.png b/Docs/Images/Bulk Launcher.png
deleted file mode 100644
index f6422c9..0000000
Binary files a/Docs/Images/Bulk Launcher.png and /dev/null differ
diff --git a/Docs/Images/Launcher.png b/Docs/Images/Launcher.png
index 62fb712..9dddf37 100644
Binary files a/Docs/Images/Launcher.png and b/Docs/Images/Launcher.png differ
diff --git a/Docs/Images/Options.png b/Docs/Images/Options.png
index f0233b9..1aef88b 100644
Binary files a/Docs/Images/Options.png and b/Docs/Images/Options.png differ
diff --git a/README.md b/README.md
index 9f9e559..2efb0c4 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,4 @@
-
-
diff --git a/Source/App.config b/Source/App.config
index 125ad19..6b81c39 100644
--- a/Source/App.config
+++ b/Source/App.config
@@ -19,17 +19,8 @@
True
-
- 1
-
-
- 0
-
-
- test_
-
- 2
+ 6
@@ -40,9 +31,6 @@
0
-
-
-
\ No newline at end of file
diff --git a/Source/MainWindow.xaml b/Source/MainWindow.xaml
index b43d13a..bd4bc5c 100644
--- a/Source/MainWindow.xaml
+++ b/Source/MainWindow.xaml
@@ -39,21 +39,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Source/MainWindow.xaml.cs b/Source/MainWindow.xaml.cs
index 09fb1a7..d685f48 100644
--- a/Source/MainWindow.xaml.cs
+++ b/Source/MainWindow.xaml.cs
@@ -3,7 +3,6 @@
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
-using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
@@ -20,17 +19,9 @@ public partial class MainWindow
{
public MainWindow()
{
- if (String.IsNullOrWhiteSpace(Properties.Settings.Default.BulkLaunchPassword))
- {
- // Create a random password if one doesn't exist
- var rand = new Random();
- for (int i = 0; i < 16; i++)
- Properties.Settings.Default.BulkLaunchPassword += Convert.ToChar(rand.Next(97, 122));
- }
-
InitializeComponent();
- Title += " 1.1"; // Update line 55 in AssemblyInfo.cs
+ Title += " 1.2"; // Update line 55 in AssemblyInfo.cs
if (Properties.Settings.Default.WindowPositionLeft != 0 && Properties.Settings.Default.WindowPositionTop != 0)
{
@@ -73,15 +64,12 @@ private void PopulateServerLists()
PopulateServerList(cboLauncherServerList, serversList);
- PopulateServerList(cboBulkLauncherServerList, serversList);
-
cmdEditServer.IsEnabled = (serversList.Count > 0);
cmdDeleteServer.IsEnabled = (serversList.Count > 0);
cmdAddAccounts.IsEnabled = (serversList.Count > 0);
cmdLaunchAll.IsEnabled = (serversList.Count > 0);
- cmdBulkLaunch.IsEnabled = (serversList.Count > 0);
}
private void PopulateServerList(ComboBox comboBox, ICollection servers)
@@ -107,16 +95,6 @@ private void SelectServer(Guid id)
break;
}
}
-
- foreach (var item in cboBulkLauncherServerList.Items)
- {
- if (item is Server server && server.Id == id)
- {
- cboBulkLauncherServerList.SelectedItem = item;
-
- break;
- }
- }
}
private void SetListAccountsSource(IList accounts)
@@ -360,84 +338,6 @@ private async void cmdLaunchAll_Click(object sender, RoutedEventArgs e)
}
- // =====================================
- // ========== BULK LAUNCH TAB ==========
- // =====================================
-
- private void cboBulkLauncherServerList_SelectionChanged(object sender, SelectionChangedEventArgs e)
- {
- if (cboBulkLauncherServerList.SelectedItem is Server server)
- SelectServer(server.Id);
- }
-
- CancellationTokenSource bulkLaunchCTS;
-
- private async void cmdBulkLaunch_Click(object sender, RoutedEventArgs e)
- {
- if (cmdBulkLaunch.Content.ToString() == "Cancel")
- {
- if (bulkLaunchCTS != null)
- {
- bulkLaunchCTS.Cancel();
- bulkLaunchCTS = null;
- }
-
- cmdBulkLaunch.Content = "Bulk Launch";
- return;
- }
-
- cmdBulkLaunch.Content = "Cancel";
-
- try
- {
- if (cboBulkLauncherServerList.SelectedItem is Server server)
- {
- bulkLaunchCTS = new CancellationTokenSource();
-
- await DoBulkLaunch(Properties.Settings.Default.BulkLaunchQuantity, Properties.Settings.Default.BulkLaunchStartIndex, Properties.Settings.Default.BulkLaunchUserNamePrefix, Properties.Settings.Default.BulkLaunchPassword, TimeSpan.FromSeconds(Properties.Settings.Default.IntervalBetweenLaunches), server, bulkLaunchCTS.Token);
- }
- }
- finally
- {
- cmdBulkLaunch.Content = "Bulk Launch";
- }
- }
-
- private async Task DoBulkLaunch(int launchQuantity, int startIndex, string userNamePrefix, string password, TimeSpan interval, Server server, CancellationToken token)
- {
- if (String.IsNullOrWhiteSpace(password))
- {
- MessageBox.Show("Password cannot be empty", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
- return;
- }
-
- for (int i = startIndex; i < (startIndex + launchQuantity); i++)
- {
- if (token.IsCancellationRequested)
- return;
-
- var userName = userNamePrefix + i.ToString("00000");
-
- txtBulkLaunchStatus.Text += $"{DateTime.Now}: Launching user {userName}, connection {(i - startIndex) + 1} of {launchQuantity}" + Environment.NewLine;
- txtBulkLaunchStatus.ScrollToEnd();
-
- var account = new Account {UserName = userName, Password = password };
-
- if (!DoLaunch(server, account))
- {
- txtBulkLaunchStatus.Text += $"{DateTime.Now}: Launching user {userName}, connection {(i - startIndex) + 1} of {launchQuantity} FAILED" + Environment.NewLine;
- txtBulkLaunchStatus.ScrollToEnd();
- break;
- }
-
- if (token.IsCancellationRequested)
- return;
-
- await Task.Delay(interval);
- }
- }
-
-
// =================================
// ========== OPTIONS TAB ==========
// =================================
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
index cb87973..4ecf9ca 100644
--- a/Source/Properties/AssemblyInfo.cs
+++ b/Source/Properties/AssemblyInfo.cs
@@ -52,4 +52,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1")] // Update line 25 in MainWindow.xaml.cs
+[assembly: AssemblyFileVersion("1.2")] // Update line 25 in MainWindow.xaml.cs
diff --git a/Source/Properties/Settings.Designer.cs b/Source/Properties/Settings.Designer.cs
index 8ac0d8e..311af2a 100644
--- a/Source/Properties/Settings.Designer.cs
+++ b/Source/Properties/Settings.Designer.cs
@@ -61,43 +61,7 @@ public bool InjectDecal {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("1")]
- public int BulkLaunchQuantity {
- get {
- return ((int)(this["BulkLaunchQuantity"]));
- }
- set {
- this["BulkLaunchQuantity"] = value;
- }
- }
-
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("0")]
- public int BulkLaunchStartIndex {
- get {
- return ((int)(this["BulkLaunchStartIndex"]));
- }
- set {
- this["BulkLaunchStartIndex"] = value;
- }
- }
-
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("test_")]
- public string BulkLaunchUserNamePrefix {
- get {
- return ((string)(this["BulkLaunchUserNamePrefix"]));
- }
- set {
- this["BulkLaunchUserNamePrefix"] = value;
- }
- }
-
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("2")]
+ [global::System.Configuration.DefaultSettingValueAttribute("6")]
public int IntervalBetweenLaunches {
get {
return ((int)(this["IntervalBetweenLaunches"]));
@@ -142,17 +106,5 @@ public double WindowPositionTop {
this["WindowPositionTop"] = value;
}
}
-
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("")]
- public string BulkLaunchPassword {
- get {
- return ((string)(this["BulkLaunchPassword"]));
- }
- set {
- this["BulkLaunchPassword"] = value;
- }
- }
}
}
diff --git a/Source/Properties/Settings.settings b/Source/Properties/Settings.settings
index e2075c4..8697a3e 100644
--- a/Source/Properties/Settings.settings
+++ b/Source/Properties/Settings.settings
@@ -11,17 +11,8 @@
True
-
- 1
-
-
- 0
-
-
- test_
-
- 2
+ 6
@@ -32,8 +23,5 @@
0
-
-
-
\ No newline at end of file