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

Fix build

Browse Source
This commit is contained in:
Matt Nadareski
2023-04-07 15:13:19 -04:00
parent f655d7b64f
commit bd951b46b5
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SabreTools.DatFiles/Setter.cs
View File

@@ -467,19 +467,19 @@ namespace SabreTools.DatFiles
private void SetFields(Archive archive) private void SetFields(Archive archive)
{ {
if (DatItemMappings.Keys.Contains(DatItemField.Number)) if (DatItemMappings.Keys.Contains(DatItemField.Number))
analog.Number = DatItemMappings[DatItemField.Number]; archive.Number = DatItemMappings[DatItemField.Number];
if (DatItemMappings.Keys.Contains(DatItemField.Clone)) if (DatItemMappings.Keys.Contains(DatItemField.Clone))
analog.Clone = DatItemMappings[DatItemField.Clone]; archive.CloneValue = DatItemMappings[DatItemField.Clone];
if (DatItemMappings.Keys.Contains(DatItemField.RegParent)) if (DatItemMappings.Keys.Contains(DatItemField.RegParent))
analog.RegParent = DatItemMappings[DatItemField.RegParent]; archive.RegParent = DatItemMappings[DatItemField.RegParent];
if (DatItemMappings.Keys.Contains(DatItemField.Region)) if (DatItemMappings.Keys.Contains(DatItemField.Region))
analog.Region = DatItemMappings[DatItemField.Region]; archive.Region = DatItemMappings[DatItemField.Region];
if (DatItemMappings.Keys.Contains(DatItemField.Languages)) if (DatItemMappings.Keys.Contains(DatItemField.Languages))
analog.Languages = DatItemMappings[DatItemField.Languages]; archive.Languages = DatItemMappings[DatItemField.Languages];
} }
/// <summary> /// <summary>

8
SabreTools.DatItems/Formats/Archive.cs
View File

@@ -30,7 +30,7 @@ namespace SabreTools.DatItems.Formats
/// </summary> /// </summary>
/// <remarks>No-Intro database export only</remarks> /// <remarks>No-Intro database export only</remarks>
[JsonProperty("clone"), XmlElement("clone")] [JsonProperty("clone"), XmlElement("clone")]
public string Clone { get; set; } public string CloneValue { get; set; }
/// <summary> /// <summary>
/// Regional parent /// Regional parent
@@ -93,7 +93,7 @@ namespace SabreTools.DatItems.Formats
Name = this.Name, Name = this.Name,
Number = this.Number, Number = this.Number,
Clone = this.Clone, CloneValue = this.CloneValue,
RegParent = this.RegParent, RegParent = this.RegParent,
Region = this.Region, Region = this.Region,
Languages = this.Languages, Languages = this.Languages,
@@ -117,10 +117,10 @@ namespace SabreTools.DatItems.Formats
// If the archive information matches // If the archive information matches
return (Name == newOther.Name return (Name == newOther.Name
&& Number == newOther.Number && Number == newOther.Number
&& Clone == newOther.Clone && CloneValue == newOther.CloneValue
&& RegParent == newOther.RegParent && RegParent == newOther.RegParent
&& Region == newOther.Region && Region == newOther.Region
&& Languages = newOther.Languages); && Languages == newOther.Languages);
} }
#endregion #endregion

8
SabreTools.Filtering/DatItemFilter.cs
View File

@@ -970,19 +970,19 @@ namespace SabreTools.Filtering
return false; return false;
// Filter on clone // Filter on clone
if (!PassStringFilter(Clone, analog.Clone)) if (!PassStringFilter(Clone, archive.CloneValue))
return false; return false;
// Filter on regional parent // Filter on regional parent
if (!PassStringFilter(RegParent, analog.RegParent)) if (!PassStringFilter(RegParent, archive.RegParent))
return false; return false;
// Filter on region // Filter on region
if (!PassStringFilter(Region, analog.Region)) if (!PassStringFilter(Region, archive.Region))
return false; return false;
// Filter on languages // Filter on languages
if (!PassStringFilter(Languages, analog.Languages)) if (!PassStringFilter(Languages, archive.Languages))
return false; return false;
return true; return true;

2
SabreTools.Filtering/DatItemRemover.cs
View File

@@ -311,7 +311,7 @@ namespace SabreTools.Filtering
archive.Number = null; archive.Number = null;
if (DatItemFields.Contains(DatItemField.Clone)) if (DatItemFields.Contains(DatItemField.Clone))
archive.Clone = null; archive.CloneValue = null;
if (DatItemFields.Contains(DatItemField.RegParent)) if (DatItemFields.Contains(DatItemField.RegParent))
archive.RegParent = null; archive.RegParent = null;

2
SabreTools.Filtering/Replacer.cs
View File

@@ -267,7 +267,7 @@ namespace SabreTools.Filtering
archive.Number = newItem.Number; archive.Number = newItem.Number;
if (datItemFields.Contains(DatItemField.Clone)) if (datItemFields.Contains(DatItemField.Clone))
archive.Clone = newItem.Clone; archive.CloneValue = newItem.CloneValue;
if (datItemFields.Contains(DatItemField.RegParent)) if (datItemFields.Contains(DatItemField.RegParent))
archive.RegParent = newItem.RegParent; archive.RegParent = newItem.RegParent;