This commit is contained in:
Bitl 2018-11-10 21:28:14 -07:00
parent a3fec2667a
commit 8a32bb92a6
14 changed files with 44 additions and 51 deletions

View File

@ -85,7 +85,7 @@ namespace NovetusLauncher
if (ofd.ShowDialog() == DialogResult.OK) if (ofd.ShowDialog() == DialogResult.OK)
{ {
string line1; string line1;
string Decryptline1, Decryptline2, Decryptline3, Decryptline4, Decryptline5, Decryptline6, Decryptline7, Decryptline8; string Decryptline1, Decryptline2, Decryptline3, Decryptline4, Decryptline5, Decryptline6, Decryptline7, Decryptline8, Decryptline9, Decryptline10;
using(StreamReader reader = new StreamReader(ofd.FileName)) using(StreamReader reader = new StreamReader(ofd.FileName))
{ {
@ -106,8 +106,8 @@ namespace NovetusLauncher
Decryptline6 = SecurityFuncs.Base64Decode(result[5]); Decryptline6 = SecurityFuncs.Base64Decode(result[5]);
Decryptline7 = SecurityFuncs.Base64Decode(result[6]); Decryptline7 = SecurityFuncs.Base64Decode(result[6]);
Decryptline8 = SecurityFuncs.Base64Decode(result[7]); Decryptline8 = SecurityFuncs.Base64Decode(result[7]);
//Decryptline9 = SecurityFuncs.Base64Decode(result[8]); Decryptline9 = SecurityFuncs.Base64Decode(result[8]);
//Decryptline10 = SecurityFuncs.Base64Decode(result[9]); Decryptline10 = SecurityFuncs.Base64Decode(result[9]);
if (GlobalVars.AdminMode != true) if (GlobalVars.AdminMode != true)
{ {
@ -148,18 +148,18 @@ namespace NovetusLauncher
SelectedClientDesc = Decryptline7; SelectedClientDesc = Decryptline7;
//bool bline9 = Convert.ToBoolean(Decryptline9); bool bline9 = Convert.ToBoolean(Decryptline9);
//FixScriptMapMode = Decryptline9; FixScriptMapMode = bline9;
//bool bline10 = Convert.ToBoolean(Decryptline10); bool bline10 = Convert.ToBoolean(Decryptline10);
//AlreadyHasSecurity = Decryptline10; AlreadyHasSecurity = bline10;
checkBox1.Checked = UsesPlayerName; checkBox1.Checked = UsesPlayerName;
checkBox2.Checked = UsesID; checkBox2.Checked = UsesID;
checkBox5.Checked = LoadsAssetsOnline; checkBox5.Checked = LoadsAssetsOnline;
checkBox3.Checked = LegacyMode; checkBox3.Checked = LegacyMode;
//checkBox6.Checked = FixScriptMapMode; checkBox6.Checked = FixScriptMapMode;
//checkBox7.Checked = AlreadyHasSecurity; checkBox7.Checked = AlreadyHasSecurity;
textBox3.Text = SelectedClientScriptMD5.ToUpper(); textBox3.Text = SelectedClientScriptMD5.ToUpper();
textBox2.Text = SelectedClientMD5.ToUpper(); textBox2.Text = SelectedClientMD5.ToUpper();
textBox1.Text = SelectedClientDesc; textBox1.Text = SelectedClientDesc;

View File

@ -263,7 +263,7 @@ namespace NovetusLauncher
public static void ReadClientValues(string clientpath) public static void ReadClientValues(string clientpath)
{ {
string line1; string line1;
string Decryptline1, Decryptline2, Decryptline3, Decryptline4, Decryptline5, Decryptline6, Decryptline7; string Decryptline1, Decryptline2, Decryptline3, Decryptline4, Decryptline5, Decryptline6, Decryptline7, Decryptline9, Decryptline10;;
using(StreamReader reader = new StreamReader(clientpath)) using(StreamReader reader = new StreamReader(clientpath))
{ {
@ -282,8 +282,8 @@ namespace NovetusLauncher
Decryptline5 = SecurityFuncs.Base64Decode(result[4]); Decryptline5 = SecurityFuncs.Base64Decode(result[4]);
Decryptline6 = SecurityFuncs.Base64Decode(result[5]); Decryptline6 = SecurityFuncs.Base64Decode(result[5]);
Decryptline7 = SecurityFuncs.Base64Decode(result[6]); Decryptline7 = SecurityFuncs.Base64Decode(result[6]);
//Decryptline9 = SecurityFuncs.Base64Decode(result[8]); Decryptline9 = SecurityFuncs.Base64Decode(result[8]);
//Decryptline10 = SecurityFuncs.Base64Decode(result[9]); Decryptline10 = SecurityFuncs.Base64Decode(result[9]);
bool bline1 = Convert.ToBoolean(Decryptline1); bool bline1 = Convert.ToBoolean(Decryptline1);
GlobalVars.UsesPlayerName = bline1; GlobalVars.UsesPlayerName = bline1;
@ -303,11 +303,11 @@ namespace NovetusLauncher
GlobalVars.SelectedClientDesc = Decryptline7; GlobalVars.SelectedClientDesc = Decryptline7;
//bool bline9 = Convert.ToBoolean(Decryptline9); bool bline9 = Convert.ToBoolean(Decryptline9);
//GlobalVars.FixScriptMapMode = Decryptline9; GlobalVars.FixScriptMapMode = bline9;
//bool bline10 = Convert.ToBoolean(Decryptline10); bool bline10 = Convert.ToBoolean(Decryptline10);
//GlobalVars.AlreadyHasSecurity = Decryptline10; GlobalVars.AlreadyHasSecurity = bline10;
} }
public static void GeneratePlayerID() public static void GeneratePlayerID()
@ -752,42 +752,42 @@ namespace NovetusLauncher
{ {
if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true)
{ {
return "_G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + GlobalVars.loadtext + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "')"; return "CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + GlobalVars.loadtext + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "')";
} }
else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true)
{ {
return "_G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + GlobalVars.loadtext + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "')"; return "CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + GlobalVars.loadtext + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "')";
} }
else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false)
{ {
return "_G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + GlobalVars.loadtext + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "')"; return "CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + GlobalVars.loadtext + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "')";
} }
else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false) else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false)
{ {
return "_G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + GlobalVars.loadtext + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "')"; return "CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + GlobalVars.loadtext + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "')";
} }
} }
else if (type == ScriptType.Server) else if (type == ScriptType.Server)
{ {
return "_G.CSServer(" + GlobalVars.RobloxPort + "," + GlobalVars.PlayerLimit + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "'," + GlobalVars.DisableTeapotTurret.ToString().ToLower() + ")"; return "CSServer(" + GlobalVars.RobloxPort + "," + GlobalVars.PlayerLimit + ",'" + GlobalVars.SelectedClientMD5 + "','" + md5dir + "','" + GlobalVars.SelectedClientScriptMD5 + "'," + GlobalVars.DisableTeapotTurret.ToString().ToLower() + ")";
} }
else if (type == ScriptType.Solo) else if (type == ScriptType.Solo)
{ {
if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true)
{ {
return "_G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "','" + GlobalVars.loadtext + ")"; return "CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "','" + GlobalVars.loadtext + ")";
} }
else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true)
{ {
return "_G.CSSolo(" + GlobalVars.UserID + ",'Player','" + GlobalVars.loadtext + ")"; return "CSSolo(" + GlobalVars.UserID + ",'Player','" + GlobalVars.loadtext + ")";
} }
else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false)
{ {
return "_G.CSSolo(0,'" + GlobalVars.PlayerName + "','" + GlobalVars.loadtext + ")"; return "CSSolo(0,'" + GlobalVars.PlayerName + "','" + GlobalVars.loadtext + ")";
} }
else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false ) else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false )
{ {
return "_G.CSSolo(0,'Player','" + GlobalVars.loadtext + ")"; return "CSSolo(0,'Player','" + GlobalVars.loadtext + ")";
} }
} }
else if (type == ScriptType.Studio) else if (type == ScriptType.Studio)
@ -802,6 +802,21 @@ namespace NovetusLauncher
return ""; return "";
} }
public static string[] GetScriptContents(string scriptPath)
{
List<string> array = new List<string>();
string line = "";
using (StreamReader sr = new StreamReader(scriptPath))
{
while ((line = sr.ReadLine()) != null)
{
array.Add(line);
}
}
return array.ToArray();
}
private static void ReadConfigValues() private static void ReadConfigValues()
{ {
LauncherFuncs.ReadConfigValues(GlobalVars.BasePath + "\\config.txt"); LauncherFuncs.ReadConfigValues(GlobalVars.BasePath + "\\config.txt");
@ -813,9 +828,11 @@ namespace NovetusLauncher
ReadConfigValues(); ReadConfigValues();
string scriptcontents = MultiLine(GetScriptContents(GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\scripts\\" + GlobalVars.ScriptName + ".lua"));
string code = MultiLine( string code = MultiLine(
"--Load Script", "--Load Script",
"dofile('rbxasset://scripts/" + GlobalVars.ScriptName + ".lua')", scriptcontents,
GetScriptFuncForType(type) GetScriptFuncForType(type)
); );

View File

@ -1,24 +0,0 @@
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\bin\Release\NovetusLauncher.exe.config
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\bin\Release\NovetusLauncher.exe
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.csprojResolveAssemblyReference.cache
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.CharacterCustomization.resources
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.ClientinfoEditor.resources
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.LoaderForm.resources
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.MainForm.resources
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.QuickConfigure.resources
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.ServerInfo.resources
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.csproj.GenerateResource.Cache
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.exe
C:\Users\BITL\Desktop\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\RBXLegacy-src-749b4965ca0c1d0e87b5902a59c70a68ab6942e1\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.ItemMaker.resources
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\bin\Release\NovetusLauncher.exe.config
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\bin\Release\NovetusLauncher.exe
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.csprojResolveAssemblyReference.cache
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.CharacterCustomization.resources
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.ClientinfoEditor.resources
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.ItemMaker.resources
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.LoaderForm.resources
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.MainForm.resources
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.QuickConfigure.resources
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.ServerInfo.resources
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.csproj.GenerateResource.Cache
C:\Users\BITL\Documents\GitHub\Novetus_src\NovetusLauncher\NovetusLauncher\obj\Release\NovetusLauncher.exe

View File

@ -50,7 +50,7 @@ function LoadCharacterNew(playerApp,newChar,RemoveTeapotTurret)
if newTShirt[1].className == "ShirtGraphic" then if newTShirt[1].className == "ShirtGraphic" then
newTShirt[1].Parent = newChar newTShirt[1].Parent = newChar
else else
ewTShirt[1]:remove() newTShirt[1]:remove()
end end
end end
end) end)