diff --git a/ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs b/ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs index 756af38..eb89363 100644 --- a/ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs +++ b/ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs @@ -2,6 +2,6 @@ { public class FighterDestroyed : JournalBase { - public int ID { get; init; } + public ulong ID { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs b/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs index 1d7a553..63e5573 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs @@ -4,7 +4,7 @@ namespace Observatory.Framework.Files.Journal { public class CodexEntry : JournalBase { - public long EntryID { get; init; } + public ulong EntryID { get; init; } public string Name { get; init; } public string Name_Localised { get; init; } public string SubCategory { get; init; } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs index e6d9e98..02b2752 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs @@ -2,7 +2,7 @@ { public class CarrierBankTransfer : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } public long Deposit { get; init; } public long Withdraw { get; init; } public long PlayerBalance { get; init; } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs index daf3e6a..0ebbb73 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs @@ -4,7 +4,7 @@ { public long BoughtAtMarket { get; init; } public ulong SystemAddress { get; init; } - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } public string Location { get; init; } public long Price { get; init; } public string Variant { get; init; } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs index c8aec6d..4777abd 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs @@ -2,6 +2,6 @@ { public class CarrierCancelDecommission : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs index a0c671c..819ebf1 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs @@ -6,7 +6,7 @@ namespace Observatory.Framework.Files.Journal { public class CarrierCrewServices : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } public string CrewRole { get; init; } public string CrewName { get; init; } [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs index fbb674d..17f5dff 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs @@ -2,7 +2,7 @@ { public class CarrierDecommission : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } public long ScrapRefund { get; init; } public long ScrapTime { get; init; } public System.DateTime ScrapTimeUTC diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs index e770a51..67ad39b 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs @@ -2,7 +2,7 @@ { public class CarrierDepositFuel : JournalBase { - public long CarrierID { get; init; } + public ulong 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 index 4e8d943..1958044 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDockingPermission.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDockingPermission.cs @@ -5,7 +5,7 @@ namespace Observatory.Framework.Files.Journal { public class CarrierDockingPermission : JournalBase { - public long CarrierID { get; init; } + public ulong 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 index 8cbe0d6..950c3e5 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierFinance.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierFinance.cs @@ -2,7 +2,7 @@ { public class CarrierFinance : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } public int TaxRate { get; init; } public long CarrierBalance { get; init; } public long ReserveBalance { get; init; } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs index 8bbe74b..4e39831 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs @@ -10,7 +10,7 @@ namespace Observatory.Framework.Files.Journal public bool Docked { get; init; } public string StationName { get; init; } public string StationType { get; init; } - public long MarketID { get; init; } + public ulong MarketID { get; init; } public Faction StationFaction { get; init; } public string StationGovernment { get; init; } public string StationGovernment_Localised { get; init; } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs index 31e258d..065eb83 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs @@ -2,6 +2,6 @@ { public class CarrierJumpCancelled : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs index 3681a16..69af5dd 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs @@ -5,7 +5,7 @@ public string Body { get; init; } public int BodyID { get; init; } public ulong SystemAddress { get; init; } - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } public string SystemName { get; init; } public ulong SystemID { get; init; } } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs index 21bc621..8415a4d 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs @@ -5,7 +5,7 @@ namespace Observatory.Framework.Files.Journal { public class CarrierShipPack : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } [JsonConverter(typeof(JsonStringEnumConverter))] public CarrierOperation Operation { get; init; } public string PackTheme { get; init; } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs index 4a46c71..547946c 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs @@ -6,7 +6,7 @@ namespace Observatory.Framework.Files.Journal { public class CarrierStats : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } public string Callsign { get; init; } public string Name { get; init; } [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs index cb80b40..6fcdc61 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs @@ -2,7 +2,7 @@ { public class CarrierTradeOrder : JournalBase { - public long CarrierID { get; init; } + public ulong CarrierID { get; init; } public bool BlackMarket { get; init; } public string Commodity { get; init; } public string Commodity_Localised { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs b/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs index 6004308..6ebb960 100644 --- a/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs +++ b/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs @@ -5,7 +5,7 @@ public ulong SystemAddress { get; init; } public string Name { get; init; } public string Name_Localised { get; init; } - public long MarketID { get; init; } + public ulong MarketID { get; init; } public float Latitude { get; init; } public float Longitude { get; init; } public int BodyID { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs b/ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs index d0ddac2..6365656 100644 --- a/ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs +++ b/ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs @@ -2,6 +2,6 @@ { public class CrewLaunchFighter : CrewMemberJoins { - public int ID { get; init; } + public ulong ID { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Other/DockFighter.cs b/ObservatoryFramework/Files/Journal/Other/DockFighter.cs index 09bfedb..e56d76b 100644 --- a/ObservatoryFramework/Files/Journal/Other/DockFighter.cs +++ b/ObservatoryFramework/Files/Journal/Other/DockFighter.cs @@ -2,6 +2,6 @@ { public class DockFighter : JournalBase { - public int ID { get; init; } + public ulong ID { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Other/FighterRebuilt.cs b/ObservatoryFramework/Files/Journal/Other/FighterRebuilt.cs index cbeb4b4..70bcac6 100644 --- a/ObservatoryFramework/Files/Journal/Other/FighterRebuilt.cs +++ b/ObservatoryFramework/Files/Journal/Other/FighterRebuilt.cs @@ -3,6 +3,6 @@ public class FighterRebuilt : JournalBase { public string Loadout { get; init; } - public int ID { get; init; } + public ulong ID { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Other/LaunchSRV.cs b/ObservatoryFramework/Files/Journal/Other/LaunchSRV.cs index 2a8c730..dc6ca3c 100644 --- a/ObservatoryFramework/Files/Journal/Other/LaunchSRV.cs +++ b/ObservatoryFramework/Files/Journal/Other/LaunchSRV.cs @@ -3,7 +3,7 @@ public class LaunchSRV : JournalBase { public string Loadout { get; init; } - public int ID { get; init; } + public ulong ID { get; init; } public bool PlayerControlled { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Other/NpcCrewPaidWage.cs b/ObservatoryFramework/Files/Journal/Other/NpcCrewPaidWage.cs index 8c2aa3f..b40417c 100644 --- a/ObservatoryFramework/Files/Journal/Other/NpcCrewPaidWage.cs +++ b/ObservatoryFramework/Files/Journal/Other/NpcCrewPaidWage.cs @@ -2,7 +2,7 @@ { public class NpcCrewPaidWage : JournalBase { - public int NpcCrewId { get; init; } + public ulong 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 index 6d3ce81..ac6984e 100644 --- a/ObservatoryFramework/Files/Journal/Other/NpcCrewRank.cs +++ b/ObservatoryFramework/Files/Journal/Other/NpcCrewRank.cs @@ -4,7 +4,7 @@ namespace Observatory.Framework.Files.Journal { public class NpcCrewRank : JournalBase { - public int NpcCrewId { get; init; } + public ulong NpcCrewId { get; init; } public string NpcCrewName { get; init; } public RankCombat RankCombat { get; init; } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/CargoDepot.cs b/ObservatoryFramework/Files/Journal/StationServices/CargoDepot.cs index e443d3a..2726b0a 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/CargoDepot.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/CargoDepot.cs @@ -5,14 +5,14 @@ namespace Observatory.Framework.Files.Journal { public class CargoDepot : JournalBase { - public int MissionID { get; init; } + public ulong 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 ulong StartMarketID { get; init; } + public ulong EndMarketID { get; init; } public int ItemsCollected { get; init; } public int ItemsDelivered { get; init; } public int TotalItemsToDeliver { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalDiscard.cs b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalDiscard.cs index 052b31b..5f15e33 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalDiscard.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoalDiscard.cs @@ -2,7 +2,7 @@ { public class CommunityGoalDiscard : JournalBase { - public long CGID { get; init; } + public ulong CGID { get; init; } public string Name { get; init; } public string System { get; init; } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/CrewFire.cs b/ObservatoryFramework/Files/Journal/StationServices/CrewFire.cs index 3172910..fece95c 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/CrewFire.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/CrewFire.cs @@ -3,6 +3,6 @@ public class CrewFire : JournalBase { public string Name { get; init; } - public long CrewID { get; init; } + public ulong CrewID { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerContribution.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerContribution.cs index cd4d7be..ecbb327 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/EngineerContribution.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerContribution.cs @@ -6,7 +6,7 @@ namespace Observatory.Framework.Files.Journal public class EngineerContribution : JournalBase { public string Engineer { get; init; } - public long EngineerID { get; init; } + public ulong EngineerID { get; init; } [JsonConverter(typeof(JsonStringEnumConverter))] public ContributionType Type { get; init; } public string Commodity { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs index 24d434c..19fb3ca 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs @@ -8,11 +8,11 @@ namespace Observatory.Framework.Files.Journal public class EngineerCraft : JournalBase { public string Engineer { get; init; } - public long EngineerID { get; init; } + public ulong EngineerID { get; init; } public string Blueprint { get; init; } public string Slot { get; init; } public string Module { get; init; } - public long BlueprintID { get; init; } + public ulong BlueprintID { get; init; } public string BlueprintName { get; init; } public string ExperimentalEffect { get; init; } public string ExperimentalEffect_Localised { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs index c26dce4..ef0962a 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs @@ -7,7 +7,7 @@ namespace Observatory.Framework.Files.Journal public class EngineerProgress : JournalBase { public string Engineer { get; init; } - public int EngineerID { get; init; } + public ulong EngineerID { get; init; } public int Rank { get; init; } public int RankProgress { get; init; } [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/ObservatoryFramework/Files/Journal/StationServices/FetchRemoteModule.cs b/ObservatoryFramework/Files/Journal/StationServices/FetchRemoteModule.cs index 7437df0..add84e0 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/FetchRemoteModule.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/FetchRemoteModule.cs @@ -2,11 +2,11 @@ { public class FetchRemoteModule : JournalBase { - public int ShipID { get; init; } + public ulong 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 ulong 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 index 8c05ffd..2b80fa3 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/Market.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/Market.cs @@ -6,7 +6,7 @@ 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 ulong MarketID { get; init; } public string StationName { get; init; } public string StationType { get; init; } public string StarSystem { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/MaterialTrade.cs b/ObservatoryFramework/Files/Journal/StationServices/MaterialTrade.cs index 4f97d80..82127bf 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MaterialTrade.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MaterialTrade.cs @@ -4,7 +4,7 @@ namespace Observatory.Framework.Files.Journal { public class MaterialTrade : JournalBase { - public long MarketID { get; init; } + public ulong 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 index 9b1e0a7..d63e2a1 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MissionAbandoned.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionAbandoned.cs @@ -3,7 +3,7 @@ public class MissionAbandoned : JournalBase { public string Name { get; init; } - public long MissionID { get; init; } + public ulong MissionID { get; init; } public long Fine { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionAccepted.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionAccepted.cs index ad31f03..9998de9 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MissionAccepted.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionAccepted.cs @@ -10,7 +10,7 @@ namespace Observatory.Framework.Files.Journal public string Name { get; init; } public string LocalisedName { get; init; } public string Faction { get; init; } - public long MissionID { get; init; } + public ulong MissionID { get; init; } [JsonConverter(typeof(MissionEffectConverter))] public MissionEffect Influence { get; init; } [JsonConverter(typeof(MissionEffectConverter))] diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs index 30e0ebc..ffb73b5 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs @@ -10,7 +10,7 @@ namespace Observatory.Framework.Files.Journal public string Name { get; init; } public string LocalisedName { get; init; } public string Faction { get; init; } - public long MissionID { get; init; } + public ulong MissionID { get; init; } public string Commodity { get; init; } public string Commodity_Localised { get; init; } public int Count { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionFailed.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionFailed.cs index efcfe1f..a1d45db 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MissionFailed.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionFailed.cs @@ -4,7 +4,7 @@ { public string Name { get; init; } public string Name_Localised { get; init; } - public long MissionID { get; init; } + public ulong MissionID { get; init; } public long Fine { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionRedirected.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionRedirected.cs index 0b0224d..fc9e61f 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MissionRedirected.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionRedirected.cs @@ -4,7 +4,7 @@ { public string Name { get; init; } public string Name_Localised { get; init; } - public long MissionID { get; init; } + public ulong MissionID { get; init; } public string NewDestinationStation { get; init; } public string OldDestinationStation { get; init; } public string NewDestinationSystem { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleBuy.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleBuy.cs index 4c6b791..5b3ed31 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ModuleBuy.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleBuy.cs @@ -2,7 +2,7 @@ { public class ModuleBuy : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string Slot { get; init; } public string BuyItem { get; init; } public string BuyItem_Localised { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleRetrieve.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleRetrieve.cs index a627b24..86b4ec2 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ModuleRetrieve.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleRetrieve.cs @@ -2,7 +2,7 @@ { public class ModuleRetrieve : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string Slot { get; init; } public string Ship { get; init; } public ulong ShipID { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleSell.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleSell.cs index acff2ec..b6cc527 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ModuleSell.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleSell.cs @@ -2,7 +2,7 @@ { public class ModuleSell : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string Slot { get; init; } public string SellItem { get; init; } public string SellItem_Localised { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleSellRemote.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleSellRemote.cs index 34601fd..34d43fd 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ModuleSellRemote.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleSellRemote.cs @@ -5,7 +5,7 @@ public int StorageSlot { get; init; } public string SellItem { get; init; } public string SellItem_Localised { get; init; } - public long ServerId { get; init; } + public ulong 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 index befd15e..ec1a6d0 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ModuleStore.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleStore.cs @@ -4,7 +4,7 @@ namespace Observatory.Framework.Files.Journal { public class ModuleStore : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string Slot { get; init; } public string Ship { get; init; } public ulong ShipID { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ModuleSwap.cs b/ObservatoryFramework/Files/Journal/StationServices/ModuleSwap.cs index 615aa8d..e4b22b0 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ModuleSwap.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ModuleSwap.cs @@ -2,7 +2,7 @@ { public class ModuleSwap : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string FromSlot { get; init; } public string ToSlot { get; init; } public string FromItem { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs b/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs index 4bdeff5..bfb406e 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs @@ -2,7 +2,7 @@ { public class Outfitting : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string StationName { get; init; } public string StarSystem { get; init; } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ScientificResearch.cs b/ObservatoryFramework/Files/Journal/StationServices/ScientificResearch.cs index a936a91..b7c0564 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ScientificResearch.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ScientificResearch.cs @@ -2,7 +2,7 @@ { public class ScientificResearch : JournalBase { - public long MarketID { get; init; } + public ulong 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 index 42df42c..b0712a6 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/SearchAndRescue.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/SearchAndRescue.cs @@ -2,7 +2,7 @@ { public class SearchAndRescue : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string Name { get; init; } public string Name_Localised { get; init; } public int Count { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/SellShipOnRebuy.cs b/ObservatoryFramework/Files/Journal/StationServices/SellShipOnRebuy.cs index 5761485..cb593db 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/SellShipOnRebuy.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/SellShipOnRebuy.cs @@ -4,7 +4,7 @@ { public string ShipType { get; init; } public string System { get; init; } - public int SellShipId { get; init; } + public ulong SellShipId { get; init; } public long ShipPrice { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs b/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs index 5839629..8fa1b67 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs @@ -2,7 +2,7 @@ { public class Shipyard : JournalBase { - public long MarketID { get; init; } + public ulong 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 index 7424656..68cd174 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ShipyardBuy.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardBuy.cs @@ -2,14 +2,14 @@ { public class ShipyardBuy : JournalBase { - public long MarketID { get; init; } + public ulong 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 ulong StoreShipID { get; init; } public string SellOldShip { get; init; } - public int SellShipID { get; init; } + public ulong SellShipID { get; init; } public long SellPrice { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ShipyardNew.cs b/ObservatoryFramework/Files/Journal/StationServices/ShipyardNew.cs index f9f3a60..2ff4182 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ShipyardNew.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardNew.cs @@ -4,6 +4,6 @@ { public string ShipType { get; init; } public string ShipType_Localised { get; init; } - public int NewShipID { get; init; } + public ulong NewShipID { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ShipyardSell.cs b/ObservatoryFramework/Files/Journal/StationServices/ShipyardSell.cs index 288a179..9f0c774 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ShipyardSell.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardSell.cs @@ -2,9 +2,9 @@ { public class ShipyardSell : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string ShipType { get; init; } - public int SellShipID { get; init; } + public ulong 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 index a62c535..7c62429 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ShipyardSwap.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardSwap.cs @@ -2,7 +2,7 @@ { public class ShipyardSwap : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string ShipType { get; init; } public string ShipType_Localised { get; init; } public ulong ShipID { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ShipyardTransfer.cs b/ObservatoryFramework/Files/Journal/StationServices/ShipyardTransfer.cs index 1e026d6..ff5b55d 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/ShipyardTransfer.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/ShipyardTransfer.cs @@ -2,12 +2,12 @@ { public class ShipyardTransfer : JournalBase { - public long MarketID { get; init; } + public ulong 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 ulong 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 index bd4c2a6..6567717 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs @@ -7,7 +7,7 @@ namespace Observatory.Framework.Files.Journal { public string StarSystem { get; init; } public string StationName { get; init; } - public long MarketID { get; init; } + public ulong MarketID { get; init; } public ImmutableList Items { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs b/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs index 017ad66..55fda63 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs @@ -5,7 +5,7 @@ namespace Observatory.Framework.Files.Journal { public class StoredShips : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string StationName { get; init; } public string StarSystem { get; init; } public ImmutableList ShipsHere { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs b/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs index 17cc943..20f2393 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs @@ -6,7 +6,7 @@ namespace Observatory.Framework.Files.Journal public class TechnologyBroker : JournalBase { public string BrokerType { get; init; } - public long MarketID { get; init; } + public ulong MarketID { get; init; } public ImmutableList ItemsUnlocked { get; init; } public ImmutableList Commodities { get; init; } public ImmutableList Materials { get; init; } diff --git a/ObservatoryFramework/Files/ParameterTypes/ShipyardPrice.cs b/ObservatoryFramework/Files/ParameterTypes/ShipyardPrice.cs index 821f310..a56278f 100644 --- a/ObservatoryFramework/Files/ParameterTypes/ShipyardPrice.cs +++ b/ObservatoryFramework/Files/ParameterTypes/ShipyardPrice.cs @@ -2,7 +2,7 @@ { public class ShipyardPrice { - public int id { get; init; } + public ulong id { get; init; } public string ShipType { get; init; } public string ShipType_Localised { get; init; } public int ShipPrice { get; init; } diff --git a/ObservatoryFramework/Files/ShipyardFile.cs b/ObservatoryFramework/Files/ShipyardFile.cs index 1dd56e6..bd3ab51 100644 --- a/ObservatoryFramework/Files/ShipyardFile.cs +++ b/ObservatoryFramework/Files/ShipyardFile.cs @@ -11,7 +11,7 @@ namespace Observatory.Framework.Files /// /// Unique ID of market. /// - public long MarketID { get; init; } + public ulong MarketID { get; init; } /// /// Name of station where shipyard is located. ///