From e84d3ed80820e4a906886e24558a730748471595 Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Tue, 28 Sep 2021 14:14:37 +0200
Subject: [PATCH] implement faction kill bonds

---
 Entry.cs                 |  1 +
 Events.cs                |  1 +
 FactionKillBondEntry.cs  | 19 +++++++++++++++++++
 MissionCompletedEntry.cs |  5 +++--
 edjournal.csproj         |  1 +
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 FactionKillBondEntry.cs

diff --git a/Entry.cs b/Entry.cs
index 9f4c977..33eab43 100644
--- a/Entry.cs
+++ b/Entry.cs
@@ -16,6 +16,7 @@ namespace EDJournal {
             { Events.CommitCrime, typeof(CommitCrimeEntry) },
             { Events.Died, typeof(DiedEntry) },
             { Events.Docked, typeof(DockedEntry) },
+            { Events.FactionKillBond, typeof(FactionKillBondEntry) },
             { Events.FSDJump, typeof(FSDJumpEntry) },
             { Events.HullDamage, typeof(HullDamageEntry) },
             { Events.MarketSell, typeof(MarketSellEntry) },
diff --git a/Events.cs b/Events.cs
index e8d3f41..585c989 100644
--- a/Events.cs
+++ b/Events.cs
@@ -4,6 +4,7 @@
         public static readonly string CommitCrime = "CommitCrime";
         public static readonly string Died = "Died";
         public static readonly string Docked = "Docked";
+        public static readonly string FactionKillBond = "FactionKillBond";
         public static readonly string FighterDestroyed = "FighterDestroyed";
         public static readonly string FSDJump = "FSDJump";
         public static readonly string HullDamage = "HullDamage";
diff --git a/FactionKillBondEntry.cs b/FactionKillBondEntry.cs
new file mode 100644
index 0000000..1d641f0
--- /dev/null
+++ b/FactionKillBondEntry.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EDJournal {
+    public class FactionKillBondEntry : Entry {
+        public int Reward { get; set; }
+        public string AwardingFaction { get; set; }
+        public string VictimFaction { get; set; }
+
+        protected override void Initialise() {
+            Reward = JSON.Value<int?>("Reward") ?? 0;
+            AwardingFaction = JSON.Value<string>("AwardingFaction") ?? "";
+            VictimFaction = JSON.Value<string>("VictimFaction") ?? "";
+        }
+    }
+}
diff --git a/MissionCompletedEntry.cs b/MissionCompletedEntry.cs
index 9338ebf..09dd4b5 100644
--- a/MissionCompletedEntry.cs
+++ b/MissionCompletedEntry.cs
@@ -19,8 +19,8 @@ namespace EDJournal {
             { "Mission_AltruismCredits_Bust_name", "Donate Credits (Bust)" },
             { "Mission_AltruismCredits_name", "Donate Credits" },
             { "Mission_Collect_Bust_name", "Provide (Bust)" },
-            { "Mission_Collect_CivilUnrest_name", "Provide (Civil Unrest)" },
             { "Mission_Collect_CivilLiberty_name", "Provide (Civil Liberty)" },
+            { "Mission_Collect_CivilUnrest_name", "Provide (Civil Unrest)" },
             { "Mission_Collect_Famine_name", "Provide (Famine)" },
             { "Mission_Collect_name", "Provide" },
             { "Mission_Courier_Democracy_name", "Courier (Democracy)" },
@@ -38,10 +38,11 @@ namespace EDJournal {
             { "Mission_Delivery_Retreat_name", "Delivery (Retreat)" },
             { "Mission_Hack_BLOPS_Boom_name", "Hack Megaship (Black Ops)" },
             { "Mission_HackMegaship_name", "Hack Megaship" },
+            { "Mission_Massacre_Conflict_CivilWar_name", "Massacre (Civil War)" },
             { "Mission_Massacre_name", "Massacre" },
             { "Mission_Massacre_RankEmp_name", "Massacre (Imperial Navy)" },
-            { "Mission_MassacreWing_name", "Massacre (Wing)" },
             { "Mission_MassacreWing_Legal_Bust_name", "Massacre (Wing) (Bust)" },
+            { "Mission_MassacreWing_name", "Massacre (Wing)" },
             { "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)" },
diff --git a/edjournal.csproj b/edjournal.csproj
index 0ef60ac..53c60e3 100644
--- a/edjournal.csproj
+++ b/edjournal.csproj
@@ -47,6 +47,7 @@
     <Compile Include="EliteDangerous.cs" />
     <Compile Include="Entry.cs" />
     <Compile Include="Events.cs" />
+    <Compile Include="FactionKillBondEntry.cs" />
     <Compile Include="FSDJumpEntry.cs" />
     <Compile Include="HullDamageEntry.cs" />
     <Compile Include="JournalException.cs" />