From d47e25605f19d9baea54aa6d5670ec0a9341572d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 14 Feb 2025 15:25:11 -0500 Subject: [PATCH] Clean up unnecessary logic complexity --- SabreTools.DatFiles/Formats/Missfile.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/SabreTools.DatFiles/Formats/Missfile.cs b/SabreTools.DatFiles/Formats/Missfile.cs index 314943ec..329a0ac5 100644 --- a/SabreTools.DatFiles/Formats/Missfile.cs +++ b/SabreTools.DatFiles/Formats/Missfile.cs @@ -176,8 +176,8 @@ namespace SabreTools.DatFiles.Formats // Romba mode automatically uses item name if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName) sw.Write($"{datItem.GetName() ?? string.Empty}\n"); - else if (!Modifiers.UseRomName && datItem.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame) - sw.Write($"{datItem.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n"); + else if (!Modifiers.UseRomName && machine!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame) + sw.Write($"{machine!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n"); sw.Flush(); } @@ -191,21 +191,16 @@ namespace SabreTools.DatFiles.Formats private void WriteDatItemDB(StreamWriter sw, KeyValuePair datItem, string? lastgame) { // Get the machine for the item - var machine = ItemsDB.GetMachineForItem(datItem.Key); + var machine = ItemsDB.GetMachineForItem(datItem.Key).Value; // Process the item name - ProcessItemName(datItem.Value, machine.Value, forceRemoveQuotes: false, forceRomName: false); + ProcessItemName(datItem.Value, machine, forceRemoveQuotes: false, forceRomName: false); // Romba mode automatically uses item name if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName) - { sw.Write($"{datItem.Value.GetName() ?? string.Empty}\n"); - } - else if (!Modifiers.UseRomName - && machine.Value!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame) - { - sw.Write($"{machine.Value!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n"); - } + else if (!Modifiers.UseRomName && machine!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame) + sw.Write($"{machine!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n"); sw.Flush(); }