diff --git a/CombatZoneDialog.xaml b/CombatZoneDialog.xaml index 8bc6c2e..c96769c 100644 --- a/CombatZoneDialog.xaml +++ b/CombatZoneDialog.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:EliteBGS" 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"> diff --git a/EliteBGS.csproj b/EliteBGS.csproj index 34f5779..7d5e747 100644 --- a/EliteBGS.csproj +++ b/EliteBGS.csproj @@ -38,7 +38,7 @@ EliteBGSApplication - NONA.ico + EliteBGS.ico @@ -185,13 +185,12 @@ - - + - + \ No newline at end of file diff --git a/EliteBGS.ico b/EliteBGS.ico new file mode 100644 index 0000000..f2b0958 Binary files /dev/null and b/EliteBGS.ico differ diff --git a/MainWindow.xaml b/MainWindow.xaml index d172406..3223eb5 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -7,7 +7,7 @@ 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" 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"> diff --git a/NONA.ico b/NONA.ico deleted file mode 100644 index c3072de..0000000 Binary files a/NONA.ico and /dev/null differ diff --git a/ProgressDialog.xaml b/ProgressDialog.xaml index bbbfc3f..c7cc8a2 100644 --- a/ProgressDialog.xaml +++ b/ProgressDialog.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:EliteBGS" mc:Ignorable="d" - Title="Progress" Height="100" Width="450" Icon="NONA.ico"> + Title="Progress" Height="100" Width="450" Icon="EliteBGS.ico"> diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 8a86abb..74df377 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -7,11 +7,11 @@ using System.Windows; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NoNaBGS")] +[assembly: AssemblyTitle("EliteBGS")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NoNaBGS")] +[assembly: AssemblyProduct("EliteBGS")] [assembly: AssemblyCopyright("Copyright © 2021 by Florian Stinglmayr")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 9391b55..0b1a21e 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ namespace EliteBGS.Properties { resourceCulture = value; } } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon EliteBGS { + get { + object obj = ResourceManager.GetObject("EliteBGS", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } } } diff --git a/Properties/Resources.resx b/Properties/Resources.resx index af7dbeb..7119902 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\EliteBGS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/README.md b/README.md index dfd628a..11b52a1 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ -# NonaBGS +# EliteBGS -This tool is meant to help people contributing to the Nova Navy BGS effor to create -BGS reports. The tool allows you to configure BGS objectives, and will then parse your -player journal for tasks you completed relating to that BGS objective. Once the JSON -player journal has been parsed, you may then generate a BGS report for the Nova Navy -discord. +This tool is meant to help people contributing to the BGS effort to create BGS reports. +The tool allows you to configure BGS objectives, and will then parse your player journal +for tasks you completed relating to that BGS objective. Once the JSON player journal has +been parsed, you may then generate a BGS report discord logs. -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/). @@ -15,9 +14,8 @@ Binary downloads can be found here: [https://bgs.n0la.org/](https://bgs.n0la.org ![Main Window Objectives](main-objectives.png) 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 -information in the Nova Navy discord, in the "daily objectives" channel. Objectives can -be deleted by selecting them and pressing the "DEL" key. +faction, and, optionally, a station. Then press "Add Objective". Objectives can be deleted +by selecting them and pressing the "DEL" key. 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 @@ -50,9 +48,8 @@ Once you are satisfied with the result, move to "Discord Report" tab, and click ![Generated Report](main-report.png) -The resulting discord report is kept in the Nova Navy format. Before you copy/paste it into the -Nova Navy discord, you should check the log. You can of course edit it, if something is wrong -or the tool itself missed something. +Before you copy/paste it into the discord of your squadron, you should check the log. You can of +course edit it, if something is wrong or the tool itself missed something. ## 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 -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 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 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 -helpful if you included the JSON player journal. This player journal can be found here: +missed a task you have done, please contact `Hekateh` on the Elite Dangerous community discord. +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\ @@ -120,6 +117,6 @@ And of course, `Newtonsoft.Json` as the JSON parser. ## 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. \ No newline at end of file diff --git a/Resources.Designer.cs b/Resources.Designer.cs index f86b9ab..a0a6d9d 100644 --- a/Resources.Designer.cs +++ b/Resources.Designer.cs @@ -63,9 +63,9 @@ namespace EliteBGS { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon NONA { + internal static System.Drawing.Icon EliteBGS { get { - object obj = ResourceManager.GetObject("NONA", resourceCulture); + object obj = ResourceManager.GetObject("EliteBGS", resourceCulture); return ((System.Drawing.Icon)(obj)); } } diff --git a/Resources.resx b/Resources.resx index 6d1af6f..ac522fb 100644 --- a/Resources.resx +++ b/Resources.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Resources\NONA.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + EliteBGS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Resources/EliteBGS.ico b/Resources/EliteBGS.ico new file mode 100644 index 0000000..5d06b9f Binary files /dev/null and b/Resources/EliteBGS.ico differ diff --git a/Resources/NONA.ico b/Resources/NONA.ico deleted file mode 100644 index c3072de..0000000 Binary files a/Resources/NONA.ico and /dev/null differ diff --git a/logo_v4.png b/logo_v4.png index f6c1e76..4d22059 100644 Binary files a/logo_v4.png and b/logo_v4.png differ diff --git a/logo_v4_bg.png b/logo_v4_bg.png deleted file mode 100644 index d343345..0000000 Binary files a/logo_v4_bg.png and /dev/null differ