ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Icon change, and changed _lastAdvancedFrame to private 

Had to put code back in to sync it.  Changed a variable to private and changed Copy icon on copy cutton to "duplicate".
Note: To fix the error with the pull request for being ahead x commits and behind x commits, must merge from upstream/master which got the missing commits.
This commit is contained in:
ShinobiWannabe 2019-07-15 22:38:54 -04:00
parent 7f29c4173b
commit bb0e0522f2
3 changed files with 1221 additions and 1164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs generated
View File

@ -57,6 +57,7 @@
this.ControlsBox = new System.Windows.Forms.GroupBox();
this.ControlProbabilityPanel = new System.Windows.Forms.Panel();
this.BestGroupBox = new System.Windows.Forms.GroupBox();
this.btnCopyBestInput = new System.Windows.Forms.Button();
this.PlayBestButton = new System.Windows.Forms.Button();
this.ClearBestButton = new System.Windows.Forms.Button();
this.BestAttemptNumberLabel = new System.Windows.Forms.Label();
@ -118,6 +119,8 @@
this.panel2 = new System.Windows.Forms.Panel();
this.StatsContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.ClearStatsContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.BotMenu.SuspendLayout();
this.BotStatusStrip.SuspendLayout();
this.ControlsBox.SuspendLayout();
@ -143,7 +146,8 @@
this.BotMenu.ClickThrough = true;
this.BotMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.OptionsSubMenu});
this.OptionsSubMenu,
this.helpToolStripMenuItem});
this.BotMenu.Location = new System.Drawing.Point(0, 0);
this.BotMenu.Name = "BotMenu";
this.BotMenu.Size = new System.Drawing.Size(707, 24);
@ -161,7 +165,7 @@
this.toolStripSeparator1,
this.ExitMenuItem});
this.FileSubMenu.Name = "FileSubMenu";
this.FileSubMenu.Size = new System.Drawing.Size(35, 20);
this.FileSubMenu.Size = new System.Drawing.Size(37, 20);
this.FileSubMenu.Text = "&File";
this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
//
@ -170,7 +174,7 @@
this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewMenuItem.Name = "NewMenuItem";
this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewMenuItem.Size = new System.Drawing.Size(193, 22);
this.NewMenuItem.Size = new System.Drawing.Size(195, 22);
this.NewMenuItem.Text = "&New";
this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click);
//
@ -179,7 +183,7 @@
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(193, 22);
this.OpenMenuItem.Size = new System.Drawing.Size(195, 22);
this.OpenMenuItem.Text = "&Open...";
this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
//
@ -188,7 +192,7 @@
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(193, 22);
this.SaveMenuItem.Size = new System.Drawing.Size(195, 22);
this.SaveMenuItem.Text = "&Save";
this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click);
//
@ -197,7 +201,7 @@
this.SaveAsMenuItem.Name = "SaveAsMenuItem";
this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.SaveAsMenuItem.Size = new System.Drawing.Size(193, 22);
this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22);
this.SaveAsMenuItem.Text = "Save &As...";
this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click);
//
@ -207,7 +211,7 @@
this.toolStripSeparator2});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(193, 22);
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22);
this.RecentSubMenu.Text = "Recent";
this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
//
@ -219,13 +223,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(190, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6);
//
// ExitMenuItem
//
this.ExitMenuItem.Name = "ExitMenuItem";
this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4";
this.ExitMenuItem.Size = new System.Drawing.Size(193, 22);
this.ExitMenuItem.Size = new System.Drawing.Size(195, 22);
this.ExitMenuItem.Text = "E&xit";
this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
//
@ -238,7 +242,7 @@
this.toolStripSeparator4,
this.TurboWhileBottingMenuItem});
this.OptionsSubMenu.Name = "OptionsSubMenu";
this.OptionsSubMenu.Size = new System.Drawing.Size(56, 20);
this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20);
this.OptionsSubMenu.Text = "&Options";
this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened);
//
@ -247,14 +251,14 @@
this.MemoryDomainsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator3});
this.MemoryDomainsMenuItem.Name = "MemoryDomainsMenuItem";
this.MemoryDomainsMenuItem.Size = new System.Drawing.Size(168, 22);
this.MemoryDomainsMenuItem.Size = new System.Drawing.Size(181, 22);
this.MemoryDomainsMenuItem.Text = "Memory Domains";
this.MemoryDomainsMenuItem.DropDownOpened += new System.EventHandler(this.MemoryDomainsMenuItem_DropDownOpened);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6);
//
// DataSizeMenuItem
//
@ -263,47 +267,47 @@
this._2ByteMenuItem,
this._4ByteMenuItem});
this.DataSizeMenuItem.Name = "DataSizeMenuItem";
this.DataSizeMenuItem.Size = new System.Drawing.Size(168, 22);
this.DataSizeMenuItem.Size = new System.Drawing.Size(181, 22);
this.DataSizeMenuItem.Text = "Data Size";
this.DataSizeMenuItem.DropDownOpened += new System.EventHandler(this.DataSizeMenuItem_DropDownOpened);
//
// _1ByteMenuItem
//
this._1ByteMenuItem.Name = "_1ByteMenuItem";
this._1ByteMenuItem.Size = new System.Drawing.Size(110, 22);
this._1ByteMenuItem.Size = new System.Drawing.Size(111, 22);
this._1ByteMenuItem.Text = "1 Byte";
this._1ByteMenuItem.Click += new System.EventHandler(this._1ByteMenuItem_Click);
//
// _2ByteMenuItem
//
this._2ByteMenuItem.Name = "_2ByteMenuItem";
this._2ByteMenuItem.Size = new System.Drawing.Size(110, 22);
this._2ByteMenuItem.Size = new System.Drawing.Size(111, 22);
this._2ByteMenuItem.Text = "2 Bytes";
this._2ByteMenuItem.Click += new System.EventHandler(this._2ByteMenuItem_Click);
//
// _4ByteMenuItem
//
this._4ByteMenuItem.Name = "_4ByteMenuItem";
this._4ByteMenuItem.Size = new System.Drawing.Size(110, 22);
this._4ByteMenuItem.Size = new System.Drawing.Size(111, 22);
this._4ByteMenuItem.Text = "4 Bytes";
this._4ByteMenuItem.Click += new System.EventHandler(this._4ByteMenuItem_Click);
//
// BigEndianMenuItem
//
this.BigEndianMenuItem.Name = "BigEndianMenuItem";
this.BigEndianMenuItem.Size = new System.Drawing.Size(168, 22);
this.BigEndianMenuItem.Size = new System.Drawing.Size(181, 22);
this.BigEndianMenuItem.Text = "Big Endian";
this.BigEndianMenuItem.Click += new System.EventHandler(this.BigEndianMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(165, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(178, 6);
//
// TurboWhileBottingMenuItem
//
this.TurboWhileBottingMenuItem.Name = "TurboWhileBottingMenuItem";
this.TurboWhileBottingMenuItem.Size = new System.Drawing.Size(168, 22);
this.TurboWhileBottingMenuItem.Size = new System.Drawing.Size(181, 22);
this.TurboWhileBottingMenuItem.Text = "Turbo While Botting";
this.TurboWhileBottingMenuItem.Click += new System.EventHandler(this.TurboWhileBottingMenuItem_Click);
//
@ -375,6 +379,7 @@
//
this.BestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.BestGroupBox.Controls.Add(this.btnCopyBestInput);
this.BestGroupBox.Controls.Add(this.PlayBestButton);
this.BestGroupBox.Controls.Add(this.ClearBestButton);
this.BestGroupBox.Controls.Add(this.BestAttemptNumberLabel);
@ -395,6 +400,20 @@
this.BestGroupBox.TabStop = false;
this.BestGroupBox.Text = "Best";
//
// btnCopyBestInput
//
this.btnCopyBestInput.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.btnCopyBestInput.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCopyBestInput.Location = new System.Drawing.Point(12, 94);
this.btnCopyBestInput.Name = "btnCopyBestInput";
this.btnCopyBestInput.Size = new System.Drawing.Size(75, 23);
this.btnCopyBestInput.TabIndex = 2005;
this.btnCopyBestInput.Text = "&Copy";
this.toolTip1.SetToolTip(this.btnCopyBestInput, "\"Copy to Clipboard. Then possible to paste to text file or directly into TasStud" +
"io.");
this.btnCopyBestInput.UseVisualStyleBackColor = true;
this.btnCopyBestInput.Click += new System.EventHandler(this.btnCopyBestInput_Click);
//
// PlayBestButton
//
this.PlayBestButton.Enabled = false;
@ -448,9 +467,9 @@
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Controls.Add(this.BestAttemptLogLabel);
this.panel1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.panel1.Location = new System.Drawing.Point(12, 112);
this.panel1.Location = new System.Drawing.Point(12, 125);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(212, 251);
this.panel1.Size = new System.Drawing.Size(212, 238);
this.panel1.TabIndex = 21;
//
// BestAttemptLogLabel
@ -1110,15 +1129,22 @@
this.StatsContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ClearStatsContextMenuItem});
this.StatsContextMenu.Name = "StatsContextMenu";
this.StatsContextMenu.Size = new System.Drawing.Size(100, 26);
this.StatsContextMenu.Size = new System.Drawing.Size(102, 26);
//
// ClearStatsContextMenuItem
//
this.ClearStatsContextMenuItem.Name = "ClearStatsContextMenuItem";
this.ClearStatsContextMenuItem.Size = new System.Drawing.Size(99, 22);
this.ClearStatsContextMenuItem.Size = new System.Drawing.Size(101, 22);
this.ClearStatsContextMenuItem.Text = "&Clear";
this.ClearStatsContextMenuItem.Click += new System.EventHandler(this.ClearStatsContextMenuItem_Click);
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.helpToolStripMenuItem.Text = "Help";
this.helpToolStripMenuItem.Click += new System.EventHandler(this.HelpToolStripMenuItem_Click);
//
// BasicBot
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1262,5 +1288,8 @@
private System.Windows.Forms.Label label9;
private HexTextBox MaximizeAddressBox;
private System.Windows.Forms.Label maximizeLabeltext;
private System.Windows.Forms.Button btnCopyBestInput;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
}
}

