diff --git a/PokemonGo/RocketAPI/Client.cs b/PokemonGo/RocketAPI/Client.cs index 86f9f81..5d4cc5f 100644 --- a/PokemonGo/RocketAPI/Client.cs +++ b/PokemonGo/RocketAPI/Client.cs @@ -39,9 +39,6 @@ namespace PokemonGo.RocketAPI private Request.Types.UnknownAuth _unknownAuth; public static string AccessToken { get; set; } = string.Empty; - public delegate void ConsoleWriteDelegate(ConsoleColor color, string message); - public static event ConsoleWriteDelegate OnConsoleWrite; - public Client(ISettings settings) { _settings = settings; @@ -63,12 +60,6 @@ namespace PokemonGo.RocketAPI "application/x-www-form-urlencoded"); } - public bool HasServerSet() - { - Console.WriteLine(_apiUrl); - return _apiUrl != null; - } - public async Task<CatchPokemonResponse> CatchPokemon(ulong encounterId, string spawnPointGuid, double pokemonLat, double pokemonLng, MiscEnums.Item pokeball, int? pokemonCP) { @@ -95,26 +86,24 @@ namespace PokemonGo.RocketAPI catchPokemonRequest); } - public async Task DoGoogleLogin() + public async Task DoGoogleLogin(string email, string password) { - GoogleLogin.TokenResponseModel tokenResponse = null; - - if (string.IsNullOrEmpty(_settings.GoogleRefreshToken) && string.IsNullOrEmpty(AccessToken)) + _authType = AuthType.Google; + GPSOAuthClient _GPSOclient = new GPSOAuthClient(email, password); + Dictionary<string, string> _GPSOresponse = _GPSOclient.PerformMasterLogin(); + /* string json = JsonConvert.SerializeObject(_GPSOresponse, Formatting.Indented); + Console.WriteLine(json); */ + if (_GPSOresponse.ContainsKey("Token")) { - var deviceCode = await GoogleLogin.GetDeviceCode(); - tokenResponse = await GoogleLogin.GetAccessToken(deviceCode); - _accessToken = tokenResponse.id_token; - ColoredConsoleWrite(ConsoleColor.White, $"Put RefreshToken in settings for direct login: {tokenResponse.refresh_token}"); - _settings.GoogleRefreshToken = tokenResponse.refresh_token; - AccessToken = tokenResponse.refresh_token; - } - else - { - if (!string.IsNullOrEmpty(_settings.GoogleRefreshToken)) - tokenResponse = await GoogleLogin.GetAccessToken(_settings.GoogleRefreshToken); - else - tokenResponse = await GoogleLogin.GetAccessToken(AccessToken); - _accessToken = tokenResponse.id_token; + string token = _GPSOresponse["Token"]; + Dictionary<string, string> oauthResponse = _GPSOclient.PerformOAuth( + token, + "audience:server:client_id:848232511240-7so421jotr2609rmqakceuu1luuq0ptb.apps.googleusercontent.com", + "com.nianticlabs.pokemongo", + "321187995bc7cdc2b5fc91b11a96e2baa8602c62"); + /* string oauthJson = JsonConvert.SerializeObject(oauthResponse, Formatting.Indented); + Console.WriteLine(oauthJson); */ + _accessToken = oauthResponse["Auth"]; } } @@ -252,7 +241,6 @@ namespace PokemonGo.RocketAPI return MiscEnums.Item.ITEM_MASTER_BALL; } - ColoredConsoleWrite(ConsoleColor.Green, $"Poke Ball is being used"); return MiscEnums.Item.ITEM_POKE_BALL; } @@ -263,11 +251,6 @@ namespace PokemonGo.RocketAPI System.Console.WriteLine("[" + DateTime.Now.ToString("HH:mm:ss tt") + "] " + text); File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory + @"\Logs.txt", "[" + DateTime.Now.ToString("HH:mm:ss tt") + "] " + text + "\n"); System.Console.ForegroundColor = originalColor; - - if (OnConsoleWrite != null) - { - OnConsoleWrite(color, text); - } } public async Task<FortDetailsResponse> GetFort(string fortId, double fortLat, double fortLng) @@ -568,4 +551,4 @@ namespace PokemonGo.RocketAPI useItemRequest); } } -} +} \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Extensions/HttpClientExtensions.cs b/PokemonGo/RocketAPI/Extensions/HttpClientExtensions.cs index e2524e9..e543a7a 100644 --- a/PokemonGo/RocketAPI/Extensions/HttpClientExtensions.cs +++ b/PokemonGo/RocketAPI/Extensions/HttpClientExtensions.cs @@ -44,9 +44,13 @@ namespace PokemonGo.RocketAPI.Extensions do { count++; + ColoredConsoleWrite(ConsoleColor.Red, "ArgumentOutOfRangeException - Restarting"); + ColoredConsoleWrite(ConsoleColor.Red, ($"[DEBUG] [{DateTime.Now.ToString("HH:mm:ss")}] requesting {typeof(TResponsePayload).Name}")); response = await PostProto(client, url, request); waitingForResponse = false; - + + + //Decode payload //todo: multi-payload support @@ -59,24 +63,6 @@ namespace PokemonGo.RocketAPI.Extensions return parsedPayload; } - - - // public static async Task<TResponsePayload> PostProtoPayload<TRequest, TResponsePayload>(this HttpClient client, - // string url, TRequest request) where TRequest : IMessage<TRequest> - // where TResponsePayload : IMessage<TResponsePayload>, new() - // { - //// ColoredConsoleWrite(ConsoleColor.Red, ($"[DEBUG] [{DateTime.Now.ToString("HH:mm:ss")}] requesting {typeof(TResponsePayload).Name}")); - // var response = await PostProto(client, url, request); - - // //Decode payload - // //todo: multi-payload support - // var payload = response.Payload[0]; - // var parsedPayload = new TResponsePayload(); - // parsedPayload.MergeFrom(payload); - - // return parsedPayload; - // } - public static void ColoredConsoleWrite(ConsoleColor color, string text) { ConsoleColor originalColor = System.Console.ForegroundColor; @@ -86,4 +72,4 @@ namespace PokemonGo.RocketAPI.Extensions } } -} +} \ No newline at end of file diff --git a/PokemonGo/RocketAPI/GeneratedCode/Payloads.cs b/PokemonGo/RocketAPI/GeneratedCode/Payloads.cs index 7cdf606..589c206 100644 --- a/PokemonGo/RocketAPI/GeneratedCode/Payloads.cs +++ b/PokemonGo/RocketAPI/GeneratedCode/Payloads.cs @@ -495,7 +495,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode "dEFQSS5HZW5lcmF0ZWRDb2RlLlBva2Vtb24SEgoKRXhwQXdhcmRlZBgDIAEo", "BRIUCgxDYW5keUF3YXJkZWQYBCABKAViBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] {global::AllEnum.AllEnumReflection.Descriptor,}, + new pbr::FileDescriptor[] { global::AllEnum.AllEnumReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::PokemonGo.RocketAPI.GeneratedCode.GetPlayerResponse), @@ -1135,19 +1135,19 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Unknown1 = input.ReadInt32(); - break; - } + { + Unknown1 = input.ReadInt32(); + break; + } case 18: - { - if (profile_ == null) { - profile_ = new global::PokemonGo.RocketAPI.GeneratedCode.Profile(); + if (profile_ == null) + { + profile_ = new global::PokemonGo.RocketAPI.GeneratedCode.Profile(); + } + input.ReadMessage(profile_); + break; } - input.ReadMessage(profile_); - break; - } } } } @@ -1373,7 +1373,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Team != 0) { output.WriteRawTag(40); - output.WriteEnum((int) Team); + output.WriteEnum((int)Team); } if (Tutorial.Length != 0) { @@ -1426,7 +1426,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Team != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Team); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Team); } if (Tutorial.Length != 0) { @@ -1528,68 +1528,68 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - CreationTime = input.ReadInt64(); - break; - } + { + CreationTime = input.ReadInt64(); + break; + } case 18: - { - Username = input.ReadString(); - break; - } + { + Username = input.ReadString(); + break; + } case 40: - { - team_ = (global::AllEnum.TeamColor) input.ReadEnum(); - break; - } + { + team_ = (global::AllEnum.TeamColor)input.ReadEnum(); + break; + } case 58: - { - Tutorial = input.ReadBytes(); - break; - } + { + Tutorial = input.ReadBytes(); + break; + } case 66: - { - if (avatar_ == null) { - avatar_ = new global::PokemonGo.RocketAPI.GeneratedCode.AvatarDetails(); + if (avatar_ == null) + { + avatar_ = new global::PokemonGo.RocketAPI.GeneratedCode.AvatarDetails(); + } + input.ReadMessage(avatar_); + break; } - input.ReadMessage(avatar_); - break; - } case 72: - { - PokeStorage = input.ReadInt32(); - break; - } + { + PokeStorage = input.ReadInt32(); + break; + } case 80: - { - ItemStorage = input.ReadInt32(); - break; - } + { + ItemStorage = input.ReadInt32(); + break; + } case 90: - { - if (dailyBonus_ == null) { - dailyBonus_ = new global::PokemonGo.RocketAPI.GeneratedCode.DailyBonus(); + if (dailyBonus_ == null) + { + dailyBonus_ = new global::PokemonGo.RocketAPI.GeneratedCode.DailyBonus(); + } + input.ReadMessage(dailyBonus_); + break; } - input.ReadMessage(dailyBonus_); - break; - } case 98: - { - Unknown12 = input.ReadBytes(); - break; - } + { + Unknown12 = input.ReadBytes(); + break; + } case 106: - { - Unknown13 = input.ReadBytes(); - break; - } + { + Unknown13 = input.ReadBytes(); + break; + } case 114: - { - currency_.AddEntriesFrom(input, _repeated_currency_codec); - break; - } + { + currency_.AddEntriesFrom(input, _repeated_currency_codec); + break; + } } } } @@ -1752,15 +1752,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - NextCollectTimestampMs = input.ReadInt64(); - break; - } + { + NextCollectTimestampMs = input.ReadInt64(); + break; + } case 16: - { - NextDefenderBonusCollectTimestampMs = input.ReadInt64(); - break; - } + { + NextDefenderBonusCollectTimestampMs = input.ReadInt64(); + break; + } } } } @@ -1914,15 +1914,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - Type = input.ReadString(); - break; - } + { + Type = input.ReadString(); + break; + } case 16: - { - Amount = input.ReadInt32(); - break; - } + { + Amount = input.ReadInt32(); + break; + } } } } @@ -2126,25 +2126,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 16: - { - Unknown2 = input.ReadInt32(); - break; - } + { + Unknown2 = input.ReadInt32(); + break; + } case 24: - { - Unknown3 = input.ReadInt32(); - break; - } + { + Unknown3 = input.ReadInt32(); + break; + } case 72: - { - Unknown9 = input.ReadInt32(); - break; - } + { + Unknown9 = input.ReadInt32(); + break; + } case 80: - { - Unknown10 = input.ReadInt32(); - break; - } + { + Unknown10 = input.ReadInt32(); + break; + } } } } @@ -2275,10 +2275,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - Hash = input.ReadString(); - break; - } + { + Hash = input.ReadString(); + break; + } } } } @@ -2435,19 +2435,19 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Success = input.ReadBool(); - break; - } + { + Success = input.ReadBool(); + break; + } case 18: - { - if (inventoryDelta_ == null) { - inventoryDelta_ = new global::PokemonGo.RocketAPI.GeneratedCode.InventoryDelta(); + if (inventoryDelta_ == null) + { + inventoryDelta_ = new global::PokemonGo.RocketAPI.GeneratedCode.InventoryDelta(); + } + input.ReadMessage(inventoryDelta_); + break; } - input.ReadMessage(inventoryDelta_); - break; - } } } } @@ -2621,20 +2621,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - OriginalTimestampMs = input.ReadInt64(); - break; - } + { + OriginalTimestampMs = input.ReadInt64(); + break; + } case 16: - { - NewTimestampMs = input.ReadInt64(); - break; - } + { + NewTimestampMs = input.ReadInt64(); + break; + } case 26: - { - inventoryItems_.AddEntriesFrom(input, _repeated_inventoryItems_codec); - break; - } + { + inventoryItems_.AddEntriesFrom(input, _repeated_inventoryItems_codec); + break; + } } } } @@ -2818,24 +2818,24 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - ModifiedTimestampMs = input.ReadInt64(); - break; - } + { + ModifiedTimestampMs = input.ReadInt64(); + break; + } case 16: - { - DeletedItemKey = input.ReadInt64(); - break; - } + { + DeletedItemKey = input.ReadInt64(); + break; + } case 26: - { - if (inventoryItemData_ == null) { - inventoryItemData_ = new global::PokemonGo.RocketAPI.GeneratedCode.InventoryItemData(); + if (inventoryItemData_ == null) + { + inventoryItemData_ = new global::PokemonGo.RocketAPI.GeneratedCode.InventoryItemData(); + } + input.ReadMessage(inventoryItemData_); + break; } - input.ReadMessage(inventoryItemData_); - break; - } } } } @@ -3391,95 +3391,95 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - if (pokemon_ == null) { - pokemon_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + if (pokemon_ == null) + { + pokemon_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + } + input.ReadMessage(pokemon_); + break; } - input.ReadMessage(pokemon_); - break; - } case 18: - { - if (item_ == null) { - item_ = new global::PokemonGo.RocketAPI.GeneratedCode.Item(); + if (item_ == null) + { + item_ = new global::PokemonGo.RocketAPI.GeneratedCode.Item(); + } + input.ReadMessage(item_); + break; } - input.ReadMessage(item_); - break; - } case 26: - { - if (pokedexEntry_ == null) { - pokedexEntry_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokedexEntry(); + if (pokedexEntry_ == null) + { + pokedexEntry_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokedexEntry(); + } + input.ReadMessage(pokedexEntry_); + break; } - input.ReadMessage(pokedexEntry_); - break; - } case 34: - { - if (playerStats_ == null) { - playerStats_ = new global::PokemonGo.RocketAPI.GeneratedCode.PlayerStats(); + if (playerStats_ == null) + { + playerStats_ = new global::PokemonGo.RocketAPI.GeneratedCode.PlayerStats(); + } + input.ReadMessage(playerStats_); + break; } - input.ReadMessage(playerStats_); - break; - } case 42: - { - if (playerCurrency_ == null) { - playerCurrency_ = new global::PokemonGo.RocketAPI.GeneratedCode.PlayerCurrency(); + if (playerCurrency_ == null) + { + playerCurrency_ = new global::PokemonGo.RocketAPI.GeneratedCode.PlayerCurrency(); + } + input.ReadMessage(playerCurrency_); + break; } - input.ReadMessage(playerCurrency_); - break; - } case 50: - { - if (playerCamera_ == null) { - playerCamera_ = new global::PokemonGo.RocketAPI.GeneratedCode.PlayerCamera(); + if (playerCamera_ == null) + { + playerCamera_ = new global::PokemonGo.RocketAPI.GeneratedCode.PlayerCamera(); + } + input.ReadMessage(playerCamera_); + break; } - input.ReadMessage(playerCamera_); - break; - } case 58: - { - if (inventoryUpgrades_ == null) { - inventoryUpgrades_ = new global::PokemonGo.RocketAPI.GeneratedCode.InventoryUpgrades(); + if (inventoryUpgrades_ == null) + { + inventoryUpgrades_ = new global::PokemonGo.RocketAPI.GeneratedCode.InventoryUpgrades(); + } + input.ReadMessage(inventoryUpgrades_); + break; } - input.ReadMessage(inventoryUpgrades_); - break; - } case 66: - { - if (appliedItems_ == null) { - appliedItems_ = new global::PokemonGo.RocketAPI.GeneratedCode.AppliedItems(); + if (appliedItems_ == null) + { + appliedItems_ = new global::PokemonGo.RocketAPI.GeneratedCode.AppliedItems(); + } + input.ReadMessage(appliedItems_); + break; } - input.ReadMessage(appliedItems_); - break; - } case 74: - { - if (eggIncubators_ == null) { - eggIncubators_ = new global::PokemonGo.RocketAPI.GeneratedCode.EggIncubators(); + if (eggIncubators_ == null) + { + eggIncubators_ = new global::PokemonGo.RocketAPI.GeneratedCode.EggIncubators(); + } + input.ReadMessage(eggIncubators_); + break; } - input.ReadMessage(eggIncubators_); - break; - } case 82: - { - if (pokemonFamily_ == null) { - pokemonFamily_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonFamily(); + if (pokemonFamily_ == null) + { + pokemonFamily_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonFamily(); + } + input.ReadMessage(pokemonFamily_); + break; } - input.ReadMessage(pokemonFamily_); - break; - } } } } @@ -3930,7 +3930,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (PokemonType != 0) { output.WriteRawTag(16); - output.WriteEnum((int) PokemonType); + output.WriteEnum((int)PokemonType); } if (Cp != 0) { @@ -3950,12 +3950,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Move1 != 0) { output.WriteRawTag(48); - output.WriteEnum((int) Move1); + output.WriteEnum((int)Move1); } if (Move2 != 0) { output.WriteRawTag(56); - output.WriteEnum((int) Move2); + output.WriteEnum((int)Move2); } if (DeployedFortId != 0) { @@ -4083,7 +4083,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (PokemonType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) PokemonType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)PokemonType); } if (Cp != 0) { @@ -4099,11 +4099,11 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Move1 != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Move1); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Move1); } if (Move2 != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Move2); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Move2); } if (DeployedFortId != 0) { @@ -4339,155 +4339,155 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Id = input.ReadInt32(); - break; - } + { + Id = input.ReadInt32(); + break; + } case 16: - { - pokemonType_ = (global::AllEnum.PokemonId) input.ReadEnum(); - break; - } + { + pokemonType_ = (global::AllEnum.PokemonId)input.ReadEnum(); + break; + } case 24: - { - Cp = input.ReadInt32(); - break; - } - case 32: - { - Stamina = input.ReadInt32(); - break; - } + { + Cp = input.ReadInt32(); + break; + } + case 32: + { + Stamina = input.ReadInt32(); + break; + } case 40: - { - StaminaMax = input.ReadInt32(); - break; - } + { + StaminaMax = input.ReadInt32(); + break; + } case 48: - { - move1_ = (global::AllEnum.PokemonMove) input.ReadEnum(); - break; - } + { + move1_ = (global::AllEnum.PokemonMove)input.ReadEnum(); + break; + } case 56: - { - move2_ = (global::AllEnum.PokemonMove) input.ReadEnum(); - break; - } + { + move2_ = (global::AllEnum.PokemonMove)input.ReadEnum(); + break; + } case 64: - { - DeployedFortId = input.ReadInt32(); - break; - } + { + DeployedFortId = input.ReadInt32(); + break; + } case 74: - { - OwnerName = input.ReadString(); - break; - } + { + OwnerName = input.ReadString(); + break; + } case 80: - { - IsEgg = input.ReadBool(); - break; - } + { + IsEgg = input.ReadBool(); + break; + } case 88: - { - EggKmWalkedTarget = input.ReadInt32(); - break; - } + { + EggKmWalkedTarget = input.ReadInt32(); + break; + } case 96: - { - EggKmWalkedStart = input.ReadInt32(); - break; - } + { + EggKmWalkedStart = input.ReadInt32(); + break; + } case 112: - { - Origin = input.ReadInt32(); - break; - } + { + Origin = input.ReadInt32(); + break; + } case 125: - { - HeightM = input.ReadFloat(); - break; - } + { + HeightM = input.ReadFloat(); + break; + } case 133: - { - WeightKg = input.ReadFloat(); - break; - } + { + WeightKg = input.ReadFloat(); + break; + } case 136: - { - IndividualAttack = input.ReadInt32(); - break; - } + { + IndividualAttack = input.ReadInt32(); + break; + } case 144: - { - IndividualDefense = input.ReadInt32(); - break; - } + { + IndividualDefense = input.ReadInt32(); + break; + } case 152: - { - IndividualStamina = input.ReadInt32(); - break; - } + { + IndividualStamina = input.ReadInt32(); + break; + } case 160: - { - CpMultiplier = input.ReadInt32(); - break; - } + { + CpMultiplier = input.ReadInt32(); + break; + } case 168: - { - Pokeball = input.ReadInt32(); - break; - } + { + Pokeball = input.ReadInt32(); + break; + } case 176: - { - CapturedCellId = input.ReadUInt64(); - break; - } + { + CapturedCellId = input.ReadUInt64(); + break; + } case 184: - { - BattlesAttacked = input.ReadInt32(); - break; - } + { + BattlesAttacked = input.ReadInt32(); + break; + } case 192: - { - BattlesDefended = input.ReadInt32(); - break; - } + { + BattlesDefended = input.ReadInt32(); + break; + } case 200: - { - EggIncubatorId = input.ReadInt32(); - break; - } + { + EggIncubatorId = input.ReadInt32(); + break; + } case 208: - { - CreationTimeMs = input.ReadUInt64(); - break; - } + { + CreationTimeMs = input.ReadUInt64(); + break; + } case 216: - { - NumUpgrades = input.ReadInt32(); - break; - } + { + NumUpgrades = input.ReadInt32(); + break; + } case 224: - { - AdditionalCpMultiplier = input.ReadInt32(); - break; - } + { + AdditionalCpMultiplier = input.ReadInt32(); + break; + } case 232: - { - Favorite = input.ReadInt32(); - break; - } + { + Favorite = input.ReadInt32(); + break; + } case 242: - { - Nickname = input.ReadString(); - break; - } + { + Nickname = input.ReadString(); + break; + } case 248: - { - FromFort = input.ReadInt32(); - break; - } + { + FromFort = input.ReadInt32(); + break; + } } } } @@ -4629,7 +4629,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Item_ != 0) { output.WriteRawTag(8); - output.WriteEnum((int) Item_); + output.WriteEnum((int)Item_); } if (Count != 0) { @@ -4648,7 +4648,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (Item_ != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Item_); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Item_); } if (Count != 0) { @@ -4692,20 +4692,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - item_ = (global::AllEnum.ItemType) input.ReadEnum(); - break; - } + { + item_ = (global::AllEnum.ItemType)input.ReadEnum(); + break; + } case 16: - { - Count = input.ReadInt32(); - break; - } + { + Count = input.ReadInt32(); + break; + } case 24: - { - Unseen = input.ReadBool(); - break; - } + { + Unseen = input.ReadBool(); + break; + } } } } @@ -4935,30 +4935,30 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - PokedexEntryNumber = input.ReadInt32(); - break; - } + { + PokedexEntryNumber = input.ReadInt32(); + break; + } case 16: - { - TimesEncountered = input.ReadInt32(); - break; - } + { + TimesEncountered = input.ReadInt32(); + break; + } case 24: - { - TimesCaptured = input.ReadInt32(); - break; - } + { + TimesCaptured = input.ReadInt32(); + break; + } case 32: - { - EvolutionStonePieces = input.ReadInt32(); - break; - } + { + EvolutionStonePieces = input.ReadInt32(); + break; + } case 40: - { - EvolutionStones = input.ReadInt32(); - break; - } + { + EvolutionStones = input.ReadInt32(); + break; + } } } } @@ -5643,120 +5643,120 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Level = input.ReadInt32(); - break; - } + { + Level = input.ReadInt32(); + break; + } case 16: - { - Experience = input.ReadInt64(); - break; - } + { + Experience = input.ReadInt64(); + break; + } case 24: - { - PrevLevelXp = input.ReadInt64(); - break; - } + { + PrevLevelXp = input.ReadInt64(); + break; + } case 32: - { - NextLevelXp = input.ReadInt64(); - break; - } + { + NextLevelXp = input.ReadInt64(); + break; + } case 45: - { - KmWalked = input.ReadFloat(); - break; - } + { + KmWalked = input.ReadFloat(); + break; + } case 48: - { - PokemonsEncountered = input.ReadInt32(); - break; - } + { + PokemonsEncountered = input.ReadInt32(); + break; + } case 56: - { - UniquePokedexEntries = input.ReadInt32(); - break; - } + { + UniquePokedexEntries = input.ReadInt32(); + break; + } case 64: - { - PokemonsCaptured = input.ReadInt32(); - break; - } + { + PokemonsCaptured = input.ReadInt32(); + break; + } case 72: - { - Evolutions = input.ReadInt32(); - break; - } + { + Evolutions = input.ReadInt32(); + break; + } case 80: - { - PokeStopVisits = input.ReadInt32(); - break; - } + { + PokeStopVisits = input.ReadInt32(); + break; + } case 88: - { - PokeballsThrown = input.ReadInt32(); - break; - } + { + PokeballsThrown = input.ReadInt32(); + break; + } case 96: - { - EggsHatched = input.ReadInt32(); - break; - } + { + EggsHatched = input.ReadInt32(); + break; + } case 104: - { - BigMagikarpCaught = input.ReadInt32(); - break; - } + { + BigMagikarpCaught = input.ReadInt32(); + break; + } case 112: - { - BattleAttackWon = input.ReadInt32(); - break; - } + { + BattleAttackWon = input.ReadInt32(); + break; + } case 120: - { - BattleAttackTotal = input.ReadInt32(); - break; - } + { + BattleAttackTotal = input.ReadInt32(); + break; + } case 128: - { - BattleDefendedWon = input.ReadInt32(); - break; - } + { + BattleDefendedWon = input.ReadInt32(); + break; + } case 136: - { - BattleTrainingWon = input.ReadInt32(); - break; - } + { + BattleTrainingWon = input.ReadInt32(); + break; + } case 144: - { - BattleTrainingTotal = input.ReadInt32(); - break; - } + { + BattleTrainingTotal = input.ReadInt32(); + break; + } case 152: - { - PrestigeRaisedTotal = input.ReadInt32(); - break; - } + { + PrestigeRaisedTotal = input.ReadInt32(); + break; + } case 160: - { - PrestigeDroppedTotal = input.ReadInt32(); - break; - } + { + PrestigeDroppedTotal = input.ReadInt32(); + break; + } case 168: - { - PokemonDeployed = input.ReadInt32(); - break; - } + { + PokemonDeployed = input.ReadInt32(); + break; + } case 178: - { - PokemonCaughtByType = input.ReadBytes(); - break; - } + { + PokemonCaughtByType = input.ReadBytes(); + break; + } case 184: - { - SmallRattataCaught = input.ReadInt32(); - break; - } + { + SmallRattataCaught = input.ReadInt32(); + break; + } } } } @@ -5906,10 +5906,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Gems = input.ReadInt32(); - break; - } + { + Gems = input.ReadInt32(); + break; + } } } } @@ -6037,10 +6037,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - IsDefaultCamera = input.ReadBool(); - break; - } + { + IsDefaultCamera = input.ReadBool(); + break; + } } } } @@ -6162,10 +6162,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - inventoryUpgrades_.AddEntriesFrom(input, _repeated_inventoryUpgrades_codec); - break; - } + { + inventoryUpgrades_.AddEntriesFrom(input, _repeated_inventoryUpgrades_codec); + break; + } } } } @@ -6280,12 +6280,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Item != 0) { output.WriteRawTag(8); - output.WriteEnum((int) Item); + output.WriteEnum((int)Item); } if (UpgradeType != 0) { output.WriteRawTag(16); - output.WriteEnum((int) UpgradeType); + output.WriteEnum((int)UpgradeType); } if (AdditionalStorage != 0) { @@ -6299,11 +6299,11 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (Item != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Item); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Item); } if (UpgradeType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) UpgradeType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)UpgradeType); } if (AdditionalStorage != 0) { @@ -6343,20 +6343,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - item_ = (global::AllEnum.ItemType) input.ReadEnum(); - break; - } + { + item_ = (global::AllEnum.ItemType)input.ReadEnum(); + break; + } case 16: - { - upgradeType_ = (global::AllEnum.InventoryUpgradeType) input.ReadEnum(); - break; - } + { + upgradeType_ = (global::AllEnum.InventoryUpgradeType)input.ReadEnum(); + break; + } case 24: - { - AdditionalStorage = input.ReadInt32(); - break; - } + { + AdditionalStorage = input.ReadInt32(); + break; + } } } } @@ -6490,14 +6490,14 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 34: - { - if (item_ == null) { - item_ = new global::PokemonGo.RocketAPI.GeneratedCode.AppliedItem(); + if (item_ == null) + { + item_ = new global::PokemonGo.RocketAPI.GeneratedCode.AppliedItem(); + } + input.ReadMessage(item_); + break; } - input.ReadMessage(item_); - break; - } } } } @@ -6624,12 +6624,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ItemType != 0) { output.WriteRawTag(8); - output.WriteEnum((int) ItemType); + output.WriteEnum((int)ItemType); } if (ItemTypeCategory != 0) { output.WriteRawTag(16); - output.WriteEnum((int) ItemTypeCategory); + output.WriteEnum((int)ItemTypeCategory); } if (ExpireMs != 0L) { @@ -6648,11 +6648,11 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (ItemType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemType); } if (ItemTypeCategory != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemTypeCategory); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemTypeCategory); } if (ExpireMs != 0L) { @@ -6700,25 +6700,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - itemType_ = (global::AllEnum.ItemId) input.ReadEnum(); - break; - } + { + itemType_ = (global::AllEnum.ItemId)input.ReadEnum(); + break; + } case 16: - { - itemTypeCategory_ = (global::AllEnum.ItemType) input.ReadEnum(); - break; - } + { + itemTypeCategory_ = (global::AllEnum.ItemType)input.ReadEnum(); + break; + } case 24: - { - ExpireMs = input.ReadInt64(); - break; - } + { + ExpireMs = input.ReadInt64(); + break; + } case 32: - { - AppliedMs = input.ReadInt64(); - break; - } + { + AppliedMs = input.ReadInt64(); + break; + } } } } @@ -6853,14 +6853,14 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - if (eggIncubator_ == null) { - eggIncubator_ = new global::PokemonGo.RocketAPI.GeneratedCode.EggIncubator(); + if (eggIncubator_ == null) + { + eggIncubator_ = new global::PokemonGo.RocketAPI.GeneratedCode.EggIncubator(); + } + input.ReadMessage(eggIncubator_); + break; } - input.ReadMessage(eggIncubator_); - break; - } } } } @@ -7031,12 +7031,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ItemType != 0) { output.WriteRawTag(16); - output.WriteEnum((int) ItemType); + output.WriteEnum((int)ItemType); } if (IncubatorType != 0) { output.WriteRawTag(24); - output.WriteEnum((int) IncubatorType); + output.WriteEnum((int)IncubatorType); } if (UsesRemaining != 0) { @@ -7069,11 +7069,11 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (ItemType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemType); } if (IncubatorType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) IncubatorType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)IncubatorType); } if (UsesRemaining != 0) { @@ -7141,40 +7141,40 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - ItemId = input.ReadString(); - break; - } + { + ItemId = input.ReadString(); + break; + } case 16: - { - itemType_ = (global::AllEnum.ItemType) input.ReadEnum(); - break; - } + { + itemType_ = (global::AllEnum.ItemType)input.ReadEnum(); + break; + } case 24: - { - incubatorType_ = (global::AllEnum.EggIncubatorType) input.ReadEnum(); - break; - } + { + incubatorType_ = (global::AllEnum.EggIncubatorType)input.ReadEnum(); + break; + } case 32: - { - UsesRemaining = input.ReadInt32(); - break; - } + { + UsesRemaining = input.ReadInt32(); + break; + } case 40: - { - PokemonId = input.ReadInt64(); - break; - } + { + PokemonId = input.ReadInt64(); + break; + } case 49: - { - StartKmWalked = input.ReadDouble(); - break; - } + { + StartKmWalked = input.ReadDouble(); + break; + } case 57: - { - TargetKmWalked = input.ReadDouble(); - break; - } + { + TargetKmWalked = input.ReadDouble(); + break; + } } } } @@ -7283,7 +7283,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (FamilyId != 0) { output.WriteRawTag(8); - output.WriteEnum((int) FamilyId); + output.WriteEnum((int)FamilyId); } if (Candy != 0) { @@ -7297,7 +7297,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (FamilyId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) FamilyId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)FamilyId); } if (Candy != 0) { @@ -7333,15 +7333,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - familyId_ = (global::AllEnum.PokemonFamilyId) input.ReadEnum(); - break; - } + { + familyId_ = (global::AllEnum.PokemonFamilyId)input.ReadEnum(); + break; + } case 16: - { - Candy = input.ReadInt32(); - break; - } + { + Candy = input.ReadInt32(); + break; + } } } } @@ -7545,25 +7545,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - CellId = input.ReadBytes(); - break; - } + { + CellId = input.ReadBytes(); + break; + } case 18: - { - SinceTimestampMs = input.ReadBytes(); - break; - } + { + SinceTimestampMs = input.ReadBytes(); + break; + } case 25: - { - Latitude = input.ReadDouble(); - break; - } + { + Latitude = input.ReadDouble(); + break; + } case 33: - { - Longitude = input.ReadDouble(); - break; - } + { + Longitude = input.ReadDouble(); + break; + } } } } @@ -7675,7 +7675,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Status != 0) { output.WriteRawTag(16); - output.WriteEnum((int) Status); + output.WriteEnum((int)Status); } } @@ -7685,7 +7685,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode size += mapCells_.CalculateSize(_repeated_mapCells_codec); if (Status != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Status); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Status); } return size; } @@ -7714,16 +7714,16 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - mapCells_.AddEntriesFrom(input, _repeated_mapCells_codec); - break; - } + { + mapCells_.AddEntriesFrom(input, _repeated_mapCells_codec); + break; + } case 16: - { - status_ = (global::AllEnum.MapObjectsStatus) input.ReadEnum(); - break; - } - } + { + status_ = (global::AllEnum.MapObjectsStatus)input.ReadEnum(); + break; + } + } } } @@ -8070,60 +8070,60 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - S2CellId = input.ReadUInt64(); - break; - } + { + S2CellId = input.ReadUInt64(); + break; + } case 16: - { - CurrentTimestampMs = input.ReadInt64(); - break; - } + { + CurrentTimestampMs = input.ReadInt64(); + break; + } case 26: - { - forts_.AddEntriesFrom(input, _repeated_forts_codec); - break; - } + { + forts_.AddEntriesFrom(input, _repeated_forts_codec); + break; + } case 34: - { - spawnPoints_.AddEntriesFrom(input, _repeated_spawnPoints_codec); - break; - } + { + spawnPoints_.AddEntriesFrom(input, _repeated_spawnPoints_codec); + break; + } case 42: - { - wildPokemons_.AddEntriesFrom(input, _repeated_wildPokemons_codec); - break; - } + { + wildPokemons_.AddEntriesFrom(input, _repeated_wildPokemons_codec); + break; + } case 50: - { - deletedObjects_.AddEntriesFrom(input, _repeated_deletedObjects_codec); - break; - } + { + deletedObjects_.AddEntriesFrom(input, _repeated_deletedObjects_codec); + break; + } case 56: - { - IsTruncatedList = input.ReadBool(); - break; - } + { + IsTruncatedList = input.ReadBool(); + break; + } case 66: - { - fortSummaries_.AddEntriesFrom(input, _repeated_fortSummaries_codec); - break; - } + { + fortSummaries_.AddEntriesFrom(input, _repeated_fortSummaries_codec); + break; + } case 74: - { - decimatedSpawnPoints_.AddEntriesFrom(input, _repeated_decimatedSpawnPoints_codec); - break; - } + { + decimatedSpawnPoints_.AddEntriesFrom(input, _repeated_decimatedSpawnPoints_codec); + break; + } case 82: - { - catchablePokemons_.AddEntriesFrom(input, _repeated_catchablePokemons_codec); - break; - } + { + catchablePokemons_.AddEntriesFrom(input, _repeated_catchablePokemons_codec); + break; + } case 90: - { - nearbyPokemons_.AddEntriesFrom(input, _repeated_nearbyPokemons_codec); - break; - } + { + nearbyPokemons_.AddEntriesFrom(input, _repeated_nearbyPokemons_codec); + break; + } } } } @@ -8442,12 +8442,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (OwnedByTeam != 0) { output.WriteRawTag(40); - output.WriteEnum((int) OwnedByTeam); + output.WriteEnum((int)OwnedByTeam); } if (GuardPokemonId != 0) { output.WriteRawTag(48); - output.WriteEnum((int) GuardPokemonId); + output.WriteEnum((int)GuardPokemonId); } if (GuardPokemonCp != 0) { @@ -8462,7 +8462,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Type != 0) { output.WriteRawTag(72); - output.WriteEnum((int) Type); + output.WriteEnum((int)Type); } if (GymPoints != 0L) { @@ -8492,12 +8492,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Sponsor != 0) { output.WriteRawTag(120); - output.WriteEnum((int) Sponsor); + output.WriteEnum((int)Sponsor); } if (RenderingType != 0) { output.WriteRawTag(128, 1); - output.WriteEnum((int) RenderingType); + output.WriteEnum((int)RenderingType); } } @@ -8526,15 +8526,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Type != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type); } if (OwnedByTeam != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) OwnedByTeam); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)OwnedByTeam); } if (GuardPokemonId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) GuardPokemonId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)GuardPokemonId); } if (GuardPokemonCp != 0) { @@ -8554,11 +8554,11 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Sponsor != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Sponsor); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Sponsor); } if (RenderingType != 0) { - size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) RenderingType); + size += 2 + pb::CodedOutputStream.ComputeEnumSize((int)RenderingType); } if (ActiveFortModifier.Length != 0) { @@ -8658,89 +8658,89 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - Id = input.ReadString(); - break; - } + { + Id = input.ReadString(); + break; + } case 16: - { - LastModifiedTimestampMs = input.ReadInt64(); - break; - } + { + LastModifiedTimestampMs = input.ReadInt64(); + break; + } case 25: - { - Latitude = input.ReadDouble(); - break; - } + { + Latitude = input.ReadDouble(); + break; + } case 33: - { - Longitude = input.ReadDouble(); - break; - } + { + Longitude = input.ReadDouble(); + break; + } case 40: - { - ownedByTeam_ = (global::AllEnum.TeamColor) input.ReadEnum(); - break; - } + { + ownedByTeam_ = (global::AllEnum.TeamColor)input.ReadEnum(); + break; + } case 48: - { - guardPokemonId_ = (global::AllEnum.PokemonId) input.ReadEnum(); - break; - } + { + guardPokemonId_ = (global::AllEnum.PokemonId)input.ReadEnum(); + break; + } case 56: - { - GuardPokemonCp = input.ReadInt32(); - break; - } + { + GuardPokemonCp = input.ReadInt32(); + break; + } case 64: - { - Enabled = input.ReadBool(); - break; - } + { + Enabled = input.ReadBool(); + break; + } case 72: - { - type_ = (global::AllEnum.FortType) input.ReadEnum(); - break; - } + { + type_ = (global::AllEnum.FortType)input.ReadEnum(); + break; + } case 80: - { - GymPoints = input.ReadInt64(); - break; - } + { + GymPoints = input.ReadInt64(); + break; + } case 88: - { - IsInBattle = input.ReadBool(); - break; - } + { + IsInBattle = input.ReadBool(); + break; + } case 98: - { - ActiveFortModifier = input.ReadBytes(); - break; - } + { + ActiveFortModifier = input.ReadBytes(); + break; + } case 106: - { - if (lureInfo_ == null) { - lureInfo_ = new global::PokemonGo.RocketAPI.GeneratedCode.FortLureInfo(); + if (lureInfo_ == null) + { + lureInfo_ = new global::PokemonGo.RocketAPI.GeneratedCode.FortLureInfo(); + } + input.ReadMessage(lureInfo_); + break; } - input.ReadMessage(lureInfo_); - break; - } case 112: - { - CooldownCompleteTimestampMs = input.ReadInt64(); - break; - } + { + CooldownCompleteTimestampMs = input.ReadInt64(); + break; + } case 120: - { - sponsor_ = (global::AllEnum.FortSponsor) input.ReadEnum(); - break; - } + { + sponsor_ = (global::AllEnum.FortSponsor)input.ReadEnum(); + break; + } case 128: - { - renderingType_ = (global::AllEnum.FortRenderingType) input.ReadEnum(); - break; - } + { + renderingType_ = (global::AllEnum.FortRenderingType)input.ReadEnum(); + break; + } } } } @@ -8892,7 +8892,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ActivePokemonId != 0) { output.WriteRawTag(24); - output.WriteEnum((int) ActivePokemonId); + output.WriteEnum((int)ActivePokemonId); } if (LureExpiresTimestampMs != 0L) { @@ -8914,7 +8914,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (ActivePokemonId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ActivePokemonId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ActivePokemonId); } if (LureExpiresTimestampMs != 0L) { @@ -8958,25 +8958,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - FortId = input.ReadString(); - break; - } + { + FortId = input.ReadString(); + break; + } case 17: - { - Unknown2 = input.ReadDouble(); - break; - } + { + Unknown2 = input.ReadDouble(); + break; + } case 24: - { - activePokemonId_ = (global::AllEnum.PokemonId) input.ReadEnum(); - break; - } + { + activePokemonId_ = (global::AllEnum.PokemonId)input.ReadEnum(); + break; + } case 32: - { - LureExpiresTimestampMs = input.ReadInt64(); - break; - } + { + LureExpiresTimestampMs = input.ReadInt64(); + break; + } } } } @@ -9132,15 +9132,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 17: - { - Latitude = input.ReadDouble(); - break; - } + { + Latitude = input.ReadDouble(); + break; + } case 25: - { - Longitude = input.ReadDouble(); - break; - } + { + Longitude = input.ReadDouble(); + break; + } } } } @@ -9344,25 +9344,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - FortSummaryId = input.ReadInt32(); - break; - } + { + FortSummaryId = input.ReadInt32(); + break; + } case 16: - { - LastModifiedTimestampMs = input.ReadInt32(); - break; - } + { + LastModifiedTimestampMs = input.ReadInt32(); + break; + } case 24: - { - Latitude = input.ReadInt32(); - break; - } + { + Latitude = input.ReadInt32(); + break; + } case 32: - { - Longitude = input.ReadInt32(); - break; - } + { + Longitude = input.ReadInt32(); + break; + } } } } @@ -9647,44 +9647,44 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - EncounterId = input.ReadFixed64(); - break; - } + { + EncounterId = input.ReadFixed64(); + break; + } case 16: - { - LastModifiedTimestampMs = input.ReadInt64(); - break; - } + { + LastModifiedTimestampMs = input.ReadInt64(); + break; + } case 25: - { - Latitude = input.ReadDouble(); - break; - } + { + Latitude = input.ReadDouble(); + break; + } case 33: - { - Longitude = input.ReadDouble(); - break; - } + { + Longitude = input.ReadDouble(); + break; + } case 42: - { - SpawnpointId = input.ReadString(); - break; - } - case 58: - { - if (pokemonData_ == null) { - pokemonData_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + SpawnpointId = input.ReadString(); + break; + } + case 58: + { + if (pokemonData_ == null) + { + pokemonData_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + } + input.ReadMessage(pokemonData_); + break; } - input.ReadMessage(pokemonData_); - break; - } case 88: - { - TimeTillHiddenMs = input.ReadInt32(); - break; - } + { + TimeTillHiddenMs = input.ReadInt32(); + break; + } } } } @@ -10139,7 +10139,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (PokemonId != 0) { output.WriteRawTag(16); - output.WriteEnum((int) PokemonId); + output.WriteEnum((int)PokemonId); } if (Cp != 0) { @@ -10159,12 +10159,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Move1 != 0) { output.WriteRawTag(48); - output.WriteEnum((int) Move1); + output.WriteEnum((int)Move1); } if (Move2 != 0) { output.WriteRawTag(56); - output.WriteEnum((int) Move2); + output.WriteEnum((int)Move2); } if (DeployedFortId != 0) { @@ -10292,7 +10292,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (PokemonId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) PokemonId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)PokemonId); } if (Cp != 0) { @@ -10308,11 +10308,11 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Move1 != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Move1); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Move1); } if (Move2 != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Move2); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Move2); } if (DeployedFortId != 0) { @@ -10548,155 +10548,155 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - Id = input.ReadFixed64(); - break; - } + { + Id = input.ReadFixed64(); + break; + } case 16: - { - pokemonId_ = (global::AllEnum.PokemonId) input.ReadEnum(); - break; - } + { + pokemonId_ = (global::AllEnum.PokemonId)input.ReadEnum(); + break; + } case 24: - { - Cp = input.ReadInt32(); - break; - } + { + Cp = input.ReadInt32(); + break; + } case 32: - { - Stamina = input.ReadInt32(); - break; - } + { + Stamina = input.ReadInt32(); + break; + } case 40: - { - StaminaMax = input.ReadInt32(); - break; - } + { + StaminaMax = input.ReadInt32(); + break; + } case 48: - { - move1_ = (global::AllEnum.PokemonMove) input.ReadEnum(); - break; - } + { + move1_ = (global::AllEnum.PokemonMove)input.ReadEnum(); + break; + } case 56: - { - move2_ = (global::AllEnum.PokemonMove) input.ReadEnum(); - break; - } + { + move2_ = (global::AllEnum.PokemonMove)input.ReadEnum(); + break; + } case 64: - { - DeployedFortId = input.ReadInt32(); - break; - } + { + DeployedFortId = input.ReadInt32(); + break; + } case 74: - { - OwnerName = input.ReadString(); - break; - } + { + OwnerName = input.ReadString(); + break; + } case 80: - { - IsEgg = input.ReadBool(); - break; - } + { + IsEgg = input.ReadBool(); + break; + } case 88: - { - EggKmWalkedTarget = input.ReadInt32(); - break; - } + { + EggKmWalkedTarget = input.ReadInt32(); + break; + } case 96: - { - EggKmWalkedStart = input.ReadInt32(); - break; - } + { + EggKmWalkedStart = input.ReadInt32(); + break; + } case 112: - { - Origin = input.ReadInt32(); - break; - } + { + Origin = input.ReadInt32(); + break; + } case 125: - { - HeightM = input.ReadFloat(); - break; - } + { + HeightM = input.ReadFloat(); + break; + } case 133: - { - WeightKg = input.ReadFloat(); - break; - } + { + WeightKg = input.ReadFloat(); + break; + } case 136: - { - IndividualAttack = input.ReadInt32(); - break; - } + { + IndividualAttack = input.ReadInt32(); + break; + } case 144: - { - IndividualDefense = input.ReadInt32(); - break; - } + { + IndividualDefense = input.ReadInt32(); + break; + } case 152: - { - IndividualStamina = input.ReadInt32(); - break; - } + { + IndividualStamina = input.ReadInt32(); + break; + } case 160: - { - CpMultiplier = input.ReadInt32(); - break; - } + { + CpMultiplier = input.ReadInt32(); + break; + } case 168: - { - Pokeball = input.ReadInt32(); - break; - } + { + Pokeball = input.ReadInt32(); + break; + } case 176: - { - CapturedCellId = input.ReadUInt64(); - break; - } + { + CapturedCellId = input.ReadUInt64(); + break; + } case 184: - { - BattlesAttacked = input.ReadInt32(); - break; - } + { + BattlesAttacked = input.ReadInt32(); + break; + } case 192: - { - BattlesDefended = input.ReadInt32(); - break; - } + { + BattlesDefended = input.ReadInt32(); + break; + } case 200: - { - EggIncubatorId = input.ReadInt32(); - break; - } + { + EggIncubatorId = input.ReadInt32(); + break; + } case 208: - { - CreationTimeMs = input.ReadUInt64(); - break; - } + { + CreationTimeMs = input.ReadUInt64(); + break; + } case 216: - { - NumUpgrades = input.ReadInt32(); - break; - } + { + NumUpgrades = input.ReadInt32(); + break; + } case 224: - { - AdditionalCpMultiplier = input.ReadInt32(); - break; - } + { + AdditionalCpMultiplier = input.ReadInt32(); + break; + } case 232: - { - Favorite = input.ReadInt32(); - break; - } + { + Favorite = input.ReadInt32(); + break; + } case 242: - { - Nickname = input.ReadString(); - break; - } + { + Nickname = input.ReadString(); + break; + } case 248: - { - FromFort = input.ReadInt32(); - break; - } + { + FromFort = input.ReadInt32(); + break; + } } } } @@ -10889,7 +10889,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (PokemonId != 0) { output.WriteRawTag(24); - output.WriteEnum((int) PokemonId); + output.WriteEnum((int)PokemonId); } if (ExpirationTimestampMs != 0L) { @@ -10921,7 +10921,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (PokemonId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) PokemonId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)PokemonId); } if (ExpirationTimestampMs != 0L) { @@ -10981,35 +10981,35 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - SpawnpointId = input.ReadString(); - break; - } + { + SpawnpointId = input.ReadString(); + break; + } case 17: - { - EncounterId = input.ReadFixed64(); - break; - } + { + EncounterId = input.ReadFixed64(); + break; + } case 24: - { - pokemonId_ = (global::AllEnum.PokemonId) input.ReadEnum(); - break; - } + { + pokemonId_ = (global::AllEnum.PokemonId)input.ReadEnum(); + break; + } case 32: - { - ExpirationTimestampMs = input.ReadInt64(); - break; - } + { + ExpirationTimestampMs = input.ReadInt64(); + break; + } case 41: - { - Latitude = input.ReadDouble(); - break; - } + { + Latitude = input.ReadDouble(); + break; + } case 49: - { - Longitude = input.ReadDouble(); - break; - } + { + Longitude = input.ReadDouble(); + break; + } } } } @@ -11129,7 +11129,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (PokemonId != 0) { output.WriteRawTag(8); - output.WriteEnum((int) PokemonId); + output.WriteEnum((int)PokemonId); } if (DistanceInMeters != 0F) { @@ -11148,7 +11148,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (PokemonId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) PokemonId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)PokemonId); } if (DistanceInMeters != 0F) { @@ -11192,20 +11192,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - pokemonId_ = (global::AllEnum.PokemonId) input.ReadEnum(); - break; - } + { + pokemonId_ = (global::AllEnum.PokemonId)input.ReadEnum(); + break; + } case 21: - { - DistanceInMeters = input.ReadFloat(); - break; - } + { + DistanceInMeters = input.ReadFloat(); + break; + } case 25: - { - EncounterId = input.ReadFixed64(); - break; - } + { + EncounterId = input.ReadFixed64(); + break; + } } } } @@ -11389,24 +11389,24 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - Error = input.ReadString(); - break; - } + { + Error = input.ReadString(); + break; + } case 18: - { - Hash = input.ReadString(); - break; - } + { + Hash = input.ReadString(); + break; + } case 26: - { - if (settings_ == null) { - settings_ = new global::PokemonGo.RocketAPI.GeneratedCode.GlobalSettings(); + if (settings_ == null) + { + settings_ = new global::PokemonGo.RocketAPI.GeneratedCode.GlobalSettings(); + } + input.ReadMessage(settings_); + break; } - input.ReadMessage(settings_); - break; - } } } } @@ -11652,46 +11652,46 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 18: - { - if (fortSettings_ == null) { - fortSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.FortSettings(); + if (fortSettings_ == null) + { + fortSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.FortSettings(); + } + input.ReadMessage(fortSettings_); + break; } - input.ReadMessage(fortSettings_); - break; - } case 26: - { - if (mapSettings_ == null) { - mapSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.MapSettings(); + if (mapSettings_ == null) + { + mapSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.MapSettings(); + } + input.ReadMessage(mapSettings_); + break; } - input.ReadMessage(mapSettings_); - break; - } case 34: - { - if (levelSettings_ == null) { - levelSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.LevelSettings(); + if (levelSettings_ == null) + { + levelSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.LevelSettings(); + } + input.ReadMessage(levelSettings_); + break; } - input.ReadMessage(levelSettings_); - break; - } case 42: - { - if (inventorySettings_ == null) { - inventorySettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.InventorySettings(); - } - input.ReadMessage(inventorySettings_); - break; - } - case 50: - { - MinimumClientVersion = input.ReadString(); - break; - } + if (inventorySettings_ == null) + { + inventorySettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.InventorySettings(); + } + input.ReadMessage(inventorySettings_); + break; + } + case 50: + { + MinimumClientVersion = input.ReadString(); + break; + } } } } @@ -11948,35 +11948,35 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - InteractionRangeMeters = input.ReadDouble(); - break; - } + { + InteractionRangeMeters = input.ReadDouble(); + break; + } case 16: - { - MaxTotalDeployedPokemon = input.ReadInt32(); - break; - } + { + MaxTotalDeployedPokemon = input.ReadInt32(); + break; + } case 24: - { - MaxPlayerDeployedPokemon = input.ReadInt32(); - break; - } + { + MaxPlayerDeployedPokemon = input.ReadInt32(); + break; + } case 33: - { - DeployStaminaMultiplier = input.ReadDouble(); - break; - } + { + DeployStaminaMultiplier = input.ReadDouble(); + break; + } case 41: - { - DeployAttackMultiplier = input.ReadDouble(); - break; - } + { + DeployAttackMultiplier = input.ReadDouble(); + break; + } case 49: - { - FarInteractionRangeMeters = input.ReadDouble(); - break; - } + { + FarInteractionRangeMeters = input.ReadDouble(); + break; + } } } } @@ -12259,40 +12259,40 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - PokemonVisibleRange = input.ReadDouble(); - break; - } + { + PokemonVisibleRange = input.ReadDouble(); + break; + } case 17: - { - PokeNavRangeMeters = input.ReadDouble(); - break; - } + { + PokeNavRangeMeters = input.ReadDouble(); + break; + } case 25: - { - EncounterRangeMeters = input.ReadDouble(); - break; - } + { + EncounterRangeMeters = input.ReadDouble(); + break; + } case 37: - { - GetMapObjectsMinRefreshSeconds = input.ReadFloat(); - break; - } + { + GetMapObjectsMinRefreshSeconds = input.ReadFloat(); + break; + } case 45: - { - GetMapObjectsMaxRefreshSeconds = input.ReadFloat(); - break; - } + { + GetMapObjectsMaxRefreshSeconds = input.ReadFloat(); + break; + } case 53: - { - GetMapObjectsMinDistanceMeters = input.ReadFloat(); - break; - } + { + GetMapObjectsMinDistanceMeters = input.ReadFloat(); + break; + } case 58: - { - GoogleMapsApiKey = input.ReadString(); - break; - } + { + GoogleMapsApiKey = input.ReadString(); + break; + } } } } @@ -12451,15 +12451,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 17: - { - TrainerCpModifier = input.ReadDouble(); - break; - } + { + TrainerCpModifier = input.ReadDouble(); + break; + } case 25: - { - TrainerDifficultyModifier = input.ReadDouble(); - break; - } + { + TrainerDifficultyModifier = input.ReadDouble(); + break; + } } } } @@ -12688,30 +12688,30 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - MaxPokemon = input.ReadInt32(); - break; - } + { + MaxPokemon = input.ReadInt32(); + break; + } case 16: - { - MaxBagItems = input.ReadInt32(); - break; - } + { + MaxBagItems = input.ReadInt32(); + break; + } case 24: - { - BasePokemon = input.ReadInt32(); - break; - } + { + BasePokemon = input.ReadInt32(); + break; + } case 32: - { - BaseBagItems = input.ReadInt32(); - break; - } + { + BaseBagItems = input.ReadInt32(); + break; + } case 40: - { - BaseEggs = input.ReadInt32(); - break; - } + { + BaseEggs = input.ReadInt32(); + break; + } } } } @@ -12868,15 +12868,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - Latitude = input.ReadDouble(); - break; - } + { + Latitude = input.ReadDouble(); + break; + } case 17: - { - Longitude = input.ReadDouble(); - break; - } + { + Longitude = input.ReadDouble(); + break; + } } } } @@ -13044,20 +13044,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - wildPokemons_.AddEntriesFrom(input, _repeated_wildPokemons_codec); - break; - } + { + wildPokemons_.AddEntriesFrom(input, _repeated_wildPokemons_codec); + break; + } case 18: - { - forts_.AddEntriesFrom(input, _repeated_forts_codec); - break; - } + { + forts_.AddEntriesFrom(input, _repeated_forts_codec); + break; + } case 24: - { - FortsNearby = input.ReadInt32(); - break; - } + { + FortsNearby = input.ReadInt32(); + break; + } } } } @@ -13343,20 +13343,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Success = input.ReadBool(); - break; - } + { + Success = input.ReadBool(); + break; + } case 18: - { - itemTemplates_.AddEntriesFrom(input, _repeated_itemTemplates_codec); - break; - } + { + itemTemplates_.AddEntriesFrom(input, _repeated_itemTemplates_codec); + break; + } case 24: - { - TimestampMs = input.ReadUInt64(); - break; - } + { + TimestampMs = input.ReadUInt64(); + break; + } } } } @@ -13933,150 +13933,150 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - TemplateId = input.ReadString(); - break; - } + { + TemplateId = input.ReadString(); + break; + } case 18: - { - if (pokemonSettings_ == null) { - pokemonSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonSettings(); + if (pokemonSettings_ == null) + { + pokemonSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonSettings(); + } + input.ReadMessage(pokemonSettings_); + break; } - input.ReadMessage(pokemonSettings_); - break; - } case 26: - { - if (itemSettings_ == null) { - itemSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.ItemSettings(); + if (itemSettings_ == null) + { + itemSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.ItemSettings(); + } + input.ReadMessage(itemSettings_); + break; } - input.ReadMessage(itemSettings_); - break; - } case 34: - { - if (moveSettings_ == null) { - moveSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.MoveSettings(); + if (moveSettings_ == null) + { + moveSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.MoveSettings(); + } + input.ReadMessage(moveSettings_); + break; } - input.ReadMessage(moveSettings_); - break; - } case 42: - { - if (moveSequenceSettings_ == null) { - moveSequenceSettings_ = - new global::PokemonGo.RocketAPI.GeneratedCode.MoveSequenceSettings(); + if (moveSequenceSettings_ == null) + { + moveSequenceSettings_ = + new global::PokemonGo.RocketAPI.GeneratedCode.MoveSequenceSettings(); + } + input.ReadMessage(moveSequenceSettings_); + break; } - input.ReadMessage(moveSequenceSettings_); - break; - } case 66: - { - if (typeEffective_ == null) { - typeEffective_ = - new global::PokemonGo.RocketAPI.GeneratedCode.TypeEffectiveSettings(); + if (typeEffective_ == null) + { + typeEffective_ = + new global::PokemonGo.RocketAPI.GeneratedCode.TypeEffectiveSettings(); + } + input.ReadMessage(typeEffective_); + break; } - input.ReadMessage(typeEffective_); - break; - } case 82: - { - if (badgeSettings_ == null) { - badgeSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.BadgeSettings(); + if (badgeSettings_ == null) + { + badgeSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.BadgeSettings(); + } + input.ReadMessage(badgeSettings_); + break; } - input.ReadMessage(badgeSettings_); - break; - } case 90: - { - if (camera_ == null) { - camera_ = new global::PokemonGo.RocketAPI.GeneratedCode.CameraSettings(); + if (camera_ == null) + { + camera_ = new global::PokemonGo.RocketAPI.GeneratedCode.CameraSettings(); + } + input.ReadMessage(camera_); + break; } - input.ReadMessage(camera_); - break; - } case 98: - { - if (playerLevel_ == null) { - playerLevel_ = new global::PokemonGo.RocketAPI.GeneratedCode.PlayerLevelSettings(); + if (playerLevel_ == null) + { + playerLevel_ = new global::PokemonGo.RocketAPI.GeneratedCode.PlayerLevelSettings(); + } + input.ReadMessage(playerLevel_); + break; } - input.ReadMessage(playerLevel_); - break; - } case 106: - { - if (gymLevel_ == null) { - gymLevel_ = new global::PokemonGo.RocketAPI.GeneratedCode.GymLevelSettings(); + if (gymLevel_ == null) + { + gymLevel_ = new global::PokemonGo.RocketAPI.GeneratedCode.GymLevelSettings(); + } + input.ReadMessage(gymLevel_); + break; } - input.ReadMessage(gymLevel_); - break; - } case 114: - { - if (battleSettings_ == null) { - battleSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.GymBattleSettings(); + if (battleSettings_ == null) + { + battleSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.GymBattleSettings(); + } + input.ReadMessage(battleSettings_); + break; } - input.ReadMessage(battleSettings_); - break; - } case 122: - { - if (encounterSettings_ == null) { - encounterSettings_ = - new global::PokemonGo.RocketAPI.GeneratedCode.EncounterSettings(); + if (encounterSettings_ == null) + { + encounterSettings_ = + new global::PokemonGo.RocketAPI.GeneratedCode.EncounterSettings(); + } + input.ReadMessage(encounterSettings_); + break; } - input.ReadMessage(encounterSettings_); - break; - } case 130: - { - if (iapItemDisplay_ == null) { - iapItemDisplay_ = new global::PokemonGo.RocketAPI.GeneratedCode.IapItemDisplay(); + if (iapItemDisplay_ == null) + { + iapItemDisplay_ = new global::PokemonGo.RocketAPI.GeneratedCode.IapItemDisplay(); + } + input.ReadMessage(iapItemDisplay_); + break; } - input.ReadMessage(iapItemDisplay_); - break; - } case 138: - { - if (iapSettings_ == null) { - iapSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.IapSettings(); + if (iapSettings_ == null) + { + iapSettings_ = new global::PokemonGo.RocketAPI.GeneratedCode.IapSettings(); + } + input.ReadMessage(iapSettings_); + break; } - input.ReadMessage(iapSettings_); - break; - } case 146: - { - if (pokemonUpgrades_ == null) { - pokemonUpgrades_ = - new global::PokemonGo.RocketAPI.GeneratedCode.PokemonUpgradeSettings(); + if (pokemonUpgrades_ == null) + { + pokemonUpgrades_ = + new global::PokemonGo.RocketAPI.GeneratedCode.PokemonUpgradeSettings(); + } + input.ReadMessage(pokemonUpgrades_); + break; } - input.ReadMessage(pokemonUpgrades_); - break; - } case 154: - { - if (equippedBadges_ == null) { - equippedBadges_ = - new global::PokemonGo.RocketAPI.GeneratedCode.EquippedBadgeSettings(); + if (equippedBadges_ == null) + { + equippedBadges_ = + new global::PokemonGo.RocketAPI.GeneratedCode.EquippedBadgeSettings(); + } + input.ReadMessage(equippedBadges_); + break; } - input.ReadMessage(equippedBadges_); - break; - } } } } @@ -14210,7 +14210,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ItemId != 0) { output.WriteRawTag(8); - output.WriteEnum((int) ItemId); + output.WriteEnum((int)ItemId); } if (EncounterId != 0UL) { @@ -14229,7 +14229,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (ItemId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemId); } if (EncounterId != 0UL) { @@ -14273,20 +14273,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - itemId_ = (global::AllEnum.ItemId) input.ReadEnum(); - break; - } + { + itemId_ = (global::AllEnum.ItemId)input.ReadEnum(); + break; + } case 17: - { - EncounterId = input.ReadFixed64(); - break; - } + { + EncounterId = input.ReadFixed64(); + break; + } case 26: - { - SpawnPointGuid = input.ReadString(); - break; - } + { + SpawnPointGuid = input.ReadString(); + break; + } } } } @@ -14321,7 +14321,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode private static readonly pb::MessageParser<UseItemRequest> _parser = new pb::MessageParser<UseItemRequest>(() => new UseItemRequest()); - + private global::AllEnum.ItemId itemId_ = 0; public UseItemRequest() @@ -14697,40 +14697,40 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Success = input.ReadBool(); - break; - } + { + Success = input.ReadBool(); + break; + } case 17: - { - ItemCaptureMult = input.ReadDouble(); - break; - } + { + ItemCaptureMult = input.ReadDouble(); + break; + } case 25: - { - ItemFleeMult = input.ReadDouble(); - break; - } + { + ItemFleeMult = input.ReadDouble(); + break; + } case 32: - { - StopMovement = input.ReadBool(); - break; - } + { + StopMovement = input.ReadBool(); + break; + } case 40: - { - StopAttack = input.ReadBool(); - break; - } + { + StopAttack = input.ReadBool(); + break; + } case 48: - { - TargetMax = input.ReadBool(); - break; - } + { + TargetMax = input.ReadBool(); + break; + } case 56: - { - TargetSlow = input.ReadBool(); - break; - } + { + TargetSlow = input.ReadBool(); + break; + } } } } @@ -14864,10 +14864,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - PokemonId = input.ReadFixed64(); - break; - } + { + PokemonId = input.ReadFixed64(); + break; + } } } } @@ -14970,7 +14970,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Result != 0) { output.WriteRawTag(8); - output.WriteEnum((int) Result); + output.WriteEnum((int)Result); } if (CandyAwarded != 0) { @@ -14984,7 +14984,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (Result != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Result); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Result); } if (CandyAwarded != 0) { @@ -15020,17 +15020,17 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - result_ = - (global::PokemonGo.RocketAPI.GeneratedCode.ReleasePokemonResponse.Types.Result) - input.ReadEnum(); - break; - } + { + result_ = + (global::PokemonGo.RocketAPI.GeneratedCode.ReleasePokemonResponse.Types.Result) + input.ReadEnum(); + break; + } case 16: - { - CandyAwarded = input.ReadInt32(); - break; - } + { + CandyAwarded = input.ReadInt32(); + break; + } } } } @@ -15063,11 +15063,16 @@ namespace PokemonGo.RocketAPI.GeneratedCode { public enum Result { - [pbr::OriginalName("UNSET")] Unset = 0, - [pbr::OriginalName("SUCCESS")] Success = 1, - [pbr::OriginalName("POKEMON_DEPLOYED")] PokemonDeployed = 2, - [pbr::OriginalName("FAILED")] Failed = 3, - [pbr::OriginalName("ERROR_POKEMON_IS_EGG")] ErrorPokemonIsEgg = 4, + [pbr::OriginalName("UNSET")] + Unset = 0, + [pbr::OriginalName("SUCCESS")] + Success = 1, + [pbr::OriginalName("POKEMON_DEPLOYED")] + PokemonDeployed = 2, + [pbr::OriginalName("FAILED")] + Failed = 3, + [pbr::OriginalName("ERROR_POKEMON_IS_EGG")] + ErrorPokemonIsEgg = 4, } } @@ -15353,34 +15358,34 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Success = input.ReadBool(); - break; - } + { + Success = input.ReadBool(); + break; + } case 18: case 16: - { - pokemonId_.AddEntriesFrom(input, _repeated_pokemonId_codec); - break; - } + { + pokemonId_.AddEntriesFrom(input, _repeated_pokemonId_codec); + break; + } case 26: case 24: - { - experienceAwarded_.AddEntriesFrom(input, _repeated_experienceAwarded_codec); - break; - } + { + experienceAwarded_.AddEntriesFrom(input, _repeated_experienceAwarded_codec); + break; + } case 34: case 32: - { - candyAwarded_.AddEntriesFrom(input, _repeated_candyAwarded_codec); - break; - } + { + candyAwarded_.AddEntriesFrom(input, _repeated_candyAwarded_codec); + break; + } case 42: case 40: - { - stardustAwarded_.AddEntriesFrom(input, _repeated_stardustAwarded_codec); - break; - } + { + stardustAwarded_.AddEntriesFrom(input, _repeated_stardustAwarded_codec); + break; + } } } } @@ -15612,30 +15617,30 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - FortId = input.ReadString(); - break; - } + { + FortId = input.ReadString(); + break; + } case 17: - { - PlayerLatitude = input.ReadDouble(); - break; - } + { + PlayerLatitude = input.ReadDouble(); + break; + } case 25: - { - PlayerLongitude = input.ReadDouble(); - break; - } + { + PlayerLongitude = input.ReadDouble(); + break; + } case 33: - { - FortLatitude = input.ReadDouble(); - break; - } + { + FortLatitude = input.ReadDouble(); + break; + } case 41: - { - FortLongitude = input.ReadDouble(); - break; - } + { + FortLongitude = input.ReadDouble(); + break; + } } } } @@ -15812,7 +15817,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Result != 0) { output.WriteRawTag(8); - output.WriteEnum((int) Result); + output.WriteEnum((int)Result); } itemsAwarded_.WriteTo(output, _repeated_itemsAwarded_codec); if (GemsAwarded != 0) @@ -15847,7 +15852,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (Result != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Result); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Result); } size += itemsAwarded_.CalculateSize(_repeated_itemsAwarded_codec); if (GemsAwarded != 0) @@ -15921,45 +15926,45 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - result_ = - (global::PokemonGo.RocketAPI.GeneratedCode.FortSearchResponse.Types.Result) input.ReadEnum(); - break; - } + { + result_ = + (global::PokemonGo.RocketAPI.GeneratedCode.FortSearchResponse.Types.Result)input.ReadEnum(); + break; + } case 18: - { - itemsAwarded_.AddEntriesFrom(input, _repeated_itemsAwarded_codec); - break; - } + { + itemsAwarded_.AddEntriesFrom(input, _repeated_itemsAwarded_codec); + break; + } case 24: - { - GemsAwarded = input.ReadInt32(); - break; - } + { + GemsAwarded = input.ReadInt32(); + break; + } case 34: - { - if (pokemonDataEgg_ == null) { - pokemonDataEgg_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + if (pokemonDataEgg_ == null) + { + pokemonDataEgg_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + } + input.ReadMessage(pokemonDataEgg_); + break; } - input.ReadMessage(pokemonDataEgg_); - break; - } case 40: - { - ExperienceAwarded = input.ReadInt32(); - break; - } + { + ExperienceAwarded = input.ReadInt32(); + break; + } case 48: - { - CooldownCompleteTimestampMs = input.ReadInt64(); - break; - } + { + CooldownCompleteTimestampMs = input.ReadInt64(); + break; + } case 56: - { - ChainHackSequenceNumber = input.ReadInt32(); - break; - } + { + ChainHackSequenceNumber = input.ReadInt32(); + break; + } } } } @@ -15997,11 +16002,16 @@ namespace PokemonGo.RocketAPI.GeneratedCode { public enum Result { - [pbr::OriginalName("NO_RESULT_SET")] NoResultSet = 0, - [pbr::OriginalName("SUCCESS")] Success = 1, - [pbr::OriginalName("OUT_OF_RANGE")] OutOfRange = 2, - [pbr::OriginalName("IN_COOLDOWN_PERIOD")] InCooldownPeriod = 3, - [pbr::OriginalName("INVENTORY_FULL")] InventoryFull = 4, + [pbr::OriginalName("NO_RESULT_SET")] + NoResultSet = 0, + [pbr::OriginalName("SUCCESS")] + Success = 1, + [pbr::OriginalName("OUT_OF_RANGE")] + OutOfRange = 2, + [pbr::OriginalName("IN_COOLDOWN_PERIOD")] + InCooldownPeriod = 3, + [pbr::OriginalName("INVENTORY_FULL")] + InventoryFull = 4, } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16085,7 +16095,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ItemId != 0) { output.WriteRawTag(8); - output.WriteEnum((int) ItemId); + output.WriteEnum((int)ItemId); } if (ItemCount != 0) { @@ -16099,7 +16109,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (ItemId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemId); } if (ItemCount != 0) { @@ -16135,15 +16145,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - itemId_ = (global::AllEnum.ItemId) input.ReadEnum(); - break; - } + { + itemId_ = (global::AllEnum.ItemId)input.ReadEnum(); + break; + } case 16: - { - ItemCount = input.ReadInt32(); - break; - } + { + ItemCount = input.ReadInt32(); + break; + } } } } @@ -16326,20 +16336,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - FortId = input.ReadString(); - break; - } + { + FortId = input.ReadString(); + break; + } case 17: - { - Latitude = input.ReadDouble(); - break; - } + { + Latitude = input.ReadDouble(); + break; + } case 25: - { - Longitude = input.ReadDouble(); - break; - } + { + Longitude = input.ReadDouble(); + break; + } } } } @@ -16589,7 +16599,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (TeamColor != 0) { output.WriteRawTag(16); - output.WriteEnum((int) TeamColor); + output.WriteEnum((int)TeamColor); } if (pokemonData_ != null) { @@ -16620,7 +16630,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Type != 0) { output.WriteRawTag(72); - output.WriteEnum((int) Type); + output.WriteEnum((int)Type); } if (Latitude != 0D) { @@ -16649,7 +16659,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (TeamColor != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) TeamColor); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)TeamColor); } if (pokemonData_ != null) { @@ -16674,7 +16684,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Type != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type); } if (Latitude != 0D) { @@ -16761,74 +16771,74 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - FortId = input.ReadString(); - break; - } + { + FortId = input.ReadString(); + break; + } case 16: - { - teamColor_ = (global::AllEnum.TeamColor) input.ReadEnum(); - break; - } + { + teamColor_ = (global::AllEnum.TeamColor)input.ReadEnum(); + break; + } case 26: - { - if (pokemonData_ == null) { - pokemonData_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + if (pokemonData_ == null) + { + pokemonData_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + } + input.ReadMessage(pokemonData_); + break; } - input.ReadMessage(pokemonData_); - break; - } case 34: - { - Name = input.ReadString(); - break; - } + { + Name = input.ReadString(); + break; + } case 42: - { - imageUrls_.AddEntriesFrom(input, _repeated_imageUrls_codec); - break; - } + { + imageUrls_.AddEntriesFrom(input, _repeated_imageUrls_codec); + break; + } case 48: - { - Fp = input.ReadInt32(); - break; - } + { + Fp = input.ReadInt32(); + break; + } case 56: - { - Stamina = input.ReadInt32(); - break; - } + { + Stamina = input.ReadInt32(); + break; + } case 64: - { - MaxStamina = input.ReadInt32(); - break; - } + { + MaxStamina = input.ReadInt32(); + break; + } case 72: - { - type_ = (global::AllEnum.FortType) input.ReadEnum(); - break; - } + { + type_ = (global::AllEnum.FortType)input.ReadEnum(); + break; + } case 81: - { - Latitude = input.ReadDouble(); - break; - } + { + Latitude = input.ReadDouble(); + break; + } case 89: - { - Longitude = input.ReadDouble(); - break; - } + { + Longitude = input.ReadDouble(); + break; + } case 98: - { - Description = input.ReadString(); - break; - } + { + Description = input.ReadString(); + break; + } case 106: - { - modifiers_.AddEntriesFrom(input, _repeated_modifiers_codec); - break; - } + { + modifiers_.AddEntriesFrom(input, _repeated_modifiers_codec); + break; + } } } } @@ -16955,7 +16965,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ItemId != 0) { output.WriteRawTag(8); - output.WriteEnum((int) ItemId); + output.WriteEnum((int)ItemId); } if (ExpirationTimestampMs != 0L) { @@ -16974,7 +16984,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (ItemId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemId); } if (ExpirationTimestampMs != 0L) { @@ -17018,20 +17028,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - itemId_ = (global::AllEnum.ItemId) input.ReadEnum(); - break; - } + { + itemId_ = (global::AllEnum.ItemId)input.ReadEnum(); + break; + } case 16: - { - ExpirationTimestampMs = input.ReadInt64(); - break; - } + { + ExpirationTimestampMs = input.ReadInt64(); + break; + } case 26: - { - DeployerPlayerCodename = input.ReadString(); - break; - } + { + DeployerPlayerCodename = input.ReadString(); + break; + } } } } @@ -17236,25 +17246,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - EncounterId = input.ReadFixed64(); - break; - } + { + EncounterId = input.ReadFixed64(); + break; + } case 18: - { - SpawnpointId = input.ReadString(); - break; - } + { + SpawnpointId = input.ReadString(); + break; + } case 25: - { - PlayerLatitude = input.ReadDouble(); - break; - } + { + PlayerLatitude = input.ReadDouble(); + break; + } case 33: - { - PlayerLongitude = input.ReadDouble(); - break; - } + { + PlayerLongitude = input.ReadDouble(); + break; + } } } } @@ -17389,12 +17399,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Background != 0) { output.WriteRawTag(16); - output.WriteEnum((int) Background); + output.WriteEnum((int)Background); } if (Status != 0) { output.WriteRawTag(24); - output.WriteEnum((int) Status); + output.WriteEnum((int)Status); } if (captureProbability_ != null) { @@ -17412,11 +17422,11 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Background != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Background); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Background); } if (Status != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Status); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Status); } if (captureProbability_ != null) { @@ -17468,36 +17478,36 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - if (wildPokemon_ == null) { - wildPokemon_ = new global::PokemonGo.RocketAPI.GeneratedCode.WildPokemon(); + if (wildPokemon_ == null) + { + wildPokemon_ = new global::PokemonGo.RocketAPI.GeneratedCode.WildPokemon(); + } + input.ReadMessage(wildPokemon_); + break; } - input.ReadMessage(wildPokemon_); - break; - } case 16: - { - background_ = - (global::PokemonGo.RocketAPI.GeneratedCode.EncounterResponse.Types.Background) - input.ReadEnum(); - break; - } + { + background_ = + (global::PokemonGo.RocketAPI.GeneratedCode.EncounterResponse.Types.Background) + input.ReadEnum(); + break; + } case 24: - { - status_ = - (global::PokemonGo.RocketAPI.GeneratedCode.EncounterResponse.Types.Status) input.ReadEnum(); - break; - } + { + status_ = + (global::PokemonGo.RocketAPI.GeneratedCode.EncounterResponse.Types.Status)input.ReadEnum(); + break; + } case 34: - { - if (captureProbability_ == null) { - captureProbability_ = new global::PokemonGo.RocketAPI.GeneratedCode.CaptureProbability(); + if (captureProbability_ == null) + { + captureProbability_ = new global::PokemonGo.RocketAPI.GeneratedCode.CaptureProbability(); + } + input.ReadMessage(captureProbability_); + break; } - input.ReadMessage(captureProbability_); - break; - } } } } @@ -17532,20 +17542,30 @@ namespace PokemonGo.RocketAPI.GeneratedCode { public enum Background { - [pbr::OriginalName("PARK")] Park = 0, - [pbr::OriginalName("DESERT")] Desert = 1, + [pbr::OriginalName("PARK")] + Park = 0, + [pbr::OriginalName("DESERT")] + Desert = 1, } public enum Status { - [pbr::OriginalName("ENCOUNTER_ERROR")] EncounterError = 0, - [pbr::OriginalName("ENCOUNTER_SUCCESS")] EncounterSuccess = 1, - [pbr::OriginalName("ENCOUNTER_NOT_FOUND")] EncounterNotFound = 2, - [pbr::OriginalName("ENCOUNTER_CLOSED")] EncounterClosed = 3, - [pbr::OriginalName("ENCOUNTER_POKEMON_FLED")] EncounterPokemonFled = 4, - [pbr::OriginalName("ENCOUNTER_NOT_IN_RANGE")] EncounterNotInRange = 5, - [pbr::OriginalName("ENCOUNTER_ALREADY_HAPPENED")] EncounterAlreadyHappened = 6, - [pbr::OriginalName("POKEMON_INVENTORY_FULL")] PokemonInventoryFull = 7, + [pbr::OriginalName("ENCOUNTER_ERROR")] + EncounterError = 0, + [pbr::OriginalName("ENCOUNTER_SUCCESS")] + EncounterSuccess = 1, + [pbr::OriginalName("ENCOUNTER_NOT_FOUND")] + EncounterNotFound = 2, + [pbr::OriginalName("ENCOUNTER_CLOSED")] + EncounterClosed = 3, + [pbr::OriginalName("ENCOUNTER_POKEMON_FLED")] + EncounterPokemonFled = 4, + [pbr::OriginalName("ENCOUNTER_NOT_IN_RANGE")] + EncounterNotInRange = 5, + [pbr::OriginalName("ENCOUNTER_ALREADY_HAPPENED")] + EncounterAlreadyHappened = 6, + [pbr::OriginalName("POKEMON_INVENTORY_FULL")] + PokemonInventoryFull = 7, } } @@ -17568,7 +17588,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode new pb::MessageParser<CaptureProbability>(() => new CaptureProbability()); private static readonly pb::FieldCodec<global::AllEnum.ItemId> _repeated_pokeballType_codec - = pb::FieldCodec.ForEnum(10, x => (int) x, x => (global::AllEnum.ItemId) x); + = pb::FieldCodec.ForEnum(10, x => (int)x, x => (global::AllEnum.ItemId)x); private static readonly pb::FieldCodec<float> _repeated_captureProbability_codec = pb::FieldCodec.ForFloat(18); @@ -17693,21 +17713,21 @@ namespace PokemonGo.RocketAPI.GeneratedCode break; case 10: case 8: - { - pokeballType_.AddEntriesFrom(input, _repeated_pokeballType_codec); - break; - } + { + pokeballType_.AddEntriesFrom(input, _repeated_pokeballType_codec); + break; + } case 18: case 21: - { - captureProbability_.AddEntriesFrom(input, _repeated_captureProbability_codec); - break; - } + { + captureProbability_.AddEntriesFrom(input, _repeated_captureProbability_codec); + break; + } case 97: - { - ReticleDifficultyScale = input.ReadDouble(); - break; - } + { + ReticleDifficultyScale = input.ReadDouble(); + break; + } } } } @@ -17912,25 +17932,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - EncounterId = input.ReadFixed64(); - break; - } + { + EncounterId = input.ReadFixed64(); + break; + } case 18: - { - FortId = input.ReadString(); - break; - } + { + FortId = input.ReadString(); + break; + } case 25: - { - PlayerLatitude = input.ReadDouble(); - break; - } + { + PlayerLatitude = input.ReadDouble(); + break; + } case 33: - { - PlayerLongitude = input.ReadDouble(); - break; - } + { + PlayerLongitude = input.ReadDouble(); + break; + } } } } @@ -18048,7 +18068,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Result != 0) { output.WriteRawTag(8); - output.WriteEnum((int) Result); + output.WriteEnum((int)Result); } if (pokemonData_ != null) { @@ -18067,7 +18087,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (Result != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Result); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Result); } if (pokemonData_ != null) { @@ -18119,30 +18139,30 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - result_ = - (global::PokemonGo.RocketAPI.GeneratedCode.DiskEncounterResponse.Types.Result) - input.ReadEnum(); - break; - } + { + result_ = + (global::PokemonGo.RocketAPI.GeneratedCode.DiskEncounterResponse.Types.Result) + input.ReadEnum(); + break; + } case 18: - { - if (pokemonData_ == null) { - pokemonData_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + if (pokemonData_ == null) + { + pokemonData_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokemonData(); + } + input.ReadMessage(pokemonData_); + break; } - input.ReadMessage(pokemonData_); - break; - } case 26: - { - if (captureProbability_ == null) { - captureProbability_ = new global::PokemonGo.RocketAPI.GeneratedCode.CaptureProbability(); + if (captureProbability_ == null) + { + captureProbability_ = new global::PokemonGo.RocketAPI.GeneratedCode.CaptureProbability(); + } + input.ReadMessage(captureProbability_); + break; } - input.ReadMessage(captureProbability_); - break; - } } } } @@ -18176,12 +18196,18 @@ namespace PokemonGo.RocketAPI.GeneratedCode { public enum Result { - [pbr::OriginalName("UNKNOWN")] Unknown = 0, - [pbr::OriginalName("SUCCESS")] Success = 1, - [pbr::OriginalName("NOT_AVAILABLE")] NotAvailable = 2, - [pbr::OriginalName("NOT_IN_RANGE")] NotInRange = 3, - [pbr::OriginalName("ENCOUNTER_ALREADY_FINISHED")] EncounterAlreadyFinished = 4, - [pbr::OriginalName("POKEMON_INVENTORY_FULL")] PokemonInventoryFull = 5, + [pbr::OriginalName("UNKNOWN")] + Unknown = 0, + [pbr::OriginalName("SUCCESS")] + Success = 1, + [pbr::OriginalName("NOT_AVAILABLE")] + NotAvailable = 2, + [pbr::OriginalName("NOT_IN_RANGE")] + NotInRange = 3, + [pbr::OriginalName("ENCOUNTER_ALREADY_FINISHED")] + EncounterAlreadyFinished = 4, + [pbr::OriginalName("POKEMON_INVENTORY_FULL")] + PokemonInventoryFull = 5, } } @@ -18441,40 +18467,40 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - EncounterId = input.ReadFixed64(); - break; - } + { + EncounterId = input.ReadFixed64(); + break; + } case 16: - { - Pokeball = input.ReadInt32(); - break; - } + { + Pokeball = input.ReadInt32(); + break; + } case 25: - { - NormalizedReticleSize = input.ReadDouble(); - break; - } + { + NormalizedReticleSize = input.ReadDouble(); + break; + } case 34: - { - SpawnPointGuid = input.ReadString(); - break; - } + { + SpawnPointGuid = input.ReadString(); + break; + } case 40: - { - HitPokemon = input.ReadBool(); - break; - } + { + HitPokemon = input.ReadBool(); + break; + } case 49: - { - SpinModifier = input.ReadDouble(); - break; - } + { + SpinModifier = input.ReadDouble(); + break; + } case 57: - { - NormalizedHitPosition = input.ReadDouble(); - break; - } + { + NormalizedHitPosition = input.ReadDouble(); + break; + } } } } @@ -18607,7 +18633,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Status != 0) { output.WriteRawTag(8); - output.WriteEnum((int) Status); + output.WriteEnum((int)Status); } if (MissPercent != 0D) { @@ -18631,7 +18657,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (Status != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Status); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Status); } if (MissPercent != 0D) { @@ -18687,31 +18713,31 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - status_ = - (global::PokemonGo.RocketAPI.GeneratedCode.CatchPokemonResponse.Types.CatchStatus) - input.ReadEnum(); - break; - } + { + status_ = + (global::PokemonGo.RocketAPI.GeneratedCode.CatchPokemonResponse.Types.CatchStatus) + input.ReadEnum(); + break; + } case 17: - { - MissPercent = input.ReadDouble(); - break; - } + { + MissPercent = input.ReadDouble(); + break; + } case 24: - { - CapturedPokemonId = input.ReadUInt64(); - break; - } + { + CapturedPokemonId = input.ReadUInt64(); + break; + } case 34: - { - if (scores_ == null) { - scores_ = new global::PokemonGo.RocketAPI.GeneratedCode.CaptureScore(); + if (scores_ == null) + { + scores_ = new global::PokemonGo.RocketAPI.GeneratedCode.CaptureScore(); + } + input.ReadMessage(scores_); + break; } - input.ReadMessage(scores_); - break; - } } } } @@ -18746,11 +18772,16 @@ namespace PokemonGo.RocketAPI.GeneratedCode { public enum CatchStatus { - [pbr::OriginalName("CATCH_ERROR")] CatchError = 0, - [pbr::OriginalName("CATCH_SUCCESS")] CatchSuccess = 1, - [pbr::OriginalName("CATCH_ESCAPE")] CatchEscape = 2, - [pbr::OriginalName("CATCH_FLEE")] CatchFlee = 3, - [pbr::OriginalName("CATCH_MISSED")] CatchMissed = 4, + [pbr::OriginalName("CATCH_ERROR")] + CatchError = 0, + [pbr::OriginalName("CATCH_SUCCESS")] + CatchSuccess = 1, + [pbr::OriginalName("CATCH_ESCAPE")] + CatchEscape = 2, + [pbr::OriginalName("CATCH_FLEE")] + CatchFlee = 3, + [pbr::OriginalName("CATCH_MISSED")] + CatchMissed = 4, } } @@ -18776,7 +18807,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode new pb::MessageParser<CaptureScore>(() => new CaptureScore()); private static readonly pb::FieldCodec<global::AllEnum.ActivityType> _repeated_activityType_codec - = pb::FieldCodec.ForEnum(10, x => (int) x, x => (global::AllEnum.ActivityType) x); + = pb::FieldCodec.ForEnum(10, x => (int)x, x => (global::AllEnum.ActivityType)x); private static readonly pb::FieldCodec<int> _repeated_xp_codec = pb::FieldCodec.ForInt32(18); @@ -18906,28 +18937,28 @@ namespace PokemonGo.RocketAPI.GeneratedCode break; case 10: case 8: - { - activityType_.AddEntriesFrom(input, _repeated_activityType_codec); - break; - } + { + activityType_.AddEntriesFrom(input, _repeated_activityType_codec); + break; + } case 18: case 16: - { - xp_.AddEntriesFrom(input, _repeated_xp_codec); - break; - } + { + xp_.AddEntriesFrom(input, _repeated_xp_codec); + break; + } case 26: case 24: - { - candy_.AddEntriesFrom(input, _repeated_candy_codec); - break; - } + { + candy_.AddEntriesFrom(input, _repeated_candy_codec); + break; + } case 34: case 32: - { - stardust_.AddEntriesFrom(input, _repeated_stardust_codec); - break; - } + { + stardust_.AddEntriesFrom(input, _repeated_stardust_codec); + break; + } } } } @@ -19077,7 +19108,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode new pb::MessageParser<CheckAwardedBadgesResponse>(() => new CheckAwardedBadgesResponse()); private static readonly pb::FieldCodec<global::AllEnum.BadgeType> _repeated_awardedBadges_codec - = pb::FieldCodec.ForEnum(18, x => (int) x, x => (global::AllEnum.BadgeType) x); + = pb::FieldCodec.ForEnum(18, x => (int)x, x => (global::AllEnum.BadgeType)x); private static readonly pb::FieldCodec<int> _repeated_awardedBadgeLevels_codec = pb::FieldCodec.ForInt32(26); @@ -19201,22 +19232,22 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Success = input.ReadBool(); - break; - } + { + Success = input.ReadBool(); + break; + } case 18: case 16: - { - awardedBadges_.AddEntriesFrom(input, _repeated_awardedBadges_codec); - break; - } + { + awardedBadges_.AddEntriesFrom(input, _repeated_awardedBadges_codec); + break; + } case 26: case 24: - { - awardedBadgeLevels_.AddEntriesFrom(input, _repeated_awardedBadgeLevels_codec); - break; - } + { + awardedBadgeLevels_.AddEntriesFrom(input, _repeated_awardedBadgeLevels_codec); + break; + } } } } @@ -19380,22 +19411,22 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - EquipBadgeCooldownMs = input.ReadInt64(); - break; - } + { + EquipBadgeCooldownMs = input.ReadInt64(); + break; + } case 18: case 21: - { - catchProbabilityBonus_.AddEntriesFrom(input, _repeated_catchProbabilityBonus_codec); - break; - } + { + catchProbabilityBonus_.AddEntriesFrom(input, _repeated_catchProbabilityBonus_codec); + break; + } case 26: case 29: - { - fleeProbabilityBonus_.AddEntriesFrom(input, _repeated_fleeProbabilityBonus_codec); - break; - } + { + fleeProbabilityBonus_.AddEntriesFrom(input, _repeated_fleeProbabilityBonus_codec); + break; + } } } } @@ -19584,27 +19615,27 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - UpgradesPerLevel = input.ReadInt32(); - break; - } + { + UpgradesPerLevel = input.ReadInt32(); + break; + } case 16: - { - AllowedLevelsAbovePlayer = input.ReadInt32(); - break; - } + { + AllowedLevelsAbovePlayer = input.ReadInt32(); + break; + } case 26: case 24: - { - candyCost_.AddEntriesFrom(input, _repeated_candyCost_codec); - break; - } + { + candyCost_.AddEntriesFrom(input, _repeated_candyCost_codec); + break; + } case 34: case 32: - { - stardustCost_.AddEntriesFrom(input, _repeated_stardustCost_codec); - break; - } + { + stardustCost_.AddEntriesFrom(input, _repeated_stardustCost_codec); + break; + } } } } @@ -19869,41 +19900,41 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - DailyBonusCoins = input.ReadInt32(); - break; - } + { + DailyBonusCoins = input.ReadInt32(); + break; + } case 18: case 16: - { - dailyDefenderBonusPerPokemon_.AddEntriesFrom(input, _repeated_dailyDefenderBonusPerPokemon_codec); - break; - } + { + dailyDefenderBonusPerPokemon_.AddEntriesFrom(input, _repeated_dailyDefenderBonusPerPokemon_codec); + break; + } case 24: - { - DailyDefenderBonusMaxDefenders = input.ReadInt32(); - break; - } + { + DailyDefenderBonusMaxDefenders = input.ReadInt32(); + break; + } case 34: - { - dailyDefenderBonusCurrency_.AddEntriesFrom(input, _repeated_dailyDefenderBonusCurrency_codec); - break; - } + { + dailyDefenderBonusCurrency_.AddEntriesFrom(input, _repeated_dailyDefenderBonusCurrency_codec); + break; + } case 40: - { - MinTimeBetweenClaimsMs = input.ReadInt64(); - break; - } + { + MinTimeBetweenClaimsMs = input.ReadInt64(); + break; + } case 48: - { - DailyBonusEnabled = input.ReadBool(); - break; - } + { + DailyBonusEnabled = input.ReadBool(); + break; + } case 56: - { - DailyDefenderBonusEnabled = input.ReadBool(); - break; - } + { + DailyDefenderBonusEnabled = input.ReadBool(); + break; + } } } } @@ -19956,7 +19987,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode new pb::MessageParser<IapItemDisplay>(() => new IapItemDisplay()); private static readonly pb::FieldCodec<global::AllEnum.ItemId> _repeated_itemIds_codec - = pb::FieldCodec.ForEnum(34, x => (int) x, x => (global::AllEnum.ItemId) x); + = pb::FieldCodec.ForEnum(34, x => (int)x, x => (global::AllEnum.ItemId)x); private static readonly pb::FieldCodec<int> _repeated_counts_codec = pb::FieldCodec.ForInt32(42); @@ -20060,7 +20091,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Category != 0) { output.WriteRawTag(16); - output.WriteEnum((int) Category); + output.WriteEnum((int)Category); } if (SortOrder != 0) { @@ -20080,7 +20111,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Category != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Category); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Category); } if (SortOrder != 0) { @@ -20124,32 +20155,32 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - Sku = input.ReadString(); - break; - } + { + Sku = input.ReadString(); + break; + } case 16: - { - category_ = (global::AllEnum.HoloIapItemCategory) input.ReadEnum(); - break; - } + { + category_ = (global::AllEnum.HoloIapItemCategory)input.ReadEnum(); + break; + } case 24: - { - SortOrder = input.ReadInt32(); - break; - } + { + SortOrder = input.ReadInt32(); + break; + } case 34: case 32: - { - itemIds_.AddEntriesFrom(input, _repeated_itemIds_codec); - break; - } + { + itemIds_.AddEntriesFrom(input, _repeated_itemIds_codec); + break; + } case 42: case 40: - { - counts_.AddEntriesFrom(input, _repeated_counts_codec); - break; - } + { + counts_.AddEntriesFrom(input, _repeated_counts_codec); + break; + } } } } @@ -20381,30 +20412,30 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 13: - { - SpinBonusThreshold = input.ReadFloat(); - break; - } + { + SpinBonusThreshold = input.ReadFloat(); + break; + } case 21: - { - ExcellentThrowThreshold = input.ReadFloat(); - break; - } + { + ExcellentThrowThreshold = input.ReadFloat(); + break; + } case 29: - { - GreatThrowThreshold = input.ReadFloat(); - break; - } + { + GreatThrowThreshold = input.ReadFloat(); + break; + } case 37: - { - NiceThrowThreshold = input.ReadFloat(); - break; - } + { + NiceThrowThreshold = input.ReadFloat(); + break; + } case 40: - { - MilestoneThreshold = input.ReadInt32(); - break; - } + { + MilestoneThreshold = input.ReadInt32(); + break; + } } } } @@ -20861,75 +20892,75 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 13: - { - EnergyPerSec = input.ReadFloat(); - break; - } + { + EnergyPerSec = input.ReadFloat(); + break; + } case 21: - { - DodgeEnergyCost = input.ReadFloat(); - break; - } + { + DodgeEnergyCost = input.ReadFloat(); + break; + } case 29: - { - RetargetSeconds = input.ReadFloat(); - break; - } + { + RetargetSeconds = input.ReadFloat(); + break; + } case 37: - { - EnemyAttackInterval = input.ReadFloat(); - break; - } + { + EnemyAttackInterval = input.ReadFloat(); + break; + } case 45: - { - AttackServerInterval = input.ReadFloat(); - break; - } + { + AttackServerInterval = input.ReadFloat(); + break; + } case 53: - { - RoundDurationSeconds = input.ReadFloat(); - break; - } + { + RoundDurationSeconds = input.ReadFloat(); + break; + } case 61: - { - BonusTimePerAllySeconds = input.ReadFloat(); - break; - } + { + BonusTimePerAllySeconds = input.ReadFloat(); + break; + } case 64: - { - MaximumAttackersPerBattle = input.ReadInt32(); - break; - } + { + MaximumAttackersPerBattle = input.ReadInt32(); + break; + } case 77: - { - SameTypeAttackBonusMultiplier = input.ReadFloat(); - break; - } + { + SameTypeAttackBonusMultiplier = input.ReadFloat(); + break; + } case 80: - { - MaximumEnergy = input.ReadInt32(); - break; - } + { + MaximumEnergy = input.ReadInt32(); + break; + } case 93: - { - EnergyDeltaPerHealthLost = input.ReadFloat(); - break; - } + { + EnergyDeltaPerHealthLost = input.ReadFloat(); + break; + } case 96: - { - DodgeDurationMs = input.ReadInt32(); - break; - } + { + DodgeDurationMs = input.ReadInt32(); + break; + } case 104: - { - MinimumPlayerLevel = input.ReadInt32(); - break; - } + { + MinimumPlayerLevel = input.ReadInt32(); + break; + } case 112: - { - SwapDurationMs = input.ReadInt32(); - break; - } + { + SwapDurationMs = input.ReadInt32(); + break; + } } } } @@ -21114,28 +21145,28 @@ namespace PokemonGo.RocketAPI.GeneratedCode break; case 10: case 8: - { - requiredExperience_.AddEntriesFrom(input, _repeated_requiredExperience_codec); - break; - } + { + requiredExperience_.AddEntriesFrom(input, _repeated_requiredExperience_codec); + break; + } case 18: case 16: - { - leaderSlots_.AddEntriesFrom(input, _repeated_leaderSlots_codec); - break; - } + { + leaderSlots_.AddEntriesFrom(input, _repeated_leaderSlots_codec); + break; + } case 26: case 24: - { - trainerSlots_.AddEntriesFrom(input, _repeated_trainerSlots_codec); - break; - } + { + trainerSlots_.AddEntriesFrom(input, _repeated_trainerSlots_codec); + break; + } case 34: case 32: - { - searchRollBonus_.AddEntriesFrom(input, _repeated_searchRollBonus_codec); - break; - } + { + searchRollBonus_.AddEntriesFrom(input, _repeated_searchRollBonus_codec); + break; + } } } } @@ -21343,32 +21374,32 @@ namespace PokemonGo.RocketAPI.GeneratedCode break; case 10: case 8: - { - rankNum_.AddEntriesFrom(input, _repeated_rankNum_codec); - break; - } + { + rankNum_.AddEntriesFrom(input, _repeated_rankNum_codec); + break; + } case 18: case 16: - { - requiredExperience_.AddEntriesFrom(input, _repeated_requiredExperience_codec); - break; - } + { + requiredExperience_.AddEntriesFrom(input, _repeated_requiredExperience_codec); + break; + } case 26: case 29: - { - cpMultiplier_.AddEntriesFrom(input, _repeated_cpMultiplier_codec); - break; - } + { + cpMultiplier_.AddEntriesFrom(input, _repeated_cpMultiplier_codec); + break; + } case 32: - { - MaxEggPlayerLevel = input.ReadInt32(); - break; - } + { + MaxEggPlayerLevel = input.ReadInt32(); + break; + } case 40: - { - MaxEncounterPlayerLevel = input.ReadInt32(); - break; - } + { + MaxEncounterPlayerLevel = input.ReadInt32(); + break; + } } } } @@ -21452,10 +21483,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode new pb::MessageParser<CameraSettings>(() => new CameraSettings()); private static readonly pb::FieldCodec<global::AllEnum.CameraInterpolation> _repeated_interpolation_codec - = pb::FieldCodec.ForEnum(18, x => (int) x, x => (global::AllEnum.CameraInterpolation) x); + = pb::FieldCodec.ForEnum(18, x => (int)x, x => (global::AllEnum.CameraInterpolation)x); private static readonly pb::FieldCodec<global::AllEnum.CameraTarget> _repeated_targetType_codec - = pb::FieldCodec.ForEnum(26, x => (int) x, x => (global::AllEnum.CameraTarget) x); + = pb::FieldCodec.ForEnum(26, x => (int)x, x => (global::AllEnum.CameraTarget)x); private static readonly pb::FieldCodec<float> _repeated_easeInSpeed_codec = pb::FieldCodec.ForFloat(34); @@ -21761,100 +21792,100 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - NextCamera = input.ReadString(); - break; - } + { + NextCamera = input.ReadString(); + break; + } case 18: case 16: - { - interpolation_.AddEntriesFrom(input, _repeated_interpolation_codec); - break; - } + { + interpolation_.AddEntriesFrom(input, _repeated_interpolation_codec); + break; + } case 26: case 24: - { - targetType_.AddEntriesFrom(input, _repeated_targetType_codec); - break; - } + { + targetType_.AddEntriesFrom(input, _repeated_targetType_codec); + break; + } case 34: case 37: - { - easeInSpeed_.AddEntriesFrom(input, _repeated_easeInSpeed_codec); - break; - } + { + easeInSpeed_.AddEntriesFrom(input, _repeated_easeInSpeed_codec); + break; + } case 42: case 45: - { - eastOutSpeed_.AddEntriesFrom(input, _repeated_eastOutSpeed_codec); - break; - } + { + eastOutSpeed_.AddEntriesFrom(input, _repeated_eastOutSpeed_codec); + break; + } case 50: case 53: - { - durationSeconds_.AddEntriesFrom(input, _repeated_durationSeconds_codec); - break; - } + { + durationSeconds_.AddEntriesFrom(input, _repeated_durationSeconds_codec); + break; + } case 58: case 61: - { - waitSeconds_.AddEntriesFrom(input, _repeated_waitSeconds_codec); - break; - } + { + waitSeconds_.AddEntriesFrom(input, _repeated_waitSeconds_codec); + break; + } case 66: case 69: - { - transitionSeconds_.AddEntriesFrom(input, _repeated_transitionSeconds_codec); - break; - } + { + transitionSeconds_.AddEntriesFrom(input, _repeated_transitionSeconds_codec); + break; + } case 74: case 77: - { - angleDegree_.AddEntriesFrom(input, _repeated_angleDegree_codec); - break; - } + { + angleDegree_.AddEntriesFrom(input, _repeated_angleDegree_codec); + break; + } case 82: case 85: - { - angleOffsetDegree_.AddEntriesFrom(input, _repeated_angleOffsetDegree_codec); - break; - } + { + angleOffsetDegree_.AddEntriesFrom(input, _repeated_angleOffsetDegree_codec); + break; + } case 90: case 93: - { - pitchDegree_.AddEntriesFrom(input, _repeated_pitchDegree_codec); - break; - } + { + pitchDegree_.AddEntriesFrom(input, _repeated_pitchDegree_codec); + break; + } case 98: case 101: - { - pitchOffsetDegree_.AddEntriesFrom(input, _repeated_pitchOffsetDegree_codec); - break; - } + { + pitchOffsetDegree_.AddEntriesFrom(input, _repeated_pitchOffsetDegree_codec); + break; + } case 106: case 109: - { - rollDegree_.AddEntriesFrom(input, _repeated_rollDegree_codec); - break; - } + { + rollDegree_.AddEntriesFrom(input, _repeated_rollDegree_codec); + break; + } case 114: case 117: - { - distanceMeters_.AddEntriesFrom(input, _repeated_distanceMeters_codec); - break; - } + { + distanceMeters_.AddEntriesFrom(input, _repeated_distanceMeters_codec); + break; + } case 122: case 125: - { - heightPercent_.AddEntriesFrom(input, _repeated_heightPercent_codec); - break; - } + { + heightPercent_.AddEntriesFrom(input, _repeated_heightPercent_codec); + break; + } case 130: case 133: - { - vertCtrRatio_.AddEntriesFrom(input, _repeated_vertCtrRatio_codec); - break; - } + { + vertCtrRatio_.AddEntriesFrom(input, _repeated_vertCtrRatio_codec); + break; + } } } } @@ -21986,7 +22017,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (BadgeType != 0) { output.WriteRawTag(8); - output.WriteEnum((int) BadgeType); + output.WriteEnum((int)BadgeType); } if (BadgeRank != 0) { @@ -22001,7 +22032,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (BadgeType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) BadgeType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)BadgeType); } if (BadgeRank != 0) { @@ -22039,21 +22070,21 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - badgeType_ = (global::AllEnum.BadgeType) input.ReadEnum(); - break; - } + { + badgeType_ = (global::AllEnum.BadgeType)input.ReadEnum(); + break; + } case 16: - { - BadgeRank = input.ReadInt32(); - break; - } + { + BadgeRank = input.ReadInt32(); + break; + } case 26: case 24: - { - targets_.AddEntriesFrom(input, _repeated_targets_codec); - break; - } + { + targets_.AddEntriesFrom(input, _repeated_targets_codec); + break; + } } } } @@ -22161,7 +22192,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (AttackType != 0) { output.WriteRawTag(16); - output.WriteEnum((int) AttackType); + output.WriteEnum((int)AttackType); } } @@ -22171,7 +22202,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode size += attackScalar_.CalculateSize(_repeated_attackScalar_codec); if (AttackType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) AttackType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)AttackType); } return size; } @@ -22201,15 +22232,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode break; case 10: case 13: - { - attackScalar_.AddEntriesFrom(input, _repeated_attackScalar_codec); - break; - } + { + attackScalar_.AddEntriesFrom(input, _repeated_attackScalar_codec); + break; + } case 16: - { - attackType_ = (global::AllEnum.PokemonType) input.ReadEnum(); - break; - } + { + attackType_ = (global::AllEnum.PokemonType)input.ReadEnum(); + break; + } } } } @@ -22330,10 +22361,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 10: - { - sequence_.AddEntriesFrom(input, _repeated_sequence_codec); - break; - } + { + sequence_.AddEntriesFrom(input, _repeated_sequence_codec); + break; + } } } } @@ -22592,7 +22623,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (MovementId != 0) { output.WriteRawTag(8); - output.WriteEnum((int) MovementId); + output.WriteEnum((int)MovementId); } if (AnimationId != 0) { @@ -22602,7 +22633,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (PokemonType != 0) { output.WriteRawTag(24); - output.WriteEnum((int) PokemonType); + output.WriteEnum((int)PokemonType); } if (Power != 0F) { @@ -22671,7 +22702,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (MovementId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) MovementId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)MovementId); } if (AnimationId != 0) { @@ -22679,7 +22710,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (PokemonType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) PokemonType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)PokemonType); } if (Power != 0F) { @@ -22811,80 +22842,80 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - movementId_ = (global::AllEnum.PokemonMovementType) input.ReadEnum(); - break; - } + { + movementId_ = (global::AllEnum.PokemonMovementType)input.ReadEnum(); + break; + } case 16: - { - AnimationId = input.ReadInt32(); - break; - } + { + AnimationId = input.ReadInt32(); + break; + } case 24: - { - pokemonType_ = (global::AllEnum.PokemonType) input.ReadEnum(); - break; - } + { + pokemonType_ = (global::AllEnum.PokemonType)input.ReadEnum(); + break; + } case 37: - { - Power = input.ReadFloat(); - break; - } + { + Power = input.ReadFloat(); + break; + } case 45: - { - AccuracyChance = input.ReadFloat(); - break; - } + { + AccuracyChance = input.ReadFloat(); + break; + } case 53: - { - CriticalChance = input.ReadFloat(); - break; - } + { + CriticalChance = input.ReadFloat(); + break; + } case 61: - { - HealScalar = input.ReadFloat(); - break; - } + { + HealScalar = input.ReadFloat(); + break; + } case 69: - { - StaminaLossScalar = input.ReadFloat(); - break; - } + { + StaminaLossScalar = input.ReadFloat(); + break; + } case 72: - { - TrainerLevelMin = input.ReadInt32(); - break; - } + { + TrainerLevelMin = input.ReadInt32(); + break; + } case 80: - { - TrainerLevelMax = input.ReadInt32(); - break; - } + { + TrainerLevelMax = input.ReadInt32(); + break; + } case 90: - { - VfxName = input.ReadString(); - break; - } + { + VfxName = input.ReadString(); + break; + } case 96: - { - DurationMs = input.ReadInt32(); - break; - } + { + DurationMs = input.ReadInt32(); + break; + } case 104: - { - DamageWindowStartMs = input.ReadInt32(); - break; - } + { + DamageWindowStartMs = input.ReadInt32(); + break; + } case 112: - { - DamageWindowEndMs = input.ReadInt32(); - break; - } + { + DamageWindowEndMs = input.ReadInt32(); + break; + } case 120: - { - EnergyDelta = input.ReadInt32(); - break; - } + { + EnergyDelta = input.ReadInt32(); + break; + } } } } @@ -22993,16 +23024,16 @@ namespace PokemonGo.RocketAPI.GeneratedCode new pb::MessageParser<PokemonSettings>(() => new PokemonSettings()); private static readonly pb::FieldCodec<global::AllEnum.PokemonMove> _repeated_quickMoves_codec - = pb::FieldCodec.ForEnum(74, x => (int) x, x => (global::AllEnum.PokemonMove) x); + = pb::FieldCodec.ForEnum(74, x => (int)x, x => (global::AllEnum.PokemonMove)x); private static readonly pb::FieldCodec<global::AllEnum.PokemonMove> _repeated_cinematicMoves_codec - = pb::FieldCodec.ForEnum(82, x => (int) x, x => (global::AllEnum.PokemonMove) x); + = pb::FieldCodec.ForEnum(82, x => (int)x, x => (global::AllEnum.PokemonMove)x); private static readonly pb::FieldCodec<float> _repeated_animationTime_codec = pb::FieldCodec.ForFloat(90); private static readonly pb::FieldCodec<global::AllEnum.PokemonId> _repeated_evolutionIds_codec - = pb::FieldCodec.ForEnum(98, x => (int) x, x => (global::AllEnum.PokemonId) x); + = pb::FieldCodec.ForEnum(98, x => (int)x, x => (global::AllEnum.PokemonId)x); private readonly pbc::RepeatedField<float> animationTime_ = new pbc::RepeatedField<float>(); @@ -23244,7 +23275,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (PokemonId != 0) { output.WriteRawTag(8); - output.WriteEnum((int) PokemonId); + output.WriteEnum((int)PokemonId); } if (ModelScale != 0F) { @@ -23254,12 +23285,12 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Type != 0) { output.WriteRawTag(32); - output.WriteEnum((int) Type); + output.WriteEnum((int)Type); } if (Type2 != 0) { output.WriteRawTag(40); - output.WriteEnum((int) Type2); + output.WriteEnum((int)Type2); } if (camera_ != null) { @@ -23288,7 +23319,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (Class != 0) { output.WriteRawTag(112); - output.WriteEnum((int) Class); + output.WriteEnum((int)Class); } if (PokedexHeightM != 0F) { @@ -23303,7 +23334,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ParentPokemonId != 0) { output.WriteRawTag(136, 1); - output.WriteEnum((int) ParentPokemonId); + output.WriteEnum((int)ParentPokemonId); } if (HeightStdDev != 0F) { @@ -23323,7 +23354,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (FamilyId != 0) { output.WriteRawTag(168, 1); - output.WriteEnum((int) FamilyId); + output.WriteEnum((int)FamilyId); } if (CandyToEvolve != 0) { @@ -23337,7 +23368,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (PokemonId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) PokemonId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)PokemonId); } if (ModelScale != 0F) { @@ -23345,11 +23376,11 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Type != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type); } if (Type2 != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type2); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type2); } if (camera_ != null) { @@ -23373,7 +23404,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (Class != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Class); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Class); } if (PokedexHeightM != 0F) { @@ -23385,7 +23416,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (ParentPokemonId != 0) { - size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) ParentPokemonId); + size += 2 + pb::CodedOutputStream.ComputeEnumSize((int)ParentPokemonId); } if (HeightStdDev != 0F) { @@ -23401,7 +23432,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (FamilyId != 0) { - size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) FamilyId); + size += 2 + pb::CodedOutputStream.ComputeEnumSize((int)FamilyId); } if (CandyToEvolve != 0) { @@ -23513,126 +23544,126 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - pokemonId_ = (global::AllEnum.PokemonId) input.ReadEnum(); - break; - } + { + pokemonId_ = (global::AllEnum.PokemonId)input.ReadEnum(); + break; + } case 29: - { - ModelScale = input.ReadFloat(); - break; - } + { + ModelScale = input.ReadFloat(); + break; + } case 32: - { - type_ = (global::AllEnum.PokemonType) input.ReadEnum(); - break; - } + { + type_ = (global::AllEnum.PokemonType)input.ReadEnum(); + break; + } case 40: - { - type2_ = (global::AllEnum.PokemonType) input.ReadEnum(); - break; - } + { + type2_ = (global::AllEnum.PokemonType)input.ReadEnum(); + break; + } case 50: - { - if (camera_ == null) { - camera_ = new global::PokemonGo.RocketAPI.GeneratedCode.CameraAttributes(); + if (camera_ == null) + { + camera_ = new global::PokemonGo.RocketAPI.GeneratedCode.CameraAttributes(); + } + input.ReadMessage(camera_); + break; } - input.ReadMessage(camera_); - break; - } case 58: - { - if (encounter_ == null) { - encounter_ = new global::PokemonGo.RocketAPI.GeneratedCode.EncounterAttributes(); + if (encounter_ == null) + { + encounter_ = new global::PokemonGo.RocketAPI.GeneratedCode.EncounterAttributes(); + } + input.ReadMessage(encounter_); + break; } - input.ReadMessage(encounter_); - break; - } case 66: - { - if (stats_ == null) { - stats_ = new global::PokemonGo.RocketAPI.GeneratedCode.StatsAttributes(); + if (stats_ == null) + { + stats_ = new global::PokemonGo.RocketAPI.GeneratedCode.StatsAttributes(); + } + input.ReadMessage(stats_); + break; } - input.ReadMessage(stats_); - break; - } case 74: case 72: - { - quickMoves_.AddEntriesFrom(input, _repeated_quickMoves_codec); - break; - } + { + quickMoves_.AddEntriesFrom(input, _repeated_quickMoves_codec); + break; + } case 82: case 80: - { - cinematicMoves_.AddEntriesFrom(input, _repeated_cinematicMoves_codec); - break; - } + { + cinematicMoves_.AddEntriesFrom(input, _repeated_cinematicMoves_codec); + break; + } case 90: case 93: - { - animationTime_.AddEntriesFrom(input, _repeated_animationTime_codec); - break; - } + { + animationTime_.AddEntriesFrom(input, _repeated_animationTime_codec); + break; + } case 98: case 96: - { - evolutionIds_.AddEntriesFrom(input, _repeated_evolutionIds_codec); - break; - } + { + evolutionIds_.AddEntriesFrom(input, _repeated_evolutionIds_codec); + break; + } case 104: - { - EvolutionPips = input.ReadInt32(); - break; - } + { + EvolutionPips = input.ReadInt32(); + break; + } case 112: - { - class_ = (global::AllEnum.PokemonClass) input.ReadEnum(); - break; - } + { + class_ = (global::AllEnum.PokemonClass)input.ReadEnum(); + break; + } case 125: - { - PokedexHeightM = input.ReadFloat(); - break; - } + { + PokedexHeightM = input.ReadFloat(); + break; + } case 133: - { - PokedexWeightKg = input.ReadFloat(); - break; - } + { + PokedexWeightKg = input.ReadFloat(); + break; + } case 136: - { - parentPokemonId_ = (global::AllEnum.PokemonId) input.ReadEnum(); - break; - } + { + parentPokemonId_ = (global::AllEnum.PokemonId)input.ReadEnum(); + break; + } case 149: - { - HeightStdDev = input.ReadFloat(); - break; - } + { + HeightStdDev = input.ReadFloat(); + break; + } case 157: - { - WeightStdDev = input.ReadFloat(); - break; - } + { + WeightStdDev = input.ReadFloat(); + break; + } case 165: - { - KmDistanceToHatch = input.ReadFloat(); - break; - } + { + KmDistanceToHatch = input.ReadFloat(); + break; + } case 168: - { - familyId_ = (global::AllEnum.PokemonFamilyId) input.ReadEnum(); - break; - } + { + familyId_ = (global::AllEnum.PokemonFamilyId)input.ReadEnum(); + break; + } case 176: - { - CandyToEvolve = input.ReadInt32(); - break; - } + { + CandyToEvolve = input.ReadInt32(); + break; + } } } } @@ -23880,30 +23911,30 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 13: - { - DiskRadiusM = input.ReadFloat(); - break; - } + { + DiskRadiusM = input.ReadFloat(); + break; + } case 21: - { - CylinderRadiusM = input.ReadFloat(); - break; - } + { + CylinderRadiusM = input.ReadFloat(); + break; + } case 29: - { - CylinderHeightM = input.ReadFloat(); - break; - } + { + CylinderHeightM = input.ReadFloat(); + break; + } case 37: - { - CylinderGroundM = input.ReadFloat(); - break; - } + { + CylinderGroundM = input.ReadFloat(); + break; + } case 45: - { - ShoulderModeScale = input.ReadFloat(); - break; - } + { + ShoulderModeScale = input.ReadFloat(); + break; + } } } } @@ -24119,7 +24150,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (MovementType != 0) { output.WriteRawTag(48); - output.WriteEnum((int) MovementType); + output.WriteEnum((int)MovementType); } if (MovementTimerS != 0F) { @@ -24163,7 +24194,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (MovementType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) MovementType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)MovementType); } if (MovementTimerS != 0F) { @@ -24235,50 +24266,50 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 13: - { - BaseCaptureRate = input.ReadFloat(); - break; - } + { + BaseCaptureRate = input.ReadFloat(); + break; + } case 21: - { - BaseFleeRate = input.ReadFloat(); - break; - } + { + BaseFleeRate = input.ReadFloat(); + break; + } case 29: - { - CollisionRadiusM = input.ReadFloat(); - break; - } + { + CollisionRadiusM = input.ReadFloat(); + break; + } case 37: - { - CollisionHeightM = input.ReadFloat(); - break; - } + { + CollisionHeightM = input.ReadFloat(); + break; + } case 45: - { - CollisionHeadRadiusM = input.ReadFloat(); - break; - } + { + CollisionHeadRadiusM = input.ReadFloat(); + break; + } case 48: - { - movementType_ = (global::AllEnum.PokemonMovementType) input.ReadEnum(); - break; - } + { + movementType_ = (global::AllEnum.PokemonMovementType)input.ReadEnum(); + break; + } case 61: - { - MovementTimerS = input.ReadFloat(); - break; - } + { + MovementTimerS = input.ReadFloat(); + break; + } case 69: - { - JumpTimeS = input.ReadFloat(); - break; - } + { + JumpTimeS = input.ReadFloat(); + break; + } case 77: - { - AttackTimerS = input.ReadFloat(); - break; - } + { + AttackTimerS = input.ReadFloat(); + break; + } } } } @@ -24489,25 +24520,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - BaseStamina = input.ReadInt32(); - break; - } + { + BaseStamina = input.ReadInt32(); + break; + } case 16: - { - BaseAttack = input.ReadInt32(); - break; - } + { + BaseAttack = input.ReadInt32(); + break; + } case 24: - { - BaseDefense = input.ReadInt32(); - break; - } + { + BaseDefense = input.ReadInt32(); + break; + } case 64: - { - DodgeEnergyDelta = input.ReadInt32(); - break; - } + { + DodgeEnergyDelta = input.ReadInt32(); + break; + } } } } @@ -24769,17 +24800,17 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ItemId != 0) { output.WriteRawTag(8); - output.WriteEnum((int) ItemId); + output.WriteEnum((int)ItemId); } if (ItemType != 0) { output.WriteRawTag(16); - output.WriteEnum((int) ItemType); + output.WriteEnum((int)ItemType); } if (Category != 0) { output.WriteRawTag(24); - output.WriteEnum((int) Category); + output.WriteEnum((int)Category); } if (DropFreq != 0F) { @@ -24848,15 +24879,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (ItemId != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemId); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemId); } if (ItemType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemType); } if (Category != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Category); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Category); } if (DropFreq != 0F) { @@ -25028,121 +25059,121 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - itemId_ = (global::AllEnum.ItemId) input.ReadEnum(); - break; - } + { + itemId_ = (global::AllEnum.ItemId)input.ReadEnum(); + break; + } case 16: - { - itemType_ = (global::AllEnum.ItemType) input.ReadEnum(); - break; - } + { + itemType_ = (global::AllEnum.ItemType)input.ReadEnum(); + break; + } case 24: - { - category_ = (global::AllEnum.ItemCategory) input.ReadEnum(); - break; - } + { + category_ = (global::AllEnum.ItemCategory)input.ReadEnum(); + break; + } case 37: - { - DropFreq = input.ReadFloat(); - break; - } + { + DropFreq = input.ReadFloat(); + break; + } case 40: - { - DropTrainerLevel = input.ReadInt32(); - break; - } + { + DropTrainerLevel = input.ReadInt32(); + break; + } case 50: - { - if (pokeball_ == null) { - pokeball_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokeballAttributes(); + if (pokeball_ == null) + { + pokeball_ = new global::PokemonGo.RocketAPI.GeneratedCode.PokeballAttributes(); + } + input.ReadMessage(pokeball_); + break; } - input.ReadMessage(pokeball_); - break; - } case 58: - { - if (potion_ == null) { - potion_ = new global::PokemonGo.RocketAPI.GeneratedCode.PotionAttributes(); + if (potion_ == null) + { + potion_ = new global::PokemonGo.RocketAPI.GeneratedCode.PotionAttributes(); + } + input.ReadMessage(potion_); + break; } - input.ReadMessage(potion_); - break; - } case 66: - { - if (revive_ == null) { - revive_ = new global::PokemonGo.RocketAPI.GeneratedCode.ReviveAttributes(); + if (revive_ == null) + { + revive_ = new global::PokemonGo.RocketAPI.GeneratedCode.ReviveAttributes(); + } + input.ReadMessage(revive_); + break; } - input.ReadMessage(revive_); - break; - } case 74: - { - if (battle_ == null) { - battle_ = new global::PokemonGo.RocketAPI.GeneratedCode.BattleAttributes(); + if (battle_ == null) + { + battle_ = new global::PokemonGo.RocketAPI.GeneratedCode.BattleAttributes(); + } + input.ReadMessage(battle_); + break; } - input.ReadMessage(battle_); - break; - } case 82: - { - if (food_ == null) { - food_ = new global::PokemonGo.RocketAPI.GeneratedCode.FoodAttributes(); + if (food_ == null) + { + food_ = new global::PokemonGo.RocketAPI.GeneratedCode.FoodAttributes(); + } + input.ReadMessage(food_); + break; } - input.ReadMessage(food_); - break; - } case 90: - { - if (inventoryUpgrade_ == null) { - inventoryUpgrade_ = - new global::PokemonGo.RocketAPI.GeneratedCode.InventoryUpgradeAttributes(); + if (inventoryUpgrade_ == null) + { + inventoryUpgrade_ = + new global::PokemonGo.RocketAPI.GeneratedCode.InventoryUpgradeAttributes(); + } + input.ReadMessage(inventoryUpgrade_); + break; } - input.ReadMessage(inventoryUpgrade_); - break; - } case 98: - { - if (xpBoost_ == null) { - xpBoost_ = new global::PokemonGo.RocketAPI.GeneratedCode.ExperienceBoostAttributes(); + if (xpBoost_ == null) + { + xpBoost_ = new global::PokemonGo.RocketAPI.GeneratedCode.ExperienceBoostAttributes(); + } + input.ReadMessage(xpBoost_); + break; } - input.ReadMessage(xpBoost_); - break; - } case 106: - { - if (incense_ == null) { - incense_ = new global::PokemonGo.RocketAPI.GeneratedCode.IncenseAttributes(); + if (incense_ == null) + { + incense_ = new global::PokemonGo.RocketAPI.GeneratedCode.IncenseAttributes(); + } + input.ReadMessage(incense_); + break; } - input.ReadMessage(incense_); - break; - } case 114: - { - if (eggIncubator_ == null) { - eggIncubator_ = new global::PokemonGo.RocketAPI.GeneratedCode.EggIncubatorAttributes(); + if (eggIncubator_ == null) + { + eggIncubator_ = new global::PokemonGo.RocketAPI.GeneratedCode.EggIncubatorAttributes(); + } + input.ReadMessage(eggIncubator_); + break; } - input.ReadMessage(eggIncubator_); - break; - } case 122: - { - if (fortModifier_ == null) { - fortModifier_ = new global::PokemonGo.RocketAPI.GeneratedCode.FortModifierAttributes(); + if (fortModifier_ == null) + { + fortModifier_ = new global::PokemonGo.RocketAPI.GeneratedCode.FortModifierAttributes(); + } + input.ReadMessage(fortModifier_); + break; } - input.ReadMessage(fortModifier_); - break; - } } } } @@ -25284,10 +25315,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 13: - { - StaPercent = input.ReadFloat(); - break; - } + { + StaPercent = input.ReadFloat(); + break; + } } } } @@ -25402,7 +25433,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (IncubatorType != 0) { output.WriteRawTag(8); - output.WriteEnum((int) IncubatorType); + output.WriteEnum((int)IncubatorType); } if (Uses != 0) { @@ -25421,7 +25452,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (IncubatorType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) IncubatorType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)IncubatorType); } if (Uses != 0) { @@ -25465,20 +25496,20 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - incubatorType_ = (global::AllEnum.EggIncubatorType) input.ReadEnum(); - break; - } + { + incubatorType_ = (global::AllEnum.EggIncubatorType)input.ReadEnum(); + break; + } case 16: - { - Uses = input.ReadInt32(); - break; - } + { + Uses = input.ReadInt32(); + break; + } case 29: - { - DistanceMultiplier = input.ReadFloat(); - break; - } + { + DistanceMultiplier = input.ReadFloat(); + break; + } } } } @@ -25633,15 +25664,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 13: - { - XpMultiplier = input.ReadFloat(); - break; - } + { + XpMultiplier = input.ReadFloat(); + break; + } case 16: - { - BoostDurationMs = input.ReadInt32(); - break; - } + { + BoostDurationMs = input.ReadInt32(); + break; + } } } } @@ -25683,7 +25714,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode new pb::MessageParser<FoodAttributes>(() => new FoodAttributes()); private static readonly pb::FieldCodec<global::AllEnum.ItemEffect> _repeated_itemEffect_codec - = pb::FieldCodec.ForEnum(10, x => (int) x, x => (global::AllEnum.ItemEffect) x); + = pb::FieldCodec.ForEnum(10, x => (int)x, x => (global::AllEnum.ItemEffect)x); private static readonly pb::FieldCodec<float> _repeated_itemEffectPercent_codec = pb::FieldCodec.ForFloat(18); @@ -25807,21 +25838,21 @@ namespace PokemonGo.RocketAPI.GeneratedCode break; case 10: case 8: - { - itemEffect_.AddEntriesFrom(input, _repeated_itemEffect_codec); - break; - } + { + itemEffect_.AddEntriesFrom(input, _repeated_itemEffect_codec); + break; + } case 18: case 21: - { - itemEffectPercent_.AddEntriesFrom(input, _repeated_itemEffectPercent_codec); - break; - } + { + itemEffectPercent_.AddEntriesFrom(input, _repeated_itemEffectPercent_codec); + break; + } case 29: - { - GrowthPercent = input.ReadFloat(); - break; - } + { + GrowthPercent = input.ReadFloat(); + break; + } } } } @@ -25976,15 +26007,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - ModifierLifetimeSeconds = input.ReadInt32(); - break; - } + { + ModifierLifetimeSeconds = input.ReadInt32(); + break; + } case 16: - { - TroyDiskNumPokemonSpawned = input.ReadInt32(); - break; - } + { + TroyDiskNumPokemonSpawned = input.ReadInt32(); + break; + } } } } @@ -26038,7 +26069,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode new pb::MessageParser<IncenseAttributes>(() => new IncenseAttributes()); private static readonly pb::FieldCodec<global::AllEnum.PokemonType> _repeated_pokemonType_codec - = pb::FieldCodec.ForEnum(18, x => (int) x, x => (global::AllEnum.PokemonType) x); + = pb::FieldCodec.ForEnum(18, x => (int)x, x => (global::AllEnum.PokemonType)x); private readonly pbc::RepeatedField<global::AllEnum.PokemonType> pokemonType_ = new pbc::RepeatedField<global::AllEnum.PokemonType>(); @@ -26258,41 +26289,41 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - IncenseLifetimeSeconds = input.ReadInt32(); - break; - } + { + IncenseLifetimeSeconds = input.ReadInt32(); + break; + } case 18: case 16: - { - pokemonType_.AddEntriesFrom(input, _repeated_pokemonType_codec); - break; - } + { + pokemonType_.AddEntriesFrom(input, _repeated_pokemonType_codec); + break; + } case 29: - { - PokemonIncenseTypeProbability = input.ReadFloat(); - break; - } + { + PokemonIncenseTypeProbability = input.ReadFloat(); + break; + } case 32: - { - StandingTimeBetweenEncountersSeconds = input.ReadInt32(); - break; - } + { + StandingTimeBetweenEncountersSeconds = input.ReadInt32(); + break; + } case 40: - { - MovingTimeBetweenEncounterSeconds = input.ReadInt32(); - break; - } + { + MovingTimeBetweenEncounterSeconds = input.ReadInt32(); + break; + } case 48: - { - DistanceRequiredForShorterIntervalMeters = input.ReadInt32(); - break; - } + { + DistanceRequiredForShorterIntervalMeters = input.ReadInt32(); + break; + } case 56: - { - PokemonAttractedLengthSec = input.ReadInt32(); - break; - } + { + PokemonAttractedLengthSec = input.ReadInt32(); + break; + } } } } @@ -26407,7 +26438,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (UpgradeType != 0) { output.WriteRawTag(16); - output.WriteEnum((int) UpgradeType); + output.WriteEnum((int)UpgradeType); } } @@ -26420,7 +26451,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode } if (UpgradeType != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) UpgradeType); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)UpgradeType); } return size; } @@ -26452,15 +26483,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - AdditionalStorage = input.ReadInt32(); - break; - } + { + AdditionalStorage = input.ReadInt32(); + break; + } case 16: - { - upgradeType_ = (global::AllEnum.InventoryUpgradeType) input.ReadEnum(); - break; - } + { + upgradeType_ = (global::AllEnum.InventoryUpgradeType)input.ReadEnum(); + break; + } } } } @@ -26588,7 +26619,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode if (ItemEffect != 0) { output.WriteRawTag(8); - output.WriteEnum((int) ItemEffect); + output.WriteEnum((int)ItemEffect); } if (CaptureMulti != 0F) { @@ -26612,7 +26643,7 @@ namespace PokemonGo.RocketAPI.GeneratedCode var size = 0; if (ItemEffect != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ItemEffect); + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ItemEffect); } if (CaptureMulti != 0F) { @@ -26664,25 +26695,25 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - itemEffect_ = (global::AllEnum.ItemEffect) input.ReadEnum(); - break; - } + { + itemEffect_ = (global::AllEnum.ItemEffect)input.ReadEnum(); + break; + } case 21: - { - CaptureMulti = input.ReadFloat(); - break; - } + { + CaptureMulti = input.ReadFloat(); + break; + } case 29: - { - CaptureMultiEffect = input.ReadFloat(); - break; - } + { + CaptureMultiEffect = input.ReadFloat(); + break; + } case 37: - { - ItemEffectMod = input.ReadFloat(); - break; - } + { + ItemEffectMod = input.ReadFloat(); + break; + } } } } @@ -26838,15 +26869,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 13: - { - StaPercent = input.ReadFloat(); - break; - } + { + StaPercent = input.ReadFloat(); + break; + } case 16: - { - StaAmount = input.ReadInt32(); - break; - } + { + StaAmount = input.ReadInt32(); + break; + } } } } @@ -26975,10 +27006,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 13: - { - StaPercent = input.ReadFloat(); - break; - } + { + StaPercent = input.ReadFloat(); + break; + } } } } @@ -27109,10 +27140,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - PokemonId = input.ReadFixed64(); - break; - } + { + PokemonId = input.ReadFixed64(); + break; + } } } } @@ -27265,15 +27296,15 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Status = input.ReadInt32(); - break; - } + { + Status = input.ReadInt32(); + break; + } case 16: - { - CandyAwarded = input.ReadInt32(); - break; - } + { + CandyAwarded = input.ReadInt32(); + break; + } } } } @@ -27405,10 +27436,10 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 9: - { - PokemonId = input.ReadFixed64(); - break; - } + { + PokemonId = input.ReadFixed64(); + break; + } } } } @@ -27615,29 +27646,29 @@ namespace PokemonGo.RocketAPI.GeneratedCode input.SkipLastField(); break; case 8: - { - Result = input.ReadInt32(); - break; - } + { + Result = input.ReadInt32(); + break; + } case 18: - { - if (evolvedPokemon_ == null) { - evolvedPokemon_ = new global::PokemonGo.RocketAPI.GeneratedCode.Pokemon(); + if (evolvedPokemon_ == null) + { + evolvedPokemon_ = new global::PokemonGo.RocketAPI.GeneratedCode.Pokemon(); + } + input.ReadMessage(evolvedPokemon_); + break; } - input.ReadMessage(evolvedPokemon_); - break; - } case 24: - { - ExpAwarded = input.ReadInt32(); - break; - } + { + ExpAwarded = input.ReadInt32(); + break; + } case 32: - { - CandyAwarded = input.ReadInt32(); - break; - } + { + CandyAwarded = input.ReadInt32(); + break; + } } } } diff --git a/PokemonGo/RocketAPI/ISettings.cs b/PokemonGo/RocketAPI/ISettings.cs index 9fc20db..6174471 100644 --- a/PokemonGo/RocketAPI/ISettings.cs +++ b/PokemonGo/RocketAPI/ISettings.cs @@ -18,11 +18,14 @@ namespace PokemonGo.RocketAPI string GoogleRefreshToken { get; set; } string PtcPassword { get; } string PtcUsername { get; } + string Email { get; } + string Password { get; } bool EvolveAllGivenPokemons { get; } string TransferType { get; } int TransferCPThreshold { get; } int TransferIVThreshold { get; } int TravelSpeed { get; } + int ImageSize { get; } bool Recycler { get; } ICollection<KeyValuePair<AllEnum.ItemId, int>> ItemRecycleFilter { get; } int RecycleItemsInterval { get; } diff --git a/PokemonGo/RocketAPI/Window/App.config b/PokemonGo/RocketAPI/Window/App.config index 6a36abc..e6b3fa7 100644 --- a/PokemonGo/RocketAPI/Window/App.config +++ b/PokemonGo/RocketAPI/Window/App.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> - <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> - </startup> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> + </startup> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> @@ -18,10 +18,14 @@ <!--Username--> <add key="PtcPassword" value="" /> <!--Password--> + <add key="Email" value="" /> + <!--Google E-mail--> + <add key="Password" value="" /> + <!--E-mail Password--> <add key="GoogleRefreshToken" value="" /> - <add key="DefaultLatitude" value="-34.915866" /> + <add key="DefaultLatitude" value="-36.714359" /> <!--Default Viaduct Harbour, Auckland, New Zealand--> - <add key="DefaultLongitude" value="138.59798" /> + <add key="DefaultLongitude" value="174.747205" /> <!--Default Viaduct Harbour, Auckland, New Zealand--> <add key="LevelOutput" value="levelup" /> <!--2 Modes: "time": Every XXX seconds and "levelup" every levelup--> @@ -37,28 +41,19 @@ <!--When to use RazzBerry cp/probability--> <add key="RazzBerrySetting" value="0.4" /> <!--Cp Mode: Use RazzBerry when Pokemon is over this value; pobability Mode: Use Razzberry when % between 0 and 1 of catching is under this value--> - <add key="TransferType" value="Leave Strongest" /> - <!--none/cp/leaveStrongest/duplicate/all Whitelists/blackslists for each type is in Program.cs--> - <add key="TransferCPThreshold" value="500" /> + <add key="TransferType" value="Duplicate" /> + <!--none/cp/iv/leaveStrongest/duplicate/all Whitelists/blackslists for each type is in Program.cs--> + <add key="TransferCPThreshold" value="0" /> <!--transfer pokemon with CP less than this value if cp transfer type is selected. Whitelist in Program.cs--> <add key="TransferIVThreshold" value="0" /> <!--transfer pokemon with IV less than this value if iv transfer type is selected. Whitelist in Program.cs--> - <add key="TravelSpeed" value="60" /> + <add key="TravelSpeed" value="60"/> <!--The speed to travel in km/h--> - <add key="CatchPokemon" value="true" /> + <add key="ImageSize" value="50"/> + <!--PokeUi image size--> + <add key="CatchPokemon" value="true"/> <!--Only visit pokestop and collect items--> <add key="EvolveAllGivenPokemons" value="false" /> <add key="ClientSettingsProvider.ServiceUri" value="" /> - - <add key="MaxItemPokeBall" value="100"/> - <add key="MaxItemGreatBall" value="100"/> - <add key="MaxItemUltraBall" value="100"/> - <add key="MaxItemMasterBall" value="200"/> - <add key="MaxItemRazzBerry" value="100"/> - <add key="MaxItemRevive" value="20"/> - <add key="MaxItemPotion" value="0"/> - <add key="MaxItemSuperPotion" value="0"/> - <add key="MaxItemHyperPotion" value="50"/> - <add key="MaxItemMaxPotion" value="100"/> </appSettings> -</configuration> +</configuration> \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Window/LocationManager.cs b/PokemonGo/RocketAPI/Window/LocationManager.cs index 46a3b57..6896d41 100644 --- a/PokemonGo/RocketAPI/Window/LocationManager.cs +++ b/PokemonGo/RocketAPI/Window/LocationManager.cs @@ -25,7 +25,7 @@ namespace PokemonGo.RocketAPI.Window public async Task update(double lat, double lng) { - double waitTime = getDistance(lat, lng)/this.kilometersPerMillisecond; + double waitTime = getDistance(lat, lng) / this.kilometersPerMillisecond; await Task.Delay((int)Math.Ceiling(waitTime)); await client.UpdatePlayerLocation(lat, lng); } @@ -46,14 +46,16 @@ namespace PokemonGo.RocketAPI.Window { double R = 6371; Func<double, double> toRad = x => x * (Math.PI / 180); - + double dLat = toRad(c2.latitude - this.latitude); + double dLong = toRad(c2.longitude - c2.longitude); double lat1 = toRad(this.latitude); double lat2 = toRad(c2.latitude); - double dLng = toRad(c2.longitude - c2.longitude); - - return Math.Acos(Math.Sin(lat1) * Math.Sin(lat2) + Math.Cos(lat1) * Math.Cos(lat2) * Math.Cos(dLng)) * R; + double a = Math.Sin(dLat / 2) * Math.Sin(dLat / 2) + + Math.Sin(dLong / 2) * Math.Sin(dLong / 2) * Math.Cos(lat1) * Math.Cos(lat2); + double c = 2 * Math.Atan2(Math.Sqrt(a), Math.Sqrt(1 - a)); + return R * c; } } } -} +} \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs index 534c29e..4cc357f 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs @@ -54,9 +54,14 @@ namespace PokemonGo.RocketAPI.Window this.largePokemonImageList = new System.Windows.Forms.ImageList(this.components); this.smallPokemonImageList = new System.Windows.Forms.ImageList(this.components); this.button1 = new System.Windows.Forms.Button(); + this.pokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.objectListView1)).BeginInit(); + this.tabControl1.SuspendLayout(); this.SuspendLayout(); // // logTextBox @@ -66,11 +71,10 @@ namespace PokemonGo.RocketAPI.Window this.logTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.logTextBox.ForeColor = System.Drawing.Color.White; this.logTextBox.ImeMode = System.Windows.Forms.ImeMode.Off; - this.logTextBox.Location = new System.Drawing.Point(0, 32); - this.logTextBox.Margin = new System.Windows.Forms.Padding(4); + this.logTextBox.Location = new System.Drawing.Point(0, 24); this.logTextBox.Name = "logTextBox"; this.logTextBox.ReadOnly = true; - this.logTextBox.Size = new System.Drawing.Size(720, 450); + this.logTextBox.Size = new System.Drawing.Size(668, 338); this.logTextBox.TabIndex = 0; this.logTextBox.Text = ""; this.logTextBox.TextChanged += new System.EventHandler(this.logTextBox_TextChanged); @@ -80,17 +84,16 @@ namespace PokemonGo.RocketAPI.Window this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 824); + this.statusStrip1.Location = new System.Drawing.Point(0, 615); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); - this.statusStrip1.Size = new System.Drawing.Size(1178, 25); + this.statusStrip1.Size = new System.Drawing.Size(1012, 22); this.statusStrip1.TabIndex = 1; this.statusStrip1.Text = "statusStrip1"; // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(49, 20); + this.statusLabel.Size = new System.Drawing.Size(43, 17); this.statusLabel.Text = "Status"; // // menuStrip1 @@ -100,39 +103,39 @@ namespace PokemonGo.RocketAPI.Window this.startStopBotToolStripMenuItem, this.todoToolStripMenuItem, this.useLuckyEggToolStripMenuItem, - this.forceUnbanToolStripMenuItem}); + this.forceUnbanToolStripMenuItem, + this.pokeToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(1178, 28); + this.menuStrip1.Size = new System.Drawing.Size(1012, 25); this.menuStrip1.TabIndex = 2; this.menuStrip1.Text = "menuStrip1"; // // startStopBotToolStripMenuItem // this.startStopBotToolStripMenuItem.Name = "startStopBotToolStripMenuItem"; - this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(79, 24); + this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(71, 21); this.startStopBotToolStripMenuItem.Text = "Start Bot"; this.startStopBotToolStripMenuItem.Click += new System.EventHandler(this.startStopBotToolStripMenuItem_Click); // // todoToolStripMenuItem // this.todoToolStripMenuItem.Name = "todoToolStripMenuItem"; - this.todoToolStripMenuItem.Size = new System.Drawing.Size(74, 24); + this.todoToolStripMenuItem.Size = new System.Drawing.Size(66, 21); this.todoToolStripMenuItem.Text = "Settings"; this.todoToolStripMenuItem.Click += new System.EventHandler(this.todoToolStripMenuItem_Click); // // useLuckyEggToolStripMenuItem // this.useLuckyEggToolStripMenuItem.Name = "useLuckyEggToolStripMenuItem"; - this.useLuckyEggToolStripMenuItem.Size = new System.Drawing.Size(115, 24); + this.useLuckyEggToolStripMenuItem.Size = new System.Drawing.Size(105, 21); this.useLuckyEggToolStripMenuItem.Text = "Use Lucky Egg"; this.useLuckyEggToolStripMenuItem.Click += new System.EventHandler(this.useLuckyEggToolStripMenuItem_Click); // // forceUnbanToolStripMenuItem // this.forceUnbanToolStripMenuItem.Name = "forceUnbanToolStripMenuItem"; - this.forceUnbanToolStripMenuItem.Size = new System.Drawing.Size(104, 24); + this.forceUnbanToolStripMenuItem.Size = new System.Drawing.Size(94, 21); this.forceUnbanToolStripMenuItem.Text = "Force Unban"; this.forceUnbanToolStripMenuItem.Click += new System.EventHandler(this.forceUnbanToolStripMenuItem_Click); // @@ -155,8 +158,7 @@ namespace PokemonGo.RocketAPI.Window this.gMapControl1.GrayScaleMode = false; this.gMapControl1.HelperLineOption = GMap.NET.WindowsForms.HelperLineOptions.DontShow; this.gMapControl1.LevelsKeepInMemmory = 5; - this.gMapControl1.Location = new System.Drawing.Point(728, 32); - this.gMapControl1.Margin = new System.Windows.Forms.Padding(4); + this.gMapControl1.Location = new System.Drawing.Point(674, 24); this.gMapControl1.MarkersEnabled = true; this.gMapControl1.MaxZoom = 2; this.gMapControl1.MinZoom = 2; @@ -169,7 +171,7 @@ namespace PokemonGo.RocketAPI.Window this.gMapControl1.ScaleMode = GMap.NET.WindowsForms.ScaleModes.Integer; this.gMapControl1.SelectedAreaFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(65)))), ((int)(((byte)(105)))), ((int)(((byte)(225))))); this.gMapControl1.ShowTileGridLines = false; - this.gMapControl1.Size = new System.Drawing.Size(450, 450); + this.gMapControl1.Size = new System.Drawing.Size(338, 338); this.gMapControl1.TabIndex = 23; this.gMapControl1.Zoom = 0D; // @@ -199,20 +201,22 @@ namespace PokemonGo.RocketAPI.Window this.pkmnPowerUpButton, this.pkmnEvolveButton}); this.objectListView1.Cursor = System.Windows.Forms.Cursors.Default; + this.objectListView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.objectListView1.FullRowSelect = true; this.objectListView1.GridLines = true; this.objectListView1.LargeImageList = this.largePokemonImageList; - this.objectListView1.Location = new System.Drawing.Point(0, 490); - this.objectListView1.Margin = new System.Windows.Forms.Padding(4); + this.objectListView1.Location = new System.Drawing.Point(0, 368); this.objectListView1.MultiSelect = false; this.objectListView1.Name = "objectListView1"; this.objectListView1.RowHeight = 32; + this.objectListView1.SelectAllOnControlA = false; this.objectListView1.ShowGroups = false; - this.objectListView1.Size = new System.Drawing.Size(1177, 285); + this.objectListView1.Size = new System.Drawing.Size(668, 215); this.objectListView1.SmallImageList = this.smallPokemonImageList; this.objectListView1.TabIndex = 25; this.objectListView1.UseCompatibleStateImageBehavior = false; this.objectListView1.View = System.Windows.Forms.View.Details; + this.objectListView1.SelectedIndexChanged += new System.EventHandler(this.objectListView1_SelectedIndexChanged); // // pkmnName // @@ -290,20 +294,59 @@ namespace PokemonGo.RocketAPI.Window this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.button1.Location = new System.Drawing.Point(0, 784); - this.button1.Margin = new System.Windows.Forms.Padding(4); + this.button1.Location = new System.Drawing.Point(0, 588); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(1178, 34); + this.button1.Size = new System.Drawing.Size(668, 26); this.button1.TabIndex = 26; this.button1.Text = "Refresh"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // + // pokeToolStripMenuItem + // + this.pokeToolStripMenuItem.Name = "pokeToolStripMenuItem"; + this.pokeToolStripMenuItem.Size = new System.Drawing.Size(50, 21); + this.pokeToolStripMenuItem.Text = "poke"; + this.pokeToolStripMenuItem.Click += new System.EventHandler(this.pokeToolStripMenuItem_Click); + // + // tabControl1 + // + this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Bottom; + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(674, 368); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(338, 246); + this.tabControl1.TabIndex = 27; + // + // tabPage1 + // + this.tabPage1.Location = new System.Drawing.Point(4, 4); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(330, 220); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "tabPage1"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Location = new System.Drawing.Point(4, 4); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(330, 220); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "tabPage2"; + this.tabPage2.UseVisualStyleBackColor = true; + // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1178, 849); + this.ClientSize = new System.Drawing.Size(1012, 637); + this.Controls.Add(this.tabControl1); this.Controls.Add(this.gMapControl1); this.Controls.Add(this.logTextBox); this.Controls.Add(this.button1); @@ -314,7 +357,6 @@ namespace PokemonGo.RocketAPI.Window this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -325,6 +367,7 @@ namespace PokemonGo.RocketAPI.Window this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.objectListView1)).EndInit(); + this.tabControl1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -356,5 +399,9 @@ namespace PokemonGo.RocketAPI.Window private System.Windows.Forms.ImageList largePokemonImageList; private BrightIdeasSoftware.OLVColumn pkmnPowerUpButton; private BrightIdeasSoftware.OLVColumn pkmnEvolveButton; + private System.Windows.Forms.ToolStripMenuItem pokeToolStripMenuItem; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; } } diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs index 81fb192..2b255f5 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.cs @@ -47,11 +47,9 @@ namespace PokemonGo.RocketAPI.Window public MainForm() { - InitializeComponent(); synchronizationContext = SynchronizationContext.Current; + InitializeComponent(); ClientSettings = Settings.Instance; - Client.OnConsoleWrite += Client_OnConsoleWrite; - Instance = this; } private void MainForm_Load(object sender, EventArgs e) @@ -256,14 +254,10 @@ namespace PokemonGo.RocketAPI.Window private async void Execute() { - if (client == null) - { - client = new Client(ClientSettings); - this.locationManager = new LocationManager(client, ClientSettings.TravelSpeed); - } + client = new Client(ClientSettings); + this.locationManager = new LocationManager(client, ClientSettings.TravelSpeed); try { - if (!client.HasServerSet()) { switch (ClientSettings.AuthType) { @@ -273,111 +267,111 @@ namespace PokemonGo.RocketAPI.Window break; case AuthType.Google: ColoredConsoleWrite(Color.Green, "Login Type: Google"); - if (ClientSettings.GoogleRefreshToken == "") - ColoredConsoleWrite(Color.Green, "Now opening www.Google.com/device and copying the 8 digit code to your clipboard"); + await client.DoGoogleLogin(ClientSettings.Email, ClientSettings.Password); - await client.DoGoogleLogin(); break; } await client.SetServer(); - } - var profile = await client.GetProfile(); - var settings = await client.GetSettings(); - var mapObjects = await client.GetMapObjects(); - var inventory = await client.GetInventory(); - var pokemons = - inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Pokemon) - .Where(p => p != null && p?.PokemonId > 0); - - ConsoleLevelTitle(profile.Profile.Username, client); - - // Write the players ingame details - ColoredConsoleWrite(Color.Yellow, "----------------------------"); - /*// dont actually want to display info but keeping here incase people want to \O_O/ - * if (ClientSettings.AuthType == AuthType.Ptc) - { - ColoredConsoleWrite(Color.Cyan, "Account: " + ClientSettings.PtcUsername); - ColoredConsoleWrite(Color.Cyan, "Password: " + ClientSettings.PtcPassword + "\n"); - } - else - { - ColoredConsoleWrite(Color.Cyan, "Email: " + ClientSettings.Email); - ColoredConsoleWrite(Color.Cyan, "Password: " + ClientSettings.Password + "\n"); - }*/ - ColoredConsoleWrite(Color.DarkGray, "Name: " + profile.Profile.Username); - ColoredConsoleWrite(Color.DarkGray, "Team: " + profile.Profile.Team); - if (profile.Profile.Currency.ToArray()[0].Amount > 0) // If player has any pokecoins it will show how many they have. - ColoredConsoleWrite(Color.DarkGray, "Pokecoins: " + profile.Profile.Currency.ToArray()[0].Amount); - ColoredConsoleWrite(Color.DarkGray, "Stardust: " + profile.Profile.Currency.ToArray()[1].Amount + "\n"); - ColoredConsoleWrite(Color.DarkGray, "Latitude: " + ClientSettings.DefaultLatitude); - ColoredConsoleWrite(Color.DarkGray, "Longitude: " + ClientSettings.DefaultLongitude); - try - { - ColoredConsoleWrite(Color.DarkGray, "Country: " + CallAPI("country", ClientSettings.DefaultLatitude, ClientSettings.DefaultLongitude)); - ColoredConsoleWrite(Color.DarkGray, "Area: " + CallAPI("place", ClientSettings.DefaultLatitude, ClientSettings.DefaultLongitude)); - } - catch (Exception) - { - ColoredConsoleWrite(Color.DarkGray, "Unable to get Country/Place"); - } + var profile = await client.GetProfile(); + var settings = await client.GetSettings(); + var mapObjects = await client.GetMapObjects(); + var inventory = await client.GetInventory(); + var pokemons = + inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Pokemon) + .Where(p => p != null && p?.PokemonId > 0); + + ConsoleLevelTitle(profile.Profile.Username, client); + + // Write the players ingame details + InitializeMap(); + ColoredConsoleWrite(Color.Yellow, "----------------------------"); + if (ClientSettings.AuthType == AuthType.Ptc) + { + ColoredConsoleWrite(Color.Cyan, "Account: " + ClientSettings.PtcUsername); + ColoredConsoleWrite(Color.Cyan, "Password: " + ClientSettings.PtcPassword + "\n"); + } + else + { + ColoredConsoleWrite(Color.Cyan, "Email: " + ClientSettings.Email); + ColoredConsoleWrite(Color.Cyan, "Password: " + ClientSettings.Password + "\n"); + } + ColoredConsoleWrite(Color.DarkGray, "Name: " + profile.Profile.Username); + ColoredConsoleWrite(Color.DarkGray, "Team: " + profile.Profile.Team); + if (profile.Profile.Currency.ToArray()[0].Amount > 0) // If player has any pokecoins it will show how many they have. + ColoredConsoleWrite(Color.DarkGray, "Pokecoins: " + profile.Profile.Currency.ToArray()[0].Amount); + ColoredConsoleWrite(Color.DarkGray, "Stardust: " + profile.Profile.Currency.ToArray()[1].Amount + "\n"); + ColoredConsoleWrite(Color.DarkGray, "Latitude: " + ClientSettings.DefaultLatitude); + ColoredConsoleWrite(Color.DarkGray, "Longitude: " + ClientSettings.DefaultLongitude); + try + { + ColoredConsoleWrite(Color.DarkGray, "Country: " + CallAPI("country", ClientSettings.DefaultLatitude, ClientSettings.DefaultLongitude)); + ColoredConsoleWrite(Color.DarkGray, "Area: " + CallAPI("place", ClientSettings.DefaultLatitude, ClientSettings.DefaultLongitude)); + } + catch (Exception) + { + ColoredConsoleWrite(Color.DarkGray, "Unable to get Country/Place"); + } - ColoredConsoleWrite(Color.Yellow, "----------------------------"); + ColoredConsoleWrite(Color.Yellow, "----------------------------"); - // I believe a switch is more efficient and easier to read. - switch (ClientSettings.TransferType) - { - case "Leave Strongest": - await TransferAllButStrongestUnwantedPokemon(client); - break; - case "All": - await TransferAllGivenPokemons(client, pokemons); - break; - case "Duplicate": - await TransferDuplicatePokemon(client); - break; - case "IV Duplicate": - await TransferDuplicateIVPokemon(client); - break; - case "CP": - await TransferAllWeakPokemon(client, ClientSettings.TransferCPThreshold); - break; - case "IV": - await TransferAllGivenPokemons(client, pokemons, ClientSettings.TransferIVThreshold); - break; - default: - ColoredConsoleWrite(Color.DarkGray, "Transfering pokemon disabled"); - break; - } + // I believe a switch is more efficient and easier to read. + switch (ClientSettings.TransferType) + { + case "Leave Strongest": + await TransferAllButStrongestUnwantedPokemon(client); + break; + case "All": + await TransferAllGivenPokemons(client, pokemons); + break; + case "Duplicate": + await TransferDuplicatePokemon(client); + break; + case "IV Duplicate": + await TransferDuplicateIVPokemon(client); + break; + case "CP": + await TransferAllWeakPokemon(client, ClientSettings.TransferCPThreshold); + break; + case "IV": + await TransferAllGivenPokemons(client, pokemons, ClientSettings.TransferIVThreshold); + break; + default: + ColoredConsoleWrite(Color.DarkGray, "Transfering pokemon disabled"); + break; + } - if (ClientSettings.EvolveAllGivenPokemons) - await EvolveAllGivenPokemons(client, pokemons); - if (ClientSettings.Recycler) - client.RecycleItems(client); + if (ClientSettings.EvolveAllGivenPokemons) + await EvolveAllGivenPokemons(client, pokemons); + if (ClientSettings.Recycler) + client.RecycleItems(client); - await Task.Delay(5000); - PrintLevel(client); - await ExecuteFarmingPokestopsAndPokemons(client); + await Task.Delay(5000); + PrintLevel(client); + await ExecuteFarmingPokestopsAndPokemons(client); - while (ForceUnbanning) - await Task.Delay(25); + while (ForceUnbanning) + await Task.Delay(25); - // await ForceUnban(client); - if (!Stopping) - { - ColoredConsoleWrite(Color.Red, $"No nearby useful locations found. Please wait 10 seconds."); - await Task.Delay(10000); - CheckVersion(); - Execute(); - } - else - { - ConsoleClear(); - ColoredConsoleWrite(Color.Red, $"Bot successfully stopped."); - startStopBotToolStripMenuItem.Text = "Start"; - Stopping = false; - bot_started = false; + // await ForceUnban(client); + if (!Stopping) + { + ColoredConsoleWrite(Color.Red, $"No nearby useful locations found. Please wait 10 seconds."); + await Task.Delay(10000); + CheckVersion(); + Execute(); + } + else + { + ConsoleClear(); + pokestopsOverlay.Routes.Clear(); + pokestopsOverlay.Markers.Clear(); + ColoredConsoleWrite(Color.Red, $"Bot successfully stopped."); + startStopBotToolStripMenuItem.Text = "Start"; + Stopping = false; + bot_started = false; + } } } catch (Exception ex) @@ -393,7 +387,7 @@ namespace PokemonGo.RocketAPI.Window private static string CallAPI(string elem, double lat, double lon) { - using (XmlReader reader = XmlReader.Create(@"http://api.geonames.org/findNearby?lat=" + lat + "&lng=" + lon + "&username=demo")) + using (XmlReader reader = XmlReader.Create(@"http://api.geonames.org/findNearby?lat=" + lat + "&lng=" + lon + "&username=pokemonbot")) { while (reader.Read()) { @@ -459,7 +453,7 @@ namespace PokemonGo.RocketAPI.Window UpdateMap(); var encounterPokemonResponse = await client.EncounterPokemon(pokemon.EncounterId, pokemon.SpawnpointId); var pokemonCP = encounterPokemonResponse?.WildPokemon?.PokemonData?.Cp; - var pokemonIV = Math.Round((double)encounterPokemonResponse?.WildPokemon?.PokemonData.GetIV() * 100); + var pokemonIV = Math.Round(Perfect(encounterPokemonResponse?.WildPokemon?.PokemonData)); CatchPokemonResponse caughtPokemonResponse; ColoredConsoleWrite(Color.Green, $"Encounter a {pokemonName} with {pokemonCP} CP and {pokemonIV}% IV"); do @@ -531,7 +525,7 @@ namespace PokemonGo.RocketAPI.Window }), new PointLatLng(latitude, longitude)); - ColoredConsoleWrite(Color.Cyan, $"Moving player location to Lat: {latitude}, Lng: {longitude}"); + ColoredConsoleWrite(Color.Gray, $"Moving player location to Lat: {latitude}, Lng: {longitude}"); } private void UpdateMap() @@ -557,7 +551,7 @@ namespace PokemonGo.RocketAPI.Window } pokestopsOverlay.Routes.Clear(); pokestopsOverlay.Routes.Add(new GMapRoute(routePoint, "Walking Path")); - + pokemonsOverlay.Markers.Clear(); if (wildPokemons != null) @@ -578,11 +572,12 @@ namespace PokemonGo.RocketAPI.Window { var mapObjects = await client.GetMapObjects(); - FortData[] rawPokeStops = mapObjects.MapCells.SelectMany(i => i.Forts).Where(i => i.Type == FortType.Checkpoint).ToArray(); + FortData[] rawPokeStops = mapObjects.MapCells.SelectMany(i => i.Forts).Where(i => i.Type == FortType.Checkpoint && i.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime()).ToArray(); pokeStops = PokeStopOptimizer.Optimize(rawPokeStops, ClientSettings.DefaultLatitude, ClientSettings.DefaultLongitude, pokestopsOverlay); wildPokemons = mapObjects.MapCells.SelectMany(i => i.WildPokemons); if (!ForceUnbanning && !Stopping) ColoredConsoleWrite(Color.Cyan, $"Visiting {pokeStops.Count()} PokeStops"); + UpdateMap(); foreach (var pokeStop in pokeStops) @@ -615,14 +610,16 @@ namespace PokemonGo.RocketAPI.Window TotalExperience += (fortSearch.ExperienceAwarded); pokeStop.CooldownCompleteTimestampMs = DateTime.UtcNow.ToUnixTime() + 300000; - + if (ClientSettings.CatchPokemon) await ExecuteCatchAllNearbyPokemons(client); } FarmingStops = false; - - client.RecycleItems(client); - await ExecuteFarmingPokestopsAndPokemons(client); + if (!ForceUnbanning && !Stopping) + { + client.RecycleItems(client); + await ExecuteFarmingPokestopsAndPokemons(client); + } } private async Task ForceUnban(Client client) @@ -639,44 +636,43 @@ namespace PokemonGo.RocketAPI.Window ColoredConsoleWrite(Color.LightGreen, "Starting force unban..."); - var mapObjects = await client.GetMapObjects(); - var pokeStops = mapObjects.MapCells.SelectMany(i => i.Forts).Where(i => i.Type == FortType.Checkpoint && i.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime()); - - await Task.Delay(10000); + pokestopsOverlay.Routes.Clear(); + pokestopsOverlay.Markers.Clear(); bool done = false; - foreach (var pokeStop in pokeStops) { - - double pokeStopDistance = locationManager.getDistance(pokeStop.Latitude, pokeStop.Longitude); - await locationManager.update(pokeStop.Latitude, pokeStop.Longitude); - var fortInfo = await client.GetFort(pokeStop.Id, pokeStop.Latitude, pokeStop.Longitude); - - if (fortInfo.Name != string.Empty) + if (pokeStop.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime()) { - ColoredConsoleWrite(Color.LightGreen, "Chosen PokeStop " + fortInfo.Name + " for force unban"); - for (int i = 1; i <= 50; i++) + await locationManager.update(pokeStop.Latitude, pokeStop.Longitude); + UpdatePlayerLocation(pokeStop.Latitude, pokeStop.Longitude); + UpdateMap(); + + var fortInfo = await client.GetFort(pokeStop.Id, pokeStop.Latitude, pokeStop.Longitude); + if (fortInfo.Name != string.Empty) { - var fortSearch = await client.SearchFort(pokeStop.Id, pokeStop.Latitude, pokeStop.Longitude); - if (fortSearch.ExperienceAwarded == 0) + ColoredConsoleWrite(Color.LightGreen, "Chosen PokeStop " + fortInfo.Name + " for force unban"); + for (int i = 1; i <= 50; i++) { - ColoredConsoleWrite(Color.LightGreen, "Attempt: " + i); + var fortSearch = await client.SearchFort(pokeStop.Id, pokeStop.Latitude, pokeStop.Longitude); + if (fortSearch.ExperienceAwarded == 0) + { + ColoredConsoleWrite(Color.LightGreen, "Attempt: " + i); + } + else + { + ColoredConsoleWrite(Color.LightGreen, "Fuck yes, you are now unbanned! Total attempts: " + i); + done = true; + break; + } } - else - { - ColoredConsoleWrite(Color.LightGreen, "Fuck yes, you are now unbanned! Total attempts: " + i); - done = true; + if (done) break; - } } } - - if (!done) - ColoredConsoleWrite(Color.LightGreen, "Force unban failed, please try again."); - - ForceUnbanning = false; - break; } + if (!done) + ColoredConsoleWrite(Color.LightGreen, "Force unban failed, please try again."); + ForceUnbanning = false; } else { @@ -707,7 +703,7 @@ namespace PokemonGo.RocketAPI.Window { unwantedPokemonTypes.Add((PokemonId)i); } - + var inventory = await client.GetInventory(); var pokemons = inventory.InventoryDelta.InventoryItems .Select(i => i.InventoryItemData?.Pokemon) @@ -723,17 +719,22 @@ namespace PokemonGo.RocketAPI.Window var unwantedPokemon = pokemonOfDesiredType.Skip(1) // keep the strongest one for potential battle-evolving .ToList(); - + await TransferAllGivenPokemons(client, unwantedPokemon); } } - private async Task TransferAllGivenPokemons(Client client, IEnumerable<PokemonData> unwantedPokemons, float keepPerfectPokemonLimit = 0.8f) + public static float Perfect(PokemonData poke) + { + return ((float)(poke.IndividualAttack + poke.IndividualDefense + poke.IndividualStamina) / (3.0f * 15.0f)) * 100.0f; + } + + private async Task TransferAllGivenPokemons(Client client, IEnumerable<PokemonData> unwantedPokemons, float keepPerfectPokemonLimit = 80.0f) { foreach (var pokemon in unwantedPokemons) { - if (pokemon.GetIV() >= keepPerfectPokemonLimit) continue; - ColoredConsoleWrite(Color.White, $"Pokemon {pokemon.PokemonId} with {pokemon.Cp} CP has IV percent less than {keepPerfectPokemonLimit * 100}%"); + if (Perfect(pokemon) >= keepPerfectPokemonLimit) continue; + ColoredConsoleWrite(Color.White, $"Pokemon {pokemon.PokemonId} with {pokemon.Cp} CP has IV percent less than {keepPerfectPokemonLimit}%"); if (pokemon.Favorite == 0) { @@ -824,7 +825,7 @@ namespace PokemonGo.RocketAPI.Window inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Pokemon) .Where(p => p != null && p?.PokemonId > 0); - var dupes = allpokemons.OrderBy(x => x.GetIV()).Select((x, i) => new { index = i, value = x }) + var dupes = allpokemons.OrderBy(x => Perfect(x)).Select((x, i) => new { index = i, value = x }) .GroupBy(x => x.value.PokemonId) .Where(x => x.Skip(1).Any()); @@ -847,7 +848,7 @@ namespace PokemonGo.RocketAPI.Window else pokemonName = Convert.ToString(dubpokemon.PokemonId); ColoredConsoleWrite(Color.DarkGreen, - $"Transferred {pokemonName} with {Math.Round(dubpokemon.GetIV() * 100)}% IV (Highest is {Math.Round(dupes.ElementAt(i).Last().value.GetIV() * 100)}% IV)"); + $"Transferred {pokemonName} with {Math.Round(Perfect(dubpokemon))}% IV (Highest is {Math.Round(Perfect(dupes.ElementAt(i).Last().value))}% IV)"); } } @@ -906,6 +907,8 @@ namespace PokemonGo.RocketAPI.Window ColoredConsoleWrite(Color.Gray, $"Finished grinding all the meat"); } + + public async Task PrintLevel(Client client) { var inventory = await client.GetInventory(); @@ -1093,7 +1096,7 @@ namespace PokemonGo.RocketAPI.Window private void Client_OnConsoleWrite(ConsoleColor color, string message) { Color c = Color.White; - switch(color) + switch (color) { case ConsoleColor.Green: c = Color.Green; @@ -1189,26 +1192,27 @@ namespace PokemonGo.RocketAPI.Window #region POKEMON LIST - IEnumerable<PokemonFamily> families; + private IEnumerable<PokemonFamily> families; + private void InitializePokemonForm() { objectListView1.ButtonClick += PokemonListButton_Click; - pkmnName.ImageGetter = delegate (object rowObject) - { - PokemonData pokemon = (PokemonData)rowObject; - - String key = pokemon.PokemonId.ToString(); - - if (!objectListView1.SmallImageList.Images.ContainsKey(key)) - { - Image largeImage = GetPokemonImage((int)pokemon.PokemonId); - objectListView1.SmallImageList.Images.Add(key, largeImage); - objectListView1.LargeImageList.Images.Add(key, largeImage); - } - return key; - }; + /* pkmnName.ImageGetter = delegate (object rowObject) + { + PokemonData pokemon = (PokemonData)rowObject; + + String key = pokemon.PokemonId.ToString(); + + if (!objectListView1.SmallImageList.Images.ContainsKey(key)) + { + Image largeImage = GetPokemonImage((int)pokemon.PokemonId); + objectListView1.SmallImageList.Images.Add(key, largeImage); + objectListView1.LargeImageList.Images.Add(key, largeImage); + } + return key; + }; */ objectListView1.CellToolTipShowing += delegate (object sender, ToolTipShowingEventArgs args) { @@ -1224,7 +1228,7 @@ namespace PokemonGo.RocketAPI.Window }; } - private static Image GetPokemonImage(int pokemonId) + private Image GetPokemonImage(int pokemonId) { var Sprites = AppDomain.CurrentDomain.BaseDirectory + "Sprites\\"; string location = Sprites + pokemonId + ".png"; @@ -1243,46 +1247,32 @@ namespace PokemonGo.RocketAPI.Window button1.Enabled = false; objectListView1.Enabled = false; - if (client2 == null) - { - client2 = new Client(ClientSettings); - } + client2 = new Client(ClientSettings); + try { - if (!client2.HasServerSet()) + switch (ClientSettings.AuthType) { - switch (ClientSettings.AuthType) - { - case AuthType.Ptc: - ColoredConsoleWrite(Color.Green, "Login Type: Pokemon Trainers Club"); - await client2.DoPtcLogin(ClientSettings.PtcUsername, ClientSettings.PtcPassword); - break; - case AuthType.Google: - ColoredConsoleWrite(Color.Green, "Login Type: Google"); - if (ClientSettings.GoogleRefreshToken == "") - ColoredConsoleWrite(Color.Green, "Now opening www.Google.com/device and copying the 8 digit code to your clipboard"); - - await client2.DoGoogleLogin(); - break; - } - - await client2.SetServer(); + case AuthType.Ptc: + await client2.DoPtcLogin(ClientSettings.PtcUsername, ClientSettings.PtcPassword); + break; + case AuthType.Google: + await client2.DoGoogleLogin(ClientSettings.Email, ClientSettings.Password); + break; } + await client2.SetServer(); var inventory = await client2.GetInventory(); - var pokemons = - inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Pokemon) - .Where(p => p != null && p?.PokemonId > 0).OrderByDescending(key => key.Cp); - + var pokemons = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Pokemon).Where(p => p != null && p?.PokemonId > 0).OrderByDescending(key => key.Cp); families = inventory.InventoryDelta.InventoryItems - .Select(i => i.InventoryItemData?.PokemonFamily) - .Where(p => p != null && (int)p?.FamilyId > 0) - .OrderByDescending(p => (int)p.FamilyId); + .Select(i => i.InventoryItemData?.PokemonFamily) + .Where(p => p != null && (int)p?.FamilyId > 0) + .OrderByDescending(p => (int)p.FamilyId); var currentScrollPosition = objectListView1.LowLevelScrollPosition; objectListView1.SetObjects(pokemons); objectListView1.LowLevelScroll(currentScrollPosition.X, currentScrollPosition.Y); } - catch (Exception ex) { ColoredConsoleWrite(Color.Red, ex.ToString()); client2 = null; ReloadPokemonList(); } + catch (Exception ex) { ColoredConsoleWrite(Color.Red, ex.ToString()); client2 = null; } button1.Enabled = true; objectListView1.Enabled = true; @@ -1380,5 +1370,15 @@ namespace PokemonGo.RocketAPI.Window ReloadPokemonList(); } #endregion + + private void pokeToolStripMenuItem_Click(object sender, EventArgs e) + { + + } + + private void objectListView1_SelectedIndexChanged(object sender, EventArgs e) + { + + } } } diff --git a/PokemonGo/RocketAPI/Window/PokeUi.cs b/PokemonGo/RocketAPI/Window/PokeUi.cs index 1ef0d50..79cc1e1 100644 --- a/PokemonGo/RocketAPI/Window/PokeUi.cs +++ b/PokemonGo/RocketAPI/Window/PokeUi.cs @@ -44,7 +44,7 @@ namespace PokemonGo.RocketAPI.Window await client.DoPtcLogin(ClientSettings.PtcUsername, ClientSettings.PtcPassword); break; case AuthType.Google: - await client.DoGoogleLogin(); + await client.DoGoogleLogin(ClientSettings.PtcUsername, ClientSettings.PtcPassword); break; } await client.SetServer(); diff --git a/PokemonGo/RocketAPI/Window/PokemonForm.cs b/PokemonGo/RocketAPI/Window/PokemonForm.cs index 89cfe15..5411bd3 100644 --- a/PokemonGo/RocketAPI/Window/PokemonForm.cs +++ b/PokemonGo/RocketAPI/Window/PokemonForm.cs @@ -38,7 +38,7 @@ namespace PokemonGo.RocketAPI.Window await client.DoPtcLogin(ClientSettings.PtcUsername, ClientSettings.PtcPassword); break; case AuthType.Google: - await client.DoGoogleLogin(); + await client.DoGoogleLogin(ClientSettings.PtcUsername, ClientSettings.PtcPassword); break; } diff --git a/PokemonGo/RocketAPI/Window/Settings.cs b/PokemonGo/RocketAPI/Window/Settings.cs index e807eec..5bbbf9f 100644 --- a/PokemonGo/RocketAPI/Window/Settings.cs +++ b/PokemonGo/RocketAPI/Window/Settings.cs @@ -47,6 +47,7 @@ namespace PokemonGo.RocketAPI.Window public int TransferCPThreshold => GetSetting() != string.Empty ? int.Parse(GetSetting(), CultureInfo.InvariantCulture) : 0; public int TransferIVThreshold => GetSetting() != string.Empty ? int.Parse(GetSetting(), CultureInfo.InvariantCulture) : 0; public int TravelSpeed => GetSetting() != string.Empty ? int.Parse(GetSetting(), CultureInfo.InvariantCulture) : 60; + public int ImageSize => GetSetting() != string.Empty ? int.Parse(GetSetting(), CultureInfo.InvariantCulture) : 50; public bool EvolveAllGivenPokemons => GetSetting() != string.Empty && Convert.ToBoolean(GetSetting(), CultureInfo.InvariantCulture); public bool CatchPokemon => GetSetting() != string.Empty && Convert.ToBoolean(GetSetting(), CultureInfo.InvariantCulture); @@ -62,6 +63,8 @@ namespace PokemonGo.RocketAPI.Window public string PtcUsername => GetSetting() != string.Empty ? GetSetting() : "username"; public string PtcPassword => GetSetting() != string.Empty ? GetSetting() : "password"; + public string Email => GetSetting() != string.Empty ? GetSetting() : "Email"; + public string Password => GetSetting() != string.Empty ? GetSetting() : "Password"; public double DefaultLatitude { diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs index f827a36..6512da9 100644 --- a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs @@ -30,8 +30,8 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm)); this.authTypeLabel = new System.Windows.Forms.Label(); this.authTypeCb = new System.Windows.Forms.ComboBox(); - this.ptcUserLabel = new System.Windows.Forms.Label(); - this.ptcPasswordLabel = new System.Windows.Forms.Label(); + this.UserLabel = new System.Windows.Forms.Label(); + this.PasswordLabel = new System.Windows.Forms.Label(); this.latLabel = new System.Windows.Forms.Label(); this.longiLabel = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); @@ -39,8 +39,8 @@ this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.ptcUserText = new System.Windows.Forms.TextBox(); - this.ptcPassText = new System.Windows.Forms.TextBox(); + this.UserLoginBox = new System.Windows.Forms.TextBox(); + this.UserPasswordBox = new System.Windows.Forms.TextBox(); this.latitudeText = new System.Windows.Forms.TextBox(); this.longitudeText = new System.Windows.Forms.TextBox(); this.razzmodeCb = new System.Windows.Forms.ComboBox(); @@ -55,11 +55,11 @@ this.AdressBox = new System.Windows.Forms.TextBox(); this.trackBar = new System.Windows.Forms.TrackBar(); this.panel1 = new System.Windows.Forms.Panel(); + this.TravelSpeedBox = new System.Windows.Forms.TextBox(); this.CatchPokemonBox = new System.Windows.Forms.CheckBox(); this.CatchPokemonText = new System.Windows.Forms.Label(); this.transferIVThresText = new System.Windows.Forms.TextBox(); this.TravelSpeedText = new System.Windows.Forms.Label(); - this.TravelSpeedBox = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit(); @@ -69,10 +69,9 @@ // authTypeLabel // this.authTypeLabel.AutoSize = true; - this.authTypeLabel.Location = new System.Drawing.Point(4, 9); - this.authTypeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.authTypeLabel.Location = new System.Drawing.Point(3, 7); this.authTypeLabel.Name = "authTypeLabel"; - this.authTypeLabel.Size = new System.Drawing.Size(83, 17); + this.authTypeLabel.Size = new System.Drawing.Size(71, 12); this.authTypeLabel.TabIndex = 0; this.authTypeLabel.Text = "Login Type:"; this.authTypeLabel.Click += new System.EventHandler(this.authTypeLabel_Click); @@ -83,80 +82,72 @@ this.authTypeCb.Items.AddRange(new object[] { "google", "Ptc"}); - this.authTypeCb.Location = new System.Drawing.Point(91, 5); - this.authTypeCb.Margin = new System.Windows.Forms.Padding(4); + this.authTypeCb.Location = new System.Drawing.Point(68, 4); this.authTypeCb.Name = "authTypeCb"; - this.authTypeCb.Size = new System.Drawing.Size(180, 24); + this.authTypeCb.Size = new System.Drawing.Size(136, 20); this.authTypeCb.TabIndex = 1; this.authTypeCb.SelectedIndexChanged += new System.EventHandler(this.authTypeCb_SelectedIndexChanged); // - // ptcUserLabel + // UserLabel // - this.ptcUserLabel.AutoSize = true; - this.ptcUserLabel.Location = new System.Drawing.Point(4, 44); - this.ptcUserLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.ptcUserLabel.Name = "ptcUserLabel"; - this.ptcUserLabel.Size = new System.Drawing.Size(77, 17); - this.ptcUserLabel.TabIndex = 2; - this.ptcUserLabel.Text = "Username:"; + this.UserLabel.AutoSize = true; + this.UserLabel.Location = new System.Drawing.Point(3, 33); + this.UserLabel.Name = "UserLabel"; + this.UserLabel.Size = new System.Drawing.Size(59, 12); + this.UserLabel.TabIndex = 2; + this.UserLabel.Text = "Username:"; // - // ptcPasswordLabel + // PasswordLabel // - this.ptcPasswordLabel.AutoSize = true; - this.ptcPasswordLabel.Location = new System.Drawing.Point(4, 76); - this.ptcPasswordLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.ptcPasswordLabel.Name = "ptcPasswordLabel"; - this.ptcPasswordLabel.Size = new System.Drawing.Size(73, 17); - this.ptcPasswordLabel.TabIndex = 3; - this.ptcPasswordLabel.Text = "Password:"; + this.PasswordLabel.AutoSize = true; + this.PasswordLabel.Location = new System.Drawing.Point(3, 57); + this.PasswordLabel.Name = "PasswordLabel"; + this.PasswordLabel.Size = new System.Drawing.Size(59, 12); + this.PasswordLabel.TabIndex = 3; + this.PasswordLabel.Text = "Password:"; // // latLabel // this.latLabel.AutoSize = true; - this.latLabel.Location = new System.Drawing.Point(4, 108); - this.latLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.latLabel.Location = new System.Drawing.Point(3, 81); this.latLabel.Name = "latLabel"; - this.latLabel.Size = new System.Drawing.Size(63, 17); + this.latLabel.Size = new System.Drawing.Size(59, 12); this.latLabel.TabIndex = 4; this.latLabel.Text = "Latitude:"; // // longiLabel // this.longiLabel.AutoSize = true; - this.longiLabel.Location = new System.Drawing.Point(4, 140); - this.longiLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.longiLabel.Location = new System.Drawing.Point(3, 105); this.longiLabel.Name = "longiLabel"; - this.longiLabel.Size = new System.Drawing.Size(75, 17); + this.longiLabel.Size = new System.Drawing.Size(65, 12); this.longiLabel.TabIndex = 5; this.longiLabel.Text = "Longitude:"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(4, 172); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 129); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(116, 17); + this.label1.Size = new System.Drawing.Size(95, 12); this.label1.TabIndex = 6; this.label1.Text = "Razzberry Mode:"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(4, 238); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(3, 178); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(102, 17); + this.label2.Size = new System.Drawing.Size(89, 12); this.label2.TabIndex = 7; this.label2.Text = "Transfer Type:"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(4, 395); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(3, 296); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(117, 17); + this.label3.Size = new System.Drawing.Size(95, 12); this.label3.TabIndex = 8; this.label3.Text = "Evolve Pokemon:"; this.label3.Click += new System.EventHandler(this.label3_Click); @@ -164,55 +155,49 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(4, 271); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(3, 203); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(98, 17); + this.label4.Size = new System.Drawing.Size(83, 12); this.label4.TabIndex = 9; this.label4.Text = "CP Threshold:"; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(4, 206); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Location = new System.Drawing.Point(3, 154); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(125, 17); + this.label5.Size = new System.Drawing.Size(113, 12); this.label5.TabIndex = 10; this.label5.Text = "Razzberry Setting:"; // - // ptcUserText + // UserLoginBox // - this.ptcUserText.Location = new System.Drawing.Point(91, 41); - this.ptcUserText.Margin = new System.Windows.Forms.Padding(4); - this.ptcUserText.Name = "ptcUserText"; - this.ptcUserText.Size = new System.Drawing.Size(180, 22); - this.ptcUserText.TabIndex = 11; + this.UserLoginBox.Location = new System.Drawing.Point(68, 31); + this.UserLoginBox.Name = "UserLoginBox"; + this.UserLoginBox.Size = new System.Drawing.Size(136, 21); + this.UserLoginBox.TabIndex = 11; // - // ptcPassText + // UserPasswordBox // - this.ptcPassText.Location = new System.Drawing.Point(91, 76); - this.ptcPassText.Margin = new System.Windows.Forms.Padding(4); - this.ptcPassText.Name = "ptcPassText"; - this.ptcPassText.Size = new System.Drawing.Size(180, 22); - this.ptcPassText.TabIndex = 12; + this.UserPasswordBox.Location = new System.Drawing.Point(68, 57); + this.UserPasswordBox.Name = "UserPasswordBox"; + this.UserPasswordBox.Size = new System.Drawing.Size(136, 21); + this.UserPasswordBox.TabIndex = 12; // // latitudeText // - this.latitudeText.Location = new System.Drawing.Point(139, 105); - this.latitudeText.Margin = new System.Windows.Forms.Padding(4); + this.latitudeText.Location = new System.Drawing.Point(104, 79); this.latitudeText.Name = "latitudeText"; this.latitudeText.ReadOnly = true; - this.latitudeText.Size = new System.Drawing.Size(132, 22); + this.latitudeText.Size = new System.Drawing.Size(100, 21); this.latitudeText.TabIndex = 13; // // longitudeText // - this.longitudeText.Location = new System.Drawing.Point(139, 137); - this.longitudeText.Margin = new System.Windows.Forms.Padding(4); + this.longitudeText.Location = new System.Drawing.Point(104, 103); this.longitudeText.Name = "longitudeText"; this.longitudeText.ReadOnly = true; - this.longitudeText.Size = new System.Drawing.Size(132, 22); + this.longitudeText.Size = new System.Drawing.Size(100, 21); this.longitudeText.TabIndex = 14; // // razzmodeCb @@ -221,18 +206,16 @@ this.razzmodeCb.Items.AddRange(new object[] { "probability", "cp"}); - this.razzmodeCb.Location = new System.Drawing.Point(139, 169); - this.razzmodeCb.Margin = new System.Windows.Forms.Padding(4); + this.razzmodeCb.Location = new System.Drawing.Point(104, 127); this.razzmodeCb.Name = "razzmodeCb"; - this.razzmodeCb.Size = new System.Drawing.Size(132, 24); + this.razzmodeCb.Size = new System.Drawing.Size(100, 20); this.razzmodeCb.TabIndex = 15; // // razzSettingText // - this.razzSettingText.Location = new System.Drawing.Point(139, 202); - this.razzSettingText.Margin = new System.Windows.Forms.Padding(4); + this.razzSettingText.Location = new System.Drawing.Point(104, 152); this.razzSettingText.Name = "razzSettingText"; - this.razzSettingText.Size = new System.Drawing.Size(132, 22); + this.razzSettingText.Size = new System.Drawing.Size(100, 21); this.razzSettingText.TabIndex = 16; // // transferTypeCb @@ -246,29 +229,26 @@ "Duplicate", "IV Duplicate", "All"}); - this.transferTypeCb.Location = new System.Drawing.Point(139, 234); - this.transferTypeCb.Margin = new System.Windows.Forms.Padding(4); + this.transferTypeCb.Location = new System.Drawing.Point(104, 176); this.transferTypeCb.Name = "transferTypeCb"; - this.transferTypeCb.Size = new System.Drawing.Size(132, 24); + this.transferTypeCb.Size = new System.Drawing.Size(100, 20); this.transferTypeCb.TabIndex = 17; this.transferTypeCb.SelectedIndexChanged += new System.EventHandler(this.transferTypeCb_SelectedIndexChanged); // // transferCpThresText // - this.transferCpThresText.Location = new System.Drawing.Point(139, 271); - this.transferCpThresText.Margin = new System.Windows.Forms.Padding(4); + this.transferCpThresText.Location = new System.Drawing.Point(104, 203); this.transferCpThresText.Name = "transferCpThresText"; - this.transferCpThresText.Size = new System.Drawing.Size(132, 22); + this.transferCpThresText.Size = new System.Drawing.Size(100, 21); this.transferCpThresText.TabIndex = 18; this.transferCpThresText.TextChanged += new System.EventHandler(this.transferCpThresText_TextChanged); // // evolveAllChk // this.evolveAllChk.AutoSize = true; - this.evolveAllChk.Location = new System.Drawing.Point(139, 395); - this.evolveAllChk.Margin = new System.Windows.Forms.Padding(4); + this.evolveAllChk.Location = new System.Drawing.Point(104, 296); this.evolveAllChk.Name = "evolveAllChk"; - this.evolveAllChk.Size = new System.Drawing.Size(18, 17); + this.evolveAllChk.Size = new System.Drawing.Size(15, 14); this.evolveAllChk.TabIndex = 19; this.evolveAllChk.UseVisualStyleBackColor = true; this.evolveAllChk.CheckedChanged += new System.EventHandler(this.evolveAllChk_CheckedChanged); @@ -277,10 +257,9 @@ // this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.saveBtn.Location = new System.Drawing.Point(0, 420); - this.saveBtn.Margin = new System.Windows.Forms.Padding(4); + this.saveBtn.Location = new System.Drawing.Point(0, 315); this.saveBtn.Name = "saveBtn"; - this.saveBtn.Size = new System.Drawing.Size(264, 117); + this.saveBtn.Size = new System.Drawing.Size(198, 88); this.saveBtn.TabIndex = 20; this.saveBtn.Text = "Save"; this.saveBtn.UseVisualStyleBackColor = true; @@ -295,8 +274,7 @@ this.gMapControl1.GrayScaleMode = false; this.gMapControl1.HelperLineOption = GMap.NET.WindowsForms.HelperLineOptions.DontShow; this.gMapControl1.LevelsKeepInMemmory = 5; - this.gMapControl1.Location = new System.Drawing.Point(4, 20); - this.gMapControl1.Margin = new System.Windows.Forms.Padding(4); + this.gMapControl1.Location = new System.Drawing.Point(3, 15); this.gMapControl1.MarkersEnabled = true; this.gMapControl1.MaxZoom = 2; this.gMapControl1.MinZoom = 2; @@ -309,7 +287,7 @@ this.gMapControl1.ScaleMode = GMap.NET.WindowsForms.ScaleModes.Integer; this.gMapControl1.SelectedAreaFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(65)))), ((int)(((byte)(105)))), ((int)(((byte)(225))))); this.gMapControl1.ShowTileGridLines = false; - this.gMapControl1.Size = new System.Drawing.Size(624, 478); + this.gMapControl1.Size = new System.Drawing.Size(468, 358); this.gMapControl1.TabIndex = 22; this.gMapControl1.Zoom = 0D; this.gMapControl1.Load += new System.EventHandler(this.gMapControl1_Load); @@ -322,11 +300,9 @@ this.groupBox1.Controls.Add(this.trackBar); this.groupBox1.Controls.Add(this.gMapControl1); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(295, 11); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Location = new System.Drawing.Point(221, 8); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(632, 544); + this.groupBox1.Size = new System.Drawing.Size(474, 408); this.groupBox1.TabIndex = 25; this.groupBox1.TabStop = false; this.groupBox1.Text = "Location"; @@ -335,10 +311,9 @@ // this.FindAdressButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.FindAdressButton.Location = new System.Drawing.Point(451, 505); - this.FindAdressButton.Margin = new System.Windows.Forms.Padding(4); + this.FindAdressButton.Location = new System.Drawing.Point(338, 379); this.FindAdressButton.Name = "FindAdressButton"; - this.FindAdressButton.Size = new System.Drawing.Size(173, 32); + this.FindAdressButton.Size = new System.Drawing.Size(130, 24); this.FindAdressButton.TabIndex = 25; this.FindAdressButton.Text = "Find Location"; this.FindAdressButton.UseVisualStyleBackColor = true; @@ -346,21 +321,19 @@ // // AdressBox // - this.AdressBox.Location = new System.Drawing.Point(8, 512); - this.AdressBox.Margin = new System.Windows.Forms.Padding(4); + this.AdressBox.Location = new System.Drawing.Point(6, 384); this.AdressBox.Name = "AdressBox"; - this.AdressBox.Size = new System.Drawing.Size(433, 22); + this.AdressBox.Size = new System.Drawing.Size(326, 21); this.AdressBox.TabIndex = 25; // // trackBar // this.trackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.trackBar.BackColor = System.Drawing.SystemColors.Info; - this.trackBar.Location = new System.Drawing.Point(568, 20); - this.trackBar.Margin = new System.Windows.Forms.Padding(4); + this.trackBar.Location = new System.Drawing.Point(426, 15); this.trackBar.Name = "trackBar"; this.trackBar.Orientation = System.Windows.Forms.Orientation.Vertical; - this.trackBar.Size = new System.Drawing.Size(56, 128); + this.trackBar.Size = new System.Drawing.Size(45, 96); this.trackBar.TabIndex = 25; this.trackBar.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.trackBar.Scroll += new System.EventHandler(this.trackBar_Scroll); @@ -375,8 +348,8 @@ this.panel1.Controls.Add(this.label6); this.panel1.Controls.Add(this.authTypeLabel); this.panel1.Controls.Add(this.authTypeCb); - this.panel1.Controls.Add(this.ptcUserLabel); - this.panel1.Controls.Add(this.ptcPasswordLabel); + this.panel1.Controls.Add(this.UserLabel); + this.panel1.Controls.Add(this.PasswordLabel); this.panel1.Controls.Add(this.saveBtn); this.panel1.Controls.Add(this.latLabel); this.panel1.Controls.Add(this.evolveAllChk); @@ -392,23 +365,29 @@ this.panel1.Controls.Add(this.longitudeText); this.panel1.Controls.Add(this.label5); this.panel1.Controls.Add(this.latitudeText); - this.panel1.Controls.Add(this.ptcUserText); - this.panel1.Controls.Add(this.ptcPassText); + this.panel1.Controls.Add(this.UserLoginBox); + this.panel1.Controls.Add(this.UserPasswordBox); this.panel1.Dock = System.Windows.Forms.DockStyle.Left; - this.panel1.Location = new System.Drawing.Point(12, 11); - this.panel1.Margin = new System.Windows.Forms.Padding(4); + this.panel1.Location = new System.Drawing.Point(9, 8); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(283, 544); + this.panel1.Size = new System.Drawing.Size(212, 408); this.panel1.TabIndex = 26; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // + // TravelSpeedBox + // + this.TravelSpeedBox.Location = new System.Drawing.Point(104, 251); + this.TravelSpeedBox.Name = "TravelSpeedBox"; + this.TravelSpeedBox.Size = new System.Drawing.Size(100, 21); + this.TravelSpeedBox.TabIndex = 22; + this.TravelSpeedBox.TextChanged += new System.EventHandler(this.textBox1_TextChanged); + // // CatchPokemonBox // this.CatchPokemonBox.AutoSize = true; - this.CatchPokemonBox.Location = new System.Drawing.Point(139, 367); - this.CatchPokemonBox.Margin = new System.Windows.Forms.Padding(4); + this.CatchPokemonBox.Location = new System.Drawing.Point(104, 275); this.CatchPokemonBox.Name = "CatchPokemonBox"; - this.CatchPokemonBox.Size = new System.Drawing.Size(18, 17); + this.CatchPokemonBox.Size = new System.Drawing.Size(15, 14); this.CatchPokemonBox.TabIndex = 26; this.CatchPokemonBox.UseVisualStyleBackColor = true; this.CatchPokemonBox.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); @@ -416,65 +395,51 @@ // CatchPokemonText // this.CatchPokemonText.AutoSize = true; - this.CatchPokemonText.Location = new System.Drawing.Point(4, 367); - this.CatchPokemonText.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.CatchPokemonText.Location = new System.Drawing.Point(3, 275); this.CatchPokemonText.Name = "CatchPokemonText"; - this.CatchPokemonText.Size = new System.Drawing.Size(111, 17); + this.CatchPokemonText.Size = new System.Drawing.Size(89, 12); this.CatchPokemonText.TabIndex = 25; this.CatchPokemonText.Text = "Catch Pokemon:"; this.CatchPokemonText.Click += new System.EventHandler(this.label7_Click); // // transferIVThresText // - this.transferIVThresText.Location = new System.Drawing.Point(139, 271); - this.transferIVThresText.Margin = new System.Windows.Forms.Padding(4); + this.transferIVThresText.Location = new System.Drawing.Point(104, 203); this.transferIVThresText.Name = "transferIVThresText"; - this.transferIVThresText.Size = new System.Drawing.Size(132, 22); + this.transferIVThresText.Size = new System.Drawing.Size(100, 21); this.transferIVThresText.TabIndex = 24; this.transferIVThresText.TextChanged += new System.EventHandler(this.textBox2_TextChanged); // // TravelSpeedText // this.TravelSpeedText.AutoSize = true; - this.TravelSpeedText.Location = new System.Drawing.Point(4, 338); - this.TravelSpeedText.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.TravelSpeedText.Location = new System.Drawing.Point(3, 254); this.TravelSpeedText.Name = "TravelSpeedText"; - this.TravelSpeedText.Size = new System.Drawing.Size(131, 17); + this.TravelSpeedText.Size = new System.Drawing.Size(113, 12); this.TravelSpeedText.TabIndex = 23; this.TravelSpeedText.Text = "Travel Speed km/h:"; // - // TravelSpeedBox - // - this.TravelSpeedBox.Location = new System.Drawing.Point(139, 335); - this.TravelSpeedBox.Margin = new System.Windows.Forms.Padding(4); - this.TravelSpeedBox.Name = "TravelSpeedBox"; - this.TravelSpeedBox.Size = new System.Drawing.Size(132, 22); - this.TravelSpeedBox.TabIndex = 22; - this.TravelSpeedBox.TextChanged += new System.EventHandler(this.textBox1_TextChanged); - // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(4, 271); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(3, 203); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(92, 17); + this.label6.Size = new System.Drawing.Size(83, 12); this.label6.TabIndex = 21; this.label6.Text = "IV Threshold:"; this.label6.Click += new System.EventHandler(this.label6_Click); // // SettingsForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(939, 566); + this.ClientSize = new System.Drawing.Size(704, 424); this.Controls.Add(this.groupBox1); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4); - this.MinimumSize = new System.Drawing.Size(834, 432); + this.MinimumSize = new System.Drawing.Size(630, 334); this.Name = "SettingsForm"; - this.Padding = new System.Windows.Forms.Padding(12, 11, 12, 11); + this.Padding = new System.Windows.Forms.Padding(9, 8, 9, 8); this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Settings"; @@ -492,8 +457,8 @@ private System.Windows.Forms.Label authTypeLabel; private System.Windows.Forms.ComboBox authTypeCb; - private System.Windows.Forms.Label ptcUserLabel; - private System.Windows.Forms.Label ptcPasswordLabel; + private System.Windows.Forms.Label UserLabel; + private System.Windows.Forms.Label PasswordLabel; private System.Windows.Forms.Label latLabel; private System.Windows.Forms.Label longiLabel; private System.Windows.Forms.Label label1; @@ -501,8 +466,8 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox ptcUserText; - private System.Windows.Forms.TextBox ptcPassText; + private System.Windows.Forms.TextBox UserLoginBox; + private System.Windows.Forms.TextBox UserPasswordBox; private System.Windows.Forms.TextBox latitudeText; private System.Windows.Forms.TextBox longitudeText; private System.Windows.Forms.ComboBox razzmodeCb; diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.cs b/PokemonGo/RocketAPI/Window/SettingsForm.cs index e2d8518..78bac93 100644 --- a/PokemonGo/RocketAPI/Window/SettingsForm.cs +++ b/PokemonGo/RocketAPI/Window/SettingsForm.cs @@ -10,18 +10,11 @@ using GMap.NET.MapProviders; using GMap.NET; using System.Configuration; using System.Globalization; -using GMap.NET.WindowsForms; -using PokemonGo.RocketAPI.Helpers; -using GMap.NET.WindowsForms.Markers; namespace PokemonGo.RocketAPI.Window { partial class SettingsForm : Form { - GMapOverlay searchAreaOverlay = new GMapOverlay("areas"); - GMapOverlay playerOverlay = new GMapOverlay("players"); - GMarkerGoogle playerMarker; - public SettingsForm() { InitializeComponent(); @@ -31,8 +24,15 @@ namespace PokemonGo.RocketAPI.Window { authTypeCb.Text = Settings.Instance.AuthType.ToString(); - ptcUserText.Text = Settings.Instance.PtcUsername.ToString(); - ptcPassText.Text = Settings.Instance.PtcPassword.ToString(); + if (authTypeCb.Text == "google") + { + UserLoginBox.Text = Settings.Instance.Email.ToString(); + UserPasswordBox.Text = Settings.Instance.Password.ToString(); + } else + { + UserLoginBox.Text = Settings.Instance.PtcUsername.ToString(); + UserPasswordBox.Text = Settings.Instance.PtcPassword.ToString(); + } latitudeText.Text = Settings.Instance.DefaultLatitude.ToString(); longitudeText.Text = Settings.Instance.DefaultLongitude.ToString(); razzmodeCb.Text = Settings.Instance.RazzBerryMode; @@ -43,6 +43,7 @@ namespace PokemonGo.RocketAPI.Window evolveAllChk.Checked = Settings.Instance.EvolveAllGivenPokemons; CatchPokemonBox.Checked = Settings.Instance.CatchPokemon; TravelSpeedBox.Text = Settings.Instance.TravelSpeed.ToString(); + // ImageSizeBox.Text = Settings.Instance.ImageSize.ToString(); // Initialize map: //use google provider gMapControl1.MapProvider = GoogleMapProvider.Instance; @@ -60,30 +61,29 @@ namespace PokemonGo.RocketAPI.Window //zoom min/max; default both = 2 - gMapControl1.DragButton = MouseButtons.Right; + gMapControl1.DragButton = MouseButtons.Left; gMapControl1.CenterPen = new Pen(Color.Red, 2); gMapControl1.MinZoom = trackBar.Maximum = 1; gMapControl1.MaxZoom = trackBar.Maximum = 20; trackBar.Value = 10; - gMapControl1.Overlays.Add(searchAreaOverlay); - gMapControl1.Overlays.Add(playerOverlay); - - playerMarker = new GMarkerGoogle(gMapControl1.Position, GMarkerGoogleType.orange_small); - playerOverlay.Markers.Add(playerMarker); - - S2GMapDrawer.DrawS2Cells(S2Helper.GetNearbyCellIds(gMapControl1.Position.Lng, gMapControl1.Position.Lat), searchAreaOverlay); - //set zoom - gMapControl1.Zoom = trackBar.Value; + gMapControl1.Zoom = trackBar.Value; } private void saveBtn_Click(object sender, EventArgs e) { Settings.Instance.SetSetting(authTypeCb.Text, "AuthType"); - Settings.Instance.SetSetting(ptcUserText.Text, "PtcUsername"); - Settings.Instance.SetSetting(ptcPassText.Text, "PtcPassword"); + if (authTypeCb.Text == "google") + { + Settings.Instance.SetSetting(UserLoginBox.Text, "Email"); + Settings.Instance.SetSetting(UserPasswordBox.Text, "Password"); + } else + { + Settings.Instance.SetSetting(UserLoginBox.Text, "PtcUsername"); + Settings.Instance.SetSetting(UserPasswordBox.Text, "PtcPassword"); + } Settings.Instance.SetSetting(latitudeText.Text.Replace(',', '.'), "DefaultLatitude"); Settings.Instance.SetSetting(longitudeText.Text.Replace(',', '.'), "DefaultLongitude"); @@ -99,12 +99,10 @@ namespace PokemonGo.RocketAPI.Window Settings.Instance.SetSetting(transferCpThresText.Text, "TransferCPThreshold"); Settings.Instance.SetSetting(transferIVThresText.Text, "TransferIVThreshold"); Settings.Instance.SetSetting(TravelSpeedBox.Text, "TravelSpeed"); + //Settings.Instance.SetSetting(ImageSizeBox.Text, "ImageSize"); Settings.Instance.SetSetting(evolveAllChk.Checked ? "true" : "false", "EvolveAllGivenPokemons"); Settings.Instance.SetSetting(CatchPokemonBox.Checked ? "true" : "false", "CatchPokemon"); Settings.Instance.Reload(); - - MainForm.Instance.Restart(); - Close(); } @@ -112,39 +110,30 @@ namespace PokemonGo.RocketAPI.Window { if (authTypeCb.Text == "google") { - ptcUserText.Visible = false; - ptcPassText.Visible = false; - ptcUserLabel.Visible = false; - ptcPasswordLabel.Visible = false; + UserLabel.Text = "Email:"; } else { - ptcUserText.Visible = true; - ptcPassText.Visible = true; - ptcUserLabel.Visible = true; - ptcPasswordLabel.Visible = true; + UserLabel.Text = "Username:"; } } private void gMapControl1_MouseClick(object sender, MouseEventArgs e) { - if (e.Button == MouseButtons.Left) + Point localCoordinates = e.Location; + gMapControl1.Position = gMapControl1.FromLocalToLatLng(localCoordinates.X, localCoordinates.Y); + + if (e.Clicks >= 2) { - Point localCoordinates = e.Location; - PointLatLng clickedCoord = gMapControl1.FromLocalToLatLng(localCoordinates.X, localCoordinates.Y); - - double X = Math.Round(clickedCoord.Lng, 6); - double Y = Math.Round(clickedCoord.Lat, 6); - string longitude = X.ToString(); - string latitude = Y.ToString(); - latitudeText.Text = latitude; - longitudeText.Text = longitude; - - playerMarker.Position = clickedCoord; - - searchAreaOverlay.Polygons.Clear(); - S2GMapDrawer.DrawS2Cells(S2Helper.GetNearbyCellIds(X, Y), searchAreaOverlay); + gMapControl1.Zoom += 5; } + + double X = Math.Round(gMapControl1.Position.Lng, 6); + double Y = Math.Round(gMapControl1.Position.Lat, 6); + string longitude = X.ToString(); + string latitude = Y.ToString(); + latitudeText.Text = latitude; + longitudeText.Text = longitude; } private void trackBar_Scroll(object sender, EventArgs e) @@ -252,4 +241,4 @@ namespace PokemonGo.RocketAPI.Window } } -} +} \ No newline at end of file