From 65929b68a70cf1ef593206be5e575a08fc99c452 Mon Sep 17 00:00:00 2001
From: 5andr0 <sandro.trianni@gmail.com>
Date: Tue, 2 Aug 2016 05:04:39 +0200
Subject: [PATCH] Updated Sniper Feeder protocol

---
 PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
index a20617678..ec9e2248b 100644
--- a/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
@@ -25,11 +25,15 @@ namespace PoGo.NecroBot.Logic.Tasks
 {
     public class SniperInfo
     {
-        public double latitude { get; set; }
-        public double longitude { get; set; }
-        public double Iv { get; set; }
-        public DateTime TimeStamp { get; set; }
+        public ulong EncounterId { get; set; }
+        public DateTime ExpirationTimestamp { get; set; }
+        public double Latitude { get; set; }
+        public double Longitude { get; set; }
         public PokemonId Id { get; set; }
+        public string SpawnPointId { get; set; }
+        public PokemonMove Move1 { get; set; }
+        public PokemonMove Move2 { get; set; }
+        public double IV { get; set; }
 
         [JsonIgnore]
         public DateTime TimeStampAdded { get; set; } = DateTime.Now;
@@ -135,13 +139,13 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                     {
                         var locationsToSnipe = SnipeLocations?.Where(q =>
                             (!session.LogicSettings.UseTransferIvForSnipe ||
-                             (q.Iv == 0 && !session.LogicSettings.SnipeIgnoreUnknownIv) ||
-                             (q.Iv >= session.Inventory.GetPokemonTransferFilter(q.Id).KeepMinIvPercentage)) &&
-                            !LocsVisited.Contains(new PokemonLocation(q.latitude, q.longitude))
-                            && !(q.TimeStamp != default(DateTime) &&
-                                 q.TimeStamp > new DateTime(2016) &&
+                             (q.IV == 0 && !session.LogicSettings.SnipeIgnoreUnknownIv) ||
+                             (q.IV >= session.Inventory.GetPokemonTransferFilter(q.Id).KeepMinIvPercentage)) &&
+                            !LocsVisited.Contains(new PokemonLocation(q.Latitude, q.Longitude))
+                            && !(q.ExpirationTimestamp != default(DateTime) &&
+                                 q.ExpirationTimestamp > new DateTime(2016) &&
                                  // make absolutely sure that the server sent a correct datetime
-                                 q.TimeStamp < DateTime.Now) &&
+                                 q.ExpirationTimestamp < DateTime.Now) &&
                             (q.Id == PokemonId.Missingno || pokemonIds.Contains(q.Id))).ToList() ??
                                                new List<SniperInfo>();
 
@@ -152,9 +156,9 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                             {
                                 session.EventDispatcher.Send(new SnipeScanEvent
                                 {
-                                    Bounds = new Location(location.latitude, location.longitude),
+                                    Bounds = new Location(location.Latitude, location.Longitude),
                                     PokemonId = location.Id,
-                                    Iv = location.Iv
+                                    Iv = location.IV
                                 });
 
                                 if (
@@ -164,8 +168,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));
+                                    Snipe(session, pokemonIds, location.Latitude, location.Longitude, cancellationToken);
+                                LocsVisited.Add(new PokemonLocation(location.Latitude, location.Longitude));
                             }
                         }
                     }
@@ -409,8 +413,8 @@ public static async Task Start(Session session, CancellationToken cancellationTo
                         var info = JsonConvert.DeserializeObject<SniperInfo>(line);
 
                         if (SnipeLocations.Any(x =>
-                            Math.Abs(x.latitude - info.latitude) < 0.0001 &&
-                            Math.Abs(x.longitude - info.longitude) < 0.0001))
+                            Math.Abs(x.Latitude - info.Latitude) < 0.0001 &&
+                            Math.Abs(x.Longitude - info.Longitude) < 0.0001))
                             // we might have different precisions from other sources
                             continue;