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

some more de-NONA-fication

Browse Source
This commit is contained in:
Florian Stinglmayr 2021-11-11 17:42:59 +01:00
parent af347a30bb
commit 701a791a39
16 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CombatZoneDialog.xaml
View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:EliteBGS" xmlns:local="clr-namespace:EliteBGS"
mc:Ignorable="d" mc:Ignorable="d"
Title="Add Combat Zone Wins" Height="150" Width="370" Icon="NONA.ico" WindowStartupLocation="CenterOwner"> Title="Add Combat Zone Wins" Height="150" Width="370" Icon="EliteBGS.ico" WindowStartupLocation="CenterOwner">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>

7
EliteBGS.csproj
View File

@ -38,7 +38,7 @@
<StartupObject>EliteBGSApplication</StartupObject> <StartupObject>EliteBGSApplication</StartupObject>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>NONA.ico</ApplicationIcon> <ApplicationIcon>EliteBGS.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AutoCompleteTextBox, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AutoCompleteTextBox, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
@ -185,13 +185,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="logo_v4.png" /> <Resource Include="logo_v4.png" />
<Resource Include="logo_v4_bg.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\NONA.ico" /> <Resource Include="Resources\EliteBGS.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="NONA.ico" /> <Resource Include="EliteBGS.ico" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

BIN
EliteBGS.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 200 KiB

2
MainWindow.xaml
View File

@ -7,7 +7,7 @@
xmlns:local="clr-namespace:EliteBGS" xmlns:local="clr-namespace:EliteBGS"
xmlns:BGS="clr-namespace:EliteBGS.BGS" xmlns:Util="clr-namespace:EliteBGS.Util" d:DataContext="{d:DesignInstance Type=Util:AppConfig}" x:Name="window" x:Class="EliteBGS.MainWindow" xmlns:BGS="clr-namespace:EliteBGS.BGS" xmlns:Util="clr-namespace:EliteBGS.Util" d:DataContext="{d:DesignInstance Type=Util:AppConfig}" x:Name="window" x:Class="EliteBGS.MainWindow"
mc:Ignorable="d" mc:Ignorable="d"
Title="Elite: Dangerous BGS Helper" Height="520" Width="890" Icon="NONA.ico"> Title="Elite: Dangerous BGS Helper" Height="520" Width="890" Icon="EliteBGS.ico">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>

BIN
NONA.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 200 KiB

2
ProgressDialog.xaml
View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:EliteBGS" xmlns:local="clr-namespace:EliteBGS"
mc:Ignorable="d" mc:Ignorable="d"
Title="Progress" Height="100" Width="450" Icon="NONA.ico"> Title="Progress" Height="100" Width="450" Icon="EliteBGS.ico">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />

4
Properties/AssemblyInfo.cs
View File

@ -7,11 +7,11 @@ using System.Windows;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("NoNaBGS")] [assembly: AssemblyTitle("EliteBGS")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("NoNaBGS")] [assembly: AssemblyProduct("EliteBGS")]
[assembly: AssemblyCopyright("Copyright © 2021 by Florian Stinglmayr")] [assembly: AssemblyCopyright("Copyright © 2021 by Florian Stinglmayr")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]

10
Properties/Resources.Designer.cs generated
View File

@ -59,5 +59,15 @@ namespace EliteBGS.Properties {
resourceCulture = value; resourceCulture = value;
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// </summary>
internal static System.Drawing.Icon EliteBGS {
get {
object obj = ResourceManager.GetObject("EliteBGS", resourceCulture);
return ((System.Drawing.Icon)(obj));
}
}
} }
} }

17
Properties/Resources.resx
View File

@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64 mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
@ -60,6 +60,7 @@
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
@ -68,9 +69,10 @@
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" /> <xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" /> <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="assembly"> <xsd:element name="assembly">
@ -85,9 +87,10 @@
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
@ -109,9 +112,13 @@
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="EliteBGS" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\EliteBGS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

31
README.md
View File

