Journals Now processed in own thread

Some invalid journal data is now handled
Journals now use polymorphic deserialization
Added Event names to all journal events
Remove unused controllers

ObservatoryFramework/Files/BackPackFile.cs

@@ -9,6 +9,7 @@ namespace Observatory.Framework.Files;
 /// </summary>
 public class BackpackFile : JournalBase
 {
+    public override string Event => "Backpack";
     /// <summary>
     /// List of all items carried.
     /// </summary>

ObservatoryFramework/Files/CargoFile.cs

@@ -9,6 +9,7 @@ namespace Observatory.Framework.Files;
 /// </summary>
 public class CargoFile : JournalBase
 {
+    public override string Event => "Cargo";
     /// <summary>
     /// Type of vehicle currently being reported. "Ship" or "SRV".
     /// </summary>

ObservatoryFramework/Files/FCMaterialsFile.cs

@@ -9,6 +9,7 @@ namespace Observatory.Framework.Files;
 /// </summary>
 public class FCMaterialsFile : JournalBase
 {
+    public override string Event => "FCMaterials";
     /// <summary>
     /// List of items in stock and in demand from the carrier bartender.
     /// </summary>

ObservatoryFramework/Files/Journal/Combat/Bounty.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Combat;
 
 public class Bounty : JournalBase
 {
+    public override string Event => "Bounty";
     public ImmutableList<Rewards> Rewards { get; init; }
     public string PilotName { get; set; }
     public string PilotName_Localised { get; set; }

ObservatoryFramework/Files/Journal/Combat/CapShipBond.cs

@@ -1,7 +1,8 @@
 namespace Observatory.Framework.Files.Journal.Combat;
 
-public class CapShipBound : JournalBase
+public class CapShipBond : JournalBase
 {
+    public override string Event => "CapShipBond";
     public long Reward { get; init; }
     public string AwardingFaction { get; init; }
     public string VictimFaction { get; init; }

ObservatoryFramework/Files/Journal/Combat/Died.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Combat;
 
 public class Died : JournalBase
 {
+    public override string Event => "Died";
     public string KillerName { get; init; }
     public string KillerName_Localised { get; init; }
     public string KillerShip { get; init; }

ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs

@@ -2,6 +2,7 @@
 
 public class EscapeInterdiction : JournalBase
 {
+    public override string Event => "EscapeInterdiction";
     public string Interdictor { get; init; }
     public bool IsPlayer { get; init; }
     public bool IsThargoid { get; init; }

ObservatoryFramework/Files/Journal/Combat/FactionKillBond.cs

@@ -2,6 +2,7 @@
 
 public class FactionKillBond : JournalBase
 {
+    public override string Event => "FactionKillBond";
     public long Reward { get; init; }
     public string AwardingFaction { get; init; }
     public string AwardingFaction_Localised { get; init; }

ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs

@@ -2,5 +2,6 @@
 
 public class FighterDestroyed : JournalBase
 {
+    public override string Event => "FighterDestroyed";
     public ulong ID { get; init; }
 }

ObservatoryFramework/Files/Journal/Combat/HeatDamage.cs

@@ -1,4 +1,6 @@
 namespace Observatory.Framework.Files.Journal.Combat;
 
 public class HeatDamage : JournalBase
-{ }
+{
+    public override string Event => "HeatDamage";
+}

ObservatoryFramework/Files/Journal/Combat/HeatWarning.cs

@@ -2,4 +2,5 @@
 
 public class HeatWarning : JournalBase
 {
+    public override string Event => "HeatWarning";
 }

ObservatoryFramework/Files/Journal/Combat/HullDamage.cs

@@ -2,6 +2,7 @@
 
 public class HullDamage : JournalBase
 {
+    public override string Event => "HullDamage";
     public float Health { get; init; }
     public bool PlayerPilot { get; init; }
     public bool Fighter { get; init; }

ObservatoryFramework/Files/Journal/Combat/Interdicted.cs

@@ -2,6 +2,7 @@
 
 public class Interdicted : JournalBase
 {
+    public override string Event => "Interdicted";
     public bool Submitted { get; init; }
     public string Interdictor { get; init; }
     public string Interdictor_Localised { get; init; }

ObservatoryFramework/Files/Journal/Combat/Interdiction.cs

@@ -2,6 +2,7 @@
 
 public class Interdiction : JournalBase
 {
+    public override string Event => "Interdiction";
     public bool Success { get; init; }
     public string Interdictor { get; init; }
     public bool IsPlayer { get; init; }

ObservatoryFramework/Files/Journal/Combat/PVPKill.cs

@@ -2,6 +2,7 @@
 
 public class PVPKill : JournalBase
 {
+    public override string Event => "PVPKill";
     public string Victim { get; init; }
     public int CombatRank { get; init; }
 }

ObservatoryFramework/Files/Journal/Combat/SRVDestroyed.cs

@@ -2,6 +2,7 @@
 
 public class SRVDestroyed : JournalBase
 {
+    public override string Event => "SRVDestroyed";
     public string SRVType { get; init; }
     public string SRVType_Localised { get; init; }
 }

ObservatoryFramework/Files/Journal/Combat/ShieldState.cs

@@ -2,5 +2,6 @@
 
 public class ShieldState : JournalBase
 {
+    public override string Event => "ShieldState";
     public bool ShieldsUp { get; init; }
 }

ObservatoryFramework/Files/Journal/Combat/ShipTargeted.cs

@@ -2,6 +2,7 @@
 
 public class ShipTargeted : JournalBase
 {
+    public override string Event => "ShipTargeted";
     public bool TargetLocked { get; init; }
     public string Ship { get; init; }
     public string Ship_Localised { get; init; }

ObservatoryFramework/Files/Journal/Combat/UnderAttack.cs

@@ -2,5 +2,6 @@
 
 public class UnderAttack : JournalBase
 {
+    public override string Event => "UnderAttack";
     public string Target { get; init; }
 }

ObservatoryFramework/Files/Journal/Exploration/BuyExplorationData.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class BuyExplorationData : JournalBase
 {
+    public override string Event => "BuyExplorationData";
     /// <summary>
     /// Name of the system for which data was purchased.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs

@@ -7,6 +7,7 @@ namespace Observatory.Framework.Files.Journal.Exploration;
 /// </summary>
 public class CodexEntry : JournalBase
 {
+    public override string Event => "CodexEntry";
     /// <summary>
     /// Unique ID of the entry.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/DiscoveryScan.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class DiscoveryScan : JournalBase
 {
+    public override string Event => "DiscoveryScan";
     /// <summary>
     /// Unique ID of system.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/FSSAllBodiesFound.cs

@@ -5,6 +5,8 @@
 /// </summary>
 public class FSSAllBodiesFound : JournalBase
 {
+    public override string Event => "FSSAllBodiesFound";
+
     /// <summary>
     /// Name of the system.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/FSSBodySignals.cs

@@ -5,4 +5,5 @@
 /// </summary>
 public class FSSBodySignals : SAASignalsFound
 {
+    public override string Event => "FSSBodySignals";
 }

ObservatoryFramework/Files/Journal/Exploration/FSSDiscoveryScan.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class FSSDiscoveryScan : JournalBase
 {
+    public override string Event => "FSSDiscoveryScan";
     /// <summary>
     /// Name of the current system.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class FSSSignalDiscovered : JournalBase
 {
+    public override string Event => "FSSSignalDiscovered";
     /// <summary>
     /// Name of the signal type.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/MaterialCollected.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class MaterialCollected : JournalBase
 {
+    public override string Event => "MaterialCollected";
     /// <summary>
     /// Category to which the material belongs.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/MaterialDiscarded.cs

@@ -5,4 +5,5 @@
 /// </summary>
 public class MaterialDiscarded : MaterialCollected
 {
+    public override string Event => "MaterialDiscarded";
 }

ObservatoryFramework/Files/Journal/Exploration/MaterialDiscovered.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class MaterialDiscovered : JournalBase
 {
+    public override string Event => "MaterialDiscovered";
     /// <summary>
     /// Category of the material.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs

@@ -8,6 +8,7 @@ namespace Observatory.Framework.Files.Journal.Exploration;
 /// </summary>
 public class MultiSellExplorationData : JournalBase
 {
+    public override string Event => "MultiSellExplorationData";
     /// <summary>
     /// List of all sold first discoveries.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/NavBeaconScan.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class NavBeaconScan : JournalBase
 {
+    public override string Event => "NavBeaconScan";
     /// <summary>
     /// Number of bodies in system.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs

@@ -7,6 +7,7 @@ namespace Observatory.Framework.Files.Journal.Exploration;
 /// </summary>
 public class SAAScanComplete : JournalBase
 {
+    public override string Event => "SAAScanComplete";
     /// <summary>
     /// Unique ID of current system.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs

@@ -8,6 +8,7 @@ namespace Observatory.Framework.Files.Journal.Exploration;
 /// </summary>
 public class SAASignalsFound : JournalBase
 {
+    public override string Event => "SAASignalsFound";
     /// <summary>
     /// Unique ID of current system.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/Scan.cs

@@ -10,6 +10,7 @@ namespace Observatory.Framework.Files.Journal.Exploration;
 /// </summary>
 public class Scan : ScanBaryCentre
 {
+    public override string Event => "Scan";
     /// <summary>
     /// Type of scan which generated the event. Possible options include "Detailed", "AutoScan", and "NavBeaconDetail" (non-exhaustive).
     /// </summary>
@@ -119,6 +120,7 @@ public class Scan : ScanBaryCentre
     /// <summary>
     /// Rotation period of body in seconds.
     /// </summary>
+    [JsonConverter(typeof(JournalInvalidFloatConverter))]
     public float RotationPeriod { get; init; }
     /// <summary>
     /// Axial tilt of body in radians.

ObservatoryFramework/Files/Journal/Exploration/ScanBaryCentre.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class ScanBaryCentre : JournalBase
 {
+    public override string Event => "ScanBaryCentre";
     /// <summary>
     /// Name of star system containing scanned body.
     /// </summary>

ObservatoryFramework/Files/Journal/Exploration/Screenshot.cs

@@ -5,6 +5,7 @@
 /// </summary>
 public class Screenshot : JournalBase
 {
+    public override string Event => "Screenshot";
     /// <summary>
     /// <para>Filename of the screenshot taken in the form of "\\ED Pictures\\filename"</para>
     /// <para>"\\ED Pictures\\" corresponds to "%userprofile%\Pictures\Frontier Developments\Elite Dangerous\"</para>

ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs

@@ -7,6 +7,7 @@ namespace Observatory.Framework.Files.Journal.Exploration;
 /// </summary>
 public class SellExplorationData : JournalBase
 {
+    public override string Event => "SellExplorationData";
     /// <summary>
     /// List of systems for which data was sold.
     /// </summary>

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs

@@ -2,6 +2,7 @@
 
 public class CarrierBankTransfer : JournalBase
 {
+    public override string Event => "CarrierBankTransfer";
     public ulong CarrierID { get; init; }
     public long Deposit { get; init; }
     public long Withdraw { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs

@@ -2,6 +2,7 @@
 
 public class CarrierBuy : JournalBase
 {
+    public override string Event => "CarrierBuy";
     public long BoughtAtMarket { get; init; }
     public ulong SystemAddress { get; init; }
     public ulong CarrierID { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs

@@ -2,5 +2,6 @@
 
 public class CarrierCancelDecommission : JournalBase
 {
+    public override string Event => "CarrierCancelDecommission";
     public ulong CarrierID { get; init; }
 }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.FleetCarrier;
 
 public class CarrierCrewServices : JournalBase
 {
+    public override string Event => "CarrierCrewServices";
     public ulong CarrierID { get; init; }
     public string CrewRole { get; init; }
     public string CrewName { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs

@@ -2,8 +2,9 @@
 
 public class CarrierDecommission : JournalBase
 {
+    public override string Event => "CarrierDecommission";
     public ulong CarrierID { get; init; }
     public long ScrapRefund { get; init; }
     public long ScrapTime { get; init; }
-    public DateTime ScrapTimeUTC => DateTimeOffset.FromUnixTimeSeconds(ScrapTime).UtcDateTime;
+    public DateTimeOffset ScrapTimeUTC => DateTimeOffset.FromUnixTimeSeconds(ScrapTime);
 }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs

@@ -2,6 +2,7 @@
 
 public class CarrierDepositFuel : JournalBase
 {
+    public override string Event => "CarrierDepositFuel";
     public ulong CarrierID { get; init; }
     public int Amount { get; init; }
     public int Total { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDockingPermission.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.FleetCarrier;
 
 public class CarrierDockingPermission : JournalBase
 {
+    public override string Event => "CarrierDockingPermission";
     public ulong CarrierID { get; init; }
     [JsonConverter(typeof(JsonStringEnumConverter))]
     public CarrierDockingAccess DockingAccess { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierFinance.cs

@@ -2,6 +2,7 @@
 
 public class CarrierFinance : JournalBase
 {
+    public override string Event => "CarrierFinance";
     public ulong CarrierID { get; init; }
     public int TaxRate { get; init; }
     public long CarrierBalance { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs

@@ -8,6 +8,7 @@ namespace Observatory.Framework.Files.Journal.FleetCarrier;
 
 public class CarrierJump : FSDJump
 {
+    public override string Event => "CarrierJump";
     public bool Docked { get; init; }
     public bool OnFoot { get; init; }
     /// <summary>

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs

@@ -2,5 +2,6 @@
 
 public class CarrierJumpCancelled : JournalBase
 {
+    public override string Event => "CarrierJumpCancelled";
     public ulong CarrierID { get; init; }
 }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs

@@ -2,6 +2,7 @@
 
 public class CarrierJumpRequest : JournalBase
 {
+    public override string Event => "CarrierJumpRequest";
     public string Body { get; init; }
     public int BodyID { get; init; }
     public ulong SystemAddress { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierModulePack.cs

@@ -2,4 +2,5 @@
 
 public class CarrierModulePack : CarrierShipPack
 {
+    public override string Event => "CarrierModulePack";
 }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.FleetCarrier;
 
 public class CarrierShipPack : JournalBase
 {
+    public override string Event => "CarrierShipPack";
     public ulong CarrierID { get; init; }
     [JsonConverter(typeof(JsonStringEnumConverter))]
     public CarrierOperation Operation { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs

@@ -6,6 +6,7 @@ namespace Observatory.Framework.Files.Journal.FleetCarrier;
 
 public class CarrierStats : JournalBase
 {
+    public override string Event => "CarrierStats";
     public ulong CarrierID { get; init; }
     public string Callsign { get; init; }
     public string Name { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs

@@ -2,6 +2,7 @@
 
 public class CarrierTradeOrder : JournalBase
 {
+    public override string Event => "CarrierTradeOrder";
     public ulong CarrierID { get; init; }
     public bool BlackMarket { get; init; }
     public string Commodity { get; init; }

ObservatoryFramework/Files/Journal/FleetCarrier/FCMaterials.cs

@@ -2,8 +2,9 @@
 
 namespace Observatory.Framework.Files.Journal.FleetCarrier;
 
-public class FCMaterlas : FSDJump
+public class FCMaterials : FSDJump
 {
+    public override string Event => "FCMaterials";
     public ulong MarketID { get; init; }
     public string CarrierName { get; init; }
     public ulong CarrierID { get; init; }

ObservatoryFramework/Files/Journal/InvalidJson.cs

@@ -1,6 +0,0 @@
-namespace Observatory.Framework.Files.Journal;
-
-public class InvalidJson : JournalBase
-{
-    public string OriginalEvent { get; init; }
-}

ObservatoryFramework/Files/Journal/JournalBase.cs

@@ -1,4 +1,8 @@
-namespace Observatory.Framework.Files.Journal;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Runtime.Serialization;
+using DateTimeOffset = System.DateTimeOffset;
+
+namespace Observatory.Framework.Files.Journal;
 
 using System.Text.Json.Serialization;
 using Combat;
@@ -15,7 +19,7 @@ using Travel;
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "event", UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FailSerialization)]
 [JsonDerivedType(typeof(Bounty), "Bounty")]
-[JsonDerivedType(typeof(CapShipBound), "CapShipBound")]
+[JsonDerivedType(typeof(CapShipBond), "CapShipBound")]
 [JsonDerivedType(typeof(Died), "Died")]
 [JsonDerivedType(typeof(EscapeInterdiction), "EscapeInterdiction")]
 [JsonDerivedType(typeof(FactionKillBond), "FactionKillBond")]
@@ -63,8 +67,7 @@ using Travel;
 [JsonDerivedType(typeof(CarrierShipPack), "CarrierShipPack")]
 [JsonDerivedType(typeof(CarrierStats), "CarrierStats")]
 [JsonDerivedType(typeof(CarrierTradeOrder), "CarrierTradeOrder")]
-[JsonDerivedType(typeof(FCMaterlas), "FCMaterlas")]
+[JsonDerivedType(typeof(FleetCarrier.FCMaterials), "FCMaterlas")]
-[JsonDerivedType(typeof(InvalidJson), "InvalidJson")]
 [JsonDerivedType(typeof(BackpackChange), "BackpackChange")]
 [JsonDerivedType(typeof(BackpackMaterials), "Backpack")]
 [JsonDerivedType(typeof(BookDropship), "BookDropship")]
@@ -81,7 +84,7 @@ using Travel;
 [JsonDerivedType(typeof(DropItems), "DropItems")]
 [JsonDerivedType(typeof(DropShipDeploy), "DropShipDeploy")]
 [JsonDerivedType(typeof(Embark), "Embark")]
-[JsonDerivedType(typeof(FCMaterials), "FCMaterials")]
+[JsonDerivedType(typeof(Odyssey.FCMaterials), "FCMaterials")]
 [JsonDerivedType(typeof(LoadoutEquipModule), "LoadoutEquipModule")]
 [JsonDerivedType(typeof(LoadoutRemoveModule), "LoadoutRemoveModule")]
 [JsonDerivedType(typeof(RenameSuitLoadout), "RenameSuitLoadout")]
@@ -273,8 +276,16 @@ public abstract class JournalBase
 {
     [JsonPropertyName("timestamp")]
     public DateTimeOffset Timestamp { get; init; }
+
+    /// <summary>
+    /// As this is used for the JsonPolymorphic attribute, this will not be deserilized.
+    /// </summary>
+    [JsonPropertyName("event")]
+    public abstract string Event { get; }
     
     [JsonExtensionData]
+    [IgnoreDataMember]
+    [NotMapped]
     public Dictionary<string, object> AdditionalProperties { get; init; }
 }
         

ObservatoryFramework/Files/Journal/Odyssey/BackPack.cs

@@ -2,5 +2,5 @@
 
 public class BackPack : JournalBase
 {
-       
+    public override string Event => "BackPack";
 }

ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class BackpackChange : JournalBase
 {
+    public override string Event => "BackpackChange";
     public ImmutableList<BackpackItemChange> Added { get; init; }
     public ImmutableList<BackpackItemChange> Removed { get; init; }
 }

ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class BackpackMaterials : JournalBase
 {
+    public override string Event => "BackpackMaterials";
     public ImmutableList<BackpackItem> Items { get; init; }
     public ImmutableList<BackpackItem> Components { get; init; }
     public ImmutableList<BackpackItem> Consumables { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/BookDropship.cs

@@ -2,4 +2,5 @@
 
 public class BookDropship : BookTaxi
 {
+    public override string Event => "BookDropship";
 }

ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs

@@ -2,6 +2,7 @@
 
 public class BookTaxi : JournalBase
 {
+    public override string Event => "BookTaxi";
     public int Cost { get; init; }
     public string DestinationSystem { get; init; }
     public string DestinationLocation { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs

@@ -6,6 +6,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class BuyMicroResources : JournalBase
 {
+    public override string Event => "BuyMicroResources";
     public string Name { get; init; }
     public string Name_Localised { get; init; }
     [JsonConverter(typeof(JsonStringEnumConverter))]

ObservatoryFramework/Files/Journal/Odyssey/BuySuit.cs

@@ -2,6 +2,7 @@
 
 public class BuySuit : JournalBase
 {
+    public override string Event => "BuySuit";
     public string Name { get; init; }
     public string Name_Localised { get; init; }
     public int Price { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/BuyWeapon.cs

@@ -2,6 +2,7 @@
 
 public class BuyWeapon : JournalBase
 {
+    public override string Event => "BuyWeapon";
     public string Name { get; init; }
     public string Name_Localised { get; init; }
     public int Price { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/CancelDropship.cs

@@ -2,4 +2,5 @@
 
 public class CancelDropship : CancelTaxi
 {
+    public override string Event => "CancelDropship";
 }

ObservatoryFramework/Files/Journal/Odyssey/CancelTaxi.cs

@@ -2,5 +2,6 @@
 
 public class CancelTaxi : JournalBase
 {
+    public override string Event => "CancelTaxi";
     public int Refund { get; init; }
 }

ObservatoryFramework/Files/Journal/Odyssey/CollectItems.cs

@@ -2,6 +2,7 @@
 
 public class CollectItems : JournalBase
 {
+    public override string Event => "CollectItems";
     public string Name { get; init; }
     public string Name_Localised { get; init; }
     public string Type { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class CreateSuitLoadout : DeleteSuitLoadout
 {
+    public override string Event => "CreateSuitLoadout";
     public ImmutableList<SuitModule> Modules { get; init; }
     public ImmutableList<string> SuitMods { get; init; }
 }

ObservatoryFramework/Files/Journal/Odyssey/DeleteSuitLoadout.cs

@@ -2,6 +2,7 @@
 
 public class DeleteSuitLoadout : JournalBase
 {
+    public override string Event => "DeleteSuitLoadout";
     public ulong SuitID { get; init; }
     public string SuitName { get; init; }
     public string SuitName_Localised { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs

@@ -2,6 +2,7 @@
 
 public class Disembark : JournalBase
 {
+    public override string Event => "Disembark";
     public bool SRV { get; init; }
     public bool Taxi { get; init; }
     public bool Multicrew { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/DropItems.cs

@@ -2,4 +2,5 @@
 
 public class DropItems : CollectItems
 {
+    public override string Event => "DropItems";
 }

ObservatoryFramework/Files/Journal/Odyssey/DropShipDeploy.cs

@@ -2,6 +2,7 @@
 
 public class DropShipDeploy : JournalBase
 {
+    public override string Event => "DropShipDeploy";
     public string StarSystem { get; init; }
     public ulong SystemAddress { get; init; }
     public string Body { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/Embark.cs

@@ -2,4 +2,5 @@
 
 public class Embark : Disembark
 {
+    public override string Event => "Embark";
 }

ObservatoryFramework/Files/Journal/Odyssey/FCMaterials.cs

@@ -2,6 +2,7 @@
 
 public class FCMaterials : JournalBase
 {
+    public override string Event => "FCMaterials";
     public ulong MarketID { get; init; }
     public string CarrierName { get; init; }
     public string CarrierID { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/LoadoutEquipModule.cs

@@ -2,6 +2,7 @@
 
 public class LoadoutEquipModule : JournalBase
 {
+    public override string Event => "LoadoutEquipModule";
     public ulong SuitID { get; init; }
     public string SuitName { get; init; }
     public string SuitName_Localised { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/LoadoutRemoveModule.cs

@@ -2,4 +2,5 @@
 
 public class LoadoutRemoveModule : LoadoutEquipModule
 {
+    public override string Event => "LoadoutRemoveModule";
 }

ObservatoryFramework/Files/Journal/Odyssey/RenameSuitLoadout.cs

@@ -2,6 +2,7 @@
 
 public class RenameSuitLoadout : JournalBase
 {
+    public override string Event => "RenameSuitLoadout";
     public ulong SuitID { get; init; }
     public string SuitName { get; init; }
     public ulong LoadoutID { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class ScanOrganic : JournalBase
 {
+    public override string Event => "ScanOrganic";
     [JsonConverter(typeof(JsonStringEnumConverter))]
     public ScanOrganicType ScanType { get; init; }
     public string Genus { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class SellMicroResources : JournalBase
 {
+    public override string Event => "SellMicroResources";
     public ImmutableList<MicroResource> MicroResources { get; init; }
     public int Price { get; init; }
     public ulong MarketID { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class SellOrganicData : JournalBase
 {
+    public override string Event => "SellOrganicData";
     public ulong MarketID { get; init; }
     public ImmutableList<BioData> BioData { get; init; }
 }

ObservatoryFramework/Files/Journal/Odyssey/SellSuit.cs

@@ -1,4 +1,6 @@
 namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class SellSuit : BuySuit
-{ }
+{
+    public override string Event => "SellSuit";
+}

ObservatoryFramework/Files/Journal/Odyssey/SellWeapon.cs

@@ -2,4 +2,5 @@
 
 public class SellWeapon : BuyWeapon
 {
+    public override string Event => "SellWeapon";
 }

ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class ShipLockerMaterials : JournalBase
 {
+    public override string Event => "ShipLockerMaterials";
     public ImmutableList<BackpackItem> Items { get; init; }
     public ImmutableList<BackpackItem> Components { get; init; }
     public ImmutableList<BackpackItem> Consumables { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/SuitLoadout.cs

@@ -1,4 +1,6 @@
 namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class SuitLoadout : CreateSuitLoadout
-{ }
+{
+    public override string Event => "SuitLoadout";
+}

ObservatoryFramework/Files/Journal/Odyssey/SwitchSuitLoadout.cs

@@ -2,4 +2,5 @@
 
 public class SwitchSuitLoadout : CreateSuitLoadout
 {
+    public override string Event => "SwitchSuitLoadout";
 }

ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs

@@ -6,6 +6,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class TradeMicroResources : JournalBase
 {
+    public override string Event => "TradeMicroResources";
     public ImmutableList<MicroResource> Offered { get; init; }
     public string Received { get; init; }
     [JsonConverter(typeof(JsonStringEnumConverter))]

ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs

@@ -5,5 +5,6 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class TransferMicroResources : JournalBase
 {
+    public override string Event => "TransferMicroResources";
     public ImmutableList<MicroTransfer> Transfers { get; init; }
 }

ObservatoryFramework/Files/Journal/Odyssey/UpgradeSuit.cs

@@ -4,6 +4,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey;
 
 public class UpgradeSuit : JournalBase
 {
+    public override string Event => "UpgradeSuit";
     public string Name { get; init; }
     public string Name_Localised { get; init; }
     public ulong SuitID { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/UpgradeWeapon.cs

@@ -2,6 +2,7 @@
 
 public class UpgradeWeapon : JournalBase
 {
+    public override string Event => "UpgradeWeapon";
     public string Name { get; init; }
     public string Name_Localised { get; init; }
     public ulong SuitModuleID { get; init; }

ObservatoryFramework/Files/Journal/Odyssey/UseConsumable.cs

@@ -2,6 +2,7 @@
 
 public class UseConsumable : JournalBase
 {
+    public override string Event => "UseConsumable";
     public string Name { get; init; }
     public string Name_Localised { get; init; }
     public string Type { get; init; }

ObservatoryFramework/Files/Journal/Other/AfmuRepairs.cs

@@ -2,6 +2,7 @@
 
 public class AfmuRepairs : JournalBase
 {
+    public override string Event => "AfmuRepairs";
     public string Module { get; init; }
     public string Module_Localised { get; init; }
     public bool FullyRepaired { get; init; }

ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs

@@ -7,6 +7,7 @@ namespace Observatory.Framework.Files.Journal.Other;
 
 public class ApproachSettlement : JournalBase
 {
+    public override string Event => "ApproachSettlement";
     public ulong SystemAddress { get; init; }
     public string Name { get; init; }
     public string Name_Localised { get; init; }

ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs

@@ -5,5 +5,6 @@ namespace Observatory.Framework.Files.Journal.Other;
 
 public class CargoTransfer : JournalBase
 {
+    public override string Event => "CargoTransfer";
     public ImmutableList<CargoTransferDetail> Transfers { get; init; }
 }

ObservatoryFramework/Files/Journal/Other/ChangeCrewRole.cs

@@ -2,6 +2,7 @@
 
 public class ChangeCrewRole : JournalBase
 {
+    public override string Event => "ChangeCrewRole";
     public string Role { get; init; }
     public bool Telepresence { get; init; }
 }

ObservatoryFramework/Files/Journal/Other/CockpitBreached.cs

@@ -2,4 +2,5 @@
 
 public class CockpitBreached : JournalBase
 {
+    public override string Event => "CockpitBreached";
 }

ObservatoryFramework/Files/Journal/Other/CommitCrime.cs

@@ -5,6 +5,7 @@ namespace Observatory.Framework.Files.Journal.Other;
 
 public class CommitCrime : JournalBase
 {
+    public override string Event => "CommitCrime";
     [JsonConverter(typeof(JsonStringEnumConverter))]
     public CrimeType CrimeType { get; init; }
     public string Faction { get; init; }

ObservatoryFramework/Files/Journal/Other/Continued.cs

@@ -2,5 +2,6 @@
 
 public class Continued : JournalBase
 {
+    public override string Event => "Continued";
     public int Part { get; init; }
 }

ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs

@@ -2,5 +2,6 @@
 
 public class CrewLaunchFighter : CrewMemberJoins
 {
+    public override string Event => "CrewLaunchFighter";
     public ulong ID { get; init; }
 }

ObservatoryFramework/Files/Journal/Other/CrewMemberJoins.cs

@@ -2,6 +2,7 @@
 
 public class CrewMemberJoins : JournalBase
 {
+    public override string Event => "CrewMemberJoins";
     public string Crew { get; init; }
     public bool Telepresence { get; init; }
 }

ObservatoryFramework/Files/Journal/Other/CrewMemberQuits.cs

@@ -1,4 +1,6 @@
 namespace Observatory.Framework.Files.Journal.Other;
 
 public class CrewMemberQuits : CrewMemberJoins
-{ }
+{
+    public override string Event => "CrewMemberQuits";
+}

ObservatoryFramework/Files/Journal/Other/CrewMemberRoleChange.cs

@@ -2,5 +2,6 @@
 
 public class CrewMemberRoleChange : CrewMemberJoins
 {
+    public override string Event => "CrewMemberRoleChange";
     public string Role { get; init; }
 }