Merge remote-tracking branch 'refs/remotes/origin/Alpha-Build' into B…

…eta-Build

PokemonGo.RocketBot.Logic/Common/ApiFailureStrategy.cs

@@ -2,11 +2,11 @@
 
 using System;
 using System.Threading.Tasks;
-using PokemonGo.RocketBot.Logic.Event;
-using PokemonGo.RocketBot.Logic.State;
 using PokemonGo.RocketAPI.Enums;
 using PokemonGo.RocketAPI.Exceptions;
 using PokemonGo.RocketAPI.Extensions;
+using PokemonGo.RocketBot.Logic.Event;
+using PokemonGo.RocketBot.Logic.State;
 using POGOProtos.Networking.Envelopes;
 
 #endregion
@@ -23,6 +23,42 @@ public ApiFailureStrategy(ISession session)
             _session = session;
         }
 
+        public void HandleApiSuccess(RequestEnvelope request, ResponseEnvelope response)
+        {
+            _retryCount = 0;
+        }
+
+        public async Task<ApiOperation> HandleApiFailure(RequestEnvelope request, ResponseEnvelope response)
+        {
+            if (_retryCount == 11)
+                return ApiOperation.Abort;
+
+            await Task.Delay(500);
+            _retryCount++;
+
+            if (_retryCount%5 == 0)
+            {
+                try
+                {
+                    DoLogin();
+                }
+                catch (PtcOfflineException)
+                {
+                    await Task.Delay(20000);
+                }
+                catch (AccessTokenExpiredException)
+                {
+                    await Task.Delay(2000);
+                }
+                catch (Exception ex) when (ex is InvalidResponseException || ex is TaskCanceledException)
+                {
+                    await Task.Delay(1000);
+                }
+            }
+
+            return ApiOperation.Retry;
+        }
+
         public async Task<ApiOperation> HandleApiFailure()
         {
             if (_retryCount == 11)
@@ -31,7 +67,7 @@ public async Task<ApiOperation> HandleApiFailure()
             await Task.Delay(500);
             _retryCount++;
 
-            if (_retryCount % 5 == 0)
+            if (_retryCount%5 == 0)
             {
                 DoLogin();
             }
@@ -120,7 +156,7 @@ private async void DoLogin()
             }
             catch (InvalidResponseException)
             {
-                _session.EventDispatcher.Send(new ErrorEvent()
+                _session.EventDispatcher.Send(new ErrorEvent
                 {
                     Message = _session.Translation.GetTranslation(TranslationString.InvalidResponse)
                 });
@@ -139,40 +175,5 @@ private async void DoLogin()
                 });
             }
         }
-        public void HandleApiSuccess(RequestEnvelope request, ResponseEnvelope response)
-        {
-            _retryCount = 0;
-        }
-
-        public async Task<ApiOperation> HandleApiFailure(RequestEnvelope request, ResponseEnvelope response)
-        {
-            if (_retryCount == 11)
-                return ApiOperation.Abort;
-
-            await Task.Delay(500);
-            _retryCount++;
-
-            if (_retryCount % 5 == 0)
-            {
-                try
-                {
-                    DoLogin();
-                }
-                catch (PtcOfflineException)
-                {
-                    await Task.Delay(20000);
-                }
-                catch (AccessTokenExpiredException)
-                {
-                    await Task.Delay(2000);
-                }
-                catch (Exception ex) when (ex is InvalidResponseException || ex is TaskCanceledException)
-                {
-                    await Task.Delay(1000);
-                }
-            }
-
-            return ApiOperation.Retry;
-        }
     }
-}
+}

PokemonGo.RocketBot.Logic/Event/EvolveCountEvent.cs

@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PokemonGo.RocketBot.Logic.Event
+namespace PokemonGo.RocketBot.Logic.Event
 {
     public class EvolveCountEvent : IEvent
     {
         public int Evolves;
     }
-}
+}

PokemonGo.RocketBot.Logic/Event/FortFailedEvent.cs

@@ -2,9 +2,9 @@
 {
     public class FortFailedEvent : IEvent
     {
+        public bool Looted;
         public int Max;
         public string Name;
         public int Try;
-        public bool Looted;
     }
 }