@ -1,12 +1,11 @@
# NonaBGS # EliteBGS
This tool is meant to help people contributing to the Nova Navy BGS effor to create This tool is meant to help people contributing to the BGS effort to create BGS reports.
BGS reports. The tool allows you to configure BGS objectives, and will then parse your The tool allows you to configure BGS objectives, and will then parse your player journal
player journal for tasks you completed relating to that BGS objective. Once the JSON for tasks you completed relating to that BGS objective. Once the JSON player journal has
player journal has been parsed, you may then generate a BGS report for the Nova Navy been parsed, you may then generate a BGS report discord logs.
discord.
Source code is available [here](https://git.aror.org/florian/nonabgs). Source code is available [here](https://git.aror.org/florian/elitebgs).
Binary downloads can be found here: [https://bgs.n0la.org/](https://bgs.n0la.org/). Binary downloads can be found here: [https://bgs.n0la.org/](https://bgs.n0la.org/).
@ -15,9 +14,8 @@ Binary downloads can be found here: [https://bgs.n0la.org/](https://bgs.n0la.org
![Main Window Objectives](main-objectives.png) ![Main Window Objectives](main-objectives.png)
Use the main tab to add objectives to the program. To do this, insert the system name, Use the main tab to add objectives to the program. To do this, insert the system name,
faction, and, optionally, a station. Then press "Add Objective". You can find this faction, and, optionally, a station. Then press "Add Objective". Objectives can be deleted
information in the Nova Navy discord, in the "daily objectives" channel. Objectives can by selecting them and pressing the "DEL" key.
be deleted by selecting them and pressing the "DEL" key.
Once you have your objectives have been configured, you can press "Parse Journal", which Once you have your objectives have been configured, you can press "Parse Journal", which
will check your Elite Dangerous player journal for completed missions. Currently the tool will check your Elite Dangerous player journal for completed missions. Currently the tool
@ -50,9 +48,8 @@ Once you are satisfied with the result, move to "Discord Report" tab, and click
![Generated Report](main-report.png) ![Generated Report](main-report.png)
The resulting discord report is kept in the Nova Navy format. Before you copy/paste it into the Before you copy/paste it into the discord of your squadron, you should check the log. You can of
Nova Navy discord, you should check the log. You can of course edit it, if something is wrong course edit it, if something is wrong or the tool itself missed something.
or the tool itself missed something.
## Known Issues and Bugs ## Known Issues and Bugs
@ -91,7 +88,7 @@ Until this is fixed, please edit the resulting BGS log text, and manually add su
## Use EDDB information ## Use EDDB information
NonaBGS can download information from EDDB to auto complete system- and station names. You can EliteBGS can download information from EDDB to auto complete system- and station names. You can
enable its use in the "Settings". Once enabled, you must also press "Download", to download and enable its use in the "Settings". Once enabled, you must also press "Download", to download and
process the current version of the EDDB database. process the current version of the EDDB database.
@ -101,8 +98,8 @@ best if you don't use this feature if you are on a slow or metered internet conn
## Nothing's Perfect ## Nothing's Perfect
The tool itself is still a work in progress, and it might miss something. If you think the tool The tool itself is still a work in progress, and it might miss something. If you think the tool
missed a task you have done, please contact `CMDR Hekateh` on the Nova Navy discord. It would be missed a task you have done, please contact `Hekateh` on the Elite Dangerous community discord.
helpful if you included the JSON player journal. This player journal can be found here: It would be helpful if you included the JSON player journal. This player journal can be found here:
``` ```
%userprofile%\saved Games\Frontier Developments\Elite Dangerous\ %userprofile%\saved Games\Frontier Developments\Elite Dangerous\
@ -120,6 +117,6 @@ And of course, `Newtonsoft.Json` as the JSON parser.
## About ## About
This tool was made by CMDR Hekateh (Discord: `nola#2457`) of the Nova Navy. This tool was made by CMDR Hekateh (Discord: `nola#2457`) of Vulcan Industrial Ventures.
Long live the Empire. Long live the Empire.

4
Resources.Designer.cs generated
View File

@ -63,9 +63,9 @@ namespace EliteBGS {
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// </summary> /// </summary>
internal static System.Drawing.Icon NONA { internal static System.Drawing.Icon EliteBGS {
get { get {
object obj = ResourceManager.GetObject("NONA", resourceCulture); object obj = ResourceManager.GetObject("EliteBGS", resourceCulture);
return ((System.Drawing.Icon)(obj)); return ((System.Drawing.Icon)(obj));
} }
} }

4
Resources.resx
View File

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="NONA" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="EliteBGS" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\NONA.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>EliteBGS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>

BIN
Resources/EliteBGS.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
Resources/NONA.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 200 KiB

BIN
logo_v4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
logo_v4_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB