Fix SpamUntilEncounter

Manu098vm · Manu098vm · commit e21d21498504 · 2022-08-25T18:51:36.000+02:00
diff --git a/SysBot.Pokemon/LGPE/BotEncounter/EncounterBot7B.cs b/SysBot.Pokemon/LGPE/BotEncounter/EncounterBot7B.cs
@@ -170,8 +170,12 @@ private async Task DoRestartingEncounter(CancellationToken token)
 
         private async Task SpamUntilEncounter(CancellationToken token)
         {
-            while (!(await IsInCatchScreen(token).ConfigureAwait(false) || await IsInBattle(token).ConfigureAwait(false) || await IsGiftFound(token).ConfigureAwait(false) || await IsInTrade(token).ConfigureAwait(false)))
-                await Click(A, 0_200, token).ConfigureAwait(false);
+            if(Settings.EncounteringType is LetsGoMode.Stationary)
+                while (!await IsInBattle(token).ConfigureAwait(false))
+                    await Click(A, 0_200, token).ConfigureAwait(false);
+            else
+                while (!(await IsInCatchScreen(token).ConfigureAwait(false) || await IsGiftFound(token).ConfigureAwait(false) || await IsInTrade(token).ConfigureAwait(false)))
+                    await Click(A, 0_200, token).ConfigureAwait(false);
         }
 
         private async Task<PB7?> ReadResetEncounter(LetsGoMode mode, CancellationToken token)

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,12 @@ private async Task DoRestartingEncounter(CancellationToken token)`
`170`	`170`
`171`	`171`	`private async Task SpamUntilEncounter(CancellationToken token)`
`172`	`172`	`{`
`173`		`- while (!(await IsInCatchScreen(token).ConfigureAwait(false) \|\| await IsInBattle(token).ConfigureAwait(false) \|\| await IsGiftFound(token).ConfigureAwait(false) \|\| await IsInTrade(token).ConfigureAwait(false)))`
`174`		`- await Click(A, 0_200, token).ConfigureAwait(false);`
	`173`	`+ if(Settings.EncounteringType is LetsGoMode.Stationary)`
	`174`	`+ while (!await IsInBattle(token).ConfigureAwait(false))`
	`175`	`+ await Click(A, 0_200, token).ConfigureAwait(false);`
	`176`	`+ else`
	`177`	`+ while (!(await IsInCatchScreen(token).ConfigureAwait(false) \|\| await IsGiftFound(token).ConfigureAwait(false) \|\| await IsInTrade(token).ConfigureAwait(false)))`
	`178`	`+ await Click(A, 0_200, token).ConfigureAwait(false);`
`175`	`179`	`}`
`176`	`180`
`177`	`181`	`private async Task<PB7?> ReadResetEncounter(LetsGoMode mode, CancellationToken token)`