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

Field enum cleanup, part 1

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-03 14:22:15 -07:00
parent 5d01d4ab51
commit 57b3521582
14 changed files with 723 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
SabreTools.Library/DatItems/Configuration.cs
View File

@@ -257,10 +257,6 @@ namespace SabreTools.Library.DatItems
if (filter.DatItem_Mask.MatchesNegativeSet(Mask) == true)
return false;
// Filter on conditions
if (filter.DatItem_Conditions.MatchesNeutral(null, Conditions != null ? (bool?)(Conditions.Count > 0) : null) == false)
return false;
// Filter on individual conditions
if (Conditions != null)
{
@@ -271,10 +267,6 @@ namespace SabreTools.Library.DatItems
}
}
// Filter on locations
if (filter.DatItem_Locations.MatchesNeutral(null, Locations != null ? (bool?)(Locations.Count > 0) : null) == false)
return false;
// Filter on individual locations
if (Locations != null)
{
@@ -285,10 +277,6 @@ namespace SabreTools.Library.DatItems
}
}
// Filter on settings
if (filter.DatItem_Settings.MatchesNeutral(null, Settings != null ? (bool?)(Settings.Count > 0) : null) == false)
return false;
// Filter on individual conditions
if (Settings != null)
{
@@ -321,9 +309,6 @@ namespace SabreTools.Library.DatItems
if (fields.Contains(Field.DatItem_Mask))
Mask = null;
if (fields.Contains(Field.DatItem_Conditions))
Conditions = null;
if (Conditions != null)
{
foreach (Condition condition in Conditions)
@@ -332,9 +317,6 @@ namespace SabreTools.Library.DatItems
}
}
if (fields.Contains(Field.DatItem_Locations))
Locations = null;
if (Locations != null)
{
foreach (Location location in Locations)
@@ -343,9 +325,6 @@ namespace SabreTools.Library.DatItems
}
}
if (fields.Contains(Field.DatItem_Settings))
Settings = null;
if (Settings != null)
{
foreach (Setting setting in Settings)
@@ -396,19 +375,8 @@ namespace SabreTools.Library.DatItems
if (fields.Contains(Field.DatItem_Mask))
Mask = newItem.Mask;
if (fields.Contains(Field.DatItem_Conditions))
Conditions = newItem.Conditions;
// Field replacement doesn't make sense for DatItem_Condition*
if (fields.Contains(Field.DatItem_Locations))
Locations = newItem.Locations;
// Field replacement doesn't make sense for DatItem_Location*
if (fields.Contains(Field.DatItem_Settings))
Settings = newItem.Settings;
// Field replacement doesn't make sense for DatItem_Setting*
}