BGS/MissionCompleted.cs

@@ -20,15 +20,7 @@ namespace EliteBGS.BGS {
         }
 
         public string Influence {
-            get {
-                MissionCompletedEntry e = (Entries[0] as MissionCompletedEntry);
-
-                if (SystemAddress == 0) {
-                    return e.GetInfluenceForFaction(Faction);
-                } else {
-                    return e.GetInfluenceForFaction(Faction, SystemAddress);
-                }
-            }
+            get { return (Entries[0] as MissionCompletedEntry).GetInfluenceForFaction(Faction); }
         }
 
         public override string ToString() {

BGS/Report.cs

@@ -146,6 +146,7 @@ namespace EliteBGS.BGS {
                             "\" was generated, please report this.");
                     }
 
+                    if (completed.Influences.Count > 1) {
                         foreach (var other in completed.Influences) {
                             string faction = other.Key;
                             if (string.IsNullOrEmpty(faction)) {
@@ -166,6 +167,7 @@ namespace EliteBGS.BGS {
                                 }
                             }
                         }
+                    }
                 } else if (e.Is(Events.MissionAccepted)) {
                     MissionAcceptedEntry accepted = e as MissionAcceptedEntry;
                     acceptedMissions[accepted.MissionID] = accepted;
@@ -264,7 +266,7 @@ namespace EliteBGS.BGS {
                     /* Find all objectives that generally match.
                      */
                     var matches = objectives
-                        .Where(x => x.Matches(entry) >= 3)
+                        .Where(x => x.Matches(entry) > 0)
                         .OrderBy(x => x.Matches(entry))
                         ;
 

EliteBGS.csproj

@@ -186,7 +186,6 @@
     <Content Include="main-objectives.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="TestData\Double-5-Inf.txt" />
     <None Include="TestData\SameInfTwice-Log.txt" />
     <None Include="TestData\SameInfTwice.txt" />
     <None Include="CHANGELOG.md">

LoadEntriesWindow.xaml

@@ -8,7 +8,6 @@
         Title="Load Entries" Height="450" Width="600">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
@@ -17,21 +16,7 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <Label Content="Use this text field to manually load JSON events into the application." Grid.Row="0" Grid.Column="1"/>
-        <TextBox x:Name="Lines" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap" Grid.Row="1" Height="Auto" Grid.Column="0" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Visible" />
-        <Grid Grid.Column="1" Grid.Row="2">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Button x:Name="Load" Content="Load Entries" Grid.Row="0" Margin="5,5,5,5" Height="Auto" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Click="Load_Click" />
-            <Button x:Name="Clear" Content="Clear" Grid.Row="0" Height="Auto" Margin="5,5,5,5" Grid.Column="3" Click="Clear_Click" />
-        </Grid>
+        <TextBox x:Name="Lines" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap" Grid.Row="0" Height="Auto" Grid.Column="0" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Visible" />
+        <Button x:Name="Load" Content="Load Entries" Grid.Row="1" Margin="5,5,5,5" Height="Auto" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Click="Load_Click" />
     </Grid>
 </Window>

LoadEntriesWindow.xaml.cs

@@ -48,9 +48,5 @@ namespace EliteBGS {
                     exception.ToString()));
             }
         }
-
-        private void Clear_Click(object sender, RoutedEventArgs e) {
-            Lines.Clear();
-        }
     }
 }