From 6265863c52b2e7a5805945e245f86f1c49ae17b1 Mon Sep 17 00:00:00 2001 From: Bitl Date: Fri, 3 Jul 2020 15:32:15 -0700 Subject: [PATCH] fixed clientscript. changed button labels. --- NovetusLauncher/NovetusFuncs/ClientScript.cs | 12 ++++++------ .../NovetusLauncher/MainForm/MainForm.Designer.cs | 2 +- .../MainForm/MainForm_legacy.Designer.cs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NovetusLauncher/NovetusFuncs/ClientScript.cs b/NovetusLauncher/NovetusFuncs/ClientScript.cs index 0da9def..813223c 100644 --- a/NovetusLauncher/NovetusFuncs/ClientScript.cs +++ b/NovetusLauncher/NovetusFuncs/ClientScript.cs @@ -156,9 +156,9 @@ public class ClientScript .Replace("%hat3%", GlobalVars.Custom_Hat3ID_Offline) .Replace("%faced%", GlobalVars.faceGameDir + GlobalVars.Custom_Face_Offline) .Replace("%headd%", GlobalVars.headGameDir + GlobalVars.Custom_Head_Offline) - .Replace("%tshirtd%", GlobalVars.tshirtGameDir + GlobalVars.Custom_T_Shirt_Offline) - .Replace("%shirtd%", GlobalVars.shirtGameDir + GlobalVars.Custom_Shirt_Offline) - .Replace("%pantsd%", GlobalVars.pantsGameDir + GlobalVars.Custom_Pants_Offline) + .Replace("%tshirtd%", GlobalVars.Custom_T_Shirt_Offline.Contains("http://") ? GlobalVars.Custom_T_Shirt_Offline : GlobalVars.tshirtGameDir + GlobalVars.Custom_T_Shirt_Offline) + .Replace("%shirtd%", GlobalVars.Custom_Shirt_Offline.Contains("http://") ? GlobalVars.Custom_Shirt_Offline : GlobalVars.shirtGameDir + GlobalVars.Custom_Shirt_Offline) + .Replace("%pantsd%", GlobalVars.Custom_Pants_Offline.Contains("http://") ? GlobalVars.Custom_Pants_Offline : GlobalVars.pantsGameDir + GlobalVars.Custom_Pants_Offline) .Replace("%hat1d%", GlobalVars.hatGameDir + GlobalVars.Custom_Hat1ID_Offline) .Replace("%hat2d%", GlobalVars.hatGameDir + GlobalVars.Custom_Hat2ID_Offline) .Replace("%hat3d%", GlobalVars.hatGameDir + GlobalVars.Custom_Hat3ID_Offline) @@ -181,9 +181,9 @@ public class ClientScript .Replace("%args%", GetRawArgsFromTag(tag, endtag, md5s, luafile)) .Replace("%facews%", GlobalVars.WebServer_FaceDir + GlobalVars.Custom_Face_Offline) .Replace("%headws%", GlobalVars.WebServer_HeadDir + GlobalVars.Custom_Head_Offline) - .Replace("%tshirtws%", GlobalVars.WebServer_TShirtDir + GlobalVars.Custom_T_Shirt_Offline) - .Replace("%shirtws%", GlobalVars.WebServer_ShirtDir + GlobalVars.Custom_Shirt_Offline) - .Replace("%pantsws%", GlobalVars.WebServer_PantsDir + GlobalVars.Custom_Pants_Offline) + .Replace("%tshirtws%", GlobalVars.Custom_T_Shirt_Offline.Contains("http://") ? GlobalVars.Custom_T_Shirt_Offline : GlobalVars.WebServer_TShirtDir + GlobalVars.Custom_T_Shirt_Offline) + .Replace("%shirtws%", GlobalVars.Custom_Shirt_Offline.Contains("http://") ? GlobalVars.Custom_Shirt_Offline : GlobalVars.WebServer_ShirtDir + GlobalVars.Custom_Shirt_Offline) + .Replace("%pantsws%", GlobalVars.Custom_Pants_Offline.Contains("http://") ? GlobalVars.Custom_Pants_Offline : GlobalVars.WebServer_PantsDir + GlobalVars.Custom_Pants_Offline) .Replace("%hat1ws%", GlobalVars.WebServer_HatDir + GlobalVars.Custom_Hat1ID_Offline) .Replace("%hat2ws%", GlobalVars.WebServer_HatDir + GlobalVars.Custom_Hat2ID_Offline) .Replace("%hat3ws%", GlobalVars.WebServer_HatDir + GlobalVars.Custom_Hat3ID_Offline) diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs index 38a199c..f9ca62b 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs @@ -873,7 +873,7 @@ namespace NovetusLauncher this.button36.Name = "button36"; this.button36.Size = new System.Drawing.Size(95, 21); this.button36.TabIndex = 75; - this.button36.Text = "Old Layout"; + this.button36.Text = "Compact Style"; this.button36.UseVisualStyleBackColor = true; this.button36.Click += new System.EventHandler(this.button36_Click); // diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs index 5bec6f9..480e20a 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs @@ -863,7 +863,7 @@ namespace NovetusLauncher this.button36.Name = "button36"; this.button36.Size = new System.Drawing.Size(75, 23); this.button36.TabIndex = 61; - this.button36.Text = "New Layout"; + this.button36.Text = "Extended Style"; this.button36.UseVisualStyleBackColor = true; this.button36.Click += new System.EventHandler(this.button36_Click); //