DatItems don't know about filtering

This commit is contained in:
Matt Nadareski
2020-12-13 21:47:42 -08:00
parent 67bfe0dae9
commit 3fcec263e0
40 changed files with 1325 additions and 1458 deletions

View File

@@ -4,7 +4,6 @@ using System.Linq;
using System.Xml.Serialization;
using SabreTools.Core;
using SabreTools.Filtering;
using Newtonsoft.Json;
namespace SabreTools.DatItems
@@ -218,58 +217,6 @@ namespace SabreTools.DatItems
#region Filtering
/// <inheritdoc/>
public override bool PassesFilter(Cleaner cleaner, bool sub = false)
{
// Check common fields first
if (!base.PassesFilter(cleaner, sub))
return false;
// Filter on item name
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
return false;
// Filter on tag
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
return false;
// Filter on mask
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Mask, Mask))
return false;
// Filter on individual conditions
if (ConditionsSpecified)
{
foreach (Condition condition in Conditions)
{
if (!condition.PassesFilter(cleaner, true))
return false;
}
}
// Filter on individual locations
if (LocationsSpecified)
{
foreach (Location location in Locations)
{
if (!location.PassesFilter(cleaner, true))
return false;
}
}
// Filter on individual conditions
if (SettingsSpecified)
{
foreach (Setting setting in Settings)
{
if (!setting.PassesFilter(cleaner, true))
return false;
}
}
return true;
}
/// <inheritdoc/>
public override void RemoveFields(
List<DatItemField> datItemFields,