Skip to content
This repository was archived by the owner on Mar 7, 2025. It is now read-only.

Commit 983cd75

Browse files
mhwlngmhwlng
committed
switch from no longer existing eddb to edsm and spansh data sources
removed mining related prices
1 parent 567554c commit 983cd75

28 files changed

+807
-956
lines changed

‎EDEngineer/EDEngineer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
41+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
4242
</Reference>
4343
<Reference Include="System" />
4444
<Reference Include="System.Core" />

‎EDEngineer/EDEngineer/Resources/Data/blueprints.json

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6423,6 +6423,38 @@
64236423
"Grade": 5,
64246424
"CoriolisGuid": "d9306721-43a4-45cd-b225-ac9174da4d13"
64256425
},
6426+
{
6427+
"Type": "Heat Sink Launcher",
6428+
"Name": "Modified Heat Sink Launcher",
6429+
"Engineers": [
6430+
"@Technology"
6431+
],
6432+
"Ingredients": [
6433+
{
6434+
"Name": "Mechanical Scrap",
6435+
"Size": 8
6436+
},
6437+
{
6438+
"Name": "Niobium",
6439+
"Size": 6
6440+
},
6441+
{
6442+
"Name": "Vanadium",
6443+
"Size": 6
6444+
},
6445+
{
6446+
"Name": "Mechanical Components",
6447+
"Size": 4
6448+
}
6449+
],
6450+
"Effects": [
6451+
{
6452+
"Effect": "+100%",
6453+
"Property": "Capacity",
6454+
"IsGood": true
6455+
}
6456+
]
6457+
},
64266458
{
64276459
"Type": "Heat Sink Launcher",
64286460
"Name": "Reinforced",
@@ -18233,7 +18265,8 @@
1823318265
"IsGood": false
1823418266
}
1823518267
],
18236-
"Grade": 5
18268+
"Grade": 5,
18269+
"CoriolisGuid": "dd804ba4-5186-44b5-a096-6490b5806165"
1823718270
},
1823818271
{
1823918272
"Type": "Fuel Transfer Limpet Controller",
@@ -34289,6 +34322,31 @@
3428934322
}
3429034323
]
3429134324
},
34325+
{
34326+
"Type": "Human",
34327+
"Name": "Sirius Modified Heat Sink Launcher",
34328+
"Engineers": [
34329+
"@Technology"
34330+
],
34331+
"Ingredients": [
34332+
{
34333+
"Name": "Mechanical Components",
34334+
"Size": 5
34335+
},
34336+
{
34337+
"Name": "Mechanical Scrap",
34338+
"Size": 8
34339+
},
34340+
{
34341+
"Name": "Niobium",
34342+
"Size": 6
34343+
},
34344+
{
34345+
"Name": "Vanadium",
34346+
"Size": 6
34347+
}
34348+
]
34349+
},
3429234350
{
3429334351
"Type": "Guardian",
3429434352
"Name": "Guardian Gauss Cannon (Fixed, Medium)",
@@ -41201,7 +41259,7 @@
4120141259
},
4120241260
{
4120341261
"Name": "Circuit Board",
41204-
"Size": 3
41262+
"Size": 5
4120541263
}
4120641264
],
4120741265
"Effects": []

‎EDEngineer/EDEngineer/Resources/Data/entryData.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,8 @@
11961196
"OriginDetails": [
11971197
"Surface prospecting"
11981198
],
1199-
"Group": "Category3"
1199+
"Group": "Category3",
1200+
"MaximumCapacity": 150
12001201
},
12011202
{
12021203
"Name": "Salvaged Alloys",
@@ -1795,6 +1796,17 @@
17951796
],
17961797
"Group": "ThargoidShip"
17971798
},
1799+
{
1800+
"Name": "Thargoid Interdiction Telemetry",
1801+
"Rarity": "VeryRare",
1802+
"FormattedName": "tg_interdictiondata",
1803+
"Kind": "Data",
1804+
"OriginDetails": [
1805+
"Ship scanning (Thargoid interceptors)"
1806+
],
1807+
"Group": "ThargoidShip",
1808+
"MaximumCapacity": 200
1809+
},
17981810
{
17991811
"Name": "Guardian Weapon Blueprint Segment",
18001812
"Rarity": "VeryRare",

‎EDEngineer/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
3+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
44
</packages>

‎Elite/CnbSystems.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ public class CnbSystemData
4141
[DefaultValue(0)]
4242
public long SystemPopulation { get; set; }
4343

44-
[JsonProperty("powerplaystate")]
45-
public string PowerplayState { get; set; }
46-
47-
[JsonProperty("powers")]
48-
public string Powers { get; set; }
49-
5044
[JsonProperty("allegiance")]
5145
public string Allegiance { get; set; }
5246

@@ -55,11 +49,7 @@ public class CnbSystemData
5549

5650
[JsonProperty("government")]
5751
public string Government { get; set; }
58-
59-
[JsonProperty("controlling_minor_faction")]
60-
public string ControllingMinorFaction { get; set; }
61-
62-
52+
6353
[JsonIgnore]
6454
public double Distance { get; set; }
6555

‎Elite/Data.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ public class Data
2424
};
2525

