Merge remote-tracking branch 'upstream/master'

PoGo.NecroBot.CLI/ConsoleEventListener.cs

@@ -243,7 +243,7 @@ private static void HandleEvent(SnipeScanEvent snipeScanEvent, ISession session)
             Logger.Write(snipeScanEvent.PokemonId == PokemonId.Missingno
                 ? session.Translation.GetTranslation(TranslationString.SnipeScan,
                     $"{snipeScanEvent.Bounds.Latitude},{snipeScanEvent.Bounds.Longitude}")
-                : session.Translation.GetTranslation(TranslationString.SnipeScanEx, session.Translation.GetPokemonTranslation(snipeScanEvent.PokemonId),
+                : ((snipeScanEvent.Source != null) ? "(" + snipeScanEvent.Source + ") " : null) + session.Translation.GetTranslation(TranslationString.SnipeScanEx, session.Translation.GetPokemonTranslation(snipeScanEvent.PokemonId),
                     snipeScanEvent.Iv > 0 ? snipeScanEvent.Iv.ToString(CultureInfo.InvariantCulture) : session.Translation.GetTranslation(TranslationString.CommonWordUnknown),
                     $"{snipeScanEvent.Bounds.Latitude},{snipeScanEvent.Bounds.Longitude}"), LogLevel.Sniper);
         }

PoGo.NecroBot.Logic/Event/SnipeScanEvent.cs

@@ -11,5 +11,6 @@ public class SnipeScanEvent : IEvent
         public Location Bounds { get; set; }
         public PokemonId PokemonId { get; set; }
         public double Iv { get; set; }
+        public string Source { get; set; }
     }
 }

PoGo.NecroBot.Logic/ILogicSettings.cs

@@ -108,6 +108,7 @@ public interface ILogicSettings
 
         int DelayBetweenPokemonCatch { get; }
         bool AutomaticallyLevelUpPokemon { get; }
+        bool UseLevelUpList { get; }
         string LevelUpByCPorIv { get; }
         float UpgradePokemonCpMinimum { get; }
         float UpgradePokemonIvMinimum { get; }
@@ -176,6 +177,7 @@ public interface ILogicSettings
         ICollection<KeyValuePair<ItemId, int>> ItemRecycleFilter { get; }
 
         ICollection<PokemonId> PokemonsToEvolve { get; }
+        ICollection<PokemonId> PokemonsToLevelUp { get; }
 
         ICollection<PokemonId> PokemonsNotToTransfer { get; }
 

PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj

@@ -57,10 +57,18 @@
       <HintPath>..\packages\CloudFlareUtilities.0.2.1-alpha\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\CloudFlareUtilities.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="EngineIoClientDotNet, Version=0.9.22.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EngineIoClientDotNet.0.9.22\lib\net45\EngineIoClientDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="S2Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\S2Geometry.1.0.1\lib\portable-net45+wp8+win8\S2Geometry.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SocketIoClientDotNet, Version=0.9.13.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SocketIoClientDotNet.0.9.13\lib\net45\SocketIoClientDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -71,6 +79,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -90,6 +99,10 @@
       <HintPath>..\packages\Telegram.Bot.10.3.1\lib\net45\Telegram.Bot.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="WebSocket4Net, Version=0.14.1.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Common\ApiFailureStrategy.cs" />

PoGo.NecroBot.Logic/Settings.cs

@@ -275,6 +275,9 @@ public class GlobalSettings
         //powerup
         [DefaultValue(false)]
         public bool AutomaticallyLevelUpPokemon;
+
+        [DefaultValue((true))]
+        public bool UseLevelUpList;
         [DefaultValue(5)]
         public int AmountOfTimesToUpgradeLoop;
         [DefaultValue(5000)]
@@ -486,6 +489,7 @@ public class GlobalSettings
             new KeyValuePair<ItemId, int>(ItemId.ItemItemStorageUpgrade, 100)
         };
 
+
         public List<PokemonId> PokemonsNotToTransfer = new List<PokemonId>
         {
             //criteria: from SS Tier to A Tier + Regional Exclusive
@@ -565,7 +569,17 @@ public class GlobalSettings
             //PokemonId.Goldeen,
             //PokemonId.Staryu
         };
