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 build... (understatement)

Browse Source
This commit is contained in:
Matt Nadareski
2020-12-13 13:22:06 -08:00
parent 710213ff9d
commit a89297686f
57 changed files with 2277 additions and 2714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
SabreTools.DatItems/Input.cs
View File

@@ -72,33 +72,32 @@ namespace SabreTools.DatItems
#region Accessors
/// <summary>
/// Set fields with given values
/// </summary>
/// <param name="mappings">Mappings dictionary</param>
public override void SetFields(Dictionary<Field, string> mappings)
/// <inheritdoc/>
public override void SetFields(
Dictionary<DatItemField, string> datItemMappings,
Dictionary<MachineField, string> machineMappings)
{
// Set base fields
base.SetFields(mappings);
base.SetFields(datItemMappings, machineMappings);
// Handle Input-specific fields
if (mappings.Keys.Contains(Field.DatItem_Service))
Service = mappings[Field.DatItem_Service].AsYesNo();
if (datItemMappings.Keys.Contains(DatItemField.Service))
Service = datItemMappings[DatItemField.Service].AsYesNo();
if (mappings.Keys.Contains(Field.DatItem_Tilt))
Tilt = mappings[Field.DatItem_Tilt].AsYesNo();
if (datItemMappings.Keys.Contains(DatItemField.Tilt))
Tilt = datItemMappings[DatItemField.Tilt].AsYesNo();
if (mappings.Keys.Contains(Field.DatItem_Players))
Players = Utilities.CleanLong(mappings[Field.DatItem_Players]);
if (datItemMappings.Keys.Contains(DatItemField.Players))
Players = Utilities.CleanLong(datItemMappings[DatItemField.Players]);
if (mappings.Keys.Contains(Field.DatItem_Coins))
Coins = Utilities.CleanLong(mappings[Field.DatItem_Coins]);
if (datItemMappings.Keys.Contains(DatItemField.Coins))
Coins = Utilities.CleanLong(datItemMappings[DatItemField.Coins]);
if (ControlsSpecified)
{
foreach (Control control in Controls)
{
control.SetFields(mappings);
control.SetFields(datItemMappings, machineMappings);
}
}
}
@@ -175,32 +174,27 @@ namespace SabreTools.DatItems
#region Filtering
/// <summary>
/// Check to see if a DatItem passes the filter
/// </summary>
/// <param name="filter">Filter to check against</param>
/// <param name="sub">True if this is a subitem, false otherwise</param>
/// <returns>True if the item passed the filter, false otherwise</returns>
public override bool PassesFilter(Filter filter, bool sub = false)
/// <inheritdoc/>
public override bool PassesFilter(Cleaner cleaner, bool sub = false)
{
// Check common fields first
if (!base.PassesFilter(filter, sub))
if (!base.PassesFilter(cleaner, sub))
return false;
// Filter on service
if (!filter.PassBoolFilter(filter.DatItem_Service, Service))
if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Service, Service))
return false;
// Filter on tilt
if (!filter.PassBoolFilter(filter.DatItem_Tilt, Tilt))
if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Tilt, Tilt))
return false;
// Filter on players
if (!filter.PassLongFilter(filter.DatItem_Players, Players))
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Players, Players))
return false;
// Filter on coins
if (!filter.PassLongFilter(filter.DatItem_Coins, Coins))
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Coins, Coins))
return false;
// Filter on individual controls
@@ -208,7 +202,7 @@ namespace SabreTools.DatItems
{
foreach (Control control in Controls)
{
if (!control.PassesFilter(filter, true))
if (!control.PassesFilter(cleaner, true))
return false;
}
}
@@ -216,33 +210,32 @@ namespace SabreTools.DatItems
return true;
}
/// <summary>
/// Remove fields from the DatItem
/// </summary>
/// <param name="fields">List of Fields to remove</param>
public override void RemoveFields(List<Field> fields)
/// <inheritdoc/>
public override void RemoveFields(
List<DatItemField> datItemFields,
List<MachineField> machineFields)
{
// Remove common fields first
base.RemoveFields(fields);
base.RemoveFields(datItemFields, machineFields);
// Remove the fields
if (fields.Contains(Field.DatItem_Service))
if (datItemFields.Contains(DatItemField.Service))
Service = null;
if (fields.Contains(Field.DatItem_Tilt))
if (datItemFields.Contains(DatItemField.Tilt))
Tilt = null;
if (fields.Contains(Field.DatItem_Players))
if (datItemFields.Contains(DatItemField.Players))
Players = 0;
if (fields.Contains(Field.DatItem_Coins))
if (datItemFields.Contains(DatItemField.Coins))
Coins = null;
if (ControlsSpecified)
{
foreach (Control control in Controls)
{
control.RemoveFields(fields);
control.RemoveFields(datItemFields, machineFields);
}
}
}
@@ -251,15 +244,14 @@ namespace SabreTools.DatItems
#region Sorting and Merging
/// <summary>
/// Replace fields from another item
/// </summary>
/// <param name="item">DatItem to pull new information from</param>
/// <param name="fields">List of Fields representing what should be updated</param>
public override void ReplaceFields(DatItem item, List<Field> fields)
/// <inheritdoc/>
public override void ReplaceFields(
DatItem item,
List<DatItemField> datItemFields,
List<MachineField> machineFields)
{
// Replace common fields first
base.ReplaceFields(item, fields);
base.ReplaceFields(item, datItemFields, machineFields);
// If we don't have a Input to replace from, ignore specific fields
if (item.ItemType != ItemType.Input)
@@ -269,16 +261,16 @@ namespace SabreTools.DatItems
Input newItem = item as Input;
// Replace the fields
if (fields.Contains(Field.DatItem_Service))
if (datItemFields.Contains(DatItemField.Service))
Service = newItem.Service;
if (fields.Contains(Field.DatItem_Tilt))
if (datItemFields.Contains(DatItemField.Tilt))
Tilt = newItem.Tilt;
if (fields.Contains(Field.DatItem_Players))
if (datItemFields.Contains(DatItemField.Players))
Players = newItem.Players;
if (fields.Contains(Field.DatItem_Coins))
if (datItemFields.Contains(DatItemField.Coins))
Coins = newItem.Coins;
// DatItem_Control_* doesn't make sense here