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

Sub items should not check types

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-30 13:25:40 -07:00
parent d82a911cd9
commit 7fc49203f4
24 changed files with 302 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -1409,7 +1409,7 @@ namespace SabreTools.Library.DatFiles
List<string> slotOptions = Items[machine]
.Where(i => i.ItemType == ItemType.Slot)
.Select(i => i as Slot)
.Where(s => s.SlotOptions != null && s.SlotOptions.Count != 0)
.Where(s => s.SlotOptionsSpecified)
.SelectMany(s => s.SlotOptions)
.Select(so => so.DeviceName)
.Distinct()
@@ -1473,8 +1473,7 @@ namespace SabreTools.Library.DatFiles
List<DatItem> slotItems = Items[slotOption];
newSlotOptions.AddRange(slotItems
.Where(i => i.ItemType == ItemType.Slot)
.Where(s => (s as Slot).SlotOptions != null)
.Where(s => (s as Slot).SlotOptions.Count != 0)
.Where(s => (s as Slot).SlotOptionsSpecified)
.SelectMany(s => (s as Slot).SlotOptions)
.Select(o => o.DeviceName));

26
SabreTools.Library/DatFiles/Listxml.cs
View File

@@ -1330,7 +1330,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("adjuster");
xtw.WriteRequiredAttributeString("name", adjuster.Name);
xtw.WriteOptionalAttributeString("default", adjuster.Default.FromYesNo());
if (adjuster.Conditions != null)
if (adjuster.ConditionsSpecified)
{
foreach (var adjusterCondition in adjuster.Conditions)
{
@@ -1381,7 +1381,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteOptionalAttributeString("tag", configuration.Tag);
xtw.WriteOptionalAttributeString("mask", configuration.Mask);
if (configuration.Conditions != null)
if (configuration.ConditionsSpecified)
{
foreach (var configurationCondition in configuration.Conditions)
{
@@ -1393,7 +1393,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteEndElement();
}
}
if (configuration.Locations != null)
if (configuration.LocationsSpecified)
{
foreach (var location in configuration.Locations)
{
@@ -1404,7 +1404,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteEndElement();
}
}
if (configuration.Settings != null)
if (configuration.SettingsSpecified)
{
foreach (var setting in configuration.Settings)
{
@@ -1426,7 +1426,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteOptionalAttributeString("fixed_image", device.FixedImage);
xtw.WriteOptionalAttributeString("mandatory", device.Mandatory?.ToString());
xtw.WriteOptionalAttributeString("interface", device.Interface);
if (device.Instances != null)
if (device.InstancesSpecified)
{
foreach (var instance in device.Instances)
{
@@ -1436,7 +1436,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteEndElement();
}
}
if (device.Extensions != null)
if (device.ExtensionsSpecified)
{
foreach (var extension in device.Extensions)
{
@@ -1461,7 +1461,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteOptionalAttributeString("name", dipSwitch.Name);
xtw.WriteOptionalAttributeString("tag", dipSwitch.Tag);
xtw.WriteOptionalAttributeString("mask", dipSwitch.Mask);
if (dipSwitch.Conditions != null)
if (dipSwitch.ConditionsSpecified)
{
foreach (var dipSwitchCondition in dipSwitch.Conditions)
{
@@ -1473,7 +1473,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteEndElement();
}
}
if (dipSwitch.Locations != null)
if (dipSwitch.LocationsSpecified)
{
foreach (var location in dipSwitch.Locations)
{
@@ -1484,7 +1484,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteEndElement();
}
}
if (dipSwitch.Values != null)
if (dipSwitch.ValuesSpecified)
{
foreach (var value in dipSwitch.Values)
{
@@ -1492,7 +1492,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteOptionalAttributeString("name", value.Name);
xtw.WriteOptionalAttributeString("value", value.Value);
xtw.WriteOptionalAttributeString("default", value.Default.FromYesNo());
if (value.Conditions != null)
if (value.ConditionsSpecified)
{
foreach (var dipValueCondition in value.Conditions)
{
@@ -1570,7 +1570,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteOptionalAttributeString("tilt", input.Tilt.FromYesNo());
xtw.WriteOptionalAttributeString("players", input.Players?.ToString());
xtw.WriteOptionalAttributeString("coins", input.Coins?.ToString());
if (input.Controls != null)
if (input.ControlsSpecified)
{
foreach (var control in input.Controls)
{
@@ -1597,7 +1597,7 @@ namespace SabreTools.Library.DatFiles
var port = datItem as Port;
xtw.WriteStartElement("port");
xtw.WriteOptionalAttributeString("tag", port.Tag);
if (port.Analogs != null)
if (port.AnalogsSpecified)
{
foreach (var analog in port.Analogs)
{
@@ -1645,7 +1645,7 @@ namespace SabreTools.Library.DatFiles
var slot = datItem as Slot;
xtw.WriteStartElement("slot");
xtw.WriteOptionalAttributeString("name", slot.Name);
if (slot.SlotOptions != null)
if (slot.SlotOptionsSpecified)
{
foreach (var slotOption in slot.SlotOptions)
{

6
SabreTools.Library/DatFiles/SoftwareList.cs
View File

@@ -677,7 +677,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteRequiredAttributeString("name", dipSwitch.Name);
xtw.WriteRequiredAttributeString("tag", dipSwitch.Tag);
xtw.WriteRequiredAttributeString("mask", dipSwitch.Mask);
if (dipSwitch.Values != null)
if (dipSwitch.ValuesSpecified)
{
foreach (Setting dipValue in dipSwitch.Values)
{
@@ -701,7 +701,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteRequiredAttributeString("name", disk.Part?.Name);
xtw.WriteRequiredAttributeString("interface", disk.Part?.Interface);
if (disk.Part?.Features != null && disk.Part?.Features.Count > 0)
if (disk.Part?.FeaturesSpecified == true)
{
foreach (PartFeature partFeature in disk.Part.Features)
{
@@ -748,7 +748,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteRequiredAttributeString("name", rom.Part?.Name);
xtw.WriteRequiredAttributeString("interface", rom.Part?.Interface);
if (rom.Part?.Features != null && rom.Part?.Features.Count > 0)
if (rom.Part?.FeaturesSpecified == true)
{
foreach (PartFeature kvp in rom.Part.Features)
{