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

Added berry logic and transferring on catch option #1835

Merged
merged 10 commits into from
Aug 1, 2016
Merged

Added berry logic and transferring on catch option #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
85a0939
Merge pull request #32 from NecronomiconCoding/master
BornSupercharged Aug 1, 2016
e8090c7
Adding travis yml
BornSupercharged Aug 1, 2016
915bb31
Merge branch 'master' of https://github.com/simplyphp/NecroBot.git
BornSupercharged Aug 1, 2016
8362155
Merge pull request #33 from NecronomiconCoding/master
BornSupercharged Aug 1, 2016
8bdc185
Updating solution name
BornSupercharged Aug 1, 2016
5b49adc
Renamed sln to not have spaces for Travis compatibility
BornSupercharged Aug 1, 2016
2cb5786
Renamed sln to not have spaces for Travis compatibility
BornSupercharged Aug 1, 2016
04d0433
Renaming back
BornSupercharged Aug 1, 2016
fac4eb2
Merge pull request #34 from NecronomiconCoding/master
BornSupercharged Aug 1, 2016
09f3161
Added berry logic and transferring on catch option
BornSupercharged Aug 1, 2016
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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
language: csharp
solution: "NecroBot-for-Pokemon-Go.sln"
2 changes: 1 addition & 1 deletion FeroxRev
Open in desktop
Submodule FeroxRev updated 5 files
+0 −1 PokemonGo.RocketAPI/Login/GoogleLogin.cs
+1 −6 PokemonGo.RocketAPI/Login/GoogleLoginGPSOAuth.cs
+3 −3 PokemonGo.RocketAPI/PokemonGo.RocketAPI.csproj
+1 −5 PokemonGo.RocketAPI/Rpc/Encounter.cs
+2 −2 PokemonGo.RocketAPI/packages.config
5 changes: 5 additions & 0 deletions PoGo.NecroBot.Logic/ILogicSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public interface ILogicSettings
bool EvolveAllPokemonWithEnoughCandy { get; }
bool KeepPokemonsThatCanEvolve { get; }
bool TransferDuplicatePokemon { get; }
bool TransferDuplicatePokemonOnCapture { get; }
bool UseEggIncubators { get; }
int UseGreatBallAboveCp { get; }
int UseUltraBallAboveCp { get; }
Expand All @@ -92,6 +93,10 @@ public interface ILogicSettings
int GetMinStarDustForLevelUp { get; }
bool UseLuckyEggConstantly { get; }
bool UseIncenseConstantly { get; }
int UseBerriesMinCp { get; }
float UseBerriesMinIv { get; }
double UseBerriesBelowCatchProbability { get; }
string UseBerriesOperator { get; }
int MaxTravelDistanceInMeters { get; }
bool UseGpxPathing { get; }
string GpxFile { get; }
Expand Down
48 changes: 44 additions & 4 deletions PoGo.NecroBot.Logic/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,16 @@ public class GlobalSettings
public int KeepMinDuplicatePokemon = 1;
public float KeepMinIvPercentage = 90;
public bool PrioritizeIvOverCp = false;
//luckyandincense
//lucky, incense and berries
public bool UseEggIncubators = true;
public bool UseLuckyEggConstantly = false;
public int UseLuckyEggsMinPokemonAmount = 30;
public bool UseLuckyEggsWhileEvolving = false;
public bool UseIncenseConstantly = false;
public int UseBerriesMinCp = 1000;
public float UseBerriesMinIv = 90;
public double UseBerriesBelowCatchProbability = 0.20;
public string UseBerriesOperator = "and";
//snipe
public bool UseSnipeOnlineLocationServer = true;
public bool UseSnipeLocationServer = false;
Expand Down Expand Up @@ -188,6 +192,7 @@ public class GlobalSettings
public double UseMasterBallBelowCatchProbability = 0.05;
//transfer
public bool TransferDuplicatePokemon = true;
public bool TransferDuplicatePokemonOnCapture = true;
//favorite
public float FavoriteMinIvPercentage = 95;
public bool AutoFavoritePokemon = false;
Expand Down Expand Up @@ -527,7 +532,37 @@ public static GlobalSettings Load(string path)
{
settings.EvolveKeptPokemonsAtStorageUsagePercentage = Default.EvolveKeptPokemonsAtStorageUsagePercentage;
}


if (settings.UseGreatBallBelowCatchProbability < 0)
{
settings.UseGreatBallBelowCatchProbability = Default.UseGreatBallBelowCatchProbability;
}

if (settings.UseUltraBallBelowCatchProbability < 0)
{
settings.UseUltraBallBelowCatchProbability = Default.UseUltraBallBelowCatchProbability;
}

if (settings.UseMasterBallBelowCatchProbability < 0)
{
settings.UseMasterBallBelowCatchProbability = Default.UseMasterBallBelowCatchProbability;
}

if (settings.UseBerriesMinCp < 0)
{
settings.UseBerriesMinCp = Default.UseBerriesMinCp;
}

if (settings.UseBerriesMinIv < 0)
{
settings.UseBerriesMinIv = Default.UseBerriesMinIv;
}

if (settings.UseBerriesOperator.ToLower().Equals("and") && settings.UseBerriesOperator.ToLower().Equals("or"))
{
settings.UseBerriesOperator = Default.UseBerriesOperator;
}

settings.ProfilePath = profilePath;
settings.ProfileConfigPath = profileConfigPath;
settings.GeneralConfigPath = Path.Combine(Directory.GetCurrentDirectory(), "config");
Expand Down Expand Up @@ -668,14 +703,19 @@ public LogicSettings(GlobalSettings settings)
public string LevelUpByCPorIv => _settings.LevelUpByCPorIv;
public int GetMinStarDustForLevelUp => _settings.GetMinStarDustForLevelUp;
public bool UseLuckyEggConstantly => _settings.UseLuckyEggConstantly;

public bool UseIncenseConstantly => _settings.UseIncenseConstantly;
public int UseBerriesMinCp => _settings.UseBerriesMinCp;
public float UseBerriesMinIv => _settings.UseBerriesMinIv;
public double UseBerriesBelowCatchProbability => _settings.UseBerriesBelowCatchProbability;
public string UseBerriesOperator => _settings.UseBerriesOperator;

public float UpgradePokemonIvMinimum => _settings.UpgradePokemonIvMinimum;
public float UpgradePokemonCpMinimum => _settings.UpgradePokemonCpMinimum;
public double WalkingSpeedInKilometerPerHour => _settings.WalkingSpeedInKilometerPerHour;
public bool EvolveAllPokemonWithEnoughCandy => _settings.EvolveAllPokemonWithEnoughCandy;
public bool KeepPokemonsThatCanEvolve => _settings.KeepPokemonsThatCanEvolve;
public bool KeepPokemonsThatCanEvolve => _settings.KeepPokemonsThatCanEvolve;
public bool TransferDuplicatePokemon => _settings.TransferDuplicatePokemon;
public bool TransferDuplicatePokemonOnCapture => _settings.TransferDuplicatePokemonOnCapture;
public bool UseEggIncubators => _settings.UseEggIncubators;
public int UseGreatBallAboveCp => _settings.UseGreatBallAboveCp;
public int UseUltraBallAboveCp => _settings.UseUltraBallAboveCp;
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Logic/Tasks/CatchIncensePokemonsTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio

