Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Rewrote the way Novetus loads clientinfo files.

This commit is contained in:
Bitl 2020-07-03 18:40:42 -07:00
parent ba0e7fcb9e
commit 733aed160f
12 changed files with 155 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NovetusLauncher/NovetusCMD/Program.cs
View File

@ -340,7 +340,7 @@ namespace NovetusCMD
static void StartServer(bool no3d) static void StartServer(bool no3d)
{ {
string luafile = ""; string luafile = "";
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua";
} }
@ -350,7 +350,7 @@ namespace NovetusCMD
} }
string mapfile = GlobalVars.MapPath; string mapfile = GlobalVars.MapPath;
string rbxexe = ""; string rbxexe = "";
if (GlobalVars.LegacyMode == true) if (GlobalVars.SelectedClientInfo.LegacyMode == true)
{ {
rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe";
} }
@ -360,9 +360,9 @@ namespace NovetusCMD
} }
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Server) + "; " + (!string.IsNullOrWhiteSpace(GlobalVars.AddonScriptPath) ? "dofile('" + GlobalVars.AddonScriptPath + "');" : "") + quote + (no3d ? " -no3d" : ""); args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Server) + "; " + (!string.IsNullOrWhiteSpace(GlobalVars.AddonScriptPath) ? "dofile('" + GlobalVars.AddonScriptPath + "');" : "") + quote + (no3d ? " -no3d" : "");
} }
@ -376,11 +376,11 @@ namespace NovetusCMD
{ {
if (!no3d) if (!no3d)
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<server>", "</server>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<server>", "</server>", mapfile, luafile, rbxexe);
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<no3d>", "</no3d>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<no3d>", "</no3d>", mapfile, luafile, rbxexe);
} }
} }
try try

29
NovetusLauncher/NovetusFuncs/ClientScript.cs
View File

