From ece2d8d68ca1a6a1ab8db98474f2534a5b3373f6 Mon Sep 17 00:00:00 2001
From: tom_mai78101 <tom.mai78101@gmail.com>
Date: Thu, 14 Jul 2022 23:35:18 -0400
Subject: [PATCH] Added NOT operator to Basic Bot.
---
.../tools/BasicBot/BasicBot.Designer.cs | 3 ++-
src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs
index 182afecdf6..44dbf9d3b4 100644
--- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs
@@ -606,7 +606,8 @@ namespace BizHawk.Client.EmuHawk
">=",
"=",
"<=",
- "<"});
+ "<",
+ "!="});
this.MainOperator.Location = new System.Drawing.Point(208, 3);
this.MainOperator.Name = "MainOperator";
this.MainOperator.Size = new System.Drawing.Size(40, 21);
diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
index a0762b3405..2375afb37c 100644
--- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
@@ -252,25 +252,25 @@ namespace BizHawk.Client.EmuHawk
public byte MainComparisonType
{
get => (byte)MainOperator.SelectedIndex;
- set => MainOperator.SelectedIndex = value < 5 ? value : 0;
+ set => MainOperator.SelectedIndex = value < 6 ? value : 0;
}
public byte Tie1ComparisonType
{
get => (byte)Tiebreak1Operator.SelectedIndex;
- set => Tiebreak1Operator.SelectedIndex = value < 5 ? value : 0;
+ set => Tiebreak1Operator.SelectedIndex = value < 6 ? value : 0;
}
public byte Tie2ComparisonType
{
get => (byte)Tiebreak2Operator.SelectedIndex;
- set => Tiebreak2Operator.SelectedIndex = value < 5 ? value : 0;
+ set => Tiebreak2Operator.SelectedIndex = value < 6 ? value : 0;
}
public byte Tie3ComparisonType
{
get => (byte)Tiebreak3Operator.SelectedIndex;
- set => Tiebreak3Operator.SelectedIndex = value < 5 ? value : 0;
+ set => Tiebreak3Operator.SelectedIndex = value < 6 ? value : 0;
}
public string FromSlot
@@ -956,6 +956,7 @@ namespace BizHawk.Client.EmuHawk
2 => (currentValue == bestValue),
3 => (currentValue <= bestValue),
4 => (currentValue < bestValue),
+ 5 => (currentValue != bestValue),
_ => false
};
}