PokemonGo.RocketBot.Logic/Event/GetHumanizeRouteEvent.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using GeoCoordinatePortable;
+
+namespace PokemonGo.RocketBot.Logic.Event
+{
+    public class GetHumanizeRouteEvent : IEvent
+    {
+        public GeoCoordinate Destination;
+        public List<GeoCoordinate> Route;
+    }
+}

PokemonGo.RocketBot.Logic/Event/HumanWalkingEvent.cs

@@ -2,8 +2,7 @@
 {
     public class HumanWalkingEvent : IEvent
     {
-        public double OldWalkingSpeed;
         public double CurrentWalkingSpeed;
+        public double OldWalkingSpeed;
     }
-}
-
+}

PokemonGo.RocketBot.Logic/Event/InventoryListEvent.cs

@@ -1,14 +1,10 @@
-using POGOProtos.Inventory.Item;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using POGOProtos.Inventory.Item;
 
 namespace PokemonGo.RocketBot.Logic.Event
 {
     public class InventoryListEvent : IEvent
     {
         public List<ItemData> Items;
     }
-}
+}

PokemonGo.RocketBot.Logic/Event/LootPokestopEvent.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using POGOProtos.Map.Fort;
+using POGOProtos.Map.Fort;
 
 namespace PokemonGo.RocketBot.Logic.Event
 {
     public class LootPokestopEvent : IEvent
     {
         public FortData Pokestop;
     }
-}
+}

PokemonGo.RocketBot.Logic/Event/OptimizeRouteEvent.cs

@@ -1,15 +1,10 @@
-using GMap.NET.WindowsForms;
+using System.Collections.Generic;
 using POGOProtos.Map.Fort;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PokemonGo.RocketBot.Logic.Event
 {
     public class OptimizeRouteEvent : IEvent
     {
         public List<FortData> OptimizedRoute { get; set; }
     }
-}
+}

PokemonGo.RocketBot.Logic/Event/PokemonCaptureEvent.cs

@@ -18,14 +18,14 @@ public class PokemonCaptureEvent : IEvent
         public int Exp;
         public int FamilyCandies;
         public PokemonId Id;
+        public double Latitude;
         public double Level;
+        public double Longitude;
         public int MaxCp;
         public double Perfection;
         public ItemId Pokeball;
         public double Probability;
         public int Stardust;
         public CatchPokemonResponse.Types.CatchStatus Status;
-        public double Latitude;
-        public double Longitude;
     }
 }

PokemonGo.RocketBot.Logic/Event/PokemonEvolveEvent.cs

@@ -1,6 +1,8 @@
 #region using directives
+
 using POGOProtos.Enums;
 using POGOProtos.Networking.Responses;
+
 #endregion
 
 namespace PokemonGo.RocketBot.Logic.Event

PokemonGo.RocketBot.Logic/Event/PokemonsEncounterEvent.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using POGOProtos.Data;
+using System.Collections.Generic;
 using POGOProtos.Map.Pokemon;
 
 namespace PokemonGo.RocketBot.Logic.Event
@@ -12,4 +7,4 @@ public class PokemonsEncounterEvent : IEvent
     {
         public List<MapPokemon> EncounterPokemons;
     }
-}
+}

PokemonGo.RocketBot.Logic/ILogicSettings.cs

@@ -1,8 +1,8 @@
 #region using directives
 
+using System.Collections.Generic;
 using POGOProtos.Enums;
 using POGOProtos.Inventory.Item;
-using System.Collections.Generic;
 
 #endregion
 
@@ -46,7 +46,8 @@ public TransferFilter()
         {
         }
 
-        public TransferFilter(int keepMinCp, int keepMinLvl, bool useKeepMinLvl, float keepMinIvPercentage, string keepMinOperator, int keepMinDuplicatePokemon,
+        public TransferFilter(int keepMinCp, int keepMinLvl, bool useKeepMinLvl, float keepMinIvPercentage,
+            string keepMinOperator, int keepMinDuplicatePokemon,
             List<PokemonMove> moves = null, string movesOperator = "or")
         {
             KeepMinCp = keepMinCp;
@@ -200,4 +201,4 @@ public interface ILogicSettings
 
         bool StartupWelcomeDelay { get; }
     }
-}
+}

