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

Compare commits

base: florian:8d51a00d577c02564b68ac52704b82b7ad8e6410
Branches Tags
florian:master
..
compare: florian:6d404a99e275eb727a60a677d19a0ef4e9c1014e
Branches Tags
florian:master

No commits in common. "8d51a00d577c02564b68ac52704b82b7ad8e6410" and "6d404a99e275eb727a60a677d19a0ef4e9c1014e" have entirely different histories.
8d51a00d57 ... 6d404a99e2

5 changed files with 8 additions and 23 deletions
Show Stats Expand all files Collapse all files

4
BGS/GenericDiscordLog.cs
View File

@ -235,9 +235,5 @@ namespace EliteBGS.BGS {
return log.ToString();
}
public override string ToString() {
return "Generic Log";
}
}
}

4
BGS/NonaDiscordLog.cs
View File

@ -229,9 +229,5 @@ namespace EliteBGS.BGS {
return log.ToString();
}
public override string ToString() {
return "Nova Navy Log";
}
}
}

6
BGS/Report.cs
View File

@ -109,9 +109,9 @@ namespace EliteBGS.BGS {
acceptedMissions[accepted.MissionID] = accepted;
} else if (e.Is(Events.MissionFailed)) {
var failed = e as MissionFailedEntry;
MissionAcceptedEntry accepted = null;
if (!acceptedMissions.TryGetValue(failed.MissionID, out accepted)) {
OnLog?.Invoke("Mission failed that wasn't accepted in the given time frame, please adjust start date.");
var accepted = acceptedMissions[failed.MissionID];
if (accepted == null) {
OnLog?.Invoke("Mission failed that wasn't accepted, please adjust time frame.");
continue;
}
entry = new MissionFailed(accepted) { Failed = failed, System = current_system };

11
MainWindow.xaml
View File

@ -58,16 +58,13 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="53*"/>
<ColumnDefinition Width="385*"/>
<ColumnDefinition Width="438*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<ToolBar HorizontalAlignment="Left" Height="36" VerticalAlignment="Top" Width="Auto" Grid.ColumnSpan="2">
<ToolBar HorizontalAlignment="Left" Height="36" VerticalAlignment="Top" Width="Auto">
<Button x:Name="GenerateDiscord" Content="Generate Discord Report" VerticalAlignment="Center" Margin="0,0,0,4.857" Click="GenerateDiscord_Click" Height="26"/>
<Separator />
<ComboBox x:Name="LogType" Height="36" Margin="0" VerticalAlignment="Center" Width="140" />
</ToolBar>
<TextBox x:Name="DiscordLog" Height="Auto" TextWrapping="Wrap" FontFamily="Consolas" FontSize="14" Grid.Row="1" Grid.ColumnSpan="3" AcceptsReturn="True" AcceptsTab="True"/>
<TextBox x:Name="DiscordLog" Height="Auto" TextWrapping="Wrap" FontFamily="Consolas" FontSize="14" Grid.Row="1" Grid.ColumnSpan="2" AcceptsReturn="True" AcceptsTab="True"/>
</Grid>
</TabItem>
<TabItem Header="Settings" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="53.7142857142857">

6
MainWindow.xaml.cs
View File

@ -38,10 +38,6 @@ namespace EliteBGS {
report.OnLog += Report_OnLog;
LogType.Items.Add(new NonaDiscordLog());
LogType.Items.Add(new GenericDiscordLog());
LogType.SelectedIndex = 0;
api = new API(config.ConfigPath);
journal = new PlayerJournal(config.Global.JournalLocation);
@ -159,7 +155,7 @@ namespace EliteBGS {
}
private void GenerateDiscord_Click(object sender, RoutedEventArgs e) {
IDiscordLogGenerator discord = LogType.SelectedItem as IDiscordLogGenerator;
GenericDiscordLog discord = new GenericDiscordLog();
string report = discord.GenerateDiscordLog(Report);
DiscordLog.Text = report;