Merge pull request NecronomiconCoding#1874 from Andrerm124/master

[Feature] Added a better config merging system
schnapster · Aug 1, 2016 · 3a21999 · 3a21999
2 parents e893f08 + cd48691
commit 3a21999
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 227 deletions.
diff --git a/PoGo.NecroBot.CLI/ConsoleEventListener.cs b/PoGo.NecroBot.CLI/ConsoleEventListener.cs
@@ -113,9 +113,11 @@ private static void HandleEvent(FortFailedEvent fortFailedEvent, ISession sessio
 
         private static void HandleEvent(FortTargetEvent fortTargetEvent, ISession session)
         {
+            int intTimeForArrival = (int) ( fortTargetEvent.Distance / ( session.LogicSettings.WalkingSpeedInKilometerPerHour * 0.277778 ) );
+
             Logger.Write(
                 session.Translation.GetTranslation(TranslationString.EventFortTargeted, fortTargetEvent.Name,
-                    Math.Round(fortTargetEvent.Distance)),
+                    Math.Round(fortTargetEvent.Distance), intTimeForArrival ),
                 LogLevel.Info, ConsoleColor.DarkRed);
         }
 

diff --git a/PoGo.NecroBot.Logic/Common/Translations.cs b/PoGo.NecroBot.Logic/Common/Translations.cs
@@ -176,7 +176,7 @@ public class Translation : ITranslation
             new KeyValuePair<TranslationString, string>(TranslationString.EventFortFailed,
                 "Name: {0} INFO: Looting failed, possible softban. Unban in: {1}/{2}"),
             new KeyValuePair<TranslationString, string>(TranslationString.EventFortTargeted,
-                "Traveling to Pokestop: {0} ({1}m)"),
+                "Traveling to Pokestop: {0} ({1}m)({2}seconds)"),
             new KeyValuePair<TranslationString, string>(TranslationString.EventProfileLogin, "Playing as {0}"),
             new KeyValuePair<TranslationString, string>(TranslationString.EventUsedIncense,
                 "Used Incense, remaining: {0}"),

diff --git a/PoGo.NecroBot.Logic/ILogicSettings.cs b/PoGo.NecroBot.Logic/ILogicSettings.cs
@@ -90,6 +90,7 @@ public interface ILogicSettings
         float UpgradePokemonIvMinimum { get; }
         int DelayBetweenPlayerActions { get; }
         bool UsePokemonToNotCatchFilter { get; }
+        bool UsePokemonSniperFilterOnly { get; }
         int KeepMinDuplicatePokemon { get; }
         bool PrioritizeIvOverCp { get; }
         int AmountOfTimesToUpgradeLoop { get; }