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

DatItems don't know about filtering

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

61
SabreTools.DatItems/Control.cs
View File

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
@@ -255,66 +254,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 control type
if (cleaner.DatItemFilter.Control_Type.MatchesPositive(ControlType.NULL, ControlType) == false)
return false;
if (cleaner.DatItemFilter.Control_Type.MatchesNegative(ControlType.NULL, ControlType) == true)
return false;
// Filter on player
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Player, Player))
return false;
// Filter on buttons
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Buttons, Buttons))
return false;
// Filter on reqbuttons
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_ReqButtons, RequiredButtons))
return false;
// Filter on minimum
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Minimum, Minimum))
return false;
// Filter on maximum
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Maximum, Maximum))
return false;
// Filter on sensitivity
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Sensitivity, Sensitivity))
return false;
// Filter on keydelta
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_KeyDelta, KeyDelta))
return false;
// Filter on reverse
if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Control_Reverse, Reverse))
return false;
// Filter on ways
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Control_Ways, Ways))
return false;
// Filter on ways2
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Control_Ways2, Ways2))
return false;
// Filter on ways3
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Control_Ways3, Ways3))
return false;
return true;
}
/// <inheritdoc/>
public override void RemoveFields(
List<DatItemField> datItemFields,