florian/EliteBGS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: florian:a4f25a2ce366c044bcb7596f43a8b25fff2a1bfc
Branches Tags
florian:master
..
compare: florian:9fc8b028986d190cc3bcb1ed47046d45b98f31e0
Branches Tags
florian:master

No commits in common. "a4f25a2ce366c044bcb7596f43a8b25fff2a1bfc" and "9fc8b028986d190cc3bcb1ed47046d45b98f31e0" have entirely different histories.
a4f25a2ce3 ... 9fc8b02898

6 changed files with 23 additions and 436 deletions
Show Stats Expand all files Collapse all files

10
BGS/MissionCompleted.cs
View File

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

38
BGS/Report.cs
View File

@ -146,23 +146,25 @@ namespace EliteBGS.BGS {
"\" was generated, please report this."); "\" was generated, please report this.");
} }
foreach (var other in completed.Influences) { if (completed.Influences.Count > 1) {
string faction = other.Key; foreach (var other in completed.Influences) {
if (string.IsNullOrEmpty(faction)) { string faction = other.Key;
continue; if (string.IsNullOrEmpty(faction)) {
} continue;
foreach (var influences in other.Value) { }
ulong system_address = influences.Key; foreach (var influences in other.Value) {
if (!faction.Equals(results[0].Faction) || ulong system_address = influences.Key;
(faction.Equals(results[0].Faction) && system_address != current_system_address)) { if (!faction.Equals(results[0].Faction) ||
string system = systems.TryGetValue(system_address, out string sys) ? sys : ""; (faction.Equals(results[0].Faction) && system_address != current_system_address)) {
results.Add(new InfluenceSupport() { string system = systems.TryGetValue(system_address, out string sys) ? sys : "";
Faction = faction, results.Add(new InfluenceSupport() {
Influence = influences.Value, Faction = faction,
System = system, Influence = influences.Value,
SystemAddress = system_address, System = system,
RelevantMission = results[0] as MissionCompleted SystemAddress = system_address,
}); RelevantMission = results[0] as MissionCompleted
});
}
} }
} }
} }
@ -264,7 +266,7 @@ namespace EliteBGS.BGS {
/* Find all objectives that generally match. /* Find all objectives that generally match.
*/ */
var matches = objectives var matches = objectives
.Where(x => x.Matches(entry) >= 3) .Where(x => x.Matches(entry) > 0)
.OrderBy(x => x.Matches(entry)) .OrderBy(x => x.Matches(entry))
; ;

1
EliteBGS.csproj
View File

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

19
LoadEntriesWindow.xaml
View File

@ -8,7 +8,6 @@
Title="Load Entries" Height="450" Width="600"> Title="Load Entries" Height="450" Width="600">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
@ -17,21 +16,7 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </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="0" Height="Auto" Grid.Column="0" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Visible" />
<TextBox x:Name="Lines" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap" Grid.Row="1" 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 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>
</Grid> </Grid>
</Window> </Window>

4
LoadEntriesWindow.xaml.cs
View File

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

387
TestData/Double-5-Inf.txt
View File

File diff suppressed because one or more lines are too long