From d494fbd5736f7cdfbbbd4fbf049bf17157486f91 Mon Sep 17 00:00:00 2001
From: Truong Nguyen <samuraitruong@hotmail.com>
Date: Sat, 3 Sep 2016 23:43:34 +1000
Subject: [PATCH 1/4] minor update to intergration with PokeEase

---
 PoGo.NecroBot.GUI/PoGo.NecroBot.GUI.csproj                 | 4 ++--
 PoGo.NecroBot.Logic/Event/HumanWalkSnipeEvent.cs           | 2 +-
 PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeFilter.cs | 3 ++-
 PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs            | 6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/PoGo.NecroBot.GUI/PoGo.NecroBot.GUI.csproj b/PoGo.NecroBot.GUI/PoGo.NecroBot.GUI.csproj
index bbba6dd8e..86a47c665 100644
--- a/PoGo.NecroBot.GUI/PoGo.NecroBot.GUI.csproj
+++ b/PoGo.NecroBot.GUI/PoGo.NecroBot.GUI.csproj
@@ -131,8 +131,8 @@
   </Choose>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>echo "$(TargetDir)html"
-xcopy "$(SolutionDir)PokeEase\src" "$(TargetDir)html" /e /y /i /r</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PoGo.NecroBot.Logic/Event/HumanWalkSnipeEvent.cs b/PoGo.NecroBot.Logic/Event/HumanWalkSnipeEvent.cs
index c450b42d0..549b40286 100644
--- a/PoGo.NecroBot.Logic/Event/HumanWalkSnipeEvent.cs
+++ b/PoGo.NecroBot.Logic/Event/HumanWalkSnipeEvent.cs
@@ -29,7 +29,7 @@ public class HumanWalkSnipeEvent : IEvent
     {
         public double Latitude { get; set; }
         public double Longitude { get; set; }
-
+        public string Rarity { get; set; }
         public double Distance { get; set; }
 
         public double WalkTimes { get; set; }
diff --git a/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeFilter.cs b/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeFilter.cs
index cb11f08d6..c380c507a 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeFilter.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeFilter.cs
@@ -21,7 +21,7 @@ public class HumanWalkSnipeFilter
         public double MaxSpeedUpSpeed { get; set; }
         public bool AllowSpeedUp { get; set; }
         public int DelayTimeAtDestination { get; set; }
-        public HumanWalkSnipeFilter(double maxDistance, double maxWalkTimes, int priority, bool catchPokemon, bool spinPokestop, bool allowSpeedUp, double speedUpSpeed, double delay = 10)
+        public HumanWalkSnipeFilter(double maxDistance, double maxWalkTimes, int priority, bool catchPokemon, bool spinPokestop, bool allowSpeedUp, double speedUpSpeed, int delay = 10)
         {
             this.MaxDistance = maxDistance;
             this.MaxWalkTimes = maxWalkTimes;
@@ -30,6 +30,7 @@ public HumanWalkSnipeFilter(double maxDistance, double maxWalkTimes, int priorit
             this.SpinPokestopWhileWalking = spinPokestop;
             this.AllowSpeedUp = allowSpeedUp;
             this.MaxSpeedUpSpeed = speedUpSpeed;
+            this.DelayTimeAtDestination = delay;
         }
         internal static Dictionary<PokemonId, HumanWalkSnipeFilter> Default()
         {
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
index 26846e00e..9beebfc7c 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
@@ -167,7 +167,8 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                         Pokemons = ApplyFilter(rarePokemons),
                         SpinPokeStop = pokemon.Setting.SpinPokestopWhileWalking,
                         WalkSpeedApplied = pokemon.Setting.AllowSpeedUp ? pokemon.Setting.MaxSpeedUpSpeed : _session.LogicSettings.WalkingSpeedInKilometerPerHour,
-                        Type = HumanWalkSnipeEventTypes.StartWalking
+                        Type = HumanWalkSnipeEventTypes.StartWalking  ,
+                        Rarity   = PokemonGradeHelper.GetPokemonGrade(pokemon.PokemonId).ToString()
                     });
 
                     await session.Navigation.Move(new GeoCoordinate(pokemon.Latitude, pokemon.Longitude,
@@ -194,7 +195,8 @@ await session.Navigation.Move(new GeoCoordinate(pokemon.Latitude, pokemon.Longit
                         Latitude = pokemon.Latitude,
                         Longitude = pokemon.Longitude,
                         PauseDuration = pokemon.Setting.DelayTimeAtDestination / 1000,
-                        Type = HumanWalkSnipeEventTypes.DestinationReached
+                        Type = HumanWalkSnipeEventTypes.DestinationReached ,
+                        UniqueId = pokemon.UniqueId
                     });
                     //await CatchNearbyPokemonsTask.Execute(session, cancellationToken, pokemon.PokemonId,false);
                     //await CatchIncensePokemonsTask.Execute(session, cancellationToken);

From ae21431f0259a29802e1818b44a82fcc4f67b56e Mon Sep 17 00:00:00 2001
From: Truong Nguyen <samuraitruong@hotmail.com>
Date: Mon, 5 Sep 2016 19:09:25 +1000
Subject: [PATCH 2/4] add support fastpokemap for human snipe

---
 .../Configuration/ILogicSettings.cs           |   3 +
 .../Model/Settings/HumanWalkSnipeConfig.cs    |   1 +
 .../Model/Settings/LogicSettings.cs           |   3 +
 .../Model/Settings/RecycleConfig.cs           |   2 +
 .../PoGo.NecroBot.Logic.csproj                |   1 +
 .../Tasks/HumanWalkSnipeTask.FastPokemap.cs   | 148 ++++++++++++++++++
 .../Tasks/HumanWalkSnipeTask.PokeZZ.cs        |   4 +-
 .../Tasks/HumanWalkSnipeTask.Pokecrew.cs      |   2 -
 .../Tasks/HumanWalkSnipeTask.Pokeradar.cs     |   2 +-
 .../Tasks/HumanWalkSnipeTask.Pokesnipers.cs   |   2 +-
 .../Tasks/HumanWalkSnipeTask.Skiplagged.cs    |   4 +-
 .../Tasks/HumanWalkSnipeTask.cs               |   3 +
 PoGo.NecroBot.Logic/Tasks/RecycleItemsTask.cs |   8 +-
 13 files changed, 175 insertions(+), 8 deletions(-)
 create mode 100644 PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.FastPokemap.cs

diff --git a/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs b/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs
index fb8a06e28..eff1999fa 100644
--- a/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs
+++ b/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs
@@ -123,6 +123,8 @@ public interface ILogicSettings
         bool RandomizeRecycle { get; }
         int RandomRecycleValue { get; }
         int TotalAmountOfPokeballsToKeep { get; }
+        int MaxPokeballsToKeep { get; }
+
         int TotalAmountOfPotionsToKeep { get; }
         int TotalAmountOfRevivesToKeep { get; }
         int TotalAmountOfBerriesToKeep { get; }
@@ -181,6 +183,7 @@ public interface ILogicSettings
         bool HumanWalkingSnipeIncludeDefaultLocation { get; }
         bool HumanWalkingSnipeUsePokeRadar { get; }
         bool HumanWalkingSnipeUseSkiplagged { get; }
+        bool HumanWalkingSnipeUseFastPokemap { get; }
         bool HumanWalkingSnipeUseSnipePokemonList { get; }
         Dictionary<PokemonId, HumanWalkSnipeFilter> HumanWalkSnipeFilters { get; }
         double HumanWalkingSnipeMaxSpeedUpSpeed { get; }
diff --git a/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs
index 564b5506e..f0921dfac 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs
@@ -26,5 +26,6 @@ public class HumanWalkSnipeConfig
         public double MaxSpeedUpSpeed = 60.0;
         public bool AllowSpeedUp = true;
         public int DelayTimeAtDestination = 10000;//  10 sec
+         public bool UseFastPokemap = true;
     }
 }
diff --git a/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs b/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs
index 833eb6c1d..f0401ccf2 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs
@@ -167,6 +167,7 @@ public LogicSettings(GlobalSettings settings)
         public bool SnipePokemonNotInPokedex => _settings.SnipeConfig.SnipePokemonNotInPokedex;
         public bool RandomizeRecycle => _settings.RecycleConfig.RandomizeRecycle;
         public int RandomRecycleValue => _settings.RecycleConfig.RandomRecycleValue;
+        public int MaxPokeballsToKeep => _settings.RecycleConfig.MaxPokeballsToKeep;
         public int TotalAmountOfPokeballsToKeep => _settings.RecycleConfig.TotalAmountOfPokeballsToKeep;
         public int TotalAmountOfPotionsToKeep => _settings.RecycleConfig.TotalAmountOfPotionsToKeep;
         public int TotalAmountOfRevivesToKeep => _settings.RecycleConfig.TotalAmountOfRevivesToKeep;
@@ -189,6 +190,7 @@ public LogicSettings(GlobalSettings settings)
         public int HumanWalkingSnipeCatchEmAllMinBalls => _settings.HumanWalkSnipeConfig.CatchEmAllMinBalls;
         public bool EnableHumanWalkingSnipe => _settings.HumanWalkSnipeConfig.Enable;
         public Dictionary<PokemonId, HumanWalkSnipeFilter> HumanWalkSnipeFilters => _settings.HumanWalkSnipeFilters;
+        public bool HumanWalkingSnipeUseFastPokemap => _settings.HumanWalkSnipeConfig.UseFastPokemap;
         public bool HumanWalkingSnipeUsePokeRadar => _settings.HumanWalkSnipeConfig.UsePokeRadar;
         public bool HumanWalkingSnipeUseSkiplagged => _settings.HumanWalkSnipeConfig.UseSkiplagged;
         public bool HumanWalkingSnipeUseSnipePokemonList => _settings.HumanWalkSnipeConfig.UseSnipePokemonList;
@@ -197,5 +199,6 @@ public LogicSettings(GlobalSettings settings)
         public double HumanWalkingSnipeMaxSpeedUpSpeed => _settings.HumanWalkSnipeConfig.MaxSpeedUpSpeed;
         public bool HumanWalkingSnipeAllowSpeedUp => _settings.HumanWalkSnipeConfig.AllowSpeedUp;
         public int HumanWalkingSnipeDelayTimeAtDestination => _settings.HumanWalkSnipeConfig.DelayTimeAtDestination;
+                
     }
 }
