Merge pull request #432 from skupfer/evolveimprovement

EvolveAllPkm Management - Evolve all above certain IV value
NecronomiconCoding · Jul 24, 2016 · eab7d63 · eab7d63
2 parents 44f8089 + 9c5e36c
commit eab7d63
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 4 deletions.
diff --git a/PokemonGo.RocketAPI.Console/App.config b/PokemonGo.RocketAPI.Console/App.config
@@ -76,6 +76,12 @@
       <setting name="useLuckyEggsWhileEvolving" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="EvolveAllPokemonAboveIV" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="EvolveAboveIVValue" serializeAs="String">
+        <value>95</value>
+      </setting>
     </PokemonGo.RocketAPI.Console.UserSettings>
   </userSettings>
 </configuration>
diff --git a/PokemonGo.RocketAPI.Console/Settings.cs b/PokemonGo.RocketAPI.Console/Settings.cs
@@ -36,6 +36,8 @@ public class Settings : ISettings
         public string GPXFile => UserSettings.Default.GPXFile;
         public bool UseGPXPathing => UserSettings.Default.UseGPXPathing;
         public bool useLuckyEggsWhileEvolving => UserSettings.Default.useLuckyEggsWhileEvolving;
+        public bool EvolveAllPokemonAboveIV => UserSettings.Default.EvolveAllPokemonAboveIV;
+        public float EvolveAboveIVValue => UserSettings.Default.EvolveAboveIVValue;
 
         //Type and amount to keep
         public ICollection<KeyValuePair<ItemId, int>> ItemRecycleFilter => new[]

diff --git a/PokemonGo.RocketAPI.Console/UserSettings.Designer.cs b/PokemonGo.RocketAPI.Console/UserSettings.Designer.cs
diff --git a/PokemonGo.RocketAPI.Console/UserSettings.settings b/PokemonGo.RocketAPI.Console/UserSettings.settings
@@ -59,5 +59,11 @@
     <Setting Name="useLuckyEggsWhileEvolving" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="EvolveAllPokemonAboveIV" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="EvolveAboveIVValue" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">95</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/PokemonGo.RocketAPI.Logic/Inventory.cs b/PokemonGo.RocketAPI.Logic/Inventory.cs
@@ -225,8 +225,19 @@ public async Task<IEnumerable<PokemonData>> GetPokemonToEvolve(IEnumerable<Pokem
                     pokemonToEvolve.Count(
                         p => pokemonSettings.Single(x => x.PokemonId == p.PokemonId).FamilyId == settings.FamilyId) *
                     settings.CandyToEvolve;
-                if (familyCandy.Candy - pokemonCandyNeededAlready > settings.CandyToEvolve)
-                    pokemonToEvolve.Add(pokemon);
+
+                if (_client.Settings.EvolveAllPokemonAboveIV)
+                    if (PokemonInfo.CalculatePokemonPerfection(pokemon) >= _client.Settings.EvolveAboveIVValue && familyCandy.Candy - pokemonCandyNeededAlready > settings.CandyToEvolve)
+                    {
+                        pokemonToEvolve.Add(pokemon);
+                    } else { continue; }
+                else
+                {
+                    if (familyCandy.Candy - pokemonCandyNeededAlready > settings.CandyToEvolve)
+                    {
+                        pokemonToEvolve.Add(pokemon);
+                    } else { continue; }
+                }
             }
 
             return pokemonToEvolve;

diff --git a/PokemonGo.RocketAPI.Logic/Logic.cs b/PokemonGo.RocketAPI.Logic/Logic.cs
@@ -468,7 +468,7 @@ private async Task ExecuteFarmingPokestopsAndPokemons()
                 {
                     stopsHit = 0;
                     await RecycleItems();
-                    if (_clientSettings.EvolveAllPokemonWithEnoughCandy) await EvolveAllPokemonWithEnoughCandy(_clientSettings.PokemonsToEvolve);
+                    if (_clientSettings.EvolveAllPokemonWithEnoughCandy || _clientSettings.EvolveAllPokemonAboveIV) await EvolveAllPokemonWithEnoughCandy(_clientSettings.PokemonsToEvolve);
                     if (_clientSettings.TransferDuplicatePokemon) await TransferDuplicatePokemon();
                 }
             }
@@ -518,7 +518,7 @@ public async Task PostLoginExecute()
             {
                 _playerProfile = await _client.GetProfile();
                 _stats.SetUsername(_playerProfile);
-                if (_clientSettings.EvolveAllPokemonWithEnoughCandy)
+                if (_clientSettings.EvolveAllPokemonWithEnoughCandy || _clientSettings.EvolveAllPokemonAboveIV)
                     await EvolveAllPokemonWithEnoughCandy(_clientSettings.PokemonsToEvolve);
                 if (_clientSettings.TransferDuplicatePokemon) await TransferDuplicatePokemon();
                 await DisplayHighests();

diff --git a/PokemonGo.RocketAPI/ISettings.cs b/PokemonGo.RocketAPI/ISettings.cs
@@ -29,6 +29,9 @@ public interface ISettings
         bool UseGPXPathing { get; }
         string GPXFile { get; }
         bool useLuckyEggsWhileEvolving { get; }
+        bool EvolveAllPokemonAboveIV { get; }
+        float EvolveAboveIVValue { get; }
+
         ICollection<KeyValuePair<ItemId, int>> ItemRecycleFilter { get; }
 
         ICollection<PokemonId> PokemonsToEvolve { get; }