CLI, RocketBot2: Reworked Evolve Logic and Settings

PoGo.NecroBot.CLI/Config/Translations/TEMPLATE-translation.en.json

@@ -117,8 +117,8 @@
       "Value": "Waiting to evolve {0} Pokemons until {1} more are in storage! (In storage: {2} | Target: {3})"
     },
     {
-      "Key": "WaitingForMoreEvolutionsToEvolveWithEgg",
-      "Value": "Waiting for {0} more evolutions to evolve with lucky egg! (Possible: {1} | Needed: {2})"
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.ca.json

@@ -140,6 +140,10 @@
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Esperant a evolucionar {0} Pokemon un cope se n'hagin capturat {1} més! ({2}/{3} per {4}% inventari)"
     },
+    {
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
+    },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",
       "Value": "Mai es farà servir cap Ou de la Sort quan UseLuckyEggsMinPokemonAmount estigui definit com a {0}, en comptes, fes servir <= {1}"

PoGo.NecroBot.CLI/Config/Translations/translation.cs.json

@@ -531,6 +531,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Čekání na vývin {0} pokemů najednou, zbývá {1} chytit! ({2}/{3} pro {4}% batohu)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "PokedexCatchedTelegram",

PoGo.NecroBot.CLI/Config/Translations/translation.da.json

@@ -167,6 +167,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Venter på at udvikle {0} Pokémon til at {1} mere er fanget! ({2}/{3} for {4}% inventar)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.de.json

