Merge pull request #1563 from Necrobot-Private/features/update_softba…

…n_limits Decrease softban limits (500 pokemon, 700 pokestops)
Necrobot-Private · Apr 25, 2017 · 5462002 · 5462002
2 parents 58d2200 + e24f647
commit 5462002
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/PoGo.NecroBot.Logic/Model/Settings/GlobalSettings.cs b/PoGo.NecroBot.Logic/Model/Settings/GlobalSettings.cs
@@ -682,7 +682,7 @@ private static void MigrateSettings(JObject settings, string configFile, string
                         break;
 
                     case 22:
-                        if (settings["PokemonsTransferFilter"] != null && settings["PokemonsTransferFilter"] != null)
+                        if (settings["PokemonsTransferFilter"] != null)
                         {
                             foreach (var x in settings["PokemonsTransferFilter"])
                             {
@@ -694,6 +694,19 @@ private static void MigrateSettings(JObject settings, string configFile, string
                             }
                         }
                         break;
+
+                    case 23:
+                        if (settings["PokeStopConfig"] != null)
+                        {
+                            settings["PokeStopConfig"]["PokeStopLimit"] = 700;
+                            Logger.Write($"PokeStopLimit changed to {settings["PokeStopConfig"]["PokeStopLimit"]}", LogLevel.Info);
+                        }
+                        if (settings["PokemonConfig"] != null)
+                        {
+                            settings["PokemonConfig"]["CatchPokemonLimit"] = 500;
+                            Logger.Write($"CatchPokemonLimit changed to {settings["PokemonConfig"]["CatchPokemonLimit"]}", LogLevel.Info);
+                        }
+                        break;
                 }
             }
         }

diff --git a/PoGo.NecroBot.Logic/Model/Settings/PokeStopConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/PokeStopConfig.cs
@@ -17,7 +17,7 @@ public PokeStopConfig() : base()
         public bool UsePokeStopLimit { get; set; }
 
         [NecrobotConfig(Description = "Max number of pokestops bot is allowed to farm a day", Position = 2)]
-        [DefaultValue(1500)]
+        [DefaultValue(700)]
         [Range(0, 9999)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate, Order = 2)]
         public int PokeStopLimit {get; set; }

diff --git a/PoGo.NecroBot.Logic/Model/Settings/PokemonConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/PokemonConfig.cs
@@ -42,7 +42,7 @@ internal enum CpIv
         public bool UseCatchLimit { get; set; }
 
         [NecrobotConfig(Description = "Number of pokemon allowed for catch duration", Position = 4)]
-        [DefaultValue(700)]
+        [DefaultValue(500)]
         [Range(0, 9999)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate, Order = 4)]
         public int CatchPokemonLimit { get; set; }

diff --git a/PoGo.NecroBot.Logic/Model/Settings/UpdateConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/UpdateConfig.cs
@@ -10,7 +10,7 @@ public UpdateConfig() : base()
         {
         }
 
-        public const int CURRENT_SCHEMA_VERSION = 23;
+        public const int CURRENT_SCHEMA_VERSION = 24;
 
         [DefaultValue(CURRENT_SCHEMA_VERSION)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate, Order = 1)]