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 everything with subitems

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

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

@@ -84,16 +84,14 @@ namespace SabreTools.Library.DatItems
if (mappings.Keys.Contains(Field.DatItem_Mask))
Mask = mappings[Field.DatItem_Mask];
// Field.DatItem_Conditions does not apply here
if (Conditions != null)
{
foreach (Condition condition in Conditions)
{
condition.SetFields(mappings);
condition.SetFields(mappings, true);
}
}
// Field.DatItem_Locations does not apply here
if (Locations != null)
{
foreach (Location location in Locations)
@@ -102,7 +100,6 @@ namespace SabreTools.Library.DatItems
}
}
// Field.DatItem_Settings does not apply here
if (Settings != null)
{
foreach (Setting setting in Settings)
@@ -163,7 +160,9 @@ namespace SabreTools.Library.DatItems
Configuration newOther = other as Configuration;
// If the Configuration information matches
bool match = (Name == newOther.Name && Tag == newOther.Tag && Mask == newOther.Mask);
bool match = (Name == newOther.Name
&& Tag == newOther.Tag
&& Mask == newOther.Mask);
if (!match)
return match;
@@ -262,7 +261,7 @@ namespace SabreTools.Library.DatItems
{
foreach (Condition condition in Conditions)
{
if (!condition.PassesFilter(filter))
if (!condition.PassesFilter(filter, true))
return false;
}
}
@@ -313,7 +312,7 @@ namespace SabreTools.Library.DatItems
{
foreach (Condition condition in Conditions)
{
condition.RemoveFields(fields);
condition.RemoveFields(fields, true);
}
}
@@ -375,9 +374,17 @@ namespace SabreTools.Library.DatItems
if (fields.Contains(Field.DatItem_Mask))
Mask = newItem.Mask;
// Field replacement doesn't make sense for DatItem_Condition*
// Field replacement doesn't make sense for DatItem_Location*
// Field replacement doesn't make sense for DatItem_Setting*
// DatItem_Condition_* doesn't make sense here
// since not every condition under the other item
// can replace every condition under this item
// DatItem_Location_* doesn't make sense here
// since not every location under the other item
// can replace every location under this item
// DatItem_Setting_* doesn't make sense here
// since not every setting under the other item
// can replace every setting under this item
}
#endregion