switch from no longer existing eddb to edsm and spansh data sources

removed mining related prices
mhwlng · Apr 10, 2023 · 983cd75 · 983cd75
1 parent 567554c
commit 983cd75
Show file tree

Hide file tree

Showing 28 changed files with 807 additions and 956 deletions.
diff --git a/EDEngineer/EDEngineer.csproj b/EDEngineer/EDEngineer.csproj
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/EDEngineer/EDEngineer/Resources/Data/blueprints.json b/EDEngineer/EDEngineer/Resources/Data/blueprints.json
@@ -6423,6 +6423,38 @@
     "Grade": 5,
     "CoriolisGuid": "d9306721-43a4-45cd-b225-ac9174da4d13"
   },
+  {
+    "Type": "Heat Sink Launcher",
+    "Name": "Modified Heat Sink Launcher",
+    "Engineers": [
+      "@Technology"
+    ],
+    "Ingredients": [
+      {
+        "Name": "Mechanical Scrap",
+        "Size": 8
+      },
+      {
+        "Name": "Niobium",
+        "Size": 6
+      },
+      {
+        "Name": "Vanadium",
+        "Size": 6
+      },
+      {
+        "Name": "Mechanical Components",
+        "Size": 4
+      }
+    ],
+    "Effects": [
+      {
+        "Effect": "+100%",
+        "Property": "Capacity",
+        "IsGood": true
+      }
+    ]
+  },
   {
     "Type": "Heat Sink Launcher",
     "Name": "Reinforced",
@@ -18233,7 +18265,8 @@
         "IsGood": false
       }
     ],
-    "Grade": 5
+    "Grade": 5,
+    "CoriolisGuid": "dd804ba4-5186-44b5-a096-6490b5806165"
   },
   {
     "Type": "Fuel Transfer Limpet Controller",
@@ -34289,6 +34322,31 @@
       }
     ]
   },
+  {
+    "Type": "Human",
+    "Name": "Sirius Modified Heat Sink Launcher",
+    "Engineers": [
+      "@Technology"
+    ],
+    "Ingredients": [
+      {
+        "Name": "Mechanical Components",
+        "Size": 5
+      },
+      {
+        "Name": "Mechanical Scrap",
+        "Size": 8
+      },
+      {
+        "Name": "Niobium",
+        "Size": 6
+      },
+      {
+        "Name": "Vanadium",
+        "Size": 6
+      }
+    ]
+  },
   {
     "Type": "Guardian",
     "Name": "Guardian Gauss Cannon (Fixed, Medium)",
@@ -41201,7 +41259,7 @@
       },
       {
         "Name": "Circuit Board",
-        "Size": 3
+        "Size": 5
       }
     ],
     "Effects": []

diff --git a/EDEngineer/EDEngineer/Resources/Data/entryData.json b/EDEngineer/EDEngineer/Resources/Data/entryData.json
@@ -1196,7 +1196,8 @@
     "OriginDetails": [
       "Surface prospecting"
     ],
-    "Group": "Category3"
+    "Group": "Category3",
+    "MaximumCapacity": 150
   },
   {
     "Name": "Salvaged Alloys",
@@ -1795,6 +1796,17 @@
     ],
     "Group": "ThargoidShip"
   },
+  {
+    "Name": "Thargoid Interdiction Telemetry",
+    "Rarity": "VeryRare",
+    "FormattedName": "tg_interdictiondata",
+    "Kind": "Data",
+    "OriginDetails": [
+      "Ship scanning (Thargoid interceptors)"
+    ],
+    "Group": "ThargoidShip",
+    "MaximumCapacity": 200
+  },
   {
     "Name": "Guardian Weapon Blueprint Segment",
     "Rarity": "VeryRare",

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="13.0.2" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
 </packages>
diff --git a/Elite/CnbSystems.cs b/Elite/CnbSystems.cs
@@ -41,12 +41,6 @@ public class CnbSystemData
             [DefaultValue(0)]
             public long SystemPopulation { get; set; }
 
-            [JsonProperty("powerplaystate")]
-            public string PowerplayState { get; set; }
-
-            [JsonProperty("powers")]
-            public string Powers { get; set; }
-
             [JsonProperty("allegiance")]
             public string Allegiance { get; set; }
 
@@ -55,11 +49,7 @@ public class CnbSystemData
 
             [JsonProperty("government")]
             public string Government { get; set; }
-
-            [JsonProperty("controlling_minor_faction")]
-            public string ControllingMinorFaction { get; set; }
-
-
+
             [JsonIgnore]
             public double Distance { get; set; }
 

diff --git a/Elite/Data.cs b/Elite/Data.cs
@@ -24,14 +24,14 @@ public class Data
         };
 
 
