Nuget bump, QP oversight and tickOffset

This commit is contained in:
2023-03-21 09:58:20 -07:00
parent c8e8775eab
commit bc0098bb9b
6 changed files with 37 additions and 13 deletions

View File

@ -254,7 +254,7 @@ public partial class ProcessData : IProcessData
reactor = defaultReactor;
else
reactor = segments[0];
if (segments.Length <= 1 || !int.TryParse(segments[1], out int rdsValue) || rdsValue < 99)
if (segments.Length <= 1 || !int.TryParse(segments[1].Replace("QP", string.Empty), out int rdsValue) || rdsValue < 99)
rds = defaultRDS;
else
rds = segments[1];
@ -360,7 +360,7 @@ public partial class ProcessData : IProcessData
segments = cassette.Split(new char[] { '.' });
else
segments = cassette.Split(new char[] { '\u005F' });
bool hasRDS = Regex.IsMatch(cassette, "[-]?[0-9]{5,}[-]?");
bool hasRDS = Regex.IsMatch(cassette, "[-]?([QP][0-9]{4,}|[0-9]{5,})[-]?");
(reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, cassette, segments, hasRDS);
(layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments, hasRDS);
zone = GetZone(segments);