From 661a4672d9713d99f2853dacab7447ce68e6319e Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Sat, 3 Dec 2022 14:47:31 +0100
Subject: [PATCH] add support for thargoid combat zones

---
 EliteBGS/CombatZoneDialog.xaml    | 48 -------------------------------
 EliteBGS/CombatZoneDialog.xaml.cs | 47 ------------------------------
 EliteBGS/MainWindow.xaml          |  1 +
 EliteBGS/MainWindow.xaml.cs       | 10 +++++++
 EliteBGS/Objective.cs             | 33 ++++++++++++++++++++-
 5 files changed, 43 insertions(+), 96 deletions(-)
 delete mode 100644 EliteBGS/CombatZoneDialog.xaml
 delete mode 100644 EliteBGS/CombatZoneDialog.xaml.cs

diff --git a/EliteBGS/CombatZoneDialog.xaml b/EliteBGS/CombatZoneDialog.xaml
deleted file mode 100644
index c96769c..0000000
--- a/EliteBGS/CombatZoneDialog.xaml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Window x:Class="EliteBGS.CombatZoneDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:EliteBGS"
-        mc:Ignorable="d"
-        Title="Add Combat Zone Wins" Height="150" Width="370" Icon="EliteBGS.ico" WindowStartupLocation="CenterOwner">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-        <GroupBox Header="Add Combat Zone" Grid.Row="0" Grid.Column="0" Width="Auto">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-                <ComboBox x:Name="type" Grid.Column="0" VerticalAlignment="Top" Width="Auto" IsReadOnly="True" Height="23" Margin="5" SelectedIndex="0">
-                    <ComboBoxItem Content="Ship"/>
-                    <ComboBoxItem Content="On Foot"/>
-                </ComboBox>
-                <ComboBox x:Name="grade" Grid.Column="1" VerticalAlignment="Top" IsReadOnly="True" Margin="5" Height="23" Width="Auto" SelectedIndex="0">
-                    <ComboBoxItem Content="Low"/>
-                    <ComboBoxItem Content="Medium"/>
-                    <ComboBoxItem Content="High"/>
-                </ComboBox>
-                <TextBox x:Name="amount" Grid.Column="2" Height="23" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="Auto" Margin="5" HorizontalContentAlignment="Right"/>
-            </Grid>
-        </GroupBox>
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button x:Name="Accept" Content="Accept" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="1" VerticalAlignment="Top" Width="75" Margin="5" IsDefault="True" Click="Accept_Click"/>
-            <Button x:Name="Cancel" Content="Cancel" HorizontalAlignment="Right" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" Width="75" Margin="5" IsCancel="True" Click="Cancel_Click"/>
-        </Grid>
-    </Grid>
-</Window>
diff --git a/EliteBGS/CombatZoneDialog.xaml.cs b/EliteBGS/CombatZoneDialog.xaml.cs
deleted file mode 100644
index c311dba..0000000
--- a/EliteBGS/CombatZoneDialog.xaml.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Forms;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace EliteBGS {
-    /// <summary>
-    /// Interaction logic for CombatZoneDialog.xaml
-    /// </summary>
-    public partial class CombatZoneDialog : Window {
-        public CombatZoneDialog() {
-            InitializeComponent();
-        }
-
-        public string Type => (type.SelectedItem as ComboBoxItem).Content.ToString();
-        public string Grade => (grade.SelectedItem as ComboBoxItem).Content.ToString();
-        public int Amount {
-            get {
-                try {
-                    return int.Parse(amount.Text);
-                } catch (Exception) {
-                    return 1;
-                }
-            }
-        }
-
-        private void Accept_Click(object sender, RoutedEventArgs e) {
-            DialogResult = true;
-            Close();
-        }
-
-        private void Cancel_Click(object sender, RoutedEventArgs e) {
-            DialogResult = false;
-            Close();
-        }
-    }
-}
diff --git a/EliteBGS/MainWindow.xaml b/EliteBGS/MainWindow.xaml
index ac92a48..f9e8b2d 100644
--- a/EliteBGS/MainWindow.xaml
+++ b/EliteBGS/MainWindow.xaml
@@ -116,6 +116,7 @@
                                                     <StackPanel Orientation="Vertical">
                                                         <Button Content="Ground" x:Name="Ground" Click="Ground_Click"/>
                                                         <Button Content="Ship" x:Name="Ship" Click="Ship_Click"/>
+                                                        <Button Content="Thargoid" x:Name="Thargoid" Click="Thargoid_Click"/>
                                                     </StackPanel>
                                                 </Expander>
                                             </StackPanel>
diff --git a/EliteBGS/MainWindow.xaml.cs b/EliteBGS/MainWindow.xaml.cs
index d7223fb..712fab5 100644
--- a/EliteBGS/MainWindow.xaml.cs
+++ b/EliteBGS/MainWindow.xaml.cs
@@ -329,6 +329,16 @@ public partial class MainWindow : Window {
         RefreshView();
     }
 
+    private void Thargoid_Click(object sender, RoutedEventArgs e) {
+        CombatZone transaction = GetTransaction<CombatZone>(sender);
+        if (transaction == null) {
+            return;
+        }
+
+        transaction.Type = CombatZones.ThargoidCombatZone;
+        RefreshView();
+    }
+
     private void Profit_LostFocus(object sender, RoutedEventArgs e) {
         RefreshView();
     }
diff --git a/EliteBGS/Objective.cs b/EliteBGS/Objective.cs
index c1f0e88..330ebfd 100644
--- a/EliteBGS/Objective.cs
+++ b/EliteBGS/Objective.cs
@@ -5,6 +5,7 @@ using Newtonsoft.Json;
 using EDPlayerJournal.BGS;
 using System.Linq;
 using System.Windows;
+using EDPlayerJournal;
 
 namespace EliteBGS;
 
@@ -25,6 +26,21 @@ public class UITransaction {
         }
     }
 
+    public Visibility IsGroundCombatZone {
+        get {
+            CombatZone combat = Transaction as CombatZone;
+            if (combat == null) {
+                return Visibility.Hidden;
+            }
+
+            if (string.Compare(combat.Type, CombatZones.GroundCombatZone) == 0) {
+                return Visibility.Visible;
+            }
+
+            return Visibility.Hidden;
+        }
+    }
+
     public Visibility IsShipCombatZone {
         get {
             CombatZone combat = Transaction as CombatZone;
@@ -32,7 +48,22 @@ public class UITransaction {
                 return Visibility.Hidden;
             }
 
-            if (string.Compare(combat.Type, "Ship") == 0) {
+            if (string.Compare(combat.Type, CombatZones.ShipCombatZone) == 0) {
+                return Visibility.Visible;
+            }
+
+            return Visibility.Hidden;
+        }
+    }
+
+    public Visibility IsThargoidCombatZone {
+        get {
+            CombatZone combat = Transaction as CombatZone;
+            if (combat == null) {
+                return Visibility.Hidden;
+            }
+
+            if (string.Compare(combat.Type, CombatZones.ThargoidCombatZone) == 0) {
                 return Visibility.Visible;
             }