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

Fix evolution logic #870

Merged
merged 3 commits into from
Jul 27, 2016
Merged

Fix evolution logic #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb1d0ca
Fixed EvolveAllPokemonAboveIv logic to evolve Pokemon not in filter list
integriti Jul 27, 2016
4be11ca
Only evolve above specified IV if EvolveAllPokemonWithEnoughCandy is …
integriti Jul 27, 2016
defe3c1
Only execute evolution logic (including using lucky egg) if there is …
integriti Jul 27, 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
26 changes: 11 additions & 15 deletions PoGo.NecroBot.Logic/Inventory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,16 @@ public async Task<IEnumerable<PokemonData>> GetPokemonToEvolve(IEnumerable<Pokem
var myPokemons = await GetPokemons();
myPokemons = myPokemons.Where(p => p.DeployedFortId == string.Empty).OrderByDescending(p => p.Cp);
//Don't evolve pokemon in gyms
if (filter != null)
if (filter.Any())
{
myPokemons =
myPokemons.Where(
p => (_logicClient.Settings.EvolveAllPokemonWithEnoughCandy && filter.Contains(p.PokemonId)) ||
(_logicClient.Settings.EvolveAllPokemonAboveIv && (PokemonInfo.CalculatePokemonPerfection(p) >= _logicClient.Settings.EvolveAboveIvValue)));
}
else if (_logicClient.Settings.EvolveAllPokemonAboveIv)
{
myPokemons = myPokemons.Where(p => filter.Contains(p.PokemonId));
myPokemons = myPokemons.Where(p => PokemonInfo.CalculatePokemonPerfection(p) >= _logicClient.Settings.EvolveAboveIvValue);
}
var pokemons = myPokemons.ToList();

Expand All @@ -290,20 +297,9 @@ public async Task<IEnumerable<PokemonData>> GetPokemonToEvolve(IEnumerable<Pokem
p => pokemonSettings.Single(x => x.PokemonId == p.PokemonId).FamilyId == settings.FamilyId)*
settings.CandyToEvolve;

if (_logicClient.Settings.EvolveAllPokemonAboveIv)
if (familyCandy.Candy - pokemonCandyNeededAlready > settings.CandyToEvolve)
{
if (PokemonInfo.CalculatePokemonPerfection(pokemon) >= _logicClient.Settings.EvolveAboveIvValue &&
familyCandy.Candy - pokemonCandyNeededAlready > settings.CandyToEvolve)
{
pokemonToEvolve.Add(pokemon);
}
}
else
{
if (familyCandy.Candy - pokemonCandyNeededAlready > settings.CandyToEvolve)
{
pokemonToEvolve.Add(pokemon);
}
pokemonToEvolve.Add(pokemon);
}
}

Expand Down
44 changes: 24 additions & 20 deletions PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,36 @@ public class EvolvePokemonTask
public static async Task Execute(Context ctx, StateMachine machine)
{
var pokemonToEvolveTask = await ctx.Inventory.GetPokemonToEvolve(ctx.LogicSettings.PokemonsToEvolve);
var pokemonToEvolve = pokemonToEvolveTask;
if (ctx.LogicSettings.UseLuckyEggsWhileEvolving)
var pokemonToEvolve = pokemonToEvolveTask.ToList();

if (pokemonToEvolve.Any())
{
if (pokemonToEvolve.Count() >= ctx.LogicSettings.UseLuckyEggsMinPokemonAmount)
{
await UseLuckyEgg(ctx.Client, ctx.Inventory, machine);
}
else
if (ctx.LogicSettings.UseLuckyEggsWhileEvolving)
{
// Wait until we have enough pokemon
return;
if (pokemonToEvolve.Count() >= ctx.LogicSettings.UseLuckyEggsMinPokemonAmount)
{
await UseLuckyEgg(ctx.Client, ctx.Inventory, machine);
}
else
{
// Wait until we have enough pokemon
return;
}
}
}

foreach (var pokemon in pokemonToEvolve)
{
var evolveResponse = await ctx.Client.Inventory.EvolvePokemon(pokemon.Id);

machine.Fire(new PokemonEvolveEvent
foreach (var pokemon in pokemonToEvolve)
{
Id = pokemon.PokemonId,
Exp = evolveResponse.ExperienceAwarded,
Result = evolveResponse.Result
});
var evolveResponse = await ctx.Client.Inventory.EvolvePokemon(pokemon.Id);

await Task.Delay(3000);
machine.Fire(new PokemonEvolveEvent
{
Id = pokemon.PokemonId,
Exp = evolveResponse.ExperienceAwarded,
Result = evolveResponse.Result
});

await Task.Delay(3000);
}
}
}

Expand Down