From 288c3ecb85e073a51618fd292ace60a781d16e88 Mon Sep 17 00:00:00 2001 From: Ryan Currie Date: Mon, 1 Aug 2016 12:23:45 -0700 Subject: [PATCH 1/2] Fix default ball settings. --- FeroxRev | 2 +- PoGo.NecroBot.Logic/Settings.cs | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/FeroxRev b/FeroxRev index 3ff1579e7..31f14b96c 160000 --- a/FeroxRev +++ b/FeroxRev @@ -1 +1 @@ -Subproject commit 3ff1579e7bdc05b1abea112112495d015a65c586 +Subproject commit 31f14b96ce746f7a10e2a39e38743cc1323c229e diff --git a/PoGo.NecroBot.Logic/Settings.cs b/PoGo.NecroBot.Logic/Settings.cs index 21c0afd05..3b863ed43 100644 --- a/PoGo.NecroBot.Logic/Settings.cs +++ b/PoGo.NecroBot.Logic/Settings.cs @@ -548,6 +548,31 @@ public static GlobalSettings Load(string path) settings.UseMasterBallBelowCatchProbability = Default.UseMasterBallBelowCatchProbability; } + if (settings.UseMasterBallAboveCp < 0) + { + settings.UseMasterBallAboveCp = Default.UseMasterBallAboveCp; + } + + if (settings.UseUltraBallAboveCp < 0) + { + settings.UseUltraBallAboveCp = Default.UseUltraBallAboveCp; + } + + if (settings.UseUltraBallAboveIv < 0) + { + settings.UseUltraBallAboveIv = Default.UseUltraBallAboveCp; + } + + if (settings.UseGreatBallAboveCp < 0) + { + settings.UseGreatBallAboveCp = Default.UseGreatBallAboveCp; + } + + if (settings.UseUltraBallAboveIv < 0) + { + settings.UseGreatBallAboveIv = Default.UseGreatBallAboveIv; + } + if (settings.UseBerriesMinCp < 0) { settings.UseBerriesMinCp = Default.UseBerriesMinCp; From 346a2fab173b928510273e4037a9177d178b25d0 Mon Sep 17 00:00:00 2001 From: Ryan Currie Date: Mon, 1 Aug 2016 13:07:23 -0700 Subject: [PATCH 2/2] Updating defaults per issue. --- PoGo.NecroBot.Logic/Settings.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PoGo.NecroBot.Logic/Settings.cs b/PoGo.NecroBot.Logic/Settings.cs index 3b863ed43..fe4b6d21f 100644 --- a/PoGo.NecroBot.Logic/Settings.cs +++ b/PoGo.NecroBot.Logic/Settings.cs @@ -182,13 +182,13 @@ public class GlobalSettings public int TotalAmountOfPotionsToKeep = 80; public int TotalAmountOfRevivesToKeep = 60; //balls - public int UseGreatBallAboveCp = 1000; - public int UseUltraBallAboveCp = 1250; + public int UseGreatBallAboveCp = 750; + public int UseUltraBallAboveCp = 1000; public int UseMasterBallAboveCp = 1500; public int UseGreatBallAboveIv = 85; - public int UseUltraBallAboveIv = 90; - public double UseGreatBallBelowCatchProbability = 0.3; - public double UseUltraBallBelowCatchProbability = 0.2; + public int UseUltraBallAboveIv = 95; + public double UseGreatBallBelowCatchProbability = 0.2; + public double UseUltraBallBelowCatchProbability = 0.1; public double UseMasterBallBelowCatchProbability = 0.05; //transfer public bool TransferDuplicatePokemon = true;