diff --git a/SBRW.Launcher.Net/App/UI_Forms/Main_Screen/Screen_Main.cs b/SBRW.Launcher.Net/App/UI_Forms/Main_Screen/Screen_Main.cs
index 875d811d..d82f7d75 100644
--- a/SBRW.Launcher.Net/App/UI_Forms/Main_Screen/Screen_Main.cs
+++ b/SBRW.Launcher.Net/App/UI_Forms/Main_Screen/Screen_Main.cs
@@ -53,11 +53,9 @@ public partial class Screen_Main : Form
public static int TotalModFileCount { get; set; }
public static string Custom_SBRW_Pack { get { return Path.Combine(Locations.LauncherFolder, "GameFiles.sbrwpack"); } }
- public static int Game_Affinity { get; set; } = 8;
+ public static int Game_Affinity { get; set; } = 4;
public static int Game_Affinity_Start { get; set; } = 0;
- public static int Game_Affinity_End { get; set; } = 8;
- public static bool TEST_Game_Affinity { get; set; }
- public static bool TEST_Classic_Affinity { get; set; }
+ public static int Game_Affinity_End { get; set; } = 3;
public Screen_Main()
{
diff --git a/SBRW.Launcher.Net/App/UI_Forms/Main_Screen/Screen_Main_Functions.cs b/SBRW.Launcher.Net/App/UI_Forms/Main_Screen/Screen_Main_Functions.cs
index baa4d374..aeba5678 100644
--- a/SBRW.Launcher.Net/App/UI_Forms/Main_Screen/Screen_Main_Functions.cs
+++ b/SBRW.Launcher.Net/App/UI_Forms/Main_Screen/Screen_Main_Functions.cs
@@ -404,7 +404,7 @@ private void Game_Live_Data(string UserID, string LoginToken, string ServerIP, F
{
if (!(Disposing || IsDisposed))
{
- if (new Process_Start_Game() { Live_Process_Cores_Max = (TEST_Classic_Affinity ? -1 : Game_Affinity) }.Initialize(Save_Settings.Live_Data.Game_Path, ServerIP, LoginToken,
+ if (new Process_Start_Game() { Live_Process_Cores_Max = Game_Affinity }.Initialize(Save_Settings.Live_Data.Game_Path, ServerIP, LoginToken,
UserID, Launcher_Value.Launcher_Select_Server_Data.ID.ToUpper(), true, "nfsw.exe") != null)
{
/* Request a New Session */
@@ -479,7 +479,7 @@ private void Game_Live_Data(string UserID, string LoginToken, string ServerIP, F
/* Wait 60 Seconds */
bool Game_Fully_Loaded = Process_Start_Game.Live_Process.WaitForInputIdle(60000);
/* Set Affinity For the Game */
- if (TEST_Game_Affinity)
+ if (Game_Affinity.Equals(-1))
{
Process_Start_Game.Live_Process.Affinity(Game_Affinity_Start, Game_Affinity_End);
}
diff --git a/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings.Designer.cs b/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings.Designer.cs
index a2ce8915..b29e7ec9 100644
--- a/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings.Designer.cs
+++ b/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings.Designer.cs
@@ -69,7 +69,6 @@ private void InitializeComponent()
this.Button_CDN_List = new System.Windows.Forms.Button();
this.LinkLabel_CDN_Current = new System.Windows.Forms.LinkLabel();
this.Label_GameFiles_Downloader = new System.Windows.Forms.Label();
- this.CheckBox_LZMA_Downloader = new System.Windows.Forms.CheckBox();
this.CheckBox_Alt_WebCalls = new System.Windows.Forms.CheckBox();
this.Label_WebClient_Timeout = new System.Windows.Forms.Label();
this.NumericUpDown_WebClient_Timeout = new System.Windows.Forms.NumericUpDown();
@@ -108,17 +107,11 @@ private void InitializeComponent()
this.CheckBox_JSON_Update_Cache = new System.Windows.Forms.CheckBox();
this.Label_Launcher_Path = new System.Windows.Forms.Label();
this.CheckBox_Theme_Support = new System.Windows.Forms.CheckBox();
- this.CheckBox_Opt_Insider = new System.Windows.Forms.CheckBox();
this.TabPage_Experiments = new System.Windows.Forms.TabPage();
- this.Label_Game_Affinity = new System.Windows.Forms.Label();
- this.NumericUpDown_Game_Affinity = new System.Windows.Forms.NumericUpDown();
this.label7 = new System.Windows.Forms.Label();
this.Button_Experiments = new System.Windows.Forms.Button();
- this.Label_Process_Priority = new System.Windows.Forms.Label();
- this.ComboBox_Process_Priority = new System.Windows.Forms.ComboBox();
- this.CheckBox_Enable_Game_Affinity = new System.Windows.Forms.CheckBox();
+ this.CheckBox_Enable_Affinity_Range = new System.Windows.Forms.CheckBox();
this.CheckBox_Enable_ACM = new System.Windows.Forms.CheckBox();
- this.CheckBox_Disable_Classic_Affinity = new System.Windows.Forms.CheckBox();
this.TabPage_Game = new System.Windows.Forms.TabPage();
this.TabControl_Game = new SBRW.Launcher.Core.Theme.Control_TabControl();
this.TabPage_Game_General = new System.Windows.Forms.TabPage();
@@ -203,14 +196,13 @@ private void InitializeComponent()
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.Button_Settings = new System.Windows.Forms.PictureBox();
this.Button_Close = new System.Windows.Forms.PictureBox();
- this.Button_Security_Center = new System.Windows.Forms.Button();
this.Clock = new System.Windows.Forms.Timer(this.components);
- this.panel1 = new System.Windows.Forms.Panel();
+ this.Panel_Affinity_Range = new System.Windows.Forms.Panel();
this.RadioButton_Affinity_Subtract = new System.Windows.Forms.RadioButton();
this.RadioButton_Affinity_Add = new System.Windows.Forms.RadioButton();
this.Label_Affinity_Core_Calculator = new System.Windows.Forms.Label();
- this.NumericUpDown_Range_Affinity = new System.Windows.Forms.NumericUpDown();
this.Label_Affinity_Core_Range = new System.Windows.Forms.Label();
+ this.NumericUpDown_Range_Affinity = new System.Windows.Forms.NumericUpDown();
((System.ComponentModel.ISupportInitialize)(this.fileSystemWatcher1)).BeginInit();
this.TabControl_Shared_Hub.SuspendLayout();
this.TabPage_Setup.SuspendLayout();
@@ -227,7 +219,6 @@ private void InitializeComponent()
this.TabPage_Launcher_Miscellaneous.SuspendLayout();
this.Panel_Launcher_Builds_Branch.SuspendLayout();
this.TabPage_Experiments.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.NumericUpDown_Game_Affinity)).BeginInit();
this.TabPage_Game.SuspendLayout();
this.TabControl_Game.SuspendLayout();
this.TabPage_Game_General.SuspendLayout();
@@ -247,7 +238,7 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Button_Settings)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Button_Close)).BeginInit();
- this.panel1.SuspendLayout();
+ this.Panel_Affinity_Range.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NumericUpDown_Range_Affinity)).BeginInit();
this.SuspendLayout();
//
@@ -545,7 +536,6 @@ private void InitializeComponent()
this.TabPage_Launcher_Downloader.Controls.Add(this.Button_CDN_List);
this.TabPage_Launcher_Downloader.Controls.Add(this.LinkLabel_CDN_Current);
this.TabPage_Launcher_Downloader.Controls.Add(this.Label_GameFiles_Downloader);
- this.TabPage_Launcher_Downloader.Controls.Add(this.CheckBox_LZMA_Downloader);
this.TabPage_Launcher_Downloader.Controls.Add(this.CheckBox_Alt_WebCalls);
this.TabPage_Launcher_Downloader.Controls.Add(this.Label_WebClient_Timeout);
this.TabPage_Launcher_Downloader.Controls.Add(this.NumericUpDown_WebClient_Timeout);
@@ -661,7 +651,7 @@ private void InitializeComponent()
this.Label_WebClient_Timeout_Details.Name = "Label_WebClient_Timeout_Details";
this.Label_WebClient_Timeout_Details.Size = new System.Drawing.Size(576, 18);
this.Label_WebClient_Timeout_Details.TabIndex = 187;
- this.Label_WebClient_Timeout_Details.Text = "Changes Game Files Downloader System\r\n";
+ this.Label_WebClient_Timeout_Details.Text = "Changes Request Time before Web Calls cancels a request.\r\n";
this.Label_WebClient_Timeout_Details.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// Label_GameFiles_Downloader_Details
@@ -730,17 +720,6 @@ private void InitializeComponent()
this.Label_GameFiles_Downloader.Text = "Game Files Downloader:";
this.Label_GameFiles_Downloader.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
//
- // CheckBox_LZMA_Downloader
- //
- this.CheckBox_LZMA_Downloader.BackColor = System.Drawing.Color.Transparent;
- this.CheckBox_LZMA_Downloader.ForeColor = System.Drawing.Color.Black;
- this.CheckBox_LZMA_Downloader.Location = new System.Drawing.Point(11, 281);
- this.CheckBox_LZMA_Downloader.Name = "CheckBox_LZMA_Downloader";
- this.CheckBox_LZMA_Downloader.Size = new System.Drawing.Size(225, 18);
- this.CheckBox_LZMA_Downloader.TabIndex = 159;
- this.CheckBox_LZMA_Downloader.Text = "Enable LZMA Downloader";
- this.CheckBox_LZMA_Downloader.UseVisualStyleBackColor = false;
- //
// CheckBox_Alt_WebCalls
//
this.CheckBox_Alt_WebCalls.BackColor = System.Drawing.Color.Transparent;
@@ -1049,7 +1028,6 @@ private void InitializeComponent()
this.TabPage_Launcher_Miscellaneous.Controls.Add(this.CheckBox_JSON_Update_Cache);
this.TabPage_Launcher_Miscellaneous.Controls.Add(this.Label_Launcher_Path);
this.TabPage_Launcher_Miscellaneous.Controls.Add(this.CheckBox_Theme_Support);
- this.TabPage_Launcher_Miscellaneous.Controls.Add(this.CheckBox_Opt_Insider);
this.TabPage_Launcher_Miscellaneous.Location = new System.Drawing.Point(0, 26);
this.TabPage_Launcher_Miscellaneous.Name = "TabPage_Launcher_Miscellaneous";
this.TabPage_Launcher_Miscellaneous.Size = new System.Drawing.Size(832, 328);
@@ -1218,30 +1196,14 @@ private void InitializeComponent()
this.CheckBox_Theme_Support.Text = "Enable Custom Theme Support";
this.CheckBox_Theme_Support.UseVisualStyleBackColor = false;
//
- // CheckBox_Opt_Insider
- //
- this.CheckBox_Opt_Insider.BackColor = System.Drawing.Color.Transparent;
- this.CheckBox_Opt_Insider.ForeColor = System.Drawing.Color.Black;
- this.CheckBox_Opt_Insider.Location = new System.Drawing.Point(8, 301);
- this.CheckBox_Opt_Insider.Name = "CheckBox_Opt_Insider";
- this.CheckBox_Opt_Insider.Size = new System.Drawing.Size(222, 18);
- this.CheckBox_Opt_Insider.TabIndex = 156;
- this.CheckBox_Opt_Insider.Text = "{PLACE HOLDER}";
- this.CheckBox_Opt_Insider.UseVisualStyleBackColor = false;
- //
// TabPage_Experiments
//
- this.TabPage_Experiments.Controls.Add(this.panel1);
this.TabPage_Experiments.Controls.Add(this.Label_Affinity_Core_Calculator);
- this.TabPage_Experiments.Controls.Add(this.Label_Game_Affinity);
- this.TabPage_Experiments.Controls.Add(this.NumericUpDown_Game_Affinity);
+ this.TabPage_Experiments.Controls.Add(this.Panel_Affinity_Range);
this.TabPage_Experiments.Controls.Add(this.label7);
this.TabPage_Experiments.Controls.Add(this.Button_Experiments);
- this.TabPage_Experiments.Controls.Add(this.Label_Process_Priority);
- this.TabPage_Experiments.Controls.Add(this.ComboBox_Process_Priority);
- this.TabPage_Experiments.Controls.Add(this.CheckBox_Enable_Game_Affinity);
+ this.TabPage_Experiments.Controls.Add(this.CheckBox_Enable_Affinity_Range);
this.TabPage_Experiments.Controls.Add(this.CheckBox_Enable_ACM);
- this.TabPage_Experiments.Controls.Add(this.CheckBox_Disable_Classic_Affinity);
this.TabPage_Experiments.Location = new System.Drawing.Point(0, 26);
this.TabPage_Experiments.Name = "TabPage_Experiments";
this.TabPage_Experiments.Padding = new System.Windows.Forms.Padding(3);
@@ -1250,51 +1212,6 @@ private void InitializeComponent()
this.TabPage_Experiments.Text = "Experiments";
this.TabPage_Experiments.UseVisualStyleBackColor = true;
//
- // Label_Game_Affinity
- //
- this.Label_Game_Affinity.BackColor = System.Drawing.Color.Transparent;
- this.Label_Game_Affinity.Font = new System.Drawing.Font("DejaVu Sans", 9F, System.Drawing.FontStyle.Bold);
- this.Label_Game_Affinity.ForeColor = System.Drawing.Color.DarkGray;
- this.Label_Game_Affinity.Location = new System.Drawing.Point(221, 41);
- this.Label_Game_Affinity.Name = "Label_Game_Affinity";
- this.Label_Game_Affinity.Size = new System.Drawing.Size(154, 14);
- this.Label_Game_Affinity.TabIndex = 215;
- this.Label_Game_Affinity.Text = "Game Affinity Range:";
- this.Label_Game_Affinity.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // NumericUpDown_Game_Affinity
- //
- this.NumericUpDown_Game_Affinity.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(58)))), ((int)(((byte)(76)))));
- this.NumericUpDown_Game_Affinity.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.NumericUpDown_Game_Affinity.Font = new System.Drawing.Font("DejaVu Sans", 9F, System.Drawing.FontStyle.Bold);
- this.NumericUpDown_Game_Affinity.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(178)))), ((int)(((byte)(210)))), ((int)(((byte)(255)))));
- this.NumericUpDown_Game_Affinity.Increment = new decimal(new int[] {
- 2,
- 0,
- 0,
- 0});
- this.NumericUpDown_Game_Affinity.Location = new System.Drawing.Point(387, 40);
- this.NumericUpDown_Game_Affinity.Maximum = new decimal(new int[] {
- 8,
- 0,
- 0,
- 0});
- this.NumericUpDown_Game_Affinity.Minimum = new decimal(new int[] {
- 2,
- 0,
- 0,
- 0});
- this.NumericUpDown_Game_Affinity.Name = "NumericUpDown_Game_Affinity";
- this.NumericUpDown_Game_Affinity.Size = new System.Drawing.Size(61, 17);
- this.NumericUpDown_Game_Affinity.TabIndex = 216;
- this.NumericUpDown_Game_Affinity.Tag = "ProxypPortNumeric";
- this.NumericUpDown_Game_Affinity.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.NumericUpDown_Game_Affinity.Value = new decimal(new int[] {
- 2,
- 0,
- 0,
- 0});
- //
// label7
//
this.label7.BackColor = System.Drawing.Color.Transparent;
@@ -1317,61 +1234,28 @@ private void InitializeComponent()
this.Button_Experiments.Text = "Set Changes";
this.Button_Experiments.UseVisualStyleBackColor = false;
//
- // Label_Process_Priority
- //
- this.Label_Process_Priority.BackColor = System.Drawing.Color.Transparent;
- this.Label_Process_Priority.ForeColor = System.Drawing.Color.DarkGray;
- this.Label_Process_Priority.Location = new System.Drawing.Point(12, 89);
- this.Label_Process_Priority.Name = "Label_Process_Priority";
- this.Label_Process_Priority.Size = new System.Drawing.Size(320, 14);
- this.Label_Process_Priority.TabIndex = 211;
- this.Label_Process_Priority.Text = "Process Priority:";
- this.Label_Process_Priority.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // ComboBox_Process_Priority
- //
- this.ComboBox_Process_Priority.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
- this.ComboBox_Process_Priority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ComboBox_Process_Priority.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.ComboBox_Process_Priority.FormattingEnabled = true;
- this.ComboBox_Process_Priority.Location = new System.Drawing.Point(14, 108);
- this.ComboBox_Process_Priority.Name = "ComboBox_Process_Priority";
- this.ComboBox_Process_Priority.Size = new System.Drawing.Size(164, 22);
- this.ComboBox_Process_Priority.TabIndex = 210;
- //
- // CheckBox_Enable_Game_Affinity
- //
- this.CheckBox_Enable_Game_Affinity.BackColor = System.Drawing.Color.Transparent;
- this.CheckBox_Enable_Game_Affinity.ForeColor = System.Drawing.Color.DarkGray;
- this.CheckBox_Enable_Game_Affinity.Location = new System.Drawing.Point(15, 10);
- this.CheckBox_Enable_Game_Affinity.Name = "CheckBox_Enable_Game_Affinity";
- this.CheckBox_Enable_Game_Affinity.Size = new System.Drawing.Size(222, 18);
- this.CheckBox_Enable_Game_Affinity.TabIndex = 199;
- this.CheckBox_Enable_Game_Affinity.Text = "Enable New Game Affinity";
- this.CheckBox_Enable_Game_Affinity.UseVisualStyleBackColor = false;
+ // CheckBox_Enable_Affinity_Range
+ //
+ this.CheckBox_Enable_Affinity_Range.BackColor = System.Drawing.Color.Transparent;
+ this.CheckBox_Enable_Affinity_Range.ForeColor = System.Drawing.Color.DarkGray;
+ this.CheckBox_Enable_Affinity_Range.Location = new System.Drawing.Point(15, 10);
+ this.CheckBox_Enable_Affinity_Range.Name = "CheckBox_Enable_Affinity_Range";
+ this.CheckBox_Enable_Affinity_Range.Size = new System.Drawing.Size(222, 18);
+ this.CheckBox_Enable_Affinity_Range.TabIndex = 199;
+ this.CheckBox_Enable_Affinity_Range.Text = "Enable Affinity Range";
+ this.CheckBox_Enable_Affinity_Range.UseVisualStyleBackColor = false;
//
// CheckBox_Enable_ACM
//
this.CheckBox_Enable_ACM.BackColor = System.Drawing.Color.Transparent;
this.CheckBox_Enable_ACM.ForeColor = System.Drawing.Color.DarkGray;
- this.CheckBox_Enable_ACM.Location = new System.Drawing.Point(15, 58);
+ this.CheckBox_Enable_ACM.Location = new System.Drawing.Point(15, 37);
this.CheckBox_Enable_ACM.Name = "CheckBox_Enable_ACM";
this.CheckBox_Enable_ACM.Size = new System.Drawing.Size(222, 18);
this.CheckBox_Enable_ACM.TabIndex = 201;
this.CheckBox_Enable_ACM.Text = "Display Account Manager";
this.CheckBox_Enable_ACM.UseVisualStyleBackColor = false;
//
- // CheckBox_Disable_Classic_Affinity
- //
- this.CheckBox_Disable_Classic_Affinity.BackColor = System.Drawing.Color.Transparent;
- this.CheckBox_Disable_Classic_Affinity.ForeColor = System.Drawing.Color.DarkGray;
- this.CheckBox_Disable_Classic_Affinity.Location = new System.Drawing.Point(15, 34);
- this.CheckBox_Disable_Classic_Affinity.Name = "CheckBox_Disable_Classic_Affinity";
- this.CheckBox_Disable_Classic_Affinity.Size = new System.Drawing.Size(222, 18);
- this.CheckBox_Disable_Classic_Affinity.TabIndex = 200;
- this.CheckBox_Disable_Classic_Affinity.Text = "Disable Classic Affinity";
- this.CheckBox_Disable_Classic_Affinity.UseVisualStyleBackColor = false;
- //
// TabPage_Game
//
this.TabPage_Game.Controls.Add(this.TabControl_Game);
@@ -2214,7 +2098,7 @@ private void InitializeComponent()
this.TabPage_API.Controls.Add(this.Label_API_Status);
this.TabPage_API.Location = new System.Drawing.Point(0, 26);
this.TabPage_API.Name = "TabPage_API";
- this.TabPage_API.Size = new System.Drawing.Size(200, 74);
+ this.TabPage_API.Size = new System.Drawing.Size(834, 354);
this.TabPage_API.TabIndex = 4;
this.TabPage_API.Text = "API";
this.TabPage_API.UseVisualStyleBackColor = true;
@@ -2305,7 +2189,7 @@ private void InitializeComponent()
this.TabPage_About.Location = new System.Drawing.Point(0, 26);
this.TabPage_About.Name = "TabPage_About";
this.TabPage_About.Padding = new System.Windows.Forms.Padding(3);
- this.TabPage_About.Size = new System.Drawing.Size(200, 74);
+ this.TabPage_About.Size = new System.Drawing.Size(834, 354);
this.TabPage_About.TabIndex = 1;
this.TabPage_About.Text = "Version: XXX.XXX.XXX";
this.TabPage_About.UseVisualStyleBackColor = true;
@@ -2467,71 +2351,74 @@ private void InitializeComponent()
this.Button_Close.TabIndex = 157;
this.Button_Close.TabStop = false;
//
- // Button_Security_Center
- //
- this.Button_Security_Center.BackColor = System.Drawing.SystemColors.ButtonFace;
- this.Button_Security_Center.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.Button_Security_Center.Location = new System.Drawing.Point(39, 12);
- this.Button_Security_Center.Name = "Button_Security_Center";
- this.Button_Security_Center.Size = new System.Drawing.Size(154, 25);
- this.Button_Security_Center.TabIndex = 183;
- this.Button_Security_Center.Text = "Security Center";
- this.Button_Security_Center.UseVisualStyleBackColor = false;
- //
// Clock
//
this.Clock.Enabled = true;
this.Clock.Interval = 1200;
//
- // panel1
+ // Panel_Affinity_Range
//
- this.panel1.BackColor = System.Drawing.Color.Transparent;
- this.panel1.Controls.Add(this.Label_Affinity_Core_Range);
- this.panel1.Controls.Add(this.NumericUpDown_Range_Affinity);
- this.panel1.Controls.Add(this.RadioButton_Affinity_Subtract);
- this.panel1.Controls.Add(this.RadioButton_Affinity_Add);
- this.panel1.Location = new System.Drawing.Point(12, 164);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(230, 52);
- this.panel1.TabIndex = 218;
- this.panel1.Tag = "SkidMarks";
+ this.Panel_Affinity_Range.BackColor = System.Drawing.Color.Transparent;
+ this.Panel_Affinity_Range.Controls.Add(this.Label_Affinity_Core_Range);
+ this.Panel_Affinity_Range.Controls.Add(this.NumericUpDown_Range_Affinity);
+ this.Panel_Affinity_Range.Controls.Add(this.RadioButton_Affinity_Subtract);
+ this.Panel_Affinity_Range.Controls.Add(this.RadioButton_Affinity_Add);
+ this.Panel_Affinity_Range.Location = new System.Drawing.Point(14, 87);
+ this.Panel_Affinity_Range.Name = "Panel_Affinity_Range";
+ this.Panel_Affinity_Range.Size = new System.Drawing.Size(232, 54);
+ this.Panel_Affinity_Range.TabIndex = 218;
+ this.Panel_Affinity_Range.Tag = "SkidMarks";
//
// RadioButton_Affinity_Subtract
//
this.RadioButton_Affinity_Subtract.BackColor = System.Drawing.Color.Transparent;
this.RadioButton_Affinity_Subtract.Font = new System.Drawing.Font("DejaVu Sans", 9F);
- this.RadioButton_Affinity_Subtract.Location = new System.Drawing.Point(6, 29);
+ this.RadioButton_Affinity_Subtract.Location = new System.Drawing.Point(123, 31);
this.RadioButton_Affinity_Subtract.Name = "RadioButton_Affinity_Subtract";
- this.RadioButton_Affinity_Subtract.Size = new System.Drawing.Size(80, 18);
+ this.RadioButton_Affinity_Subtract.Size = new System.Drawing.Size(100, 18);
this.RadioButton_Affinity_Subtract.TabIndex = 95;
- this.RadioButton_Affinity_Subtract.TabStop = true;
this.RadioButton_Affinity_Subtract.Tag = "0";
this.RadioButton_Affinity_Subtract.Text = "Subtract";
+ this.RadioButton_Affinity_Subtract.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.RadioButton_Affinity_Subtract.UseVisualStyleBackColor = false;
//
// RadioButton_Affinity_Add
//
this.RadioButton_Affinity_Add.BackColor = System.Drawing.Color.Transparent;
+ this.RadioButton_Affinity_Add.Checked = true;
this.RadioButton_Affinity_Add.Font = new System.Drawing.Font("DejaVu Sans", 9F);
- this.RadioButton_Affinity_Add.Location = new System.Drawing.Point(6, 5);
+ this.RadioButton_Affinity_Add.Location = new System.Drawing.Point(10, 31);
this.RadioButton_Affinity_Add.Name = "RadioButton_Affinity_Add";
- this.RadioButton_Affinity_Add.Size = new System.Drawing.Size(80, 18);
+ this.RadioButton_Affinity_Add.Size = new System.Drawing.Size(100, 18);
this.RadioButton_Affinity_Add.TabIndex = 96;
this.RadioButton_Affinity_Add.TabStop = true;
this.RadioButton_Affinity_Add.Tag = "1";
this.RadioButton_Affinity_Add.Text = "Add";
+ this.RadioButton_Affinity_Add.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.RadioButton_Affinity_Add.UseVisualStyleBackColor = false;
//
// Label_Affinity_Core_Calculator
//
this.Label_Affinity_Core_Calculator.BackColor = System.Drawing.Color.Transparent;
+ this.Label_Affinity_Core_Calculator.Font = new System.Drawing.Font("DejaVu Sans", 9F, System.Drawing.FontStyle.Bold);
this.Label_Affinity_Core_Calculator.ForeColor = System.Drawing.Color.DarkGray;
- this.Label_Affinity_Core_Calculator.Location = new System.Drawing.Point(11, 144);
+ this.Label_Affinity_Core_Calculator.Location = new System.Drawing.Point(14, 64);
this.Label_Affinity_Core_Calculator.Name = "Label_Affinity_Core_Calculator";
this.Label_Affinity_Core_Calculator.Size = new System.Drawing.Size(223, 16);
- this.Label_Affinity_Core_Calculator.TabIndex = 217;
+ this.Label_Affinity_Core_Calculator.TabIndex = 219;
this.Label_Affinity_Core_Calculator.Text = "Affinity Range Calculator:";
- this.Label_Affinity_Core_Calculator.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ this.Label_Affinity_Core_Calculator.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // Label_Affinity_Core_Range
+ //
+ this.Label_Affinity_Core_Range.BackColor = System.Drawing.Color.Transparent;
+ this.Label_Affinity_Core_Range.ForeColor = System.Drawing.Color.DarkGray;
+ this.Label_Affinity_Core_Range.Location = new System.Drawing.Point(9, 6);
+ this.Label_Affinity_Core_Range.Name = "Label_Affinity_Core_Range";
+ this.Label_Affinity_Core_Range.Size = new System.Drawing.Size(138, 18);
+ this.Label_Affinity_Core_Range.TabIndex = 220;
+ this.Label_Affinity_Core_Range.Text = "Range: 0-3";
+ this.Label_Affinity_Core_Range.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// NumericUpDown_Range_Affinity
//
@@ -2539,7 +2426,7 @@ private void InitializeComponent()
this.NumericUpDown_Range_Affinity.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.NumericUpDown_Range_Affinity.Font = new System.Drawing.Font("DejaVu Sans", 9F, System.Drawing.FontStyle.Bold);
this.NumericUpDown_Range_Affinity.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(178)))), ((int)(((byte)(210)))), ((int)(((byte)(255)))));
- this.NumericUpDown_Range_Affinity.Location = new System.Drawing.Point(111, 29);
+ this.NumericUpDown_Range_Affinity.Location = new System.Drawing.Point(163, 7);
this.NumericUpDown_Range_Affinity.Maximum = new decimal(new int[] {
64,
0,
@@ -2552,7 +2439,7 @@ private void InitializeComponent()
0});
this.NumericUpDown_Range_Affinity.Name = "NumericUpDown_Range_Affinity";
this.NumericUpDown_Range_Affinity.Size = new System.Drawing.Size(61, 17);
- this.NumericUpDown_Range_Affinity.TabIndex = 210;
+ this.NumericUpDown_Range_Affinity.TabIndex = 219;
this.NumericUpDown_Range_Affinity.Tag = "ProxypPortNumeric";
this.NumericUpDown_Range_Affinity.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.NumericUpDown_Range_Affinity.Value = new decimal(new int[] {
@@ -2561,17 +2448,6 @@ private void InitializeComponent()
0,
0});
//
- // Label_Affinity_Core_Range
- //
- this.Label_Affinity_Core_Range.BackColor = System.Drawing.Color.Transparent;
- this.Label_Affinity_Core_Range.ForeColor = System.Drawing.Color.DarkGray;
- this.Label_Affinity_Core_Range.Location = new System.Drawing.Point(108, 5);
- this.Label_Affinity_Core_Range.Name = "Label_Affinity_Core_Range";
- this.Label_Affinity_Core_Range.Size = new System.Drawing.Size(115, 18);
- this.Label_Affinity_Core_Range.TabIndex = 218;
- this.Label_Affinity_Core_Range.Text = "Range:";
- this.Label_Affinity_Core_Range.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
// Screen_Settings
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2579,7 +2455,6 @@ private void InitializeComponent()
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(891, 529);
this.Controls.Add(this.Panel_Form_Screens);
- this.Controls.Add(this.Button_Security_Center);
this.Controls.Add(this.TabControl_Shared_Hub);
this.Controls.Add(this.Button_Console_Submit);
this.Controls.Add(this.Input_Console);
@@ -2610,7 +2485,6 @@ private void InitializeComponent()
this.TabPage_Launcher_Miscellaneous.ResumeLayout(false);
this.Panel_Launcher_Builds_Branch.ResumeLayout(false);
this.TabPage_Experiments.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.NumericUpDown_Game_Affinity)).EndInit();
this.TabPage_Game.ResumeLayout(false);
this.TabControl_Game.ResumeLayout(false);
this.TabPage_Game_General.ResumeLayout(false);
@@ -2633,7 +2507,7 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Button_Settings)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Button_Close)).EndInit();
- this.panel1.ResumeLayout(false);
+ this.Panel_Affinity_Range.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.NumericUpDown_Range_Affinity)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -2666,7 +2540,6 @@ private void InitializeComponent()
public System.Windows.Forms.Button Button_CDN_List;
public System.Windows.Forms.LinkLabel LinkLabel_CDN_Current;
public System.Windows.Forms.Label Label_GameFiles_Downloader;
- public System.Windows.Forms.CheckBox CheckBox_LZMA_Downloader;
public System.Windows.Forms.CheckBox CheckBox_Alt_WebCalls;
public System.Windows.Forms.Label Label_WebClient_Timeout;
public System.Windows.Forms.NumericUpDown NumericUpDown_WebClient_Timeout;
@@ -2691,7 +2564,6 @@ private void InitializeComponent()
public System.Windows.Forms.CheckBox CheckBox_JSON_Update_Cache;
public System.Windows.Forms.Label Label_Launcher_Path;
public System.Windows.Forms.CheckBox CheckBox_Theme_Support;
- public System.Windows.Forms.CheckBox CheckBox_Opt_Insider;
private System.Windows.Forms.TabPage TabPage_Game;
private System.Windows.Forms.TabPage TabPage_API;
public System.Windows.Forms.Label Label_API_Status_Five;
@@ -2766,7 +2638,6 @@ private void InitializeComponent()
public System.Windows.Forms.Button Button_Clear_NFSWO_Logs;
public System.Windows.Forms.Button Button_Clear_Server_Mods;
public System.Windows.Forms.Button Button_Clear_Crash_Logs;
- public System.Windows.Forms.Button Button_Security_Center;
private System.Windows.Forms.Label VerifyHashText;
private System.Windows.Forms.Label ScanProgressText;
private System.Windows.Forms.ProgressBar ScanProgressBar;
@@ -2809,20 +2680,15 @@ private void InitializeComponent()
private System.Windows.Forms.Label DownloadProgressText_Alt;
public System.Windows.Forms.Timer Clock;
private System.Windows.Forms.TabPage TabPage_Experiments;
- public System.Windows.Forms.CheckBox CheckBox_Enable_Game_Affinity;
+ public System.Windows.Forms.CheckBox CheckBox_Enable_Affinity_Range;
public System.Windows.Forms.CheckBox CheckBox_Enable_ACM;
- public System.Windows.Forms.CheckBox CheckBox_Disable_Classic_Affinity;
- public System.Windows.Forms.Label Label_Process_Priority;
- public System.Windows.Forms.ComboBox ComboBox_Process_Priority;
public System.Windows.Forms.Button Button_Experiments;
public System.Windows.Forms.Label label7;
- public System.Windows.Forms.Label Label_Game_Affinity;
- public System.Windows.Forms.NumericUpDown NumericUpDown_Game_Affinity;
- private System.Windows.Forms.Panel panel1;
- public System.Windows.Forms.NumericUpDown NumericUpDown_Range_Affinity;
+ private System.Windows.Forms.Panel Panel_Affinity_Range;
private System.Windows.Forms.RadioButton RadioButton_Affinity_Subtract;
private System.Windows.Forms.RadioButton RadioButton_Affinity_Add;
public System.Windows.Forms.Label Label_Affinity_Core_Calculator;
public System.Windows.Forms.Label Label_Affinity_Core_Range;
+ public System.Windows.Forms.NumericUpDown NumericUpDown_Range_Affinity;
}
}
\ No newline at end of file
diff --git a/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Events.cs b/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Events.cs
index 775d8a25..218b197c 100644
--- a/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Events.cs
+++ b/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Events.cs
@@ -200,7 +200,6 @@ private async void SettingsSave_Click(object sender, EventArgs e)
/* Store Old Location for Security Panel to Use Later on */
Save_Settings.Live_Data.Game_Path_Old = Save_Settings.Live_Data.Game_Path;
Save_Settings.Live_Data.Firewall_Game = "Not Excluded";
- ButtonsColorSet(Button_Security_Center, 2, true);
#endif
Save_Settings.Live_Data.Game_Path = NewGameFilesPath;
@@ -303,12 +302,14 @@ private async void SettingsSave_Click(object sender, EventArgs e)
Save_Settings.Live_Data.Launcher_Discord_Presence = CheckBox_RPC.Checked ? "1" : "0";
}
+ /*
if ((Save_Settings.Live_Data.Launcher_Insider != (CheckBox_Opt_Insider.Checked ? "1" : "0")) &&
!Insider_Settings_Lock && !BuildDevelopment.Allowed())
{
BuildBeta.Allowed((Save_Settings.Live_Data.Launcher_Insider = CheckBox_Opt_Insider.Checked ? "1" : "0") == "1");
RestartRequired = true;
}
+ */
if (Save_Settings.Live_Data.Launcher_Theme_Support != (CheckBox_Theme_Support.Checked ? "1" : "0"))
{
@@ -448,19 +449,9 @@ await Task.Run(() =>
///
private void Button_Experiments_Click(object sender, EventArgs e)
{
- if (!Screen_Main.Game_Affinity.Equals(NumericUpDown_Game_Affinity.Value))
+ if (!Screen_Main.Game_Affinity.Equals(NumericUpDown_Range_Affinity.Value))
{
- Screen_Main.Game_Affinity = (int)NumericUpDown_Game_Affinity.Value;
- }
-
- if (!Screen_Main.TEST_Game_Affinity.Equals(CheckBox_Enable_Game_Affinity.Checked))
- {
- Screen_Main.TEST_Game_Affinity = CheckBox_Enable_Game_Affinity.Checked;
- }
-
- if (!Screen_Main.TEST_Classic_Affinity.Equals(CheckBox_Disable_Classic_Affinity.Checked))
- {
- Screen_Main.TEST_Classic_Affinity = CheckBox_Disable_Classic_Affinity.Checked;
+ Screen_Main.Game_Affinity = (int)NumericUpDown_Range_Affinity.Value;
}
if (Screen_Main.Screen_Instance != default)
@@ -469,6 +460,7 @@ private void Button_Experiments_Click(object sender, EventArgs e)
Screen_Main.Screen_Instance.Button_Account_Manager.Visible = CheckBox_Enable_ACM.Checked;
}
}
+ #endregion
///
///
///
@@ -476,21 +468,29 @@ private void Button_Experiments_Click(object sender, EventArgs e)
///
private void NumericUpDown_Range_Affinity_ValueChanged(object sender, EventArgs e)
{
- if (CheckBox_Enable_Game_Affinity.Checked)
+ if (CheckBox_Enable_Affinity_Range.Checked)
{
if (RadioButton_Affinity_Add.Checked)
{
- if ((int)NumericUpDown_Range_Affinity.Value >= Environment.ProcessorCount - 1)
+ int Max_Processor_Count = Environment.ProcessorCount - 1;
+
+ if ((int)NumericUpDown_Range_Affinity.Value >= Max_Processor_Count)
{
// Ensure we don't go above the max core count
Screen_Main.Game_Affinity_Start = (int)Math.Max(0, NumericUpDown_Range_Affinity.Value - 3);
- Screen_Main.Game_Affinity_End = Environment.ProcessorCount - 1;
+ Screen_Main.Game_Affinity_End = Max_Processor_Count;
+ }
+ else if ((Max_Processor_Count - (int)NumericUpDown_Range_Affinity.Value) >= 0 &&
+ (Max_Processor_Count - (int)NumericUpDown_Range_Affinity.Value) <= 3)
+ {
+ Screen_Main.Game_Affinity_Start = Max_Processor_Count - 3;
+ Screen_Main.Game_Affinity_End = Max_Processor_Count;
}
else
{
// Normal add mode range
Screen_Main.Game_Affinity_Start = (int)NumericUpDown_Range_Affinity.Value;
- Screen_Main.Game_Affinity_End = (int)Math.Min(Environment.ProcessorCount - 1, NumericUpDown_Range_Affinity.Value + 3);
+ Screen_Main.Game_Affinity_End = (int)Math.Min(Max_Processor_Count, NumericUpDown_Range_Affinity.Value + 3);
}
}
else if (RadioButton_Affinity_Subtract.Checked)
@@ -509,10 +509,24 @@ private void NumericUpDown_Range_Affinity_ValueChanged(object sender, EventArgs
}
}
+ Screen_Main.Game_Affinity = -1;
Label_Affinity_Core_Range.Text = $"Range: {Screen_Main.Game_Affinity_Start}-{Screen_Main.Game_Affinity_End}";
}
+ else
+ {
+ Screen_Main.Game_Affinity = BuildDevelopment.Allowed() ? (int)NumericUpDown_Range_Affinity.Value : 4;
+ Label_Affinity_Core_Range.Text = $"{(int)NumericUpDown_Range_Affinity.Value} Cores";
+ }
+ }
+ ///
+ ///
+ ///
+ ///
+ ///
+ private void CheckBox_Enable_Affinity_Range_CheckedChanged(object sender, EventArgs e)
+ {
+ Enable_Affinity_Range(CheckBox_Enable_Affinity_Range.Checked);
}
- #endregion
///
/// Settings Cancel
///
@@ -832,7 +846,6 @@ private async void Screen_Settings_Load(object sender, EventArgs e)
CheckBox_Proxy.Checked = !Save_Settings.Proxy_RunTime();
CheckBox_RPC.Checked = !Save_Settings.RPC_Discord();
CheckBox_Alt_WebCalls.Checked = Save_Settings.WebCalls_Alt();
- CheckBox_Opt_Insider.Checked = InformationCache.EnableInsiderPreview();
CheckBox_Theme_Support.Checked = Save_Settings.Theme_Custom();
CheckBox_JSON_Update_Cache.Checked = Save_Settings.Update_Frequency_JSON();
CheckBox_Proxy_Domain.Checked = Save_Settings.Proxy_Domain();
diff --git a/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Functions.cs b/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Functions.cs
index cf047534..f9781ff8 100644
--- a/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Functions.cs
+++ b/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Functions.cs
@@ -4,6 +4,7 @@
using SBRW.Launcher.Core.Extension.String_;
using SBRW.Launcher.Core.Extra.File_;
using SBRW.Launcher.Core.Theme;
+using SBRW.Launcher.RunTime.InsiderKit;
using SBRW.Launcher.RunTime.LauncherCore.APICheckers;
using SBRW.Launcher.RunTime.LauncherCore.Global;
using SBRW.Launcher.RunTime.LauncherCore.Lists;
@@ -42,7 +43,6 @@ private void WindowsDefenderGameFilesDirctoryChange()
Save_Settings.Live_Data.Game_Path_Old = Save_Settings.Live_Data.Game_Path;
Save_Settings.Live_Data.Firewall_Game = "Not Excluded";
Save_Settings.Live_Data.Defender_Game = "Not Excluded";
- ButtonsColorSet(Button_Security_Center, 2, true);
#endif
Save_Settings.Live_Data.Game_Path = NewGameFilesPath;
@@ -428,7 +428,7 @@ public static void ButtonsColorSet(Button Elements, int Color, bool EnabledORDis
}
}
///
- /// On Button/Dropdown Functions
+ /// Translation for Game Display Timer
///
///
private string Display_Timer_Button_Selection()
@@ -446,5 +446,68 @@ private string Display_Timer_Button_Selection()
return "0";
}
}
+ ///
+ /// Translation for Log to File Selection
+ ///
+ ///
+ private string Log_To_File_Selection()
+ {
+ if (Radio_Button_Proxy_Logging_All.Checked)
+ {
+ return "1";
+ }
+ else if (Radio_Button_Proxy_Logging_Errors.Checked)
+ {
+ return "2";
+ }
+ else if (Radio_Button_Proxy_Logging_Requests.Checked)
+ {
+ return "3";
+ }
+ else if (Radio_Button_Proxy_Logging_Responses.Checked)
+ {
+ return "4";
+ }
+ else
+ {
+ return "0";
+ }
+ }
+ ///
+ ///
+ ///
+ ///
+ private void Enable_Affinity_Range(bool Enable_Affinity_Range)
+ {
+ /* NOTE: We start counting up from Core 0 !!! So for 4 Cores its range is 0-3 */
+ if (Enable_Affinity_Range)
+ {
+ if (BuildDevelopment.Allowed())
+ {
+ NumericUpDown_Range_Affinity.Increment = 1;
+ NumericUpDown_Range_Affinity.Minimum = 0;
+ NumericUpDown_Range_Affinity.Maximum = Environment.ProcessorCount - 1;
+ NumericUpDown_Range_Affinity.Value = 3;
+ }
+
+ Label_Affinity_Core_Calculator.Visible = true;
+ Panel_Affinity_Range.Visible = true;
+ }
+ else if (BuildDevelopment.Allowed())
+ {
+ NumericUpDown_Range_Affinity.Increment = 2;
+ NumericUpDown_Range_Affinity.Minimum = 2;
+ NumericUpDown_Range_Affinity.Maximum = Environment.ProcessorCount >= 8 ? 8 : Environment.ProcessorCount.Equals(6) ? 6 : 4;
+ NumericUpDown_Range_Affinity.Value = Environment.ProcessorCount >= 4 ? 4 : 2;
+ Label_Affinity_Core_Calculator.Visible = true;
+ Panel_Affinity_Range.Visible = true;
+ Label_Affinity_Core_Range.Text = $"{(int)NumericUpDown_Range_Affinity.Value} Cores";
+ }
+ else
+ {
+ Label_Affinity_Core_Calculator.Visible = false;
+ Panel_Affinity_Range.Visible = false;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Visuals.cs b/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Visuals.cs
index 4f8aeb55..de8eb29e 100644
--- a/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Visuals.cs
+++ b/SBRW.Launcher.Net/App/UI_Forms/Settings_Screen/Screen_Settings_Visuals.cs
@@ -225,9 +225,8 @@ private void Set_Visuals()
LinkLabel_Launcher_Path.Text = AppDomain.CurrentDomain.BaseDirectory;
TabPage_About.Text = Label_Version_Build_About.Text = "Version: " + Application.ProductVersion;
- NumericUpDown_Range_Affinity.Minimum = 0;
- NumericUpDown_Range_Affinity.Maximum = Environment.ProcessorCount - 1;
- NumericUpDown_Range_Affinity.Value = 3;
+ //TODO Add Implementation for Setting Range if User has Range Enabled
+ Enable_Affinity_Range(CheckBox_Enable_Affinity_Range.Checked);
/*******************************/
/* Set Font /
@@ -245,7 +244,6 @@ private void Set_Visuals()
Button_Console_Submit.Font = new Font(FormsFont.Primary_Bold(), SecondaryFontSize, FontStyle.Bold);
Input_Console.Font = new Font(FormsFont.Primary(), MainFontSize, FontStyle.Regular);
/* */
- Button_Security_Center.Font = new Font(FormsFont.Primary_Bold(), MainFontSize, FontStyle.Bold);
Label_Game_Files.Font = new Font(FormsFont.Primary_Bold(), MainFontSize, FontStyle.Bold);
Button_Change_Game_Path.Font = new Font(FormsFont.Primary_Bold(), MainFontSize, FontStyle.Bold);
Button_Change_Game_Path_Setup.Font = new Font(FormsFont.Primary_Bold(), MainFontSize, FontStyle.Bold);
@@ -257,7 +255,6 @@ private void Set_Visuals()
Button_Launcher_logs.Font = new Font(FormsFont.Primary_Bold(), SecondaryFontSize, FontStyle.Bold);
Button_Clear_NFSWO_Logs.Font = new Font(FormsFont.Primary_Bold(), SecondaryFontSize, FontStyle.Bold);
Button_Clear_Server_Mods.Font = new Font(FormsFont.Primary_Bold(), SecondaryFontSize, FontStyle.Bold);
- CheckBox_Opt_Insider.Font = new Font(FormsFont.Primary(), MainFontSize, FontStyle.Regular);
#region FONT: Setup Tab
/* Setup Tab */
Button_CDN_List_Setup.Font = new Font(FormsFont.Primary_Bold(), SecondaryFontSize, FontStyle.Bold);
@@ -354,7 +351,6 @@ private void Set_Visuals()
ButtonsColorSet(Button_Launcher_logs, 0, true);
ButtonsColorSet(Button_Clear_NFSWO_Logs, 0, false);
ButtonsColorSet(Button_Clear_Server_Mods, 0, false);
- ButtonsColorSet(Button_Security_Center, 0, true);
ButtonsColorSet(Button_CDN_List, VisualsAPIChecker.Local_Cached_API() ? (Screen_Parent.Launcher_Setup.Equals(1) ? 2 : 0) : 4, true);
ButtonsColorSet(Button_CDN_List_Setup, VisualsAPIChecker.Local_Cached_API() ? (Screen_Parent.Launcher_Setup.Equals(1) ? 2 : 0) : 4, true);
ButtonsColorSet(Button_Console_Submit, 1, true);
@@ -392,9 +388,7 @@ private void Set_Visuals()
CheckBox_Proxy.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
CheckBox_RPC.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
CheckBox_Alt_WebCalls.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
- CheckBox_Opt_Insider.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
CheckBox_Theme_Support.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
- CheckBox_LZMA_Downloader.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
CheckBox_JSON_Update_Cache.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
CheckBox_Host_to_IP.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
CheckBox_Proxy_Domain.ForeColor = Color_Winform_Other.CheckBoxes_Settings;
@@ -459,7 +453,6 @@ private void Set_Visuals()
Button_Console_Submit.Click += new EventHandler(Console_Enter);
Button_CDN_List.Click += new EventHandler(Button_CDN_Selector_Click);
Button_CDN_List_Setup.Click += new EventHandler(Button_CDN_Selector_Click);
- Button_Security_Center.Click += new EventHandler(Button_Security_Center_Click);
Button_Game_Verify_Files.Click += new EventHandler(Button_Game_Verify_Files_Click);
Button_Save.Click += new EventHandler(SettingsSave_Click);
Button_Save_Setup.Click += new EventHandler(SettingsSave_Click);
@@ -498,6 +491,7 @@ private void Set_Visuals()
KeyPreview = true;
NumericUpDown_Range_Affinity.ValueChanged += new EventHandler(NumericUpDown_Range_Affinity_ValueChanged);
+ CheckBox_Enable_Affinity_Range.CheckedChanged += new EventHandler(CheckBox_Enable_Affinity_Range_CheckedChanged);
/********************************/
/* Load XML (Only one Section) /
@@ -533,7 +527,6 @@ private void Set_Visuals()
ToolTip_Hover.SetToolTip(Button_Launcher_logs, "Removes all but current session \"LOGS\\\" folders");
ToolTip_Hover.SetToolTip(Button_Clear_Server_Mods, "Erases all Server Mods from .data/MODS folders");
- ToolTip_Hover.SetToolTip(Button_Security_Center, "Opens a new Panel to review Security Information and Settings");
ToolTip_Hover.SetToolTip(CheckBox_Word_Filter_Check, "Disables the In-Game Chat \"censor\" or word filter.");
ToolTip_Hover.SetToolTip(CheckBox_Proxy, "Disables the Launcher Proxy communications hook.\n" +
@@ -541,8 +534,6 @@ private void Set_Visuals()
"Will also impact/limit the DiscordRPC functions.");
ToolTip_Hover.SetToolTip(CheckBox_RPC, "Prevents Launcher from sending Discord Presence information.");
- ToolTip_Hover.SetToolTip(CheckBox_Opt_Insider, "Unchecked: Only Official \"Release\" Builds will prompt Updates\n" +
- "Checked: Insider/Beta Build\'s will be available to the Updater");
ToolTip_Hover.SetToolTip(CheckBox_Theme_Support, "Enables supporting External Themes for the Launcher");
/* @Zacam: Update Text to reflect new options
ToolTip_Hover.SetToolTip(CheckBox_Legacy_Timer, "Setting for Legacy Timer:\n" +
@@ -551,9 +542,6 @@ private void Set_Visuals()
ToolTip_Hover.SetToolTip(CheckBox_Alt_WebCalls, "Changes the internal method used by Launcher for Communications\n" +
"Unchecked: Uses \'standard\' WebClient calls\n" +
"Checked: Uses WebClientWithTimeout");
- ToolTip_Hover.SetToolTip(CheckBox_LZMA_Downloader, "Setting for LZMA Downloader:\n" +
- "If Checked, this enables the old LZMA Downloader\n" +
- "If Unchecked, enables the new SBRW Pack Downloader");
ToolTip_Hover.SetToolTip(CheckBox_JSON_Update_Cache, "Setting for JSON Update Cache Frequency:\n" +
"If Checked, this enables daily cache update for Launcher Related JSON Files\n" +
"If Unchecked, enables hourly cache update for Launcher Related JSON Files");
diff --git a/SBRW.Launcher.RunTime/InsiderKit/BuildInformation.cs b/SBRW.Launcher.RunTime/InsiderKit/BuildInformation.cs
index 857e40b8..dcc6738a 100644
--- a/SBRW.Launcher.RunTime/InsiderKit/BuildInformation.cs
+++ b/SBRW.Launcher.RunTime/InsiderKit/BuildInformation.cs
@@ -9,10 +9,10 @@ public class BuildInformation
{
/* Current month, day, year (2 digits), and letter! Ex: 12-15-20-A */
/* If a second build gets release within the same day bump letter version up (No R2 or D2)*/
- const string DATE = "05-21-2024";
- const string DATE_SHORT = "05-21-24";
- const string TIME = "2159";
- const string TIME_SECONDS = "20";
+ const string DATE = "05-22-2024";
+ const string DATE_SHORT = "05-22-24";
+ const string TIME = "0202";
+ const string TIME_SECONDS = "30";
const string TIME_ZONE = "-07:00";
///
/// Build Information (Full Information)
diff --git a/SBRW.Launcher.RunTime/LauncherCore/Client/Auth/AuthenticationFormater.cs b/SBRW.Launcher.RunTime/LauncherCore/Client/Auth/AuthenticationFormater.cs
index e60bb12a..6c568bea 100644
--- a/SBRW.Launcher.RunTime/LauncherCore/Client/Auth/AuthenticationFormater.cs
+++ b/SBRW.Launcher.RunTime/LauncherCore/Client/Auth/AuthenticationFormater.cs
@@ -255,6 +255,25 @@ public static C_Information_Login_Register Server_Reader(this string SBRW_XML_DA
}
}
}
+ else if (NodeReader(sbrwXml, "NodeOnly", "EngineExceptionTrans", "NodeOnly") == "VAILD NODE - LAUNCHER")
+ {
+ if (NodeReader(sbrwXml, "InnerText", "EngineExceptionTrans/StackTrace", "InnerText") != "EMPTY VALUE - LAUNCHER")
+ {
+ Converted_Response.Error = NodeReader(sbrwXml, "InnerText", "EngineExceptionTrans/StackTrace", "InnerText");
+ }
+ else if (NodeReader(sbrwXml, "InnerText", "EngineExceptionTrans/StackTrace/InnerException/StackTrace", "InnerText") != "EMPTY VALUE - LAUNCHER")
+ {
+ Converted_Response.Error = NodeReader(sbrwXml, "InnerText", "EngineExceptionTrans/StackTrace/InnerException/StackTrace", "InnerText");
+ }
+ else if (NodeReader(sbrwXml, "InnerText", "EngineExceptionTrans/ErrorCode", "InnerText") != "EMPTY VALUE - LAUNCHER")
+ {
+ Converted_Response.Error = $"Server Returned an Error: {NodeReader(sbrwXml, "InnerText", "EngineExceptionTrans/ErrorCode", "InnerText")}";
+ }
+ else
+ {
+ Converted_Response.Error = $"Server Encountered an Error";
+ }
+ }
else
{
Converted_Response.Invalid_Format = true;
diff --git a/SBRW.Launcher.RunTime/LauncherCore/Global/FunctionStatus.cs b/SBRW.Launcher.RunTime/LauncherCore/Global/FunctionStatus.cs
index 3bec3b34..afa4aa21 100644
--- a/SBRW.Launcher.RunTime/LauncherCore/Global/FunctionStatus.cs
+++ b/SBRW.Launcher.RunTime/LauncherCore/Global/FunctionStatus.cs
@@ -33,7 +33,6 @@ class InformationCache
public static bool SelectedServerEnforceProxy { get; set; }
/* Holds a collection of Server Status of Servers */
public static Dictionary ServerStatusBook { get; set; } = new Dictionary();
- public static bool EnableInsiderPreview() => (Save_Settings.Live_Data.Launcher_Insider == "1" || Save_Settings.Live_Data.Launcher_Insider == "2");
///
/// Default Path Location for Game Files Archive File
///