-        public static Dictionary<MiningStations.MaterialTypes, List<MiningStations.MiningStationData>> NearbyMiningStationsList = new Dictionary<MiningStations.MaterialTypes, List<MiningStations.MiningStationData>>
+       /* public static Dictionary<MiningStations.MaterialTypes, List<MiningStations.MiningStationData>> NearbyMiningStationsList = new Dictionary<MiningStations.MaterialTypes, List<MiningStations.MiningStationData>>
         {
             {MiningStations.MaterialTypes.Painite, new List<MiningStations.MiningStationData>()},
             {MiningStations.MaterialTypes.LTD, new List<MiningStations.MiningStationData>()},
             {MiningStations.MaterialTypes.Platinum, new List<MiningStations.MiningStationData>()},
             {MiningStations.MaterialTypes.TritiumBuy, new List<MiningStations.MiningStationData>()},
             {MiningStations.MaterialTypes.TritiumSell, new List<MiningStations.MiningStationData>()}
-        };
+        };*/
 
         public static Dictionary<Station.PoiTypes, List<StationData>> NearbyStationList = new Dictionary<Station.PoiTypes, List<StationData>>
         {
@@ -227,11 +227,11 @@ public static void HandleJson()
                 NearbyHotspotSystemsList[HotspotSystems.MaterialTypes.LTD] = HotspotSystems.GetNearestHotspotSystems(LocationData.StarPos, HotspotSystems.FullHotspotSystemsList[HotspotSystems.MaterialTypes.LTD]);
                 NearbyHotspotSystemsList[HotspotSystems.MaterialTypes.Platinum] = HotspotSystems.GetNearestHotspotSystems(LocationData.StarPos, HotspotSystems.FullHotspotSystemsList[HotspotSystems.MaterialTypes.Platinum]);
 
-                NearbyMiningStationsList[MiningStations.MaterialTypes.Painite] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.Painite], true);
-                NearbyMiningStationsList[MiningStations.MaterialTypes.LTD] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.LTD], true);
-                NearbyMiningStationsList[MiningStations.MaterialTypes.Platinum] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.Platinum], true);
-                NearbyMiningStationsList[MiningStations.MaterialTypes.TritiumBuy] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.TritiumBuy], false);
-                NearbyMiningStationsList[MiningStations.MaterialTypes.TritiumSell] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.TritiumSell], true);
+                //NearbyMiningStationsList[MiningStations.MaterialTypes.Painite] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.Painite], true);
+                //NearbyMiningStationsList[MiningStations.MaterialTypes.LTD] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.LTD], true);
+                //NearbyMiningStationsList[MiningStations.MaterialTypes.Platinum] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.Platinum], true);
+                //NearbyMiningStationsList[MiningStations.MaterialTypes.TritiumBuy] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.TritiumBuy], false);
+                //NearbyMiningStationsList[MiningStations.MaterialTypes.TritiumSell] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.TritiumSell], true);
 
                 EngineersList = Station.UpdateEngineersLocation(LocationData.StarPos, EngineersList);
 

diff --git a/Elite/Elite.csproj b/Elite/Elite.csproj
@@ -105,7 +105,7 @@
       <HintPath>..\packages\NAudio.WinMM.2.1.0\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -483,7 +483,7 @@
     <Content Include="Templates\images\powers\Archon Delaine.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Templates\images\powers\Arissa Lavigny-Duval.png">
+    <Content Include="Templates\images\powers\A. Lavigny-Duval.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Templates\images\powers\Denton Patreus.png">

diff --git a/Elite/FipPanel.cs b/Elite/FipPanel.cs
@@ -1997,7 +1997,7 @@ public void RefreshDevicePage(bool mustRender = true)
                                 CheckCardSelectionLimits(2);
                                 break;
                             case LcdTab.Mining:
-                                CheckCardSelectionLimits(7);
+                                CheckCardSelectionLimits(2); //''7);
                                 break;
                             case LcdTab.HWInfo:
                                 CheckCardSelectionLimits(1);
@@ -2603,9 +2603,9 @@ public void RefreshDevicePage(bool mustRender = true)
                                                     CurrentPage = _currentPage,
                                                     CurrentCard = CurrentCard[(int)CurrentTab],
 
-                                                    NearbyHotspotSystemsList = Data.NearbyHotspotSystemsList,
+                                                    NearbyHotspotSystemsList = Data.NearbyHotspotSystemsList//,
 
-                                                    NearbyMiningStationsList = Data.NearbyMiningStationsList
+                                                    //NearbyMiningStationsList = Data.NearbyMiningStationsList
 
                                                 });
                                         }