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

even more fixes lol

This commit is contained in:
Bitl 2022-02-20 10:35:01 -07:00
parent 4717ee6e40
commit e6bc2bc15b
3 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -350,4 +350,5 @@ MigrationBackup/
.ionide/ .ionide/
# Novetus EXE Build dir # Novetus EXE Build dir
build/ build/
Novetus/build.zip

15
Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
View File

@ -1923,13 +1923,22 @@ public class GlobalFuncs
} }
else else
{ {
if (GlobalVars.SelectedClientInfo.SeperateFolders) bool rbxasset = GlobalVars.SelectedClientInfo.CommandLineArgs.Contains("%userbxassetforgeneration%");
if (!rbxasset)
{ {
luafile = GlobalPaths.ClientDir + @"\\" + ClientName + @"\\" + GetClientSeperateFolderName(type) + @"\\content\\scripts\\" + GlobalPaths.ScriptGenName + ".lua"; if (GlobalVars.SelectedClientInfo.SeperateFolders)
{
luafile = GlobalPaths.ClientDir + @"\\" + ClientName + @"\\" + GetClientSeperateFolderName(type) + @"\\content\\scripts\\" + GlobalPaths.ScriptGenName + ".lua";
}
else
{
luafile = GlobalPaths.ClientDir + @"\\" + ClientName + @"\\content\\scripts\\" + GlobalPaths.ScriptGenName + ".lua";
}
} }
else else
{ {
luafile = GlobalPaths.ClientDir + @"\\" + ClientName + @"\\content\\scripts\\" + GlobalPaths.ScriptGenName + ".lua"; luafile = "rbxasset://scripts/" + GlobalPaths.ScriptGenName + ".lua";
} }
} }

44
Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.Designer.cs generated
View File

