diff --git a/PokemonGo/RocketAPI/Client.cs b/PokemonGo/RocketAPI/Client.cs index cf2a86b..e682118 100644 --- a/PokemonGo/RocketAPI/Client.cs +++ b/PokemonGo/RocketAPI/Client.cs @@ -557,4 +557,4 @@ namespace PokemonGo.RocketAPI useItemRequest); } } -} \ No newline at end of file +} diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs index 4cc357f..8868614 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs @@ -38,6 +38,7 @@ namespace PokemonGo.RocketAPI.Window this.todoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.useLuckyEggToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.forceUnbanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showAllToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.gMapControl1 = new GMap.NET.WindowsForms.GMapControl(); @@ -54,7 +55,6 @@ 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(); @@ -139,6 +139,13 @@ namespace PokemonGo.RocketAPI.Window this.forceUnbanToolStripMenuItem.Text = "Force Unban"; this.forceUnbanToolStripMenuItem.Click += new System.EventHandler(this.forceUnbanToolStripMenuItem_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); + // // showAllToolStripMenuItem // this.showAllToolStripMenuItem.Name = "showAllToolStripMenuItem"; @@ -211,7 +218,7 @@ namespace PokemonGo.RocketAPI.Window this.objectListView1.RowHeight = 32; this.objectListView1.SelectAllOnControlA = false; this.objectListView1.ShowGroups = false; - this.objectListView1.Size = new System.Drawing.Size(668, 215); + this.objectListView1.Size = new System.Drawing.Size(1012, 215); this.objectListView1.SmallImageList = this.smallPokemonImageList; this.objectListView1.TabIndex = 25; this.objectListView1.UseCompatibleStateImageBehavior = false; @@ -296,19 +303,12 @@ namespace PokemonGo.RocketAPI.Window this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.button1.Location = new System.Drawing.Point(0, 588); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(668, 26); + this.button1.Size = new System.Drawing.Size(1012, 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; @@ -320,6 +320,7 @@ namespace PokemonGo.RocketAPI.Window this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(338, 246); this.tabControl1.TabIndex = 27; + this.tabControl1.Visible = false; // // tabPage1 // @@ -346,13 +347,13 @@ namespace PokemonGo.RocketAPI.Window this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 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); this.Controls.Add(this.objectListView1); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.menuStrip1); + this.Controls.Add(this.tabControl1); this.ForeColor = System.Drawing.SystemColors.ControlText; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs index 88454b7..176cb77 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.cs @@ -102,10 +102,10 @@ namespace PokemonGo.RocketAPI.Window private static DateTime TimeStarted = DateTime.Now; public static DateTime InitSessionDateTime = DateTime.Now; - Client client; Client client2; LocationManager locationManager; + public static double GetRuntime() { return ((DateTime.Now - TimeStarted).TotalSeconds) / 3600; @@ -258,120 +258,117 @@ namespace PokemonGo.RocketAPI.Window this.locationManager = new LocationManager(client, ClientSettings.TravelSpeed); try { + switch (ClientSettings.AuthType) { - switch (ClientSettings.AuthType) - { - - case AuthType.Ptc: - ColoredConsoleWrite(Color.Green, "Login Type: Pokemon Trainers Club"); - break; - case AuthType.Google: - ColoredConsoleWrite(Color.Green, "Login Type: Google"); - break; - } + case AuthType.Ptc: + ColoredConsoleWrite(Color.Green, "Login Type: Pokemon Trainers Club"); + break; + case AuthType.Google: + ColoredConsoleWrite(Color.Green, "Login Type: Google"); + break; + } - await client.Login(); - 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"); - } + await client.Login(); + 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); + + updateUserStatusBar(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"); + } - 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(); - pokestopsOverlay.Routes.Clear(); - pokestopsOverlay.Markers.Clear(); - 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) @@ -942,7 +939,7 @@ namespace PokemonGo.RocketAPI.Window return (DateTime.Now - InitSessionDateTime).ToString(@"dd\.hh\:mm\:ss"); } - public async Task ConsoleLevelTitle(string Username, Client client) + public async Task updateUserStatusBar(Client client) { var inventory = await client.GetInventory(); var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).ToArray(); @@ -973,10 +970,10 @@ namespace PokemonGo.RocketAPI.Window hoursLeft++; } } - SetStatusText(string.Format(Username + " | 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.Profile.Currency.ToArray()[1].Amount) + " | XP/Hour: " + Math.Round(TotalExperience / GetRuntime()) + " | Pokemon/Hour: " + Math.Round(TotalPokemon / GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft + ":" + secondsLeft); + SetStatusText(string.Format(profile.Profile.Username + " | 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.Profile.Currency.ToArray()[1].Amount) + " | XP/Hour: " + Math.Round(TotalExperience / GetRuntime()) + " | Pokemon/Hour: " + Math.Round(TotalPokemon / GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft + ":" + secondsLeft); } await Task.Delay(1000); - ConsoleLevelTitle(Username, client); + updateUserStatusBar(client); } public static int GetXpDiff(Client client, int Level) @@ -1189,7 +1186,7 @@ namespace PokemonGo.RocketAPI.Window private async void forceUnbanToolStripMenuItem_Click(object sender, EventArgs e) { - if (client != null) + if (client != null && pokeStops != null) { if (ForceUnbanning) { @@ -1202,7 +1199,7 @@ namespace PokemonGo.RocketAPI.Window } else { - ColoredConsoleWrite(Color.Red, "Please start the bot before trying to force unban"); + ColoredConsoleWrite(Color.Red, "Please start the bot and wait for map to load before trying to force unban"); } } @@ -1284,8 +1281,7 @@ namespace PokemonGo.RocketAPI.Window client2 = new Client(ClientSettings); try { - - await client2.Login(); + await client2.Login(); 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); diff --git a/PokemonGo/RocketAPI/Window/MainForm.resx b/PokemonGo/RocketAPI/Window/MainForm.resx index 1821e28..e8d4638 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.resx +++ b/PokemonGo/RocketAPI/Window/MainForm.resx @@ -129,6 +129,9 @@ <metadata name="smallPokemonImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>247, 18</value> </metadata> + <metadata name="tabControl1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>58</value> </metadata> diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs index 6512da9..3232162 100644 --- a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs @@ -82,7 +82,7 @@ this.authTypeCb.Items.AddRange(new object[] { "google", "Ptc"}); - this.authTypeCb.Location = new System.Drawing.Point(68, 4); + this.authTypeCb.Location = new System.Drawing.Point(82, 4); this.authTypeCb.Name = "authTypeCb"; this.authTypeCb.Size = new System.Drawing.Size(136, 20); this.authTypeCb.TabIndex = 1; @@ -172,21 +172,21 @@ // // UserLoginBox // - this.UserLoginBox.Location = new System.Drawing.Point(68, 31); + this.UserLoginBox.Location = new System.Drawing.Point(82, 31); this.UserLoginBox.Name = "UserLoginBox"; this.UserLoginBox.Size = new System.Drawing.Size(136, 21); this.UserLoginBox.TabIndex = 11; // // UserPasswordBox // - this.UserPasswordBox.Location = new System.Drawing.Point(68, 57); + this.UserPasswordBox.Location = new System.Drawing.Point(82, 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(104, 79); + this.latitudeText.Location = new System.Drawing.Point(118, 79); this.latitudeText.Name = "latitudeText"; this.latitudeText.ReadOnly = true; this.latitudeText.Size = new System.Drawing.Size(100, 21); @@ -194,7 +194,7 @@ // // longitudeText // - this.longitudeText.Location = new System.Drawing.Point(104, 103); + this.longitudeText.Location = new System.Drawing.Point(118, 103); this.longitudeText.Name = "longitudeText"; this.longitudeText.ReadOnly = true; this.longitudeText.Size = new System.Drawing.Size(100, 21); @@ -206,14 +206,14 @@ this.razzmodeCb.Items.AddRange(new object[] { "probability", "cp"}); - this.razzmodeCb.Location = new System.Drawing.Point(104, 127); + this.razzmodeCb.Location = new System.Drawing.Point(118, 127); this.razzmodeCb.Name = "razzmodeCb"; this.razzmodeCb.Size = new System.Drawing.Size(100, 20); this.razzmodeCb.TabIndex = 15; // // razzSettingText // - this.razzSettingText.Location = new System.Drawing.Point(104, 152); + this.razzSettingText.Location = new System.Drawing.Point(118, 152); this.razzSettingText.Name = "razzSettingText"; this.razzSettingText.Size = new System.Drawing.Size(100, 21); this.razzSettingText.TabIndex = 16; @@ -229,7 +229,7 @@ "Duplicate", "IV Duplicate", "All"}); - this.transferTypeCb.Location = new System.Drawing.Point(104, 176); + this.transferTypeCb.Location = new System.Drawing.Point(118, 176); this.transferTypeCb.Name = "transferTypeCb"; this.transferTypeCb.Size = new System.Drawing.Size(100, 20); this.transferTypeCb.TabIndex = 17; @@ -237,7 +237,7 @@ // // transferCpThresText // - this.transferCpThresText.Location = new System.Drawing.Point(104, 203); + this.transferCpThresText.Location = new System.Drawing.Point(118, 202); this.transferCpThresText.Name = "transferCpThresText"; this.transferCpThresText.Size = new System.Drawing.Size(100, 21); this.transferCpThresText.TabIndex = 18; @@ -246,7 +246,7 @@ // evolveAllChk // this.evolveAllChk.AutoSize = true; - this.evolveAllChk.Location = new System.Drawing.Point(104, 296); + this.evolveAllChk.Location = new System.Drawing.Point(118, 296); this.evolveAllChk.Name = "evolveAllChk"; this.evolveAllChk.Size = new System.Drawing.Size(15, 14); this.evolveAllChk.TabIndex = 19; @@ -259,7 +259,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.saveBtn.Location = new System.Drawing.Point(0, 315); this.saveBtn.Name = "saveBtn"; - this.saveBtn.Size = new System.Drawing.Size(198, 88); + this.saveBtn.Size = new System.Drawing.Size(218, 88); this.saveBtn.TabIndex = 20; this.saveBtn.Text = "Save"; this.saveBtn.UseVisualStyleBackColor = true; @@ -274,7 +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(3, 15); + this.gMapControl1.Location = new System.Drawing.Point(18, 15); this.gMapControl1.MarkersEnabled = true; this.gMapControl1.MaxZoom = 2; this.gMapControl1.MinZoom = 2; @@ -300,9 +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(221, 8); + this.groupBox1.Location = new System.Drawing.Point(233, 8); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(474, 408); + this.groupBox1.Size = new System.Drawing.Size(480, 408); this.groupBox1.TabIndex = 25; this.groupBox1.TabStop = false; this.groupBox1.Text = "Location"; @@ -311,9 +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(338, 379); + this.FindAdressButton.Location = new System.Drawing.Point(355, 379); this.FindAdressButton.Name = "FindAdressButton"; - this.FindAdressButton.Size = new System.Drawing.Size(130, 24); + this.FindAdressButton.Size = new System.Drawing.Size(119, 24); this.FindAdressButton.TabIndex = 25; this.FindAdressButton.Text = "Find Location"; this.FindAdressButton.UseVisualStyleBackColor = true; @@ -321,16 +321,16 @@ // // AdressBox // - this.AdressBox.Location = new System.Drawing.Point(6, 384); + this.AdressBox.Location = new System.Drawing.Point(18, 379); this.AdressBox.Name = "AdressBox"; - this.AdressBox.Size = new System.Drawing.Size(326, 21); + this.AdressBox.Size = new System.Drawing.Size(331, 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(426, 15); + this.trackBar.Location = new System.Drawing.Point(432, 15); this.trackBar.Name = "trackBar"; this.trackBar.Orientation = System.Windows.Forms.Orientation.Vertical; this.trackBar.Size = new System.Drawing.Size(45, 96); @@ -370,13 +370,13 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Left; this.panel1.Location = new System.Drawing.Point(9, 8); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(212, 408); + this.panel1.Size = new System.Drawing.Size(224, 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.Location = new System.Drawing.Point(118, 251); this.TravelSpeedBox.Name = "TravelSpeedBox"; this.TravelSpeedBox.Size = new System.Drawing.Size(100, 21); this.TravelSpeedBox.TabIndex = 22; @@ -385,7 +385,7 @@ // CatchPokemonBox // this.CatchPokemonBox.AutoSize = true; - this.CatchPokemonBox.Location = new System.Drawing.Point(104, 275); + this.CatchPokemonBox.Location = new System.Drawing.Point(118, 275); this.CatchPokemonBox.Name = "CatchPokemonBox"; this.CatchPokemonBox.Size = new System.Drawing.Size(15, 14); this.CatchPokemonBox.TabIndex = 26; @@ -404,7 +404,7 @@ // // transferIVThresText // - this.transferIVThresText.Location = new System.Drawing.Point(104, 203); + this.transferIVThresText.Location = new System.Drawing.Point(118, 203); this.transferIVThresText.Name = "transferIVThresText"; this.transferIVThresText.Size = new System.Drawing.Size(100, 21); this.transferIVThresText.TabIndex = 24; @@ -433,7 +433,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(704, 424); + this.ClientSize = new System.Drawing.Size(722, 424); this.Controls.Add(this.groupBox1); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));