diff --git a/PoGo.NecroBot.Logic/Model/Settings/RecycleConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/RecycleConfig.cs
index 4e2954e67..bf6c9cd97 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/RecycleConfig.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/RecycleConfig.cs
@@ -11,5 +11,7 @@ public class RecycleConfig
         public int TotalAmountOfPotionsToKeep = 80;
         public int TotalAmountOfRevivesToKeep = 60;
         public int TotalAmountOfBerriesToKeep = 50;
+
+        public int MaxPokeballsToKeep = 50;
     }
 }
\ No newline at end of file
diff --git a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
index 083946f81..cea3bef27 100644
--- a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
+++ b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
@@ -315,6 +315,7 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="packages.config" />
+    <Compile Include="Tasks\HumanWalkSnipeTask.FastPokemap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FeroxRev\PokemonGo.RocketAPI\PokemonGo.RocketAPI.csproj">
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.FastPokemap.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.FastPokemap.cs
new file mode 100644
index 000000000..eed33e17c
--- /dev/null
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.FastPokemap.cs
@@ -0,0 +1,148 @@
+using Newtonsoft.Json;
+using PoGo.NecroBot.Logic.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using POGOProtos.Enums;
+
+namespace PoGo.NecroBot.Logic.Tasks
+{
+    public partial class HumanWalkSnipeTask
+    {
+        private static string ip;
+
+        private static Task taskDataLive;
+        public class FastPokemapItem
+        {
+            public class Lnglat
+            {
+                public string type { get; set; }
+                public List<double> coordinates { get; set; }
+            }
+
+            public string _id { get; set; }
+            public string pokemon_id { get; set; }
+            public string encounter_id { get; set; }
+            public string spawn_id { get; set; }
+            public DateTime expireAt { get; set; }
+            public int __v { get; set; }
+            public Lnglat lnglat { get; set; }
+        }
+
+        private static string GetIP()
+        {
+
+            if (string.IsNullOrEmpty(ip))
+            {
+                var client = new HttpClient();
+                var task = client.GetStringAsync("http://checkip.dyndns.org");
+                task.Wait();
+                ip = task.Result.Split(':')[1].Trim();
+            }
+            return ip;
+
+        }
+		private static void EnsureDataLive()
+        {
+            int liveUpdateCount = 6;
+
+            if (taskDataLive != null && !taskDataLive.IsCompleted) return;
+            taskDataLive = Task.Run(async  () =>  
+            {
+					while(liveUpdateCount>0)
+                {
+                    liveUpdateCount--;
+                    var lat = _session.Client.CurrentLatitude;
+                    var lng = _session.Client.CurrentLongitude;
+                    var api = $"https://api.fastpokemap.se/?key=allow-all&ts=0&lat={lat}&lng={lng}";
+                    await DownloadContent(api);
+                    await Task.Delay(10000);
+                }
+            });
+        }
+        private static SnipePokemonInfo Map(FastPokemapItem result)
+        {
+            return new SnipePokemonInfo()
+            {
+                Latitude = result.lnglat.coordinates[1],
+                Longitude = result.lnglat.coordinates[0],
+                Id = GetId(result.pokemon_id),
+                ExpiredTime = result.expireAt.ToLocalTime(),
+                Source = "Fastpokemap"
+            };
+        }
+
+        public static int GetId(string name)
+        {
+
+            var t = name[0];
+            var realName = new StringBuilder(name.ToLower());
+            realName[0] = t;
+            try
+            {
+                var p = (PokemonId)Enum.Parse(typeof(PokemonId), realName.ToString());
+                return (int)p;
+            }
+            catch (Exception)
+            {
+
+            }
+            return 0;
+
+        }
+        private static async Task<string> DownloadContent(string url)
+        {
+            HttpClient client = new HttpClient();
+
+            var request = new HttpRequestMessage()
+            {
+                RequestUri = new Uri(url),
+                Method = HttpMethod.Get,
+            };
+            request.Headers.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
+            request.Headers.Add("origin", "https://fastpokemap.se");
+            request.Headers.Add("authority", "cache.fastpokemap.se");
+
+            string result = "";
+            try {
+                var task = await client.SendAsync(request);
+                 result = await task.Content.ReadAsStringAsync();
+            }
+			catch(Exception ex) { }
+
+            return result;
+
+        }
+        private static async Task<List<SnipePokemonInfo>> FetchFromFastPokemap(double lat, double lng)
+        {
+            List<SnipePokemonInfo> results = new List<SnipePokemonInfo>();
+             if (!_setting.HumanWalkingSnipeUseFastPokemap) return results;
+            try
+            {
+                EnsureDataLive();
+                string url = $"https://cache.fastpokemap.se/?key=allow-all&ts=0&compute={GetIP()}&lat={lat}&lng={lng}";
+                
+                var json = await DownloadContent(url);
+                var data = JsonConvert.DeserializeObject<List<FastPokemapItem>>(json);
+                foreach (var item in data)
+                {
+                    var pItem = Map(item);
+                    if (pItem != null && pItem.Id > 0)
+                    {
+                        results.Add(pItem);
+                    }
+                }
+
+            }
+            catch (Exception)
+            {
+                Logger.Write("Error loading data fastpokemap", LogLevel.Error, ConsoleColor.DarkRed);
+            }
+            return results;
+        }
+
+    }
+}
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.PokeZZ.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.PokeZZ.cs
index ab99a24ed..fb40b492b 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.PokeZZ.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.PokeZZ.cs
@@ -1,4 +1,5 @@
-using PoGo.NecroBot.Logic.Utils;
+using PoGo.NecroBot.Logic.Logging;
+using PoGo.NecroBot.Logic.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -43,6 +44,7 @@ private static async Task<List<SnipePokemonInfo>> FetchFromPokeZZ(double lat, do
             }
             catch (Exception )
             {
+                Logger.Write("Error loading data from Pokezz", LogLevel.Error, ConsoleColor.DarkRed);
 
             }
 
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokecrew.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokecrew.cs
index a03d25375..7d4d5ce01 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokecrew.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokecrew.cs
@@ -11,8 +11,6 @@ namespace PoGo.NecroBot.Logic.Tasks
 {
     public partial class HumanWalkSnipeTask
     {
-
-
         public class PokecrewWrap
         {
             public class PokecrewItem
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokeradar.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokeradar.cs
index e9c6db53a..35b34ea2b 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokeradar.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokeradar.cs
@@ -41,7 +41,7 @@ private static async Task<List<SnipePokemonInfo>> FetchFromPokeradar(double lat,
             }
             catch (Exception )
             {
-                Logger.Write("Error loading data", LogLevel.Error, ConsoleColor.DarkRed);
+                Logger.Write("Error loading data pokeradar", LogLevel.Error, ConsoleColor.DarkRed);
             }
             return results;
         }
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokesnipers.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokesnipers.cs
index 42242ecce..9e1e39bf7 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokesnipers.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokesnipers.cs
@@ -71,7 +71,7 @@ private static async Task<List<SnipePokemonInfo>> FetchFromPokesnipers(double la
             }
             catch (Exception)
             {
-                Logger.Write("Error loading data", LogLevel.Error, ConsoleColor.DarkRed);
+                Logger.Write("Error loading data from pokesnipers", LogLevel.Error, ConsoleColor.DarkRed);
             }
             return results;
         }
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Skiplagged.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Skiplagged.cs
index a6f6f2d08..0888212b1 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Skiplagged.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Skiplagged.cs
@@ -84,7 +84,9 @@ private static async Task<List<SnipePokemonInfo>> FetchFromSkiplagged(double lat
                 results = GetJsonList(json);
             }
             catch (Exception )
-            {}
+            {
+                Logger.Write("Error loading data from skiplagged", LogLevel.Error, ConsoleColor.DarkRed);
+            }
             return results;
         }
 
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
index 9beebfc7c..2c7c97ea4 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
@@ -279,6 +279,7 @@ private static void FetchData(double lat, double lng, bool silent = false)
 
             List<Task<List<SnipePokemonInfo>>> allTasks = new List<Task<List<SnipePokemonInfo>>>()
             {
+                FetchFromFastPokemap(lat, lng),
                 //FetchFromPokeWatcher(lat, lng),
                 FetchFromPokeradar(lat, lng),
                 FetchFromSkiplagged(lat, lng)     ,
@@ -291,6 +292,8 @@ private static void FetchData(double lat, double lng, bool silent = false)
             {
                 allTasks.Add(FetchFromPokeradar(_session.Settings.DefaultLatitude, _session.Settings.DefaultLongitude));
                 allTasks.Add(FetchFromSkiplagged(_session.Settings.DefaultLatitude, _session.Settings.DefaultLongitude));
+                allTasks.Add(FetchFromFastPokemap(_session.Settings.DefaultLatitude, _session.Settings.DefaultLongitude));
+
             }
 
             Task.WaitAll(allTasks.ToArray());
diff --git a/PoGo.NecroBot.Logic/Tasks/RecycleItemsTask.cs b/PoGo.NecroBot.Logic/Tasks/RecycleItemsTask.cs
index ef81a7998..7b0654e4e 100644
--- a/PoGo.NecroBot.Logic/Tasks/RecycleItemsTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/RecycleItemsTask.cs
@@ -111,12 +111,16 @@ await session.Inventory.GetItemAmountByType(ItemId.ItemIncenseCool) +
             await session.Inventory.RefreshCachedInventory();
         }
 
