diff --git a/SMBX Magic Patcher/Form1.Designer.vb b/SMBX Magic Patcher/Form1.Designer.vb index bd6386f..e1673ed 100644 --- a/SMBX Magic Patcher/Form1.Designer.vb +++ b/SMBX Magic Patcher/Form1.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class Form1 - Inherits System.Windows.Forms.Form + Inherits DevComponents.DotNetBar.OfficeForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ @@ -22,20 +22,16 @@ Partial Class Form1 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1)) - Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.TabPage1 = New System.Windows.Forms.TabPage() Me.CircularProgress_Apply = New DevComponents.DotNetBar.Controls.CircularProgress() Me.LabelX14 = New DevComponents.DotNetBar.LabelX() - Me.Button_ApplyPatch = New System.Windows.Forms.Button() Me.LabelX4 = New DevComponents.DotNetBar.LabelX() Me.LabelX6 = New DevComponents.DotNetBar.LabelX() Me.ButtonX4 = New DevComponents.DotNetBar.ButtonX() Me.TextBoxX_PatchFileApply = New DevComponents.DotNetBar.Controls.TextBoxX() Me.ButtonX6 = New DevComponents.DotNetBar.ButtonX() Me.TextBoxX_OriginalLevelApply = New DevComponents.DotNetBar.Controls.TextBoxX() - Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.CircularProgress_Create = New DevComponents.DotNetBar.Controls.CircularProgress() Me.LabelX15 = New DevComponents.DotNetBar.LabelX() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.SwitchButton_Liquids = New DevComponents.DotNetBar.Controls.SwitchButton() @@ -56,7 +52,6 @@ Partial Class Form1 Me.SwitchButton_Graphics = New DevComponents.DotNetBar.Controls.SwitchButton() Me.CheckBoxX2 = New DevComponents.DotNetBar.Controls.CheckBoxX() Me.CheckBoxX1 = New DevComponents.DotNetBar.Controls.CheckBoxX() - Me.Button_CreatePatch = New System.Windows.Forms.Button() Me.LabelX3 = New DevComponents.DotNetBar.LabelX() Me.LabelX2 = New DevComponents.DotNetBar.LabelX() Me.LabelX1 = New DevComponents.DotNetBar.LabelX() @@ -67,49 +62,30 @@ Partial Class Form1 Me.TextBoxX_PatchFileCreate = New DevComponents.DotNetBar.Controls.TextBoxX() Me.TextBoxX_OriginalLevelCreate = New DevComponents.DotNetBar.Controls.TextBoxX() Me.SuperTooltip1 = New DevComponents.DotNetBar.SuperTooltip() - Me.TabControl1.SuspendLayout() - Me.TabPage1.SuspendLayout() - Me.TabPage2.SuspendLayout() + Me.StyleManager1 = New DevComponents.DotNetBar.StyleManager(Me.components) + Me.TabControl2 = New DevComponents.DotNetBar.TabControl() + Me.TabControlPanel1 = New DevComponents.DotNetBar.TabControlPanel() + Me.Button_ApplyPatch = New DevComponents.DotNetBar.ButtonX() + Me.TabItem1 = New DevComponents.DotNetBar.TabItem(Me.components) + Me.TabControlPanel2 = New DevComponents.DotNetBar.TabControlPanel() + Me.CircularProgress_Create = New DevComponents.DotNetBar.Controls.CircularProgress() + Me.Button_CreatePatch = New DevComponents.DotNetBar.ButtonX() + Me.TabItem2 = New DevComponents.DotNetBar.TabItem(Me.components) Me.GroupBox1.SuspendLayout() + CType(Me.TabControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabControl2.SuspendLayout() + Me.TabControlPanel1.SuspendLayout() + Me.TabControlPanel2.SuspendLayout() Me.SuspendLayout() ' - 'TabControl1 - ' - Me.TabControl1.Controls.Add(Me.TabPage1) - Me.TabControl1.Controls.Add(Me.TabPage2) - Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.TabControl1.Location = New System.Drawing.Point(0, 0) - Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(352, 118) - Me.TabControl1.TabIndex = 0 - ' - 'TabPage1 - ' - Me.TabPage1.Controls.Add(Me.CircularProgress_Apply) - Me.TabPage1.Controls.Add(Me.LabelX14) - Me.TabPage1.Controls.Add(Me.Button_ApplyPatch) - Me.TabPage1.Controls.Add(Me.LabelX4) - Me.TabPage1.Controls.Add(Me.LabelX6) - Me.TabPage1.Controls.Add(Me.ButtonX4) - Me.TabPage1.Controls.Add(Me.TextBoxX_PatchFileApply) - Me.TabPage1.Controls.Add(Me.ButtonX6) - Me.TabPage1.Controls.Add(Me.TextBoxX_OriginalLevelApply) - Me.TabPage1.Location = New System.Drawing.Point(4, 22) - Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(344, 92) - Me.TabPage1.TabIndex = 0 - Me.TabPage1.Text = "Apply Patch" - Me.TabPage1.UseVisualStyleBackColor = True - ' 'CircularProgress_Apply ' + Me.CircularProgress_Apply.BackColor = System.Drawing.Color.Transparent ' ' ' Me.CircularProgress_Apply.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.CircularProgress_Apply.Location = New System.Drawing.Point(6, 63) + Me.CircularProgress_Apply.Location = New System.Drawing.Point(4, 62) Me.CircularProgress_Apply.Name = "CircularProgress_Apply" Me.CircularProgress_Apply.ProgressBarType = DevComponents.DotNetBar.eCircularProgressType.Dot Me.CircularProgress_Apply.ProgressColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(64, Byte), Integer)) @@ -119,33 +95,26 @@ Partial Class Form1 ' 'LabelX14 ' + Me.LabelX14.BackColor = System.Drawing.Color.Transparent ' ' ' Me.LabelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.LabelX14.Location = New System.Drawing.Point(35, 63) + Me.LabelX14.Location = New System.Drawing.Point(33, 62) Me.LabelX14.Name = "LabelX14" Me.LabelX14.Size = New System.Drawing.Size(196, 23) Me.LabelX14.TabIndex = 1 Me.LabelX14.Text = "Patching level. Please wait ..." Me.LabelX14.Visible = False ' - 'Button_ApplyPatch - ' - Me.Button_ApplyPatch.Location = New System.Drawing.Point(237, 63) - Me.Button_ApplyPatch.Name = "Button_ApplyPatch" - Me.Button_ApplyPatch.Size = New System.Drawing.Size(101, 23) - Me.Button_ApplyPatch.TabIndex = 40 - Me.Button_ApplyPatch.Text = "Apply Patch!" - Me.Button_ApplyPatch.UseVisualStyleBackColor = True - ' 'LabelX4 ' + Me.LabelX4.BackColor = System.Drawing.Color.Transparent ' ' ' Me.LabelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.LabelX4.Location = New System.Drawing.Point(6, 34) + Me.LabelX4.Location = New System.Drawing.Point(4, 33) Me.LabelX4.Name = "LabelX4" Me.LabelX4.Size = New System.Drawing.Size(72, 23) Me.LabelX4.TabIndex = 39 @@ -153,11 +122,12 @@ Partial Class Form1 ' 'LabelX6 ' + Me.LabelX6.BackColor = System.Drawing.Color.Transparent ' ' ' Me.LabelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.LabelX6.Location = New System.Drawing.Point(6, 5) + Me.LabelX6.Location = New System.Drawing.Point(4, 4) Me.LabelX6.Name = "LabelX6" Me.LabelX6.Size = New System.Drawing.Size(72, 23) Me.LabelX6.TabIndex = 37 @@ -167,24 +137,29 @@ Partial Class Form1 ' Me.ButtonX4.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton Me.ButtonX4.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground - Me.ButtonX4.Location = New System.Drawing.Point(305, 34) + Me.ButtonX4.FocusCuesEnabled = False + Me.ButtonX4.Location = New System.Drawing.Point(303, 33) Me.ButtonX4.Name = "ButtonX4" Me.ButtonX4.Size = New System.Drawing.Size(33, 23) - Me.ButtonX4.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.ButtonX4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX4, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select the patch here.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX4.Symbol = "58055" + Me.ButtonX4.SymbolColor = System.Drawing.Color.FromArgb(CType(CType(215, Byte), Integer), CType(CType(172, Byte), Integer), CType(CType(106, Byte), Integer)) Me.ButtonX4.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material - Me.ButtonX4.SymbolSize = 15.0! + Me.ButtonX4.SymbolSize = 12.0! Me.ButtonX4.TabIndex = 36 ' 'TextBoxX_PatchFileApply ' + Me.TextBoxX_PatchFileApply.BackColor = System.Drawing.Color.White ' ' ' Me.TextBoxX_PatchFileApply.Border.Class = "TextBoxBorder" Me.TextBoxX_PatchFileApply.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.TextBoxX_PatchFileApply.Location = New System.Drawing.Point(84, 36) + Me.TextBoxX_PatchFileApply.DisabledBackColor = System.Drawing.Color.White + Me.TextBoxX_PatchFileApply.ForeColor = System.Drawing.Color.Black + Me.TextBoxX_PatchFileApply.Location = New System.Drawing.Point(82, 35) Me.TextBoxX_PatchFileApply.Name = "TextBoxX_PatchFileApply" Me.TextBoxX_PatchFileApply.PreventEnterBeep = True Me.TextBoxX_PatchFileApply.ReadOnly = True @@ -198,24 +173,29 @@ Partial Class Form1 ' Me.ButtonX6.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton Me.ButtonX6.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground - Me.ButtonX6.Location = New System.Drawing.Point(305, 5) + Me.ButtonX6.FocusCuesEnabled = False + Me.ButtonX6.Location = New System.Drawing.Point(303, 4) Me.ButtonX6.Name = "ButtonX6" Me.ButtonX6.Size = New System.Drawing.Size(33, 23) - Me.ButtonX6.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.ButtonX6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX6, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select here your level on wich you would apply the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX6.Symbol = "58055" + Me.ButtonX6.SymbolColor = System.Drawing.Color.FromArgb(CType(CType(215, Byte), Integer), CType(CType(172, Byte), Integer), CType(CType(106, Byte), Integer)) Me.ButtonX6.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material - Me.ButtonX6.SymbolSize = 15.0! + Me.ButtonX6.SymbolSize = 12.0! Me.ButtonX6.TabIndex = 33 ' 'TextBoxX_OriginalLevelApply ' + Me.TextBoxX_OriginalLevelApply.BackColor = System.Drawing.Color.White ' ' ' Me.TextBoxX_OriginalLevelApply.Border.Class = "TextBoxBorder" Me.TextBoxX_OriginalLevelApply.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.TextBoxX_OriginalLevelApply.Location = New System.Drawing.Point(84, 7) + Me.TextBoxX_OriginalLevelApply.DisabledBackColor = System.Drawing.Color.White + Me.TextBoxX_OriginalLevelApply.ForeColor = System.Drawing.Color.Black + Me.TextBoxX_OriginalLevelApply.Location = New System.Drawing.Point(82, 6) Me.TextBoxX_OriginalLevelApply.Name = "TextBoxX_OriginalLevelApply" Me.TextBoxX_OriginalLevelApply.PreventEnterBeep = True Me.TextBoxX_OriginalLevelApply.ReadOnly = True @@ -225,52 +205,14 @@ Partial Class Form1 Me.TextBoxX_OriginalLevelApply.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty Me.TextBoxX_OriginalLevelApply.WatermarkText = "No file loaded!" ' - 'TabPage2 - ' - Me.TabPage2.Controls.Add(Me.CircularProgress_Create) - Me.TabPage2.Controls.Add(Me.LabelX15) - Me.TabPage2.Controls.Add(Me.GroupBox1) - Me.TabPage2.Controls.Add(Me.CheckBoxX2) - Me.TabPage2.Controls.Add(Me.CheckBoxX1) - Me.TabPage2.Controls.Add(Me.Button_CreatePatch) - Me.TabPage2.Controls.Add(Me.LabelX3) - Me.TabPage2.Controls.Add(Me.LabelX2) - Me.TabPage2.Controls.Add(Me.LabelX1) - Me.TabPage2.Controls.Add(Me.ButtonX3) - Me.TabPage2.Controls.Add(Me.TextBoxX_ModifiedLevel) - Me.TabPage2.Controls.Add(Me.ButtonX2) - Me.TabPage2.Controls.Add(Me.ButtonX1) - Me.TabPage2.Controls.Add(Me.TextBoxX_PatchFileCreate) - Me.TabPage2.Controls.Add(Me.TextBoxX_OriginalLevelCreate) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) - Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(344, 92) - Me.TabPage2.TabIndex = 1 - Me.TabPage2.Text = "Create Patch" - Me.TabPage2.UseVisualStyleBackColor = True - ' - 'CircularProgress_Create - ' - ' - ' - ' - Me.CircularProgress_Create.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.CircularProgress_Create.Location = New System.Drawing.Point(6, 260) - Me.CircularProgress_Create.Name = "CircularProgress_Create" - Me.CircularProgress_Create.ProgressBarType = DevComponents.DotNetBar.eCircularProgressType.Dot - Me.CircularProgress_Create.ProgressColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.CircularProgress_Create.Size = New System.Drawing.Size(23, 23) - Me.CircularProgress_Create.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP - Me.CircularProgress_Create.TabIndex = 42 - ' 'LabelX15 ' + Me.LabelX15.BackColor = System.Drawing.Color.Transparent ' ' ' Me.LabelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.LabelX15.Location = New System.Drawing.Point(35, 260) + Me.LabelX15.Location = New System.Drawing.Point(33, 259) Me.LabelX15.Name = "LabelX15" Me.LabelX15.Size = New System.Drawing.Size(196, 23) Me.LabelX15.TabIndex = 33 @@ -279,6 +221,7 @@ Partial Class Form1 ' 'GroupBox1 ' + Me.GroupBox1.BackColor = System.Drawing.Color.Transparent Me.GroupBox1.Controls.Add(Me.SwitchButton_Liquids) Me.GroupBox1.Controls.Add(Me.LabelX8) Me.GroupBox1.Controls.Add(Me.LabelX10) @@ -295,7 +238,7 @@ Partial Class Form1 Me.GroupBox1.Controls.Add(Me.LabelX7) Me.GroupBox1.Controls.Add(Me.SwitchButton_Configs) Me.GroupBox1.Controls.Add(Me.SwitchButton_Graphics) - Me.GroupBox1.Location = New System.Drawing.Point(6, 118) + Me.GroupBox1.Location = New System.Drawing.Point(4, 117) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Size = New System.Drawing.Size(330, 136) Me.SuperTooltip1.SetSuperTooltip(Me.GroupBox1, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Check which things you would include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) @@ -313,10 +256,16 @@ Partial Class Form1 Me.SwitchButton_Liquids.Location = New System.Drawing.Point(103, 48) Me.SwitchButton_Liquids.Name = "SwitchButton_Liquids" Me.SwitchButton_Liquids.OffText = "No" + Me.SwitchButton_Liquids.OffTextColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.SwitchButton_Liquids.OnBackColor = System.Drawing.Color.FromArgb(CType(CType(139, Byte), Integer), CType(CType(195, Byte), Integer), CType(CType(80, Byte), Integer)) Me.SwitchButton_Liquids.OnText = "Yes" + Me.SwitchButton_Liquids.OnTextColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer)) Me.SwitchButton_Liquids.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Liquids.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Liquids, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Liquids will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) + Me.SwitchButton_Liquids.SwitchBackColor = System.Drawing.Color.FromArgb(CType(CType(147, Byte), Integer), CType(CType(164, Byte), Integer), CType(CType(181, Byte), Integer)) + Me.SwitchButton_Liquids.SwitchBorderColor = System.Drawing.Color.FromArgb(CType(CType(69, Byte), Integer), CType(CType(85, Byte), Integer), CType(CType(107, Byte), Integer)) + Me.SwitchButton_Liquids.SwitchWidth = 16 Me.SwitchButton_Liquids.TabIndex = 49 ' 'LabelX8 @@ -353,10 +302,16 @@ Partial Class Form1 Me.SwitchButton_Layers.Location = New System.Drawing.Point(267, 106) Me.SwitchButton_Layers.Name = "SwitchButton_Layers" Me.SwitchButton_Layers.OffText = "No" + Me.SwitchButton_Layers.OffTextColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.SwitchButton_Layers.OnBackColor = System.Drawing.Color.FromArgb(CType(CType(139, Byte), Integer), CType(CType(195, Byte), Integer), CType(CType(80, Byte), Integer)) Me.SwitchButton_Layers.OnText = "Yes" + Me.SwitchButton_Layers.OnTextColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer)) Me.SwitchButton_Layers.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Layers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Layers, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Layers will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) + Me.SwitchButton_Layers.SwitchBackColor = System.Drawing.Color.FromArgb(CType(CType(147, Byte), Integer), CType(CType(164, Byte), Integer), CType(CType(181, Byte), Integer)) + Me.SwitchButton_Layers.SwitchBorderColor = System.Drawing.Color.FromArgb(CType(CType(69, Byte), Integer), CType(CType(85, Byte), Integer), CType(CType(107, Byte), Integer)) + Me.SwitchButton_Layers.SwitchWidth = 16 Me.SwitchButton_Layers.TabIndex = 48 Me.SwitchButton_Layers.Value = True Me.SwitchButton_Layers.ValueObject = "Y" @@ -371,10 +326,16 @@ Partial Class Form1 Me.SwitchButton_Scripts.Location = New System.Drawing.Point(267, 19) Me.SwitchButton_Scripts.Name = "SwitchButton_Scripts" Me.SwitchButton_Scripts.OffText = "No" + Me.SwitchButton_Scripts.OffTextColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.SwitchButton_Scripts.OnBackColor = System.Drawing.Color.FromArgb(CType(CType(139, Byte), Integer), CType(CType(195, Byte), Integer), CType(CType(80, Byte), Integer)) Me.SwitchButton_Scripts.OnText = "Yes" + Me.SwitchButton_Scripts.OnTextColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer)) Me.SwitchButton_Scripts.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Scripts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Scripts, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Scripts will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) + Me.SwitchButton_Scripts.SwitchBackColor = System.Drawing.Color.FromArgb(CType(CType(147, Byte), Integer), CType(CType(164, Byte), Integer), CType(CType(181, Byte), Integer)) + Me.SwitchButton_Scripts.SwitchBorderColor = System.Drawing.Color.FromArgb(CType(CType(69, Byte), Integer), CType(CType(85, Byte), Integer), CType(CType(107, Byte), Integer)) + Me.SwitchButton_Scripts.SwitchWidth = 16 Me.SwitchButton_Scripts.TabIndex = 42 Me.SwitchButton_Scripts.Value = True Me.SwitchButton_Scripts.ValueObject = "Y" @@ -413,10 +374,16 @@ Partial Class Form1 Me.SwitchButton_Variables.Location = New System.Drawing.Point(267, 77) Me.SwitchButton_Variables.Name = "SwitchButton_Variables" Me.SwitchButton_Variables.OffText = "No" + Me.SwitchButton_Variables.OffTextColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.SwitchButton_Variables.OnBackColor = System.Drawing.Color.FromArgb(CType(CType(139, Byte), Integer), CType(CType(195, Byte), Integer), CType(CType(80, Byte), Integer)) Me.SwitchButton_Variables.OnText = "Yes" + Me.SwitchButton_Variables.OnTextColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer)) Me.SwitchButton_Variables.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Variables.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Variables, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Local Variables will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) + Me.SwitchButton_Variables.SwitchBackColor = System.Drawing.Color.FromArgb(CType(CType(147, Byte), Integer), CType(CType(164, Byte), Integer), CType(CType(181, Byte), Integer)) + Me.SwitchButton_Variables.SwitchBorderColor = System.Drawing.Color.FromArgb(CType(CType(69, Byte), Integer), CType(CType(85, Byte), Integer), CType(CType(107, Byte), Integer)) + Me.SwitchButton_Variables.SwitchWidth = 16 Me.SwitchButton_Variables.TabIndex = 46 Me.SwitchButton_Variables.Value = True Me.SwitchButton_Variables.ValueObject = "Y" @@ -431,10 +398,16 @@ Partial Class Form1 Me.SwitchButton_Events.Location = New System.Drawing.Point(267, 48) Me.SwitchButton_Events.Name = "SwitchButton_Events" Me.SwitchButton_Events.OffText = "No" + Me.SwitchButton_Events.OffTextColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.SwitchButton_Events.OnBackColor = System.Drawing.Color.FromArgb(CType(CType(139, Byte), Integer), CType(CType(195, Byte), Integer), CType(CType(80, Byte), Integer)) Me.SwitchButton_Events.OnText = "Yes" + Me.SwitchButton_Events.OnTextColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer)) Me.SwitchButton_Events.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Events.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Events, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Events will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) + Me.SwitchButton_Events.SwitchBackColor = System.Drawing.Color.FromArgb(CType(CType(147, Byte), Integer), CType(CType(164, Byte), Integer), CType(CType(181, Byte), Integer)) + Me.SwitchButton_Events.SwitchBorderColor = System.Drawing.Color.FromArgb(CType(CType(69, Byte), Integer), CType(CType(85, Byte), Integer), CType(CType(107, Byte), Integer)) + Me.SwitchButton_Events.SwitchWidth = 16 Me.SwitchButton_Events.TabIndex = 44 Me.SwitchButton_Events.Value = True Me.SwitchButton_Events.ValueObject = "Y" @@ -473,11 +446,17 @@ Partial Class Form1 Me.SwitchButton_BlocksEtc.Location = New System.Drawing.Point(103, 19) Me.SwitchButton_BlocksEtc.Name = "SwitchButton_BlocksEtc" Me.SwitchButton_BlocksEtc.OffText = "No" + Me.SwitchButton_BlocksEtc.OffTextColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.SwitchButton_BlocksEtc.OnBackColor = System.Drawing.Color.FromArgb(CType(CType(139, Byte), Integer), CType(CType(195, Byte), Integer), CType(CType(80, Byte), Integer)) Me.SwitchButton_BlocksEtc.OnText = "Yes" + Me.SwitchButton_BlocksEtc.OnTextColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer)) Me.SwitchButton_BlocksEtc.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_BlocksEtc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_BlocksEtc, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Blocks, NPC's and Backgrounds will include in the patch" & ".", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) + Me.SwitchButton_BlocksEtc.SwitchBackColor = System.Drawing.Color.FromArgb(CType(CType(147, Byte), Integer), CType(CType(164, Byte), Integer), CType(CType(181, Byte), Integer)) + Me.SwitchButton_BlocksEtc.SwitchBorderColor = System.Drawing.Color.FromArgb(CType(CType(69, Byte), Integer), CType(CType(85, Byte), Integer), CType(CType(107, Byte), Integer)) + Me.SwitchButton_BlocksEtc.SwitchWidth = 16 Me.SwitchButton_BlocksEtc.TabIndex = 34 ' 'LabelX9 @@ -514,11 +493,17 @@ Partial Class Form1 Me.SwitchButton_Configs.Location = New System.Drawing.Point(103, 106) Me.SwitchButton_Configs.Name = "SwitchButton_Configs" Me.SwitchButton_Configs.OffText = "No" + Me.SwitchButton_Configs.OffTextColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.SwitchButton_Configs.OnBackColor = System.Drawing.Color.FromArgb(CType(CType(139, Byte), Integer), CType(CType(195, Byte), Integer), CType(CType(80, Byte), Integer)) Me.SwitchButton_Configs.OnText = "Yes" + Me.SwitchButton_Configs.OnTextColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer)) Me.SwitchButton_Configs.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Configs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Configs, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all custom configrations (like Custom NPC Configs) will inc" & "lude in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) + Me.SwitchButton_Configs.SwitchBackColor = System.Drawing.Color.FromArgb(CType(CType(147, Byte), Integer), CType(CType(164, Byte), Integer), CType(CType(181, Byte), Integer)) + Me.SwitchButton_Configs.SwitchBorderColor = System.Drawing.Color.FromArgb(CType(CType(69, Byte), Integer), CType(CType(85, Byte), Integer), CType(CType(107, Byte), Integer)) + Me.SwitchButton_Configs.SwitchWidth = 16 Me.SwitchButton_Configs.TabIndex = 38 Me.SwitchButton_Configs.Value = True Me.SwitchButton_Configs.ValueObject = "Y" @@ -533,23 +518,30 @@ Partial Class Form1 Me.SwitchButton_Graphics.Location = New System.Drawing.Point(103, 77) Me.SwitchButton_Graphics.Name = "SwitchButton_Graphics" Me.SwitchButton_Graphics.OffText = "No" + Me.SwitchButton_Graphics.OffTextColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.SwitchButton_Graphics.OnBackColor = System.Drawing.Color.FromArgb(CType(CType(139, Byte), Integer), CType(CType(195, Byte), Integer), CType(CType(80, Byte), Integer)) Me.SwitchButton_Graphics.OnText = "Yes" + Me.SwitchButton_Graphics.OnTextColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer)) Me.SwitchButton_Graphics.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Graphics.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Graphics, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all custom graphics will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) + Me.SwitchButton_Graphics.SwitchBackColor = System.Drawing.Color.FromArgb(CType(CType(147, Byte), Integer), CType(CType(164, Byte), Integer), CType(CType(181, Byte), Integer)) + Me.SwitchButton_Graphics.SwitchBorderColor = System.Drawing.Color.FromArgb(CType(CType(69, Byte), Integer), CType(CType(85, Byte), Integer), CType(CType(107, Byte), Integer)) + Me.SwitchButton_Graphics.SwitchWidth = 16 Me.SwitchButton_Graphics.TabIndex = 36 Me.SwitchButton_Graphics.Value = True Me.SwitchButton_Graphics.ValueObject = "Y" ' 'CheckBoxX2 ' + Me.CheckBoxX2.BackColor = System.Drawing.Color.Transparent ' ' ' Me.CheckBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square Me.CheckBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton Me.CheckBoxX2.FocusCuesEnabled = False - Me.CheckBoxX2.Location = New System.Drawing.Point(199, 33) + Me.CheckBoxX2.Location = New System.Drawing.Point(197, 32) Me.CheckBoxX2.Name = "CheckBoxX2" Me.CheckBoxX2.Size = New System.Drawing.Size(100, 23) Me.CheckBoxX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 @@ -559,6 +551,7 @@ Partial Class Form1 ' 'CheckBoxX1 ' + Me.CheckBoxX1.BackColor = System.Drawing.Color.Transparent ' ' ' @@ -568,7 +561,7 @@ Partial Class Form1 Me.CheckBoxX1.CheckState = System.Windows.Forms.CheckState.Checked Me.CheckBoxX1.CheckValue = "Y" Me.CheckBoxX1.FocusCuesEnabled = False - Me.CheckBoxX1.Location = New System.Drawing.Point(84, 33) + Me.CheckBoxX1.Location = New System.Drawing.Point(82, 32) Me.CheckBoxX1.Name = "CheckBoxX1" Me.CheckBoxX1.Size = New System.Drawing.Size(100, 23) Me.CheckBoxX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 @@ -576,22 +569,14 @@ Partial Class Form1 Me.CheckBoxX1.TabIndex = 31 Me.CheckBoxX1.Text = "use empty level" ' - 'Button_CreatePatch - ' - Me.Button_CreatePatch.Location = New System.Drawing.Point(237, 260) - Me.Button_CreatePatch.Name = "Button_CreatePatch" - Me.Button_CreatePatch.Size = New System.Drawing.Size(101, 23) - Me.Button_CreatePatch.TabIndex = 30 - Me.Button_CreatePatch.Text = "Create Patch!" - Me.Button_CreatePatch.UseVisualStyleBackColor = True - ' 'LabelX3 ' + Me.LabelX3.BackColor = System.Drawing.Color.Transparent ' ' ' Me.LabelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.LabelX3.Location = New System.Drawing.Point(6, 89) + Me.LabelX3.Location = New System.Drawing.Point(4, 88) Me.LabelX3.Name = "LabelX3" Me.LabelX3.Size = New System.Drawing.Size(72, 23) Me.LabelX3.TabIndex = 29 @@ -599,11 +584,12 @@ Partial Class Form1 ' 'LabelX2 ' + Me.LabelX2.BackColor = System.Drawing.Color.Transparent ' ' ' Me.LabelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.LabelX2.Location = New System.Drawing.Point(6, 60) + Me.LabelX2.Location = New System.Drawing.Point(4, 59) Me.LabelX2.Name = "LabelX2" Me.LabelX2.Size = New System.Drawing.Size(72, 23) Me.LabelX2.TabIndex = 28 @@ -611,11 +597,12 @@ Partial Class Form1 ' 'LabelX1 ' + Me.LabelX1.BackColor = System.Drawing.Color.Transparent ' ' ' Me.LabelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.LabelX1.Location = New System.Drawing.Point(6, 5) + Me.LabelX1.Location = New System.Drawing.Point(4, 4) Me.LabelX1.Name = "LabelX1" Me.LabelX1.Size = New System.Drawing.Size(72, 23) Me.LabelX1.TabIndex = 27 @@ -625,24 +612,29 @@ Partial Class Form1 ' Me.ButtonX3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton Me.ButtonX3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground - Me.ButtonX3.Location = New System.Drawing.Point(305, 60) + Me.ButtonX3.FocusCuesEnabled = False + Me.ButtonX3.Location = New System.Drawing.Point(303, 59) Me.ButtonX3.Name = "ButtonX3" Me.ButtonX3.Size = New System.Drawing.Size(33, 23) - Me.ButtonX3.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.ButtonX3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX3, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Open here your level with the feautures wich should be in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX3.Symbol = "58055" + Me.ButtonX3.SymbolColor = System.Drawing.Color.FromArgb(CType(CType(215, Byte), Integer), CType(CType(172, Byte), Integer), CType(CType(106, Byte), Integer)) Me.ButtonX3.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material - Me.ButtonX3.SymbolSize = 15.0! + Me.ButtonX3.SymbolSize = 12.0! Me.ButtonX3.TabIndex = 26 ' 'TextBoxX_ModifiedLevel ' + Me.TextBoxX_ModifiedLevel.BackColor = System.Drawing.Color.White ' ' ' Me.TextBoxX_ModifiedLevel.Border.Class = "TextBoxBorder" Me.TextBoxX_ModifiedLevel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.TextBoxX_ModifiedLevel.Location = New System.Drawing.Point(84, 62) + Me.TextBoxX_ModifiedLevel.DisabledBackColor = System.Drawing.Color.White + Me.TextBoxX_ModifiedLevel.ForeColor = System.Drawing.Color.Black + Me.TextBoxX_ModifiedLevel.Location = New System.Drawing.Point(82, 61) Me.TextBoxX_ModifiedLevel.Name = "TextBoxX_ModifiedLevel" Me.TextBoxX_ModifiedLevel.PreventEnterBeep = True Me.TextBoxX_ModifiedLevel.ReadOnly = True @@ -656,14 +648,16 @@ Partial Class Form1 ' Me.ButtonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton Me.ButtonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground - Me.ButtonX2.Location = New System.Drawing.Point(305, 89) + Me.ButtonX2.FocusCuesEnabled = False + Me.ButtonX2.Location = New System.Drawing.Point(303, 88) Me.ButtonX2.Name = "ButtonX2" Me.ButtonX2.Size = New System.Drawing.Size(33, 23) - Me.ButtonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.ButtonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX2, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select here where the patch file should be saved.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX2.Symbol = "57697" + Me.ButtonX2.SymbolColor = System.Drawing.Color.FromArgb(CType(CType(215, Byte), Integer), CType(CType(172, Byte), Integer), CType(CType(106, Byte), Integer)) Me.ButtonX2.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material - Me.ButtonX2.SymbolSize = 15.0! + Me.ButtonX2.SymbolSize = 12.0! Me.ButtonX2.TabIndex = 24 ' 'ButtonX1 @@ -671,24 +665,29 @@ Partial Class Form1 Me.ButtonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton Me.ButtonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground Me.ButtonX1.Enabled = False - Me.ButtonX1.Location = New System.Drawing.Point(305, 5) + Me.ButtonX1.FocusCuesEnabled = False + Me.ButtonX1.Location = New System.Drawing.Point(303, 4) Me.ButtonX1.Name = "ButtonX1" Me.ButtonX1.Size = New System.Drawing.Size(33, 23) - Me.ButtonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.ButtonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX1, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Open the ""without feauture"" level here.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX1.Symbol = "58055" + Me.ButtonX1.SymbolColor = System.Drawing.Color.FromArgb(CType(CType(215, Byte), Integer), CType(CType(172, Byte), Integer), CType(CType(106, Byte), Integer)) Me.ButtonX1.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material - Me.ButtonX1.SymbolSize = 15.0! + Me.ButtonX1.SymbolSize = 12.0! Me.ButtonX1.TabIndex = 23 ' 'TextBoxX_PatchFileCreate ' + Me.TextBoxX_PatchFileCreate.BackColor = System.Drawing.Color.White ' ' ' Me.TextBoxX_PatchFileCreate.Border.Class = "TextBoxBorder" Me.TextBoxX_PatchFileCreate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.TextBoxX_PatchFileCreate.Location = New System.Drawing.Point(84, 91) + Me.TextBoxX_PatchFileCreate.DisabledBackColor = System.Drawing.Color.White + Me.TextBoxX_PatchFileCreate.ForeColor = System.Drawing.Color.Black + Me.TextBoxX_PatchFileCreate.Location = New System.Drawing.Point(82, 90) Me.TextBoxX_PatchFileCreate.Name = "TextBoxX_PatchFileCreate" Me.TextBoxX_PatchFileCreate.PreventEnterBeep = True Me.TextBoxX_PatchFileCreate.ReadOnly = True @@ -700,13 +699,16 @@ Partial Class Form1 ' 'TextBoxX_OriginalLevelCreate ' + Me.TextBoxX_OriginalLevelCreate.BackColor = System.Drawing.Color.White ' ' ' Me.TextBoxX_OriginalLevelCreate.Border.Class = "TextBoxBorder" Me.TextBoxX_OriginalLevelCreate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square + Me.TextBoxX_OriginalLevelCreate.DisabledBackColor = System.Drawing.Color.White Me.TextBoxX_OriginalLevelCreate.Enabled = False - Me.TextBoxX_OriginalLevelCreate.Location = New System.Drawing.Point(84, 7) + Me.TextBoxX_OriginalLevelCreate.ForeColor = System.Drawing.Color.Black + Me.TextBoxX_OriginalLevelCreate.Location = New System.Drawing.Point(82, 6) Me.TextBoxX_OriginalLevelCreate.Name = "TextBoxX_OriginalLevelCreate" Me.TextBoxX_OriginalLevelCreate.PreventEnterBeep = True Me.TextBoxX_OriginalLevelCreate.ReadOnly = True @@ -721,37 +723,171 @@ Partial Class Form1 Me.SuperTooltip1.DefaultTooltipSettings = New DevComponents.DotNetBar.SuperTooltipInfo("", "", "", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.Gray) Me.SuperTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F" ' + 'StyleManager1 + ' + Me.StyleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro + Me.StyleManager1.MetroColorParameters = New DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(CType(CType(43, Byte), Integer), CType(CType(87, Byte), Integer), CType(CType(154, Byte), Integer))) + ' + 'TabControl2 + ' + Me.TabControl2.BackColor = System.Drawing.Color.White + Me.TabControl2.CanReorderTabs = True + Me.TabControl2.Controls.Add(Me.TabControlPanel1) + Me.TabControl2.Controls.Add(Me.TabControlPanel2) + Me.TabControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.TabControl2.ForeColor = System.Drawing.Color.Black + Me.TabControl2.Location = New System.Drawing.Point(0, 0) + Me.TabControl2.Name = "TabControl2" + Me.TabControl2.SelectedTabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold) + Me.TabControl2.SelectedTabIndex = 0 + Me.TabControl2.Size = New System.Drawing.Size(342, 118) + Me.TabControl2.Style = DevComponents.DotNetBar.eTabStripStyle.Metro + Me.TabControl2.TabIndex = 1 + Me.TabControl2.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox + Me.TabControl2.Tabs.Add(Me.TabItem1) + Me.TabControl2.Tabs.Add(Me.TabItem2) + Me.TabControl2.Text = "TabControl2" + ' + 'TabControlPanel1 + ' + Me.TabControlPanel1.Controls.Add(Me.CircularProgress_Apply) + Me.TabControlPanel1.Controls.Add(Me.ButtonX6) + Me.TabControlPanel1.Controls.Add(Me.ButtonX4) + Me.TabControlPanel1.Controls.Add(Me.LabelX6) + Me.TabControlPanel1.Controls.Add(Me.LabelX4) + Me.TabControlPanel1.Controls.Add(Me.LabelX14) + Me.TabControlPanel1.Controls.Add(Me.TextBoxX_PatchFileApply) + Me.TabControlPanel1.Controls.Add(Me.TextBoxX_OriginalLevelApply) + Me.TabControlPanel1.Controls.Add(Me.Button_ApplyPatch) + Me.TabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty + Me.TabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.TabControlPanel1.Location = New System.Drawing.Point(0, 27) + Me.TabControlPanel1.Name = "TabControlPanel1" + Me.TabControlPanel1.Padding = New System.Windows.Forms.Padding(1) + Me.TabControlPanel1.Size = New System.Drawing.Size(342, 91) + Me.TabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.White + Me.TabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine + Me.TabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(CType(CType(211, Byte), Integer), CType(CType(211, Byte), Integer), CType(CType(211, Byte), Integer)) + Me.TabControlPanel1.Style.BorderSide = CType(((DevComponents.DotNetBar.eBorderSide.Left Or DevComponents.DotNetBar.eBorderSide.Right) _ + Or DevComponents.DotNetBar.eBorderSide.Bottom), DevComponents.DotNetBar.eBorderSide) + Me.TabControlPanel1.Style.GradientAngle = 90 + Me.TabControlPanel1.TabIndex = 1 + Me.TabControlPanel1.TabItem = Me.TabItem1 + ' + 'Button_ApplyPatch + ' + Me.Button_ApplyPatch.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton + Me.Button_ApplyPatch.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground + Me.Button_ApplyPatch.FocusCuesEnabled = False + Me.Button_ApplyPatch.Location = New System.Drawing.Point(235, 62) + Me.Button_ApplyPatch.Name = "Button_ApplyPatch" + Me.Button_ApplyPatch.Size = New System.Drawing.Size(101, 23) + Me.Button_ApplyPatch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.Button_ApplyPatch.TabIndex = 42 + Me.Button_ApplyPatch.Text = "Apply Patch!" + ' + 'TabItem1 + ' + Me.TabItem1.AttachedControl = Me.TabControlPanel1 + Me.TabItem1.Name = "TabItem1" + Me.TabItem1.Text = "Apply Patch" + ' + 'TabControlPanel2 + ' + Me.TabControlPanel2.Controls.Add(Me.CircularProgress_Create) + Me.TabControlPanel2.Controls.Add(Me.LabelX15) + Me.TabControlPanel2.Controls.Add(Me.GroupBox1) + Me.TabControlPanel2.Controls.Add(Me.LabelX1) + Me.TabControlPanel2.Controls.Add(Me.CheckBoxX2) + Me.TabControlPanel2.Controls.Add(Me.TextBoxX_OriginalLevelCreate) + Me.TabControlPanel2.Controls.Add(Me.CheckBoxX1) + Me.TabControlPanel2.Controls.Add(Me.TextBoxX_PatchFileCreate) + Me.TabControlPanel2.Controls.Add(Me.ButtonX1) + Me.TabControlPanel2.Controls.Add(Me.LabelX3) + Me.TabControlPanel2.Controls.Add(Me.ButtonX2) + Me.TabControlPanel2.Controls.Add(Me.LabelX2) + Me.TabControlPanel2.Controls.Add(Me.TextBoxX_ModifiedLevel) + Me.TabControlPanel2.Controls.Add(Me.ButtonX3) + Me.TabControlPanel2.Controls.Add(Me.Button_CreatePatch) + Me.TabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty + Me.TabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill + Me.TabControlPanel2.Location = New System.Drawing.Point(0, 27) + Me.TabControlPanel2.Name = "TabControlPanel2" + Me.TabControlPanel2.Padding = New System.Windows.Forms.Padding(1) + Me.TabControlPanel2.Size = New System.Drawing.Size(342, 91) + Me.TabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.White + Me.TabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine + Me.TabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(CType(CType(211, Byte), Integer), CType(CType(211, Byte), Integer), CType(CType(211, Byte), Integer)) + Me.TabControlPanel2.Style.BorderSide = CType(((DevComponents.DotNetBar.eBorderSide.Left Or DevComponents.DotNetBar.eBorderSide.Right) _ + Or DevComponents.DotNetBar.eBorderSide.Bottom), DevComponents.DotNetBar.eBorderSide) + Me.TabControlPanel2.Style.GradientAngle = 90 + Me.TabControlPanel2.TabIndex = 5 + Me.TabControlPanel2.TabItem = Me.TabItem2 + ' + 'CircularProgress_Create + ' + Me.CircularProgress_Create.BackColor = System.Drawing.Color.Transparent + ' + ' + ' + Me.CircularProgress_Create.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square + Me.CircularProgress_Create.Location = New System.Drawing.Point(4, 259) + Me.CircularProgress_Create.Name = "CircularProgress_Create" + Me.CircularProgress_Create.ProgressBarType = DevComponents.DotNetBar.eCircularProgressType.Dot + Me.CircularProgress_Create.ProgressColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.CircularProgress_Create.Size = New System.Drawing.Size(23, 23) + Me.CircularProgress_Create.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP + Me.CircularProgress_Create.TabIndex = 42 + ' + 'Button_CreatePatch + ' + Me.Button_CreatePatch.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton + Me.Button_CreatePatch.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground + Me.Button_CreatePatch.FocusCuesEnabled = False + Me.Button_CreatePatch.Location = New System.Drawing.Point(233, 259) + Me.Button_CreatePatch.Name = "Button_CreatePatch" + Me.Button_CreatePatch.Size = New System.Drawing.Size(101, 23) + Me.Button_CreatePatch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.Button_CreatePatch.TabIndex = 43 + Me.Button_CreatePatch.Text = "Create Patch!" + ' + 'TabItem2 + ' + Me.TabItem2.AttachedControl = Me.TabControlPanel2 + Me.TabItem2.Name = "TabItem2" + Me.TabItem2.Text = "Create Patch" + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(352, 118) - Me.Controls.Add(Me.TabControl1) + Me.ClientSize = New System.Drawing.Size(342, 118) + Me.Controls.Add(Me.TabControl2) + Me.DoubleBuffered = True + Me.EnableGlass = False Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.MaximizeBox = False Me.Name = "Form1" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "SMBX Magic Patcher" - Me.TabControl1.ResumeLayout(False) - Me.TabPage1.ResumeLayout(False) - Me.TabPage2.ResumeLayout(False) + Me.Tag = "" + Me.Text = "SMBX Magic Patcher (v1.1)" + Me.TopLeftCornerSize = 0 + Me.TopRightCornerSize = 0 Me.GroupBox1.ResumeLayout(False) + CType(Me.TabControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabControl2.ResumeLayout(False) + Me.TabControlPanel1.ResumeLayout(False) + Me.TabControlPanel2.ResumeLayout(False) Me.ResumeLayout(False) End Sub - - Friend WithEvents TabControl1 As TabControl - Friend WithEvents TabPage1 As TabPage - Friend WithEvents TabPage2 As TabPage - Friend WithEvents Button_ApplyPatch As Button Friend WithEvents LabelX4 As DevComponents.DotNetBar.LabelX Friend WithEvents LabelX6 As DevComponents.DotNetBar.LabelX Friend WithEvents ButtonX4 As DevComponents.DotNetBar.ButtonX Friend WithEvents TextBoxX_PatchFileApply As DevComponents.DotNetBar.Controls.TextBoxX Friend WithEvents ButtonX6 As DevComponents.DotNetBar.ButtonX Friend WithEvents TextBoxX_OriginalLevelApply As DevComponents.DotNetBar.Controls.TextBoxX - Friend WithEvents Button_CreatePatch As Button Friend WithEvents LabelX3 As DevComponents.DotNetBar.LabelX Friend WithEvents LabelX2 As DevComponents.DotNetBar.LabelX Friend WithEvents LabelX1 As DevComponents.DotNetBar.LabelX @@ -783,6 +919,14 @@ Partial Class Form1 Friend WithEvents LabelX14 As DevComponents.DotNetBar.LabelX Friend WithEvents LabelX15 As DevComponents.DotNetBar.LabelX Friend WithEvents CircularProgress_Apply As DevComponents.DotNetBar.Controls.CircularProgress - Friend WithEvents CircularProgress_Create As DevComponents.DotNetBar.Controls.CircularProgress Friend WithEvents SuperTooltip1 As DevComponents.DotNetBar.SuperTooltip + Friend WithEvents StyleManager1 As DevComponents.DotNetBar.StyleManager + Friend WithEvents TabControl2 As DevComponents.DotNetBar.TabControl + Friend WithEvents TabControlPanel2 As DevComponents.DotNetBar.TabControlPanel + Friend WithEvents TabItem2 As DevComponents.DotNetBar.TabItem + Friend WithEvents TabControlPanel1 As DevComponents.DotNetBar.TabControlPanel + Friend WithEvents TabItem1 As DevComponents.DotNetBar.TabItem + Friend WithEvents CircularProgress_Create As DevComponents.DotNetBar.Controls.CircularProgress + Friend WithEvents Button_CreatePatch As DevComponents.DotNetBar.ButtonX + Friend WithEvents Button_ApplyPatch As DevComponents.DotNetBar.ButtonX End Class diff --git a/SMBX Magic Patcher/Form1.resx b/SMBX Magic Patcher/Form1.resx index a1d8e4a..1ca47b3 100644 --- a/SMBX Magic Patcher/Form1.resx +++ b/SMBX Magic Patcher/Form1.resx @@ -124,6 +124,9 @@ Use this, if you would make a patch of a little feauture wich is in a level of e.g. your episode. Then you should make a level "without feauture" and "with feauture". That means that all things (like npc's or custom graphics), wich you used in this level will, be ignored. + + 145, 17 + diff --git a/SMBX Magic Patcher/Form1.vb b/SMBX Magic Patcher/Form1.vb index 0396244..641bb80 100644 --- a/SMBX Magic Patcher/Form1.vb +++ b/SMBX Magic Patcher/Form1.vb @@ -1,9 +1,12 @@ -Imports System.IO +Imports System.Globalization +Imports System.IO Imports DevComponents.DotNetBar Public Class Form1 Public TempDir As String = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) & "\SMBX Magic Patcher" + Private SMBXPFX As New SMBXPFX + Private ReadOnly fileSeperatorChar As String = CultureInfo.CurrentCulture.TextInfo.ListSeparator Private Sub ButtonX1_Click(sender As Object, e As EventArgs) Handles ButtonX1.Click With New OpenFileDialog @@ -38,23 +41,38 @@ Public Class Form1 Private Sub ButtonX6_Click(sender As Object, e As EventArgs) Handles ButtonX6.Click With New OpenFileDialog .Filter = "SMBX-38A Levels (*.lvl)|*.lvl" + .Multiselect = True If .ShowDialog = Not DialogResult.OK Then Exit Sub End If - TextBoxX_OriginalLevelApply.Text = .FileName + TextBoxX_OriginalLevelApply.Text = GetFileListAsString(.FileNames) End With End Sub Private Sub ButtonX4_Click(sender As Object, e As EventArgs) Handles ButtonX4.Click With New OpenFileDialog .Filter = "All supported files (*.plx, *.slp)|*.plx;*.slp" + .Multiselect = True If .ShowDialog = Not DialogResult.OK Then Exit Sub End If - TextBoxX_PatchFileApply.Text = .FileName + TextBoxX_PatchFileApply.Text = GetFileListAsString(.FileNames) End With End Sub + Private Function GetFileListAsString(files As String()) As String + Dim str As String = String.Empty + + For Each file As String In files + If Not String.IsNullOrEmpty(str) Then + str &= fileSeperatorChar + End If + str &= file + Next + + Return str + End Function + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button_CreatePatch.Click CircularProgress_Create.IsRunning = True Button_CreatePatch.Enabled = False @@ -73,9 +91,12 @@ Public Class Form1 SwitchButton_Scripts.Value, SwitchButton_Liquids.Value) - Case 1 : MessageBoxEx.Show("Done", "Patch succesfully created!", MessageBoxButtons.OK, MessageBoxIcon.Information) - Case 2 : MessageBoxEx.Show("Done", "There is an error at packing!", MessageBoxButtons.OK, MessageBoxIcon.Error) - Case Else : MessageBoxEx.Show("Done", "There is an unknown error!", MessageBoxButtons.OK, MessageBoxIcon.Error) + Case 1 + MessageBoxEx.Show("Patch succesfully created!", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information) + Case 2 + MessageBoxEx.Show("There is an error at packing!", "Done", MessageBoxButtons.OK, MessageBoxIcon.Error) + Case Else + MessageBoxEx.Show("There is an unknown error!", "Done", MessageBoxButtons.OK, MessageBoxIcon.Error) End Select Button_CreatePatch.Enabled = True @@ -86,18 +107,40 @@ Public Class Form1 Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button_ApplyPatch.Click CircularProgress_Apply.IsRunning = True LabelX14.Visible = True - Button_ApplyPatch.Enabled = True + Button_ApplyPatch.Enabled = False - Select Case SMBXPFX.ApplyPatch(TextBoxX_OriginalLevelApply.Text, TextBoxX_PatchFileApply.Text) - Case 1 : MessageBoxEx.Show("Done", "Patch applied succesfully!", MessageBoxButtons.OK, MessageBoxIcon.Information) - Case 2 : MessageBoxEx.Show("Done", "There is an error at extracting files! Or maybe this isn't a valid patch file.", MessageBoxButtons.OK, MessageBoxIcon.Error) - Case 3 : MessageBoxEx.Show("Done", "This isn't a valid patch file.", MessageBoxButtons.OK, MessageBoxIcon.Error) - Case Else : MessageBoxEx.Show("Done", "There is an unknown error!", MessageBoxButtons.OK, MessageBoxIcon.Error) - End Select + ApplyPatch(TextBoxX_PatchFileApply.Text.Split(fileSeperatorChar), + TextBoxX_OriginalLevelApply.Text.Split(fileSeperatorChar)) LabelX14.Visible = False CircularProgress_Apply.IsRunning = False - Button_ApplyPatch.Enabled = False + Button_ApplyPatch.Enabled = True + End Sub + + Private Sub ApplyPatch(patchFiles As String(), levelFiles As String()) + Dim noErrors As Integer = 0 + + For Each levelFile As String In levelFiles + Dim msgEnd As String = "

Level file:
" & levelFile + Select Case SMBXPFX.ApplyPatch(levelFile, patchFiles) + Case 1 + noErrors += 1 + Case 2 + MessageBoxEx.Show("There is an error at extracting files! Or maybe this isn't a valid patch file." & msgEnd, "Done", MessageBoxButtons.OK, MessageBoxIcon.Error) + Case 3 + MessageBoxEx.Show("This isn't a valid patch file." & msgEnd, "Done", MessageBoxButtons.OK, MessageBoxIcon.Error) + Case Else + MessageBoxEx.Show("There is an unknown error!" & msgEnd, "Done", MessageBoxButtons.OK, MessageBoxIcon.Error) + End Select + Next + + If noErrors >= levelFiles.Length Then + MessageBoxEx.Show("All patches applied succesfully!", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information) + ElseIf noErrors < levelFiles.Length Then + MessageBoxEx.Show("All patches applied, but there seems to be some errors!", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information) + Else + MessageBoxEx.Show("No patch applied! There are some errors.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Error) + End If End Sub Private Sub CheckBoxX2_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBoxX2.CheckedChanged @@ -105,21 +148,52 @@ Public Class Form1 TextBoxX_OriginalLevelCreate.Enabled = CheckBoxX2.Checked End Sub - Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged - Select Case TabControl1.SelectedIndex - Case 0 : Me.Size = New Point(368, 157) - Case 1 : Me.Size = New Point(368, 354) + Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl2.SelectedTabChanged + Select Case TabControl2.SelectedTabIndex + Case 0 : Size = New Point(358, 157) + Case 1 : Size = New Point(358, 354) End Select End Sub Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load If Not Directory.Exists(TempDir) Then Directory.CreateDirectory(TempDir) End Sub + + Private Sub Form1_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown + CheckAndApplyCommandLinePatches() + End Sub + + Private Sub CheckAndApplyCommandLinePatches() + Dim cmds As String() = Environment.GetCommandLineArgs + Dim hasCmds As Boolean = cmds.Length > 1 + Dim patchFiles As New List(Of String) + Dim levelFiles As New List(Of String) + + If hasCmds Then + For i = 0 To cmds.Length - 1 + Dim cmd As String = cmds(i) + Select Case Path.GetExtension(cmd).ToLower + Case ".lvl" + levelFiles.Add(cmd) + Case ".plx", ".slp" + patchFiles.Add(cmd) + End Select + Next + End If + + TextBoxX_OriginalLevelApply.Text = GetFileListAsString(levelFiles.ToArray) + TextBoxX_PatchFileApply.Text = GetFileListAsString(patchFiles.ToArray) + + If patchFiles.Any AndAlso levelFiles.Any Then + Button_ApplyPatch.PerformClick() + End If + End Sub + End Class Public Class SMBXPFX - Shared Function CreatePatch(OriginalLevel As String, PatchedLevel As String, PatchFile As String, Optional UseCustomOriginalLevelFile As Boolean = False, Optional CopyBlocksEtc As Boolean = True, Optional CopyGraphics As Boolean = True, Optional CopyConfigurations As Boolean = True, Optional CopyEvents As Boolean = True, Optional CopyLayers As Boolean = True, Optional CopyVariables As Boolean = True, Optional CopyScripts As Boolean = True, Optional CopyLiquids As Boolean = True) As Integer + Public Function CreatePatch(OriginalLevel As String, PatchedLevel As String, PatchFile As String, Optional UseCustomOriginalLevelFile As Boolean = False, Optional CopyBlocksEtc As Boolean = True, Optional CopyGraphics As Boolean = True, Optional CopyConfigurations As Boolean = True, Optional CopyEvents As Boolean = True, Optional CopyLayers As Boolean = True, Optional CopyVariables As Boolean = True, Optional CopyScripts As Boolean = True, Optional CopyLiquids As Boolean = True) As Integer Dim CheckIfFilesExists = True If Not UseCustomOriginalLevelFile Then OriginalLevel = Application.StartupPath & "\Data\emptylevel\emptylevel.dat" @@ -134,20 +208,20 @@ Public Class SMBXPFX 'Add differences to patch: For Each l As String In PLevel If Not l Is "" And Not OLevel.Contains(l) And Not l.StartsWith("SMBXFile") Then - If l.StartsWith("P1|") Or l.StartsWith("P2|") Or l.StartsWith("M|") Then GoTo SkipCheck - If l.StartsWith("B|") And Not CopyBlocksEtc Then GoTo SkipCheck 'Blcks - If l.StartsWith("N|") And Not CopyBlocksEtc Then GoTo SkipCheck 'NPCs - If l.StartsWith("T|") And Not CopyBlocksEtc Then GoTo SkipCheck 'Backgrounds - If l.StartsWith("Q|") And Not CopyLiquids Then GoTo SkipCheck 'Liquids - If l.StartsWith("CB|") And Not CopyConfigurations Then GoTo SkipCheck 'Custom Block Configurations - If l.StartsWith("CT|") And Not CopyConfigurations Then GoTo SkipCheck 'Custom Backgrounds Configurations - If l.StartsWith("L|") And Not CopyLayers Then GoTo SkipCheck 'Layer - If l.StartsWith("E|") And Not CopyEvents Then GoTo SkipCheck 'Events - If l.StartsWith("V|") And Not CopyVariables Then GoTo SkipCheck 'Variables - If l.StartsWith("S|") And Not CopyScripts Then GoTo SkipCheck 'Scripts - If l.StartsWith("Su|") And Not CopyScripts Then GoTo SkipCheck 'Scripts + If l.StartsWith("P1|") Or l.StartsWith("P2|") Or l.StartsWith("M|") Then Continue For + If l.StartsWith("B|") And Not CopyBlocksEtc Then Continue For 'Blcks + If l.StartsWith("N|") And Not CopyBlocksEtc Then Continue For 'NPCs + If l.StartsWith("T|") And Not CopyBlocksEtc Then Continue For 'Backgrounds + If l.StartsWith("Q|") And Not CopyLiquids Then Continue For 'Liquids + If l.StartsWith("CB|") And Not CopyConfigurations Then Continue For 'Custom Block Configurations + If l.StartsWith("CT|") And Not CopyConfigurations Then Continue For 'Custom Backgrounds Configurations + If l.StartsWith("L|") And Not CopyLayers Then Continue For 'Layer + If l.StartsWith("E|") And Not CopyEvents Then Continue For 'Events + If l.StartsWith("V|") And Not CopyVariables Then Continue For 'Variables + If l.StartsWith("S|") And Not CopyScripts Then Continue For 'Scripts + If l.StartsWith("Su|") And Not CopyScripts Then Continue For 'Scripts If Not PFile.Contains(l) Then PFile.Add(l) 'Finaly add line to patch -SkipCheck: End If + End If Next 'Check for custom graphics: @@ -208,148 +282,100 @@ SkipCheck: End If Return 1 End Function - Shared Function ApplyPatch(OriginalLevel As String, PatchFile As String) As Integer + Public Function ApplyPatch(originalLevel As String, patchFiles As String()) As Integer Dim PatchTyp As Integer = 0 '0 = plx | 1 = slp - Dim PLevel As List(Of String) = File.ReadAllLines(OriginalLevel).ToList + Dim PLevel As List(Of String) = File.ReadAllLines(originalLevel).ToList Dim TempLeveldir As String = Form1.TempDir & "\TempLevel" : Dim TempLevelfiledir As String = TempLeveldir & "\data" - Dim oLeveldir As String = Path.GetDirectoryName(OriginalLevel) : Dim oLevelfiledir As String = oLeveldir & "\" & Path.GetFileNameWithoutExtension(OriginalLevel) + Dim oLeveldir As String = Path.GetDirectoryName(originalLevel) : Dim oLevelfiledir As String = oLeveldir & "\" & Path.GetFileNameWithoutExtension(originalLevel) If Directory.Exists(TempLeveldir) Then Directory.Delete(TempLeveldir, True) : Application.DoEvents() Directory.CreateDirectory(TempLeveldir) : Application.DoEvents() - 'Check Patchtyp: - Select Case Path.GetExtension(PatchFile) - Case ".slp" : PatchTyp = 1 - Case ".plx" : PatchTyp = 0 - Case Else : Return 3 - End Select + For Each patchFile As String In patchFiles + 'Check Patchtyp: + Select Case Path.GetExtension(patchFile) + Case ".slp" + PatchTyp = 1 + Case ".plx" + PatchTyp = 0 + Case Else + Return 3 + End Select - 'Extract with 7-zip: - If PatchTyp = 0 Then - Dim sevenzip As New Process - If Environment.Is64BitOperatingSystem Then - sevenzip.StartInfo.FileName = Application.StartupPath & "\Data\7-Zip\x64\7z.exe" - Else : sevenzip.StartInfo.FileName = Application.StartupPath & "\Data\7-Zip\x86\7z.exe" + 'Extract with 7-zip: + If PatchTyp = 0 Then + Dim sevenzip As New Process + If IntPtr.Size = 8 Then + sevenzip.StartInfo.FileName = Application.StartupPath & "\Data\7-Zip\x64\7z.exe" + Else + sevenzip.StartInfo.FileName = Application.StartupPath & "\Data\7-Zip\x86\7z.exe" + End If + Dim password As String = "SMBXMagicPatcher" + sevenzip.StartInfo.Arguments = String.Format("x ""{1}"" -p{0} -o""{2}"" -r", password, patchFile, TempLeveldir & "\") + sevenzip.StartInfo.UseShellExecute = False + sevenzip.StartInfo.CreateNoWindow = True + sevenzip.Start() + Do Until sevenzip.HasExited = True : Application.DoEvents() : Loop + If sevenzip.ExitCode <> 0 Then + Return 2 'Error at packing + End If End If - Dim password As String = "SMBXMagicPatcher" - sevenzip.StartInfo.Arguments = String.Format("x ""{1}"" -p{0} -o""{2}"" -r", password, Form1.TextBoxX_PatchFileApply.Text, TempLeveldir & "\") - sevenzip.StartInfo.UseShellExecute = False - sevenzip.StartInfo.CreateNoWindow = True - sevenzip.Start() - Do Until sevenzip.HasExited = True : Application.DoEvents() : Loop - If sevenzip.ExitCode <> 0 Then - Return 2 'Error at packing + + 'Load patchlevel: + Dim PFile() As String = {} + Select Case PatchTyp + Case 0 : PFile = File.ReadAllLines(TempLeveldir & "\data.dat") + Case 1 : PFile = File.ReadAllLines(patchFile) + End Select + + 'Apply lines in patch to the level: + For Each l As String In PFile + If Not PLevel.Contains(l) Then PLevel.Add(l) + Next + + 'Copy and replace files + If PatchTyp = 0 Then + Dim pListFilesInLeveldir() As String = Directory.GetFiles(TempLeveldir) + Dim pListFilesInLevelfiledir() As String = {} + If Directory.Exists(TempLevelfiledir) Then + pListFilesInLevelfiledir = Directory.GetFiles(TempLevelfiledir) + End If + + Dim oListFilesInLeveldir() As String = Directory.GetFiles(oLeveldir) + Dim oListFilesInLevelfiledir() As String = {} + If Directory.Exists(oLevelfiledir) Then + oListFilesInLevelfiledir = Directory.GetFiles(oLevelfiledir) + End If + + If Not Directory.Exists(oLevelfiledir) And oListFilesInLevelfiledir.Count > 0 Then + Directory.CreateDirectory(oLevelfiledir) + End If + + For i As Integer = 0 To pListFilesInLeveldir.Count - 1 + If Not pListFilesInLeveldir(i) = TempLeveldir & "\data.dat" Then _ + File.Copy(pListFilesInLeveldir(i), oLeveldir & "\" & Path.GetFileName(pListFilesInLeveldir(i)), True) + Application.DoEvents() : Next + For i As Integer = 0 To pListFilesInLevelfiledir.Count - 1 + File.Copy(pListFilesInLevelfiledir(i), oLevelfiledir & "\" & Path.GetFileName(pListFilesInLevelfiledir(i)), True) + Application.DoEvents() : Next End If - End If - - 'Load patchlevel: - Dim PFile() As String = {} - Select Case PatchTyp - Case 0 : PFile = File.ReadAllLines(TempLeveldir & "\data.dat") - Case 1 : PFile = File.ReadAllLines(PatchFile) - End Select - - 'Apply lines in patch to the level: - For Each l As String In PFile - If Not PLevel.Contains(l) Then PLevel.Add(l) Next - 'Copy and replace files - If PatchTyp = 0 Then - Dim pListFilesInLeveldir() As String = Directory.GetFiles(TempLeveldir) : Dim pListFilesInLevelfiledir() As String = {} : If Directory.Exists(TempLevelfiledir) Then pListFilesInLevelfiledir = Directory.GetFiles(TempLevelfiledir) - Dim oListFilesInLeveldir() As String = Directory.GetFiles(oLeveldir) : Dim oListFilesInLevelfiledir() As String = {} : If Directory.Exists(oLevelfiledir) Then oListFilesInLevelfiledir = Directory.GetFiles(oLevelfiledir) - If Not Directory.Exists(oLevelfiledir) And oListFilesInLevelfiledir.Count > 0 Then Directory.CreateDirectory(oLevelfiledir) - For i As Integer = 0 To pListFilesInLeveldir.Count - 1 - If Not pListFilesInLeveldir(i) = TempLeveldir & "\data.dat" Then - File.Copy(pListFilesInLeveldir(i), oLeveldir & "\" & Path.GetFileName(pListFilesInLeveldir(i)), True) : End If - Application.DoEvents() : Next - For i As Integer = 0 To pListFilesInLevelfiledir.Count - 1 - File.Copy(pListFilesInLevelfiledir(i), oLevelfiledir & "\" & Path.GetFileName(pListFilesInLevelfiledir(i)), True) - Application.DoEvents() : Next - End If - 'Wirte new level file Do While PLevel.Contains("") - PLevel.Remove("") : Application.DoEvents() : Loop - File.WriteAllLines(OriginalLevel, PLevel.ToArray) + PLevel.Remove("") : Application.DoEvents() + Loop + File.WriteAllLines(originalLevel, PLevel.ToArray) Return 1 End Function - - Shared Function GetHelp() As String - Return "Not aviable yet!" - End Function End Class Public Class PatchSettings - - Private _CopyBlocksEtc As Boolean = True - Private _CopyGraphics As Boolean = True - Private _CopyConfigs As Boolean = True - Private _CopyEvents As Boolean = True - Private _CopyLayers As Boolean = True - Private _CopyScripts As Boolean = True - Private _CopyVariables As Boolean = True - - Public Property CopyBlocksEtc As Boolean - Get - Return _CopyBlocksEtc - End Get - Set(value As Boolean) - _CopyBlocksEtc = value - End Set - End Property - - Public Property CopyGraphics As Boolean - Get - Return _CopyGraphics - End Get - Set(value As Boolean) - _CopyGraphics = value - End Set - End Property - - Public Property CopyConfigs As Boolean - Get - Return _CopyConfigs - End Get - Set(value As Boolean) - _CopyConfigs = value - End Set - End Property - - Public Property CopyEvents As Boolean - Get - Return _CopyEvents - End Get - Set(value As Boolean) - _CopyEvents = value - End Set - End Property - - Public Property CopyLayers As Boolean - Get - Return _CopyLayers - End Get - Set(value As Boolean) - _CopyLayers = value - End Set - End Property - - Public Property CopyScripts As Boolean - Get - Return _CopyScripts - End Get - Set(value As Boolean) - _CopyScripts = value - End Set - End Property - - Public Property CopyVariables As Boolean - Get - Return _CopyVariables - End Get - Set(value As Boolean) - _CopyVariables = value - End Set - End Property + Public Property CopyBlocksEtc As Boolean = True + Public Property CopyGraphics As Boolean = True + Public Property CopyConfigs As Boolean = True + Public Property CopyEvents As Boolean = True + Public Property CopyLayers As Boolean = True + Public Property CopyScripts As Boolean = True + Public Property CopyVariables As Boolean = True End Class \ No newline at end of file diff --git a/SMBX Magic Patcher/My Project/AssemblyInfo.vb b/SMBX Magic Patcher/My Project/AssemblyInfo.vb index 826a644..783cf0c 100644 --- a/SMBX Magic Patcher/My Project/AssemblyInfo.vb +++ b/SMBX Magic Patcher/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SMBX Magic Patcher/SMBX Magic Patcher.vbproj b/SMBX Magic Patcher/SMBX Magic Patcher.vbproj index 1b76d4f..908ba00 100644 --- a/SMBX Magic Patcher/SMBX Magic Patcher.vbproj +++ b/SMBX Magic Patcher/SMBX Magic Patcher.vbproj @@ -24,6 +24,7 @@ bin\Debug\ SMBX Magic Patcher.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false AnyCPU @@ -51,7 +52,7 @@ 1485383780_magic-wand-star-fantasy-magician-witchcraft.ico - +