diff --git a/SabreTools.DatFiles/Setter.cs b/SabreTools.DatFiles/Setter.cs index a978a955..8b7042da 100644 --- a/SabreTools.DatFiles/Setter.cs +++ b/SabreTools.DatFiles/Setter.cs @@ -467,19 +467,19 @@ namespace SabreTools.DatFiles private void SetFields(Archive archive) { if (DatItemMappings.Keys.Contains(DatItemField.Number)) - analog.Number = DatItemMappings[DatItemField.Number]; + archive.Number = DatItemMappings[DatItemField.Number]; if (DatItemMappings.Keys.Contains(DatItemField.Clone)) - analog.Clone = DatItemMappings[DatItemField.Clone]; + archive.CloneValue = DatItemMappings[DatItemField.Clone]; if (DatItemMappings.Keys.Contains(DatItemField.RegParent)) - analog.RegParent = DatItemMappings[DatItemField.RegParent]; + archive.RegParent = DatItemMappings[DatItemField.RegParent]; if (DatItemMappings.Keys.Contains(DatItemField.Region)) - analog.Region = DatItemMappings[DatItemField.Region]; + archive.Region = DatItemMappings[DatItemField.Region]; if (DatItemMappings.Keys.Contains(DatItemField.Languages)) - analog.Languages = DatItemMappings[DatItemField.Languages]; + archive.Languages = DatItemMappings[DatItemField.Languages]; } /// diff --git a/SabreTools.DatItems/Formats/Archive.cs b/SabreTools.DatItems/Formats/Archive.cs index 3d0b573f..83bfece9 100644 --- a/SabreTools.DatItems/Formats/Archive.cs +++ b/SabreTools.DatItems/Formats/Archive.cs @@ -30,7 +30,7 @@ namespace SabreTools.DatItems.Formats /// /// No-Intro database export only [JsonProperty("clone"), XmlElement("clone")] - public string Clone { get; set; } + public string CloneValue { get; set; } /// /// Regional parent @@ -93,7 +93,7 @@ namespace SabreTools.DatItems.Formats Name = this.Name, Number = this.Number, - Clone = this.Clone, + CloneValue = this.CloneValue, RegParent = this.RegParent, Region = this.Region, Languages = this.Languages, @@ -117,10 +117,10 @@ namespace SabreTools.DatItems.Formats // If the archive information matches return (Name == newOther.Name && Number == newOther.Number - && Clone == newOther.Clone + && CloneValue == newOther.CloneValue && RegParent == newOther.RegParent && Region == newOther.Region - && Languages = newOther.Languages); + && Languages == newOther.Languages); } #endregion diff --git a/SabreTools.Filtering/DatItemFilter.cs b/SabreTools.Filtering/DatItemFilter.cs index 905b6d24..63694f99 100644 --- a/SabreTools.Filtering/DatItemFilter.cs +++ b/SabreTools.Filtering/DatItemFilter.cs @@ -970,19 +970,19 @@ namespace SabreTools.Filtering return false; // Filter on clone - if (!PassStringFilter(Clone, analog.Clone)) + if (!PassStringFilter(Clone, archive.CloneValue)) return false; // Filter on regional parent - if (!PassStringFilter(RegParent, analog.RegParent)) + if (!PassStringFilter(RegParent, archive.RegParent)) return false; // Filter on region - if (!PassStringFilter(Region, analog.Region)) + if (!PassStringFilter(Region, archive.Region)) return false; // Filter on languages - if (!PassStringFilter(Languages, analog.Languages)) + if (!PassStringFilter(Languages, archive.Languages)) return false; return true; diff --git a/SabreTools.Filtering/DatItemRemover.cs b/SabreTools.Filtering/DatItemRemover.cs index 8dfe977c..c2db08c4 100644 --- a/SabreTools.Filtering/DatItemRemover.cs +++ b/SabreTools.Filtering/DatItemRemover.cs @@ -311,7 +311,7 @@ namespace SabreTools.Filtering archive.Number = null; if (DatItemFields.Contains(DatItemField.Clone)) - archive.Clone = null; + archive.CloneValue = null; if (DatItemFields.Contains(DatItemField.RegParent)) archive.RegParent = null; diff --git a/SabreTools.Filtering/Replacer.cs b/SabreTools.Filtering/Replacer.cs index bb96fc2f..6b548e4e 100644 --- a/SabreTools.Filtering/Replacer.cs +++ b/SabreTools.Filtering/Replacer.cs @@ -267,7 +267,7 @@ namespace SabreTools.Filtering archive.Number = newItem.Number; if (datItemFields.Contains(DatItemField.Clone)) - archive.Clone = newItem.Clone; + archive.CloneValue = newItem.CloneValue; if (datItemFields.Contains(DatItemField.RegParent)) archive.RegParent = newItem.RegParent;