Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated Sniper Feeder protocol #1965

Merged
merged 1 commit into from
Aug 2, 2016
Merged

Updated Sniper Feeder protocol #1965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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>();

Expand All @@ -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 (
Expand All @@ -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));
}
}
}
Expand Down Expand Up @@ -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;

Expand Down