Enhanced pokeball-management for sniping

PoGo.NecroBot.Logic/Common/Translations.cs

@@ -116,6 +116,7 @@ public enum TranslationString
         MissingCredentialsPtc,
         SnipeScan,
         NoPokemonToSnipe,
+        NotEnoughPokeballsToSnipe,
     }
 
     public class Translation : ITranslation
@@ -224,6 +225,7 @@ public class Translation : ITranslation
             new KeyValuePair<TranslationString, string>(Common.TranslationString.MissingCredentialsPtc, "You need to fill out PtcUsername and PtcPassword in auth.json!"),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.SnipeScan, "[Sniper] Scanning for Snipeable Pokemon at {0}..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.NoPokemonToSnipe, "[Sniper] No Pokemon found to snipe!"),
+            new KeyValuePair<TranslationString, string>(Common.TranslationString.NotEnoughPokeballsToSnipe, "Not enough Pokeballs to start sniping! ({0}/{1})"),
         };
 
         public string GetTranslation(TranslationString translationString, params object[] data)

PoGo.NecroBot.Logic/ILogicSettings.cs

@@ -92,6 +92,7 @@ public interface ILogicSettings
         string GeneralConfigPath { get; }
         bool SnipeAtPokestops { get; }
         int MinPokeballsToSnipe { get; }
+        int MinPokeballsWhileSnipe { get; }
         string SnipeLocationServer { get; }
         int SnipeLocationServerPort { get; }
         bool UseSnipeLocationServer { get; }

PoGo.NecroBot.Logic/Settings.cs

@@ -133,6 +133,7 @@ public class GlobalSettings
         public bool StartupWelcomeDelay = true;
         public bool SnipeAtPokestops = false;
         public int MinPokeballsToSnipe = 20;
+        public int MinPokeballsWhileSnipe = 0;
         public string SnipeLocationServer = "localhost";
         public int SnipeLocationServerPort = 16969;
         public bool UseSnipeLocationServer = false;
@@ -595,6 +596,7 @@ public LogicSettings(GlobalSettings settings)
         public bool StartupWelcomeDelay => _settings.StartupWelcomeDelay;
         public bool SnipeAtPokestops => _settings.SnipeAtPokestops;
         public int MinPokeballsToSnipe => _settings.MinPokeballsToSnipe;
+        public int MinPokeballsWhileSnipe => _settings.MinPokeballsWhileSnipe;
         public SnipeSettings PokemonToSnipe => _settings.PokemonToSnipe;
         public string SnipeLocationServer => _settings.SnipeLocationServer;
         public int SnipeLocationServerPort => _settings.SnipeLocationServerPort;

PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs

@@ -241,8 +241,8 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                         }
                     }
                 }
-                else
-
+                else if (await CheckPokeballsToSnipe(session.LogicSettings.MinPokeballsToSnipe, session, cancellationToken))
+                {
                     foreach (var location in session.LogicSettings.PokemonToSnipe.Locations)
                     {
                         session.EventDispatcher.Send(new SnipeScanEvent() { Bounds = location });
@@ -264,12 +264,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                             lastSnipe = DateTime.Now;
                             foreach (var pokemonLocation in locationsToSnipe)
                             {
-                                var pokeBallsCount = await session.Inventory.GetItemAmountByType(POGOProtos.Inventory.Item.ItemId.ItemPokeBall);
-                                var greatBallsCount = await session.Inventory.GetItemAmountByType(POGOProtos.Inventory.Item.ItemId.ItemGreatBall);
-                                var ultraBallsCount = await session.Inventory.GetItemAmountByType(POGOProtos.Inventory.Item.ItemId.ItemUltraBall);
-                                var masterBallsCount = await session.Inventory.GetItemAmountByType(POGOProtos.Inventory.Item.ItemId.ItemMasterBall);
-
-                                if (pokeBallsCount + greatBallsCount + ultraBallsCount + masterBallsCount < session.LogicSettings.MinPokeballsToSnipe)
+                                if (!await CheckPokeballsToSnipe(session.LogicSettings.MinPokeballsWhileSnipe + 1, session, cancellationToken))
                                     return;
 
                                 locsVisited.Add(pokemonLocation);
@@ -285,6 +280,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                             });
                         }
                     }
+                }
             }
 
         }
@@ -317,5 +313,24 @@ private static ScanResult SnipeScanForPokemon(Location location)
             }
             return scanResult;
         }
+
+        public static async Task<bool> CheckPokeballsToSnipe(int minPokeballs, ISession session, CancellationToken cancellationToken)
+        {
+            var pokeBallsCount = await session.Inventory.GetItemAmountByType(POGOProtos.Inventory.Item.ItemId.ItemPokeBall);
+            pokeBallsCount += await session.Inventory.GetItemAmountByType(POGOProtos.Inventory.Item.ItemId.ItemGreatBall);
+            pokeBallsCount += await session.Inventory.GetItemAmountByType(POGOProtos.Inventory.Item.ItemId.ItemUltraBall);
+            pokeBallsCount += await session.Inventory.GetItemAmountByType(POGOProtos.Inventory.Item.ItemId.ItemMasterBall);
+
+            if (pokeBallsCount < minPokeballs)
+            {
+                session.EventDispatcher.Send(new NoticeEvent()
+                {
+                    Message = session.Translation.GetTranslation(Common.TranslationString.NotEnoughPokeballsToSnipe, pokeBallsCount, minPokeballs)
+                });
+                return false;
+            }
+
+            return true;
+        }
     }
 }