From 9db9c367b16f2707c4feb524a0dfe672814c12ca Mon Sep 17 00:00:00 2001 From: Eppin <96589679+Eppin@users.noreply.github.com> Date: Wed, 10 Jun 2026 14:44:00 +0200 Subject: [PATCH 1/3] Increase duration for diagonal right movement --- SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs b/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs index 3ac439fd..f087e66a 100644 --- a/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs +++ b/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs @@ -54,7 +54,7 @@ protected override async Task EncounterLoop(SAV8SWSH sav, CancellationToken toke await SetStick(LEFT, 0, 0, 500, token).ConfigureAwait(false); // reset // Walk diagonally right, slightly longer to ensure we stay at the Daycare lady. - await SetStick(LEFT, 19000, 19000, 0_300, token).ConfigureAwait(false); + await SetStick(LEFT, 19000, 19000, 0_500, token).ConfigureAwait(false); await SetStick(LEFT, 0, 0, 500, token).ConfigureAwait(false); // reset } sw.Stop(); From 9706c2eed33895bd9d0d4c2055b678b32af453ce Mon Sep 17 00:00:00 2001 From: Eppin <96589679+Eppin@users.noreply.github.com> Date: Thu, 11 Jun 2026 11:03:02 +0200 Subject: [PATCH 2/3] Refine stick movement timings for egg encounters Adjusted delays and reset timings for stick movements to improve egg encounter process. --- SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs b/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs index f087e66a..0159db87 100644 --- a/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs +++ b/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs @@ -51,11 +51,11 @@ protected override async Task EncounterLoop(SAV8SWSH sav, CancellationToken toke // Walk diagonally left. await SetStick(LEFT, -19000, 19000, 0_250, token).ConfigureAwait(false); - await SetStick(LEFT, 0, 0, 500, token).ConfigureAwait(false); // reset + await SetStick(LEFT, 0, 0, 0_500, token).ConfigureAwait(false); // reset // Walk diagonally right, slightly longer to ensure we stay at the Daycare lady. await SetStick(LEFT, 19000, 19000, 0_500, token).ConfigureAwait(false); - await SetStick(LEFT, 0, 0, 500, token).ConfigureAwait(false); // reset + await SetStick(LEFT, 0, 0, 0_500, token).ConfigureAwait(false); // reset } sw.Stop(); @@ -63,6 +63,11 @@ protected override async Task EncounterLoop(SAV8SWSH sav, CancellationToken toke { Log($"Tried {sw.Elapsed}, still no egg."); await Click(B, 500, token).ConfigureAwait(false); + + // Walk diagonally right, to the Daycare lady. + await SetStick(LEFT, 19000, 19000, 4_000, token).ConfigureAwait(false); + await SetStick(LEFT, 0, 0, 500, token).ConfigureAwait(false); // reset + continue; } From 76818e1e3a2858ce0044ab1c7a3f483ab9d20f85 Mon Sep 17 00:00:00 2001 From: Eppin <96589679+Eppin@users.noreply.github.com> Date: Thu, 11 Jun 2026 12:28:29 +0200 Subject: [PATCH 3/3] Refactor egg encounter logic in EncounterBotEggSWSH Moved click and reset stick actions when no egg is found, streamlining the egg encounter process. --- .../SWSH/BotEncounter/EncounterBotEggSWSH.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs b/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs index 0159db87..55c783da 100644 --- a/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs +++ b/SysBot.Pokemon/SWSH/BotEncounter/EncounterBotEggSWSH.cs @@ -62,12 +62,7 @@ protected override async Task EncounterLoop(SAV8SWSH sav, CancellationToken toke if (sw.Elapsed.TotalSeconds >= 10) { Log($"Tried {sw.Elapsed}, still no egg."); - await Click(B, 500, token).ConfigureAwait(false); - - // Walk diagonally right, to the Daycare lady. - await SetStick(LEFT, 19000, 19000, 4_000, token).ConfigureAwait(false); - await SetStick(LEFT, 0, 0, 500, token).ConfigureAwait(false); // reset - + await Click(B, 500, token).ConfigureAwait(false); continue; } @@ -86,6 +81,11 @@ protected override async Task EncounterLoop(SAV8SWSH sav, CancellationToken toke if (pk.Species == 0) { Log($"No egg found in B{Box + 1}S{Slot + 1}. Ensure that the party is full. Restarting loop."); + + // Walk diagonally right, to the Daycare lady. + await SetStick(LEFT, 19000, 19000, 4_000, token).ConfigureAwait(false); + await SetStick(LEFT, 0, 0, 500, token).ConfigureAwait(false); // reset + continue; }