diff --git a/NHSE.Parsing/GameBCSVDumper.cs b/NHSE.Parsing/GameBCSVDumper.cs index 71f063b..911e535 100644 --- a/NHSE.Parsing/GameBCSVDumper.cs +++ b/NHSE.Parsing/GameBCSVDumper.cs @@ -56,7 +56,6 @@ void DumpU(string fn, ushort[] ushorts, string dir = "bin") Console.WriteLine($"Created {fn}"); } - DumpS("bcsv_map.txt", BCSV.EnumLookup.Dump()); DumpS("lifeSupportAchievement.txt", GetLifeSupportAchievementList(pathBCSV)); DumpS("recipeDictionary.txt", GetRecipeList(pathBCSV)); diff --git a/NHSE.Sprites/Item/ItemSprite.cs b/NHSE.Sprites/Item/ItemSprite.cs index bd204c4..7db08ca 100644 --- a/NHSE.Sprites/Item/ItemSprite.cs +++ b/NHSE.Sprites/Item/ItemSprite.cs @@ -70,7 +70,7 @@ private static bool TryGetMenuIconSprite(ushort id, out Image? img) // the 1 stops the original "leaf" being overwritten var name = iconType == ItemMenuIconType.Leaf ? $"{iconType}1" : iconType.ToString(); - img = (Image?)Resources.ResourceManager.GetObject(name); + img = (Image?)Resources.ResourceManager.GetObject(name); return img != null; } @@ -83,10 +83,7 @@ private static bool TryGetItemImageSprite(ushort id, out string path, ushort cou return true; name = $"{id:00000}_0"; // fallback to no variation - if (SpriteFileExists(name, out path)) - return true; - - return false; + return SpriteFileExists(name, out path); } private static bool SpriteFileExists(string filename, out string path) diff --git a/NHSE.WinForms/Controls/ItemGridEditor.cs b/NHSE.WinForms/Controls/ItemGridEditor.cs index f3c7a09..db652d9 100644 --- a/NHSE.WinForms/Controls/ItemGridEditor.cs +++ b/NHSE.WinForms/Controls/ItemGridEditor.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Drawing; -using System.Drawing.Text; using System.Linq; using System.Windows.Forms; -using System.Windows.Forms.VisualStyles; using NHSE.Core; using NHSE.Sprites; @@ -227,7 +224,6 @@ public void LoadItems() private static void ShowContextMenuBelow(ToolStripDropDown c, Control n) => c.Show(n.PointToScreen(new Point(0, n.Height))); private void B_Clear_Click(object sender, EventArgs e) => ShowContextMenuBelow(CM_Remove, B_Clear); - private void ClearItemIf(Func criteria) { bool all = ModifierKeys == Keys.Shift; @@ -248,41 +244,48 @@ private void ClearItemIf(Func criteria) } private void B_Sort_Click(object sender, EventArgs e) => ShowContextMenuBelow(CM_Sort, B_Sort); - private void B_SortAlpha_Click(object sender, EventArgs e) { - IEnumerable sortedItems = Items.Where(item => item.ItemId != Item.NONE).OrderBy(item => GetItemText(item).ToLower()); - IList sortedItemsCopy = new List(); // to prevent object reference issues + private void B_SortAlpha_Click(object sender, EventArgs e) + { + var sortedItems = Items.Where(item => item.ItemId != Item.NONE) + .OrderBy(item => GetItemText(item).ToLower()); + var sortedItemsCopy = new List(); // to prevent object reference issues - foreach(Item item in sortedItems) { - Item itemCopy = new Item(); + foreach(var item in sortedItems) + { + var itemCopy = new Item(); itemCopy.CopyFrom(item); sortedItemsCopy.Add(itemCopy); } SetEditorItems(sortedItemsCopy); } - private void B_SortType_Click(object sender, EventArgs e) { - IEnumerable sortedItems = Items.Where(item => item.ItemId != Item.NONE).OrderBy(item => GetItemText(item).ToLower()).OrderBy(item => ItemInfo.GetItemKind(item)); - IList sortedItemsCopy = new List(); // to prevent object reference issues - foreach(Item item in sortedItems) { - Item itemCopy = new Item(); + private void B_SortType_Click(object sender, EventArgs e) + { + var sortedItems = Items.Where(item => item.ItemId != Item.NONE) + .OrderBy(item => GetItemText(item).ToLower()) + .ThenBy(ItemInfo.GetItemKind); + var sortedItemsCopy = new List(); // to prevent object reference issues + + foreach (var item in sortedItems) + { + var itemCopy = new Item(); itemCopy.CopyFrom(item); sortedItemsCopy.Add(itemCopy); } SetEditorItems(sortedItemsCopy); } - private void SetEditorItems(IList items) { + + private void SetEditorItems(IReadOnlyList items) + { if (items.Count > Items.Count) return; - for (int i = 0; i < Items.Count; i++) { - if (i < items.Count) { - GetItem(i).CopyFrom(items[i]); - } - else { - GetItem(i).CopyFrom(Item.NO_ITEM); - } + for (int i = 0; i < Items.Count; i++) + { + var src = i < items.Count ? items[i] : Item.NO_ITEM; + GetItem(i).CopyFrom(src); ItemUpdated(); } diff --git a/NHSE.WinForms/Controls/VillagerEditor.cs b/NHSE.WinForms/Controls/VillagerEditor.cs index 003deae..982adba 100644 --- a/NHSE.WinForms/Controls/VillagerEditor.cs +++ b/NHSE.WinForms/Controls/VillagerEditor.cs @@ -251,7 +251,6 @@ private void B_MoveOutAllVillagers_Click(object sender, EventArgs e) CHK_VillagerMovingOut.Checked = true; System.Media.SystemSounds.Asterisk.Play(); - return; } private void B_SetPhraseOriginal_Click(object sender, EventArgs e) diff --git a/NHSE.WinForms/Subforms/Program/ImageFetcher.cs b/NHSE.WinForms/Subforms/Program/ImageFetcher.cs index 313606e..cc53fe4 100644 --- a/NHSE.WinForms/Subforms/Program/ImageFetcher.cs +++ b/NHSE.WinForms/Subforms/Program/ImageFetcher.cs @@ -70,7 +70,7 @@ private void B_Download_Click(object sender, EventArgs e) } private void ProgressChanged(object sender, DownloadProgressChangedEventArgs e) => PBar_MultiUse.Value = e.ProgressPercentage; - + private void Completed(object sender, AsyncCompletedEventArgs e) { if (e.Error != null) @@ -80,7 +80,7 @@ private void Completed(object sender, AsyncCompletedEventArgs e) return; } - PBar_MultiUse.Value = 100; + PBar_MultiUse.Value = 100; L_Status.Text = "Unzipping..."; UnzipFile(); } @@ -96,7 +96,7 @@ private async void UnzipFile() Directory.CreateDirectory(outputFolderPath); - await Task.Run(() => ZipFile.ExtractToDirectory(ZipFilePath, outputFolderPath)); + await Task.Run(() => ZipFile.ExtractToDirectory(ZipFilePath, outputFolderPath)).ConfigureAwait(false); SetUIDownloadState(true, true); } @@ -137,7 +137,7 @@ private async void CheckNetworkFileSizeAsync() try { using var webClient = new WebClient(); - await webClient.OpenReadTaskAsync(new Uri(AllHosts[CB_HostSelect.SelectedIndex], UriKind.Absolute)); + await webClient.OpenReadTaskAsync(new Uri(AllHosts[CB_HostSelect.SelectedIndex], UriKind.Absolute)).ConfigureAwait(false); var totalSizeBytes = Convert.ToInt64(webClient.ResponseHeaders["Content-Length"]); var totalSizeMb = totalSizeBytes / 1e+6;