Merge pull request #107 from skupfer/keepmindup_fix

Fix KeepMinDuplicatePokemon
NecronomiconCoding · Jul 23, 2016 · 0cb553e · 0cb553e
2 parents 66e76ff + 7b0ee37
commit 0cb553e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 1 deletion.
diff --git a/PokemonGo.RocketAPI.Console/App.config b/PokemonGo.RocketAPI.Console/App.config
@@ -61,6 +61,9 @@
       <setting name="UsePokemonToNotCatchFilter" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="KeepMinDuplicatePokemon" serializeAs="String">
+        <value>1</value>
+      </setting>
     </PokemonGo.RocketAPI.Console.UserSettings>
   </userSettings>
 </configuration>
diff --git a/PokemonGo.RocketAPI.Console/Settings.cs b/PokemonGo.RocketAPI.Console/Settings.cs
@@ -29,6 +29,7 @@ public class Settings : ISettings
         public bool TransferDuplicatePokemon => UserSettings.Default.TransferDuplicatePokemon;
         public int DelayBetweenPokemonCatch => UserSettings.Default.DelayBetweenPokemonCatch;
         public bool UsePokemonToNotCatchFilter => UserSettings.Default.UsePokemonToNotCatchFilter;
+        public int KeepMinDuplicatePokemon => UserSettings.Default.KeepMinDuplicatePokemon;
 
         public string GoogleRefreshToken
         {

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
@@ -44,5 +44,8 @@
     <Setting Name="UsePokemonToNotCatchFilter" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="KeepMinDuplicatePokemon" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">1</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/PokemonGo.RocketAPI.Logic/Inventory.cs b/PokemonGo.RocketAPI.Logic/Inventory.cs
@@ -72,7 +72,7 @@ public async Task<IEnumerable<PokemonData>> GetDuplicatePokemonToTransfer(
                     p =>
                         p.OrderByDescending(x => x.Cp)
                             .ThenBy(n => n.StaminaMax)
-                            .Skip(1)
+                            .Skip(_client.Settings.KeepMinDuplicatePokemon)
                             .ToList());
         }
 

diff --git a/PokemonGo.RocketAPI/ISettings.cs b/PokemonGo.RocketAPI/ISettings.cs
@@ -24,6 +24,7 @@ public interface ISettings
         bool TransferDuplicatePokemon { get; }
         int DelayBetweenPokemonCatch { get; }
         bool UsePokemonToNotCatchFilter { get; }
+        int KeepMinDuplicatePokemon { get; }
         ICollection<KeyValuePair<ItemId, int>> ItemRecycleFilter { get; }
 
         ICollection<PokemonId> PokemonsToEvolve { get; }