if (encounter.Result == IncenseEncounterResponse.Types.Result.IncenseEncounterSuccess)
{
await CatchPokemonTask.Execute(session, encounter, pokemon);
await CatchPokemonTask.Execute(session, cancellationToken, encounter, pokemon);
}
else if (encounter.Result == IncenseEncounterResponse.Types.Result.PokemonInventoryFull)
{
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Logic/Tasks/CatchLurePokemonsTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static async Task Execute(ISession session, FortData currentFortData, Can

if (encounter.Result == DiskEncounterResponse.Types.Result.Success)
{
await CatchPokemonTask.Execute(session, encounter, null, currentFortData, encounterId);
await CatchPokemonTask.Execute(session, cancellationToken, encounter, null, currentFortData, encounterId);
}
else if (encounter.Result == DiskEncounterResponse.Types.Result.PokemonInventoryFull)
{
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Logic/Tasks/CatchNearbyPokemonsTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio

if (encounter.Status == EncounterResponse.Types.Status.EncounterSuccess)
{
await CatchPokemonTask.Execute(session, encounter, pokemon);
await CatchPokemonTask.Execute(session, cancellationToken, encounter, pokemon);
}
else if (encounter.Status == EncounterResponse.Types.Status.PokemonInventoryFull)
{
Expand Down
96 changes: 57 additions & 39 deletions PoGo.NecroBot.Logic/Tasks/CatchPokemonTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,75 @@
using POGOProtos.Map.Fort;
using POGOProtos.Map.Pokemon;
using POGOProtos.Networking.Responses;
using System.Threading;

#endregion

namespace PoGo.NecroBot.Logic.Tasks
{
public static class CatchPokemonTask
{
public static async Task Execute(ISession session, dynamic encounter, MapPokemon pokemon,
public static async Task Execute(ISession session, CancellationToken cancellationToken, dynamic encounter, MapPokemon pokemon,
FortData currentFortData = null, ulong encounterId = 0)
{
cancellationToken.ThrowIfCancellationRequested();

// If the encounter is null nothing will work below, so exit now
if (encounter == null) return;

float probability = encounter?.CaptureProbability?.CaptureProbability_[0];

// Check for pokeballs before proceeding
var pokeball = await GetBestBall(session, encounter, probability);
if (pokeball == ItemId.ItemUnknown) return;

//Calculate CP and IV
var pokemonCp = (encounter is EncounterResponse
? encounter.WildPokemon?.PokemonData?.Cp
: encounter.PokemonData?.Cp);
var pokemonIv = PokemonInfo.CalculatePokemonPerfection(encounter is EncounterResponse
? encounter.WildPokemon?.PokemonData
: encounter?.PokemonData);

// Determine whether to use berries or not
if ((session.LogicSettings.UseBerriesOperator.ToLower().Equals("and") &&
pokemonIv >= session.LogicSettings.UseBerriesMinIv &&
pokemonCp >= session.LogicSettings.UseBerriesMinCp &&
probability < session.LogicSettings.UseBerriesBelowCatchProbability) ||
(session.LogicSettings.UseBerriesOperator.ToLower().Equals("or") && (
pokemonIv >= session.LogicSettings.UseBerriesMinIv ||
pokemonCp >= session.LogicSettings.UseBerriesMinCp ||
probability < session.LogicSettings.UseBerriesBelowCatchProbability)))
{
await
UseBerry(session,
encounter is EncounterResponse || encounter is IncenseEncounterResponse
? pokemon.EncounterId
: encounterId,
encounter is EncounterResponse || encounter is IncenseEncounterResponse
? pokemon.SpawnPointId
: currentFortData?.Id);
}

// Calculate distance away
var distance = LocationUtils.CalculateDistanceInMeters(session.Client.CurrentLatitude,
session.Client.CurrentLongitude,
encounter is EncounterResponse || encounter is IncenseEncounterResponse
? pokemon.Latitude
: currentFortData.Latitude,
encounter is EncounterResponse || encounter is IncenseEncounterResponse
? pokemon.Longitude
: currentFortData.Longitude);

CatchPokemonResponse caughtPokemonResponse;
var attemptCounter = 1;
do
{
if (session.LogicSettings.MaxPokeballsPerPokemon > 0 &&
attemptCounter > session.LogicSettings.MaxPokeballsPerPokemon)
if ((session.LogicSettings.MaxPokeballsPerPokemon > 0 &&
attemptCounter > session.LogicSettings.MaxPokeballsPerPokemon))
break;

float probability = encounter?.CaptureProbability?.CaptureProbability_[0];

var pokeball = await GetBestBall(session, encounter, probability);
pokeball = await GetBestBall(session, encounter, probability);
if (pokeball == ItemId.ItemUnknown)
{
session.EventDispatcher.Send(new NoPokeballEvent
Expand All @@ -46,37 +94,6 @@ public static async Task Execute(ISession session, dynamic encounter, MapPokemon
return;
}

var isLowProbability = probability < 0.35;
var isHighCp = encounter != null &&
(encounter is EncounterResponse
? encounter.WildPokemon?.PokemonData?.Cp
: encounter.PokemonData?.Cp) > 400;
var isHighPerfection =
PokemonInfo.CalculatePokemonPerfection(encounter is EncounterResponse
? encounter.WildPokemon?.PokemonData
: encounter?.PokemonData) >= session.LogicSettings.KeepMinIvPercentage;

if ((isLowProbability && isHighCp) || isHighPerfection)
{
await
UseBerry(session,
encounter is EncounterResponse || encounter is IncenseEncounterResponse
? pokemon.EncounterId
: encounterId,
encounter is EncounterResponse || encounter is IncenseEncounterResponse
? pokemon.SpawnPointId
: currentFortData?.Id);
}

var distance = LocationUtils.CalculateDistanceInMeters(session.Client.CurrentLatitude,
session.Client.CurrentLongitude,
encounter is EncounterResponse || encounter is IncenseEncounterResponse
? pokemon.Latitude
: currentFortData.Latitude,
encounter is EncounterResponse || encounter is IncenseEncounterResponse
? pokemon.Longitude
: currentFortData.Longitude);

caughtPokemonResponse =
await session.Client.Encounter.CatchPokemon(
encounter is EncounterResponse || encounter is IncenseEncounterResponse
Expand All @@ -97,7 +114,6 @@ encounter is EncounterResponse || encounter is IncenseEncounterResponse
Longitude = lng
};


if (caughtPokemonResponse.Status == CatchPokemonResponse.Types.CatchStatus.CatchSuccess)
{
var totalExp = 0;
Expand Down Expand Up @@ -128,8 +144,10 @@ encounter is EncounterResponse || encounter is IncenseEncounterResponse
{
evt.FamilyCandies = caughtPokemonResponse.CaptureAward.Candy.Sum();
}
}

if (session.LogicSettings.TransferDuplicatePokemonOnCapture && session.LogicSettings.TransferDuplicatePokemon)
await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
}

evt.CatchType = encounter is EncounterResponse
? session.Translation.GetTranslation(TranslationString.CatchTypeNormal)
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ await session.Client.Player.UpdatePlayerLocation(CurrentLatitude, CurrentLongitu
Longitude = CurrentLongitude
});

await CatchPokemonTask.Execute(session, encounter, pokemon);
await CatchPokemonTask.Execute(session, cancellationToken, encounter, pokemon);
}
else if (encounter.Status == EncounterResponse.Types.Status.PokemonInventoryFull)
{
Expand Down
2 changes: 2 additions & 0 deletions PoGo.NecroBot.Logic/Tasks/TransferDuplicatePokemonTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
using PoGo.NecroBot.Logic.PoGoUtils;
using PoGo.NecroBot.Logic.State;
using PoGo.NecroBot.Logic.Utils;
using PoGo.NecroBot.Logic.Logging;
using PoGo.NecroBot.Logic.Common;

#endregion

Expand Down