implement combat zones and combat bonds

App.xaml.cs

@@ -1,11 +1,4 @@
-using System;
+using System.Windows;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-using NonaBGS.Journal;
 
 namespace NonaBGS
 {

BGS/Cartographics.cs

@@ -1,10 +1,6 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Globalization;
+using EDJournal;
-using System.Threading.Tasks;
-using NonaBGS.Journal;
 
 namespace NonaBGS.BGS {
     public class Cartographics : LogEntry {

BGS/CombatZone.cs

@@ -1,11 +1,30 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NonaBGS.BGS {
-    public class CombatZone {
+    public class CombatZone : LogEntry, IComparable {
-        private int level;
+        public string Type { get; set; }
+        public string Grade { get; set; }
+        public int Amount { get; set; }
+
+        public int CompareTo(object obj) {
+            if (obj.GetType() != typeof(CombatZone)) {
+                return -1;
+            }
+
+            var b = obj as CombatZone;
+            if (b.Faction != Faction || b.System != System) {
+                return -1; // System and faction don't match
+            }
+
+            if (b.Type != b.Type || b.Grade != b.Grade) {
+                return -1; // grade and type don't match
+            }
+
+            return 0;
+        }
+
+        public override string ToString() {
+            return string.Format("Won {0} x {1} {2} Combat Zone(s)", Amount, Type, Grade);
+        }
     }
 }

BGS/DiscordLogGenerator.cs

@@ -1,10 +1,4 @@
-using System;
+namespace NonaBGS.BGS {
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.BGS {
     public interface IDiscordLogGenerator {
         string GenerateDiscordLog(Report report);
     }

BGS/FactionKillBonds.cs

@@ -0,0 +1,43 @@
+using System.Linq;
+using System.Globalization;
+using EDJournal;
+
+namespace NonaBGS.BGS {
+    public class FactionKillBonds : LogEntry {
+        public int TotalSum {
+            get {
+                return Entries
+                    .OfType<FactionKillBondEntry>()
+                    .Sum(x => x.Reward)
+                    ;
+            }
+        }
+
+        public string VictimFaction {
+            get {
+                return Entries
+                    .OfType<FactionKillBondEntry>()
+                    .First()
+                    .VictimFaction
+                    ;
+            }
+        }
+
+        public override int CompareTo(LogEntry other) {
+            if (other.GetType() != typeof(FactionKillBonds)) {
+                return -1;
+            }
+
+            var b = other as FactionKillBonds;
+            if (b.VictimFaction == VictimFaction) {
+                return 0;
+            }
+
+            return -1;
+        }
+
+        public override string ToString() {
+            return string.Format("Faction Kill Bonds: {0}", Credits.FormatCredits(TotalSum));
+        }
+    }
+}

BGS/LogEntry.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using EDJournal;
-using System.Threading.Tasks;
-using NonaBGS.Journal;
 
 namespace NonaBGS.BGS {
     public class LogEntry : IComparable<LogEntry> {

BGS/MissionCompleted.cs

@@ -1,10 +1,5 @@
-using System;
+using System.Text;
-using System.Collections.Generic;
+using EDJournal;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NonaBGS.Journal;
-using Newtonsoft.Json.Linq;
 
 namespace NonaBGS.BGS {
     public class MissionCompleted : LogEntry {

BGS/NonaDiscordLog.cs

@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Globalization;
+using EDJournal;
-using System.Threading.Tasks;
-using NonaBGS.Journal;
 
 namespace NonaBGS.BGS {
     public class NonaDiscordLog : IDiscordLogGenerator {
@@ -59,6 +57,26 @@ namespace NonaBGS.BGS {
             return string.Format("Sold {0} CR worth of Micro Resources\n", sum);
         }
 
+        private string BuildKillBonds(Objective objective) {
+            StringBuilder builder = new StringBuilder();
+            FactionKillBonds[] bonds = objective.LogEntries
+                                        .OfType<FactionKillBonds>()
+                                        .ToArray()
+                                        ;
+
+            if (bonds == null || bonds.Length == 0) {
+                return builder.ToString();
+            }
+
+            foreach (FactionKillBonds bond in bonds) {
+                builder.AppendFormat("{0}\n", bond.ToString());
+            }
+
+            builder.AppendFormat("\n");
+
+            return builder.ToString();
+        }
+
         private string BuildVouchers(Objective objective) {
             StringBuilder builder = new StringBuilder();
             var missions = from entries in objective.LogEntries
@@ -83,6 +101,7 @@ namespace NonaBGS.BGS {
         private string BuildMissionList(Objective objective) {
             Dictionary<string, Dictionary<string, int>> collated = new Dictionary<string, Dictionary<string, int>>();
             StringBuilder output = new StringBuilder();
+            int total_influence = 0;
 
             var missions = from entries in objective.LogEntries
                            where entries.GetType() == typeof(MissionCompleted)
@@ -102,6 +121,8 @@ namespace NonaBGS.BGS {
                 }
 
                 ++collated[m.MissionName][m.Influence];
+
+                total_influence += m.Influence.Length;
             }
 
             foreach (var mission in collated) {
@@ -118,9 +139,33 @@ namespace NonaBGS.BGS {
                 output.Append(")\n\n");
             }
 
+            if (total_influence > 0) {
+                output.AppendFormat("Total Influence: {0}\n\n", total_influence);
+            }
+
             return output.ToString();
         }
 
+        private string BuildCombatZones(Objective objective) {
+            StringBuilder builder = new StringBuilder();
+            CombatZone[] zones = objective.LogEntries
+                .OfType<CombatZone>()
+                .ToArray()
+                ;
+
+            if (zones == null || zones.Length == 0) {
+                return builder.ToString();
+            }
+
+            foreach (CombatZone zone in zones) {
+                builder.AppendFormat("{0}\n", zone.ToString());
+            }
+
+            builder.Append("\n");
+
+            return builder.ToString();
+        }
+
         public string GenerateDiscordLog(Report report) {
             StringBuilder log = new StringBuilder();
 
@@ -142,6 +187,12 @@ namespace NonaBGS.BGS {
                 var vouchers = BuildVouchers(objective);
                 entries.Append(vouchers);
 
+                var zones = BuildCombatZones(objective);
+                entries.Append(zones);
+
+                var bonds = BuildKillBonds(objective);
+                entries.Append(bonds);
+
                 var carto = BuildCartoGraphics(objective);
                 entries.Append(carto);
 

BGS/Objective.cs

@@ -26,19 +26,22 @@ namespace NonaBGS.BGS {
                 }
             }
 
-            if (e.System != null && system != null &&
+            if (e.System != null && system != null) {
-                e.System == system) {
+                if (string.Compare(e.System, system, true) == 0) {
-                ++match_count;
+                    ++match_count;
+                }
             }
 
-            if (e.Station != null && station != null &&
+            if (e.Station != null && station != null) {
-                e.Station == station) {
+                if (string.Compare(e.Station, station, true) == 0) {
-                ++match_count;
+                    ++match_count;
+                }
             }
 
-            if (e.Faction != null && faction != null &&
+            if (e.Faction != null && faction != null) {
-                e.Faction == faction) {
+                if (string.Compare(e.Faction, faction, true) == 0) {
-                ++match_count;
+                    ++match_count;
+                }
             }
 
             return match_count;

BGS/Report.cs

@@ -1,11 +1,7 @@
 using System;
-using System.ComponentModel;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
+using EDJournal;
-using System.Threading.Tasks;
-using NonaBGS.Journal;
 
 namespace NonaBGS.BGS {
     public class Report {
@@ -38,7 +34,8 @@ namespace NonaBGS.BGS {
                 e.Is(Events.FSDJump) ||
                 e.Is(Events.MultiSellExplorationData) ||
                 e.Is(Events.SellMicroResources) ||
-                e.Is(Events.RedeemVoucher)
+                e.Is(Events.RedeemVoucher) ||
+                e.Is(Events.FactionKillBond)
                 ;
         }
 
@@ -97,6 +94,14 @@ namespace NonaBGS.BGS {
                     entry.Station = current_station;
                     entry.Faction = controlling_faction;
 
+                    collate = true;
+                } else if (e.Is(Events.FactionKillBond)) {
+                    entry = new FactionKillBonds();
+                    entry.Entries.Add(e);
+                    entry.System = current_system;
+                    entry.Station = current_station;
+                    entry.Faction = (e as FactionKillBondEntry).AwardingFaction;
+
                     collate = true;
                 } else if (e.Is(Events.SellMicroResources)) {
                     entry = new SellMicroResources(current_system, current_station);

BGS/SellMicroResources.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-using NonaBGS.Journal;
+using EDJournal;
 
 namespace NonaBGS.BGS {
     public class SellMicroResources : LogEntry {

BGS/Vouchers.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Globalization;
-using NonaBGS.Journal;
+using EDJournal;
 
 namespace NonaBGS.BGS {
     public class Vouchers : LogEntry {

CombatZoneDialog.xaml

@@ -0,0 +1,48 @@
+<Window x:Class="NonaBGS.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:NonaBGS"
+        mc:Ignorable="d"
+        Title="Add Combat Zone Wins" Height="150" Width="370" 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="Space"/>
+                    <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>

CombatZoneDialog.xaml.cs

@@ -0,0 +1,47 @@
+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 NonaBGS {
+    /// <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();
+        }
+    }
+}

Journal/Credits.cs

@@ -1,18 +0,0 @@
-using System.Globalization;
-
-namespace NonaBGS.Journal {
-    public class Credits {
-        public static string FormatCredits(int amount) {
-            var format = CultureInfo.CurrentCulture.NumberFormat;
-            if ((amount % 1000000) == 0) {
-                amount /= 1000000;
-                return string.Format("{0}M CR", amount.ToString(format));
-            } else if ((amount % 1000) == 0) {
-                amount /= 1000;
-                return string.Format("{0}K CR", amount.ToString(format));
-            }
-
-            return string.Format("{0} CR", amount.ToString(format));
-        }
-    }
-}

Journal/DockedEntry.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class DockedEntry : Entry {
-        public string StationName {
-            get { return JSON.GetValue("StationName").ToString(); }
-        }
-    }
-}

Journal/EliteDangerous.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class EliteDangerous {
-        /// <summary>
-        /// The ingame universe is 1286 years in the future. This is needed to convert dates
-        /// and times to ingame dates and times
-        /// </summary>
-        public static readonly int YearOffset = 1286;
-    }
-}

Journal/Entry.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace NonaBGS.Journal {
-    /// <summary>
-    /// Base class for a single entry within the player journal. If no specific sub class is available
-    /// this class gives basic information, such as EventType or date when it happened. It also allows
-    /// base classes access to the underlying JSON object. Base classes should be named after the event
-    /// type that they map + Entry. So "FSDJump" event is handled by FSDJumpEntry.
-    /// </summary>
-    public class Entry {
-        private static readonly Dictionary<string, Type> classes = new Dictionary<string, Type> {
-            { Events.Docked, typeof(DockedEntry) },
-            { Events.FSDJump, typeof(FSDJumpEntry) },
-            { Events.MissionCompleted, typeof(MissionCompletedEntry) },
-            { Events.MultiSellExplorationData, typeof(MultiSellExplorationDataEntry) },
-            { Events.MarketSell, typeof(MarketSellEntry) },
-            { Events.SellMicroResources, typeof(SellMicroResourcesEntry) },
-            { Events.RedeemVoucher, typeof(RedeemVoucherEntry) },
-        };
-
-        private string eventtype = null;
-        private string datetime = null;
-        private DateTime timestamp;
-
-        private string jsonstr = null;
-        protected JObject json = null;
-
-        public Entry() {
-        }
-
-        public static Entry Parse(string journalline) {
-            var json = JObject.Parse(journalline);
-            return Parse(json);
-        }
-
-        public static Entry Parse(JObject json) {
-            string event_name = json.GetValue("event").ToString();
-
-            classes.TryGetValue(event_name, out Type classhandler);
-            if (classhandler == null) {
-                classhandler = typeof(Entry);
-            }
-
-            var obj = (Entry)Activator.CreateInstance(classhandler);
-            obj.InternalInitialise(json);
-            obj.Initialise();
-            return obj;
-        }
-
-        private void InternalInitialise(JObject jobject) {
-            this.json = jobject;
-            this.jsonstr = json.ToString(formatting: Formatting.None);
-
-            this.eventtype = json.GetValue("event").ToString();
-            this.datetime = json.GetValue("timestamp").ToString();
-            this.timestamp = DateTime.Parse(this.datetime);
-        }
-
-        protected virtual void Initialise() {
-        }
-
-        public bool Is(string eventtype) {
-            if (eventtype == null || this.eventtype == null) {
-                return false;
-            }
-
-            return String.Equals(this.eventtype, eventtype, StringComparison.OrdinalIgnoreCase);
-        }
-
-        public string Event {
-            get { return eventtype; }
-        }
-
-        public DateTime Timestamp {
-            get { return timestamp; }
-        }
-
-        public JObject JSON {
-            get { return this.json; }
-        }
-    }
-}

Journal/Events.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class Events {
-        public static readonly string MissionCompleted = "MissionCompleted";
-        public static readonly string Docked = "Docked";
-        public static readonly string FSDJump = "FSDJump";
-        public static readonly string MultiSellExplorationData = "MultiSellExplorationData";
-        public static readonly string MarketSell = "MarketSell";
-        public static readonly string SellMicroResources = "SellMicroResources";
-        public static readonly string RedeemVoucher = "RedeemVoucher";
-    }
-}

Journal/FSDJumpEntry.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-
-namespace NonaBGS.Journal {
-    public class FSDJumpEntry : Entry {
-        private string starsystem = null;
-        private string systemfaction = null;
-        protected override void Initialise() {
-            starsystem = JSON.Value<string>("StarSystem");
-            var faction = JSON.Value<JObject>("SystemFaction");
-            if (faction != null) {
-                systemfaction = faction.Value<string>("Name");
-            }
-        }
-        public string StarSystem => starsystem;
-
-        public string SystemFaction => systemfaction;
-    }
-}

Journal/JournalException.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class JournalException : Exception {
-        public JournalException(string message) : base(message) {
-        }
-    }
-}

Journal/JournalFile.cs

@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.IO;
-using System.Globalization;
-
-namespace NonaBGS.Journal
-{
-    public class JournalFile : IComparable<JournalFile>
-    {
-        private string fullpath = null;
-        private string part = null;
-        private int intpart = 0;
-        private DateTime datetime;
-        private DateTime normalised;
-        private List<Entry> entries = new List<Entry>();
-
-        private static Regex fileregex = new Regex("Journal\\.(\\d+)\\.(\\d+)\\.log");
-        private static string iso8601 = "yyyyMMddTHHmmss";
-        private static string iso8601_notime = "yyyyMMdd";
-
-        private void SetFilename(string path) {
-            string filename = Path.GetFileName(path);
-            if (!File.Exists(path) || filename == null) {
-                throw new JournalException(string.Format("Invalid journal file: {0}", filename));
-            }
-
-            var matches = fileregex.Matches(filename);
-            if (matches.Count < 1) {
-                throw new JournalException(string.Format("Invalid journal file: {0}", filename));
-            }
-
-            this.fullpath = path;
-            this.part = matches[0].Groups[2].ToString();
-            this.intpart = int.Parse(part);
-            // The ISO is not quite correct on journal filenames, so build
-            // a proper ISO 8601 date time stamp out of it.
-            var date = new StringBuilder();
-            date.Append("20"); // Add the missing century in front.
-            date.Append(matches[0].Groups[1].ToString());
-            date.Insert(8, "T"); // Add the "T" separating date and time
-            this.datetime = DateTime.ParseExact(date.ToString(), iso8601, CultureInfo.InvariantCulture);
-            this.normalised = DateTime.Parse(this.datetime.ToShortDateString());
-        }
-
-        public int CompareTo(JournalFile other) {
-            if (datetime == null || other.datetime == null) {
-                return 0;
-            }
-            var comp = DateTime.Compare(datetime, other.datetime);
-            if (comp == 0) {
-                /* If we have the exact same datetime we compare by parts.
-                 */
-                return intpart - other.intpart;
-            } else {
-                return comp;
-            }
-        }
-
-        public JournalFile(string path) {
-            SetFilename(path);
-        }
-
-        public DateTime Timestamp {
-            get { return datetime; }
-        }
-
-        public DateTime NormalisedTimestamp {
-            get { return normalised; }
-        }
-
-        public int Part {
-            get { return intpart; }
-        }
-
-        public IEnumerable<Entry> Entries {
-            get { 
-                if (entries == null || entries.Count == 0) {
-                    try {
-                        LoadEntries();
-                    } catch (IOException) {
-                        entries = new List<Entry>();
-                    }
-                }
-                return entries; 
-            }
-        }
-
-        public void LoadEntries() {
-            List<string> lines = new List<string>();
-
-            /* This needs to be done this way, otherwise, if the game is still running the journal files cannot
-             * be accessed. And it is very much convenient to generate logs while the game is still running.
-             */
-            using (var fs = new FileStream(this.fullpath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
-                using (var sr = new StreamReader(fs, Encoding.UTF8)) {
-                    string line = null;
-                    while ((line = sr.ReadLine()) != null) {
-                        lines.Add(line);
-                    }
-                }
-            }
-
-            entries.Clear();
-            foreach(var line in lines) {
-                Entry entry = Entry.Parse(line);
-                entries.Add(entry);
-            }
-        }
-    }
-}

Journal/MarketSellEntry.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class MarketSellEntry : Entry {
-        private int totalsale = 0;
-
-        protected override void Initialise() {
-            totalsale = JSON.Value<int>("TotalSale");
-        }
-
-        public int TotalSale => totalsale;
-    }
-}

Journal/MissionCompletedEntry.cs

@@ -1,158 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace NonaBGS.Journal {
-    public class MissionCompletedEntry : Entry {
-        private Dictionary<string, string> influences = new Dictionary<string, string>();
-        private string readable_name = null;
-        private bool readable_name_generated = false;
-        private string name = null;
-        private string commodity = null;
-        private int count = 0;
-        private int donated = 0;
-
-        /* TODO: make this a file at some point for easier editing.
-         */
-        private static readonly Dictionary<string, string> humanreadable = new Dictionary<string, string> {
-            { "Mission_AltruismCredits_name", "Donate Credits" },
-            { "Mission_AltruismCredits_Bust_name", "Donate Credits (Bust)" },
-            { "Mission_Collect_name", "Provide" },
-            { "Mission_Collect_CivilLiberty_name", "Provide (Civil Liberty)" },
-            { "Mission_Courier_Democracy_name", "Courier (Democracy)" },
-            { "Mission_Courier_Elections_name", "Courier (Elections)" },
-            { "Mission_Courier_name", "Courier" },
-            { "Mission_Courier_RankEmp_name", "Courier (Empire)" },
-            { "Mission_Delivery_Boom_name", "Delivery (Boom)" },
-            { "Mission_Delivery_Retreat_name", "Delivery (Retreat)" },
-            { "Mission_Delivery_name", "Delivery" },
-            { "Mission_Delivery_Agriculture_name", "Delivery (Agriculture)" },
-            { "Mission_Delivery_RankEmp_name", "Delivery (Imperial Rank)" },
-            { "Mission_HackMegaship_name", "Hack Megaship" },
-            { "Mission_Hack_BLOPS_Boom_name", "Hack Megaship (Black Ops)" },
-            { "Mission_MassacreWing_name", "Massacre (Wing)" },
-            { "Mission_Massacre_RankEmp_name", "Massacre (Imperial Navy)" },
-            { "Mission_OnFoot_Collect_MB_name", "On Foot Collection" },
-            { "Mission_OnFoot_Onslaught_MB_name", "On Foot Onslaught" },
-            { "Mission_OnFoot_Onslaught_Offline_MB_name", "On Foot Onslaught (Offline)" },
-            { "Mission_OnFoot_RebootRestore_MB_name", "On Foot Reboot/Restore" },
-            { "Mission_OnFoot_Reboot_MB_name", "On Foot Reboot" },
-            { "Mission_OnFoot_Salvage_MB_name", "On Foot Salvage" },
-            { "Mission_Rescue_Planet_name", "Planet Rescue" },
-            { "Mission_Salvage_name", "Salvage" },
-            { "MISSION_Salvage_CivilUnrest_name", "Salvage (Civil Unrest)" },
-            { "MISSION_Salvage_Illegal_name", "Salvage (Illegal)" },
-            { "MISSION_Salvage_Retreat_name", "Salvage (Retreat)" },
-            { "MISSION_Salvage_Expansion_name", "Salvage (Expansion)" },
-            { "Mission_Salvage_RankEmp_name", "Salvage (Imperial Navy)" },
-            { "MISSION_Scan_name", "Scan" },
-        };
-
-        protected override void Initialise() {
-            MakeHumanReadableName();
-            name = JSON.Value<string>("Name");
-            if (JSON.ContainsKey("Commodity_Localised")) {
-                commodity = JSON.Value<string>("Commodity_Localised");
-            }
-            if (JSON.ContainsKey("Count")) {
-                count = JSON.Value<int>("Count");
-            }
-            if (JSON.ContainsKey("Donated")) {
-                donated = JSON.Value<int>("Donated");
-            }
-        }
-
-        public string Name => name;
-        public string Commodity => commodity;
-        public int Count => count;
-
-        private void MakeHumanReadableName() {
-            if (readable_name != null && readable_name.Length > 0) {
-                return;
-            }
-
-            if (Name == null) {
-                return;
-            }
-
-            StringBuilder builder;
-
-            if (humanreadable.ContainsKey(Name)) {
-                builder = new StringBuilder(humanreadable[Name]);
-                readable_name_generated = false;
-            } else {
-                builder = new StringBuilder(Name);
-                builder.Replace("Mission_", "");
-                builder.Replace("_name", "");
-                builder.Replace("_MB", "");
-                builder.Replace('_', ' ');
-                builder.Replace("Illegal", " (Illegal)");
-                builder.Replace("OnFoot", "On Foot");
-                builder.Replace(" BS", "");
-                builder.Replace("HackMegaship", "Hack Megaship");
-                builder.Replace("Boom", "");
-                builder.Replace("RebootRestore", "Reboot/Restore");
-                builder.Replace("CivilLiberty", "");
-                readable_name_generated = true;
-            }
-
-            if (count > 0 && commodity != null) {
-                builder.AppendFormat(" ({0} {1})", count, commodity);
-            }
-
-            if (donated > 0) {
-                builder.AppendFormat(" ({0})", Credits.FormatCredits(donated));
-            }
-
-            readable_name = builder.ToString().Trim();
-        }
-
-        public string HumanReadableName {
-            get {
-                MakeHumanReadableName();
-                return readable_name;
-            }
-        }
-
-        public bool HumanReadableNameWasGenerated {
-            get {
-                MakeHumanReadableName();
-                return readable_name_generated;
-            }
-        }
-
-        public string GetInfluenceForFaction(string faction) {
-            if (influences.ContainsKey(faction)) {
-                return influences[faction];
-            }
-
-            var effects = JSON.Value<JArray>("FactionEffects");
-            foreach (var effect in effects.Children<JObject>()) {
-                if (effect.GetValue("Faction").ToString() != faction) {
-                    continue;
-                }
-                    
-                var influence = effect.Value<JArray>("Influence");
-                if (influence == null || influence.Count == 0) {
-                    // No influence reward, happens on courier missions sometimes.
-                    // There is always one point of rep, even if the mission won't state it
-                    influences.Add(faction, "+");
-                }
-                
-                foreach (var infl in influence.Children<JObject>()) {
-                    infl.TryGetValue("Influence", out JToken result);
-                    if (result != null && result.Type == JTokenType.String) {
-                        influences.Add(faction, result.ToString());
-                        return result.ToString();
-                    }
-                }
-            }
-
-            return "";
-        }
-    }
-}

Journal/MultiSellExplorationDataEntry.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class MultiSellExplorationDataEntry : Entry {
-        private int totalearnings = 0;
-
-        protected override void Initialise() {
-            totalearnings = JSON.Value<int>("TotalEarnings");
-        }
-
-        public int TotalEarnings => totalearnings;
-    }
-}

Journal/PlayerJournal.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class PlayerJournal {
-        public static string DefaultPath = "%UserProfile%\\Saved Games\\Frontier Developments\\Elite Dangerous";
-
-        private List<JournalFile> journalfiles = new List<JournalFile>();
-        private string basepath = null;
-
-        public PlayerJournal() {
-            Initialise(DefaultPath);
-        }
-
-        public PlayerJournal(string path) {
-            Initialise(path);
-        }
-
-        private void Initialise(string path) {
-            basepath = Environment.ExpandEnvironmentVariables(path);
-        }
-
-        public List<JournalFile> Files {
-            get { return journalfiles; }
-        }
-
-        public void Open() {
-            if (!Directory.Exists(basepath)) {
-                throw new JournalException("Invalid base path, path could not be found");
-            }
-            this.ScanFiles();
-        }
-
-        public void ScanFiles() { 
-            var files = Directory.EnumerateFiles(basepath);
-
-            journalfiles.Clear();
-
-            foreach (var file in files) {
-                string full = Path.Combine(basepath, file);
-                try {
-                    JournalFile journalfile = new JournalFile(full);
-                    journalfiles.Add(journalfile);
-                } catch (JournalException) {
-                    /* invalid journal file, or one of the other json files in there */
-                    continue;
-                }
-            }
-
-            journalfiles.Sort();
-        }
-    }
-}

Journal/RedeemVoucherEntry.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class RedeemVoucherEntry : Entry {
-        private int amount = 0;
-        private string type = null;
-        protected override void Initialise() {
-            amount = JSON.Value<int>("Amount");
-            type = JSON.Value<string>("Type");
-        }
-
-        public int Amount => amount;
-        public string Type => type;
-    }
-}

Journal/SellMicroResourcesEntry.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NonaBGS.Journal {
-    public class SellMicroResourcesEntry : Entry {
-        private int price;
-
-        protected override void Initialise() {
-            price = JSON.Value<int>("Price");
-        }
-
-        public int Price => price;
-    }
-}

MainWindow.xaml

@@ -37,6 +37,8 @@
                         <abc:AutoCompleteTextBox x:Name="faction" Margin="0" VerticalAlignment="Center" MinWidth="120" MinHeight="22" KeyDown="Filter_KeyDown"/>
                         <Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
                         <Button x:Name="AddFilter" Content="Add Objective" VerticalAlignment="Stretch" Click="AddFilter_Click" Margin="0,0,0,0.286" RenderTransformOrigin="0.5,0.505"/>
+                        <Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
+                        <Button x:Name="AddCombatZone" Content="Add Combat Zone Win" VerticalAlignment="Stretch" Margin="0,0,0,0.286" RenderTransformOrigin="0.5,0.505" Click="AddCombatZone_Click"/>
                     </ToolBar>
                     <ToolBar VerticalAlignment="Top" Grid.Row="1" Width="Auto" Margin="0,0,0,0" Height="Auto" Grid.ColumnSpan="3" HorizontalAlignment="Left">
                         <Button x:Name="ParseJournal" Content="Parse Journal" VerticalAlignment="Center" Click="ParseJournal_Click" HorizontalAlignment="Center"/>

MainWindow.xaml.cs

@@ -5,7 +5,8 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using Ookii.Dialogs.Wpf;
 
-using NonaBGS.Journal;
+using EDJournal;
+
 using NonaBGS.BGS;
 using NonaBGS.Util;
 using NonaBGS.EDDB;
@@ -240,5 +241,39 @@ namespace NonaBGS {
             dialog.StartDownload();
             dialog.ShowDialog();
         }
+
+        private void AddCombatZone_Click(object sender, RoutedEventArgs e) {
+            if (entries.SelectedItem == null) {
+                return;
+            }
+
+            TreeViewItem item = entries.SelectedItem as TreeViewItem;
+            var obj = item.Tag;
+
+            if (obj.GetType() != typeof(Objective)) {
+                return;
+            }
+
+            Objective objective = obj as Objective;
+
+            CombatZoneDialog dialog = new CombatZoneDialog() { Owner = this };
+
+            if (!(dialog.ShowDialog() ?? false)) {
+                return;
+            }
+
+            CombatZone zone = new CombatZone();
+
+            zone.Faction = objective.Faction;
+            zone.System = objective.System;
+            zone.Station = objective.Station;
+
+            zone.Grade = dialog.Grade;
+            zone.Type = dialog.Type;
+            zone.Amount = dialog.Amount;
+
+            objective.LogEntries.Add(zone);
+            RefreshObjectives();
+        }
     }
 }

nonabgs.csproj

@@ -41,6 +41,9 @@
     <Reference Include="AutoCompleteTextBox, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\AutoCompleteTextBox.1.1.1\lib\net472\AutoCompleteTextBox.dll</HintPath>
     </Reference>
+    <Reference Include="EDJournal">
+      <HintPath>..\edjournal\bin\Debug\EDJournal.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -73,14 +76,9 @@
     <Compile Include="BGS\DiscordLogGenerator.cs" />
     <Compile Include="BGS\NonaDiscordLog.cs" />
     <Compile Include="BGS\SellMicroResources.cs" />
+    <Compile Include="BGS\FactionKillBonds.cs" />
     <Compile Include="EDDB\PopulatedSystems.cs" />
     <Compile Include="EDDB\Stations.cs" />
-    <Compile Include="Journal\Credits.cs" />
-    <Compile Include="Journal\EliteDangerous.cs" />
-    <Compile Include="Journal\MarketSellEntry.cs" />
-    <Compile Include="Journal\MultiSellExplorationDataEntry.cs" />
-    <Compile Include="Journal\RedeemVoucherEntry.cs" />
-    <Compile Include="Journal\SellMicroResourcesEntry.cs" />
     <Compile Include="UI\StationSuggestionProvider.cs" />
     <Compile Include="UI\SystemSuggestionProvider.cs" />
     <Compile Include="Util\AppConfig.cs" />
@@ -89,6 +87,9 @@
     <Compile Include="ProgressDialog.xaml.cs">
       <DependentUpon>ProgressDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="CombatZoneDialog.xaml.cs">
+      <DependentUpon>CombatZoneDialog.xaml</DependentUpon>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -103,15 +104,7 @@
     <Compile Include="BGS\CombatZone.cs" />
     <Compile Include="BGS\LogEntry.cs" />
     <Compile Include="BGS\MissionCompleted.cs" />
-    <Compile Include="Journal\DockedEntry.cs" />
-    <Compile Include="Journal\Entry.cs" />
     <Compile Include="BGS\Objective.cs" />
-    <Compile Include="Journal\Events.cs" />
-    <Compile Include="Journal\FSDJumpEntry.cs" />
-    <Compile Include="Journal\JournalException.cs" />
-    <Compile Include="Journal\JournalFile.cs" />
-    <Compile Include="Journal\MissionCompletedEntry.cs" />
-    <Compile Include="Journal\PlayerJournal.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -120,6 +113,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="CombatZoneDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">

nonabgs.sln

@@ -15,6 +15,10 @@ Global
 		{73BFB315-C808-40E7-8D69-B651F875880C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73BFB315-C808-40E7-8D69-B651F875880C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73BFB315-C808-40E7-8D69-B651F875880C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C84BD6A6-55AF-48F0-A73E-51D1FAF65BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C84BD6A6-55AF-48F0-A73E-51D1FAF65BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C84BD6A6-55AF-48F0-A73E-51D1FAF65BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C84BD6A6-55AF-48F0-A73E-51D1FAF65BC2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE