diff --git a/SabreTools.Skippers/Detector.cs b/SabreTools.Skippers/Detector.cs index ad18d297..105fdf49 100644 --- a/SabreTools.Skippers/Detector.cs +++ b/SabreTools.Skippers/Detector.cs @@ -6,7 +6,7 @@ using System.Xml.Serialization; namespace SabreTools.Skippers { [XmlRoot("detector")] - public class Detector + public abstract class Detector { #region Fields @@ -14,31 +14,31 @@ namespace SabreTools.Skippers /// Detector name /// [XmlElement("name")] - public string? Name { get; set; } + public string? Name { get; protected set; } /// /// Author names /// [XmlElement("author")] - public string? Author { get; set; } + public string? Author { get; protected set; } /// /// File version /// [XmlElement("version")] - public string? Version { get; set; } + public string? Version { get; protected set; } /// /// Set of all rules in the skipper /// [XmlElement("rule")] - public Rule[]? Rules { get; set; } + public Rule[]? Rules { get; protected set; } /// /// Filename the skipper lives in /// [XmlIgnore] - public string? SourceFile { get; set; } + public string? SourceFile { get; protected set; } #endregion diff --git a/SabreTools.Skippers/Detectors/Atari7800.cs b/SabreTools.Skippers/Detectors/Atari7800.cs index 44f3979d..26e393d4 100644 --- a/SabreTools.Skippers/Detectors/Atari7800.cs +++ b/SabreTools.Skippers/Detectors/Atari7800.cs @@ -31,10 +31,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "80", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; var rule2 = new Rule @@ -42,10 +42,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "80", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule2Test1, - } + ] }; // Create file @@ -53,11 +53,11 @@ namespace SabreTools.Skippers.Detectors Author = "Roman Scherzer"; Version = "1.0"; SourceFile = "a7800"; - Rules = new Rule[] - { + Rules = + [ rule1, rule2, - }; + ]; } } } diff --git a/SabreTools.Skippers/Detectors/AtariLynx.cs b/SabreTools.Skippers/Detectors/AtariLynx.cs index 68020ca0..d516e007 100644 --- a/SabreTools.Skippers/Detectors/AtariLynx.cs +++ b/SabreTools.Skippers/Detectors/AtariLynx.cs @@ -31,10 +31,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "40", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; var rule2 = new Rule @@ -42,10 +42,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "40", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule2Test1, - } + ] }; // Create file @@ -53,11 +53,11 @@ namespace SabreTools.Skippers.Detectors Author = "Roman Scherzer"; Version = "1.0"; SourceFile = "lynx"; - Rules = new Rule[] - { + Rules = + [ rule1, rule2, - }; + ]; } } } diff --git a/SabreTools.Skippers/Detectors/CommodorePSID.cs b/SabreTools.Skippers/Detectors/CommodorePSID.cs index a95cb181..184744aa 100644 --- a/SabreTools.Skippers/Detectors/CommodorePSID.cs +++ b/SabreTools.Skippers/Detectors/CommodorePSID.cs @@ -52,10 +52,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "76", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; var rule2 = new Rule @@ -63,10 +63,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "76", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule2Test1, - } + ] }; var rule3 = new Rule @@ -74,10 +74,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "7c", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule3Test1, - } + ] }; var rule4 = new Rule @@ -85,10 +85,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "7c", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule4Test1, - } + ] }; var rule5 = new Rule @@ -96,10 +96,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "7c", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule5Test1, - } + ] }; // Create file @@ -107,14 +107,14 @@ namespace SabreTools.Skippers.Detectors Author = "Yori Yoshizuki"; Version = "1.2"; SourceFile = "psid"; - Rules = new Rule[] - { + Rules = + [ rule1, rule2, rule3, rule4, rule5, - }; + ]; } } } diff --git a/SabreTools.Skippers/Detectors/NECPCEngine.cs b/SabreTools.Skippers/Detectors/NECPCEngine.cs index 191bfbf5..65f6e994 100644 --- a/SabreTools.Skippers/Detectors/NECPCEngine.cs +++ b/SabreTools.Skippers/Detectors/NECPCEngine.cs @@ -23,10 +23,10 @@ namespace SabreTools.Skippers.Detectors { StartOffset = "200", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; // Create file @@ -34,10 +34,10 @@ namespace SabreTools.Skippers.Detectors Author = "Matt Nadareski (darksabre76)"; Version = "1.0"; SourceFile = "pce"; - Rules = new Rule[] - { + Rules = + [ rule1, - }; + ]; } } } diff --git a/SabreTools.Skippers/Detectors/Nintendo64.cs b/SabreTools.Skippers/Detectors/Nintendo64.cs index 64e41b4a..7891502d 100644 --- a/SabreTools.Skippers/Detectors/Nintendo64.cs +++ b/SabreTools.Skippers/Detectors/Nintendo64.cs @@ -38,10 +38,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "0", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; var rule2 = new Rule @@ -49,10 +49,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "0", EndOffset = "EOF", Operation = HeaderSkipOperation.Byteswap, - Tests = new Test[] - { + Tests = + [ rule2Test1, - } + ] }; var rule3 = new Rule @@ -60,10 +60,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "0", EndOffset = "EOF", Operation = HeaderSkipOperation.Wordswap, - Tests = new Test[] - { + Tests = + [ rule3Test1, - } + ] }; // Create file @@ -71,12 +71,12 @@ namespace SabreTools.Skippers.Detectors Author = "CUE"; Version = "1.1"; SourceFile = "n64"; - Rules = new Rule[] - { + Rules = + [ rule1, // V64 rule2, // Z64 rule3, // N64 - }; + ]; } } } diff --git a/SabreTools.Skippers/Detectors/NintendoEntertainmentSystem.cs b/SabreTools.Skippers/Detectors/NintendoEntertainmentSystem.cs index 53317b2e..bad3efa9 100644 --- a/SabreTools.Skippers/Detectors/NintendoEntertainmentSystem.cs +++ b/SabreTools.Skippers/Detectors/NintendoEntertainmentSystem.cs @@ -24,10 +24,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "10", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; // Create file @@ -35,10 +35,10 @@ namespace SabreTools.Skippers.Detectors Author = "Roman Scherzer"; Version = "1.1"; SourceFile = "nes"; - Rules = new Rule[] - { + Rules = + [ rule1, - }; + ]; } } } diff --git a/SabreTools.Skippers/Detectors/NintendoFamicomDiskSystem.cs b/SabreTools.Skippers/Detectors/NintendoFamicomDiskSystem.cs index e197340e..d236c009 100644 --- a/SabreTools.Skippers/Detectors/NintendoFamicomDiskSystem.cs +++ b/SabreTools.Skippers/Detectors/NintendoFamicomDiskSystem.cs @@ -40,40 +40,40 @@ namespace SabreTools.Skippers.Detectors { StartOffset = "10", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; var rule2 = new Rule { StartOffset = "10", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule2Test1, - } + ] }; var rule3 = new Rule { StartOffset = "10", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule3Test1, - } + ] }; var rule4 = new Rule { StartOffset = "10", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule4Test1, - } + ] }; // Create file @@ -81,13 +81,13 @@ namespace SabreTools.Skippers.Detectors Author = "Yori Yoshizuki"; Version = "1.0"; SourceFile = "fds"; - Rules = new Rule[] - { + Rules = + [ rule1, rule2, rule3, rule4, - }; + ]; } } } diff --git a/SabreTools.Skippers/Detectors/SuperFamicomSPC.cs b/SabreTools.Skippers/Detectors/SuperFamicomSPC.cs index 31c9ad71..46757e82 100644 --- a/SabreTools.Skippers/Detectors/SuperFamicomSPC.cs +++ b/SabreTools.Skippers/Detectors/SuperFamicomSPC.cs @@ -24,10 +24,10 @@ namespace SabreTools.Skippers.Detectors StartOffset = "00100", EndOffset = "EOF", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; // Create file @@ -35,10 +35,10 @@ namespace SabreTools.Skippers.Detectors Author = "Yori Yoshizuki"; Version = "1.0"; SourceFile = "spc"; - Rules = new Rule[] - { + Rules = + [ rule1, - }; + ]; } } } diff --git a/SabreTools.Skippers/Detectors/SuperNintendoEntertainmentSystem.cs b/SabreTools.Skippers/Detectors/SuperNintendoEntertainmentSystem.cs index b66a0ac0..be9a3cf0 100644 --- a/SabreTools.Skippers/Detectors/SuperNintendoEntertainmentSystem.cs +++ b/SabreTools.Skippers/Detectors/SuperNintendoEntertainmentSystem.cs @@ -34,30 +34,30 @@ namespace SabreTools.Skippers.Detectors { StartOffset = "200", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule1Test1, - } + ] }; var rule2 = new Rule { StartOffset = "200", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule2Test1, - } + ] }; var rule3 = new Rule { StartOffset = "200", Operation = HeaderSkipOperation.None, - Tests = new Test[] - { + Tests = + [ rule3Test1, - } + ] }; // Create file @@ -65,12 +65,12 @@ namespace SabreTools.Skippers.Detectors Author = "Matt Nadareski (darksabre76)"; Version = "1.0"; SourceFile = "snes"; - Rules = new Rule[] - { + Rules = + [ rule1, // FIG rule2, // SMC rule3, // UFO - }; + ]; } } }