Added Sword of Justice & Gigas support

Author: Manu098vm

SysBot.Pokemon/Actions/PokeRoutineExecutor.cs

@@ -318,8 +318,8 @@ public async Task StartGame(PokeTradeHubConfig config, CancellationToken token)
             for (int i = 0; i < 5; i++)
                 await Click(A, 1_000, token).ConfigureAwait(false);
 
-            while (!await IsOnOverworld(config, token).ConfigureAwait(false))
-                await Task.Delay(2_000, token).ConfigureAwait(false);
+            while (!await IsOnOverworld(config, token).ConfigureAwait(false) && !await IsInBattle(token).ConfigureAwait(false))
+                await Task.Delay(0_500, token).ConfigureAwait(false);
 
             Log("Back in the overworld!");
         }

SysBot.Pokemon/BotEncounter/EncounterBot.cs

@@ -42,8 +42,10 @@ protected override async Task MainLoop(CancellationToken token)
                 EncounterMode.VerticalLine => WalkInLine(token),
                 EncounterMode.HorizontalLine => WalkInLine(token),
                 EncounterMode.Eternatus => DoEternatusEncounter(token),
+                EncounterMode.Regigigas => DoRegigigasEncounter(token),
                 EncounterMode.Regis => DoRegiEncounter(token),
                 EncounterMode.LegendaryDogs => DoDogEncounter(token),
+                EncounterMode.SwordsJustice => DoJusticeEncounter(token),
                 _ => WalkInLine(token),
             };
             await task.ConfigureAwait(false);
@@ -109,6 +111,33 @@ private async Task DoEternatusEncounter(CancellationToken token)
             }
         }
 
+        private async Task DoRegigigasEncounter(CancellationToken token)
+        {
+            Log("Reminder: LDN-MITM SYSMODULE IS REQUIRED IN ORDER FOR THIS BOT TO WORK!");
+            while (!token.IsCancellationRequested)
+            {
+                Log("Looking for Gigas...");
+
+                //Click through all the menus until the encounter.
+                while (!await IsInBattle(token).ConfigureAwait(false))
+                    await Click(A, 1_000, token).ConfigureAwait(false);
+
+                Log("An encounter has started!");
+
+                var pk = await ReadUntilPresent(RaidPokemonOffset, 2_000, 0_200, token).ConfigureAwait(false);
+                if (pk != null)
+                {
+                    if (await HandleEncounter(pk, true, token).ConfigureAwait(false))
+                        return;
+                }
+
+                Connection.Log("Resetting Regigigas by restarting the game");
+
+                await CloseGame(Hub.Config, token).ConfigureAwait(false);
+                await StartGame(Hub.Config, token).ConfigureAwait(false);
+            }
+        }
+
         private async Task DoRegiEncounter(CancellationToken token)
         {
             Log("Reminder: LDN-MITM SYSMODULE IS REQUIRED IN ORDER FOR THIS BOT TO WORK!");
@@ -136,11 +165,12 @@ private async Task DoRegiEncounter(CancellationToken token)
                 for (int i = 0; i < 3; i++)
                     await ReadUntilChanged(BattleMenuOffset, BattleMenuReady, 5_000, 0_100, true, token).ConfigureAwait(false);
 
-                if (await HandleEncounter(pk, false, token).ConfigureAwait(false))
+                if (await HandleEncounter(pk, true, token).ConfigureAwait(false))
                     return;
 
                 Log("Restarting game...");
                 await CloseGame(Hub.Config, token).ConfigureAwait(false);
+                await StartGame(Hub.Config, token).ConfigureAwait(false);
             }
         }
 
@@ -194,6 +224,46 @@ private async Task DoDogEncounter(CancellationToken token)
             }
         }
 
+        private async Task DoJusticeEncounter(CancellationToken token)
+        {
+            Log("Reminder: LDN-MITM SYSMODULE IS REQUIRED IN ORDER FOR THIS BOT TO WORK!");
+            bool log;
+            while (!token.IsCancellationRequested)
+            {
+                Log("Position saved. Rebooting game...");
+                await CloseGame(Hub.Config, token).ConfigureAwait(false);
+                await StartGame(Hub.Config, token).ConfigureAwait(false);
+
+                log = true;
+
+                while (!await IsInBattle(token).ConfigureAwait(false))
+                {
+                    if (log) Log("Position could be wrong. Try to move a bit and save again.");
+                    log = false;
+                }
+
+                Log("Encounter started! Checking details...");
+                var pk = await ReadUntilPresent(WildPokemonOffset, 2_000, 0_200, token).ConfigureAwait(false);
+                if (pk == null)
+                {
+                    Log("Not right Offset. Restarting loop.");
+
+                    // Flee and continue looping.
+                    while (await IsInBattle(token).ConfigureAwait(false))
+                        await FleeToOverworld(token).ConfigureAwait(false);
+                    continue;
+                }
+
+                // Offsets are flickery so make sure we see it 3 times.
+                for (int i = 0; i < 3; i++)
+                    await ReadUntilChanged(BattleMenuOffset, BattleMenuReady, 5_000, 0_100, true, token).ConfigureAwait(false);
+
+                if (await HandleEncounter(pk, true, token).ConfigureAwait(false))
+                    return;
+            }
+        }
+
+
         private async Task<int> StepUntilEncounter(CancellationToken token)
         {
             Log("Walking around until an encounter...");

SysBot.Pokemon/BotEncounter/EncounterModes.cs

@@ -18,13 +18,23 @@ public enum EncounterMode
         Eternatus,
 
         /// <summary>
-        /// Bot will soft reset for Regis. Do not use for Regigigas.
+        /// Bot will soft reset Regigigas
+        /// </summary>
+        Regigigas,
+
+        /// <summary>
+        /// Bot will soft reset for Regis
         /// </summary>
         Regis,
 
         /// <summary>
         /// Bot will soft reset the Legendary Dogs
         /// </summary>
         LegendaryDogs,
+
+        /// <summary>
+        /// Bot will soft reset the Swords of Justice Trio
+        /// </summary>
+        SwordsJustice,
     }
 }