diff --git a/ObservatoryBotanist/Botanist.cs b/ObservatoryBotanist/Botanist.cs new file mode 100644 index 0000000..0540a72 --- /dev/null +++ b/ObservatoryBotanist/Botanist.cs @@ -0,0 +1,188 @@ +using Observatory.Framework; +using Observatory.Framework.Files; +using Observatory.Framework.Files.Journal; +using Observatory.Framework.Interfaces; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Generic; +using System.Linq; +using System; +using System.Collections.ObjectModel; + +namespace Observatory.Botanist +{ + public class Botanist : IObservatoryWorker + { + private IObservatoryCore Core; + private bool OdysseyLoaded = false; + private Dictionary + < + ( + ulong systemAddress, + int bodyID + ), + ( + string bodyName, + int bioTotal, + List speciesFound, + List speciesAnalysed + ) + > BioPlanets; + ObservableCollection GridCollection; + private PluginUI pluginUI; + private bool readAllInProgress = false; + + public string Name => "Observatory Botanist"; + + public string ShortName => "Botanist"; + + public string Version => typeof(Botanist).Assembly.GetName().Version.ToString(); + + public PluginUI PluginUI => pluginUI; + + public object Settings { get => null; set { } } + + public void JournalEvent(TJournal journal) where TJournal : JournalBase + { + switch (journal) + { + case LoadGame loadGame: + OdysseyLoaded = loadGame.Odyssey; + break; + case SAASignalsFound signalsFound: + { + var systemBodyId = (signalsFound.SystemAddress, signalsFound.BodyID); + if (OdysseyLoaded && !BioPlanets.ContainsKey(systemBodyId)) + { + var bioSignals = from signal in signalsFound.Signals + where signal.Type == "$SAA_SignalType_Biological;" + select signal; + + if (bioSignals.Any()) + { + if (!BioPlanets.ContainsKey(systemBodyId)) + { + BioPlanets.Add( + systemBodyId, + (signalsFound.BodyName, bioSignals.First().Count, new List(), new List()) + ); + } + else + { + var bioPlanet = BioPlanets[systemBodyId]; + bioPlanet.bodyName = signalsFound.BodyName; + bioPlanet.bioTotal = bioSignals.First().Count; + } + + } + } + } + break; + case ScanOrganic scanOrganic: + { + var systemBodyId = (scanOrganic.SystemAddress, scanOrganic.Body); + if (!BioPlanets.ContainsKey(systemBodyId)) + { + //Unlikely to ever end up in here, but just in case create a new planet entry. + List genus = new(); + List species = new(); + genus.Add(scanOrganic.Genus_Localised); + species.Add(scanOrganic.Species_Localised); + var bioPlanet = (string.Empty, 0, genus, species); + BioPlanets.Add(systemBodyId, bioPlanet); + } + else + { + var bioPlanet = BioPlanets[systemBodyId]; + + switch (scanOrganic.ScanType) + { + case ScanOrganicType.Log: + case ScanOrganicType.Sample: + if (!bioPlanet.speciesFound.Contains(scanOrganic.Species_Localised)) + { + bioPlanet.speciesFound.Add(scanOrganic.Species_Localised); + } + break; + case ScanOrganicType.Analyse: + if (!bioPlanet.speciesAnalysed.Contains(scanOrganic.Species_Localised)) + { + bioPlanet.speciesAnalysed.Add(scanOrganic.Species_Localised); + } + break; + } + } + UpdateUIGrid(); + } + break; + } + } + + public void Load(IObservatoryCore observatoryCore) + { + GridCollection = new(); + BotanistGrid uiObject = new(); + + GridCollection.Add(uiObject); + pluginUI = new PluginUI(GridCollection); + + BioPlanets = new(); + + Core = observatoryCore; + } + + public void ReadAllStarted() + { + readAllInProgress = true; + Core.ClearGrid(this, new BotanistGrid()); + } + + public void ReadAllFinished() + { + readAllInProgress = false; + UpdateUIGrid(); + } + + private void UpdateUIGrid() + { + // Suppress repainting the entire contents of the grid on every ScanOrganic record we read. + if (readAllInProgress) return; + + BotanistGrid uiObject = new(); + Core.ClearGrid(this, uiObject); + foreach (var bioPlanet in BioPlanets.Values) + { + if (bioPlanet.speciesFound.Count == 0) + { + var planetRow = new BotanistGrid() + { + Body = bioPlanet.bodyName, + BioTotal = bioPlanet.bioTotal.ToString(), + Species = "(NO SAMPLES TAKEN)", + Analysed = string.Empty + }; + Core.AddGridItem(this, planetRow); + } + + for (int i = 0; i < bioPlanet.speciesFound.Count; i++) + { + var speciesRow = new BotanistGrid() + { + Body = i == 0 ? bioPlanet.bodyName : string.Empty, + BioTotal = i == 0 ? bioPlanet.bioTotal.ToString() : string.Empty, + Species = bioPlanet.speciesFound[i], + Analysed = bioPlanet.speciesAnalysed.Contains(bioPlanet.speciesFound[i]) ? "✓" : "" + }; + Core.AddGridItem(this, speciesRow); + } + } + } + } + + public class BotanistGrid + { + public string Body { get; set; } + public string BioTotal { get; set; } + public string Species { get; set; } + public string Analysed { get; set; } + } +} diff --git a/ObservatoryBotanist/ObservatoryBotanist.csproj b/ObservatoryBotanist/ObservatoryBotanist.csproj new file mode 100644 index 0000000..be4ae6b --- /dev/null +++ b/ObservatoryBotanist/ObservatoryBotanist.csproj @@ -0,0 +1,27 @@ + + + + net5.0 + false + ObservatoryKey.snk + + + + 0.0.$([System.DateTime]::UtcNow.DayOfYear.ToString()).$([System.DateTime]::UtcNow.ToString(HHmm)) + 0.0.0.1 + $(VersionSuffix) + 0.0.1.0 + $(VersionSuffix) + + + + + ..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll + + + + + + + + diff --git a/ObservatoryBotanist/ObservatoryBotanist.sln b/ObservatoryBotanist/ObservatoryBotanist.sln new file mode 100644 index 0000000..fb4570a --- /dev/null +++ b/ObservatoryBotanist/ObservatoryBotanist.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31205.134 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObservatoryBotanist", "ObservatoryBotanist.csproj", "{498F7360-D443-4D64-895C-9EAB5570D019}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {498F7360-D443-4D64-895C-9EAB5570D019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {498F7360-D443-4D64-895C-9EAB5570D019}.Debug|Any CPU.Build.0 = Debug|Any CPU + {498F7360-D443-4D64-895C-9EAB5570D019}.Release|Any CPU.ActiveCfg = Release|Any CPU + {498F7360-D443-4D64-895C-9EAB5570D019}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0CC48015-0A6F-420C-9939-A71F3D33FF60} + EndGlobalSection +EndGlobal diff --git a/ObservatoryCore/LogMonitor.cs b/ObservatoryCore/LogMonitor.cs index 231345a..661beac 100644 --- a/ObservatoryCore/LogMonitor.cs +++ b/ObservatoryCore/LogMonitor.cs @@ -229,8 +229,11 @@ namespace Observatory throw new NotImplementedException("Current OS Platform Not Supported."); } - Properties.Core.Default.JournalFolder = path; - Properties.Core.Default.Save(); + if (Properties.Core.Default.JournalFolder != path) + { + Properties.Core.Default.JournalFolder = path; + Properties.Core.Default.Save(); + } return logDirectory; } @@ -378,11 +381,12 @@ namespace Observatory /// private async void JournalPoke() { + var journalFolder = GetJournalFolder(); + await System.Threading.Tasks.Task.Run(() => { while (monitoring) { - var journalFolder = GetJournalFolder(); FileInfo fileToPoke = null; foreach (var file in journalFolder.GetFiles("Journal.????????????.??.log")) diff --git a/ObservatoryCore/ObservatoryCore.csproj b/ObservatoryCore/ObservatoryCore.csproj index aa4efa2..cb7b39a 100644 --- a/ObservatoryCore/ObservatoryCore.csproj +++ b/ObservatoryCore/ObservatoryCore.csproj @@ -39,7 +39,7 @@ - ..\..\ObservatoryFramework\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll + ..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll diff --git a/ObservatoryCore.sln b/ObservatoryCore/ObservatoryCore.sln similarity index 92% rename from ObservatoryCore.sln rename to ObservatoryCore/ObservatoryCore.sln index 1611998..31626d7 100644 --- a/ObservatoryCore.sln +++ b/ObservatoryCore/ObservatoryCore.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30128.74 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservatoryCore", "ObservatoryCore\ObservatoryCore.csproj", "{0E1C4F16-858E-4E53-948A-77D81A8F3395}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservatoryCore", "ObservatoryCore.csproj", "{0E1C4F16-858E-4E53-948A-77D81A8F3395}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ObservatoryExplorer/CriteriaLoadException.cs b/ObservatoryExplorer/CriteriaLoadException.cs new file mode 100644 index 0000000..cd0c528 --- /dev/null +++ b/ObservatoryExplorer/CriteriaLoadException.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Observatory.Explorer +{ + internal class CriteriaLoadException : Exception + { + public CriteriaLoadException(string message, string script) + { + Message = message; + OriginalScript = script; + } + + new public readonly string Message; + public readonly string OriginalScript; + } +} diff --git a/ObservatoryExplorer/CustomCriteriaManager.cs b/ObservatoryExplorer/CustomCriteriaManager.cs new file mode 100644 index 0000000..e6b23b4 --- /dev/null +++ b/ObservatoryExplorer/CustomCriteriaManager.cs @@ -0,0 +1,236 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; +using Observatory.Framework.Files.Journal; +using NLua; +using System.Linq; + +namespace Observatory.Explorer +{ + internal class CustomCriteriaManager + { + private Lua LuaState; + private List CriteriaFunctions; + + public CustomCriteriaManager() + { + CriteriaFunctions = new(); + } + + public void RefreshCriteria(string criteriaPath) + { + LuaState = new(); + LuaState.State.Encoding = Encoding.UTF8; + LuaState.LoadCLRPackage(); + + #region Iterators + + //Materials and AtmosphereComposition + LuaState.DoString(@" + function materials (material_list) + local i = 0 + local count = material_list.Count + return function () + i = i + 1 + if i <= count then + return { name = material_list[i - 1].Name, percent = material_list[i - 1].Percent } + end + end + end"); + + //Rings + LuaState.DoString(@" + function rings (ring_list) + local i = 0 + local count = ring_list.Count + return function () + i = i + 1 + if i <= count then + local ring = ring_list[i - 1] + return { name = ring.Name, ringclass = ring.RingClass, massmt = ring.MassMT, innerrad = ring.InnerRad, outerrad = ring.OuterRad } + end + end + end"); + + //Bodies in system + LuaState.DoString(@" + function bodies (system_list) + local i = 0 + local count = system_list.Count + return function () + i = i + 1 + if i <= count then + return system_list[i - 1] + end + end + end"); + + //Parent bodies + LuaState.DoString(@" + function allparents (parent_list) + local i = 0 + local count + if parent_list then count = parent_list.Count else count = 0 end + return function () + i = i + 1 + if i <= count then + return { parenttype = parent_list[i - 1].ParentType, body = parent_list[i - 1].Body, scan = parent_list[i - 1].Scan } + end + end + end"); + + #endregion + + CriteriaFunctions.Clear(); + var criteria = File.Exists(criteriaPath) ? File.ReadAllLines(criteriaPath) : Array.Empty(); + StringBuilder script = new(); + + try + { + for (int i = 0; i < criteria.Length; i++) + { + if (criteria[i].Trim().StartsWith("::")) + { + string scriptDescription = criteria[i].Trim().Replace("::", string.Empty); + if (scriptDescription.ToLower() == "criteria") + { + string functionName = $"Criteria{i}"; + script.AppendLine($"function {functionName} (scan, parents, system, biosignals, geosignals)"); + i++; + do + { + script.AppendLine(criteria[i]); + i++; + } while (!criteria[i].Trim().ToLower().StartsWith("::end::")); + script.AppendLine("end"); + + LuaState.DoString(script.ToString()); + CriteriaFunctions.Add(LuaState[functionName] as LuaFunction); + script.Clear(); + } + else if (scriptDescription.ToLower() == "global") + { + i++; + do + { + script.AppendLine(criteria[i]); + i++; + } while (!criteria[i].Trim().ToLower().StartsWith("::end::")); + LuaState.DoString(script.ToString()); + script.Clear(); + } + else + { + i++; + + string functionName = $"Criteria{i}"; + + script.AppendLine($"function {functionName} (scan, parents, system, biosignals, geosignals)"); + script.AppendLine($" local result = {criteria[i]}"); + + if (criteria.Length > i + 1 && criteria[i + 1].Trim().ToLower() == "::detail::") + { + i++; i++; + script.AppendLine($" local detail = {criteria[i]}"); + } + else + { + script.AppendLine(" local detail = ''"); + } + + script.AppendLine($" return result, '{scriptDescription}', detail"); + script.AppendLine("end"); + + LuaState.DoString(script.ToString()); + CriteriaFunctions.Add(LuaState[functionName] as LuaFunction); + script.Clear(); + } + } + } + } + catch (Exception e) + { + string originalScript = script.ToString().Trim(); + + originalScript = originalScript.Remove(originalScript.LastIndexOf(Environment.NewLine)); + originalScript = originalScript[(originalScript.IndexOf(Environment.NewLine) + Environment.NewLine.Length)..]; + + throw new CriteriaLoadException(e.Message, originalScript.Replace('\t', ' ')); + } + } + + public List<(string, string)> CheckInterest(Scan scan, Dictionary> scanHistory, Dictionary> signalHistory, ExplorerSettings settings) + { + List<(string, string)> results = new(); + + foreach (var criteriaFunction in CriteriaFunctions) + { + var scanList = scanHistory[scan.SystemAddress].Values.ToList(); + + int bioSignals; + int geoSignals; + + if (signalHistory.ContainsKey(scan.SystemAddress) && signalHistory[scan.SystemAddress].ContainsKey(scan.BodyID)) + { + bioSignals = signalHistory[scan.SystemAddress][scan.BodyID].Signals.Where(s => s.Type == "$SAA_SignalType_Biological;").Select(s => s.Count).FirstOrDefault(); + geoSignals = signalHistory[scan.SystemAddress][scan.BodyID].Signals.Where(s => s.Type == "$SAA_SignalType_Geological;").Select(s => s.Count).FirstOrDefault(); + } + else + { + bioSignals = 0; + geoSignals = 0; + } + + + List parents; + + if (scan.Parent != null) + { + parents = new(); + foreach (var parent in scan.Parent) + { + var parentScan = scanList.Where(s => s.BodyID == parent.Body); + + parents.Add(new Parent() + { + ParentType = parent.ParentType.ToString(), + Body = parent.Body, + Scan = parentScan.Any() ? parentScan.First() : null + }); + } + } + else + { + parents = null; + } + + var result = criteriaFunction.Call(scan, parents, scanList, bioSignals, geoSignals); + + try + { + if (result.Length > 0 && ((bool?)result[0]).GetValueOrDefault(false)) + { + results.Add((result[1].ToString(), result[2].ToString())); + } + } + catch (NLua.Exceptions.LuaScriptException e) + { + settings.EnableCustomCriteria = false; + results.Add((e.Message, scan.Json)); + break; + } + } + + return results; + } + + internal class Parent + { + public string ParentType; + public int Body; + public Scan Scan; + } + + } +} diff --git a/ObservatoryExplorer/DefaultCriteria.cs b/ObservatoryExplorer/DefaultCriteria.cs new file mode 100644 index 0000000..2f6e483 --- /dev/null +++ b/ObservatoryExplorer/DefaultCriteria.cs @@ -0,0 +1,206 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using Observatory.Framework.Files.Journal; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Explorer +{ + internal static class DefaultCriteria + { + public static List<(string Description, string Detail)> CheckInterest(Scan scan, Dictionary> scanHistory, Dictionary> signalHistory, ExplorerSettings settings) + { + List<(string, string)> results = new(); + TextInfo textInfo = new CultureInfo("en-US", false).TextInfo; + + bool isRing = scan.BodyName.Contains("Ring"); + + #region Landable Checks + if (scan.Landable) + { + if (settings.LandableTerraformable && scan.TerraformState?.Length > 0) + { + results.Add($"Landable and {scan.TerraformState}"); + } + + if (settings.LandableRing && scan.Rings?.Count > 0) + { + results.Add("Ringed Landable Body"); + } + + if (settings.LandableAtmosphere && scan.Atmosphere.Length > 0) + { + results.Add("Landable with Atmosphere", textInfo.ToTitleCase(scan.Atmosphere)); + } + + if (settings.LandableHighG && scan.SurfaceGravity > 29.4) + { + results.Add("Landable with High Gravity", $"Surface gravity: {scan.SurfaceGravity / 9.81:0.00}g"); + } + + if (settings.LandableLarge && scan.Radius > 18000000) + { + results.Add("Landable Large Planet", $"Radius: {scan.Radius / 1000:0}km"); + } + } + #endregion + + #region Parent Relative Checks + + if (scan.SystemAddress != 0 && scan.SemiMajorAxis != 0 && + scanHistory[scan.SystemAddress].ContainsKey(scan.Parent[0].Body)) + { + Scan parent = scanHistory[scan.SystemAddress][scan.Parent[0].Body]; + + if (settings.CloseOrbit && !isRing && parent.Radius * 3 > scan.SemiMajorAxis) + { + results.Add("Close Orbit", $"Orbital Radius: {scan.SemiMajorAxis / 1000:N0}km, Parent Radius: {parent.Radius / 1000:N0}km"); + } + + if (settings.ShepherdMoon && !isRing && parent.Rings?.Last().OuterRad > scan.SemiMajorAxis && !parent.Rings.Last().Name.Contains("Belt")) + { + results.Add("Shepherd Moon", $"Orbit: {scan.SemiMajorAxis / 1000:N0}km, Ring Radius: {parent.Rings.Last().OuterRad / 1000:N0}km"); + } + + if (settings.CloseRing && parent.Rings?.Count > 0) + { + foreach (var ring in parent.Rings) + { + var separation = Math.Min(Math.Abs(scan.SemiMajorAxis - ring.OuterRad), Math.Abs(ring.InnerRad - scan.SemiMajorAxis)); + if (separation < scan.Radius * 10) + { + results.Add("Close Ring Proximity", $"Orbit: {scan.SemiMajorAxis / 1000:N0}km, Radius: {scan.Radius / 1000:N0}km, Distance from ring: {separation / 1000:N0}km"); + } + } + } + } + + #endregion + + if (settings.DiverseLife && signalHistory.ContainsKey(scan.SystemAddress) && signalHistory[scan.SystemAddress].ContainsKey(scan.BodyID)) + { + var bioSignals = signalHistory[scan.SystemAddress][scan.BodyID].Signals.Where(s => s.Type == "$SAA_SignalType_Biological;"); + + if (bioSignals.Count() > 0 && bioSignals.First().Count > 7) + { + results.Add("Diverse Life", $"Biological Signals: {bioSignals.First().Count}"); + } + } + + if (settings.WideRing && scan.Rings?.Count > 0) + { + foreach (var ring in scan.Rings.Where(r => !r.Name.Contains("Belt"))) + { + var ringWidth = ring.OuterRad - ring.InnerRad; + if (ringWidth > scan.Radius * 5) + { + results.Add("Wide Ring", $"Width: {ringWidth / 299792458:N2}Ls / {ringWidth / 1000:N0}km, Parent Radius: {scan.Radius / 1000:N0}km"); + } + } + } + + if (settings.SmallObject && scan.StarType == null && scan.PlanetClass != null && scan.PlanetClass != "Barycentre" && scan.Radius < 300000) + { + results.Add("Small Object", $"Radius: {scan.Radius / 1000:N0}km"); + } + + if (settings.HighEccentricity && scan.Eccentricity > 0.9) + { + results.Add("Highly Eccentric Orbit", $"Eccentricity: {Math.Round(scan.Eccentricity, 4)}"); + } + + if (settings.Nested && !isRing && scan.Parent?.Count > 1 && scan.Parent[0].ParentType == ParentType.Planet && scan.Parent[1].ParentType == ParentType.Planet) + { + results.Add("Nested Moon"); + } + + if (settings.FastRotation && scan.RotationPeriod != 0 && !scan.TidalLock && Math.Abs(scan.RotationPeriod) < 28800 && !isRing) + { + results.Add("Non-locked Body with Fast Rotation", $"Period: {scan.RotationPeriod/3600:N1} hours"); + } + + if (settings.FastOrbit && scan.OrbitalPeriod != 0 && Math.Abs(scan.OrbitalPeriod) < 28800 && !isRing) + { + results.Add("Fast Orbit", $"Orbital Period: {Math.Abs(scan.OrbitalPeriod / 3600):N1} hours"); + } + + if (settings.GoodFSDBody && scan.Landable) + { + List boostMaterials = new() + { + "Carbon", + "Germanium", + "Arsenic", + "Niobium", + "Yttrium", + "Polonium" + }; + + boostMaterials.RemoveMatchedMaterials(scan); + + if (boostMaterials.Count == 1) + { + results.Add("5 of 6 Premium Boost Materials", $"Missing material: {boostMaterials[0]}"); + } + } + + if ((settings.GreenSystem || settings.GoldSystem) && scan.Materials != null) + { + List boostMaterials = new() + { + "Carbon", + "Germanium", + "Arsenic", + "Niobium", + "Yttrium", + "Polonium" + }; + + var systemBodies = scanHistory[scan.SystemAddress]; + + bool notifyGreen = false; + + foreach (var body in systemBodies.Values) + { + if (settings.GreenSystem && body.Materials != null) + { + if (!boostMaterials.RemoveMatchedMaterials(body) && boostMaterials.Count == 0) + { + //If the list has been emptied but we're still checking more bodies this notification has already fired and we can abort. + notifyGreen = false; + break; + } + + if (boostMaterials.Count == 0) + notifyGreen = true; + + } + } + + if (notifyGreen) + results.Add("All Premium Boost Materials In System"); + } + + return results; + } + + private static bool RemoveMatchedMaterials(this List materials, Scan body) + { + foreach (var material in body.Materials) + { + var matchedMaterial = materials.Find(mat => mat.Equals(material.Name, StringComparison.OrdinalIgnoreCase)); + if (matchedMaterial != null) + { + materials.Remove(matchedMaterial); + } + } + return false; + } + + private static void Add(this List<(string, string)> results, string description, string detail = "") + { + results.Add((description, detail)); + } + } +} diff --git a/ObservatoryExplorer/Explorer.cs b/ObservatoryExplorer/Explorer.cs new file mode 100644 index 0000000..7110953 --- /dev/null +++ b/ObservatoryExplorer/Explorer.cs @@ -0,0 +1,251 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Linq; +using System.Text; +using Observatory.Framework; +using Observatory.Framework.Files.Journal; +using Observatory.Framework.Interfaces; + +namespace Observatory.Explorer +{ + internal class Explorer + { + private IObservatoryCore ObservatoryCore; + private ObservableCollection Results; + private ExplorerWorker ExplorerWorker; + private Dictionary> SystemBodyHistory; + private Dictionary> BodySignalHistory; + private Dictionary> BarycentreHistory; + private CustomCriteriaManager CustomCriteriaManager; + private DateTime CriteriaLastModified; + + internal Explorer(ExplorerWorker explorerWorker, IObservatoryCore core, ObservableCollection results) + { + SystemBodyHistory = new(); + BodySignalHistory = new(); + BarycentreHistory = new(); + ExplorerWorker = explorerWorker; + ObservatoryCore = core; + Results = results; + CustomCriteriaManager = new(); + CriteriaLastModified = new DateTime(0); + } + + public void Clear() + { + SystemBodyHistory.Clear(); + BodySignalHistory.Clear(); + BarycentreHistory.Clear(); + } + + public void RecordSignal(FSSBodySignals bodySignals) + { + if (!BodySignalHistory.ContainsKey(bodySignals.SystemAddress)) + { + BodySignalHistory.Add(bodySignals.SystemAddress, new Dictionary()); + } + + if (!BodySignalHistory[bodySignals.SystemAddress].ContainsKey(bodySignals.BodyID)) + { + BodySignalHistory[bodySignals.SystemAddress].Add(bodySignals.BodyID, bodySignals); + } + } + + public void RecordBarycentre(ScanBaryCentre scan) + { + if (!BarycentreHistory.ContainsKey(scan.SystemAddress)) + { + BarycentreHistory.Add(scan.SystemAddress, new Dictionary()); + } + + if (!BarycentreHistory[scan.SystemAddress].ContainsKey(scan.BodyID)) + { + BarycentreHistory[scan.SystemAddress].Add(scan.BodyID, scan); + } + } + + public Scan ConvertBarycentre(ScanBaryCentre barycentre, Scan childScan) + { + string childAffix = childScan.BodyName + .Replace(childScan.StarSystem, string.Empty); + + char childOrdinal = childAffix.ToCharArray().Last(); + + bool lowChild = childScan.BodyID - barycentre.BodyID == 1; + + string baryAffix; + + if (lowChild) + { + baryAffix = new string(new char[] { childOrdinal, (char)(childOrdinal + 1) }); + } + else + { + baryAffix = new string(new char[] { (char)(childOrdinal - 1), childOrdinal }); + } + + baryAffix = childAffix.Replace(childOrdinal.ToString(), baryAffix); + + Scan barycentreScan = new() + { + Timestamp = barycentre.Timestamp, + BodyName = barycentre.StarSystem + baryAffix, + Parents = childScan.Parents.RemoveAt(0), + PlanetClass = "Barycentre", + StarSystem = barycentre.StarSystem, + SystemAddress = barycentre.SystemAddress, + BodyID = barycentre.BodyID, + SemiMajorAxis = barycentre.SemiMajorAxis, + Eccentricity = barycentre.Eccentricity, + OrbitalInclination = barycentre.OrbitalInclination, + Periapsis = barycentre.Periapsis, + OrbitalPeriod = barycentre.OrbitalPeriod, + AscendingNode = barycentre.AscendingNode, + MeanAnomaly = barycentre.MeanAnomaly, + Json = barycentre.Json + }; + + return barycentreScan; + } + + public void ProcessScan(Scan scanEvent, bool readAll) + { + if (!readAll) + { + string criteriaFilePath = ((ExplorerSettings)ExplorerWorker.Settings).CustomCriteriaFile; + + if (File.Exists(criteriaFilePath)) + { + DateTime fileModified = new FileInfo(criteriaFilePath).LastWriteTime; + + if (fileModified != CriteriaLastModified) + { + try + { + CustomCriteriaManager.RefreshCriteria(criteriaFilePath); + } + catch (CriteriaLoadException e) + { + var exceptionResult = new ExplorerUIResults() + { + BodyName = "Custom Criteria Processing Error", + Time = DateTime.Now.ToString("G"), + Description = e.Message, + Details = e.OriginalScript + }; + ObservatoryCore.AddGridItem(ExplorerWorker, exceptionResult); + ((ExplorerSettings)ExplorerWorker.Settings).EnableCustomCriteria = false; + } + + CriteriaLastModified = fileModified; + } + } + } + + Dictionary systemBodies; + if (SystemBodyHistory.ContainsKey(scanEvent.SystemAddress)) + { + systemBodies = SystemBodyHistory[scanEvent.SystemAddress]; + if (systemBodies.ContainsKey(scanEvent.BodyID)) + { + if (scanEvent.SystemAddress != 0) + { + //We've already checked this object. + return; + } + } + } + else + { + systemBodies = new(); + SystemBodyHistory.Add(scanEvent.SystemAddress, systemBodies); + } + + if (SystemBodyHistory.Count > 1000) + { + foreach (var entry in SystemBodyHistory.Where(entry => entry.Key != scanEvent.SystemAddress).ToList()) + { + SystemBodyHistory.Remove(entry.Key); + } + SystemBodyHistory.TrimExcess(); + } + + if (scanEvent.SystemAddress != 0 && !systemBodies.ContainsKey(scanEvent.BodyID)) + systemBodies.Add(scanEvent.BodyID, scanEvent); + + var results = DefaultCriteria.CheckInterest(scanEvent, SystemBodyHistory, BodySignalHistory, (ExplorerSettings)ExplorerWorker.Settings); + + if (BarycentreHistory.ContainsKey(scanEvent.SystemAddress) && BarycentreHistory[scanEvent.SystemAddress].ContainsKey(scanEvent.Parent[0].Body)) + { + ProcessScan(ConvertBarycentre(BarycentreHistory[scanEvent.SystemAddress][scanEvent.Parent[0].Body], scanEvent), readAll); + } + + if (((ExplorerSettings)ExplorerWorker.Settings).EnableCustomCriteria) + results.AddRange(CustomCriteriaManager.CheckInterest(scanEvent, SystemBodyHistory, BodySignalHistory, (ExplorerSettings)ExplorerWorker.Settings)); + + if (results.Count > 0) + { + StringBuilder notificationDetail = new(); + foreach (var result in results) + { + var scanResult = new ExplorerUIResults() + { + BodyName = scanEvent.BodyName, + Time = scanEvent.TimestampDateTime.ToString("G"), + Description = result.Description, + Details = result.Detail + }; + ObservatoryCore.AddGridItem(ExplorerWorker, scanResult); + notificationDetail.AppendLine(result.Description); + } + + string bodyAffix; + + if (scanEvent.StarSystem != null && scanEvent.BodyName.StartsWith(scanEvent.StarSystem)) + { + bodyAffix = scanEvent.BodyName.Replace(scanEvent.StarSystem, string.Empty); + } + else + { + bodyAffix = string.Empty; + } + + string bodyLabel = scanEvent.PlanetClass == "Barycentre" ? "Barycentre" : "Body"; + + string spokenAffix; + + if (bodyAffix.Length > 0) + { + if (bodyAffix.Contains("Ring")) + { + int ringIndex = bodyAffix.Length - 6; + spokenAffix = + "" + bodyAffix.Substring(0, ringIndex) + + "" + + bodyAffix.Substring(ringIndex, 1) + "" + bodyAffix.Substring(ringIndex + 1, bodyAffix.Length - (ringIndex + 1)); + } + else + { + spokenAffix = "" + bodyAffix + ""; + } + } + else + { + spokenAffix = string.Empty; + } + + NotificationArgs args = new() + { + Title = bodyLabel + bodyAffix, + TitleSsml = $"{bodyLabel} {spokenAffix}", + Detail = notificationDetail.ToString() + }; + + ObservatoryCore.SendNotification(args); + } + } + + } +} diff --git a/ObservatoryExplorer/ExplorerSettings.cs b/ObservatoryExplorer/ExplorerSettings.cs new file mode 100644 index 0000000..2453ac5 --- /dev/null +++ b/ObservatoryExplorer/ExplorerSettings.cs @@ -0,0 +1,96 @@ +using Observatory.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Observatory.Explorer +{ + public class ExplorerSettings + { + public ExplorerSettings() + { + CustomCriteriaFile = $"{Environment.GetFolderPath(Environment.SpecialFolder.Personal)}{System.IO.Path.DirectorySeparatorChar}ObservatoryCriteria.lua"; + } + + [SettingDisplayName("Landable & Terraformable")] + public bool LandableTerraformable { get; set; } + + [SettingDisplayName("Landable w/ Atmosphere")] + public bool LandableAtmosphere { get; set; } + + [SettingDisplayName("Landable High-g")] + public bool LandableHighG { get; set; } + + [SettingDisplayName("Landable Large")] + public bool LandableLarge { get; set; } + + [SettingDisplayName("Close Orbit")] + public bool CloseOrbit { get; set; } + + [SettingDisplayName("Shepherd Moon")] + public bool ShepherdMoon { get; set; } + + [SettingDisplayName("Wide Ring")] + public bool WideRing { get; set; } + + [SettingDisplayName("Close Binary")] + public bool CloseBinary { get; set; } + + [SettingDisplayName("Colliding Binary")] + public bool CollidingBinary { get; set; } + + [SettingDisplayName("Close Ring Proximity")] + public bool CloseRing { get; set; } + + [SettingDisplayName("Codex Discoveries")] + public bool Codex { get; set; } + + [SettingDisplayName("Uncommon Secondary Star")] + public bool UncommonSecondary { get; set; } + + [SettingDisplayName("Landable w/ Ring")] + public bool LandableRing { get; set; } + + [SettingDisplayName("Nested Moon")] + public bool Nested { get; set; } + + [SettingDisplayName("Small Object")] + public bool SmallObject { get; set; } + + [SettingDisplayName("Fast Rotation")] + public bool FastRotation { get; set; } + + [SettingDisplayName("Fast Orbit")] + public bool FastOrbit { get; set; } + + [SettingDisplayName("High Eccentricity")] + public bool HighEccentricity { get; set; } + + [SettingDisplayName("Diverse Life")] + public bool DiverseLife { get; set; } + + [SettingDisplayName("Good FSD Injection")] + public bool GoodFSDBody { get; set; } + + [SettingDisplayName("All FSD Mats In System")] + public bool GreenSystem { get; set; } + + [SettingDisplayName("All Surface Mats In System")] + public bool GoldSystem { get; set; } + + [SettingDisplayName("Multiple Criteria Notification")] + public bool MultipleCriteria { get; set; } + + [SettingDisplayName("Enable Custom Criteria")] + public bool EnableCustomCriteria { get; set; } + + [SettingDisplayName("Custom Criteria File")] + [System.Text.Json.Serialization.JsonIgnore] + public System.IO.FileInfo CustomCriteria {get => new System.IO.FileInfo(CustomCriteriaFile); set => CustomCriteriaFile = value.FullName;} + + [SettingIgnore] + public string CustomCriteriaFile { get; set; } + } +} diff --git a/ObservatoryExplorer/ExplorerUIResults.cs b/ObservatoryExplorer/ExplorerUIResults.cs new file mode 100644 index 0000000..142b9e8 --- /dev/null +++ b/ObservatoryExplorer/ExplorerUIResults.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Observatory.Explorer +{ + public class ExplorerUIResults + { + public string Time { get; set; } + public string BodyName { get; set; } + public string Description { get; set; } + public string Details { get; set; } + } +} diff --git a/ObservatoryExplorer/ObservatoryExplorer.csproj b/ObservatoryExplorer/ObservatoryExplorer.csproj new file mode 100644 index 0000000..38cb1c5 --- /dev/null +++ b/ObservatoryExplorer/ObservatoryExplorer.csproj @@ -0,0 +1,42 @@ + + + + net5.0 + false + ObservatoryKey.snk + + + + 0.1.$([System.DateTime]::UtcNow.DayOfYear.ToString()).$([System.DateTime]::UtcNow.ToString(HHmm)) + 0.0.0.1 + $(VersionSuffix) + 0.0.1.0 + $(VersionSuffix) + + + + true + + + + + + + + + + + + + + + + + + + + ..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll + + + + diff --git a/ObservatoryExplorer/ObservatoryExplorer.sln b/ObservatoryExplorer/ObservatoryExplorer.sln new file mode 100644 index 0000000..7481c63 --- /dev/null +++ b/ObservatoryExplorer/ObservatoryExplorer.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31205.134 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservatoryExplorer", "ObservatoryExplorer.csproj", "{E0FCF2A2-BF56-4F4D-836B-92A0E8269192}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E0FCF2A2-BF56-4F4D-836B-92A0E8269192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0FCF2A2-BF56-4F4D-836B-92A0E8269192}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0FCF2A2-BF56-4F4D-836B-92A0E8269192}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0FCF2A2-BF56-4F4D-836B-92A0E8269192}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {196B0F23-25FC-4A58-A7A9-2676C7749FFD} + EndGlobalSection +EndGlobal diff --git a/ObservatoryExplorer/Worker.cs b/ObservatoryExplorer/Worker.cs new file mode 100644 index 0000000..5be719c --- /dev/null +++ b/ObservatoryExplorer/Worker.cs @@ -0,0 +1,113 @@ +using System.Collections.ObjectModel; +using Observatory.Framework.Files.Journal; +using Observatory.Framework.Interfaces; +using Observatory.Framework; + +namespace Observatory.Explorer +{ + public class ExplorerWorker : IObservatoryWorker + { + public ExplorerWorker() + { + settings = new() + { + CloseBinary = true, + CloseOrbit = true, + CloseRing = true, + CollidingBinary = true, + FastRotation = true, + HighEccentricity = true, + LandableAtmosphere = true, + LandableHighG = true, + LandableLarge = true, + LandableRing = true, + LandableTerraformable = true, + Nested = true, + ShepherdMoon = true, + SmallObject = true, + WideRing = true + }; + resultsGrid = new(); + } + + private Explorer explorer; + private ObservableCollection resultsGrid; + private IObservatoryCore Core; + + private bool readAllStarting = false; + private bool readAllInProgress = false; + + public string Name => "Observatory Explorer"; + + public string ShortName => "Explorer"; + + public string Version => typeof(ExplorerWorker).Assembly.GetName().Version.ToString(); + + private PluginUI pluginUI; + + public PluginUI PluginUI => pluginUI; + + public void Load(IObservatoryCore observatoryCore) + { + explorer = new Explorer(this, observatoryCore, resultsGrid); + resultsGrid.Add(new ExplorerUIResults()); + pluginUI = new PluginUI(resultsGrid); + Core = observatoryCore; + } + + public void JournalEvent(TJournal journal) where TJournal : JournalBase + { + bool recordProcessed = false; + switch (journal) + { + case Scan scan: + explorer.ProcessScan(scan, readAllInProgress); + recordProcessed = true; + break; + case FSSBodySignals signals: + explorer.RecordSignal(signals); + break; + case ScanBaryCentre barycentre: + explorer.RecordBarycentre(barycentre); + break; + case DiscoveryScan discoveryScan: + break; + case FSSDiscoveryScan discoveryScan: + break; + case FSSSignalDiscovered signalDiscovered: + break; + case NavBeaconScan beaconScan: + break; + case SAAScanComplete scanComplete: + break; + case SAASignalsFound signalsFound: + break; + } + + //Set this *after* the first scan processes so that we get the current custom criteria file. + if (readAllStarting && recordProcessed) + readAllInProgress = true; + } + + public void ReadAllStarted() + { + readAllStarting = true; + Core.ClearGrid(this, new ExplorerUIResults()); + explorer.Clear(); + } + + public void ReadAllFinished() + { + readAllStarting = false; + readAllInProgress = false; + } + + public object Settings + { + get => settings; + set => settings = (ExplorerSettings)value; + } + + private ExplorerSettings settings; + } +} diff --git a/ObservatoryFramework/Attributes.cs b/ObservatoryFramework/Attributes.cs new file mode 100644 index 0000000..4f2e2ba --- /dev/null +++ b/ObservatoryFramework/Attributes.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Immutable; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Observatory.Framework +{ + public class SettingDisplayName : Attribute + { + private string name; + + public SettingDisplayName(string name) + { + this.name = name; + } + + public string DisplayName + { + get => name; + set => name = value; + } + } + + public class SettingIgnore : Attribute + { } + + public class SettingNumericUseSlider : Attribute + { } + + public class SettingNumericBounds : Attribute + { + private double minimum; + private double maximum; + private double increment; + + public SettingNumericBounds(double minimum, double maximum, double increment = 1.0) + { + this.minimum = minimum; + this.maximum = maximum; + this.increment = increment; + } + + public double Minimum + { + get => minimum; + set => minimum = value; + } + public double Maximum + { + get => maximum; + set => maximum = value; + } + public double Increment + { + get => increment; + set => increment = value; + } + } +} diff --git a/ObservatoryFramework/EventArgs.cs b/ObservatoryFramework/EventArgs.cs new file mode 100644 index 0000000..ea48664 --- /dev/null +++ b/ObservatoryFramework/EventArgs.cs @@ -0,0 +1,58 @@ +using System; + +namespace Observatory.Framework +{ + /// + /// Provides data for Elite Dangerous journal events. + /// + public class JournalEventArgs : EventArgs + { + /// + /// Type of journal entry that triggered event. + /// Will be a class from the Observatory.Framework.Files.Journal namespace derived from JournalBase, or JournalBase itself in the case of an unhandled journal event type. + /// + public Type journalType; + /// + /// Elite Dangerous journal event, deserialized into a .NET object of the type specified by JournalEventArgs.journalType. + /// Unhandled json values within a journal entry type will be contained in member property:
Dictionary<string, object> AdditionalProperties. + /// + public object journalEvent; + } + + /// + /// Provides values used as arguments for Observatory notification events. + /// + public class NotificationArgs + { + /// + /// Text typically displayed as header content. + /// + public string Title; + /// + /// SSML representation of Title text.
+ /// This value is optional, if omitted the value of NotificationArgs.Title will be used for voice synthesis without markup. + /// + public string TitleSsml; + /// + /// Text typically displayed as body content. + /// + public string Detail; + /// + /// SSML representation of Detail text.
+ /// This value is optional, if omitted the value of NotificationArgs.Detail will be used for voice synthesis without markup. + /// + public string DetailSsml; + /// + /// Specify window timeout in ms (overrides Core setting). Specify 0 timeout to persist until removed via IObservatoryCore.CancelNotification. Default -1 (use Core setting). + /// + public int Timeout = -1; + /// + /// Specify window X position as a percentage from upper left corner (overrides Core setting). Default -1.0 (use Core setting). + /// + public double XPos = -1.0; + /// + /// Specify window Y position as a percentage from upper left corner (overrides Core setting). Default -1.0 (use Core setting). + /// + public double YPos = -1.0; + } +} diff --git a/ObservatoryFramework/Files/BackPackFile.cs b/ObservatoryFramework/Files/BackPackFile.cs new file mode 100644 index 0000000..6ab7b74 --- /dev/null +++ b/ObservatoryFramework/Files/BackPackFile.cs @@ -0,0 +1,13 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class BackpackFile : JournalBase + { + public ImmutableList Items { get; init; } + public ImmutableList Components { get; init; } + public ImmutableList Consumables { get; init; } + public ImmutableList Data { get; init; } + } +} diff --git a/ObservatoryFramework/Files/CargoFile.cs b/ObservatoryFramework/Files/CargoFile.cs new file mode 100644 index 0000000..5a73886 --- /dev/null +++ b/ObservatoryFramework/Files/CargoFile.cs @@ -0,0 +1,12 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files +{ + public class CargoFile : Journal.JournalBase + { + public string Vessel { get; init; } + public int Count { get; init; } + public ImmutableList Inventory { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Converters/FleetCarrierTravelConverter.cs b/ObservatoryFramework/Files/Converters/FleetCarrierTravelConverter.cs new file mode 100644 index 0000000..0a68a81 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/FleetCarrierTravelConverter.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Immutable; +using System.Text; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Converters +{ + class FleetCarrierTravelConverter : JsonConverter + { + public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType == JsonTokenType.String) + return Single.Parse(reader.GetString().Split(' ')[0]); + else + return reader.GetSingle(); + } + + public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOptions options) + { + writer.WriteStringValue(value.ToString()); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/IntBoolConverter.cs b/ObservatoryFramework/Files/Converters/IntBoolConverter.cs new file mode 100644 index 0000000..5368487 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/IntBoolConverter.cs @@ -0,0 +1,20 @@ +using System; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Converters +{ + + public class IntBoolConverter : JsonConverter + { + public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + return reader.GetInt16() == 1; + } + + public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options) + { + writer.WriteNumberValue(value ? 1 : 0); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/IntBoolFlexConverter.cs b/ObservatoryFramework/Files/Converters/IntBoolFlexConverter.cs new file mode 100644 index 0000000..eaaf1d9 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/IntBoolFlexConverter.cs @@ -0,0 +1,22 @@ +using System; +using System.Text.Json.Serialization; +using System.Text.Json; + +namespace Observatory.Framework.Files.Converters +{ + public class IntBoolFlexConverter : JsonConverter + { + public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType == JsonTokenType.Number) + return reader.GetInt16() == 1; + else + return reader.GetBoolean(); + } + + public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options) + { + writer.WriteBooleanValue(value); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/LegacyFactionConverter.cs b/ObservatoryFramework/Files/Converters/LegacyFactionConverter.cs new file mode 100644 index 0000000..e25b0ae --- /dev/null +++ b/ObservatoryFramework/Files/Converters/LegacyFactionConverter.cs @@ -0,0 +1,31 @@ +using System; +using System.Text.Json; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Converters +{ + + /// + /// Faction changed from a simple string to an object with additional state information. If we find a string convert it to an object with null state. + /// + public class LegacyFactionConverter : JsonConverter where TFaction : Faction, new() + { + public override TFaction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType == JsonTokenType.String) + { + return new TFaction { Name = reader.GetString(), FactionState = null }; + } + else + { + return JsonSerializer.Deserialize(ref reader); + } + } + + public override void Write(Utf8JsonWriter writer, TFaction value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/MaterialCompositionConverter.cs b/ObservatoryFramework/Files/Converters/MaterialCompositionConverter.cs new file mode 100644 index 0000000..febf321 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/MaterialCompositionConverter.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Immutable; +using System.Collections.Generic; +using System.Text.Json; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Converters +{ + /// + /// The format used for materials changed from an object with a key for each material to an array of objects containing "name" and "percent". + /// Need to handle both if we're going to read historical data. This reads the old format into a class reflecting the new structure. + /// + public class MaterialCompositionConverter : JsonConverter> + { + public override ImmutableList Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType == JsonTokenType.StartObject) + { + var materialComposition = new List(); + while (reader.Read()) + { + if (reader.TokenType != JsonTokenType.EndObject) + { + if (reader.TokenType == JsonTokenType.PropertyName) + { + string name = reader.GetString(); + reader.Read(); + float percent = reader.GetSingle(); + var material = new MaterialComposition + { + Name = name, + Percent = percent + }; + materialComposition.Add(material); + } + } + else + { + break; + } + } + return materialComposition.ToImmutableList(); + } + else + { + return (ImmutableList)JsonSerializer.Deserialize(ref reader, typeof(ImmutableList)); + } + } + + public override void Write(Utf8JsonWriter writer, ImmutableList value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/MaterialConverter.cs b/ObservatoryFramework/Files/Converters/MaterialConverter.cs new file mode 100644 index 0000000..0006cb8 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/MaterialConverter.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Immutable; +using System.Collections.Generic; +using System.Text.Json; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Converters +{ + /// + /// The format used for materials changed from an object with a key for each material to an array of objects containing "name" and "percent". + /// Need to handle both if we're going to read historical data. This reads the old format into a class reflecting the new structure. + /// + public class MaterialConverter : JsonConverter> + { + public override ImmutableList Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType == JsonTokenType.StartObject) + { + var materialComposition = new List(); + while (reader.Read()) + { + if (reader.TokenType != JsonTokenType.EndObject) + { + if (reader.TokenType == JsonTokenType.PropertyName) + { + string name = reader.GetString(); + reader.Read(); + int count = reader.GetInt32(); + var material = new Material + { + Name = name, + Count = count + }; + materialComposition.Add(material); + } + } + else + { + break; + } + } + return materialComposition.ToImmutableList(); + } + else + { + return (ImmutableList)JsonSerializer.Deserialize(ref reader, typeof(ImmutableList)); + } + } + + public override void Write(Utf8JsonWriter writer, ImmutableList value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/MissionEffectConverter.cs b/ObservatoryFramework/Files/Converters/MissionEffectConverter.cs new file mode 100644 index 0000000..67447a2 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/MissionEffectConverter.cs @@ -0,0 +1,39 @@ +using System; +using System.Text.Json; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Converters +{ + public class MissionEffectConverter : JsonConverter + { + public override MissionEffect Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string effect = reader.GetString(); + //TODO: Find out all possible values + switch (effect) + { + case "+": + effect = "Low"; + break; + case "++": + effect = "Med"; + break; + case "+++++": + effect = "High"; + break; + default: + break; + } + + MissionEffect missionEffect = (MissionEffect)Enum.Parse(typeof(MissionEffect), effect, true); + + return missionEffect; + } + + public override void Write(Utf8JsonWriter writer, MissionEffect value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/PipConverter.cs b/ObservatoryFramework/Files/Converters/PipConverter.cs new file mode 100644 index 0000000..e15b893 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/PipConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Converters +{ + class PipConverter : JsonConverter<(int Sys, int Eng, int Wep)> + { + public override (int Sys, int Eng, int Wep) Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + int[] values = (int[])JsonSerializer.Deserialize(ref reader, typeof(int[])); + + return (Sys: values[0], Eng: values[1], Wep: values[2]); + } + + public override void Write(Utf8JsonWriter writer, (int Sys, int Eng, int Wep) value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/RepInfConverter.cs b/ObservatoryFramework/Files/Converters/RepInfConverter.cs new file mode 100644 index 0000000..6637159 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/RepInfConverter.cs @@ -0,0 +1,19 @@ +using System; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Converters +{ + public class RepInfConverter : JsonConverter + { + public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + return reader.GetString().Trim().Length; + } + + public override void Write(Utf8JsonWriter writer, int value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/StarPosConverter.cs b/ObservatoryFramework/Files/Converters/StarPosConverter.cs new file mode 100644 index 0000000..14fc424 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/StarPosConverter.cs @@ -0,0 +1,24 @@ +using System; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Converters +{ + /// + /// Converting the ordered array of coordinates from the journal to a named tuple for clarity. + /// + public class StarPosConverter : JsonConverter<(double x, double y, double z)> + { + public override (double x, double y, double z) Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + double[] values = (double[])JsonSerializer.Deserialize(ref reader, typeof(double[])); + + return (x: values[0], y: values[1], z: values[2]); + } + + public override void Write(Utf8JsonWriter writer, (double x, double y, double z) value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/StationServiceConverter.cs b/ObservatoryFramework/Files/Converters/StationServiceConverter.cs new file mode 100644 index 0000000..18a02bc --- /dev/null +++ b/ObservatoryFramework/Files/Converters/StationServiceConverter.cs @@ -0,0 +1,28 @@ +using System; +using System.Text.Json; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Converters +{ + public class StationServiceConverter : JsonConverter + { + public override StationService Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + StationService services = StationService.None; + + while (reader.Read() && reader.TokenType != JsonTokenType.EndArray) + { + services |= (StationService)Enum.Parse(typeof(StationService), reader.GetString(), true); + } + + return services; + + } + + public override void Write(Utf8JsonWriter writer, StationService value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/StringIntConverter.cs b/ObservatoryFramework/Files/Converters/StringIntConverter.cs new file mode 100644 index 0000000..5304aec --- /dev/null +++ b/ObservatoryFramework/Files/Converters/StringIntConverter.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Immutable; +using System.Text; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Converters +{ + class StringIntConverter : JsonConverter + { + public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType == JsonTokenType.String) + return Int32.Parse(reader.GetString()); + else + return reader.GetInt32(); + } + + public override void Write(Utf8JsonWriter writer, int value, JsonSerializerOptions options) + { + writer.WriteStringValue(value.ToString()); + } + } +} diff --git a/ObservatoryFramework/Files/Converters/VoucherTypeConverter.cs b/ObservatoryFramework/Files/Converters/VoucherTypeConverter.cs new file mode 100644 index 0000000..40e2dc7 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/VoucherTypeConverter.cs @@ -0,0 +1,29 @@ +using Observatory.Framework.Files.ParameterTypes; +using System; +using System.Collections.Immutable; +using System.Text; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Converters +{ + class VoucherTypeConverter : JsonConverter + { + public override VoucherType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string voucher = reader.GetString(); + + if (voucher.Length == 0) + voucher = "None"; + + VoucherType missionEffect = (VoucherType)Enum.Parse(typeof(VoucherType), voucher, true); + + return missionEffect; + } + + public override void Write(Utf8JsonWriter writer, VoucherType value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/Bounty.cs b/ObservatoryFramework/Files/Journal/Combat/Bounty.cs new file mode 100644 index 0000000..54c4470 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/Bounty.cs @@ -0,0 +1,19 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Bounty : JournalBase + { + public ImmutableList Rewards { get; init; } + public string Target { get; init; } + public string Target_Localised { get; init; } + public string Faction { get; init; } + public string Faction_Localised { get; init; } + public long Reward { get; init; } + public long TotalReward { get; init; } + public string VictimFaction { get; init; } + public string VictimFaction_Localised { get; init; } + public int SharedWithOthers { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/CapShipBound.cs b/ObservatoryFramework/Files/Journal/Combat/CapShipBound.cs new file mode 100644 index 0000000..cfba7df --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/CapShipBound.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CapShipBound : JournalBase + { + public long Reward { get; init; } + public string AwardingFaction { get; init; } + public string VictimFaction { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/Died.cs b/ObservatoryFramework/Files/Journal/Combat/Died.cs new file mode 100644 index 0000000..2339d42 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/Died.cs @@ -0,0 +1,14 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Died : JournalBase + { + public string KillerName { get; init; } + public string KillerName_Localised { get; init; } + public string KillerShip { get; init; } + public string KillerRank { get; init; } + public ImmutableList Killers { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs b/ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs new file mode 100644 index 0000000..c917d3b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class EscapeInterdiction : JournalBase + { + public string Interdictor { get; init; } + public bool IsPlayer { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/FactionKillBond.cs b/ObservatoryFramework/Files/Journal/Combat/FactionKillBond.cs new file mode 100644 index 0000000..13294f1 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/FactionKillBond.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FactionKillBond : JournalBase + { + public long Reward { get; init; } + public string AwardingFaction { get; init; } + public string AwardingFaction_Localised { get; init; } + public string VictimFaction { get; init; } + public string VictimFaction_Localised { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs b/ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs new file mode 100644 index 0000000..756af38 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FighterDestroyed : JournalBase + { + public int ID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/HeatDamage.cs b/ObservatoryFramework/Files/Journal/Combat/HeatDamage.cs new file mode 100644 index 0000000..0e1e62f --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/HeatDamage.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class HeatDamage : JournalBase + { } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/HeatWarning.cs b/ObservatoryFramework/Files/Journal/Combat/HeatWarning.cs new file mode 100644 index 0000000..27771b6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/HeatWarning.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class HeatWarning : JournalBase + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/HullDamage.cs b/ObservatoryFramework/Files/Journal/Combat/HullDamage.cs new file mode 100644 index 0000000..7e50507 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/HullDamage.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class HullDamage : JournalBase + { + public float Health { get; init; } + public bool PlayerPilot { get; init; } + public bool Fighter { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/Interdicted.cs b/ObservatoryFramework/Files/Journal/Combat/Interdicted.cs new file mode 100644 index 0000000..17b6121 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/Interdicted.cs @@ -0,0 +1,13 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Interdicted : JournalBase + { + public bool Submitted { get; init; } + public string Interdictor { get; init; } + public string Interdictor_Localised { get; init; } + public bool IsPlayer { get; init; } + public int CombatRank { get; init; } + public string Faction { get; init; } + public string Power { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/Interdiction.cs b/ObservatoryFramework/Files/Journal/Combat/Interdiction.cs new file mode 100644 index 0000000..7bd2064 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/Interdiction.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Interdiction : JournalBase + { + public bool Success { get; init; } + public string Interdictor { get; init; } + public bool IsPlayer { get; init; } + public int CombatRank { get; init; } + public string Faction { get; init; } + public string Power { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/PVPKill.cs b/ObservatoryFramework/Files/Journal/Combat/PVPKill.cs new file mode 100644 index 0000000..e32bd39 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/PVPKill.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PVPKill : JournalBase + { + public string Victim { get; init; } + public int CombatRank { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/SRVDestroyed.cs b/ObservatoryFramework/Files/Journal/Combat/SRVDestroyed.cs new file mode 100644 index 0000000..0acae38 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/SRVDestroyed.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SRVDestroyed : JournalBase + { } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/ShieldState.cs b/ObservatoryFramework/Files/Journal/Combat/ShieldState.cs new file mode 100644 index 0000000..dc3c71b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/ShieldState.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ShieldState : JournalBase + { + public bool ShieldsUp { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/ShipTargeted.cs b/ObservatoryFramework/Files/Journal/Combat/ShipTargeted.cs new file mode 100644 index 0000000..3452276 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/ShipTargeted.cs @@ -0,0 +1,23 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ShipTargeted : JournalBase + { + public bool TargetLocked { get; init; } + public string Ship { get; init; } + public string Ship_Localised { get; init; } + public int ScanStage { get; init; } + public string PilotName { get; init; } + public string PilotName_Localised { get; init; } + public string PilotRank { get; init; } + public float ShieldHealth { get; init; } + public float HullHealth { get; init; } + public string Faction { get; init; } + public string LegalStatus { get; init; } + public long Bounty { get; init; } + public string Subsystem { get; init; } + public string Subsystem_Localised { get; init; } + public float SubsystemHealth { get; init; } + public string Power { get; init; } + public string SquadronID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/UnderAttack.cs b/ObservatoryFramework/Files/Journal/Combat/UnderAttack.cs new file mode 100644 index 0000000..69e0f0d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Combat/UnderAttack.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class UnderAttack : JournalBase + { + public string Target { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/BuyExplorationData.cs b/ObservatoryFramework/Files/Journal/Exploration/BuyExplorationData.cs new file mode 100644 index 0000000..a5ff6ec --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/BuyExplorationData.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class BuyExplorationData : JournalBase + { + public string System { get; init; } + public int Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs b/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs new file mode 100644 index 0000000..1d7a553 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs @@ -0,0 +1,27 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class CodexEntry : JournalBase + { + public long EntryID { get; init; } + public string Name { get; init; } + public string Name_Localised { get; init; } + public string SubCategory { get; init; } + public string SubCategory_Localised { get; init; } + public string Category { get; init; } + public string Category_Localised { get; init; } + public string Region { get; init; } + public string Region_Localised { get; init; } + public string System { get; init; } + public ulong SystemAddress { get; init; } + public string NearestDestination { get; init; } + public string NearestDestination_Localised { get; init; } + public bool IsNewEntry { get; init; } + public bool NewTraitsDiscovered { get; init; } + public ImmutableList Traits { get; init; } + public int VoucherAmount { get; init; } + public float Latitude { get; init; } + public float Longitude { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/DiscoveryScan.cs b/ObservatoryFramework/Files/Journal/Exploration/DiscoveryScan.cs new file mode 100644 index 0000000..c997b3a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/DiscoveryScan.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DiscoveryScan : JournalBase + { + public ulong SystemAddress { get; init; } + public int Bodies { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/FSSAllBodiesFound.cs b/ObservatoryFramework/Files/Journal/Exploration/FSSAllBodiesFound.cs new file mode 100644 index 0000000..8fb04d9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/FSSAllBodiesFound.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FSSAllBodiesFound : JournalBase + { + public string SystemName { get; init; } + public ulong SystemAddress { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/FSSBodySignals.cs b/ObservatoryFramework/Files/Journal/Exploration/FSSBodySignals.cs new file mode 100644 index 0000000..faa6e26 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/FSSBodySignals.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FSSBodySignals : SAASignalsFound + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/FSSDiscoveryScan.cs b/ObservatoryFramework/Files/Journal/Exploration/FSSDiscoveryScan.cs new file mode 100644 index 0000000..f7fd6af --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/FSSDiscoveryScan.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FSSDiscoveryScan : JournalBase + { + public string SystemName { get; init; } + public ulong SystemAddress { get; init; } + public float Progress { get; init; } + public int BodyCount { get; init; } + public int NonBodyCount { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs b/ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs new file mode 100644 index 0000000..49116f3 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs @@ -0,0 +1,18 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FSSSignalDiscovered : JournalBase + { + public string SignalName { get; init; } + public string SignalName_Localised { get; init; } + public string SpawningState { get; init; } + public string SpawningState_Localised { get; init; } + public string SpawningFaction { get; init; } + public string SpawningFaction_Localised { get; init; } + public float TimeRemaining { get; init; } + public ulong SystemAddress { get; init; } + public int ThreatLevel { get; init; } + public string USSType { get; init; } + public string USSType_Localised { get; init; } + public bool IsStation { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/MaterialCollected.cs b/ObservatoryFramework/Files/Journal/Exploration/MaterialCollected.cs new file mode 100644 index 0000000..81663e7 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/MaterialCollected.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MaterialCollected : JournalBase + { + public string Category { get; init; } + public string Name { get; init; } + public string Name_Localised { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/MaterialDiscarded.cs b/ObservatoryFramework/Files/Journal/Exploration/MaterialDiscarded.cs new file mode 100644 index 0000000..dc3e885 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/MaterialDiscarded.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MaterialDiscarded : MaterialCollected + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/MaterialDiscovered.cs b/ObservatoryFramework/Files/Journal/Exploration/MaterialDiscovered.cs new file mode 100644 index 0000000..b207f30 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/MaterialDiscovered.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MaterialDiscovered : JournalBase + { + public string Category { get; init; } + public string Name { get; init; } + public string Name_Localised { get; init; } + public int DiscoveryNumber { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs b/ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs new file mode 100644 index 0000000..bb08c64 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs @@ -0,0 +1,14 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class MultiSellExplorationData : JournalBase + { + public ImmutableList Discovered { get; init; } + public long BaseValue { get; init; } + public long Bonus { get; init; } + public long TotalEarnings { get; init; } + + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/NavBeaconScan.cs b/ObservatoryFramework/Files/Journal/Exploration/NavBeaconScan.cs new file mode 100644 index 0000000..299368c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/NavBeaconScan.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class NavBeaconScan : JournalBase + { + public int NumBodies { get; init; } + public ulong SystemAddress { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs b/ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs new file mode 100644 index 0000000..2c3cb5a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs @@ -0,0 +1,21 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class SAAScanComplete : JournalBase + { + public ulong SystemAddress { get; init; } + public string BodyName { get; init; } + public int BodyID { get; init; } + /// + /// This property is indicated with strikethrough in Frontier's documentation and may be deprecated. + /// + public ImmutableList Discoverers { get; init; } + /// + /// This property is indicated with strikethrough in Frontier's documentation and may be deprecated. + /// + public ImmutableList Mappers { get; init; } + public int ProbesUsed { get; init; } + public int EfficiencyTarget { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs b/ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs new file mode 100644 index 0000000..25b35ca --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs @@ -0,0 +1,13 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class SAASignalsFound : JournalBase + { + public ulong SystemAddress { get; init; } + public string BodyName { get; init; } + public int BodyID { get; init; } + public ImmutableList Signals { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/Scan.cs b/ObservatoryFramework/Files/Journal/Exploration/Scan.cs new file mode 100644 index 0000000..d2ded12 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/Scan.cs @@ -0,0 +1,168 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; +using Observatory.Framework.Files.Converters; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + /// + /// Journal "Scan" event generated when directly FSS scanning, from automatic proximity scans, or nav beacon data. + /// + public class Scan : ScanBaryCentre + { + /// + /// Type of scan which generated the event. Possible options include "Detailed", "AutoScan", and "NavBeaconDetail" (non-exhaustive). + /// + public string ScanType { get; init; } + /// + /// Name of scanned body. + /// + public string BodyName { get; init; } + /// + /// List which reflects Frontier's JSON structure for the "Parents" object. Use of Parent property is recommended instead. + /// + public ImmutableList Parents { + get => _Parents; + init + { + _Parents = value; + var ParentList = new System.Collections.Generic.List<(ParentType ParentType, int Body)>(); + foreach (var parent in value) + { + if (parent.Null != null) + { + ParentList.Add((ParentType.Null, parent.Null.GetValueOrDefault(0))); + } + else if (parent.Planet != null) + { + ParentList.Add((ParentType.Planet, parent.Planet.GetValueOrDefault(0))); + } + else if (parent.Star != null) + { + ParentList.Add((ParentType.Star, parent.Star.GetValueOrDefault(0))); + } + } + Parent = ParentList.ToImmutableList(); + } + } + /// + /// "Parents" object rearranged into more intuitive structure for ease of use. + /// + [JsonIgnore] + public ImmutableList<(ParentType ParentType, int Body)> Parent { get; init; } + private ImmutableList _Parents; + /// + /// Body distance from system arrival point in light-seconds. + /// + public double DistanceFromArrivalLS { get; init; } + /// + /// Indicates if body is tidally locked to another body (parent, child, or binary partner). + /// + public bool TidalLock { get; init; } + /// + /// Whether the planet can be or has been terraformed. Options include "Terraformable", "Terraformed", or "" (non-terraformable or naturally earth-like). + /// + public string TerraformState { get; init; } + /// + /// Class of planet. Consult your preferred source of journal documentation for all possible values. + /// + public string PlanetClass { get; init; } + /// + /// Descriptive string for body atmosphere, e.g. "hot thick sulfur dioxide atmosphere". + /// + public string Atmosphere { get; init; } + /// + /// Simple string indicating dominant atmosphere type, e.g. "SulfurDioxide". + /// + public string AtmosphereType { get; init; } + /// + /// List containing full breakdown of atmospheric components and their relative percentages. + /// + public ImmutableList AtmosphereComposition { get; init; } + /// + /// Descriptive string for type of volcanism present, or an empty string for none, e.g. "major silicate vapour geysers volcanism". + /// + public string Volcanism { get; init; } + /// + /// Mass of body in multiples of Earth's mass (5.972e24 kg). + /// + public float MassEM { get; init; } + /// + /// Radius of body in metres. + /// + public float Radius { get; init; } + /// + /// Surface gravity in m/s². + /// + public float SurfaceGravity { get; init; } + /// + /// Average surface temperature in Kelvin. + /// + public float SurfaceTemperature { get; init; } + /// + /// Average surface pressure in Pascals. + /// + public float SurfacePressure { get; init; } + /// + /// Whether the body in landable in the player's current version of Elite Dangerous. + /// + public bool Landable { get; init; } + /// + /// List containing full breakdown of prospectable surface materials and their relative percentages. + /// + [JsonConverter(typeof(MaterialCompositionConverter))] + public ImmutableList Materials { get; init; } + /// + /// Overall composition of body, expressed as percentages of ice, rock, and metal. + /// + public Composition Composition { get; init; } + /// + /// Rotation period of body in seconds. + /// + public float RotationPeriod { get; init; } + /// + /// Axial tilt of body in radians. + /// + public float AxialTilt { get; init; } + /// + /// List of all planetary or stellar ring systems around the body. + /// + public ImmutableList Rings { get; init; } + /// + /// Description of the minable material abundance.
Possible values inclue "PristineResources", "MajorResources", "CommonResources", "LowResources", and "DepletedResources". + /// + public string ReserveLevel { get; init; } + /// + /// Type of star. Consult your preferred source of journal documentation for all possible values. + /// + public string StarType { get; init; } + /// + /// Subclass of star. Consult your preferred source of journal documentation for all possible values. + /// + public int Subclass { get; init; } + /// + /// Mass of star in multiples of The Sun's mass (1.989e30 kg). + /// + public float StellarMass { get; init; } + /// + /// Absolute magnitude of star. + /// + public float AbsoluteMagnitude { get; init; } + /// + /// Age of body in millions of years. + /// + public int Age_MY { get; init; } + /// + /// Yerkes luminosity class of star. + /// + public string Luminosity { get; init; } + /// + /// Whether the body has been previously discovered by a player. + /// + public bool WasDiscovered { get; init; } + /// + /// Whether the body has been previously mapped by a player. + /// + public bool WasMapped { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/ScanBaryCentre.cs b/ObservatoryFramework/Files/Journal/Exploration/ScanBaryCentre.cs new file mode 100644 index 0000000..e18c134 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/ScanBaryCentre.cs @@ -0,0 +1,50 @@ +namespace Observatory.Framework.Files.Journal +{ + /// + /// Barycentre orbital properties, automatically recorded when any member of a multiple-body orbital arrangement is first scanned. + /// + public class ScanBaryCentre : JournalBase + { + /// + /// Name of star system containing scanned body. + /// + public string StarSystem { get; init; } + /// + /// 64-bit unique identifier for the current star system. Also known as the system's "ID64". + /// + public ulong SystemAddress { get; init; } + /// + /// Id number of body within a system. + /// + public int BodyID { get; init; } + /// + /// Orbital semi-major axis in metres.
Distance from the body's centre of gravity to the parent's centre of gravity at the most distant point in the orbit. + /// + public float SemiMajorAxis { get; init; } + /// + /// Orbital eccentricity.
0: perfectly circular, 0 > x > 1: eccentric, 1: parabolic (escape) trajectory.
(You should not ever see 1 or 0.) + /// + public float Eccentricity { get; init; } + /// + /// Orbital inclination in degrees. + /// + public float OrbitalInclination { get; init; } + /// + /// Argument of periapsis in degrees. + /// + public float Periapsis { get; init; } + /// + /// Orbital period in seconds. + /// + public float OrbitalPeriod { get; init; } + /// + /// Longitude of the ascending node in degrees. + /// + public float AscendingNode { get; init; } + /// + /// Mean anomaly in degrees. + /// + public float MeanAnomaly { get; init; } + + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/Screenshot.cs b/ObservatoryFramework/Files/Journal/Exploration/Screenshot.cs new file mode 100644 index 0000000..487063a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/Screenshot.cs @@ -0,0 +1,15 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Screenshot : JournalBase + { + public string Filename { get; init; } + public int Width { get; init; } + public int Height { get; init; } + public string System { get; init; } + public string Body { get; init; } + public float Latitude { get; init; } + public float Longitude { get; init; } + public float Altitude { get; init; } + public int Heading { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs b/ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs new file mode 100644 index 0000000..3ab331c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs @@ -0,0 +1,13 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class SellExplorationData : JournalBase + { + public ImmutableList Systems { get; init; } + public ImmutableList Discovered { get; init; } + public long BaseValue { get; init; } + public long Bonus { get; init; } + public long TotalEarnings { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs new file mode 100644 index 0000000..e6d9e98 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierBankTransfer : JournalBase + { + public long CarrierID { get; init; } + public long Deposit { get; init; } + public long Withdraw { get; init; } + public long PlayerBalance { get; init; } + public long CarrierBalance { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs new file mode 100644 index 0000000..daf3e6a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs @@ -0,0 +1,13 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierBuy : JournalBase + { + public long BoughtAtMarket { get; init; } + public ulong SystemAddress { get; init; } + public long CarrierID { get; init; } + public string Location { get; init; } + public long Price { get; init; } + public string Variant { get; init; } + public string Callsign { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs new file mode 100644 index 0000000..c8aec6d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierCancelDecommission : JournalBase + { + public long CarrierID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs new file mode 100644 index 0000000..a0c671c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs @@ -0,0 +1,15 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class CarrierCrewServices : JournalBase + { + public long CarrierID { get; init; } + public string CrewRole { get; init; } + public string CrewName { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public CarrierCrewOperation Operation { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs new file mode 100644 index 0000000..fbb674d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs @@ -0,0 +1,16 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierDecommission : JournalBase + { + public long CarrierID { get; init; } + public long ScrapRefund { get; init; } + public long ScrapTime { get; init; } + public System.DateTime ScrapTimeUTC + { + get + { + return System.DateTimeOffset.FromUnixTimeSeconds(ScrapTime).UtcDateTime; + } + } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs new file mode 100644 index 0000000..e770a51 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierDepositFuel : JournalBase + { + public long CarrierID { get; init; } + public int Amount { get; init; } + public int Total { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDockingPermission.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDockingPermission.cs new file mode 100644 index 0000000..4e8d943 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDockingPermission.cs @@ -0,0 +1,13 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class CarrierDockingPermission : JournalBase + { + public long CarrierID { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public CarrierDockingAccess DockingAccess { get; init; } + public bool AllowNotorious { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierFinance.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierFinance.cs new file mode 100644 index 0000000..8cbe0d6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierFinance.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierFinance : JournalBase + { + public long CarrierID { get; init; } + public int TaxRate { get; init; } + public long CarrierBalance { get; init; } + public long ReserveBalance { get; init; } + public long AvailableBalance { get; init; } + public int ReservePercent { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs new file mode 100644 index 0000000..8bbe74b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs @@ -0,0 +1,23 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class CarrierJump : FSDJump + { + public bool Docked { get; init; } + public string StationName { get; init; } + public string StationType { get; init; } + public long MarketID { get; init; } + public Faction StationFaction { get; init; } + public string StationGovernment { get; init; } + public string StationGovernment_Localised { get; init; } + [JsonConverter(typeof(StationServiceConverter))] + public StationService StationServices { get; init; } + public string StationEconomy { get; init; } + public string StationEconomy_Localised { get; init; } + public ImmutableList StationEconomies { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs new file mode 100644 index 0000000..31e258d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierJumpCancelled : JournalBase + { + public long CarrierID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs new file mode 100644 index 0000000..3681a16 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierJumpRequest : JournalBase + { + public string Body { get; init; } + public int BodyID { get; init; } + public ulong SystemAddress { get; init; } + public long CarrierID { get; init; } + public string SystemName { get; init; } + public ulong SystemID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierModulePack.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierModulePack.cs new file mode 100644 index 0000000..24c29c9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierModulePack.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierModulePack : CarrierShipPack + { + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs new file mode 100644 index 0000000..21bc621 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class CarrierShipPack : JournalBase + { + public long CarrierID { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public CarrierOperation Operation { get; init; } + public string PackTheme { get; init; } + public int PackTier { get; init; } + public int Cost { get; init; } + public int Refund { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs new file mode 100644 index 0000000..4a46c71 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs @@ -0,0 +1,25 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class CarrierStats : JournalBase + { + public long CarrierID { get; init; } + public string Callsign { get; init; } + public string Name { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public CarrierDockingAccess DockingAccess { get; init; } + public bool AllowNotorious { get; init; } + public int FuelLevel { get; init; } + public float JumpRangeCurr { get; init; } + public float JumpRangeMax { get; init; } + public bool PendingDecommission { get; init; } + public CarrierSpaceUsage SpaceUsage { get; init; } + public ParameterTypes.CarrierFinance Finance { get; init; } + public ImmutableList Crew { get; init; } + public ImmutableList ShipPacks { get; init; } + public ImmutableList ModulePacks { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs new file mode 100644 index 0000000..cb80b40 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs @@ -0,0 +1,14 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CarrierTradeOrder : JournalBase + { + public long CarrierID { get; init; } + public bool BlackMarket { get; init; } + public string Commodity { get; init; } + public string Commodity_Localised { get; init; } + public int PurchaseOrder { get; init; } + public int SaleOrder { get; init; } + public bool CancelTrade { get; init; } + public int Price { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/InvalidJson.cs b/ObservatoryFramework/Files/Journal/InvalidJson.cs new file mode 100644 index 0000000..2fe0390 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/InvalidJson.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Immutable; +using System.Text; + +namespace Observatory.Framework.Files.Journal +{ + public class InvalidJson : JournalBase + { + public string OriginalEvent { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/JournalBase.cs b/ObservatoryFramework/Files/Journal/JournalBase.cs new file mode 100644 index 0000000..3d53e91 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/JournalBase.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class JournalBase + { + [JsonPropertyName("timestamp")] + public string Timestamp { get; init; } + + [JsonIgnore] + public DateTime TimestampDateTime + { + get + { + return DateTime.ParseExact(Timestamp, "yyyy-MM-ddTHH:mm:ssZ", null, System.Globalization.DateTimeStyles.AssumeUniversal); + } + } + + [JsonPropertyName("event")] + public string Event { get; init; } + + [JsonExtensionData] + public Dictionary AdditionalProperties { get; init; } + + [JsonIgnore] + public string Json + { + get => json; + set + { + if (json == null || string.IsNullOrWhiteSpace(json)) + { + json = value; + } + else + { + throw new Exception("Journal property \"Json\" can only be set while empty."); + } + } + } + + private string json; + + } +} diff --git a/ObservatoryFramework/Files/Journal/JournalUtilities.cs b/ObservatoryFramework/Files/Journal/JournalUtilities.cs new file mode 100644 index 0000000..e7c7e74 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/JournalUtilities.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Immutable; +using System.Text; +using System.Text.Json; + +namespace Observatory.Framework.Files +{ + public static class JournalUtilities + { + public static string GetEventType(string line) + { + var reader = new Utf8JsonReader(Encoding.UTF8.GetBytes(line)); + string result = string.Empty; + + try + { + while (reader.Read()) + { + if (reader.TokenType == JsonTokenType.PropertyName && reader.GetString() == "event") + { + reader.Read(); + result = reader.GetString(); + } + } + } + catch + { + + result = "InvalidJson"; + } + + + return result; + } + + public static string CleanScanEvent(string line) + { + return line.Replace("\"RotationPeriod\":inf,", ""); + } + + public const string ObsoleteMessage = "Unused in Elite Dangerous 3.7+, may appear in legacy journal data."; + + public const string UnusedMessage = "Documented by Frontier, but no occurances of this value ever found in real journal data."; + + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BackPack.cs b/ObservatoryFramework/Files/Journal/Odyssey/BackPack.cs new file mode 100644 index 0000000..6fd32f8 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/BackPack.cs @@ -0,0 +1,10 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class BackPack : JournalBase + { + + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs b/ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs new file mode 100644 index 0000000..c3be94f --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs @@ -0,0 +1,11 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class BackpackChange : JournalBase + { + public ImmutableList Added { get; init; } + public ImmutableList Removed { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs b/ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs new file mode 100644 index 0000000..81ad943 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs @@ -0,0 +1,13 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class BackpackMaterials : JournalBase + { + public ImmutableList Items { get; init; } + public ImmutableList Components { get; init; } + public ImmutableList Consumables { get; init; } + public ImmutableList Data { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BookDropship.cs b/ObservatoryFramework/Files/Journal/Odyssey/BookDropship.cs new file mode 100644 index 0000000..71590e7 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/BookDropship.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class BookDropship : BookTaxi + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs b/ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs new file mode 100644 index 0000000..eec57d8 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class BookTaxi : JournalBase + { + public int Cost { get; init; } + public string DestinationSystem { get; init; } + public string DestinationLocation { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs new file mode 100644 index 0000000..a49808f --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs @@ -0,0 +1,16 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class BuyMicroResources : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public MicroCategory Category { get; init; } + public int Count { get; init; } + public int Price { get; init; } + public ulong MarketID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BuySuit.cs b/ObservatoryFramework/Files/Journal/Odyssey/BuySuit.cs new file mode 100644 index 0000000..327451e --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/BuySuit.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class BuySuit : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public int Price { get; init; } + public ulong SuitID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BuyWeapon.cs b/ObservatoryFramework/Files/Journal/Odyssey/BuyWeapon.cs new file mode 100644 index 0000000..2dd6444 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/BuyWeapon.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class BuyWeapon : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public int Price { get; init; } + public ulong SuitModuleID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/CancelDropship.cs b/ObservatoryFramework/Files/Journal/Odyssey/CancelDropship.cs new file mode 100644 index 0000000..97c52fd --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/CancelDropship.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CancelDropship : CancelTaxi + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/CancelTaxi.cs b/ObservatoryFramework/Files/Journal/Odyssey/CancelTaxi.cs new file mode 100644 index 0000000..360e3d8 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/CancelTaxi.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CancelTaxi : JournalBase + { + public int Refund { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/CollectItems.cs b/ObservatoryFramework/Files/Journal/Odyssey/CollectItems.cs new file mode 100644 index 0000000..037b0ad --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/CollectItems.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CollectItems : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public string Type { get; init; } + public ulong OwnerID { get; init; } + public int Count { get; init; } + public bool Stolen { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs b/ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs new file mode 100644 index 0000000..4ac7472 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs @@ -0,0 +1,11 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class CreateSuitLoadout : DeleteSuitLoadout + { + public ImmutableList Modules { get; init; } + public ImmutableList SuitMods { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/DeleteSuitLoadout.cs b/ObservatoryFramework/Files/Journal/Odyssey/DeleteSuitLoadout.cs new file mode 100644 index 0000000..8414cf1 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/DeleteSuitLoadout.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DeleteSuitLoadout : JournalBase + { + public ulong SuitID { get; init; } + public string SuitName { get; init; } + public string SuitName_Localised { get; init; } + public ulong LoadoutID { get; init; } + public string LoadoutName { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs b/ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs new file mode 100644 index 0000000..6ee667c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Immutable; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Observatory.Framework.Files.Journal +{ + public class Disembark : JournalBase + { + public bool SRV { get; init; } + public bool Taxi { get; init; } + public bool Multicrew { get; init; } + public ulong ID { get; init; } + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + public string Body { get; init; } + public int BodyID { get; init; } + public bool OnStation { get; init; } + public bool OnPlanet { get; init; } + public string StationName { get; init; } + public string StationType { get; init; } + public ulong MarketID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/DropItems.cs b/ObservatoryFramework/Files/Journal/Odyssey/DropItems.cs new file mode 100644 index 0000000..7eea980 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/DropItems.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DropItems : CollectItems + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/DropShipDeploy.cs b/ObservatoryFramework/Files/Journal/Odyssey/DropShipDeploy.cs new file mode 100644 index 0000000..227d42c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/DropShipDeploy.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DropShipDeploy : JournalBase + { + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + public string Body { get; init; } + public int BodyID { get; init; } + public bool OnStation { get; init; } + public bool OnPlanet { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/Embark.cs b/ObservatoryFramework/Files/Journal/Odyssey/Embark.cs new file mode 100644 index 0000000..1e6a471 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/Embark.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Embark : Disembark + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/LoadoutEquipModule.cs b/ObservatoryFramework/Files/Journal/Odyssey/LoadoutEquipModule.cs new file mode 100644 index 0000000..716f781 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/LoadoutEquipModule.cs @@ -0,0 +1,15 @@ +namespace Observatory.Framework.Files.Journal +{ + public class LoadoutEquipModule : JournalBase + { + public ulong SuitID { get; init; } + public string SuitName { get; init; } + public string SuitName_Localised { get; init; } + public string SlotName { get; init; } + public ulong LoadoutID { get; init; } + public string LoadoutName { get; init; } + public string ModuleName { get; init; } + public string ModuleName_Localised { get; init; } + public ulong SuitModuleID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/LoadoutRemoveModule.cs b/ObservatoryFramework/Files/Journal/Odyssey/LoadoutRemoveModule.cs new file mode 100644 index 0000000..1606d04 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/LoadoutRemoveModule.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class LoadoutRemoveModule : LoadoutEquipModule + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/RenameSuitLoadout.cs b/ObservatoryFramework/Files/Journal/Odyssey/RenameSuitLoadout.cs new file mode 100644 index 0000000..0c4408d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/RenameSuitLoadout.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class RenameSuitLoadout : JournalBase + { + public ulong SuitID { get; init; } + public string SuitName { get; init; } + public ulong LoadoutID { get; init; } + public string LoadoutName { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs b/ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs new file mode 100644 index 0000000..7237f07 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs @@ -0,0 +1,17 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class ScanOrganic : JournalBase + { + [JsonConverter(typeof(JsonStringEnumConverter))] + public ScanOrganicType ScanType { get; init; } + public string Genus { get; init; } + public string Genus_Localised { get; init; } + public string Species { get; init; } + public string Species_Localised { get; init; } + public ulong SystemAddress { get; init; } + public int Body { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs new file mode 100644 index 0000000..6e77d6b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs @@ -0,0 +1,12 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class SellMicroResources : JournalBase + { + public ImmutableList MicroResources { get; init; } + public int Price { get; init; } + public ulong MarketID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs b/ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs new file mode 100644 index 0000000..84ce81a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs @@ -0,0 +1,11 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class SellOrganicData : JournalBase + { + public ulong MarketID { get; init; } + public ImmutableList BioData { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/SellSuit.cs b/ObservatoryFramework/Files/Journal/Odyssey/SellSuit.cs new file mode 100644 index 0000000..d7baaeb --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/SellSuit.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SellSuit : BuySuit + { } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/SellWeapon.cs b/ObservatoryFramework/Files/Journal/Odyssey/SellWeapon.cs new file mode 100644 index 0000000..42be3b6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/SellWeapon.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SellWeapon : BuyWeapon + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs b/ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs new file mode 100644 index 0000000..946dbe8 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs @@ -0,0 +1,13 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class ShipLockerMaterials : JournalBase + { + public ImmutableList Items { get; init; } + public ImmutableList Components { get; init; } + public ImmutableList Consumables { get; init; } + public ImmutableList Data { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/SuitLoadout.cs b/ObservatoryFramework/Files/Journal/Odyssey/SuitLoadout.cs new file mode 100644 index 0000000..52fea86 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/SuitLoadout.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SuitLoadout : CreateSuitLoadout + { } +} \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/SwitchSuitLoadout.cs b/ObservatoryFramework/Files/Journal/Odyssey/SwitchSuitLoadout.cs new file mode 100644 index 0000000..0e18bc3 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/SwitchSuitLoadout.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SwitchSuitLoadout : CreateSuitLoadout + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs new file mode 100644 index 0000000..3805ba7 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs @@ -0,0 +1,14 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class TradeMicroResources : JournalBase + { + public ImmutableList Offered { get; init; } + public string Received { get; init; } + public MicroCategory Category { get; init; } + public int Count { get; init; } + public ulong MarketID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs new file mode 100644 index 0000000..68fc7f1 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs @@ -0,0 +1,10 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class TransferMicroResources : JournalBase + { + public ImmutableList Transfers { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/UpgradeSuit.cs b/ObservatoryFramework/Files/Journal/Odyssey/UpgradeSuit.cs new file mode 100644 index 0000000..9adf998 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/UpgradeSuit.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class UpgradeSuit : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public ulong SuitID { get; init; } + public int Class { get; init; } + public int Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/UpgradeWeapon.cs b/ObservatoryFramework/Files/Journal/Odyssey/UpgradeWeapon.cs new file mode 100644 index 0000000..2e70256 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/UpgradeWeapon.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class UpgradeWeapon : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public ulong SuitModuleID { get; init; } + public int Class { get; init; } + public int Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Odyssey/UseConsumable.cs b/ObservatoryFramework/Files/Journal/Odyssey/UseConsumable.cs new file mode 100644 index 0000000..dba0e52 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Odyssey/UseConsumable.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class UseConsumable : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public string Type { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/AfmuRepairs.cs b/ObservatoryFramework/Files/Journal/Other/AfmuRepairs.cs new file mode 100644 index 0000000..75aca6f --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/AfmuRepairs.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class AfmuRepairs : JournalBase + { + public string Module { get; init; } + public string Module_Localised { get; init; } + public bool FullyRepaired { get; init; } + public float Health { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs b/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs new file mode 100644 index 0000000..6004308 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs @@ -0,0 +1,14 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ApproachSettlement : JournalBase + { + public ulong SystemAddress { get; init; } + public string Name { get; init; } + public string Name_Localised { get; init; } + public long MarketID { get; init; } + public float Latitude { get; init; } + public float Longitude { get; init; } + public int BodyID { get; init; } + public string BodyName { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs b/ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs new file mode 100644 index 0000000..d1e80ca --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs @@ -0,0 +1,10 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class CargoTransfer : JournalBase + { + public ImmutableList Transfers { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/ChangeCrewRole.cs b/ObservatoryFramework/Files/Journal/Other/ChangeCrewRole.cs new file mode 100644 index 0000000..2a423c3 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/ChangeCrewRole.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ChangeCrewRole : JournalBase + { + public string Role { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/CockpitBreached.cs b/ObservatoryFramework/Files/Journal/Other/CockpitBreached.cs new file mode 100644 index 0000000..d7acff8 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/CockpitBreached.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CockpitBreached : JournalBase + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/CommitCrime.cs b/ObservatoryFramework/Files/Journal/Other/CommitCrime.cs new file mode 100644 index 0000000..f1d83e9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/CommitCrime.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class CommitCrime : JournalBase + { + [JsonConverter(typeof(JsonStringEnumConverter))] + public CrimeType CrimeType { get; init; } + public string Faction { get; init; } + public string Victim { get; init; } + public string Victim_Localised { get; init; } + public int Fine { get; init; } + public int Bounty { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/Continued.cs b/ObservatoryFramework/Files/Journal/Other/Continued.cs new file mode 100644 index 0000000..08a0093 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/Continued.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Continued : JournalBase + { + public int Part { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs b/ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs new file mode 100644 index 0000000..d0ddac2 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CrewLaunchFighter : CrewMemberJoins + { + public int ID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/CrewMemberJoins.cs b/ObservatoryFramework/Files/Journal/Other/CrewMemberJoins.cs new file mode 100644 index 0000000..2068a6c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/CrewMemberJoins.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CrewMemberJoins : JournalBase + { + public string Crew { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/CrewMemberQuits.cs b/ObservatoryFramework/Files/Journal/Other/CrewMemberQuits.cs new file mode 100644 index 0000000..97d8f8d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/CrewMemberQuits.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CrewMemberQuits : CrewMemberJoins + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/CrewMemberRoleChange.cs b/ObservatoryFramework/Files/Journal/Other/CrewMemberRoleChange.cs new file mode 100644 index 0000000..1eaa99a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/CrewMemberRoleChange.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CrewMemberRoleChange : CrewMemberJoins + { + public string Role { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/CrimeVictim.cs b/ObservatoryFramework/Files/Journal/Other/CrimeVictim.cs new file mode 100644 index 0000000..e00b993 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/CrimeVictim.cs @@ -0,0 +1,14 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class CrimeVictim : JournalBase + { + public string Offender { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public CrimeType CrimeType { get; init; } + public int Fine { get; init; } + public int Bounty { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/DataScanned.cs b/ObservatoryFramework/Files/Journal/Other/DataScanned.cs new file mode 100644 index 0000000..48be8e1 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/DataScanned.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DataScanned : JournalBase + { + public string Type { get; init; } + public string Type_Localised { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/DatalinkScan.cs b/ObservatoryFramework/Files/Journal/Other/DatalinkScan.cs new file mode 100644 index 0000000..b6d6a5e --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/DatalinkScan.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DatalinkScan : JournalBase + { + public string Message { get; init; } + public string Message_Localised { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/DatalinkVoucher.cs b/ObservatoryFramework/Files/Journal/Other/DatalinkVoucher.cs new file mode 100644 index 0000000..1d9bf01 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/DatalinkVoucher.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DatalinkVoucher : JournalBase + { + public int Reward { get; init; } + public string VictimFaction { get; init; } + public string PayeeFaction { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/DockFighter.cs b/ObservatoryFramework/Files/Journal/Other/DockFighter.cs new file mode 100644 index 0000000..09bfedb --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/DockFighter.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DockFighter : JournalBase + { + public int ID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/DockSRV.cs b/ObservatoryFramework/Files/Journal/Other/DockSRV.cs new file mode 100644 index 0000000..0ae557d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/DockSRV.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DockSRV : DockFighter + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/EndCrewSession.cs b/ObservatoryFramework/Files/Journal/Other/EndCrewSession.cs new file mode 100644 index 0000000..4d42fcb --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/EndCrewSession.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class EndCrewSession : JournalBase + { + public bool OnCrime { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/FighterRebuilt.cs b/ObservatoryFramework/Files/Journal/Other/FighterRebuilt.cs new file mode 100644 index 0000000..cbeb4b4 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/FighterRebuilt.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FighterRebuilt : JournalBase + { + public string Loadout { get; init; } + public int ID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/Friends.cs b/ObservatoryFramework/Files/Journal/Other/Friends.cs new file mode 100644 index 0000000..2653bfe --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/Friends.cs @@ -0,0 +1,12 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class Friends : JournalBase + { + [JsonConverter(typeof(JsonStringEnumConverter))] + public FriendStatus Status { get; init; } + public string Name { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/FuelScoop.cs b/ObservatoryFramework/Files/Journal/Other/FuelScoop.cs new file mode 100644 index 0000000..f81349c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/FuelScoop.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FuelScoop : JournalBase + { + public float Scooped { get; init; } + public float Total { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/JetConeBoost.cs b/ObservatoryFramework/Files/Journal/Other/JetConeBoost.cs new file mode 100644 index 0000000..fffa238 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/JetConeBoost.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class JetConeBoost : JournalBase + { + public float BoostValue { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/JetConeDamage.cs b/ObservatoryFramework/Files/Journal/Other/JetConeDamage.cs new file mode 100644 index 0000000..2cb7ffd --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/JetConeDamage.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class JetConeDamage : JournalBase + { + public string Module { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/JoinACrew.cs b/ObservatoryFramework/Files/Journal/Other/JoinACrew.cs new file mode 100644 index 0000000..09bdaac --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/JoinACrew.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class JoinACrew : JournalBase + { + public string Captain { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/KickCrewMember.cs b/ObservatoryFramework/Files/Journal/Other/KickCrewMember.cs new file mode 100644 index 0000000..2163e32 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/KickCrewMember.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class KickCrewMember : JournalBase + { + public string Crew { get; init; } + public bool OnCrime { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/LaunchDrone.cs b/ObservatoryFramework/Files/Journal/Other/LaunchDrone.cs new file mode 100644 index 0000000..03e7ee6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/LaunchDrone.cs @@ -0,0 +1,11 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class LaunchDrone : JournalBase + { + [JsonConverter(typeof(JsonStringEnumConverter))] + public LimpetDrone Type { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/LaunchFighter.cs b/ObservatoryFramework/Files/Journal/Other/LaunchFighter.cs new file mode 100644 index 0000000..f53ab1a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/LaunchFighter.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class LaunchFighter : LaunchSRV + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/LaunchSRV.cs b/ObservatoryFramework/Files/Journal/Other/LaunchSRV.cs new file mode 100644 index 0000000..2a8c730 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/LaunchSRV.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class LaunchSRV : JournalBase + { + public string Loadout { get; init; } + public int ID { get; init; } + public bool PlayerControlled { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/ModuleInfo.cs b/ObservatoryFramework/Files/Journal/Other/ModuleInfo.cs new file mode 100644 index 0000000..2879e68 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/ModuleInfo.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ModuleInfo : JournalBase + { + + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/Music.cs b/ObservatoryFramework/Files/Journal/Other/Music.cs new file mode 100644 index 0000000..4d9620b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/Music.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Music : JournalBase + { + public string MusicTrack { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/NpcCrewPaidWage.cs b/ObservatoryFramework/Files/Journal/Other/NpcCrewPaidWage.cs new file mode 100644 index 0000000..8c2aa3f --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/NpcCrewPaidWage.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class NpcCrewPaidWage : JournalBase + { + public int NpcCrewId { get; init; } + public string NpcCrewName { get; init; } + public int Amount { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/NpcCrewRank.cs b/ObservatoryFramework/Files/Journal/Other/NpcCrewRank.cs new file mode 100644 index 0000000..6d3ce81 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/NpcCrewRank.cs @@ -0,0 +1,11 @@ +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class NpcCrewRank : JournalBase + { + public int NpcCrewId { get; init; } + public string NpcCrewName { get; init; } + public RankCombat RankCombat { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/Promotion.cs b/ObservatoryFramework/Files/Journal/Other/Promotion.cs new file mode 100644 index 0000000..e75b4d4 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/Promotion.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Promotion : Rank + { } +} diff --git a/ObservatoryFramework/Files/Journal/Other/ProspectedAsteroid.cs b/ObservatoryFramework/Files/Journal/Other/ProspectedAsteroid.cs new file mode 100644 index 0000000..644c2a2 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/ProspectedAsteroid.cs @@ -0,0 +1,15 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class ProspectedAsteroid : JournalBase + { + public ImmutableList Materials { get; init; } + public string Content { get; init; } + public string Content_Localised { get; init; } + public string MotherlodeMaterial { get; init; } + public string MotherlodeMaterial_Localised { get; init; } + public float Remaining { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/QuitACrew.cs b/ObservatoryFramework/Files/Journal/Other/QuitACrew.cs new file mode 100644 index 0000000..fae4e96 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/QuitACrew.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class QuitACrew : JoinACrew + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/RebootRepair.cs b/ObservatoryFramework/Files/Journal/Other/RebootRepair.cs new file mode 100644 index 0000000..b69e19f --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/RebootRepair.cs @@ -0,0 +1,9 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class RebootRepair : JournalBase + { + public ImmutableList Modules { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/ReceiveText.cs b/ObservatoryFramework/Files/Journal/Other/ReceiveText.cs new file mode 100644 index 0000000..f8c1e95 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/ReceiveText.cs @@ -0,0 +1,15 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class ReceiveText : JournalBase + { + public string From { get; init; } + public string From_Localised { get; init; } + public string Message { get; init; } + public string Message_Localised { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public TextChannel Channel { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/RepairDrone.cs b/ObservatoryFramework/Files/Journal/Other/RepairDrone.cs new file mode 100644 index 0000000..407f156 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/RepairDrone.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class RepairDrone : JournalBase + { + public float HullRepaired { get; init; } + public float CockpitRepaired { get; init; } + public float CorrosionRepaired { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/ReservoirReplenished.cs b/ObservatoryFramework/Files/Journal/Other/ReservoirReplenished.cs new file mode 100644 index 0000000..21e3c55 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/ReservoirReplenished.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ReservoirReplenished : JournalBase + { + public float FuelMain { get; init; } + public float FuelReservoir { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/Resurrect.cs b/ObservatoryFramework/Files/Journal/Other/Resurrect.cs new file mode 100644 index 0000000..2e19bb3 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/Resurrect.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Resurrect : JournalBase + { + public string Option { get; init; } + public int Cost { get; init; } + public bool Bankrupt { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/Scanned.cs b/ObservatoryFramework/Files/Journal/Other/Scanned.cs new file mode 100644 index 0000000..ccc28b8 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/Scanned.cs @@ -0,0 +1,11 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class Scanned : JournalBase + { + [JsonConverter(typeof(JsonStringEnumConverter))] + public ScanType ScanType { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/SelfDestruct.cs b/ObservatoryFramework/Files/Journal/Other/SelfDestruct.cs new file mode 100644 index 0000000..eed0037 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/SelfDestruct.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SelfDestruct : JournalBase + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/SendText.cs b/ObservatoryFramework/Files/Journal/Other/SendText.cs new file mode 100644 index 0000000..64a57fa --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/SendText.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SendText : JournalBase + { + public string To { get; init; } + public string To_Localised { get; init; } + public string Message { get; init; } + public bool Sent { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/Shutdown.cs b/ObservatoryFramework/Files/Journal/Other/Shutdown.cs new file mode 100644 index 0000000..576d1a5 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/Shutdown.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Shutdown : JournalBase + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/Synthesis.cs b/ObservatoryFramework/Files/Journal/Other/Synthesis.cs new file mode 100644 index 0000000..07d790a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/Synthesis.cs @@ -0,0 +1,15 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Synthesis : JournalBase + { + public string Name { get; init; } + + [JsonConverter(typeof(MaterialConverter))] + public ImmutableList Materials { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/SystemsShutdown.cs b/ObservatoryFramework/Files/Journal/Other/SystemsShutdown.cs new file mode 100644 index 0000000..8cd7c85 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/SystemsShutdown.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SystemsShutdown : JournalBase + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/USSDrop.cs b/ObservatoryFramework/Files/Journal/Other/USSDrop.cs new file mode 100644 index 0000000..9ac487e --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/USSDrop.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class USSDrop : JournalBase + { + public string USSType { get; init; } + public string USSType_Localised { get; init; } + public int USSThreat { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/VehicleSwitch.cs b/ObservatoryFramework/Files/Journal/Other/VehicleSwitch.cs new file mode 100644 index 0000000..c6a41db --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/VehicleSwitch.cs @@ -0,0 +1,11 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class VehicleSwitch : JournalBase + { + [JsonConverter(typeof(JsonStringEnumConverter))] + public VehicleSwitchTo To { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/WingAdd.cs b/ObservatoryFramework/Files/Journal/Other/WingAdd.cs new file mode 100644 index 0000000..2a3fccb --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/WingAdd.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class WingAdd : JournalBase + { + public string Name { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/WingInvite.cs b/ObservatoryFramework/Files/Journal/Other/WingInvite.cs new file mode 100644 index 0000000..6c09ed1 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/WingInvite.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class WingInvite : WingAdd + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/WingJoin.cs b/ObservatoryFramework/Files/Journal/Other/WingJoin.cs new file mode 100644 index 0000000..11757f9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/WingJoin.cs @@ -0,0 +1,9 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class WingJoin : JournalBase + { + public ImmutableList Others { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Other/WingLeave.cs b/ObservatoryFramework/Files/Journal/Other/WingLeave.cs new file mode 100644 index 0000000..b03cc8c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Other/WingLeave.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class WingLeave : JournalBase + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayCollect.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayCollect.cs new file mode 100644 index 0000000..bbd99b2 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayCollect.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PowerplayCollect : PowerplayJoin + { + public string Type { get; init; } + public string Type_Localised { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayDefect.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayDefect.cs new file mode 100644 index 0000000..44c4f57 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayDefect.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PowerplayDefect : JournalBase + { + public string FromPower { get; init; } + public string ToPower { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayDeliver.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayDeliver.cs new file mode 100644 index 0000000..30c0095 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayDeliver.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PowerplayDeliver : PowerplayCollect + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayFastTrack.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayFastTrack.cs new file mode 100644 index 0000000..9ab9420 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayFastTrack.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PowerplayFastTrack : PowerplayJoin + { + public int Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayJoin.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayJoin.cs new file mode 100644 index 0000000..11873bf --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayJoin.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PowerplayJoin : JournalBase + { + public string Power { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayLeave.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayLeave.cs new file mode 100644 index 0000000..f2c77f0 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayLeave.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PowerplayLeave : PowerplayJoin + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplaySalary.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplaySalary.cs new file mode 100644 index 0000000..c69f009 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplaySalary.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PowerplaySalary : PowerplayJoin + { + public int Amount { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVote.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVote.cs new file mode 100644 index 0000000..96c1aea --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVote.cs @@ -0,0 +1,12 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class PowerplayVote : PowerplayJoin + { + public int Votes { get; init; } + [JsonPropertyName("")] + public int UnnamedValue { get; init; } + public string System { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVoucher.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVoucher.cs new file mode 100644 index 0000000..76fbeeb --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVoucher.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PowerplayVoucher : PowerplayJoin + { + //TODO: Find out what this is actually supposed to be. Documented as "Systems:[name,name]" + public string Systems { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/AppliedToSquadron.cs b/ObservatoryFramework/Files/Journal/Squadron/AppliedToSquadron.cs new file mode 100644 index 0000000..54d307a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/AppliedToSquadron.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class AppliedToSquadron : SquadronCreated + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/DisbandedSquadron.cs b/ObservatoryFramework/Files/Journal/Squadron/DisbandedSquadron.cs new file mode 100644 index 0000000..fc1b305 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/DisbandedSquadron.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DisbandedSquadron : SquadronCreated + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/InvitedToSquadron.cs b/ObservatoryFramework/Files/Journal/Squadron/InvitedToSquadron.cs new file mode 100644 index 0000000..3a49f69 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/InvitedToSquadron.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class InvitedToSquadron : SquadronCreated + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/JoinedSquadron.cs b/ObservatoryFramework/Files/Journal/Squadron/JoinedSquadron.cs new file mode 100644 index 0000000..21e6e68 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/JoinedSquadron.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class JoinedSquadron : SquadronCreated + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/KickedFromSquadron.cs b/ObservatoryFramework/Files/Journal/Squadron/KickedFromSquadron.cs new file mode 100644 index 0000000..6dd8404 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/KickedFromSquadron.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class KickedFromSquadron : SquadronCreated + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/LeftSquadron.cs b/ObservatoryFramework/Files/Journal/Squadron/LeftSquadron.cs new file mode 100644 index 0000000..ace840c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/LeftSquadron.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class LeftSquadron : SquadronCreated + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/SharedBookmarkToSquadron.cs b/ObservatoryFramework/Files/Journal/Squadron/SharedBookmarkToSquadron.cs new file mode 100644 index 0000000..ae6ba3f --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/SharedBookmarkToSquadron.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SharedBookmarkToSquadron : SquadronCreated + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/SquadronCreated.cs b/ObservatoryFramework/Files/Journal/Squadron/SquadronCreated.cs new file mode 100644 index 0000000..1af8781 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/SquadronCreated.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SquadronCreated : JournalBase + { + public string SquadronName { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/SquadronDemotion.cs b/ObservatoryFramework/Files/Journal/Squadron/SquadronDemotion.cs new file mode 100644 index 0000000..eca8e45 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/SquadronDemotion.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SquadronDemotion : SquadronCreated + { + public int OldRank { get; init; } + public int NewRank { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/SquadronPromotion.cs b/ObservatoryFramework/Files/Journal/Squadron/SquadronPromotion.cs new file mode 100644 index 0000000..351d520 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/SquadronPromotion.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SquadronPromotion : SquadronDemotion + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/SquadronStartup.cs b/ObservatoryFramework/Files/Journal/Squadron/SquadronStartup.cs new file mode 100644 index 0000000..c2a8a96 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/SquadronStartup.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SquadronStartup : SquadronCreated + { + public int CurrentRank { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Squadron/WonATrophyForSquadron.cs b/ObservatoryFramework/Files/Journal/Squadron/WonATrophyForSquadron.cs new file mode 100644 index 0000000..faceb0b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Squadron/WonATrophyForSquadron.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class WonATrophyForSquadron : SquadronCreated + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Cargo.cs b/ObservatoryFramework/Files/Journal/Startup/Cargo.cs new file mode 100644 index 0000000..68d372a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Cargo.cs @@ -0,0 +1,11 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Cargo : JournalBase + { + public string Vessel { get; init; } + public int Count { get; init; } + public ImmutableList Inventory { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/ClearSavedGame.cs b/ObservatoryFramework/Files/Journal/Startup/ClearSavedGame.cs new file mode 100644 index 0000000..d1934b6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/ClearSavedGame.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ClearSavedGame : Commander + { } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Commander.cs b/ObservatoryFramework/Files/Journal/Startup/Commander.cs new file mode 100644 index 0000000..04f1855 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Commander.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Commander : JournalBase + { + public string Name { get; init; } + + public string FID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/FileHeader.cs b/ObservatoryFramework/Files/Journal/Startup/FileHeader.cs new file mode 100644 index 0000000..75bf25a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/FileHeader.cs @@ -0,0 +1,20 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class FileHeader : JournalBase + { + [JsonPropertyName("part")] + public int Part { get; init; } + + [JsonPropertyName("language")] + public string Language { get; init; } + + [JsonPropertyName("gameversion")] + public string GameVersion { get; init; } + + [JsonPropertyName("build")] + public string Build { get; init; } + public bool Odyssey { get; init; } + } +} \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Startup/LoadGame.cs b/ObservatoryFramework/Files/Journal/Startup/LoadGame.cs new file mode 100644 index 0000000..5d2a554 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/LoadGame.cs @@ -0,0 +1,31 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class LoadGame : JournalBase + { + public string Commander { get; init; } + public string FID { get; init; } + public bool Horizons { get; init; } + public bool Odyssey { get; init; } + public string Ship { get; init; } + public string Ship_Localised { get; init; } + public ulong ShipID { get; init; } + public bool StartLanded { get; init; } + public bool StartDead { get; init; } + public string GameMode { get; init; } + public string Group { get; init; } + public long Credits { get; init; } + public long Loan { get; init; } + public string ShipName { get; init; } + public string ShipIdent { get; init; } + public double FuelLevel { get; init; } + public double FuelCapacity { get; init; } + [JsonPropertyName("language")] + public string Language { get; init; } + [JsonPropertyName("gameversion")] + public string GameVersion { get; init; } + [JsonPropertyName("build")] + public string Build { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Loadout.cs b/ObservatoryFramework/Files/Journal/Startup/Loadout.cs new file mode 100644 index 0000000..c9ec9ca --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Loadout.cs @@ -0,0 +1,23 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Loadout : JournalBase + { + public string Ship { get; init; } + public ulong ShipID { get; init; } + public string ShipName { get; init; } + public string ShipIdent { get; init; } + public int CargoCapacity { get; init; } + public ulong HullValue { get; init; } + public ulong ModulesValue { get; init; } + public double HullHealth { get; init; } + public double UnladenMass { get; init; } + public FuelCapacity FuelCapacity { get; init; } + public double MaxJumpRange { get; init; } + public ulong Rebuy { get; init; } + public bool Hot { get; init; } + public ImmutableList Modules { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Materials.cs b/ObservatoryFramework/Files/Journal/Startup/Materials.cs new file mode 100644 index 0000000..62ab3cb --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Materials.cs @@ -0,0 +1,13 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Materials : JournalBase + { + public ImmutableList Raw { get; init; } + public ImmutableList Manufactured { get; init; } + public ImmutableList Encoded { get; init; } + + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Missions.cs b/ObservatoryFramework/Files/Journal/Startup/Missions.cs new file mode 100644 index 0000000..42ed39d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Missions.cs @@ -0,0 +1,12 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Missions : JournalBase + { + public ImmutableList Active { get; init; } + public ImmutableList Failed { get; init; } + public ImmutableList Complete { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/NewCommander.cs b/ObservatoryFramework/Files/Journal/Startup/NewCommander.cs new file mode 100644 index 0000000..0a408d6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/NewCommander.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class NewCommander : Commander + { + public string Package { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Passengers.cs b/ObservatoryFramework/Files/Journal/Startup/Passengers.cs new file mode 100644 index 0000000..830e74b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Passengers.cs @@ -0,0 +1,11 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Passengers : JournalBase + { + public ImmutableList Manifest { get; init; } + + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Powerplay.cs b/ObservatoryFramework/Files/Journal/Startup/Powerplay.cs new file mode 100644 index 0000000..3aaf2ee --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Powerplay.cs @@ -0,0 +1,15 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Powerplay : JournalBase + { + public string Power { get; init; } + + public int Rank { get; init; } + + public int Merits { get; init; } + + public int Votes { get; init; } + + public long TimePledged { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Progress.cs b/ObservatoryFramework/Files/Journal/Startup/Progress.cs new file mode 100644 index 0000000..64262b9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Progress.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Progress : Rank + { } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Rank.cs b/ObservatoryFramework/Files/Journal/Startup/Rank.cs new file mode 100644 index 0000000..589c769 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Rank.cs @@ -0,0 +1,16 @@ +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class Rank : JournalBase + { + public RankCombat Combat { get; init; } + public RankTrade Trade { get; init; } + public RankExploration Explore { get; init; } + public RankCQC CQC { get; init; } + public RankSoldier Soldier { get; init; } + public RankExobiologist Exobiologist { get; init; } + public RankEmpire Empire { get; init; } + public RankFederation Federation { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Reputation.cs b/ObservatoryFramework/Files/Journal/Startup/Reputation.cs new file mode 100644 index 0000000..ab7a3c9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Reputation.cs @@ -0,0 +1,47 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Reputation : JournalBase + { + public float Empire { get; init; } + + public float Federation { get; init; } + + public float Independent { get; init; } + + public float Alliance { get; init; } + + public string EmpireText() + { + return GetReputationText(Empire); + } + + public string FederationText() + { + return GetReputationText(Federation); + } + + public string IndependentText() + { + return GetReputationText(Independent); + } + + public string AllianceText() + { + return GetReputationText(Alliance); + } + + private string GetReputationText(float rep) + { + string text = rep switch + { + float r when r > 90 => "allied", + float r when r > 35 => "friendly", + float r when r > 4 => "cordial", + float r when r > -35 => "neutral", + float r when r > -90 => "unfriendly", + _ => "hostile", + }; + return text; + } + } +} diff --git a/ObservatoryFramework/Files/Journal/Startup/Statistics.cs b/ObservatoryFramework/Files/Journal/Startup/Statistics.cs new file mode 100644 index 0000000..1b26b88 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Startup/Statistics.cs @@ -0,0 +1,31 @@ +using System; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class Statistics : JournalBase + { + [JsonPropertyName("Bank_Account")] + public BankAccount BankAccount { get; init; } + public Combat Combat { get; init; } + public Crime Crime { get; init; } + public Smuggling Smuggling { get; init; } + public Trading Trading { get; init; } + public Mining Mining { get; init; } + public Exploration Exploration { get; init; } + public Passengers Passengers { get; init; } + [JsonPropertyName("Search_And_Rescue")] + public ParameterTypes.SearchAndRescue SearchAndRescue { get; init; } + public Crafting Crafting { get; init; } + public Crew Crew { get; init; } + public Multicrew Multicrew { get; init; } + [JsonPropertyName("TG_ENCOUNTERS")] + public Thargoid Thargoid { get; init; } + [JsonPropertyName("Material_Trader_Stats")] + public MaterialTrader MaterialTrader { get; init; } + public CQC CQC { get; init; } + [JsonPropertyName("FLEETCARRIER")] + public FleetCarrier FleetCarrier { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/BuyAmmo.cs b/ObservatoryFramework/Files/Journal/StationServices/BuyAmmo.cs new file mode 100644 index 0000000..dc45b68 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/BuyAmmo.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class BuyAmmo : JournalBase + { + public int Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/BuyDrones.cs b/ObservatoryFramework/Files/Journal/StationServices/BuyDrones.cs new file mode 100644 index 0000000..6f55c97 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/BuyDrones.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class BuyDrones : JournalBase + { + public string Type { get; init; } + public int Count { get; init; } + public int BuyPrice { get; init; } + public int SellPrice { get; init; } + public int TotalCost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/CargoDepot.cs b/ObservatoryFramework/Files/Journal/StationServices/CargoDepot.cs new file mode 100644 index 0000000..e443d3a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/CargoDepot.cs @@ -0,0 +1,21 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class CargoDepot : JournalBase + { + public int MissionID { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public UpdateType UpdateType { get; init; } + public string CargoType { get; init; } + public string CargoType_Localised { get; init; } + public int Count { get; init; } + public long StartMarketID { get; init; } + public long EndMarketID { get; init; } + public int ItemsCollected { get; init; } + public int ItemsDelivered { get; init; } + public int TotalItemsToDeliver { get; init; } + public float Progress { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/CommunityGoal.cs b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoal.cs new file mode 100644 index 0000000..085965c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoal.cs @@ -0,0 +1,10 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class CommunityGoal : JournalBase + { + public ImmutableList CurrentGoals { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalDiscard.cs b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalDiscard.cs new file mode 100644 index 0000000..052b31b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalDiscard.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CommunityGoalDiscard : JournalBase + { + public long CGID { get; init; } + public string Name { get; init; } + public string System { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalJoin.cs b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalJoin.cs new file mode 100644 index 0000000..70766b0 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalJoin.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CommunityGoalJoin : CommunityGoalDiscard + { + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalReward.cs b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalReward.cs new file mode 100644 index 0000000..6d7cea6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalReward.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CommunityGoalReward : CommunityGoalDiscard + { + public long Reward { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/CrewAssign.cs b/ObservatoryFramework/Files/Journal/StationServices/CrewAssign.cs new file mode 100644 index 0000000..9d06d44 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/CrewAssign.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CrewAssign : CrewFire + { + public string Role { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/CrewFire.cs b/ObservatoryFramework/Files/Journal/StationServices/CrewFire.cs new file mode 100644 index 0000000..3172910 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/CrewFire.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CrewFire : JournalBase + { + public string Name { get; init; } + public long CrewID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/CrewHire.cs b/ObservatoryFramework/Files/Journal/StationServices/CrewHire.cs new file mode 100644 index 0000000..bad5952 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/CrewHire.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CrewHire : CrewFire + { + public string Faction { get; init; } + public long Cost { get; init; } + public int CombatRank { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerApply.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerApply.cs new file mode 100644 index 0000000..19446c9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerApply.cs @@ -0,0 +1,12 @@ +using System; + +namespace Observatory.Framework.Files.Journal +{ + [Obsolete("This event was removed in Elite Dangerous 3.0 and will only appear in legacy data.")] + public class EngineerApply : JournalBase + { + public string Engineer { get; init; } + public string Blueprint { get; init; } + public int Level { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerContribution.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerContribution.cs new file mode 100644 index 0000000..cd4d7be --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerContribution.cs @@ -0,0 +1,20 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class EngineerContribution : JournalBase + { + public string Engineer { get; init; } + public long EngineerID { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public ContributionType Type { get; init; } + public string Commodity { get; init; } + public string Commodity_Localised { get; init; } + public string Material { get; init; } + public string Material_Localised { get; init; } + public string Faction { get; init; } + public int Quantity { get; init; } + public int TotalQuantity { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs new file mode 100644 index 0000000..24d434c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs @@ -0,0 +1,26 @@ +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; +using System.Text.Json.Serialization; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class EngineerCraft : JournalBase + { + public string Engineer { get; init; } + public long EngineerID { get; init; } + public string Blueprint { get; init; } + public string Slot { get; init; } + public string Module { get; init; } + public long BlueprintID { get; init; } + public string BlueprintName { get; init; } + public string ExperimentalEffect { get; init; } + public string ExperimentalEffect_Localised { get; init; } + public int Level { get; init; } + public float Quality { get; init; } + public string ApplyExperimentalEffect { get; init; } + [JsonConverter(typeof(MaterialConverter))] + public ImmutableList Ingredients { get; init; } + public ImmutableList Modifiers { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerLegacyConvert.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerLegacyConvert.cs new file mode 100644 index 0000000..8095b7c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerLegacyConvert.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class EngineerLegacyConvert : EngineerCraft + { + public bool IsPreview { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs new file mode 100644 index 0000000..c26dce4 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs @@ -0,0 +1,17 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Text.Json.Serialization; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class EngineerProgress : JournalBase + { + public string Engineer { get; init; } + public int EngineerID { get; init; } + public int Rank { get; init; } + public int RankProgress { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public ParameterTypes.Progress Progress { get; init; } + public ImmutableList Engineers { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/FetchRemoteModule.cs b/ObservatoryFramework/Files/Journal/StationServices/FetchRemoteModule.cs new file mode 100644 index 0000000..7437df0 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/FetchRemoteModule.cs @@ -0,0 +1,14 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FetchRemoteModule : JournalBase + { + public int ShipID { get; init; } + public int StorageSlot { get; init; } + public string StoredItem { get; init; } + public string StoredItem_Localised { get; init; } + public long ServerId { get; init; } + public long TransferCost { get; init; } + public string Ship { get; init; } + public long TransferTime { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/Market.cs b/ObservatoryFramework/Files/Journal/StationServices/Market.cs new file mode 100644 index 0000000..8c05ffd --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/Market.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + // TODO: Read market.json file - Will only be valid for most recent market event + public class Market : JournalBase + { + public long MarketID { get; init; } + public string StationName { get; init; } + public string StationType { get; init; } + public string StarSystem { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public CarrierDockingAccess CarrierDockingAccess { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs b/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs new file mode 100644 index 0000000..b406b8d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs @@ -0,0 +1,13 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class MassModuleStore : JournalBase + { + public long MarketID { get; init; } + public string Ship { get; init; } + public ulong ShipID { get; init; } + public ImmutableList Items { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/MaterialTrade.cs b/ObservatoryFramework/Files/Journal/StationServices/MaterialTrade.cs new file mode 100644 index 0000000..4f97d80 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/MaterialTrade.cs @@ -0,0 +1,12 @@ +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class MaterialTrade : JournalBase + { + public long MarketID { get; init; } + public string TraderType { get; init; } + public TradeDetail Paid { get; init; } + public TradeDetail Received { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionAbandoned.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionAbandoned.cs new file mode 100644 index 0000000..9b1e0a7 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionAbandoned.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MissionAbandoned : JournalBase + { + public string Name { get; init; } + public long MissionID { get; init; } + public long Fine { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionAccepted.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionAccepted.cs new file mode 100644 index 0000000..ad31f03 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionAccepted.cs @@ -0,0 +1,55 @@ +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; +using System; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal +{ + public class MissionAccepted : JournalBase + { + public string Name { get; init; } + public string LocalisedName { get; init; } + public string Faction { get; init; } + public long MissionID { get; init; } + [JsonConverter(typeof(MissionEffectConverter))] + public MissionEffect Influence { get; init; } + [JsonConverter(typeof(MissionEffectConverter))] + public MissionEffect Reputation { get; init; } + public long Reward { get; init; } + public string Commodity { get; init; } + public string Commodity_Localised { get; init; } + public int Count { get; init; } + public string Donation { get; init; } + public int Donated { get; init; } + public string Target { get; init; } + public string Target_Localised { get; init; } + public string TargetType { get; init; } + public string TargetType_Localised { get; init; } + public string TargetFaction { get; init; } + public int KillCount { get; init; } + public string Expiry { get; init; } + public DateTime ExpiryDateTime + { + get + { + if (DateTime.TryParseExact(Expiry, "yyyy-MM-ddTHH:mm:ssZ", null, System.Globalization.DateTimeStyles.AssumeUniversal, out DateTime expiryDateTime)) + { + return expiryDateTime; + } + else + { + return new DateTime(); + } + } + } + public string DestinationSystem { get; init; } + public string DestinationStation { get; init; } + public string NewDestinationSystem { get; init; } + public string NewDestinationStation { get; init; } + public int PassengerCount { get; init; } + public bool PassengerVIPs { get; init; } + public bool PassengerWanted { get; init; } + public string PassengerType { get; init; } + public bool Wing { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs new file mode 100644 index 0000000..30e0ebc --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs @@ -0,0 +1,36 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class MissionCompleted : JournalBase + { + public string Name { get; init; } + public string LocalisedName { get; init; } + public string Faction { get; init; } + public long MissionID { get; init; } + public string Commodity { get; init; } + public string Commodity_Localised { get; init; } + public int Count { get; init; } + public string Target { get; init; } + public string Target_Localised { get; init; } + public string TargetType { get; init; } + public string TargetType_Localised { get; init; } + public long Reward { get; init; } + [JsonConverter(typeof(StringIntConverter))] + public int Donation { get; init; } + public long Donated { get; init; } + public ImmutableList PermitsAwarded { get; init; } + public ImmutableList CommodityReward { get; init; } + public ImmutableList MaterialsReward { get; init; } + public string DestinationSystem { get; init; } + public string DestinationStation { get; init; } + public string NewDestinationSystem { get; init; } + public string NewDestinationStation { get; init; } + public int KillCount { get; init; } + public string TargetFaction { get; init; } + public ImmutableList FactionEffects { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionFailed.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionFailed.cs new file mode 100644 index 0000000..efcfe1f --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionFailed.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MissionFailed : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public long MissionID { get; init; } + public long Fine { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionRedirected.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionRedirected.cs new file mode 100644 index 0000000..0b0224d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionRedirected.cs @@ -0,0 +1,13 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MissionRedirected : JournalBase + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public long MissionID { get; init; } + public string NewDestinationStation { get; init; } + public string OldDestinationStation { get; init; } + public string NewDestinationSystem { get; init; } + public string OldDestinationSystem { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleBuy.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleBuy.cs new file mode 100644 index 0000000..4c6b791 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleBuy.cs @@ -0,0 +1,18 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ModuleBuy : JournalBase + { + public long MarketID { get; init; } + public string Slot { get; init; } + public string BuyItem { get; init; } + public string BuyItem_Localised { get; init; } + public int BuyPrice { get; init; } + public string SellItem { get; init; } + public string SellItem_Localised { get; init; } + public int SellPrice { get; init; } + public string StoredItem { get; init; } + public string StoredItem_Localised { get; init; } + public string Ship { get; init; } + public ulong ShipID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleRetrieve.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleRetrieve.cs new file mode 100644 index 0000000..a627b24 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleRetrieve.cs @@ -0,0 +1,19 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ModuleRetrieve : JournalBase + { + public long MarketID { get; init; } + public string Slot { get; init; } + public string Ship { get; init; } + public ulong ShipID { get; init; } + public string RetrievedItem { get; init; } + public string RetrievedItem_Localised { get; init; } + public bool Hot { get; init; } + public string SwapOutItem { get; init; } + public string SwapOutItem_Localised { get; init; } + public string EngineerModifications { get; init; } + public int Level { get; init; } + public float Quality { get; init; } + public int Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleSell.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleSell.cs new file mode 100644 index 0000000..acff2ec --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleSell.cs @@ -0,0 +1,13 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ModuleSell : JournalBase + { + public long MarketID { get; init; } + public string Slot { get; init; } + public string SellItem { get; init; } + public string SellItem_Localised { get; init; } + public int SellPrice { get; init; } + public string Ship { get; init; } + public ulong ShipID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleSellRemote.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleSellRemote.cs new file mode 100644 index 0000000..34601fd --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleSellRemote.cs @@ -0,0 +1,13 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ModuleSellRemote : JournalBase + { + public int StorageSlot { get; init; } + public string SellItem { get; init; } + public string SellItem_Localised { get; init; } + public long ServerId { get; init; } + public int SellPrice { get; init; } + public string Ship { get; init; } + public ulong ShipID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleStore.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleStore.cs new file mode 100644 index 0000000..befd15e --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleStore.cs @@ -0,0 +1,22 @@ +using System; + +namespace Observatory.Framework.Files.Journal +{ + public class ModuleStore : JournalBase + { + public long MarketID { get; init; } + public string Slot { get; init; } + public string Ship { get; init; } + public ulong ShipID { get; init; } + public string StoredItem { get; init; } + public string StoredItem_Localised { get; init; } + public bool Hot { get; init; } + public string EngineerModifications { get; init; } + public int Level { get; init; } + public float Quality { get; init; } + [Obsolete(JournalUtilities.UnusedMessage)] + public string ReplacementItem { get; init; } + [Obsolete(JournalUtilities.UnusedMessage)] + public int Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleSwap.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleSwap.cs new file mode 100644 index 0000000..615aa8d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleSwap.cs @@ -0,0 +1,15 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ModuleSwap : JournalBase + { + public long MarketID { get; init; } + public string FromSlot { get; init; } + public string ToSlot { get; init; } + public string FromItem { get; init; } + public string FromItem_Localised { get; init; } + public string ToItem { get; init; } + public string ToItem_Localised { get; init; } + public string Ship { get; init; } + public ulong ShipID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs b/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs new file mode 100644 index 0000000..4bdeff5 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Outfitting : JournalBase + { + public long MarketID { get; init; } + public string StationName { get; init; } + public string StarSystem { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/PayBounties.cs b/ObservatoryFramework/Files/Journal/StationServices/PayBounties.cs new file mode 100644 index 0000000..2a3e00d --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/PayBounties.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PayBounties : JournalBase + { + public long Amount { get; init; } + public float BrokerPercentage { get; init; } + public bool AllFines { get; init; } + public string Faction { get; init; } + public string Faction_Localised { get; init; } + public ulong ShipID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/PayFines.cs b/ObservatoryFramework/Files/Journal/StationServices/PayFines.cs new file mode 100644 index 0000000..33e2d21 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/PayFines.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class PayFines : PayBounties + { + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/PayLegacyFines.cs b/ObservatoryFramework/Files/Journal/StationServices/PayLegacyFines.cs new file mode 100644 index 0000000..b065a6b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/PayLegacyFines.cs @@ -0,0 +1,11 @@ +using System; + +namespace Observatory.Framework.Files.Journal +{ + [Obsolete(JournalUtilities.ObsoleteMessage)] + public class PayLegacyFines : JournalBase + { + public long Amount { get; init; } + public float BrokerPercentage { get; init; } + } +} \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/RedeemVoucher.cs b/ObservatoryFramework/Files/Journal/StationServices/RedeemVoucher.cs new file mode 100644 index 0000000..627b5e9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/RedeemVoucher.cs @@ -0,0 +1,18 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class RedeemVoucher : JournalBase + { + [JsonConverter(typeof(VoucherTypeConverter))] + public VoucherType Type { get; init; } + public long Amount { get; init; } + public string Faction { get; init; } + public float BrokerPercentage { get; init; } + public ImmutableList Factions { get; init; } + + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/RefuelAll.cs b/ObservatoryFramework/Files/Journal/StationServices/RefuelAll.cs new file mode 100644 index 0000000..6f1093a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/RefuelAll.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class RefuelAll : JournalBase + { + public int Cost { get; init; } + public float Amount { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/RefuelPartial.cs b/ObservatoryFramework/Files/Journal/StationServices/RefuelPartial.cs new file mode 100644 index 0000000..952e2b3 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/RefuelPartial.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class RefuelPartial : RefuelAll + { + + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/Repair.cs b/ObservatoryFramework/Files/Journal/StationServices/Repair.cs new file mode 100644 index 0000000..0528ad9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/Repair.cs @@ -0,0 +1,11 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Repair : JournalBase + { + public string Item { get; init; } + public int Cost { get; init; } + public ImmutableList Items { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/RepairAll.cs b/ObservatoryFramework/Files/Journal/StationServices/RepairAll.cs new file mode 100644 index 0000000..e3165e6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/RepairAll.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class RepairAll : JournalBase + { + public int Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/RestockVehicle.cs b/ObservatoryFramework/Files/Journal/StationServices/RestockVehicle.cs new file mode 100644 index 0000000..aa159e6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/RestockVehicle.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class RestockVehicle : JournalBase + { + public string Type { get; init; } + public string Loadout { get; init; } + public int Cost { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ScientificResearch.cs b/ObservatoryFramework/Files/Journal/StationServices/ScientificResearch.cs new file mode 100644 index 0000000..a936a91 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ScientificResearch.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ScientificResearch : JournalBase + { + public long MarketID { get; init; } + public string Name { get; init; } + public string Category { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/SearchAndRescue.cs b/ObservatoryFramework/Files/Journal/StationServices/SearchAndRescue.cs new file mode 100644 index 0000000..42df42c --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/SearchAndRescue.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SearchAndRescue : JournalBase + { + public long MarketID { get; init; } + public string Name { get; init; } + public string Name_Localised { get; init; } + public int Count { get; init; } + public int Reward { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/SellDrones.cs b/ObservatoryFramework/Files/Journal/StationServices/SellDrones.cs new file mode 100644 index 0000000..f7d3c3e --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/SellDrones.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SellDrones : JournalBase + { + public string Type { get; init; } + public int Count { get; init; } + public int SellPrice { get; init; } + public int TotalSale { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/SellShipOnRebuy.cs b/ObservatoryFramework/Files/Journal/StationServices/SellShipOnRebuy.cs new file mode 100644 index 0000000..5761485 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/SellShipOnRebuy.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SellShipOnRebuy : JournalBase + { + public string ShipType { get; init; } + public string System { get; init; } + public int SellShipId { get; init; } + public long ShipPrice { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/SetUserShipName.cs b/ObservatoryFramework/Files/Journal/StationServices/SetUserShipName.cs new file mode 100644 index 0000000..6bf55a6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/SetUserShipName.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SetUserShipName : JournalBase + { + public string Ship { get; init; } + public ulong ShipID { get; init; } + public string UserShipName { get; init; } + public string UserShipId { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs b/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs new file mode 100644 index 0000000..5839629 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Shipyard : JournalBase + { + public long MarketID { get; init; } + public string StationName { get; init; } + public string StarSystem { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ShipyardBuy.cs b/ObservatoryFramework/Files/Journal/StationServices/ShipyardBuy.cs new file mode 100644 index 0000000..7424656 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardBuy.cs @@ -0,0 +1,15 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ShipyardBuy : JournalBase + { + public long MarketID { get; init; } + public string ShipType { get; init; } + public string ShipType_Localised { get; init; } + public long ShipPrice { get; init; } + public string StoreOldShip { get; init; } + public int StoreShipID { get; init; } + public string SellOldShip { get; init; } + public int SellShipID { get; init; } + public long SellPrice { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ShipyardNew.cs b/ObservatoryFramework/Files/Journal/StationServices/ShipyardNew.cs new file mode 100644 index 0000000..f9f3a60 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardNew.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ShipyardNew : JournalBase + { + public string ShipType { get; init; } + public string ShipType_Localised { get; init; } + public int NewShipID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ShipyardSell.cs b/ObservatoryFramework/Files/Journal/StationServices/ShipyardSell.cs new file mode 100644 index 0000000..288a179 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardSell.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ShipyardSell : JournalBase + { + public long MarketID { get; init; } + public string ShipType { get; init; } + public int SellShipID { get; init; } + public long ShipPrice { get; init; } + public string System { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ShipyardSwap.cs b/ObservatoryFramework/Files/Journal/StationServices/ShipyardSwap.cs new file mode 100644 index 0000000..a62c535 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardSwap.cs @@ -0,0 +1,14 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ShipyardSwap : JournalBase + { + public long MarketID { get; init; } + public string ShipType { get; init; } + public string ShipType_Localised { get; init; } + public ulong ShipID { get; init; } + public string StoreOldShip { get; init; } + public ulong StoreShipID { get; init; } + public string SellOldShip { get; init; } + public ulong SellShipID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/ShipyardTransfer.cs b/ObservatoryFramework/Files/Journal/StationServices/ShipyardTransfer.cs new file mode 100644 index 0000000..1e026d6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardTransfer.cs @@ -0,0 +1,15 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ShipyardTransfer : JournalBase + { + public long MarketID { get; init; } + public string ShipType { get; init; } + public string ShipType_Localised { get; init; } + public ulong ShipID { get; init; } + public string System { get; init; } + public long ShipMarketID { get; init; } + public float Distance { get; init; } + public int TransferPrice { get; init; } + public long TransferTime { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs b/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs new file mode 100644 index 0000000..bd4c2a6 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs @@ -0,0 +1,13 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class StoredModules : JournalBase + { + public string StarSystem { get; init; } + public string StationName { get; init; } + public long MarketID { get; init; } + public ImmutableList Items { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs b/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs new file mode 100644 index 0000000..017ad66 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs @@ -0,0 +1,14 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class StoredShips : JournalBase + { + public long MarketID { get; init; } + public string StationName { get; init; } + public string StarSystem { get; init; } + public ImmutableList ShipsHere { get; init; } + public ImmutableList ShipsRemote { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs b/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs new file mode 100644 index 0000000..17cc943 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs @@ -0,0 +1,14 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class TechnologyBroker : JournalBase + { + public string BrokerType { get; init; } + public long MarketID { get; init; } + public ImmutableList ItemsUnlocked { get; init; } + public ImmutableList Commodities { get; init; } + public ImmutableList Materials { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Trade/AsteroidCracked.cs b/ObservatoryFramework/Files/Journal/Trade/AsteroidCracked.cs new file mode 100644 index 0000000..75cea91 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Trade/AsteroidCracked.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class AsteroidCracked : JournalBase + { + public string Body { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Trade/BuyTradeData.cs b/ObservatoryFramework/Files/Journal/Trade/BuyTradeData.cs new file mode 100644 index 0000000..27205c8 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Trade/BuyTradeData.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class BuyTradeData : JournalBase + { + public string System { get; init; } + public long Cost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Trade/CollectCargo.cs b/ObservatoryFramework/Files/Journal/Trade/CollectCargo.cs new file mode 100644 index 0000000..61108e9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Trade/CollectCargo.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class CollectCargo : JournalBase + { + public string Type { get; init; } + public string Type_Localised { get; init; } + public bool Stolen { get; init; } + public int MissionID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Trade/EjectCargo.cs b/ObservatoryFramework/Files/Journal/Trade/EjectCargo.cs new file mode 100644 index 0000000..d6401ca --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Trade/EjectCargo.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.Journal +{ + public class EjectCargo : JournalBase + { + public string Type { get; init; } + public string Type_Localised { get; init; } + public int Count { get; init; } + public int MissionID { get; init; } + public bool Abandoned { get; init; } + public string PowerplayOrigin { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Trade/MarketBuy.cs b/ObservatoryFramework/Files/Journal/Trade/MarketBuy.cs new file mode 100644 index 0000000..23254db --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Trade/MarketBuy.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MarketBuy : JournalBase + { + public long MarketID { get; init; } + public string Type { get; init; } + public string Type_Localised { get; init; } + public int Count { get; init; } + public int BuyPrice { get; init; } + public long TotalCost { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Trade/MarketSell.cs b/ObservatoryFramework/Files/Journal/Trade/MarketSell.cs new file mode 100644 index 0000000..8d479be --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Trade/MarketSell.cs @@ -0,0 +1,16 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MarketSell : JournalBase + { + public long MarketID { get; init; } + public string Type { get; init; } + public string Type_Localised { get; init; } + public int Count { get; init; } + public int SellPrice { get; init; } + public long TotalSale { get; init; } + public int AvgPricePaid { get; init; } + public bool IllegalGoods { get; init; } + public bool StolenGoods { get; init; } + public bool BlackMarket { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Trade/MiningRefined.cs b/ObservatoryFramework/Files/Journal/Trade/MiningRefined.cs new file mode 100644 index 0000000..1db4406 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Trade/MiningRefined.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.Journal +{ + public class MiningRefined : JournalBase + { + public string Type { get; init; } + public string Type_Localised { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/ApproachBody.cs b/ObservatoryFramework/Files/Journal/Travel/ApproachBody.cs new file mode 100644 index 0000000..133fcfc --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/ApproachBody.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ApproachBody : JournalBase + { + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + public string Body { get; init; } + public int BodyID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/Docked.cs b/ObservatoryFramework/Files/Journal/Travel/Docked.cs new file mode 100644 index 0000000..1fa7299 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/Docked.cs @@ -0,0 +1,101 @@ +using System; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Docked : JournalBase + { + + public string StationName { get; init; } + public string StationType { get; init; } + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + public long MarketID { get; init; } + + [JsonConverter(typeof(Converters.LegacyFactionConverter))] + public Faction StationFaction { get; init; } + + [Obsolete(JournalUtilities.ObsoleteMessage), JsonConverter(typeof(Converters.LegacyFactionConverter))] + public Faction Faction + { + private get + { + return StationFaction; + } + init + { + StationFaction = value; + } + } + + [Obsolete(JournalUtilities.ObsoleteMessage)] + public string FactionState + { + private get + { + return StationFaction.FactionState; + } + + init + { + //Stale Data, discard + } + } + + public string StationGovernment { get; init; } + + [Obsolete(JournalUtilities.ObsoleteMessage)] + public string Government + { + private get { return StationGovernment; } + init { StationGovernment = value; } + } + public string StationGovernment_Localised { get; init; } + + [Obsolete(JournalUtilities.ObsoleteMessage)] + public string Government_Localised + { + private get { return StationGovernment_Localised; } + init { StationGovernment_Localised = value; } + } + public string StationAllegiance { get; init; } + + [Obsolete(JournalUtilities.ObsoleteMessage)] + public string Allegiance + { + private get { return StationAllegiance; } + init { StationAllegiance = value; } + } + + [JsonConverter(typeof(Converters.StationServiceConverter))] + public StationService StationServices { get; init; } + public string StationEconomy { get; init; } + + [Obsolete(JournalUtilities.ObsoleteMessage)] + public string Economy + { + private get { return StationEconomy; } + init { StationEconomy = value; } + } + public string StationEconomy_Localised { get; init; } + + [Obsolete(JournalUtilities.ObsoleteMessage)] + public string Economy_Localised + { + private get { return StationEconomy_Localised; } + init { StationEconomy_Localised = value; } + } + public ImmutableList StationEconomies { get; init; } + + [Obsolete("StationState is a rundundant property. Use StationEconomy to potentially reduce unnecessary checks.")] + public string StationState { get; init; } + public float DistFromStarLS { get; init; } + public bool Wanted { get; init; } + public bool ActiveFine { get; init; } + public bool CockpitBreach { get; init; } + public bool Taxi { get; init; } + public bool Multicrew { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/DockingCancelled.cs b/ObservatoryFramework/Files/Journal/Travel/DockingCancelled.cs new file mode 100644 index 0000000..1f2681a --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/DockingCancelled.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DockingCancelled : DockingRequested + { } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/DockingDenied.cs b/ObservatoryFramework/Files/Journal/Travel/DockingDenied.cs new file mode 100644 index 0000000..6271fd5 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/DockingDenied.cs @@ -0,0 +1,11 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class DockingDenied : DockingCancelled + { + [JsonConverter(typeof(JsonStringEnumConverter))] + public Reason Reason { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/DockingGranted.cs b/ObservatoryFramework/Files/Journal/Travel/DockingGranted.cs new file mode 100644 index 0000000..5216dfb --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/DockingGranted.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DockingGranted : DockingCancelled + { + public int LandingPad { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/DockingRequested.cs b/ObservatoryFramework/Files/Journal/Travel/DockingRequested.cs new file mode 100644 index 0000000..07f19dc --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/DockingRequested.cs @@ -0,0 +1,12 @@ +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files.Journal +{ + public class DockingRequested : JournalBase + { + public string StationName { get; init; } + public string StationType { get; init; } + public long MarketID { get; init; } + public LandingPads LandingPads { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/DockingTimeout.cs b/ObservatoryFramework/Files/Journal/Travel/DockingTimeout.cs new file mode 100644 index 0000000..0d1d120 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/DockingTimeout.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class DockingTimeout : DockingRequested + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs b/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs new file mode 100644 index 0000000..0a83152 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs @@ -0,0 +1,53 @@ +using System; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class FSDJump : JournalBase + { + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + [JsonConverter(typeof(Converters.StarPosConverter))] + public (double x, double y, double z) StarPos { get; init; } + public string Body { get; init; } + public int BodyID { get; init; } + public string BodyType { get; init; } + public double JumpDist { get; init; } + public double FuelUsed { get; init; } + public double FuelLevel { get; init; } + public int BoostUsed { get; init; } + [JsonConverter(typeof(Converters.LegacyFactionConverter))] + public SystemFaction SystemFaction { get; init; } + [Obsolete(JournalUtilities.ObsoleteMessage)] + public string FactionState + { + get + { + return SystemFaction.FactionState; + } + init + { + //Stale Data, discard + } + } + public string SystemAllegiance { get; init; } + public string SystemEconomy { get; init; } + public string SystemEconomy_Localised { get; init; } + public string SystemSecondEconomy { get; init; } + public string SystemSecondEconomy_Localised { get; init; } + public string SystemGovernment { get; init; } + public string SystemGovernment_Localised { get; init; } + public string SystemSecurity { get; init; } + public string SystemSecurity_Localised { get; init; } + public long Population { get; init; } + public bool Wanted { get; init; } + public ImmutableList Factions { get; init; } + public ImmutableList Conflicts { get; init; } + public ImmutableList Powers { get; init; } + public string PowerplayState { get; init; } + public bool Taxi { get; init; } + public bool Multicrew { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/FSDTarget.cs b/ObservatoryFramework/Files/Journal/Travel/FSDTarget.cs new file mode 100644 index 0000000..d95f470 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/FSDTarget.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class FSDTarget : JournalBase + { + public string Name { get; init; } + public ulong SystemAddress { get; init; } + public string StarClass { get; init; } + public int RemainingJumpsInRoute { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/LeaveBody.cs b/ObservatoryFramework/Files/Journal/Travel/LeaveBody.cs new file mode 100644 index 0000000..1834c10 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/LeaveBody.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class LeaveBody : JournalBase + { + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + public string Body { get; init; } + public int BodyID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/Liftoff.cs b/ObservatoryFramework/Files/Journal/Travel/Liftoff.cs new file mode 100644 index 0000000..1e58a87 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/Liftoff.cs @@ -0,0 +1,5 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Liftoff : Touchdown + { } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/Location.cs b/ObservatoryFramework/Files/Journal/Travel/Location.cs new file mode 100644 index 0000000..f771569 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/Location.cs @@ -0,0 +1,72 @@ +using System; +using System.Text.Json.Serialization; +using Observatory.Framework.Files.ParameterTypes; +using Observatory.Framework.Files.Converters; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.Journal +{ + public class Location : JournalBase + { + [JsonConverter(typeof(IntBoolFlexConverter))] + public bool Docked { get; init; } + public double DistFromStarLS { get; init; } + + [Obsolete(JournalUtilities.ObsoleteMessage)] + public string FactionState + { + get + { + return SystemFaction.FactionState; + } + init + { + //Stale Data, discard + } + } + public string StationName { get; init; } + public string StationType { get; init; } + public float Longitude { get; init; } + public float Latitude { get; init; } + public long MarketID { get; init; } + + [JsonConverter(typeof(LegacyFactionConverter))] + public Faction StationFaction { get; init; } + public string StationGovernment { get; init; } + public string StationGovernment_Localised { get; init; } + public string StationAllegiance { get; init; } + public ImmutableList StationServices { get; init; } + public string StationEconomy { get; init; } + public string StationEconomy_Localised { get; init; } + public ImmutableList StationEconomies { get; init; } + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + + [JsonConverter(typeof(StarPosConverter))] + public (double x, double y, double z) StarPos { get; init; } + public string SystemAllegiance { get; init; } + public string SystemEconomy { get; init; } + public string SystemEconomy_Localised { get; init; } + public string SystemSecondEconomy { get; init; } + public string SystemSecondEconomy_Localised { get; init; } + public string SystemGovernment { get; init; } + public string SystemGovernment_Localised { get; init; } + public string SystemSecurity { get; init; } + public string SystemSecurity_Localised { get; init; } + public long Population { get; init; } + public string Body { get; init; } + public int BodyID { get; init; } + public string BodyType { get; init; } + public ImmutableList Factions { get; init; } + + [JsonConverter(typeof(LegacyFactionConverter))] + public DetailedFaction SystemFaction { get; init; } + public ImmutableList Conflicts { get; init; } + public ImmutableList Powers { get; init; } + public string PowerplayState { get; init; } + public bool Taxi { get; init; } + public bool Multicrew { get; init; } + public bool OnFoot { get; init; } + public bool InSRV { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/NavRoute.cs b/ObservatoryFramework/Files/Journal/Travel/NavRoute.cs new file mode 100644 index 0000000..0451321 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/NavRoute.cs @@ -0,0 +1,6 @@ +namespace Observatory.Framework.Files.Journal +{ + public class NavRoute : JournalBase + { + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/StartJump.cs b/ObservatoryFramework/Files/Journal/Travel/StartJump.cs new file mode 100644 index 0000000..b09297b --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/StartJump.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class StartJump : JournalBase + { + public string JumpType { get; init; } + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + public string StarClass { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/SupercruiseEntry.cs b/ObservatoryFramework/Files/Journal/Travel/SupercruiseEntry.cs new file mode 100644 index 0000000..f5c1cc5 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/SupercruiseEntry.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SupercruiseEntry : JournalBase + { + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + public bool Taxi { get; init; } + public bool Multicrew { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/SupercruiseExit.cs b/ObservatoryFramework/Files/Journal/Travel/SupercruiseExit.cs new file mode 100644 index 0000000..198b1e9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/SupercruiseExit.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SupercruiseExit : SupercruiseEntry + { + public string Body { get; init; } + public int BodyID { get; init; } + public string BodyType { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/Touchdown.cs b/ObservatoryFramework/Files/Journal/Travel/Touchdown.cs new file mode 100644 index 0000000..701cdd9 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/Touchdown.cs @@ -0,0 +1,19 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Touchdown : JournalBase + { + public double Latitude { get; init; } + public double Longitude { get; init; } + public string NearestDestination { get; init; } + public string NearestDestination_Localised { get; init; } + public bool PlayerControlled { get; init; } + public bool Taxi { get; init; } + public bool Multicrew { get; init; } + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + public string Body { get; init; } + public int BodyID { get; init; } + public bool OnStation { get; init; } + public bool OnPlanet { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/Undocked.cs b/ObservatoryFramework/Files/Journal/Travel/Undocked.cs new file mode 100644 index 0000000..747e0d7 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/Undocked.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class Undocked : JournalBase + { + public string StationName { get; init; } + public string StationType { get; init; } + public ulong MarketID { get; init; } + public bool Taxi { get; init; } + public bool Multicrew { get; init; } + } +} diff --git a/ObservatoryFramework/Files/MarketFile.cs b/ObservatoryFramework/Files/MarketFile.cs new file mode 100644 index 0000000..699a0d3 --- /dev/null +++ b/ObservatoryFramework/Files/MarketFile.cs @@ -0,0 +1,14 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files +{ + public class MarketFile : Journal.JournalBase + { + public long MarketID { get; init; } + public string StationName { get; init; } + public string StationType { get; init; } + public string StarSystem { get; init; } + public ImmutableList Items { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ModulesInfo.cs b/ObservatoryFramework/Files/ModulesInfo.cs new file mode 100644 index 0000000..074202a --- /dev/null +++ b/ObservatoryFramework/Files/ModulesInfo.cs @@ -0,0 +1,10 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files +{ + public class ModulesInfo : Journal.JournalBase + { + public ImmutableList Modules { get; init; } + } +} diff --git a/ObservatoryFramework/Files/NavRouteFile.cs b/ObservatoryFramework/Files/NavRouteFile.cs new file mode 100644 index 0000000..d32ee1d --- /dev/null +++ b/ObservatoryFramework/Files/NavRouteFile.cs @@ -0,0 +1,10 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files +{ + public class NavRouteFile : Journal.JournalBase + { + public ImmutableList Route { get; init; } + } +} diff --git a/ObservatoryFramework/Files/OutfittingFile.cs b/ObservatoryFramework/Files/OutfittingFile.cs new file mode 100644 index 0000000..ba355ff --- /dev/null +++ b/ObservatoryFramework/Files/OutfittingFile.cs @@ -0,0 +1,14 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files +{ + public class OutfittingFile : Journal.JournalBase + { + public long MarketID { get; init; } + public string StationName { get; init; } + public string StarSystem { get; init; } + public bool Horizons { get; init; } + public ImmutableList Items { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/BackpackItem.cs b/ObservatoryFramework/Files/ParameterTypes/BackpackItem.cs new file mode 100644 index 0000000..685501e --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/BackpackItem.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class BackpackItem + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public ulong OwnerID { get; init; } + public ulong MissionID { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/BackpackItemChange.cs b/ObservatoryFramework/Files/ParameterTypes/BackpackItemChange.cs new file mode 100644 index 0000000..7e3a631 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/BackpackItemChange.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class BackpackItemChange : BackpackItem + { + public string Type { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/BankAccount.cs b/ObservatoryFramework/Files/ParameterTypes/BankAccount.cs new file mode 100644 index 0000000..ca98037 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/BankAccount.cs @@ -0,0 +1,31 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class BankAccount + { + [JsonPropertyName("Current_Wealth")] + public long CurrentWealth { get; init; } + + [JsonPropertyName("Spent_On_Ships")] + public long SpentOnShips { get; init; } + + [JsonPropertyName("Spent_On_Outfitting")] + public long SpentOnOutfitting { get; init; } + + [JsonPropertyName("Spent_On_Repairs")] + public long SpentOnRepairs { get; init; } + + [JsonPropertyName("Spent_On_Fuel")] + public long SpentOnFuel { get; init; } + + [JsonPropertyName("Spent_On_Ammo_Consumables")] + public long SpentOnAmmoConsumables { get; init; } + + [JsonPropertyName("Insurance_Claims")] + public int InsuranceClaims { get; init; } + + [JsonPropertyName("Spent_On_Insurance")] + public long SpentOnInsurance { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/BioData.cs b/ObservatoryFramework/Files/ParameterTypes/BioData.cs new file mode 100644 index 0000000..50dbfd4 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/BioData.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class BioData + { + public string Genus { get; init; } + public string Genus_Localised { get; init; } + public string Species { get; init; } + public string Species_Localised { get; init; } + public int Value { get; init; } + public int Bonus { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CQC.cs b/ObservatoryFramework/Files/ParameterTypes/CQC.cs new file mode 100644 index 0000000..c9de60b --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CQC.cs @@ -0,0 +1,22 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CQC + { + [JsonPropertyName("CQC_Credits_Earned")] + public long CreditsEarned { get; init; } + + [JsonPropertyName("CQC_Time_Played")] + public long TimePlayed { get; init; } + + [JsonPropertyName("CQC_KD")] + public double KillDeathRatio { get; init; } + + [JsonPropertyName("CQC_Kills")] + public int Kills { get; init; } + + [JsonPropertyName("CQC_WL")] + public double WinLossRatio { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CargoTransferDetail.cs b/ObservatoryFramework/Files/ParameterTypes/CargoTransferDetail.cs new file mode 100644 index 0000000..5364a9d --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CargoTransferDetail.cs @@ -0,0 +1,13 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CargoTransferDetail + { + public string Type { get; init; } + public string Type_Localised { get; init; } + public int Count { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public CargoTransferDirection Direction { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CargoType.cs b/ObservatoryFramework/Files/ParameterTypes/CargoType.cs new file mode 100644 index 0000000..fb9c1c2 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CargoType.cs @@ -0,0 +1,15 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CargoType + { + public string Name { get; init; } + + public string Name_Localised { get; init; } + + public int Count { get; init; } + + public int Stolen { get; init; } + + public long? MissionID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CarrierCrew.cs b/ObservatoryFramework/Files/ParameterTypes/CarrierCrew.cs new file mode 100644 index 0000000..0b73d12 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CarrierCrew.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CarrierCrew + { + public string CrewRole { get; init; } + public bool Activated { get; init; } + public bool Enabled { get; init; } + public string CrewName { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CarrierFinance.cs b/ObservatoryFramework/Files/ParameterTypes/CarrierFinance.cs new file mode 100644 index 0000000..f7470ee --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CarrierFinance.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CarrierFinance + { + public long CarrierBalance { get; init; } + public long ReserveBalance { get; init; } + public long AvailableBalance { get; init; } + public int ReservePercent { get; init; } + public int TaxRate { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CarrierPack.cs b/ObservatoryFramework/Files/ParameterTypes/CarrierPack.cs new file mode 100644 index 0000000..f281b5d --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CarrierPack.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CarrierPack + { + public string PackTheme { get; init; } + public int PackTier { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CarrierSpaceUsage.cs b/ObservatoryFramework/Files/ParameterTypes/CarrierSpaceUsage.cs new file mode 100644 index 0000000..24e7cb9 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CarrierSpaceUsage.cs @@ -0,0 +1,13 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CarrierSpaceUsage + { + public int TotalCapacity { get; init; } + public int Crew { get; init; } + public int Cargo { get; init; } + public int CargoSpaceReserved { get; init; } + public int ShipPacks { get; init; } + public int ModulePacks { get; init; } + public int FreeSpace { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Combat.cs b/ObservatoryFramework/Files/ParameterTypes/Combat.cs new file mode 100644 index 0000000..39ddeea --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Combat.cs @@ -0,0 +1,30 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Combat + { + [JsonPropertyName("Bounties_Claimed")] + public int BountiesClaimed { get; init; } + + [JsonPropertyName("Bounty_Hunting_Profit")] + public decimal BountyHuntingProfit { get; init; } + + [JsonPropertyName("Combat_Bonds")] + public int CombatBonds { get; init; } + + [JsonPropertyName("Combat_Bond_Profits")] + public decimal CombatBondProfits { get; init; } + + public int Assassinations { get; init; } + + [JsonPropertyName("Assassination_Profits")] + public decimal AssassinationProfits { get; init; } + + [JsonPropertyName("Highest_Single_Reward")] + public decimal HighestSingleReward { get; init; } + + [JsonPropertyName("Skimmers_Killed")] + public int SkimmersKilled { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CommodityReward.cs b/ObservatoryFramework/Files/ParameterTypes/CommodityReward.cs new file mode 100644 index 0000000..7aa7f59 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CommodityReward.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CommodityReward + { + public string Name { get; init; } + public string Localised_Name { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Composition.cs b/ObservatoryFramework/Files/ParameterTypes/Composition.cs new file mode 100644 index 0000000..77d719b --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Composition.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Composition + { + public float Ice { get; init; } + public float Rock { get; init; } + public float Metal { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Conflict.cs b/ObservatoryFramework/Files/ParameterTypes/Conflict.cs new file mode 100644 index 0000000..3fd461b --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Conflict.cs @@ -0,0 +1,17 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Conflict + { + public string WarType { get; init; } + + public string Status { get; init; } + + [JsonPropertyName("Faction1")] + public WarFaction FirstFaction { get; init; } + + [JsonPropertyName("Faction2")] + public WarFaction SecondFaction { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Crafting.cs b/ObservatoryFramework/Files/ParameterTypes/Crafting.cs new file mode 100644 index 0000000..2903945 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Crafting.cs @@ -0,0 +1,53 @@ +using System; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Crafting + { + [JsonPropertyName("Spent_On_Crafting"), Obsolete(JournalUtilities.ObsoleteMessage)] + public long SpentOnCrafting { get; init; } + + [JsonPropertyName("Count_Of_Used_Engineers")] + public int CountOfUsedEngineers { get; init; } + + [JsonPropertyName("Recipes_Generated")] + public int RecipesGenerated { get; init; } + + [JsonPropertyName("Recipes_Generated_Rank_1")] + public int RecipesGeneratedRank1 { get; init; } + + [JsonPropertyName("Recipes_Generated_Rank_2")] + public int RecipesGeneratedRank2 { get; init; } + + [JsonPropertyName("Recipes_Generated_Rank_3")] + public int RecipesGeneratedRank3 { get; init; } + + [JsonPropertyName("Recipes_Generated_Rank_4")] + public int RecipesGeneratedRank4 { get; init; } + + [JsonPropertyName("Recipes_Generated_Rank_5")] + public int RecipesGeneratedRank5 { get; init; } + + [JsonPropertyName("Recipes_Applied"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int RecipesApplied { get; init; } + + [JsonPropertyName("Recipes_Applied_Rank_1"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int RecipesAppliedRank1 { get; init; } + + [JsonPropertyName("Recipes_Applied_Rank_2"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int RecipesAppliedRank2 { get; init; } + + [JsonPropertyName("Recipes_Applied_Rank_3"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int RecipesAppliedRank3 { get; init; } + + [JsonPropertyName("Recipes_Applied_Rank_4"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int RecipesAppliedRank4 { get; init; } + + [JsonPropertyName("Recipes_Applied_Rank_5"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int RecipesAppliedRank5 { get; init; } + + [JsonPropertyName("Recipes_Applied_On_Previously_Modified_Modules"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int RecipesAppliedOnPreviouslyModifiedModules { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Crew.cs b/ObservatoryFramework/Files/ParameterTypes/Crew.cs new file mode 100644 index 0000000..6f379b3 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Crew.cs @@ -0,0 +1,19 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Crew + { + [JsonPropertyName("NpcCrew_TotalWages")] + public long NpcCrewTotalWages { get; init; } + + [JsonPropertyName("NpcCrew_Hired")] + public int NpcCrewHired { get; init; } + + [JsonPropertyName("NpcCrew_Fired")] + public int NpcCrewFired { get; init; } + + [JsonPropertyName("NpcCrew_Died")] + public int NpcCrewDied { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Crime.cs b/ObservatoryFramework/Files/ParameterTypes/Crime.cs new file mode 100644 index 0000000..d3c4982 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Crime.cs @@ -0,0 +1,23 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Crime + { + public int Notoriety { get; init; } + + public long Fines { get; init; } + + [JsonPropertyName("Total_Fines")] + public long TotalFines { get; init; } + + [JsonPropertyName("Bounties_Received")] + public int BountiesReceived { get; init; } + + [JsonPropertyName("Total_Bounties")] + public decimal TotalBounties { get; init; } + + [JsonPropertyName("Highest_Bounty")] + public decimal HighestBounty { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/CurrentGoal.cs b/ObservatoryFramework/Files/ParameterTypes/CurrentGoal.cs new file mode 100644 index 0000000..4e92e3a --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/CurrentGoal.cs @@ -0,0 +1,40 @@ +using Microsoft.VisualBasic.CompilerServices; +using System; +using System.Numerics; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class CurrentGoal + { + public long CGID { get; init; } + public string Title { get; init; } + public string SystemName { get; init; } + public string MarketName { get; init; } + public string Expiry { get; init; } + public DateTime ExpiryDateTime + { + get + { + if (DateTime.TryParseExact(Expiry, "yyyy-MM-ddTHH:mm:ssZ", null, System.Globalization.DateTimeStyles.AssumeUniversal, out DateTime expiryDateTime)) + { + return expiryDateTime; + } + else + { + return new DateTime(); + } + } + } + public bool IsComplete { get; init; } + public long CurrentTotal { get; init; } + public long PlayerContribution { get; init; } + public long NumContributors { get; init; } + public int PlayerPercentileBand { get; init; } + public TopTier TopTier { get; init; } + public int TopRankSize { get; init; } + public bool PlayerInTopRank { get; init; } + public string TierReached { get; init; } + public long Bonus { get; init; } + + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Destination.cs b/ObservatoryFramework/Files/ParameterTypes/Destination.cs new file mode 100644 index 0000000..eb206e9 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Destination.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Destination + { + public ulong System { get; init; } + public int Body { get; init; } + public string Name { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/DetailedFaction.cs b/ObservatoryFramework/Files/ParameterTypes/DetailedFaction.cs new file mode 100644 index 0000000..4cfb597 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/DetailedFaction.cs @@ -0,0 +1,16 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class DetailedFaction : Faction + { + public string Government { get; init; } + public float Influence { get; init; } + public string Allegiance { get; init; } + public string Happiness { get; init; } + public string Happiness_Localised { get; init; } + public float MyReputation { get; init; } + public ImmutableList RecoveringStates { get; init; } + public ImmutableList ActiveStates { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Discovered.cs b/ObservatoryFramework/Files/ParameterTypes/Discovered.cs new file mode 100644 index 0000000..0099f3d --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Discovered.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Discovered + { + public string SystemName { get; init; } + public int NumBodies { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Effect.cs b/ObservatoryFramework/Files/ParameterTypes/Effect.cs new file mode 100644 index 0000000..6404a8c --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Effect.cs @@ -0,0 +1,12 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class EffectType + { + public string Effect { get; init; } + public string Effect_Localised { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public TrendValue Trend {get; set;} + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Engineer.cs b/ObservatoryFramework/Files/ParameterTypes/Engineer.cs new file mode 100644 index 0000000..6c29bf6 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Engineer.cs @@ -0,0 +1,14 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class EngineerType + { + public string Engineer { get; init; } + public int EngineerID { get; init; } + public int Rank { get; init; } + public int RankProgress { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public Progress Progress { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Engineering.cs b/ObservatoryFramework/Files/ParameterTypes/Engineering.cs new file mode 100644 index 0000000..b1bc4d2 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Engineering.cs @@ -0,0 +1,23 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Engineering + { + public ulong EngineerID { get; init; } + + public string Engineer { get; init; } + + public ulong BlueprintID { get; init; } + + public string BlueprintName { get; init; } + + public int Level { get; init; } + + public double Quality { get; init; } + + public string ExperimentalEffect { get; init; } + + public ImmutableList Modifiers { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Enumerations.cs b/ObservatoryFramework/Files/ParameterTypes/Enumerations.cs new file mode 100644 index 0000000..a326d3c --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Enumerations.cs @@ -0,0 +1,501 @@ +using System; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public enum CargoTransferDirection + { + ToShip, + ToSRV, + ToCarrier + } + + public enum CarrierCrewOperation + { + Activate, + Deactivate, + Pause, + Resume, + Replace + } + + public enum CarrierDockingAccess + { + All, + None, + Friends, + Squadron, + SquadronFriends + } + + public enum CarrierOperation + { + BuyPack, + SellPack, + RestockPack + } + + public enum ContributionType + { + Commodity, + Materials, + Credits, + Bond, + Bounty + } + + public enum CrimeType + { + Assault, + Murder, + Piracy, + Interdiction, + IllegalCargo, + DisobeyPolice, + FireInNoFireZone, + FireInStation, + DumpingDangerous, + DumpingNearStation, + DockingMinorBlockingAirlock, + DockingMajorBlockingAirlock, + DockingMinorBlockingLandingPad, + DockingMajorBlockingLandingPad, + DockingMinorTresspass, + DockingMajorTresspass, + CollidedAtSpeedInNoFireZone, + CollidedAtSpeedInNoFireZone_HullDamage, + RecklessWeaponsDischarge, + PassengerWanted, + onfoot_carryingIllegalGoods, + onfoot_identityTheft, + onfoot_recklessEndangerment, + onfoot_arcCutterUse, + onfoot_detectionOfWeapon, + onfoot_murder, + onfoot_overchargeIntent, + onfoot_damagingDefences, + onfoot_overchargedPort, + onfoot_trespass, + onfoot_carryingIllegalData, + onfoot_propertyTheft, + onfoot_theft, + onfoot_profileCloningIntent, + onFoot_failureToSubmitToPolice + } + + public enum LimpetDrone + { + Hatchbreaker, + FuelTransfer, + Collection, + Prospector, + Repair, + Research, + Decontamination, + Recon + } + + public enum FriendStatus + { + Requested, + Declined, + Added, + Lost, + Offline, + Online + } + + public enum MicroCategory + { + Encoded, + Raw, + Manufactured, + Item, + Component, + Data, + Consumable + } + + public enum MicroTransferDirection + { + ToBackpack, + ToShipLocker + } + + public enum MissionEffect + { + None, + Low, + Med, + High + } + + public enum ParentType + { + Null, + Planet, + Star + } + + public enum Progress + { + Invited, + Acquainted, + Unlocked, + Barred, + Known + } + + public enum RankCombat + { + Harmless = 0, + MostlyHarmless = 1, + Novice = 2, + Competent = 3, + Expert = 4, + Master = 5, + Dangerous = 6, + Deadly = 7, + Elite = 8, + Elite1 = 9, + Elite2 = 10, + Elite3 = 11, + Elite4 = 12, + Elite5 = 13 + } + + public enum RankTrade + { + Penniless = 0, + MostlyPenniless = 1, + Peddler = 2, + Dealer = 3, + Merchant = 4, + Broker = 5, + Entrepreneur = 6, + Tycoon = 7, + Elite = 8, + Elite1 = 9, + Elite2 = 10, + Elite3 = 11, + Elite4 = 12, + Elite5 = 13 + } + + public enum RankExploration + { + Aimless = 0, + MostlyAimless = 1, + Scout = 2, + Surveyor = 3, + Explorer = 4, + Pathfinder = 5, + Ranger = 6, + Pioneer = 7, + Elite = 8, + Elite1 = 9, + Elite2 = 10, + Elite3 = 11, + Elite4 = 12, + Elite5 = 13 + } + + public enum RankCQC + { + Helpless = 0, + MostlyHelpless = 1, + Amateur = 2, + SemiProfessional = 3, + Professional = 4, + Champion = 5, + Hero = 6, + Legend = 7, + Elite = 8, + Elite1 = 9, + Elite2 = 10, + Elite3 = 11, + Elite4 = 12, + Elite5 = 13 + } + + public enum RankExobiologist + { + Directionless = 0, + MostlyDirectionless = 1, + Compiler = 2, + Collector = 3, + Cataloguer = 4, + Taxonomist = 5, + Ecologist = 6, + Geneticist = 7, + Elite = 8, + Elite1 = 9, + Elite2 = 10, + Elite3 = 11, + Elite4 = 12, + Elite5 = 13 + } + + public enum RankSoldier + { + Defenceless = 0, + MostlyDefenceless = 1, + Rookie = 2, + Soldier = 3, + Gunslinger = 4, + Warrior = 5, + Gladiator = 6, + Deadeye = 7, + Elite = 8, + Elite1 = 9, + Elite2 = 10, + Elite3 = 11, + Elite4 = 12, + Elite5 = 13 + } + + public enum RankFederation + { + None = 0, + Recruit = 1, + Cadet = 2, + Midshipman = 3, + PettyOfficer = 4, + ChiefPettyOfficer = 5, + WarrantOfficer = 6, + Ensign = 7, + Lieutenant = 8, + LtCommander = 9, + PostCommander = 10, + PostCaptain = 11, + RearAdmiral = 12, + ViceAdmiral = 13, + Admiral = 14 + } + + public enum RankEmpire + { + None = 0, + Outsider = 1, + Serf = 2, + Master = 3, + Squire = 4, + Knight = 5, + Lord = 6, + Baron = 7, + Viscount = 8, + Count = 9, + Earl = 10, + Marquis = 11, + Duke = 12, + Prince = 13, + King = 14 + } + + public enum Reason + { + NoSpace, + TooLarge, + Hostile, + Offences, + Distance, + ActiveFighter, + JumpImminent, + RestrictedAccess, + NoReason + } + + public enum ScanOrganicType + { + Log, + Sample, + Analyse + } + + public enum ScanType + { + Cargo, + Crime, + Cabin, + Data, + Unknown, + Xeno + } + + [System.Flags] + public enum StationService : ulong + { + None = 0, + Dock = 1, + Autodock = 1 << 1, + BlackMarket = 1 << 2, + Commodities = 1 << 3, + Contacts = 1 << 4, + Exploration = 1 << 5, + Initiatives = 1 << 6, + Missions = 1 << 7, + Outfitting = 1 << 8, + CrewLounge = 1 << 9, + Rearm = 1 << 10, + Refuel = 1 << 11, + Repair = 1 << 12, + Shipyard = 1 << 13, + Tuning = 1 << 14, + Workshop = 1 << 15, + MissionsGenerated = 1 << 16, + Facilitator = 1 << 17, + Research = 1 << 18, + FlightController = 1 << 19, + StationOperations = 1 << 20, + OnDockMission = 1 << 21, + Powerplay = 1 << 22, + SearchAndRescue = 1 << 23, + SearchRescue = 1 << 23, + MaterialTrader = 1 << 24, + TechBroker = 1 << 25, + StationMenu = 1 << 26, + Shop = 1 << 27, + Engineer = 1 << 28, + CarrierManagement = 1 << 29, + CarrierFuel = 1 << 30, + VoucherRedemption = 1L << 31, + CarrierVendor = 1L << 32, + ModulePacks = 1L << 33, + Livery = 1L << 34, + SocialSpace = 1L << 35 + } + + public enum TextChannel + { + Wing, + Local, + Voicechat, + Friend, + Player, + Npc, + Squadron, + SquadLeaders, + Starsystem + } + + public enum TrendValue + { + UpGood, + UpBad, + DownGood, + DownBad, + None + } + + public enum UpdateType + { + Collect, + Deliver, + WingUpdate + } + + public enum VehicleSwitchTo + { + Mothership, + Fighter + } + + public enum VoucherType + { + CombatBond, + Bounty, + Trade, + Settlement, + Scannable, + Codex, + None + } + + [Flags] + public enum StatusFlags : uint + { + Docked = 1, + Landed = 1 << 1, + LandingGear = 1 << 2, + Shields = 1 << 3, + Supercruise = 1 << 4, + FAOff = 1 << 5, + Hardpoints = 1 << 6, + Wing = 1 << 7, + Lights = 1 << 8, + CargoScoop = 1 << 9, + SilentRunning = 1 << 10, + FuelScooping = 1 << 11, + SRVBrake = 1 << 12, + SRVTurret = 1 << 13, + SRVProximity = 1 << 14, + SRVDriveAssist = 1 << 15, + Masslock = 1 << 16, + FSDCharging = 1 << 17, + FSDCooldown = 1 << 18, + LowFuel = 1 << 19, + Overheat = 1 << 20, + LatLongValid = 1 << 21, + InDanger = 1 << 22, + Interdiction = 1 << 23, + MainShip = 1 << 24, + Fighter = 1 << 25, + SRV = 1 << 26, + AnalysisHUD = 1 << 27, + NightVision = 1 << 28, + /// + /// Altitude above average radius (sea level) when set. Altitude raycast to ground when unset. + /// + RadialAltitude = 1 << 29, + FSDJump = 1 << 30, + SRVHighBeam = 1u << 31 + } + + [Flags] + public enum StatusFlags2 : uint + { + OnFoot = 1, + InTaxi = 1 << 1, + InMulticrew = 1 << 2, + OnFootInStation = 1 << 3, + OnFootOnPlanet = 1 << 4, + AimDownSight = 1 << 5, + LowOxygen = 1 << 6, + LowHealth = 1 << 7, + Cold = 1 << 8, + Hot = 1 << 9, + VeryCold = 1 << 10, + VeryHot = 1 << 11, + GlideMode = 1 << 12, + OnFootInHangar = 1 << 13, + OnFootInSocialSpace = 1 << 14, + OnFootExterior = 1 << 15, + BreathableAtmosphere = 1 << 16 + } + + public enum LegalStatus + { + Clean, + IllegalCargo, + Speeding, + Wanted, + Hostile, + PassengerWanted, + Warrant + } + + public enum FocusStatus + { + NoFocus = 0, + InternalPanel = 1, + ExternalPanel = 2, + CommsPanel = 3, + RolePanel = 4, + StationServices = 5, + GalaxyMap = 6, + SystemMap = 7, + Orrery = 8, + FSS = 9, + SAA = 10, + Codex = 11 + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Exploration.cs b/ObservatoryFramework/Files/ParameterTypes/Exploration.cs new file mode 100644 index 0000000..df7fa01 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Exploration.cs @@ -0,0 +1,44 @@ +using System; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Exploration + { + [JsonPropertyName("Systems_Visited")] + public long SystemsVisited { get; init; } + + [JsonPropertyName("Fuel_Scooped"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int FuelScooped { get; init; } + + [JsonPropertyName("Fuel_Purchased"), Obsolete(JournalUtilities.ObsoleteMessage)] + public int FuelPurchased { get; init; } + + [JsonPropertyName("Exploration_Profits")] + public long ExplorationProfits { get; init; } + + [JsonPropertyName("Planets_Scanned_To_Level_2")] + public long PlanetsScannedToLevel2 { get; init; } + + [JsonPropertyName("Planets_Scanned_To_Level_3")] + public long PlanetsScannedToLevel3 { get; init; } + + [JsonPropertyName("Highest_Payout")] + public long HighestPayout { get; init; } + + [JsonPropertyName("Total_Hyperspace_Distance")] + public long TotalHyperspaceDistance { get; init; } + + [JsonPropertyName("Total_Hyperspace_Jumps")] + public long TotalHyperspaceJumps { get; init; } + + [JsonPropertyName("Greatest_Distance_From_Start")] + public double GreatestDistanceFromStart { get; init; } + + [JsonPropertyName("Time_Played")] + public long TimePlayed { get; init; } + + [JsonPropertyName("Efficient_Scans")] + public int EfficientScans { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Faction.cs b/ObservatoryFramework/Files/ParameterTypes/Faction.cs new file mode 100644 index 0000000..a153c94 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Faction.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Faction + { + public string Name { get; init; } + + public string FactionState { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/FactionEffect.cs b/ObservatoryFramework/Files/ParameterTypes/FactionEffect.cs new file mode 100644 index 0000000..63fdfd9 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/FactionEffect.cs @@ -0,0 +1,17 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class FactionEffect + { + public string Faction { get; init; } + public ImmutableList Effects { get; init; } + public ImmutableList Influence { get; init; } + [JsonConverter(typeof(RepInfConverter))] + public int Reputation { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public TrendValue ReputationTrend { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/FactionState.cs b/ObservatoryFramework/Files/ParameterTypes/FactionState.cs new file mode 100644 index 0000000..a21a4aa --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/FactionState.cs @@ -0,0 +1,7 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class FactionState + { + public string State { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/FactionStateTrend.cs b/ObservatoryFramework/Files/ParameterTypes/FactionStateTrend.cs new file mode 100644 index 0000000..3dd154e --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/FactionStateTrend.cs @@ -0,0 +1,8 @@ +using System; +namespace Observatory.Framework.Files.ParameterTypes +{ + public class FactionStateTrend : FactionState + { + public int Trend { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/FleetCarrier.cs b/ObservatoryFramework/Files/ParameterTypes/FleetCarrier.cs new file mode 100644 index 0000000..8ae215f --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/FleetCarrier.cs @@ -0,0 +1,63 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class FleetCarrier + { + [JsonPropertyName("FLEETCARRIER_EXPORT_TOTAL")] + public int ExportTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_IMPORT_TOTAL")] + public int ImportTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_TRADEPROFIT_TOTAL")] + public long TradeprofitTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_TRADESPEND_TOTAL")] + public long TradespendTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_STOLENPROFIT_TOTAL")] + public int StolenprofitTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_STOLENSPEND_TOTAL")] + public int StolenspendTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_DISTANCE_TRAVELLED")] + [JsonConverter(typeof(FleetCarrierTravelConverter))] + public float DistanceTravelled { get; init; } + + [JsonPropertyName("FLEETCARRIER_TOTAL_JUMPS")] + public int TotalJumps { get; init; } + + [JsonPropertyName("FLEETCARRIER_SHIPYARD_SOLD")] + public int ShipyardSold { get; init; } + + [JsonPropertyName("FLEETCARRIER_SHIPYARD_PROFIT")] + public long ShipyardProfit { get; init; } + + [JsonPropertyName("FLEETCARRIER_OUTFITTING_SOLD")] + public int OutfittingSold { get; init; } + + [JsonPropertyName("FLEETCARRIER_OUTFITTING_PROFIT")] + public long OutfittingProfit { get; init; } + + [JsonPropertyName("FLEETCARRIER_REARM_TOTAL")] + public int RearmTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_REFUEL_TOTAL")] + public int RefuelTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_REFUEL_PROFIT")] + public long RefuelProfit { get; init; } + + [JsonPropertyName("FLEETCARRIER_REPAIRS_TOTAL")] + public int RepairsTotal { get; init; } + + [JsonPropertyName("FLEETCARRIER_VOUCHERS_REDEEMED")] + public int VouchersRedeemed { get; init; } + + [JsonPropertyName("FLEETCARRIER_VOUCHERS_PROFIT")] + public long VouchersProfit { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/FuelCapacity.cs b/ObservatoryFramework/Files/ParameterTypes/FuelCapacity.cs new file mode 100644 index 0000000..0a80223 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/FuelCapacity.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class FuelCapacity + { + public double Main { get; init; } + + public double Reserve { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/FuelType.cs b/ObservatoryFramework/Files/ParameterTypes/FuelType.cs new file mode 100644 index 0000000..9512670 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/FuelType.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class FuelType + { + public double FuelMain { get; init; } + public double FuelReservoir { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Influence.cs b/ObservatoryFramework/Files/ParameterTypes/Influence.cs new file mode 100644 index 0000000..31d1564 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Influence.cs @@ -0,0 +1,14 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class InfluenceType + { + public ulong SystemAddress { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public TrendValue Trend { get; init; } + [JsonConverter(typeof(RepInfConverter))] + public int Influence { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Item.cs b/ObservatoryFramework/Files/ParameterTypes/Item.cs new file mode 100644 index 0000000..0f76b4a --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Item.cs @@ -0,0 +1,12 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Item + { + public string Slot { get; init; } + public string Name { get; init; } + public bool Hot { get; init; } + public string EngineerModifications { get; init; } + public int Level { get; init; } + public float Quality { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/ItemName.cs b/ObservatoryFramework/Files/ParameterTypes/ItemName.cs new file mode 100644 index 0000000..8f2d16c --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/ItemName.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class ItemName + { + public string Name { get; init; } + public string Name_Localised { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Killer.cs b/ObservatoryFramework/Files/ParameterTypes/Killer.cs new file mode 100644 index 0000000..78483b1 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Killer.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Killer + { + public string Name { get; init; } + public string Ship { get; init; } + public string Rank { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/LandingPads.cs b/ObservatoryFramework/Files/ParameterTypes/LandingPads.cs new file mode 100644 index 0000000..4bab8de --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/LandingPads.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class LandingPads + { + int Small { get; init; } + int Medium { get; init; } + int Large { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/MarketItem.cs b/ObservatoryFramework/Files/ParameterTypes/MarketItem.cs new file mode 100644 index 0000000..245f709 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/MarketItem.cs @@ -0,0 +1,20 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class MarketItem + { + public long id { get; init; } + public string Name { get; init; } + public string Name_Localised { get; init; } + public string Category { get; init; } + public string Category_Localised { get; init; } + public int BuyPrice { get; init; } + public int SellPrice { get; init; } + public int StockBracket { get; init; } + public int DemandBracket { get; init; } + public int Stock { get; init; } + public int Demand { get; init; } + public bool Consumer { get; init; } + public bool Producer { get; init; } + public bool Rare { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Material.cs b/ObservatoryFramework/Files/ParameterTypes/Material.cs new file mode 100644 index 0000000..c8308c9 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Material.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Material + { + public string Name { get; init; } + + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/MaterialComposition.cs b/ObservatoryFramework/Files/ParameterTypes/MaterialComposition.cs new file mode 100644 index 0000000..f089128 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/MaterialComposition.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class MaterialComposition + { + public string Name { get; init; } + public float Percent { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/MaterialReward.cs b/ObservatoryFramework/Files/ParameterTypes/MaterialReward.cs new file mode 100644 index 0000000..0713e76 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/MaterialReward.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class MaterialReward + { + public string Name { get; init; } + public string Localised_Name { get; init; } + public string Category { get; init; } + public string Category_Localised { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/MaterialTrader.cs b/ObservatoryFramework/Files/ParameterTypes/MaterialTrader.cs new file mode 100644 index 0000000..8186c75 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/MaterialTrader.cs @@ -0,0 +1,42 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class MaterialTrader + { + [JsonPropertyName("Trades_Completed")] + public int TradesCompleted { get; init; } + + [JsonPropertyName("Materials_Traded")] + public int MaterialsTraded { get; init; } + + [JsonPropertyName("Encoded_Materials_Traded")] + public int EncodedMaterialsTraded { get; init; } + + [JsonPropertyName("Raw_Materials_Traded")] + public int RawMaterialsTraded { get; init; } + + public int DataMaterialsTraded + { + get + { + return MaterialsTraded - EncodedMaterialsTraded - RawMaterialsTraded; + } + } + + [JsonPropertyName("Grade_1_Materials_Traded")] + public int Grade1MaterialsTraded { get; init; } + + [JsonPropertyName("Grade_2_Materials_Traded")] + public int Grade2MaterialsTraded { get; init; } + + [JsonPropertyName("Grade_3_Materials_Traded")] + public int Grade3MaterialsTraded { get; init; } + + [JsonPropertyName("Grade_4_Materials_Traded")] + public int Grade4MaterialsTraded { get; init; } + + [JsonPropertyName("Grade_5_Materials_Traded")] + public int Grade5MaterialsTraded { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/MicroResource.cs b/ObservatoryFramework/Files/ParameterTypes/MicroResource.cs new file mode 100644 index 0000000..64a80e9 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/MicroResource.cs @@ -0,0 +1,13 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class MicroResource + { + public string Name { get; init; } + public string Name_Localised { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public MicroCategory Category { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/MicroTransfer.cs b/ObservatoryFramework/Files/ParameterTypes/MicroTransfer.cs new file mode 100644 index 0000000..7cf63f0 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/MicroTransfer.cs @@ -0,0 +1,10 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class MicroTransfer : MicroResource + { + [JsonConverter(typeof(JsonStringEnumConverter))] + public MicroTransferDirection Direction { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Mining.cs b/ObservatoryFramework/Files/ParameterTypes/Mining.cs new file mode 100644 index 0000000..33f23e2 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Mining.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Mining + { + [JsonPropertyName("Mining_Profits")] + public long MiningProfits { get; init; } + + [JsonPropertyName("Quantity_Mined")] + public long QuantityMined { get; init; } + + [JsonPropertyName("Materials_Collected")] + public long MaterialsCollected { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Mission.cs b/ObservatoryFramework/Files/ParameterTypes/Mission.cs new file mode 100644 index 0000000..221d02a --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Mission.cs @@ -0,0 +1,13 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Mission + { + public long MissionID { get; init; } + + public string Name { get; init; } + + public bool PassengerMission { get; init; } + + public int Expires { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Modifier.cs b/ObservatoryFramework/Files/ParameterTypes/Modifier.cs new file mode 100644 index 0000000..c0f2817 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Modifier.cs @@ -0,0 +1,15 @@ +using Observatory.Framework.Files.Converters; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Modifier + { + public string Label { get; init; } + public float Value { get; init; } + public float OriginalValue { get; init; } + [JsonConverter(typeof(IntBoolConverter))] + public bool LessIsGood { get; init; } + public string ValueStr { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Modifiers.cs b/ObservatoryFramework/Files/ParameterTypes/Modifiers.cs new file mode 100644 index 0000000..80cf827 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Modifiers.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Modifiers + { + public string Label { get; init; } + + public double Value { get; init; } + + public double OriginalValue { get; init; } + + [JsonConverter(typeof(Converters.IntBoolConverter))] + public bool LessIsGood { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Module.cs b/ObservatoryFramework/Files/ParameterTypes/Module.cs new file mode 100644 index 0000000..8a39814 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Module.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Module + { + public string Slot { get; init; } + public string Item { get; init; } + public double? Power { get; init; } + public int? Priority { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Modules.cs b/ObservatoryFramework/Files/ParameterTypes/Modules.cs new file mode 100644 index 0000000..fb8922e --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Modules.cs @@ -0,0 +1,23 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Modules + { + public string Slot { get; init; } + + public string Item { get; init; } + + public bool On { get; init; } + + public int Priority { get; init; } + + public double Health { get; init; } + + public double? Value { get; init; } + + public int? AmmoInClip { get; init; } + + public int? AmmoInHopper { get; init; } + + public Engineering Engineering { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Multicrew.cs b/ObservatoryFramework/Files/ParameterTypes/Multicrew.cs new file mode 100644 index 0000000..dbfa030 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Multicrew.cs @@ -0,0 +1,22 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Multicrew + { + [JsonPropertyName("Multicrew_Time_Total")] + public long TimeTotal { get; init; } + + [JsonPropertyName("Multicrew_Gunner_Time_Total")] + public long GunnerTimeTotal { get; init; } + + [JsonPropertyName("Multicrew_Fighter_Time_Total")] + public long FighterTimeTotal { get; init; } + + [JsonPropertyName("Multicrew_Credits_Total")] + public long CreditsTotal { get; init; } + + [JsonPropertyName("Multicrew_Fines_Total")] + public long FinesTotal { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/OutfittingModule.cs b/ObservatoryFramework/Files/ParameterTypes/OutfittingModule.cs new file mode 100644 index 0000000..0692130 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/OutfittingModule.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class OutfittingModule + { + public int id { get; init; } + public string Name { get; init; } + public int BuyPrice { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Parent.cs b/ObservatoryFramework/Files/ParameterTypes/Parent.cs new file mode 100644 index 0000000..9951dcb --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Parent.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Parent + { + public int? Null { get; init; } + public int? Planet { get; init; } + public int? Star { get; init; } + } + +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Passenger.cs b/ObservatoryFramework/Files/ParameterTypes/Passenger.cs new file mode 100644 index 0000000..d9d9a28 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Passenger.cs @@ -0,0 +1,15 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Passenger + { + public long MissionID { get; init; } + + public string Type { get; init; } + + public bool VIP { get; init; } + + public bool Wanted { get; init; } + + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Passengers.cs b/ObservatoryFramework/Files/ParameterTypes/Passengers.cs new file mode 100644 index 0000000..cfc1aa8 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Passengers.cs @@ -0,0 +1,25 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Passengers + { + [JsonPropertyName("Passengers_Missions_Accepted")] + public int MissionsAccepted { get; init; } + + [JsonPropertyName("Passengers_Missions_Disgruntled")] + public int MissionsDisgruntled { get; init; } + + [JsonPropertyName("Passengers_Missions_Bulk")] + public int MissionsBulk { get; init; } + + [JsonPropertyName("Passengers_Missions_VIP")] + public int MissionsVIP { get; init; } + + [JsonPropertyName("Passnegers_Missions_Delivered")] + public int MissionsDelivered { get; init; } + + [JsonPropertyName("Passengers_Missions_Ejected")] + public int MissionsEjected { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/ProspectMaterial.cs b/ObservatoryFramework/Files/ParameterTypes/ProspectMaterial.cs new file mode 100644 index 0000000..c9a4849 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/ProspectMaterial.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class ProspectMaterial + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public float Proportion { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Rewards.cs b/ObservatoryFramework/Files/ParameterTypes/Rewards.cs new file mode 100644 index 0000000..92a1372 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Rewards.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Rewards + { + public string Faction { get; init; } + public long Reward { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Ring.cs b/ObservatoryFramework/Files/ParameterTypes/Ring.cs new file mode 100644 index 0000000..0597a85 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Ring.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Ring + { + public string Name { get; init; } + public string RingClass { get; init; } + public float MassMT { get; init; } + public float InnerRad { get; init; } + public float OuterRad { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Route.cs b/ObservatoryFramework/Files/ParameterTypes/Route.cs new file mode 100644 index 0000000..10c889a --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Route.cs @@ -0,0 +1,14 @@ +using Observatory.Framework.Files.Converters; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Route + { + public string StarSystem { get; init; } + public ulong SystemAddress { get; init; } + [JsonConverter(typeof(StarPosConverter))] + public (double x, double y, double z) StarPos { get; init; } + public string StarClass { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/SearchAndRescue.cs b/ObservatoryFramework/Files/ParameterTypes/SearchAndRescue.cs new file mode 100644 index 0000000..a3e27e4 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/SearchAndRescue.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class SearchAndRescue + { + [JsonPropertyName("SearchRescue_Traded")] + public int Traded { get; init; } + + [JsonPropertyName("SearchRescue_Profit")] + public long Profit { get; init; } + + [JsonPropertyName("SearchRescue_Count")] + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/ShipyardPrice.cs b/ObservatoryFramework/Files/ParameterTypes/ShipyardPrice.cs new file mode 100644 index 0000000..821f310 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/ShipyardPrice.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class ShipyardPrice + { + public int id { get; init; } + public string ShipType { get; init; } + public string ShipType_Localised { get; init; } + public int ShipPrice { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Signal.cs b/ObservatoryFramework/Files/ParameterTypes/Signal.cs new file mode 100644 index 0000000..7f568d8 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Signal.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Signal + { + public string Type { get; init; } + public string Type_Localised { get; init; } + public int Count { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Smuggling.cs b/ObservatoryFramework/Files/ParameterTypes/Smuggling.cs new file mode 100644 index 0000000..d5d1eba --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Smuggling.cs @@ -0,0 +1,22 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Smuggling + { + [JsonPropertyName("Black_Markets_Traded_With")] + public int BlackMarketsTradedWith { get; init; } + + [JsonPropertyName("Black_Markets_Profits")] + public long BlackMarketsProfits { get; init; } + + [JsonPropertyName("Resources_Smuggled")] + public int ResourcesSmuggled { get; init; } + + [JsonPropertyName("Average_Profit")] + public decimal AverageProfit { get; init; } + + [JsonPropertyName("Highest_Single_Transaction")] + public long HighestSingleTransaction { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/StationEconomy.cs b/ObservatoryFramework/Files/ParameterTypes/StationEconomy.cs new file mode 100644 index 0000000..dfeed91 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/StationEconomy.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class StationEconomy + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public float Proportion { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/StoredItem.cs b/ObservatoryFramework/Files/ParameterTypes/StoredItem.cs new file mode 100644 index 0000000..010844f --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/StoredItem.cs @@ -0,0 +1,18 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class StoredItem + { + public string Name { get; init; } + public string Name_Localised { get; init; } + public string StarSystem { get; init; } + public long MarketID { get; init; } + public int StorageSlot { get; init; } + public long TransferCost { get; init; } + public long TransferTime { get; init; } + public bool Hot { get; init; } + public string EngineerModifications { get; init; } + public int Level { get; init; } + public float Quality { get; init; } + public bool InTransit { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/StoredShip.cs b/ObservatoryFramework/Files/ParameterTypes/StoredShip.cs new file mode 100644 index 0000000..fff1e7a --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/StoredShip.cs @@ -0,0 +1,16 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class StoredShip + { + public ulong ShipID { get; init; } + public string ShipType { get; init; } + public string Name { get; init; } + public long Value { get; init; } + public bool Hot { get; init; } + public bool InTransit { get; init; } + public string StarSystem { get; init; } + public long ShipMarketID { get; init; } + public long TransferPrice { get; init; } + public long TransferTime { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/SuitModule.cs b/ObservatoryFramework/Files/ParameterTypes/SuitModule.cs new file mode 100644 index 0000000..0a87802 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/SuitModule.cs @@ -0,0 +1,13 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class SuitModule + { + public string SlotName { get; init; } + public string ModuleName { get; init; } + public ulong SuitModuleID { get; init; } + public int Class { get; init; } + public ImmutableList WeaponMods { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/SystemFaction.cs b/ObservatoryFramework/Files/ParameterTypes/SystemFaction.cs new file mode 100644 index 0000000..11a2819 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/SystemFaction.cs @@ -0,0 +1,29 @@ +using System.Collections.Immutable; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class SystemFaction : Faction + { + public string Government { get; init; } + + public double Influence { get; init; } + + public string Happiness { get; init; } + + public string Happiness_Localised { get; init; } + + public double MyReputation { get; init; } + + public ImmutableList PendingStates { get; init; } + + public ImmutableList RecoveringStates { get; init; } + + public ImmutableList ActiveStates { get; init; } + + public bool? SquadronFaction { get; init; } + + public bool? HappiestSystem { get; init; } + + public bool? HomeSystem { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Thargoid.cs b/ObservatoryFramework/Files/ParameterTypes/Thargoid.cs new file mode 100644 index 0000000..1cb7806 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Thargoid.cs @@ -0,0 +1,25 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Thargoid + { + [JsonPropertyName("TG_ENCOUNTER_WAKES")] + public int EncounterWakes { get; init; } + + [JsonPropertyName("TG_ENCOUNTER_TOTAL")] + public int EncounterTotal { get; init; } + + [JsonPropertyName("TG_ENCOUNTER_TOTAL_LAST_SYSTEM")] + public string LastSystem { get; init; } + + [JsonPropertyName("TG_ENCOUNTER_TOTAL_LAST_TIMESTAMP")] + public string LastTimestamp { get; init; } + + [JsonPropertyName("TG_ENCOUNTER_TOTAL_LAST_SHIP")] + public string LastShip { get; init; } + + [JsonPropertyName("TG_SCOUT_COUNT")] + public int ScoutCount { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/TopTier.cs b/ObservatoryFramework/Files/ParameterTypes/TopTier.cs new file mode 100644 index 0000000..923d60b --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/TopTier.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class TopTier + { + public string Name { get; init; } + public string Bonus { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/TradeDetail.cs b/ObservatoryFramework/Files/ParameterTypes/TradeDetail.cs new file mode 100644 index 0000000..ab1b546 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/TradeDetail.cs @@ -0,0 +1,10 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class TradeDetail + { + public string Material { get; init; } + public string Material_Localised { get; init; } + public string Category { get; init; } + public int Quantity { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Trading.cs b/ObservatoryFramework/Files/ParameterTypes/Trading.cs new file mode 100644 index 0000000..f15d5ef --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Trading.cs @@ -0,0 +1,22 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Trading + { + [JsonPropertyName("Markets_Traded_With")] + public int MarketsTradedWith { get; init; } + + [JsonPropertyName("Market_Profits")] + public long MarketProfits { get; init; } + + [JsonPropertyName("Resources_Traded")] + public int ResourcesTraded { get; init; } + + [JsonPropertyName("Average_Profit")] + public decimal AverageProfit { get; init; } + + [JsonPropertyName("Highest_Single_Transaction")] + public long HighestSingleTransaction { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/VoucherFaction.cs b/ObservatoryFramework/Files/ParameterTypes/VoucherFaction.cs new file mode 100644 index 0000000..8c223e9 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/VoucherFaction.cs @@ -0,0 +1,8 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class VoucherFaction + { + public string Faction { get; init; } + public int Amount { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/WarFaction.cs b/ObservatoryFramework/Files/ParameterTypes/WarFaction.cs new file mode 100644 index 0000000..e9a22fb --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/WarFaction.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.ParameterTypes +{ + public class WarFaction + { + public string Name { get; init; } + + public string Stake { get; init; } + + public int WonDays { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ShipyardFile.cs b/ObservatoryFramework/Files/ShipyardFile.cs new file mode 100644 index 0000000..313c156 --- /dev/null +++ b/ObservatoryFramework/Files/ShipyardFile.cs @@ -0,0 +1,15 @@ +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; + +namespace Observatory.Framework.Files +{ + public class ShipyardFile : Journal.JournalBase + { + public long MarketID { get; init; } + public string StationName { get; init; } + public string StarSystem { get; init; } + public bool Horizons { get; init; } + public bool AllowCobraMkIV { get; init; } + public ImmutableList PriceList { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Status.cs b/ObservatoryFramework/Files/Status.cs new file mode 100644 index 0000000..ad86366 --- /dev/null +++ b/ObservatoryFramework/Files/Status.cs @@ -0,0 +1,33 @@ +using System.Text.Json.Serialization; +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; + +namespace Observatory.Framework.Files +{ + public class Status : Journal.JournalBase + { + public StatusFlags Flags { get; init; } + public StatusFlags2 Flags2 { get; init; } + [JsonConverter(typeof(PipConverter))] + public (int Sys, int Eng, int Wep) Pips { get; init; } + public int Firegroup { get; init; } + public FocusStatus GuiFocus { get; init; } + public FuelType Fuel { get; init; } + public float Cargo { get; init; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public LegalStatus LegalState { get; init; } + public int Altitude { get; init; } + public double Latitude { get; init; } + public double Longitude { get; init; } + public int Heading { get; init; } + public string BodyName { get; init; } + public double PlanetRadius { get; init; } + public float Oxygen { get; init; } + public float Health { get; init; } + public float Temperature { get; init; } + public string SelectedWeapon { get; init; } + public float Gravity { get; init; } + public long Balance { get; init; } + public Destination Destination { get; init; } + } +} diff --git a/ObservatoryFramework/Interfaces.cs b/ObservatoryFramework/Interfaces.cs new file mode 100644 index 0000000..08b31ce --- /dev/null +++ b/ObservatoryFramework/Interfaces.cs @@ -0,0 +1,173 @@ +using System; +using Observatory.Framework.Files; +using Observatory.Framework.Files.Journal; + +namespace Observatory.Framework.Interfaces +{ + /// + /// Base plugin interface containing methods common to both notifiers and workers. + /// Note: Not intended to be implemented on its own and will not define a functional plugin. Use IObservatoryWorker, IObservatoryNotifier, or both, as appropriate. + /// + public interface IObservatoryPlugin + { + /// + /// This method will be called on startup by Observatory Core when a plugin is first loaded. + /// Passes the Core interface to the plugin. + /// + /// Object implementing Observatory Core's main interface. A reference to this object should be maintained by the plugin for communication back to Core. + public void Load(IObservatoryCore observatoryCore); + + /// + /// Full name of the plugin. Displayed in the Core settings tab's plugin list. + /// + public string Name { get; } + + /// + /// Short name of the plugin. Used as the tab title for the plugin UI.
+ /// Can be omitted, in which case the full Name will be used. + /// + public string ShortName { get => Name; } + + /// + /// Version string displayed in the Core settings tab's plugin list.
+ /// Potentially used for automated version checking. (Not yet implemented) + /// + public string Version { get; } + + /// + /// Reference to plugin UI to display within its tab. + /// + public PluginUI PluginUI { get; } + + /// + /// Accessors for plugin settings object. Should be initialized in a default state. + /// Saving and loading of settings is handled by Observatory Core, and any previously saved settings will be set after plugin instantiation, but before Load() is called. + /// A plugin's settings class is expected to consist of properties with public getters and setters. The settings UI will be automatically generated based on each property type.
+ /// The [SettingDisplayName(string name)] attribute can be used to specify a display name, otherwise the name of the property will be used.
+ /// Private or internal properties and methods are ignored and can be used for backing values or any other purpose.
+ /// If a public property is necessary but not required to be user accessible the [SettingIgnore] property will suppress display. + /// + public object Settings { get; set; } + + } + + /// + /// Interface for worker plugins which process journal data to update their UI or send notifications. + /// Work required on plugin startup — for example object instantiation — can be done in the constructor or Load() method.
+ /// Be aware that saved settings will not be available until Load() is called. + /// + public interface IObservatoryWorker : IObservatoryPlugin + { + /// + /// Method called when new journal data is processed. Most work done by worker plugins will occur here. + /// + /// Specific type of journal entry being received. + /// Elite Dangerous journal event, deserialized into a .NET object. + /// Unhandled json values within a journal entry type will be contained in member property:
Dictionary<string, object> AdditionalProperties. + /// Unhandled journal event types will be type JournalBase with all values contained in AdditionalProperties. + public void JournalEvent(TJournal journal) where TJournal : JournalBase; + + /// + /// Method called when status.json content is updated.
+ /// Can be omitted for plugins which do not use this data. + /// + /// Player status.json content, deserialized into a .NET object. + public void StatusChange(Status status) + { } + + /// + /// Method called when the user begins "Read All" journal processing, before any journal events are sent.
+ /// Used to track if a "Read All" operation is in progress or not to avoid unnecessary processing or notifications.
+ /// Can be omitted for plugins which do not require the distinction. + /// + public void ReadAllStarted() + { } + + /// + /// Method called when "Read All" journal processing completes.
+ /// Used to track if a "Read All" operation is in progress or not to avoid unnecessary processing or notifications.
+ /// Can be omitted for plugins which do not require the distinction. + /// + public void ReadAllFinished() + { } + } + + /// + /// Interface for notifier plugins which receive notification events from other plugins for any purpose. + /// Work required on plugin startup — for example object instantiation — can be done in the constructor or Load() method.
+ /// Be aware that saved settings will not be available until Load() is called. + /// + public interface IObservatoryNotifier : IObservatoryPlugin + { + /// + /// Method called when other plugins send notification events to Observatory Core. + /// + /// Details of the notification as sent from the originating worker plugin. + public void OnNotificationEvent(NotificationArgs notificationEventArgs); + } + + /// + /// Interface passed by Observatory Core to plugins. Primarily used for sending notifications and UI updates back to Core. + /// + public interface IObservatoryCore + { + /// + /// Send a notification out to all native notifiers and any plugins implementing IObservatoryNotifier. + /// + /// Title text for notification. + /// Detail/body text for notificaiton. + /// Guid associated with the notification during its lifetime. Used as an argument with CancelNotification and UpdateNotification. + public Guid SendNotification(string title, string detail); + + /// + /// Send a notification with arguments out to all native notifiers and any plugins implementing IObservatoryNotifier. + /// + /// NotificationArgs object specifying notification content and behaviour. + /// Guid associated with the notification during its lifetime. Used as an argument with CancelNotification and UpdateNotification. + public Guid SendNotification(NotificationArgs notificationEventArgs); + + /// + /// Cancel or close an active notification. + /// + /// Guid of notification to be cancelled. + public void CancelNotification(Guid notificationId); + + /// + /// Update an active notification with a new set of NotificationsArgs. Timeout values are reset and begin counting again from zero if specified. + /// + /// Guid of notification to be updated. + /// NotificationArgs object specifying updated notification content and behaviour. + public void UpdateNotification(Guid notificationId, NotificationArgs notificationEventArgs); + + /// + /// Add an item to the bottom of the basic UI grid. + /// + /// Reference to the calling plugin's worker interface. + /// Grid item to be added. Object type should match original template item used to create the grid. + public void AddGridItem(IObservatoryWorker worker, object item); + + /// + /// Clears basic UI grid, removing all items. + /// + /// Reference to the calling plugin's worker interface. + /// Template item used to re-initialise the grid. + public void ClearGrid(IObservatoryWorker worker, object templateItem); + + /// + /// Requests current Elite Dangerous status.json content. + /// + /// Status object reflecting current Elite Dangerous player status. + public Status GetStatus(); + + /// + /// Version string of Observatory Core. + /// + public string Version { get; } + + /// + /// Perform an action on the current Avalonia UI thread. + /// + /// + public void ExecuteOnUIThread(Action action); + } +} diff --git a/ObservatoryFramework/ObservatoryFramework.csproj b/ObservatoryFramework/ObservatoryFramework.csproj new file mode 100644 index 0000000..156f9ea --- /dev/null +++ b/ObservatoryFramework/ObservatoryFramework.csproj @@ -0,0 +1,20 @@ + + + + net5.0 + Observatory.Framework + + + + 0.1.$([System.DateTime]::UtcNow.DayOfYear.ToString()).$([System.DateTime]::UtcNow.ToString(HHmm)) + 0.0.0.1 + $(VersionSuffix) + 0.0.1.0 + $(VersionSuffix) + + + + ObservatoryFramework.xml + + + diff --git a/ObservatoryFramework/ObservatoryFramework.sln b/ObservatoryFramework/ObservatoryFramework.sln new file mode 100644 index 0000000..d17277b --- /dev/null +++ b/ObservatoryFramework/ObservatoryFramework.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31205.134 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservatoryFramework", "ObservatoryFramework.csproj", "{27ABA3B7-AB3C-465F-BA40-4F06BD803811}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {27ABA3B7-AB3C-465F-BA40-4F06BD803811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27ABA3B7-AB3C-465F-BA40-4F06BD803811}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27ABA3B7-AB3C-465F-BA40-4F06BD803811}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27ABA3B7-AB3C-465F-BA40-4F06BD803811}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A448965F-9149-43AB-8091-3F042B1D18E4} + EndGlobalSection +EndGlobal diff --git a/ObservatoryFramework/ObservatoryFramework.xml b/ObservatoryFramework/ObservatoryFramework.xml new file mode 100644 index 0000000..b9a810a --- /dev/null +++ b/ObservatoryFramework/ObservatoryFramework.xml @@ -0,0 +1,483 @@ + + + + ObservatoryFramework + + + + + Provides data for Elite Dangerous journal events. + + + + + Type of journal entry that triggered event. + Will be a class from the Observatory.Framework.Files.Journal namespace derived from JournalBase, or JournalBase itself in the case of an unhandled journal event type. + + + + + Elite Dangerous journal event, deserialized into a .NET object of the type specified by JournalEventArgs.journalType. + Unhandled json values within a journal entry type will be contained in member property:
Dictionary<string, object> AdditionalProperties. + + + + + Provides values used as arguments for Observatory notification events. + + + + + Text typically displayed as header content. + + + + + SSML representation of Title text.
+ This value is optional, if omitted the value of NotificationArgs.Title will be used for voice synthesis without markup. + + + + + Text typically displayed as body content. + + + + + SSML representation of Detail text.
+ This value is optional, if omitted the value of NotificationArgs.Detail will be used for voice synthesis without markup. + + + + + Specify window timeout in ms (overrides Core setting). Specify 0 timeout to persist until removed via IObservatoryCore.CancelNotification. Default -1 (use Core setting). + + + + + Specify window X position as a percentage from upper left corner (overrides Core setting). Default -1.0 (use Core setting). + + + + + Specify window Y position as a percentage from upper left corner (overrides Core setting). Default -1.0 (use Core setting). + + + + + This property is indicated with strikethrough in Frontier's documentation and may be deprecated. + + + + + This property is indicated with strikethrough in Frontier's documentation and may be deprecated. + + + + + Journal "Scan" event generated when directly FSS scanning, from automatic proximity scans, or nav beacon data. + + + + + Type of scan which generated the event. Possible options include "Detailed", "AutoScan", and "NavBeaconDetail" (non-exhaustive). + + + + + Name of scanned body. + + + + + List which reflects Frontier's JSON structure for the "Parents" object. Use of Parent property is recommended instead. + + + + + "Parents" object rearranged into more intuitive structure for ease of use. + + + + + Body distance from system arrival point in light-seconds. + + + + + Indicates if body is tidally locked to another body (parent, child, or binary partner). + + + + + Whether the planet can be or has been terraformed. Options include "Terraformable", "Terraformed", or "" (non-terraformable or naturally earth-like). + + + + + Class of planet. Consult your preferred source of journal documentation for all possible values. + + + + + Descriptive string for body atmosphere, e.g. "hot thick sulfur dioxide atmosphere". + + + + + Simple string indicating dominant atmosphere type, e.g. "SulfurDioxide". + + + + + List containing full breakdown of atmospheric components and their relative percentages. + + + + + Descriptive string for type of volcanism present, or an empty string for none, e.g. "major silicate vapour geysers volcanism". + + + + + Mass of body in multiples of Earth's mass (5.972e24 kg). + + + + + Radius of body in metres. + + + + + Surface gravity in m/s². + + + + + Average surface temperature in Kelvin. + + + + + Average surface pressure in Pascals. + + + + + Whether the body in landable in the player's current version of Elite Dangerous. + + + + + List containing full breakdown of prospectable surface materials and their relative percentages. + + + + + Overall composition of body, expressed as percentages of ice, rock, and metal. + + + + + Rotation period of body in seconds. + + + + + Axial tilt of body in radians. + + + + + List of all planetary or stellar ring systems around the body. + + + + + Description of the minable material abundance.
Possible values inclue "PristineResources", "MajorResources", "CommonResources", "LowResources", and "DepletedResources". + + + + + Type of star. Consult your preferred source of journal documentation for all possible values. + + + + + Subclass of star. Consult your preferred source of journal documentation for all possible values. + + + + + Mass of star in multiples of The Sun's mass (1.989e30 kg). + + + + + Absolute magnitude of star. + + + + + Age of body in millions of years. + + + + + Yerkes luminosity class of star. + + + + + Whether the body has been previously discovered by a player. + + + + + Whether the body has been previously mapped by a player. + + + + + Barycentre orbital properties, automatically recorded when any member of a multiple-body orbital arrangement is first scanned. + + + + + Name of star system containing scanned body. + + + + + 64-bit unique identifier for the current star system. Also known as the system's "ID64". + + + + + Id number of body within a system. + + + + + Orbital semi-major axis in metres.
Distance from the body's centre of gravity to the parent's centre of gravity at the most distant point in the orbit. + + + + + Orbital eccentricity.
0: perfectly circular, 0 > x > 1: eccentric, 1: parabolic (escape) trajectory.
(You should not ever see 1 or 0.) + + + + + Orbital inclination in degrees. + + + + + Argument of periapsis in degrees. + + + + + Orbital period in seconds. + + + + + Longitude of the ascending node in degrees. + + + + + Mean anomaly in degrees. + + + + + Faction changed from a simple string to an object with additional state information. If we find a string convert it to an object with null state. + + + + + The format used for materials changed from an object with a key for each material to an array of objects containing "name" and "percent". + Need to handle both if we're going to read historical data. This reads the old format into a class reflecting the new structure. + + + + + The format used for materials changed from an object with a key for each material to an array of objects containing "name" and "percent". + Need to handle both if we're going to read historical data. This reads the old format into a class reflecting the new structure. + + + + + Converting the ordered array of coordinates from the journal to a named tuple for clarity. + + + + + Altitude above average radius (sea level) when set. Altitude raycast to ground when unset. + + + + + Base plugin interface containing methods common to both notifiers and workers. + Note: Not intended to be implemented on its own and will not define a functional plugin. Use IObservatoryWorker, IObservatoryNotifier, or both, as appropriate. + + + + + This method will be called on startup by Observatory Core when a plugin is first loaded. + Passes the Core interface to the plugin. + + Object implementing Observatory Core's main interface. A reference to this object should be maintained by the plugin for communication back to Core. + + + + Full name of the plugin. Displayed in the Core settings tab's plugin list. + + + + + Short name of the plugin. Used as the tab title for the plugin UI.
+ Can be omitted, in which case the full Name will be used. + + + + + Version string displayed in the Core settings tab's plugin list.
+ Potentially used for automated version checking. (Not yet implemented) + + + + + Reference to plugin UI to display within its tab. + + + + + Accessors for plugin settings object. Should be initialized in a default state. + Saving and loading of settings is handled by Observatory Core, and any previously saved settings will be set after plugin instantiation, but before Load() is called. + A plugin's settings class is expected to consist of properties with public getters and setters. The settings UI will be automatically generated based on each property type.
+ The [SettingDisplayName(string name)] attribute can be used to specify a display name, otherwise the name of the property will be used.
+ Private or internal properties and methods are ignored and can be used for backing values or any other purpose.
+ If a public property is necessary but not required to be user accessible the [SettingIgnore] property will suppress display. + + + + + Interface for worker plugins which process journal data to update their UI or send notifications. + Work required on plugin startup — for example object instantiation — can be done in the constructor or Load() method.
+ Be aware that saved settings will not be available until Load() is called. + + + + + Method called when new journal data is processed. Most work done by worker plugins will occur here. + + Specific type of journal entry being received. + Elite Dangerous journal event, deserialized into a .NET object. + Unhandled json values within a journal entry type will be contained in member property:
Dictionary<string, object> AdditionalProperties. + Unhandled journal event types will be type JournalBase with all values contained in AdditionalProperties. + + + + Method called when status.json content is updated.
+ Can be omitted for plugins which do not use this data. + + Player status.json content, deserialized into a .NET object. + + + + Method called when the user begins "Read All" journal processing, before any journal events are sent.
+ Used to track if a "Read All" operation is in progress or not to avoid unnecessary processing or notifications.
+ Can be omitted for plugins which do not require the distinction. + + + + + Method called when "Read All" journal processing completes.
+ Used to track if a "Read All" operation is in progress or not to avoid unnecessary processing or notifications.
+ Can be omitted for plugins which do not require the distinction. + + + + + Interface for notifier plugins which receive notification events from other plugins for any purpose. + Work required on plugin startup — for example object instantiation — can be done in the constructor or Load() method.
+ Be aware that saved settings will not be available until Load() is called. + + + + + Method called when other plugins send notification events to Observatory Core. + + Details of the notification as sent from the originating worker plugin. + + + + Interface passed by Observatory Core to plugins. Primarily used for sending notifications and UI updates back to Core. + + + + + Send a notification out to all native notifiers and any plugins implementing IObservatoryNotifier. + + Title text for notification. + Detail/body text for notificaiton. + Guid associated with the notification during its lifetime. Used as an argument with CancelNotification and UpdateNotification. + + + + Send a notification with arguments out to all native notifiers and any plugins implementing IObservatoryNotifier. + + NotificationArgs object specifying notification content and behaviour. + Guid associated with the notification during its lifetime. Used as an argument with CancelNotification and UpdateNotification. + + + + Cancel or close an active notification. + + Guid of notification to be cancelled. + + + + Update an active notification with a new set of NotificationsArgs. Timeout values are reset and begin counting again from zero if specified. + + Guid of notification to be updated. + NotificationArgs object specifying updated notification content and behaviour. + + + + Add an item to the bottom of the basic UI grid. + + Reference to the calling plugin's worker interface. + Grid item to be added. Object type should match original template item used to create the grid. + + + + Clears basic UI grid, removing all items. + + Reference to the calling plugin's worker interface. + Template item used to re-initialise the grid. + + + + Requests current Elite Dangerous status.json content. + + Status object reflecting current Elite Dangerous player status. + + + + Version string of Observatory Core. + + + + + Perform an action on the current Avalonia UI thread. + + + + + diff --git a/ObservatoryFramework/PluginUI.cs b/ObservatoryFramework/PluginUI.cs new file mode 100644 index 0000000..97e3c5d --- /dev/null +++ b/ObservatoryFramework/PluginUI.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Observatory.Framework +{ + public class PluginUI + { + public readonly UIType PluginUIType; + public object UI; + public ObservableCollection DataGrid; + + public PluginUI(ObservableCollection DataGrid) + { + PluginUIType = UIType.Basic; + this.DataGrid = DataGrid; + } + + public PluginUI(UIType uiType, object UI) + { + PluginUIType = uiType; + this.UI = UI; + } + + public enum UIType + { + None = 0, + Basic = 1, + Avalonia = 2, + Core = 3 + } + } +}