From 365412375ea8ed591e87025bae5848ef079333b3 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Mon, 13 May 2024 18:50:41 +0100 Subject: [PATCH] Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. --- modules/index.js | 1 + modules/internal/docking_computer.json | 2 +- .../internal/planetary_approach_suite.json | 35 +++++++++++++++++++ modules/internal/supercruise_assist.json | 2 +- ships/adder.json | 12 +++++-- ships/alliance_challenger.json | 12 +++++-- ships/alliance_chieftain.json | 12 +++++-- ships/alliance_crusader.json | 13 +++++-- ships/anaconda.json | 12 +++++-- ships/asp.json | 12 +++++-- ships/asp_scout.json | 12 +++++-- ships/beluga.json | 12 +++++-- ships/cobra_mk_iii.json | 12 +++++-- ships/cobra_mk_iv.json | 12 +++++-- ships/diamondback_explorer.json | 12 +++++-- ships/diamondback_scout.json | 12 +++++-- ships/dolphin.json | 12 +++++-- ships/eagle.json | 12 +++++-- ships/federal_assault_ship.json | 12 +++++-- ships/federal_corvette.json | 12 +++++-- ships/federal_dropship.json | 12 +++++-- ships/federal_gunship.json | 12 +++++-- ships/fer_de_lance.json | 12 +++++-- ships/hauler.json | 12 +++++-- ships/imperial_clipper.json | 12 +++++-- ships/imperial_courier.json | 12 +++++-- ships/imperial_cutter.json | 12 +++++-- ships/imperial_eagle.json | 12 +++++-- ships/keelback.json | 12 +++++-- ships/krait_mkii.json | 12 +++++-- ships/krait_phantom.json | 12 +++++-- ships/mamba.json | 12 +++++-- ships/orca.json | 12 +++++-- ships/python.json | 12 +++++-- ships/python_nx.json | 11 ++++-- ships/sidewinder.json | 12 +++++-- ships/type_10_defender.json | 12 +++++-- ships/type_6_transporter.json | 12 +++++-- ships/type_7_transport.json | 12 +++++-- ships/type_9_heavy.json | 12 +++++-- ships/viper.json | 12 +++++-- ships/viper_mk_iv.json | 12 +++++-- ships/vulture.json | 12 +++++-- 43 files changed, 428 insertions(+), 80 deletions(-) create mode 100644 modules/internal/planetary_approach_suite.json diff --git a/modules/index.js b/modules/index.js index b2d8867..ad67cdf 100644 --- a/modules/index.js +++ b/modules/index.js @@ -84,5 +84,6 @@ module.exports = { gmrp: require('./internal/guardian_module_reinforcement_package').gmrp, sua: require('./internal/supercruise_assist').sua, ews: require('./internal/experemental_weapon_stabilizer').ews, + pas: require('./internal/planetary_approach_suite').pas, } } diff --git a/modules/internal/docking_computer.json b/modules/internal/docking_computer.json index 17a42cb..c0fcd33 100644 --- a/modules/internal/docking_computer.json +++ b/modules/internal/docking_computer.json @@ -19,7 +19,7 @@ "class": 1, "cost": 13509, "edID": 128935155, - "eddbID": 890, + "eddbID": 1810, "grp": "dc", "id": "3x", "integrity": 10, diff --git a/modules/internal/planetary_approach_suite.json b/modules/internal/planetary_approach_suite.json new file mode 100644 index 0000000..0dd3b9f --- /dev/null +++ b/modules/internal/planetary_approach_suite.json @@ -0,0 +1,35 @@ +{ + "pas": [ + { + "class": 1, + "cost": 500, + "edID": 128672317, + "eddbID": 0, + "grp": "pas", + "id": "4C", + "mass": 0, + "name": "Planetary Approach Suite (Horizons)", + "power": 0, + "rating": "I", + "symbol": "Int_PlanetApproachSuite", + "ukName": "Planetary Approach Suite (Horizons)", + "ukDiscript": "Assistant for planetary approach and landing." + }, + { + "class": 1, + "cost": 500, + "edID": 128975719, + "eddbID": 0, + "grp": "pas", + "id": "4F", + "mass": 0, + "name": "Advanced Planetary Approach Suite (Odyssey)", + "power": 0, + "rating": "I", + "symbol": "int_planetapproachsuite_advanced", + "ukName": "Advanced Planetary Approach Suite (Odyssey)", + "ukDiscript": "Advanced assistant for planetary approach and landing." + } + ] + } + \ No newline at end of file diff --git a/modules/internal/supercruise_assist.json b/modules/internal/supercruise_assist.json index 7eeddda..11bc6c9 100644 --- a/modules/internal/supercruise_assist.json +++ b/modules/internal/supercruise_assist.json @@ -4,7 +4,7 @@ "class": 1, "cost": 9121, "edID": 128932273, - "eddbID": 1538, + "eddbID": 1809, "grp": "sua", "id": "3w", "mass": 0, diff --git a/ships/adder.json b/ships/adder.json index b39daa2..a7f8615 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -115,7 +115,14 @@ 2, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -142,7 +149,8 @@ 0, "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json index 84e4df3..ab2fcbb 100644 --- a/ships/alliance_challenger.json +++ b/ships/alliance_challenger.json @@ -163,7 +163,14 @@ "ghrp": 1 } }, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -198,7 +205,8 @@ "", "", "", - 0 + 0, + "4F" ] } } diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 90076ef..38a3b94 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -161,7 +161,14 @@ "ghrp": 1 } }, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -195,7 +202,8 @@ "", "", "", - 0 + 0, + "4F" ] } } diff --git a/ships/alliance_crusader.json b/ships/alliance_crusader.json index 70b2ca1..c33d594 100644 --- a/ships/alliance_crusader.json +++ b/ships/alliance_crusader.json @@ -163,7 +163,14 @@ "ghrp": 1 } }, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -196,7 +203,9 @@ "", "", "", - 0 + 0, + "", + "4F" ] } } diff --git a/ships/anaconda.json b/ships/anaconda.json index 78de6c7..655dd59 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -145,7 +145,14 @@ 4, 4, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -189,7 +196,8 @@ 0, "", "00", - 0 + 0, + "4F" ] } } diff --git a/ships/asp.json b/ships/asp.json index cbb3759..3cf824b 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -121,7 +121,14 @@ 3, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -154,7 +161,8 @@ 0, "00", "", - 0 + 0, + "4F" ] } } diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 89b6647..0afc982 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -116,7 +116,14 @@ 3, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -144,7 +151,8 @@ 0, 0, 0, - 0 + 0, + "4F" ] } } diff --git a/ships/beluga.json b/ships/beluga.json index aa1d450..4e4d3f3 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -131,7 +131,14 @@ 3, 3, 3, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -169,7 +176,8 @@ 0, 0, "", - 0 + 0, + "4F" ] } } diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 7bbd646..d02db55 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -117,7 +117,14 @@ 2, 2, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -146,7 +153,8 @@ 0, "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 5d1cc70..408bd63 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -123,7 +123,14 @@ 2, 2, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -155,7 +162,8 @@ "00", "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index 0e4e7a3..7b906ea 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -118,7 +118,14 @@ 2, 2, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -148,7 +155,8 @@ "", 0, 0, - 0 + 0, + "4F" ] } } diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 8eaa500..608b14d 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -117,7 +117,14 @@ 3, 2, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -146,7 +153,8 @@ 0, "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/dolphin.json b/ships/dolphin.json index 1c5f023..41f75cd 100755 --- a/ships/dolphin.json +++ b/ships/dolphin.json @@ -121,7 +121,14 @@ 2, 2, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -150,7 +157,8 @@ 0, "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/eagle.json b/ships/eagle.json index c67ab0f..b5cfd38 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -126,7 +126,14 @@ 1, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -152,7 +159,8 @@ "", 0, 0, - 0 + 0, + "4F" ] } } diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index 22bf68d..052c657 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -147,7 +147,14 @@ 3, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -179,7 +186,8 @@ "02", 0, 0, - 0 + 0, + "4F" ] } } diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index fc46bf4..b2c1f2e 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -159,7 +159,14 @@ 4, 4, 3, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -202,7 +209,8 @@ "02", "01", "", - 0 + 0, + "4F" ] } } diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index b7c2286..8f7124a 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -149,7 +149,14 @@ 3, 3, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -183,7 +190,8 @@ 0, 0, "", - 0 + 0, + "4F" ] } } diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index c100de3..d9326b8 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -163,7 +163,14 @@ }, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -198,7 +205,8 @@ 0, 0, "", - 0 + 0, + "4F" ] } } diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index bbcefa8..6040e2f 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -120,7 +120,14 @@ 4, 2, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -152,7 +159,8 @@ "02", 0, "", - 0 + 0, + "4F" ] } } diff --git a/ships/hauler.json b/ships/hauler.json index 245d563..c9d9bcd 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -112,7 +112,14 @@ 2, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -136,7 +143,8 @@ "3v", "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index fa1a7ec..1ceb2ae 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -123,7 +123,14 @@ 3, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -155,7 +162,8 @@ 0, "00", "", - 0 + 0, + "4F" ] } } diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index b2e0944..305a318 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -121,7 +121,14 @@ 2, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -151,7 +158,8 @@ "00", "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index a826b70..fd8eb99 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -158,7 +158,14 @@ }, 4, 3, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -200,7 +207,8 @@ 0, "01", "", - 0 + 0, + "4F" ] } } diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index a9b9f61..b335c1b 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -126,7 +126,14 @@ 1, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -152,7 +159,8 @@ "", 0, 0, - 0 + 0, + "4F" ] } } diff --git a/ships/keelback.json b/ships/keelback.json index 86ffdb0..3e33a40 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -118,7 +118,14 @@ 3, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -147,7 +154,8 @@ "44", "00", "", - 0 + 0, + "4F" ] } } diff --git a/ships/krait_mkii.json b/ships/krait_mkii.json index ba6b8e0..3ca27eb 100644 --- a/ships/krait_mkii.json +++ b/ships/krait_mkii.json @@ -122,7 +122,14 @@ 3, 3, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -155,7 +162,8 @@ "", 0, "00", - 0 + 0, + "4F" ] } } diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json index 2fd6b27..f078233 100644 --- a/ships/krait_phantom.json +++ b/ships/krait_phantom.json @@ -120,7 +120,14 @@ 3, 3, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -152,7 +159,8 @@ "", 0, "00", - 0 + 0, + "4F" ] } } diff --git a/ships/mamba.json b/ships/mamba.json index 3bfdbdc..7f29caf 100644 --- a/ships/mamba.json +++ b/ships/mamba.json @@ -120,7 +120,14 @@ 3, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -152,7 +159,8 @@ "01", 0, 0, - 0 + 0, + "4F" ] } } diff --git a/ships/orca.json b/ships/orca.json index 726cb0c..f611fd1 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -120,7 +120,14 @@ 3, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -151,7 +158,8 @@ 0, 0, "", - 0 + 0, + "4F" ] } } diff --git a/ships/python.json b/ships/python.json index e5eb7b5..9fa20cf 100755 --- a/ships/python.json +++ b/ships/python.json @@ -122,7 +122,14 @@ 3, 3, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -156,7 +163,8 @@ 0, "00", "", - 0 + 0, + "4F" ] } } diff --git a/ships/python_nx.json b/ships/python_nx.json index de78dd9..80e2d91 100755 --- a/ships/python_nx.json +++ b/ships/python_nx.json @@ -121,7 +121,14 @@ 3, 2, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -152,7 +159,7 @@ "", "00", "3w", - 0, + "4F", 0, 0, 0 diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 1c1dd9e..c947a29 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -113,7 +113,14 @@ 1, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -138,7 +145,8 @@ "", 0, 0, - 0 + 0, + "4F" ] } } diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index c03cbe9..9c1190f 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -156,7 +156,14 @@ "ghrp": 1 } }, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -200,7 +207,8 @@ "", 0, 0, - 0 + 0, + "4F" ] } } diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 76b488c..0890dfd 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -116,7 +116,14 @@ 3, 2, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -144,7 +151,8 @@ "44", "00", "", - 0 + 0, + "4F" ] } } diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index 7309380..91cd4a6 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -121,7 +121,14 @@ 3, 3, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -154,7 +161,8 @@ 0, 0, "", - 0 + 0, + "4F" ] } } diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 96db65c..cd49a49 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -124,7 +124,14 @@ 3, 3, 2, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -159,7 +166,8 @@ "01", 0, "", - 0 + 0, + "4F" ] } } diff --git a/ships/viper.json b/ships/viper.json index fe68216..9513d13 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -128,7 +128,14 @@ 2, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -156,7 +163,8 @@ 0, "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 97889cb..300b7be 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -130,7 +130,14 @@ 2, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -160,7 +167,8 @@ 0, "", 0, - 0 + 0, + "4F" ] } } diff --git a/ships/vulture.json b/ships/vulture.json index 1d78597..b430c61 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -129,7 +129,14 @@ 1, 1, 1, - 1 + 1, + { + "class": 1, + "name": "Planetary", + "eligible": { + "pas": 1 + } + } ] }, "defaults": { @@ -158,7 +165,8 @@ 0, "", 0, - 0 + 0, + "4F" ] } }