diff --git a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.Designer.cs b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.Designer.cs index 6a3354d..0b35067 100644 --- a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.Designer.cs +++ b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.Designer.cs @@ -76,6 +76,7 @@ this.Controls.Add(this.Divider1); this.Controls.Add(this.ResultLabel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimumSize = new System.Drawing.Size(816, 200); this.Name = "ClientScriptTestForm"; this.Text = "ClientScript Tester"; this.Load += new System.EventHandler(this.ClientScriptTestForm_Load); diff --git a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs index 77508ba..6c74e57 100644 --- a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs +++ b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs @@ -20,8 +20,11 @@ namespace Novetus.ClientScriptTester { foreach (string str in LocalVars.SharedArgs) { - OutputBox.AppendText(str + Environment.NewLine + Environment.NewLine); + OutputBox.AppendText(str + NETExt.DoubleSpacedNewLine); } + + OutputBox.SelectionStart = 0; + OutputBox.ScrollToCaret(); } #endregion } diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj index d5c150e..817c8dc 100644 --- a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj +++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj @@ -35,8 +35,33 @@ NovetusIcon.ico + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + + + ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll + + + ..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll + + + ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll + + + + ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll + + + ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll + @@ -68,6 +93,8 @@ True Resources.resx + + SettingsSingleFileGenerator Settings.Designer.cs @@ -81,6 +108,7 @@ + SET path=$(SolutionDir)build @@ -93,4 +121,9 @@ del "%25path%25"\*.xml if not exist "%25path%25"\clients\ClientScriptTester mkdir "%25path%25"\clients\ClientScriptTester move "%25path%25"\* "%25path%25"\clients\ClientScriptTester + + + + + \ No newline at end of file diff --git a/Novetus/Novetus.ClientScriptTester/app.config b/Novetus/Novetus.ClientScriptTester/app.config new file mode 100644 index 0000000..3c73782 --- /dev/null +++ b/Novetus/Novetus.ClientScriptTester/app.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Novetus/Novetus.ClientScriptTester/packages.config b/Novetus/Novetus.ClientScriptTester/packages.config new file mode 100644 index 0000000..d635654 --- /dev/null +++ b/Novetus/Novetus.ClientScriptTester/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Novetus/Novetus.sln b/Novetus/Novetus.sln index dae2569..bbf952d 100644 --- a/Novetus/Novetus.sln +++ b/Novetus/Novetus.sln @@ -16,6 +16,7 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution NovetusCore\NovetusCore.projitems*{2070eaa6-7606-4006-a628-5705c24a3644}*SharedItemsImports = 4 + NovetusCore\NovetusCore.projitems*{83b08607-65b8-4f9c-8d0f-ab1c8eeffae0}*SharedItemsImports = 4 NovetusCore\NovetusCore.projitems*{bac99c87-f6c1-4ed0-aa2e-05c6ae8979ea}*SharedItemsImports = 4 NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13 NovetusCore\NovetusCore.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4 diff --git a/Novetus/NovetusCMD/Novetus.CMD.csproj b/Novetus/NovetusCMD/Novetus.CMD.csproj index 811ef67..c49d356 100644 --- a/Novetus/NovetusCMD/Novetus.CMD.csproj +++ b/Novetus/NovetusCMD/Novetus.CMD.csproj @@ -70,10 +70,6 @@ TRACE;CMD;NOVETUS_APPS - - ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll - True - 4.0 diff --git a/Novetus/NovetusCMD/packages.config b/Novetus/NovetusCMD/packages.config index b7926cb..d635654 100644 --- a/Novetus/NovetusCMD/packages.config +++ b/Novetus/NovetusCMD/packages.config @@ -1,6 +1,5 @@  - diff --git a/Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.Designer.cs b/Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.Designer.cs index 07a1018..018d905 100644 --- a/Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.Designer.cs +++ b/Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.Designer.cs @@ -68,10 +68,11 @@ partial class ClientinfoEditor this.generalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mapfileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mapfiledToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mapfilecToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.luafileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.portToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.portToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.addonscriptpathToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.serverToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.limitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.securityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -126,12 +127,12 @@ partial class ClientinfoEditor this.hat4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hat4dToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hat4wsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.iconeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.iconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.charappToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.nameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.idToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tripcodeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.iconeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.iconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debuggingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.donothingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.argsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -144,7 +145,9 @@ partial class ClientinfoEditor this.label8 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.checkBox5 = new System.Windows.Forms.CheckBox(); - this.mapfilecToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.scripttypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.sharedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.versionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -306,28 +309,28 @@ partial class ClientinfoEditor // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.newToolStripMenuItem.Text = "New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.NewToolStripMenuItemClick); // // loadToolStripMenuItem // this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.loadToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadToolStripMenuItem.Text = "Load"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItemClick); // // saveToolStripMenuItem // this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItemClick); // // saveAsTextFileToolStripMenuItem // this.saveAsTextFileToolStripMenuItem.Name = "saveAsTextFileToolStripMenuItem"; - this.saveAsTextFileToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.saveAsTextFileToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.saveAsTextFileToolStripMenuItem.Text = "Save as Text File"; this.saveAsTextFileToolStripMenuItem.Click += new System.EventHandler(this.saveAsTextFileToolStripMenuItem_Click); // @@ -348,7 +351,8 @@ partial class ClientinfoEditor this.serverToolStripMenuItem, this.soloToolStripMenuItem, this.studioToolStripMenuItem, - this.no3dToolStripMenuItem}); + this.no3dToolStripMenuItem, + this.sharedToolStripMenuItem}); this.tagsToolStripMenuItem.Name = "tagsToolStripMenuItem"; this.tagsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.tagsToolStripMenuItem.Text = "Add Tags"; @@ -410,7 +414,9 @@ partial class ClientinfoEditor this.luafileToolStripMenuItem, this.ipToolStripMenuItem, this.portToolStripMenuItem, - this.portToolStripMenuItem1}); + this.addonscriptpathToolStripMenuItem, + this.scripttypeToolStripMenuItem, + this.versionToolStripMenuItem}); this.generalToolStripMenuItem.Name = "generalToolStripMenuItem"; this.generalToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.generalToolStripMenuItem.Text = "General"; @@ -429,6 +435,13 @@ partial class ClientinfoEditor this.mapfiledToolStripMenuItem.Text = "%mapfiled%"; this.mapfiledToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // + // mapfilecToolStripMenuItem + // + this.mapfilecToolStripMenuItem.Name = "mapfilecToolStripMenuItem"; + this.mapfilecToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.mapfilecToolStripMenuItem.Text = "%mapfilec%"; + this.mapfilecToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // // luafileToolStripMenuItem // this.luafileToolStripMenuItem.Name = "luafileToolStripMenuItem"; @@ -450,12 +463,12 @@ partial class ClientinfoEditor this.portToolStripMenuItem.Text = "%port%"; this.portToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // - // portToolStripMenuItem1 + // addonscriptpathToolStripMenuItem // - this.portToolStripMenuItem1.Name = "portToolStripMenuItem1"; - this.portToolStripMenuItem1.Size = new System.Drawing.Size(181, 22); - this.portToolStripMenuItem1.Text = "%addonscriptpath%"; - this.portToolStripMenuItem1.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + this.addonscriptpathToolStripMenuItem.Name = "addonscriptpathToolStripMenuItem"; + this.addonscriptpathToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.addonscriptpathToolStripMenuItem.Text = "%addonscriptpath%"; + this.addonscriptpathToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // serverToolStripMenuItem1 // @@ -525,9 +538,7 @@ partial class ClientinfoEditor this.customizationToolStripMenuItem, this.nameToolStripMenuItem, this.idToolStripMenuItem, - this.tripcodeToolStripMenuItem, - this.iconeToolStripMenuItem, - this.iconToolStripMenuItem}); + this.tripcodeToolStripMenuItem}); this.playerToolStripMenuItem.Name = "playerToolStripMenuItem"; this.playerToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.playerToolStripMenuItem.Text = "Player"; @@ -545,7 +556,7 @@ partial class ClientinfoEditor this.extraToolStripMenuItem, this.charappToolStripMenuItem}); this.customizationToolStripMenuItem.Name = "customizationToolStripMenuItem"; - this.customizationToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.customizationToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.customizationToolStripMenuItem.Text = "Customization"; // // bodyColorsToolStripMenuItem @@ -558,7 +569,7 @@ partial class ClientinfoEditor this.rarmcolorToolStripMenuItem, this.rlegcolorToolStripMenuItem}); this.bodyColorsToolStripMenuItem.Name = "bodyColorsToolStripMenuItem"; - this.bodyColorsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.bodyColorsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.bodyColorsToolStripMenuItem.Text = "Body Colors"; // // headcolorToolStripMenuItem @@ -616,7 +627,7 @@ partial class ClientinfoEditor this.hat2wsToolStripMenuItem, this.hat3wsToolStripMenuItem}); this.hatsToolStripMenuItem.Name = "hatsToolStripMenuItem"; - this.hatsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.hatsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hatsToolStripMenuItem.Text = "Hats"; // // hat1ToolStripMenuItem @@ -689,7 +700,7 @@ partial class ClientinfoEditor this.facedToolStripMenuItem, this.facewsToolStripMenuItem}); this.facesToolStripMenuItem.Name = "facesToolStripMenuItem"; - this.facesToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.facesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.facesToolStripMenuItem.Text = "Faces"; // // faceToolStripMenuItem @@ -720,7 +731,7 @@ partial class ClientinfoEditor this.headdToolStripMenuItem, this.headwsToolStripMenuItem}); this.headsToolStripMenuItem.Name = "headsToolStripMenuItem"; - this.headsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.headsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.headsToolStripMenuItem.Text = "Heads"; // // headToolStripMenuItem @@ -751,7 +762,7 @@ partial class ClientinfoEditor this.tshirtdToolStripMenuItem, this.tshirtwsToolStripMenuItem}); this.tShirtsToolStripMenuItem.Name = "tShirtsToolStripMenuItem"; - this.tShirtsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.tShirtsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.tShirtsToolStripMenuItem.Text = "T-Shirts"; // // tshirtToolStripMenuItem @@ -782,7 +793,7 @@ partial class ClientinfoEditor this.shirtdToolStripMenuItem, this.shirtwsToolStripMenuItem}); this.shirtsToolStripMenuItem.Name = "shirtsToolStripMenuItem"; - this.shirtsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.shirtsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.shirtsToolStripMenuItem.Text = "Shirts"; // // shirtToolStripMenuItem @@ -813,7 +824,7 @@ partial class ClientinfoEditor this.pantsdToolStripMenuItem, this.pantswsToolStripMenuItem}); this.pantsToolStripMenuItem.Name = "pantsToolStripMenuItem"; - this.pantsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.pantsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.pantsToolStripMenuItem.Text = "Pants"; // // pantsToolStripMenuItem1 @@ -845,95 +856,97 @@ partial class ClientinfoEditor this.extrawsToolStripMenuItem, this.hat4ToolStripMenuItem, this.hat4dToolStripMenuItem, - this.hat4wsToolStripMenuItem}); + this.hat4wsToolStripMenuItem, + this.iconeToolStripMenuItem, + this.iconToolStripMenuItem}); this.extraToolStripMenuItem.Name = "extraToolStripMenuItem"; - this.extraToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.extraToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.extraToolStripMenuItem.Text = "Extra"; // // extraToolStripMenuItem1 // this.extraToolStripMenuItem1.Name = "extraToolStripMenuItem1"; - this.extraToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); + this.extraToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.extraToolStripMenuItem1.Text = "%extra%"; this.extraToolStripMenuItem1.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // extradToolStripMenuItem // this.extradToolStripMenuItem.Name = "extradToolStripMenuItem"; - this.extradToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.extradToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.extradToolStripMenuItem.Text = "%extrad%"; this.extradToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // extrawsToolStripMenuItem // this.extrawsToolStripMenuItem.Name = "extrawsToolStripMenuItem"; - this.extrawsToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.extrawsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.extrawsToolStripMenuItem.Text = "%extraws%"; this.extrawsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat4ToolStripMenuItem // this.hat4ToolStripMenuItem.Name = "hat4ToolStripMenuItem"; - this.hat4ToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.hat4ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat4ToolStripMenuItem.Text = "%hat4%"; this.hat4ToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat4dToolStripMenuItem // this.hat4dToolStripMenuItem.Name = "hat4dToolStripMenuItem"; - this.hat4dToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.hat4dToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat4dToolStripMenuItem.Text = "%hat4d%"; this.hat4dToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // hat4wsToolStripMenuItem // this.hat4wsToolStripMenuItem.Name = "hat4wsToolStripMenuItem"; - this.hat4wsToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.hat4wsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.hat4wsToolStripMenuItem.Text = "%hat4ws%"; this.hat4wsToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // - // charappToolStripMenuItem - // - this.charappToolStripMenuItem.Name = "charappToolStripMenuItem"; - this.charappToolStripMenuItem.Size = new System.Drawing.Size(138, 22); - this.charappToolStripMenuItem.Text = "%charapp%"; - this.charappToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); - // - // nameToolStripMenuItem - // - this.nameToolStripMenuItem.Name = "nameToolStripMenuItem"; - this.nameToolStripMenuItem.Size = new System.Drawing.Size(151, 22); - this.nameToolStripMenuItem.Text = "%name%"; - this.nameToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); - // - // idToolStripMenuItem - // - this.idToolStripMenuItem.Name = "idToolStripMenuItem"; - this.idToolStripMenuItem.Size = new System.Drawing.Size(151, 22); - this.idToolStripMenuItem.Text = "%id%"; - this.idToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); - // - // tripcodeToolStripMenuItem - // - this.tripcodeToolStripMenuItem.Name = "tripcodeToolStripMenuItem"; - this.tripcodeToolStripMenuItem.Size = new System.Drawing.Size(151, 22); - this.tripcodeToolStripMenuItem.Text = "%tripcode%"; - this.tripcodeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); - // // iconeToolStripMenuItem // this.iconeToolStripMenuItem.Name = "iconeToolStripMenuItem"; - this.iconeToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.iconeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.iconeToolStripMenuItem.Text = "%icone%"; this.iconeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // iconToolStripMenuItem // this.iconToolStripMenuItem.Name = "iconToolStripMenuItem"; - this.iconToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.iconToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.iconToolStripMenuItem.Text = "%icon%"; this.iconToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // + // charappToolStripMenuItem + // + this.charappToolStripMenuItem.Name = "charappToolStripMenuItem"; + this.charappToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.charappToolStripMenuItem.Text = "%charapp%"; + this.charappToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // + // nameToolStripMenuItem + // + this.nameToolStripMenuItem.Name = "nameToolStripMenuItem"; + this.nameToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.nameToolStripMenuItem.Text = "%name%"; + this.nameToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // + // idToolStripMenuItem + // + this.idToolStripMenuItem.Name = "idToolStripMenuItem"; + this.idToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.idToolStripMenuItem.Text = "%id%"; + this.idToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // + // tripcodeToolStripMenuItem + // + this.tripcodeToolStripMenuItem.Name = "tripcodeToolStripMenuItem"; + this.tripcodeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.tripcodeToolStripMenuItem.Text = "%tripcode%"; + this.tripcodeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // // debuggingToolStripMenuItem // this.debuggingToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1037,12 +1050,26 @@ partial class ClientinfoEditor this.checkBox5.UseVisualStyleBackColor = true; this.checkBox5.CheckedChanged += new System.EventHandler(this.checkBox5_CheckedChanged); // - // mapfilecToolStripMenuItem + // scripttypeToolStripMenuItem // - this.mapfilecToolStripMenuItem.Name = "mapfilecToolStripMenuItem"; - this.mapfilecToolStripMenuItem.Size = new System.Drawing.Size(181, 22); - this.mapfilecToolStripMenuItem.Text = "%mapfilec%"; - this.mapfilecToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + this.scripttypeToolStripMenuItem.Name = "scripttypeToolStripMenuItem"; + this.scripttypeToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.scripttypeToolStripMenuItem.Text = "%scripttype%"; + this.scripttypeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // + // sharedToolStripMenuItem + // + this.sharedToolStripMenuItem.Name = "sharedToolStripMenuItem"; + this.sharedToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.sharedToolStripMenuItem.Text = ""; + this.sharedToolStripMenuItem.Click += new System.EventHandler(this.sharedToolStripMenuItem_Click); + // + // versionToolStripMenuItem + // + this.versionToolStripMenuItem.Name = "versionToolStripMenuItem"; + this.versionToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.versionToolStripMenuItem.Text = "%version%"; + this.versionToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // ClientinfoEditor // @@ -1124,7 +1151,7 @@ partial class ClientinfoEditor private System.Windows.Forms.ToolStripMenuItem luafileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ipToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem portToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem portToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem addonscriptpathToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem serverToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem limitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem securityToolStripMenuItem; @@ -1194,4 +1221,7 @@ partial class ClientinfoEditor private System.Windows.Forms.CheckBox checkBox5; private System.Windows.Forms.ToolStripMenuItem hat4ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mapfilecToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem scripttypeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem sharedToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem versionToolStripMenuItem; } diff --git a/Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.cs b/Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.cs index 8beadc6..381d34a 100644 --- a/Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.cs +++ b/Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.cs @@ -408,7 +408,12 @@ using System.Globalization; AddClientinfoText(""); } - private void variableToolStripMenuItem_Click(object sender, EventArgs e) + private void sharedToolStripMenuItem_Click(object sender, EventArgs e) + { + AddClientinfoText(""); + } + + private void variableToolStripMenuItem_Click(object sender, EventArgs e) { ToolStripMenuItem senderitem = (ToolStripMenuItem)sender; AddClientinfoText(senderitem.Text); diff --git a/Novetus/NovetusCore/SDK/Forms/NovetusSDK.Designer.cs b/Novetus/NovetusCore/SDK/Forms/NovetusSDK.Designer.cs index 9ad51d4..81c31d2 100644 --- a/Novetus/NovetusCore/SDK/Forms/NovetusSDK.Designer.cs +++ b/Novetus/NovetusCore/SDK/Forms/NovetusSDK.Designer.cs @@ -26,36 +26,36 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NovetusSDK)); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.label1 = new System.Windows.Forms.Label(); - this.listBox1 = new System.Windows.Forms.ListBox(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.SuspendLayout(); - // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox2.Location = new System.Drawing.Point(12, 12); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(260, 52); - this.pictureBox2.TabIndex = 8; - this.pictureBox2.TabStop = false; - // - // label1 - // - this.label1.Location = new System.Drawing.Point(12, 168); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(260, 16); - this.label1.TabIndex = 12; - this.label1.Text = "v1.0"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // listBox1 - // - this.listBox1.FormattingEnabled = true; - this.listBox1.Items.AddRange(new object[] { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NovetusSDK)); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.label1 = new System.Windows.Forms.Label(); + this.listBox1 = new System.Windows.Forms.ListBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox2.Location = new System.Drawing.Point(12, 12); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(260, 52); + this.pictureBox2.TabIndex = 8; + this.pictureBox2.TabStop = false; + // + // label1 + // + this.label1.Location = new System.Drawing.Point(12, 168); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(260, 16); + this.label1.TabIndex = 12; + this.label1.Text = "v1.0"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.Items.AddRange(new object[] { "Item SDK", "Client SDK", "ClientScript Documentation", @@ -64,31 +64,32 @@ "RBXMeshConverter GUI", "ROBLOX Script Generator", "ROBLOX Legacy Place Converter", - "Diogenes Editor"}); - this.listBox1.Location = new System.Drawing.Point(12, 70); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(260, 95); - this.listBox1.TabIndex = 14; - this.listBox1.DoubleClick += new System.EventHandler(this.listBox1_SelectedIndexChanged); - // - // NovetusSDK - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.ClientSize = new System.Drawing.Size(284, 193); - this.Controls.Add(this.listBox1); - this.Controls.Add(this.label1); - this.Controls.Add(this.pictureBox2); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.Name = "NovetusSDK"; - this.Text = "Novetus SDK"; - this.Load += new System.EventHandler(this.NovetusSDK_Load); - this.Closing += new System.ComponentModel.CancelEventHandler(this.NovetusSDK_Close); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.ResumeLayout(false); + "Diogenes Editor", + "ClientScript Tester"}); + this.listBox1.Location = new System.Drawing.Point(12, 70); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(260, 95); + this.listBox1.TabIndex = 14; + this.listBox1.DoubleClick += new System.EventHandler(this.listBox1_SelectedIndexChanged); + // + // NovetusSDK + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.ClientSize = new System.Drawing.Size(284, 193); + this.Controls.Add(this.listBox1); + this.Controls.Add(this.label1); + this.Controls.Add(this.pictureBox2); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.Name = "NovetusSDK"; + this.Text = "Novetus SDK"; + this.Closing += new System.ComponentModel.CancelEventHandler(this.NovetusSDK_Close); + this.Load += new System.EventHandler(this.NovetusSDK_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.ResumeLayout(false); } diff --git a/Novetus/NovetusCore/SDK/Forms/NovetusSDK.cs b/Novetus/NovetusCore/SDK/Forms/NovetusSDK.cs index 9ffb725..bdc1ee2 100644 --- a/Novetus/NovetusCore/SDK/Forms/NovetusSDK.cs +++ b/Novetus/NovetusCore/SDK/Forms/NovetusSDK.cs @@ -78,6 +78,14 @@ public partial class NovetusSDK : Form DiogenesEditor dio = new DiogenesEditor(); dio.Show(); break; + case SDKApps.ClientScriptTester: + MessageBox.Show("Note: If you want to test a specific way of loading a client, select the ClientScript Tester in the 'Versions' tab of the Novetus Launcher, then launch it through any way you wish."); +#if LAUNCHER + GlobalFuncs.LaunchRBXClient("ClientScriptTester", ScriptType.Client, false, false, null, null); +#else + GlobalFuncs.LaunchRBXClient("ClientScriptTester", ScriptType.Client, false, false, null); +#endif + break; default: ItemMaker im = new ItemMaker(); im.Show(); diff --git a/Novetus/NovetusCore/SDK/SDKFuncs.cs b/Novetus/NovetusCore/SDK/SDKFuncs.cs index 71abd32..fe67da2 100644 --- a/Novetus/NovetusCore/SDK/SDKFuncs.cs +++ b/Novetus/NovetusCore/SDK/SDKFuncs.cs @@ -19,7 +19,8 @@ enum SDKApps Obj2MeshV1GUI = 5, ScriptGenerator = 6, LegacyPlaceConverter = 7, - DiogenesEditor = 8 + DiogenesEditor = 8, + ClientScriptTester = 9 } #endregion @@ -601,6 +602,8 @@ class SDKFuncs return SDKApps.LegacyPlaceConverter; case 8: return SDKApps.DiogenesEditor; + case 9: + return SDKApps.ClientScriptTester; default: return SDKApps.ItemSDK; } diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs index cea8590..f265cc9 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs @@ -426,7 +426,21 @@ public class GlobalFuncs public static void ReadClientValues() #endif { - string clientpath = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\clientinfo.nov"; +#if LAUNCHER + ReadClientValues(GlobalVars.UserConfiguration.SelectedClient, box); +#else + ReadClientValues(GlobalVars.UserConfiguration.SelectedClient); +#endif + } + +#if LAUNCHER + public static void ReadClientValues(string ClientName, RichTextBox box) +#else + public static void ReadClientValues(string ClientName) +#endif + { + string name = ClientName; + string clientpath = GlobalPaths.ClientDir + @"\\" + name + @"\\clientinfo.nov"; if (!File.Exists(clientpath)) { @@ -436,20 +450,20 @@ public class GlobalFuncs GlobalFuncs.ConsolePrint("ERROR - No clientinfo.nov detected with the client you chose. The client either cannot be loaded, or it is not available.", 2); #elif URI #endif - GlobalVars.UserConfiguration.SelectedClient = GlobalVars.ProgramInformation.DefaultClient; + name = GlobalVars.ProgramInformation.DefaultClient; #if LAUNCHER - ReadClientValues(box); + ReadClientValues(name, box); #else - ReadClientValues(); + ReadClientValues(name); #endif } else { LoadClientValues(clientpath); #if LAUNCHER - ConsolePrint("Client '" + GlobalVars.UserConfiguration.SelectedClient + "' successfully loaded.", 3, box); + ConsolePrint("Client '" + name + "' successfully loaded.", 3, box); #elif CMD - GlobalFuncs.ConsolePrint("Client '" + GlobalVars.UserConfiguration.SelectedClient + "' successfully loaded.", 3); + GlobalFuncs.ConsolePrint("Client '" + name + "' successfully loaded.", 3); #elif URI #endif } @@ -963,15 +977,32 @@ public class GlobalFuncs public static void LaunchRBXClient(ScriptType type, bool no3d, bool nomap, EventHandler e, Label label) #elif LAUNCHER public static void LaunchRBXClient(ScriptType type, bool no3d, bool nomap, EventHandler e, RichTextBox box) -#elif CMD +#else public static void LaunchRBXClient(ScriptType type, bool no3d, bool nomap, EventHandler e) #endif { +#if URI + LaunchRBXClient(GlobalVars.UserConfiguration.SelectedClient, type, no3d, nomap, e, label); +#elif LAUNCHER + LaunchRBXClient(GlobalVars.UserConfiguration.SelectedClient, type, no3d, nomap, e, box); +#else + LaunchRBXClient(GlobalVars.UserConfiguration.SelectedClient, type, no3d, nomap, e); +#endif + } + +#if URI + public static void LaunchRBXClient(string ClientName, ScriptType type, bool no3d, bool nomap, EventHandler e, Label label) +#elif LAUNCHER + public static void LaunchRBXClient(string ClientName, ScriptType type, bool no3d, bool nomap, EventHandler e, RichTextBox box) +#else + public static void LaunchRBXClient(string ClientName, ScriptType type, bool no3d, bool nomap, EventHandler e) +#endif + { #if LAUNCHER - ReadClientValues(box); + ReadClientValues(ClientName, box); #else - ReadClientValues(); + ReadClientValues(ClientName); #endif string luafile = GetLuaFileName(); @@ -1037,79 +1068,87 @@ public class GlobalFuncs { if (SecurityFuncs.checkClientMD5(GlobalVars.UserConfiguration.SelectedClient) && SecurityFuncs.checkScriptMD5(GlobalVars.UserConfiguration.SelectedClient)) { -#if LAUNCHER - OpenClient(type, rbxexe, args, mapname, e, box); -#else OpenClient(type, rbxexe, args, mapname, e); -#endif } else { #if URI - label.Text = "The client has been detected as modified."; + if (label != null) + { + label.Text = "The client has been detected as modified."; + } #elif LAUNCHER - ConsolePrint("ERROR - Failed to launch Novetus. (The client has been detected as modified.)", 2, box); - MessageBox.Show("Failed to launch Novetus. (Error: The client has been detected as modified.)", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + if (box != null) + { + ConsolePrint("ERROR - Failed to launch Novetus. (The client has been detected as modified.)", 2, box); + } #elif CMD ConsolePrint("ERROR - Failed to launch Novetus. (The client has been detected as modified.)", 2); #endif + +#if URI || LAUNCHER + MessageBox.Show("Failed to launch Novetus. (Error: The client has been detected as modified.)", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); +#endif } } else { -#if LAUNCHER - OpenClient(type, rbxexe, args, mapname, e, box); -#else OpenClient(type, rbxexe, args, mapname, e); -#endif } } else { -#if LAUNCHER - OpenClient(type, rbxexe, args, mapname, e, box); -#else OpenClient(type, rbxexe, args, mapname, e); -#endif } } else { -#if LAUNCHER - OpenClient(type, rbxexe, args, mapname, e, box); -#else OpenClient(type, rbxexe, args, mapname, e); -#endif } } +#if URI || LAUNCHER || CMD catch (Exception ex) +#else + catch (Exception) +#endif { #if URI - label.Text = "Error: " + ex.Message; + if (label != null) + { + label.Text = "Error: " + ex.Message; + } #elif LAUNCHER - ConsolePrint("ERROR - Failed to launch Novetus. (Error: " + ex.Message + ")", 2, box); - MessageBox.Show("Failed to launch Novetus. (Error: " + ex.Message + ")", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + if (box != null) + { + ConsolePrint("ERROR - Failed to launch Novetus. (Error: " + ex.Message + ")", 2, box); + } #elif CMD ConsolePrint("ERROR - Failed to launch Novetus. (Error: " + ex.Message + ")", 2); #endif + +#if URI || LAUNCHER + MessageBox.Show("Failed to launch Novetus. (Error: " + ex.Message + ")", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); +#endif } } -#if LAUNCHER - private static void OpenClient(ScriptType type, string rbxexe, string args, string mapname, EventHandler e, RichTextBox box) -#else private static void OpenClient(ScriptType type, string rbxexe, string args, string mapname, EventHandler e) -#endif { Process client = new Process(); client.StartInfo.FileName = rbxexe; client.StartInfo.Arguments = args; - client.EnableRaisingEvents = true; - client.Exited += e; + if (e != null) + { + client.EnableRaisingEvents = true; + client.Exited += e; + } client.Start(); client.PriorityClass = ProcessPriorityClass.RealTime; SecurityFuncs.RenameWindow(client, type, mapname); - UpdateRichPresence(GetStateForType(type), mapname); + if (e != null) + { + UpdateRichPresence(GetStateForType(type), mapname); + } #if CMD GlobalVars.ProcessID = client.Id; CreateTXT(); @@ -1119,6 +1158,9 @@ public class GlobalFuncs #if LAUNCHER public static void ConsolePrint(string text, int type, RichTextBox box) { + if (box == null) + return; + box.AppendText("[" + DateTime.Now.ToShortTimeString() + "] - ", Color.White); switch (type) diff --git a/Novetus/NovetusCore/StorageAndFunctions/NETExt.cs b/Novetus/NovetusCore/StorageAndFunctions/NETExt.cs index dc81a8d..a6a0e59 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/NETExt.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/NETExt.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using System.Diagnostics; using System.Security.Cryptography; using System.Text; +using System.Diagnostics.Contracts; #endregion #region .NET Extentions @@ -161,5 +162,17 @@ public static class NETExt return Encoding.Unicode.GetString(outputBuffer); } #endregion + + #region Environment Extentions + //a re-implementation of "Environment.NewLine" but with double spaces. + public static String DoubleSpacedNewLine + { + get + { + Contract.Ensures(Contract.Result() != null); + return "\r\n\r\n"; + } + } + #endregion } #endregion \ No newline at end of file diff --git a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs index 23f708f..3670486 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Net.PeerToPeer.Collaboration; using System.Reflection; using System.Text.RegularExpressions; #endregion @@ -89,7 +90,7 @@ public class ScriptFuncs case ScriptType.EasterEgg: return "A message from Bitl"; default: - return ""; + return "N/A"; } } public static void GenerateScriptForClient(ScriptType type) @@ -200,11 +201,6 @@ public class ScriptFuncs } } - public static string GetRawArgsFromTag(string tag, string md5s, string luafile) - { - return GetRawArgsForType(GetTypeFromTag(tag), md5s, luafile); - } - public static int ConvertIconStringToInt() { switch (GlobalVars.UserCustomization.Icon) @@ -247,14 +243,37 @@ public class ScriptFuncs return GetFolderAndMapName(source, " -"); } - 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, bool usesharedtags = true) { - if (GlobalVars.SelectedClientInfo.Fix2007) + string start = tag; + string end = endtag; + + ScriptType type = GetTypeFromTag(start); + + //we must have the ending tag before we continue. + if (string.IsNullOrWhiteSpace(end)) { - Generator.GenerateScriptForClient(GetTypeFromTag(tag)); + return ""; } - string extractedCode = GetArgsFromTag(code, tag, endtag); + if (usesharedtags) + { + string sharedstart = ""; + string sharedend = ""; + + if (code.Contains(sharedstart) && code.Contains(sharedend)) + { + start = sharedstart; + end = sharedend; + } + } + + if (GlobalVars.SelectedClientInfo.Fix2007) + { + Generator.GenerateScriptForClient(type); + } + + string extractedCode = GetArgsFromTag(code, start, end); if (extractedCode.Contains("%donothing%")) { @@ -269,7 +288,8 @@ public class ScriptFuncs string md5script = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\content\\scripts\\" + GlobalPaths.ScriptName + ".lua") : ""; string md5exe = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(rbxexe) : ""; string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'"; - string compiled = extractedCode.Replace("%mapfile%", mapfile) + string compiled = extractedCode.Replace("%version%", GlobalVars.ProgramInformation.Version) + .Replace("%mapfile%", mapfile) .Replace("%luafile%", luafile) .Replace("%charapp%", GlobalVars.UserCustomization.CharacterID) .Replace("%ip%", GlobalVars.IP) @@ -301,8 +321,8 @@ public class ScriptFuncs .Replace("%rarmcolor%", GlobalVars.UserCustomization.RightArmColorID.ToString()) .Replace("%rlegcolor%", GlobalVars.UserCustomization.RightLegColorID.ToString()) .Replace("%md5launcher%", md5dir) - .Replace("%md5script%", GlobalVars.SelectedClientInfo.ClientMD5) - .Replace("%md5exe%", GlobalVars.SelectedClientInfo.ScriptMD5) + .Replace("%md5script%", GlobalVars.SelectedClientInfo.ScriptMD5) + .Replace("%md5exe%", GlobalVars.SelectedClientInfo.ClientMD5) .Replace("%md5scriptd%", md5script) .Replace("%md5exed%", md5exe) .Replace("%limit%", GlobalVars.UserConfiguration.PlayerLimit.ToString()) @@ -310,7 +330,7 @@ public class ScriptFuncs .Replace("%hat4%", GlobalVars.UserCustomization.Extra) .Replace("%extrad%", GlobalPaths.extraGameDir + GlobalVars.UserCustomization.Extra) .Replace("%hat4d%", GlobalPaths.hatGameDir + GlobalVars.UserCustomization.Extra) - .Replace("%args%", GetRawArgsFromTag(tag, md5s, luafile)) + .Replace("%args%", GetRawArgsForType(type, md5s, luafile)) .Replace("%facews%", GlobalPaths.WebServer_FaceDir + GlobalVars.UserCustomization.Face) .Replace("%headws%", GlobalPaths.WebServer_HeadDir + GlobalVars.UserCustomization.Head) .Replace("%tshirtws%", GlobalVars.UserCustomization.TShirt.Contains("http://") ? GlobalVars.UserCustomization.TShirt : GlobalPaths.WebServer_TShirtDir + GlobalVars.UserCustomization.TShirt) @@ -324,6 +344,7 @@ public class ScriptFuncs .Replace("%mapfiled%", GlobalPaths.BaseGameDir + GlobalVars.UserConfiguration.MapPathSnip.Replace(@"\\", @"\")) .Replace("%mapfilec%", GlobalFuncs.CopyMapToRBXAsset() ? GlobalPaths.AltBaseGameDir + "temp.rbxl" : "") .Replace("%tripcode%", GlobalVars.UserConfiguration.PlayerTripcode) + .Replace("%scripttype%", Generator.GetNameForType(type)) .Replace("%addonscriptpath%", GlobalPaths.AddonScriptPath); return compiled; } diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index 3a0ba8a..41de9bd 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -75,7 +75,6 @@ ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll - True ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll @@ -127,7 +126,7 @@ Forms\CharCustom\Compact\CharacterCustomizationCompact.cs - Form + Form Forms\CharCustom\Compact\CharacterCustomizationCompact.designer.cs @@ -135,7 +134,7 @@ Forms\CharCustom\Extended\CharacterCustomizationExtended.cs - Form + Form Forms\CharCustom\Extended\CharacterCustomizationExtended.designer.cs @@ -143,7 +142,7 @@ Forms\SDK\AssetLocalizer.cs - Form + Form Forms\SDK\AssetLocalizer.designer.cs @@ -151,7 +150,7 @@ Forms\SDK\ClientinfoCreator.cs - Form + Form Forms\SDK\ClientinfoCreator.designer.cs @@ -159,7 +158,7 @@ Forms\SDK\ClientScriptDocumentation.cs - Form + Form Forms\SDK\ClientScriptDocumentation.designer.cs @@ -167,7 +166,7 @@ Forms\SDK\DiogenesEditor.cs - Form + Form Forms\SDK\DiogenesEditor.designer.cs @@ -175,7 +174,7 @@ Forms\SDK\ItemMaker.cs - Form + Form Forms\SDK\ItemMaker.designer.cs @@ -183,7 +182,7 @@ Forms\SDK\NovetusSDK.cs - Form + Form Forms\SDK\NovetusSDK.designer.cs @@ -191,7 +190,7 @@ Forms\SDK\Obj2MeshV1GUI.cs - Form + Form Forms\SDK\Obj2MeshV1GUI.designer.cs @@ -199,7 +198,7 @@ Forms\SDK\SplashTester.cs - Form + Form Forms\SDK\SplashTester.designer.cs diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj index b2a6c65..6affbfb 100644 --- a/Novetus/NovetusURI/Novetus.URI.csproj +++ b/Novetus/NovetusURI/Novetus.URI.csproj @@ -40,10 +40,6 @@ NovetusIcon.ico - - ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll - True - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll True @@ -90,7 +86,7 @@ Forms\CharCustom\Compact\CharacterCustomizationCompact.cs - Form + Form Forms\CharCustom\Compact\CharacterCustomizationCompact.designer.cs @@ -98,7 +94,7 @@ Forms\CharCustom\Extended\CharacterCustomizationExtended.cs - Form + Form Forms\CharCustom\Extended\CharacterCustomizationExtended.designer.cs diff --git a/Novetus/NovetusURI/packages.config b/Novetus/NovetusURI/packages.config index b7926cb..d635654 100644 --- a/Novetus/NovetusURI/packages.config +++ b/Novetus/NovetusURI/packages.config @@ -1,6 +1,5 @@  -