From ba264c325e5a5cb0e7baaa8ebc8752012176a060 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Mon, 13 May 2024 09:32:49 +0100 Subject: [PATCH 01/23] Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. --- ships/python.json | 2 +- ships/python_nx.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ships/python.json b/ships/python.json index 99c8fdf..e5eb7b5 100755 --- a/ships/python.json +++ b/ships/python.json @@ -6,7 +6,7 @@ "name": "Python", "manufacturer": "Faulcon DeLacy", "class": 2, - "hullCost": 55171380, + "hullCost": 55172380, "speed": 230, "boost": 300, "boostEnergy": 23, diff --git a/ships/python_nx.json b/ships/python_nx.json index 1475038..de78dd9 100755 --- a/ships/python_nx.json +++ b/ships/python_nx.json @@ -6,7 +6,7 @@ "name": "Python Mk II", "manufacturer": "Faulcon DeLacy", "class": 2, - "hullCost": 56812626, + "hullCost": 66122374, "speed": 256, "boost": 345, "boostEnergy": 19, From 365412375ea8ed591e87025bae5848ef079333b3 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Mon, 13 May 2024 18:50:41 +0100 Subject: [PATCH 02/23] 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" ] } } From 3d379799d536ffe420dd4f62b10e062bdc1ebb47 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Tue, 14 May 2024 09:12:39 -0400 Subject: [PATCH 03/23] [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. --- modules/standard/frame_shift_drive.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index def82d3..a2d6708 100644 --- a/modules/standard/frame_shift_drive.json +++ b/modules/standard/frame_shift_drive.json @@ -1146,7 +1146,7 @@ "edID": 129030580, "fuelmul": 0.013, "fuelpower": 2.0, - "grp": "fsd2", + "grp": "fsd", "id": "FY", "name": "Frame Shift Drive (SCO)", "integrity": 64, From 7e58828577e41906e82996ee6a09a03844784aa7 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Tue, 14 May 2024 16:42:34 +0100 Subject: [PATCH 04/23] Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. --- modules/hardpoints/multi_cannon.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index bf191ce..1088280 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -15,7 +15,7 @@ "distdraw": 0.06, "edID": 128049455, "eddbID": 867, - "falloff": 1800, + "falloff": 2000, "fireint": 0.13, "grp": "mc", "id": "23", @@ -46,7 +46,7 @@ "distdraw": 0.07, "edID": 128049459, "eddbID": 869, - "falloff": 1800, + "falloff": 2000, "fireint": 0.12, "grp": "mc", "id": "24", @@ -77,7 +77,7 @@ "distdraw": 0.03, "edID": 128049462, "eddbID": 871, - "falloff": 1800, + "falloff": 2000, "fireint": 0.14, "grp": "mc", "id": "25", @@ -108,7 +108,7 @@ "distdraw": 0.12, "edID": 128671345, "eddbID": 1481, - "falloff": 1800, + "falloff": 4500, "fireint": 0.23, "grp": "mc", "id": "e0", @@ -141,7 +141,7 @@ "distdraw": 0.11, "edID": 128049456, "eddbID": 868, - "falloff": 1800, + "falloff": 2000, "fireint": 0.14, "grp": "mc", "id": "26", @@ -172,7 +172,7 @@ "distdraw": 0.14, "edID": 128049460, "eddbID": 870, - "falloff": 1800, + "falloff": 2000, "fireint": 0.13, "grp": "mc", "id": "27", @@ -203,7 +203,7 @@ "distdraw": 0.06, "edID": 128049463, "eddbID": 872, - "falloff": 1800, + "falloff": 2000, "fireint": 0.16, "grp": "mc", "id": "28", @@ -234,7 +234,7 @@ "distdraw": 0.18, "edID": 128049457, "eddbID": 1541, - "falloff": 1800, + "falloff": 2000, "fireint": 0.17, "grp": "mc", "id": "7k", @@ -265,7 +265,7 @@ "distdraw": 0.25, "edID": 128049461, "eddbID": 1543, - "falloff": 1800, + "falloff": 2000, "fireint": 0.15, "grp": "mc", "id": "7l", @@ -327,7 +327,7 @@ "distdraw": 0.24, "edID": 128049458, "eddbID": 1542, - "falloff": 1800, + "falloff": 2000, "fireint": 0.33, "grp": "mc", "id": "7n", @@ -359,7 +359,7 @@ "distdraw": 0.37, "edID": 128681996, "eddbID": 1546, - "falloff": 1800, + "falloff": 2000, "fireint": 0.297, "grp": "mc", "id": "7o", From 6be72732fc66c12af5d4fc20d4a46232e464f6e4 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Wed, 15 May 2024 11:11:43 +0100 Subject: [PATCH 05/23] Changing Enforcer falloff to 3km to match in game metric --- modules/hardpoints/multi_cannon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index 1088280..d9458d1 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -108,7 +108,7 @@ "distdraw": 0.12, "edID": 128671345, "eddbID": 1481, - "falloff": 4500, + "falloff": 3000, "fireint": 0.23, "grp": "mc", "id": "e0", From d04d380c678c261e460cb0cfc426e1d31ab2b11d Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Thu, 16 May 2024 19:31:00 +0100 Subject: [PATCH 06/23] Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. --- generate_distribution.js | 2 +- modifications/modules.json | 12 +++++++ modules/hardpoints/missing_hardpoint.json | 35 +++++++++++++++++++ modules/index.js | 5 +-- modules/internal/missing_module.json | 20 +++++++++++ modules/standard/frame_shift_drive.json | 19 ++++++++++ modules/standard/fuel_tank.json | 15 ++++++++ modules/standard/life_support.json | 18 ++++++++++ .../standard/planetary_approach_suite.json | 18 ---------- modules/standard/power_distributor.json | 23 ++++++++++++ modules/standard/power_plant.json | 18 ++++++++++ modules/standard/sensors.json | 18 ++++++++++ modules/standard/thrusters.json | 22 ++++++++++++ ships/adder.json | 2 +- ships/alliance_challenger.json | 2 +- ships/alliance_chieftain.json | 2 +- ships/alliance_crusader.json | 2 +- ships/anaconda.json | 2 +- ships/asp.json | 2 +- ships/asp_scout.json | 2 +- ships/beluga.json | 2 +- ships/cobra_mk_iii.json | 2 +- ships/cobra_mk_iv.json | 2 +- ships/diamondback_explorer.json | 2 +- ships/diamondback_scout.json | 2 +- ships/dolphin.json | 2 +- ships/eagle.json | 2 +- ships/federal_assault_ship.json | 2 +- ships/federal_corvette.json | 2 +- ships/federal_dropship.json | 2 +- ships/federal_gunship.json | 2 +- ships/fer_de_lance.json | 2 +- ships/hauler.json | 2 +- ships/imperial_clipper.json | 2 +- ships/imperial_courier.json | 2 +- ships/imperial_cutter.json | 2 +- ships/imperial_eagle.json | 2 +- ships/keelback.json | 2 +- ships/krait_mkii.json | 2 +- ships/krait_phantom.json | 2 +- ships/mamba.json | 2 +- ships/orca.json | 2 +- ships/python.json | 2 +- ships/python_nx.json | 2 +- ships/sidewinder.json | 2 +- ships/type_10_defender.json | 2 +- ships/type_6_transporter.json | 2 +- ships/type_7_transport.json | 2 +- ships/type_9_heavy.json | 2 +- ships/viper.json | 2 +- ships/viper_mk_iv.json | 2 +- ships/vulture.json | 2 +- 52 files changed, 243 insertions(+), 60 deletions(-) create mode 100644 modules/hardpoints/missing_hardpoint.json create mode 100644 modules/internal/missing_module.json delete mode 100644 modules/standard/planetary_approach_suite.json diff --git a/generate_distribution.js b/generate_distribution.js index d93f436..fa69903 100644 --- a/generate_distribution.js +++ b/generate_distribution.js @@ -11,7 +11,7 @@ if (!fs.existsSync('./dist')){ fs.mkdirSync('./dist'); } -fs.open('./dist/index.json', 'w', function() { +fs.open('./dist/index.js', 'w', function() { fs.writeFile('./dist/index.js', code, function(err) {}); }); diff --git a/modifications/modules.json b/modifications/modules.json index 9ef7f94..18a2a46 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -6903,5 +6903,17 @@ }, "modifications": [ ] + }, + "mh": { + "blueprints": { + }, + "modifications": [ + ] + }, + "mm": { + "blueprints": { + }, + "modifications": [ + ] } } diff --git a/modules/hardpoints/missing_hardpoint.json b/modules/hardpoints/missing_hardpoint.json new file mode 100644 index 0000000..420aabe --- /dev/null +++ b/modules/hardpoints/missing_hardpoint.json @@ -0,0 +1,35 @@ +{ + "mh": [ + { + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "mh", + "id": "4G", + "integrity": 0, + "mass": 0, + "name": "Unrecognised Utility", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "power": 0, + "rating": "I", + "symbol": "Hpt_Missing_Utility" + }, + { + "class": 0, + "cost": 10, + "edID": 0, + "eddbID": 0, + "grp": "mh", + "id": "4H", + "integrity": 0, + "mass": 0, + "name": "Unrecognised Weapon", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "power": 0, + "rating": "Z", + "symbol": "Hpt_Missing_Hardpoint" + } + ] + } + \ No newline at end of file diff --git a/modules/index.js b/modules/index.js index ad67cdf..c240ee4 100644 --- a/modules/index.js +++ b/modules/index.js @@ -7,7 +7,6 @@ module.exports = { pd: require('./standard/power_distributor').pd, s: require('./standard/sensors').s, ft: require('./standard/fuel_tank').ft, - pas: require('./standard/planetary_approach_suite').pas }, hardpoints: { pl: require('./hardpoints/pulse_laser').pl, @@ -45,7 +44,8 @@ module.exports = { tbsc: require('./hardpoints/shock_cannon').tbsc, tbem: require('./hardpoints/enzyme_missile_rack.json').tbem, tbrfl: require('./hardpoints/remote_release_flechette_launcher.json').tbrfl, - gsc: require('./hardpoints/guardian_shard_cannon').gsc + gsc: require('./hardpoints/guardian_shard_cannon').gsc, + mh: require('./hardpoints/missing_hardpoint').mh, }, internal: { am: require('./internal/auto_field_maintenance_unit').am, @@ -85,5 +85,6 @@ module.exports = { sua: require('./internal/supercruise_assist').sua, ews: require('./internal/experemental_weapon_stabilizer').ews, pas: require('./internal/planetary_approach_suite').pas, + mm: require('./internal/missing_module').mm, } } diff --git a/modules/internal/missing_module.json b/modules/internal/missing_module.json new file mode 100644 index 0000000..63fbd23 --- /dev/null +++ b/modules/internal/missing_module.json @@ -0,0 +1,20 @@ +{ + "mm": [ + { + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "mm", + "id": "4I", + "integrity": 0, + "mass": 0, + "name": "Unrecognised Module", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "power": 0, + "rating": "Z", + "symbol": "Int_Missing_Module" + } + ] + } + \ No newline at end of file diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index a2d6708..070d3f9 100644 --- a/modules/standard/frame_shift_drive.json +++ b/modules/standard/frame_shift_drive.json @@ -1234,6 +1234,25 @@ "symbol": "Int_Hyperdrive_Overcharge_Size2_Class1", "ukName": "FSD", "ukDiscript": "Faster-than-light capable ship drive, featuring experimental overcharge capabilities, necessary for supercruise travel and hyperspace jumps between star systems." + }, + { + "class": 0, + "cost": 0, + "edID": 0, + "fuelmul": 0, + "fuelpower": 0, + "grp": "fsd", + "id": "4P", + "name": "Unrecognised Frame Shift Drive", + "integrity": 0, + "mass": 0, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "Z", + "symbol": "Int_Missing_Hyperdrive", + "ukName": "Unrecognised Frame Shift Drive", + "ukDiscript": "Unrecognised Frame Shift Drive" } ] } diff --git a/modules/standard/fuel_tank.json b/modules/standard/fuel_tank.json index c661930..3deef80 100644 --- a/modules/standard/fuel_tank.json +++ b/modules/standard/fuel_tank.json @@ -111,6 +111,21 @@ "symbol": "Int_FuelTank_Size8_Class3", "ukName": "Fuel Tank", "ukDiscript": "Storage container for fuel used by ship's power plant." + }, + { + "class": 1, + "cost": 0, + "edID": 0, + "eddbID": 0, + "fuel": 0, + "mass": 0, + "grp": "ft", + "id": "4M", + "rating": "Z", + "symbol": "Int_Missing_FuelTank", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "ukName": "Unrecognised Fuel Tank", + "ukDiscript": "Unrecognised Fuel Tank" } ] } diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json index 69b4abf..29c582a 100644 --- a/modules/standard/life_support.json +++ b/modules/standard/life_support.json @@ -679,6 +679,24 @@ "symbol": "Int_LifeSupport_Size1_Class5", "ukName": "Life Support", "ukDiscript": "Regulates habitable ship atmosphere and provides emergency reservoir for pilot's Remlock system. " + }, + { + "boot": 0, + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "ls", + "id": "4O", + "integrity": 0, + "mass": 0, + "power": 0, + "rating": "Z", + "time": 0, + "symbol": "Int_Missing_LifeSupport", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "ukName": "Unrecognised Life Support", + "ukDiscript": "Unrecognised Life Support" } ] } diff --git a/modules/standard/planetary_approach_suite.json b/modules/standard/planetary_approach_suite.json deleted file mode 100644 index 43fe58c..0000000 --- a/modules/standard/planetary_approach_suite.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "pas": [ - { - "class": 1, - "cost": 500, - "edID": 128672317, - "eddbID": 1538, - "grp": "pas", - "id": "PA", - "mass": 0, - "power": 0, - "rating": "I", - "symbol": "Int_PlanetApproachSuite", - "ukName": "Planetary Approach Suite", - "ukDiscript": "The required Thruster modifications, sensor package and avionics to allow a ship to fly effectively in close proximity to planets." - } - ] -} diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json index f188ba0..dc8f129 100644 --- a/modules/standard/power_distributor.json +++ b/modules/standard/power_distributor.json @@ -1015,6 +1015,29 @@ "symbol": "Int_GuardianPowerDistributor_Size8", "ukName": "Guardian Power Distributor", "ukDiscript": "Distribution system for ENG, SYS and WEP capacitors. Enhanced with Guardian technology to speed up capacitor recharge rates, at the cost of smaller capacitors and increased heat generation. Also boosts overall power output of any power plant it is hooked into." + }, + { + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "engcap": 0, + "engrate": 0, + "grp": "pd", + "id": "4N", + "integrity": 0, + "mass": 0, + "power": 0, + "rating": "Z", + "syscap": 0, + "sysrate": 0, + "wepcap": 0, + "weprate": 0, + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "name": "Unrecognised Power Distributor", + "symbol": "Int_Missing_PowerDistributor", + "ukName": "Unrecognised Power Distributor", + "ukDiscript": "Unrecognised Power Distributor" } ] } diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json index 3fad645..1f3e297 100644 --- a/modules/standard/power_plant.json +++ b/modules/standard/power_plant.json @@ -678,6 +678,24 @@ "symbol": "Int_GuardianPowerplant_Size8", "ukName": "Guardian Power Plant", "ukDiscript": "Consumes fuel to power all ship modules. Enhanced with Guardian technology to produce greater power output, at the cost of heat generated and mass." + }, + { + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "eff": 0, + "grp": "pp", + "id": "4K", + "integrity": 0, + "mass": 0, + "pgen": 0, + "rating": "Z", + "name": "Unrecognised Power Plant", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "symbol": "Int_Missing_Powerplant", + "ukName": "Unrecognised Power Plant", + "ukDiscript": "Unrecognised Power Plant" } ] } diff --git a/modules/standard/sensors.json b/modules/standard/sensors.json index a10adb5..51c8e7e 100644 --- a/modules/standard/sensors.json +++ b/modules/standard/sensors.json @@ -679,6 +679,24 @@ "symbol": "Int_Sensors_Size1_Class5", "ukName": "Sensors", "ukDiscript": "Standard suite providing basic detection, identification and targeting capabilities." + }, + { + "angle": 0, + "class": 1, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "s", + "id": "4L", + "integrity": 0, + "mass": 0, + "power": 0, + "range": 0, + "rating": "Z", + "symbol": "Int_Missing_Sensors", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "ukName": "Unrecognised Sensors", + "ukDiscript": "Unrecognised Sensors" } ] } diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index 1f8b015..d85fd11 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -796,6 +796,28 @@ "symbol": "Int_Engine_Size2_Class5_Fast", "ukName": "Thrusters", "ukDiscript": "Enhanced performance normal-space propulsion system." + }, + { + "class": 2, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "t", + "id": "4J", + "integrity": 0, + "mass": 0, + "maxmass": 0, + "maxmul": 0, + "minmass": 0, + "minmul": 0, + "optmass": 0, + "optmul": 0, + "power": 0, + "rating": "Z", + "symbol": "Int_Missing_Engine", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "ukName": "Unrecognised Thrusters", + "ukDiscript": "Unrecognised Thrusters " } ] } diff --git a/ships/adder.json b/ships/adder.json index a7f8615..e05ad58 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -118,7 +118,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json index ab2fcbb..2928181 100644 --- a/ships/alliance_challenger.json +++ b/ships/alliance_challenger.json @@ -166,7 +166,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 38a3b94..feadabd 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -164,7 +164,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/alliance_crusader.json b/ships/alliance_crusader.json index c33d594..f4aace6 100644 --- a/ships/alliance_crusader.json +++ b/ships/alliance_crusader.json @@ -166,7 +166,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/anaconda.json b/ships/anaconda.json index 655dd59..7ba88c4 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -148,7 +148,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/asp.json b/ships/asp.json index 3cf824b..792285f 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 0afc982..7114cde 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -119,7 +119,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/beluga.json b/ships/beluga.json index 4e4d3f3..1d13f87 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -134,7 +134,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index d02db55..6cbb738 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -120,7 +120,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 408bd63..a449e93 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -126,7 +126,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index 7b906ea..07c0bb5 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -121,7 +121,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 608b14d..bb789ee 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -120,7 +120,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/dolphin.json b/ships/dolphin.json index 41f75cd..f209683 100755 --- a/ships/dolphin.json +++ b/ships/dolphin.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/eagle.json b/ships/eagle.json index b5cfd38..db67cb0 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -129,7 +129,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index 052c657..af3d74b 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -150,7 +150,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index b2c1f2e..79a878f 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -162,7 +162,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 8f7124a..cf0d3bf 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -152,7 +152,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index d9326b8..9cac08f 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -166,7 +166,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index 6040e2f..b3b4617 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -123,7 +123,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/hauler.json b/ships/hauler.json index c9d9bcd..4882001 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -115,7 +115,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index 1ceb2ae..d1e9d58 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -126,7 +126,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index 305a318..d8d7b06 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index fd8eb99..b007846 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -161,7 +161,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index b335c1b..742391d 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -129,7 +129,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/keelback.json b/ships/keelback.json index 3e33a40..1602769 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -121,7 +121,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/krait_mkii.json b/ships/krait_mkii.json index 3ca27eb..ea6d8b6 100644 --- a/ships/krait_mkii.json +++ b/ships/krait_mkii.json @@ -125,7 +125,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json index f078233..ca614e3 100644 --- a/ships/krait_phantom.json +++ b/ships/krait_phantom.json @@ -123,7 +123,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/mamba.json b/ships/mamba.json index 7f29caf..25dc53c 100644 --- a/ships/mamba.json +++ b/ships/mamba.json @@ -123,7 +123,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/orca.json b/ships/orca.json index f611fd1..452a903 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -123,7 +123,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/python.json b/ships/python.json index 9fa20cf..a25918c 100755 --- a/ships/python.json +++ b/ships/python.json @@ -125,7 +125,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/python_nx.json b/ships/python_nx.json index 80e2d91..813689a 100755 --- a/ships/python_nx.json +++ b/ships/python_nx.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/sidewinder.json b/ships/sidewinder.json index c947a29..3bdc944 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -116,7 +116,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index 9c1190f..a2da048 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -159,7 +159,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 0890dfd..92612a0 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -119,7 +119,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index 91cd4a6..667ec89 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index cd49a49..5307d10 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -127,7 +127,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/viper.json b/ships/viper.json index 9513d13..6c57e59 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -131,7 +131,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 300b7be..46428e4 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -133,7 +133,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/vulture.json b/ships/vulture.json index b430c61..c337e5a 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -132,7 +132,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } From f297da379ad52b0bc2a43577f6c15ec196d3d3b5 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 17 May 2024 08:48:25 +0100 Subject: [PATCH 07/23] Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo --- modifications/modules.json | 309 ++++++++++++++++++ .../hardpoints/ax_missile_rack_enhanced.json | 136 ++++++++ modules/hardpoints/ax_multi_cannon.json | 1 - .../hardpoints/ax_multi_cannon_enhanced.json | 203 ++++++++++++ modules/hardpoints/multi_cannon_advanced.json | 66 ++++ modules/hardpoints/nanite_torpedo_pylon.json | 59 ++++ modules/index.js | 4 + 7 files changed, 777 insertions(+), 1 deletion(-) create mode 100644 modules/hardpoints/ax_missile_rack_enhanced.json create mode 100644 modules/hardpoints/ax_multi_cannon_enhanced.json create mode 100644 modules/hardpoints/multi_cannon_advanced.json create mode 100644 modules/hardpoints/nanite_torpedo_pylon.json diff --git a/modifications/modules.json b/modifications/modules.json index 9ef7f94..74abd2a 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -3384,12 +3384,309 @@ "special_weapon_lightweight" ] }, + "advmc": { + "blueprints": { + "Weapon_Efficient": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_HighCapacity": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_LightWeight": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_LongRange": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "MC_Overcharged": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_RapidFire": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_ShortRange": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_Sturdy": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + } + }, + "modifications": [ + "ammo", + "clip", + "damage", + "damagedist", + "fallofffromrange", + "distdraw", + "integrity", + "jitter", + "mass", + "piercing", + "power", + "range", + "reload", + "rof", + "shotspeed", + "thermload" + ], + "specials": [ + "special_auto_loader", + "special_corrosive_shell", + "special_emissive_munitions", + "special_incendiary_rounds", + "special_smart_rounds", + "special_thermalshock", + "special_weapon_damage", + "special_weapon_efficient", + "special_weapon_rateoffire", + "special_weapon_toughened", + "special_weapon_lightweight" + ] + }, "axmc": { "blueprints": { }, "modifications": [ ] }, + "axmce": { + "blueprints": { + }, + "modifications": [ + ] + }, "ml": { "blueprints": { }, @@ -3573,6 +3870,12 @@ "modifications": [ ] }, + "axmre": { + "blueprints": { + }, + "modifications": [ + ] + }, "ews": { "blueprints": { }, @@ -6316,6 +6619,12 @@ "special_mass_lock" ] }, + "ntp": { + "blueprints": { + }, + "modifications": [ + ] + }, "ul": { "blueprints": { "Weapon_Efficient": { diff --git a/modules/hardpoints/ax_missile_rack_enhanced.json b/modules/hardpoints/ax_missile_rack_enhanced.json new file mode 100644 index 0000000..3e1f3ce --- /dev/null +++ b/modules/hardpoints/ax_missile_rack_enhanced.json @@ -0,0 +1,136 @@ +{ + "axmre": [ + { + "experimental": true, + "ammo": 64, + "breachdmg": 0, + "breachmax": 0.8, + "breachmin": 1, + "class": 2, + "clip": 8, + "cost": 681530, + "damage": 77, + "damagedist": { + "X": 1, + "E": 1 + }, + "distdraw": 0.14, + "edID": 129022081, + "eddbID": 0, + "fireint": 2.0, + "grp": "axmre", + "id": "4S", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "F", + "piercing": 60, + "power": 1.3, + "rating": "D", + "reload": 5, + "shotspeed": 1250, + "thermload": 2.4, + "symbol": "Hpt_ATDumbfireMissile_Fixed_Medium_v2" + }, + { + "experimental": true, + "ammo": 64, + "breachdmg": 0, + "breachmax": 0.8, + "breachmin": 1, + "class": 2, + "clip": 8, + "cost": 2666290, + "damage": 64, + "damagedist": { + "X": 1, + "E": 1 + }, + "distdraw": 0.08, + "edID": 129022083, + "eddbID": 0, + "fireint": 2.0, + "grp": "axmre", + "id": "4T", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "T", + "piercing": 60, + "power": 1.3, + "rating": "E", + "reload": 5, + "shotspeed": 1250, + "thermload": 1.5, + + "symbol": "Hpt_ATDumbfireMissile_Turret_Medium_v2" + }, + { + "experimental": true, + "ammo": 128, + "breachdmg": 0, + "breachmax": 0.8, + "breachmin": 1, + "class": 3, + "clip": 12, + "cost": 1703830, + "damage": 77, + "damagedist": { + "X": 1, + "E": 1 + }, + "distdraw": 0.24, + "edID": 129022079, + "eddbID": 0, + "fireint": 2.0, + "grp": "axmre", + "id": "4U", + "integrity": 64, + "mass": 8, + "missile": "D", + "mount": "F", + "piercing": 60, + "power": 1.72, + "rating": "B", + "reload": 5, + "shotspeed": 1250, + "thermload": 3.6, + + "symbol": "Hpt_ATDumbfireMissile_Fixed_Large_v2" + }, + { + "experimental": true, + "ammo": 128, + "breachdmg": 0, + "breachmax": 0.8, + "breachmin": 1, + "class": 3, + "clip": 12, + "cost": 5347530, + "damage": 64, + "damagedist": { + "X": 1, + "E": 1 + }, + "distdraw": 0.14, + "edID": 129022082, + "eddbID": 0, + "fireint": 2.0, + "grp": "axmre", + "id": "4V", + "integrity": 64, + "mass": 8, + "missile": "D", + "mount": "T", + "piercing": 60, + "power": 1.85, + "rating": "D", + "reload": 5, + "shotspeed": 1250, + "thermload": 1.9, + + "symbol": "Hpt_ATDumbfireMissile_Turret_Large_v2" + } + ] + } + \ No newline at end of file diff --git a/modules/hardpoints/ax_multi_cannon.json b/modules/hardpoints/ax_multi_cannon.json index 992b840..d9fcde0 100644 --- a/modules/hardpoints/ax_multi_cannon.json +++ b/modules/hardpoints/ax_multi_cannon.json @@ -14,7 +14,6 @@ "X": 1, "K": 1 }, - "experimental": true, "distdraw": 0.11, "edID": 128788701, "eddbID": 1618, diff --git a/modules/hardpoints/ax_multi_cannon_enhanced.json b/modules/hardpoints/ax_multi_cannon_enhanced.json new file mode 100644 index 0000000..db180a4 --- /dev/null +++ b/modules/hardpoints/ax_multi_cannon_enhanced.json @@ -0,0 +1,203 @@ +{ + "axmce": [ + { + "experimental": true, + "ammo": 2100, + "breachdmg": 3.3, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 2, + "clip": 100, + "cost": 455080, + "damage": 3.9, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.11, + "edID": 129022080, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.14, + "grp": "axmce", + "id": "4W", + "integrity": 51, + "mass": 4, + "mount": "F", + "piercing": 17, + "power": 0.48, + "range": 4000, + "rating": "D", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.18, + "symbol": "Hpt_ATMultiCannon_Fixed_Medium_V2" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 3.1, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 2, + "clip": 100, + "cost": 1197640, + "damage": 3.7, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.11, + "edID": 129022089, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.14, + "grp": "axmce", + "id": "4X", + "integrity": 51, + "mass": 4, + "mount": "G", + "piercing": 17, + "power": 0.46, + "range": 4000, + "rating": "E", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.18, + "symbol": "Hpt_ATMultiCannon_Gimbal_Medium" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 0.5, + "breachmax": 0.5, + "breachmin": 0.5, + "class": 2, + "clip": 90, + "cost": 2193300, + "damage": 2, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.06, + "edID": 129022086, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.16, + "grp": "axmce", + "id": "4Y", + "integrity": 51, + "mass": 4, + "mount": "T", + "piercing": 17, + "power": 0.52, + "range": 4000, + "rating": "E", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.1, + "symbol": "Hpt_ATMultiCannon_Turret_Medium_V2" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 6.2, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 3, + "clip": 100, + "cost": 1360320, + "damage": 7.3, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.18, + "edID": 129022084, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.17, + "grp": "axmce", + "id": "4Z", + "integrity": 64, + "mass": 8, + "mount": "F", + "piercing": 33, + "power": 0.69, + "range": 4000, + "rating": "B", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.28, + "symbol": "Hpt_ATMultiCannon_Fixed_Large_V2" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 5.2, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 3, + "clip": 100, + "cost": 2390460, + "damage": 6.3, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.18, + "edID": 129022088, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.17, + "grp": "axmce", + "id": "5A", + "integrity": 64, + "mass": 8, + "mount": "G", + "piercing": 33, + "power": 0.64, + "range": 4000, + "rating": "C", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.28, + "symbol": "Hpt_ATMultiCannon_Gimbal_Large" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 1, + "breachmax": 0.5, + "breachmin": 0.5, + "class": 3, + "clip": 90, + "cost": 4588710, + "damage": 3.9, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.06, + "edID": 129022085, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.16, + "grp": "axmce", + "id": "5B", + "integrity": 64, + "mass": 8, + "mount": "T", + "piercing": 33, + "power": 0.69, + "range": 4000, + "rating": "D", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.1, + "symbol": "Hpt_ATMultiCannon_Turret_Large_V2" + } + ] + } + \ No newline at end of file diff --git a/modules/hardpoints/multi_cannon_advanced.json b/modules/hardpoints/multi_cannon_advanced.json new file mode 100644 index 0000000..f82c75e --- /dev/null +++ b/modules/hardpoints/multi_cannon_advanced.json @@ -0,0 +1,66 @@ +{ + "advmc": [ + { + "ammo": 2100, + "breachdmg": 1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 1, + "clip": 100, + "cost": 9500, + "damage": 1.12, + "damagedist": { + "K": 1 + }, + "distdraw": 0.06, + "edID": 128935981, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.13, + "grp": "advmc", + "id": "5C", + "integrity": 40, + "mass": 2, + "mount": "F", + "piercing": 22, + "power": 0.28, + "range": 4000, + "rating": "F", + "reload": 4, + "shotspeed": 1600, + "thermload": 0.09, + "symbol": "Hpt_MultiCannon_Fixed_Small_Advanced" + }, + { + "ammo": 2100, + "breachdmg": 2, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "clip": 100, + "cost": 38000, + "damage": 2.19, + "damagedist": { + "K": 1 + }, + "distdraw": 0.11, + "edID": 128935980, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.14, + "grp": "advmc", + "id": "5D", + "integrity": 51, + "mass": 4, + "mount": "F", + "piercing": 37, + "power": 0.46, + "range": 4000, + "rating": "E", + "reload": 4, + "shotspeed": 1600, + "thermload": 0.18, + "symbol": "Hpt_MultiCannon_Fixed_Medium_Advanced" + } + ] +} \ No newline at end of file diff --git a/modules/hardpoints/nanite_torpedo_pylon.json b/modules/hardpoints/nanite_torpedo_pylon.json new file mode 100644 index 0000000..3a1a09a --- /dev/null +++ b/modules/hardpoints/nanite_torpedo_pylon.json @@ -0,0 +1,59 @@ +{ + "ntp": [ + { + "ammo": 64, + "breachdmg": 0, + "class": 2, + "clip": 1, + "cost": 843170, + "damage": 0, + "damagedist": { + "E": 1 + }, + "distdraw": 0, + "edID": 128049511, + "eddbID": 0, + "fireint": 2.0, + "grp": "ntp", + "id": "4Q", + "integrity": 50, + "mass": 3, + "missile": "S", + "mount": "F", + "power": 0.4, + "rating": "I", + "reload": 3, + "shotspeed": 1000, + "thermload": 35, + "symbol": "Hpt_ATVentDisruptorPylon_Fixed_Medium" + }, + { + "ammo": 125, + "breachdmg": 0, + "class": 3, + "clip": 1, + "cost": 1627420, + "damage": 0, + "damagedist": { + "E": 1 + }, + "distdraw": 0, + "edID": 128049511, + "eddbID": 0, + "fireint": 2.0, + "grp": "ntp", + "id": "4R", + "integrity": 80, + "mass": 5, + "missile": "S", + "mount": "F", + "power": 0.7, + "rating": "I", + "reload": 3, + "shotspeed": 1000, + "thermload": 35, + "symbol": "Hpt_ATVentDisruptorPylon_Fixed_Large" + } + ] + } + \ No newline at end of file diff --git a/modules/index.js b/modules/index.js index ad67cdf..f28e154 100644 --- a/modules/index.js +++ b/modules/index.js @@ -14,7 +14,9 @@ module.exports = { ul: require('./hardpoints/burst_laser').ul, bl: require('./hardpoints/beam_laser').bl, mc: require('./hardpoints/multi_cannon').mc, + advmc: require('./hardpoints/multi_cannon_advanced').advmc, axmc: require('./hardpoints/ax_multi_cannon').axmc, + axmce: require('./hardpoints/ax_multi_cannon_enhanced').axmce, c: require('./hardpoints/cannon').c, fc: require('./hardpoints/fragment_cannon').fc, rfl: require('./hardpoints/remote_release_flak_launcher.json').rfl, @@ -22,7 +24,9 @@ module.exports = { pa: require('./hardpoints/plasma_accelerator').pa, mr: require('./hardpoints/missile_rack').mr, axmr: require('./hardpoints/ax_missile_rack').axmr, + axmre: require('./hardpoints/ax_missile_rack_enhanced').axmre, tp: require('./hardpoints/torpedo_pylon').tp, + ntp: require('./hardpoints/nanite_torpedo_pylon').ntp, nl: require('./hardpoints/mine_launcher').nl, ml: require('./hardpoints/mining_laser').ml, cs: require('./hardpoints/cargo_scanner').cs, From 441eec5f559d5f670782b85f6ec5dabac06b402c Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 17 May 2024 12:38:51 +0100 Subject: [PATCH 08/23] Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) --- generate_distribution.js | 2 +- modifications/modules.json | 12 +++++++ modules/hardpoints/missing_hardpoint.json | 35 +++++++++++++++++++ modules/index.js | 5 +-- modules/internal/missing_module.json | 20 +++++++++++ modules/standard/frame_shift_drive.json | 19 ++++++++++ modules/standard/fuel_tank.json | 15 ++++++++ modules/standard/life_support.json | 18 ++++++++++ .../standard/planetary_approach_suite.json | 18 ---------- modules/standard/power_distributor.json | 23 ++++++++++++ modules/standard/power_plant.json | 18 ++++++++++ modules/standard/sensors.json | 18 ++++++++++ modules/standard/thrusters.json | 22 ++++++++++++ ships/adder.json | 2 +- ships/alliance_challenger.json | 2 +- ships/alliance_chieftain.json | 2 +- ships/alliance_crusader.json | 2 +- ships/anaconda.json | 2 +- ships/asp.json | 2 +- ships/asp_scout.json | 2 +- ships/beluga.json | 2 +- ships/cobra_mk_iii.json | 2 +- ships/cobra_mk_iv.json | 2 +- ships/diamondback_explorer.json | 2 +- ships/diamondback_scout.json | 2 +- ships/dolphin.json | 2 +- ships/eagle.json | 2 +- ships/federal_assault_ship.json | 2 +- ships/federal_corvette.json | 2 +- ships/federal_dropship.json | 2 +- ships/federal_gunship.json | 2 +- ships/fer_de_lance.json | 2 +- ships/hauler.json | 2 +- ships/imperial_clipper.json | 2 +- ships/imperial_courier.json | 2 +- ships/imperial_cutter.json | 2 +- ships/imperial_eagle.json | 2 +- ships/keelback.json | 2 +- ships/krait_mkii.json | 2 +- ships/krait_phantom.json | 2 +- ships/mamba.json | 2 +- ships/orca.json | 2 +- ships/python.json | 2 +- ships/python_nx.json | 2 +- ships/sidewinder.json | 2 +- ships/type_10_defender.json | 2 +- ships/type_6_transporter.json | 2 +- ships/type_7_transport.json | 2 +- ships/type_9_heavy.json | 2 +- ships/viper.json | 2 +- ships/viper_mk_iv.json | 2 +- ships/vulture.json | 2 +- 52 files changed, 243 insertions(+), 60 deletions(-) create mode 100644 modules/hardpoints/missing_hardpoint.json create mode 100644 modules/internal/missing_module.json delete mode 100644 modules/standard/planetary_approach_suite.json diff --git a/generate_distribution.js b/generate_distribution.js index d93f436..fa69903 100644 --- a/generate_distribution.js +++ b/generate_distribution.js @@ -11,7 +11,7 @@ if (!fs.existsSync('./dist')){ fs.mkdirSync('./dist'); } -fs.open('./dist/index.json', 'w', function() { +fs.open('./dist/index.js', 'w', function() { fs.writeFile('./dist/index.js', code, function(err) {}); }); diff --git a/modifications/modules.json b/modifications/modules.json index 9ef7f94..18a2a46 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -6903,5 +6903,17 @@ }, "modifications": [ ] + }, + "mh": { + "blueprints": { + }, + "modifications": [ + ] + }, + "mm": { + "blueprints": { + }, + "modifications": [ + ] } } diff --git a/modules/hardpoints/missing_hardpoint.json b/modules/hardpoints/missing_hardpoint.json new file mode 100644 index 0000000..420aabe --- /dev/null +++ b/modules/hardpoints/missing_hardpoint.json @@ -0,0 +1,35 @@ +{ + "mh": [ + { + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "mh", + "id": "4G", + "integrity": 0, + "mass": 0, + "name": "Unrecognised Utility", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "power": 0, + "rating": "I", + "symbol": "Hpt_Missing_Utility" + }, + { + "class": 0, + "cost": 10, + "edID": 0, + "eddbID": 0, + "grp": "mh", + "id": "4H", + "integrity": 0, + "mass": 0, + "name": "Unrecognised Weapon", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "power": 0, + "rating": "Z", + "symbol": "Hpt_Missing_Hardpoint" + } + ] + } + \ No newline at end of file diff --git a/modules/index.js b/modules/index.js index ad67cdf..c240ee4 100644 --- a/modules/index.js +++ b/modules/index.js @@ -7,7 +7,6 @@ module.exports = { pd: require('./standard/power_distributor').pd, s: require('./standard/sensors').s, ft: require('./standard/fuel_tank').ft, - pas: require('./standard/planetary_approach_suite').pas }, hardpoints: { pl: require('./hardpoints/pulse_laser').pl, @@ -45,7 +44,8 @@ module.exports = { tbsc: require('./hardpoints/shock_cannon').tbsc, tbem: require('./hardpoints/enzyme_missile_rack.json').tbem, tbrfl: require('./hardpoints/remote_release_flechette_launcher.json').tbrfl, - gsc: require('./hardpoints/guardian_shard_cannon').gsc + gsc: require('./hardpoints/guardian_shard_cannon').gsc, + mh: require('./hardpoints/missing_hardpoint').mh, }, internal: { am: require('./internal/auto_field_maintenance_unit').am, @@ -85,5 +85,6 @@ module.exports = { sua: require('./internal/supercruise_assist').sua, ews: require('./internal/experemental_weapon_stabilizer').ews, pas: require('./internal/planetary_approach_suite').pas, + mm: require('./internal/missing_module').mm, } } diff --git a/modules/internal/missing_module.json b/modules/internal/missing_module.json new file mode 100644 index 0000000..63fbd23 --- /dev/null +++ b/modules/internal/missing_module.json @@ -0,0 +1,20 @@ +{ + "mm": [ + { + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "mm", + "id": "4I", + "integrity": 0, + "mass": 0, + "name": "Unrecognised Module", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "power": 0, + "rating": "Z", + "symbol": "Int_Missing_Module" + } + ] + } + \ No newline at end of file diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index a2d6708..070d3f9 100644 --- a/modules/standard/frame_shift_drive.json +++ b/modules/standard/frame_shift_drive.json @@ -1234,6 +1234,25 @@ "symbol": "Int_Hyperdrive_Overcharge_Size2_Class1", "ukName": "FSD", "ukDiscript": "Faster-than-light capable ship drive, featuring experimental overcharge capabilities, necessary for supercruise travel and hyperspace jumps between star systems." + }, + { + "class": 0, + "cost": 0, + "edID": 0, + "fuelmul": 0, + "fuelpower": 0, + "grp": "fsd", + "id": "4P", + "name": "Unrecognised Frame Shift Drive", + "integrity": 0, + "mass": 0, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "Z", + "symbol": "Int_Missing_Hyperdrive", + "ukName": "Unrecognised Frame Shift Drive", + "ukDiscript": "Unrecognised Frame Shift Drive" } ] } diff --git a/modules/standard/fuel_tank.json b/modules/standard/fuel_tank.json index c661930..3deef80 100644 --- a/modules/standard/fuel_tank.json +++ b/modules/standard/fuel_tank.json @@ -111,6 +111,21 @@ "symbol": "Int_FuelTank_Size8_Class3", "ukName": "Fuel Tank", "ukDiscript": "Storage container for fuel used by ship's power plant." + }, + { + "class": 1, + "cost": 0, + "edID": 0, + "eddbID": 0, + "fuel": 0, + "mass": 0, + "grp": "ft", + "id": "4M", + "rating": "Z", + "symbol": "Int_Missing_FuelTank", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "ukName": "Unrecognised Fuel Tank", + "ukDiscript": "Unrecognised Fuel Tank" } ] } diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json index 69b4abf..29c582a 100644 --- a/modules/standard/life_support.json +++ b/modules/standard/life_support.json @@ -679,6 +679,24 @@ "symbol": "Int_LifeSupport_Size1_Class5", "ukName": "Life Support", "ukDiscript": "Regulates habitable ship atmosphere and provides emergency reservoir for pilot's Remlock system. " + }, + { + "boot": 0, + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "ls", + "id": "4O", + "integrity": 0, + "mass": 0, + "power": 0, + "rating": "Z", + "time": 0, + "symbol": "Int_Missing_LifeSupport", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "ukName": "Unrecognised Life Support", + "ukDiscript": "Unrecognised Life Support" } ] } diff --git a/modules/standard/planetary_approach_suite.json b/modules/standard/planetary_approach_suite.json deleted file mode 100644 index 43fe58c..0000000 --- a/modules/standard/planetary_approach_suite.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "pas": [ - { - "class": 1, - "cost": 500, - "edID": 128672317, - "eddbID": 1538, - "grp": "pas", - "id": "PA", - "mass": 0, - "power": 0, - "rating": "I", - "symbol": "Int_PlanetApproachSuite", - "ukName": "Planetary Approach Suite", - "ukDiscript": "The required Thruster modifications, sensor package and avionics to allow a ship to fly effectively in close proximity to planets." - } - ] -} diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json index f188ba0..dc8f129 100644 --- a/modules/standard/power_distributor.json +++ b/modules/standard/power_distributor.json @@ -1015,6 +1015,29 @@ "symbol": "Int_GuardianPowerDistributor_Size8", "ukName": "Guardian Power Distributor", "ukDiscript": "Distribution system for ENG, SYS and WEP capacitors. Enhanced with Guardian technology to speed up capacitor recharge rates, at the cost of smaller capacitors and increased heat generation. Also boosts overall power output of any power plant it is hooked into." + }, + { + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "engcap": 0, + "engrate": 0, + "grp": "pd", + "id": "4N", + "integrity": 0, + "mass": 0, + "power": 0, + "rating": "Z", + "syscap": 0, + "sysrate": 0, + "wepcap": 0, + "weprate": 0, + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "name": "Unrecognised Power Distributor", + "symbol": "Int_Missing_PowerDistributor", + "ukName": "Unrecognised Power Distributor", + "ukDiscript": "Unrecognised Power Distributor" } ] } diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json index 3fad645..1f3e297 100644 --- a/modules/standard/power_plant.json +++ b/modules/standard/power_plant.json @@ -678,6 +678,24 @@ "symbol": "Int_GuardianPowerplant_Size8", "ukName": "Guardian Power Plant", "ukDiscript": "Consumes fuel to power all ship modules. Enhanced with Guardian technology to produce greater power output, at the cost of heat generated and mass." + }, + { + "class": 0, + "cost": 0, + "edID": 0, + "eddbID": 0, + "eff": 0, + "grp": "pp", + "id": "4K", + "integrity": 0, + "mass": 0, + "pgen": 0, + "rating": "Z", + "name": "Unrecognised Power Plant", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "symbol": "Int_Missing_Powerplant", + "ukName": "Unrecognised Power Plant", + "ukDiscript": "Unrecognised Power Plant" } ] } diff --git a/modules/standard/sensors.json b/modules/standard/sensors.json index a10adb5..51c8e7e 100644 --- a/modules/standard/sensors.json +++ b/modules/standard/sensors.json @@ -679,6 +679,24 @@ "symbol": "Int_Sensors_Size1_Class5", "ukName": "Sensors", "ukDiscript": "Standard suite providing basic detection, identification and targeting capabilities." + }, + { + "angle": 0, + "class": 1, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "s", + "id": "4L", + "integrity": 0, + "mass": 0, + "power": 0, + "range": 0, + "rating": "Z", + "symbol": "Int_Missing_Sensors", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "ukName": "Unrecognised Sensors", + "ukDiscript": "Unrecognised Sensors" } ] } diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index 1f8b015..d85fd11 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -796,6 +796,28 @@ "symbol": "Int_Engine_Size2_Class5_Fast", "ukName": "Thrusters", "ukDiscript": "Enhanced performance normal-space propulsion system." + }, + { + "class": 2, + "cost": 0, + "edID": 0, + "eddbID": 0, + "grp": "t", + "id": "4J", + "integrity": 0, + "mass": 0, + "maxmass": 0, + "maxmul": 0, + "minmass": 0, + "minmul": 0, + "optmass": 0, + "optmul": 0, + "power": 0, + "rating": "Z", + "symbol": "Int_Missing_Engine", + "info": "Not in Coriolis yet. Check GitHub issues. Add Issue if needed.", + "ukName": "Unrecognised Thrusters", + "ukDiscript": "Unrecognised Thrusters " } ] } diff --git a/ships/adder.json b/ships/adder.json index a7f8615..e05ad58 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -118,7 +118,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json index ab2fcbb..2928181 100644 --- a/ships/alliance_challenger.json +++ b/ships/alliance_challenger.json @@ -166,7 +166,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 38a3b94..feadabd 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -164,7 +164,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/alliance_crusader.json b/ships/alliance_crusader.json index c33d594..f4aace6 100644 --- a/ships/alliance_crusader.json +++ b/ships/alliance_crusader.json @@ -166,7 +166,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/anaconda.json b/ships/anaconda.json index 655dd59..7ba88c4 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -148,7 +148,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/asp.json b/ships/asp.json index 3cf824b..792285f 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 0afc982..7114cde 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -119,7 +119,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/beluga.json b/ships/beluga.json index 4e4d3f3..1d13f87 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -134,7 +134,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index d02db55..6cbb738 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -120,7 +120,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 408bd63..a449e93 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -126,7 +126,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index 7b906ea..07c0bb5 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -121,7 +121,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 608b14d..bb789ee 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -120,7 +120,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/dolphin.json b/ships/dolphin.json index 41f75cd..f209683 100755 --- a/ships/dolphin.json +++ b/ships/dolphin.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/eagle.json b/ships/eagle.json index b5cfd38..db67cb0 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -129,7 +129,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index 052c657..af3d74b 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -150,7 +150,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index b2c1f2e..79a878f 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -162,7 +162,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 8f7124a..cf0d3bf 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -152,7 +152,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index d9326b8..9cac08f 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -166,7 +166,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index 6040e2f..b3b4617 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -123,7 +123,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/hauler.json b/ships/hauler.json index c9d9bcd..4882001 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -115,7 +115,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index 1ceb2ae..d1e9d58 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -126,7 +126,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index 305a318..d8d7b06 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index fd8eb99..b007846 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -161,7 +161,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index b335c1b..742391d 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -129,7 +129,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/keelback.json b/ships/keelback.json index 3e33a40..1602769 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -121,7 +121,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/krait_mkii.json b/ships/krait_mkii.json index 3ca27eb..ea6d8b6 100644 --- a/ships/krait_mkii.json +++ b/ships/krait_mkii.json @@ -125,7 +125,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json index f078233..ca614e3 100644 --- a/ships/krait_phantom.json +++ b/ships/krait_phantom.json @@ -123,7 +123,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/mamba.json b/ships/mamba.json index 7f29caf..25dc53c 100644 --- a/ships/mamba.json +++ b/ships/mamba.json @@ -123,7 +123,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/orca.json b/ships/orca.json index f611fd1..452a903 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -123,7 +123,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/python.json b/ships/python.json index 9fa20cf..a25918c 100755 --- a/ships/python.json +++ b/ships/python.json @@ -125,7 +125,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/python_nx.json b/ships/python_nx.json index 80e2d91..813689a 100755 --- a/ships/python_nx.json +++ b/ships/python_nx.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/sidewinder.json b/ships/sidewinder.json index c947a29..3bdc944 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -116,7 +116,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index 9c1190f..a2da048 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -159,7 +159,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 0890dfd..92612a0 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -119,7 +119,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index 91cd4a6..667ec89 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -124,7 +124,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index cd49a49..5307d10 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -127,7 +127,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/viper.json b/ships/viper.json index 9513d13..6c57e59 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -131,7 +131,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 300b7be..46428e4 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -133,7 +133,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } diff --git a/ships/vulture.json b/ships/vulture.json index b430c61..c337e5a 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -132,7 +132,7 @@ 1, { "class": 1, - "name": "Planetary", + "name": "PlanetaryApproachSuite", "eligible": { "pas": 1 } From ae18c94ab8a5f5c9b7f8c08a08f5496199c0f50b Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 24 May 2024 17:55:50 +0100 Subject: [PATCH 09/23] Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) --- modifications/modules.json | 309 ++++++++++++++++++ .../hardpoints/ax_missile_rack_enhanced.json | 136 ++++++++ modules/hardpoints/ax_multi_cannon.json | 1 - .../hardpoints/ax_multi_cannon_enhanced.json | 203 ++++++++++++ modules/hardpoints/multi_cannon_advanced.json | 66 ++++ modules/hardpoints/nanite_torpedo_pylon.json | 59 ++++ modules/index.js | 4 + 7 files changed, 777 insertions(+), 1 deletion(-) create mode 100644 modules/hardpoints/ax_missile_rack_enhanced.json create mode 100644 modules/hardpoints/ax_multi_cannon_enhanced.json create mode 100644 modules/hardpoints/multi_cannon_advanced.json create mode 100644 modules/hardpoints/nanite_torpedo_pylon.json diff --git a/modifications/modules.json b/modifications/modules.json index 18a2a46..26c825f 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -3384,12 +3384,309 @@ "special_weapon_lightweight" ] }, + "advmc": { + "blueprints": { + "Weapon_Efficient": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_HighCapacity": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_LightWeight": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_LongRange": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "MC_Overcharged": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_RapidFire": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_ShortRange": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + }, + "Weapon_Sturdy": { + "grades": { + "1": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "2": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "3": { + "engineers": [ + "Tod McQuinn", + "Zacariah Nemo" + ] + }, + "4": { + "engineers": [ + "Tod McQuinn" + ] + }, + "5": { + "engineers": [ + "Tod McQuinn" + ] + } + } + } + }, + "modifications": [ + "ammo", + "clip", + "damage", + "damagedist", + "fallofffromrange", + "distdraw", + "integrity", + "jitter", + "mass", + "piercing", + "power", + "range", + "reload", + "rof", + "shotspeed", + "thermload" + ], + "specials": [ + "special_auto_loader", + "special_corrosive_shell", + "special_emissive_munitions", + "special_incendiary_rounds", + "special_smart_rounds", + "special_thermalshock", + "special_weapon_damage", + "special_weapon_efficient", + "special_weapon_rateoffire", + "special_weapon_toughened", + "special_weapon_lightweight" + ] + }, "axmc": { "blueprints": { }, "modifications": [ ] }, + "axmce": { + "blueprints": { + }, + "modifications": [ + ] + }, "ml": { "blueprints": { }, @@ -3573,6 +3870,12 @@ "modifications": [ ] }, + "axmre": { + "blueprints": { + }, + "modifications": [ + ] + }, "ews": { "blueprints": { }, @@ -6316,6 +6619,12 @@ "special_mass_lock" ] }, + "ntp": { + "blueprints": { + }, + "modifications": [ + ] + }, "ul": { "blueprints": { "Weapon_Efficient": { diff --git a/modules/hardpoints/ax_missile_rack_enhanced.json b/modules/hardpoints/ax_missile_rack_enhanced.json new file mode 100644 index 0000000..3e1f3ce --- /dev/null +++ b/modules/hardpoints/ax_missile_rack_enhanced.json @@ -0,0 +1,136 @@ +{ + "axmre": [ + { + "experimental": true, + "ammo": 64, + "breachdmg": 0, + "breachmax": 0.8, + "breachmin": 1, + "class": 2, + "clip": 8, + "cost": 681530, + "damage": 77, + "damagedist": { + "X": 1, + "E": 1 + }, + "distdraw": 0.14, + "edID": 129022081, + "eddbID": 0, + "fireint": 2.0, + "grp": "axmre", + "id": "4S", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "F", + "piercing": 60, + "power": 1.3, + "rating": "D", + "reload": 5, + "shotspeed": 1250, + "thermload": 2.4, + "symbol": "Hpt_ATDumbfireMissile_Fixed_Medium_v2" + }, + { + "experimental": true, + "ammo": 64, + "breachdmg": 0, + "breachmax": 0.8, + "breachmin": 1, + "class": 2, + "clip": 8, + "cost": 2666290, + "damage": 64, + "damagedist": { + "X": 1, + "E": 1 + }, + "distdraw": 0.08, + "edID": 129022083, + "eddbID": 0, + "fireint": 2.0, + "grp": "axmre", + "id": "4T", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "T", + "piercing": 60, + "power": 1.3, + "rating": "E", + "reload": 5, + "shotspeed": 1250, + "thermload": 1.5, + + "symbol": "Hpt_ATDumbfireMissile_Turret_Medium_v2" + }, + { + "experimental": true, + "ammo": 128, + "breachdmg": 0, + "breachmax": 0.8, + "breachmin": 1, + "class": 3, + "clip": 12, + "cost": 1703830, + "damage": 77, + "damagedist": { + "X": 1, + "E": 1 + }, + "distdraw": 0.24, + "edID": 129022079, + "eddbID": 0, + "fireint": 2.0, + "grp": "axmre", + "id": "4U", + "integrity": 64, + "mass": 8, + "missile": "D", + "mount": "F", + "piercing": 60, + "power": 1.72, + "rating": "B", + "reload": 5, + "shotspeed": 1250, + "thermload": 3.6, + + "symbol": "Hpt_ATDumbfireMissile_Fixed_Large_v2" + }, + { + "experimental": true, + "ammo": 128, + "breachdmg": 0, + "breachmax": 0.8, + "breachmin": 1, + "class": 3, + "clip": 12, + "cost": 5347530, + "damage": 64, + "damagedist": { + "X": 1, + "E": 1 + }, + "distdraw": 0.14, + "edID": 129022082, + "eddbID": 0, + "fireint": 2.0, + "grp": "axmre", + "id": "4V", + "integrity": 64, + "mass": 8, + "missile": "D", + "mount": "T", + "piercing": 60, + "power": 1.85, + "rating": "D", + "reload": 5, + "shotspeed": 1250, + "thermload": 1.9, + + "symbol": "Hpt_ATDumbfireMissile_Turret_Large_v2" + } + ] + } + \ No newline at end of file diff --git a/modules/hardpoints/ax_multi_cannon.json b/modules/hardpoints/ax_multi_cannon.json index 992b840..d9fcde0 100644 --- a/modules/hardpoints/ax_multi_cannon.json +++ b/modules/hardpoints/ax_multi_cannon.json @@ -14,7 +14,6 @@ "X": 1, "K": 1 }, - "experimental": true, "distdraw": 0.11, "edID": 128788701, "eddbID": 1618, diff --git a/modules/hardpoints/ax_multi_cannon_enhanced.json b/modules/hardpoints/ax_multi_cannon_enhanced.json new file mode 100644 index 0000000..db180a4 --- /dev/null +++ b/modules/hardpoints/ax_multi_cannon_enhanced.json @@ -0,0 +1,203 @@ +{ + "axmce": [ + { + "experimental": true, + "ammo": 2100, + "breachdmg": 3.3, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 2, + "clip": 100, + "cost": 455080, + "damage": 3.9, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.11, + "edID": 129022080, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.14, + "grp": "axmce", + "id": "4W", + "integrity": 51, + "mass": 4, + "mount": "F", + "piercing": 17, + "power": 0.48, + "range": 4000, + "rating": "D", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.18, + "symbol": "Hpt_ATMultiCannon_Fixed_Medium_V2" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 3.1, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 2, + "clip": 100, + "cost": 1197640, + "damage": 3.7, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.11, + "edID": 129022089, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.14, + "grp": "axmce", + "id": "4X", + "integrity": 51, + "mass": 4, + "mount": "G", + "piercing": 17, + "power": 0.46, + "range": 4000, + "rating": "E", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.18, + "symbol": "Hpt_ATMultiCannon_Gimbal_Medium" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 0.5, + "breachmax": 0.5, + "breachmin": 0.5, + "class": 2, + "clip": 90, + "cost": 2193300, + "damage": 2, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.06, + "edID": 129022086, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.16, + "grp": "axmce", + "id": "4Y", + "integrity": 51, + "mass": 4, + "mount": "T", + "piercing": 17, + "power": 0.52, + "range": 4000, + "rating": "E", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.1, + "symbol": "Hpt_ATMultiCannon_Turret_Medium_V2" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 6.2, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 3, + "clip": 100, + "cost": 1360320, + "damage": 7.3, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.18, + "edID": 129022084, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.17, + "grp": "axmce", + "id": "4Z", + "integrity": 64, + "mass": 8, + "mount": "F", + "piercing": 33, + "power": 0.69, + "range": 4000, + "rating": "B", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.28, + "symbol": "Hpt_ATMultiCannon_Fixed_Large_V2" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 5.2, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 3, + "clip": 100, + "cost": 2390460, + "damage": 6.3, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.18, + "edID": 129022088, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.17, + "grp": "axmce", + "id": "5A", + "integrity": 64, + "mass": 8, + "mount": "G", + "piercing": 33, + "power": 0.64, + "range": 4000, + "rating": "C", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.28, + "symbol": "Hpt_ATMultiCannon_Gimbal_Large" + }, + { + "experimental": true, + "ammo": 2100, + "breachdmg": 1, + "breachmax": 0.5, + "breachmin": 0.5, + "class": 3, + "clip": 90, + "cost": 4588710, + "damage": 3.9, + "damagedist": { + "X": 1, + "K": 1 + }, + "distdraw": 0.06, + "edID": 129022085, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.16, + "grp": "axmce", + "id": "5B", + "integrity": 64, + "mass": 8, + "mount": "T", + "piercing": 33, + "power": 0.69, + "range": 4000, + "rating": "D", + "reload": 4, + "shotspeed": 4000, + "thermload": 0.1, + "symbol": "Hpt_ATMultiCannon_Turret_Large_V2" + } + ] + } + \ No newline at end of file diff --git a/modules/hardpoints/multi_cannon_advanced.json b/modules/hardpoints/multi_cannon_advanced.json new file mode 100644 index 0000000..f82c75e --- /dev/null +++ b/modules/hardpoints/multi_cannon_advanced.json @@ -0,0 +1,66 @@ +{ + "advmc": [ + { + "ammo": 2100, + "breachdmg": 1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 1, + "clip": 100, + "cost": 9500, + "damage": 1.12, + "damagedist": { + "K": 1 + }, + "distdraw": 0.06, + "edID": 128935981, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.13, + "grp": "advmc", + "id": "5C", + "integrity": 40, + "mass": 2, + "mount": "F", + "piercing": 22, + "power": 0.28, + "range": 4000, + "rating": "F", + "reload": 4, + "shotspeed": 1600, + "thermload": 0.09, + "symbol": "Hpt_MultiCannon_Fixed_Small_Advanced" + }, + { + "ammo": 2100, + "breachdmg": 2, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "clip": 100, + "cost": 38000, + "damage": 2.19, + "damagedist": { + "K": 1 + }, + "distdraw": 0.11, + "edID": 128935980, + "eddbID": 0, + "falloff": 2000, + "fireint": 0.14, + "grp": "advmc", + "id": "5D", + "integrity": 51, + "mass": 4, + "mount": "F", + "piercing": 37, + "power": 0.46, + "range": 4000, + "rating": "E", + "reload": 4, + "shotspeed": 1600, + "thermload": 0.18, + "symbol": "Hpt_MultiCannon_Fixed_Medium_Advanced" + } + ] +} \ No newline at end of file diff --git a/modules/hardpoints/nanite_torpedo_pylon.json b/modules/hardpoints/nanite_torpedo_pylon.json new file mode 100644 index 0000000..3a1a09a --- /dev/null +++ b/modules/hardpoints/nanite_torpedo_pylon.json @@ -0,0 +1,59 @@ +{ + "ntp": [ + { + "ammo": 64, + "breachdmg": 0, + "class": 2, + "clip": 1, + "cost": 843170, + "damage": 0, + "damagedist": { + "E": 1 + }, + "distdraw": 0, + "edID": 128049511, + "eddbID": 0, + "fireint": 2.0, + "grp": "ntp", + "id": "4Q", + "integrity": 50, + "mass": 3, + "missile": "S", + "mount": "F", + "power": 0.4, + "rating": "I", + "reload": 3, + "shotspeed": 1000, + "thermload": 35, + "symbol": "Hpt_ATVentDisruptorPylon_Fixed_Medium" + }, + { + "ammo": 125, + "breachdmg": 0, + "class": 3, + "clip": 1, + "cost": 1627420, + "damage": 0, + "damagedist": { + "E": 1 + }, + "distdraw": 0, + "edID": 128049511, + "eddbID": 0, + "fireint": 2.0, + "grp": "ntp", + "id": "4R", + "integrity": 80, + "mass": 5, + "missile": "S", + "mount": "F", + "power": 0.7, + "rating": "I", + "reload": 3, + "shotspeed": 1000, + "thermload": 35, + "symbol": "Hpt_ATVentDisruptorPylon_Fixed_Large" + } + ] + } + \ No newline at end of file diff --git a/modules/index.js b/modules/index.js index c240ee4..18844d2 100644 --- a/modules/index.js +++ b/modules/index.js @@ -13,7 +13,9 @@ module.exports = { ul: require('./hardpoints/burst_laser').ul, bl: require('./hardpoints/beam_laser').bl, mc: require('./hardpoints/multi_cannon').mc, + advmc: require('./hardpoints/multi_cannon_advanced').advmc, axmc: require('./hardpoints/ax_multi_cannon').axmc, + axmce: require('./hardpoints/ax_multi_cannon_enhanced').axmce, c: require('./hardpoints/cannon').c, fc: require('./hardpoints/fragment_cannon').fc, rfl: require('./hardpoints/remote_release_flak_launcher.json').rfl, @@ -21,7 +23,9 @@ module.exports = { pa: require('./hardpoints/plasma_accelerator').pa, mr: require('./hardpoints/missile_rack').mr, axmr: require('./hardpoints/ax_missile_rack').axmr, + axmre: require('./hardpoints/ax_missile_rack_enhanced').axmre, tp: require('./hardpoints/torpedo_pylon').tp, + ntp: require('./hardpoints/nanite_torpedo_pylon').ntp, nl: require('./hardpoints/mine_launcher').nl, ml: require('./hardpoints/mining_laser').ml, cs: require('./hardpoints/cargo_scanner').cs, From 972e168e76c6c47d47788072de31c59e23d82786 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Mon, 27 May 2024 15:46:16 +0100 Subject: [PATCH 10/23] Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --- modules/hardpoints/beam_laser.json | 1 + modules/hardpoints/burst_laser.json | 1 + modules/hardpoints/fragment_cannon.json | 1 + modules/hardpoints/mining_laser.json | 1 + modules/hardpoints/missile_rack.json | 67 ++----------------- modules/hardpoints/missile_rack_advanced.json | 66 ++++++++++++++++++ modules/hardpoints/multi_cannon.json | 1 + modules/hardpoints/plasma_accelerator.json | 1 + modules/hardpoints/pulse_laser.json | 1 + modules/hardpoints/rail_gun.json | 1 + modules/index.js | 1 + 11 files changed, 80 insertions(+), 62 deletions(-) create mode 100644 modules/hardpoints/missile_rack_advanced.json diff --git a/modules/hardpoints/beam_laser.json b/modules/hardpoints/beam_laser.json index 9c1e162..f4e427b 100644 --- a/modules/hardpoints/beam_laser.json +++ b/modules/hardpoints/beam_laser.json @@ -100,6 +100,7 @@ "mass": 2, "mount": "F", "name": "Retributor", + "special": "Retributor", "piercing": 18, "power": 0.62, "pp": "Edmund Mahon", diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json index 873744a..e927ebc 100644 --- a/modules/hardpoints/burst_laser.json +++ b/modules/hardpoints/burst_laser.json @@ -111,6 +111,7 @@ "mass": 2, "mount": "F", "name": "Cytoscrambler", + "special": "Cyto", "piercing": 1, "power": 0.8, "pp": "Archon Delaine", diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index 919c497..f06b68f 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -321,6 +321,7 @@ "mass": 8, "mount": "F", "name": "Pacifier", + "special": "Pacifier", "piercing": 45, "power": 1.02, "pp": "Zachary Hudson", diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json index 13ec5fa..9293ffb 100644 --- a/modules/hardpoints/mining_laser.json +++ b/modules/hardpoints/mining_laser.json @@ -72,6 +72,7 @@ "mass": 2, "mount": "F", "name": "Mining Lance", + "special": "Lance", "piercing": 18, "power": 0.7, "pp": "Zemina Torval", diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json index a59d971..49984e7 100644 --- a/modules/hardpoints/missile_rack.json +++ b/modules/hardpoints/missile_rack.json @@ -51,6 +51,7 @@ "integrity": 40, "mass": 2, "missile": "S", + "special": "Seeker", "mount": "F", "piercing": 60, "power": 0.6, @@ -115,6 +116,7 @@ "integrity": 51, "mass": 4, "missile": "S", + "special": "Seeker", "mount": "F", "piercing": 60, "power": 1.2, @@ -147,6 +149,7 @@ "missile": "D", "mount": "F", "name": "Rocket Propelled FSD Disruptor", + "special": "Grom", "piercing": 60, "power": 1.2, "pp": "Yuri Grom", @@ -189,6 +192,7 @@ "roundspershot": 4, "shotspeed": 600, "thermload": 3.6, + "special": "Pack-Hound", "symbol": "Hpt_DrunkMissileRack_Fixed_Medium" }, { @@ -242,6 +246,7 @@ "integrity": 64, "mass": 8, "missile": "S", + "special": "Seeker", "mount": "F", "piercing": 60, "power": 1.62, @@ -250,68 +255,6 @@ "shotspeed": 625, "thermload": 3.6, "symbol": "Hpt_BasicMissileRack_Fixed_Large" - }, - { - "ammo": 64, - "breachdmg": 20, - "breachmax": 1, - "breachmin": 1, - "class": 1, - "clip": 8, - "cost": 32180, - "damage": 50, - "damagedist": { - "E": 1 - }, - "distdraw": 0.24, - "edID": 128935982, - "eddbID": 1813, - "fireint": 2, - "grp": "mr", - "id": "yT", - "integrity": 40, - "mass": 2, - "missile": "D", - "mount": "F", - "name": "Advanced Missile Rack", - "piercing": 60, - "power": 0.4, - "rating": "B", - "reload": 5, - "shotspeed": 750, - "thermload": 3.6, - "symbol": "Hpt_DumbfireMissileRack_Fixed_Small_Advanced" - }, - { - "ammo": 64, - "breachdmg": 20, - "breachmax": 1, - "breachmin": 1, - "class": 2, - "clip": 12, - "cost": 1471030, - "damage": 50, - "damagedist": { - "E": 1 - }, - "distdraw": 0.24, - "edID": 128935983, - "eddbID": 1814, - "fireint": 2, - "grp": "mr", - "id": "yU", - "integrity": 51, - "mass": 4, - "missile": "D", - "mount": "F", - "name": "Advanced Missile Rack", - "piercing": 60, - "power": 1.2, - "rating": "B", - "reload": 5, - "shotspeed": 750, - "thermload": 3.6, - "symbol": "Hpt_DumbfireMissileRack_Fixed_Medium_Advanced" } ] } diff --git a/modules/hardpoints/missile_rack_advanced.json b/modules/hardpoints/missile_rack_advanced.json new file mode 100644 index 0000000..1b82e5a --- /dev/null +++ b/modules/hardpoints/missile_rack_advanced.json @@ -0,0 +1,66 @@ +{ + "amr": [ + { + "ammo": 64, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, + "class": 1, + "clip": 8, + "cost": 32180, + "damage": 50, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128935982, + "eddbID": 1813, + "fireint": 2, + "grp": "amr", + "id": "yT", + "integrity": 40, + "mass": 2, + "missile": "D", + "mount": "F", + "name": "Advanced Missile Rack", + "piercing": 60, + "power": 0.4, + "rating": "B", + "reload": 5, + "shotspeed": 750, + "thermload": 3.6, + "symbol": "Hpt_DumbfireMissileRack_Fixed_Small_Advanced" + }, + { + "ammo": 64, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, + "class": 2, + "clip": 12, + "cost": 1471030, + "damage": 50, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128935983, + "eddbID": 1814, + "fireint": 2, + "grp": "amr", + "id": "yU", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "F", + "name": "Advanced Missile Rack", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 5, + "shotspeed": 750, + "thermload": 3.6, + "symbol": "Hpt_DumbfireMissileRack_Fixed_Medium_Advanced" + } + ] +} diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index d9458d1..3ecd503 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -116,6 +116,7 @@ "mass": 2, "mount": "F", "name": "Enforcer", + "special": "Enforcer", "piercing": 30, "power": 0.28, "pp": "Pranav Antal", diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json index 70f1155..3330a33 100644 --- a/modules/hardpoints/plasma_accelerator.json +++ b/modules/hardpoints/plasma_accelerator.json @@ -91,6 +91,7 @@ "mass": 8, "mount": "F", "name": "Advanced Plasma Accelerator", + "special": "Advanced", "piercing": 100, "power": 1.97, "pp": "Denton Patreus", diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json index 967b12a..9a3bfd6 100644 --- a/modules/hardpoints/pulse_laser.json +++ b/modules/hardpoints/pulse_laser.json @@ -183,6 +183,7 @@ "mass": 4, "mount": "F", "name": "Disruptor", + "special": "Disruptor", "piercing": 35, "power": 0.7, "pp": "Felicia Winters", diff --git a/modules/hardpoints/rail_gun.json b/modules/hardpoints/rail_gun.json index d321edc..547851a 100644 --- a/modules/hardpoints/rail_gun.json +++ b/modules/hardpoints/rail_gun.json @@ -88,6 +88,7 @@ "mass": 4, "mount": "F", "name": "Imperial Hammer", + "special": "Hammer", "piercing": 100, "power": 1.63, "pp": "Arissa Lavigny-Duval", diff --git a/modules/index.js b/modules/index.js index 18844d2..1525022 100644 --- a/modules/index.js +++ b/modules/index.js @@ -22,6 +22,7 @@ module.exports = { rg: require('./hardpoints/rail_gun').rg, pa: require('./hardpoints/plasma_accelerator').pa, mr: require('./hardpoints/missile_rack').mr, + amr: require('./hardpoints/missile_rack_advanced').amr, axmr: require('./hardpoints/ax_missile_rack').axmr, axmre: require('./hardpoints/ax_missile_rack_enhanced').axmre, tp: require('./hardpoints/torpedo_pylon').tp, From 0b2800f99025a4e89f3d58b42e39d4350cf1d1c7 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Mon, 27 May 2024 17:00:19 +0100 Subject: [PATCH 11/23] Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey --- modules/hardpoints/beam_laser.json | 1 + modules/hardpoints/burst_laser.json | 1 + modules/hardpoints/fragment_cannon.json | 1 + modules/hardpoints/mining_laser.json | 1 + modules/hardpoints/missile_rack.json | 67 ++----------------- modules/hardpoints/missile_rack_advanced.json | 66 ++++++++++++++++++ modules/hardpoints/multi_cannon.json | 1 + modules/hardpoints/plasma_accelerator.json | 1 + modules/hardpoints/pulse_laser.json | 1 + modules/hardpoints/rail_gun.json | 1 + modules/index.js | 1 + 11 files changed, 80 insertions(+), 62 deletions(-) create mode 100644 modules/hardpoints/missile_rack_advanced.json diff --git a/modules/hardpoints/beam_laser.json b/modules/hardpoints/beam_laser.json index 9c1e162..f4e427b 100644 --- a/modules/hardpoints/beam_laser.json +++ b/modules/hardpoints/beam_laser.json @@ -100,6 +100,7 @@ "mass": 2, "mount": "F", "name": "Retributor", + "special": "Retributor", "piercing": 18, "power": 0.62, "pp": "Edmund Mahon", diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json index 873744a..e927ebc 100644 --- a/modules/hardpoints/burst_laser.json +++ b/modules/hardpoints/burst_laser.json @@ -111,6 +111,7 @@ "mass": 2, "mount": "F", "name": "Cytoscrambler", + "special": "Cyto", "piercing": 1, "power": 0.8, "pp": "Archon Delaine", diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index 919c497..f06b68f 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -321,6 +321,7 @@ "mass": 8, "mount": "F", "name": "Pacifier", + "special": "Pacifier", "piercing": 45, "power": 1.02, "pp": "Zachary Hudson", diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json index 13ec5fa..9293ffb 100644 --- a/modules/hardpoints/mining_laser.json +++ b/modules/hardpoints/mining_laser.json @@ -72,6 +72,7 @@ "mass": 2, "mount": "F", "name": "Mining Lance", + "special": "Lance", "piercing": 18, "power": 0.7, "pp": "Zemina Torval", diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json index a59d971..49984e7 100644 --- a/modules/hardpoints/missile_rack.json +++ b/modules/hardpoints/missile_rack.json @@ -51,6 +51,7 @@ "integrity": 40, "mass": 2, "missile": "S", + "special": "Seeker", "mount": "F", "piercing": 60, "power": 0.6, @@ -115,6 +116,7 @@ "integrity": 51, "mass": 4, "missile": "S", + "special": "Seeker", "mount": "F", "piercing": 60, "power": 1.2, @@ -147,6 +149,7 @@ "missile": "D", "mount": "F", "name": "Rocket Propelled FSD Disruptor", + "special": "Grom", "piercing": 60, "power": 1.2, "pp": "Yuri Grom", @@ -189,6 +192,7 @@ "roundspershot": 4, "shotspeed": 600, "thermload": 3.6, + "special": "Pack-Hound", "symbol": "Hpt_DrunkMissileRack_Fixed_Medium" }, { @@ -242,6 +246,7 @@ "integrity": 64, "mass": 8, "missile": "S", + "special": "Seeker", "mount": "F", "piercing": 60, "power": 1.62, @@ -250,68 +255,6 @@ "shotspeed": 625, "thermload": 3.6, "symbol": "Hpt_BasicMissileRack_Fixed_Large" - }, - { - "ammo": 64, - "breachdmg": 20, - "breachmax": 1, - "breachmin": 1, - "class": 1, - "clip": 8, - "cost": 32180, - "damage": 50, - "damagedist": { - "E": 1 - }, - "distdraw": 0.24, - "edID": 128935982, - "eddbID": 1813, - "fireint": 2, - "grp": "mr", - "id": "yT", - "integrity": 40, - "mass": 2, - "missile": "D", - "mount": "F", - "name": "Advanced Missile Rack", - "piercing": 60, - "power": 0.4, - "rating": "B", - "reload": 5, - "shotspeed": 750, - "thermload": 3.6, - "symbol": "Hpt_DumbfireMissileRack_Fixed_Small_Advanced" - }, - { - "ammo": 64, - "breachdmg": 20, - "breachmax": 1, - "breachmin": 1, - "class": 2, - "clip": 12, - "cost": 1471030, - "damage": 50, - "damagedist": { - "E": 1 - }, - "distdraw": 0.24, - "edID": 128935983, - "eddbID": 1814, - "fireint": 2, - "grp": "mr", - "id": "yU", - "integrity": 51, - "mass": 4, - "missile": "D", - "mount": "F", - "name": "Advanced Missile Rack", - "piercing": 60, - "power": 1.2, - "rating": "B", - "reload": 5, - "shotspeed": 750, - "thermload": 3.6, - "symbol": "Hpt_DumbfireMissileRack_Fixed_Medium_Advanced" } ] } diff --git a/modules/hardpoints/missile_rack_advanced.json b/modules/hardpoints/missile_rack_advanced.json new file mode 100644 index 0000000..1b82e5a --- /dev/null +++ b/modules/hardpoints/missile_rack_advanced.json @@ -0,0 +1,66 @@ +{ + "amr": [ + { + "ammo": 64, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, + "class": 1, + "clip": 8, + "cost": 32180, + "damage": 50, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128935982, + "eddbID": 1813, + "fireint": 2, + "grp": "amr", + "id": "yT", + "integrity": 40, + "mass": 2, + "missile": "D", + "mount": "F", + "name": "Advanced Missile Rack", + "piercing": 60, + "power": 0.4, + "rating": "B", + "reload": 5, + "shotspeed": 750, + "thermload": 3.6, + "symbol": "Hpt_DumbfireMissileRack_Fixed_Small_Advanced" + }, + { + "ammo": 64, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, + "class": 2, + "clip": 12, + "cost": 1471030, + "damage": 50, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128935983, + "eddbID": 1814, + "fireint": 2, + "grp": "amr", + "id": "yU", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "F", + "name": "Advanced Missile Rack", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 5, + "shotspeed": 750, + "thermload": 3.6, + "symbol": "Hpt_DumbfireMissileRack_Fixed_Medium_Advanced" + } + ] +} diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index d9458d1..3ecd503 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -116,6 +116,7 @@ "mass": 2, "mount": "F", "name": "Enforcer", + "special": "Enforcer", "piercing": 30, "power": 0.28, "pp": "Pranav Antal", diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json index 70f1155..3330a33 100644 --- a/modules/hardpoints/plasma_accelerator.json +++ b/modules/hardpoints/plasma_accelerator.json @@ -91,6 +91,7 @@ "mass": 8, "mount": "F", "name": "Advanced Plasma Accelerator", + "special": "Advanced", "piercing": 100, "power": 1.97, "pp": "Denton Patreus", diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json index 967b12a..9a3bfd6 100644 --- a/modules/hardpoints/pulse_laser.json +++ b/modules/hardpoints/pulse_laser.json @@ -183,6 +183,7 @@ "mass": 4, "mount": "F", "name": "Disruptor", + "special": "Disruptor", "piercing": 35, "power": 0.7, "pp": "Felicia Winters", diff --git a/modules/hardpoints/rail_gun.json b/modules/hardpoints/rail_gun.json index d321edc..547851a 100644 --- a/modules/hardpoints/rail_gun.json +++ b/modules/hardpoints/rail_gun.json @@ -88,6 +88,7 @@ "mass": 4, "mount": "F", "name": "Imperial Hammer", + "special": "Hammer", "piercing": 100, "power": 1.63, "pp": "Arissa Lavigny-Duval", diff --git a/modules/index.js b/modules/index.js index 18844d2..1525022 100644 --- a/modules/index.js +++ b/modules/index.js @@ -22,6 +22,7 @@ module.exports = { rg: require('./hardpoints/rail_gun').rg, pa: require('./hardpoints/plasma_accelerator').pa, mr: require('./hardpoints/missile_rack').mr, + amr: require('./hardpoints/missile_rack_advanced').amr, axmr: require('./hardpoints/ax_missile_rack').axmr, axmre: require('./hardpoints/ax_missile_rack_enhanced').axmre, tp: require('./hardpoints/torpedo_pylon').tp, From 9e5273b56426596061e2b02a6ba53e3e4103c9ab Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Wed, 5 Jun 2024 10:21:57 +0100 Subject: [PATCH 12/23] Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. --- .../hardpoints/ax_missile_rack_enhanced.json | 15 ++-- .../hardpoints/ax_multi_cannon_enhanced.json | 11 ++- modules/hardpoints/cargo_scanner.json | 10 +-- modules/hardpoints/fragment_cannon.json | 2 +- .../hardpoints/frame_shift_wake_scanner.json | 10 +-- modules/hardpoints/kill_warrant_scanner.json | 10 +-- modules/hardpoints/mine_launcher.json | 2 +- modules/hardpoints/mining_laser.json | 4 +- modules/hardpoints/missile_rack.json | 66 +++++++++++++++- modules/hardpoints/multi_cannon.json | 2 +- modules/hardpoints/nanite_torpedo_pylon.json | 3 +- modules/hardpoints/pulse_wave_analyser.json | 10 +-- .../hardpoints/seismic_charge_launcher.json | 2 +- .../shutdown_field_neutraliser.json | 2 +- .../sub_surface_displacement_missile.json | 6 +- modules/hardpoints/xeno_scanner.json | 4 +- .../internal/auto_field_maintenance_unit.json | 28 +++---- .../internal/bi_weave_shield_generator.json | 16 ++-- .../internal/business_passenger_cabin.json | 8 +- modules/internal/cargo_rack.json | 10 +-- .../decontamination_limpet_controller.json | 6 +- modules/internal/docking_computer.json | 2 +- modules/internal/economy_passenger_cabin.json | 10 +-- .../experemental_weapon_stabilizer.json | 4 +- modules/internal/fighter_hangar.json | 6 +- modules/internal/first_passenger_cabin.json | 6 +- .../frame_shift_drive_interdictor.json | 10 +-- modules/internal/fuel_scoop.json | 70 ++++++++--------- modules/internal/luxury_passenger_cabin.json | 4 +- .../internal/multi_limpet_controllers.json | 5 +- modules/internal/refinery.json | 10 +-- modules/internal/shield_cell_bank.json | 6 +- modules/internal/shield_generator.json | 66 ++++++++-------- modules/standard/frame_shift_drive.json | 66 ++++++++-------- modules/standard/fuel_tank.json | 12 +-- modules/standard/life_support.json | 76 +++++++++---------- modules/standard/power_distributor.json | 76 +++++++++---------- modules/standard/power_plant.json | 70 ++++++++--------- modules/standard/sensors.json | 76 +++++++++---------- modules/standard/thrusters.json | 66 ++++++++-------- ships/adder.json | 8 +- ships/alliance_challenger.json | 8 +- ships/alliance_chieftain.json | 8 +- ships/anaconda.json | 6 +- ships/asp.json | 8 +- ships/asp_scout.json | 8 +- ships/beluga.json | 8 +- ships/cobra_mk_iii.json | 8 +- ships/cobra_mk_iv.json | 6 +- ships/diamondback_explorer.json | 8 +- ships/diamondback_scout.json | 8 +- ships/dolphin.json | 8 +- ships/eagle.json | 6 +- ships/federal_assault_ship.json | 8 +- ships/federal_corvette.json | 8 +- ships/federal_dropship.json | 8 +- ships/federal_gunship.json | 8 +- ships/fer_de_lance.json | 8 +- ships/hauler.json | 8 +- ships/imperial_clipper.json | 8 +- ships/imperial_courier.json | 8 +- ships/imperial_cutter.json | 8 +- ships/imperial_eagle.json | 8 +- ships/keelback.json | 8 +- ships/krait_mkii.json | 8 +- ships/krait_phantom.json | 8 +- ships/mamba.json | 8 +- ships/orca.json | 8 +- ships/python.json | 8 +- ships/sidewinder.json | 4 +- ships/type_10_defender.json | 4 +- ships/type_6_transporter.json | 6 +- ships/type_7_transport.json | 4 +- ships/type_9_heavy.json | 8 +- ships/viper.json | 8 +- ships/viper_mk_iv.json | 8 +- ships/vulture.json | 8 +- 77 files changed, 601 insertions(+), 543 deletions(-) diff --git a/modules/hardpoints/ax_missile_rack_enhanced.json b/modules/hardpoints/ax_missile_rack_enhanced.json index 3e1f3ce..83199b2 100644 --- a/modules/hardpoints/ax_missile_rack_enhanced.json +++ b/modules/hardpoints/ax_missile_rack_enhanced.json @@ -8,7 +8,7 @@ "breachmin": 1, "class": 2, "clip": 8, - "cost": 681530, + "cost": 681534, "damage": 77, "damagedist": { "X": 1, @@ -40,7 +40,7 @@ "breachmin": 1, "class": 2, "clip": 8, - "cost": 2666290, + "cost": 2666286, "damage": 64, "damagedist": { "X": 1, @@ -62,7 +62,7 @@ "reload": 5, "shotspeed": 1250, "thermload": 1.5, - + "symbol": "Hpt_ATDumbfireMissile_Turret_Medium_v2" }, { @@ -73,7 +73,7 @@ "breachmin": 1, "class": 3, "clip": 12, - "cost": 1703830, + "cost": 1703835, "damage": 77, "damagedist": { "X": 1, @@ -95,7 +95,7 @@ "reload": 5, "shotspeed": 1250, "thermload": 3.6, - + "symbol": "Hpt_ATDumbfireMissile_Fixed_Large_v2" }, { @@ -106,7 +106,7 @@ "breachmin": 1, "class": 3, "clip": 12, - "cost": 5347530, + "cost": 5347534, "damage": 64, "damagedist": { "X": 1, @@ -128,9 +128,8 @@ "reload": 5, "shotspeed": 1250, "thermload": 1.9, - + "symbol": "Hpt_ATDumbfireMissile_Turret_Large_v2" } ] } - \ No newline at end of file diff --git a/modules/hardpoints/ax_multi_cannon_enhanced.json b/modules/hardpoints/ax_multi_cannon_enhanced.json index db180a4..0488133 100644 --- a/modules/hardpoints/ax_multi_cannon_enhanced.json +++ b/modules/hardpoints/ax_multi_cannon_enhanced.json @@ -8,7 +8,7 @@ "breachmin": 0.8, "class": 2, "clip": 100, - "cost": 455080, + "cost": 455077, "damage": 3.9, "damagedist": { "X": 1, @@ -41,7 +41,7 @@ "breachmin": 0.8, "class": 2, "clip": 100, - "cost": 1197640, + "cost": 1197644, "damage": 3.7, "damagedist": { "X": 1, @@ -74,7 +74,7 @@ "breachmin": 0.5, "class": 2, "clip": 90, - "cost": 2193300, + "cost": 2193297, "damage": 2, "damagedist": { "X": 1, @@ -107,7 +107,7 @@ "breachmin": 0.8, "class": 3, "clip": 100, - "cost": 1360320, + "cost": 1360322, "damage": 7.3, "damagedist": { "X": 1, @@ -173,7 +173,7 @@ "breachmin": 0.5, "class": 3, "clip": 90, - "cost": 4588710, + "cost": 4588709, "damage": 3.9, "damagedist": { "X": 1, @@ -200,4 +200,3 @@ } ] } - \ No newline at end of file diff --git a/modules/hardpoints/cargo_scanner.json b/modules/hardpoints/cargo_scanner.json index 72ee88d..e0fade0 100644 --- a/modules/hardpoints/cargo_scanner.json +++ b/modules/hardpoints/cargo_scanner.json @@ -3,7 +3,7 @@ { "angle": 15, "class": 0, - "cost": 13540, + "cost": 13544, "edID": 128662520, "eddbID": 1227, "grp": "cs", @@ -19,7 +19,7 @@ { "angle": 15, "class": 0, - "cost": 40630, + "cost": 40633, "edID": 128662521, "eddbID": 1228, "grp": "cs", @@ -35,7 +35,7 @@ { "angle": 15, "class": 0, - "cost": 121900, + "cost": 121899, "edID": 128662522, "eddbID": 1229, "grp": "cs", @@ -51,7 +51,7 @@ { "angle": 15, "class": 0, - "cost": 365700, + "cost": 365698, "edID": 128662523, "eddbID": 1230, "grp": "cs", @@ -67,7 +67,7 @@ { "angle": 15, "class": 0, - "cost": 1097100, + "cost": 1097095, "edID": 128662524, "eddbID": 1231, "grp": "cs", diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index f06b68f..bd6cabc 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -139,7 +139,7 @@ "breachmin": 0.4, "class": 2, "clip": 3, - "cost": 437761, + "cost": 437760, "damage": 2.275, "damagedist": { "K": 1 diff --git a/modules/hardpoints/frame_shift_wake_scanner.json b/modules/hardpoints/frame_shift_wake_scanner.json index dc3d130..38af771 100644 --- a/modules/hardpoints/frame_shift_wake_scanner.json +++ b/modules/hardpoints/frame_shift_wake_scanner.json @@ -2,7 +2,7 @@ "ws": [ { "class": 0, - "cost": 13540, + "cost": 13544, "edID": 128662525, "eddbID": 1232, "grp": "ws", @@ -17,7 +17,7 @@ }, { "class": 0, - "cost": 40630, + "cost": 40633, "edID": 128662526, "eddbID": 1233, "grp": "ws", @@ -32,7 +32,7 @@ }, { "class": 0, - "cost": 121900, + "cost": 121899, "edID": 128662527, "eddbID": 1234, "grp": "ws", @@ -47,7 +47,7 @@ }, { "class": 0, - "cost": 365700, + "cost": 365698, "edID": 128662528, "eddbID": 1235, "grp": "ws", @@ -62,7 +62,7 @@ }, { "class": 0, - "cost": 1097100, + "cost": 1097095, "edID": 128662529, "eddbID": 1236, "grp": "ws", diff --git a/modules/hardpoints/kill_warrant_scanner.json b/modules/hardpoints/kill_warrant_scanner.json index 713754b..c0f905d 100644 --- a/modules/hardpoints/kill_warrant_scanner.json +++ b/modules/hardpoints/kill_warrant_scanner.json @@ -2,7 +2,7 @@ "kw": [ { "class": 0, - "cost": 13540, + "cost": 13544, "edID": 128662530, "eddbID": 1237, "grp": "kw", @@ -17,7 +17,7 @@ }, { "class": 0, - "cost": 40630, + "cost": 40633, "edID": 128662531, "eddbID": 1238, "grp": "kw", @@ -32,7 +32,7 @@ }, { "class": 0, - "cost": 121900, + "cost": 121899, "edID": 128662532, "eddbID": 1239, "grp": "kw", @@ -47,7 +47,7 @@ }, { "class": 0, - "cost": 365700, + "cost": 365698, "edID": 128662533, "eddbID": 1240, "grp": "kw", @@ -62,7 +62,7 @@ }, { "class": 0, - "cost": 1097100, + "cost": 1097095, "edID": 128662534, "eddbID": 1241, "grp": "kw", diff --git a/modules/hardpoints/mine_launcher.json b/modules/hardpoints/mine_launcher.json index eb00459..941ed3c 100644 --- a/modules/hardpoints/mine_launcher.json +++ b/modules/hardpoints/mine_launcher.json @@ -36,7 +36,7 @@ "breachmin": 0, "class": 1, "clip": 1, - "cost": 36400, + "cost": 36390, "damage": 32, "damagedist": { "E": 0.5, diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json index 9293ffb..f66468d 100644 --- a/modules/hardpoints/mining_laser.json +++ b/modules/hardpoints/mining_laser.json @@ -86,7 +86,7 @@ "breachmax": 0.2, "breachmin": 0.1, "class": 2, - "cost": 22580, + "cost": 22576, "damage": 4, "damagedist": { "T": 1 @@ -112,7 +112,7 @@ "breachmax": 0.2, "breachmin": 0.1, "class": 2, - "cost": 32578, + "cost": 32576, "damage": 4, "damagedist": { "T": 1 diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json index 49984e7..16f9b62 100644 --- a/modules/hardpoints/missile_rack.json +++ b/modules/hardpoints/missile_rack.json @@ -7,7 +7,7 @@ "breachmin": 1, "class": 1, "clip": 8, - "cost": 32180, + "cost": 32175, "damage": 50, "damagedist": { "E": 1 @@ -202,7 +202,7 @@ "breachmin": 1, "class": 3, "clip": 12, - "cost": 1021501, + "cost": 1021500, "damage": 50, "damagedist": { "E": 1 @@ -255,6 +255,68 @@ "shotspeed": 625, "thermload": 3.6, "symbol": "Hpt_BasicMissileRack_Fixed_Large" + }, + { + "ammo": 64, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, + "class": 1, + "clip": 8, + "cost": 32175, + "damage": 50, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128935982, + "eddbID": 1813, + "fireint": 2, + "grp": "mr", + "id": "yT", + "integrity": 40, + "mass": 2, + "missile": "D", + "mount": "F", + "name": "Advanced Missile Rack", + "piercing": 60, + "power": 0.4, + "rating": "B", + "reload": 5, + "shotspeed": 750, + "thermload": 3.6, + "symbol": "Hpt_DumbfireMissileRack_Fixed_Small_Advanced" + }, + { + "ammo": 64, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, + "class": 2, + "clip": 12, + "cost": 240400, + "damage": 50, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128935983, + "eddbID": 1814, + "fireint": 2, + "grp": "mr", + "id": "yU", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "F", + "name": "Advanced Missile Rack", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 5, + "shotspeed": 750, + "thermload": 3.6, + "symbol": "Hpt_DumbfireMissileRack_Fixed_Medium_Advanced" } ] } diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index 3ecd503..cd0b1a2 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -289,7 +289,7 @@ "breachmin": 0.4, "class": 3, "clip": 90, - "cost": 3794601, + "cost": 3794600, "damage": 2.2, "damagedist": { "K": 1 diff --git a/modules/hardpoints/nanite_torpedo_pylon.json b/modules/hardpoints/nanite_torpedo_pylon.json index 3a1a09a..cd32652 100644 --- a/modules/hardpoints/nanite_torpedo_pylon.json +++ b/modules/hardpoints/nanite_torpedo_pylon.json @@ -32,7 +32,7 @@ "breachdmg": 0, "class": 3, "clip": 1, - "cost": 1627420, + "cost": 1627419, "damage": 0, "damagedist": { "E": 1 @@ -56,4 +56,3 @@ } ] } - \ No newline at end of file diff --git a/modules/hardpoints/pulse_wave_analyser.json b/modules/hardpoints/pulse_wave_analyser.json index 0a44892..6182c52 100644 --- a/modules/hardpoints/pulse_wave_analyser.json +++ b/modules/hardpoints/pulse_wave_analyser.json @@ -7,7 +7,7 @@ "eddbID": 0, "power": 3.2, "integrity": 48, - "cost": 1097096, + "cost": 1097095, "id": "2x", "maxangle": 15, "scanrange": 24000, @@ -24,7 +24,7 @@ "eddbID": 0, "power": 1.6, "integrity": 56, - "cost": 406332, + "cost": 365698, "id": "2y", "maxangle": 15, "boot": 3, @@ -41,7 +41,7 @@ "eddbID": 0, "power": 0.8, "integrity": 40, - "cost": 121901, + "cost": 121899, "id": "2z", "maxangle": 15, "boot": 3, @@ -58,7 +58,7 @@ "eddbID": 0, "power": 0.4, "integrity": 24, - "cost": 40634, + "cost": 40633, "id": "3J", "maxangle": 15, "boot": 3, @@ -75,7 +75,7 @@ "eddbID": 0, "power": 0.2, "integrity": 24, - "cost": 13545, + "cost": 13544, "id": "3K", "maxangle": 15, "boot": 3, diff --git a/modules/hardpoints/seismic_charge_launcher.json b/modules/hardpoints/seismic_charge_launcher.json index aa66c67..533c8f6 100644 --- a/modules/hardpoints/seismic_charge_launcher.json +++ b/modules/hardpoints/seismic_charge_launcher.json @@ -37,7 +37,7 @@ "shotspeed": 350, "breachmin": 0, "class": 2, - "cost": 170123, + "cost": 153110, "damage": 15, "chargetime": 2, "damagedist": { diff --git a/modules/hardpoints/shutdown_field_neutraliser.json b/modules/hardpoints/shutdown_field_neutraliser.json index 3dad48c..28a6a84 100644 --- a/modules/hardpoints/shutdown_field_neutraliser.json +++ b/modules/hardpoints/shutdown_field_neutraliser.json @@ -21,7 +21,7 @@ }, { "class": 0, - "cost": 0, + "cost": 150000, "grp": "sfn", "id": "4E", "edID": 129022663, diff --git a/modules/hardpoints/sub_surface_displacement_missile.json b/modules/hardpoints/sub_surface_displacement_missile.json index 9335c27..7bf3d9f 100644 --- a/modules/hardpoints/sub_surface_displacement_missile.json +++ b/modules/hardpoints/sub_surface_displacement_missile.json @@ -6,7 +6,7 @@ "shotspeed": 550, "breachmin": 0.1, "class": 2, - "cost": 381750, + "cost": 122170, "damage": 5, "chargetime": 2, "damagedist": { @@ -70,7 +70,7 @@ "shotspeed": 550, "breachmin": 0.1, "class": 1, - "cost": 12601, + "cost": 12600, "damage": 5, "chargetime": 2, "damagedist": { @@ -102,7 +102,7 @@ "shotspeed": 550, "breachmin": 0.1, "class": 1, - "cost": 38751, + "cost": 38750, "damage": 5, "chargetime": 2, "damagedist": { diff --git a/modules/hardpoints/xeno_scanner.json b/modules/hardpoints/xeno_scanner.json index fab46d9..6562a18 100644 --- a/modules/hardpoints/xeno_scanner.json +++ b/modules/hardpoints/xeno_scanner.json @@ -20,7 +20,7 @@ }, { "class": 0, - "cost": 745950, + "cost": 745948, "edID": 128808878, "grp": "xs", "id": "3y", @@ -37,7 +37,7 @@ }, { "class": 0, - "cost": 745950, + "cost": 850000, "edID": 129022952, "grp": "xs", "id": "4B", diff --git a/modules/internal/auto_field_maintenance_unit.json b/modules/internal/auto_field_maintenance_unit.json index eb18a4a..9ab06f7 100644 --- a/modules/internal/auto_field_maintenance_unit.json +++ b/modules/internal/auto_field_maintenance_unit.json @@ -324,7 +324,7 @@ "ammo": 6100, "ammocost": 1, "class": 5, - "cost": 104980, + "cost": 104976, "edID": 128667602, "eddbID": 1332, "grp": "am", @@ -340,7 +340,7 @@ "ammo": 5500, "ammocost": 1, "class": 5, - "cost": 314930, + "cost": 314928, "edID": 128667610, "eddbID": 1340, "grp": "am", @@ -356,7 +356,7 @@ "ammo": 6100, "ammocost": 1, "class": 5, - "cost": 944780, + "cost": 944784, "edID": 128667618, "eddbID": 1348, "grp": "am", @@ -372,7 +372,7 @@ "ammo": 7300, "ammocost": 1, "class": 5, - "cost": 2834350, + "cost": 2834352, "edID": 128667626, "eddbID": 1356, "grp": "am", @@ -388,7 +388,7 @@ "ammo": 6700, "ammocost": 1, "class": 5, - "cost": 8503060, + "cost": 8503056, "edID": 128667634, "eddbID": 1364, "grp": "am", @@ -404,7 +404,7 @@ "ammo": 7400, "ammocost": 1, "class": 6, - "cost": 188960, + "cost": 188957, "edID": 128667603, "eddbID": 1333, "grp": "am", @@ -436,7 +436,7 @@ "ammo": 7400, "ammocost": 1, "class": 6, - "cost": 1700610, + "cost": 1700611, "edID": 128667619, "eddbID": 1349, "grp": "am", @@ -452,7 +452,7 @@ "ammo": 8900, "ammocost": 1, "class": 6, - "cost": 5101830, + "cost": 5101834, "edID": 128667627, "eddbID": 1357, "grp": "am", @@ -468,7 +468,7 @@ "ammo": 8100, "ammocost": 1, "class": 6, - "cost": 15305500, + "cost": 15305501, "edID": 128667635, "eddbID": 1365, "grp": "am", @@ -484,7 +484,7 @@ "ammo": 8700, "ammocost": 1, "class": 7, - "cost": 340120, + "cost": 340122, "edID": 128667604, "eddbID": 1334, "grp": "am", @@ -500,7 +500,7 @@ "ammo": 7800, "ammocost": 1, "class": 7, - "cost": 1020370, + "cost": 1020367, "edID": 128667612, "eddbID": 1342, "grp": "am", @@ -548,7 +548,7 @@ "ammo": 9600, "ammocost": 1, "class": 7, - "cost": 27549900, + "cost": 27549901, "edID": 128667636, "eddbID": 1366, "grp": "am", @@ -612,7 +612,7 @@ "ammo": 12000, "ammocost": 1, "class": 8, - "cost": 16529940, + "cost": 16529941, "edID": 128667629, "eddbID": 1359, "grp": "am", @@ -628,7 +628,7 @@ "ammo": 11000, "ammocost": 1, "class": 8, - "cost": 49589820, + "cost": 49589823, "edID": 128667637, "eddbID": 1367, "grp": "am", diff --git a/modules/internal/bi_weave_shield_generator.json b/modules/internal/bi_weave_shield_generator.json index 1b8bfdd..1c9d556 100644 --- a/modules/internal/bi_weave_shield_generator.json +++ b/modules/internal/bi_weave_shield_generator.json @@ -3,7 +3,7 @@ { "brokenregen": 2.4, "class": 1, - "cost": 7710, + "cost": 7713, "distdraw": 0.6, "edID": 128671331, "eddbID": 1530, @@ -30,7 +30,7 @@ { "brokenregen": 2.4, "class": 2, - "cost": 26710, + "cost": 26705, "distdraw": 0.6, "edID": 128671332, "eddbID": 1531, @@ -57,7 +57,7 @@ { "brokenregen": 2.8, "class": 3, - "cost": 84650, + "cost": 84653, "distdraw": 0.6, "edID": 128671333, "eddbID": 1532, @@ -84,7 +84,7 @@ { "brokenregen": 3.8, "class": 4, - "cost": 268350, + "cost": 268347, "distdraw": 0.6, "edID": 128671334, "eddbID": 1533, @@ -111,7 +111,7 @@ { "brokenregen": 5.6, "class": 5, - "cost": 850660, + "cost": 850659, "distdraw": 0.6, "edID": 128671335, "eddbID": 1534, @@ -138,7 +138,7 @@ { "brokenregen": 8, "class": 6, - "cost": 2696600, + "cost": 2696589, "distdraw": 0.6, "edID": 128671336, "eddbID": 1535, @@ -165,7 +165,7 @@ { "brokenregen": 11, "class": 7, - "cost": 8548186, + "cost": 8548185, "distdraw": 0.6, "edID": 128671337, "eddbID": 1536, @@ -192,7 +192,7 @@ { "brokenregen": 14.4, "class": 8, - "cost": 27097750, + "cost": 27097748, "distdraw": 0.6, "edID": 128671338, "eddbID": 1537, diff --git a/modules/internal/business_passenger_cabin.json b/modules/internal/business_passenger_cabin.json index e01278e..a45f870 100644 --- a/modules/internal/business_passenger_cabin.json +++ b/modules/internal/business_passenger_cabin.json @@ -2,7 +2,7 @@ "pci": [ { "class": 3, - "cost": 26707, + "cost": 26705, "edID": 128734692, "eddbID": 1568, "grp": "pci", @@ -16,7 +16,7 @@ }, { "class": 4, - "cost": 56870, + "cost": 56862, "edID": 128727923, "eddbID": 1569, "grp": "pci", @@ -30,7 +30,7 @@ }, { "class": 5, - "cost": 92370, + "cost": 92362, "edID": 128734694, "eddbID": 1570, "grp": "pci", @@ -44,7 +44,7 @@ }, { "class": 6, - "cost": 184240, + "cost": 184232, "edID": 128727927, "eddbID": 1571, "grp": "pci", diff --git a/modules/internal/cargo_rack.json b/modules/internal/cargo_rack.json index d2f088f..d8946d7 100644 --- a/modules/internal/cargo_rack.json +++ b/modules/internal/cargo_rack.json @@ -31,7 +31,7 @@ { "cargo": 8, "class": 3, - "cost": 10560, + "cost": 10563, "edID": 128064340, "eddbID": 1193, "grp": "cr", @@ -45,7 +45,7 @@ { "cargo": 16, "class": 4, - "cost": 34330, + "cost": 34328, "edID": 128064341, "eddbID": 1194, "grp": "cr", @@ -59,7 +59,7 @@ { "cargo": 32, "class": 5, - "cost": 111570, + "cost": 111566, "edID": 128064342, "eddbID": 1195, "grp": "cr", @@ -73,7 +73,7 @@ { "cargo": 64, "class": 6, - "cost": 362590, + "cost": 362591, "edID": 128064343, "eddbID": 1196, "grp": "cr", @@ -101,7 +101,7 @@ { "cargo": 256, "class": 8, - "cost": 3829870, + "cost": 3829866, "edID": 128064345, "eddbID": 1198, "grp": "cr", diff --git a/modules/internal/decontamination_limpet_controller.json b/modules/internal/decontamination_limpet_controller.json index 478da97..88625c4 100644 --- a/modules/internal/decontamination_limpet_controller.json +++ b/modules/internal/decontamination_limpet_controller.json @@ -18,7 +18,7 @@ }, { "class": 3, - "cost": 16201, + "cost": 16200, "edID": 128793942, "eddbID": 1633, "grp": "dtl", @@ -34,7 +34,7 @@ }, { "class": 5, - "cost": 145801, + "cost": 145800, "edID": 128793943, "eddbID": 1634, "grp": "dtl", @@ -50,7 +50,7 @@ }, { "class": 7, - "cost": 1312201, + "cost": 1312200, "edID": 128793944, "eddbID": 1635, "grp": "dtl", diff --git a/modules/internal/docking_computer.json b/modules/internal/docking_computer.json index c0fcd33..44c9a0c 100644 --- a/modules/internal/docking_computer.json +++ b/modules/internal/docking_computer.json @@ -17,7 +17,7 @@ }, { "class": 1, - "cost": 13509, + "cost": 13507, "edID": 128935155, "eddbID": 1810, "grp": "dc", diff --git a/modules/internal/economy_passenger_cabin.json b/modules/internal/economy_passenger_cabin.json index 5ed22bf..eb4b1a3 100644 --- a/modules/internal/economy_passenger_cabin.json +++ b/modules/internal/economy_passenger_cabin.json @@ -2,7 +2,7 @@ "pce": [ { "class": 2, - "cost": 4320, + "cost": 4312, "edID": 128734690, "eddbID": 1563, "grp": "pce", @@ -16,7 +16,7 @@ }, { "class": 3, - "cost": 8659, + "cost": 8657, "edID": 128734691, "eddbID": 1564, "grp": "pce", @@ -30,7 +30,7 @@ }, { "class": 4, - "cost": 18960, + "cost": 18954, "edID": 128727922, "eddbID": 1565, "grp": "pce", @@ -44,7 +44,7 @@ }, { "class": 5, - "cost": 34960, + "cost": 34954, "edID": 128734693, "eddbID": 1566, "grp": "pce", @@ -58,7 +58,7 @@ }, { "class": 6, - "cost": 61420, + "cost": 61410, "edID": 128727926, "eddbID": 1567, "grp": "pce", diff --git a/modules/internal/experemental_weapon_stabilizer.json b/modules/internal/experemental_weapon_stabilizer.json index b682361..954ac7a 100644 --- a/modules/internal/experemental_weapon_stabilizer.json +++ b/modules/internal/experemental_weapon_stabilizer.json @@ -8,7 +8,7 @@ "edID": 129019260, "eddbID": 1836, "power": 1.5, - "cost": 1930500, + "cost": 2000000, "symbol": "Int_ExpModuleStabiliser_Size3_Class3", "grp": "ews", "ukName": "Experimental Weapon Stabilizer", @@ -19,7 +19,7 @@ "class": 5, "mass": 20, "id": "4D", - "edID": 129019261, + "edID": 4000000, "eddbID": 1837, "power": 3.0, "cost": 4000000, diff --git a/modules/internal/fighter_hangar.json b/modules/internal/fighter_hangar.json index 5ec6189..86734e9 100644 --- a/modules/internal/fighter_hangar.json +++ b/modules/internal/fighter_hangar.json @@ -3,7 +3,7 @@ { "bays": 1, "class": 5, - "cost": 575644, + "cost": 575643, "edID": 128727930, "eddbID": 1562, "fightercost": 1030, @@ -21,7 +21,7 @@ { "bays": 2, "class": 6, - "cost": 1869350, + "cost": 1869340, "edID": 128727931, "eddbID": 1561, "fightercost": 1030, @@ -40,7 +40,7 @@ "bays": 2, "class": 7, "edID": 128727932, - "cost": 2369330, + "cost": 2369320, "eddbID": 1560, "fightercost": 1030, "grp": "fh", diff --git a/modules/internal/first_passenger_cabin.json b/modules/internal/first_passenger_cabin.json index 004b6a9..2e9da33 100644 --- a/modules/internal/first_passenger_cabin.json +++ b/modules/internal/first_passenger_cabin.json @@ -2,7 +2,7 @@ "pcm": [ { "class": 4, - "cost": 170587, + "cost": 170586, "edID": 128727924, "eddbID": 1572, "grp": "pcm", @@ -16,7 +16,7 @@ }, { "class": 5, - "cost": 340528, + "cost": 340526, "edID": 128734695, "eddbID": 1573, "grp": "pcm", @@ -30,7 +30,7 @@ }, { "class": 6, - "cost": 552700, + "cost": 552698, "edID": 128727928, "eddbID": 1574, "grp": "pcm", diff --git a/modules/internal/frame_shift_drive_interdictor.json b/modules/internal/frame_shift_drive_interdictor.json index 97bbffa..a0bf19c 100644 --- a/modules/internal/frame_shift_drive_interdictor.json +++ b/modules/internal/frame_shift_drive_interdictor.json @@ -273,7 +273,7 @@ { "boot": 15, "class": 4, - "cost": 263420, + "cost": 263424, "edID": 128666707, "eddbID": 1309, "facinglimit": 50, @@ -291,7 +291,7 @@ { "boot": 15, "class": 4, - "cost": 790270, + "cost": 790272, "edID": 128666711, "eddbID": 1313, "facinglimit": 50, @@ -309,7 +309,7 @@ { "boot": 15, "class": 4, - "cost": 2370820, + "cost": 2370816, "edID": 128666715, "eddbID": 1317, "facinglimit": 50, @@ -327,7 +327,7 @@ { "boot": 15, "class": 4, - "cost": 7112450, + "cost": 7112448, "edID": 128666719, "eddbID": 1321, "facinglimit": 50, @@ -345,7 +345,7 @@ { "boot": 15, "class": 4, - "cost": 21337340, + "cost": 21337344, "edID": 128666723, "eddbID": 1325, "facinglimit": 50, diff --git a/modules/internal/fuel_scoop.json b/modules/internal/fuel_scoop.json index 7983130..47072e0 100644 --- a/modules/internal/fuel_scoop.json +++ b/modules/internal/fuel_scoop.json @@ -2,7 +2,7 @@ "fs": [ { "class": 1, - "cost": 310, + "cost": 309, "edID": 128666644, "eddbID": 1246, "grp": "fs", @@ -16,7 +16,7 @@ }, { "class": 1, - "cost": 1290, + "cost": 1285, "edID": 128666652, "eddbID": 1254, "grp": "fs", @@ -30,7 +30,7 @@ }, { "class": 1, - "cost": 5140, + "cost": 5142, "edID": 128666660, "eddbID": 1262, "grp": "fs", @@ -44,7 +44,7 @@ }, { "class": 1, - "cost": 20570, + "cost": 20568, "edID": 128666668, "eddbID": 1270, "grp": "fs", @@ -72,7 +72,7 @@ }, { "class": 2, - "cost": 1070, + "cost": 1068, "edID": 128666645, "eddbID": 1247, "grp": "fs", @@ -86,7 +86,7 @@ }, { "class": 2, - "cost": 4450, + "cost": 4451, "edID": 128666653, "eddbID": 1255, "grp": "fs", @@ -100,7 +100,7 @@ }, { "class": 2, - "cost": 17800, + "cost": 17803, "edID": 128666661, "eddbID": 1263, "grp": "fs", @@ -114,7 +114,7 @@ }, { "class": 2, - "cost": 71210, + "cost": 71211, "edID": 128666669, "eddbID": 1271, "grp": "fs", @@ -128,7 +128,7 @@ }, { "class": 2, - "cost": 284840, + "cost": 284844, "edID": 128666677, "eddbID": 1279, "grp": "fs", @@ -142,7 +142,7 @@ }, { "class": 3, - "cost": 3390, + "cost": 3386, "edID": 128666646, "eddbID": 1248, "grp": "fs", @@ -156,7 +156,7 @@ }, { "class": 3, - "cost": 14110, + "cost": 14109, "edID": 128666654, "eddbID": 1256, "grp": "fs", @@ -170,7 +170,7 @@ }, { "class": 3, - "cost": 56440, + "cost": 56435, "edID": 128666662, "eddbID": 1264, "grp": "fs", @@ -184,7 +184,7 @@ }, { "class": 3, - "cost": 225740, + "cost": 225738, "edID": 128666670, "eddbID": 1272, "grp": "fs", @@ -198,7 +198,7 @@ }, { "class": 3, - "cost": 902950, + "cost": 902954, "edID": 128666678, "eddbID": 1280, "grp": "fs", @@ -212,7 +212,7 @@ }, { "class": 4, - "cost": 10730, + "cost": 10734, "edID": 128666647, "eddbID": 1249, "grp": "fs", @@ -226,7 +226,7 @@ }, { "class": 4, - "cost": 44720, + "cost": 44724, "edID": 128666655, "eddbID": 1257, "grp": "fs", @@ -240,7 +240,7 @@ }, { "class": 4, - "cost": 178900, + "cost": 178898, "edID": 128666663, "eddbID": 1265, "grp": "fs", @@ -254,7 +254,7 @@ }, { "class": 4, - "cost": 715590, + "cost": 715591, "edID": 128666671, "eddbID": 1273, "grp": "fs", @@ -268,7 +268,7 @@ }, { "class": 4, - "cost": 2862360, + "cost": 2862364, "edID": 128666679, "eddbID": 1281, "grp": "fs", @@ -282,7 +282,7 @@ }, { "class": 5, - "cost": 34030, + "cost": 34026, "edID": 128666648, "eddbID": 1250, "grp": "fs", @@ -296,7 +296,7 @@ }, { "class": 5, - "cost": 141780, + "cost": 141776, "edID": 128666656, "eddbID": 1258, "grp": "fs", @@ -310,7 +310,7 @@ }, { "class": 5, - "cost": 567110, + "cost": 567106, "edID": 128666664, "eddbID": 1266, "grp": "fs", @@ -324,7 +324,7 @@ }, { "class": 5, - "cost": 2268420, + "cost": 2268424, "edID": 128666672, "eddbID": 1274, "grp": "fs", @@ -338,7 +338,7 @@ }, { "class": 5, - "cost": 9073690, + "cost": 9073694, "edID": 128666680, "eddbID": 1282, "grp": "fs", @@ -352,7 +352,7 @@ }, { "class": 6, - "cost": 107860, + "cost": 107864, "edID": 128666649, "eddbID": 1251, "grp": "fs", @@ -366,7 +366,7 @@ }, { "class": 6, - "cost": 449430, + "cost": 449431, "edID": 128666657, "eddbID": 1259, "grp": "fs", @@ -380,7 +380,7 @@ }, { "class": 6, - "cost": 1797730, + "cost": 1797726, "edID": 128666665, "eddbID": 1267, "grp": "fs", @@ -394,7 +394,7 @@ }, { "class": 6, - "cost": 7190900, + "cost": 7190903, "edID": 128666673, "eddbID": 1275, "grp": "fs", @@ -422,7 +422,7 @@ }, { "class": 7, - "cost": 341930, + "cost": 341927, "edID": 128666650, "eddbID": 1252, "grp": "fs", @@ -436,7 +436,7 @@ }, { "class": 7, - "cost": 1424700, + "cost": 1424698, "edID": 128666658, "eddbID": 1260, "grp": "fs", @@ -464,7 +464,7 @@ }, { "class": 7, - "cost": 22795160, + "cost": 22795161, "edID": 128666674, "eddbID": 1276, "grp": "fs", @@ -478,7 +478,7 @@ }, { "class": 7, - "cost": 91180640, + "cost": 91180644, "edID": 128666682, "eddbID": 1284, "grp": "fs", @@ -506,7 +506,7 @@ }, { "class": 8, - "cost": 4516290, + "cost": 4516291, "edID": 128666659, "eddbID": 1261, "grp": "fs", @@ -520,7 +520,7 @@ }, { "class": 8, - "cost": 18065160, + "cost": 18065165, "edID": 128666667, "eddbID": 1269, "grp": "fs", @@ -548,7 +548,7 @@ }, { "class": 8, - "cost": 289042642, + "cost": 289042641, "edID": 128666683, "eddbID": 1285, "grp": "fs", diff --git a/modules/internal/luxury_passenger_cabin.json b/modules/internal/luxury_passenger_cabin.json index 4dc268b..fd8f178 100644 --- a/modules/internal/luxury_passenger_cabin.json +++ b/modules/internal/luxury_passenger_cabin.json @@ -2,7 +2,7 @@ "pcq": [ { "class": 5, - "cost": 1658100, + "cost": 1658095, "edID": 128727925, "eddbID": 1575, "grp": "pcq", @@ -16,7 +16,7 @@ }, { "class": 6, - "cost": 4974288, + "cost": 4974287, "edID": 128727929, "eddbID": 1576, "grp": "pcq", diff --git a/modules/internal/multi_limpet_controllers.json b/modules/internal/multi_limpet_controllers.json index 91df8ba..a99d834 100644 --- a/modules/internal/multi_limpet_controllers.json +++ b/modules/internal/multi_limpet_controllers.json @@ -68,7 +68,7 @@ }, { "class": 3, - "cost": 80000, + "cost": 30000, "edID": 129001925, "eddbID": 1820, "grp": "mlc", @@ -85,7 +85,7 @@ }, { "class": 3, - "cost": 80000, + "cost": 50000, "edID": 129001926, "eddbID": 1821, "grp": "mlc", @@ -170,4 +170,3 @@ } ] } - \ No newline at end of file diff --git a/modules/internal/refinery.json b/modules/internal/refinery.json index 0ebad52..3f5a20b 100644 --- a/modules/internal/refinery.json +++ b/modules/internal/refinery.json @@ -213,7 +213,7 @@ { "bins": 4, "class": 4, - "cost": 55570, + "cost": 55566, "edID": 128666687, "eddbID": 1289, "grp": "rf", @@ -227,7 +227,7 @@ { "bins": 5, "class": 4, - "cost": 166700, + "cost": 166698, "edID": 128666691, "eddbID": 1293, "grp": "rf", @@ -241,7 +241,7 @@ { "bins": 7, "class": 4, - "cost": 500090, + "cost": 500094, "edID": 128666695, "eddbID": 1297, "grp": "rf", @@ -255,7 +255,7 @@ { "bins": 9, "class": 4, - "cost": 1500280, + "cost": 1500282, "edID": 128666699, "eddbID": 1301, "grp": "rf", @@ -269,7 +269,7 @@ { "bins": 10, "class": 4, - "cost": 4500850, + "cost": 4500846, "edID": 128666703, "eddbID": 1305, "grp": "rf", diff --git a/modules/internal/shield_cell_bank.json b/modules/internal/shield_cell_bank.json index fcde273..3843aef 100644 --- a/modules/internal/shield_cell_bank.json +++ b/modules/internal/shield_cell_bank.json @@ -534,7 +534,7 @@ "boot": 25, "class": 5, "clip": 1, - "cost": 198612, + "cost": 198611, "duration": 5, "edID": 128064320, "eddbID": 1173, @@ -582,7 +582,7 @@ "boot": 25, "class": 5, "clip": 1, - "cost": 1241319, + "cost": 1241317, "duration": 5, "edID": 128064322, "eddbID": 1175, @@ -606,7 +606,7 @@ "boot": 25, "class": 6, "clip": 1, - "cost": 88987, + "cost": 88978, "duration": 8, "edID": 128064323, "eddbID": 1176, diff --git a/modules/internal/shield_generator.json b/modules/internal/shield_generator.json index 99b1d42..276aae9 100644 --- a/modules/internal/shield_generator.json +++ b/modules/internal/shield_generator.json @@ -30,7 +30,7 @@ { "brokenregen": 1.6, "class": 2, - "cost": 1980, + "cost": 1978, "distdraw": 0.6, "edID": 128064263, "eddbID": 1116, @@ -57,7 +57,7 @@ { "brokenregen": 1.6, "class": 2, - "cost": 5930, + "cost": 5934, "distdraw": 0.6, "edID": 128064264, "eddbID": 1117, @@ -84,7 +84,7 @@ { "brokenregen": 1.6, "class": 2, - "cost": 17800, + "cost": 17803, "distdraw": 0.6, "edID": 128064265, "eddbID": 1118, @@ -111,7 +111,7 @@ { "brokenregen": 1.6, "class": 2, - "cost": 53410, + "cost": 53408, "distdraw": 0.6, "edID": 128064266, "eddbID": 1119, @@ -138,7 +138,7 @@ { "brokenregen": 1.6, "class": 2, - "cost": 160220, + "cost": 160224, "distdraw": 0.6, "edID": 128064267, "eddbID": 1120, @@ -165,7 +165,7 @@ { "brokenregen": 1.87, "class": 3, - "cost": 6270, + "cost": 6271, "distdraw": 0.6, "edID": 128064268, "eddbID": 1121, @@ -192,7 +192,7 @@ { "brokenregen": 1.87, "class": 3, - "cost": 18810, + "cost": 18812, "distdraw": 0.6, "edID": 128064269, "eddbID": 1122, @@ -219,7 +219,7 @@ { "brokenregen": 1.87, "class": 3, - "cost": 56440, + "cost": 56435, "distdraw": 0.6, "edID": 128064270, "eddbID": 1123, @@ -246,7 +246,7 @@ { "brokenregen": 1.87, "class": 3, - "cost": 169300, + "cost": 169304, "distdraw": 0.6, "edID": 128064271, "eddbID": 1124, @@ -273,7 +273,7 @@ { "brokenregen": 1.87, "class": 3, - "cost": 507910, + "cost": 507912, "distdraw": 0.6, "edID": 128064272, "eddbID": 1125, @@ -300,7 +300,7 @@ { "brokenregen": 2.53, "class": 4, - "cost": 19880, + "cost": 19878, "distdraw": 0.6, "edID": 128064273, "eddbID": 1126, @@ -327,7 +327,7 @@ { "brokenregen": 2.53, "class": 4, - "cost": 59630, + "cost": 59633, "distdraw": 0.6, "edID": 128064274, "eddbID": 1127, @@ -354,7 +354,7 @@ { "brokenregen": 2.53, "class": 4, - "cost": 178900, + "cost": 178898, "distdraw": 0.6, "edID": 128064275, "eddbID": 1128, @@ -381,7 +381,7 @@ { "brokenregen": 2.53, "class": 4, - "cost": 536690, + "cost": 536693, "distdraw": 0.6, "edID": 128064276, "eddbID": 1129, @@ -435,7 +435,7 @@ { "brokenregen": 3.75, "class": 5, - "cost": 63010, + "cost": 63012, "distdraw": 0.6, "edID": 128064278, "eddbID": 1131, @@ -462,7 +462,7 @@ { "brokenregen": 3.75, "class": 5, - "cost": 189040, + "cost": 189035, "distdraw": 0.6, "edID": 128064279, "eddbID": 1132, @@ -489,7 +489,7 @@ { "brokenregen": 3.75, "class": 5, - "cost": 567110, + "cost": 567106, "distdraw": 0.6, "edID": 128064280, "eddbID": 1133, @@ -516,7 +516,7 @@ { "brokenregen": 3.75, "class": 5, - "cost": 1701320, + "cost": 1701318, "distdraw": 0.6, "edID": 128064281, "eddbID": 1134, @@ -543,7 +543,7 @@ { "brokenregen": 3.75, "class": 5, - "cost": 5103950, + "cost": 5103953, "distdraw": 0.6, "edID": 128064282, "eddbID": 1135, @@ -570,7 +570,7 @@ { "brokenregen": 5.33, "class": 6, - "cost": 199750, + "cost": 199747, "distdraw": 0.6, "edID": 128064283, "eddbID": 1136, @@ -597,7 +597,7 @@ { "brokenregen": 5.33, "class": 6, - "cost": 599240, + "cost": 599242, "distdraw": 0.6, "edID": 128064284, "eddbID": 1137, @@ -624,7 +624,7 @@ { "brokenregen": 5.33, "class": 6, - "cost": 1797730, + "cost": 1797726, "distdraw": 0.6, "edID": 128064285, "eddbID": 1138, @@ -651,7 +651,7 @@ { "brokenregen": 5.33, "class": 6, - "cost": 5393180, + "cost": 5393177, "distdraw": 0.6, "edID": 128064286, "eddbID": 1139, @@ -678,7 +678,7 @@ { "brokenregen": 5.33, "class": 6, - "cost": 16179530, + "cost": 16179531, "distdraw": 0.6, "edID": 128064287, "eddbID": 1140, @@ -705,7 +705,7 @@ { "brokenregen": 7.33, "class": 7, - "cost": 633200, + "cost": 633199, "distdraw": 0.6, "edID": 128064288, "eddbID": 1141, @@ -732,7 +732,7 @@ { "brokenregen": 7.33, "class": 7, - "cost": 1899600, + "cost": 1899597, "distdraw": 0.6, "edID": 128064289, "eddbID": 1142, @@ -786,7 +786,7 @@ { "brokenregen": 7.33, "class": 7, - "cost": 17096370, + "cost": 17096371, "distdraw": 0.6, "edID": 128064291, "eddbID": 1144, @@ -813,7 +813,7 @@ { "brokenregen": 7.33, "class": 7, - "cost": 51289110, + "cost": 51289112, "distdraw": 0.6, "edID": 128064292, "eddbID": 1145, @@ -840,7 +840,7 @@ { "brokenregen": 9.6, "class": 8, - "cost": 2007240, + "cost": 2007241, "distdraw": 0.6, "edID": 128064293, "eddbID": 1146, @@ -867,7 +867,7 @@ { "brokenregen": 9.6, "class": 8, - "cost": 6021720, + "cost": 6021722, "distdraw": 0.6, "edID": 128064294, "eddbID": 1147, @@ -894,7 +894,7 @@ { "brokenregen": 9.6, "class": 8, - "cost": 18065170, + "cost": 18065165, "distdraw": 0.6, "edID": 128064295, "eddbID": 1148, @@ -921,7 +921,7 @@ { "brokenregen": 9.6, "class": 8, - "cost": 54195500, + "cost": 54195495, "distdraw": 0.6, "edID": 128064296, "eddbID": 1149, @@ -948,7 +948,7 @@ { "brokenregen": 9.6, "class": 8, - "cost": 162586490, + "cost": 162586486, "distdraw": 0.6, "edID": 128064297, "eddbID": 1150, diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index 070d3f9..763c10a 100644 --- a/modules/standard/frame_shift_drive.json +++ b/modules/standard/frame_shift_drive.json @@ -97,7 +97,7 @@ }, { "class": 7, - "cost": 633200, + "cost": 633199, "edID": 128064128, "eddbID": 986, "fuelmul": 0.011, @@ -116,7 +116,7 @@ }, { "class": 7, - "cost": 1899600, + "cost": 1899597, "edID": 128064129, "eddbID": 987, "fuelmul": 0.01, @@ -154,7 +154,7 @@ }, { "class": 7, - "cost": 17096370, + "cost": 17096371, "edID": 128064131, "eddbID": 989, "fuelmul": 0.01, @@ -173,7 +173,7 @@ }, { "class": 7, - "cost": 51289110, + "cost": 51289112, "edID": 128064132, "eddbID": 990, "fuelmul": 0.012, @@ -192,7 +192,7 @@ }, { "class": 6, - "cost": 199750, + "cost": 199747, "edID": 128064123, "eddbID": 981, "fuelmul": 0.011, @@ -211,7 +211,7 @@ }, { "class": 6, - "cost": 599240, + "cost": 599242, "edID": 128064124, "eddbID": 982, "fuelmul": 0.01, @@ -230,7 +230,7 @@ }, { "class": 6, - "cost": 1797730, + "cost": 1797726, "edID": 128064125, "eddbID": 983, "fuelmul": 0.008, @@ -249,7 +249,7 @@ }, { "class": 6, - "cost": 5393180, + "cost": 5393177, "edID": 128064126, "eddbID": 984, "fuelmul": 0.01, @@ -268,7 +268,7 @@ }, { "class": 6, - "cost": 16179530, + "cost": 16179531, "edID": 128064127, "eddbID": 985, "fuelmul": 0.012, @@ -287,7 +287,7 @@ }, { "class": 5, - "cost": 63010, + "cost": 63012, "edID": 128064118, "eddbID": 976, "fuelmul": 0.011, @@ -306,7 +306,7 @@ }, { "class": 5, - "cost": 189040, + "cost": 189035, "edID": 128064119, "eddbID": 977, "fuelmul": 0.01, @@ -325,7 +325,7 @@ }, { "class": 5, - "cost": 567110, + "cost": 567106, "edID": 128064120, "eddbID": 978, "fuelmul": 0.008, @@ -344,7 +344,7 @@ }, { "class": 5, - "cost": 1701320, + "cost": 1701318, "edID": 128064121, "eddbID": 979, "fuelmul": 0.01, @@ -363,7 +363,7 @@ }, { "class": 5, - "cost": 5103950, + "cost": 5103953, "edID": 128064122, "eddbID": 980, "fuelmul": 0.012, @@ -382,7 +382,7 @@ }, { "class": 4, - "cost": 19880, + "cost": 19878, "edID": 128064113, "eddbID": 971, "fuelmul": 0.011, @@ -401,7 +401,7 @@ }, { "class": 4, - "cost": 59630, + "cost": 59633, "edID": 128064114, "eddbID": 972, "fuelmul": 0.01, @@ -420,7 +420,7 @@ }, { "class": 4, - "cost": 178900, + "cost": 178898, "edID": 128064115, "eddbID": 973, "fuelmul": 0.008, @@ -439,7 +439,7 @@ }, { "class": 4, - "cost": 536690, + "cost": 536693, "edID": 128064116, "eddbID": 974, "fuelmul": 0.01, @@ -477,7 +477,7 @@ }, { "class": 3, - "cost": 6270, + "cost": 6271, "edID": 128064108, "eddbID": 966, "fuelmul": 0.011, @@ -496,7 +496,7 @@ }, { "class": 3, - "cost": 18810, + "cost": 18812, "edID": 128064109, "eddbID": 967, "fuelmul": 0.01, @@ -515,7 +515,7 @@ }, { "class": 3, - "cost": 56440, + "cost": 56435, "edID": 128064110, "eddbID": 968, "fuelmul": 0.008, @@ -534,7 +534,7 @@ }, { "class": 3, - "cost": 169300, + "cost": 169304, "edID": 128064111, "eddbID": 969, "fuelmul": 0.01, @@ -553,7 +553,7 @@ }, { "class": 3, - "cost": 507910, + "cost": 507912, "edID": 128064112, "eddbID": 970, "fuelmul": 0.012, @@ -572,7 +572,7 @@ }, { "class": 2, - "cost": 1980, + "cost": 1978, "edID": 128064103, "eddbID": 961, "fuelmul": 0.011, @@ -591,7 +591,7 @@ }, { "class": 2, - "cost": 5930, + "cost": 5934, "edID": 128064104, "eddbID": 962, "fuelmul": 0.01, @@ -610,7 +610,7 @@ }, { "class": 2, - "cost": 17800, + "cost": 17803, "edID": 128064105, "eddbID": 963, "fuelmul": 0.008, @@ -629,7 +629,7 @@ }, { "class": 2, - "cost": 53410, + "cost": 53408, "edID": 128064106, "eddbID": 964, "fuelmul": 0.01, @@ -648,7 +648,7 @@ }, { "class": 2, - "cost": 160220, + "cost": 160224, "edID": 128064107, "eddbID": 965, "fuelmul": 0.012, @@ -705,7 +705,7 @@ }, { "class": 7, - "cost": 6838548, + "cost": 20515645, "edID": 129030483, "fuelmul": 0.012, "fuelpower": 2.75, @@ -800,7 +800,7 @@ }, { "class": 6, - "cost": 2157271, + "cost": 6471812, "edID": 129030484, "fuelmul": 0.012, "fuelpower": 2.6, @@ -990,7 +990,7 @@ }, { "class": 4, - "cost": 214677, + "cost": 644032, "edID": 129030485, "fuelmul": 0.012, "fuelpower": 2.3, @@ -1085,7 +1085,7 @@ }, { "class": 3, - "cost": 67722, + "cost": 203165, "edID": 129030486, "fuelmul": 0.012, "fuelpower": 2.15, @@ -1180,7 +1180,7 @@ }, { "class": 2, - "cost": 21363, + "cost": 64090, "edID": 129030487, "fuelmul": 0.012, "fuelpower": 2.0, diff --git a/modules/standard/fuel_tank.json b/modules/standard/fuel_tank.json index 3deef80..33be198 100644 --- a/modules/standard/fuel_tank.json +++ b/modules/standard/fuel_tank.json @@ -30,7 +30,7 @@ }, { "class": 3, - "cost": 7060, + "cost": 7063, "edID": 128064348, "eddbID": 1201, "fuel": 8, @@ -44,7 +44,7 @@ }, { "class": 4, - "cost": 24730, + "cost": 24734, "edID": 128064349, "eddbID": 1202, "fuel": 16, @@ -58,7 +58,7 @@ }, { "class": 5, - "cost": 97750, + "cost": 97754, "edID": 128064350, "eddbID": 1203, "fuel": 32, @@ -72,7 +72,7 @@ }, { "class": 6, - "cost": 341580, + "cost": 341577, "edID": 128064351, "eddbID": 1204, "fuel": 64, @@ -86,7 +86,7 @@ }, { "class": 7, - "cost": 1780910, + "cost": 1780914, "edID": 128064352, "eddbID": 1205, "fuel": 128, @@ -100,7 +100,7 @@ }, { "class": 8, - "cost": 5428431, + "cost": 5428429, "edID": 128064353, "eddbID": 1206, "fuel": 256, diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json index 29c582a..52075ed 100644 --- a/modules/standard/life_support.json +++ b/modules/standard/life_support.json @@ -3,7 +3,7 @@ { "boot": 1, "class": 8, - "cost": 697590, + "cost": 697584, "edID": 128064173, "eddbID": 1031, "grp": "ls", @@ -20,7 +20,7 @@ { "boot": 1, "class": 8, - "cost": 1743970, + "cost": 1743961, "edID": 128064174, "eddbID": 1032, "grp": "ls", @@ -37,7 +37,7 @@ { "boot": 1, "class": 8, - "cost": 4359900, + "cost": 4359903, "edID": 128064175, "eddbID": 1033, "grp": "ls", @@ -54,7 +54,7 @@ { "boot": 1, "class": 8, - "cost": 10899757, + "cost": 10899756, "edID": 128064176, "eddbID": 1034, "grp": "ls", @@ -71,7 +71,7 @@ { "boot": 1, "class": 8, - "cost": 27249400, + "cost": 27249391, "edID": 128064177, "eddbID": 1035, "grp": "ls", @@ -88,7 +88,7 @@ { "boot": 1, "class": 7, - "cost": 249140, + "cost": 249137, "edID": 128064168, "eddbID": 1026, "grp": "ls", @@ -105,7 +105,7 @@ { "boot": 1, "class": 7, - "cost": 622840, + "cost": 622843, "edID": 128064169, "eddbID": 1027, "grp": "ls", @@ -122,7 +122,7 @@ { "boot": 1, "class": 7, - "cost": 1557110, + "cost": 1557108, "edID": 128064170, "eddbID": 1028, "grp": "ls", @@ -156,7 +156,7 @@ { "boot": 1, "class": 7, - "cost": 9731930, + "cost": 9731925, "edID": 128064172, "eddbID": 1030, "grp": "ls", @@ -173,7 +173,7 @@ { "boot": 1, "class": 6, - "cost": 88980, + "cost": 88978, "edID": 128064163, "eddbID": 1021, "grp": "ls", @@ -190,7 +190,7 @@ { "boot": 1, "class": 6, - "cost": 222440, + "cost": 222444, "edID": 128064164, "eddbID": 1022, "grp": "ls", @@ -224,7 +224,7 @@ { "boot": 1, "class": 6, - "cost": 1390280, + "cost": 1390275, "edID": 128064166, "eddbID": 1024, "grp": "ls", @@ -241,7 +241,7 @@ { "boot": 1, "class": 6, - "cost": 3475690, + "cost": 3475688, "edID": 128064167, "eddbID": 1025, "grp": "ls", @@ -258,7 +258,7 @@ { "boot": 1, "class": 5, - "cost": 31780, + "cost": 31778, "edID": 128064158, "eddbID": 1016, "grp": "ls", @@ -275,7 +275,7 @@ { "boot": 1, "class": 5, - "cost": 79440, + "cost": 79444, "edID": 128064159, "eddbID": 1017, "grp": "ls", @@ -292,7 +292,7 @@ { "boot": 1, "class": 5, - "cost": 198610, + "cost": 198611, "edID": 128064160, "eddbID": 1018, "grp": "ls", @@ -309,7 +309,7 @@ { "boot": 1, "class": 5, - "cost": 496530, + "cost": 496527, "edID": 128064161, "eddbID": 1019, "grp": "ls", @@ -326,7 +326,7 @@ { "boot": 1, "class": 5, - "cost": 1241320, + "cost": 1241317, "edID": 128064162, "eddbID": 1020, "grp": "ls", @@ -343,7 +343,7 @@ { "boot": 1, "class": 4, - "cost": 11350, + "cost": 11349, "edID": 128064153, "eddbID": 1011, "grp": "ls", @@ -360,7 +360,7 @@ { "boot": 1, "class": 4, - "cost": 28370, + "cost": 28373, "edID": 128064154, "eddbID": 1012, "grp": "ls", @@ -377,7 +377,7 @@ { "boot": 1, "class": 4, - "cost": 70930, + "cost": 70932, "edID": 128064155, "eddbID": 1013, "grp": "ls", @@ -394,7 +394,7 @@ { "boot": 1, "class": 4, - "cost": 177330, + "cost": 177331, "edID": 128064156, "eddbID": 1014, "grp": "ls", @@ -411,7 +411,7 @@ { "boot": 1, "class": 4, - "cost": 443330, + "cost": 443328, "edID": 128064157, "eddbID": 1015, "grp": "ls", @@ -428,7 +428,7 @@ { "boot": 1, "class": 3, - "cost": 4050, + "cost": 4053, "edID": 128064148, "eddbID": 1006, "grp": "ls", @@ -445,7 +445,7 @@ { "boot": 1, "class": 3, - "cost": 10130, + "cost": 10133, "edID": 128064149, "eddbID": 1007, "grp": "ls", @@ -462,7 +462,7 @@ { "boot": 1, "class": 3, - "cost": 25330, + "cost": 25333, "edID": 128064150, "eddbID": 1008, "grp": "ls", @@ -479,7 +479,7 @@ { "boot": 1, "class": 3, - "cost": 63330, + "cost": 63333, "edID": 128064151, "eddbID": 1009, "grp": "ls", @@ -496,7 +496,7 @@ { "boot": 1, "class": 3, - "cost": 158330, + "cost": 158331, "edID": 128064152, "eddbID": 1010, "grp": "ls", @@ -513,7 +513,7 @@ { "boot": 1, "class": 2, - "cost": 1450, + "cost": 1448, "edID": 128064143, "eddbID": 1001, "grp": "ls", @@ -530,7 +530,7 @@ { "boot": 1, "class": 2, - "cost": 3620, + "cost": 3619, "edID": 128064144, "eddbID": 1002, "grp": "ls", @@ -547,7 +547,7 @@ { "boot": 1, "class": 2, - "cost": 9050, + "cost": 9048, "edID": 128064145, "eddbID": 1003, "grp": "ls", @@ -564,7 +564,7 @@ { "boot": 1, "class": 2, - "cost": 22620, + "cost": 22619, "edID": 128064146, "eddbID": 1004, "grp": "ls", @@ -581,7 +581,7 @@ { "boot": 1, "class": 2, - "cost": 56550, + "cost": 56547, "edID": 128064147, "eddbID": 1005, "grp": "ls", @@ -598,7 +598,7 @@ { "boot": 1, "class": 1, - "cost": 520, + "cost": 517, "edID": 128064138, "eddbID": 996, "grp": "ls", @@ -615,7 +615,7 @@ { "boot": 1, "class": 1, - "cost": 1290, + "cost": 1293, "edID": 128064139, "eddbID": 997, "grp": "ls", @@ -632,7 +632,7 @@ { "boot": 1, "class": 1, - "cost": 3230, + "cost": 3231, "edID": 128064140, "eddbID": 998, "grp": "ls", @@ -649,7 +649,7 @@ { "boot": 1, "class": 1, - "cost": 8080, + "cost": 8078, "edID": 128064141, "eddbID": 999, "grp": "ls", @@ -666,7 +666,7 @@ { "boot": 1, "class": 1, - "cost": 20200, + "cost": 20195, "edID": 128064142, "eddbID": 1000, "grp": "ls", diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json index dc8f129..9207b1f 100644 --- a/modules/standard/power_distributor.json +++ b/modules/standard/power_distributor.json @@ -2,7 +2,7 @@ "pd": [ { "class": 8, - "cost": 697580, + "cost": 697584, "edID": 128064213, "eddbID": 1071, "engcap": 32, @@ -23,7 +23,7 @@ }, { "class": 8, - "cost": 1743960, + "cost": 1743961, "edID": 128064214, "eddbID": 1072, "engcap": 36, @@ -44,7 +44,7 @@ }, { "class": 8, - "cost": 4359900, + "cost": 4359903, "edID": 128064215, "eddbID": 1073, "engcap": 40, @@ -65,7 +65,7 @@ }, { "class": 8, - "cost": 10899760, + "cost": 10899756, "edID": 128064216, "eddbID": 1074, "engcap": 44, @@ -86,7 +86,7 @@ }, { "class": 8, - "cost": 27249390, + "cost": 27249391, "edID": 128064217, "eddbID": 1075, "engcap": 48, @@ -107,7 +107,7 @@ }, { "class": 7, - "cost": 249140, + "cost": 249137, "edID": 128064208, "eddbID": 1066, "engcap": 27, @@ -128,7 +128,7 @@ }, { "class": 7, - "cost": 622840, + "cost": 622843, "edID": 128064209, "eddbID": 1067, "engcap": 31, @@ -149,7 +149,7 @@ }, { "class": 7, - "cost": 1557110, + "cost": 1557108, "edID": 128064210, "eddbID": 1068, "engcap": 34, @@ -191,7 +191,7 @@ }, { "class": 7, - "cost": 9731930, + "cost": 9731925, "edID": 128064212, "eddbID": 1070, "engcap": 41, @@ -212,7 +212,7 @@ }, { "class": 6, - "cost": 88980, + "cost": 88978, "edID": 128064203, "eddbID": 1061, "engcap": 23, @@ -233,7 +233,7 @@ }, { "class": 6, - "cost": 222440, + "cost": 222444, "edID": 128064204, "eddbID": 1062, "engcap": 26, @@ -275,7 +275,7 @@ }, { "class": 6, - "cost": 1390280, + "cost": 1390275, "edID": 128064206, "eddbID": 1064, "engcap": 32, @@ -296,7 +296,7 @@ }, { "class": 6, - "cost": 3475690, + "cost": 3475688, "edID": 128064207, "eddbID": 1065, "engcap": 35, @@ -317,7 +317,7 @@ }, { "class": 5, - "cost": 31780, + "cost": 31778, "edID": 128064198, "eddbID": 1056, "engcap": 19, @@ -338,7 +338,7 @@ }, { "class": 5, - "cost": 79440, + "cost": 79444, "edID": 128064199, "eddbID": 1057, "engcap": 22, @@ -359,7 +359,7 @@ }, { "class": 5, - "cost": 198610, + "cost": 198611, "edID": 128064200, "eddbID": 1058, "engcap": 24, @@ -380,7 +380,7 @@ }, { "class": 5, - "cost": 496530, + "cost": 496527, "edID": 128064201, "eddbID": 1059, "engcap": 26, @@ -401,7 +401,7 @@ }, { "class": 5, - "cost": 1241320, + "cost": 1241317, "edID": 128064202, "eddbID": 1060, "engcap": 29, @@ -422,7 +422,7 @@ }, { "class": 4, - "cost": 11350, + "cost": 11349, "edID": 128064193, "eddbID": 1051, "engcap": 15, @@ -443,7 +443,7 @@ }, { "class": 4, - "cost": 28370, + "cost": 28373, "edID": 128064194, "eddbID": 1052, "engcap": 17, @@ -464,7 +464,7 @@ }, { "class": 4, - "cost": 70930, + "cost": 70932, "edID": 128064195, "eddbID": 1053, "engcap": 19, @@ -485,7 +485,7 @@ }, { "class": 4, - "cost": 177330, + "cost": 177331, "edID": 128064196, "eddbID": 1054, "engcap": 21, @@ -506,7 +506,7 @@ }, { "class": 4, - "cost": 443330, + "cost": 443328, "edID": 128064197, "eddbID": 1055, "engcap": 23, @@ -527,7 +527,7 @@ }, { "class": 3, - "cost": 4050, + "cost": 4053, "edID": 128064188, "eddbID": 1046, "engcap": 12, @@ -548,7 +548,7 @@ }, { "class": 3, - "cost": 10130, + "cost": 10133, "edID": 128064189, "eddbID": 1047, "engcap": 14, @@ -569,7 +569,7 @@ }, { "class": 3, - "cost": 25330, + "cost": 25333, "edID": 128064190, "eddbID": 1048, "engcap": 15, @@ -590,7 +590,7 @@ }, { "class": 3, - "cost": 63330, + "cost": 63333, "edID": 128064191, "eddbID": 1049, "engcap": 17, @@ -611,7 +611,7 @@ }, { "class": 3, - "cost": 158330, + "cost": 158331, "edID": 128064192, "eddbID": 1050, "engcap": 18, @@ -632,7 +632,7 @@ }, { "class": 2, - "cost": 1450, + "cost": 1448, "edID": 128064183, "eddbID": 1041, "engcap": 10, @@ -653,7 +653,7 @@ }, { "class": 2, - "cost": 3620, + "cost": 3619, "edID": 128064184, "eddbID": 1042, "engcap": 11, @@ -674,7 +674,7 @@ }, { "class": 2, - "cost": 9050, + "cost": 9048, "edID": 128064185, "eddbID": 1043, "engcap": 12, @@ -695,7 +695,7 @@ }, { "class": 2, - "cost": 22620, + "cost": 22619, "edID": 128064186, "eddbID": 1044, "engcap": 13, @@ -716,7 +716,7 @@ }, { "class": 2, - "cost": 56550, + "cost": 56547, "edID": 128064187, "eddbID": 1045, "engcap": 14, @@ -737,7 +737,7 @@ }, { "class": 1, - "cost": 520, + "cost": 517, "edID": 128064178, "eddbID": 1036, "engcap": 8, @@ -758,7 +758,7 @@ }, { "class": 1, - "cost": 1290, + "cost": 1293, "edID": 128064179, "eddbID": 1037, "engcap": 9, @@ -779,7 +779,7 @@ }, { "class": 1, - "cost": 3230, + "cost": 3231, "edID": 128064180, "eddbID": 1038, "engcap": 10, @@ -800,7 +800,7 @@ }, { "class": 1, - "cost": 8080, + "cost": 8078, "edID": 128064181, "eddbID": 1039, "engcap": 11, @@ -821,7 +821,7 @@ }, { "class": 1, - "cost": 20200, + "cost": 20195, "edID": 128064182, "eddbID": 1040, "engcap": 12, diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json index 1f3e297..8f6e0d2 100644 --- a/modules/standard/power_plant.json +++ b/modules/standard/power_plant.json @@ -2,7 +2,7 @@ "pp": [ { "class": 8, - "cost": 2007240, + "cost": 1441233, "edID": 128064063, "eddbID": 921, "eff": 1, @@ -18,7 +18,7 @@ }, { "class": 8, - "cost": 6021720, + "cost": 4323699, "edID": 128064064, "eddbID": 922, "eff": 0.75, @@ -34,7 +34,7 @@ }, { "class": 8, - "cost": 18065170, + "cost": 12971097, "edID": 128064065, "eddbID": 923, "eff": 0.5, @@ -50,7 +50,7 @@ }, { "class": 8, - "cost": 54195500, + "cost": 38913291, "edID": 128064066, "eddbID": 924, "eff": 0.45, @@ -66,7 +66,7 @@ }, { "class": 8, - "cost": 162586490, + "cost": 116739873, "edID": 128064067, "eddbID": 925, "eff": 0.4, @@ -82,7 +82,7 @@ }, { "class": 7, - "cost": 633200, + "cost": 480411, "edID": 128064058, "eddbID": 916, "eff": 1, @@ -98,7 +98,7 @@ }, { "class": 7, - "cost": 1899600, + "cost": 1441233, "edID": 128064059, "eddbID": 917, "eff": 0.75, @@ -114,7 +114,7 @@ }, { "class": 7, - "cost": 5698790, + "cost": 4323699, "edID": 128064060, "eddbID": 918, "eff": 0.5, @@ -130,7 +130,7 @@ }, { "class": 7, - "cost": 17096370, + "cost": 12971097, "edID": 128064061, "eddbID": 919, "eff": 0.45, @@ -146,7 +146,7 @@ }, { "class": 7, - "cost": 51289110, + "cost": 38913291, "edID": 128064062, "eddbID": 920, "eff": 0.4, @@ -162,7 +162,7 @@ }, { "class": 6, - "cost": 199750, + "cost": 160137, "edID": 128064053, "eddbID": 911, "eff": 1, @@ -178,7 +178,7 @@ }, { "class": 6, - "cost": 599240, + "cost": 480411, "edID": 128064054, "eddbID": 912, "eff": 0.75, @@ -194,7 +194,7 @@ }, { "class": 6, - "cost": 1797730, + "cost": 1441233, "edID": 128064055, "eddbID": 913, "eff": 0.5, @@ -210,7 +210,7 @@ }, { "class": 6, - "cost": 5393180, + "cost": 4323699, "edID": 128064056, "eddbID": 914, "eff": 0.45, @@ -226,7 +226,7 @@ }, { "class": 6, - "cost": 16179530, + "cost": 12971097, "edID": 128064057, "eddbID": 915, "eff": 0.4, @@ -242,7 +242,7 @@ }, { "class": 5, - "cost": 63010, + "cost": 53379, "edID": 128064048, "eddbID": 906, "eff": 1, @@ -258,7 +258,7 @@ }, { "class": 5, - "cost": 189040, + "cost": 160137, "edID": 128064049, "eddbID": 907, "eff": 0.75, @@ -274,7 +274,7 @@ }, { "class": 5, - "cost": 567110, + "cost": 480411, "edID": 128064050, "eddbID": 908, "eff": 0.5, @@ -290,7 +290,7 @@ }, { "class": 5, - "cost": 1701320, + "cost": 1441233, "edID": 128064051, "eddbID": 909, "eff": 0.45, @@ -306,7 +306,7 @@ }, { "class": 5, - "cost": 5103950, + "cost": 4323699, "edID": 128064052, "eddbID": 910, "eff": 0.4, @@ -322,7 +322,7 @@ }, { "class": 4, - "cost": 19880, + "cost": 17793, "edID": 128064043, "eddbID": 901, "eff": 1, @@ -338,7 +338,7 @@ }, { "class": 4, - "cost": 59630, + "cost": 53379, "edID": 128064044, "eddbID": 902, "eff": 0.75, @@ -354,7 +354,7 @@ }, { "class": 4, - "cost": 178900, + "cost": 160137, "edID": 128064045, "eddbID": 903, "eff": 0.5, @@ -370,7 +370,7 @@ }, { "class": 4, - "cost": 536690, + "cost": 480411, "edID": 128064046, "eddbID": 904, "eff": 0.45, @@ -386,7 +386,7 @@ }, { "class": 4, - "cost": 1610080, + "cost": 1441233, "edID": 128064047, "eddbID": 905, "eff": 0.4, @@ -402,7 +402,7 @@ }, { "class": 3, - "cost": 6270, + "cost": 5931, "edID": 128064038, "eddbID": 896, "eff": 1, @@ -418,7 +418,7 @@ }, { "class": 3, - "cost": 18810, + "cost": 17793, "edID": 128064039, "eddbID": 897, "eff": 0.75, @@ -434,7 +434,7 @@ }, { "class": 3, - "cost": 56440, + "cost": 53379, "edID": 128064040, "eddbID": 898, "eff": 0.5, @@ -450,7 +450,7 @@ }, { "class": 3, - "cost": 169300, + "cost": 160137, "edID": 128064041, "eddbID": 899, "eff": 0.45, @@ -466,7 +466,7 @@ }, { "class": 3, - "cost": 507910, + "cost": 480411, "edID": 128064042, "eddbID": 900, "eff": 0.4, @@ -482,7 +482,7 @@ }, { "class": 2, - "cost": 1980, + "cost": 1977, "edID": 128064033, "eddbID": 891, "eff": 1, @@ -498,7 +498,7 @@ }, { "class": 2, - "cost": 5930, + "cost": 5931, "edID": 128064034, "eddbID": 892, "eff": 0.75, @@ -514,7 +514,7 @@ }, { "class": 2, - "cost": 17800, + "cost": 17793, "edID": 128064035, "eddbID": 893, "eff": 0.5, @@ -530,7 +530,7 @@ }, { "class": 2, - "cost": 53410, + "cost": 53379, "edID": 128064036, "eddbID": 894, "eff": 0.45, @@ -546,7 +546,7 @@ }, { "class": 2, - "cost": 160220, + "cost": 160137, "edID": 128064037, "eddbID": 895, "eff": 0.4, diff --git a/modules/standard/sensors.json b/modules/standard/sensors.json index 51c8e7e..5d07865 100644 --- a/modules/standard/sensors.json +++ b/modules/standard/sensors.json @@ -3,7 +3,7 @@ { "angle": 30, "class": 8, - "cost": 697580, + "cost": 697584, "edID": 128064253, "eddbID": 1111, "grp": "s", @@ -20,7 +20,7 @@ { "angle": 30, "class": 8, - "cost": 1743960, + "cost": 1743961, "edID": 128064254, "eddbID": 1112, "grp": "s", @@ -37,7 +37,7 @@ { "angle": 30, "class": 8, - "cost": 4359900, + "cost": 4359903, "edID": 128064255, "eddbID": 1113, "grp": "s", @@ -54,7 +54,7 @@ { "angle": 30, "class": 8, - "cost": 10899760, + "cost": 10899756, "edID": 128064256, "eddbID": 1114, "grp": "s", @@ -71,7 +71,7 @@ { "angle": 30, "class": 8, - "cost": 27249390, + "cost": 27249391, "edID": 128064257, "eddbID": 1115, "grp": "s", @@ -88,7 +88,7 @@ { "angle": 30, "class": 7, - "cost": 249140, + "cost": 249137, "edID": 128064248, "eddbID": 1106, "grp": "s", @@ -105,7 +105,7 @@ { "angle": 30, "class": 7, - "cost": 622840, + "cost": 622843, "edID": 128064249, "eddbID": 1107, "grp": "s", @@ -122,7 +122,7 @@ { "angle": 30, "class": 7, - "cost": 1557110, + "cost": 1557108, "edID": 128064250, "eddbID": 1108, "grp": "s", @@ -156,7 +156,7 @@ { "angle": 30, "class": 7, - "cost": 9731930, + "cost": 9731925, "edID": 128064252, "eddbID": 1110, "grp": "s", @@ -173,7 +173,7 @@ { "angle": 30, "class": 6, - "cost": 88980, + "cost": 88978, "edID": 128064243, "eddbID": 1101, "grp": "s", @@ -190,7 +190,7 @@ { "angle": 30, "class": 6, - "cost": 222440, + "cost": 222444, "edID": 128064244, "eddbID": 1102, "grp": "s", @@ -224,7 +224,7 @@ { "angle": 30, "class": 6, - "cost": 1390280, + "cost": 1390275, "edID": 128064246, "eddbID": 1104, "grp": "s", @@ -241,7 +241,7 @@ { "angle": 30, "class": 6, - "cost": 3475690, + "cost": 3475688, "edID": 128064247, "eddbID": 1105, "grp": "s", @@ -258,7 +258,7 @@ { "angle": 30, "class": 5, - "cost": 31780, + "cost": 31778, "edID": 128064238, "eddbID": 1096, "grp": "s", @@ -275,7 +275,7 @@ { "angle": 30, "class": 5, - "cost": 79440, + "cost": 79444, "edID": 128064239, "eddbID": 1097, "grp": "s", @@ -292,7 +292,7 @@ { "angle": 30, "class": 5, - "cost": 198610, + "cost": 198611, "edID": 128064240, "eddbID": 1098, "grp": "s", @@ -309,7 +309,7 @@ { "angle": 30, "class": 5, - "cost": 496530, + "cost": 496527, "edID": 128064241, "eddbID": 1099, "grp": "s", @@ -326,7 +326,7 @@ { "angle": 30, "class": 5, - "cost": 1241320, + "cost": 1241317, "edID": 128064242, "eddbID": 1100, "grp": "s", @@ -343,7 +343,7 @@ { "angle": 30, "class": 4, - "cost": 11350, + "cost": 11349, "edID": 128064233, "eddbID": 1091, "grp": "s", @@ -360,7 +360,7 @@ { "angle": 30, "class": 4, - "cost": 28370, + "cost": 28373, "edID": 128064234, "eddbID": 1092, "grp": "s", @@ -377,7 +377,7 @@ { "angle": 30, "class": 4, - "cost": 70930, + "cost": 70932, "edID": 128064235, "eddbID": 1093, "grp": "s", @@ -394,7 +394,7 @@ { "angle": 30, "class": 4, - "cost": 177330, + "cost": 177331, "edID": 128064236, "eddbID": 1094, "grp": "s", @@ -411,7 +411,7 @@ { "angle": 30, "class": 4, - "cost": 443330, + "cost": 443328, "edID": 128064237, "eddbID": 1095, "grp": "s", @@ -428,7 +428,7 @@ { "angle": 30, "class": 3, - "cost": 4050, + "cost": 4053, "edID": 128064228, "eddbID": 1086, "grp": "s", @@ -445,7 +445,7 @@ { "angle": 30, "class": 3, - "cost": 10130, + "cost": 10133, "edID": 128064229, "eddbID": 1087, "grp": "s", @@ -462,7 +462,7 @@ { "angle": 30, "class": 3, - "cost": 25330, + "cost": 25333, "edID": 128064230, "eddbID": 1088, "grp": "s", @@ -479,7 +479,7 @@ { "angle": 30, "class": 3, - "cost": 63330, + "cost": 63333, "edID": 128064231, "eddbID": 1089, "grp": "s", @@ -496,7 +496,7 @@ { "angle": 30, "class": 3, - "cost": 158330, + "cost": 158331, "edID": 128064232, "eddbID": 1090, "grp": "s", @@ -513,7 +513,7 @@ { "angle": 30, "class": 2, - "cost": 1450, + "cost": 1448, "edID": 128064223, "eddbID": 1081, "grp": "s", @@ -530,7 +530,7 @@ { "angle": 30, "class": 2, - "cost": 3620, + "cost": 3619, "edID": 128064224, "eddbID": 1082, "grp": "s", @@ -547,7 +547,7 @@ { "angle": 30, "class": 2, - "cost": 9050, + "cost": 9048, "edID": 128064225, "eddbID": 1083, "grp": "s", @@ -564,7 +564,7 @@ { "angle": 30, "class": 2, - "cost": 22620, + "cost": 22619, "edID": 128064226, "eddbID": 1084, "grp": "s", @@ -581,7 +581,7 @@ { "angle": 30, "class": 2, - "cost": 56550, + "cost": 56547, "edID": 128064227, "eddbID": 1085, "grp": "s", @@ -598,7 +598,7 @@ { "angle": 30, "class": 1, - "cost": 520, + "cost": 517, "edID": 128064218, "eddbID": 1076, "grp": "s", @@ -615,7 +615,7 @@ { "angle": 30, "class": 1, - "cost": 1290, + "cost": 1293, "edID": 128064219, "eddbID": 1077, "grp": "s", @@ -632,7 +632,7 @@ { "angle": 30, "class": 1, - "cost": 3230, + "cost": 3231, "edID": 128064220, "eddbID": 1078, "grp": "s", @@ -649,7 +649,7 @@ { "angle": 30, "class": 1, - "cost": 8080, + "cost": 8078, "edID": 128064221, "eddbID": 1079, "grp": "s", @@ -666,7 +666,7 @@ { "angle": 30, "class": 1, - "cost": 20200, + "cost": 20195, "edID": 128064222, "eddbID": 1080, "grp": "s", diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index d85fd11..34db722 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -2,7 +2,7 @@ "t": [ { "class": 8, - "cost": 2007240, + "cost": 2007241, "edID": 128064098, "eddbID": 956, "grp": "t", @@ -23,7 +23,7 @@ }, { "class": 8, - "cost": 6021720, + "cost": 6021722, "edID": 128064099, "eddbID": 957, "grp": "t", @@ -44,7 +44,7 @@ }, { "class": 8, - "cost": 18065170, + "cost": 18065165, "edID": 128064100, "eddbID": 958, "grp": "t", @@ -65,7 +65,7 @@ }, { "class": 8, - "cost": 54195500, + "cost": 54195495, "edID": 128064101, "eddbID": 959, "grp": "t", @@ -86,7 +86,7 @@ }, { "class": 8, - "cost": 162586490, + "cost": 162586486, "edID": 128064102, "eddbID": 960, "grp": "t", @@ -107,7 +107,7 @@ }, { "class": 7, - "cost": 633200, + "cost": 633199, "edID": 128064093, "eddbID": 951, "grp": "t", @@ -128,7 +128,7 @@ }, { "class": 7, - "cost": 1899600, + "cost": 1899597, "edID": 128064094, "eddbID": 952, "grp": "t", @@ -170,7 +170,7 @@ }, { "class": 7, - "cost": 17096370, + "cost": 17096371, "edID": 128064096, "eddbID": 954, "grp": "t", @@ -191,7 +191,7 @@ }, { "class": 7, - "cost": 51289110, + "cost": 51289112, "edID": 128064097, "eddbID": 955, "grp": "t", @@ -212,7 +212,7 @@ }, { "class": 6, - "cost": 199750, + "cost": 199747, "edID": 128064088, "eddbID": 946, "grp": "t", @@ -233,7 +233,7 @@ }, { "class": 6, - "cost": 599240, + "cost": 599242, "edID": 128064089, "eddbID": 947, "grp": "t", @@ -254,7 +254,7 @@ }, { "class": 6, - "cost": 1797730, + "cost": 1797726, "edID": 128064090, "eddbID": 948, "grp": "t", @@ -275,7 +275,7 @@ }, { "class": 6, - "cost": 5393180, + "cost": 5393177, "edID": 128064091, "eddbID": 949, "grp": "t", @@ -296,7 +296,7 @@ }, { "class": 6, - "cost": 16179530, + "cost": 16179531, "edID": 128064092, "eddbID": 950, "grp": "t", @@ -317,7 +317,7 @@ }, { "class": 5, - "cost": 63010, + "cost": 63012, "edID": 128064083, "eddbID": 941, "grp": "t", @@ -338,7 +338,7 @@ }, { "class": 5, - "cost": 189040, + "cost": 189035, "edID": 128064084, "eddbID": 942, "grp": "t", @@ -359,7 +359,7 @@ }, { "class": 5, - "cost": 567110, + "cost": 567106, "edID": 128064085, "eddbID": 943, "grp": "t", @@ -380,7 +380,7 @@ }, { "class": 5, - "cost": 1701320, + "cost": 1701318, "edID": 128064086, "eddbID": 944, "grp": "t", @@ -401,7 +401,7 @@ }, { "class": 5, - "cost": 5103950, + "cost": 5103953, "edID": 128064087, "eddbID": 945, "grp": "t", @@ -422,7 +422,7 @@ }, { "class": 4, - "cost": 19880, + "cost": 19878, "edID": 128064078, "eddbID": 936, "grp": "t", @@ -443,7 +443,7 @@ }, { "class": 4, - "cost": 59630, + "cost": 59633, "edID": 128064079, "eddbID": 937, "grp": "t", @@ -464,7 +464,7 @@ }, { "class": 4, - "cost": 178900, + "cost": 178898, "edID": 128064080, "eddbID": 938, "grp": "t", @@ -485,7 +485,7 @@ }, { "class": 4, - "cost": 536690, + "cost": 536693, "edID": 128064081, "eddbID": 939, "grp": "t", @@ -527,7 +527,7 @@ }, { "class": 3, - "cost": 6270, + "cost": 6271, "edID": 128064073, "eddbID": 931, "grp": "t", @@ -548,7 +548,7 @@ }, { "class": 3, - "cost": 18810, + "cost": 18812, "edID": 128064074, "eddbID": 932, "grp": "t", @@ -569,7 +569,7 @@ }, { "class": 3, - "cost": 56440, + "cost": 56435, "edID": 128064075, "eddbID": 933, "grp": "t", @@ -590,7 +590,7 @@ }, { "class": 3, - "cost": 169300, + "cost": 169304, "edID": 128064076, "eddbID": 934, "grp": "t", @@ -611,7 +611,7 @@ }, { "class": 3, - "cost": 507910, + "cost": 507912, "edID": 128064077, "eddbID": 935, "grp": "t", @@ -632,7 +632,7 @@ }, { "class": 2, - "cost": 1980, + "cost": 1978, "edID": 128064068, "eddbID": 926, "grp": "t", @@ -653,7 +653,7 @@ }, { "class": 2, - "cost": 5930, + "cost": 5934, "edID": 128064069, "eddbID": 927, "grp": "t", @@ -674,7 +674,7 @@ }, { "class": 2, - "cost": 17800, + "cost": 17803, "edID": 128064070, "eddbID": 928, "grp": "t", @@ -695,7 +695,7 @@ }, { "class": 2, - "cost": 53410, + "cost": 53408, "edID": 128064071, "eddbID": 929, "grp": "t", @@ -716,7 +716,7 @@ }, { "class": 2, - "cost": 160220, + "cost": 160224, "edID": 128064072, "eddbID": 930, "grp": "t", diff --git a/ships/adder.json b/ships/adder.json index e05ad58..8cdf3b9 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -43,7 +43,7 @@ "edID": 128049269, "eddbID": 754, "grp": "bh", - "cost": 35120, + "cost": 35123, "mass": 3, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128049270, "eddbID": 755, "grp": "bh", - "cost": 79030, + "cost": 79027, "mass": 5, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049271, "eddbID": 756, "grp": "bh", - "cost": 186770, + "cost": 186767, "mass": 5, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049272, "eddbID": 757, "grp": "bh", - "cost": 206960, + "cost": 206963, "mass": 5, "causres": 0, "explres": 0.2, diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json index 2928181..3c73d1d 100644 --- a/ships/alliance_challenger.json +++ b/ships/alliance_challenger.json @@ -46,7 +46,7 @@ "edID": 128816591, "eddbID": 1651, "grp": "bh", - "cost": 6803170, + "cost": 12188900, "mass": 40, "causres": 0, "explres": -0.4, @@ -59,7 +59,7 @@ "edID": 128816592, "eddbID": 1652, "grp": "bh", - "cost": 15307134, + "cost": 27425026, "mass": 78, "causres": 0, "explres": -0.4, @@ -72,7 +72,7 @@ "edID": 128816593, "eddbID": 1653, "grp": "bh", - "cost": 36175859, + "cost": 64814480, "mass": 78, "causres": 0, "explres": -0.5, @@ -85,7 +85,7 @@ "edID": 128816594, "eddbID": 1654, "grp": "bh", - "cost": 40087682, + "cost": 71823097, "mass": 78, "causres": 0, "explres": 0.2, diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index feadabd..05c8d3e 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -46,7 +46,7 @@ "edID": 128816577, "eddbID": 1641, "grp": "bh", - "cost": 6803170, + "cost": 7752900, "mass": 40, "causres": 0, "explres": -0.4, @@ -59,7 +59,7 @@ "edID": 128816578, "eddbID": 1642, "grp": "bh", - "cost": 15307134, + "cost": 17444026, "mass": 78, "causres": 0, "explres": -0.4, @@ -72,7 +72,7 @@ "edID": 128816579, "eddbID": 1643, "grp": "bh", - "cost": 36175859, + "cost": 41226050, "mass": 78, "causres": 0, "explres": -0.5, @@ -85,7 +85,7 @@ "edID": 128816580, "eddbID": 1644, "grp": "bh", - "cost": 40087682, + "cost": 45683967, "mass": 78, "causres": 0, "explres": 0.2, diff --git a/ships/anaconda.json b/ships/anaconda.json index 7ba88c4..c69230d 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -57,7 +57,7 @@ "edID": 128049366, "eddbID": 820, "grp": "bh", - "cost": 132272510, + "cost": 132272505, "mass": 60, "causres": 0, "explres": -0.4, @@ -70,7 +70,7 @@ "edID": 128049367, "eddbID": 821, "grp": "bh", - "cost": 312604020, + "cost": 312604021, "mass": 60, "causres": 0, "explres": -0.5, @@ -83,7 +83,7 @@ "edID": 128049368, "eddbID": 822, "grp": "bh", - "cost": 346407000, + "cost": 346406995, "mass": 60, "causres": 0, "explres": 0.2, diff --git a/ships/asp.json b/ships/asp.json index 792285f..64dd88a 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -43,7 +43,7 @@ "edID": 128049305, "eddbID": 779, "grp": "bh", - "cost": 2664460, + "cost": 2664461, "mass": 21, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128049306, "eddbID": 780, "grp": "bh", - "cost": 5995040, + "cost": 5995038, "mass": 42, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049307, "eddbID": 781, "grp": "bh", - "cost": 14168270, + "cost": 14168274, "mass": 42, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049308, "eddbID": 782, "grp": "bh", - "cost": 15700340, + "cost": 15700339, "mass": 42, "causres": 0, "explres": 0.2, diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 7114cde..b56e48f 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -43,7 +43,7 @@ "edID": 128672279, "eddbID": 1504, "grp": "bh", - "cost": 1584460, + "cost": 1584461, "mass": 21, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128672280, "eddbID": 1505, "grp": "bh", - "cost": 3565040, + "cost": 3565038, "mass": 42, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128672281, "eddbID": 1506, "grp": "bh", - "cost": 8425380, + "cost": 8425374, "mass": 42, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128672282, "eddbID": 1507, "grp": "bh", - "cost": 9336440, + "cost": 9336439, "mass": 42, "causres": 0, "explres": 0.2, diff --git a/ships/beluga.json b/ships/beluga.json index 1d13f87..fcfa4b4 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -48,7 +48,7 @@ "edID": 128049347, "eddbID": 1555, "grp": "bh", - "cost": 33813120, + "cost": 33813105, "mass": 83, "causres": 0, "explres": -0.4, @@ -61,7 +61,7 @@ "edID": 128049348, "eddbID": 1556, "grp": "bh", - "cost": 76079500, + "cost": 76079487, "mass": 165, "causres": 0, "explres": -0.4, @@ -74,7 +74,7 @@ "edID": 128049349, "eddbID": 1557, "grp": "bh", - "cost": 179801200, + "cost": 179801189, "mass": 165, "causres": 0, "explres": -0.5, @@ -87,7 +87,7 @@ "edID": 128049350, "eddbID": 1558, "grp": "bh", - "cost": 199243730, + "cost": 199243724, "mass": 165, "causres": 0, "explres": 0.2, diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 6cbb738..72ba0dd 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -43,7 +43,7 @@ "edID": 128049281, "eddbID": 764, "grp": "bh", - "cost": 151890, + "cost": 139887, "mass": 14, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128049282, "eddbID": 765, "grp": "bh", - "cost": 341750, + "cost": 341746, "mass": 27, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049283, "eddbID": 766, "grp": "bh", - "cost": 797410, + "cost": 734407, "mass": 27, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049284, "eddbID": 767, "grp": "bh", - "cost": 895000, + "cost": 824285, "mass": 27, "causres": 0, "explres": 0.2, diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index a449e93..f977f0f 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -46,7 +46,7 @@ "edID": 128672265, "eddbID": 1519, "grp": "bh", - "cost": 305890, + "cost": 305887, "mass": 14, "causres": 0, "explres": -0.4, @@ -59,7 +59,7 @@ "edID": 128672266, "eddbID": 1520, "grp": "bh", - "cost": 688250, + "cost": 688246, "mass": 27, "causres": 0, "explres": -0.4, @@ -72,7 +72,7 @@ "edID": 128672267, "eddbID": 1521, "grp": "bh", - "cost": 1605910, + "cost": 1605907, "mass": 27, "causres": 0, "explres": -0.5, diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index 07c0bb5..f59f7ce 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -43,7 +43,7 @@ "edID": 128671833, "eddbID": 1457, "grp": "bh", - "cost": 800000, + "cost": 757904, "mass": 23, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128671834, "eddbID": 1458, "grp": "bh", - "cost": 1800000, + "cost": 1705284, "mass": 47, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128671835, "eddbID": 1459, "grp": "bh", - "cost": 4200000, + "cost": 3978996, "mass": 26, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128671836, "eddbID": 1460, "grp": "bh", - "cost": 4714000, + "cost": 4465949, "mass": 47, "causres": 0, "explres": 0.2, diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index bb789ee..273f00c 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -43,7 +43,7 @@ "edID": 128671219, "eddbID": 1385, "grp": "bh", - "cost": 225700, + "cost": 225731, "mass": 13, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128671220, "eddbID": 1386, "grp": "bh", - "cost": 507900, + "cost": 507896, "mass": 26, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128671221, "eddbID": 1387, "grp": "bh", - "cost": 1185100, + "cost": 1185090, "mass": 26, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128671222, "eddbID": 1388, "grp": "bh", - "cost": 1330100, + "cost": 1330123, "mass": 26, "causres": 0, "explres": 0.2, diff --git a/ships/dolphin.json b/ships/dolphin.json index f209683..a59a6d7 100755 --- a/ships/dolphin.json +++ b/ships/dolphin.json @@ -47,7 +47,7 @@ "edID": 128049293, "eddbID": 1590, "grp": "bh", - "cost": 534940, + "cost": 534929, "mass": 32, "causres": 0, "explres": -0.4, @@ -60,7 +60,7 @@ "edID": 128049294, "eddbID": 1591, "grp": "bh", - "cost": 1203600, + "cost": 1203590, "mass": 63, "causres": 0, "explres": -0.4, @@ -73,7 +73,7 @@ "edID": 128049295, "eddbID": 1592, "grp": "bh", - "cost": 2808390, + "cost": 2808378, "mass": 63, "causres": 0, "explres": -0.5, @@ -86,7 +86,7 @@ "edID": 128049296, "eddbID": 1593, "grp": "bh", - "cost": 3152080, + "cost": 3152070, "mass": 63, "causres": 0, "explres": 0.2, diff --git a/ships/eagle.json b/ships/eagle.json index db67cb0..0298f4f 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -56,7 +56,7 @@ "edID": 128049258, "eddbID": 745, "grp": "bh", - "cost": 90050, + "cost": 90048, "mass": 8, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049259, "eddbID": 746, "grp": "bh", - "cost": 140090, + "cost": 140089, "mass": 8, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049260, "eddbID": 747, "grp": "bh", - "cost": 150390, + "cost": 150393, "mass": 8, "causres": 0, "explres": 0.2, diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index af3d74b..bdcfd2e 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -46,7 +46,7 @@ "edID": 128672148, "eddbID": 1467, "grp": "bh", - "cost": 7925680, + "cost": 7925682, "mass": 44, "causres": 0, "explres": -0.4, @@ -59,7 +59,7 @@ "edID": 128672149, "eddbID": 1468, "grp": "bh", - "cost": 17832780, + "cost": 17832784, "mass": 87, "causres": 0, "explres": -0.4, @@ -72,7 +72,7 @@ "edID": 128672150, "eddbID": 1469, "grp": "bh", - "cost": 42144810, + "cost": 42144814, "mass": 87, "causres": 0, "explres": -0.5, @@ -85,7 +85,7 @@ "edID": 128672151, "eddbID": 1470, "grp": "bh", - "cost": 46702080, + "cost": 46702081, "mass": 87, "causres": 0, "explres": 0.2, diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 79a878f..823a6d5 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -47,7 +47,7 @@ "edID": 128049371, "eddbID": 1499, "grp": "bh", - "cost": 75187790, + "cost": 75187780, "mass": 30, "causres": 0, "explres": -0.4, @@ -60,7 +60,7 @@ "edID": 128049372, "eddbID": 1500, "grp": "bh", - "cost": 169172510, + "cost": 169172505, "mass": 60, "causres": 0, "explres": -0.4, @@ -73,7 +73,7 @@ "edID": 128049373, "eddbID": 1501, "grp": "bh", - "cost": 399811020, + "cost": 399811021, "mass": 60, "causres": 0, "explres": -0.5, @@ -86,7 +86,7 @@ "edID": 128049374, "eddbID": 1502, "grp": "bh", - "cost": 443044000, + "cost": 443043995, "mass": 60, "causres": 0, "explres": 0.2, diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index cf0d3bf..a8b1e66 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -46,7 +46,7 @@ "edID": 128049323, "eddbID": 794, "grp": "bh", - "cost": 5725680, + "cost": 5725682, "mass": 44, "causres": 0, "explres": -0.4, @@ -59,7 +59,7 @@ "edID": 128049324, "eddbID": 795, "grp": "bh", - "cost": 12882780, + "cost": 12882784, "mass": 87, "causres": 0, "explres": -0.4, @@ -72,7 +72,7 @@ "edID": 128049325, "eddbID": 796, "grp": "bh", - "cost": 30446310, + "cost": 30446314, "mass": 87, "causres": 0, "explres": -0.5, @@ -85,7 +85,7 @@ "edID": 128049326, "eddbID": 797, "grp": "bh", - "cost": 33738580, + "cost": 33738581, "mass": 87, "causres": 0, "explres": 0.2, diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 9cac08f..4a355e2 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -47,7 +47,7 @@ "edID": 128672155, "eddbID": 1472, "grp": "bh", - "cost": 14325690, + "cost": 14325682, "mass": 44, "causres": 0, "explres": -0.4, @@ -60,7 +60,7 @@ "edID": 128672156, "eddbID": 1473, "grp": "bh", - "cost": 32232790, + "cost": 32232784, "mass": 87, "causres": 0, "explres": -0.4, @@ -73,7 +73,7 @@ "edID": 128672157, "eddbID": 1474, "grp": "bh", - "cost": 76176810, + "cost": 76176814, "mass": 87, "causres": 0, "explres": -0.5, @@ -86,7 +86,7 @@ "edID": 128672158, "eddbID": 1475, "grp": "bh", - "cost": 84414090, + "cost": 84414081, "mass": 87, "causres": 0, "explres": 0.2, diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index b3b4617..e28a06b 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -43,7 +43,7 @@ "edID": 128049353, "eddbID": 814, "grp": "bh", - "cost": 20626820, + "cost": 20626816, "mass": 19, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128049354, "eddbID": 815, "grp": "bh", - "cost": 46410340, + "cost": 46410336, "mass": 38, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049355, "eddbID": 816, "grp": "bh", - "cost": 109683090, + "cost": 109683094, "mass": 38, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049356, "eddbID": 817, "grp": "bh", - "cost": 121543510, + "cost": 121543513, "mass": 38, "causres": 0, "explres": 0.2, diff --git a/ships/hauler.json b/ships/hauler.json index 4882001..3fd3641 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -43,7 +43,7 @@ "edID": 128049263, "eddbID": 749, "grp": "bh", - "cost": 42180, + "cost": 42176, "mass": 1, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128049264, "eddbID": 750, "grp": "bh", - "cost": 185050, + "cost": 185047, "mass": 2, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049265, "eddbID": 751, "grp": "bh", - "cost": 270300, + "cost": 270295, "mass": 2, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049266, "eddbID": 752, "grp": "bh", - "cost": 282420, + "cost": 282421, "mass": 2, "causres": 0, "explres": 0.2, diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index d1e9d58..53d6f8f 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -46,7 +46,7 @@ "edID": 128049317, "eddbID": 789, "grp": "bh", - "cost": 8918340, + "cost": 8918344, "mass": 30, "causres": 0, "explres": -0.4, @@ -59,7 +59,7 @@ "edID": 128049318, "eddbID": 790, "grp": "bh", - "cost": 20066270, + "cost": 20066274, "mass": 60, "causres": 0, "explres": -0.4, @@ -72,7 +72,7 @@ "edID": 128049319, "eddbID": 791, "grp": "bh", - "cost": 47423290, + "cost": 47423294, "mass": 60, "causres": 0, "explres": -0.5, @@ -85,7 +85,7 @@ "edID": 128049320, "eddbID": 792, "grp": "bh", - "cost": 52551340, + "cost": 52551342, "mass": 60, "causres": 0, "explres": 0.2, diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index d8d7b06..2a7334b 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -46,7 +46,7 @@ "edID": 128671225, "eddbID": 1390, "grp": "bh", - "cost": 1017200, + "cost": 1017172, "mass": 4, "causres": 0, "explres": -0.4, @@ -59,7 +59,7 @@ "edID": 128671226, "eddbID": 1391, "grp": "bh", - "cost": 2288600, + "cost": 2288637, "mass": 8, "causres": 0, "explres": -0.4, @@ -72,7 +72,7 @@ "edID": 128671227, "eddbID": 1392, "grp": "bh", - "cost": 5408800, + "cost": 5408814, "mass": 8, "causres": 0, "explres": -0.5, @@ -85,7 +85,7 @@ "edID": 128671228, "eddbID": 1393, "grp": "bh", - "cost": 5993700, + "cost": 5993688, "mass": 8, "causres": 0, "explres": 0.2, diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index b007846..7a689a4 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -47,7 +47,7 @@ "edID": 128049377, "eddbID": 1494, "grp": "bh", - "cost": 83587790, + "cost": 83587780, "mass": 30, "causres": 0, "explres": -0.4, @@ -60,7 +60,7 @@ "edID": 128049378, "eddbID": 1495, "grp": "bh", - "cost": 188072510, + "cost": 188072505, "mass": 60, "causres": 0, "explres": -0.4, @@ -73,7 +73,7 @@ "edID": 128049379, "eddbID": 1496, "grp": "bh", - "cost": 444478020, + "cost": 444478021, "mass": 60, "causres": 0, "explres": -0.5, @@ -86,7 +86,7 @@ "edID": 128049380, "eddbID": 1497, "grp": "bh", - "cost": 492541000, + "cost": 492540995, "mass": 60, "causres": 0, "explres": 0.2, diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 742391d..fab902e 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -43,7 +43,7 @@ "edID": 128672141, "eddbID": 1462, "grp": "bh", - "cost": 66500, + "cost": 66495, "mass": 4, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128672142, "eddbID": 1463, "grp": "bh", - "cost": 222760, + "cost": 222758, "mass": 8, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128672143, "eddbID": 1464, "grp": "bh", - "cost": 346550, + "cost": 346549, "mass": 8, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128672144, "eddbID": 1465, "grp": "bh", - "cost": 372040, + "cost": 372039, "mass": 8, "causres": 0, "explres": 0.2, diff --git a/ships/keelback.json b/ships/keelback.json index 1602769..aeae2d9 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -44,7 +44,7 @@ "edID": 128672272, "eddbID": 1514, "grp": "bh", - "cost": 1250460, + "cost": 1250461, "mass": 12, "causres": 0, "explres": -0.4, @@ -57,7 +57,7 @@ "edID": 128672273, "eddbID": 1515, "grp": "bh", - "cost": 2813540, + "cost": 2813538, "mass": 23, "causres": 0, "explres": -0.4, @@ -70,7 +70,7 @@ "edID": 128672274, "eddbID": 1516, "grp": "bh", - "cost": 6649330, + "cost": 6649329, "mass": 23, "causres": 0, "explres": -0.5, @@ -83,7 +83,7 @@ "edID": 128672275, "eddbID": 1517, "grp": "bh", - "cost": 7368340, + "cost": 7368344, "mass": 23, "causres": 0, "explres": 0.2, diff --git a/ships/krait_mkii.json b/ships/krait_mkii.json index ea6d8b6..931f71e 100644 --- a/ships/krait_mkii.json +++ b/ships/krait_mkii.json @@ -44,7 +44,7 @@ "edID": 128816570, "eddbID": 1646, "grp": "bh", - "cost": 22791270, + "cost": 18325682, "mass": 36, "causres": 0, "explres": -0.4, @@ -57,7 +57,7 @@ "edID": 128816571, "eddbID": 1647, "grp": "bh", - "cost": 51280360, + "cost": 41232784, "mass": 67, "causres": 0, "explres": -0.4, @@ -70,7 +70,7 @@ "edID": 128816572, "eddbID": 1648, "grp": "bh", - "cost": 121192590, + "cost": 97446814, "mass": 67, "causres": 0, "explres": -0.5, @@ -83,7 +83,7 @@ "edID": 128816573, "eddbID": 1649, "grp": "bh", - "cost": 134297570, + "cost": 88322097, "mass": 67, "causres": 0, "explres": 0.2, diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json index ca614e3..a37e305 100644 --- a/ships/krait_phantom.json +++ b/ships/krait_phantom.json @@ -43,7 +43,7 @@ "edID": 128839284, "eddbID": 1769, "grp": "bh", - "cost": 22791270, + "cost": 14988900, "mass": 26, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128839285, "eddbID": 1770, "grp": "bh", - "cost": 51280360, + "cost": 33725026, "mass": 53, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128839286, "eddbID": 1771, "grp": "bh", - "cost": 121192590, + "cost": 79703480, "mass": 53, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128839287, "eddbID": 1772, "grp": "bh", - "cost": 134297570, + "cost": 88322097, "mass": 53, "causres": 0, "explres": 0.2, diff --git a/ships/mamba.json b/ships/mamba.json index 25dc53c..6c98157 100644 --- a/ships/mamba.json +++ b/ships/mamba.json @@ -43,7 +43,7 @@ "edID": 128915982, "eddbID": 1799, "grp": "bh", - "cost": 20626820, + "cost": 22346816, "mass": 19, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128915983, "eddbID": 1800, "grp": "bh", - "cost": 46410340, + "cost": 50280336, "mass": 38, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128915984, "eddbID": 1801, "grp": "bh", - "cost": 109683090, + "cost": 118829194, "mass": 38, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128915985, "eddbID": 1802, "grp": "bh", - "cost": 121543510, + "cost": 131678613, "mass": 38, "causres": 0, "explres": 0.2, diff --git a/ships/orca.json b/ships/orca.json index 452a903..9fac7f6 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -44,7 +44,7 @@ "edID": 128049329, "eddbID": 799, "grp": "bh", - "cost": 19415950, + "cost": 19415954, "mass": 21, "causres": 0, "explres": -0.4, @@ -57,7 +57,7 @@ "edID": 128049330, "eddbID": 800, "grp": "bh", - "cost": 43685900, + "cost": 43685898, "mass": 87, "causres": 0, "explres": -0.4, @@ -70,7 +70,7 @@ "edID": 128049331, "eddbID": 801, "grp": "bh", - "cost": 103244340, + "cost": 103244339, "mass": 87, "causres": 0, "explres": -0.5, @@ -83,7 +83,7 @@ "edID": 128049332, "eddbID": 802, "grp": "bh", - "cost": 114408510, + "cost": 114408513, "mass": 87, "causres": 0, "explres": 0.2, diff --git a/ships/python.json b/ships/python.json index a25918c..e884002 100755 --- a/ships/python.json +++ b/ships/python.json @@ -43,7 +43,7 @@ "edID": 128049341, "eddbID": 809, "grp": "bh", - "cost": 22791270, + "cost": 22791271, "mass": 26, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128049342, "eddbID": 810, "grp": "bh", - "cost": 51280360, + "cost": 51280361, "mass": 53, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049343, "eddbID": 811, "grp": "bh", - "cost": 121192590, + "cost": 121192586, "mass": 53, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049344, "eddbID": 812, "grp": "bh", - "cost": 134297570, + "cost": 134297567, "mass": 53, "causres": 0, "explres": 0.2, diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 3bdc944..398beac 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -69,7 +69,7 @@ "edID": 128049253, "eddbID": 741, "grp": "bh", - "cost": 132060, + "cost": 132064, "mass": 4, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049254, "eddbID": 742, "grp": "bh", - "cost": 139420, + "cost": 139424, "mass": 4, "causres": 0, "explres": 0.2, diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index a2da048..49055d4 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -44,7 +44,7 @@ "edID": 128785622, "eddbID": 1628, "grp": "bh", - "cost": 49902137, + "cost": 49902136, "mass": 75, "causres": 0, "explres": -0.4, @@ -83,7 +83,7 @@ "edID": 128785625, "eddbID": 1631, "grp": "bh", - "cost": 294048342, + "cost": 294048341, "mass": 150, "causres": 0, "explres": 0.2, diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 92612a0..25c4c54 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -43,7 +43,7 @@ "edID": 128049287, "eddbID": 769, "grp": "bh", - "cost": 418380, + "cost": 418378, "mass": 12, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049289, "eddbID": 771, "grp": "bh", - "cost": 2224730, + "cost": 2224725, "mass": 23, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049290, "eddbID": 772, "grp": "bh", - "cost": 2465290, + "cost": 2465292, "mass": 23, "causres": 0, "explres": 0.2, diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index 667ec89..0415fe1 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -56,7 +56,7 @@ "edID": 128049300, "eddbID": 775, "grp": "bh", - "cost": 15725030, + "cost": 15725026, "mass": 63, "causres": 0, "explres": -0.4, @@ -82,7 +82,7 @@ "edID": 128049302, "eddbID": 777, "grp": "bh", - "cost": 41182100, + "cost": 41182097, "mass": 63, "causres": 0, "explres": 0.2, diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 5307d10..1dbd79f 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -44,7 +44,7 @@ "edID": 128049335, "eddbID": 804, "grp": "bh", - "cost": 30622340, + "cost": 30622336, "mass": 75, "causres": 0, "explres": -0.4, @@ -57,7 +57,7 @@ "edID": 128049336, "eddbID": 805, "grp": "bh", - "cost": 68900260, + "cost": 68900257, "mass": 150, "causres": 0, "explres": -0.4, @@ -70,7 +70,7 @@ "edID": 128049337, "eddbID": 806, "grp": "bh", - "cost": 162834280, + "cost": 162834275, "mass": 150, "causres": 0, "explres": -0.5, @@ -83,7 +83,7 @@ "edID": 128049338, "eddbID": 807, "grp": "bh", - "cost": 180442120, + "cost": 180442119, "mass": 150, "causres": 0, "explres": 0.2, diff --git a/ships/viper.json b/ships/viper.json index 6c57e59..fcec0be 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -43,7 +43,7 @@ "edID": 128049275, "eddbID": 759, "grp": "bh", - "cost": 57170, + "cost": 57172, "mass": 5, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128049276, "eddbID": 760, "grp": "bh", - "cost": 128640, + "cost": 128637, "mass": 9, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049277, "eddbID": 761, "grp": "bh", - "cost": 304010, + "cost": 304014, "mass": 9, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049278, "eddbID": 762, "grp": "bh", - "cost": 336890, + "cost": 336888, "mass": 9, "causres": 0, "explres": 0.2, diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 46428e4..bd3d28b 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -43,7 +43,7 @@ "edID": 128672258, "eddbID": 1509, "grp": "bh", - "cost": 175180, + "cost": 175172, "mass": 5, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128672259, "eddbID": 1510, "grp": "bh", - "cost": 394140, + "cost": 394137, "mass": 9, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128672260, "eddbID": 1511, "grp": "bh", - "cost": 931490, + "cost": 931479, "mass": 9, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128672261, "eddbID": 1512, "grp": "bh", - "cost": 1033210, + "cost": 1032203, "mass": 9, "causres": 0, "explres": 0.2, diff --git a/ships/vulture.json b/ships/vulture.json index c337e5a..c1e384a 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -43,7 +43,7 @@ "edID": 128049311, "eddbID": 784, "grp": "bh", - "cost": 1970250, + "cost": 1970246, "mass": 17, "causres": 0, "explres": -0.4, @@ -56,7 +56,7 @@ "edID": 128049312, "eddbID": 785, "grp": "bh", - "cost": 4433050, + "cost": 4433053, "mass": 35, "causres": 0, "explres": -0.4, @@ -69,7 +69,7 @@ "edID": 128049313, "eddbID": 786, "grp": "bh", - "cost": 10476780, + "cost": 10476783, "mass": 35, "causres": 0, "explres": -0.5, @@ -82,7 +82,7 @@ "edID": 128049314, "eddbID": 787, "grp": "bh", - "cost": 11609670, + "cost": 11609674, "mass": 35, "causres": 0, "explres": 0.2, From 0d9a082a53bb0e7b8886b14d46e38d1f3e180f3e Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Thu, 6 Jun 2024 21:34:11 +0100 Subject: [PATCH 13/23] Adding SCO Drive Price update --- modules/standard/frame_shift_drive.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index 763c10a..c1e9bd9 100644 --- a/modules/standard/frame_shift_drive.json +++ b/modules/standard/frame_shift_drive.json @@ -895,7 +895,7 @@ }, { "class": 5, - "cost": 623816, + "cost": 2041581, "edID": 129030474, "fuelmul": 0.012, "fuelpower": 2.45, From afe7e1609c17e7212b0aa2130ead9a5f60fcfb68 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Sat, 22 Jun 2024 22:53:32 +0100 Subject: [PATCH 14/23] Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR --- modifications/modules.json | 160 +++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/modifications/modules.json b/modifications/modules.json index 26c825f..0d261b0 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -3864,6 +3864,166 @@ "special_penetrator_munitions" ] }, + "amr": { + "blueprints": { + "Weapon_HighCapacity": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "4": { + "engineers": [ + "Liz Ryder" + ] + }, + "5": { + "engineers": [ + "Liz Ryder" + ] + } + } + }, + "Weapon_LightWeight": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "4": { + "engineers": [ + "Liz Ryder" + ] + }, + "5": { + "engineers": [ + "Liz Ryder" + ] + } + } + }, + "Weapon_RapidFire": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "4": { + "engineers": [ + "Liz Ryder" + ] + }, + "5": { + "engineers": [ + "Liz Ryder" + ] + } + } + }, + "Weapon_Sturdy": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder" + ] + }, + "4": { + "engineers": [ + "Liz Ryder" + ] + }, + "5": { + "engineers": [ + "Liz Ryder" + ] + } + } + } + }, + "modifications": [ + "ammo", + "clip", + "damage", + "damagedist", + "fallofffromrange", + "distdraw", + "integrity", + "jitter", + "mass", + "piercing", + "power", + "reload", + "rof", + "thermload" + ], + "specials_D": [ + "special_emissive_munitions", + "special_fsd_interrupt", + "special_overload_munitions", + "special_thermal_cascade", + "special_weapon_damage", + "special_weapon_efficient", + "special_weapon_rateoffire", + "special_weapon_toughened", + "special_weapon_lightweight", + "special_penetrator_munitions" + ] + }, "axmr": { "blueprints": { }, From df5efe7b4678878e3ba306d1c73df65cfdc4e00b Mon Sep 17 00:00:00 2001 From: Chris <2653277+chennin@users.noreply.github.com> Date: Sat, 19 Oct 2024 11:19:31 -0400 Subject: [PATCH 15/23] Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e8fab38..a2fe1e5 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "test": "npm run lint && npm run jasmine-no-stack", "start": "node generate_distribution.js", "build": "node generate_distribution.js", + "preinstall": "npm install --ignore-scripts", "install": "node generate_distribution.js" }, "dependencies": { From a5a85857ecd2b11ea2a36106f0dd8a32b9c4b454 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Sun, 20 Oct 2024 09:55:51 +0100 Subject: [PATCH 16/23] Type 8 Added to Shipyard (#14) --- ships/index.js | 1 + ships/type_8_transport.json | 163 ++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) create mode 100755 ships/type_8_transport.json diff --git a/ships/index.js b/ships/index.js index 319430c..ed44a03 100644 --- a/ships/index.js +++ b/ships/index.js @@ -33,6 +33,7 @@ module.exports = { sidewinder: require('./sidewinder').sidewinder, type_6_transporter: require('./type_6_transporter').type_6_transporter, type_7_transport: require('./type_7_transport').type_7_transport, + type_8_transport: require('./type_8_transport').type_8_transport, type_9_heavy: require('./type_9_heavy').type_9_heavy, type_10_defender: require('./type_10_defender').type_10_defender, viper: require('./viper').viper, diff --git a/ships/type_8_transport.json b/ships/type_8_transport.json new file mode 100755 index 0000000..60b15f1 --- /dev/null +++ b/ships/type_8_transport.json @@ -0,0 +1,163 @@ +{ + "type_8_transport": { + "edID": 129030534, + "properties": { + "name": "Type-8 Transporter", + "manufacturer": "Lakon", + "class": 2, + "hullCost": 36238840, + "speed": 200, + "heatCapacity": 226, + "boost": 340, + "boostEnergy": 10, + "baseShieldStrength": 228, + "baseArmour": 440, + "hardness": 58, + "hullMass": 400, + "masslock": 18, + "pipSpeed": 0.16666666666667, + "pitch": 28, + "roll": 60, + "yaw": 18, + "crew": 1, + "reserveFuelCapacity": 0.52 + }, + "retailCost": 38453970, + "bulkheads": [ + { + "id": "Bs", + "edID": 129030535, + "grp": "bh", + "cost": 0, + "mass": 0, + "causres": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 0.8 + }, + { + "id": "Bt", + "edID": 129030536, + "grp": "bh", + "cost": 15381590, + "mass": 32, + "causres": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 1.52 + }, + { + "id": "Bu", + "edID": 129030537, + "grp": "bh", + "cost": 34608570, + "mass": 63, + "causres": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 2.5 + }, + { + "id": "Bv", + "edID": 129030538, + "grp": "bh", + "cost": 37163480, + "mass": 63, + "causres": 0, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 + }, + { + "id": "Bw", + "edID": 129030539, + "grp": "bh", + "cost": 90636000, + "mass": 63, + "causres": 0, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 + } + ], + "slots": { + "standard": [ + 5, + 5, + 5, + 3, + 4, + 3, + 5 + ], + "hardpoints": [ + 2, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0 + ], + "internal": [ + 7, + 6, + 6, + 6, + 5, + 5, + 4, + 2, + 1, + { + "class": 1, + "name": "PlanetaryApproachSuite", + "eligible": { + "pas": 1 + } + } + ] + }, + "defaults": { + "standard": [ + "5E", + "5E", + "FL", + "3E", + "4E", + "3E", + "5C" + ], + "hardpoints": [ + 0, + 17, + 17, + 0, + 0, + 0, + 0, + 0 + ], + "internal": [ + "06", + "04", + 0, + 0, + "03", + "49", + 0, + 0, + "3w", + "4F" + ] + } + } +} From fa26435a583e9866f8864c52c82f4a2bccdd14b7 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 8 Nov 2024 20:08:26 +0000 Subject: [PATCH 17/23] Type 8 Added to Shipyard (#26) From 775e9c429dd40d077c24846b3872a8c5f456a2e6 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 8 Nov 2024 20:10:44 +0000 Subject: [PATCH 18/23] Add concord cannon (#27) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Initial Addition of the Concord Cannon * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#18) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding EDId of Concord Cannon * Fixing up Concord numbers --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> --- .../hardpoints/ax_missile_rack_enhanced.json | 2 +- modules/hardpoints/cannon.json | 35 ++++ modules/hardpoints/fragment_cannon.json | 1 + modules/hardpoints/nanite_torpedo_pylon.json | 2 +- ships/index.js | 1 + ships/mandalay.json | 167 ++++++++++++++++++ 6 files changed, 206 insertions(+), 2 deletions(-) create mode 100755 ships/mandalay.json diff --git a/modules/hardpoints/ax_missile_rack_enhanced.json b/modules/hardpoints/ax_missile_rack_enhanced.json index 1bf1f59..c442777 100644 --- a/modules/hardpoints/ax_missile_rack_enhanced.json +++ b/modules/hardpoints/ax_missile_rack_enhanced.json @@ -129,4 +129,4 @@ "symbol": "Hpt_ATDumbfireMissile_Turret_Large_v2" } ] - } \ No newline at end of file + } diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json index 8447c1f..c179e46 100644 --- a/modules/hardpoints/cannon.json +++ b/modules/hardpoints/cannon.json @@ -346,6 +346,41 @@ "shotspeed": 750, "thermload": 4.4, "symbol": "Hpt_Cannon_Gimbal_Huge" + }, + { + "ammo": 300, + "breachdmg": 13.9, + "breachmax": 0.9, + "breachmin": 0.6, + "burst": 3, + "burstrof": 4, + "class": 2, + "clip": 9, + "cost": 314620, + "damage": 14.6, + "damagedist": { + "K": 1 + }, + "distdraw": 0.75, + "edID": 129030051, + "falloff": 3500, + "fireint": 1.1, + "eps": 0.688, + "grp": "c", + "hps": 1.76, + "id": "4w", + "integrity": 51, + "mass": 4, + "mount": "G", + "name": "Concord Cannon", + "piercing": 42, + "power": 0.64, + "range": 3500, + "rating": "D", + "reload": 4, + "shotspeed": 1300, + "thermload": 1.9, + "symbol": "Hpt_Cannon_Gimbal_Medium_Burst" } ] } diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index bd6cabc..d2d0541 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -325,6 +325,7 @@ "piercing": 45, "power": 1.02, "pp": "Zachary Hudson", + "range": 3000, "rating": "C", "reload": 5, "roundspershot": 12, diff --git a/modules/hardpoints/nanite_torpedo_pylon.json b/modules/hardpoints/nanite_torpedo_pylon.json index 06a62c6..cd32652 100644 --- a/modules/hardpoints/nanite_torpedo_pylon.json +++ b/modules/hardpoints/nanite_torpedo_pylon.json @@ -55,4 +55,4 @@ "symbol": "Hpt_ATVentDisruptorPylon_Fixed_Large" } ] - } \ No newline at end of file + } diff --git a/ships/index.js b/ships/index.js index ed44a03..958436d 100644 --- a/ships/index.js +++ b/ships/index.js @@ -28,6 +28,7 @@ module.exports = { krait_phantom: require('./krait_phantom').krait_phantom, orca: require('./orca').orca, mamba: require('./mamba').mamba, + mandalay: require('./mandalay').mandalay, python: require('./python').python, python_nx: require('./python_nx').python_nx, sidewinder: require('./sidewinder').sidewinder, diff --git a/ships/mandalay.json b/ships/mandalay.json new file mode 100755 index 0000000..0fd8c1a --- /dev/null +++ b/ships/mandalay.json @@ -0,0 +1,167 @@ +{ + "mandalay": { + "edID": 129030680, + "properties": { + "name": "Mandalay", + "manufacturer": "Zorgon Peterson", + "class": 2, + "hullCost": 14502616, + "speed": 280, + "heatCapacity": 250, + "boost": 350, + "boostEnergy": 14, + "baseShieldStrength": 220, + "baseArmour": 230, + "hardness": 55, + "hullMass": 230, + "masslock": 11, + "pipSpeed": 0.16666666666667, + "pitch": 35, + "roll": 96, + "yaw": 28, + "crew": 2, + "reserveFuelCapacity": 0.52 + }, + "retailCost": 17639221, + "bulkheads": [ + { + "id": "Bs", + "edID": 129030681, + "grp": "bh", + "cost": 0, + "mass": 0, + "causres": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 0.8 + }, + { + "id": "Bt", + "edID": 129030682, + "grp": "bh", + "cost": 6191367, + "mass": 32, + "causres": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 1.52 + }, + { + "id": "Bu", + "edID": 129030683, + "grp": "bh", + "cost": 13930575, + "mass": 63, + "causres": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 2.5 + }, + { + "id": "Bv", + "edID": 129030684, + "grp": "bh", + "cost": 32922590, + "mass": 63, + "causres": 0, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 + }, + { + "id": "Bw", + "edID": 129030685, + "grp": "bh", + "cost": 36482626, + "mass": 63, + "causres": 0, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 + } + ], + "slots": { + "standard": [ + 5, + 5, + 5, + 4, + 5, + 5, + 5 + ], + "hardpoints": [ + 2, + 2, + 2, + 2, + 1, + 1, + 0, + 0, + 0, + 0 + ], + "internal": [ + 6, + 5, + 4, + 4, + 3, + 3, + 2, + 1, + 1, + 1, + { + "class": 1, + "name": "PlanetaryApproachSuite", + "eligible": { + "pas": 1 + } + } + ] + }, + "defaults": { + "standard": [ + "5E", + "5E", + "FN", + "4E", + "5E", + "5E", + "5C" + ], + "hardpoints": [ + 0, + 0, + 0, + 0, + 17, + 17, + 0, + 0, + 0, + 0 + ], + "internal": [ + "04", + "4e", + "02", + 0, + 0, + 0, + 0, + 0, + 0, + "3w", + "4F" + ] + } + } +} From 5ba0b2db90e0a1845331f21d848d161c07f58bf7 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 8 Nov 2024 20:13:20 +0000 Subject: [PATCH 19/23] Add mandalay (#28) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#18) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add concord cannon (#19) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Initial Addition of the Concord Cannon * Adding EDId of Concord Cannon --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Display boost intervals better (#20) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Adding boostInt values to ships --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding BoostInt value to Mandalay * Add concord cannon (#22) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Initial Addition of the Concord Cannon * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding EDId of Concord Cannon * Fixing up Concord numbers --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Display boost intervals better (#23) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add concord cannon (#19) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Initial Addition of the Concord Cannon * Adding EDId of Concord Cannon --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding boostInt values to ships --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> --- modules/hardpoints/cannon.json | 2 +- ships/adder.json | 1 + ships/alliance_challenger.json | 1 + ships/alliance_chieftain.json | 1 + ships/alliance_crusader.json | 1 + ships/anaconda.json | 1 + ships/asp.json | 1 + ships/asp_scout.json | 1 + ships/beluga.json | 1 + ships/cobra_mk_iii.json | 1 + ships/cobra_mk_iv.json | 1 + ships/diamondback_explorer.json | 1 + ships/diamondback_scout.json | 1 + ships/dolphin.json | 1 + ships/eagle.json | 1 + ships/federal_assault_ship.json | 1 + ships/federal_corvette.json | 1 + ships/federal_dropship.json | 1 + ships/federal_gunship.json | 1 + ships/fer_de_lance.json | 1 + ships/hauler.json | 1 + ships/imperial_clipper.json | 1 + ships/imperial_courier.json | 1 + ships/imperial_cutter.json | 1 + ships/imperial_eagle.json | 1 + ships/keelback.json | 1 + ships/krait_mkii.json | 1 + ships/krait_phantom.json | 1 + ships/mamba.json | 1 + ships/mandalay.json | 1 + ships/orca.json | 1 + ships/python.json | 1 + ships/python_nx.json | 3 ++- ships/sidewinder.json | 1 + ships/type_10_defender.json | 1 + ships/type_6_transporter.json | 1 + ships/type_7_transport.json | 1 + ships/type_8_transport.json | 1 + ships/type_9_heavy.json | 1 + ships/viper.json | 1 + ships/viper_mk_iv.json | 1 + ships/vulture.json | 1 + 42 files changed, 43 insertions(+), 2 deletions(-) diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json index c179e46..4bb34e1 100644 --- a/modules/hardpoints/cannon.json +++ b/modules/hardpoints/cannon.json @@ -357,7 +357,7 @@ "class": 2, "clip": 9, "cost": 314620, - "damage": 14.6, + "damage": 7.42, "damagedist": { "K": 1 }, diff --git a/ships/adder.json b/ships/adder.json index 8cdf3b9..7ca2209 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -10,6 +10,7 @@ "speed": 220, "boost": 320, "boostEnergy": 9, + "boostInt": 4, "heatCapacity": 170, "baseShieldStrength": 60, "baseArmour": 90, diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json index 3c73d1d..fe035f9 100644 --- a/ships/alliance_challenger.json +++ b/ships/alliance_challenger.json @@ -10,6 +10,7 @@ "speed": 204, "boost": 310, "boostEnergy": 19, + "boostInt": 6, "heatCapacity": 316, "baseShieldStrength": 220, "baseArmour": 300, diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 05c8d3e..5488a9f 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -10,6 +10,7 @@ "speed": 230, "boost": 330, "boostEnergy": 19, + "boostInt": 6, "baseShieldStrength": 200, "heatCapacity": 289, "baseArmour": 280, diff --git a/ships/alliance_crusader.json b/ships/alliance_crusader.json index f4aace6..b80e52d 100644 --- a/ships/alliance_crusader.json +++ b/ships/alliance_crusader.json @@ -10,6 +10,7 @@ "speed": 180, "boost": 300, "boostEnergy": 19, + "boostInt": 6, "baseShieldStrength": 200, "baseArmour": 300, "heatCapacity": 316, diff --git a/ships/anaconda.json b/ships/anaconda.json index c69230d..af31195 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -10,6 +10,7 @@ "speed": 180, "boost": 240, "boostEnergy": 27, + "boostInt": 6, "baseShieldStrength": 350, "baseArmour": 525, "heatCapacity": 334, diff --git a/ships/asp.json b/ships/asp.json index 64dd88a..365c6ab 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -10,6 +10,7 @@ "speed": 250, "boost": 340, "boostEnergy": 13, + "boostInt": 4.5, "baseShieldStrength": 140, "heatCapacity": 272, "baseArmour": 210, diff --git a/ships/asp_scout.json b/ships/asp_scout.json index b56e48f..d5be184 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -10,6 +10,7 @@ "speed": 220, "boost": 300, "boostEnergy": 13, + "boostInt": 4.5, "baseShieldStrength": 120, "heatCapacity": 210, "baseArmour": 180, diff --git a/ships/beluga.json b/ships/beluga.json index fcfa4b4..ab5cd9c 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -10,6 +10,7 @@ "speed": 200, "boost": 280, "boostEnergy": 19, + "boostInt": 6, "baseShieldStrength": 280, "heatCapacity": 283, "baseArmour": 280, diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 72ba0dd..73527fa 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -10,6 +10,7 @@ "speed": 280, "boost": 400, "boostEnergy": 10, + "boostInt": 5, "baseShieldStrength": 80, "baseArmour": 120, "heatCapacity": 225, diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index f977f0f..825424a 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -10,6 +10,7 @@ "speed": 200, "boost": 300, "boostEnergy": 10, + "boostInt": 5, "baseShieldStrength": 120, "heatCapacity": 228, "baseArmour": 120, diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index f59f7ce..45b8b94 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -10,6 +10,7 @@ "speed": 260, "boost": 340, "boostEnergy": 13, + "boostInt": 4, "baseShieldStrength": 150, "baseArmour": 150, "hardness": 42, diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 273f00c..8a8d69d 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -11,6 +11,7 @@ "boost": 380, "boostEnergy": 10, "baseShieldStrength": 120, + "boostInt": 4, "baseArmour": 120, "hardness": 40, "heatCapacity": 346, diff --git a/ships/dolphin.json b/ships/dolphin.json index a59a6d7..4919afe 100755 --- a/ships/dolphin.json +++ b/ships/dolphin.json @@ -10,6 +10,7 @@ "speed": 250, "boost": 350, "boostEnergy": 10, + "boostInt": 4, "baseShieldStrength": 110, "baseArmour": 110, "hardness": 35, diff --git a/ships/eagle.json b/ships/eagle.json index 0298f4f..e54624a 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -10,6 +10,7 @@ "speed": 240, "boost": 350, "boostEnergy": 8, + "boostInt": 4.5, "baseShieldStrength": 60, "baseArmour": 40, "hardness": 28, diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index bdcfd2e..adad878 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -10,6 +10,7 @@ "speed": 210, "boost": 350, "boostEnergy": 19, + "boostInt": 6, "baseShieldStrength": 200, "baseArmour": 300, "hardness": 60, diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 823a6d5..6a7e047 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -10,6 +10,7 @@ "speed": 200, "boost": 260, "boostEnergy": 27, + "boostInt": 6, "baseShieldStrength": 555, "baseArmour": 370, "hardness": 70, diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index a8b1e66..d1737bb 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -10,6 +10,7 @@ "speed": 180, "boost": 300, "boostEnergy": 19, + "boostInt": 6, "baseShieldStrength": 200, "baseArmour": 300, "hardness": 60, diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 4a355e2..e283bd5 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -10,6 +10,7 @@ "speed": 170, "boost": 280, "boostEnergy": 23, + "boostInt": 6, "baseShieldStrength": 250, "baseArmour": 350, "hardness": 60, diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index e28a06b..d1cf80b 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -10,6 +10,7 @@ "speed": 260, "boost": 350, "boostEnergy": 19, + "boostInt": 5, "baseShieldStrength": 300, "baseArmour": 225, "hardness": 70, diff --git a/ships/hauler.json b/ships/hauler.json index 3fd3641..e8b6644 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -10,6 +10,7 @@ "speed": 200, "boost": 300, "boostEnergy": 7, + "boostInt": 4, "baseShieldStrength": 50, "baseArmour": 100, "hardness": 20, diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index 53d6f8f..3c54f9f 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -10,6 +10,7 @@ "speed": 300, "boost": 380, "boostEnergy": 19, + "boostInt": 4.5, "baseShieldStrength": 180, "baseArmour": 270, "hardness": 60, diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index 2a7334b..79b12ab 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -10,6 +10,7 @@ "speed": 280, "boost": 380, "boostEnergy": 10, + "boostInt": 4, "baseShieldStrength": 200, "baseArmour": 80, "hardness": 30, diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 7a689a4..3d9a190 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -10,6 +10,7 @@ "speed": 200, "boost": 320, "boostEnergy": 23, + "boostInt": 6, "baseShieldStrength": 600, "baseArmour": 400, "hardness": 70, diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index fab902e..7f60284 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -10,6 +10,7 @@ "speed": 300, "boost": 400, "boostEnergy": 8, + "boostInt": 4.5, "baseShieldStrength": 80, "baseArmour": 60, "hardness": 28, diff --git a/ships/keelback.json b/ships/keelback.json index aeae2d9..95cbb1a 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -10,6 +10,7 @@ "speed": 200, "boost": 300, "boostEnergy": 10, + "boostInt": 4, "baseShieldStrength": 135, "baseArmour": 270, "hardness": 45, diff --git a/ships/krait_mkii.json b/ships/krait_mkii.json index 931f71e..ebb3156 100644 --- a/ships/krait_mkii.json +++ b/ships/krait_mkii.json @@ -10,6 +10,7 @@ "speed": 240, "boost": 330, "boostEnergy": 13, + "boostInt": 4.5, "baseShieldStrength": 220, "heatCapacity": 300, "baseArmour": 220, diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json index a37e305..78242df 100644 --- a/ships/krait_phantom.json +++ b/ships/krait_phantom.json @@ -9,6 +9,7 @@ "hullCost": 35589214, "speed": 250, "boost": 350, + "boostInt": 4.5, "heatCapacity": 300, "boostEnergy": 13, "baseShieldStrength": 200, diff --git a/ships/mamba.json b/ships/mamba.json index 6c98157..e9b2faf 100644 --- a/ships/mamba.json +++ b/ships/mamba.json @@ -10,6 +10,7 @@ "speed": 310, "boost": 380, "boostEnergy": 17, + "boostInt": 5, "baseShieldStrength": 270, "heatCapacity": 165, "baseArmour": 230, diff --git a/ships/mandalay.json b/ships/mandalay.json index 0fd8c1a..3d5fe39 100755 --- a/ships/mandalay.json +++ b/ships/mandalay.json @@ -10,6 +10,7 @@ "heatCapacity": 250, "boost": 350, "boostEnergy": 14, + "boostInt": 5, "baseShieldStrength": 220, "baseArmour": 230, "hardness": 55, diff --git a/ships/orca.json b/ships/orca.json index 9fac7f6..989e1ed 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -10,6 +10,7 @@ "speed": 300, "boost": 380, "boostEnergy": 16, + "boostInt": 4, "baseShieldStrength": 220, "baseArmour": 220, "heatCapacity": 262, diff --git a/ships/python.json b/ships/python.json index e884002..2c01702 100755 --- a/ships/python.json +++ b/ships/python.json @@ -10,6 +10,7 @@ "speed": 230, "boost": 300, "boostEnergy": 23, + "boostInt": 4.5, "baseShieldStrength": 260, "baseArmour": 260, "heatCapacity": 300, diff --git a/ships/python_nx.json b/ships/python_nx.json index 813689a..8c99916 100755 --- a/ships/python_nx.json +++ b/ships/python_nx.json @@ -10,6 +10,7 @@ "speed": 256, "boost": 345, "boostEnergy": 19, + "boostInt": 4.5, "baseShieldStrength": 335, "baseArmour": 280, "heatCapacity": 316, @@ -159,7 +160,7 @@ "", "00", "3w", - "4F", + "4F", 0, 0, 0 diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 398beac..bcb558e 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -10,6 +10,7 @@ "speed": 220, "boost": 320, "boostEnergy": 7, + "boostInt": 4, "heatCapacity": 140, "baseShieldStrength": 40, "baseArmour": 60, diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index 49055d4..9fa0f58 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -10,6 +10,7 @@ "speed": 179, "boost": 219, "boostEnergy": 19, + "boostInt": 6, "baseShieldStrength": 320, "baseArmour": 580, "hardness": 75, diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 25c4c54..b1551bc 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -9,6 +9,7 @@ "hullCost": 865790, "speed": 220, "boost": 350, + "boostInt": 4, "heatCapacity": 179, "boostEnergy": 10, "baseShieldStrength": 90, diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index 0415fe1..d6dfa95 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -11,6 +11,7 @@ "heatCapacity": 226, "boost": 300, "boostEnergy": 10, + "boostInt": 6, "baseShieldStrength": 155, "baseArmour": 340, "hardness": 54, diff --git a/ships/type_8_transport.json b/ships/type_8_transport.json index 60b15f1..e70cbf1 100755 --- a/ships/type_8_transport.json +++ b/ships/type_8_transport.json @@ -10,6 +10,7 @@ "heatCapacity": 226, "boost": 340, "boostEnergy": 10, + "boostInt": 4, "baseShieldStrength": 228, "baseArmour": 440, "hardness": 58, diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 1dbd79f..467d260 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -10,6 +10,7 @@ "speed": 130, "boost": 200, "boostEnergy": 19, + "boostInt": 6, "heatCapacity": 289, "baseShieldStrength": 240, "baseArmour": 480, diff --git a/ships/viper.json b/ships/viper.json index fcec0be..d4016f6 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -10,6 +10,7 @@ "speed": 320, "boost": 400, "boostEnergy": 10, + "boostInt": 5, "baseShieldStrength": 105, "baseArmour": 70, "hardness": 35, diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index bd3d28b..4020121 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -10,6 +10,7 @@ "speed": 270, "boost": 340, "boostEnergy": 10, + "boostInt": 5, "baseShieldStrength": 150, "baseArmour": 150, "hardness": 35, diff --git a/ships/vulture.json b/ships/vulture.json index c1e384a..3349101 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -10,6 +10,7 @@ "speed": 210, "boost": 340, "boostEnergy": 16, + "boostInt": 4.5, "baseShieldStrength": 240, "baseArmour": 160, "heatCapacity": 237, From 4fce07a165993a41ad218e5b593383db32f4f9ec Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 8 Nov 2024 20:13:56 +0000 Subject: [PATCH 20/23] Display boost intervals better (#25) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#18) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add concord cannon (#19) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Initial Addition of the Concord Cannon * Adding EDId of Concord Cannon --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding boostInt values to ships * Add concord cannon (#22) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Initial Addition of the Concord Cannon * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding EDId of Concord Cannon * Fixing up Concord numbers --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> From 4bc078178b7c05289cdde82bc0e66136aca6c65e Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Sat, 9 Nov 2024 00:38:41 +0000 Subject: [PATCH 21/23] Issues/296 making engineers match (#31) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add concord cannon (#19) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Initial Addition of the Concord Cannon * Adding EDId of Concord Cannon --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Display boost intervals better (#20) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Adding boostInt values to ships --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#21) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data * Adding BoostInt value to Mandalay --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Issues/782 gpd stats wrong (#29) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Type 8 Added to Shipyard (#26) * Add concord cannon (#27) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Initial Addition of the Concord Cannon * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#18) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding EDId of Concord Cannon * Fixing up Concord numbers --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#28) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#18) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add concord cannon (#19) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Initial Addition of the Concord Cannon * Adding EDId of Concord Cannon --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Display boost intervals better (#20) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Adding boostInt values to ships --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding BoostInt value to Mandalay * Add concord cannon (#22) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Initial Addition of the Concord Cannon * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding EDId of Concord Cannon * Fixing up Concord numbers --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Display boost intervals better (#23) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * 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. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Add Type 8 to the Shipyard (#12) * Fix missile… * Making engineers match blueprints --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> Co-authored-by: David Sangrey Co-authored-by: David Sangrey --- modifications/modules.json | 2395 ++++++++++++++++------- modules/standard/power_distributor.json | 14 +- 2 files changed, 1723 insertions(+), 686 deletions(-) diff --git a/modifications/modules.json b/modifications/modules.json index 0d261b0..2fc9ee0 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -6,24 +6,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Petra Olmanova" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Petra Olmanova" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Petra Olmanova" ] } } @@ -234,29 +243,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -266,29 +280,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -298,29 +317,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -330,29 +354,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -362,29 +391,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -394,29 +428,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -455,31 +494,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -490,31 +534,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -525,31 +574,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -560,31 +614,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -621,28 +680,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -652,28 +716,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -683,28 +752,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -714,28 +788,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -745,28 +824,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -776,28 +860,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -807,28 +896,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -851,17 +945,20 @@ }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -905,6 +1002,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -912,6 +1010,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -919,6 +1018,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -926,6 +1026,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -933,6 +1034,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -943,6 +1045,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -950,6 +1053,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -957,6 +1061,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -964,6 +1069,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -971,6 +1077,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -981,6 +1088,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -988,6 +1096,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -995,6 +1104,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -1002,6 +1112,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -1009,6 +1120,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -1167,7 +1279,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1176,7 +1291,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1184,17 +1302,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1207,7 +1339,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1216,7 +1351,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1224,17 +1362,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1247,7 +1399,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1256,7 +1411,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1264,17 +1422,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1287,7 +1459,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1296,7 +1471,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1304,17 +1482,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1327,7 +1519,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1336,7 +1531,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1344,17 +1542,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1367,7 +1579,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1376,7 +1591,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1384,17 +1602,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1544,26 +1776,31 @@ "grades": { "1": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "2": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "3": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "4": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "5": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] } @@ -1573,26 +1810,31 @@ "grades": { "1": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "2": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "3": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "4": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "5": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] } @@ -1602,26 +1844,31 @@ "grades": { "1": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "2": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "3": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "4": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "5": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] } @@ -1640,29 +1887,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1672,29 +1924,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1704,29 +1961,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1736,29 +1998,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1768,29 +2035,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1800,29 +2072,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1832,29 +2109,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1999,24 +2281,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" + ] + }, + "5": { + "engineers": [ + "Marsha Hicks" ] } } @@ -2036,7 +2327,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "2": { @@ -2044,7 +2337,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "3": { @@ -2052,19 +2347,23 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "4": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] }, "5": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] } } @@ -2076,7 +2375,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "2": { @@ -2084,7 +2385,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "3": { @@ -2092,19 +2395,23 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "4": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] }, "5": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] } } @@ -2116,7 +2423,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "2": { @@ -2124,7 +2433,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "3": { @@ -2132,19 +2443,23 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "4": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] }, "5": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] } } @@ -2179,6 +2494,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2186,6 +2502,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2193,6 +2510,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2200,6 +2518,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2207,6 +2526,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2217,6 +2537,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2224,6 +2545,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2231,6 +2553,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2238,6 +2561,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2245,6 +2569,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2255,6 +2580,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2262,6 +2588,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2269,6 +2596,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2276,6 +2604,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2283,6 +2612,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2302,6 +2632,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2309,6 +2640,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2316,6 +2648,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2323,6 +2656,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2330,6 +2664,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2340,6 +2675,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2347,6 +2683,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2354,6 +2691,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2361,6 +2699,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2368,6 +2707,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2378,6 +2718,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2385,6 +2726,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2392,6 +2734,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2399,6 +2742,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2406,6 +2750,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2762,17 +3107,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2802,17 +3150,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2842,17 +3193,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2882,17 +3236,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2922,17 +3279,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2962,17 +3322,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2994,28 +3357,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "5": { "engineers": [ + "Etienne Dorn", "Etienne Dorn" ] } @@ -3026,28 +3394,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "5": { "engineers": [ + "Etienne Dorn", "Etienne Dorn" ] } @@ -3058,28 +3431,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "5": { "engineers": [ + "Etienne Dorn", "Etienne Dorn" ] } @@ -3099,30 +3477,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3131,30 +3514,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3163,30 +3551,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3195,30 +3588,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3227,30 +3625,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3259,30 +3662,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3291,30 +3699,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3323,30 +3736,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3390,30 +3808,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3422,30 +3845,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3454,30 +3882,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3486,30 +3919,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3518,30 +3956,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3550,30 +3993,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3582,30 +4030,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3614,30 +4067,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3700,29 +4158,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -3732,29 +4195,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -3764,29 +4232,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -3796,29 +4269,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -3864,6 +4342,186 @@ "special_penetrator_munitions" ] }, + "amr": { + "blueprints": { + "Weapon_HighCapacity": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "4": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + } + } + }, + "Weapon_LightWeight": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "4": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + } + } + }, + "Weapon_RapidFire": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "4": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + } + } + }, + "Weapon_Sturdy": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "4": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + } + } + } + }, + "modifications": [ + "ammo", + "clip", + "damage", + "damagedist", + "fallofffromrange", + "distdraw", + "integrity", + "jitter", + "mass", + "piercing", + "power", + "reload", + "rof", + "thermload" + ], + "specials_D": [ + "special_emissive_munitions", + "special_fsd_interrupt", + "special_overload_munitions", + "special_thermal_cascade", + "special_weapon_damage", + "special_weapon_efficient", + "special_weapon_rateoffire", + "special_weapon_toughened", + "special_weapon_lightweight", + "special_penetrator_munitions" + ] + }, "amr": { "blueprints": { "Weapon_HighCapacity": { @@ -4055,29 +4713,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] } } @@ -4087,29 +4750,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] } } @@ -4119,29 +4787,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] } } @@ -4151,29 +4824,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] } } @@ -4276,28 +4954,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4307,28 +4990,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4338,28 +5026,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4369,28 +5062,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4400,28 +5098,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4431,28 +5134,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4462,28 +5170,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4493,28 +5206,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4565,6 +5283,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4572,6 +5291,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4579,6 +5299,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4586,6 +5307,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4593,6 +5315,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -4603,6 +5326,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4610,6 +5334,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4617,6 +5342,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4624,6 +5350,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4631,6 +5358,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -4641,6 +5369,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4648,6 +5377,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4655,6 +5385,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4662,6 +5393,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4669,6 +5401,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -4714,31 +5447,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4749,31 +5487,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4784,31 +5527,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4819,31 +5567,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4854,31 +5607,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4889,31 +5647,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4946,30 +5709,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -4979,30 +5747,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5012,30 +5785,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5045,30 +5823,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5078,30 +5861,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5111,30 +5899,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5144,30 +5937,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5177,30 +5975,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5364,30 +6167,35 @@ "engineers": [ "Felicity Farseer", "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "4": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Hera Tani" + "Hera Tani", + "Etienne Dorn" ] } } @@ -5398,30 +6206,35 @@ "engineers": [ "Felicity Farseer", "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "4": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Hera Tani" + "Hera Tani", + "Etienne Dorn" ] } } @@ -5432,30 +6245,35 @@ "engineers": [ "Felicity Farseer", "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "4": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Hera Tani" + "Hera Tani", + "Etienne Dorn" ] } } @@ -5482,31 +6300,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -5517,31 +6340,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -5552,31 +6380,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -5587,31 +6420,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -5654,24 +6492,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" + ] + }, + "5": { + "engineers": [ + "Marsha Hicks" ] } } @@ -5689,29 +6536,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5721,29 +6573,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5753,29 +6610,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5785,29 +6647,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5817,29 +6684,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5922,7 +6794,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { @@ -5931,7 +6804,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -5980,7 +6854,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { @@ -5989,7 +6864,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -6038,7 +6914,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { @@ -6047,7 +6924,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -6069,29 +6947,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6102,29 +6985,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6135,29 +7023,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6168,29 +7061,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6201,29 +7099,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6266,17 +7169,20 @@ "1": { "engineers": [ "Elvira Martuuk", - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "2": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "3": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "4": { @@ -6291,17 +7197,20 @@ "1": { "engineers": [ "Elvira Martuuk", - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "2": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "3": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "4": { @@ -6339,31 +7248,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -6374,31 +7288,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -6409,31 +7328,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -6444,31 +7368,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -6509,7 +7438,9 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn", + "Hera Tani" ] }, "2": { @@ -6519,7 +7450,9 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn", + "Hera Tani" ] }, "3": { @@ -6529,7 +7462,9 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn", + "Hera Tani" ] }, "4": { @@ -6537,7 +7472,9 @@ "Bill Turner", "Juri Ishmaak", "Lei Cheung", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn", + "Hera Tani" ] }, "5": { @@ -6545,7 +7482,9 @@ "Bill Turner", "Juri Ishmaak", "Lei Cheung", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn", + "Hera Tani" ] } } @@ -6573,30 +7512,40 @@ "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "2": { "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "3": { "engineers": [ "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "4": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "5": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] } } @@ -6607,30 +7556,40 @@ "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "2": { "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "3": { "engineers": [ "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "4": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "5": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] } } @@ -6641,30 +7600,40 @@ "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "2": { "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "3": { "engineers": [ "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "4": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "5": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] } } @@ -6693,29 +7662,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -6725,29 +7699,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -6792,29 +7771,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6824,29 +7808,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6856,29 +7845,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6888,29 +7882,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6920,29 +7919,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6952,29 +7956,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6984,29 +7993,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -7016,29 +8030,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -7100,17 +8119,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7140,17 +8162,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7180,17 +8205,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7220,17 +8248,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7260,17 +8291,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7300,17 +8334,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json index 9207b1f..8b3a472 100644 --- a/modules/standard/power_distributor.json +++ b/modules/standard/power_distributor.json @@ -867,18 +867,18 @@ "cost": 111600, "edID": 128833981, "eddbID": 1040, - "engcap": 9, - "engrate": 0.8, + "engcap": 11, + "engrate": 1, "grp": "pd", "id": "0U", - "integrity": 56, + "integrity": 45, "mass": 2.6, "power": 0.73, "rating": "A", - "syscap": 10, - "sysrate": 0.8, - "wepcap": 10, - "weprate": 2.5, + "syscap": 11, + "sysrate": 1, + "wepcap": 13, + "weprate": 3.1, "name": "Guardian Power Distributor", "symbol": "Int_GuardianPowerDistributor_Size2", "ukName": "Guardian Power Distributor", From 7146ba94cd16da55bd365afcec230e12b3f17a27 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 15 Nov 2024 08:53:30 +0000 Subject: [PATCH 22/23] Updating the stats for the concord cannon --- modules/hardpoints/cannon.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json index 4bb34e1..c456496 100644 --- a/modules/hardpoints/cannon.json +++ b/modules/hardpoints/cannon.json @@ -357,14 +357,14 @@ "class": 2, "clip": 9, "cost": 314620, - "damage": 7.42, + "damage": 14.63, "damagedist": { "K": 1 }, "distdraw": 0.75, "edID": 129030051, "falloff": 3500, - "fireint": 1.1, + "fireint": 2.26, "eps": 0.688, "grp": "c", "hps": 1.76, @@ -379,7 +379,7 @@ "rating": "D", "reload": 4, "shotspeed": 1300, - "thermload": 1.9, + "thermload": 1.92, "symbol": "Hpt_Cannon_Gimbal_Medium_Burst" } ] From 074a8eee0d9be225c94aa80ecc57dc396bf97fa3 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Sun, 17 Nov 2024 23:05:53 +0000 Subject: [PATCH 23/23] Fixing Hullcost values, which should fix build prices. --- ships/adder.json | 4 ++-- ships/alliance_challenger.json | 4 ++-- ships/alliance_chieftain.json | 2 +- ships/alliance_crusader.json | 4 ++-- ships/anaconda.json | 4 ++-- ships/asp.json | 4 ++-- ships/asp_scout.json | 4 ++-- ships/beluga.json | 4 ++-- ships/cobra_mk_iii.json | 4 ++-- ships/cobra_mk_iv.json | 4 ++-- ships/diamondback_explorer.json | 2 +- ships/diamondback_scout.json | 4 ++-- ships/dolphin.json | 4 ++-- ships/eagle.json | 2 +- ships/federal_assault_ship.json | 2 +- ships/federal_corvette.json | 2 +- ships/federal_dropship.json | 2 +- ships/federal_gunship.json | 2 +- ships/fer_de_lance.json | 2 +- ships/hauler.json | 2 +- ships/imperial_clipper.json | 4 ++-- ships/imperial_courier.json | 4 ++-- ships/imperial_cutter.json | 4 ++-- ships/imperial_eagle.json | 2 +- ships/keelback.json | 4 ++-- ships/krait_mkii.json | 2 +- ships/krait_phantom.json | 4 ++-- ships/mamba.json | 4 ++-- ships/mandalay.json | 4 ++-- ships/orca.json | 4 ++-- ships/python.json | 4 ++-- ships/python_nx.json | 4 ++-- ships/sidewinder.json | 2 +- ships/type_10_defender.json | 2 +- ships/type_6_transporter.json | 4 ++-- ships/type_7_transport.json | 4 ++-- ships/type_8_transport.json | 2 +- ships/type_9_heavy.json | 4 ++-- ships/viper.json | 4 ++-- ships/viper_mk_iv.json | 4 ++-- ships/vulture.json | 4 ++-- 41 files changed, 68 insertions(+), 68 deletions(-) diff --git a/ships/adder.json b/ships/adder.json index 7ca2209..4b2730d 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -6,7 +6,7 @@ "name": "Adder", "manufacturer": "Zorgon Peterson", "class": 1, - "hullCost": 40000, + "hullCost": 40833, "speed": 220, "boost": 320, "boostEnergy": 9, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.36 }, - "retailCost": 87810, + "retailCost": 87808, "bulkheads": [ { "id": "BC", diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json index fe035f9..3579e3f 100644 --- a/ships/alliance_challenger.json +++ b/ships/alliance_challenger.json @@ -6,7 +6,7 @@ "name": "Alliance Challenger", "manufacturer": "Lakon", "class": 2, - "hullCost": 28041035, + "hullCost": 29569804, "speed": 204, "boost": 310, "boostEnergy": 19, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.77 }, - "retailCost": 30472265, + "retailCost": 30472252, "requirements": { "horizons": true }, diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 5488a9f..121ce2c 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -6,7 +6,7 @@ "name": "Alliance Chieftain", "manufacturer": "Lakon", "class": 2, - "hullCost": 18182883, + "hullCost": 18612476, "speed": 230, "boost": 330, "boostEnergy": 19, diff --git a/ships/alliance_crusader.json b/ships/alliance_crusader.json index b80e52d..771d77d 100644 --- a/ships/alliance_crusader.json +++ b/ships/alliance_crusader.json @@ -6,7 +6,7 @@ "name": "Alliance Crusader", "manufacturer": "Lakon", "class": 2, - "hullCost": 22866341, + "hullCost": 22096565, "speed": 180, "boost": 300, "boostEnergy": 19, @@ -25,7 +25,7 @@ "crew": 3, "reserveFuelCapacity": 0.77 }, - "retailCost": 19382252, + "retailCost": 22866341, "requirements": { "horizons": true }, diff --git a/ships/anaconda.json b/ships/anaconda.json index af31195..bea1115 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -6,7 +6,7 @@ "name": "Anaconda", "manufacturer": "Faulcon DeLacy", "class": 3, - "hullCost": 141889930, + "hullCost": 142456440, "speed": 180, "boost": 240, "boostEnergy": 27, @@ -25,7 +25,7 @@ "crew": 3, "reserveFuelCapacity": 1.07 }, - "retailCost": 146969450, + "retailCost": 146969451, "bulkheads": [ { "id": "bT", diff --git a/ships/asp.json b/ships/asp.json index 365c6ab..ca638f6 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -6,7 +6,7 @@ "name": "Asp Explorer", "manufacturer": "Lakon", "class": 2, - "hullCost": 6135660, + "hullCost": 6145793, "speed": 250, "boost": 340, "boostEnergy": 13, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.63 }, - "retailCost": 6661150, + "retailCost": 6661154, "bulkheads": [ { "id": "BH", diff --git a/ships/asp_scout.json b/ships/asp_scout.json index d5be184..9906d1b 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -6,7 +6,7 @@ "name": "Asp Scout", "manufacturer": "Lakon", "class": 2, - "hullCost": 3818240, + "hullCost": 3819823, "speed": 220, "boost": 300, "boostEnergy": 13, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.47 }, - "retailCost": 3961150, + "retailCost": 3961154, "bulkheads": [ { "id": "c1", diff --git a/ships/beluga.json b/ships/beluga.json index ab5cd9c..f154def 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -6,7 +6,7 @@ "name": "Beluga Liner", "manufacturer": "Saud Kruger", "class": 3, - "hullCost": 79654610, + "hullCost": 79694761, "speed": 200, "boost": 280, "boostEnergy": 19, @@ -26,7 +26,7 @@ "crew": 3, "reserveFuelCapacity": 0.81 }, - "retailCost": 84532770, + "retailCost": 84532764, "requirements": { "horizons": true }, diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 73527fa..5628265 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -6,7 +6,7 @@ "name": "Cobra Mk III", "manufacturer": "Faulcon DeLacy", "class": 1, - "hullCost": 205800, + "hullCost": 208372, "speed": 280, "boost": 400, "boostEnergy": 10, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.49 }, - "retailCost": 349720, + "retailCost": 349718, "bulkheads": [ { "id": "bk", diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 825424a..61fa574 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -6,7 +6,7 @@ "name": "Cobra Mk IV", "manufacturer": "Faulcon DeLacy", "class": 1, - "hullCost": 603740, + "hullCost": 623374, "speed": 200, "boost": 300, "boostEnergy": 10, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.51 }, - "retailCost": 747660, + "retailCost": 764720, "requirements": { "horizonsEarlyAdoption": true }, diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index 45b8b94..e21cb4f 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -6,7 +6,7 @@ "name": "Diamondback Explorer", "manufacturer": "Lakon", "class": 1, - "hullCost": 1635700, + "hullCost": 1638277, "speed": 260, "boost": 340, "boostEnergy": 13, diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 8a8d69d..843c6e2 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -6,7 +6,7 @@ "name": "Diamondback Scout", "manufacturer": "Lakon", "class": 1, - "hullCost": 461340, + "hullCost": 463926, "speed": 280, "boost": 380, "boostEnergy": 10, @@ -24,7 +24,7 @@ "crew": 1, "reserveFuelCapacity": 0.49 }, - "retailCost": 564330, + "retailCost": 564329, "bulkheads": [ { "id": "b5", diff --git a/ships/dolphin.json b/ships/dolphin.json index 4919afe..095a9d0 100755 --- a/ships/dolphin.json +++ b/ships/dolphin.json @@ -6,7 +6,7 @@ "name": "Dolphin", "manufacturer": "Saud Kruger", "class": 1, - "hullCost": 1115330, + "hullCost": 1117906, "speed": 250, "boost": 350, "boostEnergy": 10, @@ -25,7 +25,7 @@ "crew": 1, "reserveFuelCapacity": 0.5 }, - "retailCost": 1337330, + "retailCost": 1337323, "requirements": { "horizons": true }, diff --git a/ships/eagle.json b/ships/eagle.json index e54624a..7a7eaab 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -6,7 +6,7 @@ "name": "Eagle", "manufacturer": "Core Dynamics", "class": 1, - "hullCost": 10440, + "hullCost": 10947, "speed": 240, "boost": 350, "boostEnergy": 8, diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index adad878..dd0b9f0 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -6,7 +6,7 @@ "name": "Federal Assault Ship", "manufacturer": "Core Dynamics", "class": 2, - "hullCost": 19072000, + "hullCost": 19111109, "speed": 210, "boost": 350, "boostEnergy": 19, diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 6a7e047..564578f 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -6,7 +6,7 @@ "name": "Federal Corvette", "manufacturer": "Core Dynamics", "class": 3, - "hullCost": 182589570, + "hullCost": 183156068, "speed": 200, "boost": 260, "boostEnergy": 27, diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index d1737bb..b45e9b8 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -6,7 +6,7 @@ "name": "Federal Dropship", "manufacturer": "Core Dynamics", "class": 2, - "hullCost": 13469990, + "hullCost": 13510106, "speed": 180, "boost": 300, "boostEnergy": 19, diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index e283bd5..e5eb1f2 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -6,7 +6,7 @@ "name": "Federal Gunship", "manufacturer": "Core Dynamics", "class": 2, - "hullCost": 34774790, + "hullCost": 34814912, "speed": 170, "boost": 280, "boostEnergy": 23, diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index d1cf80b..ac371b2 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -6,7 +6,7 @@ "name": "Fer-de-Lance", "manufacturer": "Zorgon Peterson", "class": 2, - "hullCost": 51232230, + "hullCost": 51242363, "speed": 260, "boost": 350, "boostEnergy": 19, diff --git a/ships/hauler.json b/ships/hauler.json index e8b6644..5c5d86d 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -6,7 +6,7 @@ "name": "Hauler", "manufacturer": "Zorgon Peterson", "class": 1, - "hullCost": 29790, + "hullCost": 30308, "speed": 200, "boost": 300, "boostEnergy": 7, diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index 3c54f9f..f0f4e83 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -6,7 +6,7 @@ "name": "Imperial Clipper", "manufacturer": "Gutamaya", "class": 3, - "hullCost": 21077780, + "hullCost": 21116895, "speed": 300, "boost": 380, "boostEnergy": 19, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.74 }, - "retailCost": 22296860, + "retailCost": 22295860, "requirements": { "empireRank": 7 }, diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index 79b12ab..4ebcb10 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -6,7 +6,7 @@ "name": "Imperial Courier", "manufacturer": "Gutamaya", "class": 1, - "hullCost": 2481550, + "hullCost": 2484137, "speed": 280, "boost": 380, "boostEnergy": 10, @@ -24,7 +24,7 @@ "crew": 1, "reserveFuelCapacity": 0.41 }, - "retailCost": 2542930, + "retailCost": 2542931, "requirements": { "empireRank": 3 }, diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 3d9a190..2f8bdd0 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -6,7 +6,7 @@ "name": "Imperial Cutter", "manufacturer": "Gutamaya", "class": 3, - "hullCost": 199926890, + "hullCost": 200493413, "speed": 200, "boost": 320, "boostEnergy": 23, @@ -25,7 +25,7 @@ "crew": 3, "reserveFuelCapacity": 1.16 }, - "retailCost": 208969450, + "retailCost": 208969451, "requirements": { "empireRank": 12 }, diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 7f60284..2c24874 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -6,7 +6,7 @@ "name": "Imperial Eagle", "manufacturer": "Gutamaya", "class": 1, - "hullCost": 72180, + "hullCost": 73023, "speed": 300, "boost": 400, "boostEnergy": 8, diff --git a/ships/keelback.json b/ships/keelback.json index 95cbb1a..0079a40 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -6,7 +6,7 @@ "name": "Keelback", "manufacturer": "Lakon", "class": 2, - "hullCost": 2943870, + "hullCost": 2946463, "speed": 200, "boost": 300, "boostEnergy": 10, @@ -25,7 +25,7 @@ "crew": 2, "reserveFuelCapacity": 0.39 }, - "retailCost": 3126150, + "retailCost": 3126154, "bulkheads": [ { "id": "cb", diff --git a/ships/krait_mkii.json b/ships/krait_mkii.json index ebb3156..12faff2 100644 --- a/ships/krait_mkii.json +++ b/ships/krait_mkii.json @@ -6,7 +6,7 @@ "name": "Krait Mk II", "manufacturer": "Faulcon DeLacy", "class": 2, - "hullCost": 42409425, + "hullCost": 44160710, "speed": 240, "boost": 330, "boostEnergy": 13, diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json index 78242df..2ae4c70 100644 --- a/ships/krait_phantom.json +++ b/ships/krait_phantom.json @@ -6,7 +6,7 @@ "name": "Krait Phantom", "manufacturer": "Faulcon DeLacy", "class": 2, - "hullCost": 35589214, + "hullCost": 35741519, "speed": 250, "boost": 350, "boostInt": 4.5, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.63 }, - "retailCost": 37472254, + "retailCost": 37472252, "bulkheads": [ { "id": "3B", diff --git a/ships/mamba.json b/ships/mamba.json index e9b2faf..c0363ed 100644 --- a/ships/mamba.json +++ b/ships/mamba.json @@ -6,7 +6,7 @@ "name": "Mamba", "manufacturer": "Zorgon Peterson", "class": 2, - "hullCost": 55866341, + "hullCost": 55442918, "speed": 310, "boost": 380, "boostEnergy": 17, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.5 }, - "retailCost": 55867041, + "retailCost": 55867040, "bulkheads": [ { "id": "1A", diff --git a/ships/mandalay.json b/ships/mandalay.json index 3d5fe39..7843c71 100755 --- a/ships/mandalay.json +++ b/ships/mandalay.json @@ -5,7 +5,7 @@ "name": "Mandalay", "manufacturer": "Zorgon Peterson", "class": 2, - "hullCost": 14502616, + "hullCost": 16527192, "speed": 280, "heatCapacity": 250, "boost": 350, @@ -23,7 +23,7 @@ "crew": 2, "reserveFuelCapacity": 0.52 }, - "retailCost": 17639221, + "retailCost": 17639220, "bulkheads": [ { "id": "Bs", diff --git a/ships/orca.json b/ships/orca.json index 989e1ed..b4a0db2 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -6,7 +6,7 @@ "name": "Orca", "manufacturer": "Saud Kruger", "class": 3, - "hullCost": 47790590, + "hullCost": 47800723, "speed": 300, "boost": 380, "boostEnergy": 16, @@ -25,7 +25,7 @@ "crew": 2, "reserveFuelCapacity": 0.79 }, - "retailCost": 48539900, + "retailCost": 48539887, "bulkheads": [ { "id": "BM", diff --git a/ships/python.json b/ships/python.json index 2c01702..6218493 100755 --- a/ships/python.json +++ b/ships/python.json @@ -6,7 +6,7 @@ "name": "Python", "manufacturer": "Faulcon DeLacy", "class": 2, - "hullCost": 55172380, + "hullCost": 55324684, "speed": 230, "boost": 300, "boostEnergy": 23, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.83 }, - "retailCost": 56978180, + "retailCost": 56978179, "bulkheads": [ { "id": "bO", diff --git a/ships/python_nx.json b/ships/python_nx.json index 8c99916..8a71d66 100755 --- a/ships/python_nx.json +++ b/ships/python_nx.json @@ -6,7 +6,7 @@ "name": "Python Mk II", "manufacturer": "Faulcon DeLacy", "class": 2, - "hullCost": 66122374, + "hullCost": 64743724, "speed": 256, "boost": 345, "boostEnergy": 19, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.83 }, - "retailCost": 67527360, + "retailCost": 67527359, "bulkheads": [ { "id": "bO", diff --git a/ships/sidewinder.json b/ships/sidewinder.json index bcb558e..d61d7e4 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -6,7 +6,7 @@ "name": "Sidewinder", "manufacturer": "Faulcon DeLacy", "class": 1, - "hullCost": 4070, + "hullCost": 4588, "speed": 220, "boost": 320, "boostEnergy": 7, diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index 9fa0f58..294d593 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -6,7 +6,7 @@ "name": "Type-10 Defender", "manufacturer": "Lakon", "class": 3, - "hullCost": 121454652, + "hullCost": 121334619, "speed": 179, "boost": 219, "boostEnergy": 19, diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index b1551bc..c54c808 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -6,7 +6,7 @@ "name": "Type-6 Transporter", "manufacturer": "Lakon", "class": 2, - "hullCost": 865790, + "hullCost": 866622, "speed": 220, "boost": 350, "boostInt": 4, @@ -24,7 +24,7 @@ "crew": 1, "reserveFuelCapacity": 0.39 }, - "retailCost": 1045950, + "retailCost": 1045945, "bulkheads": [ { "id": "Bn", diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index d6dfa95..3e704b0 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -6,7 +6,7 @@ "name": "Type-7 Transporter", "manufacturer": "Lakon", "class": 3, - "hullCost": 16780510, + "hullCost": 16783094, "speed": 180, "heatCapacity": 226, "boost": 300, @@ -24,7 +24,7 @@ "crew": 1, "reserveFuelCapacity": 0.52 }, - "retailCost": 17472260, + "retailCost": 17472252, "bulkheads": [ { "id": "Bs", diff --git a/ships/type_8_transport.json b/ships/type_8_transport.json index e70cbf1..d38c59a 100755 --- a/ships/type_8_transport.json +++ b/ships/type_8_transport.json @@ -5,7 +5,7 @@ "name": "Type-8 Transporter", "manufacturer": "Lakon", "class": 2, - "hullCost": 36238840, + "hullCost": 34820576, "speed": 200, "heatCapacity": 226, "boost": 340, diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 467d260..c3fe96b 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -6,7 +6,7 @@ "name": "Type-9 Heavy", "manufacturer": "Lakon", "class": 3, - "hullCost": 72076730, + "hullCost": 72116858, "speed": 130, "boost": 200, "boostEnergy": 19, @@ -25,7 +25,7 @@ "crew": 3, "reserveFuelCapacity": 0.77 }, - "retailCost": 76555840, + "retailCost": 76555842, "bulkheads": [ { "id": "Bx", diff --git a/ships/viper.json b/ships/viper.json index d4016f6..7fb2da5 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -6,7 +6,7 @@ "name": "Viper", "manufacturer": "Faulcon DeLacy", "class": 1, - "hullCost": 95900, + "hullCost": 96733, "speed": 320, "boost": 400, "boostEnergy": 10, @@ -24,7 +24,7 @@ "crew": 1, "reserveFuelCapacity": 0.41 }, - "retailCost": 142930, + "retailCost": 142931, "bulkheads": [ { "id": "B3", diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 4020121..9f0a60f 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -6,7 +6,7 @@ "name": "Viper Mk IV", "manufacturer": "Faulcon DeLacy", "class": 1, - "hullCost": 310220, + "hullCost": 312797, "speed": 270, "boost": 340, "boostEnergy": 10, @@ -24,7 +24,7 @@ "crew": 1, "reserveFuelCapacity": 0.46 }, - "retailCost": 437930, + "retailCost": 437931, "bulkheads": [ { "id": "c6", diff --git a/ships/vulture.json b/ships/vulture.json index 3349101..83a1b5f 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -6,7 +6,7 @@ "name": "Vulture", "manufacturer": "Core Dynamics", "class": 1, - "hullCost": 4689640, + "hullCost": 4692214, "speed": 210, "boost": 340, "boostEnergy": 16, @@ -24,7 +24,7 @@ "crew": 2, "reserveFuelCapacity": 0.57 }, - "retailCost": 4925620, + "retailCost": 4925615, "bulkheads": [ { "id": "B8",