diff --git a/SysBot.Pokemon.WinForms/Main.Designer.cs b/SysBot.Pokemon.WinForms/Main.Designer.cs index 89a917d..10f0c7c 100644 --- a/SysBot.Pokemon.WinForms/Main.Designer.cs +++ b/SysBot.Pokemon.WinForms/Main.Designer.cs @@ -63,17 +63,20 @@ private void InitializeComponent() // // TC_Main // - TC_Main.Appearance = TabAppearance.Buttons; + TC_Main.Appearance = TabAppearance.FlatButtons; TC_Main.Controls.Add(Tab_Bots); TC_Main.Controls.Add(Tab_Hub); TC_Main.Controls.Add(Tab_Logs); TC_Main.Dock = DockStyle.Fill; - TC_Main.ItemSize = new Size(76, 30); + TC_Main.Font = new Font("Cambria", 11.25F, FontStyle.Bold, GraphicsUnit.Point, 0); + TC_Main.ItemSize = new Size(60, 45); TC_Main.Location = new Point(0, 0); + TC_Main.Margin = new Padding(0); + TC_Main.Multiline = true; TC_Main.Name = "TC_Main"; - TC_Main.Padding = new Point(20, 7); + TC_Main.Padding = new Point(0, 0); TC_Main.SelectedIndex = 0; - TC_Main.Size = new Size(773, 519); + TC_Main.Size = new Size(734, 519); TC_Main.TabIndex = 3; // // Tab_Bots @@ -85,9 +88,9 @@ private void InitializeComponent() Tab_Bots.Controls.Add(CB_Routine); Tab_Bots.Controls.Add(NUD_Port); Tab_Bots.Controls.Add(B_New); - Tab_Bots.Location = new Point(4, 34); + Tab_Bots.Location = new Point(4, 49); Tab_Bots.Name = "Tab_Bots"; - Tab_Bots.Size = new Size(765, 481); + Tab_Bots.Size = new Size(726, 466); Tab_Bots.TabIndex = 0; Tab_Bots.Text = "Bots"; // @@ -95,9 +98,9 @@ private void InitializeComponent() // comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.FormattingEnabled = true; - comboBox1.Location = new Point(487, 6); + comboBox1.Location = new Point(525, 6); comboBox1.Name = "comboBox1"; - comboBox1.Size = new Size(117, 23); + comboBox1.Size = new Size(192, 25); comboBox1.TabIndex = 11; comboBox1.SelectedIndexChanged += ComboBox1_SelectedIndexChanged; // @@ -106,9 +109,9 @@ private void InitializeComponent() CB_Protocol.DropDownStyle = ComboBoxStyle.DropDownList; CB_Protocol.ForeColor = Color.Red; CB_Protocol.FormattingEnabled = true; - CB_Protocol.Location = new Point(289, 6); + CB_Protocol.Location = new Point(291, 6); CB_Protocol.Name = "CB_Protocol"; - CB_Protocol.Size = new Size(67, 23); + CB_Protocol.Size = new Size(67, 25); CB_Protocol.TabIndex = 10; CB_Protocol.SelectedIndexChanged += CB_Protocol_SelectedIndexChanged; // @@ -123,7 +126,7 @@ private void InitializeComponent() FLP_Bots.Location = new Point(0, 37); FLP_Bots.Margin = new Padding(0); FLP_Bots.Name = "FLP_Bots"; - FLP_Bots.Size = new Size(765, 445); + FLP_Bots.Size = new Size(726, 430); FLP_Bots.TabIndex = 9; FLP_Bots.Paint += FLP_Bots_Paint; FLP_Bots.Resize += FLP_Bots_Resize; @@ -143,7 +146,7 @@ private void InitializeComponent() CB_Routine.FormattingEnabled = true; CB_Routine.Location = new Point(364, 6); CB_Routine.Name = "CB_Routine"; - CB_Routine.Size = new Size(117, 23); + CB_Routine.Size = new Size(155, 25); CB_Routine.TabIndex = 7; // // NUD_Port @@ -170,10 +173,10 @@ private void InitializeComponent() // Tab_Hub // Tab_Hub.Controls.Add(PG_Hub); - Tab_Hub.Location = new Point(4, 34); + Tab_Hub.Location = new Point(4, 49); Tab_Hub.Name = "Tab_Hub"; Tab_Hub.Padding = new Padding(3); - Tab_Hub.Size = new Size(841, 481); + Tab_Hub.Size = new Size(726, 466); Tab_Hub.TabIndex = 2; Tab_Hub.Text = "Hub"; // @@ -183,16 +186,16 @@ private void InitializeComponent() PG_Hub.Location = new Point(3, 3); PG_Hub.Name = "PG_Hub"; PG_Hub.PropertySort = PropertySort.Categorized; - PG_Hub.Size = new Size(835, 475); + PG_Hub.Size = new Size(720, 460); PG_Hub.TabIndex = 0; PG_Hub.ToolbarVisible = false; // // Tab_Logs // Tab_Logs.Controls.Add(RTB_Logs); - Tab_Logs.Location = new Point(4, 34); + Tab_Logs.Location = new Point(4, 49); Tab_Logs.Name = "Tab_Logs"; - Tab_Logs.Size = new Size(841, 481); + Tab_Logs.Size = new Size(726, 466); Tab_Logs.TabIndex = 1; Tab_Logs.Text = "Logs"; // @@ -202,7 +205,7 @@ private void InitializeComponent() RTB_Logs.Location = new Point(0, 0); RTB_Logs.Name = "RTB_Logs"; RTB_Logs.ReadOnly = true; - RTB_Logs.Size = new Size(841, 481); + RTB_Logs.Size = new Size(726, 466); RTB_Logs.TabIndex = 0; RTB_Logs.Text = ""; // @@ -215,7 +218,7 @@ private void InitializeComponent() B_Stop.ForeColor = Color.WhiteSmoke; B_Stop.Image = Resources.stopall; B_Stop.ImageAlign = ContentAlignment.MiddleLeft; - B_Stop.Location = new Point(100, 2); + B_Stop.Location = new Point(99, 9); B_Stop.Margin = new Padding(0); B_Stop.Name = "B_Stop"; B_Stop.Size = new Size(90, 28); @@ -233,7 +236,7 @@ private void InitializeComponent() B_Start.ForeColor = Color.ForestGreen; B_Start.Image = Resources.startall; B_Start.ImageAlign = ContentAlignment.MiddleLeft; - B_Start.Location = new Point(5, 2); + B_Start.Location = new Point(2, 9); B_Start.Margin = new Padding(0); B_Start.Name = "B_Start"; B_Start.Size = new Size(91, 28); @@ -251,7 +254,7 @@ private void InitializeComponent() B_RebootReset.ForeColor = Color.SteelBlue; B_RebootReset.Image = Resources.refresh; B_RebootReset.ImageAlign = ContentAlignment.MiddleLeft; - B_RebootReset.Location = new Point(301, 2); + B_RebootReset.Location = new Point(301, 9); B_RebootReset.Margin = new Padding(0); B_RebootReset.Name = "B_RebootReset"; B_RebootReset.Size = new Size(88, 28); @@ -269,7 +272,7 @@ private void InitializeComponent() updater.ForeColor = Color.Transparent; updater.Image = Resources.update; updater.ImageAlign = ContentAlignment.MiddleLeft; - updater.Location = new Point(393, 2); + updater.Location = new Point(394, 9); updater.Margin = new Padding(0); updater.Name = "updater"; updater.Size = new Size(78, 28); @@ -287,10 +290,10 @@ private void InitializeComponent() ButtonPanel.Controls.Add(B_RebootReset); ButtonPanel.Controls.Add(B_Stop); ButtonPanel.Controls.Add(B_Start); - ButtonPanel.Location = new Point(293, 0); + ButtonPanel.Location = new Point(249, 0); ButtonPanel.Margin = new Padding(3, 4, 3, 4); ButtonPanel.Name = "ButtonPanel"; - ButtonPanel.Size = new Size(476, 33); + ButtonPanel.Size = new Size(481, 42); ButtonPanel.TabIndex = 0; // // B_RefreshMap @@ -302,7 +305,7 @@ private void InitializeComponent() B_RefreshMap.ForeColor = Color.Green; B_RefreshMap.Image = Resources.maprefresh; B_RefreshMap.ImageAlign = ContentAlignment.MiddleLeft; - B_RefreshMap.Location = new Point(194, 2); + B_RefreshMap.Location = new Point(194, 9); B_RefreshMap.Margin = new Padding(0); B_RefreshMap.Name = "B_RefreshMap"; B_RefreshMap.Size = new Size(103, 28); @@ -316,7 +319,7 @@ private void InitializeComponent() // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(773, 519); + ClientSize = new Size(734, 519); Controls.Add(ButtonPanel); Controls.Add(TC_Main); Icon = Resources.icon; diff --git a/SysBot.Pokemon/SV/BotRaid/RotatingRaidBotSV.cs b/SysBot.Pokemon/SV/BotRaid/RotatingRaidBotSV.cs index ad6e127..4605b91 100644 --- a/SysBot.Pokemon/SV/BotRaid/RotatingRaidBotSV.cs +++ b/SysBot.Pokemon/SV/BotRaid/RotatingRaidBotSV.cs @@ -3186,15 +3186,7 @@ private async Task ProcessAllRaids(CancellationToken token) var allRewards = container.Rewards; uint denHexSeedUInt; denHexSeedUInt = uint.Parse(denHexSeed, NumberStyles.AllowHexSpecifier); - bool seedFound = await FindSeedIndexInRaids(denHexSeedUInt, token); - - if (!seedFound) - { - Log($"Seed {denHexSeedUInt:X8} not found in any region. Stopping processing and refreshing the map."); - shouldRefreshMap = true; - return; - } - + await FindSeedIndexInRaids(denHexSeedUInt, token); var raidInfoList = await ExtractPaldeaRaidInfo(token); bool newEventSpeciesFound = false; var (distGroupIDs, mightGroupIDs) = GetPossibleGroups(container); @@ -3426,7 +3418,7 @@ private async Task ProcessAllRaids(CancellationToken token) } } - private async Task FindSeedIndexInRaids(uint denHexSeedUInt, CancellationToken token) + private async Task FindSeedIndexInRaids(uint denHexSeedUInt, CancellationToken token) { var upperBound = KitakamiDensCount == 25 ? 94 : 95; var startIndex = KitakamiDensCount == 25 ? 94 : 95; @@ -3439,7 +3431,7 @@ private async Task FindSeedIndexInRaids(uint denHexSeedUInt, CancellationT if (seed == denHexSeedUInt) { SeedIndexToReplace = i; - return true; + return; } } @@ -3451,7 +3443,7 @@ private async Task FindSeedIndexInRaids(uint denHexSeedUInt, CancellationT if (seed == denHexSeedUInt) { SeedIndexToReplace = i + 69; - return true; + return; } } @@ -3463,11 +3455,11 @@ private async Task FindSeedIndexInRaids(uint denHexSeedUInt, CancellationT if (seed == denHexSeedUInt) { SeedIndexToReplace = i - 1; - return true; + return; } } - return false; + Log($"Seed {denHexSeedUInt:X8} not found in any region."); } public static (PK9, Embed) RaidInfoCommand(string seedValue, int contentType, TeraRaidMapParent map, int storyProgressLevel, int raidDeliveryGroupID, List rewardsToShow, bool moveTypeEmojis, List customTypeEmojis, int queuePosition = 0, bool isEvent = false)