@ -48,13 +48,13 @@ public class ClientScript
public static string GetRawArgsForType(ScriptGenerator.ScriptType type, string md5s, string luafile) public static string GetRawArgsForType(ScriptGenerator.ScriptType type, string md5s, string luafile)
{ {
if (type == ScriptGenerator.ScriptType.Client) { if (type == ScriptGenerator.ScriptType.Client) {
if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { if (GlobalVars.SelectedClientInfo.UsesPlayerName == true && GlobalVars.SelectedClientInfo.UsesID == true) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
} else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false && GlobalVars.SelectedClientInfo.UsesID == true) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
} else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == true && GlobalVars.SelectedClientInfo.UsesID == false) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
} else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false && GlobalVars.SelectedClientInfo.UsesID == false) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
} else { } else {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
@ -62,13 +62,13 @@ public class ClientScript
} else if (type == ScriptGenerator.ScriptType.Server) { } else if (type == ScriptGenerator.ScriptType.Server) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSServer(" + GlobalVars.RobloxPort + "," + GlobalVars.PlayerLimit + "," + md5s + "); " + (!string.IsNullOrWhiteSpace(GlobalVars.AddonScriptPath) ? LauncherFuncs.ChangeGameSettings() + " dofile('" + GlobalVars.AddonScriptPath + "');" : ""); return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSServer(" + GlobalVars.RobloxPort + "," + GlobalVars.PlayerLimit + "," + md5s + "); " + (!string.IsNullOrWhiteSpace(GlobalVars.AddonScriptPath) ? LauncherFuncs.ChangeGameSettings() + " dofile('" + GlobalVars.AddonScriptPath + "');" : "");
} else if (type == ScriptGenerator.ScriptType.Solo) { } else if (type == ScriptGenerator.ScriptType.Solo) {
if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { if (GlobalVars.SelectedClientInfo.UsesPlayerName == true && GlobalVars.SelectedClientInfo.UsesID == true) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")";
} else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false && GlobalVars.SelectedClientInfo.UsesID == true) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player'," + GlobalVars.sololoadtext + ")"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player'," + GlobalVars.sololoadtext + ")";
} else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == true && GlobalVars.SelectedClientInfo.UsesID == false) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")";
} else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false && GlobalVars.SelectedClientInfo.UsesID == false) {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(0,'Player'," + GlobalVars.sololoadtext + ")"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(0,'Player'," + GlobalVars.sololoadtext + ")";
} else { } else {
return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")"; return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")";
@ -122,7 +122,7 @@ public class ClientScript
public static string CompileScript(string code, string tag, string endtag, string mapfile, string luafile, string rbxexe) public static string CompileScript(string code, string tag, string endtag, string mapfile, string luafile, string rbxexe)
{ {
if (GlobalVars.FixScriptMapMode) { if (GlobalVars.SelectedClientInfo.Fix2007) {
ScriptGenerator.GenerateScriptForClient(GetTypeFromTag(tag, endtag)); ScriptGenerator.GenerateScriptForClient(GetTypeFromTag(tag, endtag));
} }
@ -133,9 +133,9 @@ public class ClientScript
return ""; return "";
} }
string md5dir = GlobalVars.AlreadyHasSecurity != true ? SecurityFuncs.CalculateMD5(Assembly.GetExecutingAssembly().Location) : ""; string md5dir = GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true ? SecurityFuncs.CalculateMD5(Assembly.GetExecutingAssembly().Location) : "";
string md5script = GlobalVars.AlreadyHasSecurity != true ? SecurityFuncs.CalculateMD5(GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\scripts\\" + GlobalVars.ScriptName + ".lua") : ""; string md5script = GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true ? SecurityFuncs.CalculateMD5(GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\scripts\\" + GlobalVars.ScriptName + ".lua") : "";
string md5exe = GlobalVars.AlreadyHasSecurity != true ? SecurityFuncs.CalculateMD5(rbxexe) : ""; string md5exe = GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true ? SecurityFuncs.CalculateMD5(rbxexe) : "";
string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'"; string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'";
string compiled = extractedCode.Replace("%mapfile%", mapfile) string compiled = extractedCode.Replace("%mapfile%", mapfile)
.Replace("%luafile%", luafile) .Replace("%luafile%", luafile)
@ -168,10 +168,9 @@ public class ClientScript
.Replace("%llegcolor%", GlobalVars.LeftLegColorID.ToString()) .Replace("%llegcolor%", GlobalVars.LeftLegColorID.ToString())
.Replace("%rarmcolor%", GlobalVars.RightArmColorID.ToString()) .Replace("%rarmcolor%", GlobalVars.RightArmColorID.ToString())
.Replace("%rlegcolor%", GlobalVars.RightLegColorID.ToString()) .Replace("%rlegcolor%", GlobalVars.RightLegColorID.ToString())
.Replace("%rlegcolor%", GlobalVars.SelectedClientMD5)
.Replace("%md5launcher%", md5dir) .Replace("%md5launcher%", md5dir)
.Replace("%md5script%", GlobalVars.SelectedClientMD5) .Replace("%md5script%", GlobalVars.SelectedClientInfo.ClientMD5)
.Replace("%md5exe%", GlobalVars.SelectedClientScriptMD5) .Replace("%md5exe%", GlobalVars.SelectedClientInfo.ScriptMD5)
.Replace("%md5scriptd%", md5script) .Replace("%md5scriptd%", md5script)
.Replace("%md5exed%", md5exe) .Replace("%md5exed%", md5exe)
.Replace("%limit%", GlobalVars.PlayerLimit.ToString()) .Replace("%limit%", GlobalVars.PlayerLimit.ToString())

12
NovetusLauncher/NovetusFuncs/GlobalVars.cs
View File

@ -171,17 +171,7 @@ public static class GlobalVars
public static bool OldLayout = false; public static bool OldLayout = false;
//client shit //client shit
public static string SelectedClient = ""; public static string SelectedClient = "";
public static bool UsesPlayerName = false; public static ClientInfo SelectedClientInfo = new ClientInfo();
public static bool UsesID = true;
public static string SelectedClientDesc = "";
public static string Warning = "";
public static bool LegacyMode = false;
public static string SelectedClientMD5 = "";
public static string SelectedClientScriptMD5 = "";
public static bool FixScriptMapMode = false;
public static bool AlreadyHasSecurity = false;
public static bool NoGraphicsModeOptions = false;
public static string CustomArgs = "";
public static string AddonScriptPath = ""; public static string AddonScriptPath = "";
//info shit //info shit
public static string DefaultClient = ""; public static string DefaultClient = "";

34
NovetusLauncher/NovetusFuncs/LauncherFuncs.cs
View File

@ -603,32 +603,30 @@ public class LauncherFuncs
} }
bool bline1 = Convert.ToBoolean(Decryptline1); bool bline1 = Convert.ToBoolean(Decryptline1);
GlobalVars.UsesPlayerName = bline1; GlobalVars.SelectedClientInfo.UsesPlayerName = bline1;
bool bline2 = Convert.ToBoolean(Decryptline2); bool bline2 = Convert.ToBoolean(Decryptline2);
GlobalVars.UsesID = bline2; GlobalVars.SelectedClientInfo.UsesID = bline2;
GlobalVars.Warning = Decryptline3; GlobalVars.SelectedClientInfo.Warning = Decryptline3;
bool bline4 = Convert.ToBoolean(Decryptline4); bool bline4 = Convert.ToBoolean(Decryptline4);
GlobalVars.LegacyMode = bline4; GlobalVars.SelectedClientInfo.LegacyMode = bline4;
GlobalVars.SelectedClientMD5 = Decryptline5; GlobalVars.SelectedClientInfo.ClientMD5 = Decryptline5;
GlobalVars.SelectedClientInfo.ScriptMD5 = Decryptline6;
GlobalVars.SelectedClientScriptMD5 = Decryptline6; GlobalVars.SelectedClientInfo.Description = Decryptline7;
GlobalVars.SelectedClientDesc = Decryptline7;
bool bline9 = Convert.ToBoolean(Decryptline9); bool bline9 = Convert.ToBoolean(Decryptline9);
GlobalVars.FixScriptMapMode = bline9; GlobalVars.SelectedClientInfo.Fix2007 = bline9;
bool bline10 = Convert.ToBoolean(Decryptline10); bool bline10 = Convert.ToBoolean(Decryptline10);
GlobalVars.AlreadyHasSecurity = bline10; GlobalVars.SelectedClientInfo.AlreadyHasSecurity = bline10;
bool bline11 = Convert.ToBoolean(Decryptline11); bool bline11 = Convert.ToBoolean(Decryptline11);
GlobalVars.NoGraphicsModeOptions = bline11; GlobalVars.SelectedClientInfo.NoGraphicsOptions = bline11;
GlobalVars.CustomArgs = Decryptline12; GlobalVars.SelectedClientInfo.CommandLineArgs = Decryptline12;
} }
public static void GeneratePlayerID() public static void GeneratePlayerID()
@ -762,7 +760,7 @@ public class LauncherFuncs
{ {
string result = ""; string result = "";
if (!GlobalVars.NoGraphicsModeOptions) if (!GlobalVars.SelectedClientInfo.NoGraphicsOptions)
{ {
if (GlobalVars.GraphicsMode == 1) if (GlobalVars.GraphicsMode == 1)
{ {
@ -854,7 +852,7 @@ public class LauncherFuncs
{ {
string luafile = ""; string luafile = "";
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua";
} }
@ -869,7 +867,7 @@ public class LauncherFuncs
public static string GetClientEXEDir(ScriptGenerator.ScriptType type) public static string GetClientEXEDir(ScriptGenerator.ScriptType type)
{ {
string rbxexe = ""; string rbxexe = "";
if (GlobalVars.LegacyMode == true) if (GlobalVars.SelectedClientInfo.LegacyMode)
{ {
rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe";
} }

41
NovetusLauncher/NovetusFuncs/NovetusSpecialClasses.cs
View File

@ -17,24 +17,31 @@
public string[] GameDir { get; set; } public string[] GameDir { get; set; }
} }
//maybe... /*
public class Client * add classes for:
*
* config
* customization
* info
* reshade
*
* also change field names for all forms and config read/writes
*/
public class ClientInfo
{ {
public Client(bool playername, bool playerid, string description, public ClientInfo()
string warning, bool legacymode, string clientmd5, string scriptmd5,
bool fix2007, bool hassecurity, bool nographicsoptions, string commandlineargs)
{ {
UsesPlayerName = playername; UsesPlayerName = false;
UsesID = playerid; UsesID = true;
Description = description; Description = "";
Warning = warning; Warning = "";
LegacyMode = legacymode; LegacyMode = false;
ClientMD5 = clientmd5; ClientMD5 = "";
ScriptMD5 = scriptmd5; ScriptMD5 = "";
Fix2007 = fix2007; Fix2007 = false;
HasSecurity = hassecurity; AlreadyHasSecurity = false;
NoGraphicsOptions = nographicsoptions; NoGraphicsOptions = false;
CommandLineArgs = commandlineargs; CommandLineArgs = "";
} }
public bool UsesPlayerName { get; set; } public bool UsesPlayerName { get; set; }
@ -45,7 +52,7 @@ public class Client
public string ClientMD5 { get; set; } public string ClientMD5 { get; set; }
public string ScriptMD5 { get; set; } public string ScriptMD5 { get; set; }
public bool Fix2007 { get; set; } public bool Fix2007 { get; set; }
public bool HasSecurity { get; set; } public bool AlreadyHasSecurity { get; set; }
public bool NoGraphicsOptions { get; set; } public bool NoGraphicsOptions { get; set; }
public string CommandLineArgs { get; set; } public string CommandLineArgs { get; set; }
} }

18
NovetusLauncher/NovetusFuncs/ScriptGenerator.cs
View File

@ -39,7 +39,7 @@ public class ScriptGenerator
public static string GetScriptFuncForType(ScriptType type) public static string GetScriptFuncForType(ScriptType type)
{ {
string rbxexe = ""; string rbxexe = "";
if (GlobalVars.LegacyMode == true) { if (GlobalVars.SelectedClientInfo.LegacyMode == true) {
rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe";
} else { } else {
rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp_client.exe"; rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp_client.exe";
@ -50,13 +50,13 @@ public class ScriptGenerator
string md5exe = SecurityFuncs.CalculateMD5(rbxexe); string md5exe = SecurityFuncs.CalculateMD5(rbxexe);
string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'"; string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'";
if (type == ScriptType.Client) { if (type == ScriptType.Client) {
if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { if (GlobalVars.SelectedClientInfo.UsesPlayerName == true && GlobalVars.SelectedClientInfo.UsesID == true) {
return "_G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return "_G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
} else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false && GlobalVars.SelectedClientInfo.UsesID == true) {
return "_G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return "_G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
} else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == true && GlobalVars.SelectedClientInfo.UsesID == false) {
return "_G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return "_G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
} else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false && GlobalVars.SelectedClientInfo.UsesID == false) {
return "_G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return "_G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
} else { } else {
return "_G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')"; return "_G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.PlayerTripcode + "')";
@ -64,13 +64,13 @@ public class ScriptGenerator
} else if (type == ScriptType.Server) { } else if (type == ScriptType.Server) {
return "_G.CSServer(" + GlobalVars.RobloxPort + "," + GlobalVars.PlayerLimit + "," + md5s + ")"; return "_G.CSServer(" + GlobalVars.RobloxPort + "," + GlobalVars.PlayerLimit + "," + md5s + ")";
} else if (type == ScriptType.Solo || type == ScriptType.EasterEgg) { } else if (type == ScriptType.Solo || type == ScriptType.EasterEgg) {
if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { if (GlobalVars.SelectedClientInfo.UsesPlayerName == true && GlobalVars.SelectedClientInfo.UsesID == true) {
return "_G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")"; return "_G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")";
} else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false && GlobalVars.SelectedClientInfo.UsesID == true) {
return "_G.CSSolo(" + GlobalVars.UserID + ",'Player'," + GlobalVars.sololoadtext + ")"; return "_G.CSSolo(" + GlobalVars.UserID + ",'Player'," + GlobalVars.sololoadtext + ")";
} else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == true && GlobalVars.SelectedClientInfo.UsesID == false) {
return "_G.CSSolo(0,'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")"; return "_G.CSSolo(0,'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")";
} else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false) { } else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false && GlobalVars.SelectedClientInfo.UsesID == false) {
return "_G.CSSolo(0,'Player'," + GlobalVars.sololoadtext + ")"; return "_G.CSSolo(0,'Player'," + GlobalVars.sololoadtext + ")";
} else { } else {
return "_G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")"; return "_G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.sololoadtext + ")";

12
NovetusLauncher/NovetusFuncs/SecurityFuncs.cs
View File

@ -97,9 +97,9 @@ public class SecurityFuncs
public static bool checkClientMD5(string client) public static bool checkClientMD5(string client)
{ {
if (GlobalVars.AdminMode != true) { if (GlobalVars.AdminMode != true) {
if (GlobalVars.AlreadyHasSecurity != true) { if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true) {
string rbxexe = ""; string rbxexe = "";
if (GlobalVars.LegacyMode == true) { if (GlobalVars.SelectedClientInfo.LegacyMode == true) {
rbxexe = GlobalVars.BasePath + "\\clients\\" + client + "\\RobloxApp.exe"; rbxexe = GlobalVars.BasePath + "\\clients\\" + client + "\\RobloxApp.exe";
} else { } else {
rbxexe = GlobalVars.BasePath + "\\clients\\" + client + "\\RobloxApp_client.exe"; rbxexe = GlobalVars.BasePath + "\\clients\\" + client + "\\RobloxApp_client.exe";
@ -108,7 +108,7 @@ public class SecurityFuncs
using (var stream = File.OpenRead(rbxexe)) { using (var stream = File.OpenRead(rbxexe)) {
byte[] hash = md5.ComputeHash(stream); byte[] hash = md5.ComputeHash(stream);
string clientMD5 = BitConverter.ToString(hash).Replace("-", ""); string clientMD5 = BitConverter.ToString(hash).Replace("-", "");
if (clientMD5.Equals(GlobalVars.SelectedClientMD5)) { if (clientMD5.Equals(GlobalVars.SelectedClientInfo.ClientMD5)) {
return true; return true;
} else { } else {
return false; return false;
@ -126,13 +126,13 @@ public class SecurityFuncs
public static bool checkScriptMD5(string client) public static bool checkScriptMD5(string client)
{ {
if (GlobalVars.AdminMode != true) { if (GlobalVars.AdminMode != true) {
if (GlobalVars.AlreadyHasSecurity != true) { if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true) {
string rbxscript = GlobalVars.BasePath + "\\clients\\" + client + "\\content\\scripts\\" + GlobalVars.ScriptName + ".lua"; string rbxscript = GlobalVars.BasePath + "\\clients\\" + client + "\\content\\scripts\\" + GlobalVars.ScriptName + ".lua";
using (var md5 = MD5.Create()) { using (var md5 = MD5.Create()) {
using (var stream = File.OpenRead(rbxscript)) { using (var stream = File.OpenRead(rbxscript)) {
byte[] hash = md5.ComputeHash(stream); byte[] hash = md5.ComputeHash(stream);
string clientMD5 = BitConverter.ToString(hash).Replace("-", ""); string clientMD5 = BitConverter.ToString(hash).Replace("-", "");
if (clientMD5.Equals(GlobalVars.SelectedClientScriptMD5)) { if (clientMD5.Equals(GlobalVars.SelectedClientInfo.ScriptMD5)) {
return true; return true;
} else { } else {
return false; return false;
@ -170,7 +170,7 @@ public class SecurityFuncs
public static void RenameWindow(Process exe, ScriptGenerator.ScriptType type, string mapname) public static void RenameWindow(Process exe, ScriptGenerator.ScriptType type, string mapname)
{ {
if (GlobalVars.AlreadyHasSecurity != true) { if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true) {
int time = 500; int time = 500;
BackgroundWorker worker = new BackgroundWorker(); BackgroundWorker worker = new BackgroundWorker();
worker.DoWork += (obj, e) => WorkerDoWork(exe, type, time, worker, GlobalVars.SelectedClient, mapname); worker.DoWork += (obj, e) => WorkerDoWork(exe, type, time, worker, GlobalVars.SelectedClient, mapname);

15
NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs
View File

@ -1902,7 +1902,10 @@ namespace NovetusLauncher
break; break;
} }
GlobalVars.Custom_Shirt_Offline = Custom_Shirt_URL + textBox11.Text; if (!string.IsNullOrWhiteSpace(textBox11.Text))
{
GlobalVars.Custom_Shirt_Offline = Custom_Shirt_URL + textBox11.Text;
}
} }
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
@ -1917,7 +1920,10 @@ namespace NovetusLauncher
break; break;
} }
GlobalVars.Custom_Pants_Offline = Custom_Pants_URL + textBox13.Text; if (!string.IsNullOrWhiteSpace(textBox13.Text))
{
GlobalVars.Custom_Pants_Offline = Custom_Pants_URL + textBox13.Text;
}
} }
private void comboBox3_SelectedIndexChanged(object sender, EventArgs e) private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
@ -1932,7 +1938,10 @@ namespace NovetusLauncher
break; break;
} }
GlobalVars.Custom_T_Shirt_Offline = Custom_T_Shirt_URL + textBox12.Text; if (!string.IsNullOrWhiteSpace(textBox12.Text))
{
GlobalVars.Custom_T_Shirt_Offline = Custom_T_Shirt_URL + textBox12.Text;
}
} }
} }
} }

15
NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs
View File

@ -1894,7 +1894,10 @@ namespace NovetusLauncher
break; break;
} }
GlobalVars.Custom_T_Shirt_Offline = Custom_T_Shirt_URL + textBox11.Text; if (!string.IsNullOrWhiteSpace(textBox11.Text))
{
GlobalVars.Custom_T_Shirt_Offline = Custom_T_Shirt_URL + textBox11.Text;
}
} }
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
@ -1909,7 +1912,10 @@ namespace NovetusLauncher
break; break;
} }
GlobalVars.Custom_Shirt_Offline = Custom_Shirt_URL + textBox12.Text; if (!string.IsNullOrWhiteSpace(textBox12.Text))
{
GlobalVars.Custom_Shirt_Offline = Custom_Shirt_URL + textBox12.Text;
}
} }
private void comboBox3_SelectedIndexChanged(object sender, EventArgs e) private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
@ -1924,7 +1930,10 @@ namespace NovetusLauncher
break; break;
} }
GlobalVars.Custom_Pants_Offline = Custom_Pants_URL + textBox13.Text; if (!string.IsNullOrWhiteSpace(textBox13.Text))
{
GlobalVars.Custom_Pants_Offline = Custom_Pants_URL + textBox13.Text;
}
} }
} }
} }

