diff --git a/ObservatoryFramework/Files/FCMaterialsFile.cs b/ObservatoryFramework/Files/FCMaterialsFile.cs
new file mode 100644
index 0000000..ed36b0b
--- /dev/null
+++ b/ObservatoryFramework/Files/FCMaterialsFile.cs
@@ -0,0 +1,16 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files
+{
+ ///
+ /// Elite Dangerous fcmaterials.json file. Contains data about current fleet carrier bartender stock.
+ ///
+ public class FCMaterialsFile : Journal.JournalBase
+ {
+ ///
+ /// List of items in stock and in demand from the carrier bartender.
+ ///
+ public ImmutableList Items { get; init; }
+ }
+}
diff --git a/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs b/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs
index 63e5573..b44887e 100644
--- a/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs
+++ b/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs
@@ -23,5 +23,6 @@ namespace Observatory.Framework.Files.Journal
public int VoucherAmount { get; init; }
public float Latitude { get; init; }
public float Longitude { get; init; }
+ public int BodyID { get; init; }
}
}
diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/FCMaterials.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/FCMaterials.cs
new file mode 100644
index 0000000..e757383
--- /dev/null
+++ b/ObservatoryFramework/Files/Journal/FleetCarrier/FCMaterials.cs
@@ -0,0 +1,9 @@
+namespace Observatory.Framework.Files.Journal
+{
+ public class FCMaterlas : FSDJump
+ {
+ public ulong MarketID { get; init; }
+ public string CarrierName { get; init; }
+ public ulong CarrierID { get; init; }
+ }
+}
diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs b/ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs
index eec57d8..c18066d 100644
--- a/ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs
+++ b/ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs
@@ -5,5 +5,6 @@
public int Cost { get; init; }
public string DestinationSystem { get; init; }
public string DestinationLocation { get; init; }
+ public bool Retreat { get; init; }
}
}
diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs
index a49808f..f18413a 100644
--- a/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs
+++ b/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs
@@ -1,4 +1,5 @@
using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
using System.Text.Json.Serialization;
namespace Observatory.Framework.Files.Journal
@@ -12,5 +13,7 @@ namespace Observatory.Framework.Files.Journal
public int Count { get; init; }
public int Price { get; init; }
public ulong MarketID { get; init; }
+ public int TotalCount { get; init; }
+ public ImmutableList MicroResources { get; init; }
}
}
diff --git a/ObservatoryFramework/Files/ParameterTypes/FCMaterial.cs b/ObservatoryFramework/Files/ParameterTypes/FCMaterial.cs
new file mode 100644
index 0000000..37a2488
--- /dev/null
+++ b/ObservatoryFramework/Files/ParameterTypes/FCMaterial.cs
@@ -0,0 +1,12 @@
+namespace Observatory.Framework.Files.ParameterTypes
+{
+ public class FCMaterial
+ {
+ public ulong Id { get; init; }
+ public string Name { get; init; }
+ public string Name_Localised { get; init; }
+ public int Price { get; init; }
+ public int Stock { get; init; }
+ public int Demand { get; init; }
+ }
+}