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... (understatement)

Browse Source
This commit is contained in:
Matt Nadareski
2020-12-13 13:22:06 -08:00
parent 710213ff9d
commit a89297686f
57 changed files with 2277 additions and 2714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
SabreTools.DatItems/Analog.cs
View File

@@ -27,18 +27,17 @@ namespace SabreTools.DatItems
#region Accessors
/// <summary>
/// Set fields with given values
/// </summary>
/// <param name="mappings">Mappings dictionary</param>
public override void SetFields(Dictionary<Field, string> mappings)
/// <inheritdoc/>
public override void SetFields(
Dictionary<DatItemField, string> datItemMappings,
Dictionary<MachineField, string> machineMappings)
{
// Set base fields
base.SetFields(mappings);
base.SetFields(datItemMappings, machineMappings);
// Handle Analog-specific fields
if (mappings.Keys.Contains(Field.DatItem_Analog_Mask))
Mask = mappings[Field.DatItem_Analog_Mask];
if (datItemMappings.Keys.Contains(DatItemField.Analog_Mask))
Mask = datItemMappings[DatItemField.Analog_Mask];
}
#endregion
@@ -93,36 +92,30 @@ namespace SabreTools.DatItems
#region Filtering
/// <summary>
/// Check to see if a DatItem passes the filter
/// </summary>
/// <param name="filter">Filter to check against</param>
/// <param name="sub">True if this is a subitem, false otherwise</param>
/// <returns>True if the item passed the filter, false otherwise</returns>
public override bool PassesFilter(Filter filter, bool sub = false)
/// <inheritdoc/>
public override bool PassesFilter(Cleaner cleaner, bool sub = false)
{
// Check common fields first
if (!base.PassesFilter(filter, sub))
if (!base.PassesFilter(cleaner, sub))
return false;
// Filter on mask
if (!filter.PassStringFilter(filter.DatItem_Analog_Mask, Mask))
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Analog_Mask, Mask))
return false;
return true;
}
/// <summary>
/// Remove fields from the DatItem
/// </summary>
/// <param name="fields">List of Fields to remove</param>
public override void RemoveFields(List<Field> fields)
/// <inheritdoc/>
public override void RemoveFields(
List<DatItemField> datItemFields,
List<MachineField> machineFields)
{
// Remove common fields first
base.RemoveFields(fields);
base.RemoveFields(datItemFields, machineFields);
// Remove the fields
if (fields.Contains(Field.DatItem_Analog_Mask))
if (datItemFields.Contains(DatItemField.Analog_Mask))
Mask = null;
}
@@ -130,15 +123,14 @@ namespace SabreTools.DatItems
#region Sorting and Merging
/// <summary>
/// Replace fields from another item
/// </summary>
/// <param name="item">DatItem to pull new information from</param>
/// <param name="fields">List of Fields representing what should be updated</param>
public override void ReplaceFields(DatItem item, List<Field> fields)
/// <inheritdoc/>
public override void ReplaceFields(
DatItem item,
List<DatItemField> datItemFields,
List<MachineField> machineFields)
{
// Replace common fields first
base.ReplaceFields(item, fields);
base.ReplaceFields(item, datItemFields, machineFields);
// If we don't have a Analog to replace from, ignore specific fields
if (item.ItemType != ItemType.Analog)
@@ -148,7 +140,7 @@ namespace SabreTools.DatItems
Analog newItem = item as Analog;
// Replace the fields
if (fields.Contains(Field.DatItem_Analog_Mask))
if (datItemFields.Contains(DatItemField.Analog_Mask))
Mask = newItem.Mask;
}