Skip to content

Keep evolving while lucky egg active #549

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

Open
NinjaKemuri wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Keep evolving while lucky egg active #549

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
33 changes: 18 additions & 15 deletions PoGo.PokeMobBot.Logic/Tasks/EvolvePokemonTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,27 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
var luckyEggs = inventoryContent.Where(p => p.ItemId == ItemId.ItemLuckyEgg);
var luckyEgg = luckyEggs.FirstOrDefault();

//maybe there can be a warning message as an else condition of luckyEgg checks, like;
//"There is no Lucky Egg, so, your UseLuckyEggsMinPokemonAmount setting bypassed."
if (session.LogicSettings.UseLuckyEggsWhileEvolving && luckyEgg != null && luckyEgg.Count > 0)
if (session.LogicSettings.UseLuckyEggsWhileEvolving && _lastLuckyEggTime.AddMinutes(30).Ticks < DateTime.Now.Ticks)
{
if (pokemonToEvolve.Count >= session.LogicSettings.UseLuckyEggsMinPokemonAmount)
//maybe there can be a warning message as an else condition of luckyEgg checks, like;
//"There is no Lucky Egg, so, your UseLuckyEggsMinPokemonAmount setting bypassed."
if (luckyEgg != null && luckyEgg.Count > 0)
{
await UseLuckyEgg(session);
}
else
{
// Wait until we have enough pokemon
session.EventDispatcher.Send(new UseLuckyEggMinPokemonEvent
if (pokemonToEvolve.Count >= session.LogicSettings.UseLuckyEggsMinPokemonAmount)
{
await UseLuckyEgg(session);
}
else
{
Diff = session.LogicSettings.UseLuckyEggsMinPokemonAmount - pokemonToEvolve.Count,
CurrCount = pokemonToEvolve.Count,
MinPokemon = session.LogicSettings.UseLuckyEggsMinPokemonAmount
});
return;
// Wait until we have enough pokemon
session.EventDispatcher.Send(new UseLuckyEggMinPokemonEvent
{
Diff = session.LogicSettings.UseLuckyEggsMinPokemonAmount - pokemonToEvolve.Count,
CurrCount = pokemonToEvolve.Count,
MinPokemon = session.LogicSettings.UseLuckyEggsMinPokemonAmount
});
return;
}
}
}

Expand Down