ready for release

Manu098vm · May 4, 2021 · 5e57b6d · 5e57b6d
1 parent 1134b96
commit 5e57b6d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/SysBot.Pokemon.WinForms/Main.Designer.cs b/SysBot.Pokemon.WinForms/Main.Designer.cs
diff --git a/SysBot.Pokemon/Actions/PokeRoutineExecutor.cs b/SysBot.Pokemon/Actions/PokeRoutineExecutor.cs
@@ -210,14 +210,14 @@ public async Task<List<PK8>> ReadOwPokemonFromBlock(byte[] KCoordinates, SAV8 sa
                 {
                     data = await Connection.ReadBytesAsync(offset, 56, token).ConfigureAwait(false);
                     species = (Species)BitConverter.ToUInt16(data.Slice(0, 2), 0);
-                    Log($"Target: {target}, Encountered: {species}");
+                    //Log($"Target: {target}, Encountered: {species}");
                     offset += 192;
                     i++;
-                } while (target != 0 && species != 0 && target != species && i <= 300);
-                if (i > 100)
+                } while (target != 0 && species != 0 && target != species && i <= 40);
+                if (i > 40)
                 {
                     data = null;
-                    Log("Above 100");
+                    //Log("Above 100");
                 }
             }
             else if (mondata != null)
@@ -568,7 +568,7 @@ public async Task LGOpenGame(PokeTradeHubConfig config, CancellationToken token)
             stopwatch.Start();
             while (!await LGIsInTitleScreen(token).ConfigureAwait(false))
             {
-                if(stopwatch.ElapsedMilliseconds > 7000)
+                if(stopwatch.ElapsedMilliseconds > 6000)
                     await DetachController(token).ConfigureAwait(false);
                 await Click(A, 0_500, token).ConfigureAwait(false);
             }

diff --git a/SysBot.Pokemon/GeneralSettings/StopConditionSettings.cs b/SysBot.Pokemon/GeneralSettings/StopConditionSettings.cs
@@ -23,7 +23,7 @@ public class StopConditionSettings
         [Category(StopConditions), Description("Selects the shiny type to stop on.")]
         public TargetShinyType ShinyTarget { get; set; } = TargetShinyType.DisableOption;
 
-        [Category(StopConditions), Description("If set to \"Any\", the bot will target a Pokémon that has any of the Marks listed. Select a certain Mark if you're hunting for it specifically. No restrictions if set to \"None\".")]
+        [Category(StopConditions), Description("If set to \"Any\", the bot will target a Pokémon that has any of the Marks listed. Select a certain Mark if you're hunting for it specifically. No restrictions if set to \"None\". Ignored for LGPE encounters.")]
         public MarkIndex MarkTarget { get; set; } = MarkIndex.None;
 
         [Category(StopConditions), Description("Holds Capture button to record a 30 second clip when a matching Pokémon is found by EncounterBot or Fossilbot.")]

diff --git a/SysBot.Pokemon/LGPE_OverworldScan/OverworldBot.cs b/SysBot.Pokemon/LGPE_OverworldScan/OverworldBot.cs
@@ -137,9 +137,7 @@ private async Task Overworld(CancellationToken token, bool birds = false)
                         freeze = true;
                 }
 
-                if (!String.IsNullOrEmpty(Hub.Config.Discord.UserTag) && searchforshiny && !token.IsCancellationRequested)
-                    Log($"<@{Hub.Config.Discord.UserTag}> a Shiny has been detected.");
-                else if (!token.IsCancellationRequested)
+                if (searchforshiny && !token.IsCancellationRequested)
                     Log("A Shiny has been detected.");
 
                 //Unfreeze to restart the routine, or log the Shiny species.
@@ -158,10 +156,7 @@ private async Task Overworld(CancellationToken token, bool birds = false)
                 if (!found && !token.IsCancellationRequested)
                 {
                     freeze = false;
-                    if (!String.IsNullOrEmpty(Hub.Config.Discord.UserTag))
-                        Log($"<@{Hub.Config.Discord.UserTag}> Shiny {SpeciesName.GetSpeciesName((int)newspawn, 4)} is not the target, the routine will continue.");
-                    else
-                        Log($"Shiny {SpeciesName.GetSpeciesName((int)newspawn, 4)} is not the target, the routine will continue.");
+                    Log($"Shiny {SpeciesName.GetSpeciesName((int)newspawn, 4)} is not the target, the routine will continue.");
                 }
                 else if (!token.IsCancellationRequested)
                 {