improved support for odyssey

improved credit calculation
mhwlng · May 20, 2021 · 4486bef · 4486bef
1 parent d4c1509
commit 4486bef
Show file tree

Hide file tree

Showing 21 changed files with 691 additions and 175 deletions.
diff --git a/EDEngineer/EDEngineer/Resources/Data/entryData.json b/EDEngineer/EDEngineer/Resources/Data/entryData.json
@@ -1187,8 +1187,7 @@
     "OriginDetails": [
       "Surface prospecting"
     ],
-    "Group": "Category3",
-    "MaximumCapacity": 100
+    "Group": "Category3"
   },
   {
     "Name": "Salvaged Alloys",

diff --git a/Elite/App.xaml.cs b/Elite/App.xaml.cs
@@ -51,6 +51,7 @@ public partial class App : Application
         public static JournalWatcher journalWatcher;
         public static CargoWatcher cargoWatcher;
         public static NavRouteWatcher navRouteWatcher;
+        public static BackPackWatcher backPackWatcher;
 
         private static StatusWatcher _statusWatcher;
 
@@ -578,6 +579,13 @@ protected override void OnStartup(StartupEventArgs evtArgs)
 
                 navRouteWatcher.StartWatching();
 
+                splashScreen.Dispatcher.Invoke(() => splashScreen.ProgressText.Text = "Starting Elite BackPack Watcher...");
+                backPackWatcher = new BackPackWatcher(path);
+
+                backPackWatcher.BackPackUpdated += Data.HandleBackPackEvent;
+
+                backPackWatcher.StartWatching();
+
                 splashScreen.Dispatcher.Invoke(() => splashScreen.ProgressText.Text = "Initializing FIP...");
                 if (!FipHandler.Initialize())
                 {
@@ -692,6 +700,10 @@ protected override void OnExit(ExitEventArgs e)
 
             navRouteWatcher.StopWatching();
 
+            backPackWatcher.BackPackUpdated -= Data.HandleBackPackEvent;
+
+            backPackWatcher.StopWatching();
+
             FipHandler.Close();
 
             _notifyIcon.Dispose(); //the icon would clean up automatically, but this is cleaner