From 441eec5f559d5f670782b85f6ec5dabac06b402c Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 17 May 2024 12:38:51 +0100 Subject: [PATCH 1/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. (#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 2/3] 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 0b2800f99025a4e89f3d58b42e39d4350cf1d1c7 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Mon, 27 May 2024 17:00:19 +0100 Subject: [PATCH 3/3] 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,