@@ -545,8 +545,8 @@
       "Value": "Warte mit Entwicklungen von {0} Pokemons bis {1} weitere im Speicher sind! (Im Speicher: {2} | Ziel: {3})"
     },
     {
-      "Key": "WaitingForMoreEvolutionsToEvolveWithEgg",
-      "Value": "Warte auf {0} weitere Entwicklungen um mit Gluecksei zu entwicklen! ({1} von {2} erreicht)"
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Warte auf {0} weitere Entwicklungen um zu Entwicklen zu starten! ({1} von {2} erreicht)"
     },
     {
       "Key": "PokedexCatchedTelegram",

PoGo.NecroBot.CLI/Config/Translations/translation.es.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Esperando evolución {0} Pokémon {1} ¡es el más capturado! ({2}/{3} para {4}% del inventario)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.fr.json

@@ -115,6 +115,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "En attente d'évoluer {0} Pokémon une fois {1} plus sont capturés! ({2}/{3} pour {4}% inventory)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Attente de {0} plus evolutions pour demarrer l'evolution! (Possible: {1} | Requis: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.hu.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Varakozas a fejlesztesevel: {0} Meg {1} darabot kell elkapni a ({2}/{3} {4}%-os tarolokapacitashoz)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.id.json

@@ -147,6 +147,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Menunggu untuk evolusi {0} Pokemon, setelah {1} lagi tertangkap! ({2}/{3} dari {4}% inventaris)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.it.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "In attesa di catturare ancora {1} Pokemon per evolverne {0}! ({2}/{3} per il {4}% dell'inventario)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.ja-JP.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "進化待機中： {0} Pokemon once {1} more are caught! ({2}/{3} for {4}% inventory)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.ja-JP2.json

@@ -87,6 +87,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Waiting to evolve {0} Pokemon once {1} more are caught! ({2}/{3} for {4}% inventory)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.pl.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Pokemonów oczekujących na ewolucje: {0} | Możesz złapać ich jeszcze: {1} | {2}/{3} dla {4}% ekwipunku"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.pt-br.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Esperando evoluir {0} Pokemon(s) até que mais {1} sejam capturados! ({2}/{3} para {4}% do inventário)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.ro.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Se așteaptă evoluarea pokemonului {0} odată ce alți {1} sunt prinși! ({2}/{3} pentru inventar {4}%)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.ru-RU.json

@@ -138,6 +138,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Улучшения ждут {0} покемонов, собираем {1} оставшихся. ({2}/{3} на {4}% сумки)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.th.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "รอการแปลงร่าง {0} ของโปเกมอน {1} จับเพิ่มเติม! ({2}/{3} จาก {4}% ในคลัง)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.tr.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "{0} Pokémon geliştirilmeyi(evolve) bekliyor! {1} Pokémon daha yakalandığında Pokémon taşıma limitinin {4}%'i dolacak. ({2}/{3})"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.vi.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "Đợi để tiến hoá {0} Pokemon lần {1} đã bắt! ({2}/{3} - {4}% túi)"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "等待进化[{0}]还需要捕获{1}个!({2}/{3}为{4}%背包)\t\t"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN_pp.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "等待进化[{0}]还需要捕获{1}个!({2}/{3}为{4}%背包)\t\t"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.zh-HK.json

@@ -139,6 +139,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "目前有 {0} 隻小精靈，再捕捉 {1} 隻小精靈後將會進化! (目前有 {2}/{3} 佔背包總量的 {4}% )"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.CLI/Config/Translations/translation.zh-TW.json

@@ -143,6 +143,10 @@
     {
       "Key": "waitingForMorePokemonToEvolve",
       "Value": "目前有 {0} 隻神奇寶貝，再捕捉 {1} 隻神奇寶貝後將會進化！(目前有 {2}/{3} 占背包總量的 {4}% )\t\t"
+    },
+	{
+      "Key": "WaitingForMoreEvolutionsToEvolve",
+      "Value": "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"
     },
     {
       "Key": "useLuckyEggsMinPokemonAmountTooHigh",

PoGo.NecroBot.Logic/Common/Translations.cs

@@ -50,7 +50,7 @@ public enum TranslationString
         EventPokemonCaptureFailed,
         EventNoPokeballs,
         WaitingForMorePokemonToEvolve,
-        WaitingForMoreEvolutionsToEvolveWithEgg,
+        WaitingForMoreEvolutionsToEvolve,
         UseLuckyEggsMinPokemonAmountTooHigh,
         CatchMorePokemonToUseLuckyEgg,
         EventUseBerry,
@@ -385,8 +385,8 @@ public class Translation : ITranslation
                     "No Pokeballs - We missed a {0} with CP {1}"),
                 new KeyValuePair<TranslationString, string>(TranslationString.WaitingForMorePokemonToEvolve,
                     "Waiting to evolve {0} Pokemons until {1} more are in storage! (In storage: {2} | Target: {3})"),
-                new KeyValuePair<TranslationString, string>(TranslationString.WaitingForMoreEvolutionsToEvolveWithEgg,
-                    "Waiting for {0} more evolutions to evolve with lucky egg! (Possible: {1} | Needed: {2})"),
+                new KeyValuePair<TranslationString, string>(TranslationString.WaitingForMoreEvolutionsToEvolve,
+                    "Waiting for {0} more evolutions to start evolving! (Possible: {1} | Needed: {2})"),
                 new KeyValuePair<TranslationString, string>(TranslationString.UseLuckyEggsMinPokemonAmountTooHigh,
                     "Lucky eggs will never be used with UseLuckyEggsMinPokemonAmount set to {0}, use <= {1} instead"),
                 new KeyValuePair<TranslationString, string>(TranslationString.CatchMorePokemonToUseLuckyEgg,

PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs

@@ -32,6 +32,7 @@ public interface ILogicSettings
         int KeepMinLvl { get; }
         bool UseKeepMinLvl { get; }
         string KeepMinOperator { get; }
+        bool KeepPokemonsToBeEvolved { get; }
         double WalkingSpeedInKilometerPerHour { get; }
         bool UseWalkingSpeedVariant { get; }
         double WalkingSpeedVariant { get; }
@@ -40,10 +41,6 @@ public interface ILogicSettings
         bool FastSoftBanBypass { get; }
         int ByPassSpinCount { get; }
         double AutoSnipeMaxDistance { get; }
-        bool EvolveAllPokemonWithEnoughCandy { get; }
-        bool EvolvePreserveMinCandiesFromFilter { get; }
-        bool KeepPokemonsThatCanEvolve { get; }
-
         bool UseTransferFilterToCatch { get; }
         bool TransferDuplicatePokemon { get; }
         bool TransferDuplicatePokemonOnCapture { get; }
@@ -96,10 +93,22 @@ public interface ILogicSettings
         bool StartFromLastPosition { get; }
         bool UseGpxPathing { get; }
         string GpxFile { get; }
-        bool UseLuckyEggsWhileEvolving { get; }
-        int UseLuckyEggsMinPokemonAmount { get; }
-        bool EvolveAllPokemonAboveIv { get; }
-        float EvolveAboveIvValue { get; }
+        #region Evolve
+        bool EvolvePokemonsThatMatchFilter { get; }
+        bool EvolveAnyPokemonAboveIv { get; }
+        float EvolveAnyPokemonAboveIvValue { get; }
+        bool TriggerEvolveAsSoonAsFilterIsMatched { get; }
+        bool TriggerEvolveOnEvolutionCount { get; }
+        int TriggerEvolveOnEvolutionCountValue { get; }
+        bool TriggerEvolveOnStorageUsagePercentage { get; }
+        double TriggerEvolveOnStorageUsagePercentageValue { get; }
+        bool TriggerEvolveOnStorageUsageAbsolute { get; }
+        int TriggerEvolveOnStorageUsageAbsoluteValue { get; }
+        bool TriggerEvolveIfLuckyEggIsActive { get; }
+        bool EvolvePreserveMinCandiesFromFilter { get; }
+        bool EvolveApplyLuckyEggOnEvolutionCount { get; }
+        int EvolveApplyLuckyEggOnEvolutionCountValue { get; }
+        #endregion
         bool DumpPokemonStats { get; }
         bool RenamePokemon { get; }
         bool RenamePokemonRespectTransferRule { get; }
@@ -146,9 +155,6 @@ public interface ILogicSettings
         bool DetailedCountsBeforeRecycling { get; }
         bool VerboseRecycling { get; }
         double RecycleInventoryAtUsagePercentage { get; }
-        double EvolveKeptPokemonsAtStorageUsagePercentage { get; }
-        int EvolveKeptPokemonIfBagHasOverThisManyPokemon { get; }
-        bool EvolveKeptPokemonsIfLuckyEggCanBeUsed { get; }
         bool UseSnipeLimit { get; }
         bool UsePokeStopLimit { get; }
         bool UseCatchLimit { get; }
@@ -243,11 +249,6 @@ public interface ILogicSettings
         bool SkipCollectingLevelUpRewards { get; }
         Dictionary<ItemId, ItemUseFilter> ItemUseFilters { get; }
         double UpgradePokemonLvlMinimum { get; }
-        bool EvolveFavoritedOnly { get; }
-        string EvolveOperator { get; }
-        double EvolveMinIV { get; }
-        double EvolveMinCP { get;  }
-        double EvolveMinLevel { get; }
         int MinLevelForAutoSnipe { get;  }
 
         bool UseHumanlikeDelays { get; }