fix problem with prices due to data format change on inara

add PRELIMINARY odyssey functionality
mhwlng · May 13, 2021 · 6979d60 · 6979d60
1 parent 8870cb4
commit 6979d60
Show file tree

Hide file tree

Showing 103 changed files with 2,308 additions and 179 deletions.
diff --git a/EDEngineer/EDEngineer.csproj b/EDEngineer/EDEngineer.csproj
@@ -36,8 +36,8 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -67,9 +67,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
     <None Include="EDEngineer\Resources\Data\blueprints.json" />
     <None Include="EDEngineer\Resources\Data\entryData.json" />
+    <None Include="packages.config" />
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup />

diff --git a/EDEngineer/EDEngineer/Resources/Data/blueprints.json b/EDEngineer/EDEngineer/Resources/Data/blueprints.json
@@ -29905,7 +29905,7 @@
   },
   {
     "Type": "Heat Sink Launcher",
-    "Name": "50% Refill",
+    "Name": "100% Refill",
     "Engineers": [
       "@Synthesis"
     ],
@@ -40571,5 +40571,34 @@
         "Size": 18
       }
     ]
+  },
+  {
+    "Type": "Human",
+    "Name": "Engineered Missile Rack V1",
+    "Engineers": [
+      "@Technology"
+    ],
+    "Ingredients": [
+      {
+        "Name": "Proto Radiolic Alloys",
+        "Size": 16
+      },
+      {
+        "Name": "Phosphorus",
+        "Size": 28
+      },
+      {
+        "Name": "Osmium",
+        "Size": 10
+      },
+      {
+        "Name": "Conductive Ceramics",
+        "Size": 24
+      },
+      {
+        "Name": "Hybrid Capacitors",
+        "Size": 26
+      }
+    ]
   }
-]
+]
diff --git a/EDEngineer/packages.config b/EDEngineer/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
 </packages>
diff --git a/Elite/App.xaml.cs b/Elite/App.xaml.cs
@@ -294,6 +294,11 @@ protected override void OnStartup(StartupEventArgs evtArgs)
                 }
             }
 
+            var defaultFilter = @"Journal.*.log";
+//#if DEBUG
+            //defaultFilter = @"JournalAlpha.*.log";
+//#endif
+
             //create the notifyicon (it's a resource declared in NotifyIconResources.xaml
             _notifyIcon = (TaskbarIcon)FindResource("NotifyIcon");
 
@@ -345,6 +350,9 @@ protected override void OnStartup(StartupEventArgs evtArgs)
                 Engine.Razor.Compile("missions.cshtml", null);
                 Engine.Razor.Compile("events.cshtml", null);
 
+                Engine.Razor.Compile("backpack.cshtml", null);
+                Engine.Razor.Compile("shiplocker.cshtml", null);
+
                 CssData = TheArtOfDev.HtmlRenderer.WinForms.HtmlRender.ParseStyleSheet(
                     File.ReadAllText(Path.Combine(ExePath, "Templates\\styles.css")), true);
 
@@ -366,7 +374,7 @@ protected override void OnStartup(StartupEventArgs evtArgs)
                 RefreshJson(splashScreen);
 
                 splashScreen.Dispatcher.Invoke(() => splashScreen.ProgressText.Text = "Loading History...");
-                var path = History.GetEliteHistory();
+                var path = History.GetEliteHistory(defaultFilter);
 
                 splashScreen.Dispatcher.Invoke(() => splashScreen.ProgressText.Text = "Getting Shopping List from EDEngineer...");
                 Engineer.GetCommanderName();
@@ -549,7 +557,8 @@ protected override void OnStartup(StartupEventArgs evtArgs)
                 _statusWatcher.StartWatching();
 
                 splashScreen.Dispatcher.Invoke(() => splashScreen.ProgressText.Text = "Starting Elite Journal Watcher...");
-                journalWatcher = new JournalWatcher(path);
+
+                journalWatcher = new JournalWatcher(path, defaultFilter);
 
                 journalWatcher.AllEventHandler += Data.HandleEliteEvents;
 

diff --git a/Elite/Cargo.cs b/Elite/Cargo.cs
@@ -13,7 +13,7 @@ public class CargoItem
             public int Count { get; set; }
             public int Stolen { get; set; }
 
-            public long MissionID { get; set; }
+            public string MissionID { get; set; }
 
             public string MissionName { get; set; } // only filled in FipPanel.cs
             public string System { get; set; } // only filled in FipPanel.cs