Clean

bdawg1989 · Apr 7, 2024 · 814b8e7 · 814b8e7
1 parent 4c8828c
commit 814b8e7
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 128 deletions.
diff --git a/SysBot.Pokemon.Discord/Commands/Bots/RaidModule.cs b/SysBot.Pokemon.Discord/Commands/Bots/RaidModule.cs
@@ -289,7 +289,7 @@ public async Task RePeek()
                 return;
             }
 
-            using MemoryStream ms = new MemoryStream(bytes);
+            using MemoryStream ms = new(bytes);
             var img = "cap.jpg";
             var embed = new EmbedBuilder { ImageUrl = $"attachment://{img}", Color = Color.Purple }
                 .WithFooter(new EmbedFooterBuilder { Text = $"Here's your screenshot." });
@@ -780,7 +780,7 @@ public async Task CheckQueueStatus()
             // Find the index of the user's request in the queue, excluding Mystery Shiny Raids
             var userRequestIndex = Hub.Config.RotatingRaidSV.ActiveRaids.FindIndex(r => r.RequestedByUserID == userId && !r.Title.Contains("Mystery Shiny Raid"));
 
-            EmbedBuilder embed = new EmbedBuilder();
+            EmbedBuilder embed = new();
 
             if (userRequestIndex == -1)
             {

diff --git a/SysBot.Pokemon.WinForms/Main.Designer.cs b/SysBot.Pokemon.WinForms/Main.Designer.cs
diff --git a/SysBot.Pokemon.WinForms/Main.cs b/SysBot.Pokemon.WinForms/Main.cs
@@ -25,7 +25,7 @@ public sealed partial class Main : Form
         public Main()
         {
             InitializeComponent();
-            this.Load += async (sender, e) => await InitializeAsync();
+            Load += async (sender, e) => await InitializeAsync();
 
             TC_Main.SelectedIndexChanged += TC_Main_SelectedIndexChanged;
             RTB_Logs.TextChanged += RTB_Logs_TextChanged;
@@ -38,7 +38,7 @@ private async Task InitializeAsync()
             string discordName = string.Empty;
 
             // Update checker
-            UpdateChecker updateChecker = new UpdateChecker();
+            UpdateChecker updateChecker = new();
             await UpdateChecker.CheckForUpdatesAsync();
 
             if (File.Exists(Program.ConfigPath))
@@ -380,7 +380,7 @@ private void FLP_Bots_Paint(object sender, PaintEventArgs e)
         {
         }
 
-        private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        private void ComboBox1_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (sender is ComboBox comboBox)
             {
@@ -427,10 +427,10 @@ private void ApplySylveonTheme()
             Color ElegantWhite = Color.FromArgb(255, 255, 255);// An elegant white for background and contrast
 
             // Set the background color of the form
-            this.BackColor = ElegantWhite;
+            BackColor = ElegantWhite;
 
             // Set the foreground color of the form (text color)
-            this.ForeColor = DeepBlue;
+            ForeColor = DeepBlue;
 
             // Set the background color of the tab control
             TC_Main.BackColor = SkyBlue;
@@ -493,10 +493,10 @@ private void ApplyGengarTheme()
             Color MidnightBlack = Color.FromArgb(25, 25, 35);  // A near-black for the darkest areas
 
             // Set the background color of the form
-            this.BackColor = MidnightBlack;
+            BackColor = MidnightBlack;
 
             // Set the foreground color of the form (text color)
-            this.ForeColor = GhostlyGrey;
+            ForeColor = GhostlyGrey;
 
             // Set the background color of the tab control
             TC_Main.BackColor = GengarPurple;
@@ -557,10 +557,10 @@ private void ApplyLightTheme()
             Color DarkBlue = Color.FromArgb(26, 13, 171);
 
             // Set the background color of the form
-            this.BackColor = GentleGrey;
+            BackColor = GentleGrey;
 
             // Set the foreground color of the form (text color)
-            this.ForeColor = DarkBlue;
+            ForeColor = DarkBlue;
 
             // Set the background color of the tab control
             TC_Main.BackColor = SoftBlue;
@@ -623,10 +623,10 @@ private void ApplyPokemonTheme()
             Color MidnightBlack = Color.FromArgb(18, 19, 20); // A near-black for darker elements and depth
 
             // Set the background color of the form
-            this.BackColor = SleekGrey;
+            BackColor = SleekGrey;
 
             // Set the foreground color of the form (text color)
-            this.ForeColor = SoftWhite;
+            ForeColor = SoftWhite;
 
             // Set the background color of the tab control
             TC_Main.BackColor = DarkPokeRed;
@@ -688,10 +688,10 @@ private void ApplyDarkTheme()
             Color SoftWhite = Color.FromArgb(245, 245, 245);
 
             // Set the background color of the form
-            this.BackColor = DarkGrey;
+            BackColor = DarkGrey;
 
             // Set the foreground color of the form (text color)
-            this.ForeColor = SoftWhite;
+            ForeColor = SoftWhite;
 
             // Set the background color of the tab control
             TC_Main.BackColor = LightGrey;

diff --git a/SysBot.Pokemon/SV/BotRaid/RaidEmbedInfoHelpers.cs b/SysBot.Pokemon/SV/BotRaid/RaidEmbedInfoHelpers.cs
@@ -0,0 +1,19 @@
+using PKHeX.Core;
+
+internal static class RaidEmbedInfoHelpers
+{
+    public static string RaidEmbedTitle = string.Empty;
+    public static Species RaidSpecies = Species.None;
+    public static byte RaidSpeciesForm = 0;
+    public static string RaidSpeciesGender = string.Empty;
+    public static int RaidLevel;
+    public static string RaidSpeciesIVs = string.Empty;
+    public static string RaidSpeciesAbility = string.Empty;
+    public static string RaidSpeciesNature = string.Empty;
+    public static string RaidSpeciesTeraType = string.Empty;
+    public static string Moves = string.Empty;
+    public static string ExtraMoves = string.Empty;
+    public static string ScaleText = string.Empty;
+    public static string SpecialRewards = string.Empty;
+    public static int ScaleNumber;
+}