-
+        public List<PokemonId> PokemonsToLevelUp = new List<PokemonId>
+        {
+            //criteria: most common
+            PokemonId.Caterpie,
+            PokemonId.Weedle,
+            PokemonId.Pidgey,
+            PokemonId.Rattata,
+            PokemonId.Spearow,
+            PokemonId.Zubat,
+            PokemonId.Doduo
+        };
         public List<PokemonId> PokemonsToIgnore = new List<PokemonId>
         {
             //criteria: most common
@@ -1227,6 +1241,7 @@ public LogicSettings(GlobalSettings settings)
         public int KeepMinLvl => _settings.KeepMinLvl;
         public bool UseKeepMinLvl => _settings.UseKeepMinLvl;
         public bool AutomaticallyLevelUpPokemon => _settings.AutomaticallyLevelUpPokemon;
+        public bool UseLevelUpList => _settings.UseLevelUpList;
         public int AmountOfTimesToUpgradeLoop => _settings.AmountOfTimesToUpgradeLoop;
         public string LevelUpByCPorIv => _settings.LevelUpByCPorIv;
         public int GetMinStarDustForLevelUp => _settings.GetMinStarDustForLevelUp;
@@ -1289,8 +1304,10 @@ public LogicSettings(GlobalSettings settings)
         public double EvolveKeptPokemonsAtStorageUsagePercentage => _settings.EvolveKeptPokemonsAtStorageUsagePercentage;
         public ICollection<KeyValuePair<ItemId, int>> ItemRecycleFilter => _settings.ItemRecycleFilter;
         public ICollection<PokemonId> PokemonsToEvolve => _settings.PokemonsToEvolve;
+        public ICollection<PokemonId> PokemonsToLevelUp => _settings.PokemonsToLevelUp;
         public ICollection<PokemonId> PokemonsNotToTransfer => _settings.PokemonsNotToTransfer;
         public ICollection<PokemonId> PokemonsNotToCatch => _settings.PokemonsToIgnore;
+
         public ICollection<PokemonId> PokemonToUseMasterball => _settings.PokemonToUseMasterball;
         public Dictionary<PokemonId, TransferFilter> PokemonsTransferFilter => _settings.PokemonsTransferFilter;
         public bool StartupWelcomeDelay => _settings.StartupWelcomeDelay;

PoGo.NecroBot.Logic/State/FarmState.cs

@@ -26,7 +26,7 @@ public async Task<IState> Execute(ISession session, CancellationToken cancellati
 
             if (session.LogicSettings.TransferDuplicatePokemon)
             {
-                TransferDuplicatePokemonTask.Execute(session, cancellationToken);
+                await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
             }
 
             if (session.LogicSettings.UseLuckyEggConstantly)
@@ -70,4 +70,4 @@ public async Task<IState> Execute(ISession session, CancellationToken cancellati
             return this;
         }
     }
-}
+}

PoGo.NecroBot.Logic/Tasks/LevelUpPokemonTask.cs

@@ -1,18 +1,21 @@
 #region using directives
 
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using PoGo.NecroBot.Logic.Logging;
 using PoGo.NecroBot.Logic.State;
 using PoGo.NecroBot.Logic.PoGoUtils;
 using System.Linq;
