From cda2aae333c7cac21a87da946248b15aeb938a6e Mon Sep 17 00:00:00 2001 From: NinjaKemuri Date: Thu, 4 Aug 2016 00:52:55 +1000 Subject: [PATCH] Keep evolving while lucky egg active --- .../Tasks/EvolvePokemonTask.cs | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/PoGo.PokeMobBot.Logic/Tasks/EvolvePokemonTask.cs b/PoGo.PokeMobBot.Logic/Tasks/EvolvePokemonTask.cs index 3b5813d..daf278c 100644 --- a/PoGo.PokeMobBot.Logic/Tasks/EvolvePokemonTask.cs +++ b/PoGo.PokeMobBot.Logic/Tasks/EvolvePokemonTask.cs @@ -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; + } } }