diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs
index e939cf3..527390e 100644
--- a/PokemonGo/RocketAPI/Window/MainForm.cs
+++ b/PokemonGo/RocketAPI/Window/MainForm.cs
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Net;
-using System.Reflection;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
@@ -27,7 +27,6 @@ using POGOProtos.Map.Fort;
using POGOProtos.Map.Pokemon;
using POGOProtos.Networking.Responses;
using static System.Reflection.Assembly;
-using System.ComponentModel;
namespace PokemonGo.RocketAPI.Window
{
@@ -48,19 +47,19 @@ namespace PokemonGo.RocketAPI.Window
public static DateTime InitSessionDateTime = DateTime.Now;
private static bool _botStarted;
+ private readonly GMapOverlay _playerOverlay = new GMapOverlay("players");
+ private readonly GMapOverlay _pokemonsOverlay = new GMapOverlay("pokemons");
+ private readonly GMapOverlay _pokestopsOverlay = new GMapOverlay("pokestops");
+
+ private readonly GMapOverlay _searchAreaOverlay = new GMapOverlay("areas");
private Client _client;
private Client _client2;
private LocationManager _locationManager;
private GMarkerGoogle _playerMarker;
- private readonly GMapOverlay _playerOverlay = new GMapOverlay("players");
- private readonly GMapOverlay _pokemonsOverlay = new GMapOverlay("pokemons");
private IEnumerable<FortData> _pokeStops;
- private readonly GMapOverlay _pokestopsOverlay = new GMapOverlay("pokestops");
-
- private readonly GMapOverlay _searchAreaOverlay = new GMapOverlay("areas");
private IEnumerable<WildPokemon> _wildPokemons;
public MainForm()
@@ -130,7 +129,7 @@ namespace PokemonGo.RocketAPI.Window
public static double GetRuntime()
{
- return (DateTime.Now - TimeStarted).TotalSeconds / 3600;
+ return (DateTime.Now - TimeStarted).TotalSeconds/3600;
}
public void CheckVersion()
@@ -152,7 +151,7 @@ namespace PokemonGo.RocketAPI.Window
match.Groups[3],
match.Groups[4]));
// makes sense to display your version and say what the current one is on github
- ColoredConsoleWrite(Color.Green, "Your version is " + Assembly.GetExecutingAssembly().GetName().Version);
+ ColoredConsoleWrite(Color.Green, "Your version is " + GetExecutingAssembly().GetName().Version);
ColoredConsoleWrite(Color.Green, "Github version is " + gitVersion);
ColoredConsoleWrite(Color.Green,
"You can find it at www.GitHub.com/1461748123/Pokemon-Go-Rocket-API/releases");
@@ -500,7 +499,7 @@ namespace PokemonGo.RocketAPI.Window
var request =
(HttpWebRequest)
WebRequest.Create("http://boosting-service.de/pokemon/index.php?pokeName=" + name_english);
- var response = (HttpWebResponse)request.GetResponse();
+ var response = (HttpWebResponse) request.GetResponse();
pokemonName = new StreamReader(response.GetResponseStream()).ReadToEnd();
}
else
@@ -585,7 +584,7 @@ namespace PokemonGo.RocketAPI.Window
{
SynchronizationContext.Post(o =>
{
- _playerMarker.Position = (PointLatLng)o;
+ _playerMarker.Position = (PointLatLng) o;
_searchAreaOverlay.Polygons.Clear();
}, new PointLatLng(latitude, longitude));
@@ -774,7 +773,7 @@ namespace PokemonGo.RocketAPI.Window
return string.Empty;
return enumerable.GroupBy(i => i.ItemId)
- .Select(kvp => new { ItemName = kvp.Key.ToString().Substring(4), Amount = kvp.Sum(x => x.ItemCount) })
+ .Select(kvp => new {ItemName = kvp.Key.ToString().Substring(4), Amount = kvp.Sum(x => x.ItemCount)})
.Select(y => $"{y.Amount}x {y.ItemName}")
.Aggregate((a, b) => $"{a}, {b}");
}
@@ -785,7 +784,7 @@ namespace PokemonGo.RocketAPI.Window
var unwantedPokemonTypes = new List<PokemonId>();
for (var i = 1; i <= 151; i++)
{
- unwantedPokemonTypes.Add((PokemonId)i);
+ unwantedPokemonTypes.Add((PokemonId) i);
}
var inventory = await client.Inventory.GetInventory();
@@ -810,7 +809,7 @@ namespace PokemonGo.RocketAPI.Window
public static float Perfect(PokemonData poke)
{
- return (poke.IndividualAttack + poke.IndividualDefense + poke.IndividualStamina) / (3.0f * 15.0f) * 100.0f;
+ return (poke.IndividualAttack + poke.IndividualDefense + poke.IndividualStamina)/(3.0f*15.0f)*100.0f;
}
private async Task TransferAllGivenPokemons(Client client, IEnumerable<PokemonData> unwantedPokemons,
@@ -844,7 +843,7 @@ namespace PokemonGo.RocketAPI.Window
(HttpWebRequest)
WebRequest.Create("http://boosting-service.de/pokemon/index.php?pokeName=" +
name_english);
- var response = (HttpWebResponse)request.GetResponse();
+ var response = (HttpWebResponse) request.GetResponse();
pokemonName = new StreamReader(response.GetResponseStream()).ReadToEnd();
}
else
@@ -875,7 +874,7 @@ namespace PokemonGo.RocketAPI.Window
inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PokemonData)
.Where(p => p != null && p?.PokemonId > 0);
- var dupes = allpokemons.OrderBy(x => x.Cp).Select((x, i) => new { index = i, value = x })
+ var dupes = allpokemons.OrderBy(x => x.Cp).Select((x, i) => new {index = i, value = x})
.GroupBy(x => x.value.PokemonId)
.Where(x => x.Skip(1).Any());
@@ -895,7 +894,7 @@ namespace PokemonGo.RocketAPI.Window
(HttpWebRequest)
WebRequest.Create("http://boosting-service.de/pokemon/index.php?pokeName=" +
name_english);
- var response = (HttpWebResponse)request.GetResponse();
+ var response = (HttpWebResponse) request.GetResponse();
pokemonName = new StreamReader(response.GetResponseStream()).ReadToEnd();
}
else
@@ -915,7 +914,7 @@ namespace PokemonGo.RocketAPI.Window
inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PokemonData)
.Where(p => p != null && p?.PokemonId > 0);
- var dupes = allpokemons.OrderBy(x => Perfect(x)).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());
@@ -935,7 +934,7 @@ namespace PokemonGo.RocketAPI.Window
(HttpWebRequest)
WebRequest.Create("http://boosting-service.de/pokemon/index.php?pokeName=" +
name_english);
- var response = (HttpWebResponse)request.GetResponse();
+ var response = (HttpWebResponse) request.GetResponse();
pokemonName = new StreamReader(response.GetResponseStream()).ReadToEnd();
}
else
@@ -1027,7 +1026,7 @@ namespace PokemonGo.RocketAPI.Window
if (ClientSettings.LevelOutput == "levelup")
await Task.Delay(1000);
else
- await Task.Delay(ClientSettings.LevelTimeInterval * 1000);
+ await Task.Delay(ClientSettings.LevelTimeInterval*1000);
PrintLevel(client);
}
@@ -1053,10 +1052,10 @@ namespace PokemonGo.RocketAPI.Window
//Calculating the exp needed to level up
float expNextLvl = v.NextLevelXp - v.Experience;
//Calculating the exp made per second
- xpSec = Math.Round(_totalExperience / GetRuntime()) / 60 / 60;
+ xpSec = Math.Round(_totalExperience/GetRuntime())/60/60;
//Calculating the seconds left to level up
if (xpSec != 0)
- secondsLeft = Convert.ToInt32(expNextLvl / xpSec);
+ secondsLeft = Convert.ToInt32(expNextLvl/xpSec);
//formatting data to make an output like DateFormat
while (secondsLeft > 60)
{
@@ -1077,8 +1076,8 @@ namespace PokemonGo.RocketAPI.Window
" | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level,
_getSessionRuntimeInTimeFormat(), v.Experience - v.PrevLevelXp - XpDiff,
v.NextLevelXp - v.PrevLevelXp - XpDiff, profile.PlayerData.Currencies.ToArray()[1].Amount) +
- " | XP/Hour: " + Math.Round(_totalExperience / GetRuntime()) + " | Pokemon/Hour: " +
- Math.Round(_totalPokemon / GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft +
+ " | XP/Hour: " + Math.Round(_totalExperience/GetRuntime()) + " | Pokemon/Hour: " +
+ Math.Round(_totalPokemon/GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft +
":" + secondsLeft);
}
await Task.Delay(1000);
@@ -1344,20 +1343,21 @@ namespace PokemonGo.RocketAPI.Window
{
olvPokemonList.ButtonClick += PokemonListButton_Click;
- pkmnName.ImageGetter = delegate (object rowObject)
+ pkmnName.ImageGetter = delegate(object rowObject)
{
var pokemon = rowObject as PokemonObject;
var key = pokemon.PokemonId.ToString();
if (!olvPokemonList.SmallImageList.Images.ContainsKey(key))
{
- var img = GetPokemonImage((int)pokemon.PokemonId);
+ var img = GetPokemonImage((int) pokemon.PokemonId);
olvPokemonList.SmallImageList.Images.Add(key, img);
}
return key;
};
- olvPokemonList.FormatRow += delegate (object sender, FormatRowEventArgs e) {
+ olvPokemonList.FormatRow += delegate(object sender, FormatRowEventArgs e)
+ {
var pok = e.Model as PokemonObject;
if (
olvPokemonList.Objects.Cast<PokemonObject>()
@@ -1366,14 +1366,17 @@ namespace PokemonGo.RocketAPI.Window
.Count() > 1)
e.Item.BackColor = Color.LightGreen;
- foreach (OLVListSubItem sub in e.Item.SubItems) {
- if (sub.Text.Equals("Evolve") && !pok.CanEvolve) {
+ foreach (OLVListSubItem sub in e.Item.SubItems)
+ {
+ if (sub.Text.Equals("Evolve") && !pok.CanEvolve)
+ {
sub.CellPadding = new Rectangle(100, 100, 0, 0);
}
}
};
- cmsPokemonList.Opening += delegate (object sender, CancelEventArgs e) {
+ cmsPokemonList.Opening += delegate(object sender, CancelEventArgs e)
+ {
e.Cancel = false;
cmsPokemonList.Items.Clear();
@@ -1385,7 +1388,8 @@ namespace PokemonGo.RocketAPI.Window
.Count() == 0;
var count = pokemons.Count();
- if (count < 1) {
+ if (count < 1)
+ {
e.Cancel = true;
return;
}
@@ -1398,14 +1402,16 @@ namespace PokemonGo.RocketAPI.Window
item.Click += delegate { TransferPokemon(pokemons); };
cmsPokemonList.Items.Add(item);
- if (canAllEvolve) {
+ if (canAllEvolve)
+ {
item = new ToolStripMenuItem();
item.Text = "Evolve " + count + " pokemon";
item.Click += delegate { EvolvePokemon(pokemons); };
cmsPokemonList.Items.Add(item);
}
- if (count == 1) {
+ if (count == 1)
+ {
item = new ToolStripMenuItem();
item.Text = "PowerUp";
item.Click += delegate { PowerUpPokemon(pokemons); };
@@ -1415,30 +1421,22 @@ namespace PokemonGo.RocketAPI.Window
item = new ToolStripMenuItem();
item.Text = "Transfer Clean Up (Keep highest IV)";
- item.Click += delegate {
- CleanUpTransferPokemon(pokemonObject, "IV");
- };
+ item.Click += delegate { CleanUpTransferPokemon(pokemonObject, "IV"); };
cmsPokemonList.Items.Add(item);
item = new ToolStripMenuItem();
item.Text = "Transfer Clean Up (Keep highest CP)";
- item.Click += delegate {
- CleanUpTransferPokemon(pokemonObject, "CP");
- };
+ item.Click += delegate { CleanUpTransferPokemon(pokemonObject, "CP"); };
cmsPokemonList.Items.Add(item);
item = new ToolStripMenuItem();
item.Text = "Evolve Clean Up (Highest IV)";
- item.Click += delegate {
- CleanUpEvolvePokemon(pokemonObject, "IV");
- };
+ item.Click += delegate { CleanUpEvolvePokemon(pokemonObject, "IV"); };
cmsPokemonList.Items.Add(item);
item = new ToolStripMenuItem();
item.Text = "Evolve Clean Up (Highest CP)";
- item.Click += delegate {
- CleanUpEvolvePokemon(pokemonObject, "CP");
- };
+ item.Click += delegate { CleanUpEvolvePokemon(pokemonObject, "CP"); };
cmsPokemonList.Items.Add(item);
/*
cmsPokemonList.Items.Add(separator);
@@ -1460,10 +1458,11 @@ namespace PokemonGo.RocketAPI.Window
private Image GetPokemonImage(int pokemonId)
{
- return (Image)Properties.Resources.ResourceManager.GetObject("Pokemon_" + pokemonId);
+ return (Image) Properties.Resources.ResourceManager.GetObject("Pokemon_" + pokemonId);
}
- private void SetState(bool state) {
+ private void SetState(bool state)
+ {
btnRefresh.Enabled = state;
olvPokemonList.Enabled = state;
//flpItems.Enabled = state;
@@ -1497,11 +1496,12 @@ namespace PokemonGo.RocketAPI.Window
.OrderByDescending(p => p.FamilyId);
var pokemonObjects = new List<PokemonObject>();
- foreach (var pokemon in pokemons) {
+ foreach (var pokemon in pokemons)
+ {
var pokemonObject = new PokemonObject(pokemon);
- var family =
+ var family =
families.Where(i => (int) i.FamilyId <= (int) pokemon.PokemonId)
- .First();
+ .First();
pokemonObject.Candy = family.Candy_;
pokemonObjects.Add(pokemonObject);
}
@@ -1551,15 +1551,15 @@ namespace PokemonGo.RocketAPI.Window
var cName = olvPokemonList.AllColumns[e.ColumnIndex].AspectToStringFormat;
if (cName.Equals("Transfer"))
{
- TransferPokemon(new List<PokemonData> { pokemon.PokemonData });
+ TransferPokemon(new List<PokemonData> {pokemon.PokemonData});
}
else if (cName.Equals("Power Up"))
{
- PowerUpPokemon(new List<PokemonData> { pokemon.PokemonData });
+ PowerUpPokemon(new List<PokemonData> {pokemon.PokemonData});
}
else if (cName.Equals("Evolve"))
{
- EvolvePokemon(new List<PokemonData> { pokemon.PokemonData });
+ EvolvePokemon(new List<PokemonData> {pokemon.PokemonData});
}
}
catch (Exception ex)
@@ -1573,12 +1573,16 @@ namespace PokemonGo.RocketAPI.Window
private async void TransferPokemon(IEnumerable<PokemonData> pokemons)
{
SetState(false);
- foreach (var pokemon in pokemons) {
+ foreach (var pokemon in pokemons)
+ {
var transferPokemonResponse = await _client2.Inventory.TransferPokemon(pokemon.Id);
- if (transferPokemonResponse.Result == ReleasePokemonResponse.Types.Result.Success) {
+ if (transferPokemonResponse.Result == ReleasePokemonResponse.Types.Result.Success)
+ {
ColoredConsoleWrite(Color.Magenta,
$"{pokemon.PokemonId} was transferred. {transferPokemonResponse.CandyAwarded} candy awarded");
- } else {
+ }
+ else
+ {
ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} could not be transferred");
}
}
@@ -1588,11 +1592,15 @@ namespace PokemonGo.RocketAPI.Window
private async void PowerUpPokemon(IEnumerable<PokemonData> pokemons)
{
SetState(false);
- foreach (var pokemon in pokemons) {
+ foreach (var pokemon in pokemons)
+ {
var evolvePokemonResponse = await _client2.Inventory.UpgradePokemon(pokemon.Id);
- if (evolvePokemonResponse.Result == UpgradePokemonResponse.Types.Result.Success) {
+ if (evolvePokemonResponse.Result == UpgradePokemonResponse.Types.Result.Success)
+ {
ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} successfully upgraded.");
- } else {
+ }
+ else
+ {
ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} could not be upgraded");
}
}
@@ -1602,27 +1610,32 @@ namespace PokemonGo.RocketAPI.Window
private async void EvolvePokemon(IEnumerable<PokemonData> pokemons)
{
SetState(false);
- foreach (var pokemon in pokemons) {
+ foreach (var pokemon in pokemons)
+ {
var evolvePokemonResponse = await _client2.Inventory.EvolvePokemon(pokemon.Id);
- if (evolvePokemonResponse.Result == EvolvePokemonResponse.Types.Result.Success) {
+ if (evolvePokemonResponse.Result == EvolvePokemonResponse.Types.Result.Success)
+ {
ColoredConsoleWrite(Color.Magenta,
$"{pokemon.PokemonId} successfully evolved into {evolvePokemonResponse.EvolvedPokemonData.PokemonId}\n{evolvePokemonResponse.ExperienceAwarded} experience awarded\n{evolvePokemonResponse.CandyAwarded} candy awarded");
-
- } else {
+ }
+ else
+ {
ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} could not be evolved");
}
}
ReloadPokemonList();
}
- private void CleanUpTransferPokemon(PokemonObject pokemon, string type) {
- int ET = pokemon.EvolveTimes;
- int pokemonCount =
+ private void CleanUpTransferPokemon(PokemonObject pokemon, string type)
+ {
+ var ET = pokemon.EvolveTimes;
+ var pokemonCount =
olvPokemonList.Objects.Cast<PokemonObject>()
- .Where(p => p.PokemonId == pokemon.PokemonId)
- .Count();
+ .Where(p => p.PokemonId == pokemon.PokemonId)
+ .Count();
- if (pokemonCount < ET) {
+ if (pokemonCount < ET)
+ {
ReloadPokemonList();
return;
}
@@ -1630,55 +1643,63 @@ namespace PokemonGo.RocketAPI.Window
if (ET == 0)
ET = 1;
- if (type.Equals("IV")) {
+ if (type.Equals("IV"))
+ {
var pokemons =
olvPokemonList.Objects.Cast<PokemonObject>()
- .Where(p => p.PokemonId == pokemon.PokemonId)
- .Select(p => p.PokemonData)
- .OrderBy(p => p.Cp)
- .OrderBy(p => p.GetIV())
- .Take(pokemonCount - ET);
+ .Where(p => p.PokemonId == pokemon.PokemonId)
+ .Select(p => p.PokemonData)
+ .OrderBy(p => p.Cp)
+ .OrderBy(p => p.GetIV())
+ .Take(pokemonCount - ET);
TransferPokemon(pokemons);
- } else if (type.Equals("CP")) {
+ }
+ else if (type.Equals("CP"))
+ {
var pokemons =
olvPokemonList.Objects.Cast<PokemonObject>()
- .Where(p => p.PokemonId == pokemon.PokemonId)
- .Select(p => p.PokemonData)
- .OrderBy(p => p.GetIV())
- .OrderBy(p => p.Cp)
- .Take(pokemonCount - ET);
+ .Where(p => p.PokemonId == pokemon.PokemonId)
+ .Select(p => p.PokemonData)
+ .OrderBy(p => p.GetIV())
+ .OrderBy(p => p.Cp)
+ .Take(pokemonCount - ET);
TransferPokemon(pokemons);
}
}
- private void CleanUpEvolvePokemon(PokemonObject pokemon, string type) {
- int ET = pokemon.EvolveTimes;
+ private void CleanUpEvolvePokemon(PokemonObject pokemon, string type)
+ {
+ var ET = pokemon.EvolveTimes;
- if (ET < 1) {
+ if (ET < 1)
+ {
ReloadPokemonList();
return;
}
- if (type.Equals("IV")) {
+ if (type.Equals("IV"))
+ {
var pokemons =
olvPokemonList.Objects.Cast<PokemonObject>()
- .Where(p => p.PokemonId == pokemon.PokemonId)
- .Select(p => p.PokemonData)
- .OrderByDescending(p => p.Cp)
- .OrderByDescending(p => p.GetIV())
- .Take(ET);
+ .Where(p => p.PokemonId == pokemon.PokemonId)
+ .Select(p => p.PokemonData)
+ .OrderByDescending(p => p.Cp)
+ .OrderByDescending(p => p.GetIV())
+ .Take(ET);
EvolvePokemon(pokemons);
- } else if (type.Equals("CP")) {
+ }
+ else if (type.Equals("CP"))
+ {
var pokemons =
olvPokemonList.Objects.Cast<PokemonObject>()
- .Where(p => p.PokemonId == pokemon.PokemonId)
- .Select(p => p.PokemonData)
- .OrderByDescending(p => p.GetIV())
- .OrderByDescending(p => p.Cp)
- .Take(ET);
+ .Where(p => p.PokemonId == pokemon.PokemonId)
+ .Select(p => p.PokemonData)
+ .OrderByDescending(p => p.GetIV())
+ .OrderByDescending(p => p.Cp)
+ .Take(ET);
EvolvePokemon(pokemons);
}
@@ -1694,7 +1715,7 @@ namespace PokemonGo.RocketAPI.Window
public async Task<IEnumerable<ItemData>> GetItemsToRecycle(ISettings _settings, Client client)
{
- var settings = (Settings)_settings;
+ var settings = (Settings) _settings;
var myItems = await GetItems(client);
return myItems
@@ -1719,7 +1740,7 @@ namespace PokemonGo.RocketAPI.Window
ColoredConsoleWrite(Color.DarkCyan, $"Recycled {item.Count}x {item.ItemId.ToString().Substring(4)}");
await Task.Delay(500);
}
- await Task.Delay(ClientSettings.RecycleItemsInterval * 1000);
+ await Task.Delay(ClientSettings.RecycleItemsInterval*1000);
RecycleItems(client);
}
@@ -1754,20 +1775,20 @@ namespace PokemonGo.RocketAPI.Window
var ballCollection = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Item)
.Where(p => p != null)
.GroupBy(i => i.ItemId)
- .Select(kvp => new { ItemId = kvp.Key, Amount = kvp.Sum(x => x.Count) })
+ .Select(kvp => new {ItemId = kvp.Key, Amount = kvp.Sum(x => x.Count)})
.Where(y => y.ItemId == ItemId.ItemPokeBall
|| y.ItemId == ItemId.ItemGreatBall
|| y.ItemId == ItemId.ItemUltraBall
|| y.ItemId == ItemId.ItemMasterBall);
var pokeBallsCount = ballCollection.Where(p => p.ItemId == ItemId.ItemPokeBall).
- DefaultIfEmpty(new { ItemId = ItemId.ItemPokeBall, Amount = 0 }).FirstOrDefault().Amount;
+ DefaultIfEmpty(new {ItemId = ItemId.ItemPokeBall, Amount = 0}).FirstOrDefault().Amount;
var greatBallsCount = ballCollection.Where(p => p.ItemId == ItemId.ItemGreatBall).
- DefaultIfEmpty(new { ItemId = ItemId.ItemGreatBall, Amount = 0 }).FirstOrDefault().Amount;
+ DefaultIfEmpty(new {ItemId = ItemId.ItemGreatBall, Amount = 0}).FirstOrDefault().Amount;
var ultraBallsCount = ballCollection.Where(p => p.ItemId == ItemId.ItemUltraBall).
- DefaultIfEmpty(new { ItemId = ItemId.ItemUltraBall, Amount = 0 }).FirstOrDefault().Amount;
+ DefaultIfEmpty(new {ItemId = ItemId.ItemUltraBall, Amount = 0}).FirstOrDefault().Amount;
var masterBallsCount = ballCollection.Where(p => p.ItemId == ItemId.ItemMasterBall).
- DefaultIfEmpty(new { ItemId = ItemId.ItemMasterBall, Amount = 0 }).FirstOrDefault().Amount;
+ DefaultIfEmpty(new {ItemId = ItemId.ItemMasterBall, Amount = 0}).FirstOrDefault().Amount;
// Use better balls for high CP pokemon
if (masterBallsCount > 0 && pokemonCP >= 1000)
diff --git a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs b/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs
index 25f2f58..904f8a4 100644
--- a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs
+++ b/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.0.1")]
+[assembly: AssemblyVersion("1.8.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file