Fix everything with subitems

This commit is contained in:
Matt Nadareski
2020-09-03 15:02:59 -07:00
parent 57b3521582
commit 45fb1ebfe7
11 changed files with 488 additions and 138 deletions

View File

@@ -68,7 +68,7 @@ namespace SabreTools.Library.DatItems
{
foreach (Condition condition in Conditions)
{
condition.SetFields(mappings);
condition.SetFields(mappings, true);
}
}
}
@@ -194,7 +194,7 @@ namespace SabreTools.Library.DatItems
{
foreach (Condition condition in Conditions)
{
if (!condition.PassesFilter(filter))
if (!condition.PassesFilter(filter, true))
return false;
}
}
@@ -222,7 +222,7 @@ namespace SabreTools.Library.DatItems
{
foreach (Condition condition in Conditions)
{
condition.RemoveFields(fields);
condition.RemoveFields(fields, true);
}
}
}
@@ -265,7 +265,9 @@ namespace SabreTools.Library.DatItems
if (fields.Contains(Field.DatItem_Default))
Default = newItem.Default;
// Field replacement doesn't make sense for DatItem_Condition*
// DatItem_Condition_* doesn't make sense here
// since not every condition under the other item
// can replace every condition under this item
}
#endregion