Merge branch 'release/2.5.1'

The value in baseShieldStrength seems to be incorrect. MJ value displayed in coriolis (31mj) doesn't match the righ shielding value for the Type 10 stock build (99mj). After some testing "baseShieldStrength": 320, seems to work outputting the right mj value.

.gitignore

@@ -2,3 +2,4 @@ node_modules
 node_modules/*
 *.log
 .idea
+

ChangeLog.md

@@ -1,3 +1,20 @@
+#2.5.1  
+  * AX Modules  
+  * Fixed some engineering values
+
+#2.5.0
+  * Willyb321 fixed engineering. Some stuff doesn't work. We currently believe this is FDevs fault and not ours.
+
+#2.4.3
+  * T10 Defender
+
+#2.4.2
+  * Add requirements to UI
+  * Fix for limpets
+
+#2.4.1
+  * Config Fix
+
 #2.4.0
   * Added Repair Limpet Computers
 

modifications/modifierActions.json

@@ -1,191 +1,166 @@
 {
-  "mod_boot_time": {
+  "OutfittingFieldType_BootTime": {
     "boot": 1
   },
-  "mod_defencemodifier_explosive_mult": {
+  "OutfittingFieldType_ExplosiveResistance": {
     "explres": 1
   },
-  "mod_defencemodifier_global_hull_mult": {
+  "OutfittingFieldType_DefenceModifierHealthAddition": {
-    "explres": 1,
-    "kinres": 1,
-    "thermres": 1
-  },
-  "mod_defencemodifier_global_shield_mult": {
-    "explres": 1,
-    "kinres": 1,
-    "thermres": 1
-  },
-  "mod_defencemodifier_health_add": {
     "hullreinforcement": 1
   },
-  "mod_defencemodifier_health_mult": {
+  "OutfittingFieldType_DefenceModifierHealthMultiplier": {
     "hullboost": 1
   },
-  "mod_defencemodifier_kinetic_mult": {
+  "OutfittingFieldType_KineticResistance": {
     "kinres": 1
   },
-  "mod_defencemodifier_shield_explosive_mult": {
+  "OutfittingFieldType_DefenceModifierShieldMultiplier": {
-    "explres": 1
-  },
-  "mod_defencemodifier_shield_kinetic_mult": {
-    "kinres": 1
-  },
-  "mod_defencemodifier_shield_mult": {
     "shieldboost": 1
   },
-  "mod_defencemodifier_shield_thermic_mult": {
+  "OutfittingFieldType_ThermicResistance": {
     "thermres": 1
   },
-  "mod_defencemodifier_thermic_mult": {
+  "OutfittingFieldType_EngineHeatRate": {
-    "thermres": 1
-  },
-  "mod_engine_heat": {
     "thermload": 1
   },
-  "mod_engine_mass_curve": {
+  "OutfittingFieldType_EngineOptimalMass": {
     "optmass": 1
   },
-  "mod_engine_mass_curve_multiplier": {
+  "OutfittingFieldType_EngineOptPerformance": {
     "optmul": 1
   },
-  "mod_fsd_heat_rate": {
+  "OutfittingFieldType_FSDHeatRate": {
     "thermload": 1
   },
-  "mod_fsd_max_fuel_per_jump": {
+  "OutfittingFieldType_FSDMaxFuelPerJump": {
     "maxfuel": 1
   },
-  "mod_fsd_optimised_mass": {
+  "OutfittingFieldType_FSDOptimalMass": {
     "optmass": 1
   },
-  "mod_fsdinterdictor_facing_limit": {
+  "OutfittingFieldType_FSDInterdictorFacingLimit": {
     "facinglimit": 1
   },
-  "mod_fsdinterdictor_range": {
+  "OutfittingFieldType_FSDInterdictorRange": {
     "ranget": 1
   },
-  "mod_health": {
+  "OutfittingFieldType_Integrity": {
     "integrity": 1
   },
-  "mod_mass": {
+  "OutfittingFieldType_Mass": {
     "mass": 1
   },
-  "mod_passive_power": {
+  "OutfittingFieldType_SensorTargetScanAngle": {
-    "power": 1
+    "angle": 1
   },
-  "mod_powerdistributor_engine_charge": {
+  "OutfittingFieldType_DSS_RateMult": {
-    "engcap": 1
+    "scanrate": 1
   },
-  "mod_powerdistributor_engine_rate": {
+  "OutfittingFieldType_ScannerTimeToScan": {
-    "engrate": 1
+    "scantime": 1
   },
-  "mod_powerdistributor_global_charge": {
+  "OutfittingFieldType_ScannerRange": {
-    "engcap": 1,
-    "syscap": 1,
-    "wepcap": 1
-  },
-  "mod_powerdistributor_global_rate": {
-    "engrate": 1,
-    "sysrate": 1,
-    "weprate": 1
-  },
-  "mod_powerdistributor_system_charge": {
-    "syscap": 1
-  },
-  "mod_powerdistributor_system_rate": {
-    "sysrate": 1
-  },
-  "mod_powerdistributor_weapon_charge": {
-    "wepcap": 1
-  },
-  "mod_powerdistributor_weapon_rate": {
-    "weprate": 1
-  },
-  "mod_powerplant_heat": {
-    "eff": 1
-  },
-  "mod_powerplant_power": {
-    "pgen": 1
-  },
-  "mod_shield_broken_regen": {
-    "brokenregen": 1
-  },
-  "mod_shield_energy_per_regen": {
-    "distdraw": 1
-  },
-  "mod_shield_explosive_mult": {
-    "explres": 1
-  },
-  "mod_shield_global_mult": {
-    "explres": 1,
-    "kinres": 1,
-    "thermres": 1
-  },
-  "mod_shield_kinetic_mult": {
-    "kinres": 1
-  },
-  "mod_shield_mass_curve": {
-    "optmass": 1
-  },
-  "mod_shield_mass_curve_multiplier": {
-    "optmul": 1
-  },
-  "mod_shield_normal_regen": {
-    "regen": 1
-  },
-  "mod_shield_thermal_mult": {
-    "thermres": 1
-  },
-  "mod_shieldcell_charge_heat": {
-    "thermload": 1
-  },
-  "mod_shieldcell_duration": {
-    "duration": 1
-  },
-  "mod_shieldcell_shield_units": {
-    "shieldreinforcement": 1
-  },
-  "mod_shieldcell_spin_up": {
-    "spinup": 1
-  },
-  "mod_weapon_active_heat": {
-    "thermload": 1
-  },
-  "mod_weapon_active_power": {
-    "distdraw": 1
-  },
-  "mod_weapon_ammo_capacity": {
-    "ammo": 1
-  },
-  "mod_weapon_burst_interval": {
-    "rof": 1
-  },
-  "mod_weapon_burst_rof": {
-    "burstrof": 1
-  },
-  "mod_weapon_burst_size": {
-    "burst": 1
-  },
-  "mod_weapon_clip_size": {
-    "clip": 1
-  },
-  "mod_weapon_clip_size_override": {
-    "clip": 1
-  },
-  "mod_weapon_damage": {
-    "damage": 1
-  },
-  "mod_weapon_falloffrange_from_range": {
-  },
-  "mod_weapon_hardness_piercing": {
-    "piercing": 1
-  },
-  "mod_weapon_jitter_radius": {
-    "jitter": 1
-  },
-  "mod_weapon_range": {
     "range": 1
   },
-  "mod_weapon_reload_time": {
+  "OutfittingFieldType_MaxAngle": {
+    "angle": 1
+  },
+  "OutfittingFieldType_Range": {
+    "range": 1
+  },
+  "OutfittingFieldType_PowerDraw": {
+    "power": 1
+  },
+  "OutfittingFieldType_EnginesCapacity": {
+    "engcap": 1
+  },
+  "OutfittingFieldType_EnginesRecharge": {
+    "engrate": 1
+  },
+  "OutfittingFieldType_SystemsCapacity": {
+    "syscap": 1
+  },
+  "OutfittingFieldType_SystemsRecharge": {
+    "sysrate": 1
+  },
+  "OutfittingFieldType_WeaponsCapacity": {
+    "wepcap": 1
+  },
+  "OutfittingFieldType_WeaponsRecharge": {
+    "weprate": 1
+  },
+  "OutfittingFieldType_HeatEfficiency": {
+    "eff": 1
+  },
+  "OutfittingFieldType_PowerCapacity": {
+    "pgen": 1
+  },
+  "OutfittingFieldType_BrokenRegenRate": {
+    "brokenregen": 1
+  },
+  "OutfittingFieldType_EnergyPerRegen": {
+    "distdraw": 1
+  },
+  "OutfittingFieldType_ShieldGenOptimalMass": {
+    "optmass": 1
+  },
+  "OutfittingFieldType_ShieldGenStrength": {
+    "optmul": 1
+  },
+  "OutfittingFieldType_RegenRate": {
+    "regen": 1
+  },
+  "OutfittingFieldType_ShieldBankHeat": {
+    "thermload": 1
+  },
+  "OutfittingFieldType_ShieldBankDuration": {
+    "duration": 1
+  },
+  "OutfittingFieldType_ShieldBankReinforcement": {
+    "shieldreinforcement": 1
+  },
+  "OutfittingFieldType_ShieldBankSpinUp": {
+    "spinup": 1
+  },
+  "OutfittingFieldType_ThermalLoad": {
+    "thermload": 1
+  },
+  "OutfittingFieldType_DistributorDraw": {
+    "distdraw": 1
+  },
+  "OutfittingFieldType_AmmoMaximum": {
+    "ammo": 1
+  },
+  "OutfittingFieldType_RateOfFire": {
+    "rof": 1
+  },
+  "OutfittingFieldType_weapon_burst_rof": {
+    "burstrof": 1
+  },
+  "OutfittingFieldType_weapon_burst_size": {
+    "burst": 1
+  },
+  "OutfittingFieldType_AmmoClipSize": {
+    "clip": 1
+  },
+  "OutfittingFieldType_weapon_clip_size_override": {
+    "clip": 1
+  },
+  "OutfittingFieldType_Damage": {
+    "damage": 1
+  },
+  "OutfittingFieldType_weapon_falloffrange_from_range": {
+  },
+  "OutfittingFieldType_ArmourPenetration": {
+    "piercing": 1
+  },
+  "OutfittingFieldType_Jitter": {
+    "jitter": 1
+  },
+  "OutfittingFieldType_MaximumRange": {
+    "range": 1
+  },
+  "OutfittingFieldType_ReloadTime": {
     "reload": 1
   },
   "special_auto_loader": {},

modifications/modules.json

@@ -1053,6 +1053,12 @@
     "modifications": [
     ]
   },
+  "rpl": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "cs": {
     "blueprints": {
       "Sensor_CargoScanner_FastScan": {
@@ -1641,6 +1647,12 @@
       "special_screening_shell"
     ]
   },
+  "rfl": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "fh": {
     "blueprints": {
     },
@@ -3007,6 +3019,12 @@
       "special_thermalshock"
     ]
   },
+  "axmc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "ml": {
     "blueprints": {
     },
@@ -3176,6 +3194,12 @@
       "special_thermal_cascade"
     ]
   },
+  "axmr": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "mrp": {
     "blueprints": {
     },
@@ -5187,6 +5211,12 @@
       "thermres"
     ]
   },
+  "sfn": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "sc": {
     "blueprints": {
     },
@@ -5567,7 +5597,12 @@
       "scanrate"
     ]
   },
-
+  "xs": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "t": {
     "blueprints": {
       "Engine_Dirty": {

modules/hardpoints/ax_missile_rack.json

@@ -0,0 +1,124 @@
+{
+  "axmr": [
+    {
+      "ammo": 64,
+      "breachdmg": 0.1,
+      "breachmax": 0.8,
+      "breachmin": 1,
+      "class": 2,
+      "clip": 8,
+      "cost": 540900,
+      "damage": 64,
+      "damagedist": {
+        "X": 1
+      },
+      "distdraw": 0.14,
+      "edID": 128788699,
+      "eddbID": 1614,
+      "falloff": 10000,
+      "grp": "axmr",
+      "id": "x4",
+      "integrity": 51,
+      "mass": 4,
+      "missile": "D",
+      "mount": "F",
+      "piercing": 60,
+      "power": 1.2,
+      "rating": "B",
+      "reload": 5,
+      "rof": 0.5,
+      "shotspeed": 750,
+      "thermload": 2.4
+    },
+    {
+      "ammo": 64,
+      "breachdmg": 0.1,
+      "breachmax": 0.8,
+      "breachmin": 1,
+      "class": 2,
+      "clip": 8,
+      "cost": 2022700,
+      "damage": 50,
+      "damagedist": {
+        "X": 1
+      },
+      "distdraw": 0.08,
+      "edID": 128788704,
+      "eddbID": 1615,
+      "falloff": 10000,
+      "grp": "axmr",
+      "id": "x5",
+      "integrity": 51,
+      "mass": 4,
+      "missile": "D",
+      "mount": "T",
+      "piercing": 60,
+      "power": 1.2,
+      "rating": "B",
+      "reload": 5,
+      "rof": 0.5,
+      "shotspeed": 750,
+      "thermload": 1.5
+    },
+    {
+      "ammo": 128,
+      "breachdmg": 0.1,
+      "breachmax": 0.8,
+      "breachmin": 1,
+      "class": 3,
+      "clip": 12,
+      "cost": 1352250,
+      "damage": 64,
+      "damagedist": {
+        "X": 1
+      },
+      "distdraw": 0.24,
+      "edID": 128788700,
+      "eddbID": 1623,
+      "falloff": 10000,
+      "grp": "axmr",
+      "id": "x6",
+      "integrity": 64,
+      "mass": 8,
+      "missile": "D",
+      "mount": "F",
+      "piercing": 60,
+      "power": 1.62,
+      "rating": "A",
+      "reload": 5,
+      "rof": 0.5,
+      "shotspeed": 750,
+      "thermload": 3.6
+    },
+    {
+      "ammo": 128,
+      "breachdmg": 0.1,
+      "breachmax": 0.8,
+      "breachmin": 1,
+      "class": 3,
+      "clip": 12,
+      "cost": 4056750,
+      "damage": 64,
+      "damagedist": {
+        "X": 1
+      },
+      "distdraw": 0.14,
+      "edID": 128788705,
+      "eddbID": 1624,
+      "falloff": 10000,
+      "grp": "axmr",
+      "id": "x7",
+      "integrity": 64,
+      "mass": 8,
+      "missile": "D",
+      "mount": "T",
+      "piercing": 60,
+      "power": 1.75,
+      "rating": "A",
+      "reload": 5,
+      "rof": 0.5,
+      "shotspeed": 750,
+      "thermload": 1.9
+    }
+  ]
+}

modules/hardpoints/ax_multi_cannon.json

@@ -0,0 +1,124 @@
+{
+  "axmc": [
+    {
+      "ammo": 2100,
+      "breachdmg": 2.8,
+      "breachmax": 0.5,
+      "breachmin": 0.8,
+      "class": 2,
+      "clip": 100,
+      "cost": 379000,
+      "damage": 3.3,
+      "damagedist": {
+        "X": 1
+      },
+      "distdraw": 0.11,
+      "edID": 128788701,
+      "eddbID": 1618,
+      "falloff": 2000,
+      "grp": "axmc",
+      "id": "x0",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 17,
+      "power": 0.46,
+      "range": 4000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 7.1,
+      "shotspeed": 1600,
+      "thermload": 0.2
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 0.4,
+      "breachmax": 0.5,
+      "breachmin": 0.5,
+      "class": 2,
+      "clip": 90,
+      "cost": 1826500,
+      "damage": 1.7,
+      "damagedist": {
+        "X": 1
+      },
+      "distdraw": 0.06,
+      "edID": 128793059,
+      "eddbID": 1619,
+      "falloff": 2000,
+      "grp": "axmc",
+      "id": "x1",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 17,
+      "power": 0.5,
+      "range": 4000,
+      "rating": "F",
+      "reload": 4,
+      "rof": 6.2,
+      "shotspeed": 1600,
+      "thermload": 0.1
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 5.2,
+      "breachmax": 0.5,
+      "breachmin": 0.8,
+      "class": 3,
+      "clip": 100,
+      "cost": 1181500,
+      "damage": 6.1,
+      "damagedist": {
+        "X": 1
+      },
+      "distdraw": 0.18,
+      "edID": 128788702,
+      "eddbID": 1625,
+      "falloff": 2000,
+      "grp": "axmc",
+      "id": "x2",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 33,
+      "power": 0.64,
+      "range": 4000,
+      "rating": "C",
+      "reload": 4,
+      "rof": 5.9,
+      "shotspeed": 1600,
+      "thermload": 0.3
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 0.8,
+      "breachmax": 0.5,
+      "breachmin": 0.5,
+      "class": 3,
+      "clip": 90,
+      "cost": 3821600,
+      "damage": 3.3,
+      "damagedist": {
+        "X": 1
+      },
+      "distdraw": 0.06,
+      "edID": 128793060,
+      "eddbID": 1626,
+      "falloff": 2000,
+      "grp": "axmc",
+      "id": "x3",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 33,
+      "power": 0.64,
+      "range": 4000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 6.2,
+      "shotspeed": 1600,
+      "thermload": 0.1
+    }
+  ]
+}

modules/hardpoints/remote_release_flak_launcher.json

@@ -0,0 +1,63 @@
+{
+  "rfl": [
+    {
+      "ammo": 32,
+      "breachdmg": 1.7,
+      "breachmax": 1,
+      "breachmin": 1,
+      "class": 2,
+      "clip": 1,
+      "cost": 261800,
+      "damage": 34.0,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
+      "edID": 128785626,
+      "eddbID": 1620,
+      "falloff": 100000,
+      "grp": "rfl",
+      "id": "x8",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 60,
+      "power": 1.2,
+      "rating": "B",
+      "reload": 2,
+      "rof": 0.5,
+      "shotspeed": 550,
+      "thermload": 3.6
+    },
+    {
+      "ammo": 32,
+      "breachdmg": 1.7,
+      "breachmax": 1,
+      "breachmin": 1,
+      "class": 2,
+      "clip": 1,
+      "cost": 1259200,
+      "damage": 34.0,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
+      "edID": 128793058,
+      "eddbID": 1621,
+      "falloff": 100000,
+      "grp": "rfl",
+      "id": "x9",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 60,
+      "power": 1.2,
+      "rating": "B",
+      "reload": 2,
+      "rof": 0.5,
+      "shotspeed": 550,
+      "thermload": 3.6
+    }
+  ]
+}
+  

modules/hardpoints/shutdown_field_neutraliser.json

@@ -0,0 +1,23 @@
+{
+  "sfn": [
+    {
+      "class": 0,
+      "cost": 63000,
+      "edID": 128771884,
+      "eddbID": 1622,
+      "grp": "sfn",
+      "id": "sfn",
+      "integrity": 35,
+      "mass": 1.3,
+      "name": "Shutdown Field Neutraliser",
+      "passive": 1,
+      "power": 0.2,
+      "activepower": 0.25,
+      "rating": "F",
+      "cooldown": 10,
+      "duration": 1,
+      "range": 3000
+    }
+  ]
+}
+  

modules/hardpoints/xeno_scanner.json

@@ -0,0 +1,22 @@
+{
+  "xs": [
+    {
+      "class": 0,
+      "cost": 365698,
+      "edID": 128793115,
+      "eddbID": 1616,
+      "grp": "xs",
+      "id": "xs",
+      "integrity": 56,
+      "mass": 1.3,
+      "name": "Xeno Scanner",
+      "power": 0.2,
+      "range": 500,
+      "rating": "E",
+      "boot": 2,
+      "scantime": 10,
+      "angle": 23
+    }
+  ]
+}
+  

modules/index.js

@@ -14,11 +14,14 @@ module.exports = {
     ul: require('./hardpoints/burst_laser').ul,
     bl: require('./hardpoints/beam_laser').bl,
     mc: require('./hardpoints/multi_cannon').mc,
+    axmc: require('./hardpoints/ax_multi_cannon').axmc,
     c: require('./hardpoints/cannon').c,
     fc: require('./hardpoints/fragment_cannon').fc,
+    rfl: require('./hardpoints/remote_release_flak_launcher.json').rfl,
     rg: require('./hardpoints/rail_gun').rg,
     pa: require('./hardpoints/plasma_accelerator').pa,
     mr: require('./hardpoints/missile_rack').mr,
+    axmr: require('./hardpoints/ax_missile_rack').axmr,
     tp: require('./hardpoints/torpedo_pylon').tp,
     nl: require('./hardpoints/mine_launcher').nl,
     ml: require('./hardpoints/mining_laser').ml,
@@ -29,7 +32,9 @@ module.exports = {
     ch: require('./hardpoints/chaff_launcher').ch,
     ec: require('./hardpoints/electronic_countermeasure').ec,
     hs: require('./hardpoints/heat_sink_launcher').hs,
-    po: require('./hardpoints/point_defence').po
+    po: require('./hardpoints/point_defence').po,
+    sfn: require('./hardpoints/shutdown_field_neutraliser').sfn,
+    xs: require('./hardpoints/xeno_scanner').xs
   },
   internal: {
     am: require('./internal/auto_field_maintenance_unit').am,

modules/internal/repair_limpet_controller.json

@@ -1,265 +1,264 @@
 {
-    "rpl": [
+  "rpl": [
-      {
+    {
-        "class": 1,
+      "class": 1,
-        "cost": 600,
+      "cost": 600,
-        "edID": 128777327,
+      "edID": 128777327,
-        "eddbID": 1594,
+      "eddbID": 1594,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rple1",
+      "id": "9z",
-        "mass": 1.3,
+      "mass": 1.3,
-        "maximum": 1,
+      "maximum": 1,
-        "power": 0.18,
+      "power": 0.18,
-        "range": 0.6,
+      "range": 0.6,
-        "rating": "E"
+      "rating": "E"
-      },
+    },
-      {
+    {
-        "class": 1,
+      "class": 1,
-        "cost": 1200,
+      "cost": 1200,
-        "edID": 128777328,
+      "edID": 128777328,
-        "eddbID": 1595,
+      "eddbID": 1595,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rpld1",
+      "id": "9q",
-        "mass": 0.5,
+      "mass": 0.5,
-        "maximum": 1,
+      "maximum": 1,
-        "power": 0.14,
+      "power": 0.14,
-        "range": 0.8,
+      "range": 0.8,
-        "rating": "D"
+      "rating": "D"
-      },
+    },
-      {
+    {
-        "class": 1,
+      "class": 1,
-        "cost": 2400,
+      "cost": 2400,
-        "edID": 128777329,
+      "edID": 128777329,
-        "eddbID": 1596,
+      "eddbID": 1596,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rplc1",
+      "id": "9a",
-        "mass": 1.3,
+      "mass": 1.3,
-        "maximum": 1,
+      "maximum": 1,
-        "power": 0.23,
+      "power": 0.23,
-        "range": 1,
+      "range": 1,
-        "rating": "C"
+      "rating": "C"
-      },
+    },
-      {
+    {
-        "class": 1,
+      "class": 1,
-        "cost": 4800,
+      "cost": 4800,
-        "edID": 128777330,
+      "edID": 128777330,
-        "eddbID": 1597,
+      "eddbID": 1597,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rplb1",
+      "id": "9w",
-        "mass": 2,
+      "mass": 2,
-        "maximum": 1,
+      "maximum": 1,
-        "power": 0.32,
+      "power": 0.32,
-        "range": 1.2,
+      "range": 1.2,
-        "rating": "B"
+      "rating": "B"
-      },
+    },
-      {
+    {
-        "class": 1,
+      "class": 1,
-        "cost": 9600,
+      "cost": 9600,
-        "edID": 128777331,
+      "edID": 128777331,
-        "eddbID": 1598,
+      "eddbID": 1598,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rpla1",
+      "id": "9s",
-        "mass": 1.3,
+      "mass": 1.3,
-        "maximum": 1,
+      "maximum": 1,
-        "power": 0.28,
+      "power": 0.28,
-        "range": 1.4,
+      "range": 1.4,
-        "rating": "A"
+      "rating": "A"
-      },
+    },
-      {
+    {
-        "class": 3,
+      "class": 3,
-        "cost": 5400,
+      "cost": 5400,
-        "edID": 128777332,
+      "edID": 128777332,
-        "eddbID": 1599,
+      "eddbID": 1599,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rple3",
+      "id": "9x",
-        "mass": 5,
+      "mass": 5,
-        "maximum": 2,
+      "maximum": 2,
-        "power": 0.27,
+      "power": 0.27,
-        "range": 0.66,
+      "range": 0.66,
-        "rating": "E"
+      "rating": "E"
-      },
+    },
-      {
+    {
-        "class": 3,
+      "class": 3,
-        "cost": 10800,
+      "cost": 10800,
-        "edID": 128777333,
+      "edID": 128777333,
-        "eddbID": 1600,
+      "eddbID": 1600,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rpld3",
+      "id": "9e",
-        "mass": 2,
+      "mass": 2,
-        "maximum": 2,
+      "maximum": 2,
-        "power": 0.2,
+      "power": 0.2,
-        "range": 0.88,
+      "range": 0.88,
-        "rating": "D"
+      "rating": "D"
-      },
+    },
-      {
+    {
-        "class": 3,
+      "class": 3,
-        "cost": 21600,
+      "cost": 21600,
-        "edID": 128777334,
+      "edID": 128777334,
-        "eddbID": 1601,
+      "eddbID": 1601,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rplc3",
+      "id": "9d",
-        "mass": 5,
+      "mass": 5,
-        "maximum": 2,
+      "maximum": 2,
-        "power": 0.34,
+      "power": 0.34,
-        "range": 1.1,
+      "range": 1.1,
-        "rating": "C"
+      "rating": "C"
-      },
+    },
-      {
+    {
-        "class": 3,
+      "class": 3,
-        "cost": 43200,
+      "cost": 43200,
-        "edID": 128777335,
+      "edID": 128777335,
-        "eddbID": 1602,
+      "eddbID": 1602,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rplb3",
+      "id": "9c",
-        "mass": 8,
+      "mass": 8,
-        "maximum": 2,
+      "maximum": 2,
-        "power": 0.48,
+      "power": 0.48,
-        "range": 1.32,
+      "range": 1.32,
-        "rating": "B"
+      "rating": "B"
-      },
+    },
-      {
+    {
-        "class": 3,
+      "class": 3,
-        "cost": 86400,
+      "cost": 86400,
-        "edID": 128777336,
+      "edID": 128777336,
-        "eddbID": 1603,
+      "eddbID": 1603,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rpba3",
+      "id": "9r",
-        "mass": 5,
+      "mass": 5,
-        "maximum": 2,
+      "maximum": 2,
-        "power": 0.41,
+      "power": 0.41,
-        "range": 1.54,
+      "range": 1.54,
-        "rating": "A"
+      "rating": "A"
-      },
+    },
-      {
+    {
-        "class": 5,
+      "class": 5,
-        "cost": 48600,
+      "cost": 48600,
-        "edID": 128777337,
+      "edID": 128777337,
-        "eddbID": 1604,
+      "eddbID": 1604,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rple5",
+      "id": "9f",
-        "mass": 20,
+      "mass": 20,
-        "maximum": 3,
+      "maximum": 3,
-        "power": 0.4,
+      "power": 0.4,
-        "range": 0.78,
+      "range": 0.78,
-        "rating": "E"
+      "rating": "E"
-      },
+    },
-      {
+    {
-        "class": 5,
+      "class": 5,
-        "cost": 97200,
+      "cost": 97200,
-        "edID": 128777338,
+      "edID": 128777338,
-        "eddbID": 1605,
+      "eddbID": 1605,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rpld5",
+      "id": "9v",
-        "mass": 8,
+      "mass": 8,
-        "maximum": 3,
+      "maximum": 3,
-        "power": 0.3,
+      "power": 0.3,
-        "range": 1.04,
+      "range": 1.04,
-        "rating": "D"
+      "rating": "D"
-      },
+    },
-      {
+    {
-        "class": 5,
+      "class": 5,
-        "cost": 194400,
+      "cost": 194400,
-        "edID": 128777339,
+      "edID": 128777339,
-        "eddbID": 1606,
+      "eddbID": 1606,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rplc5",
+      "id": "9t",
-        "mass": 20,
+      "mass": 20,
-        "maximum": 3,
+      "maximum": 3,
-        "power": 0.5,
+      "power": 0.5,
-        "range": 1.3,
+      "range": 1.3,
-        "rating": "C"
+      "rating": "C"
-      },
+    },
-      {
+    {
-        "class": 5,
+      "class": 5,
-        "cost": 388800,
+      "cost": 388800,
-        "edID": 128777340,
+      "edID": 128777340,
-        "eddbID": 1607,
+      "eddbID": 1607,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rplb5",
+      "id": "9g",
-        "mass": 32,
+      "mass": 32,
-        "maximum": 3,
+      "maximum": 3,
-        "power": 0.97,
+      "power": 0.97,
-        "range": 1.56,
+      "range": 1.56,
-        "rating": "B"
+      "rating": "B"
-      },
+    },
-      {
+    {
-        "class": 5,
+      "class": 5,
-        "cost": 777600,
+      "cost": 777600,
-        "edID": 128777341,
+      "edID": 128777341,
-        "eddbID": 1608,
+      "eddbID": 1608,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rpla5",
+      "id": "9b",
-        "mass": 20,
+      "mass": 20,
-        "maximum": 3,
+      "maximum": 3,
-        "power": 0.6,
+      "power": 0.6,
-        "range": 1.82,
+      "range": 1.82,
-        "rating": "A"
+      "rating": "A"
-      },
+    },
-      {
+    {
-        "class": 7,
+      "class": 7,
-        "cost": 437400,
+      "cost": 437400,
-        "edID": 128777342,
+      "edID": 128777342,
-        "eddbID": 1609,
+      "eddbID": 1609,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rple7",
+      "id": "9y",
-        "mass": 80,
+      "mass": 80,
-        "maximum": 4,
+      "maximum": 4,
-        "power": 0.55,
+      "power": 0.55,
-        "range": 1.02,
+      "range": 1.02,
-        "rating": "E"
+      "rating": "E"
-      },
+    },
-      {
+    {
-        "class": 7,
+      "class": 7,
-        "cost": 874800,
+      "cost": 874800,
-        "edID": 128777343,
+      "edID": 128777343,
-        "eddbID": 1610,
+      "eddbID": 1610,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rpld7",
+      "id": "9h",
-        "mass": 32,
+      "mass": 32,
-        "maximum": 4,
+      "maximum": 4,
-        "power": 0.41,
+      "power": 0.41,
-        "range": 1.36,
+      "range": 1.36,
-        "rating": "D"
+      "rating": "D"
-      },
+    },
-      {
+    {
-        "class": 7,
+      "class": 7,
-        "cost": 1749600,
+      "cost": 1749600,
-        "edID": 128777344,
+      "edID": 128777344,
-        "eddbID": 1611,
+      "eddbID": 1611,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rplc7",
+      "id": "9n",
-        "mass": 80,
+      "mass": 80,
-        "maximum": 4,
+      "maximum": 4,
-        "power": 0.69,
+      "power": 0.69,
-        "range": 1.7,
+      "range": 1.7,
-        "rating": "C"
+      "rating": "C"
-      },
+    },
-      {
+    {
-        "class": 7,
+      "class": 7,
-        "cost": 3499200,
+      "cost": 3499200,
-        "edID": 128777345,
+      "edID": 128777345,
-        "eddbID": 1612,
+      "eddbID": 1612,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rplb7",
+      "id": "9u",
-        "mass": 128,
+      "mass": 128,
-        "maximum": 4,
+      "maximum": 4,
-        "power": 0.97,
+      "power": 0.97,
-        "range": 2.04,
+      "range": 2.04,
-        "rating": "B"
+      "rating": "B"
-      },
+    },
-      {
+    {
-        "class": 7,
+      "class": 7,
-        "cost": 6998400,
+      "cost": 6998400,
-        "edID": 128777346,
+      "edID": 128777346,
-        "eddbID": 1613,
+      "eddbID": 1613,
-        "grp": "rpl",
+      "grp": "rpl",
-        "id": "rpla7",
+      "id": "9j",
-        "mass": 80,
+      "mass": 80,
-        "maximum": 4,
+      "maximum": 4,
-        "power": 0.83,
+      "power": 0.83,
-        "range": 2.38,
+      "range": 2.38,
-        "rating": "A"
+      "rating": "A"
-      }
+    }
-    ]
+  ]
-  }
+}
-  

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"

ships/beluga.json

@@ -24,6 +24,9 @@
       "crew": 3
     },
     "retailCost": 84532770,
+    "requirements": {
+      "horizons": true
+    },
     "bulkheads": [
       { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/cobra_mk_iv.json

@@ -22,6 +22,9 @@
       "crew": 2 
     },
     "retailCost": 747660,
+    "requirements": {
+      "horizonsEarlyAdoption": true
+    },
     "bulkheads": [
       { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/dolphin.json

@@ -23,6 +23,9 @@
       "crew": 1
     },
     "retailCost": 1337330,
+    "requirements": {
+      "horizons": true
+    },
     "bulkheads": [
       { "id": "cq", "edID": 128049292, "eddbID": 1589, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "cr", "edID": 128049293, "eddbID": 1590, "grp": "bh", "cost": 534940, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/federal_assault_ship.json

@@ -22,6 +22,9 @@
       "crew": 2
     },
     "retailCost": 19814210,
+    "requirements": {
+      "federationRank": 5
+    },
     "bulkheads": [
       { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/federal_corvette.json

@@ -23,6 +23,9 @@
       "crew": 3 
     },
     "retailCost": 187969450,
+    "requirements": {
+      "federationRank": 12
+    },
     "bulkheads": [
       { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/federal_dropship.json

@@ -22,6 +22,9 @@
       "crew": 2
     },
     "retailCost": 14314210,
+    "requirements": {
+      "federationRank": 3
+    },
     "bulkheads": [
       { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/federal_gunship.json

@@ -23,6 +23,9 @@
       "crew": 2
     },
     "retailCost": 35814210,
+    "requirements": {
+      "federationRank": 7
+    },
     "bulkheads": [
       { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/imperial_clipper.json

@@ -22,7 +22,10 @@
       "crew": 2
     },
     "retailCost": 22296860,
-      "bulkheads": [
+    "requirements": {
+      "empireRank": 7
+    },
+    "bulkheads": [
       { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
       { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },

ships/imperial_courier.json

@@ -22,6 +22,9 @@
       "crew": 1
     },
     "retailCost": 2542930,
+    "requirements": {
+      "empireRank": 3
+    },
     "bulkheads": [
       { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/imperial_cutter.json

@@ -23,6 +23,9 @@
       "crew": 3 
     },
     "retailCost": 208969450,
+    "requirements": {
+      "empireRank": 12
+    },
     "bulkheads": [
       { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/index.js

@@ -27,6 +27,7 @@ module.exports = {
   type_6_transporter: require('./type_6_transporter').type_6_transporter,
   type_7_transport: require('./type_7_transport').type_7_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,
   viper_mk_iv: require('./viper_mk_iv').viper_mk_iv,
   vulture: require('./vulture').vulture

ships/type_10_defender.json

@@ -0,0 +1,45 @@
+{
+    "type_10_defender": {
+      "edID": 128785619,
+      "eddbID": 32,
+      "properties": {
+        "name": "Type-10 Defender",
+        "manufacturer": "Lakon",
+        "class": 3,
+        "hullCost": 121454173,
+        "speed": 179,
+        "boost": 219,
+        "boostEnergy": 19,
+        "baseShieldStrength": 320,
+        "baseArmour": 580,
+        "hardness": 75,
+        "hullMass": 1200,
+        "masslock": 26,
+        "pipSpeed": 0.17375,
+        "fighterHangars": true,
+        "pitch": 20,
+        "roll": 20,
+        "yaw": 8,
+        "crew": 3
+      },
+      "retailCost": 121454652,
+      "bulkheads": [
+        { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+        { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+        { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+        { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+        { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      ],
+      "slots": {
+        "standard": [8, 7, 7, 5, 6, 4, 6],
+        "hardpoints": [3, 3, 3, 3, 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
+        "internal": [8, 7, 6, 5, 4, 4, 3, 3, 2,{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }]
+      },
+      "defaults": {
+        "standard": ["6E", "7E", "6E", "5E", "6E", "4E", "6C"],
+        "hardpoints": [0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        "internal": ["06", "05", "4j", "03", "02", 0, "01", 0, "2h", 0, 0]
+      }
+    }
+  }
+