Merge pull request #3212 from Saiteik/master

PokemonCatch event logging cleanup
NecronomiconCoding · Aug 8, 2016 · ac1e9b1 · ac1e9b1
2 parents 402fc38 + faf7a9b
commit ac1e9b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/PoGo.NecroBot.Logic/ILogicSettings.cs b/PoGo.NecroBot.Logic/ILogicSettings.cs
@@ -163,7 +163,7 @@ public interface ILogicSettings
         int TotalAmountOfRevivesToKeep { get; }
         int TotalAmountOfBerriesToKeep { get; }
 
-        bool ShowPokeballCountsBeforeRecycle { get; }
+        bool DetailedCountsBeforeRecycling { get; }
         bool VerboseRecycling { get; }
         double RecycleInventoryAtUsagePercentage { get; }
         double EvolveKeptPokemonsAtStorageUsagePercentage { get; }

diff --git a/PoGo.NecroBot.Logic/Settings.cs b/PoGo.NecroBot.Logic/Settings.cs
@@ -256,7 +256,7 @@ public class GlobalSettings
         [DefaultValue(10)]
         public int AmountOfPokemonToDisplayOnStart;
         [DefaultValue(true)]
-        public bool ShowPokeballCountsBeforeRecycle;
+        public bool DetailedCountsBeforeRecycling;
         //pokemon
         [DefaultValue(true)]
         public bool CatchPokemon;
@@ -1266,7 +1266,7 @@ public LogicSettings(GlobalSettings settings)
         public int AmountOfPokemonToDisplayOnStart => _settings.AmountOfPokemonToDisplayOnStart;
         public bool DumpPokemonStats => _settings.DumpPokemonStats;
         public string TranslationLanguageCode => _settings.TranslationLanguageCode;
-        public bool ShowPokeballCountsBeforeRecycle => _settings.ShowPokeballCountsBeforeRecycle;
+        public bool DetailedCountsBeforeRecycling => _settings.DetailedCountsBeforeRecycling;
         public bool VerboseRecycling => _settings.VerboseRecycling;
         public double RecycleInventoryAtUsagePercentage => _settings.RecycleInventoryAtUsagePercentage;
         public double EvolveKeptPokemonsAtStorageUsagePercentage => _settings.EvolveKeptPokemonsAtStorageUsagePercentage;

diff --git a/PoGo.NecroBot.Logic/Tasks/RecycleItemsTask.cs b/PoGo.NecroBot.Logic/Tasks/RecycleItemsTask.cs
@@ -26,7 +26,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
             var currentAmountOfUltraballs = await session.Inventory.GetItemAmountByType(ItemId.ItemUltraBall);
             var currentAmountOfMasterballs = await session.Inventory.GetItemAmountByType(ItemId.ItemMasterBall);
 
-            if (session.LogicSettings.ShowPokeballCountsBeforeRecycle)
+            if (session.LogicSettings.DetailedCountsBeforeRecycling)
                 Logger.Write(session.Translation.GetTranslation(TranslationString.CurrentPokeballInv,
                     currentAmountOfPokeballs, currentAmountOfGreatballs, currentAmountOfUltraballs,
                     currentAmountOfMasterballs));
@@ -38,7 +38,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
 
             var currentAmountOfPotions = currentPotions + currentSuperPotions + currentHyperPotions + currentMaxPotions;
 
-            if (session.LogicSettings.ShowPokeballCountsBeforeRecycle)
+            if (session.LogicSettings.DetailedCountsBeforeRecycling)
                 Logger.Write(session.Translation.GetTranslation(TranslationString.CurrentPotionInv,
                     currentPotions, currentSuperPotions, currentHyperPotions, currentMaxPotions));
 
@@ -47,7 +47,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
 
             var currentAmountOfRevives = currentRevives + currentMaxRevives;
 
-            if (session.LogicSettings.ShowPokeballCountsBeforeRecycle)
+            if (session.LogicSettings.DetailedCountsBeforeRecycling)
                 Logger.Write(session.Translation.GetTranslation(TranslationString.CurrentReviveInv,
                     currentRevives, currentMaxRevives));
 
@@ -63,7 +63,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
             var currentAmountOfLuckyEggs = await session.Inventory.GetItemAmountByType(ItemId.ItemLuckyEgg);
             var currentAmountOfLures = await session.Inventory.GetItemAmountByType(ItemId.ItemTroyDisk);
 
-            if (session.LogicSettings.ShowPokeballCountsBeforeRecycle)
+            if (session.LogicSettings.DetailedCountsBeforeRecycling)
                 Logger.Write(session.Translation.GetTranslation(TranslationString.CurrentMiscItemInv,
                     currentAmountOfBerries, currentAmountOfIncense, currentAmountOfLuckyEggs, currentAmountOfLures));