diff --git a/ShipTargetedEntry.cs b/ShipTargetedEntry.cs index 80cd885..03b8b80 100644 --- a/ShipTargetedEntry.cs +++ b/ShipTargetedEntry.cs @@ -1,38 +1,31 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace EDJournal { public class ShipTargetedEntry : Entry { - private string ship = null; - private string pilot = null; - private string rank = null; - private double shield = 0.0; - private double hull = 0.0; - private int bounty = 0; - private string legalstatus = null; - private string faction = null; - - public string Ship => ship; - public string Pilot => pilot; - public string Rank => rank; - public double ShieldHealth => shield; - public double HullHealth => hull; - public int Bounty => bounty; - public string LegalStatus => legalstatus; - public string Faction => faction; + public string Ship { get; set; } + public long ScanStage { get; set; } + public string PilotName { get; set; } + public string PilotNameLocalised { get; set; } + public string PilotRank { get; set; } + public double ShieldHealth { get; set; } + public double HullHealth { get; set; } + public long Bounty { get; set; } + public string LegalStatus { get; set; } + public string Faction { get; set; } + public string Power { get; set; } protected override void Initialise() { - ship = JSON.Value("Ship_Localised") ?? ""; - pilot = JSON.Value("PilotName_Localised") ?? ""; - rank = JSON.Value("PilotRank") ?? ""; - shield = JSON.Value("ShieldHealth") ?? 0.0; - hull = JSON.Value("HullHealth") ?? 0.0; - bounty = JSON.Value("Bounty") ?? 0; - legalstatus = JSON.Value("LegalStatus") ?? "Clean"; - faction = JSON.Value("Faction") ?? ""; + ScanStage = JSON.Value("ScanStage") ?? 0; + Ship = JSON.Value("Ship_Localised") ?? ""; + PilotName = JSON.Value("PilotName") ?? ""; + PilotNameLocalised = JSON.Value("PilotName_Localised") ?? ""; + PilotRank = JSON.Value("PilotRank") ?? ""; + ShieldHealth = JSON.Value("ShieldHealth") ?? 0.0; + HullHealth = JSON.Value("HullHealth") ?? 0.0; + Bounty = JSON.Value("Bounty") ?? 0; + LegalStatus = JSON.Value("LegalStatus") ?? "Clean"; + Faction = JSON.Value("Faction") ?? ""; + Power = JSON.Value("Power") ?? ""; } } }