diff --git a/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/SafeCommand.cs b/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/SafeCommand.cs index 5c9cbec9..77f3870c 100644 --- a/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/SafeCommand.cs +++ b/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/SafeCommand.cs @@ -1,7 +1,7 @@ namespace TAS.Input.Commands; public static class SafeCommand { - // stop tas when out of Level/LevelLoader/LevelExit/Pico8/LevelEnter/LevelReenter(from CelesteTAS) + // stop tas when out of Level/LevelLoader/LevelExit/Pico8/LevelEnter // stop tas when entering Options/ModOptions UI public static bool DisallowUnsafeInput { get; set; } = true; public static bool DisallowUnsafeInputParsing { get; private set; } = true; diff --git a/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/SaveAndQuitReenterCommand.cs b/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/SaveAndQuitReenterCommand.cs index ad03baf0..76776be9 100644 --- a/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/SaveAndQuitReenterCommand.cs +++ b/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/SaveAndQuitReenterCommand.cs @@ -1,73 +1,23 @@ -using System; -using System.Collections; using System.Collections.Generic; using System.Reflection; using Celeste; using Mono.Cecil.Cil; using Monocle; +using MonoMod.Utils; using TAS.Module; using TAS.Utils; -namespace TAS.Input.Commands; +namespace TAS.Input.Commands; public static class SaveAndQuitReenterCommand { - public enum SaveAndQuitReenterMode { - Input, - Simulate - } - - public class LevelReenter : Scene { - public LevelReenter(Session session) { - AreaData.Get(session).RestoreASideAreaData(); - } - - public override void Begin() { - base.Begin(); - - Entity routine = new() {new Coroutine(Routine())}; - Add(routine); - Add(new HudRenderer()); - } - - private IEnumerator Routine() { - UserIO.SaveHandler(file: true, settings: true); - while (UserIO.Saving) yield return null; - while (SaveLoadIcon.OnScreen) yield return null; - - int slot = SaveData.Instance.FileSlot; - var saveData = UserIO.Load(SaveData.GetFilename(slot)); - SaveData.Start(saveData, slot); - - LevelEnter.Go(SaveData.Instance.CurrentSession, fromSaveData: true); - } - } - - private static bool justPressedSnQ = false; - public static SaveAndQuitReenterMode? LocalMode; - public static SaveAndQuitReenterMode? GlobalModeParsing; - public static SaveAndQuitReenterMode? GlobalModeRuntime; - - private static SaveAndQuitReenterMode Mode { - get { - if (LibTasHelper.Exporting) { - return SaveAndQuitReenterMode.Input; - } - - if (EnforceLegalCommand.EnabledWhenParsing) { - return SaveAndQuitReenterMode.Input; - } - - SaveAndQuitReenterMode? globalMode = ParsingCommand ? GlobalModeParsing : GlobalModeRuntime; - return LocalMode ?? globalMode ?? SaveAndQuitReenterMode.Simulate; - } - } + private static bool justPressedSnQ; private static int ActiveFileSlot { get { if (LibTasHelper.Exporting) { return 0; } - + if (Engine.Scene is Overworld {Current: OuiFileSelect select}) { return select.SlotIndex; } @@ -77,9 +27,10 @@ private static int ActiveFileSlot { } private static bool preventClear = false; + // Contains which slot was used for each command, to ensure that inputs before the current frame stay the same public static Dictionary InsertedSlots = new(); - + [Load] private static void Load() { typeof(Level) @@ -87,127 +38,83 @@ private static void Load() { .GetMethod("b__8", BindingFlags.NonPublic | BindingFlags.Instance) .IlHook((cursor, _) => cursor.Emit(OpCodes.Ldc_I4_1) .Emit(OpCodes.Stsfld, typeof(SaveAndQuitReenterCommand).GetFieldInfo(nameof(justPressedSnQ)))); - + typeof(Level).GetMethod("Update").IlHook((cursor, _) => cursor.Emit(OpCodes.Ldc_I4_0) - .Emit(OpCodes.Stsfld, typeof(SaveAndQuitReenterCommand).GetFieldInfo(nameof(justPressedSnQ)))); + .Emit(OpCodes.Stsfld, typeof(SaveAndQuitReenterCommand).GetFieldInfo(nameof(justPressedSnQ)))); } [ClearInputs] private static void Clear() { - if (preventClear) return; InsertedSlots.Clear(); } - [ClearInputs] - [ParseFileEnd] - private static void ParseFileEnd() { - GlobalModeParsing = null; - } - [DisableRun] private static void DisableRun() { - LocalMode = null; - GlobalModeRuntime = null; justPressedSnQ = false; } - + [TasCommand("SaveAndQuitReenter", ExecuteTiming = ExecuteTiming.Parse | ExecuteTiming.Runtime)] private static void SaveAndQuitReenter(string[] args, int studioLine, string filePath, int fileLine) { - LocalMode = null; + InputController controller = Manager.Controller; - if (args.IsNotEmpty()) { - if (Enum.TryParse(args[0], true, out SaveAndQuitReenterMode value)) { - LocalMode = value; - } else if (ParsingCommand) { - AbortTas("SaveAndQuitReenter command failed.\nMode must be Input or Simulate"); - return; + if (ParsingCommand) { + int slot = ActiveFileSlot; + if (InsertedSlots.TryGetValue(studioLine, out int prevSlot)) { + slot = prevSlot; + } else { + InsertedSlots[studioLine] = slot; } - } - if (ParsingCommand) { - if (Mode == SaveAndQuitReenterMode.Simulate) { - // Wait for the Save & Quit wipe - Manager.Controller.AddFrames("32", studioLine); + bool isSafe = !SafeCommand.DisallowUnsafeInputParsing; + + LibTasHelper.AddInputFrame("58"); + controller.AddFrames("31", studioLine); + Command.TryParse(controller, filePath, fileLine, "Unsafe", controller.CurrentParsingFrame, studioLine, out _); + controller.AddFrames("14", studioLine); + if (slot == -1) { + // Load debug slot + controller.AddFrames("1,D", studioLine); + controller.AddFrames("1,O", studioLine); + controller.AddFrames("33", studioLine); } else { - if (SafeCommand.DisallowUnsafeInputParsing) { - AbortTas("\"SaveAndQuitReenter, Input\" requires unsafe inputs"); - return; - } - - int slot = ActiveFileSlot; - if (InsertedSlots.TryGetValue(studioLine, out int prevSlot)) { - slot = prevSlot; + // Get to the save files screen + controller.AddFrames("1,O", studioLine); + controller.AddFrames("56", studioLine); + // Alternate 1,D and 1,F,180 to select the slot + for (int i = 0; i < slot; i++) { + controller.AddFrames(i % 2 == 0 ? "1,D" : "1,F,180", studioLine); } - LibTasHelper.AddInputFrame("58"); - Manager.Controller.AddFrames("31", studioLine); - Manager.Controller.AddFrames("14", studioLine); - - if (slot == -1) { - // Load debug slot - Manager.Controller.AddFrames("1,D", studioLine); - Manager.Controller.AddFrames("1,O", studioLine); - Manager.Controller.AddFrames("33", studioLine); - } else { - // Get to the save files screen - Manager.Controller.AddFrames("1,O", studioLine); - Manager.Controller.AddFrames("56", studioLine); - // Alternate 1,D and 1,F,180 to select the slot - for (int i = 0; i < slot; i++) { - Manager.Controller.AddFrames(i % 2 == 0 ? "1,D" : "1,F,180", studioLine); - } - // Load the selected save file - Manager.Controller.AddFrames("1,O", studioLine); - Manager.Controller.AddFrames("14", studioLine); - Manager.Controller.AddFrames("1,O", studioLine); - Manager.Controller.AddFrames("1", studioLine); - LibTasHelper.AddInputFrame("32"); - } + // Load the selected save file + controller.AddFrames("1,O", studioLine); + controller.AddFrames("14", studioLine); + controller.AddFrames("1,O", studioLine); + controller.AddFrames("1", studioLine); + LibTasHelper.AddInputFrame("32"); + } - InsertedSlots[studioLine] = slot; + Command.TryParse(controller, filePath, fileLine, isSafe ? "Safe" : "Unsafe", controller.CurrentParsingFrame, studioLine, out _); + } else { + if (!justPressedSnQ) { + AbortTas("SaveAndQuitReenter must be exactly after pressing the \"Save & Quit\" button"); + return; } - - return; - } - if (!justPressedSnQ) { - AbortTas("SaveAndQuitReenter must be exactly after pressing the \"Save & Quit\" button"); - return; - } - - if (Engine.Scene is not Level level) { - AbortTas("SaveAndQuitReenter can't be used outside levels"); - return; - } + if (Engine.Scene is not Level level) { + AbortTas("SaveAndQuitReenter can't be used outside levels"); + return; + } - if (Mode == SaveAndQuitReenterMode.Simulate) { - // Replace the Save & Quit wipe with our work action - level.Wipe.OnComplete = delegate { - Engine.Scene = new LevelReenter(level.Session); - }; - } else { // Re-insert inputs of the save file slot changed if (InsertedSlots.TryGetValue(studioLine, out int slot) && slot != ActiveFileSlot) { InsertedSlots[studioLine] = ActiveFileSlot; - // Avoid clearing our InsertedSlots info - preventClear = true; - Manager.Controller.NeedsReload = true; - Manager.Controller.RefreshInputs(enableRun: false); - preventClear = false; - } - } - } - - [TasCommand("SaveAndQuitReenterMode", ExecuteTiming = ExecuteTiming.Parse | ExecuteTiming.Runtime)] - private static void StunPauseCommandMode(string[] args) { - if (args.IsNotEmpty() && Enum.TryParse(args[0], true, out SaveAndQuitReenterMode value)) { - if (ParsingCommand) { - GlobalModeParsing = value; - } else { - GlobalModeRuntime = value; + // Avoid clearing our InsertedSlots info when RefreshInputs() + Dictionary backup = new(InsertedSlots); + controller.NeedsReload = true; + controller.RefreshInputs(enableRun: false); + InsertedSlots.Clear(); + InsertedSlots.AddRange(backup); } - } else if (ParsingCommand) { - AbortTas("SaveAndQuitReenterMode command failed.\nMode must be Input or Simulate"); } } } \ No newline at end of file diff --git a/CelesteTAS-EverestInterop/Source/TAS/Manager.cs b/CelesteTAS-EverestInterop/Source/TAS/Manager.cs index d1900294..cdef2ae0 100644 --- a/CelesteTAS-EverestInterop/Source/TAS/Manager.cs +++ b/CelesteTAS-EverestInterop/Source/TAS/Manager.cs @@ -80,7 +80,7 @@ public static void Update() { if (!canPlayback) { DisableRun(); } else if (SafeCommand.DisallowUnsafeInput && Controller.CurrentFrameInTas > 1) { - if (Engine.Scene is not (Level or LevelLoader or LevelExit or Emulator or LevelEnter or SaveAndQuitReenterCommand.LevelReenter)) { + if (Engine.Scene is not (Level or LevelLoader or LevelExit or Emulator or LevelEnter)) { DisableRun(); } else if (Engine.Scene is Level level && level.Tracker.GetEntity() is { } menu) { if (menu.Items.FirstOrDefault() is TextMenu.Header header && header.Title == Dialog.Clean("options_title") || @@ -248,7 +248,7 @@ overworld.Next is OuiChapterSelect && UserIO.Saving || case Emulator emulator: return emulator.game == null; default: - bool isLoading = Engine.Scene is LevelExit or LevelLoader or GameLoader or SaveAndQuitReenterCommand.LevelReenter || Engine.Scene.GetType().Name == "LevelExitToLobby"; + bool isLoading = Engine.Scene is LevelExit or LevelLoader or GameLoader || Engine.Scene.GetType().Name == "LevelExitToLobby"; return isLoading; } } diff --git a/CelesteTAS-EverestInterop/Source/Utils/SpeedrunToolUtils.cs b/CelesteTAS-EverestInterop/Source/Utils/SpeedrunToolUtils.cs index ece69d00..f31deee2 100644 --- a/CelesteTAS-EverestInterop/Source/Utils/SpeedrunToolUtils.cs +++ b/CelesteTAS-EverestInterop/Source/Utils/SpeedrunToolUtils.cs @@ -28,8 +28,6 @@ internal static class SpeedrunToolUtils { private static long? tasStartFileTime; private static MouseState mouseState; private static Dictionary followers; - private static SaveAndQuitReenterCommand.SaveAndQuitReenterMode? localSnQMode; - private static SaveAndQuitReenterCommand.SaveAndQuitReenterMode? globalSnQMode; private static Dictionary insertedSlots = new(); private static bool disallowUnsafeInput; @@ -48,8 +46,6 @@ public static void AddSaveLoadAction() { tasStartFileTime = MetadataCommands.TasStartFileTime; mouseState = MouseCommand.CurrentState; followers = HitboxSimplified.Followers.DeepCloneShared(); - localSnQMode = SaveAndQuitReenterCommand.LocalMode; - globalSnQMode = SaveAndQuitReenterCommand.GlobalModeRuntime; insertedSlots = SaveAndQuitReenterCommand.InsertedSlots.DeepCloneShared(); disallowUnsafeInput = SafeCommand.DisallowUnsafeInput; }; @@ -71,8 +67,6 @@ public static void AddSaveLoadAction() { MetadataCommands.TasStartFileTime = tasStartFileTime; MouseCommand.CurrentState = mouseState; HitboxSimplified.Followers = followers.DeepCloneShared(); - SaveAndQuitReenterCommand.LocalMode = localSnQMode; - SaveAndQuitReenterCommand.GlobalModeRuntime = globalSnQMode; SaveAndQuitReenterCommand.InsertedSlots = insertedSlots.DeepCloneShared(); SafeCommand.DisallowUnsafeInput = disallowUnsafeInput; }; diff --git a/Docs/Commands.md b/Docs/Commands.md index f5527115..3e7ffd2e 100644 --- a/Docs/Commands.md +++ b/Docs/Commands.md @@ -224,11 +224,10 @@ Specify the default mode for `StunPause` command. ### SaveAndQuitReenter - ``` - SaveAndQuitReenter, (optional mode, Simulate or Input) + SaveAndQuitReenter ``` -- It is important to place the command directly after pressing the `Save & Quit` button -- Simulate mode should be used for working on individual levels, since it doesn't require `Unsafe`. -- Input mode should be used for a full-game run, by using `SaveAndQuitReenterMode`. +- Inserts the inputs required to Save & Quit and to reenter the correct save file. +- It is important to place the command directly after pressing the `Save & Quit` button. e.g. ``` @@ -241,16 +240,6 @@ Specify the default mode for `StunPause` command. #Respawn animation 36 ``` - -- The command's mode is determined by several things, the priority from high to low are: - 1. [EnforceLegal](#enforcelegal) command force all the commands use `Input` mode - 2. Mode specified by the `SaveAndQuitReenter` command - 3. Mode specified by the `SaveAndQuitReenterMode` command - 4. Default mode is `Simulate` - -### SaveAndQuitReenterMode -Specify the default mode for `SaveAndQuitReenter` command. -- `SaveAndQuitReenterMode, Simulate/Input` ### StartRecording and StopRecording NOTE: These commands require [TAS Recorder](https://gamebanana.com/tools/14085)! diff --git a/Studio/Studio.Designer.cs b/Studio/Studio.Designer.cs index 5fc8243c..4a883739 100644 --- a/Studio/Studio.Designer.cs +++ b/Studio/Studio.Designer.cs @@ -77,6 +77,7 @@ private void InitializeComponent() { this.toggleGameplayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.toggleCenterCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.centerCameraHorizontallyOnlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.switchInfoHUDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tASInputInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -135,14 +136,13 @@ private void InitializeComponent() { this.endStunPauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.stunPauseModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator(); - this.saveAndQuitReenterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAndQuitReenterModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator(); this.autoInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startAutoInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.endAutoInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.skipAutoInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); + this.saveAndQuitReenterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator(); this.startExportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.finishExportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); @@ -177,7 +177,6 @@ private void InitializeComponent() { this.statusPanel = new System.Windows.Forms.Panel(); this.statusBar = new System.Windows.Forms.StatusStrip(); this.lblStatus = new System.Windows.Forms.ToolStripStatusLabel(); - this.centerCameraHorizontallyOnlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusBarContextMenuStrip.SuspendLayout(); this.menuStrip.SuspendLayout(); this.tasTextContextMenuStrip.SuspendLayout(); @@ -199,13 +198,13 @@ private void InitializeComponent() { // this.statusBarContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.copyGameDataMenuItem, this.reconnectStudioAndCelesteToolStripMenuItem, this.toolStripSeparator11, this.copyCustomInfoTemplateToClipboardToolStripMenuItem, this.setCustomInfoTemplateFromClipboardToolStripMenuItem, this.clearCustomInfoTemplateToolStripMenuItem, this.toolStripSeparator20, this.clearWatchEntityInfoToolStripMenuItem}); this.statusBarContextMenuStrip.Name = "statusBarMenuStrip"; - this.statusBarContextMenuStrip.Size = new System.Drawing.Size(330, 148); + this.statusBarContextMenuStrip.Size = new System.Drawing.Size(457, 184); // // copyGameDataMenuItem // this.copyGameDataMenuItem.Name = "copyGameDataMenuItem"; this.copyGameDataMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.C))); - this.copyGameDataMenuItem.Size = new System.Drawing.Size(329, 22); + this.copyGameDataMenuItem.Size = new System.Drawing.Size(456, 28); this.copyGameDataMenuItem.Text = "Copy Game Info to Clipboard"; this.copyGameDataMenuItem.Click += new System.EventHandler(this.copyGamerDataMenuItem_Click); // @@ -213,45 +212,45 @@ private void InitializeComponent() { // this.reconnectStudioAndCelesteToolStripMenuItem.Name = "reconnectStudioAndCelesteToolStripMenuItem"; this.reconnectStudioAndCelesteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.D))); - this.reconnectStudioAndCelesteToolStripMenuItem.Size = new System.Drawing.Size(329, 22); + this.reconnectStudioAndCelesteToolStripMenuItem.Size = new System.Drawing.Size(456, 28); this.reconnectStudioAndCelesteToolStripMenuItem.Text = "Reconnect Studio and Celeste"; this.reconnectStudioAndCelesteToolStripMenuItem.Click += new System.EventHandler(this.reconnectStudioAndCelesteToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(326, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(453, 6); // // copyCustomInfoTemplateToClipboardToolStripMenuItem // this.copyCustomInfoTemplateToClipboardToolStripMenuItem.Name = "copyCustomInfoTemplateToClipboardToolStripMenuItem"; - this.copyCustomInfoTemplateToClipboardToolStripMenuItem.Size = new System.Drawing.Size(329, 22); + this.copyCustomInfoTemplateToClipboardToolStripMenuItem.Size = new System.Drawing.Size(456, 28); this.copyCustomInfoTemplateToClipboardToolStripMenuItem.Text = "Copy Custom Info Template to Clipboard"; this.copyCustomInfoTemplateToClipboardToolStripMenuItem.Click += new System.EventHandler(this.copyCustomInfoTemplateToClipboardToolStripMenuItem_Click); // // setCustomInfoTemplateFromClipboardToolStripMenuItem // this.setCustomInfoTemplateFromClipboardToolStripMenuItem.Name = "setCustomInfoTemplateFromClipboardToolStripMenuItem"; - this.setCustomInfoTemplateFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(329, 22); + this.setCustomInfoTemplateFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(456, 28); this.setCustomInfoTemplateFromClipboardToolStripMenuItem.Text = "Set Custom Info Template From Clipboard"; this.setCustomInfoTemplateFromClipboardToolStripMenuItem.Click += new System.EventHandler(this.setCustomInfoTemplateFromClipboardToolStripMenuItem_Click); // // clearCustomInfoTemplateToolStripMenuItem // this.clearCustomInfoTemplateToolStripMenuItem.Name = "clearCustomInfoTemplateToolStripMenuItem"; - this.clearCustomInfoTemplateToolStripMenuItem.Size = new System.Drawing.Size(329, 22); + this.clearCustomInfoTemplateToolStripMenuItem.Size = new System.Drawing.Size(456, 28); this.clearCustomInfoTemplateToolStripMenuItem.Text = "Clear Custom Info Template"; this.clearCustomInfoTemplateToolStripMenuItem.Click += new System.EventHandler(this.clearCustomInfoTemplateToolStripMenuItem_Click); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(326, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(453, 6); // // clearWatchEntityInfoToolStripMenuItem // this.clearWatchEntityInfoToolStripMenuItem.Name = "clearWatchEntityInfoToolStripMenuItem"; - this.clearWatchEntityInfoToolStripMenuItem.Size = new System.Drawing.Size(329, 22); + this.clearWatchEntityInfoToolStripMenuItem.Size = new System.Drawing.Size(456, 28); this.clearWatchEntityInfoToolStripMenuItem.Text = "Clear Watch Entity Info"; this.clearWatchEntityInfoToolStripMenuItem.Click += new System.EventHandler(this.clearWatchEntityInfoToolStripMenuItem_Click); // @@ -262,7 +261,8 @@ private void InitializeComponent() { this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.fileToolStripMenuItem, this.settingsToolStripMenuItem, this.toggleToolStripMenuItem, this.helpToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(286, 24); + this.menuStrip.Padding = new System.Windows.Forms.Padding(9, 3, 0, 3); + this.menuStrip.Size = new System.Drawing.Size(429, 32); this.menuStrip.TabIndex = 3; this.menuStrip.Text = "menuStrip1"; // @@ -270,27 +270,27 @@ private void InitializeComponent() { // this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.newFileToolStripMenuItem, this.toolStripSeparator7, this.openFileMenuItem, this.openPreviousFileToolStripMenuItem, this.openRecentMenuItem, this.openBackupToolStripMenuItem, this.toolStripSeparator15, this.saveAsToolStripMenuItem, this.integrateReadFilesToolStripMenuItem, this.recordTASToolStripMenuItem, this.convertToLibTASInputsToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(52, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(70, 26); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // // newFileToolStripMenuItem // this.newFileToolStripMenuItem.Name = "newFileToolStripMenuItem"; - this.newFileToolStripMenuItem.Size = new System.Drawing.Size(292, 22); + this.newFileToolStripMenuItem.Size = new System.Drawing.Size(402, 26); this.newFileToolStripMenuItem.Text = "&New File"; this.newFileToolStripMenuItem.Click += new System.EventHandler(this.newFileToolStripMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(289, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(399, 6); // // openFileMenuItem // this.openFileMenuItem.Name = "openFileMenuItem"; this.openFileMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openFileMenuItem.Size = new System.Drawing.Size(292, 22); + this.openFileMenuItem.Size = new System.Drawing.Size(402, 26); this.openFileMenuItem.Text = "&Open File..."; this.openFileMenuItem.Click += new System.EventHandler(this.openFileMenuItem_Click); // @@ -298,53 +298,53 @@ private void InitializeComponent() { // this.openPreviousFileToolStripMenuItem.Name = "openPreviousFileToolStripMenuItem"; this.openPreviousFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Left))); - this.openPreviousFileToolStripMenuItem.Size = new System.Drawing.Size(292, 22); + this.openPreviousFileToolStripMenuItem.Size = new System.Drawing.Size(402, 26); this.openPreviousFileToolStripMenuItem.Text = "Open &Previous File"; this.openPreviousFileToolStripMenuItem.Click += new System.EventHandler(this.openPreviousFileToolStripMenuItem_Click); // // openRecentMenuItem // this.openRecentMenuItem.Name = "openRecentMenuItem"; - this.openRecentMenuItem.Size = new System.Drawing.Size(292, 22); + this.openRecentMenuItem.Size = new System.Drawing.Size(402, 26); this.openRecentMenuItem.Text = "Open &Recent"; // // openBackupToolStripMenuItem // this.openBackupToolStripMenuItem.Name = "openBackupToolStripMenuItem"; - this.openBackupToolStripMenuItem.Size = new System.Drawing.Size(292, 22); + this.openBackupToolStripMenuItem.Size = new System.Drawing.Size(402, 26); this.openBackupToolStripMenuItem.Text = "Open &Backup"; // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(289, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(399, 6); // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(292, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(402, 26); this.saveAsToolStripMenuItem.Text = "&Save As..."; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); // // integrateReadFilesToolStripMenuItem // this.integrateReadFilesToolStripMenuItem.Name = "integrateReadFilesToolStripMenuItem"; - this.integrateReadFilesToolStripMenuItem.Size = new System.Drawing.Size(292, 22); + this.integrateReadFilesToolStripMenuItem.Size = new System.Drawing.Size(402, 26); this.integrateReadFilesToolStripMenuItem.Text = "&Integrate Read Files..."; this.integrateReadFilesToolStripMenuItem.Click += new System.EventHandler(this.integrateReadFilesToolStripMenuItem_Click); // // recordTASToolStripMenuItem // this.recordTASToolStripMenuItem.Name = "recordTASToolStripMenuItem"; - this.recordTASToolStripMenuItem.Size = new System.Drawing.Size(292, 22); + this.recordTASToolStripMenuItem.Size = new System.Drawing.Size(402, 26); this.recordTASToolStripMenuItem.Text = "&Record TAS..."; this.recordTASToolStripMenuItem.Click += new System.EventHandler(this.recordTASToolStripMenuItem_Click); // // convertToLibTASInputsToolStripMenuItem // this.convertToLibTASInputsToolStripMenuItem.Name = "convertToLibTASInputsToolStripMenuItem"; - this.convertToLibTASInputsToolStripMenuItem.Size = new System.Drawing.Size(292, 22); + this.convertToLibTASInputsToolStripMenuItem.Size = new System.Drawing.Size(402, 26); this.convertToLibTASInputsToolStripMenuItem.Text = "&Convert to LibTAS Movie..."; this.convertToLibTASInputsToolStripMenuItem.Click += new System.EventHandler(this.convertToLibTASInputsToolStripMenuItem_Click); // @@ -352,7 +352,7 @@ private void InitializeComponent() { // this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.sendInputsToCelesteMenuItem, this.autoRemoveExclusiveActionsToolStripMenuItem, this.showGameInfoToolStripMenuItem, this.alwaysOnTopToolStripMenuItem, this.autoBackupToolStripMenuItem, this.fontToolStripMenuItem, this.themesToolStripMenuItem, this.openSettingsFileToolStripMenuItem}); this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(84, 20); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(118, 26); this.settingsToolStripMenuItem.Text = "&Settings"; this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_Opened); // @@ -360,28 +360,28 @@ private void InitializeComponent() { // this.sendInputsToCelesteMenuItem.Name = "sendInputsToCelesteMenuItem"; this.sendInputsToCelesteMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.sendInputsToCelesteMenuItem.Size = new System.Drawing.Size(380, 22); + this.sendInputsToCelesteMenuItem.Size = new System.Drawing.Size(536, 26); this.sendInputsToCelesteMenuItem.Text = "&Send Inputs to Celeste"; this.sendInputsToCelesteMenuItem.Click += new System.EventHandler(this.sendInputsToCelesteMenuItem_Click); // // autoRemoveExclusiveActionsToolStripMenuItem // this.autoRemoveExclusiveActionsToolStripMenuItem.Name = "autoRemoveExclusiveActionsToolStripMenuItem"; - this.autoRemoveExclusiveActionsToolStripMenuItem.Size = new System.Drawing.Size(380, 22); + this.autoRemoveExclusiveActionsToolStripMenuItem.Size = new System.Drawing.Size(536, 26); this.autoRemoveExclusiveActionsToolStripMenuItem.Text = "Auto Remove Mutually Exclusive Actions"; this.autoRemoveExclusiveActionsToolStripMenuItem.Click += new System.EventHandler(this.autoRemoveExclusiveActionsToolStripMenuItem_Click); // // showGameInfoToolStripMenuItem // this.showGameInfoToolStripMenuItem.Name = "showGameInfoToolStripMenuItem"; - this.showGameInfoToolStripMenuItem.Size = new System.Drawing.Size(380, 22); + this.showGameInfoToolStripMenuItem.Size = new System.Drawing.Size(536, 26); this.showGameInfoToolStripMenuItem.Text = "Show Game Info"; this.showGameInfoToolStripMenuItem.Click += new System.EventHandler(this.showGameInfoToolStripMenuItem_Click); // // alwaysOnTopToolStripMenuItem // this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem"; - this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(380, 22); + this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(536, 26); this.alwaysOnTopToolStripMenuItem.Text = "Always on Top"; this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click); // @@ -389,7 +389,7 @@ private void InitializeComponent() { // this.autoBackupToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.enabledAutoBackupToolStripMenuItem, this.backupRateToolStripMenuItem, this.backupFileCountsToolStripMenuItem}); this.autoBackupToolStripMenuItem.Name = "autoBackupToolStripMenuItem"; - this.autoBackupToolStripMenuItem.Size = new System.Drawing.Size(380, 22); + this.autoBackupToolStripMenuItem.Size = new System.Drawing.Size(536, 26); this.autoBackupToolStripMenuItem.Text = "Automatic Backup"; // // enabledAutoBackupToolStripMenuItem @@ -397,14 +397,14 @@ private void InitializeComponent() { this.enabledAutoBackupToolStripMenuItem.Checked = true; this.enabledAutoBackupToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.enabledAutoBackupToolStripMenuItem.Name = "enabledAutoBackupToolStripMenuItem"; - this.enabledAutoBackupToolStripMenuItem.Size = new System.Drawing.Size(244, 22); + this.enabledAutoBackupToolStripMenuItem.Size = new System.Drawing.Size(332, 26); this.enabledAutoBackupToolStripMenuItem.Text = "Enabled"; this.enabledAutoBackupToolStripMenuItem.Click += new System.EventHandler(this.enabledAutoBackupToolStripMenuItem_Click); // // backupRateToolStripMenuItem // this.backupRateToolStripMenuItem.Name = "backupRateToolStripMenuItem"; - this.backupRateToolStripMenuItem.Size = new System.Drawing.Size(244, 22); + this.backupRateToolStripMenuItem.Size = new System.Drawing.Size(332, 26); this.backupRateToolStripMenuItem.Text = "Backup Rate (minutes)"; this.backupRateToolStripMenuItem.ToolTipText = "0 means the file will be backed up every time it is modified"; this.backupRateToolStripMenuItem.Click += new System.EventHandler(this.backupRateToolStripMenuItem_Click); @@ -412,7 +412,7 @@ private void InitializeComponent() { // backupFileCountsToolStripMenuItem // this.backupFileCountsToolStripMenuItem.Name = "backupFileCountsToolStripMenuItem"; - this.backupFileCountsToolStripMenuItem.Size = new System.Drawing.Size(244, 22); + this.backupFileCountsToolStripMenuItem.Size = new System.Drawing.Size(332, 26); this.backupFileCountsToolStripMenuItem.Text = "Backup File Count"; this.backupFileCountsToolStripMenuItem.ToolTipText = "0 means no limit"; this.backupFileCountsToolStripMenuItem.Click += new System.EventHandler(this.backupFileCountsToolStripMenuItem_Click); @@ -420,7 +420,7 @@ private void InitializeComponent() { // fontToolStripMenuItem // this.fontToolStripMenuItem.Name = "fontToolStripMenuItem"; - this.fontToolStripMenuItem.Size = new System.Drawing.Size(380, 22); + this.fontToolStripMenuItem.Size = new System.Drawing.Size(536, 26); this.fontToolStripMenuItem.Text = "Font..."; this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click); // @@ -428,35 +428,35 @@ private void InitializeComponent() { // this.themesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.lightToolStripMenuItem, this.darkToolStripMenuItem, this.customToolStripMenuItem}); this.themesToolStripMenuItem.Name = "themesToolStripMenuItem"; - this.themesToolStripMenuItem.Size = new System.Drawing.Size(380, 22); + this.themesToolStripMenuItem.Size = new System.Drawing.Size(536, 26); this.themesToolStripMenuItem.Text = "Themes"; this.themesToolStripMenuItem.DropDownOpened += new System.EventHandler(this.themesToolStripMenuItem_DropDownOpened); // // lightToolStripMenuItem // this.lightToolStripMenuItem.Name = "lightToolStripMenuItem"; - this.lightToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.lightToolStripMenuItem.Size = new System.Drawing.Size(152, 26); this.lightToolStripMenuItem.Text = "Light"; this.lightToolStripMenuItem.Click += new System.EventHandler(this.lightToolStripMenuItem_Click); // // darkToolStripMenuItem // this.darkToolStripMenuItem.Name = "darkToolStripMenuItem"; - this.darkToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.darkToolStripMenuItem.Size = new System.Drawing.Size(152, 26); this.darkToolStripMenuItem.Text = "Dark"; this.darkToolStripMenuItem.Click += new System.EventHandler(this.darkToolStripMenuItem_Click); // // customToolStripMenuItem // this.customToolStripMenuItem.Name = "customToolStripMenuItem"; - this.customToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.customToolStripMenuItem.Size = new System.Drawing.Size(152, 26); this.customToolStripMenuItem.Text = "Custom"; this.customToolStripMenuItem.Click += new System.EventHandler(this.customToolStripMenuItem_Click); // // openSettingsFileToolStripMenuItem // this.openSettingsFileToolStripMenuItem.Name = "openSettingsFileToolStripMenuItem"; - this.openSettingsFileToolStripMenuItem.Size = new System.Drawing.Size(380, 22); + this.openSettingsFileToolStripMenuItem.Size = new System.Drawing.Size(536, 26); this.openSettingsFileToolStripMenuItem.Text = "Open Settings File..."; this.openSettingsFileToolStripMenuItem.Click += new System.EventHandler(this.openSettingsFileToolStripMenuItem_Click); // @@ -464,199 +464,206 @@ private void InitializeComponent() { // this.toggleToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.toggleHitboxesToolStripMenuItem, this.toggleTriggerHitboxesToolStripMenuItem, this.unloadedRoomsHitboxesToolStripMenuItem, this.cameraHitboxesToolStripMenuItem, this.toggleSimplifiedHitboxesToolStripMenuItem, this.switchActualCollideHitboxesToolStripMenuItem, this.toolStripSeparator8, this.toggleSimplifiedGraphicsToolStripMenuItem, this.toggleGameplayToolStripMenuItem, this.toolStripSeparator10, this.toggleCenterCameraToolStripMenuItem, this.centerCameraHorizontallyOnlyToolStripMenuItem, this.toolStripSeparator9, this.switchInfoHUDToolStripMenuItem, this.tASInputInfoToolStripMenuItem, this.gameInfoToolStripMenuItem, this.watchEntityInfoToolStripMenuItem, this.customInfoToolStripMenuItem, this.subpixelIndicatorToolStripMenuItem, this.toolStripSeparator1, this.positionDecimalsToolStripMenuItem, this.speedDecimalsToolStripMenuItem, this.velocityDecimalsToolStripMenuItem, this.angleDecimalsToolStripMenuItem, this.customInfoDecimalsToolStripMenuItem, this.subpixelIndicatorDecimalsToolStripMenuItem, this.unitOfSpeedToolStripMenuItem, this.toolStripSeparator19, this.fastForwardSpeedToolStripMenuItem, this.slowForwardSpeedToolStripMenuItem}); this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem"; - this.toggleToolStripMenuItem.Size = new System.Drawing.Size(76, 20); + this.toggleToolStripMenuItem.Size = new System.Drawing.Size(106, 26); this.toggleToolStripMenuItem.Text = "&Toggles"; // // toggleHitboxesToolStripMenuItem // this.toggleHitboxesToolStripMenuItem.Name = "toggleHitboxesToolStripMenuItem"; - this.toggleHitboxesToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.toggleHitboxesToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.toggleHitboxesToolStripMenuItem.Text = "&Hitboxes"; this.toggleHitboxesToolStripMenuItem.Click += new System.EventHandler(this.toggleHitboxesToolStripMenuItem_Click); // // toggleTriggerHitboxesToolStripMenuItem // this.toggleTriggerHitboxesToolStripMenuItem.Name = "toggleTriggerHitboxesToolStripMenuItem"; - this.toggleTriggerHitboxesToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.toggleTriggerHitboxesToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.toggleTriggerHitboxesToolStripMenuItem.Text = "&Trigger Hitboxes"; this.toggleTriggerHitboxesToolStripMenuItem.Click += new System.EventHandler(this.toggleTriggerHitboxesToolStripMenuItem_Click); // // unloadedRoomsHitboxesToolStripMenuItem // this.unloadedRoomsHitboxesToolStripMenuItem.Name = "unloadedRoomsHitboxesToolStripMenuItem"; - this.unloadedRoomsHitboxesToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.unloadedRoomsHitboxesToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.unloadedRoomsHitboxesToolStripMenuItem.Text = "Unloaded Rooms Hitboxes"; this.unloadedRoomsHitboxesToolStripMenuItem.Click += new System.EventHandler(this.unloadedRoomsHitboxesToolStripMenuItem_Click); // // cameraHitboxesToolStripMenuItem // this.cameraHitboxesToolStripMenuItem.Name = "cameraHitboxesToolStripMenuItem"; - this.cameraHitboxesToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.cameraHitboxesToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.cameraHitboxesToolStripMenuItem.Text = "Camera Hitboxes"; this.cameraHitboxesToolStripMenuItem.Click += new System.EventHandler(this.cameraHitboxesToolStripMenuItem_Click); // // toggleSimplifiedHitboxesToolStripMenuItem // this.toggleSimplifiedHitboxesToolStripMenuItem.Name = "toggleSimplifiedHitboxesToolStripMenuItem"; - this.toggleSimplifiedHitboxesToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.toggleSimplifiedHitboxesToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.toggleSimplifiedHitboxesToolStripMenuItem.Text = "&Simplified Hitboxes"; this.toggleSimplifiedHitboxesToolStripMenuItem.Click += new System.EventHandler(this.toggleSimplifiedHitboxesToolStripMenuItem_Click); // // switchActualCollideHitboxesToolStripMenuItem // this.switchActualCollideHitboxesToolStripMenuItem.Name = "switchActualCollideHitboxesToolStripMenuItem"; - this.switchActualCollideHitboxesToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.switchActualCollideHitboxesToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.switchActualCollideHitboxesToolStripMenuItem.Text = "&Actual Collide Hitboxes"; this.switchActualCollideHitboxesToolStripMenuItem.Click += new System.EventHandler(this.switchActualCollideHitboxesToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(321, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(449, 6); // // toggleSimplifiedGraphicsToolStripMenuItem // this.toggleSimplifiedGraphicsToolStripMenuItem.Name = "toggleSimplifiedGraphicsToolStripMenuItem"; - this.toggleSimplifiedGraphicsToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.toggleSimplifiedGraphicsToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.toggleSimplifiedGraphicsToolStripMenuItem.Text = "Simplified &Graphics"; this.toggleSimplifiedGraphicsToolStripMenuItem.Click += new System.EventHandler(this.toggleSimplifiedGraphicsToolStripMenuItem_Click); // // toggleGameplayToolStripMenuItem // this.toggleGameplayToolStripMenuItem.Name = "toggleGameplayToolStripMenuItem"; - this.toggleGameplayToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.toggleGameplayToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.toggleGameplayToolStripMenuItem.Text = "Game&play"; this.toggleGameplayToolStripMenuItem.Click += new System.EventHandler(this.toggleGameplayToolStripMenuItem_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(321, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(449, 6); // // toggleCenterCameraToolStripMenuItem // this.toggleCenterCameraToolStripMenuItem.Name = "toggleCenterCameraToolStripMenuItem"; - this.toggleCenterCameraToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.toggleCenterCameraToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.toggleCenterCameraToolStripMenuItem.Text = "&Center Camera"; this.toggleCenterCameraToolStripMenuItem.Click += new System.EventHandler(this.toggleCenterCameraToolStripMenuItem_Click); // + // centerCameraHorizontallyOnlyToolStripMenuItem + // + this.centerCameraHorizontallyOnlyToolStripMenuItem.Name = "centerCameraHorizontallyOnlyToolStripMenuItem"; + this.centerCameraHorizontallyOnlyToolStripMenuItem.Size = new System.Drawing.Size(452, 26); + this.centerCameraHorizontallyOnlyToolStripMenuItem.Text = "Center Camera Horizontally Only"; + this.centerCameraHorizontallyOnlyToolStripMenuItem.Click += new System.EventHandler(this.centerCameraHorizontallyOnlyToolStripMenuItem_Click); + // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(321, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(449, 6); // // switchInfoHUDToolStripMenuItem // this.switchInfoHUDToolStripMenuItem.Name = "switchInfoHUDToolStripMenuItem"; - this.switchInfoHUDToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.switchInfoHUDToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.switchInfoHUDToolStripMenuItem.Text = "&Info HUD"; this.switchInfoHUDToolStripMenuItem.Click += new System.EventHandler(this.switchInfoHUDToolStripMenuItem_Click); // // tASInputInfoToolStripMenuItem // this.tASInputInfoToolStripMenuItem.Name = "tASInputInfoToolStripMenuItem"; - this.tASInputInfoToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.tASInputInfoToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.tASInputInfoToolStripMenuItem.Text = "TAS Input Info"; this.tASInputInfoToolStripMenuItem.Click += new System.EventHandler(this.tASInputInfoToolStripMenuItem_Click); // // gameInfoToolStripMenuItem // this.gameInfoToolStripMenuItem.Name = "gameInfoToolStripMenuItem"; - this.gameInfoToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.gameInfoToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.gameInfoToolStripMenuItem.Text = "Game Info"; this.gameInfoToolStripMenuItem.Click += new System.EventHandler(this.gameInfoToolStripMenuItem_Click); // // watchEntityInfoToolStripMenuItem // this.watchEntityInfoToolStripMenuItem.Name = "watchEntityInfoToolStripMenuItem"; - this.watchEntityInfoToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.watchEntityInfoToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.watchEntityInfoToolStripMenuItem.Text = "Watch Entity Info"; this.watchEntityInfoToolStripMenuItem.Click += new System.EventHandler(this.watchEntityInfoToolStripMenuItem_Click); // // customInfoToolStripMenuItem // this.customInfoToolStripMenuItem.Name = "customInfoToolStripMenuItem"; - this.customInfoToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.customInfoToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.customInfoToolStripMenuItem.Text = "Custom Info"; this.customInfoToolStripMenuItem.Click += new System.EventHandler(this.customInfoToolStripMenuItem_Click); // // subpixelIndicatorToolStripMenuItem // this.subpixelIndicatorToolStripMenuItem.Name = "subpixelIndicatorToolStripMenuItem"; - this.subpixelIndicatorToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.subpixelIndicatorToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.subpixelIndicatorToolStripMenuItem.Text = "Subpixel Indicator"; this.subpixelIndicatorToolStripMenuItem.Click += new System.EventHandler(this.subpixelIndicatorToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(321, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(449, 6); // // positionDecimalsToolStripMenuItem // this.positionDecimalsToolStripMenuItem.Name = "positionDecimalsToolStripMenuItem"; - this.positionDecimalsToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.positionDecimalsToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.positionDecimalsToolStripMenuItem.Text = "Position Decimals"; this.positionDecimalsToolStripMenuItem.Click += new System.EventHandler(this.positionDecimalsToolStripMenuItem_Click); // // speedDecimalsToolStripMenuItem // this.speedDecimalsToolStripMenuItem.Name = "speedDecimalsToolStripMenuItem"; - this.speedDecimalsToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.speedDecimalsToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.speedDecimalsToolStripMenuItem.Text = "Speed Decimals"; this.speedDecimalsToolStripMenuItem.Click += new System.EventHandler(this.speedDecimalsToolStripMenuItem_Click); // // velocityDecimalsToolStripMenuItem // this.velocityDecimalsToolStripMenuItem.Name = "velocityDecimalsToolStripMenuItem"; - this.velocityDecimalsToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.velocityDecimalsToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.velocityDecimalsToolStripMenuItem.Text = "Velocity Decimals"; this.velocityDecimalsToolStripMenuItem.Click += new System.EventHandler(this.velocityDecimalsToolStripMenuItem_Click); // // angleDecimalsToolStripMenuItem // this.angleDecimalsToolStripMenuItem.Name = "angleDecimalsToolStripMenuItem"; - this.angleDecimalsToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.angleDecimalsToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.angleDecimalsToolStripMenuItem.Text = "Angle Decimals"; this.angleDecimalsToolStripMenuItem.Click += new System.EventHandler(this.angleDecimalsToolStripMenuItem_Click); // // customInfoDecimalsToolStripMenuItem // this.customInfoDecimalsToolStripMenuItem.Name = "customInfoDecimalsToolStripMenuItem"; - this.customInfoDecimalsToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.customInfoDecimalsToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.customInfoDecimalsToolStripMenuItem.Text = "Custom Info Decimals"; this.customInfoDecimalsToolStripMenuItem.Click += new System.EventHandler(this.customInfoDecimalsToolStripMenuItem_Click); // // subpixelIndicatorDecimalsToolStripMenuItem // this.subpixelIndicatorDecimalsToolStripMenuItem.Name = "subpixelIndicatorDecimalsToolStripMenuItem"; - this.subpixelIndicatorDecimalsToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.subpixelIndicatorDecimalsToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.subpixelIndicatorDecimalsToolStripMenuItem.Text = "Subpixel Indicator Decimals"; this.subpixelIndicatorDecimalsToolStripMenuItem.Click += new System.EventHandler(this.subpixelIndicatorDecimalsToolStripMenuItem_Click); // // unitOfSpeedToolStripMenuItem // this.unitOfSpeedToolStripMenuItem.Name = "unitOfSpeedToolStripMenuItem"; - this.unitOfSpeedToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.unitOfSpeedToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.unitOfSpeedToolStripMenuItem.Text = "Unit of Speed"; this.unitOfSpeedToolStripMenuItem.Click += new System.EventHandler(this.unitOfSpeedToolStripMenuItem_Click); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(321, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(449, 6); // // fastForwardSpeedToolStripMenuItem // this.fastForwardSpeedToolStripMenuItem.Name = "fastForwardSpeedToolStripMenuItem"; - this.fastForwardSpeedToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.fastForwardSpeedToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.fastForwardSpeedToolStripMenuItem.Text = "Fast Forward Speed"; this.fastForwardSpeedToolStripMenuItem.Click += new System.EventHandler(this.fastForwardSpeedToolStripMenuItem_Click); // // slowForwardSpeedToolStripMenuItem // this.slowForwardSpeedToolStripMenuItem.Name = "slowForwardSpeedToolStripMenuItem"; - this.slowForwardSpeedToolStripMenuItem.Size = new System.Drawing.Size(324, 22); + this.slowForwardSpeedToolStripMenuItem.Size = new System.Drawing.Size(452, 26); this.slowForwardSpeedToolStripMenuItem.Text = "Slow Forward Speed"; this.slowForwardSpeedToolStripMenuItem.Click += new System.EventHandler(this.slowForwardSpeedToolStripMenuItem_Click); // @@ -664,13 +671,13 @@ private void InitializeComponent() { // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.homeMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(52, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(70, 26); this.helpToolStripMenuItem.Text = "&Help"; // // homeMenuItem // this.homeMenuItem.Name = "homeMenuItem"; - this.homeMenuItem.Size = new System.Drawing.Size(108, 22); + this.homeMenuItem.Size = new System.Drawing.Size(128, 26); this.homeMenuItem.Text = "&Home"; this.homeMenuItem.Click += new System.EventHandler(this.homeMenuItem_Click); // @@ -678,22 +685,23 @@ private void InitializeComponent() { // this.dividerLabel.BackColor = System.Drawing.SystemColors.ActiveBorder; this.dividerLabel.Dock = System.Windows.Forms.DockStyle.Top; - this.dividerLabel.Location = new System.Drawing.Point(0, 24); + this.dividerLabel.Location = new System.Drawing.Point(0, 32); + this.dividerLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.dividerLabel.Name = "dividerLabel"; - this.dividerLabel.Size = new System.Drawing.Size(286, 1); + this.dividerLabel.Size = new System.Drawing.Size(429, 2); this.dividerLabel.TabIndex = 4; // // tasTextContextMenuStrip // this.tasTextContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.insertRemoveBreakPointToolStripMenuItem, this.insertRemoveSavestateBreakPointToolStripMenuItem, this.removeAllUncommentedBreakpointsToolStripMenuItem, this.removeAllBreakpointsToolStripMenuItem, this.commentUncommentAllBreakpointsToolStripMenuItem, this.toolStripSeparator2, this.commentUncommentTextToolStripMenuItem, this.insertRoomNameToolStripMenuItem, this.insertCurrentInGameTimeToolStripMenuItem, this.removeAllTimestampsToolStripMenuItem, this.insertModInfoStripMenuItem1, this.insertConsoleLoadCommandToolStripMenuItem, this.insertSimpleConsoleLoadCommandToolStripMenuItem, this.insertOtherCommandToolStripMenuItem, this.toolStripSeparator6, this.swapDashKeysStripMenuItem, this.swapJumpKeysToolStripMenuItem, this.swapSelectedLAndRToolStripMenuItem, this.combineConsecutiveSameInputsToolStripMenuItem, this.forceCombineInputsToolStripMenuItem, this.convertDashToDemoDashToolStripMenuItem, this.toolStripSeparator12, this.openReadFileToolStripMenuItem}); this.tasTextContextMenuStrip.Name = "tasTextContextMenuStrip"; - this.tasTextContextMenuStrip.Size = new System.Drawing.Size(426, 462); + this.tasTextContextMenuStrip.Size = new System.Drawing.Size(595, 604); // // insertRemoveBreakPointToolStripMenuItem // this.insertRemoveBreakPointToolStripMenuItem.Name = "insertRemoveBreakPointToolStripMenuItem"; this.insertRemoveBreakPointToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.OemPeriod))); - this.insertRemoveBreakPointToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.insertRemoveBreakPointToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.insertRemoveBreakPointToolStripMenuItem.Text = "Insert/Remove Breakpoint"; this.insertRemoveBreakPointToolStripMenuItem.Click += new System.EventHandler(this.insertRemoveBreakPointToolStripMenuItem_Click); // @@ -701,7 +709,7 @@ private void InitializeComponent() { // this.insertRemoveSavestateBreakPointToolStripMenuItem.Name = "insertRemoveSavestateBreakPointToolStripMenuItem"; this.insertRemoveSavestateBreakPointToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.OemPeriod))); - this.insertRemoveSavestateBreakPointToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.insertRemoveSavestateBreakPointToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.insertRemoveSavestateBreakPointToolStripMenuItem.Text = "Insert/Remove Savestate Breakpoint"; this.insertRemoveSavestateBreakPointToolStripMenuItem.Click += new System.EventHandler(this.insertRemoveSavestateBreakPointToolStripMenuItem_Click); // @@ -709,7 +717,7 @@ private void InitializeComponent() { // this.removeAllUncommentedBreakpointsToolStripMenuItem.Name = "removeAllUncommentedBreakpointsToolStripMenuItem"; this.removeAllUncommentedBreakpointsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.removeAllUncommentedBreakpointsToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.removeAllUncommentedBreakpointsToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.removeAllUncommentedBreakpointsToolStripMenuItem.Text = "Remove All Uncommented Breakpoints"; this.removeAllUncommentedBreakpointsToolStripMenuItem.Click += new System.EventHandler(this.removeAllUncommentedBreakpointsToolStripMenuItem_Click); // @@ -717,7 +725,7 @@ private void InitializeComponent() { // this.removeAllBreakpointsToolStripMenuItem.Name = "removeAllBreakpointsToolStripMenuItem"; this.removeAllBreakpointsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.P))); - this.removeAllBreakpointsToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.removeAllBreakpointsToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.removeAllBreakpointsToolStripMenuItem.Text = "Remove All Breakpoints"; this.removeAllBreakpointsToolStripMenuItem.Click += new System.EventHandler(this.removeAllBreakpointsToolStripMenuItem_Click); // @@ -725,20 +733,20 @@ private void InitializeComponent() { // this.commentUncommentAllBreakpointsToolStripMenuItem.Name = "commentUncommentAllBreakpointsToolStripMenuItem"; this.commentUncommentAllBreakpointsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) | System.Windows.Forms.Keys.P))); - this.commentUncommentAllBreakpointsToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.commentUncommentAllBreakpointsToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.commentUncommentAllBreakpointsToolStripMenuItem.Text = "Comment/Uncomment All Breakpoints"; this.commentUncommentAllBreakpointsToolStripMenuItem.Click += new System.EventHandler(this.commentUncommentAllBreakpointsToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(422, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(591, 6); // // commentUncommentTextToolStripMenuItem // this.commentUncommentTextToolStripMenuItem.Name = "commentUncommentTextToolStripMenuItem"; this.commentUncommentTextToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.K))); - this.commentUncommentTextToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.commentUncommentTextToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.commentUncommentTextToolStripMenuItem.Text = "Comment/Uncomment Text"; this.commentUncommentTextToolStripMenuItem.Click += new System.EventHandler(this.commentUncommentTextToolStripMenuItem_Click); // @@ -746,7 +754,7 @@ private void InitializeComponent() { // this.insertRoomNameToolStripMenuItem.Name = "insertRoomNameToolStripMenuItem"; this.insertRoomNameToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.insertRoomNameToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.insertRoomNameToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.insertRoomNameToolStripMenuItem.Text = "Insert Room Name"; this.insertRoomNameToolStripMenuItem.Click += new System.EventHandler(this.insertRoomNameToolStripMenuItem_Click); // @@ -754,7 +762,7 @@ private void InitializeComponent() { // this.insertCurrentInGameTimeToolStripMenuItem.Name = "insertCurrentInGameTimeToolStripMenuItem"; this.insertCurrentInGameTimeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); - this.insertCurrentInGameTimeToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.insertCurrentInGameTimeToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.insertCurrentInGameTimeToolStripMenuItem.Text = "Insert Current In-Game Time"; this.insertCurrentInGameTimeToolStripMenuItem.Click += new System.EventHandler(this.insertCurrentInGameTimeToolStripMenuItem_Click); // @@ -762,14 +770,14 @@ private void InitializeComponent() { // this.removeAllTimestampsToolStripMenuItem.Name = "removeAllTimestampsToolStripMenuItem"; this.removeAllTimestampsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.T))); - this.removeAllTimestampsToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.removeAllTimestampsToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.removeAllTimestampsToolStripMenuItem.Text = "Remove All Timestamps"; this.removeAllTimestampsToolStripMenuItem.Click += new System.EventHandler(this.removeAllTimestampsToolStripMenuItem_Click); // // insertModInfoStripMenuItem1 // this.insertModInfoStripMenuItem1.Name = "insertModInfoStripMenuItem1"; - this.insertModInfoStripMenuItem1.Size = new System.Drawing.Size(425, 22); + this.insertModInfoStripMenuItem1.Size = new System.Drawing.Size(594, 28); this.insertModInfoStripMenuItem1.Text = "Insert Mod Info"; this.insertModInfoStripMenuItem1.Click += new System.EventHandler(this.insertModInfoStripMenuItem1_Click); // @@ -777,7 +785,7 @@ private void InitializeComponent() { // this.insertConsoleLoadCommandToolStripMenuItem.Name = "insertConsoleLoadCommandToolStripMenuItem"; this.insertConsoleLoadCommandToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.R))); - this.insertConsoleLoadCommandToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.insertConsoleLoadCommandToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.insertConsoleLoadCommandToolStripMenuItem.Text = "Insert Console Load Command"; this.insertConsoleLoadCommandToolStripMenuItem.Click += new System.EventHandler(this.insertConsoleLoadCommandToolStripMenuItem_Click); // @@ -785,21 +793,21 @@ private void InitializeComponent() { // this.insertSimpleConsoleLoadCommandToolStripMenuItem.Name = "insertSimpleConsoleLoadCommandToolStripMenuItem"; this.insertSimpleConsoleLoadCommandToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) | System.Windows.Forms.Keys.R))); - this.insertSimpleConsoleLoadCommandToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.insertSimpleConsoleLoadCommandToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.insertSimpleConsoleLoadCommandToolStripMenuItem.Text = "Insert Simple Console Load Command"; this.insertSimpleConsoleLoadCommandToolStripMenuItem.Click += new System.EventHandler(this.insertSimpleConsoleLoadCommandToolStripMenuItem_Click); // // insertOtherCommandToolStripMenuItem // - this.insertOtherCommandToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.enforceLegalToolStripMenuItem, this.unsafeToolStripMenuItem, this.safeToolStripMenuItem, this.toolStripSeparator18, this.readToolStripMenuItem, this.playToolStripMenuItem, this.toolStripSeparator17, this.repeatToolStripMenuItem, this.endRepeatToolStripMenuItem, this.toolStripSeparator16, this.setToolStripMenuItem, this.invokeToolStripMenuItem, this.evalLuaStripMenuItem, this.toolStripSeparator3, this.pressToolStripMenuItem, this.toolStripSeparator24, this.analogueModeToolStripMenuItem, this.toolStripSeparator4, this.stunPauseToolStripMenuItem, this.endStunPauseToolStripMenuItem, this.stunPauseModeToolStripMenuItem, this.toolStripSeparator23, this.autoInputToolStripMenuItem, this.startAutoInputToolStripMenuItem, this.endAutoInputToolStripMenuItem, this.skipAutoInputToolStripMenuItem, this.toolStripSeparator22, this.saveAndQuitReenterToolStripMenuItem, this.saveAndQuitReenterModeToolStripMenuItem, this.toolStripSeparator26, this.startExportToolStripMenuItem, this.finishExportToolStripMenuItem, this.toolStripSeparator14, this.startExportRoomInfoToolStripMenuItem, this.finishExportRoomInfoToolStripMenuItem, this.toolStripSeparator25, this.startRecordingToolStripMenuItem, this.stopRecordingToolStripMenuItem, this.toolStripSeparator5, this.addToolStripMenuItem, this.skipToolStripMenuItem, this.startExportLibTASToolStripMenuItem, this.finishExportLibTASToolStripMenuItem, this.toolStripSeparator13, this.completeInfoToolStripMenuItem, this.recordCountToolStripMenuItem, this.fileTimeToolStripMenuItem, this.chapterTimeToolStripMenuItem, this.toolStripSeparator21, this.exitGameToolStripMenuItem}); + this.insertOtherCommandToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.enforceLegalToolStripMenuItem, this.unsafeToolStripMenuItem, this.safeToolStripMenuItem, this.toolStripSeparator18, this.readToolStripMenuItem, this.playToolStripMenuItem, this.toolStripSeparator17, this.repeatToolStripMenuItem, this.endRepeatToolStripMenuItem, this.toolStripSeparator16, this.setToolStripMenuItem, this.invokeToolStripMenuItem, this.evalLuaStripMenuItem, this.toolStripSeparator3, this.pressToolStripMenuItem, this.toolStripSeparator24, this.analogueModeToolStripMenuItem, this.toolStripSeparator4, this.stunPauseToolStripMenuItem, this.endStunPauseToolStripMenuItem, this.stunPauseModeToolStripMenuItem, this.toolStripSeparator23, this.autoInputToolStripMenuItem, this.startAutoInputToolStripMenuItem, this.endAutoInputToolStripMenuItem, this.skipAutoInputToolStripMenuItem, this.toolStripSeparator22, this.saveAndQuitReenterToolStripMenuItem, this.toolStripSeparator26, this.startExportToolStripMenuItem, this.finishExportToolStripMenuItem, this.toolStripSeparator14, this.startExportRoomInfoToolStripMenuItem, this.finishExportRoomInfoToolStripMenuItem, this.toolStripSeparator25, this.startRecordingToolStripMenuItem, this.stopRecordingToolStripMenuItem, this.toolStripSeparator5, this.addToolStripMenuItem, this.skipToolStripMenuItem, this.startExportLibTASToolStripMenuItem, this.finishExportLibTASToolStripMenuItem, this.toolStripSeparator13, this.completeInfoToolStripMenuItem, this.recordCountToolStripMenuItem, this.fileTimeToolStripMenuItem, this.chapterTimeToolStripMenuItem, this.toolStripSeparator21, this.exitGameToolStripMenuItem}); this.insertOtherCommandToolStripMenuItem.Name = "insertOtherCommandToolStripMenuItem"; - this.insertOtherCommandToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.insertOtherCommandToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.insertOtherCommandToolStripMenuItem.Text = "Insert Other Command"; // // enforceLegalToolStripMenuItem // this.enforceLegalToolStripMenuItem.Name = "enforceLegalToolStripMenuItem"; - this.enforceLegalToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.enforceLegalToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.enforceLegalToolStripMenuItem.Text = "EnforceLegal"; this.enforceLegalToolStripMenuItem.ToolTipText = "This is used at the start of fullgame files.\r\nIt prevents the use of commands whi" + "ch would not be legal in a run."; this.enforceLegalToolStripMenuItem.Click += new System.EventHandler(this.enforceLegalToolStripMenuItem_Click); @@ -807,7 +815,7 @@ private void InitializeComponent() { // unsafeToolStripMenuItem // this.unsafeToolStripMenuItem.Name = "unsafeToolStripMenuItem"; - this.unsafeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.unsafeToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.unsafeToolStripMenuItem.Text = "Unsafe"; this.unsafeToolStripMenuItem.ToolTipText = "The TAS will normally only run inside levels.\r\nConsole load normally forces the T" + "AS to load the debug save.\r\nUnsafe allows the TAS to run anywhere, on any save."; this.unsafeToolStripMenuItem.Click += new System.EventHandler(this.unsafeToolStripMenuItem_Click); @@ -815,7 +823,7 @@ private void InitializeComponent() { // safeToolStripMenuItem // this.safeToolStripMenuItem.Name = "safeToolStripMenuItem"; - this.safeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.safeToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.safeToolStripMenuItem.Text = "Safe"; this.safeToolStripMenuItem.ToolTipText = "The TAS will only run inside levels.\r\nConsole load forces the TAS to load the deb" + "ug save."; this.safeToolStripMenuItem.Click += new System.EventHandler(this.safeToolStripMenuItem_Click); @@ -823,12 +831,12 @@ private void InitializeComponent() { // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(257, 6); // // readToolStripMenuItem // this.readToolStripMenuItem.Name = "readToolStripMenuItem"; - this.readToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.readToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.readToolStripMenuItem.Text = "Read"; this.readToolStripMenuItem.ToolTipText = "Will read inputs from the specified file."; this.readToolStripMenuItem.Click += new System.EventHandler(this.readToolStripMenuItem_Click); @@ -836,7 +844,7 @@ private void InitializeComponent() { // playToolStripMenuItem // this.playToolStripMenuItem.Name = "playToolStripMenuItem"; - this.playToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.playToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.playToolStripMenuItem.Text = "Play"; this.playToolStripMenuItem.ToolTipText = "A simplified Read command which skips to the starting line in the current file.\r\n" + "Useful for splitting a large level into larger chunks."; this.playToolStripMenuItem.Click += new System.EventHandler(this.playToolStripMenuItem_Click); @@ -844,12 +852,12 @@ private void InitializeComponent() { // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(257, 6); // // repeatToolStripMenuItem // this.repeatToolStripMenuItem.Name = "repeatToolStripMenuItem"; - this.repeatToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.repeatToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.repeatToolStripMenuItem.Text = "Repeat"; this.repeatToolStripMenuItem.ToolTipText = "Repeat the inputs between \"Repeat\" and \"EndRepeat\" several times, nesting is not " + "supported."; this.repeatToolStripMenuItem.Click += new System.EventHandler(this.repeatToolStripMenuItem_Click); @@ -857,7 +865,7 @@ private void InitializeComponent() { // endRepeatToolStripMenuItem // this.endRepeatToolStripMenuItem.Name = "endRepeatToolStripMenuItem"; - this.endRepeatToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.endRepeatToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.endRepeatToolStripMenuItem.Text = "EndRepeat"; this.endRepeatToolStripMenuItem.ToolTipText = "Repeat the inputs between \"Repeat\" and \"EndRepeat\" several times, nesting is not " + "supported."; this.endRepeatToolStripMenuItem.Click += new System.EventHandler(this.endRepeatToolStripMenuItem_Click); @@ -865,12 +873,12 @@ private void InitializeComponent() { // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(257, 6); // // setToolStripMenuItem // this.setToolStripMenuItem.Name = "setToolStripMenuItem"; - this.setToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.setToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.setToolStripMenuItem.Text = "Set"; this.setToolStripMenuItem.ToolTipText = "Sets the specified setting to the specified value."; this.setToolStripMenuItem.Click += new System.EventHandler(this.setToolStripMenuItem_Click); @@ -878,7 +886,7 @@ private void InitializeComponent() { // invokeToolStripMenuItem // this.invokeToolStripMenuItem.Name = "invokeToolStripMenuItem"; - this.invokeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.invokeToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.invokeToolStripMenuItem.Text = "Invoke"; this.invokeToolStripMenuItem.ToolTipText = "Similar to the set command, but used to invoke the method"; this.invokeToolStripMenuItem.Click += new System.EventHandler(this.invokeToolStripMenuItem_Click); @@ -886,7 +894,7 @@ private void InitializeComponent() { // evalLuaStripMenuItem // this.evalLuaStripMenuItem.Name = "evalLuaStripMenuItem"; - this.evalLuaStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.evalLuaStripMenuItem.Size = new System.Drawing.Size(260, 28); this.evalLuaStripMenuItem.Text = "EvalLua"; this.evalLuaStripMenuItem.ToolTipText = "Evaluate lua code"; this.evalLuaStripMenuItem.Click += new System.EventHandler(this.evalLuaStripMenuItem_Click); @@ -894,12 +902,12 @@ private void InitializeComponent() { // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(257, 6); // // pressToolStripMenuItem // this.pressToolStripMenuItem.Name = "pressToolStripMenuItem"; - this.pressToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.pressToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.pressToolStripMenuItem.Text = "Press"; this.pressToolStripMenuItem.ToolTipText = "Press the specified keys with the next input."; this.pressToolStripMenuItem.Click += new System.EventHandler(this.pressToolStripMenuItem_Click); @@ -907,12 +915,12 @@ private void InitializeComponent() { // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(257, 6); // // analogueModeToolStripMenuItem // this.analogueModeToolStripMenuItem.Name = "analogueModeToolStripMenuItem"; - this.analogueModeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.analogueModeToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.analogueModeToolStripMenuItem.Text = "AnalogMode"; this.analogueModeToolStripMenuItem.ToolTipText = resources.GetString("analogueModeToolStripMenuItem.ToolTipText"); this.analogueModeToolStripMenuItem.Click += new System.EventHandler(this.analogueModeToolStripMenuItem_Click); @@ -920,12 +928,12 @@ private void InitializeComponent() { // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(257, 6); // // stunPauseToolStripMenuItem // this.stunPauseToolStripMenuItem.Name = "stunPauseToolStripMenuItem"; - this.stunPauseToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.stunPauseToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.stunPauseToolStripMenuItem.Text = "StunPause"; this.stunPauseToolStripMenuItem.ToolTipText = "Simulate pausing every other frame without doing the actual pause inputs.\r\nThese " + "commands should only be used to test routes, to simplify the stunning pause inpu" + "ts use the AutoInput command."; this.stunPauseToolStripMenuItem.Click += new System.EventHandler(this.stunPauseToolStripMenuItem_Click); @@ -933,7 +941,7 @@ private void InitializeComponent() { // endStunPauseToolStripMenuItem // this.endStunPauseToolStripMenuItem.Name = "endStunPauseToolStripMenuItem"; - this.endStunPauseToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.endStunPauseToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.endStunPauseToolStripMenuItem.Text = "EndStunPause"; this.endStunPauseToolStripMenuItem.ToolTipText = "Simulate pausing every other frame without doing the actual pause inputs.\r\nThese " + "commands should only be used to test routes, to simplify the stunning pause inpu" + "ts use the AutoInput command."; this.endStunPauseToolStripMenuItem.Click += new System.EventHandler(this.endStunPauseToolStripMenuItem_Click); @@ -941,7 +949,7 @@ private void InitializeComponent() { // stunPauseModeToolStripMenuItem // this.stunPauseModeToolStripMenuItem.Name = "stunPauseModeToolStripMenuItem"; - this.stunPauseModeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.stunPauseModeToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.stunPauseModeToolStripMenuItem.Text = "StunPauseMode"; this.stunPauseModeToolStripMenuItem.ToolTipText = "Specify the default mode for StunPause command.\r\n"; this.stunPauseModeToolStripMenuItem.Click += new System.EventHandler(this.stunPauseModeToolStripMenuItem_Click); @@ -949,33 +957,12 @@ private void InitializeComponent() { // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(191, 6); - // - // saveAndQuitReenterToolStripMenuItem - // - this.saveAndQuitReenterToolStripMenuItem.Name = "saveAndQuitReenterToolStripMenuItem"; - this.saveAndQuitReenterToolStripMenuItem.Size = new System.Drawing.Size(194, 22); - this.saveAndQuitReenterToolStripMenuItem.Text = "SaveAndQuitReenter"; - this.saveAndQuitReenterToolStripMenuItem.ToolTipText = "Perform a Save && Quit and reenter the current save file.\nThis command must be placed directly after pressing the \"Save && Quit\" button"; - this.saveAndQuitReenterToolStripMenuItem.Click += new System.EventHandler(this.saveAndQuitReenterToolStripMenuItem_Click); - // - // saveAndQuitReenterModeToolStripMenuItem - // - this.saveAndQuitReenterModeToolStripMenuItem.Name = "saveAndQuitReenterModeToolStripMenuItem"; - this.saveAndQuitReenterModeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); - this.saveAndQuitReenterModeToolStripMenuItem.Text = "SaveAndQuitReenterMode"; - this.saveAndQuitReenterModeToolStripMenuItem.ToolTipText = "Specify the default mode for SaveAndQuitReenter command.\r\n"; - this.saveAndQuitReenterModeToolStripMenuItem.Click += new System.EventHandler(this.saveAndQuitReenterModeToolStripMenuItem_Click); - // - // toolStripSeparator26 - // - this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(257, 6); // // autoInputToolStripMenuItem // this.autoInputToolStripMenuItem.Name = "autoInputToolStripMenuItem"; - this.autoInputToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.autoInputToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.autoInputToolStripMenuItem.Text = "AutoInput"; this.autoInputToolStripMenuItem.ToolTipText = "Inserts the auto inputs every cycle length frames that is played through inputs.\r" + "\n"; this.autoInputToolStripMenuItem.Click += new System.EventHandler(this.autoInputToolStripMenuItem_Click); @@ -983,7 +970,7 @@ private void InitializeComponent() { // startAutoInputToolStripMenuItem // this.startAutoInputToolStripMenuItem.Name = "startAutoInputToolStripMenuItem"; - this.startAutoInputToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.startAutoInputToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.startAutoInputToolStripMenuItem.Text = "StartAutoInput"; this.startAutoInputToolStripMenuItem.ToolTipText = "Inserts the auto inputs every cycle length frames that is played through inputs."; this.startAutoInputToolStripMenuItem.Click += new System.EventHandler(this.startAutoInputToolStripMenuItem_Click); @@ -991,7 +978,7 @@ private void InitializeComponent() { // endAutoInputToolStripMenuItem // this.endAutoInputToolStripMenuItem.Name = "endAutoInputToolStripMenuItem"; - this.endAutoInputToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.endAutoInputToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.endAutoInputToolStripMenuItem.Text = "EndAutoInput"; this.endAutoInputToolStripMenuItem.ToolTipText = "Inserts the auto inputs every cycle length frames that is played through inputs."; this.endAutoInputToolStripMenuItem.Click += new System.EventHandler(this.endAutoInputToolStripMenuItem_Click); @@ -999,7 +986,7 @@ private void InitializeComponent() { // skipAutoInputToolStripMenuItem // this.skipAutoInputToolStripMenuItem.Name = "skipAutoInputToolStripMenuItem"; - this.skipAutoInputToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.skipAutoInputToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.skipAutoInputToolStripMenuItem.Text = "SkipInput"; this.skipAutoInputToolStripMenuItem.ToolTipText = "Prevents the next input from being calculated in the AutoInput cycle. Usually use" + "d to mark the freeze frames."; this.skipAutoInputToolStripMenuItem.Click += new System.EventHandler(this.skipAutoInputToolStripMenuItem_Click); @@ -1007,12 +994,25 @@ private void InitializeComponent() { // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(257, 6); + // + // saveAndQuitReenterToolStripMenuItem + // + this.saveAndQuitReenterToolStripMenuItem.Name = "saveAndQuitReenterToolStripMenuItem"; + this.saveAndQuitReenterToolStripMenuItem.Size = new System.Drawing.Size(260, 28); + this.saveAndQuitReenterToolStripMenuItem.Text = "SaveAndQuitReenter"; + this.saveAndQuitReenterToolStripMenuItem.ToolTipText = "Perform a Save && Quit and reenter the current save file.\nThis command must be pl" + "aced directly after pressing the \"Save && Quit\" button"; + this.saveAndQuitReenterToolStripMenuItem.Click += new System.EventHandler(this.saveAndQuitReenterToolStripMenuItem_Click); + // + // toolStripSeparator26 + // + this.toolStripSeparator26.Name = "toolStripSeparator26"; + this.toolStripSeparator26.Size = new System.Drawing.Size(257, 6); // // startExportToolStripMenuItem // this.startExportToolStripMenuItem.Name = "startExportToolStripMenuItem"; - this.startExportToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.startExportToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.startExportToolStripMenuItem.Text = "ExportGameInfo"; this.startExportToolStripMenuItem.ToolTipText = "Dumps data to a file, which can be used to analyze desyncs."; this.startExportToolStripMenuItem.Click += new System.EventHandler(this.startExportToolStripMenuItem_Click); @@ -1020,7 +1020,7 @@ private void InitializeComponent() { // finishExportToolStripMenuItem // this.finishExportToolStripMenuItem.Name = "finishExportToolStripMenuItem"; - this.finishExportToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.finishExportToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.finishExportToolStripMenuItem.Text = "EndExportGameInfo"; this.finishExportToolStripMenuItem.ToolTipText = "Dumps data to a file, which can be used to analyze desyncs."; this.finishExportToolStripMenuItem.Click += new System.EventHandler(this.finishExportToolStripMenuItem_Click); @@ -1028,12 +1028,12 @@ private void InitializeComponent() { // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(257, 6); // // startExportRoomInfoToolStripMenuItem // this.startExportRoomInfoToolStripMenuItem.Name = "startExportRoomInfoToolStripMenuItem"; - this.startExportRoomInfoToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.startExportRoomInfoToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.startExportRoomInfoToolStripMenuItem.Text = "ExportRoomInfo"; this.startExportRoomInfoToolStripMenuItem.ToolTipText = "Dumps the elapsed time of each room to a file. which can be used to compare impro" + "vements.\r\n"; this.startExportRoomInfoToolStripMenuItem.Click += new System.EventHandler(this.startExportRoomInfoToolStripMenuItem_Click); @@ -1041,7 +1041,7 @@ private void InitializeComponent() { // finishExportRoomInfoToolStripMenuItem // this.finishExportRoomInfoToolStripMenuItem.Name = "finishExportRoomInfoToolStripMenuItem"; - this.finishExportRoomInfoToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.finishExportRoomInfoToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.finishExportRoomInfoToolStripMenuItem.Text = "EndExportRoomInfo"; this.finishExportRoomInfoToolStripMenuItem.ToolTipText = "Dumps the elapsed time of each room to a file. which can be used to compare impro" + "vements.\r\n"; this.finishExportRoomInfoToolStripMenuItem.Click += new System.EventHandler(this.finishExportRoomInfoToolStripMenuItem_Click); @@ -1049,12 +1049,12 @@ private void InitializeComponent() { // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(257, 6); // // startRecordingToolStripMenuItem // this.startRecordingToolStripMenuItem.Name = "startRecordingToolStripMenuItem"; - this.startRecordingToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.startRecordingToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.startRecordingToolStripMenuItem.Text = "StartRecording"; this.startRecordingToolStripMenuItem.ToolTipText = "Creates frame-perfect recordings, no matter what hardware is used."; this.startRecordingToolStripMenuItem.Click += new System.EventHandler(this.startRecordingToolStripMenuItem_Click); @@ -1062,7 +1062,7 @@ private void InitializeComponent() { // stopRecordingToolStripMenuItem // this.stopRecordingToolStripMenuItem.Name = "stopRecordingToolStripMenuItem"; - this.stopRecordingToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.stopRecordingToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.stopRecordingToolStripMenuItem.Text = "StopRecording"; this.stopRecordingToolStripMenuItem.ToolTipText = "Creates frame-perfect recordings, no matter what hardware is used."; this.stopRecordingToolStripMenuItem.Click += new System.EventHandler(this.stopRecordingToolStripMenuItem_Click); @@ -1070,12 +1070,12 @@ private void InitializeComponent() { // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(257, 6); // // addToolStripMenuItem // this.addToolStripMenuItem.Name = "addToolStripMenuItem"; - this.addToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.addToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.addToolStripMenuItem.Text = "Add"; this.addToolStripMenuItem.ToolTipText = "Serve as instructions to the libTAS converter.\r\nOdds are you don\'t need to worry " + "about this."; this.addToolStripMenuItem.Click += new System.EventHandler(this.addToolStripMenuItem_Click); @@ -1083,7 +1083,7 @@ private void InitializeComponent() { // skipToolStripMenuItem // this.skipToolStripMenuItem.Name = "skipToolStripMenuItem"; - this.skipToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.skipToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.skipToolStripMenuItem.Text = "Skip"; this.skipToolStripMenuItem.ToolTipText = "Serve as instructions to the libTAS converter.\r\nOdds are you don\'t need to worry " + "about this."; this.skipToolStripMenuItem.Click += new System.EventHandler(this.skipToolStripMenuItem_Click); @@ -1091,7 +1091,7 @@ private void InitializeComponent() { // startExportLibTASToolStripMenuItem // this.startExportLibTASToolStripMenuItem.Name = "startExportLibTASToolStripMenuItem"; - this.startExportLibTASToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.startExportLibTASToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.startExportLibTASToolStripMenuItem.Text = "ExportLibTAS"; this.startExportLibTASToolStripMenuItem.ToolTipText = "Converts the TAS to the inputs portion of a LibTAS movie file.\r\n"; this.startExportLibTASToolStripMenuItem.Click += new System.EventHandler(this.startExportLibTASToolStripMenuItem_Click); @@ -1099,7 +1099,7 @@ private void InitializeComponent() { // finishExportLibTASToolStripMenuItem // this.finishExportLibTASToolStripMenuItem.Name = "finishExportLibTASToolStripMenuItem"; - this.finishExportLibTASToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.finishExportLibTASToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.finishExportLibTASToolStripMenuItem.Text = "EndExportLibTAS"; this.finishExportLibTASToolStripMenuItem.ToolTipText = "Converts the TAS to the inputs portion of a LibTAS movie file.\r\n"; this.finishExportLibTASToolStripMenuItem.Click += new System.EventHandler(this.finishExportLibTASToolStripMenuItem_Click); @@ -1107,12 +1107,12 @@ private void InitializeComponent() { // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(257, 6); // // completeInfoToolStripMenuItem // this.completeInfoToolStripMenuItem.Name = "completeInfoToolStripMenuItem"; - this.completeInfoToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.completeInfoToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.completeInfoToolStripMenuItem.Text = "CompleteInfo"; this.completeInfoToolStripMenuItem.ToolTipText = "The successive comments immediately following this command will be displayed to t" + "he specified chapter complete screen."; this.completeInfoToolStripMenuItem.Click += new System.EventHandler(this.completeInfoToolStripMenuItem_Click); @@ -1120,7 +1120,7 @@ private void InitializeComponent() { // recordCountToolStripMenuItem // this.recordCountToolStripMenuItem.Name = "recordCountToolStripMenuItem"; - this.recordCountToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.recordCountToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.recordCountToolStripMenuItem.Text = "Record Count"; this.recordCountToolStripMenuItem.ToolTipText = "Every time you run tas after modifying the current input file, the record count a" + "uto increases by one."; this.recordCountToolStripMenuItem.Click += new System.EventHandler(this.recordCountToolStripMenuItem_Click); @@ -1128,7 +1128,7 @@ private void InitializeComponent() { // fileTimeToolStripMenuItem // this.fileTimeToolStripMenuItem.Name = "fileTimeToolStripMenuItem"; - this.fileTimeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.fileTimeToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.fileTimeToolStripMenuItem.Text = "File Time"; this.fileTimeToolStripMenuItem.ToolTipText = "Auto update the file time when TAS has finished running, the file time is equal t" + "o the elapsed time during the TAS run.\r\n"; this.fileTimeToolStripMenuItem.Click += new System.EventHandler(this.fileTimeToolStripMenuItem_Click); @@ -1136,7 +1136,7 @@ private void InitializeComponent() { // chapterTimeToolStripMenuItem // this.chapterTimeToolStripMenuItem.Name = "chapterTimeToolStripMenuItem"; - this.chapterTimeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.chapterTimeToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.chapterTimeToolStripMenuItem.Text = "Chapter Time"; this.chapterTimeToolStripMenuItem.ToolTipText = "After completing the whole level from the beginning, auto updating the chapter ti" + "me.\r\n"; this.chapterTimeToolStripMenuItem.Click += new System.EventHandler(this.chapterTimeToolStripMenuItem_Click); @@ -1144,12 +1144,12 @@ private void InitializeComponent() { // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(257, 6); // // exitGameToolStripMenuItem // this.exitGameToolStripMenuItem.Name = "exitGameToolStripMenuItem"; - this.exitGameToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.exitGameToolStripMenuItem.Size = new System.Drawing.Size(260, 28); this.exitGameToolStripMenuItem.Text = "Exit Game"; this.exitGameToolStripMenuItem.ToolTipText = "Used to force the game when recording video with .kkapture to finish recording."; this.exitGameToolStripMenuItem.Click += new System.EventHandler(this.exitGameToolStripMenuItem_Click); @@ -1157,26 +1157,26 @@ private void InitializeComponent() { // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(422, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(591, 6); // // swapDashKeysStripMenuItem // this.swapDashKeysStripMenuItem.Name = "swapDashKeysStripMenuItem"; - this.swapDashKeysStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.swapDashKeysStripMenuItem.Size = new System.Drawing.Size(594, 28); this.swapDashKeysStripMenuItem.Text = "Swap Selected C and X"; this.swapDashKeysStripMenuItem.Click += new System.EventHandler(this.swapDashKeysStripMenuItem_Click); // // swapJumpKeysToolStripMenuItem // this.swapJumpKeysToolStripMenuItem.Name = "swapJumpKeysToolStripMenuItem"; - this.swapJumpKeysToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.swapJumpKeysToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.swapJumpKeysToolStripMenuItem.Text = "Swap Selected J and K"; this.swapJumpKeysToolStripMenuItem.Click += new System.EventHandler(this.swapJumpKeysToolStripMenuItem_Click); // // swapSelectedLAndRToolStripMenuItem // this.swapSelectedLAndRToolStripMenuItem.Name = "swapSelectedLAndRToolStripMenuItem"; - this.swapSelectedLAndRToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.swapSelectedLAndRToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.swapSelectedLAndRToolStripMenuItem.Text = "Swap Selected L and R"; this.swapSelectedLAndRToolStripMenuItem.Click += new System.EventHandler(this.swapSelectedLAndRToolStripMenuItem_Click); // @@ -1184,7 +1184,7 @@ private void InitializeComponent() { // this.combineConsecutiveSameInputsToolStripMenuItem.Name = "combineConsecutiveSameInputsToolStripMenuItem"; this.combineConsecutiveSameInputsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L))); - this.combineConsecutiveSameInputsToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.combineConsecutiveSameInputsToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.combineConsecutiveSameInputsToolStripMenuItem.Text = "Combine Consecutive Same Inputs"; this.combineConsecutiveSameInputsToolStripMenuItem.Click += new System.EventHandler(this.combineConsecutiveSameInputsToolStripMenuItem_Click); // @@ -1192,26 +1192,26 @@ private void InitializeComponent() { // this.forceCombineInputsToolStripMenuItem.Name = "forceCombineInputsToolStripMenuItem"; this.forceCombineInputsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) (((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.L))); - this.forceCombineInputsToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.forceCombineInputsToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.forceCombineInputsToolStripMenuItem.Text = "Force Combine Inputs Frames"; this.forceCombineInputsToolStripMenuItem.Click += new System.EventHandler(this.forceCombineInputsToolStripMenuItem_Click); // // convertDashToDemoDashToolStripMenuItem // this.convertDashToDemoDashToolStripMenuItem.Name = "convertDashToDemoDashToolStripMenuItem"; - this.convertDashToDemoDashToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.convertDashToDemoDashToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.convertDashToDemoDashToolStripMenuItem.Text = "Convert Dash to Demo Dash"; this.convertDashToDemoDashToolStripMenuItem.Click += new System.EventHandler(this.convertDashToDemoDashToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(422, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(591, 6); // // openReadFileToolStripMenuItem // this.openReadFileToolStripMenuItem.Name = "openReadFileToolStripMenuItem"; - this.openReadFileToolStripMenuItem.Size = new System.Drawing.Size(425, 22); + this.openReadFileToolStripMenuItem.Size = new System.Drawing.Size(594, 28); this.openReadFileToolStripMenuItem.Text = "Open Read File / Go to Play Line"; this.openReadFileToolStripMenuItem.Click += new System.EventHandler(this.openReadFileToolStripMenuItem_Click); // @@ -1220,7 +1220,7 @@ private void InitializeComponent() { this.richText.AllowDrop = true; this.richText.Anchor = ((System.Windows.Forms.AnchorStyles) ((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.richText.AutoIndent = false; - this.richText.AutoScrollMinSize = new System.Drawing.Size(33, 84); + this.richText.AutoScrollMinSize = new System.Drawing.Size(45, 128); this.richText.BackBrush = null; this.richText.ChangedLineBgColor = System.Drawing.Color.DarkOrange; this.richText.ChangedLineTextColor = System.Drawing.Color.Teal; @@ -1234,7 +1234,8 @@ private void InitializeComponent() { this.richText.ForeColor = System.Drawing.Color.Black; this.richText.Language = CelesteStudio.RichText.Language.TAS; this.richText.LineNumberColor = System.Drawing.Color.Black; - this.richText.Location = new System.Drawing.Point(0, 24); + this.richText.Location = new System.Drawing.Point(0, 36); + this.richText.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.richText.Name = "richText"; this.richText.Paddings = new System.Windows.Forms.Padding(0); this.richText.PlayingLineBgColor = System.Drawing.Color.Lime; @@ -1243,7 +1244,7 @@ private void InitializeComponent() { this.richText.SaveStateLine = -1; this.richText.SaveStateTextColor = System.Drawing.Color.White; this.richText.SelectionColor = System.Drawing.Color.FromArgb(((int) (((byte) (50)))), ((int) (((byte) (0)))), ((int) (((byte) (0)))), ((int) (((byte) (0))))); - this.richText.Size = new System.Drawing.Size(286, 496); + this.richText.Size = new System.Drawing.Size(429, 744); this.richText.TabIndex = 0; this.richText.TabLength = 0; this.richText.TextChanged += new System.EventHandler(this.tasText_TextChanged); @@ -1262,9 +1263,10 @@ private void InitializeComponent() { this.statusPanel.AutoScroll = true; this.statusPanel.Controls.Add(this.statusBar); this.statusPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.statusPanel.Location = new System.Drawing.Point(0, 502); + this.statusPanel.Location = new System.Drawing.Point(0, 753); + this.statusPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.statusPanel.Name = "statusPanel"; - this.statusPanel.Size = new System.Drawing.Size(286, 100); + this.statusPanel.Size = new System.Drawing.Size(429, 150); this.statusPanel.TabIndex = 5; // // statusBar @@ -1276,7 +1278,8 @@ private void InitializeComponent() { this.statusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.lblStatus}); this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(286, 100); + this.statusBar.Padding = new System.Windows.Forms.Padding(2, 0, 21, 0); + this.statusBar.Size = new System.Drawing.Size(429, 150); this.statusBar.TabIndex = 2; // // lblStatus @@ -1284,24 +1287,17 @@ private void InitializeComponent() { this.lblStatus.Font = new System.Drawing.Font("Courier New", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (0))); this.lblStatus.Name = "lblStatus"; this.lblStatus.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; - this.lblStatus.Size = new System.Drawing.Size(271, 95); + this.lblStatus.Size = new System.Drawing.Size(406, 145); this.lblStatus.Spring = true; this.lblStatus.Text = "Searching..."; this.lblStatus.TextAlign = System.Drawing.ContentAlignment.TopLeft; // - // centerCameraHorizontallyOnlyToolStripMenuItem - // - this.centerCameraHorizontallyOnlyToolStripMenuItem.Name = "centerCameraHorizontallyOnlyToolStripMenuItem"; - this.centerCameraHorizontallyOnlyToolStripMenuItem.Size = new System.Drawing.Size(324, 22); - this.centerCameraHorizontallyOnlyToolStripMenuItem.Text = "Center Camera Horizontally Only"; - this.centerCameraHorizontallyOnlyToolStripMenuItem.Click += new System.EventHandler(this.centerCameraHorizontallyOnlyToolStripMenuItem_Click); - // // Studio // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(286, 602); + this.ClientSize = new System.Drawing.Size(429, 903); this.Controls.Add(this.statusPanel); this.Controls.Add(this.dividerLabel); this.Controls.Add(this.menuStrip); @@ -1310,7 +1306,8 @@ private void InitializeComponent() { this.KeyPreview = true; this.Location = new System.Drawing.Point(0, 0); this.MainMenuStrip = this.menuStrip; - this.MinimumSize = new System.Drawing.Size(192, 206); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.MinimumSize = new System.Drawing.Size(277, 281); this.Name = "Studio"; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "Studio"; @@ -1356,7 +1353,6 @@ private void InitializeComponent() { private System.Windows.Forms.ToolStripSeparator toolStripSeparator22; private System.Windows.Forms.ToolStripMenuItem saveAndQuitReenterToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveAndQuitReenterModeToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator26; private System.Windows.Forms.ToolStripMenuItem invokeToolStripMenuItem; diff --git a/Studio/Studio.cs b/Studio/Studio.cs index 20858708..7981b6ce 100644 --- a/Studio/Studio.cs +++ b/Studio/Studio.cs @@ -1578,10 +1578,6 @@ private void saveAndQuitReenterToolStripMenuItem_Click(object sender, EventArgs InsertNewLine("SaveAndQuitReenter"); } - private void saveAndQuitReenterModeToolStripMenuItem_Click(object sender, EventArgs e) { - InsertNewLine("SaveAndQuitReenterMode, Simulate/Input"); - } - private void autoInputToolStripMenuItem_Click(object sender, EventArgs e) { InsertNewLine("AutoInput, 2\n 1,S,N\n 10,O\nStartAutoInput\n\nEndAutoInput"); }