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

added %doublequote%

This commit is contained in:
Bitl 2020-11-15 17:19:07 -07:00
parent 3dd660567f
commit ae45fbeb86
2 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs
View File

@ -123,7 +123,7 @@ public class ScriptFuncs
} }
#endregion #endregion
#region ClientScript Parser #region ClientScript Parser
public class ClientScript public class ClientScript
{ {
public static string GetArgsFromTag(string code, string tag, string endtag) public static string GetArgsFromTag(string code, string tag, string endtag)
@ -372,7 +372,8 @@ public class ScriptFuncs
.Replace("%tripcode%", GlobalVars.UserConfiguration.PlayerTripcode) .Replace("%tripcode%", GlobalVars.UserConfiguration.PlayerTripcode)
.Replace("%scripttype%", Generator.GetNameForType(type)) .Replace("%scripttype%", Generator.GetNameForType(type))
.Replace("%addonscriptpath%", GlobalPaths.AddonScriptPath) .Replace("%addonscriptpath%", GlobalPaths.AddonScriptPath)
.Replace("%loadout%", code.Contains("<solo>") ? GlobalVars.soloLoadout : GlobalVars.Loadout); .Replace("%loadout%", code.Contains("<solo>") ? GlobalVars.soloLoadout : GlobalVars.Loadout)
.Replace("%doublequote%", "\"");
return compiled; return compiled;
} }
} }

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

