From 0e6b60b249c4c41881869a45bc0d64ceb50f82c8 Mon Sep 17 00:00:00 2001 From: Bitl Date: Fri, 28 Jul 2017 17:37:23 -0700 Subject: [PATCH] ui tweaks and fixes --- .../RBXLegacyLauncher/LauncherFuncs.cs | 14 +++++----- .../RBXLegacyLauncher/LoaderForm.Designer.cs | 6 ++-- .../RBXLegacyLauncher/SDKForm.Designer.cs | 5 ++-- .../RBXLegacyLauncher/SDKForm.cs | 28 ++++++++++++++----- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/LauncherFuncs.cs b/RBXLegacyLauncher/RBXLegacyLauncher/LauncherFuncs.cs index 14d699e..a8094a2 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/LauncherFuncs.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/LauncherFuncs.cs @@ -261,16 +261,16 @@ namespace RBXLegacyLauncher bool bline4 = Convert.ToBoolean(Decryptline4); GlobalVars.LegacyMode = bline4; - GlobalVars.SelectedClientMD5 = Decryptline5; + bool bline5 = Convert.ToBoolean(Decryptline5); + GlobalVars.HasRocky = bline5; - GlobalVars.SelectedClientVersion = Decryptline6; - - GlobalVars.SelectedClientDesc = Decryptline7; + GlobalVars.SelectedClientMD5 = Decryptline6; + + GlobalVars.SelectedClientVersion = Decryptline7; + + GlobalVars.SelectedClientDesc = Decryptline8; GlobalVars.MD5 = GlobalVars.SelectedClientMD5; - - bool bline5 = Convert.ToBoolean(Decryptline4); - GlobalVars.HasRocky = bline5; } public static void GeneratePlayerID() diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.Designer.cs index 478d2d3..49b9b3d 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.Designer.cs @@ -48,7 +48,7 @@ namespace RBXLegacyLauncher // this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(169, 28); + this.pictureBox1.Location = new System.Drawing.Point(163, 29); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(130, 109); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -75,9 +75,9 @@ namespace RBXLegacyLauncher // button1 // this.button1.Font = new System.Drawing.Font("Source Sans Pro", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button1.Location = new System.Drawing.Point(172, 221); + this.button1.Location = new System.Drawing.Point(163, 221); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(121, 30); + this.button1.Size = new System.Drawing.Size(130, 30); this.button1.TabIndex = 3; this.button1.Text = "Cancel"; this.button1.UseVisualStyleBackColor = true; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.Designer.cs index a373f11..4dc75e8 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.Designer.cs @@ -112,10 +112,11 @@ namespace RBXLegacyLauncher // this.checkBox4.Location = new System.Drawing.Point(5, 106); this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(175, 20); + this.checkBox4.Size = new System.Drawing.Size(182, 20); this.checkBox4.TabIndex = 34; - this.checkBox4.Text = "Client has rocky packets"; + this.checkBox4.Text = "Client has \"rocky\" packet errors"; this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox4.CheckedChanged += new System.EventHandler(this.CheckBox4CheckedChanged); // // button4 // diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.cs index 913c698..c853be6 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.cs @@ -93,7 +93,7 @@ namespace RBXLegacyLauncher Decryptline5 = SecurityFuncs.Base64Decode(result[4]); Decryptline6 = SecurityFuncs.Base64Decode(result[5]); Decryptline7 = SecurityFuncs.Base64Decode(result[6]); - Decryptline8 = SecurityFuncs.Base64Decode(result[8]); + Decryptline8 = SecurityFuncs.Base64Decode(result[7]); Boolean bline1 = Convert.ToBoolean(Decryptline1); GlobalVars.ClientCreator_UsesPlayerName = bline1; @@ -107,14 +107,14 @@ namespace RBXLegacyLauncher Boolean bline4 = Convert.ToBoolean(Decryptline4); GlobalVars.ClientCreator_LegacyMode = bline4; - Boolean bline5 = Convert.ToBoolean(Decryptline8); + Boolean bline5 = Convert.ToBoolean(Decryptline5); GlobalVars.ClientCreator_HasRocky = bline5; - GlobalVars.ClientCreator_SelectedClientMD5 = Decryptline5; + GlobalVars.ClientCreator_SelectedClientMD5 = Decryptline6; - GlobalVars.ClientCreator_SelectedClientVersion = Decryptline6; + GlobalVars.ClientCreator_SelectedClientVersion = Decryptline7; - GlobalVars.ClientCreator_SelectedClientDesc = Decryptline7; + GlobalVars.ClientCreator_SelectedClientDesc = Decryptline8; checkBox1.Checked = GlobalVars.ClientCreator_UsesPlayerName; checkBox2.Checked = GlobalVars.ClientCreator_UsesID; @@ -144,10 +144,10 @@ namespace RBXLegacyLauncher SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_UsesID.ToString()), SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_LoadsAssetsOnline.ToString()), SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_LegacyMode.ToString()), + SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_HasRocky.ToString()), SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_SelectedClientMD5.ToString()), SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_SelectedClientVersion.ToString()), - SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_SelectedClientDesc.ToString()), - SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_HasRocky.ToString()) + SecurityFuncs.Base64Encode(GlobalVars.ClientCreator_SelectedClientDesc.ToString()) }; File.WriteAllText(sfd.FileName, SecurityFuncs.Base64Encode(string.Join("|",lines))); } @@ -175,10 +175,12 @@ namespace RBXLegacyLauncher GlobalVars.ClientCreator_SelectedClientDesc = ""; GlobalVars.ClientCreator_SelectedClientMD5 = ""; GlobalVars.ClientCreator_SelectedClientVersion = ""; + GlobalVars.ClientCreator_HasRocky = false; checkBox1.Checked = GlobalVars.ClientCreator_UsesPlayerName; checkBox2.Checked = GlobalVars.ClientCreator_UsesID; checkBox5.Checked = GlobalVars.ClientCreator_LoadsAssetsOnline; checkBox3.Checked = GlobalVars.ClientCreator_LegacyMode; + checkBox4.Checked = GlobalVars.ClientCreator_HasRocky; textBox2.Text = GlobalVars.ClientCreator_SelectedClientMD5.ToUpper(); textBox1.Text = GlobalVars.ClientCreator_SelectedClientDesc; textBox3.Text = GlobalVars.ClientCreator_SelectedClientVersion; @@ -207,6 +209,18 @@ namespace RBXLegacyLauncher GlobalVars.ClientCreator_SelectedClientVersion = textBox3.Text; } + void CheckBox4CheckedChanged(object sender, EventArgs e) + { + if (checkBox4.Checked == true) + { + GlobalVars.ClientCreator_HasRocky = true; + } + else if (checkBox4.Checked == false) + { + GlobalVars.ClientCreator_HasRocky = false; + } + } + void Button4Click(object sender, EventArgs e) { DocForm doc = new DocForm();