From 47c8d4f6e832b3f1ae91881e17391f67c9f5afec Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Sun, 28 Nov 2021 10:27:01 -0500 Subject: [PATCH] EmuHawk: Add description to N64 profile informing user about auto-skipping lag frames during frame advance. Fixes #2380 --- .../config/ProfileConfig.Designer.cs | 202 +++++++++--------- .../config/ProfileConfig.resx | 9 +- 2 files changed, 106 insertions(+), 105 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs index bba7f01ae5..a4adbb1d22 100644 --- a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs @@ -28,110 +28,110 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProfileConfig)); - this.OkBtn = new System.Windows.Forms.Button(); - this.CancelBtn = new System.Windows.Forms.Button(); - this.ProfileSelectComboBox = new System.Windows.Forms.ComboBox(); - this.ProfileDialogHelpTexBox = new System.Windows.Forms.RichTextBox(); - this.ProfileOptionsLabel = new BizHawk.WinForms.Controls.LocLabelEx(); - this.OtherOptions = new BizHawk.WinForms.Controls.LocLabelEx(); - this.AutoCheckForUpdates = new System.Windows.Forms.CheckBox(); - this.SuspendLayout(); - // - // OkBtn - // - this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OkBtn.Location = new System.Drawing.Point(290, 231); - this.OkBtn.Name = "OkBtn"; - this.OkBtn.Size = new System.Drawing.Size(60, 23); - this.OkBtn.TabIndex = 0; - this.OkBtn.Text = "&OK"; - this.OkBtn.UseVisualStyleBackColor = true; - this.OkBtn.Click += new System.EventHandler(this.OkBtn_Click); - // - // CancelBtn - // - this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.CancelBtn.Location = new System.Drawing.Point(356, 231); - this.CancelBtn.Name = "CancelBtn"; - this.CancelBtn.Size = new System.Drawing.Size(60, 23); - this.CancelBtn.TabIndex = 1; - this.CancelBtn.Text = "&Cancel"; - this.CancelBtn.UseVisualStyleBackColor = true; - this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click); - // - // ProfileSelectComboBox - // - this.ProfileSelectComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ProfileSelectComboBox.FormattingEnabled = true; - this.ProfileSelectComboBox.Items.AddRange(new object[] { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProfileConfig)); + this.OkBtn = new System.Windows.Forms.Button(); + this.CancelBtn = new System.Windows.Forms.Button(); + this.ProfileSelectComboBox = new System.Windows.Forms.ComboBox(); + this.ProfileDialogHelpTexBox = new System.Windows.Forms.RichTextBox(); + this.ProfileOptionsLabel = new BizHawk.WinForms.Controls.LocLabelEx(); + this.OtherOptions = new BizHawk.WinForms.Controls.LocLabelEx(); + this.AutoCheckForUpdates = new System.Windows.Forms.CheckBox(); + this.SuspendLayout(); + // + // OkBtn + // + this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.OkBtn.Location = new System.Drawing.Point(290, 297); + this.OkBtn.Name = "OkBtn"; + this.OkBtn.Size = new System.Drawing.Size(60, 23); + this.OkBtn.TabIndex = 0; + this.OkBtn.Text = "&OK"; + this.OkBtn.UseVisualStyleBackColor = true; + this.OkBtn.Click += new System.EventHandler(this.OkBtn_Click); + // + // CancelBtn + // + this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.CancelBtn.Location = new System.Drawing.Point(356, 297); + this.CancelBtn.Name = "CancelBtn"; + this.CancelBtn.Size = new System.Drawing.Size(60, 23); + this.CancelBtn.TabIndex = 1; + this.CancelBtn.Text = "&Cancel"; + this.CancelBtn.UseVisualStyleBackColor = true; + this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click); + // + // ProfileSelectComboBox + // + this.ProfileSelectComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ProfileSelectComboBox.FormattingEnabled = true; + this.ProfileSelectComboBox.Items.AddRange(new object[] { "Casual Gaming", + "Longplays", "Tool-assisted Speedruns", - "N64 Tool-assisted Speedruns", - "Longplays"}); - this.ProfileSelectComboBox.Location = new System.Drawing.Point(12, 27); - this.ProfileSelectComboBox.Name = "ProfileSelectComboBox"; - this.ProfileSelectComboBox.Size = new System.Drawing.Size(156, 21); - this.ProfileSelectComboBox.TabIndex = 4; - // - // ProfileDialogHelpTexBox - // - this.ProfileDialogHelpTexBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + "N64 Tool-assisted Speedruns"}); + this.ProfileSelectComboBox.Location = new System.Drawing.Point(12, 27); + this.ProfileSelectComboBox.Name = "ProfileSelectComboBox"; + this.ProfileSelectComboBox.Size = new System.Drawing.Size(156, 21); + this.ProfileSelectComboBox.TabIndex = 4; + // + // ProfileDialogHelpTexBox + // + this.ProfileDialogHelpTexBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.ProfileDialogHelpTexBox.Location = new System.Drawing.Point(218, 12); - this.ProfileDialogHelpTexBox.Name = "ProfileDialogHelpTexBox"; - this.ProfileDialogHelpTexBox.ReadOnly = true; - this.ProfileDialogHelpTexBox.Size = new System.Drawing.Size(198, 174); - this.ProfileDialogHelpTexBox.TabIndex = 2; - this.ProfileDialogHelpTexBox.Text = resources.GetString("ProfileDialogHelpTexBox.Text"); - // - // ProfileOptionsLabel - // - this.ProfileOptionsLabel.Location = new System.Drawing.Point(9, 9); - this.ProfileOptionsLabel.Name = "ProfileOptionsLabel"; - this.ProfileOptionsLabel.Text = "Profile Options"; - // - // OtherOptions - // - this.OtherOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.OtherOptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.OtherOptions.Location = new System.Drawing.Point(9, 190); - this.OtherOptions.Name = "OtherOptions"; - this.OtherOptions.Text = "Other Options"; - // - // AutoCheckForUpdates - // - this.AutoCheckForUpdates.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.AutoCheckForUpdates.AutoSize = true; - this.AutoCheckForUpdates.Location = new System.Drawing.Point(12, 208); - this.AutoCheckForUpdates.Name = "AutoCheckForUpdates"; - this.AutoCheckForUpdates.Size = new System.Drawing.Size(345, 17); - this.AutoCheckForUpdates.TabIndex = 13; - this.AutoCheckForUpdates.Text = "Automatically check for and notify me of newer versions of BizHawk"; - this.AutoCheckForUpdates.UseVisualStyleBackColor = true; - // - // ProfileConfig - // - this.AcceptButton = this.OkBtn; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.CancelBtn; - this.ClientSize = new System.Drawing.Size(428, 266); - this.Controls.Add(this.AutoCheckForUpdates); - this.Controls.Add(this.OtherOptions); - this.Controls.Add(this.ProfileOptionsLabel); - this.Controls.Add(this.ProfileDialogHelpTexBox); - this.Controls.Add(this.ProfileSelectComboBox); - this.Controls.Add(this.CancelBtn); - this.Controls.Add(this.OkBtn); - this.MinimumSize = new System.Drawing.Size(315, 280); - this.Name = "ProfileConfig"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Profile Config"; - this.Load += new System.EventHandler(this.ProfileConfig_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.ProfileDialogHelpTexBox.Location = new System.Drawing.Point(218, 12); + this.ProfileDialogHelpTexBox.Name = "ProfileDialogHelpTexBox"; + this.ProfileDialogHelpTexBox.ReadOnly = true; + this.ProfileDialogHelpTexBox.Size = new System.Drawing.Size(198, 240); + this.ProfileDialogHelpTexBox.TabIndex = 2; + this.ProfileDialogHelpTexBox.Text = resources.GetString("ProfileDialogHelpTexBox.Text"); + // + // ProfileOptionsLabel + // + this.ProfileOptionsLabel.Location = new System.Drawing.Point(9, 9); + this.ProfileOptionsLabel.Name = "ProfileOptionsLabel"; + this.ProfileOptionsLabel.Text = "Profile Options"; + // + // OtherOptions + // + this.OtherOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.OtherOptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.OtherOptions.Location = new System.Drawing.Point(9, 256); + this.OtherOptions.Name = "OtherOptions"; + this.OtherOptions.Text = "Other Options"; + // + // AutoCheckForUpdates + // + this.AutoCheckForUpdates.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.AutoCheckForUpdates.AutoSize = true; + this.AutoCheckForUpdates.Location = new System.Drawing.Point(12, 274); + this.AutoCheckForUpdates.Name = "AutoCheckForUpdates"; + this.AutoCheckForUpdates.Size = new System.Drawing.Size(345, 17); + this.AutoCheckForUpdates.TabIndex = 13; + this.AutoCheckForUpdates.Text = "Automatically check for and notify me of newer versions of BizHawk"; + this.AutoCheckForUpdates.UseVisualStyleBackColor = true; + // + // ProfileConfig + // + this.AcceptButton = this.OkBtn; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.CancelBtn; + this.ClientSize = new System.Drawing.Size(428, 332); + this.Controls.Add(this.AutoCheckForUpdates); + this.Controls.Add(this.OtherOptions); + this.Controls.Add(this.ProfileOptionsLabel); + this.Controls.Add(this.ProfileDialogHelpTexBox); + this.Controls.Add(this.ProfileSelectComboBox); + this.Controls.Add(this.CancelBtn); + this.Controls.Add(this.OkBtn); + this.MinimumSize = new System.Drawing.Size(315, 280); + this.Name = "ProfileConfig"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Profile Config"; + this.Load += new System.EventHandler(this.ProfileConfig_Load); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.resx b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.resx index 368376830a..c1265942d6 100644 --- a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.resx +++ b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.resx @@ -121,11 +121,12 @@ Options: Casual Gaming - All about performance! -Tool-Assisted Speedruns - Maximum Accuracy! +Longplays - Stability is the key! -N64 Tool-assisted Speedruns - Identical to Tool -Assisted Speedruns but with additional N64 specific settings. +Tool-Assisted Speedruns (TAS) - Maximum Accuracy! -Longplays - Stability is the key! +N64 Tool-assisted Speedruns - Same as TAS above but with additional N64 specific settings. NOTE: With this profile, frame advance also skips non-input (lag) frames. This can optionally be disabled under Config->Customize->Advanced. + + \ No newline at end of file