@ -73,6 +73,7 @@ partial class ClientinfoEditor
this.addonscriptpathToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addonscriptpathToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.scripttypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.scripttypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.versionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.versionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.doublequoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.serverToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.serverToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.limitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.limitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.securityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.securityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -81,6 +82,8 @@ partial class ClientinfoEditor
this.md5exeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.md5exeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.md5scriptdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.md5scriptdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.md5exedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.md5exedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.md5sToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.md5sdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.playerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.playerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customizationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.customizationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bodyColorsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bodyColorsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -147,8 +150,6 @@ partial class ClientinfoEditor
this.label9 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
this.comboBox1 = new System.Windows.Forms.ComboBox(); this.comboBox1 = new System.Windows.Forms.ComboBox();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
this.md5sToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.md5sdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -329,48 +330,48 @@ partial class ClientinfoEditor
this.no3dToolStripMenuItem, this.no3dToolStripMenuItem,
this.sharedToolStripMenuItem}); this.sharedToolStripMenuItem});
this.tagsToolStripMenuItem.Name = "tagsToolStripMenuItem"; this.tagsToolStripMenuItem.Name = "tagsToolStripMenuItem";
this.tagsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.tagsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.tagsToolStripMenuItem.Text = "Add Tags"; this.tagsToolStripMenuItem.Text = "Add Tags";
// //
// clientToolStripMenuItem // clientToolStripMenuItem
// //
this.clientToolStripMenuItem.Name = "clientToolStripMenuItem"; this.clientToolStripMenuItem.Name = "clientToolStripMenuItem";
this.clientToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.clientToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.clientToolStripMenuItem.Text = "<client>"; this.clientToolStripMenuItem.Text = "<client>";
this.clientToolStripMenuItem.Click += new System.EventHandler(this.clientToolStripMenuItem_Click); this.clientToolStripMenuItem.Click += new System.EventHandler(this.clientToolStripMenuItem_Click);
// //
// serverToolStripMenuItem // serverToolStripMenuItem
// //
this.serverToolStripMenuItem.Name = "serverToolStripMenuItem"; this.serverToolStripMenuItem.Name = "serverToolStripMenuItem";
this.serverToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.serverToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.serverToolStripMenuItem.Text = "<server>"; this.serverToolStripMenuItem.Text = "<server>";
this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click); this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click);
// //
// soloToolStripMenuItem // soloToolStripMenuItem
// //
this.soloToolStripMenuItem.Name = "soloToolStripMenuItem"; this.soloToolStripMenuItem.Name = "soloToolStripMenuItem";
this.soloToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.soloToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.soloToolStripMenuItem.Text = "<solo>"; this.soloToolStripMenuItem.Text = "<solo>";
this.soloToolStripMenuItem.Click += new System.EventHandler(this.soloToolStripMenuItem_Click); this.soloToolStripMenuItem.Click += new System.EventHandler(this.soloToolStripMenuItem_Click);
// //
// studioToolStripMenuItem // studioToolStripMenuItem
// //
this.studioToolStripMenuItem.Name = "studioToolStripMenuItem"; this.studioToolStripMenuItem.Name = "studioToolStripMenuItem";
this.studioToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.studioToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.studioToolStripMenuItem.Text = "<studio>"; this.studioToolStripMenuItem.Text = "<studio>";
this.studioToolStripMenuItem.Click += new System.EventHandler(this.studioToolStripMenuItem_Click); this.studioToolStripMenuItem.Click += new System.EventHandler(this.studioToolStripMenuItem_Click);
// //
// no3dToolStripMenuItem // no3dToolStripMenuItem
// //
this.no3dToolStripMenuItem.Name = "no3dToolStripMenuItem"; this.no3dToolStripMenuItem.Name = "no3dToolStripMenuItem";
this.no3dToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.no3dToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.no3dToolStripMenuItem.Text = "<no3d>"; this.no3dToolStripMenuItem.Text = "<no3d>";
this.no3dToolStripMenuItem.Click += new System.EventHandler(this.no3dToolStripMenuItem_Click); this.no3dToolStripMenuItem.Click += new System.EventHandler(this.no3dToolStripMenuItem_Click);
// //
// sharedToolStripMenuItem // sharedToolStripMenuItem
// //
this.sharedToolStripMenuItem.Name = "sharedToolStripMenuItem"; this.sharedToolStripMenuItem.Name = "sharedToolStripMenuItem";
this.sharedToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.sharedToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.sharedToolStripMenuItem.Text = "<shared>"; this.sharedToolStripMenuItem.Text = "<shared>";
this.sharedToolStripMenuItem.Click += new System.EventHandler(this.sharedToolStripMenuItem_Click); this.sharedToolStripMenuItem.Click += new System.EventHandler(this.sharedToolStripMenuItem_Click);
// //
@ -384,7 +385,7 @@ partial class ClientinfoEditor
this.debuggingToolStripMenuItem, this.debuggingToolStripMenuItem,
this.argsToolStripMenuItem}); this.argsToolStripMenuItem});
this.variablesToolStripMenuItem.Name = "variablesToolStripMenuItem"; this.variablesToolStripMenuItem.Name = "variablesToolStripMenuItem";
this.variablesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.variablesToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.variablesToolStripMenuItem.Text = "Add Variables"; this.variablesToolStripMenuItem.Text = "Add Variables";
// //
// generalToolStripMenuItem // generalToolStripMenuItem
@ -398,9 +399,10 @@ partial class ClientinfoEditor
this.portToolStripMenuItem, this.portToolStripMenuItem,
this.addonscriptpathToolStripMenuItem, this.addonscriptpathToolStripMenuItem,
this.scripttypeToolStripMenuItem, this.scripttypeToolStripMenuItem,
this.versionToolStripMenuItem}); this.versionToolStripMenuItem,
this.doublequoteToolStripMenuItem});
this.generalToolStripMenuItem.Name = "generalToolStripMenuItem"; this.generalToolStripMenuItem.Name = "generalToolStripMenuItem";
this.generalToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.generalToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
this.generalToolStripMenuItem.Text = "General"; this.generalToolStripMenuItem.Text = "General";
// //
// mapfileToolStripMenuItem // mapfileToolStripMenuItem
@ -466,12 +468,19 @@ partial class ClientinfoEditor
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
//
this.doublequoteToolStripMenuItem.Name = "doublequoteToolStripMenuItem";
this.doublequoteToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
this.doublequoteToolStripMenuItem.Text = "%doublequote%";
this.doublequoteToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
//
// serverToolStripMenuItem1 // serverToolStripMenuItem1
// //
this.serverToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.serverToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.limitToolStripMenuItem}); this.limitToolStripMenuItem});
this.serverToolStripMenuItem1.Name = "serverToolStripMenuItem1"; this.serverToolStripMenuItem1.Name = "serverToolStripMenuItem1";
this.serverToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.serverToolStripMenuItem1.Size = new System.Drawing.Size(133, 22);
this.serverToolStripMenuItem1.Text = "Server"; this.serverToolStripMenuItem1.Text = "Server";
// //
// limitToolStripMenuItem // limitToolStripMenuItem
@ -492,44 +501,58 @@ partial class ClientinfoEditor
this.md5sToolStripMenuItem, this.md5sToolStripMenuItem,
this.md5sdToolStripMenuItem}); this.md5sdToolStripMenuItem});
this.securityToolStripMenuItem.Name = "securityToolStripMenuItem"; this.securityToolStripMenuItem.Name = "securityToolStripMenuItem";
this.securityToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.securityToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
this.securityToolStripMenuItem.Text = "Security"; this.securityToolStripMenuItem.Text = "Security";
// //
// md5launcherToolStripMenuItem // md5launcherToolStripMenuItem
// //
this.md5launcherToolStripMenuItem.Name = "md5launcherToolStripMenuItem"; this.md5launcherToolStripMenuItem.Name = "md5launcherToolStripMenuItem";
this.md5launcherToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5launcherToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.md5launcherToolStripMenuItem.Text = "%md5launcher%"; this.md5launcherToolStripMenuItem.Text = "%md5launcher%";
this.md5launcherToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.md5launcherToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// md5scriptToolStripMenuItem // md5scriptToolStripMenuItem
// //
this.md5scriptToolStripMenuItem.Name = "md5scriptToolStripMenuItem"; this.md5scriptToolStripMenuItem.Name = "md5scriptToolStripMenuItem";
this.md5scriptToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5scriptToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.md5scriptToolStripMenuItem.Text = "%md5script%"; this.md5scriptToolStripMenuItem.Text = "%md5script%";
this.md5scriptToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.md5scriptToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// md5exeToolStripMenuItem // md5exeToolStripMenuItem
// //
this.md5exeToolStripMenuItem.Name = "md5exeToolStripMenuItem"; this.md5exeToolStripMenuItem.Name = "md5exeToolStripMenuItem";
this.md5exeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5exeToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.md5exeToolStripMenuItem.Text = "%md5exe%"; this.md5exeToolStripMenuItem.Text = "%md5exe%";
this.md5exeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.md5exeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// md5scriptdToolStripMenuItem // md5scriptdToolStripMenuItem
// //
this.md5scriptdToolStripMenuItem.Name = "md5scriptdToolStripMenuItem"; this.md5scriptdToolStripMenuItem.Name = "md5scriptdToolStripMenuItem";
this.md5scriptdToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5scriptdToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.md5scriptdToolStripMenuItem.Text = "%md5scriptd%"; this.md5scriptdToolStripMenuItem.Text = "%md5scriptd%";
this.md5scriptdToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.md5scriptdToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// md5exedToolStripMenuItem // md5exedToolStripMenuItem
// //
this.md5exedToolStripMenuItem.Name = "md5exedToolStripMenuItem"; this.md5exedToolStripMenuItem.Name = "md5exedToolStripMenuItem";
this.md5exedToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5exedToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.md5exedToolStripMenuItem.Text = "%md5exed%"; this.md5exedToolStripMenuItem.Text = "%md5exed%";
this.md5exedToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.md5exedToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// md5sToolStripMenuItem
//
this.md5sToolStripMenuItem.Name = "md5sToolStripMenuItem";
this.md5sToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.md5sToolStripMenuItem.Text = "%md5s%";
this.md5sToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
//
// md5sdToolStripMenuItem
//
this.md5sdToolStripMenuItem.Name = "md5sdToolStripMenuItem";
this.md5sdToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.md5sdToolStripMenuItem.Text = "%md5sd%";
this.md5sdToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
//
// playerToolStripMenuItem // playerToolStripMenuItem
// //
this.playerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.playerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -538,7 +561,7 @@ partial class ClientinfoEditor
this.idToolStripMenuItem, this.idToolStripMenuItem,
this.tripcodeToolStripMenuItem}); this.tripcodeToolStripMenuItem});
this.playerToolStripMenuItem.Name = "playerToolStripMenuItem"; this.playerToolStripMenuItem.Name = "playerToolStripMenuItem";
this.playerToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.playerToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
this.playerToolStripMenuItem.Text = "Player"; this.playerToolStripMenuItem.Text = "Player";
// //
// customizationToolStripMenuItem // customizationToolStripMenuItem
@ -958,7 +981,7 @@ partial class ClientinfoEditor
this.debuggingToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.debuggingToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.donothingToolStripMenuItem}); this.donothingToolStripMenuItem});
this.debuggingToolStripMenuItem.Name = "debuggingToolStripMenuItem"; this.debuggingToolStripMenuItem.Name = "debuggingToolStripMenuItem";
this.debuggingToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.debuggingToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
this.debuggingToolStripMenuItem.Text = "Debugging"; this.debuggingToolStripMenuItem.Text = "Debugging";
// //
// donothingToolStripMenuItem // donothingToolStripMenuItem
@ -971,14 +994,14 @@ partial class ClientinfoEditor
// argsToolStripMenuItem // argsToolStripMenuItem
// //
this.argsToolStripMenuItem.Name = "argsToolStripMenuItem"; this.argsToolStripMenuItem.Name = "argsToolStripMenuItem";
this.argsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.argsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
this.argsToolStripMenuItem.Text = "%args%"; this.argsToolStripMenuItem.Text = "%args%";
this.argsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); this.argsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// documentationToolStripMenuItem1 // documentationToolStripMenuItem1
// //
this.documentationToolStripMenuItem1.Name = "documentationToolStripMenuItem1"; this.documentationToolStripMenuItem1.Name = "documentationToolStripMenuItem1";
this.documentationToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.documentationToolStripMenuItem1.Size = new System.Drawing.Size(157, 22);
this.documentationToolStripMenuItem1.Text = "Documentation"; this.documentationToolStripMenuItem1.Text = "Documentation";
this.documentationToolStripMenuItem1.Click += new System.EventHandler(this.documentationToolStripMenuItem_Click); this.documentationToolStripMenuItem1.Click += new System.EventHandler(this.documentationToolStripMenuItem_Click);
// //
@ -1081,23 +1104,9 @@ partial class ClientinfoEditor
this.label10.AutoSize = true; this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(8, 128); this.label10.Location = new System.Drawing.Point(8, 128);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(138, 13); this.label10.Size = new System.Drawing.Size(278, 13);
this.label10.TabIndex = 33; this.label10.TabIndex = 33;
this.label10.Text = "When applying the settings:"; this.label10.Text = "When applying the settings (if there is a settings XML file):";
//
// md5sToolStripMenuItem
//
this.md5sToolStripMenuItem.Name = "md5sToolStripMenuItem";
this.md5sToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.md5sToolStripMenuItem.Text = "%md5s%";
this.md5sToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
//
// md5sdToolStripMenuItem
//
this.md5sdToolStripMenuItem.Name = "md5sdToolStripMenuItem";
this.md5sdToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.md5sdToolStripMenuItem.Text = "%md5sd%";
this.md5sdToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click);
// //
// ClientinfoEditor // ClientinfoEditor
// //
@ -1249,4 +1258,5 @@ partial class ClientinfoEditor
private System.Windows.Forms.ToolStripMenuItem loadoutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadoutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem md5sToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem md5sToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem md5sdToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem md5sdToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem doublequoteToolStripMenuItem;
} }