Compare commits
No commits in common. "cb8698dd42cf8012e228d4350a6df22bf1e55b39" and "3df82af239878774d3111a448d65c9c71838b59b" have entirely different histories.
cb8698dd42
...
3df82af239
@ -66,7 +66,7 @@ public class CombatZone : Transaction {
|
|||||||
/// Returns true if it is a thargoid combat zone
|
/// Returns true if it is a thargoid combat zone
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsThargoid {
|
public bool IsThargoid {
|
||||||
get { return string.Compare(Type, CombatZones.AXCombatZone) == 0; }
|
get { return string.Compare(Type, CombatZones.ThargoidCombatZone) == 0; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public override int CompareTo(Transaction? obj) {
|
public override int CompareTo(Transaction? obj) {
|
||||||
|
@ -112,7 +112,7 @@ internal class TransactionParserContext {
|
|||||||
cztype = CombatZones.ShipCombatZone;
|
cztype = CombatZones.ShipCombatZone;
|
||||||
} else if (ThargoidScoutKills > 0 && ThargoidInterceptorKills > 0) {
|
} else if (ThargoidScoutKills > 0 && ThargoidInterceptorKills > 0) {
|
||||||
// Could be a thargoid combat zones if interceptors and scouts are there
|
// Could be a thargoid combat zones if interceptors and scouts are there
|
||||||
cztype = CombatZones.AXCombatZone;
|
cztype = CombatZones.ThargoidCombatZone;
|
||||||
// Still unknown
|
// Still unknown
|
||||||
grade = null;
|
grade = null;
|
||||||
} else {
|
} else {
|
||||||
|
@ -15,9 +15,9 @@ public class CombatZones {
|
|||||||
public static readonly string ShipCombatZone = "Ship";
|
public static readonly string ShipCombatZone = "Ship";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// AX combat zone
|
/// Thargoid combat zone
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly string AXCombatZone = "AX";
|
public static readonly string ThargoidCombatZone = "Thargoid";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Difficulty low
|
/// Difficulty low
|
||||||
@ -33,9 +33,4 @@ public class CombatZones {
|
|||||||
/// Difficulty high
|
/// Difficulty high
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly string DifficultyHigh = "High";
|
public static readonly string DifficultyHigh = "High";
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Very high difficulty, so far AX combat zone only
|
|
||||||
/// </summary>
|
|
||||||
public static readonly string DifficultyVeryHigh = "Very High";
|
|
||||||
}
|
}
|
||||||
|
@ -2,36 +2,15 @@
|
|||||||
|
|
||||||
namespace EDPlayerJournal.Entries;
|
namespace EDPlayerJournal.Entries;
|
||||||
public class DockedEntry : Entry {
|
public class DockedEntry : Entry {
|
||||||
/// <summary>
|
|
||||||
/// Name of the station
|
|
||||||
/// </summary>
|
|
||||||
public string? StationName { get; set; }
|
public string? StationName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Star system of the station
|
|
||||||
/// </summary>
|
|
||||||
public string? StarSystem { get; set; }
|
public string? StarSystem { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// System address
|
|
||||||
/// </summary>
|
|
||||||
public ulong? SystemAddress { get; set; }
|
public ulong? SystemAddress { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Faction owning the station.
|
|
||||||
/// </summary>
|
|
||||||
public string? StationFaction { get; set; }
|
public string? StationFaction { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// State of the station, new in Update 14
|
|
||||||
/// </summary>
|
|
||||||
public string? StationState { get; set; }
|
|
||||||
|
|
||||||
protected override void Initialise() {
|
protected override void Initialise() {
|
||||||
StationName = JSON.Value<string>("StationName");
|
StationName = JSON.Value<string>("StationName");
|
||||||
StarSystem = JSON.Value<string>("StarSystem");
|
StarSystem = JSON.Value<string>("StarSystem");
|
||||||
SystemAddress = JSON.Value<ulong?>("SystemAddress");
|
SystemAddress = JSON.Value<ulong?>("SystemAddress");
|
||||||
StationState = JSON.Value<string>("StationState");
|
|
||||||
JObject? faction = JSON.Value<JObject>("StationFaction");
|
JObject? faction = JSON.Value<JObject>("StationFaction");
|
||||||
if (faction != null) {
|
if (faction != null) {
|
||||||
StationFaction = faction.Value<string>("Name") ?? "";
|
StationFaction = faction.Value<string>("Name") ?? "";
|
||||||
|
@ -27,7 +27,6 @@ public class Thargoid {
|
|||||||
{ 8000000, ThargoidVessel.Cyclops },
|
{ 8000000, ThargoidVessel.Cyclops },
|
||||||
{ 24000000, ThargoidVessel.Basilisk },
|
{ 24000000, ThargoidVessel.Basilisk },
|
||||||
{ 40000000, ThargoidVessel.Medusa },
|
{ 40000000, ThargoidVessel.Medusa },
|
||||||
{ 50000000, ThargoidVessel.Orthrus },
|
|
||||||
{ 60000000, ThargoidVessel.Hydra },
|
{ 60000000, ThargoidVessel.Hydra },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -110,14 +110,13 @@
|
|||||||
<Button x:Name="Low" Content="Low" Click="Low_Click"/>
|
<Button x:Name="Low" Content="Low" Click="Low_Click"/>
|
||||||
<Button x:Name="Med" Content="Med" Click="Med_Click"/>
|
<Button x:Name="Med" Content="Med" Click="Med_Click"/>
|
||||||
<Button x:Name="High" Content="High" Click="High_Click"/>
|
<Button x:Name="High" Content="High" Click="High_Click"/>
|
||||||
<Button x:Name="VeryHigh" Content="Very High" Click="VeryHigh_Click" />
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Expander>
|
</Expander>
|
||||||
<Expander Header="Type">
|
<Expander Header="Type">
|
||||||
<StackPanel Orientation="Vertical">
|
<StackPanel Orientation="Vertical">
|
||||||
<Button Content="Ground" x:Name="Ground" Click="Ground_Click"/>
|
<Button Content="Ground" x:Name="Ground" Click="Ground_Click"/>
|
||||||
<Button Content="Ship" x:Name="Ship" Click="Ship_Click"/>
|
<Button Content="Ship" x:Name="Ship" Click="Ship_Click"/>
|
||||||
<Button Content="AX" x:Name="Thargoid" Click="Thargoid_Click"/>
|
<Button Content="Thargoid" x:Name="Thargoid" Click="Thargoid_Click"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Expander>
|
</Expander>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@ -309,16 +309,6 @@ public partial class MainWindow : Window {
|
|||||||
RefreshView();
|
RefreshView();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void VeryHigh_Click(object sender, RoutedEventArgs e) {
|
|
||||||
CombatZone transaction = GetTransaction<CombatZone>(sender);
|
|
||||||
if (transaction == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
transaction.Grade = CombatZones.DifficultyVeryHigh;
|
|
||||||
RefreshView();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Ground_Click(object sender, RoutedEventArgs e) {
|
private void Ground_Click(object sender, RoutedEventArgs e) {
|
||||||
CombatZone transaction = GetTransaction<CombatZone>(sender);
|
CombatZone transaction = GetTransaction<CombatZone>(sender);
|
||||||
if (transaction == null) {
|
if (transaction == null) {
|
||||||
@ -345,7 +335,7 @@ public partial class MainWindow : Window {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
transaction.Type = CombatZones.AXCombatZone;
|
transaction.Type = CombatZones.ThargoidCombatZone;
|
||||||
RefreshView();
|
RefreshView();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,14 +56,14 @@ public class UITransaction {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Visibility IsAXCombatZone {
|
public Visibility IsThargoidCombatZone {
|
||||||
get {
|
get {
|
||||||
CombatZone combat = Transaction as CombatZone;
|
CombatZone combat = Transaction as CombatZone;
|
||||||
if (combat == null) {
|
if (combat == null) {
|
||||||
return Visibility.Hidden;
|
return Visibility.Hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string.Compare(combat.Type, CombatZones.AXCombatZone) == 0) {
|
if (string.Compare(combat.Type, CombatZones.ThargoidCombatZone) == 0) {
|
||||||
return Visibility.Visible;
|
return Visibility.Visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user