-        private static async Task RecycleItems(ISession session, CancellationToken cancellationToken, int itemCount, ItemId item)
+        private static async Task RecycleItems(ISession session, CancellationToken cancellationToken, int itemCount, ItemId item, int maxItemToKeep=1000)
         {
             int itemsToRecycle = 0;
             int itemsToKeep = itemCount - _diff;
             if (itemsToKeep < 0)
                 itemsToKeep = 0;
+
+            if(maxItemToKeep>0) {
+                itemsToKeep = Math.Min(itemsToKeep, maxItemToKeep);
+            }
             itemsToRecycle = itemCount - itemsToKeep;
             if (itemsToRecycle != 0)
             {
@@ -151,7 +155,7 @@ private static async Task OptimizedRecycleBalls(ISession session, CancellationTo
                 
                 if (_diff > 0)
                 {
-                    await RecycleItems(session, cancellationToken, pokeBallsCount, ItemId.ItemPokeBall);
+                    await RecycleItems(session, cancellationToken, pokeBallsCount, ItemId.ItemPokeBall, session.LogicSettings.MaxPokeballsToKeep);
                 }
                 if (_diff > 0)
                 {

From ab0f08b4a1c67aa38f6ff6d80f7fffc711bb4583 Mon Sep 17 00:00:00 2001
From: Truong Nguyen <samuraitruong@hotmail.com>
Date: Mon, 5 Sep 2016 20:12:47 +1000
Subject: [PATCH 3/4] Add support for read feed from pogolocation feeder for
 human walk

---
 PoGo.NecroBot.CLI/Program.cs                  |  2 +-
 PoGo.NecroBot.CLI/SniperEventListener.cs      | 10 ++++
 .../Event/SnipePokemonFoundEvent.cs           | 13 ++++
 .../Configuration/ILogicSettings.cs           |  2 +
 .../Model/Settings/HumanWalkSnipeConfig.cs    |  1 +
 .../Model/Settings/LogicSettings.cs           |  3 +-
 .../PoGo.NecroBot.Logic.csproj                |  1 +
 .../Tasks/HumanWalkSnipeTask.Pokecrew.cs      |  4 +-
 .../Tasks/HumanWalkSnipeTask.cs               | 60 ++++++++++++-------
 PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs |  3 +-
 10 files changed, 72 insertions(+), 27 deletions(-)
 create mode 100644 PoGo.NecroBot.Logic/Event/SnipePokemonFoundEvent.cs

diff --git a/PoGo.NecroBot.CLI/Program.cs b/PoGo.NecroBot.CLI/Program.cs
index e353bf49f..f79a02bf2 100644
--- a/PoGo.NecroBot.CLI/Program.cs
+++ b/PoGo.NecroBot.CLI/Program.cs
@@ -252,7 +252,7 @@ private static void Main(string[] args)
             if (settings.TelegramConfig.UseTelegramAPI)
                 session.Telegram = new Logic.Service.TelegramService(settings.TelegramConfig.TelegramAPIKey, session);
 
-            if (session.LogicSettings.UseSnipeLocationServer)
+            if (session.LogicSettings.UseSnipeLocationServer || session.LogicSettings.HumanWalkingSnipeUsePogoLocationFeeder)
                 SnipePokemonTask.AsyncStart(session);
 
             settings.checkProxy(session.Translation);
diff --git a/PoGo.NecroBot.CLI/SniperEventListener.cs b/PoGo.NecroBot.CLI/SniperEventListener.cs
index bad0a6480..318efd62e 100644
--- a/PoGo.NecroBot.CLI/SniperEventListener.cs
+++ b/PoGo.NecroBot.CLI/SniperEventListener.cs
@@ -23,6 +23,16 @@ private static void HandleEvent(PokemonCaptureEvent pokemonCaptureEvent, ISessio
             Logic.Tasks.HumanWalkSnipeTask.UpdateCatchPokemon(pokemonCaptureEvent.Latitude, pokemonCaptureEvent.Longitude, pokemonCaptureEvent.Id);
         }
 
+        public static void HandleEvent(SnipePokemonFoundEvent ev, ISession session)
+        {
+            Logic.Tasks.HumanWalkSnipeTask.AddSnipePokemon("Local Feeder", ev.PokemonFound.Id,
+                ev.PokemonFound.Latitude,
+                ev.PokemonFound.Longitude,
+                ev.PokemonFound.ExpirationTimestamp,
+                ev.PokemonFound.IV, 
+                session
+                );
+        }
         internal void Listen(IEvent evt, ISession session)
         {
             dynamic eve = evt;
diff --git a/PoGo.NecroBot.Logic/Event/SnipePokemonFoundEvent.cs b/PoGo.NecroBot.Logic/Event/SnipePokemonFoundEvent.cs
new file mode 100644
index 000000000..a41680e72
--- /dev/null
+++ b/PoGo.NecroBot.Logic/Event/SnipePokemonFoundEvent.cs
@@ -0,0 +1,13 @@
+using PoGo.NecroBot.Logic.Tasks;
+
+namespace PoGo.NecroBot.Logic.Event
+{
+    public class SnipePokemonFoundEvent : IEvent
+    {
+        public SniperInfo PokemonFound { get; set; }
+        public override string ToString()
+        {
+            return PokemonFound.Id.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs b/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs
index eff1999fa..c0a5b150a 100644
--- a/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs
+++ b/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs
@@ -189,6 +189,8 @@ public interface ILogicSettings
         double HumanWalkingSnipeMaxSpeedUpSpeed { get; }
         int HumanWalkingSnipeDelayTimeAtDestination { get; }
         bool HumanWalkingSnipeAllowSpeedUp { get; }
+        bool HumanWalkingSnipeUsePogoLocationFeeder { get; }
+
         int EvolveActionDelay { get; }
         int TransferActionDelay { get; }
         int RecycleActionDelay { get; }
diff --git a/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs
index f0921dfac..926ffc58f 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs
@@ -27,5 +27,6 @@ public class HumanWalkSnipeConfig
         public bool AllowSpeedUp = true;
         public int DelayTimeAtDestination = 10000;//  10 sec
          public bool UseFastPokemap = true;
+        public bool UsePogoLocationFeeder = false;
     }
 }
diff --git a/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs b/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs
index f0401ccf2..2550a627e 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs
@@ -178,7 +178,6 @@ public LogicSettings(GlobalSettings settings)
         public int ResumeTrack => _settings.LocationConfig.ResumeTrack;
         public int ResumeTrackSeg => _settings.LocationConfig.ResumeTrackSeg;
         public int ResumeTrackPt => _settings.LocationConfig.ResumeTrackPt;
-
         public bool HumanWalkingSnipeDisplayList => _settings.HumanWalkSnipeConfig.DisplayPokemonList;
         public double HumanWalkingSnipeMaxDistance => _settings.HumanWalkSnipeConfig.MaxDistance;
         public double HumanWalkingSnipeMaxEstimateTime => _settings.HumanWalkSnipeConfig.MaxEstimateTime;
@@ -199,6 +198,6 @@ public LogicSettings(GlobalSettings settings)
         public double HumanWalkingSnipeMaxSpeedUpSpeed => _settings.HumanWalkSnipeConfig.MaxSpeedUpSpeed;
         public bool HumanWalkingSnipeAllowSpeedUp => _settings.HumanWalkSnipeConfig.AllowSpeedUp;
         public int HumanWalkingSnipeDelayTimeAtDestination => _settings.HumanWalkSnipeConfig.DelayTimeAtDestination;
-                
+        public bool HumanWalkingSnipeUsePogoLocationFeeder => _settings.HumanWalkSnipeConfig.UsePogoLocationFeeder;
     }
 }
diff --git a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
index cea3bef27..6e4813ce3 100644
--- a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
+++ b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
@@ -144,6 +144,7 @@
     <Compile Include="Event\KillSwitchEvent.cs" />
     <Compile Include="Event\LogEvent.cs" />
     <Compile Include="Event\NoPokeballEvent.cs" />
+    <Compile Include="Event\SnipePokemonFoundEvent.cs" />
     <Compile Include="Event\SnipeEvent.cs" />
     <Compile Include="Event\SnipeModeEvent.cs" />
     <Compile Include="Event\PokemonListEvent.cs" />
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokecrew.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokecrew.cs
index 7d4d5ce01..85319b55a 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokecrew.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.Pokecrew.cs
@@ -6,6 +6,7 @@
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using POGOProtos.Enums;
 
 namespace PoGo.NecroBot.Logic.Tasks
 {
@@ -39,8 +40,7 @@ private static SnipePokemonInfo Map(PokecrewWrap.PokecrewItem result)
                 Source = "Pokecrew"
             };
         }
-
-        private static async Task<List<SnipePokemonInfo>> FetchFromPokecrew(double lat, double lng)
+         private static async Task<List<SnipePokemonInfo>> FetchFromPokecrew(double lat, double lng)
         {
             List<SnipePokemonInfo> results = new List<SnipePokemonInfo>();
             // if (!_setting.HumanWalkingSnipeUsePokeRadar) return results;
diff --git a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
index 2c7c97ea4..6b1da82e1 100644
--- a/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/HumanWalkSnipeTask.cs
@@ -24,7 +24,7 @@
 namespace PoGo.NecroBot.Logic.Tasks
 {
     //need refactor this class, move list snipping pokemon to session and split function out to smaller class.
-    public partial class  HumanWalkSnipeTask
+    public partial class HumanWalkSnipeTask
     {
         public class SnipePokemonInfo
         {
@@ -53,6 +53,7 @@ public string UniqueId
                 }
             }
             public string Source { get; set; }
+            public double IV { get; internal set; }
         }
 
         private static List<SnipePokemonInfo> rarePokemons = new List<SnipePokemonInfo>();
@@ -63,6 +64,27 @@ public string UniqueId
         static bool prioritySnipeFlag = false;
         private static DateTime lastUpdated = DateTime.Now.AddMinutes(-10);
 
+        public static async void AddSnipePokemon(string source, PokemonId id, double latitude, double longitude, DateTime expirationTimestamp, double iV = 0, ISession session = null)
+        {
+            if (session != null)
+            {
+                InitSession(session);
+            }
+            if (_session == null || _session == null) return;
+
+            PostProcessDataFetched(new List<SnipePokemonInfo> {
+                new SnipePokemonInfo()
+                {
+                    Latitude =latitude,
+                    Longitude = longitude,
+                    Id = (int) id,
+                    ExpiredTime = expirationTimestamp,
+                    Source = source,
+                    IV = iV
+                }
+            },false);
+        }
+
         public static async Task<bool> CheckPokeballsToSnipe(int minPokeballs, ISession session,
             CancellationToken cancellationToken)
         {
@@ -100,14 +122,10 @@ public static Task ExecuteFetchData(ISession session)
 
         private static void InitSession(ISession session)
         {
-            if (_session == null)
-            {
-                _session = session;
-                _setting = _session.LogicSettings;
-                pokemonToBeSnipedIds = _setting.HumanWalkingSnipeUseSnipePokemonList ? _setting.PokemonToSnipe.Pokemon : new List<PokemonId>();
-                pokemonToBeSnipedIds.AddRange(_setting.HumanWalkSnipeFilters.Where(x => !pokemonToBeSnipedIds.Any(t => t == x.Key)).Select(x => x.Key).ToList());      //this will combine with pokemon snipe filter
-
-            }
+            _session = session;
+            _setting = _session.LogicSettings;
+            pokemonToBeSnipedIds = _setting.HumanWalkingSnipeUseSnipePokemonList ? _setting.PokemonToSnipe.Pokemon : new List<PokemonId>();
+            pokemonToBeSnipedIds.AddRange(_setting.HumanWalkSnipeFilters.Where(x => !pokemonToBeSnipedIds.Any(t => t == x.Key)).Select(x => x.Key).ToList());      //this will combine with pokemon snipe filter
         }
 
         public static List<SnipePokemonInfo> ApplyFilter(List<SnipePokemonInfo> source)
@@ -167,8 +185,8 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                         Pokemons = ApplyFilter(rarePokemons),
                         SpinPokeStop = pokemon.Setting.SpinPokestopWhileWalking,
                         WalkSpeedApplied = pokemon.Setting.AllowSpeedUp ? pokemon.Setting.MaxSpeedUpSpeed : _session.LogicSettings.WalkingSpeedInKilometerPerHour,
-                        Type = HumanWalkSnipeEventTypes.StartWalking  ,
-                        Rarity   = PokemonGradeHelper.GetPokemonGrade(pokemon.PokemonId).ToString()
+                        Type = HumanWalkSnipeEventTypes.StartWalking,
+                        Rarity = PokemonGradeHelper.GetPokemonGrade(pokemon.PokemonId).ToString()
                     });
 
                     await session.Navigation.Move(new GeoCoordinate(pokemon.Latitude, pokemon.Longitude,
@@ -195,14 +213,14 @@ await session.Navigation.Move(new GeoCoordinate(pokemon.Latitude, pokemon.Longit
                         Latitude = pokemon.Latitude,
                         Longitude = pokemon.Longitude,
                         PauseDuration = pokemon.Setting.DelayTimeAtDestination / 1000,
-                        Type = HumanWalkSnipeEventTypes.DestinationReached ,
+                        Type = HumanWalkSnipeEventTypes.DestinationReached,
                         UniqueId = pokemon.UniqueId
                     });
                     //await CatchNearbyPokemonsTask.Execute(session, cancellationToken, pokemon.PokemonId,false);
                     //await CatchIncensePokemonsTask.Execute(session, cancellationToken);
 
                     await Task.Delay(pokemon.Setting.DelayTimeAtDestination);
-                   // if (!pokemon.IsVisited)
+                    // if (!pokemon.IsVisited)
                     {
                         await CatchNearbyPokemonsTask.Execute(session, cancellationToken, pokemon.PokemonId, false);
                         await CatchIncensePokemonsTask.Execute(session, cancellationToken);
@@ -225,7 +243,7 @@ static void CalculateDistanceAndEstTime(SnipePokemonInfo p)
             var speedInMetersPerSecond = speed / 3.6;
 
             p.Distance = CalculateDistanceInMeters(_session.Client.CurrentLatitude, _session.Client.CurrentLongitude, p.Latitude, p.Longitude);
-            p.EstimatedTime = p.Distance / speedInMetersPerSecond + p.Setting.DelayTimeAtDestination /1000  + 15; //margin 30 second
+            p.EstimatedTime = p.Distance / speedInMetersPerSecond + p.Setting.DelayTimeAtDestination / 1000 + 15; //margin 30 second
 
         }
 
@@ -351,7 +369,7 @@ private static void PostProcessDataFetched(IEnumerable<SnipePokemonInfo> pokemon
                 item.Setting = Clone<HumanWalkSnipeFilter>(config);
 
                 CalculateDistanceAndEstTime(item);
-                                           
+
                 if (item.Distance < 10000)  //only add if distance <10km
                 {
                     rarePokemons.Add(item);
@@ -364,7 +382,7 @@ private static void PostProcessDataFetched(IEnumerable<SnipePokemonInfo> pokemon
             var grouped = rarePokemons.GroupBy(p => p.PokemonId);
             foreach (var g in grouped)
             {
-                if(g.Count() > 5)
+                if (g.Count() > 5)
                 {
                     //caculate distance to betweek pokemon
                 }
@@ -413,7 +431,7 @@ public static DateTime UnixTimeStampToDateTime(double unixTimeStamp)
             dtDateTime = dtDateTime.AddSeconds(unixTimeStamp).ToLocalTime();
             return dtDateTime;
         }
-       
+
         public static Task PriorityPokemon(ISession session, string id)
         {
             return Task.Run(() =>
@@ -461,9 +479,9 @@ public static void UpdateCatchPokemon(double latitude, double longitude, Pokemon
             bool exist = false;
             rarePokemons.ForEach((p) =>
             {
-            if (LocationUtils.CalculateDistanceInMeters(latitude, longitude, p.Latitude, p.Longitude) <30.0 &&
-                    p.PokemonId == id &&
-                    !p.IsVisited)
+                if (LocationUtils.CalculateDistanceInMeters(latitude, longitude, p.Latitude, p.Longitude) < 30.0 &&
+                        p.PokemonId == id &&
+                        !p.IsVisited)
                 {
                     p.IsVisited = true;
                     exist = true;
@@ -481,7 +499,7 @@ public static void UpdateCatchPokemon(double latitude, double longitude, Pokemon
 
             //in some case, we caught the pokemon before data refresh, we need add a fake pokemon to list to avoid it add back and waste time 
 
-            if(!exist && pokemonToBeSnipedIds.Any(p => p == id))
+            if (!exist && pokemonToBeSnipedIds.Any(p => p == id))
             {
                 rarePokemons.Add(new SnipePokemonInfo()
                 {
diff --git a/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
index 27003e548..cf8a40797 100644
--- a/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
@@ -212,7 +212,7 @@ private static bool CheckSnipeConditions(ISession session)
 
         public static async Task Execute(ISession session, CancellationToken cancellationToken)
         {
-            if (_lastSnipe.AddMilliseconds(session.LogicSettings.MinDelayBetweenSnipes) > DateTime.Now)
+            if (_lastSnipe.AddMilliseconds(session.LogicSettings.MinDelayBetweenSnipes) > DateTime.Now || !session.LogicSettings.UseSnipeLocationServer)
                 return;
 
             LocsVisited.RemoveAll(q => DateTime.Now > q.TimeStampAdded.AddMinutes(15));
@@ -917,6 +917,7 @@ public static async Task Start(Session session, CancellationToken cancellationTo
                             SnipeLocations.RemoveAll(x => _lastSnipe > x.TimeStampAdded);
                             SnipeLocations.RemoveAll(x => DateTime.Now > x.TimeStampAdded.AddMinutes(15));
                             SnipeLocations.Add(info);
+                            session.EventDispatcher.Send(new SnipePokemonFoundEvent() { PokemonFound = info });
                         }
                         catch (System.IO.IOException)
                         {

From 30dd66ff9b94c90f872a8695c12f86e2183fc6e3 Mon Sep 17 00:00:00 2001
From: Truong Nguyen <samuraitruong@hotmail.com>
Date: Mon, 5 Sep 2016 20:47:18 +1000
Subject: [PATCH 4/4] merge & resolve conflict

---
 PoGo.NecroBot.CLI/Program.cs                  |  2 +-
 PoGo.NecroBot.CLI/SniperEventListener.cs      | 26 +++++++++----------
 .../Model/Settings/ItemRecycleConfig.cs       |  5 ++++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/PoGo.NecroBot.CLI/Program.cs b/PoGo.NecroBot.CLI/Program.cs
index 1fa9c9fe0..8a5703dec 100644
--- a/PoGo.NecroBot.CLI/Program.cs
+++ b/PoGo.NecroBot.CLI/Program.cs
@@ -247,7 +247,7 @@ private static void Main(string[] args)
             if (settings.TelegramConfig.UseTelegramAPI)
                 _session.Telegram = new TelegramService(settings.TelegramConfig.TelegramAPIKey, _session);
 
-            if (session.LogicSettings.UseSnipeLocationServer || session.LogicSettings.HumanWalkingSnipeUsePogoLocationFeeder)
+            if (_session.LogicSettings.UseSnipeLocationServer || _session.LogicSettings.HumanWalkingSnipeUsePogoLocationFeeder)
                 SnipePokemonTask.AsyncStart(_session);
 
             settings.checkProxy(_session.Translation);
diff --git a/PoGo.NecroBot.CLI/SniperEventListener.cs b/PoGo.NecroBot.CLI/SniperEventListener.cs
index 1e96b8dc7..c1c670ff2 100644
--- a/PoGo.NecroBot.CLI/SniperEventListener.cs
+++ b/PoGo.NecroBot.CLI/SniperEventListener.cs
@@ -2,10 +2,14 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using PoGo.NecroBot.Logic.Common;
 using PoGo.NecroBot.Logic.Event;
+using PoGo.NecroBot.Logic.Logging;
 using PoGo.NecroBot.Logic.State;
-using PoGo.NecroBot.Logic.Tasks;
-
+using POGOProtos.Enums;
+using POGOProtos.Inventory.Item;
+using POGOProtos.Networking.Responses;
 #endregion
 
 namespace PoGo.NecroBot.CLI
@@ -16,13 +20,13 @@ internal class SniperEventListener
         private static void HandleEvent(PokemonCaptureEvent pokemonCaptureEvent, ISession session)
         {
             //remove pokemon from list
-            HumanWalkSnipeTask.UpdateCatchPokemon(pokemonCaptureEvent.Latitude, pokemonCaptureEvent.Longitude,
-                pokemonCaptureEvent.Id);
+            Logic.Tasks.HumanWalkSnipeTask.UpdateCatchPokemon(pokemonCaptureEvent.Latitude, pokemonCaptureEvent.Longitude, pokemonCaptureEvent.Id);
         }
 
         public static void HandleEvent(SnipePokemonFoundEvent ev, ISession session)
         {
-            Logic.Tasks.HumanWalkSnipeTask.AddSnipePokemon("Local Feeder", ev.PokemonFound.Id,
+            Logic.Tasks.HumanWalkSnipeTask.AddSnipePokemon("Local Feeder",
+                ev.PokemonFound.Id,
                 ev.PokemonFound.Latitude,
                 ev.PokemonFound.Longitude,
                 ev.PokemonFound.ExpirationTimestamp,
@@ -35,13 +39,9 @@ internal void Listen(IEvent evt, ISession session)
             dynamic eve = evt;
 
             try
-            {
-                HandleEvent(eve, session);
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
+            { HandleEvent(eve, session); }
+            catch
+            { }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/PoGo.NecroBot.Logic/Model/Settings/ItemRecycleConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/ItemRecycleConfig.cs
index 21faa24d1..8bcc70fd4 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/ItemRecycleConfig.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/ItemRecycleConfig.cs
@@ -45,5 +45,10 @@ public class ItemRecycleConfig
         [Range(0, 999)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate, Order = 9)]
         public int TotalAmountOfBerriesToKeep = 50;
+
+        [Range(0, 999)]
+        [DefaultValue(50)]
+        [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate, Order = 9)]
+        public int MaxPokeballsToKeep = 50;
     }
 }
\ No newline at end of file