From cb8698dd42cf8012e228d4350a6df22bf1e55b39 Mon Sep 17 00:00:00 2001 From: Florian Stinglmayr Date: Sat, 3 Dec 2022 20:42:38 +0100 Subject: [PATCH] thargoid combat zones are called "AX" combat zones ingame --- EDPlayerJournal/BGS/CombatZone.cs | 2 +- EDPlayerJournal/BGS/TransactionParser.cs | 2 +- EDPlayerJournal/CombatZones.cs | 9 +++++++-- EliteBGS/MainWindow.xaml | 3 ++- EliteBGS/MainWindow.xaml.cs | 12 +++++++++++- EliteBGS/Objective.cs | 4 ++-- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/EDPlayerJournal/BGS/CombatZone.cs b/EDPlayerJournal/BGS/CombatZone.cs index ee37f12..a7a8229 100644 --- a/EDPlayerJournal/BGS/CombatZone.cs +++ b/EDPlayerJournal/BGS/CombatZone.cs @@ -66,7 +66,7 @@ public class CombatZone : Transaction { /// Returns true if it is a thargoid combat zone /// public bool IsThargoid { - get { return string.Compare(Type, CombatZones.ThargoidCombatZone) == 0; } + get { return string.Compare(Type, CombatZones.AXCombatZone) == 0; } } public override int CompareTo(Transaction? obj) { diff --git a/EDPlayerJournal/BGS/TransactionParser.cs b/EDPlayerJournal/BGS/TransactionParser.cs index 022c5bb..0177481 100644 --- a/EDPlayerJournal/BGS/TransactionParser.cs +++ b/EDPlayerJournal/BGS/TransactionParser.cs @@ -112,7 +112,7 @@ internal class TransactionParserContext { cztype = CombatZones.ShipCombatZone; } else if (ThargoidScoutKills > 0 && ThargoidInterceptorKills > 0) { // Could be a thargoid combat zones if interceptors and scouts are there - cztype = CombatZones.ThargoidCombatZone; + cztype = CombatZones.AXCombatZone; // Still unknown grade = null; } else { diff --git a/EDPlayerJournal/CombatZones.cs b/EDPlayerJournal/CombatZones.cs index 786642f..f369459 100644 --- a/EDPlayerJournal/CombatZones.cs +++ b/EDPlayerJournal/CombatZones.cs @@ -15,9 +15,9 @@ public class CombatZones { public static readonly string ShipCombatZone = "Ship"; /// - /// Thargoid combat zone + /// AX combat zone /// - public static readonly string ThargoidCombatZone = "Thargoid"; + public static readonly string AXCombatZone = "AX"; /// /// Difficulty low @@ -33,4 +33,9 @@ public class CombatZones { /// Difficulty high /// public static readonly string DifficultyHigh = "High"; + + /// + /// Very high difficulty, so far AX combat zone only + /// + public static readonly string DifficultyVeryHigh = "Very High"; } diff --git a/EliteBGS/MainWindow.xaml b/EliteBGS/MainWindow.xaml index f9e8b2d..0565b95 100644 --- a/EliteBGS/MainWindow.xaml +++ b/EliteBGS/MainWindow.xaml @@ -110,13 +110,14 @@