claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up unnecessary logic complexity

Browse Source
This commit is contained in:
Matt Nadareski
2025-02-14 15:25:11 -05:00
parent bbf1f5f6c3
commit d47e25605f
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SabreTools.DatFiles/Formats/Missfile.cs
View File

@@ -176,8 +176,8 @@ namespace SabreTools.DatFiles.Formats
// Romba mode automatically uses item name // Romba mode automatically uses item name
if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName) if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName)
sw.Write($"{datItem.GetName() ?? string.Empty}\n"); sw.Write($"{datItem.GetName() ?? string.Empty}\n");
else if (!Modifiers.UseRomName && datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame) else if (!Modifiers.UseRomName && machine!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame)
sw.Write($"{datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n"); sw.Write($"{machine!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n");
sw.Flush(); sw.Flush();
} }
@@ -191,21 +191,16 @@ namespace SabreTools.DatFiles.Formats
private void WriteDatItemDB(StreamWriter sw, KeyValuePair<long, DatItem> datItem, string? lastgame) private void WriteDatItemDB(StreamWriter sw, KeyValuePair<long, DatItem> datItem, string? lastgame)
{ {
// Get the machine for the item // Get the machine for the item
var machine = ItemsDB.GetMachineForItem(datItem.Key); var machine = ItemsDB.GetMachineForItem(datItem.Key).Value;
// Process the item name // 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 // Romba mode automatically uses item name
if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName) if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName)
{
sw.Write($"{datItem.Value.GetName() ?? string.Empty}\n"); sw.Write($"{datItem.Value.GetName() ?? string.Empty}\n");
} else if (!Modifiers.UseRomName && machine!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame)
else if (!Modifiers.UseRomName sw.Write($"{machine!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n");
&& machine.Value!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame)
{
sw.Write($"{machine.Value!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n");
}
sw.Flush(); sw.Flush();
} }