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

Move more to the DatItem base class

Browse Source
This commit is contained in:
Matt Nadareski
2023-08-14 22:33:05 -04:00
parent 6adbe601a2
commit ed1f809065
41 changed files with 708 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
SabreTools.DatItems/Formats/Input.cs
View File

@@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats
[JsonProperty("service", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("service")]
public bool? Service
{
get => _input.ReadBool(Models.Internal.Input.ServiceKey);
set => _input[Models.Internal.Input.ServiceKey] = value;
get => _internal.ReadBool(Models.Internal.Input.ServiceKey);
set => _internal[Models.Internal.Input.ServiceKey] = value;
}
[JsonIgnore]
@@ -33,8 +33,8 @@ namespace SabreTools.DatItems.Formats
[JsonProperty("tilt", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tilt")]
public bool? Tilt
{
get => _input.ReadBool(Models.Internal.Input.TiltKey);
set => _input[Models.Internal.Input.TiltKey] = value;
get => _internal.ReadBool(Models.Internal.Input.TiltKey);
set => _internal[Models.Internal.Input.TiltKey] = value;
}
[JsonIgnore]
@@ -46,8 +46,8 @@ namespace SabreTools.DatItems.Formats
[JsonProperty("players", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("players")]
public long? Players
{
get => _input.ReadLong(Models.Internal.Input.PlayersKey);
set => _input[Models.Internal.Input.PlayersKey] = value;
get => _internal.ReadLong(Models.Internal.Input.PlayersKey);
set => _internal[Models.Internal.Input.PlayersKey] = value;
}
[JsonIgnore]
@@ -59,8 +59,8 @@ namespace SabreTools.DatItems.Formats
[JsonProperty("coins", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("coins")]
public long? Coins
{
get => _input.ReadLong(Models.Internal.Input.CoinsKey);
set => _input[Models.Internal.Input.CoinsKey] = value;
get => _internal.ReadLong(Models.Internal.Input.CoinsKey);
set => _internal[Models.Internal.Input.CoinsKey] = value;
}
[JsonIgnore]
@@ -72,19 +72,13 @@ namespace SabreTools.DatItems.Formats
[JsonProperty("controls", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("controls")]
public List<Control>? Controls
{
get => _input.Read<Control[]>(Models.Internal.Input.ControlKey)?.ToList();
set => _input[Models.Internal.Input.ControlKey] = value?.ToArray();
get => _internal.Read<Control[]>(Models.Internal.Input.ControlKey)?.ToList();
set => _internal[Models.Internal.Input.ControlKey] = value?.ToArray();
}
[JsonIgnore]
public bool ControlsSpecified { get { return Controls != null && Controls.Count > 0; } }
/// <summary>
/// Internal Input model
/// </summary>
[JsonIgnore]
private Models.Internal.Input _input = new();
#endregion
#region Constructors
@@ -94,6 +88,7 @@ namespace SabreTools.DatItems.Formats
/// </summary>
public Input()
{
_internal = new Models.Internal.Input();
ItemType = ItemType.Input;
}
@@ -113,25 +108,10 @@ namespace SabreTools.DatItems.Formats
Source = this.Source?.Clone() as Source,
Remove = this.Remove,
_input = this._input?.Clone() as Models.Internal.Input ?? new Models.Internal.Input(),
_internal = this._internal?.Clone() as Models.Internal.Input ?? new Models.Internal.Input(),
};
}
#endregion
#region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem? other)
{
// If we don't have a Input, return false
if (ItemType != other?.ItemType || other is not Input otherInternal)
return false;
// Compare the internal models
return _input.EqualTo(otherInternal._input);
}
#endregion
}
}