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

Only remove extension in ORPG when it's Rom

Browse Source
This commit is contained in:
Matt Nadareski
2024-07-30 09:10:03 -04:00
parent 4c4ea54ac8
commit 4b3cb481c1
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -1111,12 +1111,17 @@ namespace SabreTools.DatFiles
if (datItem.GetName() == null)
return;
string[] splitname = datItem.GetName()!.Split('.');
// Remove extensions from Rom items
string machine = datItem.GetName()!;
if (datItem is Rom)
{
string[] splitname = machine.Split('.');
#if NET20 || NET35
string machine = datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1).ToArray())}";
machine = datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1).ToArray())}";
#else
string machine = datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1))}";
machine = datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1))}";
#endif
}
// Strip off "Default" prefix only for ORPG
if (machine.StartsWith("Default"))

11
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -1533,12 +1533,17 @@ namespace SabreTools.DatFiles
if (machine.Item2 == null)
return;
string[] splitname = datItem.Item2.GetName()!.Split('.');
// Remove extensions from Rom items
string machineName = datItem.Item2.GetName()!;
if (datItem.Item2 is Rom)
{
string[] splitname = machineName.Split('.');
#if NET20 || NET35
string machineName = machine.Item2.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1).ToArray())}";
machineName = datItem.Item2.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1).ToArray())}";
#else
string machineName = machine.Item2.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1))}";
machineName = datItem.Item2.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1))}";
#endif
}
// Strip off "Default" prefix only for ORPG
if (machineName.StartsWith("Default"))