diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs index b120f44a..668d6fd1 100644 --- a/SabreTools.Library/DatFiles/SeparatedValue.cs +++ b/SabreTools.Library/DatFiles/SeparatedValue.cs @@ -188,6 +188,8 @@ namespace SabreTools.Library.DatFiles #region Machine + #region Common + case "Machine.Name": machine.Name = value; break; @@ -228,10 +230,42 @@ namespace SabreTools.Library.DatFiles machine.SampleOf = value; break; - case "Machine.Supported": - machine.Supported = value.AsYesNo(); + #endregion + + #region AttractMode + + case "Machine.Players": + machine.Players = value; break; + case "Machine.Rotation": + machine.Rotation = value; + break; + + case "Machine.Control": + machine.Control = value; + break; + + case "Machine.Status": + machine.Status = value; + break; + + case "Machine.DisplayCount": + machine.DisplayCount = value; + break; + + case "Machine.DisplayType": + machine.DisplayType = value; + break; + + case "Machine.Buttons": + machine.Buttons = value; + break; + + #endregion + + #region ListXML + case "Machine.SourceFile": machine.SourceFile = value; break; @@ -240,14 +274,6 @@ namespace SabreTools.Library.DatFiles machine.Runnable = value.AsYesNo(); break; - case "Machine.Board": - machine.Board = value; - break; - - case "Machine.RebuildTo": - machine.RebuildTo = value; - break; - case "Machine.Devices": machine.Devices = new List(); var devices = value.Split(';'); @@ -285,6 +311,28 @@ namespace SabreTools.Library.DatFiles #endregion + #region Logiqx + + case "Machine.Board": + machine.Board = value; + break; + + case "Machine.RebuildTo": + machine.RebuildTo = value; + break; + + #endregion + + #region SoftwareList + + case "Machine.Supported": + machine.Supported = value.AsYesNo(); + break; + + #endregion + + #endregion // Machine + #region DatItem case "DatItem.Type": @@ -617,6 +665,7 @@ namespace SabreTools.Library.DatFiles case "internal name": return "DatFile.Name"; + case "desc": case "description": case "dat description": return "DatFile.Description"; @@ -674,6 +723,8 @@ namespace SabreTools.Library.DatFiles #region Machine + #region Common + case "game": case "gamename": case "game name": @@ -683,11 +734,16 @@ namespace SabreTools.Library.DatFiles return "Machine.Name"; case "comment": + case "extra": return "Machine.Comment"; + case "gamedesc": case "gamedescription": + case "game-description": case "game description": + case "machinedesc": case "machinedescription": + case "machine-description": case "machine description": return "Machine.Description"; @@ -700,6 +756,12 @@ namespace SabreTools.Library.DatFiles case "publisher": return "Machine.Publisher"; + case "gamecategory": + case "game-category": + case "machinecategory": + case "machine-category": + return "Machine.Category"; + case "romof": return "Machine.RomOf"; @@ -709,28 +771,59 @@ namespace SabreTools.Library.DatFiles case "sampleof": return "Machine.SampleOf"; - case "supported": - return "Machine.Supported"; + #endregion + + #region AttractMode + + case "players": + return "Machine.Players"; + + case "rotation": + return "Machine.Rotation"; + + case "control": + return "Machine.Control"; + + case "amstatus": + case "am-status": + case "gamestatus": + case "game-status": + case "machinestatus": + case "machine-status": + case "supportstatus": + case "support-status": + return "Machine.Status"; + + case "displaycount": + case "display-count": + case "displays": + return "Machine.DisplayCount"; + + case "displaytype": + case "display-type": + return "Machine.DisplayType"; + + case "buttons": + return "Machine.Buttons"; + + #endregion + + #region ListXML case "sourcefile": case "source file": + case "source-file": return "Machine.SourceFile"; case "runnable": return "Machine.Runnable"; - case "board": - return "Machine.Board"; - - case "rebuildto": - case "rebuild to": - return "Machine.RebuildTo"; - case "devices": return "Machine.Devices"; case "slotoptions": case "slot options": + case "slot-options": return "Machine.SlotOptions"; case "infos": @@ -738,12 +831,35 @@ namespace SabreTools.Library.DatFiles case "gametype": case "game type": + case "game-type": case "machinetype": case "machine type": + case "machine-type": return "Machine.MachineType"; #endregion + #region Logiqx + + case "board": + return "Machine.Board"; + + case "rebuildto": + case "rebuild to": + case "rebuild-to": + return "Machine.RebuildTo"; + + #endregion + + #region SoftwareList + + case "supported": + return "Machine.Supported"; + + #endregion + + #endregion // Machine + #region DatItem case "itemtype": diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs index 9969e56a..18556df7 100644 --- a/SabreTools.Library/DatItems/DatItem.cs +++ b/SabreTools.Library/DatItems/DatItem.cs @@ -53,7 +53,7 @@ namespace SabreTools.Library.DatItems #endregion - #region Software list information + #region SoftwareList Fields /// /// Original hardware part associated with the item diff --git a/SabreTools.Library/Tools/Converters.cs b/SabreTools.Library/Tools/Converters.cs index 03936faa..5cbdfb1a 100644 --- a/SabreTools.Library/Tools/Converters.cs +++ b/SabreTools.Library/Tools/Converters.cs @@ -127,37 +127,52 @@ namespace SabreTools.Library.Tools #region Common + case "game": case "gamename": case "game-name": + case "machine": case "machinename": case "machine-name": return Field.MachineName; + case "comment": case "extra": return Field.Comment; + case "desc": case "description": case "gamedesc": case "gamedescription": case "game-description": + case "game description": case "machinedesc": case "machinedescription": case "machine-description": + case "machine description": return Field.Description; + case "year": return Field.Year; + case "manufacturer": return Field.Manufacturer; + case "publisher": return Field.Publisher; + case "category": + case "gamecategory": + case "game-category": case "machinecategory": case "machine-category": return Field.Category; + case "romof": return Field.RomOf; + case "cloneof": return Field.CloneOf; + case "sampleof": return Field.SampleOf; @@ -167,10 +182,13 @@ namespace SabreTools.Library.Tools case "players": return Field.Players; + case "rotation": return Field.Rotation; + case "control": return Field.Control; + case "amstatus": case "am-status": case "gamestatus": @@ -180,13 +198,16 @@ namespace SabreTools.Library.Tools case "supportstatus": case "support-status": return Field.SupportStatus; + case "displaycount": case "display-count": case "displays": return Field.DisplayCount; + case "displaytype": case "display-type": return Field.DisplayType; + case "buttons": return Field.Buttons; @@ -195,20 +216,29 @@ namespace SabreTools.Library.Tools #region ListXML case "sourcefile": + case "source file": case "source-file": return Field.SourceFile; + case "runnable": return Field.Runnable; + case "devices": return Field.Devices; + case "slotoptions": + case "slot options": case "slot-options": return Field.SlotOptions; + case "infos": return Field.Infos; + case "gametype": + case "game type": case "game-type": case "machinetype": + case "machine type": case "machine-type": return Field.MachineType; @@ -218,7 +248,10 @@ namespace SabreTools.Library.Tools case "board": return Field.Board; + case "rebuildto": + case "rebuild to": + case "rebuild-to": return Field.RebuildTo; #endregion