+using POGOProtos.Data;
 
 #endregion
 
 namespace PoGo.NecroBot.Logic.Tasks
 {
     internal class LevelUpPokemonTask
     {
+        public static List<PokemonData> Upgrade = new List<PokemonData>();
         public static async Task Execute(ISession session, CancellationToken cancellationToken)
         {
             if (await session.Inventory.GetStarDust() <= session.LogicSettings.GetMinStarDustForLevelUp)
@@ -29,25 +32,67 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
             var pokemonFamilies = myPokemonFamilies.ToArray();
 
             var upgradedNumber = 0;
+            var PokemonToLevel = session.LogicSettings.PokemonsToLevelUp;
+
             foreach (var pokemon in upgradablePokemon)
             {
-                if (PokemonInfo.GetLevel(pokemon) >= session.Inventory.GetPlayerStats().Result.FirstOrDefault().Level + 1) continue;
+                if (session.LogicSettings.UseLevelUpList)
+                {
+                    for (int i = 0; i < PokemonToLevel.Count - 1; i++)
+                    {
+                        if (PokemonToLevel.Contains(pokemon.PokemonId))
+                        {
+                            if (PokemonInfo.GetLevel(pokemon) >=
+                                session.Inventory.GetPlayerStats().Result.FirstOrDefault().Level + 1) break;
 
-                var settings = pokemonSettings.Single(x => x.PokemonId == pokemon.PokemonId);
-                var familyCandy = pokemonFamilies.Single(x => settings.FamilyId == x.FamilyId);
+                            var settings = pokemonSettings.Single(x => x.PokemonId == pokemon.PokemonId);
+                            var familyCandy = pokemonFamilies.Single(x => settings.FamilyId == x.FamilyId);
 
-                if (familyCandy.Candy_ <= 0) continue;
+                            if (familyCandy.Candy_ <= 0) continue;
+
+                            var upgradeResult = await session.Inventory.UpgradePokemon(pokemon.Id);
+                            if (upgradeResult.Result.ToString().ToLower().Contains("success"))
+                            {
+                                Logger.Write("Pokemon Upgraded:" +
+                                             session.Translation.GetPokemonTranslation(
+                                                 upgradeResult.UpgradedPokemon.PokemonId) + ":" +
+                                             upgradeResult.UpgradedPokemon.Cp);
+                                upgradedNumber++;
+                            }
+
+                            if (upgradedNumber >= session.LogicSettings.AmountOfTimesToUpgradeLoop)
+                                break;
+                            break;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
 
-                var upgradeResult = await session.Inventory.UpgradePokemon(pokemon.Id);
-                if (upgradeResult.Result.ToString().ToLower().Contains("success"))
-                {
-                    Logger.Write("Pokemon Upgraded:" + session.Translation.GetPokemonTranslation(upgradeResult.UpgradedPokemon.PokemonId) + ":" +
-                                    upgradeResult.UpgradedPokemon.Cp);
-                    upgradedNumber++;
                 }
+                else
+                {
+                    if (PokemonInfo.GetLevel(pokemon) >= session.Inventory.GetPlayerStats().Result.FirstOrDefault().Level + 1) break;
+
+                    var settings = pokemonSettings.Single(x => x.PokemonId == pokemon.PokemonId);
+                    var familyCandy = pokemonFamilies.Single(x => settings.FamilyId == x.FamilyId);
+
+                    if (familyCandy.Candy_ <= 0) continue;
 
-                if (upgradedNumber >= session.LogicSettings.AmountOfTimesToUpgradeLoop)
-                    break;
+                    var upgradeResult = await session.Inventory.UpgradePokemon(pokemon.Id);
+                    if (upgradeResult.Result.ToString().ToLower().Contains("success"))
+                    {
+                        Logger.Write("Pokemon Upgraded:" + session.Translation.GetPokemonTranslation(upgradeResult.UpgradedPokemon.PokemonId) + ":" +
+                                        upgradeResult.UpgradedPokemon.Cp);
+                        upgradedNumber++;
+                    }
+
+                    if (upgradedNumber >= session.LogicSettings.AmountOfTimesToUpgradeLoop)
+                        break;
+                }
+
+
             }
         }
     }

PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs

@@ -20,6 +20,8 @@
 using POGOProtos.Inventory.Item;
 using POGOProtos.Map.Pokemon;
 using POGOProtos.Networking.Responses;
+using Quobject.SocketIoClientDotNet.Client;
+using Newtonsoft.Json.Linq;
 
 #endregion
 
@@ -248,14 +250,17 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                                     {
                                         Bounds = new Location(location.Latitude, location.Longitude),
                                         PokemonId = location.Id,
-                                        //Iv = location.IV
+                                        Source = "Pokezz.com",
+                                        Iv = location.IV
                                     });
 
                                     if (!await CheckPokeballsToSnipe(session.LogicSettings.MinPokeballsWhileSnipe + 1,
                                         session, cancellationToken))
                                         return;
 
                                     await Snipe(session, pokemonIds, location.Latitude, location.Longitude, cancellationToken);
+                                    if (!LocsVisited.Contains(new PokemonLocation(location.Latitude, location.Longitude))) 
+                                        LocsVisited.Add(new PokemonLocation(location.Latitude, location.Longitude));
                                 }
                             }
                         }
@@ -272,6 +277,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                                     {
                                         Bounds = new Location(location.Latitude, location.Longitude),
                                         PokemonId = location.Id,
+                                        Source = "PokeSnipers.com",
                                         //Iv = location.IV
                                     });
 
@@ -280,7 +286,8 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                                         return;
 
                                     await Snipe(session, pokemonIds, location.Latitude, location.Longitude, cancellationToken);
-                                    LocsVisited.Add(new PokemonLocation(location.Latitude, location.Longitude));
+                                    if (!LocsVisited.Contains(new PokemonLocation(location.Latitude, location.Longitude)))
+                                        LocsVisited.Add(new PokemonLocation(location.Latitude, location.Longitude));
                                 }
                             }
                         }
@@ -509,46 +516,45 @@ private static ScanResult SnipeScanForPokemon(ISession session, Location locatio
             return scanResult;
         }
 
