Merge pull request #2 from Necrobot-Private/master

sync
Necrobot-Private · Nov 8, 2016 · 4495d83 · 4495d83
2 parents f5314f1 + c780d50
commit 4495d83
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 462 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Change Log
 
+
+## [v1.0.0.12](https://github.com/Necrobot-Private/NecroBot/tree/v1.0.0.12) (2016-11-07)
+[Full Changelog](https://github.com/Necrobot-Private/NecroBot/compare/v1.0.0.11...v1.0.0.12)
+
+**Implemented enhancements:**
+
+- Only regenerate device info once if device package name is set to "random". 
+- Regenerate iOS device info and save to auth.config if using Android device info.
+
+## [v1.0.0.11](https://github.com/Necrobot-Private/NecroBot/tree/v1.0.0.11) (2016-11-07)
+[Full Changelog](https://github.com/Necrobot-Private/NecroBot/compare/v1.0.0.10...v1.0.0.11)
+
+**Implemented enhancements:**
+
+- Captcha checking - for now we are checking if there is a captcha being required and will display message to user and have the bot exit.
+- Disabled human snipe online sources to avoid errors in console
+- Allow common pokemon to be sniped again (to avoid getting questions about why they are being skipped).
+
+## [v1.0.0.10](https://github.com/Necrobot-Private/NecroBot/tree/v1.0.0.10) (2016-11-07)
+[Full Changelog](https://github.com/Necrobot-Private/NecroBot/compare/v1.0.0.9...v1.0.0.10)
+
+**Fixed bugs:**
+
+- Generate random iOS device info for the API if Android info is read from auth.json.  Note that the iOS device settings are not saved.
+
+
+## [v1.0.0.9](https://github.com/Necrobot-Private/NecroBot/tree/v1.0.0.9) (2016-11-07)
+[Full Changelog](https://github.com/Necrobot-Private/NecroBot/compare/v1.0.0.6...v1.0.0.9)
+
+**Implemented enhancements:**
+
+- Support for 0.43 API
+
 ## [v1.0.0.6](https://github.com/Necrobot-Private/NecroBot/tree/v1.0.0.6) (2016-09-23)
 [Full Changelog](https://github.com/Necrobot-Private/NecroBot/compare/v1.0.0.5...v1.0.0.6)
 
@@ -312,4 +345,4 @@
 ## [v0.1-beta](https://github.com/Necrobot-Private/NecroBot/tree/v0.1-beta) (2016-07-25)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/FeroxRev b/FeroxRev
diff --git a/POGOProtos b/POGOProtos
diff --git a/PoGo.NecroBot.CLI/Properties/AssemblyInfo.cs b/PoGo.NecroBot.CLI/Properties/AssemblyInfo.cs
@@ -40,7 +40,7 @@
 // [assembly: AssemblyVersion1("0.9.9.5")]
 
 
-[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyVersion("1.0.0.12")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("v1.0.0.6")]
+[assembly: AssemblyInformationalVersion("v1.0.0.12")]
 
diff --git a/PoGo.NecroBot.GUI/Properties/AssemblyInfo.cs b/PoGo.NecroBot.GUI/Properties/AssemblyInfo.cs
@@ -37,10 +37,10 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.0.6")]
+// [assembly: AssemblyVersion("1.0.0.12")]
 
 
-[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyVersion("1.0.0.12")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("v1.0.0.6")]
+[assembly: AssemblyInformationalVersion("v1.0.0.12")]
 
diff --git a/PoGo.NecroBot.Logic/Common/ApiFailureStrategy.cs b/PoGo.NecroBot.Logic/Common/ApiFailureStrategy.cs
@@ -100,7 +100,7 @@ public void HandleCaptcha(string challengeUrl, ICaptchaResponseHandler captchaRe
 
             _session.EventDispatcher.Send(new WarnEvent
             {
-                Message = _session.Translation.GetTranslation(TranslationString.RequireInputText)
+                Message = _session.Translation.GetTranslation(TranslationString.ExitNowAfterEnterKey)
             });
 
             Console.ReadKey();

diff --git a/PoGo.NecroBot.Logic/Common/Translations.cs b/PoGo.NecroBot.Logic/Common/Translations.cs
@@ -466,7 +466,7 @@ public class Translation : ITranslation
             new KeyValuePair<TranslationString, string>(TranslationString.ShowPokeSkillTemplate,
                 "\n CP: {0} | IV: {1}% | Move: {2} + {3} | Name: {4}"),
             new KeyValuePair<TranslationString, string>(TranslationString.HelpTemplate,
-                "Commands: \n \n /help - Show commands. \n /top <cp/iv> <amount> - Shows you top Pokemons. \n /all <cp/iv> - Shows you all Pokemons. \n /profile - Shows you profile. \n /loc - Shows you location. \n /items - Shows your items. \n /status - Shows you the Status of the Bot. \n /pokedex - Shows you Pokedex. \n /restart - Restart NcroBot. \n /exit - Close NecroBot."),
+                "Commands: \n \n /help - Show commands. \n /top <cp/iv> <amount> - Shows you top Pokemons. \n /all <cp/iv> - Shows you all Pokemons. \n /profile - Shows you profile. \n /loc - Shows you location. \n /items - Shows your items. \n /status - Shows you the Status of the Bot. \n /pokedex - Shows you Pokedex. \n /restart - Restart NecroBot. \n /exit - Close NecroBot."),
             new KeyValuePair<TranslationString, string>(TranslationString.StatsXpTemplateString,
                 "{0} (Advance in {1}h {2}m | {3:n0}/{4:n0} XP)"),
             new KeyValuePair<TranslationString, string>(TranslationString.RequireInputText,

diff --git a/PoGo.NecroBot.Logic/Model/Settings/AuthSettings.cs b/PoGo.NecroBot.Logic/Model/Settings/AuthSettings.cs
@@ -189,10 +189,15 @@ public void Load(string path, bool boolSkipSave = false, bool validate = false)
                     {
                         var randomAppleDeviceInfo = DeviceInfoHelper.GetRandomIosDevice();
                         SetDevInfoByDeviceInfo(randomAppleDeviceInfo);
+
+                        // After generating iOS settings, automatically set the package name to "custom", so that we don't regenerate settings every time we start.
+                        DeviceConfig.DevicePackageName = "custom";
                     }
                 }
                 else
                 {
+                    // We cannot emulate Android at the moment, so if we got here, then regenerate the settings with random iOS device.
+                    /*
                     // Android
                     if (!DeviceConfig.DevicePackageName.Equals("random", StringComparison.InvariantCultureIgnoreCase) &&
                         !DeviceConfig.DevicePackageName.Equals("custom", StringComparison.InvariantCultureIgnoreCase))
@@ -210,6 +215,12 @@ public void Load(string path, bool boolSkipSave = false, bool validate = false)
                         DeviceConfig.DevicePackageName = DeviceInfoHelper.AndroidDeviceInfoSets.Keys.ToArray()[rndIdx];
                         SetDevInfoByKey();
                     }
+                    */
+                    DeviceConfig.DevicePlatform = "ios";
+                    DeviceConfig.DevicePackageName = "custom";
+
+                    var randomAppleDeviceInfo = DeviceInfoHelper.GetRandomIosDevice();
+                    SetDevInfoByDeviceInfo(randomAppleDeviceInfo);
                 }
                 if (string.IsNullOrEmpty(DeviceConfig.DeviceId) || DeviceConfig.DeviceId == "8525f5d8201f78b5")
                     DeviceConfig.DeviceId = RandomString(16, "0123456789abcdef");

diff --git a/PoGo.NecroBot.Logic/Model/Settings/CatchConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/CatchConfig.cs
@@ -12,13 +12,13 @@ internal static List<PokemonId> PokemonsToIgnoreDefault()
             return new List<PokemonId>
             {
                 //criteria: most common
-                PokemonId.Caterpie,
-                PokemonId.Weedle,
-                PokemonId.Pidgey,
-                PokemonId.Rattata,
-                PokemonId.Spearow,
-                PokemonId.Zubat,
-                PokemonId.Doduo,
+                //PokemonId.Caterpie,
+                //PokemonId.Weedle,
+                //PokemonId.Pidgey,
+                //PokemonId.Rattata,
+                //PokemonId.Spearow,
+                //PokemonId.Zubat,
+                //PokemonId.Doduo,
                 //criteria: regional
                 PokemonId.Tauros,
                 PokemonId.Kangaskhan,

diff --git a/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/HumanWalkSnipeConfig.cs
@@ -80,31 +80,31 @@ public class HumanWalkSnipeConfig
 
         [DefaultValue(true)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate)]
-        public bool UsePokeRadar = true;
+        public bool UsePokeRadar = false;
 
         [DefaultValue(true)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate)]
-        public bool UseSkiplagged = true;
+        public bool UseSkiplagged = false;
 
         [DefaultValue(true)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate)]
-        public bool UsePokecrew = true;
+        public bool UsePokecrew = false;
 
         [DefaultValue(true)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate)]
-        public bool UsePokesnipers = true;
+        public bool UsePokesnipers = false;
 
         [DefaultValue(true)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate)]
-        public bool UsePokeZZ = true;
+        public bool UsePokeZZ = false;
 
         [DefaultValue(true)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate)]
-        public bool UsePokeWatcher = true;
+        public bool UsePokeWatcher = false;
 
         [DefaultValue(true)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate)]
-        public bool UseFastPokemap = true;
+        public bool UseFastPokemap = false;
 
         [DefaultValue(false)]
         [JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate)]

diff --git a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
@@ -335,7 +335,6 @@
     <Compile Include="Tasks\UseLuckyEggConstantlyTask.cs" />
     <Compile Include="Tasks\UseNearbyPokestopsTask.cs" />
     <Compile Include="Utils\DelayingUtils.cs" />
-    <Compile Include="Utils\DeviceInfoHelper.cs" />
     <Compile Include="Utils\EggWalker.cs" />
     <Compile Include="Utils\ErrorHandler.cs" />
     <Compile Include="Utils\GPXReader.cs" />

diff --git a/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs b/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs
@@ -40,6 +40,6 @@
 // [assembly: AssemblyVersion1("0.9.9.5")]
 //
 
-[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyVersion("1.0.0.12")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("v1.0.0.6")]
+[assembly: AssemblyInformationalVersion("v1.0.0.12")]