Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Added a better config merging system #1874

Merged
merged 14 commits into from
Aug 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion PoGo.NecroBot.CLI/ConsoleEventListener.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Logic/Common/Translations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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}"),
Expand Down
1 change: 1 addition & 0 deletions PoGo.NecroBot.Logic/ILogicSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
Loading