Merge branch 'features/auto_favorite_shiny_on_catch' into master

Necrobot-Private · Mar 28, 2017 · dee7861 · dee7861
2 parents f365b00 + 5cd3c4e
commit dee7861
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs b/PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs
@@ -107,6 +107,7 @@ public interface ILogicSettings
         int FavoriteMinLevel { get; }
         string FavoriteOperator { get; }
         bool AutoFavoritePokemon { get; }
+        bool AutoFavoriteShinyOnCatch { get; }
         string RenameTemplate { get; }
         int AmountOfPokemonToDisplayOnStart { get; }
         string TranslationLanguageCode { get; }
@@ -250,4 +251,4 @@ public interface ILogicSettings
         int CatchMissedDelay { get; }
         int BeforeCatchDelay { get; }
     }
-}
+}
diff --git a/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs b/PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs
@@ -171,6 +171,7 @@ public float GenRandom(float val)
         public string FavoriteOperator => _settings.PokemonConfig.FavoriteOperator.ToString();
 
         public bool AutoFavoritePokemon => _settings.PokemonConfig.AutoFavoritePokemon;
+        public bool AutoFavoriteShinyOnCatch => _settings.PokemonConfig.AutoFavoriteShinyOnCatch;
         public string RenameTemplate => _settings.PokemonConfig.RenameTemplate;
         public int AmountOfPokemonToDisplayOnStart => _settings.ConsoleConfig.AmountOfPokemonToDisplayOnStart;
         public bool DumpPokemonStats => _settings.PokemonConfig.DumpPokemonStats;
@@ -290,4 +291,4 @@ public float GenRandom(float val)
         public int BeforeCatchDelay => _settings.HumanlikeDelays.BeforeCatchDelay;
 
     }
-}
+}
diff --git a/PoGo.NecroBot.Logic/Tasks/CatchPokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/CatchPokemonTask.cs
@@ -429,6 +429,7 @@ encounter is EncounterResponse || encounter is IncenseEncounterResponse
 
                     if (caughtPokemonResponse.Status == CatchPokemonResponse.Types.CatchStatus.CatchSuccess)
                     {
+
                         evt.Shiny = (await session.Inventory.GetPokemons().ConfigureAwait(false)).First(x => x.Id == caughtPokemonResponse.CapturedPokemonId).PokemonDisplay.Shiny ? "Yes" : "No";
                         evt.Gender = (await session.Inventory.GetPokemons().ConfigureAwait(false)).First(x => x.Id == caughtPokemonResponse.CapturedPokemonId).PokemonDisplay.Gender.ToString();