some code cleaning

Author: Manu098vm

SysBot.Pokemon/Actions/PokeRoutineExecutor.cs

@@ -452,20 +452,11 @@ public static uint GetOverworldOffset(ConsoleLanguageParameter value)
         public async Task PokeCamp(PokeTradeHubConfig config, CancellationToken token)
         {
             // Open Poke Camp and return to the overworld
-            try
-            {
-                Log("Opening Camp...");
-                await Click(X, 2_500, token).ConfigureAwait(false);
-                await Click(A, 9_000, token).ConfigureAwait(false);
-                await Click(B, 2_000, token).ConfigureAwait(false);
-                await Click(A, 2_000, token).ConfigureAwait(false);
-            }
-            catch (Exception e)
-            {
-                Log(e + "Exception Caught. Trying to restart.");
-                await CloseGame(config, token).ConfigureAwait(false);
-                await StartGame(config, token).ConfigureAwait(false);
-            }
+            Log("Opening Camp...");
+            await Click(X, 2_500, token).ConfigureAwait(false);
+            await Click(A, 9_000, token).ConfigureAwait(false);
+            await Click(B, 2_000, token).ConfigureAwait(false);
+            await Click(A, 2_000, token).ConfigureAwait(false);
         }
     }
 }

SysBot.Pokemon/BotEncounter/EncounterBot.cs

@@ -183,18 +183,12 @@ private async Task DoDogEncounter(CancellationToken token)
                 Log("Looking for a new dog...");
 
                 // At the start of each loop, an A press is needed to exit out of a prompt.
-                await Click(A, 0_500, token).ConfigureAwait(false);
+                await Click(A, 0_200, token).ConfigureAwait(false);
                 await SetStick(LEFT, 0, 30000, 1_000, token).ConfigureAwait(false);
 
-                // Encounters Zacian/Zamazenta
-                await Click(A, 0_600, token).ConfigureAwait(false);
-
-                // Cutscene loads
-                await Click(A, 2_600, token).ConfigureAwait(false);
-
-                // Click through all the menus.
+                // Encounters Zacian/Zamazenta and clicks through all the menus.
                 while (!await IsInBattle(token).ConfigureAwait(false))
-                    await Click(A, 1_000, token).ConfigureAwait(false);
+                    await Click(A, 0_300, token).ConfigureAwait(false);
 
                 Log("Encounter started! Checking details...");
                 var pk = await ReadUntilPresent(LegendaryPokemonOffset, 2_000, 0_200, token).ConfigureAwait(false);
@@ -307,7 +301,7 @@ private async Task DoGArticunoEncounter(CancellationToken token)
                 }
 
                 //Read Pokémon Information
-                Log("Encounter Articuno started! Checking details...");
+                Log("Articuno Encounter started! Checking details...");
                 var pk = await ReadUntilPresent(WildPokemonOffset, 2_000, 0_200, token).ConfigureAwait(false);
                 if (pk == null)
                     Log("Not right Offset.");
@@ -416,7 +410,7 @@ private async Task<bool> HandleEncounter(PK8 pk, bool legends, CancellationToken
         private string getRibbonsList(PK8 pk)
         {
             string ribbonsList = "Ribbons: ";
-            for (var mark = RibbonIndex.MarkLunchtime; mark <= RibbonIndex.MarkSlump; mark++)
+            for (var mark = MarkIndex.MarkLunchtime; mark <= MarkIndex.MarkSlump; mark++)
                 if (pk.GetRibbon((int)mark))
                     ribbonsList += mark;
 

SysBot.Pokemon/Settings/StopConditionSettings.cs

@@ -102,11 +102,14 @@ public static int[] InitializeTargetIVs(PokeTradeHub<PK8> hub)
 
         private static bool HasMark(IRibbonIndex pk, MarkIndex target, bool specific)
         {
-            for (var mark = RibbonIndex.MarkLunchtime; mark <= RibbonIndex.MarkSlump; mark++)
-            {
-                if ((!specific && pk.GetRibbon((int)mark)) || (specific && pk.GetRibbon((int)mark) && mark.Equals(target)))
-                    return true;
+            if (!specific) {
+                for (var mark = RibbonIndex.MarkLunchtime; mark <= RibbonIndex.MarkSlump; mark++)
+                    if ((!specific && pk.GetRibbon((int)mark)) || (specific && pk.GetRibbon((int)mark) && mark.Equals(target)))
+                        return true;
             }
+            else if (specific && pk.GetRibbon((int)target))
+                return true;
+
             return false;
         }
     }