quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00
Code Actions

Suppress body ordinal in results for system-wide checks

Browse Source
This commit is contained in:
Xjph 2021-11-22 11:18:33 -03:30
parent 27a6b8c39d
commit 45b3dbf115
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ObservatoryExplorer/CustomCriteriaManager.cs
View File

@ -160,9 +160,9 @@ namespace Observatory.Explorer
} }
} }
public List<(string, string)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings) public List<(string, string, bool)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings)
{ {
List<(string, string)> results = new(); List<(string, string, bool)> results = new();
foreach (var criteriaFunction in CriteriaFunctions) foreach (var criteriaFunction in CriteriaFunctions)
{ {
@ -210,13 +210,13 @@ namespace Observatory.Explorer
var result = criteriaFunction.Call(scan, parents, scanList, bioSignals, geoSignals); var result = criteriaFunction.Call(scan, parents, scanList, bioSignals, geoSignals);
if (result.Length > 0 && ((bool?)result[0]).GetValueOrDefault(false)) if (result.Length > 0 && ((bool?)result[0]).GetValueOrDefault(false))
{ {
results.Add((result[1].ToString(), result[2].ToString())); results.Add((result[1].ToString(), result[2].ToString(), false));
} }
} }
catch (NLua.Exceptions.LuaScriptException e) catch (NLua.Exceptions.LuaScriptException e)
{ {
settings.EnableCustomCriteria = false; settings.EnableCustomCriteria = false;
results.Add((e.Message, scan.Json)); results.Add((e.Message, scan.Json, false));
break; break;
} }
} }

16
ObservatoryExplorer/DefaultCriteria.cs
View File

@ -9,9 +9,9 @@ namespace Observatory.Explorer
{ {
internal static class DefaultCriteria internal static class DefaultCriteria
{ {
public static List<(string Description, string Detail)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings) public static List<(string Description, string Detail, bool SystemWide)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings)
{ {
List<(string, string)> results = new(); List<(string, string, bool)> results = new();
TextInfo textInfo = new CultureInfo("en-US", false).TextInfo; TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
bool isRing = scan.BodyName.Contains("Ring"); bool isRing = scan.BodyName.Contains("Ring");
@ -136,11 +136,11 @@ namespace Observatory.Explorer
{ {
if (settings.CollidingBinary && binaryPartner.First().Value.Radius + scan.Radius >= binaryPartner.First().Value.SemiMajorAxis * (1 - binaryPartner.First().Value.Eccentricity) + scan.SemiMajorAxis * (1 - scan.Eccentricity)) if (settings.CollidingBinary && binaryPartner.First().Value.Radius + scan.Radius >= binaryPartner.First().Value.SemiMajorAxis * (1 - binaryPartner.First().Value.Eccentricity) + scan.SemiMajorAxis * (1 - scan.Eccentricity))
{ {
results.Add(("COLLIDING binary", $"Orbit: {Math.Truncate((double)scan.SemiMajorAxis / 1000):N0}km, Radius: {Math.Truncate((double)scan.Radius / 1000):N0}km, Partner: {binaryPartner.First().Value.BodyName}")); results.Add("COLLIDING binary", $"Orbit: {Math.Truncate((double)scan.SemiMajorAxis / 1000):N0}km, Radius: {Math.Truncate((double)scan.Radius / 1000):N0}km, Partner: {binaryPartner.First().Value.BodyName}");
} }
else if (settings.CloseBinary) else if (settings.CloseBinary)
{ {
results.Add(("Close binary relative to body size", $"Orbit: {Math.Truncate((double)scan.SemiMajorAxis / 1000):N0}km, Radius: {Math.Truncate((double)scan.Radius / 1000):N0}km, Partner: {binaryPartner.First().Value.BodyName}")); results.Add("Close binary relative to body size", $"Orbit: {Math.Truncate((double)scan.SemiMajorAxis / 1000):N0}km, Radius: {Math.Truncate((double)scan.Radius / 1000):N0}km, Partner: {binaryPartner.First().Value.BodyName}");
} }
} }
} }
@ -215,10 +215,10 @@ namespace Observatory.Explorer
} }
if (notifyGreen) if (notifyGreen)
results.Add("All Premium Boost Materials In System"); results.Add("All Premium Boost Materials In System", string.Empty, true);
if (notifyGold) if (notifyGold)
results.Add("All Surface Materials In System"); results.Add("All Surface Materials In System", string.Empty, true);
} }
if (settings.UncommonSecondary && scan.BodyID > 0 && !string.IsNullOrWhiteSpace(scan.StarType) && scan.DistanceFromArrivalLS > 10) if (settings.UncommonSecondary && scan.BodyID > 0 && !string.IsNullOrWhiteSpace(scan.StarType) && scan.DistanceFromArrivalLS > 10)
@ -347,9 +347,9 @@ namespace Observatory.Explorer
return materials.Count; return materials.Count;
} }
private static void Add(this List<(string, string)> results, string description, string detail = "") private static void Add(this List<(string, string, bool)> results, string description, string detail = "", bool systemWide = false)
{ {
results.Add((description, detail)); results.Add((description, detail, systemWide));
} }
} }
} }

3
ObservatoryExplorer/Explorer.cs
View File

@ -192,7 +192,7 @@ namespace Observatory.Explorer
{ {
var scanResult = new ExplorerUIResults() var scanResult = new ExplorerUIResults()
{ {
BodyName = scanEvent.BodyName, BodyName = result.SystemWide ? scanEvent.StarSystem : scanEvent.BodyName,
Time = scanEvent.TimestampDateTime.ToString("G"), Time = scanEvent.TimestampDateTime.ToString("G"),
Description = result.Description, Description = result.Description,
Details = result.Detail Details = result.Detail
@ -233,6 +233,7 @@ namespace Observatory.Explorer
} }
else else
{ {
bodyLabel = "Primary Star";
spokenAffix = string.Empty; spokenAffix = string.Empty;
} }