27
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -48,6 +48,7 @@ namespace BizHawk.Client.EmuHawk
private bool _replayMode = false;
private int _startFrame = 0;
private string _lastRom = "";
private int _lastFrameAdvanced { get; set; }
private bool _dontUpdateValues = false;
@ -819,6 +820,12 @@ namespace BizHawk.Client.EmuHawk
#endregion
public bool HasFrameAdvanced()
{
//If the emulator frame is different from the last time it tried calling
//the function then we can continue, otherwise we need to stop.
return _lastFrameAdvanced != Emulator.Frame;
}
private void SetupControlsAndProperties()
{
MaximizeAddressBox.SetHexProperties(_currentDomain.Size);
@ -898,6 +905,11 @@ namespace BizHawk.Client.EmuHawk
return;
}
if (!HasFrameAdvanced())
{
return;
}
if (_replayMode)
{
int index = Emulator.Frame - _startFrame;
@ -941,8 +953,12 @@ namespace BizHawk.Client.EmuHawk
_currentBotAttempt = new BotAttempt { Attempt = Attempts };
GlobalWin.MainForm.LoadQuickSave(SelectedSlot, false, true);
}
//Before this would have 2 additional hits before the frame even advanced, making the amount of inputs greater than the number of frames to test.
if (_currentBotAttempt.Log.Count < FrameLength) //aka do not Add more inputs than there are Frames to test
{
PressButtons();
_lastFrameAdvanced = Emulator.Frame;
}
}
}
@ -1330,5 +1346,14 @@ namespace BizHawk.Client.EmuHawk
this._comparisonBotAttempt.TieBreak3 = (int)numericUpDown.Value;
}
private void btnCopyBestInput_Click(object sender, EventArgs e)
{
Clipboard.SetText(BestAttemptLogLabel.Text);
}
private void HelpToolStripMenuItem_Click(object sender, EventArgs e)
{
}
}
}

3
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.resx
View File

@ -139,6 +139,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>400, 17</value>
</metadata>
<metadata name="StatsContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>248, 17</value>
</metadata>