Compare commits
2 Commits
6d404a99e2
...
8d51a00d57
Author | SHA1 | Date | |
---|---|---|---|
8d51a00d57 | |||
69fddcaed6 |
@ -235,5 +235,9 @@ namespace EliteBGS.BGS {
|
|||||||
|
|
||||||
return log.ToString();
|
return log.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString() {
|
||||||
|
return "Generic Log";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -229,5 +229,9 @@ namespace EliteBGS.BGS {
|
|||||||
|
|
||||||
return log.ToString();
|
return log.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString() {
|
||||||
|
return "Nova Navy Log";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -109,9 +109,9 @@ namespace EliteBGS.BGS {
|
|||||||
acceptedMissions[accepted.MissionID] = accepted;
|
acceptedMissions[accepted.MissionID] = accepted;
|
||||||
} else if (e.Is(Events.MissionFailed)) {
|
} else if (e.Is(Events.MissionFailed)) {
|
||||||
var failed = e as MissionFailedEntry;
|
var failed = e as MissionFailedEntry;
|
||||||
var accepted = acceptedMissions[failed.MissionID];
|
MissionAcceptedEntry accepted = null;
|
||||||
if (accepted == null) {
|
if (!acceptedMissions.TryGetValue(failed.MissionID, out accepted)) {
|
||||||
OnLog?.Invoke("Mission failed that wasn't accepted, please adjust time frame.");
|
OnLog?.Invoke("Mission failed that wasn't accepted in the given time frame, please adjust start date.");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
entry = new MissionFailed(accepted) { Failed = failed, System = current_system };
|
entry = new MissionFailed(accepted) { Failed = failed, System = current_system };
|
||||||
|
@ -58,13 +58,16 @@
|
|||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="53*"/>
|
||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="385*"/>
|
||||||
|
<ColumnDefinition Width="438*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<ToolBar HorizontalAlignment="Left" Height="36" VerticalAlignment="Top" Width="Auto">
|
<ToolBar HorizontalAlignment="Left" Height="36" VerticalAlignment="Top" Width="Auto" Grid.ColumnSpan="2">
|
||||||
<Button x:Name="GenerateDiscord" Content="Generate Discord Report" VerticalAlignment="Center" Margin="0,0,0,4.857" Click="GenerateDiscord_Click" Height="26"/>
|
<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>
|
</ToolBar>
|
||||||
<TextBox x:Name="DiscordLog" Height="Auto" TextWrapping="Wrap" FontFamily="Consolas" FontSize="14" Grid.Row="1" Grid.ColumnSpan="2" AcceptsReturn="True" AcceptsTab="True"/>
|
<TextBox x:Name="DiscordLog" Height="Auto" TextWrapping="Wrap" FontFamily="Consolas" FontSize="14" Grid.Row="1" Grid.ColumnSpan="3" AcceptsReturn="True" AcceptsTab="True"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="Settings" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="53.7142857142857">
|
<TabItem Header="Settings" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="53.7142857142857">
|
||||||
|
@ -38,6 +38,10 @@ namespace EliteBGS {
|
|||||||
|
|
||||||
report.OnLog += Report_OnLog;
|
report.OnLog += Report_OnLog;
|
||||||
|
|
||||||
|
LogType.Items.Add(new NonaDiscordLog());
|
||||||
|
LogType.Items.Add(new GenericDiscordLog());
|
||||||
|
LogType.SelectedIndex = 0;
|
||||||
|
|
||||||
api = new API(config.ConfigPath);
|
api = new API(config.ConfigPath);
|
||||||
journal = new PlayerJournal(config.Global.JournalLocation);
|
journal = new PlayerJournal(config.Global.JournalLocation);
|
||||||
|
|
||||||
@ -155,7 +159,7 @@ namespace EliteBGS {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void GenerateDiscord_Click(object sender, RoutedEventArgs e) {
|
private void GenerateDiscord_Click(object sender, RoutedEventArgs e) {
|
||||||
GenericDiscordLog discord = new GenericDiscordLog();
|
IDiscordLogGenerator discord = LogType.SelectedItem as IDiscordLogGenerator;
|
||||||
string report = discord.GenerateDiscordLog(Report);
|
string report = discord.GenerateDiscordLog(Report);
|
||||||
|
|
||||||
DiscordLog.Text = report;
|
DiscordLog.Text = report;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user