EDPlayerJournal/BGS/CombatZone.cs

@@ -29,6 +29,7 @@ public class CombatZone : Transaction {
     }
 
     public override string ToString() {
-        return string.Format("Won {0} x {1} {2} Combat Zone(s)", Amount, Grade, Type);
+        return string.Format("Won {0} x {1} {2} Combat Zone(s) for {3}",
+            Amount, Grade, Type, Faction);
     }
 }

EDPlayerJournal/BGS/TransactionParser.cs

@@ -319,30 +319,16 @@ internal class CommitCrimeParser : TransactionParserPart {
             victim = "Unknown";
         }
 
-        string faction;
-
-        if (entry.IsCrime(CrimeTypes.OnFootMurder)) {
-            if (entry.Faction == null) {
-                transactions.AddIncomplete(
-                    new FoulMurder(),
-                    "On foot murder victim did not have a faction"
-                    );
-                return;
-            }
-            // On foot murders are different, there the faction is
-            // the faction the NPC belonged too
-            faction = entry.Faction;
-        } else {
-            if (!context.NPCFaction.ContainsKey(victim)) {
-                transactions.AddIncomplete(
-                    new FoulMurder(),
-                    "Crime victim was not properly scanned."
-                    );
-                return;
-            }
-            faction = context.NPCFaction[victim];
+        if (!context.NPCFaction.ContainsKey(victim)) {
+            transactions.AddIncomplete(
+                new FoulMurder(),
+                "Crime victim was not properly scanned."
+                );
+            return;
         }
 
+        string faction = context.NPCFaction[victim];
+
         transactions.Add(new FoulMurder(entry) {
             System = context.CurrentSystem,
             Faction = faction,

EDPlayerJournal/Entries/CommitCrimeEntry.cs

@@ -19,12 +19,4 @@ public class CommitCrimeEntry : Entry {
     public bool IsMurder {
         get { return CrimeType?.CompareTo(CrimeTypes.Murder) == 0 || CrimeType?.CompareTo(CrimeTypes.OnFootMurder) == 0; }
     }
-
-    public bool IsCrime(string crimetype) {
-        if (CrimeType == null) {
-            return false;
-        }
-
-        return string.Compare(CrimeType, crimetype) == 0;
-    }
 }

EliteBGS/LogGenerator/MurderFormat.cs

@@ -1,48 +1,6 @@
 using EDPlayerJournal.BGS;
-using System.Collections.Generic;
-using System.Text;
-using System;
-using System.Linq;
-using EDPlayerJournal;
 
 namespace EliteBGS.LogGenerator;
 
-public class MurderFormat : LogFormatter {
-    public string GenerateLog(Objective objective) {
-        var logs = objective
-            .EnabledOfType<FoulMurder>()
-            .GroupBy(x => x.CrimeType)
-            .ToDictionary(x => x.Key, x => x.ToList())
-            ;
-        StringBuilder builder = new StringBuilder();
-
-        if (logs == null || logs.Count() <= 0) {
-            return "";
-        }
-
-        foreach (var log in logs) {
-            string type;
-
-            if (string.Compare(log.Key, CrimeTypes.Murder) == 0) {
-                if (log.Value.Count > 1) {
-                    type = "ships";
-                } else {
-                    type = "ship";
-                }
-            } else {
-                if (log.Value.Count > 1) {
-                    type = "people";
-                } else {
-                    type = "person";
-                }
-            }
-            builder.AppendFormat("Murdered {0} {1} (Bounties: {2}, Fines: {3})",
-                log.Value.Count, type,
-                log.Value.Sum(x => x.Bounties),
-                log.Value.Sum(x => x.Fines)
-                );
-        }
-
-        return builder.ToString();
-    }
+public class MurderFormat : GenericFormat<FoulMurder> {
 }