@ -165,6 +165,7 @@ partial class ClientinfoEditor
this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.useloadfileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.useloadfileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.userbxassetforgenerationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -452,7 +453,8 @@ partial class ClientinfoEditor
this.newguiToolStripMenuItem, this.newguiToolStripMenuItem,
this.signgeneratedjoinscriptToolStripMenuItem, this.signgeneratedjoinscriptToolStripMenuItem,
this.usenewsignformatToolStripMenuItem, this.usenewsignformatToolStripMenuItem,
this.useloadfileToolStripMenuItem}); this.useloadfileToolStripMenuItem,
this.userbxassetforgenerationToolStripMenuItem});
this.generalToolStripMenuItem.Name = "generalToolStripMenuItem"; this.generalToolStripMenuItem.Name = "generalToolStripMenuItem";
this.generalToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.generalToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.generalToolStripMenuItem.Text = "General"; this.generalToolStripMenuItem.Text = "General";
@ -460,105 +462,105 @@ partial class ClientinfoEditor
// mapfileToolStripMenuItem // mapfileToolStripMenuItem
// //
this.mapfileToolStripMenuItem.Name = "mapfileToolStripMenuItem"; this.mapfileToolStripMenuItem.Name = "mapfileToolStripMenuItem";
this.mapfileToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.mapfileToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.mapfileToolStripMenuItem.Text = "%mapfile%"; this.mapfileToolStripMenuItem.Text = "%mapfile%";
this.mapfileToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.mapfileToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// mapfiledToolStripMenuItem // mapfiledToolStripMenuItem
// //
this.mapfiledToolStripMenuItem.Name = "mapfiledToolStripMenuItem"; this.mapfiledToolStripMenuItem.Name = "mapfiledToolStripMenuItem";
this.mapfiledToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.mapfiledToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.mapfiledToolStripMenuItem.Text = "%mapfiled%"; this.mapfiledToolStripMenuItem.Text = "%mapfiled%";
this.mapfiledToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.mapfiledToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// mapfilecToolStripMenuItem // mapfilecToolStripMenuItem
// //
this.mapfilecToolStripMenuItem.Name = "mapfilecToolStripMenuItem"; this.mapfilecToolStripMenuItem.Name = "mapfilecToolStripMenuItem";
this.mapfilecToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.mapfilecToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.mapfilecToolStripMenuItem.Text = "%mapfilec%"; this.mapfilecToolStripMenuItem.Text = "%mapfilec%";
this.mapfilecToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.mapfilecToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// luafileToolStripMenuItem // luafileToolStripMenuItem
// //
this.luafileToolStripMenuItem.Name = "luafileToolStripMenuItem"; this.luafileToolStripMenuItem.Name = "luafileToolStripMenuItem";
this.luafileToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.luafileToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.luafileToolStripMenuItem.Text = "%luafile%"; this.luafileToolStripMenuItem.Text = "%luafile%";
this.luafileToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.luafileToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// ipToolStripMenuItem // ipToolStripMenuItem
// //
this.ipToolStripMenuItem.Name = "ipToolStripMenuItem"; this.ipToolStripMenuItem.Name = "ipToolStripMenuItem";
this.ipToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.ipToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.ipToolStripMenuItem.Text = "%ip%"; this.ipToolStripMenuItem.Text = "%ip%";
this.ipToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.ipToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// addonscriptpathToolStripMenuItem // addonscriptpathToolStripMenuItem
// //
this.addonscriptpathToolStripMenuItem.Name = "addonscriptpathToolStripMenuItem"; this.addonscriptpathToolStripMenuItem.Name = "addonscriptpathToolStripMenuItem";
this.addonscriptpathToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.addonscriptpathToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.addonscriptpathToolStripMenuItem.Text = "%addonscriptpath%"; this.addonscriptpathToolStripMenuItem.Text = "%addonscriptpath%";
this.addonscriptpathToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.addonscriptpathToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// scripttypeToolStripMenuItem // scripttypeToolStripMenuItem
// //
this.scripttypeToolStripMenuItem.Name = "scripttypeToolStripMenuItem"; this.scripttypeToolStripMenuItem.Name = "scripttypeToolStripMenuItem";
this.scripttypeToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.scripttypeToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.scripttypeToolStripMenuItem.Text = "%scripttype%"; this.scripttypeToolStripMenuItem.Text = "%scripttype%";
this.scripttypeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.scripttypeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// versionToolStripMenuItem // versionToolStripMenuItem
// //
this.versionToolStripMenuItem.Name = "versionToolStripMenuItem"; this.versionToolStripMenuItem.Name = "versionToolStripMenuItem";
this.versionToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.versionToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.versionToolStripMenuItem.Text = "%version%"; this.versionToolStripMenuItem.Text = "%version%";
this.versionToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.versionToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// doublequoteToolStripMenuItem // doublequoteToolStripMenuItem
// //
this.doublequoteToolStripMenuItem.Name = "doublequoteToolStripMenuItem"; this.doublequoteToolStripMenuItem.Name = "doublequoteToolStripMenuItem";
this.doublequoteToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.doublequoteToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.doublequoteToolStripMenuItem.Text = "%doublequote%"; this.doublequoteToolStripMenuItem.Text = "%doublequote%";
this.doublequoteToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.doublequoteToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// joinportToolStripMenuItem // joinportToolStripMenuItem
// //
this.joinportToolStripMenuItem.Name = "joinportToolStripMenuItem"; this.joinportToolStripMenuItem.Name = "joinportToolStripMenuItem";
this.joinportToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.joinportToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.joinportToolStripMenuItem.Text = "%joinport%"; this.joinportToolStripMenuItem.Text = "%joinport%";
this.joinportToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.joinportToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// validatedextrafilesToolStripMenuItem // validatedextrafilesToolStripMenuItem
// //
this.validatedextrafilesToolStripMenuItem.Name = "validatedextrafilesToolStripMenuItem"; this.validatedextrafilesToolStripMenuItem.Name = "validatedextrafilesToolStripMenuItem";
this.validatedextrafilesToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.validatedextrafilesToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.validatedextrafilesToolStripMenuItem.Text = "%validatedextrafiles%"; this.validatedextrafilesToolStripMenuItem.Text = "%validatedextrafiles%";
this.validatedextrafilesToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.validatedextrafilesToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// argstringToolStripMenuItem // argstringToolStripMenuItem
// //
this.argstringToolStripMenuItem.Name = "argstringToolStripMenuItem"; this.argstringToolStripMenuItem.Name = "argstringToolStripMenuItem";
this.argstringToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.argstringToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.argstringToolStripMenuItem.Text = "%argstring%"; this.argstringToolStripMenuItem.Text = "%argstring%";
this.argstringToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.argstringToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// newguiToolStripMenuItem // newguiToolStripMenuItem
// //
this.newguiToolStripMenuItem.Name = "newguiToolStripMenuItem"; this.newguiToolStripMenuItem.Name = "newguiToolStripMenuItem";
this.newguiToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.newguiToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.newguiToolStripMenuItem.Text = "%newgui%"; this.newguiToolStripMenuItem.Text = "%newgui%";
this.newguiToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.newguiToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// signgeneratedjoinscriptToolStripMenuItem // signgeneratedjoinscriptToolStripMenuItem
// //
this.signgeneratedjoinscriptToolStripMenuItem.Name = "signgeneratedjoinscriptToolStripMenuItem"; this.signgeneratedjoinscriptToolStripMenuItem.Name = "signgeneratedjoinscriptToolStripMenuItem";
this.signgeneratedjoinscriptToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.signgeneratedjoinscriptToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.signgeneratedjoinscriptToolStripMenuItem.Text = "%signgeneratedjoinscript%"; this.signgeneratedjoinscriptToolStripMenuItem.Text = "%signgeneratedjoinscript%";
this.signgeneratedjoinscriptToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.signgeneratedjoinscriptToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// usenewsignformatToolStripMenuItem // usenewsignformatToolStripMenuItem
// //
this.usenewsignformatToolStripMenuItem.Name = "usenewsignformatToolStripMenuItem"; this.usenewsignformatToolStripMenuItem.Name = "usenewsignformatToolStripMenuItem";
this.usenewsignformatToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.usenewsignformatToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.usenewsignformatToolStripMenuItem.Text = "%usenewsignformat%"; this.usenewsignformatToolStripMenuItem.Text = "%usenewsignformat%";
this.usenewsignformatToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.usenewsignformatToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
@ -1264,10 +1266,17 @@ partial class ClientinfoEditor
// useloadfileToolStripMenuItem // useloadfileToolStripMenuItem
// //
this.useloadfileToolStripMenuItem.Name = "useloadfileToolStripMenuItem"; this.useloadfileToolStripMenuItem.Name = "useloadfileToolStripMenuItem";
this.useloadfileToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.useloadfileToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.useloadfileToolStripMenuItem.Text = "%useloadfile%"; this.useloadfileToolStripMenuItem.Text = "%useloadfile%";
this.useloadfileToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.useloadfileToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// userbxassetforgenerationToolStripMenuItem
//
this.userbxassetforgenerationToolStripMenuItem.Name = "userbxassetforgenerationToolStripMenuItem";
this.userbxassetforgenerationToolStripMenuItem.Size = new System.Drawing.Size(227, 22);
this.userbxassetforgenerationToolStripMenuItem.Text = "%userbxassetforgeneration%";
this.userbxassetforgenerationToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
//
// ClientinfoEditor // ClientinfoEditor
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1438,4 +1447,5 @@ partial class ClientinfoEditor
private System.Windows.Forms.ToolStripMenuItem signgeneratedjoinscriptToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem signgeneratedjoinscriptToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem usenewsignformatToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem usenewsignformatToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem useloadfileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem useloadfileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem userbxassetforgenerationToolStripMenuItem;
} }