Merge pull request #9 from Kakumi/beta

Pull Request V1.1.2
Kakumi · Jan 18, 2024 · a489da1 · a489da1
2 parents 36dba18 + 664cf2a
commit a489da1
Show file tree

Hide file tree

Showing 9 changed files with 173 additions and 110 deletions.
diff --git a/BizHawk/ExternalTools/Pokebot.dll b/BizHawk/ExternalTools/Pokebot.dll
diff --git a/src/Factories/Bots/PokeFinderBot.cs b/src/Factories/Bots/PokeFinderBot.cs
@@ -103,12 +103,17 @@ public void Execute(PlayerData playerData, GameState state)
                         var pokemon = party[0];
                         PokemonEncountered?.Invoke(pokemon);
                         Control.SetPID(pokemon.PID.ToString("X"));
-                        if (pokemon.PID.ToString("X") == Control.GetPID())
+
+                        var opponent = GameVersion.Memory.GetOpponent();
+                        if (opponent != null)
                         {
-                            Log.Info(Messages.Pokemon_Found);
-                            PokemonFound?.Invoke(pokemon);
+                            PokemonEncountered?.Invoke(opponent);
+                            Control.SetOpponentPID(opponent.PID.ToString("X"));
                         }
 
+                        Log.Info(Messages.Pokemon_Found);
+                        PokemonFound?.Invoke(pokemon);
+
                         Stop();
                     }
                 }

diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs
diff --git a/src/Messages.resx b/src/Messages.resx
@@ -330,6 +330,9 @@
   <data name="Viewer_NotShiny" xml:space="preserve">
     <value>Not shiny</value>
   </data>
+  <data name="Viewer_PID" xml:space="preserve">
+    <value>PID: {0}</value>
+  </data>
   <data name="Viewer_Shiny" xml:space="preserve">
     <value>Shiny</value>
   </data>

diff --git a/src/Panels/PokeFinderControl.Designer.cs b/src/Panels/PokeFinderControl.Designer.cs
diff --git a/src/Panels/PokeFinderControl.cs b/src/Panels/PokeFinderControl.cs
@@ -38,6 +38,11 @@ public string GetPID()
             return _inputPID.Text;
         }
 
+        public string GetOpponentPID()
+        {
+            return _opponentPID.Text;
+        }
+
         public void SetInfo(int tid, int sid)
         {
             _labelTIDSID.Text = string.Format(Messages.BotPokeFinder_TrainerInfo, tid, sid);
@@ -90,6 +95,11 @@ internal void SetPID(string pid)
             _inputPID.Text = pid;
         }
 
+        internal void SetOpponentPID(string pid)
+        {
+            _opponentPID.Text = pid;
+        }
+
         private void _pokefinderTypesComboBox_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (_pokefinderTypesComboBox.SelectedItem is PokeFinderType pokeFinderType)