diff --git a/BTDToolbox/BTDToolbox.csproj b/BTDToolbox/BTDToolbox.csproj index 8b725ae..8db2fb7 100644 --- a/BTDToolbox/BTDToolbox.csproj +++ b/BTDToolbox/BTDToolbox.csproj @@ -69,6 +69,7 @@ + @@ -141,6 +142,12 @@ FlashReader.cs + + Form + + + SelectGame.cs + Form @@ -199,6 +206,9 @@ FlashReader.cs + + SelectGame.cs + SettingsWindow.cs diff --git a/BTDToolbox/Classes/GeneralMethods.cs b/BTDToolbox/Classes/GeneralMethods.cs index 4f0959f..5c0f23d 100644 --- a/BTDToolbox/Classes/GeneralMethods.cs +++ b/BTDToolbox/Classes/GeneralMethods.cs @@ -352,17 +352,17 @@ public static void CreateBackup(string game) ConsoleHandler.appendLog("Unable to create backup for " + game + "."); } } - public static void SteamValidateBTD5() + public static void SteamValidate(string game) { - Process.Start("steam://validate/306020"); - } - public static void SteamValidateBTDB() - { - Process.Start("steam://validate/444640"); - } - public static void SteamValidateBMC() - { - Process.Start("steam://validate/1252780"); + string url = ""; + if (game == "BTD5") + url = "306020"; + else if (game == "BTDB") + url = "444640"; + else if (game == "BMC") + url = "1252780"; + + Process.Start("steam://validate/" + url); } public static void BackupLOC(string game) { @@ -534,31 +534,34 @@ public static void browseForExe(string game) { string exeName = Get_EXE_Name(game); - if (exeName != null && exeName != "") + if(!Guard.IsStringValid(exeName)) + return; + + + MessageBox.Show("Please browse for " + exeName + ".\n\nMake sure that your game is UNMODDED, otherwise Toolbox will make a corrupt backup"); + ConsoleHandler.appendLog("Make sure that your game is UNMODDED, otherwise Toolbox will make a corrupt backup.."); + string exePath = BrowseForFile("Open game exe", "exe", "Exe files (*.exe)|*.exe|All files (*.*)|*.*", ""); + if (!Guard.IsStringValid(exePath)) { - MessageBox.Show("Please browse for " + exeName + ".\n\nMake sure that your game is UNMODDED, otherwise Toolbox will make a corrupt backup"); - ConsoleHandler.appendLog("Make sure that your game is UNMODDED, otherwise Toolbox will make a corrupt backup.."); - string exePath = BrowseForFile("Open game exe", "exe", "Exe files (*.exe)|*.exe|All files (*.*)|*.*", ""); - if (exePath != null && exePath != "") - { - if (exePath.Contains(exeName)) - { - string gameDir = exePath.Replace("\\" + exeName, ""); - if (game == "BTD5") - Main.BTD5_Dir = gameDir; - else if (game == "BTDB") - Main.BTDB_Dir = gameDir; - else if (game == "BMC") - Main.BMC_Dir = gameDir; - - Serializer.SaveConfig(Main.getInstance(), "directories"); - } - else - { - ConsoleHandler.appendLog("You selected an Invalid .exe. Please browse for the exe for your game."); - } - } + ConsoleHandler.force_appendLog("Invalid EXE path!"); + return; + } + + if (!exePath.Contains(exeName)) + { + ConsoleHandler.appendLog("You selected an Invalid .exe. Please browse for the exe for your game."); + return; } + + string gameDir = exePath.Replace("\\" + exeName, ""); + if (game == "BTD5") + Main.BTD5_Dir = gameDir; + else if (game == "BTDB") + Main.BTDB_Dir = gameDir; + else if (game == "BMC") + Main.BMC_Dir = gameDir; + + Serializer.SaveConfig(Main.getInstance(), "directories"); } public static string OutputJet() { diff --git a/BTDToolbox/Classes/Guard.cs b/BTDToolbox/Classes/Guard.cs new file mode 100644 index 0000000..40addff --- /dev/null +++ b/BTDToolbox/Classes/Guard.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BTDToolbox.Classes +{ + class Guard + { + public static bool IsStringValid(string input) + { + if (input != null && input != "") + return true; + else + return false; + } + } +} diff --git a/BTDToolbox/Classes/NewProjects/ProjectHandler.cs b/BTDToolbox/Classes/NewProjects/ProjectHandler.cs index c43c316..e7357a0 100644 --- a/BTDToolbox/Classes/NewProjects/ProjectHandler.cs +++ b/BTDToolbox/Classes/NewProjects/ProjectHandler.cs @@ -57,6 +57,9 @@ public static ProjectClass.ProjectFile ReadProject(string projFile) } public static void SaveProject() { + if (project == null) + project = new ProjectClass.ProjectFile(); + project.ProjectName = CurrentProjectVariables.ProjectName; project.PathToProjectFiles = CurrentProjectVariables.PathToProjectFiles; project.PathToProjectClassFile = CurrentProjectVariables.PathToProjectClassFile; diff --git a/BTDToolbox/Extra Forms/EZCard_Editor.Designer.cs b/BTDToolbox/Extra Forms/EZCard_Editor.Designer.cs index 1a5108d..9b43bf9 100644 --- a/BTDToolbox/Extra Forms/EZCard_Editor.Designer.cs +++ b/BTDToolbox/Extra Forms/EZCard_Editor.Designer.cs @@ -1533,9 +1533,9 @@ private void InitializeComponent() this.Controls.Add(this.CardFiles_ComboBox); this.Controls.Add(this.Save_Button); this.Controls.Add(this.Card_Label); + this.Controls.Add(this.TowerPanel); this.Controls.Add(this.Tower_Bloon_Panel); this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.TowerPanel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.KeyPreview = true; this.MaximizeBox = false; diff --git a/BTDToolbox/Extra Forms/EasyTowerEditor.cs b/BTDToolbox/Extra Forms/EasyTowerEditor.cs index 336978f..6659531 100644 --- a/BTDToolbox/Extra Forms/EasyTowerEditor.cs +++ b/BTDToolbox/Extra Forms/EasyTowerEditor.cs @@ -240,11 +240,11 @@ private void PopulateUI() { if (game == "BTD5") { - GeneralMethods.SteamValidateBTD5(); + GeneralMethods.SteamValidate("BTD5"); } else { - GeneralMethods.SteamValidateBMC(); + GeneralMethods.SteamValidate("BMC"); } } else @@ -809,11 +809,16 @@ private void UpgradeName_TextBox_TextChanged(object sender, EventArgs e) { if (Upgrades_ListBox.Items.Count > 0) { - var item = Upgrades_ListBox.SelectedIndex; - Upgrades_ListBox.Items.RemoveAt(item); - Upgrades_ListBox.Items.Insert(item, UpgradeName_TextBox.Text); - upgradenames[item] = UpgradeName_TextBox.Text; - loc_upgradeNames[item] = UpgradeName_TextBox.Text; + if (Upgrades_ListBox.SelectedIndex < 0) + return; + + int item = Upgrades_ListBox.SelectedIndex;; + string text = UpgradeName_TextBox.Text; + Upgrades_ListBox.Items[item] = text; + upgradenames[item] = text; + + if(CurrentProjectVariables.GameName != "BTDB") + loc_upgradeNames[item] = UpgradeName_TextBox.Text; Upgrades_ListBox.SelectedIndex = item; UpgradeName_TextBox.SelectionStart = UpgradeName_TextBox.Text.Length; diff --git a/BTDToolbox/Extra Forms/SelectGame.Designer.cs b/BTDToolbox/Extra Forms/SelectGame.Designer.cs new file mode 100644 index 0000000..844456d --- /dev/null +++ b/BTDToolbox/Extra Forms/SelectGame.Designer.cs @@ -0,0 +1,123 @@ +namespace BTDToolbox.Extra_Forms +{ + partial class SelectGame + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.SelectGame_Label = new System.Windows.Forms.Label(); + this.BTD5_Button = new System.Windows.Forms.Button(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.BTDB_Button = new System.Windows.Forms.Button(); + this.BMC_Button = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // SelectGame_Label + // + this.SelectGame_Label.AutoSize = true; + this.SelectGame_Label.Location = new System.Drawing.Point(31, 9); + this.SelectGame_Label.Name = "SelectGame_Label"; + this.SelectGame_Label.Size = new System.Drawing.Size(207, 18); + this.SelectGame_Label.TabIndex = 0; + this.SelectGame_Label.Text = "What Game is Your Mod For?"; + // + // BTD5_Button + // + this.BTD5_Button.ForeColor = System.Drawing.Color.Black; + this.BTD5_Button.Location = new System.Drawing.Point(17, 52); + this.BTD5_Button.Name = "BTD5_Button"; + this.BTD5_Button.Size = new System.Drawing.Size(75, 25); + this.BTD5_Button.TabIndex = 1; + this.BTD5_Button.Text = "BTD5"; + this.BTD5_Button.UseVisualStyleBackColor = true; + this.BTD5_Button.Click += new System.EventHandler(this.BTD5_Button_Click); + // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65))))); + this.pictureBox1.Location = new System.Drawing.Point(-10, 40); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(349, 120); + this.pictureBox1.TabIndex = 2; + this.pictureBox1.TabStop = false; + // + // BTDB_Button + // + this.BTDB_Button.ForeColor = System.Drawing.Color.Black; + this.BTDB_Button.Location = new System.Drawing.Point(98, 52); + this.BTDB_Button.Name = "BTDB_Button"; + this.BTDB_Button.Size = new System.Drawing.Size(75, 25); + this.BTDB_Button.TabIndex = 3; + this.BTDB_Button.Text = "BTDB"; + this.BTDB_Button.UseVisualStyleBackColor = true; + this.BTDB_Button.Click += new System.EventHandler(this.BTDB_Button_Click); + // + // BMC_Button + // + this.BMC_Button.ForeColor = System.Drawing.Color.Black; + this.BMC_Button.Location = new System.Drawing.Point(179, 52); + this.BMC_Button.Name = "BMC_Button"; + this.BMC_Button.Size = new System.Drawing.Size(75, 25); + this.BMC_Button.TabIndex = 4; + this.BMC_Button.Text = "BMC"; + this.BMC_Button.UseVisualStyleBackColor = true; + this.BMC_Button.Click += new System.EventHandler(this.BMC_Button_Click); + // + // SelectGame + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.ClientSize = new System.Drawing.Size(267, 89); + this.Controls.Add(this.BMC_Button); + this.Controls.Add(this.BTDB_Button); + this.Controls.Add(this.BTD5_Button); + this.Controls.Add(this.SelectGame_Label); + this.Controls.Add(this.pictureBox1); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ForeColor = System.Drawing.Color.White; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.MaximizeBox = false; + this.Name = "SelectGame"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "SelectGame"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label SelectGame_Label; + private System.Windows.Forms.Button BTD5_Button; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Button BTDB_Button; + private System.Windows.Forms.Button BMC_Button; + } +} \ No newline at end of file diff --git a/BTDToolbox/Extra Forms/SelectGame.cs b/BTDToolbox/Extra Forms/SelectGame.cs new file mode 100644 index 0000000..38e1834 --- /dev/null +++ b/BTDToolbox/Extra Forms/SelectGame.cs @@ -0,0 +1,154 @@ +using BTDToolbox.Classes.NewProjects; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using static BTDToolbox.GeneralMethods; + +namespace BTDToolbox.Extra_Forms +{ + public partial class SelectGame : Form + { + #region Constructors + public SelectGame() + { + InitializeComponent(); + } + + /// + /// Constructs the form with a jet file path to pass it to other forms easier. This would be used for example + /// if the user browsed for a jet file, then the game name is asked for. + /// + /// Path to the jet file that was selected + public SelectGame(string jetPath) : this() + { + this.JetPath = jetPath; + } + #endregion + + + #region Properties + public string JetPath { get; set; } + public string GameName { get; set; } + #endregion + + public void OnGameSelected() + { + if (DoWork(GameName) == false) + { + this.Close(); + return; + } + + ZipForm.existingJetFile = this.JetPath; + + Main.gameName = GameName; + Serializer.SaveConfig(this, "game"); + + ProjectHandler.CreateProject(); + CurrentProjectVariables.GameName = GameName; + CurrentProjectVariables.GamePath = GeneralMethods.ReturnGamePath(GameName); + ProjectHandler.SaveProject(); + + + var getName = new SetProjectName(); + getName.Show(); + + this.Close(); + } + + public bool DoWork(string gameName) + { + if (isGamePathValid(gameName) == false) + { + string gameFolder = ""; + if (gameName == "BTD5") + gameFolder = "BloonsTD5"; + if (gameName == "BTDB") + gameFolder = "Bloons TD Battles"; + if (gameName == "BMC") + gameFolder = "Bloons Monkey City"; + + bool failed = false; + string tryFindGameDir = Main.TryFindSteamDir(gameFolder); + + if (tryFindGameDir == "") + { + failed = true; + ConsoleHandler.appendLog("Failed to automatically aquire game dir"); + } + else + { + ConsoleHandler.appendLog("Game directory was automatically aquired..."); + if (gameName == "BTD5") + Main.BTD5_Dir = tryFindGameDir; + else if (gameName == "BTDB") + Main.BTDB_Dir = tryFindGameDir; + else if (gameName == "BMC") + Main.BMC_Dir = tryFindGameDir; + + Serializer.SaveConfig(this, "directories"); + + CurrentProjectVariables.GameName = tryFindGameDir; + ProjectHandler.SaveProject(); + } + + if (failed) + { + DialogResult diag = MessageBox.Show("Unable to find the game directory. Do you want to create the project without" + + " the game? Choose no to browse for your game's EXE." + + " If you choose Yes, you wont be able to launch your mod until you select it.", "Browse for EXE", MessageBoxButtons.YesNoCancel); ; + + if (diag == DialogResult.Cancel) + return false; + else if (diag == DialogResult.Yes) + { + ConsoleHandler.appendLog("Please browse for " + Get_EXE_Name(gameName)); + browseForExe(gameName); + if (isGamePathValid(gameName) == false) + { + ConsoleHandler.appendLog("Theres been an error identifying your game"); + return false; + } + } + } + } + + if (!Validate_Backup(gameName)) + CreateBackup(gameName); + + if (!Validate_Backup(gameName)) + { + ConsoleHandler.force_appendNotice("Failed to create a new project because the backup failed to be aquired..."); + return false; + } + return true; + } + + + #region UI Events + private void BTD5_Button_Click(object sender, EventArgs e) + { + GameName = "BTD5"; + OnGameSelected(); + } + + private void BTDB_Button_Click(object sender, EventArgs e) + { + GameName = "BTDB"; + OnGameSelected(); + } + + private void BMC_Button_Click(object sender, EventArgs e) + { + GameName = "BMC"; + OnGameSelected(); + } + #endregion + } +} diff --git a/BTDToolbox/Extra Forms/SelectGame.resx b/BTDToolbox/Extra Forms/SelectGame.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/BTDToolbox/Extra Forms/SelectGame.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/BTDToolbox/JsonEditor_Instance.Designer.cs b/BTDToolbox/JsonEditor_Instance.Designer.cs index 1a1d47f..4d946b9 100644 --- a/BTDToolbox/JsonEditor_Instance.Designer.cs +++ b/BTDToolbox/JsonEditor_Instance.Designer.cs @@ -40,6 +40,7 @@ private void InitializeComponent() this.ShowReplaceMenu_Button = new System.Windows.Forms.ToolStripMenuItem(); this.FindSubtask_Button = new System.Windows.Forms.ToolStripMenuItem(); this.ReformatJSON_Button = new System.Windows.Forms.ToolStripMenuItem(); + this.disableAutoformattinhToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.EZCard_Button = new System.Windows.Forms.ToolStripMenuItem(); this.EZBoon_Button = new System.Windows.Forms.ToolStripMenuItem(); this.EZTowerEditor_Button = new System.Windows.Forms.ToolStripMenuItem(); @@ -80,7 +81,7 @@ private void InitializeComponent() this.findSubtaskToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.getThisSubtaskNumberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.Encrypt_Button = new System.Windows.Forms.Button(); - this.disableAutoformattinhToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CloseFindPanel_Button = new System.Windows.Forms.Button(); this.JsonToolstrip.SuspendLayout(); this.Find_Panel.SuspendLayout(); this.SearchOptions_Panel.SuspendLayout(); @@ -213,6 +214,13 @@ private void InitializeComponent() this.ReformatJSON_Button.Text = "Re-format JSON"; this.ReformatJSON_Button.Click += new System.EventHandler(this.ReformatJSON_Button_Click); // + // disableAutoformattinhToolStripMenuItem + // + this.disableAutoformattinhToolStripMenuItem.Name = "disableAutoformattinhToolStripMenuItem"; + this.disableAutoformattinhToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.disableAutoformattinhToolStripMenuItem.Text = "Disable auto-formatting"; + this.disableAutoformattinhToolStripMenuItem.Click += new System.EventHandler(this.DisableAutoformattinhToolStripMenuItem_Click); + // // EZCard_Button // this.EZCard_Button.Name = "EZCard_Button"; @@ -384,6 +392,7 @@ private void InitializeComponent() // this.Find_Panel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.Find_Panel.Controls.Add(this.CloseFindPanel_Button); this.Find_Panel.Controls.Add(this.SearchOptions_Button); this.Find_Panel.Controls.Add(this.Find_Button); this.Find_Panel.Controls.Add(this.Find_TB); @@ -569,12 +578,18 @@ private void InitializeComponent() this.Encrypt_Button.Visible = false; this.Encrypt_Button.Click += new System.EventHandler(this.Encrypt_Button_Click); // - // disableAutoformattinhToolStripMenuItem + // CloseFindPanel_Button // - this.disableAutoformattinhToolStripMenuItem.Name = "disableAutoformattinhToolStripMenuItem"; - this.disableAutoformattinhToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.disableAutoformattinhToolStripMenuItem.Text = "Disable auto-formatting"; - this.disableAutoformattinhToolStripMenuItem.Click += new System.EventHandler(this.DisableAutoformattinhToolStripMenuItem_Click); + this.CloseFindPanel_Button.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.CloseFindPanel_Button.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); + this.CloseFindPanel_Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.CloseFindPanel_Button.Location = new System.Drawing.Point(0, 1); + this.CloseFindPanel_Button.Name = "CloseFindPanel_Button"; + this.CloseFindPanel_Button.Size = new System.Drawing.Size(25, 20); + this.CloseFindPanel_Button.TabIndex = 35; + this.CloseFindPanel_Button.Text = "X"; + this.CloseFindPanel_Button.UseVisualStyleBackColor = false; + this.CloseFindPanel_Button.Click += new System.EventHandler(this.CloseFindPanel_Button_Click); // // JsonEditor_Instance // @@ -657,5 +672,6 @@ private void InitializeComponent() private System.Windows.Forms.Button Encrypt_Button; private System.Windows.Forms.ToolStripMenuItem ReformatJSON_Button; private System.Windows.Forms.ToolStripMenuItem disableAutoformattinhToolStripMenuItem; + private System.Windows.Forms.Button CloseFindPanel_Button; } } diff --git a/BTDToolbox/JsonEditor_Instance.cs b/BTDToolbox/JsonEditor_Instance.cs index acdc019..8088db9 100644 --- a/BTDToolbox/JsonEditor_Instance.cs +++ b/BTDToolbox/JsonEditor_Instance.cs @@ -746,11 +746,11 @@ private void NoItem_CM_ItemClicked(object sender, ToolStripItemClickedEventArgs Editor_TextBox.SelectionStart = CharIndex_UnderMouse; Editor_TextBox.Paste(); } - if (e.ClickedItem.Text == "Find subtask") + if (e.ClickedItem.Text == "Find Subtask") { FindSubtask_Button_Event(); } - if (e.ClickedItem.Text == "Get current subtask number") + if (e.ClickedItem.Text == "Get this subtask number") { GetSubtaskNum(); } @@ -1152,5 +1152,16 @@ private void DisableAutoformattinhToolStripMenuItem_Click(object sender, EventAr "Or, you can change it in Settings, which you can find under the \"File\" button at the top of toolbox."); } } + + private void CloseFindPanel_Button_Click(object sender, EventArgs e) + { + Find_Panel.Hide(); + + Find_TB.Text = ""; + Replace_TB.Text = ""; + SearchOptions_Panel.Visible = false; + Editor_TextBox.Size = new Size(Editor_TextBox.Size.Width, Editor_TextBox.Size.Height + 80); + tB_line.Size = new Size(tB_line.Size.Width, tB_line.Size.Height + 80); + } } } diff --git a/BTDToolbox/Main.Designer.cs b/BTDToolbox/Main.Designer.cs index 048a4ec..cdd7593 100644 --- a/BTDToolbox/Main.Designer.cs +++ b/BTDToolbox/Main.Designer.cs @@ -54,8 +54,8 @@ private void InitializeComponent() this.bTDFontsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fontForPCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.onlineFontGeneratorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - //this.combineModsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - //this.modUpdaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.combineModsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.modUpdaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.spriteEditingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.spriteSheetDecompilerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.spriteAnimationVisualizerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -69,7 +69,7 @@ private void InitializeComponent() this.getBTDBPasswordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.FlashReader = new System.Windows.Forms.ToolStripMenuItem(); - //this.bTD5FlashMapEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bTD5FlashMapEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.ToggleConsole = new System.Windows.Forms.ToolStripMenuItem(); this.OpenJetExplorer = new System.Windows.Forms.ToolStripMenuItem(); @@ -80,6 +80,7 @@ private void InitializeComponent() this.bTD5DirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bTDBDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem(); + this.ShowBMCPass_Button = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.bTDBPasswordManagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.advancedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -90,8 +91,8 @@ private void InitializeComponent() this.EZCard_Editor = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restorejetToBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Backup_BTD5 = new System.Windows.Forms.ToolStripMenuItem(); - this.Backup_BTDB = new System.Windows.Forms.ToolStripMenuItem(); + this.Restore_BTD5 = new System.Windows.Forms.ToolStripMenuItem(); + this.Restore_BTDB = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); this.restoreBTD5LocToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreBTDBattlesLOCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -111,7 +112,7 @@ private void InitializeComponent() this.ValidateBTDB = new System.Windows.Forms.ToolStripMenuItem(); this.eraseConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.contactUsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ContactUs = new System.Windows.Forms.ToolStripMenuItem(); this.Credits = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.UpdaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -122,10 +123,13 @@ private void InitializeComponent() this.TestForm = new System.Windows.Forms.ToolStripMenuItem(); this.testingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.versionTag = new System.Windows.Forms.Label(); - this.combineModsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bTD5FlashMapEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.modUpdaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowBMCPass_Button = new System.Windows.Forms.ToolStripMenuItem(); + this.resetBMCexeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.Restore_BMC = new System.Windows.Forms.ToolStripMenuItem(); + this.Replace_BMC_Backup = new System.Windows.Forms.ToolStripMenuItem(); + this.ValidateBMC = new System.Windows.Forms.ToolStripMenuItem(); + this.restoreBMCLocToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forBMCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bMCDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -170,7 +174,7 @@ private void InitializeComponent() this.NewProject_From_Backup, this.btdpToolStripMenuItem}); this.New_ToolStrip.Name = "New_ToolStrip"; - this.New_ToolStrip.Size = new System.Drawing.Size(142, 22); + this.New_ToolStrip.Size = new System.Drawing.Size(180, 22); this.New_ToolStrip.Text = "New"; // // New_BTD5_Proj @@ -219,41 +223,41 @@ private void InitializeComponent() this.Open_Existing_JetFile, this.OpenExistingProject}); this.openToolStripMenuItem1.Name = "openToolStripMenuItem1"; - this.openToolStripMenuItem1.Size = new System.Drawing.Size(142, 22); + this.openToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.openToolStripMenuItem1.Text = "Open"; // // Open_Existing_JetFile // this.Open_Existing_JetFile.Name = "Open_Existing_JetFile"; - this.Open_Existing_JetFile.Size = new System.Drawing.Size(155, 22); + this.Open_Existing_JetFile.Size = new System.Drawing.Size(180, 22); this.Open_Existing_JetFile.Text = "Existing .jet"; this.Open_Existing_JetFile.Click += new System.EventHandler(this.Open_Existing_JetFile_Click); // // OpenExistingProject // this.OpenExistingProject.Name = "OpenExistingProject"; - this.OpenExistingProject.Size = new System.Drawing.Size(155, 22); + this.OpenExistingProject.Size = new System.Drawing.Size(180, 22); this.OpenExistingProject.Text = "Existing project"; this.OpenExistingProject.Click += new System.EventHandler(this.OpenExistingProject_Click); // // MainForm_SaveButton // this.MainForm_SaveButton.Name = "MainForm_SaveButton"; - this.MainForm_SaveButton.Size = new System.Drawing.Size(142, 22); + this.MainForm_SaveButton.Size = new System.Drawing.Size(180, 22); this.MainForm_SaveButton.Text = "Save"; this.MainForm_SaveButton.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click); // // OpenSettings_Button // this.OpenSettings_Button.Name = "OpenSettings_Button"; - this.OpenSettings_Button.Size = new System.Drawing.Size(142, 22); + this.OpenSettings_Button.Size = new System.Drawing.Size(180, 22); this.OpenSettings_Button.Text = "Settings"; this.OpenSettings_Button.Click += new System.EventHandler(this.OpenSettings_Button_Click); // // openRecentToolStripMenuItem // this.openRecentToolStripMenuItem.Name = "openRecentToolStripMenuItem"; - this.openRecentToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.openRecentToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.openRecentToolStripMenuItem.Text = "Open Recent"; this.openRecentToolStripMenuItem.Visible = false; // @@ -290,83 +294,6 @@ private void InitializeComponent() this.Launch_Program_ToolStrip.Text = "Launch 🚀"; this.Launch_Program_ToolStrip.Click += new System.EventHandler(this.LaunchProgram_Click); // - // viewToolStripMenuItem1 - // - this.viewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ToggleConsole, - this.OpenJetExplorer, - this.toolStripSeparator6, - this.ShowBTD5_Pass, - this.ShowLastBattlesPass, - this.toolStripSeparator5, - this.bTD5DirectoryToolStripMenuItem, - this.bTDBDirectoryToolStripMenuItem, - this.toolStripMenuItem4}); - this.viewToolStripMenuItem1.ForeColor = System.Drawing.Color.White; - this.viewToolStripMenuItem1.Name = "viewToolStripMenuItem1"; - this.viewToolStripMenuItem1.Size = new System.Drawing.Size(44, 20); - this.viewToolStripMenuItem1.Text = "View"; - // - // ToggleConsole - // - this.ToggleConsole.Name = "ToggleConsole"; - this.ToggleConsole.Size = new System.Drawing.Size(167, 22); - this.ToggleConsole.Text = "Console"; - this.ToggleConsole.Click += new System.EventHandler(this.ToggleConsole_Click); - // - // OpenJetExplorer - // - this.OpenJetExplorer.Name = "OpenJetExplorer"; - this.OpenJetExplorer.Size = new System.Drawing.Size(167, 22); - this.OpenJetExplorer.Text = "Jet Explorer"; - this.OpenJetExplorer.Click += new System.EventHandler(this.OpenJetExplorer_Click); - // - - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(164, 6); - // - // ShowBTD5_Pass - // - this.ShowBTD5_Pass.Name = "ShowBTD5_Pass"; - this.ShowBTD5_Pass.Size = new System.Drawing.Size(167, 22); - this.ShowBTD5_Pass.Text = "BTD5 Password"; - this.ShowBTD5_Pass.Click += new System.EventHandler(this.ShowBTD5_Pass_Click); - // - // ShowLastBattlesPass - // - this.ShowLastBattlesPass.Name = "ShowLastBattlesPass"; - this.ShowLastBattlesPass.Size = new System.Drawing.Size(167, 22); - this.ShowLastBattlesPass.Text = "BTDB Password"; - this.ShowLastBattlesPass.Click += new System.EventHandler(this.ShowLastBattlesPass_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(164, 6); - // - // bTD5DirectoryToolStripMenuItem - // - this.bTD5DirectoryToolStripMenuItem.Name = "bTD5DirectoryToolStripMenuItem"; - this.bTD5DirectoryToolStripMenuItem.Size = new System.Drawing.Size(167, 22); - this.bTD5DirectoryToolStripMenuItem.Text = "BTD5 Directory"; - this.bTD5DirectoryToolStripMenuItem.Click += new System.EventHandler(this.BTD5DirectoryToolStripMenuItem_Click_1); - // - // bTDBDirectoryToolStripMenuItem - // - this.bTDBDirectoryToolStripMenuItem.Name = "bTDBDirectoryToolStripMenuItem"; - this.bTDBDirectoryToolStripMenuItem.Size = new System.Drawing.Size(167, 22); - this.bTDBDirectoryToolStripMenuItem.Text = "BTDB Directory"; - this.bTDBDirectoryToolStripMenuItem.Click += new System.EventHandler(this.BTDBDirectoryToolStripMenuItem_Click_1); - // - // toolStripMenuItem4 - // - this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(167, 22); - this.toolStripMenuItem4.Text = "Toolbox Directory"; - this.toolStripMenuItem4.Click += new System.EventHandler(this.ToolStripMenuItem4_Click); - // // toolStripMenuItem1 // this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -553,6 +480,7 @@ private void InitializeComponent() this.toolStripSeparator5, this.bTD5DirectoryToolStripMenuItem, this.bTDBDirectoryToolStripMenuItem, + this.bMCDirectoryToolStripMenuItem, this.toolStripMenuItem4, this.toolStripSeparator9, this.bTDBPasswordManagerToolStripMenuItem, @@ -621,6 +549,13 @@ private void InitializeComponent() this.toolStripMenuItem4.Text = "Toolbox Directory"; this.toolStripMenuItem4.Click += new System.EventHandler(this.ToolStripMenuItem4_Click); // + // ShowBMCPass_Button + // + this.ShowBMCPass_Button.Name = "ShowBMCPass_Button"; + this.ShowBMCPass_Button.Size = new System.Drawing.Size(204, 22); + this.ShowBMCPass_Button.Text = "BMC Password"; + this.ShowBMCPass_Button.Click += new System.EventHandler(this.ShowBMCPass_Button_Click); + // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; @@ -642,11 +577,12 @@ private void InitializeComponent() this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem"; this.advancedToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.advancedToolStripMenuItem.Text = "Advanced"; + this.advancedToolStripMenuItem.Visible = false; // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(135, 22); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.settingsToolStripMenuItem.Text = "Settings file"; this.settingsToolStripMenuItem.Click += new System.EventHandler(this.SettingsToolStripMenuItem_Click); // @@ -664,21 +600,21 @@ private void InitializeComponent() // EZ_TowerEditor // this.EZ_TowerEditor.Name = "EZ_TowerEditor"; - this.EZ_TowerEditor.Size = new System.Drawing.Size(155, 22); + this.EZ_TowerEditor.Size = new System.Drawing.Size(180, 22); this.EZ_TowerEditor.Text = "EZ Tower editor"; this.EZ_TowerEditor.Click += new System.EventHandler(this.EZ_TowerEditor_Click); // // EZ_BloonEditor // this.EZ_BloonEditor.Name = "EZ_BloonEditor"; - this.EZ_BloonEditor.Size = new System.Drawing.Size(155, 22); + this.EZ_BloonEditor.Size = new System.Drawing.Size(180, 22); this.EZ_BloonEditor.Text = "EZ Bloon editor"; this.EZ_BloonEditor.Click += new System.EventHandler(this.EZ_BloonEditor_Click); // // EZCard_Editor // this.EZCard_Editor.Name = "EZCard_Editor"; - this.EZCard_Editor.Size = new System.Drawing.Size(155, 22); + this.EZCard_Editor.Size = new System.Drawing.Size(180, 22); this.EZCard_Editor.Text = "EZ Card editor"; this.EZCard_Editor.Click += new System.EventHandler(this.EZCard_Editor_Click); // @@ -695,7 +631,7 @@ private void InitializeComponent() this.validateGameFilesToolStripMenuItem, this.eraseConsoleToolStripMenuItem, this.toolStripSeparator2, - this.contactUsToolStripMenuItem, + this.ContactUs, this.Credits, this.toolStripSeparator3, this.UpdaterToolStripMenuItem, @@ -709,31 +645,33 @@ private void InitializeComponent() // restorejetToBackupToolStripMenuItem // this.restorejetToBackupToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.Backup_BTD5, - this.Backup_BTDB}); + this.Restore_BTD5, + this.Restore_BTDB, + this.Restore_BMC}); this.restorejetToBackupToolStripMenuItem.Name = "restorejetToBackupToolStripMenuItem"; this.restorejetToBackupToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.restorejetToBackupToolStripMenuItem.Text = "Restore game\'s .jet"; // - // Backup_BTD5 + // Restore_BTD5 // - this.Backup_BTD5.Name = "Backup_BTD5"; - this.Backup_BTD5.Size = new System.Drawing.Size(158, 22); - this.Backup_BTD5.Text = "Restore BTD5.jet"; - this.Backup_BTD5.Click += new System.EventHandler(this.Backup_BTD5_Click_1); + this.Restore_BTD5.Name = "Restore_BTD5"; + this.Restore_BTD5.Size = new System.Drawing.Size(180, 22); + this.Restore_BTD5.Text = "Restore BTD5.jet"; + this.Restore_BTD5.Click += new System.EventHandler(this.Backup_BTD5_Click_1); // - // Backup_BTDB + // Restore_BTDB // - this.Backup_BTDB.Name = "Backup_BTDB"; - this.Backup_BTDB.Size = new System.Drawing.Size(158, 22); - this.Backup_BTDB.Text = "Restore data.jet"; - this.Backup_BTDB.Click += new System.EventHandler(this.Backup_BTDB_Click_1); + this.Restore_BTDB.Name = "Restore_BTDB"; + this.Restore_BTDB.Size = new System.Drawing.Size(180, 22); + this.Restore_BTDB.Text = "Restore BTDB jet"; + this.Restore_BTDB.Click += new System.EventHandler(this.Backup_BTDB_Click_1); // // toolStripMenuItem5 // this.toolStripMenuItem5.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.restoreBTD5LocToolStripMenuItem, - this.restoreBTDBattlesLOCToolStripMenuItem}); + this.restoreBTDBattlesLOCToolStripMenuItem, + this.restoreBMCLocToolStripMenuItem}); this.toolStripMenuItem5.Name = "toolStripMenuItem5"; this.toolStripMenuItem5.Size = new System.Drawing.Size(210, 22); this.toolStripMenuItem5.Text = "Restore game\'s LOC file"; @@ -741,22 +679,23 @@ private void InitializeComponent() // restoreBTD5LocToolStripMenuItem // this.restoreBTD5LocToolStripMenuItem.Name = "restoreBTD5LocToolStripMenuItem"; - this.restoreBTD5LocToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.restoreBTD5LocToolStripMenuItem.Size = new System.Drawing.Size(196, 22); this.restoreBTD5LocToolStripMenuItem.Text = "Restore BTD5 Loc"; this.restoreBTD5LocToolStripMenuItem.Click += new System.EventHandler(this.RestoreBTD5LocToolStripMenuItem_Click); // // restoreBTDBattlesLOCToolStripMenuItem // this.restoreBTDBattlesLOCToolStripMenuItem.Name = "restoreBTDBattlesLOCToolStripMenuItem"; - this.restoreBTDBattlesLOCToolStripMenuItem.Size = new System.Drawing.Size(200, 22); - this.restoreBTDBattlesLOCToolStripMenuItem.Text = "Restore BTD Battles LOC"; + this.restoreBTDBattlesLOCToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.restoreBTDBattlesLOCToolStripMenuItem.Text = "Restore BTD Battles Loc"; this.restoreBTDBattlesLOCToolStripMenuItem.Click += new System.EventHandler(this.RestoreBTDBattlesLOCToolStripMenuItem_Click); // // remakeBackupjetToolStripMenuItem // this.remakeBackupjetToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Replace_BTD5_Backup, - this.Replace_BTDB_Backup}); + this.Replace_BTDB_Backup, + this.Replace_BMC_Backup}); this.remakeBackupjetToolStripMenuItem.Name = "remakeBackupjetToolStripMenuItem"; this.remakeBackupjetToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.remakeBackupjetToolStripMenuItem.Text = "Get a new backup .jet"; @@ -764,14 +703,14 @@ private void InitializeComponent() // Replace_BTD5_Backup // this.Replace_BTD5_Backup.Name = "Replace_BTD5_Backup"; - this.Replace_BTD5_Backup.Size = new System.Drawing.Size(150, 22); + this.Replace_BTD5_Backup.Size = new System.Drawing.Size(180, 22); this.Replace_BTD5_Backup.Text = "for BTD5"; this.Replace_BTD5_Backup.Click += new System.EventHandler(this.Replace_BTD5_Backup_Click); // // Replace_BTDB_Backup // this.Replace_BTDB_Backup.Name = "Replace_BTDB_Backup"; - this.Replace_BTDB_Backup.Size = new System.Drawing.Size(150, 22); + this.Replace_BTDB_Backup.Size = new System.Drawing.Size(180, 22); this.Replace_BTDB_Backup.Text = "for BTD Battles"; this.Replace_BTDB_Backup.Click += new System.EventHandler(this.Replace_BTDB_Backup_Click); // @@ -779,7 +718,8 @@ private void InitializeComponent() // this.createNewLOCFileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bTD5ToolStripMenuItem1, - this.bTDBattlesToolStripMenuItem}); + this.bTDBattlesToolStripMenuItem, + this.forBMCToolStripMenuItem}); this.createNewLOCFileToolStripMenuItem.Name = "createNewLOCFileToolStripMenuItem"; this.createNewLOCFileToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.createNewLOCFileToolStripMenuItem.Text = "Create new LOC file"; @@ -787,14 +727,14 @@ private void InitializeComponent() // bTD5ToolStripMenuItem1 // this.bTD5ToolStripMenuItem1.Name = "bTD5ToolStripMenuItem1"; - this.bTD5ToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); + this.bTD5ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.bTD5ToolStripMenuItem1.Text = "for BTD5"; this.bTD5ToolStripMenuItem1.Click += new System.EventHandler(this.BTD5ToolStripMenuItem1_Click); // // bTDBattlesToolStripMenuItem // this.bTDBattlesToolStripMenuItem.Name = "bTDBattlesToolStripMenuItem"; - this.bTDBattlesToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.bTDBattlesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.bTDBattlesToolStripMenuItem.Text = "for BTD Battles"; this.bTDBattlesToolStripMenuItem.Click += new System.EventHandler(this.BTDBattlesToolStripMenuItem_Click); // @@ -807,7 +747,8 @@ private void InitializeComponent() // this.Reset_EXE.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.resetBTD5exeToolStripMenuItem, - this.resetBTDBattlesexeToolStripMenuItem}); + this.resetBTDBattlesexeToolStripMenuItem, + this.resetBMCexeToolStripMenuItem}); this.Reset_EXE.Name = "Reset_EXE"; this.Reset_EXE.Size = new System.Drawing.Size(210, 22); this.Reset_EXE.Text = "Browse for game"; @@ -839,7 +780,8 @@ private void InitializeComponent() // this.validateGameFilesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ValidateBTD5, - this.ValidateBTDB}); + this.ValidateBTDB, + this.ValidateBMC}); this.validateGameFilesToolStripMenuItem.Name = "validateGameFilesToolStripMenuItem"; this.validateGameFilesToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.validateGameFilesToolStripMenuItem.Text = "Validate game files"; @@ -847,14 +789,14 @@ private void InitializeComponent() // ValidateBTD5 // this.ValidateBTD5.Name = "ValidateBTD5"; - this.ValidateBTD5.Size = new System.Drawing.Size(132, 22); + this.ValidateBTD5.Size = new System.Drawing.Size(180, 22); this.ValidateBTD5.Text = "BTD5"; this.ValidateBTD5.Click += new System.EventHandler(this.ValidateBTD5_Click); // // ValidateBTDB // this.ValidateBTDB.Name = "ValidateBTDB"; - this.ValidateBTDB.Size = new System.Drawing.Size(132, 22); + this.ValidateBTDB.Size = new System.Drawing.Size(180, 22); this.ValidateBTDB.Text = "BTD Battles"; this.ValidateBTDB.Click += new System.EventHandler(this.ValidateBTDB_Click); // @@ -870,11 +812,12 @@ private void InitializeComponent() this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(207, 6); // - // contactUsToolStripMenuItem + // ContactUs // - this.contactUsToolStripMenuItem.Name = "contactUsToolStripMenuItem"; - this.contactUsToolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.contactUsToolStripMenuItem.Text = "Contact Us"; + this.ContactUs.Name = "ContactUs"; + this.ContactUs.Size = new System.Drawing.Size(210, 22); + this.ContactUs.Text = "Contact Us"; + this.ContactUs.Click += new System.EventHandler(this.ContactUs_Click); // // Credits // @@ -923,21 +866,21 @@ private void InitializeComponent() // themedFormToolStripMenuItem // this.themedFormToolStripMenuItem.Name = "themedFormToolStripMenuItem"; - this.themedFormToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.themedFormToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.themedFormToolStripMenuItem.Text = "Themed Form"; this.themedFormToolStripMenuItem.Click += new System.EventHandler(this.Debug_ThemedForm_Click); // // TestForm // this.TestForm.Name = "TestForm"; - this.TestForm.Size = new System.Drawing.Size(148, 22); + this.TestForm.Size = new System.Drawing.Size(180, 22); this.TestForm.Text = "JSON Editor"; this.TestForm.Click += new System.EventHandler(this.TestForm_Click); // // testingToolStripMenuItem // this.testingToolStripMenuItem.Name = "testingToolStripMenuItem"; - this.testingToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.testingToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.testingToolStripMenuItem.Text = "Testing"; this.testingToolStripMenuItem.Click += new System.EventHandler(this.TestingToolStripMenuItem_Click); // @@ -954,12 +897,54 @@ private void InitializeComponent() this.versionTag.TabIndex = 3; this.versionTag.Text = "null"; // - // ShowBMCPass_Button + // resetBMCexeToolStripMenuItem // - this.ShowBMCPass_Button.Name = "ShowBMCPass_Button"; - this.ShowBMCPass_Button.Size = new System.Drawing.Size(204, 22); - this.ShowBMCPass_Button.Text = "BMC Password"; - this.ShowBMCPass_Button.Click += new System.EventHandler(this.ShowBMCPass_Button_Click); + this.resetBMCexeToolStripMenuItem.Name = "resetBMCexeToolStripMenuItem"; + this.resetBMCexeToolStripMenuItem.Size = new System.Drawing.Size(184, 22); + this.resetBMCexeToolStripMenuItem.Text = "Reset BMC.exe"; + this.resetBMCexeToolStripMenuItem.Click += new System.EventHandler(this.resetBMCexeToolStripMenuItem_Click); + // + // Restore_BMC + // + this.Restore_BMC.Name = "Restore_BMC"; + this.Restore_BMC.Size = new System.Drawing.Size(180, 22); + this.Restore_BMC.Text = "Restore BMC jet"; + this.Restore_BMC.Click += new System.EventHandler(this.Restore_BMC_Click); + // + // Replace_BMC_Backup + // + this.Replace_BMC_Backup.Name = "Replace_BMC_Backup"; + this.Replace_BMC_Backup.Size = new System.Drawing.Size(180, 22); + this.Replace_BMC_Backup.Text = "for BMC"; + this.Replace_BMC_Backup.Click += new System.EventHandler(this.Replace_BMC_Backup_Click); + // + // ValidateBMC + // + this.ValidateBMC.Name = "ValidateBMC"; + this.ValidateBMC.Size = new System.Drawing.Size(180, 22); + this.ValidateBMC.Text = "BMC"; + this.ValidateBMC.Click += new System.EventHandler(this.ValidateBMC_Click); + // + // restoreBMCLocToolStripMenuItem + // + this.restoreBMCLocToolStripMenuItem.Name = "restoreBMCLocToolStripMenuItem"; + this.restoreBMCLocToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.restoreBMCLocToolStripMenuItem.Text = "Restore BMC Loc"; + this.restoreBMCLocToolStripMenuItem.Click += new System.EventHandler(this.restoreBMCLocToolStripMenuItem_Click); + // + // forBMCToolStripMenuItem + // + this.forBMCToolStripMenuItem.Name = "forBMCToolStripMenuItem"; + this.forBMCToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.forBMCToolStripMenuItem.Text = "for BMC"; + this.forBMCToolStripMenuItem.Click += new System.EventHandler(this.forBMCToolStripMenuItem_Click); + // + // bMCDirectoryToolStripMenuItem + // + this.bMCDirectoryToolStripMenuItem.Name = "bMCDirectoryToolStripMenuItem"; + this.bMCDirectoryToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.bMCDirectoryToolStripMenuItem.Text = "BMC Directory"; + this.bMCDirectoryToolStripMenuItem.Click += new System.EventHandler(this.bMCDirectoryToolStripMenuItem_Click); // // Main // @@ -1024,15 +1009,15 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem spriteEditingToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem spriteSheetDecompilerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem spriteAnimationVisualizerToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem contactUsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem ContactUs; private System.Windows.Forms.ToolStripMenuItem Replace_BTD5_Backup; private System.Windows.Forms.ToolStripMenuItem Replace_BTDB_Backup; private System.Windows.Forms.ToolStripMenuItem Reset_EXE; private System.Windows.Forms.ToolStripMenuItem resetBTD5exeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem resetBTDBattlesexeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem restorejetToBackupToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem Backup_BTD5; - private System.Windows.Forms.ToolStripMenuItem Backup_BTDB; + private System.Windows.Forms.ToolStripMenuItem Restore_BTD5; + private System.Windows.Forms.ToolStripMenuItem Restore_BTDB; private System.Windows.Forms.ToolStripMenuItem resetUserSettingsToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; @@ -1087,6 +1072,13 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem advancedToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ShowBMCPass_Button; + private System.Windows.Forms.ToolStripMenuItem resetBMCexeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem Restore_BMC; + private System.Windows.Forms.ToolStripMenuItem Replace_BMC_Backup; + private System.Windows.Forms.ToolStripMenuItem ValidateBMC; + private System.Windows.Forms.ToolStripMenuItem restoreBMCLocToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem forBMCToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem bMCDirectoryToolStripMenuItem; } } diff --git a/BTDToolbox/Main.cs b/BTDToolbox/Main.cs index 8ef0370..f13c9cd 100644 --- a/BTDToolbox/Main.cs +++ b/BTDToolbox/Main.cs @@ -253,16 +253,10 @@ private void AddNewJet() { ZipForm.existingJetFile = ""; string path = BrowseForFile("Browse for an existing .jet file", "jet", "Jet files (*.jet)|*.jet|All files (*.*)|*.*", ""); - if (path != null && path != "") + if (Guard.IsStringValid(path) && path.Contains(".jet")) { - if (path.Contains(".jet")) - { - gameName = DetermineJet_Game(path); - ZipForm.existingJetFile = path; - Serializer.SaveConfig(this, "game"); - var getName = new SetProjectName(); - getName.Show(); - } + SelectGame select = new SelectGame(path); + select.Show(); } } private void OpenExistingProject_Click(object sender, EventArgs e) @@ -536,6 +530,11 @@ private void Replace_BTD5_Backup_Click(object sender, EventArgs e) { CreateBackup("BTD5"); } + private void Replace_BMC_Backup_Click(object sender, EventArgs e) + { + CreateBackup("BMC"); + } + private void TestForm_Click(object sender, EventArgs e) { JsonEditorHandler.OpenFile(CurrentProjectVariables.PathToProjectFiles + "\\Assets\\JSON\\TowerDefinitions\\DartMonkey.tower"); @@ -564,6 +563,19 @@ private void ResetBTDBattlesexeToolStripMenuItem_Click(object sender, EventArgs else ConsoleHandler.appendLog("Invalid game directory selected."); } + private void resetBMCexeToolStripMenuItem_Click(object sender, EventArgs e) + { + string g = "BMC"; + ConsoleHandler.appendLog("Please browse for MonkeyCity-Win.exe"); + browseForExe(g); + if (isGamePathValid(g) == true) + { + ConsoleHandler.appendLog("Success! Selected exe at: " + DeserializeConfig().BTDB_Directory); + } + else + ConsoleHandler.appendLog("Invalid game directory selected."); + } + private void ResetUserSettingsToolStripMenuItem_Click(object sender, EventArgs e) { ConsoleHandler.appendLog("Resetting user settings..."); @@ -583,7 +595,11 @@ private void Backup_BTDB_Click_1(object sender, EventArgs e) { RestoreGame_ToBackup("BTDB"); } - + private void Restore_BMC_Click(object sender, EventArgs e) + { + RestoreGame_ToBackup("BMC"); + } + private void BTDFontsToolStripMenuItem_Click(object sender, EventArgs e) { @@ -611,46 +627,8 @@ private void OpenBTDToolboxGithubToolStripMenuItem_Click(object sender, EventArg private void TestingToolStripMenuItem_Click(object sender, EventArgs e) { - string startDir = ""; - if (gameName != "") - { - MessageBox.Show("Please select the sprite file you want to decompile"); - if (gameName == "BTD5") - { - if(Serializer.Deserialize_Config().BTD5_Directory != "") - { - startDir = Serializer.Deserialize_Config().BTD5_Directory + "\\Assets\\Textures"; - } - } - else - { - if (Serializer.Deserialize_Config().BTDB_Directory != "") - { - startDir = Serializer.Deserialize_Config().BTDB_Directory + "\\Assets\\Textures"; - } - } - } - OpenFileDialog ofd = new OpenFileDialog(); - ofd.InitialDirectory = startDir; - ofd.Title = "Browse for sprite sheet"; - ofd.Filter = "Image files (*.png, *.jpng, *.jpg, *.jpeg) | *.png; *.jpng; *.jpg; *.jpeg"; - ofd.Multiselect = true; - if(ofd.ShowDialog() == DialogResult.OK) - { - if(ofd.FileName.EndsWith(".png") || ofd.FileName.EndsWith(".jpng") || ofd.FileName.EndsWith(".jpg") || ofd.FileName.EndsWith(".jpeg")) - { - SpriteSheet_Handler handler = new SpriteSheet_Handler(); - Thread thread = new Thread(delegate () { handler.Extract(ofd.FileName, "Cell"); }); - thread.Start(); - - } - else - { - MessageBox.Show("You selected an invalid filetype. Please contact the TD Toolbox team if you think we should add this to the list"); - } - } - /*BattlesPassManager mgr = new BattlesPassManager(); - mgr.Show();*/ + SelectGame form = new SelectGame(); + form.Show(); } private void ToolStripMenuItem2_Click(object sender, EventArgs e) @@ -693,6 +671,30 @@ private void GetBTDBPasswordToolStripMenuItem_Click(object sender, EventArgs e) } } + + + private void bMCDirectoryToolStripMenuItem_Click(object sender, EventArgs e) + { + if (isGamePathValid("BMC")) + { + ConsoleHandler.appendLog("Opening Monkey City Directory"); + Process.Start(DeserializeConfig().BMC_Directory); + } + else + { + ConsoleHandler.appendLog("Could not find your BMC directory"); + browseForExe("BMC"); + if (isGamePathValid("BMC")) + { + ConsoleHandler.appendLog("Opening BMC Directory"); + Process.Start(DeserializeConfig().BMC_Directory); + } + else + { + ConsoleHandler.appendLog("Something went wrong..."); + } + } + } private void BTD5DirectoryToolStripMenuItem_Click_1(object sender, EventArgs e) { if (isGamePathValid("BTD5")) @@ -825,6 +827,10 @@ private void BTDBattlesToolStripMenuItem_Click(object sender, EventArgs e) { CreateBackup("BTDB"); } + private void forBMCToolStripMenuItem_Click(object sender, EventArgs e) + { + CreateBackup("BMC"); + } private void RestoreBTD5LocToolStripMenuItem_Click(object sender, EventArgs e) { @@ -835,6 +841,12 @@ private void RestoreBTDBattlesLOCToolStripMenuItem_Click(object sender, EventArg { RestoreGame_ToBackup_LOC("BTDB"); } + private void restoreBMCLocToolStripMenuItem_Click(object sender, EventArgs e) + { + RestoreGame_ToBackup_LOC("BMC"); + } + + private void Reset_EXE_Click(object sender, EventArgs e) { @@ -847,12 +859,17 @@ private void Reset_EXE_MouseHover(object sender, EventArgs e) } private void ValidateBTD5_Click(object sender, EventArgs e) { - GeneralMethods.SteamValidateBTD5(); + SteamValidate("BTD5"); } private void ValidateBTDB_Click(object sender, EventArgs e) { - GeneralMethods.SteamValidateBTDB(); + SteamValidate("BTDB"); + } + private void ValidateBMC_Click(object sender, EventArgs e) + { + SteamValidate("BMC"); } + private void FontForPCToolStripMenuItem_Click(object sender, EventArgs e) { ConsoleHandler.appendLog("Opening download for BTD Font for PC"); @@ -998,5 +1015,10 @@ private void SettingsToolStripMenuItem_Click(object sender, EventArgs e) { } + + private void ContactUs_Click(object sender, EventArgs e) + { + Process.Start("https://discordapp.com/invite/jj5Q7mA"); + } } } \ No newline at end of file diff --git a/BTDToolbox/SetProjectName.cs b/BTDToolbox/SetProjectName.cs index 85e1546..1391636 100644 --- a/BTDToolbox/SetProjectName.cs +++ b/BTDToolbox/SetProjectName.cs @@ -38,6 +38,7 @@ public SetProjectName() this.AcceptButton = CreateProject_Button; this.Activate(); } + private void CreateProject_Button_Click(object sender, EventArgs e) { CreateProject(); diff --git a/BTDToolbox/ZipForm.cs b/BTDToolbox/ZipForm.cs index 3fa4b32..6805aa5 100644 --- a/BTDToolbox/ZipForm.cs +++ b/BTDToolbox/ZipForm.cs @@ -283,16 +283,11 @@ private void Extract_OnThread() else { try - { - this.Invoke(new Action(() => this.Close())); - backgroundThread.Abort(); - } + { this.Invoke(new Action(() => this.Close())); } catch (Exception ex) { error = true; PrintError(ex.Message); - this.Invoke(new Action(() => this.Close())); - backgroundThread.Abort(); } } } @@ -312,27 +307,21 @@ private void Extract_OnThread() if (varr == DialogResult.Cancel) { try - { - this.Invoke(new Action(() => this.Close())); - } + { this.Invoke(new Action(() => this.Close())); } catch (Exception ex) { + error = true; PrintError(ex.Message); - backgroundThread.Abort(); } - backgroundThread.Abort(); } } try - { - this.Invoke(new Action(() => this.Close())); - } + { this.Invoke(new Action(() => this.Close())); } catch (Exception ex) { + error = true; PrintError(ex.Message); - backgroundThread.Abort(); } - backgroundThread.Abort(); } public void Compile() { @@ -536,8 +525,23 @@ private void ZipCompileProgress(object sender, AddProgressEventArgs e) } private void PrintError(string exception) { + if (this == null) + return; + ConsoleHandler.appendLog("An error occured that may prevent the program from running properly.\r\nThe error is below: \r\n\r\n" + exception + "\r\n"); - this.Close(); + + if(exception == "The password did not match.") + { + MessageBox.Show("Failed to create project!!!\n\nThe password for the zip was incorrect, " + + "make sure you entered the correct password" + + " and selected the correct game for your mod (if you browsed for an existing" + + " mod rather than creating a new one)"); + } + + try + { this.Invoke(new Action(() => this.Close())); } + catch(System.InvalidOperationException) + { } } public static void CreateAssetBundleJet(string exportPath)