2626

27-
public static Dictionary<MiningStations.MaterialTypes, List<MiningStations.MiningStationData>> NearbyMiningStationsList = new Dictionary<MiningStations.MaterialTypes, List<MiningStations.MiningStationData>>
27+
/* public static Dictionary<MiningStations.MaterialTypes, List<MiningStations.MiningStationData>> NearbyMiningStationsList = new Dictionary<MiningStations.MaterialTypes, List<MiningStations.MiningStationData>>
2828
{
2929
{MiningStations.MaterialTypes.Painite, new List<MiningStations.MiningStationData>()},
3030
{MiningStations.MaterialTypes.LTD, new List<MiningStations.MiningStationData>()},
3131
{MiningStations.MaterialTypes.Platinum, new List<MiningStations.MiningStationData>()},
3232
{MiningStations.MaterialTypes.TritiumBuy, new List<MiningStations.MiningStationData>()},
3333
{MiningStations.MaterialTypes.TritiumSell, new List<MiningStations.MiningStationData>()}
34-
};
34+
};*/
3535

3636
public static Dictionary<Station.PoiTypes, List<StationData>> NearbyStationList = new Dictionary<Station.PoiTypes, List<StationData>>
3737
{
@@ -227,11 +227,11 @@ public static void HandleJson()
227227
NearbyHotspotSystemsList[HotspotSystems.MaterialTypes.LTD] = HotspotSystems.GetNearestHotspotSystems(LocationData.StarPos, HotspotSystems.FullHotspotSystemsList[HotspotSystems.MaterialTypes.LTD]);
228228
NearbyHotspotSystemsList[HotspotSystems.MaterialTypes.Platinum] = HotspotSystems.GetNearestHotspotSystems(LocationData.StarPos, HotspotSystems.FullHotspotSystemsList[HotspotSystems.MaterialTypes.Platinum]);
229229

230-
NearbyMiningStationsList[MiningStations.MaterialTypes.Painite] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.Painite], true);
231-
NearbyMiningStationsList[MiningStations.MaterialTypes.LTD] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.LTD], true);
232-
NearbyMiningStationsList[MiningStations.MaterialTypes.Platinum] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.Platinum], true);
233-
NearbyMiningStationsList[MiningStations.MaterialTypes.TritiumBuy] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.TritiumBuy], false);
234-
NearbyMiningStationsList[MiningStations.MaterialTypes.TritiumSell] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.TritiumSell], true);
230+
//NearbyMiningStationsList[MiningStations.MaterialTypes.Painite] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.Painite], true);
231+
//NearbyMiningStationsList[MiningStations.MaterialTypes.LTD] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.LTD], true);
232+
//NearbyMiningStationsList[MiningStations.MaterialTypes.Platinum] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.Platinum], true);
233+
//NearbyMiningStationsList[MiningStations.MaterialTypes.TritiumBuy] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.TritiumBuy], false);
234+
//NearbyMiningStationsList[MiningStations.MaterialTypes.TritiumSell] = MiningStations.GetNearestMiningStations(LocationData.StarPos, MiningStations.FullMiningStationsList[MiningStations.MaterialTypes.TritiumSell], true);
235235

236236
EngineersList = Station.UpdateEngineersLocation(LocationData.StarPos, EngineersList);
237237

‎Elite/Elite.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<HintPath>..\packages\NAudio.WinMM.2.1.0\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
106106
</Reference>
107107
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
108-
<HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
108+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
109109
</Reference>
110110
<Reference Include="PresentationCore" />
111111
<Reference Include="PresentationFramework" />
@@ -483,7 +483,7 @@
483483
<Content Include="Templates\images\powers\Archon Delaine.png">
484484
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
485485
</Content>
486-
<Content Include="Templates\images\powers\Arissa Lavigny-Duval.png">
486+
<Content Include="Templates\images\powers\A. Lavigny-Duval.png">
487487
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
488488
</Content>
489489
<Content Include="Templates\images\powers\Denton Patreus.png">

‎Elite/FipPanel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,7 @@ public void RefreshDevicePage(bool mustRender = true)
19971997
CheckCardSelectionLimits(2);
19981998
break;
19991999
case LcdTab.Mining:
2000-
CheckCardSelectionLimits(7);
2000+
CheckCardSelectionLimits(2); //''7);
20012001
break;
20022002
case LcdTab.HWInfo:
20032003
CheckCardSelectionLimits(1);
@@ -2603,9 +2603,9 @@ public void RefreshDevicePage(bool mustRender = true)
26032603
CurrentPage = _currentPage,
26042604
CurrentCard = CurrentCard[(int)CurrentTab],
26052605

2606-
NearbyHotspotSystemsList = Data.NearbyHotspotSystemsList,
2606+
NearbyHotspotSystemsList = Data.NearbyHotspotSystemsList//,
26072607

2608-
NearbyMiningStationsList = Data.NearbyMiningStationsList
2608+
//NearbyMiningStationsList = Data.NearbyMiningStationsList
26092609

26102610
});
26112611
}

0 commit comments

Comments
 (0)