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

@@ -1,4 +1,5 @@
 node_modules
 node_modules/*
 *.log
-.idea
+.idea
+

ChangeLog.md

@@ -1,3 +1,75 @@
+#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
+
+#2.3.7
+  * Fixed Orca mass-lock
+
+#2.3.5
+  * Fix list of available blueprints for Point Defence
+  * Fix integrity values for class 6 power plants
+  * Add shot speed for long range weapon
+  * Fix components for dirty drive grade 3
+  * Update values for Cytoscrambler
+  * Add shotspeed modifier to cannon/multi-cannon/fragment cannon
+
+#2.3.4
+  * Add missing Long Range blueprint to multi-cannon
+  * Fix values for thermal load of focused weapon grade 4
+  * Fix internal module information for power plant blueprints
+  * Add 'FSD Interrupt' special to dumbfire missile racks; this module now has `specials_S` and `specials_D` keys for specials to differentiate
+
+#2.3.3
+  * Add Felicity Farseer to list of engineers that supply sensor and detailed surface scanner modifications
+
+#2.3.2
+  * Update ownership of module blueprints for sensors and scanners
+  * Update railgun penetration
+
+#2.3.1
+  * Separate scan time and scan range
+  * Add Frontier IDs for new items in 2.3
+
+#2.3.0
+  * Add Dolphin
+  * Add turreted mining lasers
+  * Add long range / wide angle / fast scan scanner blueprints
+  * Fix EDDB IDs for class 5 and 7 fighter hangars for correct shopping list
+  * Fix cost for rocket-propelled FSD disruptor
+  * Add module names for blueprints
+  * Fix erroneous value for grade 5 kinetic shield booster
+  * Add missing integrity values for some modules
+  * Update module reinforcement package integrity
+  * Update specs of Beluga as per 2.3
+  * Update specs of Asp Scout as per 2.3
+  * Update specs of Diamondback Explorer as per 2.3
+  * Add ED ID for Rocket Propelled FSD Disruptor
+  * Fix ED name for target lock breaker special
+  * Update scan range and angle information for sensors
+  * Tidy up shield cell bank information to allow for accurate calculations with modifications
+  * Update mine launcher stats
+  * Add appropriate engineers to per-module blueprint information
+
+#2.2.19
+  * Remove shot speed modification - it is directly tied to range
+  * Fix incorrect minimal mass for 3C bi-weave shield generator
+
 #2.2.18
   * Correct lower efficiency value to be better, not worse
 

modifications/modifications.json

@@ -3,7 +3,7 @@
     "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite", "higherbetter": true},
-    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite"},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite", "higherbetter": false},
     "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
@@ -19,7 +19,7 @@
     "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative", "higherbetter": true},
+    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "additive", "higherbetter": false},
     "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive", "higherbetter": true},
     "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative", "higherbetter": true},
@@ -34,6 +34,9 @@
     "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "angle": {"id": 46, "name": "angle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "scanrate": {"id": 49, "name": "scanrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "scantime": {"id": 48, "name": "scantime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "shotspeed": {"id": 43, "name": "shotspeed", "type": "percentage", "method": "multiplicative", "higherbetter": true},

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": {},
@@ -211,25 +186,33 @@
     "jitter": 1,
     "speed": -0.1667
   },
+  "special_fsd_interrupt": {
+    "damage": -0.3,
+    "rof": 0.5
+  },
   "special_high_yield_shell": {
     "rof": 0.1111111111111111
   },
   "special_incendiary_rounds": {
     "rof": 0.05263157894736842,
     "thermload": 2,
-    "damagedist": { 
+    "damagedist": {
       "T": 1
     }
   },
   "special_inertial_impact": {
     "damage": 0.5,
-    "jitter": 1,
+    "jitter": 3,
-    "damagedist": { 
+    "damagedist": {
       "K": 0.5,
       "T": 0.5
     }
   },
   "special_overload_munitions": {
+    "damagedist": {
+      "E": 0.5,
+      "T": 0.5
+    }
   },
   "special_phasing_sequence": {
     "damage": -0.1
@@ -266,8 +249,16 @@
   "special_thermalshock": {
     "damage": -0.2
   },
-  "trade_cell_heat_cell_units": {},
+  "trade_cell_heat_cell_units": {
-  "trade_defence_health_add_defence_global_mult": {},
+    "shieldreinforcement": -1,
+    "thermload": -1
+  },
+  "trade_defence_health_add_defence_global_mult": {
+    "explres": 0.4,
+    "hullreinforcement": 1,
+    "kinres": 0.4,
+    "thermres": 0.4
+  },
   "trade_distributor_engine_charge_system_charge": {
     "engcap": 1,
     "syscap": -1

modifications/specials.json

@@ -10,6 +10,7 @@
     "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
     "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
     "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
+    "special_fsd_interrupt": {"id": 33, "edname": "special_fsd_interrupt", "name": "FSD interrupt"},
     "special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"},
     "special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"},
     "special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"},
@@ -27,7 +28,7 @@
     "special_shiftlock_canister": {"id": 24, "edname": "special_shiftlock_canister", "name": "Shift-lock canister"},
     "special_smart_rounds": {"id": 25, "edname": "special_smart_rounds", "name": "Smart rounds"},
     "special_super_penetrator": {"id": 26, "edname": "special_super_penetrator", "name": "Super penetrator"},
-    "special_target_lock_breaker": {"id": 27, "edname": "special_target_lock_breaker", "name": "Target lock breaker"},
+    "special_lock_breaker": {"id": 27, "edname": "special_lock_breaker", "name": "Target lock breaker"},
     "special_thermal_cascade": {"id": 28, "edname": "special_thermal_cascade", "name": "Thermal cascade"},
     "special_thermal_conduit": {"id": 29, "edname": "special_thermal_conduit", "name": "Thermal conduit"},
     "special_thermal_vent": {"id": 30, "edname": "special_thermal_vent", "name": "Thermal vent"},

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/burst_laser.json

@@ -12,7 +12,7 @@
       "damagedist": {
         "T": 1
       },
-      "distdraw": 0.24,
+      "distdraw": 0.25,
       "edID": 128049400,
       "eddbID": 832,
       "falloff": 500,
@@ -26,7 +26,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 2,
-      "thermload": 0.4
+      "thermload": 0.38
     },
     {
       "breachdmg": 1,
@@ -36,11 +36,11 @@
       "burstrof": 17,
       "class": 1,
       "cost": 8600,
-      "damage": 1.2,
+      "damage": 1.22,
       "damagedist": {
         "T": 1
       },
-      "distdraw": 0.23,
+      "distdraw": 0.24,
       "edID": 128049404,
       "eddbID": 835,
       "falloff": 500,
@@ -54,7 +54,7 @@
       "range": 3000,
       "rating": "G",
       "rof": 2.23,
-      "thermload": 0.3
+      "thermload": 0.34
     },
     {
       "breachdmg": 0.4,
@@ -68,7 +68,7 @@
       "damagedist": {
         "T": 1
       },
-      "distdraw": 0.136,
+      "distdraw": 0.14,
       "edID": 128049407,
       "eddbID": 838,
       "falloff": 500,
@@ -82,24 +82,24 @@
       "range": 3000,
       "rating": "G",
       "rof": 1.92,
-      "thermload": 0.2
+      "thermload": 0.19
     },
     {
-      "breachdmg": 2,
+      "breachdmg": 3.1,
       "breachmax": 0,
       "breachmin": 0,
       "burst": 8,
       "burstrof": 20,
       "class": 1,
       "cost": 8800,
-      "damage": 2.4,
+      "damage": 3.6,
       "damagedist": {
         "T": 1
       },
       "distdraw": 0.31,
       "edID": 128671449,
       "eddbID": 1477,
-      "falloff": 500,
+      "falloff": 600,
       "grp": "ul",
       "id": "cy",
       "integrity": 40,
@@ -110,9 +110,9 @@
       "piercing": 1,
       "power": 0.8,
       "pp": "Archon Delaine",
-      "range": 600,
+      "range": 3000,
       "rating": "F",
-      "rof": 6.6,
+      "rof": 7.6,
       "thermload": 0.3
     },
     {
@@ -123,11 +123,11 @@
       "burstrof": 11,
       "class": 2,
       "cost": 23000,
-      "damage": 3.5,
+      "damage": 3.53,
       "damagedist": {
         "T": 1
       },
-      "distdraw": 0.482,
+      "distdraw": 0.5,
       "edID": 128049401,
       "eddbID": 833,
       "falloff": 500,
@@ -141,7 +141,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.6,
-      "thermload": 0.8
+      "thermload": 0.78
     },
     {
       "breachdmg": 2.1,
@@ -155,7 +155,7 @@
       "damagedist": {
         "T": 1
       },
-      "distdraw": 0.468,
+      "distdraw": 0.49,
       "edID": 128049405,
       "eddbID": 836,
       "falloff": 500,
@@ -169,7 +169,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 1.78,
-      "thermload": 0.7
+      "thermload": 0.67
     },
     {
       "breachdmg": 0.9,
@@ -179,11 +179,11 @@
       "burstrof": 15,
       "class": 2,
       "cost": 162800,
-      "damage": 1.74,
+      "damage": 1.72,
       "damagedist": {
         "T": 1
       },
-      "distdraw": 0.26,
+      "distdraw": 0.28,
       "edID": 128049408,
       "eddbID": 839,
       "falloff": 500,
@@ -197,7 +197,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 1.57,
-      "thermload": 0.4
+      "thermload": 0.38
     },
     {
       "breachdmg": 3.9,
@@ -207,11 +207,11 @@
       "burstrof": 7,
       "class": 3,
       "cost": 140400,
-      "damage": 7.75,
+      "damage": 7.73,
       "damagedist": {
         "T": 1
       },
-      "distdraw": 1.06,
+      "distdraw": 1.11,
       "edID": 128049402,
       "eddbID": 834,
       "falloff": 500,
@@ -235,11 +235,11 @@
       "burstrof": 9,
       "class": 3,
       "cost": 281600,
-      "damage": 5.18,
+      "damage": 5.16,
       "damagedist": {
         "T": 1
       },
-      "distdraw": 0.986,
+      "distdraw": 1.03,
       "edID": 128049406,
       "eddbID": 837,
       "falloff": 500,
@@ -253,7 +253,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.4,
-      "thermload": 1.4
+      "thermload": 1.42
     },
     {
       "breachdmg": 1.8,
@@ -263,11 +263,11 @@
       "burstrof": 11,
       "class": 3,
       "cost": 800400,
-      "damage": 3.54,
+      "damage": 3.53,
       "damagedist": {
         "T": 1
       },
-      "distdraw": 0.536,
+      "distdraw": 0.56,
       "edID": 128049409,
       "eddbID": 840,
       "falloff": 500,
@@ -281,7 +281,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.272,
-      "thermload": 0.8
+      "thermload": 0.78
     },
     {
       "breachdmg": 17.5,
@@ -291,11 +291,11 @@
       "burstrof": 3,
       "class": 4,
       "cost": 281600,
-      "damage": 20.6,
+      "damage": 20.61,
       "damagedist": {
         "T": 1
       },
-      "distdraw": 2.84,
+      "distdraw": 2.98,
       "edID": 128049403,
       "eddbID": 1549,
       "falloff": 500,
@@ -309,7 +309,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 0.8,
-      "thermload": 4.5
+      "thermload": 4.53
     },
     {
       "breachdmg": 10.3,
@@ -319,11 +319,11 @@
       "burstrof": 5,
       "class": 4,
       "cost": 1245600,
-      "damage": 12.1,
+      "damage": 12.09,
       "damagedist": {
         "T": 1
       },
-      "distdraw": 2.31,
+      "distdraw": 2.41,
       "edID": 128727920,
       "eddbID": 1550,
       "falloff": 500,
@@ -337,7 +337,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1,
-      "thermload": 3.3
+      "thermload": 3.33
     }
   ]
 }

modules/hardpoints/cargo_scanner.json

@@ -13,7 +13,7 @@
       "power": 0.2,
       "range": 2000,
       "rating": "E",
-      "time": 10
+      "scantime": 10
     },
     {
       "angle": 15,
@@ -28,7 +28,7 @@
       "power": 0.4,
       "range": 2500,
       "rating": "D",
-      "time": 10
+      "scantime": 10
     },
     {
       "angle": 15,
@@ -43,7 +43,7 @@
       "power": 0.8,
       "range": 3000,
       "rating": "C",
-      "time": 10
+      "scantime": 10
     },
     {
       "angle": 15,
@@ -58,7 +58,7 @@
       "power": 1.6,
       "range": 3500,
       "rating": "B",
-      "time": 10
+      "scantime": 10
     },
     {
       "angle": 15,
@@ -73,7 +73,7 @@
       "power": 3.2,
       "range": 4000,
       "rating": "A",
-      "time": 10
+      "scantime": 10
     }
   ]
 }

modules/hardpoints/fragment_cannon.json

@@ -19,14 +19,14 @@
       "grp": "fc",
       "id": "20",
       "integrity": 40,
-      "jitter": 0.5,
+      "jitter":5,
       "mass": 2,
       "mount": "F",
       "piercing": 20,
       "power": 0.45,
       "range": 2000,
       "rating": "E",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 5.555,
       "roundspershot": 12,
       "shotspeed": 667,
@@ -51,14 +51,14 @@
       "grp": "fc",
       "id": "21",
       "integrity": 40,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 2,
       "mount": "G",
       "piercing": 20,
       "power": 0.59,
       "range": 2000,
       "rating": "E",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 5.88,
       "roundspershot": 12,
       "shotspeed": 667,
@@ -83,14 +83,14 @@
       "grp": "fc",
       "id": "22",
       "integrity": 40,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 2,
       "mount": "T",
       "piercing": 20,
       "power": 0.42,
       "range": 2000,
       "rating": "E",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 4.76,
       "roundspershot": 12,
       "shotspeed": 667,
@@ -104,7 +104,7 @@
       "class": 2,
       "clip": 3,
       "cost": 291840,
-      "damage": 2.56,
+      "damage": 3,
       "damagedist": {
         "K": 1
       },
@@ -115,15 +115,15 @@
       "grp": "fc",
       "id": "1s",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 4,
       "mount": "F",
       "piercing": 30,
       "power": 0.74,
       "range": 2000,
       "rating": "A",
-      "reload": 2.5,
+      "reload": 5,
-      "rof": 5,
+      "rof": 4.975,
       "roundspershot": 12,
       "shotspeed": 667,
       "thermload": 0.7
@@ -136,7 +136,7 @@
       "class": 2,
       "clip": 3,
       "cost": 437800,
-      "damage": 1.95,
+      "damage": 2.275,
       "damagedist": {
         "K": 1
       },
@@ -147,14 +147,14 @@
       "grp": "fc",
       "id": "7e",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 4,
       "mount": "G",
       "piercing": 30,
       "power": 1.03,
       "range": 2000,
       "rating": "D",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 5.26,
       "roundspershot": 12,
       "shotspeed": 667,
@@ -168,7 +168,7 @@
       "class": 2,
       "clip": 3,
       "cost": 1459200,
-      "damage": 1.43,
+      "damage": 1.7,
       "damagedist": {
         "K": 1
       },
@@ -179,15 +179,15 @@
       "grp": "fc",
       "id": "7f",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 4,
       "mount": "T",
       "piercing": 30,
       "power": 0.79,
       "range": 2000,
       "rating": "D",
-      "reload": 2.5,
+      "reload": 5,
-      "rof": 4.345,
+      "rof": 4.26,
       "roundspershot": 12,
       "shotspeed": 667,
       "thermload": 0.4
@@ -200,7 +200,7 @@
       "class": 3,
       "clip": 3,
       "cost": 1167360,
-      "damage": 3.92,
+      "damage": 4.57,
       "damagedist": {
         "K": 1
       },
@@ -211,14 +211,14 @@
       "grp": "fc",
       "id": "1t",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 8,
       "mount": "F",
       "piercing": 45,
       "power": 1.02,
       "range": 2000,
       "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 4.545,
       "roundspershot": 12,
       "shotspeed": 667,
@@ -232,7 +232,7 @@
       "class": 3,
       "clip": 3,
       "cost": 1751040,
-      "damage": 3.23,
+      "damage": 3.77,
       "damagedist": {
         "K": 1
       },
@@ -243,14 +243,14 @@
       "grp": "fc",
       "id": "1u",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 8,
       "mount": "G",
       "piercing": 45,
       "power": 1.55,
       "range": 2000,
       "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 4.76,
       "roundspershot": 12,
       "shotspeed": 667,
@@ -264,7 +264,7 @@
       "class": 3,
       "clip": 3,
       "cost": 5836800,
-      "damage": 2.56,
+      "damage": 2.98,
       "damagedist": {
         "K": 1
       },
@@ -275,14 +275,14 @@
       "grp": "fc",
       "id": "1v",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 8,
       "mount": "T",
       "piercing": 45,
       "power": 1.29,
       "range": 2000,
       "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 4,
       "roundspershot": 12,
       "shotspeed": 667,
@@ -315,7 +315,7 @@
       "power": 1.02,
       "pp": "Zachary Hudson",
       "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 4.5,
       "roundspershot": 12,
       "shotspeed": 1000,

modules/hardpoints/frame_shift_wake_scanner.json

@@ -12,7 +12,7 @@
       "power": 0.2,
       "range": 2000,
       "rating": "E",
-      "time": 10
+      "scantime": 10
     },
     {
       "class": 0,
@@ -26,7 +26,7 @@
       "power": 0.4,
       "range": 2500,
       "rating": "D",
-      "time": 10
+      "scantime": 10
     },
     {
       "class": 0,
@@ -40,7 +40,7 @@
       "power": 0.8,
       "range": 3000,
       "rating": "C",
-      "time": 10
+      "scantime": 10
     },
     {
       "class": 0,
@@ -54,7 +54,7 @@
       "power": 1.6,
       "range": 3500,
       "rating": "B",
-      "time": 10
+      "scantime": 10
     },
     {
       "class": 0,
@@ -68,7 +68,7 @@
       "power": 3.2,
       "range": 4000,
       "rating": "A",
-      "time": 10
+      "scantime": 10
     }
   ]
 }

modules/hardpoints/kill_warrant_scanner.json

@@ -12,7 +12,7 @@
       "power": 0.2,
       "range": 2000,
       "rating": "E",
-      "time": 10
+      "scantime": 10
     },
     {
       "class": 0,
@@ -26,7 +26,7 @@
       "power": 0.4,
       "range": 2500,
       "rating": "D",
-      "time": 10
+      "scantime": 10
     },
     {
       "class": 0,
@@ -40,7 +40,7 @@
       "power": 0.8,
       "range": 3000,
       "rating": "C",
-      "time": 10
+      "scantime": 10
     },
     {
       "class": 0,
@@ -54,7 +54,7 @@
       "power": 1.6,
       "range": 3500,
       "rating": "B",
-      "time": 10
+      "scantime": 10
     },
     {
       "class": 0,
@@ -68,7 +68,7 @@
       "power": 3.2,
       "range": 4000,
       "rating": "A",
-      "time": 10
+      "scantime": 10
     }
   ]
 }

modules/hardpoints/mine_launcher.json

@@ -6,7 +6,7 @@
       "breachmax": 0,
       "breachmin": 0,
       "class": 1,
-      "clip": 3,
+      "clip": 1,
       "cost": 24260,
       "damage": 44,
       "damagedist": {
@@ -34,7 +34,7 @@
       "breachmax": 0,
       "breachmin": 0,
       "class": 1,
-      "clip": 3,
+      "clip": 1,
       "cost": 36400,
       "damage": 32,
       "damagedist": {
@@ -58,7 +58,7 @@
       "thermload": 5
     },
     {
-      "ammo": 36,
+      "ammo": 72,
       "breachdmg": 0,
       "breachmax": 0,
       "breachmin": 0,
@@ -81,7 +81,7 @@
       "piercing": 60,
       "power": 0.4,
       "rating": "I",
-      "reload": 2,
+      "reload": 6.6,
       "rof": 1,
       "thermload": 7.5
     }

modules/hardpoints/mining_laser.json

@@ -25,6 +25,31 @@
       "rating": "D",
       "thermload": 2
     },
+    {
+      "breachdmg": 0.3,
+      "breachmax": 0.2,
+      "breachmin": 0.1,
+      "class": 1,
+      "cost": 9400,
+      "damage": 2,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.5,
+      "edID": 128740819,
+      "eddbID": 1587,
+      "falloff": 300,
+      "grp": "ml",
+      "id": "w0",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "piercing": 18,
+      "power": 0.5,
+      "range": 500,
+      "rating": "D",
+      "thermload": 2
+    },
     {
       "breachdmg": 1.2,
       "breachmax": 0.2,
@@ -76,6 +101,31 @@
       "range": 500,
       "rating": "D",
       "thermload": 4
+    },
+    {
+      "breachdmg": 0.6,
+      "breachmax": 0.2,
+      "breachmin": 0.1,
+      "class": 2,
+      "cost": 32590,
+      "damage": 4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3,
+      "edID": 128740820,
+      "eddbID": 1588,
+      "falloff": 300,
+      "grp": "ml",
+      "id": "w1",
+      "integrity": 51,
+      "mass": 2,
+      "mount": "T",
+      "piercing": 18,
+      "power": 0.75,
+      "range": 500,
+      "rating": "D",
+      "thermload": 4
     }
   ]
 }

modules/hardpoints/missile_rack.json

@@ -127,7 +127,7 @@
       "breachmin": 0,
       "class": 2,
       "clip": 12,
-      "cost": 190227,
+      "cost": 1951040,
       "damage": 40,
       "damagedist": {
         "E": 1
@@ -135,6 +135,7 @@
       "distdraw": 0.24,
       "eddbID": 1559,
       "grp": "mr",
+      "edID": 128732552,
       "id": "1z",
       "integrity": 51,
       "mass": 4,

modules/hardpoints/multi_cannon.json

@@ -28,7 +28,7 @@
       "reload": 4,
       "rof": 7.69,
       "shotspeed": 1600,
-      "thermload": 0.1
+      "thermload": 0.09
     },
     {
       "ammo": 2100,
@@ -88,7 +88,7 @@
       "reload": 4,
       "rof": 7.14,
       "shotspeed": 1600,
-      "thermload": 0
+      "thermload": 0.04
     },
     {
       "ammo": 1000,
@@ -150,7 +150,7 @@
       "reload": 4,
       "rof": 7.14,
       "shotspeed": 1600,
-      "thermload": 0.2
+      "thermload": 0.18
     },
     {
       "ammo": 2100,
@@ -210,7 +210,7 @@
       "reload": 4,
       "rof": 6.25,
       "shotspeed": 1600,
-      "thermload": 0.1
+      "thermload": 0.09
     },
     {
       "ammo": 2100,
@@ -220,7 +220,7 @@
       "class": 3,
       "clip": 100,
       "cost": 140400,
-      "damage": 3.93,
+      "damage": 3.92,
       "damagedist": {
         "K": 1
       },
@@ -238,9 +238,9 @@
       "range": 4000,
       "rating": "C",
       "reload": 4,
-      "rof": 5.88,
+      "rof": 5.884,
       "shotspeed": 1600,
-      "thermload": 0.3
+      "thermload": 0.28
     },
     {
       "ammo": 2100,
@@ -270,7 +270,7 @@
       "reload": 5,
       "rof": 6.665,
       "shotspeed": 1600,
-      "thermload": 0.3
+      "thermload": 0.34
     },
     {
       "ammo": 2100,
@@ -280,7 +280,7 @@
       "class": 4,
       "clip": 100,
       "cost": 1177600,
-      "damage": 4.62,
+      "damage": 4.625,
       "damagedist": {
         "K": 1
       },
@@ -301,7 +301,7 @@
       "rof": 3.03,
       "roundspershot": 2,
       "shotspeed": 1600,
-      "thermload": 0.4
+      "thermload": 0.39
     },
     {
       "ammo": 2100,
@@ -332,7 +332,7 @@
       "rof": 3.365,
       "roundspershot": 2,
       "shotspeed": 1600,
-      "thermload": 0.5
+      "thermload": 0.51
     }
   ]
 }

modules/hardpoints/pulse_laser.json

@@ -6,7 +6,7 @@
       "breachmin": 0.4,
       "class": 1,
       "cost": 2200,
-      "damage": 2.04,
+      "damage": 2.05,
       "damagedist": {
         "T": 1
       },
@@ -23,8 +23,8 @@
       "power": 0.39,
       "range": 3000,
       "rating": "F",
-      "rof": 3.847,
+      "rof": 3.85,
-      "thermload": 0.3
+      "thermload": 0.33
     },
     {
       "breachdmg": 1.3,
@@ -49,8 +49,8 @@
       "power": 0.39,
       "range": 3000,
       "rating": "G",
-      "rof": 3.987,
+      "rof": 4,
-      "thermload": 0.3
+      "thermload": 0.31
     },
     {
       "breachdmg": 1,
@@ -58,7 +58,7 @@
       "breachmin": 0.4,
       "class": 1,
       "cost": 26000,
-      "damage": 1.18,
+      "damage": 1.19,
       "damagedist": {
         "T": 1
       },
@@ -75,8 +75,8 @@
       "power": 0.38,
       "range": 3000,
       "rating": "G",
-      "rof": 3.339,
+      "rof": 3.33,
-      "thermload": 0.2
+      "thermload": 0.19
     },
     {
       "breachdmg": 3,
@@ -84,7 +84,7 @@
       "breachmin": 0.4,
       "class": 2,
       "cost": 17600,
-      "damage": 3.49,
+      "damage": 3.5,
       "damagedist": {
         "T": 1
       },
@@ -101,8 +101,8 @@
       "power": 0.6,
       "range": 3000,
       "rating": "E",
-      "rof": 3.448,
+      "rof": 3.45,
-      "thermload": 0.6
+      "thermload": 0.56
     },
     {
       "breachdmg": 2.3,
@@ -127,8 +127,8 @@
       "power": 0.6,
       "range": 3000,
       "rating": "F",
-      "rof": 3.567,
+      "rof": 3.57,
-      "thermload": 0.5
+      "thermload": 0.54
     },
     {
       "breachdmg": 1.7,
@@ -136,7 +136,7 @@
       "breachmin": 0.4,
       "class": 2,
       "cost": 132800,
-      "damage": 2.04,
+      "damage": 2.05,
       "damagedist": {
         "T": 1
       },
@@ -153,8 +153,8 @@
       "power": 0.58,
       "range": 3000,
       "rating": "F",
-      "rof": 3.037,
+      "rof": 3.03,
-      "thermload": 0.3
+      "thermload": 0.33
     },
     {
       "breachdmg": 2.4,
@@ -206,8 +206,8 @@
       "power": 0.9,
       "range": 3000,
       "rating": "D",
-      "rof": 3.3,
+      "rof": 3.03,
-      "thermload": 1
+      "thermload": 0.96
     },
     {
       "breachdmg": 3.9,
@@ -232,8 +232,8 @@
       "power": 0.92,
       "range": 3000,
       "rating": "E",
-      "rof": 3.223,
+      "rof": 3.23,
-      "thermload": 0.9
+      "thermload": 0.92
     },
     {
       "breachdmg": 3,
@@ -241,7 +241,7 @@
       "breachmin": 0.4,
       "class": 3,
       "cost": 400400,
-      "damage": 3.49,
+      "damage": 3.5,
       "damagedist": {
         "T": 1
       },
@@ -258,8 +258,8 @@
       "power": 0.89,
       "range": 3000,
       "rating": "F",
-      "rof": 2.705,
+      "rof": 2.7,
-      "thermload": 0.6
+      "thermload": 0.56
     },
     {
       "breachdmg": 8.7,
@@ -267,7 +267,7 @@
       "breachmin": 0.4,
       "class": 4,
       "cost": 177600,
-      "damage": 10.23,
+      "damage": 10.24,
       "damagedist": {
         "T": 1
       },
@@ -284,8 +284,8 @@
       "power": 1.33,
       "range": 3000,
       "rating": "A",
-      "rof": 2.633,
+      "rof": 2.63,
-      "thermload": 1.6
+      "thermload": 1.64
     },
     {
       "breachdmg": 6.6,
@@ -310,8 +310,8 @@
       "power": 1.37,
       "range": 3000,
       "rating": "A",
-      "rof": 2.777,
+      "rof": 2.78,
-      "thermload": 1.6
+      "thermload": 1.56
     }
   ]
 }

modules/hardpoints/rail_gun.json

@@ -8,7 +8,7 @@
       "class": 1,
       "clip": 1,
       "cost": 51600,
-      "damage": 23.3,
+      "damage": 23.25,
       "damagedist": {
         "K": 0.5,
         "T": 0.5
@@ -22,13 +22,13 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
-      "piercing": 30,
+      "piercing": 100,
       "power": 1.15,
       "range": 3000,
       "rating": "D",
       "reload": 1,
       "rof": 1.6,
-      "thermload": 17.8
+      "thermload": 12
     },
     {
       "ammo": 80,
@@ -52,16 +52,16 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
-      "piercing": 48,
+      "piercing": 100,
       "power": 1.63,
       "range": 3000,
       "rating": "B",
       "reload": 1,
       "rof": 1.2,
-      "thermload": 30
+      "thermload": 20
     },
     {
-      "ammo": 90,
+      "ammo": 240,
       "breachdmg": 14.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -85,14 +85,14 @@
       "mass": 4,
       "mount": "F",
       "name": "Imperial Hammer",
-      "piercing": 150,
+      "piercing": 100,
       "power": 1.63,
       "pp": "Arissa Lavigny-Duval",
       "range": 3000,
       "rating": "B",
       "reload": 1,
       "rof": 4.1,
-      "thermload": 16
+      "thermload": 11
     }
   ]
 }

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,
@@ -55,6 +60,8 @@ module.exports = {
     rf: require('./internal/refinery').rf,
     sc: require('./internal/scanner').sc,
     scb: require('./internal/shield_cell_bank').scb,
-    sg: require('./internal/shield_generator').sg
+    sg: require('./internal/shield_generator').sg,
+    ss: require('./internal/surface_scanner').ss,
+    rpl: require('./internal/repair_limpet_controller').rpl
   }
 };

modules/internal/bi_weave_shield_generator.json

@@ -10,6 +10,7 @@
       "explres": 0.5,
       "grp": "bsg",
       "id": "B6",
+      "integrity": 40,
       "kinres": 0.4,
       "mass": 1.3,
       "maxmass": 63,
@@ -33,11 +34,12 @@
       "explres": 0.5,
       "grp": "bsg",
       "id": "B5",
+      "integrity": 51,
       "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
       "maxmul": 1.4,
-      "minmass": 23,
+      "minmass": 28,
       "minmul": 0.4,
       "optmass": 55,
       "optmul": 0.9,
@@ -56,6 +58,7 @@
       "explres": 0.5,
       "grp": "bsg",
       "id": "B4",
+      "integrity": 64,
       "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
@@ -79,6 +82,7 @@
       "explres": 0.5,
       "grp": "bsg",
       "id": "B3",
+      "integrity": 80,
       "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
@@ -102,6 +106,7 @@
       "explres": 0.5,
       "grp": "bsg",
       "id": "B2",
+      "integrity": 96,
       "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
@@ -125,6 +130,7 @@
       "explres": 0.5,
       "grp": "bsg",
       "id": "B1",
+      "integrity": 113,
       "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
@@ -148,6 +154,7 @@
       "explres": 0.5,
       "grp": "bsg",
       "id": "B0",
+      "integrity": 131,
       "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
@@ -171,6 +178,7 @@
       "explres": 0.5,
       "grp": "bsg",
       "id": "B7",
+      "integrity": 150,
       "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,

modules/internal/docking_computer.json

@@ -7,6 +7,7 @@
       "eddbID": 890,
       "grp": "dc",
       "id": "24",
+      "integrity": 10,
       "name": "Standard Docking Computer",
       "power": 0.39,
       "rating": "E"

modules/internal/fighter_hangar.json

@@ -5,10 +5,11 @@
       "class": 5,
       "cost": 575660,
       "edID": 128727930,
-      "eddbID": 1560,
+      "eddbID": 1562,
       "fightercost": 1030,
       "grp": "fh",
       "id": "fr",
+      "integrity": 60,
       "mass": 20,
       "power": 0.25,
       "rating": "D",
@@ -23,6 +24,7 @@
       "fightercost": 1030,
       "grp": "fh",
       "id": "fm",
+      "integrity": 80,
       "mass": 40,
       "power": 0.35,
       "rating": "D",
@@ -33,10 +35,11 @@
       "class": 7,
       "edID": 128727932,
       "cost": 2369330,
-      "eddbID": 1562,
+      "eddbID": 1560,
       "fightercost": 1030,
       "grp": "fh",
       "id": "fh",
+      "integrity": 120,
       "mass": 60,
       "power": 0.35,
       "rating": "D",

modules/internal/frame_shift_drive_interdictor.json

@@ -9,6 +9,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6a",
+      "integrity": 32,
       "mass": 1.3,
       "power": 0.14,
       "ranget": 3, 
@@ -23,6 +24,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "69",
+      "integrity": 24,
       "mass": 0.5,
       "power": 0.18,
       "ranget": 4, 
@@ -37,6 +39,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "68",
+      "integrity": 40,
       "mass": 1.3,
       "power": 0.23,
       "ranget": 5, 
@@ -51,6 +54,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "67",
+      "integrity": 56,
       "mass": 2,
       "power": 0.28,
       "ranget": 6, 
@@ -65,6 +69,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "66",
+      "integrity": 48,
       "mass": 1.3,
       "power": 0.32,
       "ranget": 7, 
@@ -79,6 +84,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6f",
+      "integrity": 41,
       "mass": 2.5,
       "power": 0.17,
       "ranget": 6, 
@@ -93,6 +99,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6e",
+      "integrity": 51,
       "mass": 1,
       "power": 0.22,
       "ranget": 7, 
@@ -107,6 +114,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6d",
+      "integrity": 51,
       "mass": 2.5,
       "power": 0.28,
       "ranget": 8, 
@@ -121,6 +129,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6c",
+      "integrity": 71,
       "mass": 4,
       "power": 0.34,
       "ranget": 9, 
@@ -135,6 +144,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6b",
+      "integrity": 61,
       "mass": 2.5,
       "power": 0.39,
       "ranget": 10, 
@@ -149,6 +159,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6k",
+      "integrity": 51,
       "mass": 5,
       "power": 0.2,
       "ranget": 9, 
@@ -163,6 +174,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6j",
+      "integrity": 38,
       "mass": 2,
       "power": 0.27,
       "ranget": 10, 
@@ -177,6 +189,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6i",
+      "integrity": 64,
       "mass": 5,
       "power": 0.34,
       "ranget": 11, 
@@ -191,6 +204,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6h",
+      "integrity": 90,
       "mass": 8,
       "power": 0.41,
       "ranget": 12, 
@@ -205,6 +219,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6g",
+      "integrity": 77,
       "mass": 5,
       "power": 0.48,
       "ranget": 13, 
@@ -219,6 +234,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6p",
+      "integrity": 64,
       "mass": 10,
       "power": 0.25,
       "ranget": 12, 
@@ -233,6 +249,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6o",
+      "integrity": 48,
       "mass": 4,
       "power": 0.33,
       "ranget": 13, 
@@ -247,6 +264,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6n",
+      "integrity": 80,
       "mass": 10,
       "power": 0.41,
       "ranget": 14, 
@@ -261,6 +279,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6m",
+      "integrity": 112,
       "mass": 16,
       "power": 0.49,
       "ranget": 15, 
@@ -275,6 +294,7 @@
       "facinglimit": 50,
       "grp": "fi",
       "id": "6l",
+      "integrity": 96,
       "mass": 10,
       "power": 0.57,
       "ranget": 16, 

modules/internal/module_reinforcement_package.json

@@ -7,7 +7,7 @@
       "edID": 128737270,
       "grp": "mrp",
       "id": "m0",
-      "integrity": 70,
+      "integrity": 77,
       "mass": 2,
       "protection": 0.3,
       "rating": "E"
@@ -19,7 +19,7 @@
       "edID": 128737271,
       "grp": "mrp",
       "id": "m1",
-      "integrity": 30,
+      "integrity": 70,
       "mass": 1,
       "protection": 0.6,
       "rating": "D"
@@ -31,7 +31,7 @@
       "edID": 128737272,
       "grp": "mrp",
       "id": "m2",
-      "integrity": 105,
+      "integrity": 115,
       "mass": 4,
       "protection": 0.3,
       "rating": "E"
@@ -43,7 +43,7 @@
       "edID": 128737273,
       "grp": "mrp",
       "id": "m3",
-      "integrity": 45,
+      "integrity": 105,
       "mass": 2,
       "protection": 0.6,
       "rating": "D"
@@ -55,7 +55,7 @@
       "edID": 128737274,
       "grp": "mrp",
       "id": "m4",
-      "integrity": 155,
+      "integrity": 170,
       "mass": 8,
       "protection": 0.3,
       "rating": "E"
@@ -67,7 +67,7 @@
       "edID": 128737275,
       "grp": "mrp",
       "id": "m5",
-      "integrity": 65,
+      "integrity": 155,
       "mass": 4,
       "protection": 0.6,
       "rating": "D"
@@ -79,7 +79,7 @@
       "edID": 128737276,
       "grp": "mrp",
       "id": "m6",
-      "integrity": 235,
+      "integrity": 260,
       "mass": 16,
       "protection": 0.3,
       "rating": "E"
@@ -91,7 +91,7 @@
       "edID": 128737277,
       "grp": "mrp",
       "id": "m7",
-      "integrity": 95,
+      "integrity": 235,
       "mass": 8,
       "protection": 0.6,
       "rating": "D"
@@ -103,7 +103,7 @@
       "edID": 128737278,
       "grp": "mrp",
       "id": "m8",
-      "integrity": 350,
+      "integrity": 385,
       "mass": 32,
       "protection": 0.3,
       "rating": "E"
@@ -115,7 +115,7 @@
       "edID": 128737279,
       "grp": "mrp",
       "id": "m9",
-      "integrity": 145,
+      "integrity": 350,
       "mass": 16,
       "protection": 0.6,
       "rating": "D"

modules/internal/planetary_vehicle_hanger.json

@@ -8,6 +8,7 @@
       "eddbID": 1528,
       "grp": "pv",
       "id": "v5",
+      "integrity": 30,
       "mass": 12,
       "power": 0.25,
       "rating": "H"
@@ -20,6 +21,7 @@
       "eddbID": 1529,
       "grp": "pv",
       "id": "v6",
+      "integrity": 30,
       "mass": 6,
       "power": 0.75,
       "rating": "G"
@@ -32,6 +34,7 @@
       "eddbID": 1526,
       "grp": "pv",
       "id": "v3",
+      "integrity": 30,
       "mass": 20,
       "power": 0.4,
       "rating": "H"
@@ -44,6 +47,7 @@
       "eddbID": 1527,
       "grp": "pv",
       "id": "v4",
+      "integrity": 30,
       "mass": 10,
       "power": 1.2,
       "rating": "G"
@@ -56,6 +60,7 @@
       "eddbID": 1524,
       "grp": "pv",
       "id": "v1",
+      "integrity": 30,
       "mass": 34,
       "power": 0.6,
       "rating": "H"
@@ -68,6 +73,7 @@
       "eddbID": 1525,
       "grp": "pv",
       "id": "v2",
+      "integrity": 30,
       "mass": 17,
       "power": 1.8,
       "rating": "G"

modules/internal/pristmatic_shield_generator.json

@@ -10,6 +10,7 @@
       "explres": 0.5,
       "grp": "psg",
       "id": "p6",
+      "integrity": 48,
       "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 63,
@@ -34,6 +35,7 @@
       "explres": 0.5,
       "grp": "psg",
       "id": "p5",
+      "integrity": 61,
       "kinres": 0.4,
       "mass": 5,
       "maxmass": 138,
@@ -58,6 +60,7 @@
       "explres": 0.5,
       "grp": "psg",
       "id": "p4",
+      "integrity": 77,
       "kinres": 0.4,
       "mass": 10,
       "maxmass": 413,
@@ -82,6 +85,7 @@
       "explres": 0.5,
       "grp": "psg",
       "id": "p3",
+      "integrity": 96,
       "kinres": 0.4,
       "mass": 20,
       "maxmass": 713,
@@ -106,6 +110,7 @@
       "explres": 0.5,
       "grp": "psg",
       "id": "p2",
+      "integrity": 115,
       "kinres": 0.4,
       "mass": 40,
       "maxmass": 1013,
@@ -130,6 +135,7 @@
       "explres": 0.5,
       "grp": "psg",
       "id": "p1",
+      "integrity": 136,
       "kinres": 0.4,
       "mass": 80,
       "maxmass": 1350,
@@ -154,6 +160,7 @@
       "explres": 0.5,
       "grp": "psg",
       "id": "p0",
+      "integrity": 157,
       "kinres": 0.4,
       "mass": 160,
       "maxmass": 2650,
@@ -178,6 +185,7 @@
       "explres": 0.5,
       "grp": "psg",
       "id": "p7",
+      "integrity": 180,
       "kinres": 0.4,
       "mass": 320,
       "maxmass": 4500,

modules/internal/repair_limpet_controller.json

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

modules/internal/scanner.json

@@ -7,6 +7,7 @@
       "eddbID": 1244,
       "grp": "sc",
       "id": "2f",
+      "integrity": 40,
       "mass": 2,
       "name": "Advanced Discovery Scanner",
       "power": 0,
@@ -20,6 +21,7 @@
       "eddbID": 1243,
       "grp": "sc",
       "id": "2g",
+      "integrity": 40,
       "mass": 2,
       "name": "Intermediate Discovery Scanner",
       "power": 0,
@@ -33,23 +35,12 @@
       "eddbID": 1242,
       "grp": "sc",
       "id": "2h",
+      "integrity": 40,
       "mass": 2,
       "name": "Basic Discovery Scanner",
       "power": 0,
       "rangeLS": 500,
       "rating": "E"
-    },
-    {
-      "class": 1,
-      "cost": 250000,
-      "edID": 128666634,
-      "eddbID": 1245,
-      "grp": "sc",
-      "id": "2i",
-      "mass": 1.3,
-      "name": "Detailed Surface Scanner",
-      "power": 0,
-      "rating": "C"
     }
   ]
 }

modules/internal/shield_cell_bank.json

@@ -1,10 +1,11 @@
 {
   "scb": [
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 1,
+      "clip": 1,
       "cost": 517,
       "duration": 1,
       "edID": 128064298,
@@ -21,10 +22,11 @@
       "thermload": 170
     },
     {
+      "ammo": 0,
       "ammocost": 300,
       "boot": 25,
-      "cells": 1,
       "class": 1,
+      "clip": 1,
       "cost": 1293,
       "duration": 1,
       "edID": 128064299,
@@ -41,10 +43,11 @@
       "thermload": 170
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 1,
+      "clip": 1,
       "cost": 3231,
       "duration": 1,
       "edID": 128064300,
@@ -61,10 +64,11 @@
       "thermload": 170
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 1,
+      "clip": 1,
       "cost": 8078,
       "duration": 1,
       "edID": 128064301,
@@ -81,10 +85,11 @@
       "thermload": 170
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 1,
+      "clip": 1,
       "cost": 20195,
       "duration": 1,
       "edID": 128064302,
@@ -101,10 +106,11 @@
       "thermload": 170
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 2,
+      "clip": 1,
       "cost": 1448,
       "duration": 2,
       "edID": 128064303,
@@ -115,16 +121,17 @@
       "mass": 2.5,
       "power": 0.5,
       "rating": "E",
-      "shieldreinforcement": 28,
+      "shieldreinforcement": 14,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 2,
+      "clip": 1,
       "cost": 3619,
       "duration": 2,
       "edID": 128064304,
@@ -135,16 +142,17 @@
       "mass": 1,
       "power": 0.67,
       "rating": "D",
-      "shieldreinforcement": 36,
+      "shieldreinforcement": 18,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 2,
+      "clip": 1,
       "cost": 9048,
       "duration": 2,
       "edID": 128064305,
@@ -155,16 +163,17 @@
       "mass": 2.5,
       "power": 0.84,
       "rating": "C",
-      "shieldreinforcement": 46,
+      "shieldreinforcement": 23,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 2,
+      "clip": 1,
       "cost": 22619,
       "duration": 2,
       "edID": 128064306,
@@ -175,16 +184,17 @@
       "mass": 4,
       "power": 1.01,
       "rating": "B",
-      "shieldreinforcement": 56,
+      "shieldreinforcement": 28,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 2,
+      "clip": 1,
       "cost": 56547,
       "duration": 2,
       "edID": 128064307,
@@ -195,16 +205,17 @@
       "mass": 2.5,
       "power": 1.18,
       "rating": "A",
-      "shieldreinforcement": 64,
+      "shieldreinforcement": 32,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 3,
+      "clip": 1,
       "cost": 4053,
       "duration": 2,
       "edID": 128064308,
@@ -215,16 +226,17 @@
       "mass": 5,
       "power": 0.61,
       "rating": "E",
-      "shieldreinforcement": 34,
+      "shieldreinforcement": 17,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 3,
+      "clip": 1,
       "cost": 10133,
       "duration": 2,
       "edID": 128064309,
@@ -235,16 +247,17 @@
       "mass": 2,
       "power": 0.82,
       "rating": "D",
-      "shieldreinforcement": 46,
+      "shieldreinforcement": 23,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 3,
+      "clip": 1,
       "cost": 25333,
       "duration": 2,
       "edID": 128064310,
@@ -255,16 +268,17 @@
       "mass": 5,
       "power": 1.02,
       "rating": "C",
-      "shieldreinforcement": 58,
+      "shieldreinforcement": 29,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 3,
+      "clip": 1,
       "cost": 61909,
       "duration": 2,
       "edID": 128064311,
@@ -275,16 +289,17 @@
       "mass": 8,
       "power": 1.22,
       "rating": "B",
-      "shieldreinforcement": 70,
+      "shieldreinforcement": 35,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 3,
+      "clip": 1,
       "cost": 158331,
       "duration": 2,
       "edID": 128064312,
@@ -295,16 +310,17 @@
       "mass": 5,
       "power": 1.43,
       "rating": "A",
-      "shieldreinforcement": 82,
+      "shieldreinforcement": 41,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 4,
+      "clip": 1,
       "cost": 11349,
       "duration": 3,
       "edID": 128064313,
@@ -315,16 +331,17 @@
       "mass": 10,
       "power": 0.74,
       "rating": "E",
-      "shieldreinforcement": 60,
+      "shieldreinforcement": 20,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 4,
+      "clip": 1,
       "cost": 28373,
       "duration": 3,
       "edID": 128064314,
@@ -335,16 +352,17 @@
       "mass": 4,
       "power": 0.98,
       "rating": "D",
-      "shieldreinforcement": 78,
+      "shieldreinforcement": 26,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 4,
+      "clip": 1,
       "cost": 70932,
       "duration": 3,
       "edID": 128064315,
@@ -355,16 +373,17 @@
       "mass": 10,
       "power": 1.23,
       "rating": "C",
-      "shieldreinforcement": 99,
+      "shieldreinforcement": 33,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 4,
+      "clip": 1,
       "cost": 177331,
       "duration": 3,
       "edID": 128064316,
@@ -375,16 +394,17 @@
       "mass": 16,
       "power": 1.48,
       "rating": "B",
-      "shieldreinforcement": 117,
+      "shieldreinforcement": 39,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 4,
+      "clip": 1,
       "cost": 443328,
       "duration": 3,
       "edID": 128064317,
@@ -395,16 +415,17 @@
       "mass": 10,
       "power": 1.72,
       "rating": "A",
-      "shieldreinforcement": 138,
+      "shieldreinforcement": 46,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 5,
+      "clip": 1,
       "cost": 31778,
       "duration": 5,
       "edID": 128064318,
@@ -415,16 +436,17 @@
       "mass": 20,
       "power": 0.9,
       "rating": "E",
-      "shieldreinforcement": 105,
+      "shieldreinforcement": 21,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 5,
+      "clip": 1,
       "cost": 79444,
       "duration": 5,
       "edID": 128064319,
@@ -435,16 +457,17 @@
       "mass": 8,
       "power": 1.2,
       "rating": "D",
-      "shieldreinforcement": 140,
+      "shieldreinforcement": 28,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 5,
+      "clip": 1,
       "cost": 194143,
       "duration": 5,
       "edID": 128064320,
@@ -455,16 +478,17 @@
       "mass": 20,
       "power": 1.5,
       "rating": "C",
-      "shieldreinforcement": 175,
+      "shieldreinforcement": 35,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 5,
+      "clip": 1,
       "cost": 496527,
       "duration": 5,
       "edID": 128064321,
@@ -475,16 +499,17 @@
       "mass": 32,
       "power": 1.8,
       "rating": "B",
-      "shieldreinforcement": 205,
+      "shieldreinforcement": 41,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 5,
+      "clip": 1,
       "cost": 1210285,
       "duration": 5,
       "edID": 128064322,
@@ -495,16 +520,17 @@
       "mass": 20,
       "power": 2.1,
       "rating": "A",
-      "shieldreinforcement": 240,
+      "shieldreinforcement": 48,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 6,
+      "clip": 1,
       "cost": 88987,
       "duration": 8,
       "edID": 128064323,
@@ -515,16 +541,17 @@
       "mass": 40,
       "power": 1.06,
       "rating": "E",
-      "shieldreinforcement": 160,
+      "shieldreinforcement": 20,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 6,
+      "clip": 1,
       "cost": 222444,
       "duration": 8,
       "edID": 128064324,
@@ -535,16 +562,17 @@
       "mass": 16,
       "power": 1.42,
       "rating": "D",
-      "shieldreinforcement": 208,
+      "shieldreinforcement": 26,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 6,
+      "clip": 1,
       "cost": 556110,
       "duration": 8,
       "edID": 128064325,
@@ -555,16 +583,17 @@
       "mass": 40,
       "power": 1.77,
       "rating": "C",
-      "shieldreinforcement": 264,
+      "shieldreinforcement": 33,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 6,
+      "clip": 1,
       "cost": 1390275,
       "duration": 8,
       "edID": 128064326,
@@ -575,16 +604,17 @@
       "mass": 64,
       "power": 2.12,
       "rating": "B",
-      "shieldreinforcement": 312,
+      "shieldreinforcement": 39,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 6,
+      "clip": 1,
       "cost": 3475688,
       "duration": 8,
       "edID": 128064327,
@@ -595,16 +625,17 @@
       "mass": 40,
       "power": 2.48,
       "rating": "A",
-      "shieldreinforcement": 368,
+      "shieldreinforcement": 46,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 7,
+      "clip": 1,
       "cost": 249137,
       "duration": 11,
       "edID": 128064328,
@@ -615,16 +646,17 @@
       "mass": 80,
       "power": 1.24,
       "rating": "E",
-      "shieldreinforcement": 264,
+      "shieldreinforcement": 24,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 7,
+      "clip": 1,
       "cost": 622843,
       "duration": 11,
       "edID": 128064329,
@@ -635,16 +667,17 @@
       "mass": 32,
       "power": 1.66,
       "rating": "D",
-      "shieldreinforcement": 352,
+      "shieldreinforcement": 32,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 7,
+      "clip": 1,
       "cost": 1557108,
       "duration": 11,
       "edID": 128064330,
@@ -655,16 +688,17 @@
       "mass": 80,
       "power": 2.07,
       "rating": "C",
-      "shieldreinforcement": 451,
+      "shieldreinforcement": 41,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 7,
+      "clip": 1,
       "cost": 3892770,
       "duration": 11,
       "edID": 128064331,
@@ -675,16 +709,17 @@
       "mass": 128,
       "power": 2.48,
       "rating": "B",
-      "shieldreinforcement": 539,
+      "shieldreinforcement": 49,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 7,
+      "clip": 1,
       "cost": 9731925,
       "duration": 11,
       "edID": 128064332,
@@ -695,16 +730,17 @@
       "mass": 80,
       "power": 2.9,
       "rating": "A",
-      "shieldreinforcement": 627,
+      "shieldreinforcement": 57,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 8,
+      "clip": 1,
       "cost": 697584,
       "duration": 17,
       "edID": 128064333,
@@ -715,16 +751,17 @@
       "mass": 160,
       "power": 1.44,
       "rating": "E",
-      "shieldreinforcement": 476,
+      "shieldreinforcement": 28,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 800
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 8,
+      "clip": 1,
       "cost": 1743961,
       "duration": 17,
       "edID": 128064334,
@@ -735,16 +772,17 @@
       "mass": 64,
       "power": 1.92,
       "rating": "D",
-      "shieldreinforcement": 629,
+      "shieldreinforcement": 37,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 800
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 8,
+      "clip": 1,
       "cost": 4359903,
       "duration": 17,
       "edID": 128064335,
@@ -755,16 +793,17 @@
       "mass": 160,
       "power": 2.4,
       "rating": "C",
-      "shieldreinforcement": 799,
+      "shieldreinforcement": 47,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 800
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 8,
+      "clip": 1,
       "cost": 10899756,
       "duration": 17,
       "edID": 128064336,
@@ -775,16 +814,17 @@
       "mass": 256,
       "power": 2.88,
       "rating": "B",
-      "shieldreinforcement": 952,
+      "shieldreinforcement": 56,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 800
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 8,
+      "clip": 1,
       "cost": 27249391,
       "duration": 17,
       "edID": 128064337,
@@ -795,7 +835,7 @@
       "mass": 160,
       "power": 3.36,
       "rating": "A",
-      "shieldreinforcement": 1105,
+      "shieldreinforcement": 65,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 800

modules/internal/shield_generator.json

@@ -10,6 +10,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "1x",
+      "integrity": 48,
       "kinres": 0.4,
       "mass": 1.3,
       "maxmass": 63,
@@ -33,6 +34,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "3v",
+      "integrity": 41,
       "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
@@ -56,6 +58,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "3u",
+      "integrity": 31,
       "kinres": 0.4,
       "mass": 1,
       "maxmass": 138,
@@ -79,6 +82,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "3t",
+      "integrity": 51,
       "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
@@ -102,6 +106,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "3s",
+      "integrity": 71,
       "kinres": 0.4,
       "mass": 4,
       "maxmass": 138,
@@ -125,6 +130,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "3r",
+      "integrity": 61,
       "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
@@ -148,6 +154,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "44",
+      "integrity": 51,
       "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
@@ -171,6 +178,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "43",
+      "integrity": 38,
       "kinres": 0.4,
       "mass": 2,
       "maxmass": 413,
@@ -194,6 +202,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "42",
+      "integrity": 64,
       "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
@@ -217,6 +226,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "41",
+      "integrity": 90,
       "kinres": 0.4,
       "mass": 8,
       "maxmass": 413,
@@ -240,6 +250,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "40",
+      "integrity": 77,
       "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
@@ -263,6 +274,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "49",
+      "integrity": 64,
       "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
@@ -286,6 +298,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "48",
+      "integrity": 48,
       "kinres": 0.4,
       "mass": 4,
       "maxmass": 713,
@@ -309,6 +322,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "47",
+      "integrity": 80,
       "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
@@ -332,6 +346,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "46",
+      "integrity": 112,
       "kinres": 0.4,
       "mass": 16,
       "maxmass": 713,
@@ -355,6 +370,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "45",
+      "integrity": 96,
       "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
@@ -378,6 +394,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4e",
+      "integrity": 77,
       "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
@@ -401,6 +418,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4d",
+      "integrity": 58,
       "kinres": 0.4,
       "mass": 8,
       "maxmass": 1013,
@@ -424,6 +442,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4c",
+      "integrity": 96,
       "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
@@ -447,6 +466,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4b",
+      "integrity": 134,
       "kinres": 0.4,
       "mass": 32,
       "maxmass": 1013,
@@ -470,6 +490,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4a",
+      "integrity": 115,
       "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
@@ -493,6 +514,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4j",
+      "integrity": 90,
       "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
@@ -516,6 +538,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4i",
+      "integrity": 68,
       "kinres": 0.4,
       "mass": 16,
       "maxmass": 1350,
@@ -539,6 +562,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4h",
+      "integrity": 113,
       "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
@@ -562,6 +586,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4g",
+      "integrity": 158,
       "kinres": 0.4,
       "mass": 64,
       "maxmass": 1350,
@@ -585,6 +610,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4f",
+      "integrity": 136,
       "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
@@ -608,6 +634,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4o",
+      "integrity": 105,
       "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
@@ -631,6 +658,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4n",
+      "integrity": 79,
       "kinres": 0.4,
       "mass": 32,
       "maxmass": 2650,
@@ -654,6 +682,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4m",
+      "integrity": 131,
       "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
@@ -677,6 +706,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4l",
+      "integrity": 183,
       "kinres": 0.4,
       "mass": 128,
       "maxmass": 2650,
@@ -700,6 +730,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4k",
+      "integrity": 157,
       "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
@@ -723,6 +754,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4t",
+      "integrity": 120,
       "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,
@@ -746,6 +778,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4s",
+      "integrity": 90,
       "kinres": 0.4,
       "mass": 64,
       "maxmass": 4500,
@@ -769,6 +802,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4r",
+      "integrity": 150,
       "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,
@@ -792,6 +826,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4q",
+      "integrity": 210,
       "kinres": 0.4,
       "mass": 256,
       "maxmass": 4500,
@@ -815,6 +850,7 @@
       "explres": 0.5,
       "grp": "sg",
       "id": "4p",
+      "integrity": 180,
       "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,

modules/internal/surface_scanner.json

@@ -0,0 +1,16 @@
+{
+  "ss": [
+    {
+      "class": 1,
+      "cost": 250000,
+      "edID": 128666634,
+      "eddbID": 1245,
+      "grp": "ss",
+      "id": "2i",
+      "mass": 1.3,
+      "name": "Detailed Surface Scanner",
+      "power": 0,
+      "rating": "C"
+    }
+  ]
+}

modules/standard/frame_shift_drive.json

@@ -313,7 +313,7 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Ff",
-      "integrity": 106,
+      "integrity": 120,
       "mass": 20,
       "maxfuel": 5,
       "optmass": 1050,

modules/standard/power_plant.json

@@ -138,7 +138,7 @@
       "eff": 1,
       "grp": "pp",
       "id": "po",
-      "integrity": 90,
+      "integrity": 102,
       "mass": 40,
       "pgen": 16.8,
       "rating": "E"
@@ -151,7 +151,7 @@
       "eff": 0.75,
       "grp": "pp",
       "id": "pn",
-      "integrity": 113,
+      "integrity": 90,
       "mass": 16,
       "pgen": 18.9,
       "rating": "D"
@@ -164,7 +164,7 @@
       "eff": 0.5,
       "grp": "pp",
       "id": "pm",
-      "integrity": 136,
+      "integrity": 113,
       "mass": 20,
       "pgen": 21,
       "rating": "C"
@@ -177,7 +177,7 @@
       "eff": 0.45,
       "grp": "pp",
       "id": "pl",
-      "integrity": 124,
+      "integrity": 136,
       "mass": 32,
       "pgen": 23.1,
       "rating": "B"
@@ -190,7 +190,7 @@
       "eff": 0.4,
       "grp": "pp",
       "id": "pk",
-      "integrity": 118,
+      "integrity": 124,
       "mass": 20,
       "pgen": 25.2,
       "rating": "A"

modules/standard/sensors.json

@@ -1,6 +1,7 @@
 {
   "s": [
     {
+      "angle": 30,
       "class": 8,
       "cost": 697580,
       "edID": 128064253,
@@ -14,6 +15,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 1743960,
       "edID": 128064254,
@@ -27,6 +29,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 4359900,
       "edID": 128064255,
@@ -40,6 +43,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 10899760,
       "edID": 128064256,
@@ -53,6 +57,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 27249390,
       "edID": 128064257,
@@ -66,6 +71,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 249140,
       "edID": 128064248,
@@ -79,6 +85,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 622840,
       "edID": 128064249,
@@ -92,6 +99,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 1557110,
       "edID": 128064250,
@@ -105,6 +113,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 3892770,
       "edID": 128064251,
@@ -118,6 +127,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 9731930,
       "edID": 128064252,
@@ -131,6 +141,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 88980,
       "edID": 128064243,
@@ -144,6 +155,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 222440,
       "edID": 128064244,
@@ -157,6 +169,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 556110,
       "edID": 128064245,
@@ -170,6 +183,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 1390280,
       "edID": 128064246,
@@ -183,6 +197,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 3475690,
       "edID": 128064247,
@@ -196,6 +211,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 31780,
       "edID": 128064238,
@@ -209,6 +225,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 79440,
       "edID": 128064239,
@@ -222,6 +239,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 198610,
       "edID": 128064240,
@@ -235,6 +253,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 496530,
       "edID": 128064241,
@@ -248,6 +267,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 1241320,
       "edID": 128064242,
@@ -261,6 +281,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 11350,
       "edID": 128064233,
@@ -274,6 +295,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 28370,
       "edID": 128064234,
@@ -287,6 +309,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 70930,
       "edID": 128064235,
@@ -300,6 +323,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 177330,
       "edID": 128064236,
@@ -313,6 +337,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 443330,
       "edID": 128064237,
@@ -326,6 +351,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 4050,
       "edID": 128064228,
@@ -339,6 +365,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 10130,
       "edID": 128064229,
@@ -352,6 +379,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 25330,
       "edID": 128064230,
@@ -365,6 +393,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 63330,
       "edID": 128064231,
@@ -378,6 +407,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 158330,
       "edID": 128064232,
@@ -391,6 +421,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 1450,
       "edID": 128064223,
@@ -404,6 +435,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 3620,
       "edID": 128064224,
@@ -417,6 +449,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 9050,
       "edID": 128064225,
@@ -430,6 +463,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 22620,
       "edID": 128064226,
@@ -443,6 +477,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 56550,
       "edID": 128064227,
@@ -456,6 +491,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 520,
       "edID": 128064218,
@@ -469,6 +505,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 1290,
       "edID": 128064219,
@@ -482,6 +519,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 3230,
       "edID": 128064220,
@@ -495,6 +533,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 8080,
       "edID": 128064221,
@@ -508,6 +547,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 20200,
       "edID": 128064222,

package.json

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

ships/asp_scout.json

@@ -32,12 +32,12 @@
     "slots": {
       "standard": [4, 4, 4, 3, 4, 4, 4],
       "hardpoints": [2, 2, 1, 1, 0, 0],
-      "internal": [4, 4, 3, 3, 2]
+      "internal": [5, 4, 3, 3, 2, 2]
     },
     "defaults": {
       "standard": ["4E", "4E", "4E", "3E", "4E", "4E", "4C"],
       "hardpoints": [0, 0, 17, 17, 0, 0],
-      "internal": ["02", "02", "44", 0, 0]
+      "internal": ["02", "02", "44", 0, 0, 0]
     }
   }
 }

ships/beluga.json

@@ -13,7 +13,7 @@
       "baseShieldStrength": 280,
       "baseArmour": 280,
       "hardness": 60,
-      "hullMass": 1100,
+      "hullMass": 950,
       "masslock": 18,
       "pipSpeed": 0.1125,
       "luxuryCabins": true,
@@ -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/diamondback_explorer.json

@@ -1,6 +1,7 @@
 {
   "diamondback_explorer": {
-    "edID": 128671831, "eddbID": 5,
+    "edID": 128671831,
+    "eddbID": 5,
     "properties": {
       "name": "Diamondback Explorer",
       "manufacturer": "Lakon",
@@ -12,7 +13,7 @@
       "baseShieldStrength": 150,
       "baseArmour": 150,
       "hardness": 42,
-      "hullMass": 298,
+      "hullMass": 260,
       "masslock": 10,
       "pipSpeed": 0.09625,
       "pitch": 35,
@@ -31,12 +32,12 @@
     "slots": {
       "standard": [ 4, 4, 5, 3, 4, 3, 5],
       "hardpoints": [ 3, 2, 2, 0, 0, 0, 0],
-      "internal": [ 4, 4, 3, 3, 2]
+      "internal": [ 4, 4, 3, 3, 2, 2]
     },
     "defaults": {
       "standard": ["4E", "4E", "5E", "3E", "4E", "3E", "5C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["49", "02", "01", 0, "2h"]
+      "internal": ["49", "02", "01", 0, "2h", 0]
     }
   }
 }

ships/dolphin.json

@@ -0,0 +1,50 @@
+{
+  "dolphin": {
+    "edID": 128049291,
+    "eddbID": 31,
+    "properties": {
+      "name": "Dolphin",
+      "manufacturer": "Saud Kruger",
+      "class": 1,
+      "hullCost": 1115330,
+      "speed": 250,
+      "boost": 350,
+      "boostEnergy": 10,
+      "baseShieldStrength": 110,
+      "baseArmour": 110,
+      "hardness": 35,
+      "hullMass": 140,
+      "masslock": 9,
+      "pipSpeed": 0.13,
+      "luxuryCabins": true,
+      "pitch": 30,
+      "roll": 100,
+      "yaw": 20,
+      "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 },
+      { "id": "cs", "edID": 128049294, "eddbID": 1591, "grp": "bh", "cost": 1203600, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "ct", "edID": 128049295, "eddbID": 1592, "grp": "bh", "cost": 2808390, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cu", "edID": 128049296, "eddbID": 1593, "grp": "bh", "cost": 3152080, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [4, 5, 4, 4, 3, 3, 4],
+      "hardpoints": [1, 1, 0, 0, 0],
+      "internal": [
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        4, 4, 3, 2, 2, 2
+      ]
+    },
+    "defaults": {
+      "standard": ["4E", "5E", "4E", "4E", "3E", "3E", "4C"],
+      "hardpoints": [17, 17, 0, 0, 0],
+      "internal": ["md", "02", "49", "01", "00", 0, "2h"]
+    }
+  }
+}

ships/federal_assault_ship.json

@@ -1,6 +1,7 @@
 {
   "federal_assault_ship": {
-    "edID": 128672145, "eddbID": 8,
+    "edID": 128672145,
+    "eddbID": 8,
     "properties": {
       "name": "Federal Assault Ship",
       "manufacturer": "Core Dynamics",
@@ -21,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

@@ -1,6 +1,7 @@
 {
   "imperial_courier": {
-    "edID": 128671223, "eddbID": 14,
+    "edID": 128671223,
+    "eddbID": 14,
     "properties": {
       "name": "Imperial Courier",
       "manufacturer": "Gutamaya",
@@ -21,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

@@ -1,6 +1,7 @@
 {
   "imperial_cutter": {
-    "edID": 128049375, "eddbID": 26,
+    "edID": 128049375,
+    "eddbID": 26,
     "properties": {
       "name": "Imperial Cutter",
       "manufacturer": "Gutamaya",
@@ -22,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

@@ -8,6 +8,7 @@ module.exports = {
   cobra_mk_iv: require('./cobra_mk_iv').cobra_mk_iv,
   diamondback_explorer: require('./diamondback_explorer').diamondback_explorer,
   diamondback: require('./diamondback_scout').diamondback,
+  dolphin: require('./dolphin').dolphin,
   eagle: require('./eagle').eagle,
   federal_assault_ship: require('./federal_assault_ship').federal_assault_ship,
   federal_corvette: require('./federal_corvette').federal_corvette,
@@ -26,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/orca.json

@@ -13,8 +13,8 @@
       "baseShieldStrength": 220,
       "baseArmour": 220,
       "hardness": 55,
-      "hullMass": 580,
+      "hullMass": 290,
-      "masslock": 13,
+      "masslock": 16,
       "pipSpeed": 0.08375,
       "luxuryCabins": true,
       "pitch": 25,

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]
+      }
+    }
+  }
+  

spec/data-spec.js

@@ -211,8 +211,7 @@ describe('JSON Data', function() {
       const module = Modifications.modules[m];
       for (var bp in module.blueprints) {
         expect(Modifications.blueprints[bp]).toBeDefined('Missing ' + bp + ' for ' + m);
-        for (var g in module.blueprints[bp]) {
+        for (var grade in module.blueprints[bp].grades) {
-          const grade = module.blueprints[bp][g];
           expect(Modifications.blueprints[bp].grades[grade]).toBeDefined('Missing ' + bp + ' grade ' + grade + ' for ' + m);
         }
       }