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

Add and use Relation enum

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-03 21:59:53 -07:00
parent ad0e5a7f0f
commit 33908e4e72
9 changed files with 138 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3545,6 +3545,7 @@ namespace SabreTools.Library.DatFiles
.Replace("%size%", size);
// TODO: Add GameName logic here too?
// TODO: Figure out what I meant by the above ^
return fix;
}

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

@@ -229,7 +229,7 @@ namespace SabreTools.Library.DatFiles
{
Tag = reader.GetAttribute("tag"),
Mask = reader.GetAttribute("mask"),
Relation = reader.GetAttribute("relation"),
Relation = reader.GetAttribute("relation").AsRelation(),
Value = reader.GetAttribute("value"),
Source = new Source
@@ -746,7 +746,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
dipSwitch.Conditions.Add(condition);
@@ -820,7 +820,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
dipValue.Conditions.Add(condition);
@@ -870,7 +870,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
configuration.Conditions.Add(condition);
@@ -944,7 +944,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
confSetting.Conditions.Add(condition);
@@ -1037,7 +1037,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
adjuster.Conditions.Add(condition);
@@ -1320,7 +1320,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", adjusterCondition.Tag);
xtw.WriteOptionalAttributeString("mask", adjusterCondition.Mask);
xtw.WriteOptionalAttributeString("relation", adjusterCondition.Relation);
xtw.WriteOptionalAttributeString("relation", adjusterCondition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", adjusterCondition.Value);
xtw.WriteEndElement();
}
@@ -1352,7 +1352,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", condition.Tag);
xtw.WriteOptionalAttributeString("mask", condition.Mask);
xtw.WriteOptionalAttributeString("relation", condition.Relation);
xtw.WriteOptionalAttributeString("relation", condition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", condition.Value);
xtw.WriteEndElement();
break;
@@ -1371,7 +1371,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", configurationCondition.Tag);
xtw.WriteOptionalAttributeString("mask", configurationCondition.Mask);
xtw.WriteOptionalAttributeString("relation", configurationCondition.Relation);
xtw.WriteOptionalAttributeString("relation", configurationCondition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", configurationCondition.Value);
xtw.WriteEndElement();
}
@@ -1451,7 +1451,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", dipSwitchCondition.Tag);
xtw.WriteOptionalAttributeString("mask", dipSwitchCondition.Mask);
xtw.WriteOptionalAttributeString("relation", dipSwitchCondition.Relation);
xtw.WriteOptionalAttributeString("relation", dipSwitchCondition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", dipSwitchCondition.Value);
xtw.WriteEndElement();
}
@@ -1482,7 +1482,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", dipValueCondition.Tag);
xtw.WriteOptionalAttributeString("mask", dipValueCondition.Mask);
xtw.WriteOptionalAttributeString("relation", dipValueCondition.Relation);
xtw.WriteOptionalAttributeString("relation", dipValueCondition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", dipValueCondition.Value);
xtw.WriteEndElement();
}

1
SabreTools.Library/DatFiles/Logiqx.cs
View File

@@ -16,7 +16,6 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// Represents parsing and writing of a Logiqx-derived DAT
/// </summary>
/// TODO: Add XSD validation for all XML DAT types (maybe?)
internal class Logiqx : DatFile
{
// Private instance variables specific to Logiqx DATs

20
SabreTools.Library/DatFiles/SabreDat.cs
View File

@@ -664,7 +664,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
(adjuster as Adjuster).Conditions.Add(condition);
@@ -718,7 +718,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
(configuration as Configuration).Conditions.Add(condition);
@@ -792,7 +792,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
confSetting.Conditions.Add(condition);
@@ -846,7 +846,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
(dipSwitch as DipSwitch).Conditions.Add(condition);
@@ -920,7 +920,7 @@ namespace SabreTools.Library.DatFiles
var condition = new Condition();
condition.Tag = reader.GetAttribute("tag");
condition.Mask = reader.GetAttribute("mask");
condition.Relation = reader.GetAttribute("relation");
condition.Relation = reader.GetAttribute("relation").AsRelation();
condition.Value = reader.GetAttribute("value");
dipValue.Conditions.Add(condition);
@@ -1221,7 +1221,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", adjusterCondition.Tag);
xtw.WriteOptionalAttributeString("mask", adjusterCondition.Mask);
xtw.WriteOptionalAttributeString("relation", adjusterCondition.Relation);
xtw.WriteOptionalAttributeString("relation", adjusterCondition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", adjusterCondition.Value);
xtw.WriteEndElement();
}
@@ -1264,7 +1264,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteAttributeString("type", "condition");
xtw.WriteOptionalAttributeString("tag", condition.Tag);
xtw.WriteOptionalAttributeString("mask", condition.Mask);
xtw.WriteOptionalAttributeString("relation", condition.Relation);
xtw.WriteOptionalAttributeString("relation", condition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", condition.Value);
xtw.WriteEndElement();
break;
@@ -1284,7 +1284,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", configurationCondition.Tag);
xtw.WriteOptionalAttributeString("mask", configurationCondition.Mask);
xtw.WriteOptionalAttributeString("relation", configurationCondition.Relation);
xtw.WriteOptionalAttributeString("relation", configurationCondition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", configurationCondition.Value);
xtw.WriteEndElement();
}
@@ -1367,7 +1367,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", dipSwitchCondition.Tag);
xtw.WriteOptionalAttributeString("mask", dipSwitchCondition.Mask);
xtw.WriteOptionalAttributeString("relation", dipSwitchCondition.Relation);
xtw.WriteOptionalAttributeString("relation", dipSwitchCondition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", dipSwitchCondition.Value);
xtw.WriteEndElement();
}
@@ -1398,7 +1398,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("condition");
xtw.WriteOptionalAttributeString("tag", dipValueCondition.Tag);
xtw.WriteOptionalAttributeString("mask", dipValueCondition.Mask);
xtw.WriteOptionalAttributeString("relation", dipValueCondition.Relation);
xtw.WriteOptionalAttributeString("relation", dipValueCondition.Relation.FromRelation());
xtw.WriteOptionalAttributeString("value", dipValueCondition.Value);
xtw.WriteEndElement();
}