From 41f8cbf6d4db78dcc7994d3b396befd00a4e2474 Mon Sep 17 00:00:00 2001 From: NecronomiconCoding Date: Sat, 30 Jul 2016 19:37:28 +0200 Subject: [PATCH 1/3] push to 0.4.0 --- PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs b/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs index 6db459808..d2882a086 100644 --- a/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs +++ b/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.3.3")] +[assembly: AssemblyVersion("0.4.0")] [assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file From 9917f92a9cc73548ad9cbc85f75f6c4eba954305 Mon Sep 17 00:00:00 2001 From: l3uddz Date: Sat, 30 Jul 2016 19:06:03 +0100 Subject: [PATCH 2/3] Upgrade fix Wasnt upgrading when absolute value was specified, e.g. wanting only 100% IV uprades. --- PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs b/PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs index a85a4b957..f523fea4d 100644 --- a/PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs +++ b/PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs @@ -77,7 +77,7 @@ public static async Task Execute(ISession session) var tokens = dgdfs.Split(new[] {"id"}, StringSplitOptions.None); var splitone = tokens[1].Split('"'); var iv = session.Inventory.GetPerfect(pokemon.Item1); - if (iv > session.LogicSettings.UpgradePokemonIvMinimum) + if (iv >= session.LogicSettings.UpgradePokemonIvMinimum) { PokemonId.Add(ulong.Parse(splitone[2])); } @@ -90,7 +90,7 @@ public static async Task Execute(ISession session) var tokensSplit = tokens[1].Split(new[] {"cp"}, StringSplitOptions.None); var tokenSplitAgain = tokensSplit[1].Split(' '); var tokenSplitAgain2 = tokenSplitAgain[1].Split(','); - if (float.Parse(tokenSplitAgain2[0]) > session.LogicSettings.UpgradePokemonCpMinimum) + if (float.Parse(tokenSplitAgain2[0]) >= session.LogicSettings.UpgradePokemonCpMinimum) { PokemonIdcp.Add(ulong.Parse(splitone[2])); } From 4b067343f505616144cc8d5317b2577c37e423be Mon Sep 17 00:00:00 2001 From: Andrerm124 Date: Sat, 30 Jul 2016 23:46:12 +0100 Subject: [PATCH 3/3] Potential Evolves Displays how many Pokemon could potentially be evolved every EvolvePokemonTask.Execute(..) I've found this particularly useful for seeing how close I am to the "UseLuckyEggsMinPokemonAmount" when "UseLuckyEggsWhileEvolving"=true. NOTE: Translation handling should be implemented at some stage. I haven't had the time to do that (Should be handled in the ConsoleEventListener Handler) --- PoGo.NecroBot.CLI/ConsoleEventListener.cs | 5 +++++ PoGo.NecroBot.Logic/Event/EvolveCountEvent.cs | 13 +++++++++++++ PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs | 5 +++++ 3 files changed, 23 insertions(+) create mode 100644 PoGo.NecroBot.Logic/Event/EvolveCountEvent.cs diff --git a/PoGo.NecroBot.CLI/ConsoleEventListener.cs b/PoGo.NecroBot.CLI/ConsoleEventListener.cs index b8ff283be..452f69113 100644 --- a/PoGo.NecroBot.CLI/ConsoleEventListener.cs +++ b/PoGo.NecroBot.CLI/ConsoleEventListener.cs @@ -229,6 +229,11 @@ public void HandleEvent(DisplayHighestsPokemonEvent evt, ISession session) LogLevel.Info, ConsoleColor.Yellow); } + public void HandleEvent( EvolveCountEvent evt, ISession session ) + { + Logger.Write( "[Evolves] Potential Evolves: " + evt.Evolves, LogLevel.Update, ConsoleColor.White ); + } + public void HandleEvent(UpdateEvent evt, ISession session) { Logger.Write(evt.ToString(), LogLevel.Update); diff --git a/PoGo.NecroBot.Logic/Event/EvolveCountEvent.cs b/PoGo.NecroBot.Logic/Event/EvolveCountEvent.cs new file mode 100644 index 000000000..ad89b9e04 --- /dev/null +++ b/PoGo.NecroBot.Logic/Event/EvolveCountEvent.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PoGo.NecroBot.Logic.Event +{ + public class EvolveCountEvent : IEvent + { + public int Evolves; + } +} diff --git a/PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs index fd21162ff..61e77886d 100644 --- a/PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs +++ b/PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs @@ -24,6 +24,11 @@ public static async Task Execute(ISession session, CancellationToken cancellatio var pokemonToEvolveTask = await session.Inventory.GetPokemonToEvolve(session.LogicSettings.PokemonsToEvolve); var pokemonToEvolve = pokemonToEvolveTask.ToList(); + session.EventDispatcher.Send( new EvolveCountEvent + { + Evolves = pokemonToEvolve.Count + } ); + if (pokemonToEvolve.Any()) { var inventoryContent = await session.Inventory.GetItems();