-
         private static List<SniperInfo> GetSniperInfoFrom_pokezz(ISession session, List<PokemonId> pokemonIds)
         {
+            var options = new IO.Options();
+            options.Transports = Quobject.Collections.Immutable.ImmutableList.Create<string>("websocket");
 
-            var uri = $"http://pokezz.com/pokemons.json";
+            var socket = IO.Socket("http://pokezz.com", options);
 
-            ScanResult_pokezz scanResult_pokezz;
-            try
-            {
-                var request = WebRequest.CreateHttp(uri);
-                request.Accept = "application/json";
-                request.UserAgent =
-                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n";
-                request.Method = "GET";
-                request.Timeout = 15000;
-                request.ReadWriteTimeout = 32000;
+            var hasError = false;
 
-                var resp = request.GetResponse();
-                var reader = new StreamReader(resp.GetResponseStream());
-                var fullresp = "{\"pokemons\": " + reader.ReadToEnd().Replace(" M", "Male").Replace(" F", "Female").Replace("Farfetch'd", "Farfetchd").Replace("Mr.Maleime", "MrMime") +"}";
-
-                scanResult_pokezz = JsonConvert.DeserializeObject<ScanResult_pokezz>(fullresp);
-            }
-            catch (Exception ex)
-            {
-                // most likely System.IO.IOException
-                session.EventDispatcher.Send(new ErrorEvent { Message = ex.Message });
-                scanResult_pokezz = new ScanResult_pokezz
+            ManualResetEventSlim waitforbroadcast = new ManualResetEventSlim(false);
+
+            List<PokemonLocation_pokezz> pokemons = new List<PokemonLocation_pokezz>();
+
+            socket.On("pokemons", (msg) => {
+                JArray data = JArray.FromObject(msg);
+                foreach (var pokeToken in data.Children())
                 {
-                    Status = "fail",
-                    pokemons = new List<PokemonLocation_pokezz>()
-                };
-                return new List<SniperInfo>();
-            }
-            if (scanResult_pokezz.pokemons != null)
-            {
+                    var temp = pokeToken.ToString().Replace(" M", "Male").Replace(" F", "Female").Replace("Farfetch'd", "Farfetchd").Replace("Mr.Maleime", "MrMime");
+                    var fixedToken = JToken.Parse(temp);
+                    pokemons.Add(fixedToken.ToObject<PokemonLocation_pokezz>());
+                }
 
-                SnipeLocations.RemoveAll(x => DateTime.Now > x.TimeStampAdded.AddMinutes(15));
+                waitforbroadcast.Set();
+            });
+
+            socket.On(Quobject.SocketIoClientDotNet.Client.Socket.EVENT_ERROR, () => {
+                hasError = true;
+                waitforbroadcast.Set();
+            });
 
-                foreach (var pokemon in scanResult_pokezz.pokemons)
+            socket.On(Quobject.SocketIoClientDotNet.Client.Socket.EVENT_CONNECT_ERROR, () => {
+                hasError = true;
+                waitforbroadcast.Set();
+            });
+
+            waitforbroadcast.Wait();
+            if (!hasError)
+            {
+                foreach (var pokemon in pokemons)
                 {
                     var SnipInfo = new SniperInfo();
                     SnipInfo.Id = pokemon.name;
@@ -576,7 +582,10 @@ private static List<SniperInfo> GetSniperInfoFrom_pokezz(ISession session, List<
                                    new List<SniperInfo>();
                 return locationsToSnipe;
             }
-            return new List<SniperInfo>();
+            else
+            {
+                return new List<SniperInfo>();
+            }
         }
 
         private static List<SniperInfo> GetSniperInfoFrom_pokesnipers(ISession session, List<PokemonId> pokemonIds)

PoGo.NecroBot.Logic/packages.config

@@ -2,10 +2,13 @@
 <packages>
   <package id="C5" version="2.2.5073.27396" targetFramework="net452" />
   <package id="CloudFlareUtilities" version="0.2.1-alpha" targetFramework="net452" />
+  <package id="EngineIoClientDotNet" version="0.9.22" targetFramework="net452" />
   <package id="GeoCoordinate" version="1.1.0" targetFramework="net45" />
   <package id="Google.Protobuf" version="3.0.0-beta4" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="S2Geometry" version="1.0.1" targetFramework="net452" />
+  <package id="SocketIoClientDotNet" version="0.9.13" targetFramework="net452" />
   <package id="Telegram.Bot" version="10.3.1" targetFramework="net452" />
+  <package id="WebSocket4Net" version="0.14.1" targetFramework="net452" />
 </packages>