From 2bef2a6c81816a4a50a751baf459e427a7dcd3a9 Mon Sep 17 00:00:00 2001 From: Florian Stinglmayr Date: Thu, 28 Apr 2022 09:58:41 +0200 Subject: [PATCH] StarPos can have negative values --- FSDJumpEntry.cs | 7 ++----- LocationEntry.cs | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/FSDJumpEntry.cs b/FSDJumpEntry.cs index 0cb736c..c96da6f 100644 --- a/FSDJumpEntry.cs +++ b/FSDJumpEntry.cs @@ -6,7 +6,7 @@ namespace EDJournal { protected override void Initialise() { SystemAddress = JSON.Value("SystemAddress") ?? 0; StarSystem = JSON.Value("StarSystem"); - StarPos = JSON.Value("StarPos").ToObject(); + StarPos = JSON.Value("StarPos").ToObject(); var faction = JSON.Value("SystemFaction"); if (faction != null) { @@ -23,13 +23,10 @@ namespace EDJournal { } } } - public ulong[] StarPos { get; set; } + public long[] StarPos { get; set; } public string StarSystem { get; set; } - public string SystemFaction { get; set; } - public ulong SystemAddress { get; set; } - public List SystemFactions { get; set; } = new List(); } } diff --git a/LocationEntry.cs b/LocationEntry.cs index 3e5aa39..57ea669 100644 --- a/LocationEntry.cs +++ b/LocationEntry.cs @@ -13,7 +13,7 @@ namespace EDJournal { public ulong SystemAddress { get; set; } public string Body { get; set; } public bool Docked { get; set; } - public ulong[] StarPos { get; set; } + public long[] StarPos { get; set; } public List SystemFactions { get; set; } = new List(); @@ -22,7 +22,7 @@ namespace EDJournal { SystemAddress = JSON.Value("SystemAddress") ?? 0; Docked = JSON.Value("Docked") ?? false; StationName = JSON.Value("StationName") ?? ""; - StarPos = JSON.Value("StarPos").ToObject(); + StarPos = JSON.Value("StarPos").ToObject(); JObject systemfaction = JSON.Value("SystemFaction"); if (systemfaction != null) {