48
NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs
View File

@ -596,16 +596,16 @@ namespace NovetusLauncher
{ {
LauncherFuncs.ReadClientValues(clientpath); LauncherFuncs.ReadClientValues(clientpath);
if (GlobalVars.UsesPlayerName == true) if (GlobalVars.SelectedClientInfo.UsesPlayerName == true)
{ {
textBox2.Enabled = true; textBox2.Enabled = true;
} }
else if (GlobalVars.UsesPlayerName == false) else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false)
{ {
textBox2.Enabled = false; textBox2.Enabled = false;
} }
if (GlobalVars.UsesID == true) if (GlobalVars.SelectedClientInfo.UsesID == true)
{ {
textBox5.Enabled = true; textBox5.Enabled = true;
button4.Enabled = true; button4.Enabled = true;
@ -614,7 +614,7 @@ namespace NovetusLauncher
checkBox3.Enabled = true; checkBox3.Enabled = true;
} }
} }
else if (GlobalVars.UsesID == false) else if (GlobalVars.SelectedClientInfo.UsesID == false)
{ {
textBox5.Enabled = false; textBox5.Enabled = false;
button4.Enabled = false; button4.Enabled = false;
@ -622,9 +622,9 @@ namespace NovetusLauncher
GlobalVars.LocalPlayMode = false; GlobalVars.LocalPlayMode = false;
} }
if (!string.IsNullOrWhiteSpace(GlobalVars.Warning)) if (!string.IsNullOrWhiteSpace(GlobalVars.SelectedClientInfo.Warning))
{ {
label30.Text = GlobalVars.Warning; label30.Text = GlobalVars.SelectedClientInfo.Warning;
label30.Visible = true; label30.Visible = true;
} }
else else
@ -632,7 +632,7 @@ namespace NovetusLauncher
label30.Visible = false; label30.Visible = false;
} }
textBox6.Text = GlobalVars.SelectedClientDesc; textBox6.Text = GlobalVars.SelectedClientInfo.Description;
label26.Text = GlobalVars.SelectedClient; label26.Text = GlobalVars.SelectedClient;
ConsolePrint("Client '" + GlobalVars.SelectedClient + "' successfully loaded.", 3); ConsolePrint("Client '" + GlobalVars.SelectedClient + "' successfully loaded.", 3);
} }
@ -896,9 +896,9 @@ namespace NovetusLauncher
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = "-script " + quote + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Client) + quote; args = "-script " + quote + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Client) + quote;
} }
@ -910,14 +910,14 @@ namespace NovetusLauncher
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<client>", "</client>", "", luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<client>", "</client>", "", luafile, rbxexe);
} }
try try
{ {
ConsolePrint("Client Loaded.", 4); ConsolePrint("Client Loaded.", 4);
if (GlobalVars.AdminMode != true) if (GlobalVars.AdminMode != true)
{ {
if (GlobalVars.AlreadyHasSecurity != true) if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true)
{ {
if (SecurityFuncs.checkClientMD5(GlobalVars.SelectedClient) == true) if (SecurityFuncs.checkClientMD5(GlobalVars.SelectedClient) == true)
{ {
@ -1002,9 +1002,9 @@ namespace NovetusLauncher
string mapfile = GlobalVars.MapPath; string mapfile = GlobalVars.MapPath;
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Solo) + quote; args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Solo) + quote;
} }
@ -1016,7 +1016,7 @@ namespace NovetusLauncher
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<solo>", "</solo>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<solo>", "</solo>", mapfile, luafile, rbxexe);
} }
try try
{ {
@ -1046,9 +1046,9 @@ namespace NovetusLauncher
string mapfile = GlobalVars.MapPath; string mapfile = GlobalVars.MapPath;
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Server) + "; " + (!string.IsNullOrWhiteSpace(GlobalVars.AddonScriptPath) ? LauncherFuncs.ChangeGameSettings() + " dofile('" + GlobalVars.AddonScriptPath + "');" : "") + quote + (no3d ? " -no3d" : ""); args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Server) + "; " + (!string.IsNullOrWhiteSpace(GlobalVars.AddonScriptPath) ? LauncherFuncs.ChangeGameSettings() + " dofile('" + GlobalVars.AddonScriptPath + "');" : "") + quote + (no3d ? " -no3d" : "");
} }
@ -1062,11 +1062,11 @@ namespace NovetusLauncher
{ {
if (!no3d) if (!no3d)
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<server>", "</server>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<server>", "</server>", mapfile, luafile, rbxexe);
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<no3d>", "</no3d>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<no3d>", "</no3d>", mapfile, luafile, rbxexe);
} }
} }
try try
@ -1098,9 +1098,9 @@ namespace NovetusLauncher
string mapname = (nomap ? "" : GlobalVars.Map); string mapname = (nomap ? "" : GlobalVars.Map);
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Studio) + quote; args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Studio) + quote;
} }
@ -1112,7 +1112,7 @@ namespace NovetusLauncher
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<studio>", "</studio>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<studio>", "</studio>", mapfile, luafile, rbxexe);
} }
try try
{ {
@ -1143,9 +1143,9 @@ namespace NovetusLauncher
string mapfile = GlobalVars.ConfigDirData + "\\Appreciation.rbxl"; string mapfile = GlobalVars.ConfigDirData + "\\Appreciation.rbxl";
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.EasterEgg) + quote; args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.EasterEgg) + quote;
} }
@ -1157,7 +1157,7 @@ namespace NovetusLauncher
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<solo>", "</solo>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<solo>", "</solo>", mapfile, luafile, rbxexe);
} }
try try
{ {

50
NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs
View File

@ -563,16 +563,16 @@ namespace NovetusLauncher
{ {
LauncherFuncs.ReadClientValues(clientpath); LauncherFuncs.ReadClientValues(clientpath);
if (GlobalVars.UsesPlayerName == true) if (GlobalVars.SelectedClientInfo.UsesPlayerName == true)
{ {
textBox2.Enabled = true; textBox2.Enabled = true;
} }
else if (GlobalVars.UsesPlayerName == false) else if (GlobalVars.SelectedClientInfo.UsesPlayerName == false)
{ {
textBox2.Enabled = false; textBox2.Enabled = false;
} }
if (GlobalVars.UsesID == true) if (GlobalVars.SelectedClientInfo.UsesID == true)
{ {
textBox5.Enabled = true; textBox5.Enabled = true;
button4.Enabled = true; button4.Enabled = true;
@ -581,7 +581,7 @@ namespace NovetusLauncher
checkBox3.Enabled = true; checkBox3.Enabled = true;
} }
} }
else if (GlobalVars.UsesID == false) else if (GlobalVars.SelectedClientInfo.UsesID == false)
{ {
textBox5.Enabled = false; textBox5.Enabled = false;
button4.Enabled = false; button4.Enabled = false;
@ -589,9 +589,9 @@ namespace NovetusLauncher
GlobalVars.LocalPlayMode = false; GlobalVars.LocalPlayMode = false;
} }
if (!string.IsNullOrWhiteSpace(GlobalVars.Warning)) if (!string.IsNullOrWhiteSpace(GlobalVars.SelectedClientInfo.Warning))
{ {
label30.Text = GlobalVars.Warning; label30.Text = GlobalVars.SelectedClientInfo.Warning;
label30.Visible = true; label30.Visible = true;
} }
else else
@ -599,7 +599,7 @@ namespace NovetusLauncher
label30.Visible = false; label30.Visible = false;
} }
textBox6.Text = GlobalVars.SelectedClientDesc; textBox6.Text = GlobalVars.SelectedClientInfo.Description;
label26.Text = GlobalVars.SelectedClient; label26.Text = GlobalVars.SelectedClient;
ConsolePrint("Client '" + GlobalVars.SelectedClient + "' successfully loaded.", 3); ConsolePrint("Client '" + GlobalVars.SelectedClient + "' successfully loaded.", 3);
} }
@ -860,12 +860,12 @@ namespace NovetusLauncher
{ {
string luafile = LauncherFuncs.GetLuaFileName(); string luafile = LauncherFuncs.GetLuaFileName();
string rbxexe = LauncherFuncs.GetClientEXEDir(ScriptGenerator.ScriptType.Client); string rbxexe = LauncherFuncs.GetClientEXEDir(ScriptGenerator.ScriptType.Client);
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = "-script " + quote + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Client) + quote; args = "-script " + quote + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Client) + quote;
} }
@ -877,14 +877,14 @@ namespace NovetusLauncher
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<client>", "</client>", "", luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<client>", "</client>", "", luafile, rbxexe);
} }
try try
{ {
ConsolePrint("Client Loaded.", 4); ConsolePrint("Client Loaded.", 4);
if (GlobalVars.AdminMode != true) if (GlobalVars.AdminMode != true)
{ {
if (GlobalVars.AlreadyHasSecurity != true) if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true)
{ {
if (SecurityFuncs.checkClientMD5(GlobalVars.SelectedClient) == true) if (SecurityFuncs.checkClientMD5(GlobalVars.SelectedClient) == true)
{ {
@ -969,9 +969,9 @@ namespace NovetusLauncher
string mapfile = GlobalVars.MapPath; string mapfile = GlobalVars.MapPath;
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Solo) + quote; args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Solo) + quote;
} }
@ -983,7 +983,7 @@ namespace NovetusLauncher
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<solo>", "</solo>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<solo>", "</solo>", mapfile, luafile, rbxexe);
} }
try try
{ {
@ -1013,9 +1013,9 @@ namespace NovetusLauncher
string mapfile = GlobalVars.MapPath; string mapfile = GlobalVars.MapPath;
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Server) + "; " + (!string.IsNullOrWhiteSpace(GlobalVars.AddonScriptPath) ? LauncherFuncs.ChangeGameSettings() + " dofile('" + GlobalVars.AddonScriptPath + "');" : "") + quote + (no3d ? " -no3d" : ""); args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Server) + "; " + (!string.IsNullOrWhiteSpace(GlobalVars.AddonScriptPath) ? LauncherFuncs.ChangeGameSettings() + " dofile('" + GlobalVars.AddonScriptPath + "');" : "") + quote + (no3d ? " -no3d" : "");
} }
@ -1029,11 +1029,11 @@ namespace NovetusLauncher
{ {
if (!no3d) if (!no3d)
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<server>", "</server>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<server>", "</server>", mapfile, luafile, rbxexe);
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<no3d>", "</no3d>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<no3d>", "</no3d>", mapfile, luafile, rbxexe);
} }
} }
try try
@ -1065,9 +1065,9 @@ namespace NovetusLauncher
string mapname = (nomap ? "" : GlobalVars.Map); string mapname = (nomap ? "" : GlobalVars.Map);
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Studio) + quote; args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Studio) + quote;
} }
@ -1079,7 +1079,7 @@ namespace NovetusLauncher
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<studio>", "</studio>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<studio>", "</studio>", mapfile, luafile, rbxexe);
} }
try try
{ {
@ -1110,9 +1110,9 @@ namespace NovetusLauncher
string mapfile = GlobalVars.ConfigDirData + "\\Appreciation.rbxl"; string mapfile = GlobalVars.ConfigDirData + "\\Appreciation.rbxl";
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.EasterEgg) + quote; args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.EasterEgg) + quote;
} }
@ -1124,7 +1124,7 @@ namespace NovetusLauncher
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<solo>", "</solo>", mapfile, luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<solo>", "</solo>", mapfile, luafile, rbxexe);
} }
try try
{ {

12
NovetusLauncher/NovetusURI/URI/LoaderForm.cs
View File

@ -95,7 +95,7 @@ namespace NovetusURI
GlobalVars.RobloxPort = Convert.ToInt32(port); GlobalVars.RobloxPort = Convert.ToInt32(port);
ReadClientValues(GlobalVars.SelectedClient); ReadClientValues(GlobalVars.SelectedClient);
string luafile = ""; string luafile = "";
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua";
} }
@ -104,7 +104,7 @@ namespace NovetusURI
luafile = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\scripts\\" + GlobalVars.ScriptGenName + ".lua"; luafile = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\scripts\\" + GlobalVars.ScriptGenName + ".lua";
} }
string rbxexe = ""; string rbxexe = "";
if (GlobalVars.LegacyMode == true) if (GlobalVars.SelectedClientInfo.LegacyMode == true)
{ {
rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe";
} }
@ -114,9 +114,9 @@ namespace NovetusURI
} }
string quote = "\""; string quote = "\"";
string args = ""; string args = "";
if (GlobalVars.CustomArgs.Equals("%args%")) if (GlobalVars.SelectedClientInfo.CommandLineArgs.Equals("%args%"))
{ {
if (!GlobalVars.FixScriptMapMode) if (!GlobalVars.SelectedClientInfo.Fix2007)
{ {
args = "-script " + quote + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Client) + quote; args = "-script " + quote + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); " + ScriptGenerator.GetScriptFuncForType(ScriptGenerator.ScriptType.Client) + quote;
} }
@ -128,13 +128,13 @@ namespace NovetusURI
} }
else else
{ {
args = ClientScript.CompileScript(GlobalVars.CustomArgs, "<client>", "</client>", "", luafile, rbxexe); args = ClientScript.CompileScript(GlobalVars.SelectedClientInfo.CommandLineArgs, "<client>", "</client>", "", luafile, rbxexe);
} }
try try
{ {
if (GlobalVars.AdminMode != true) if (GlobalVars.AdminMode != true)
{ {
if (GlobalVars.AlreadyHasSecurity != true) if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true)
{ {
if (SecurityFuncs.checkClientMD5(GlobalVars.SelectedClient) == true) if (SecurityFuncs.checkClientMD5(GlobalVars.SelectedClient) == true)
{ {