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

Value is only part of certain items

Browse Source 
This is yet another boilerplate reduction AS WELL AS a reduction for unnecessary field names (mostly due to my misunderstanding of my own implementation)
This commit is contained in:
Matt Nadareski
2020-09-03 11:48:30 -07:00
parent 47c2c1d227
commit 6f72416947
40 changed files with 119 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
SabreTools.Library/DatItems/DatItem.cs
View File

@@ -104,12 +104,6 @@ namespace SabreTools.Library.DatItems
#region SoftwareList Fields
/// <summary>
/// SoftwareList value associated with the item
/// </summary>
[JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore)]
public string Value { get; set; }
/// <summary>
/// Loading flag
/// </summary>
@@ -178,11 +172,6 @@ namespace SabreTools.Library.DatItems
Field.DatItem_Feature_Name,
Field.DatItem_Feature_Value,
Field.DatItem_AreaName,
Field.DatItem_AreaSize,
Field.DatItem_AreaWidth,
Field.DatItem_AreaEndianness,
Field.DatItem_Value,
Field.DatItem_LoadFlag,
#endregion
@@ -211,6 +200,13 @@ namespace SabreTools.Library.DatItems
Field.DatItem_Optional,
Field.DatItem_Inverted,
// Rom (SoftwareList)
Field.DatItem_AreaName,
Field.DatItem_AreaSize,
Field.DatItem_AreaWidth,
Field.DatItem_AreaEndianness,
Field.DatItem_Value,
// Disk
Field.DatItem_Index,
Field.DatItem_Writable,
@@ -373,12 +369,6 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
// TODO: Add DatItem_Part*
// TODO: Add DatItem_Feature*
if (mappings.Keys.Contains(Field.DatItem_Value))
Value = mappings[Field.DatItem_Value];
if (mappings.Keys.Contains(Field.DatItem_LoadFlag))
LoadFlag = mappings[Field.DatItem_LoadFlag];
@@ -763,12 +753,6 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
// Filter on softwarelist value
if (filter.DatItem_Value.MatchesPositiveSet(Value) == false)
return false;
if (filter.DatItem_Value.MatchesNegativeSet(Value) == true)
return false;
// Filter on load flag
if (filter.DatItem_LoadFlag.MatchesPositiveSet(LoadFlag) == false)
return false;
@@ -820,9 +804,6 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
if (fields.Contains(Field.DatItem_Value))
Value = null;
if (fields.Contains(Field.DatItem_LoadFlag))
LoadFlag = null;
@@ -947,9 +928,6 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
if (fields.Contains(Field.DatItem_Value))
Value = item.Value;
if (fields.Contains(Field.DatItem_LoadFlag))
LoadFlag = item.LoadFlag;