diff --git a/SabreTools.Library/DatItems/Adjuster.cs b/SabreTools.Library/DatItems/Adjuster.cs index a6b3726d..a42ceddb 100644 --- a/SabreTools.Library/DatItems/Adjuster.cs +++ b/SabreTools.Library/DatItems/Adjuster.cs @@ -94,17 +94,14 @@ namespace SabreTools.Library.DatItems { return new Adjuster() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Default = this.Default, Conditions = this.Conditions, }; diff --git a/SabreTools.Library/DatItems/Analog.cs b/SabreTools.Library/DatItems/Analog.cs index 079ed2d0..68309b38 100644 --- a/SabreTools.Library/DatItems/Analog.cs +++ b/SabreTools.Library/DatItems/Analog.cs @@ -61,9 +61,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Archive.cs b/SabreTools.Library/DatItems/Archive.cs index 7bc0a472..4808ac0f 100644 --- a/SabreTools.Library/DatItems/Archive.cs +++ b/SabreTools.Library/DatItems/Archive.cs @@ -70,16 +70,14 @@ namespace SabreTools.Library.DatItems { return new Archive() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + + Name = this.Name, }; } diff --git a/SabreTools.Library/DatItems/BiosSet.cs b/SabreTools.Library/DatItems/BiosSet.cs index 491f62fc..0ce9adeb 100644 --- a/SabreTools.Library/DatItems/BiosSet.cs +++ b/SabreTools.Library/DatItems/BiosSet.cs @@ -88,17 +88,14 @@ namespace SabreTools.Library.DatItems { return new BiosSet() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Description = this.Description, Default = this.Default, }; diff --git a/SabreTools.Library/DatItems/Blank.cs b/SabreTools.Library/DatItems/Blank.cs index 996ae0d7..0ef83ba0 100644 --- a/SabreTools.Library/DatItems/Blank.cs +++ b/SabreTools.Library/DatItems/Blank.cs @@ -29,9 +29,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Chip.cs b/SabreTools.Library/DatItems/Chip.cs index 68d2077d..0fe419c9 100644 --- a/SabreTools.Library/DatItems/Chip.cs +++ b/SabreTools.Library/DatItems/Chip.cs @@ -99,17 +99,14 @@ namespace SabreTools.Library.DatItems { return new Chip() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Tag = this.Tag, ChipType = this.ChipType, Clock = this.Clock, diff --git a/SabreTools.Library/DatItems/Condition.cs b/SabreTools.Library/DatItems/Condition.cs index 8f1c4467..cea5c6a2 100644 --- a/SabreTools.Library/DatItems/Condition.cs +++ b/SabreTools.Library/DatItems/Condition.cs @@ -96,9 +96,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Configuration.cs b/SabreTools.Library/DatItems/Configuration.cs index b4e4b22d..02d0b747 100644 --- a/SabreTools.Library/DatItems/Configuration.cs +++ b/SabreTools.Library/DatItems/Configuration.cs @@ -133,17 +133,14 @@ namespace SabreTools.Library.DatItems { return new Configuration() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Tag = this.Tag, Mask = this.Mask, Conditions = this.Conditions, diff --git a/SabreTools.Library/DatItems/Control.cs b/SabreTools.Library/DatItems/Control.cs index 5172f716..2771fd53 100644 --- a/SabreTools.Library/DatItems/Control.cs +++ b/SabreTools.Library/DatItems/Control.cs @@ -161,9 +161,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs index 8c806560..4d1558e8 100644 --- a/SabreTools.Library/DatItems/DatItem.cs +++ b/SabreTools.Library/DatItems/DatItem.cs @@ -19,8 +19,6 @@ namespace SabreTools.Library.DatItems [JsonObject("datitem")] public abstract class DatItem : IEquatable, IComparable, ICloneable { - // TODO: Should any of these be specific to certain types? - // Most of the "weird" fields might only apply to Rom or Disk? #region Fields #region Common Fields @@ -50,22 +48,6 @@ namespace SabreTools.Library.DatItems #endregion - #region AttractMode Fields - - /// - /// Alternate name for the item - /// - [JsonProperty("alt_romname", DefaultValueHandling = DefaultValueHandling.Ignore)] - public string AltName { get; set; } - - /// - /// Alternate title for the item - /// - [JsonProperty("alt_title", DefaultValueHandling = DefaultValueHandling.Ignore)] - public string AltTitle { get; set; } - - #endregion - #region Metadata information /// @@ -291,16 +273,6 @@ namespace SabreTools.Library.DatItems Machine = new Machine(); Machine.SetFields(mappings); - - #region AttractMode - - if (mappings.Keys.Contains(Field.DatItem_AltName)) - AltName = mappings[Field.DatItem_AltName]; - - if (mappings.Keys.Contains(Field.DatItem_AltTitle)) - AltTitle = mappings[Field.DatItem_AltTitle]; - - #endregion } #endregion @@ -629,22 +601,6 @@ namespace SabreTools.Library.DatItems #endregion - #region AttractMode - - // Filter on alt name - if (filter.DatItem_AltName.MatchesPositiveSet(AltName) == false) - return false; - if (filter.DatItem_AltName.MatchesNegativeSet(AltName) == true) - return false; - - // Filter on alt title - if (filter.DatItem_AltTitle.MatchesPositiveSet(AltTitle) == false) - return false; - if (filter.DatItem_AltTitle.MatchesNegativeSet(AltTitle) == true) - return false; - - #endregion - return true; } @@ -656,16 +612,6 @@ namespace SabreTools.Library.DatItems { // Remove machine fields Machine.RemoveFields(fields); - - #region AttractMode - - if (fields.Contains(Field.DatItem_AltName)) - AltName = null; - - if (fields.Contains(Field.DatItem_AltTitle)) - AltTitle = null; - - #endregion } /// @@ -755,15 +701,6 @@ namespace SabreTools.Library.DatItems /// List of Fields representing what should be updated public virtual void ReplaceFields(DatItem item, List fields) { - #region AttractMode - - if (fields.Contains(Field.DatItem_AltName)) - AltName = item.AltName; - - if (fields.Contains(Field.DatItem_AltTitle)) - AltTitle = item.AltTitle; - - #endregion } #endregion diff --git a/SabreTools.Library/DatItems/Device.cs b/SabreTools.Library/DatItems/Device.cs index c9672929..8b0111f1 100644 --- a/SabreTools.Library/DatItems/Device.cs +++ b/SabreTools.Library/DatItems/Device.cs @@ -112,9 +112,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/DeviceReference.cs b/SabreTools.Library/DatItems/DeviceReference.cs index 693e4ecf..c7222cee 100644 --- a/SabreTools.Library/DatItems/DeviceReference.cs +++ b/SabreTools.Library/DatItems/DeviceReference.cs @@ -70,16 +70,14 @@ namespace SabreTools.Library.DatItems { return new DeviceReference() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + + Name = this.Name, }; } diff --git a/SabreTools.Library/DatItems/DipSwitch.cs b/SabreTools.Library/DatItems/DipSwitch.cs index 56397875..a3e9dd13 100644 --- a/SabreTools.Library/DatItems/DipSwitch.cs +++ b/SabreTools.Library/DatItems/DipSwitch.cs @@ -155,9 +155,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Disk.cs b/SabreTools.Library/DatItems/Disk.cs index c04f3beb..370f3f27 100644 --- a/SabreTools.Library/DatItems/Disk.cs +++ b/SabreTools.Library/DatItems/Disk.cs @@ -227,9 +227,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, @@ -260,9 +257,6 @@ namespace SabreTools.Library.DatItems ItemType = ItemType.Rom, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Display.cs b/SabreTools.Library/DatItems/Display.cs index cd361eb3..7a1ab5d5 100644 --- a/SabreTools.Library/DatItems/Display.cs +++ b/SabreTools.Library/DatItems/Display.cs @@ -178,9 +178,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Driver.cs b/SabreTools.Library/DatItems/Driver.cs index ec6baa9c..a873433b 100644 --- a/SabreTools.Library/DatItems/Driver.cs +++ b/SabreTools.Library/DatItems/Driver.cs @@ -94,9 +94,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Extension.cs b/SabreTools.Library/DatItems/Extension.cs index 3a0a71ed..ea4df034 100644 --- a/SabreTools.Library/DatItems/Extension.cs +++ b/SabreTools.Library/DatItems/Extension.cs @@ -70,16 +70,14 @@ namespace SabreTools.Library.DatItems { return new Extension() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + + Name = this.Name, }; } diff --git a/SabreTools.Library/DatItems/Feature.cs b/SabreTools.Library/DatItems/Feature.cs index 395c8f57..3422b96b 100644 --- a/SabreTools.Library/DatItems/Feature.cs +++ b/SabreTools.Library/DatItems/Feature.cs @@ -84,9 +84,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Info.cs b/SabreTools.Library/DatItems/Info.cs index 14f9da20..e742a3f1 100644 --- a/SabreTools.Library/DatItems/Info.cs +++ b/SabreTools.Library/DatItems/Info.cs @@ -78,17 +78,14 @@ namespace SabreTools.Library.DatItems { return new Info() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Value = this.Value, }; } diff --git a/SabreTools.Library/DatItems/Input.cs b/SabreTools.Library/DatItems/Input.cs index 93d671a9..52b3d71a 100644 --- a/SabreTools.Library/DatItems/Input.cs +++ b/SabreTools.Library/DatItems/Input.cs @@ -96,9 +96,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/Instance.cs b/SabreTools.Library/DatItems/Instance.cs index 457ea338..8881e152 100644 --- a/SabreTools.Library/DatItems/Instance.cs +++ b/SabreTools.Library/DatItems/Instance.cs @@ -79,17 +79,14 @@ namespace SabreTools.Library.DatItems { return new Instance() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, BriefName = this.BriefName, }; } diff --git a/SabreTools.Library/DatItems/Location.cs b/SabreTools.Library/DatItems/Location.cs index 3b9bd688..81401b41 100644 --- a/SabreTools.Library/DatItems/Location.cs +++ b/SabreTools.Library/DatItems/Location.cs @@ -87,17 +87,14 @@ namespace SabreTools.Library.DatItems { return new Location() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Number = this.Number, Inverted = this.Inverted, }; diff --git a/SabreTools.Library/DatItems/Media.cs b/SabreTools.Library/DatItems/Media.cs index d14f9adf..ff077709 100644 --- a/SabreTools.Library/DatItems/Media.cs +++ b/SabreTools.Library/DatItems/Media.cs @@ -135,17 +135,14 @@ namespace SabreTools.Library.DatItems { return new Media() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, _md5 = this._md5, _sha1 = this._sha1, _sha256 = this._sha256, @@ -160,17 +157,14 @@ namespace SabreTools.Library.DatItems { var rom = new Rom() { - Name = this.Name + ".aif", ItemType = ItemType.Rom, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name + ".aif", MD5 = this.MD5, SHA1 = this.SHA1, SHA256 = this.SHA256, diff --git a/SabreTools.Library/DatItems/Port.cs b/SabreTools.Library/DatItems/Port.cs index 033a48e4..bb9b3692 100644 --- a/SabreTools.Library/DatItems/Port.cs +++ b/SabreTools.Library/DatItems/Port.cs @@ -71,9 +71,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, diff --git a/SabreTools.Library/DatItems/RamOption.cs b/SabreTools.Library/DatItems/RamOption.cs index 672557a6..83c0cd98 100644 --- a/SabreTools.Library/DatItems/RamOption.cs +++ b/SabreTools.Library/DatItems/RamOption.cs @@ -88,17 +88,14 @@ namespace SabreTools.Library.DatItems { return new RamOption() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Default = this.Default, Content = this.Content, }; diff --git a/SabreTools.Library/DatItems/Release.cs b/SabreTools.Library/DatItems/Release.cs index 16a7520c..5105f62f 100644 --- a/SabreTools.Library/DatItems/Release.cs +++ b/SabreTools.Library/DatItems/Release.cs @@ -110,17 +110,14 @@ namespace SabreTools.Library.DatItems { return new Release() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Region = this.Region, Language = this.Language, Date = this.Date, diff --git a/SabreTools.Library/DatItems/Rom.cs b/SabreTools.Library/DatItems/Rom.cs index a8697cda..08a51a39 100644 --- a/SabreTools.Library/DatItems/Rom.cs +++ b/SabreTools.Library/DatItems/Rom.cs @@ -171,6 +171,22 @@ namespace SabreTools.Library.DatItems #endregion + #region AttractMode + + /// + /// Alternate name for the item + /// + [JsonProperty("alt_romname", DefaultValueHandling = DefaultValueHandling.Ignore)] + public string AltName { get; set; } + + /// + /// Alternate title for the item + /// + [JsonProperty("alt_title", DefaultValueHandling = DefaultValueHandling.Ignore)] + public string AltTitle { get; set; } + + #endregion + #region OpenMSX /// @@ -320,6 +336,16 @@ namespace SabreTools.Library.DatItems #endregion + #region AttractMode + + if (mappings.Keys.Contains(Field.DatItem_AltName)) + AltName = mappings[Field.DatItem_AltName]; + + if (mappings.Keys.Contains(Field.DatItem_AltTitle)) + AltTitle = mappings[Field.DatItem_AltTitle]; + + #endregion + #region OpenMSX if (mappings.Keys.Contains(Field.DatItem_Original)) @@ -472,17 +498,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - - Original = this.Original, - OpenMSXSubType = this.OpenMSXSubType, - OpenMSXType = this.OpenMSXType, - Remark = this.Remark, - Boot = this.Boot, - - LoadFlag = this.LoadFlag, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, @@ -506,7 +521,17 @@ namespace SabreTools.Library.DatItems Optional = this.Optional, Inverted = this.Inverted, + AltName = this.AltName, + AltTitle = this.AltTitle, + + Original = this.Original, + OpenMSXSubType = this.OpenMSXSubType, + OpenMSXType = this.OpenMSXType, + Remark = this.Remark, + Boot = this.Boot, + DataArea = this.DataArea, + LoadFlag = this.LoadFlag, Part = this.Part, Value = this.Value, }; @@ -815,6 +840,22 @@ namespace SabreTools.Library.DatItems #endregion + #region AttractMode + + // Filter on alt name + if (filter.DatItem_AltName.MatchesPositiveSet(AltName) == false) + return false; + if (filter.DatItem_AltName.MatchesNegativeSet(AltName) == true) + return false; + + // Filter on alt title + if (filter.DatItem_AltTitle.MatchesPositiveSet(AltTitle) == false) + return false; + if (filter.DatItem_AltTitle.MatchesNegativeSet(AltTitle) == true) + return false; + + #endregion + #region OpenMSX // Filter on original @@ -976,6 +1017,16 @@ namespace SabreTools.Library.DatItems #endregion + #region AttractMode + + if (fields.Contains(Field.DatItem_AltName)) + AltName = null; + + if (fields.Contains(Field.DatItem_AltTitle)) + AltTitle = null; + + #endregion + #region OpenMSX if (fields.Contains(Field.DatItem_Original)) @@ -1209,6 +1260,16 @@ namespace SabreTools.Library.DatItems #endregion + #region AttractMode + + if (fields.Contains(Field.DatItem_AltName)) + AltName = newItem.AltName; + + if (fields.Contains(Field.DatItem_AltTitle)) + AltTitle = newItem.AltTitle; + + #endregion + #region OpenMSX if (fields.Contains(Field.DatItem_Original)) diff --git a/SabreTools.Library/DatItems/Sample.cs b/SabreTools.Library/DatItems/Sample.cs index 88708cec..5f083590 100644 --- a/SabreTools.Library/DatItems/Sample.cs +++ b/SabreTools.Library/DatItems/Sample.cs @@ -70,16 +70,14 @@ namespace SabreTools.Library.DatItems { return new Sample() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + + Name = this.Name, }; } diff --git a/SabreTools.Library/DatItems/Setting.cs b/SabreTools.Library/DatItems/Setting.cs index 9b2f6233..3f58fba8 100644 --- a/SabreTools.Library/DatItems/Setting.cs +++ b/SabreTools.Library/DatItems/Setting.cs @@ -1,9 +1,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; + using SabreTools.Library.Filtering; -using Newtonsoft.Json; using SabreTools.Library.Tools; +using Newtonsoft.Json; namespace SabreTools.Library.DatItems { @@ -102,17 +103,14 @@ namespace SabreTools.Library.DatItems { return new Setting() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Value = this.Value, Default = this.Default, Conditions = this.Conditions, diff --git a/SabreTools.Library/DatItems/SharedFeature.cs b/SabreTools.Library/DatItems/SharedFeature.cs index 99b7c124..9fabfca9 100644 --- a/SabreTools.Library/DatItems/SharedFeature.cs +++ b/SabreTools.Library/DatItems/SharedFeature.cs @@ -78,17 +78,14 @@ namespace SabreTools.Library.DatItems { return new SharedFeature() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Value = this.Value, }; } diff --git a/SabreTools.Library/DatItems/Slot.cs b/SabreTools.Library/DatItems/Slot.cs index 26f92e43..db568443 100644 --- a/SabreTools.Library/DatItems/Slot.cs +++ b/SabreTools.Library/DatItems/Slot.cs @@ -78,17 +78,14 @@ namespace SabreTools.Library.DatItems { return new Slot() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, SlotOptions = this.SlotOptions, }; } diff --git a/SabreTools.Library/DatItems/SlotOption.cs b/SabreTools.Library/DatItems/SlotOption.cs index 2f47fc3b..bb110008 100644 --- a/SabreTools.Library/DatItems/SlotOption.cs +++ b/SabreTools.Library/DatItems/SlotOption.cs @@ -87,17 +87,14 @@ namespace SabreTools.Library.DatItems { return new SlotOption() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, DeviceName = this.DeviceName, Default = this.Default, }; diff --git a/SabreTools.Library/DatItems/SoftwareList.cs b/SabreTools.Library/DatItems/SoftwareList.cs index 70f85d59..834d81f2 100644 --- a/SabreTools.Library/DatItems/SoftwareList.cs +++ b/SabreTools.Library/DatItems/SoftwareList.cs @@ -90,17 +90,14 @@ namespace SabreTools.Library.DatItems { return new SoftwareList() { - Name = this.Name, ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove, + Name = this.Name, Status = this.Status, Filter = this.Filter, }; diff --git a/SabreTools.Library/DatItems/Sound.cs b/SabreTools.Library/DatItems/Sound.cs index 929248b3..40013ef9 100644 --- a/SabreTools.Library/DatItems/Sound.cs +++ b/SabreTools.Library/DatItems/Sound.cs @@ -61,9 +61,6 @@ namespace SabreTools.Library.DatItems ItemType = this.ItemType, DupeType = this.DupeType, - AltName = this.AltName, - AltTitle = this.AltTitle, - Machine = this.Machine.Clone() as Machine, Source = this.Source.Clone() as Source, Remove = this.Remove,