Removed debug code,

Fixed evolve check event not triggering.
NecronomiconCoding · Aug 8, 2016 · 38b5127 · 38b5127
1 parent 1fc1353
commit 38b5127
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/PoGo.NecroBot.Logic/State/FarmState.cs b/PoGo.NecroBot.Logic/State/FarmState.cs
@@ -13,7 +13,8 @@ public class FarmState : IState
         public async Task<IState> Execute(ISession session, CancellationToken cancellationToken)
         {
 
-            if (session.LogicSettings.EvolveAllPokemonAboveIv || session.LogicSettings.EvolveAllPokemonWithEnoughCandy || session.LogicSettings.UseLuckyEggsWhileEvolving)
+            if (session.LogicSettings.EvolveAllPokemonAboveIv || session.LogicSettings.EvolveAllPokemonWithEnoughCandy 
+               || session.LogicSettings.UseLuckyEggsWhileEvolving || session.LogicSettings.KeepPokemonsThatCanEvolve)
             {
                 await EvolvePokemonTask.Execute(session, cancellationToken);
             }

diff --git a/PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs
@@ -33,11 +33,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
             {
                 Evolves = pokemonToEvolve.Count
             } );
-            var myPokemonFamilies = await session.Inventory.GetPokemonFamilies();
-            var pokemonFamilies = myPokemonFamilies.ToArray();
-            var familyCandy = pokemonFamilies.Where(p => p.FamilyId == POGOProtos.Enums.PokemonFamilyId.FamilyPidgey || p.FamilyId == POGOProtos.Enums.PokemonFamilyId.FamilyWeedle);
-            Logger.Write(String.Join(",", pokemonToEvolve.Select(p => p.PokemonId)), LogLevel.Update);
-            Logger.Write(String.Join(",", familyCandy), LogLevel.Update);
+
             if (pokemonToEvolve.Any())
             {
                 if (session.LogicSettings.KeepPokemonsThatCanEvolve || session.LogicSettings.UseLuckyEggsWhileEvolving)
@@ -68,7 +64,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                     }
                     if(eggNeededToEvolve <= deltaCount)
                     {
-                        if (eggNeededToEvolve > 0)
+                        if (eggNeededToEvolve > 0 || !session.LogicSettings.KeepPokemonsThatCanEvolve)
                         {
                             session.EventDispatcher.Send(new UpdateEvent()
                             {

diff --git a/PoGo.NecroBot.Logic/Tasks/Farm.cs b/PoGo.NecroBot.Logic/Tasks/Farm.cs
@@ -24,7 +24,8 @@ public Farm(ISession session)
 
         public void Run(CancellationToken cancellationToken)
         {
-            if (_session.LogicSettings.EvolveAllPokemonAboveIv || _session.LogicSettings.EvolveAllPokemonWithEnoughCandy || _session.LogicSettings.UseLuckyEggsWhileEvolving)
+            if (_session.LogicSettings.EvolveAllPokemonAboveIv || _session.LogicSettings.EvolveAllPokemonWithEnoughCandy 
+                || _session.LogicSettings.UseLuckyEggsWhileEvolving || _session.LogicSettings.KeepPokemonsThatCanEvolve)
             {
                 EvolvePokemonTask.Execute(_session, cancellationToken).Wait(cancellationToken);
             }

diff --git a/PoGo.NecroBot.Logic/Tasks/FarmPokestopsGPXTask.cs b/PoGo.NecroBot.Logic/Tasks/FarmPokestopsGPXTask.cs
@@ -121,7 +121,8 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
 
                             if (session.LogicSettings.EvolveAllPokemonWithEnoughCandy ||
                                 session.LogicSettings.EvolveAllPokemonAboveIv || 
-                                session.LogicSettings.UseLuckyEggsWhileEvolving)
+                                session.LogicSettings.UseLuckyEggsWhileEvolving ||
+                                session.LogicSettings.KeepPokemonsThatCanEvolve)
                             {
                                 await EvolvePokemonTask.Execute(session, cancellationToken);
                             }

diff --git a/PoGo.NecroBot.Logic/Tasks/FarmPokestopsTask.cs b/PoGo.NecroBot.Logic/Tasks/FarmPokestopsTask.cs
@@ -168,7 +168,8 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
 
                     if (session.LogicSettings.EvolveAllPokemonWithEnoughCandy ||
                         session.LogicSettings.EvolveAllPokemonAboveIv ||
-                        session.LogicSettings.UseLuckyEggsWhileEvolving)
+                        session.LogicSettings.UseLuckyEggsWhileEvolving ||
+                        session.LogicSettings.KeepPokemonsThatCanEvolve)
                     {
                         await EvolvePokemonTask.Execute(session, cancellationToken);
                     }

diff --git a/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/SnipePokemonTask.cs
@@ -374,7 +374,8 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                 {
                     if (session.LogicSettings.EvolveAllPokemonAboveIv ||
                         session.LogicSettings.EvolveAllPokemonWithEnoughCandy ||
-                        session.LogicSettings.UseLuckyEggsWhileEvolving)
+                        session.LogicSettings.UseLuckyEggsWhileEvolving ||
+                        session.LogicSettings.KeepPokemonsThatCanEvolve)
                     {
                         await EvolvePokemonTask.Execute(session, cancellationToken);
                     }