PokemonGo.RocketBot.Logic/Logging/ILogger.cs

@@ -22,6 +22,7 @@ public interface ILogger
         /// <param name="level">Optional. Default <see cref="LogLevel.Info" />.</param>
         /// <param name="color">Optional. Default automatic color.</param>
         void Write(string message, LogLevel level = LogLevel.Info, ConsoleColor color = ConsoleColor.Black);
+
         void lineSelect(int lineChar = 0, int linesUp = 1);
     }
 }

PokemonGo.RocketBot.Logic/Logging/Logger.cs

@@ -77,7 +77,8 @@ public static void SetLoggerContext(ISession session)
         /// <param name="message">The message to log.</param>
         /// <param name="level">Optional level to log. Default <see cref="LogLevel.Info" />.</param>
         /// <param name="color">Optional. Default is automatic color.</param>
-        public static void Write(string message, LogLevel level = LogLevel.Info, ConsoleColor color = ConsoleColor.Black, bool force = false)
+        public static void Write(string message, LogLevel level = LogLevel.Info, ConsoleColor color = ConsoleColor.Black,
+            bool force = false)
         {
             if (_logger == null || _lastLogMessage == message)
                 return;
@@ -114,6 +115,6 @@ public enum LogLevel
         New = 15,
         SoftBan = 16,
         LevelUp = 17,
-        Debug = 18,
+        Debug = 18
     }
 }

PokemonGo.RocketBot.Logic/Navigation.cs

@@ -22,6 +22,8 @@ namespace PokemonGo.RocketBot.Logic
 {
     public delegate void UpdatePositionDelegate(double lat, double lng);
 
+    public delegate void GetHumanizeRouteDelegate(List<GeoCoordinate> route, GeoCoordinate destination);
+
     public class Navigation
     {
         private const double SpeedDownTo = 10/3.6;
@@ -210,6 +212,8 @@ public async Task<PlayerUpdateResponse> Move(GeoCoordinate targetLocation,
                 foreach (var item in route)
                     points.Add(new GeoCoordinate(item.ToArray()[1], item.ToArray()[0]));
 
+                OnGetHumanizeRouteEvent(points, targetLocation);
+
                 for (var i = 0; i < points.Count; i++)
                 {
                     var speedInMetersPerSecond = session.LogicSettings.UseWalkingSpeedVariant
@@ -413,5 +417,11 @@ public async Task<PlayerUpdateResponse> HumanPathWalking(GpxReader.Trkpt trk,
         }
 
         public event UpdatePositionDelegate UpdatePositionEvent;
+        public static event GetHumanizeRouteDelegate GetHumanizeRouteEvent;
+
+        protected virtual void OnGetHumanizeRouteEvent(List<GeoCoordinate> route, GeoCoordinate destination)
+        {
+            GetHumanizeRouteEvent?.Invoke(route, destination);
+        }
     }
 }

PokemonGo.RocketBot.Logic/PoGoUtils/PokemonInfo.cs

@@ -1,12 +1,12 @@
 #region using directives
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using POGOProtos.Data;
 using POGOProtos.Enums;
 using POGOProtos.Inventory;
-using System.Collections.Generic;
 using POGOProtos.Settings.Master;
-using System.Linq;
 
 #endregion
 
@@ -583,7 +583,8 @@ public static PokemonMove GetPokemonMove2(PokemonData poke)
             return move2;
         }
 
-        public static int GetCandy(PokemonData pokemon, List<Candy> PokemonFamilies, IEnumerable<PokemonSettings> PokemonSettings)
+        public static int GetCandy(PokemonData pokemon, List<Candy> PokemonFamilies,
+            IEnumerable<PokemonSettings> PokemonSettings)
         {
             var setting = PokemonSettings.FirstOrDefault(q => pokemon != null && q.PokemonId.Equals(pokemon.PokemonId));
             var family = PokemonFamilies.FirstOrDefault(q => setting != null && q.FamilyId.Equals(setting.FamilyId));
@@ -596,4 +597,4 @@ public static int GetPowerUpLevel(PokemonData poke)
             return (int) (GetLevel(poke)*2.0);
         }
     }
-}
+}