splash changes

This commit is contained in:
Bitl 2020-05-21 10:39:19 -07:00
parent 3934645a19
commit 2622b8e60a
6 changed files with 17 additions and 7 deletions

View File

@ -213,6 +213,7 @@ namespace NovetusCMD
{ {
GlobalVars.Version = lines[0]; GlobalVars.Version = lines[0];
} }
GlobalVars.Branch = lines[0];
GlobalVars.DefaultClient = lines[1]; GlobalVars.DefaultClient = lines[1];
GlobalVars.DefaultMap = lines[2]; GlobalVars.DefaultMap = lines[2];
GlobalVars.RegisterClient1 = lines[3]; GlobalVars.RegisterClient1 = lines[3];

View File

@ -136,7 +136,8 @@ public static class GlobalVars
public static string IP = "localhost"; public static string IP = "localhost";
public static string Version = ""; public static string Version = "";
public static string SharedArgs = ""; public static string Branch = "";
public static string SharedArgs = "";
public static readonly string ScriptName = "CSMPFunctions"; public static readonly string ScriptName = "CSMPFunctions";
public static readonly string ScriptGenName = "CSMPBoot"; public static readonly string ScriptGenName = "CSMPBoot";
public static SimpleHTTPServer WebServer = null; public static SimpleHTTPServer WebServer = null;

View File

@ -27,10 +27,15 @@ public static class SplashReader
return splash; return splash;
} }
} }
string formattedsplash = splash.Replace("%name%", GlobalVars.PlayerName); CryptoRandom random = new CryptoRandom();
return formattedsplash; string formattedsplash = splash
.Replace("%name%", GlobalVars.PlayerName)
.Replace("%nextversion%", (Convert.ToDouble(GlobalVars.Branch) + 0.1).ToString())
.Replace("%randomtext%", SecurityFuncs.RandomString(random.Next(2,32)));
return formattedsplash;
} }
private static bool IsTheSameDay(DateTime date1, DateTime date2) private static bool IsTheSameDay(DateTime date1, DateTime date2)

View File

@ -432,7 +432,8 @@ namespace NovetusLauncher
{ {
GlobalVars.Version = lines[0]; GlobalVars.Version = lines[0];
} }
GlobalVars.DefaultClient = lines[1]; GlobalVars.Branch = lines[0];
GlobalVars.DefaultClient = lines[1];
GlobalVars.DefaultMap = lines[2]; GlobalVars.DefaultMap = lines[2];
GlobalVars.RegisterClient1 = lines[3]; GlobalVars.RegisterClient1 = lines[3];
GlobalVars.RegisterClient2 = lines[4]; GlobalVars.RegisterClient2 = lines[4];

View File

@ -57,6 +57,7 @@ namespace NovetusLauncher
{ {
GlobalVars.Version = lines[0]; GlobalVars.Version = lines[0];
} }
GlobalVars.Branch = lines[0];
Text = "Novetus SDK " + GlobalVars.Version; Text = "Novetus SDK " + GlobalVars.Version;
label1.Text = GlobalVars.Version; label1.Text = GlobalVars.Version;
} }

View File

@ -83,7 +83,8 @@ namespace NovetusURI
{ {
GlobalVars.Version = lines[0]; GlobalVars.Version = lines[0];
} }
GlobalVars.DefaultClient = lines[1]; GlobalVars.Branch = lines[0];
GlobalVars.DefaultClient = lines[1];
GlobalVars.DefaultMap = lines[2]; GlobalVars.DefaultMap = lines[2];
GlobalVars.RegisterClient1 = lines[3]; GlobalVars.RegisterClient1 = lines[3];
GlobalVars.RegisterClient2 = lines[4]; GlobalVars.RegisterClient2 = lines[4];