Merge branch 'release/2.5.2'

Update wiki link to edcd

.gitignore

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

ChangeLog.md

@@ -0,0 +1,168 @@
+#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
+
+#2.2.17
+  * Add mass as potential SCB modification
+  * Fix mining laser statistics
+  * Remove non-existent grade 4 and 5 wake scanner modifications
+  * Add number of crew for each ship
+
+#2.2.16
+  * Fix incorrect thermal load modifiers for dirty drives
+  * Provide explicit information about if values are higher numeric value == better or not
+
+#2.2.15
+  * Fix location of initial cargo rack for Vulture
+  * Fix broken regeneration rate for 6B shield generators
+  * Tidy up breach damage values
+
+#2.2.14
+  * Alter blueprint structure to combine components and features
+  * Make hidden value of modifications its own attribute
+  * Fix incorrect ED ID for class 6 passenger cabins
+
+#2.2.13
+  * Add plasma slug special effect for plasma accelerator
+  * Tweak hull costs of ships
+
+#2.2.12
+  * Add special effects for each blueprint
+  * Add IDs for most Powerplay modules
+
+#2.2.11
+  * Remove non-existant chaff launcher capacity blueprint grades
+  * Fix incorrect values for charge enhanced power distributor
+  * Remove incorrect AFMU blueprints
+  * Correct fragment cannon Double Shot blueprint information
+  * Correct Focused weapon blueprint information
+
+#2.2.10
+  * Fix incorrect base shield values for Cutter and Corvette
+  * Update weapons to have %-based damage distributions
+  * Remove power draw for detailed surface scanner - although shown in outfitting it is not part of active power
+  * Fix incorrect names for lightweight and kinetic armour
+  * Add engineering blueprints
+
+#2.2.9
+  * Add falloff metric for weapons
+  * Add falloff from range modification
+
+#2.2.8
+  * Set military slot of Viper Mk IV to class 3; was incorrectly set as class 2
+  * Update base regeneration rate of prismatic shield generators to values in 2.2.03
+  * Update specials with information in 2.2.03
+
+#2.2.6
+  * Update weapons with changed values for 2.2.03
+  * Add individual pitch/roll/yaw statistics for each ship
+  * Remove old and meaningless agility stat
+  * Use sane order for multi-module JSON - coriolis can re-order as it sees fit when displaying modules
+  * Fix cost of fighter hangars
+  * Update Powerplay weapons with current statistics
+  * Add separate min/opt/max multipliers for enhanced thrusters for speed, acceleration and rotation
+  * Add module reinforcement packages
+  * Add military compartments
+  * Fix missing damage value for 2B dumbfires
+  * Update shield recharge rates
+  * Reduce hull mass of Viper to 50T
+  * Fix incorrect optimal mass value for 8A thrusters
+  * Add power draw for detailed surface scanner
+
+#2.2.5
+  * Fix incorrect ID for emissive munitions special
+  * Fix rate of fire for burst lasers
+  * Add fragment cannon modifications
+  * Fix internal name of dazzle shell
+
+#2.2.4
+  * Fix incorrect ID for class 5 luxury passenger cabin
+  * Add damage type modifier
+  * Change modifications from simple strings to objects, to allow more data-driven behaviour
+  * Add special effects
+
+#2.2.3
+  * Fix mismatch between class 5 and class 7 fighter hangars
+  * Add details for concordant sequence special effect
+  * Fix details for thermal shock special effect
+  * Add engineer blueprints
+
+#2.2.2
+  * Add distributor draw modifier to shield generators
+  * Remove modifiers for sensors
+  * Add initial loadout passenger cabins for Beluga
+  * Add initial loadout passenger cabins for Orca
+  * Update costs and initial loadouts for Keelback and Type-7
+  * Add resistances for hull reinforcement packages
+  * Added modifier actions to create modifications from raw data

README.md

@@ -3,7 +3,7 @@
 
 JSON Data modelling Elite Dangerous ships and components.
 
-See [the wiki](https://github.com/cmmcleod/coriolis-data/wiki) for more details
+See [the wiki](https://github.com/edcd/coriolis-data/wiki) for more details
 
 
 ## Development

generate_distribution.js

@@ -2,8 +2,9 @@ var fs = require('fs');
 var UglifyJS = require('uglify-js');
 var Ships = require('./ships');
 var Modules = require('./modules');
-var exportString = JSON.stringify({ Ships: Ships, Modules: Modules }, null, '\t');
-var ast = UglifyJS.parse(['module.exports = ', JSON.stringify({ Ships: Ships, Modules: Modules }), ';'].join(''));
+var Modifications = require('./modifications');
+var exportString = JSON.stringify({ Ships: Ships, Modules: Modules, Modifications: Modifications }, null, '\t');
+var ast = UglifyJS.parse(['module.exports = ', JSON.stringify({ Ships: Ships, Modules: Modules, Modifications: Modifications }), ';'].join(''));
 var code = ast.print_to_string({beautify: true, indent_level: 2});
 
 fs.open('./dist/index.json', 'w', function() {

modifications/index.js

@@ -0,0 +1,7 @@
+module.exports = {
+  blueprints: require('./blueprints'),
+  modifications: require('./modifications'),
+  modifierActions: require('./modifierActions'),
+  modules: require('./modules'),
+  specials: require('./specials')
+};

modifications/modifications.json

@@ -0,0 +1,51 @@
+{
+    "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "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", "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"},
+    "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive", "higherbetter": true},
+    "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "numeric", "hidden": true, "method": "overwrite"},
+    "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": "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},
+    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "protection": {"id": 44, "name": "protection", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "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},
+    "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive", "higherbetter": true},
+    "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true}
+}

modifications/modifierActions.json

@@ -0,0 +1,346 @@
+{
+  "OutfittingFieldType_BootTime": {
+    "boot": 1
+  },
+  "OutfittingFieldType_ExplosiveResistance": {
+    "explres": 1
+  },
+  "OutfittingFieldType_DefenceModifierHealthAddition": {
+    "hullreinforcement": 1
+  },
+  "OutfittingFieldType_DefenceModifierHealthMultiplier": {
+    "hullboost": 1
+  },
+  "OutfittingFieldType_KineticResistance": {
+    "kinres": 1
+  },
+  "OutfittingFieldType_DefenceModifierShieldMultiplier": {
+    "shieldboost": 1
+  },
+  "OutfittingFieldType_ThermicResistance": {
+    "thermres": 1
+  },
+  "OutfittingFieldType_EngineHeatRate": {
+    "thermload": 1
+  },
+  "OutfittingFieldType_EngineOptimalMass": {
+    "optmass": 1
+  },
+  "OutfittingFieldType_EngineOptPerformance": {
+    "optmul": 1
+  },
+  "OutfittingFieldType_FSDHeatRate": {
+    "thermload": 1
+  },
+  "OutfittingFieldType_FSDMaxFuelPerJump": {
+    "maxfuel": 1
+  },
+  "OutfittingFieldType_FSDOptimalMass": {
+    "optmass": 1
+  },
+  "OutfittingFieldType_FSDInterdictorFacingLimit": {
+    "facinglimit": 1
+  },
+  "OutfittingFieldType_FSDInterdictorRange": {
+    "ranget": 1
+  },
+  "OutfittingFieldType_Integrity": {
+    "integrity": 1
+  },
+  "OutfittingFieldType_Mass": {
+    "mass": 1
+  },
+  "OutfittingFieldType_SensorTargetScanAngle": {
+    "angle": 1
+  },
+  "OutfittingFieldType_DSS_RateMult": {
+    "scanrate": 1
+  },
+  "OutfittingFieldType_ScannerTimeToScan": {
+    "scantime": 1
+  },
+  "OutfittingFieldType_ScannerRange": {
+    "range": 1
+  },
+  "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": {},
+  "special_choke_canister": {},
+  "special_concordant_sequence": {
+    "thermload": 0.5
+  },
+  "special_corrosive_shell": {
+    "ammo": -0.2
+  },
+  "special_dispersal_field": {
+  },
+  "special_distortion_field": {},
+  "special_drag_munitions": {},
+  "special_emissive_munitions": {
+    "thermload": 1
+  },
+  "special_feedback_cascade": {
+    "breachdmg": -0.2,
+    "damage": -0.2
+  },
+  "special_force_shell": {
+    "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": {
+      "T": 1
+    }
+  },
+  "special_inertial_impact": {
+    "damage": 0.5,
+    "jitter": 3,
+    "damagedist": {
+      "K": 0.5,
+      "T": 0.5
+    }
+  },
+  "special_overload_munitions": {
+    "damagedist": {
+      "E": 0.5,
+      "T": 0.5
+    }
+  },
+  "special_phasing_sequence": {
+    "damage": -0.1
+  },
+  "special_plasma_slug": {
+    "damage": -0.2
+  },
+  "special_radiant_canister": {
+    "ammo": -0.25
+  },
+  "special_regeneration_sequence": {
+    "damage": -0.1
+  },
+  "special_reverberating_cascade": {},
+  "special_scramble_spectrum": {
+    "rof": 0.1111111111111111
+  },
+  "special_screening_shell": {
+    "reload": -0.5
+  },
+  "special_shiftlock_canister": {
+    "damage": -0.2
+  },
+  "special_super_penetrator": {
+    "reload": 0.5
+  },
+  "special_thermal_cascade": {},
+  "special_thermal_conduit": {
+    "damage": -0.2
+  },
+  "special_thermal_vent": {
+    "thermload": 0.25
+  },
+  "special_thermalshock": {
+    "damage": -0.2
+  },
+  "trade_cell_heat_cell_units": {
+    "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
+  },
+  "trade_distributor_global_charge_mass": {
+    "engcap": 0.75,
+    "mass": 1,
+    "syscap": 0.75,
+    "wepcap": 0.75
+  },
+  "trade_engine_curve_mult_engine_heat": {
+    "optmul": 0.4,
+    "thermload": 1
+  },
+  "trade_fsd_fuel_per_jump_fsd_heat": {
+    "maxfuel": 0.5,
+    "thermload": 1
+  },
+  "trade_interdictor_range_facing_limit": {},
+  "trade_mass_defence_health_add": {
+    "hullreinforcement": -0.75,
+    "mass": -1
+  },
+  "trade_mass_health": {
+    "integrity": 1,
+    "mass": 0.4
+  },
+  "trade_passive_power_booster_global_mult": {
+    "explres": 0.4,
+    "kinres": 0.4,
+    "power": -1,
+    "thermres": 0.4
+  },
+  "trade_passive_power_boot_time": {
+    "boot": 1,
+    "power": -0.5
+  },
+  "trade_passive_power_cell_spin_up": {},
+  "trade_passive_power_distributor_global_rate": {
+    "engrate": -1,
+    "power": -1,
+    "sysrate": -1,
+    "weprate": -1
+  },
+  "trade_passive_power_engine_curve": {
+    "optmass": -0.66,
+    "power": -1
+  },
+  "trade_passive_power_shield_global_mult": {
+    "explres": 0.5,
+    "kinres": 0.5,
+    "power": -1,
+    "thermres": 0.5
+  },
+  "trade_passive_power_weapon_active": {
+    "distdraw": -0.6,
+    "power": 1
+  },
+  "trade_shield_curve_shield_curve_mult": {
+    "optmass": -1,
+    "optmul": -0.8
+  },
+  "trade_shield_global_mult_shield_broken_regen": {
+    "brokenregen": -1,
+    "explres": -0.5,
+    "kinres": -0.5,
+    "thermres": -0.5
+  },
+  "trade_shield_kinetic_shield_thermic": {
+    "kinres": 1,
+    "thermres": -1
+  },
+  "trade_weapon_active_passive_power": {
+    "distdraw": -0.67,
+    "power": 1
+  },
+  "trade_weapon_damage_weapon_active_power": {
+    "damage": 0.5,
+    "distdraw": 1
+  },
+  "trade_weapon_hardness_weapon_heat": {
+    "piercing": 0.4,
+    "thermload": 1
+  }
+}

modifications/specials.json

@@ -0,0 +1,36 @@
+{
+    "special_auto_loader": {"id": 0, "edname": "special_auto_loader", "name": "Auto loader"},
+    "special_choke_canister": {"id": 1, "edname": "special_choke_canister", "name": "Choke canister"},
+    "special_concordant_sequence": {"id": 2, "edname": "special_concordant_sequence", "name": "Concordant sequence"},
+    "special_corrosive_shell": {"id": 3, "edname": "special_corrosive_shell", "name": "Corrosive shell"},
+    "special_blinding_shell": {"id": 4, "edname": "special_blinding_shell", "name": "Dazzle shell"},
+    "special_dispersal_field": {"id": 5, "edname": "special_dispersal_field", "name": "Dispersal field"},
+    "special_distortion_field": {"id": 6, "edname": "special_distortion_field", "name": "Distortion field"},
+    "special_drag_munitions": {"id": 7, "edname": "special_drag_munitions", "name": "Drag munitions"},
+    "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"},
+    "special_ion_disruptor": {"id": 13, "edname": "special_ion_disruptor", "name": "Ion disruptor"},
+    "special_mass_lock_munition": {"id": 14, "edname": "special_mass_lock_munition", "name": "Mass lock munition"},
+    "special_overload_munitions": {"id": 15, "edname": "special_overload_munitions", "name": "Overload munitions"},
+    "special_penetrator_payload": {"id": 16, "edname": "special_penetrator_payload", "name": "Penetrator payload"},
+    "special_phasing_sequence": {"id": 17, "edname": "special_phasing_sequence", "name": "Phasing sequence"},
+    "special_plasma_slug": {"id": 18, "edname": "special_plasma_slug", "name": "Plasma slug"},
+    "special_radiant_canister": {"id": 19, "edname": "special_radiant_canister", "name": "Radiant Canister"},
+    "special_regeneration_sequence": {"id": 20, "edname": "special_regeneration_sequence", "name": "Regeneration sequence"},
+    "special_reverberating_cascade": {"id": 21, "edname": "special_reverberating_cascade", "name": "Reverberating cascade"},
+    "special_scramble_spectrum": {"id": 22, "edname": "special_scramble_spectrum", "name": "Scramble spectrum"},
+    "special_screening_shell": {"id": 23, "edname": "special_screening_shell", "name": "Screening shell"},
+    "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_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"},
+    "special_thermalshock": {"id": 31, "edname": "special_thermalshock", "name": "Thermal shock"}
+}

modules/hardpoints/ax_missile_rack.json

@@ -0,0 +1,128 @@
+{
+  "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,
+      "symbol": "Hpt_ATDumbfireMissile_Fixed_Medium"
+    },
+    {
+      "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,
+      "symbol": "Hpt_ATDumbfireMissile_Turret_Medium"
+    },
+    {
+      "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,
+      "symbol": "Hpt_ATDumbfireMissile_Fixed_Large"
+    },
+    {
+      "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,
+      "symbol": "Hpt_ATDumbfireMissile_Turret_Large"
+    }
+  ]
+}

modules/hardpoints/ax_multi_cannon.json

@@ -0,0 +1,128 @@
+{
+  "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,
+      "symbol": "Hpt_ATMultiCannon_Fixed_Medium"
+    },
+    {
+      "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,
+      "symbol": "Hpt_ATMultiCannon_Turret_Medium"
+    },
+    {
+      "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,
+      "symbol": "Hpt_ATMultiCannon_Fixed_Large"
+    },
+    {
+      "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,
+      "symbol": "Hpt_ATMultiCannon_Turret_Large"
+    }
+  ]
+}

modules/hardpoints/beam_laser.json

@@ -1,235 +1,71 @@
 {
   "bl": [
     {
-      "armourpen": 60,
-      "breachdps": 33.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "cost": 2396160,
-      "dps": 41.4,
-      "edID": 128049431,
-      "eddbID": 1540,
-      "eps": 9.1,
-      "grp": "bl",
-      "hps": 9.9,
-      "id": "0w",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 2.9,
-      "range": 3000,
-      "rating": "A",
-      "type": "T"
-    },
-    {
-      "armourpen": 60,
-      "breachdps": 26.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "cost": 8746160,
-      "dps": 32.7,
-      "edID": 128681994,
-      "eddbID": 1544,
-      "eps": 8.99,
-      "grp": "bl",
-      "hps": 10.6,
-      "id": "0x",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 2.86,
-      "range": 3000,
-      "rating": "A",
-      "type": "T"
-    },
-    {
-      "armourpen": 50,
-      "breachdps": 20.6,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 1177600,
-      "dps": 25.8,
-      "edID": 128049430,
-      "eddbID": 843,
-      "eps": 5.67,
-      "grp": "bl",
-      "hps": 7.2,
-      "id": "0u",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 1.8,
-      "range": 3000,
-      "rating": "C",
-      "type": "T"
-    },
-    {
-      "armourpen": 50,
-      "breachdps": 16.2,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 2396160,
-      "dps": 20.3,
-      "edID": 128049434,
-      "eddbID": 846,
-      "eps": 5.58,
-      "grp": "bl",
-      "hps": 7.6,
-      "id": "0v",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "G",
-      "power": 1.78,
-      "range": 3000,
-      "rating": "C",
-      "type": "T"
-    },
-    {
-      "armourpen": 50,
-      "breachdps": 11.5,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 19399600,
-      "dps": 14.4,
-      "edID": 128049437,
-      "eddbID": 849,
-      "eps": 3.51,
-      "grp": "bl",
-      "hps": 5.1,
-      "id": "0o",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "T",
-      "power": 1.68,
-      "range": 3000,
-      "rating": "D",
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 12.8,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 299520,
-      "dps": 16,
-      "edID": 128049429,
-      "eddbID": 842,
-      "eps": 3.51,
-      "grp": "bl",
-      "hps": 5.1,
-      "id": "0r",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "F",
-      "power": 1.12,
-      "range": 3000,
-      "rating": "D",
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 10,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 500600,
-      "dps": 12.5,
-      "edID": 128049433,
-      "eddbID": 845,
-      "eps": 3.44,
-      "grp": "bl",
-      "hps": 5.3,
-      "id": "0s",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "G",
-      "power": 1.1,
-      "range": 3000,
-      "rating": "D",
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 7.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 2099900,
-      "dps": 8.8,
-      "edID": 128049436,
-      "eddbID": 848,
-      "eps": 2.16,
-      "grp": "bl",
-      "hps": 3.5,
-      "id": "0t",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "T",
-      "power": 1.03,
-      "range": 3000,
-      "rating": "E",
-      "type": "T"
-    },
-    {
-      "armourpen": 18,
-      "breachdps": 7.9,
+      "breachdmg": 7.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 37430,
-      "dps": 9.8,
+      "damage": 9.8,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.94,
       "edID": 128049428,
       "eddbID": 841,
-      "eps": 2.16,
+      "falloff": 600,
       "grp": "bl",
-      "hps": 3.5,
       "id": "10",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
-      "power": 0.69,
+      "piercing": 18,
+      "power": 0.62,
       "range": 3000,
       "rating": "E",
-      "type": "T"
+      "thermload": 3.5,
+      "symbol": "Hpt_BeamLaser_Fixed_Small"
     },
     {
-      "armourpen": 18,
-      "breachdps": 6.1,
+      "breachdmg": 6.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 74650,
-      "dps": 7.7,
+      "damage": 7.66,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.11,
       "edID": 128049432,
       "eddbID": 844,
-      "eps": 2.11,
+      "falloff": 600,
       "grp": "bl",
-      "hps": 3.7,
       "id": "0p",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
-      "power": 0.67,
+      "piercing": 18,
+      "power": 0.6,
       "range": 3000,
       "rating": "E",
-      "type": "T"
+      "thermload": 3.6,
+      "symbol": "Hpt_BeamLaser_Gimbal_Small"
     },
     {
-      "armourpen": 18,
-      "breachdps": 4.3,
+      "breachdmg": 4.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 500000,
-      "dps": 5.4,
+      "damage": 5.4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.32,
       "edID": 128049435,
       "eddbID": 847,
+      "falloff": 600,
       "eps": 1.32,
       "grp": "bl",
       "hps": 2.4,
@@ -237,34 +73,248 @@
       "integrity": 40,
       "mass": 2,
       "mount": "T",
-      "power": 0.63,
+      "piercing": 18,
+      "power": 0.57,
       "range": 3000,
       "rating": "F",
-      "type": "T"
+      "thermload": 2.4,
+      "symbol": "Hpt_BeamLaser_Turret_Small"
     },
     {
-      "armourpen": 18,
-      "breachdps": 3.9,
+      "breachdmg": 3.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 56150,
-      "dps": 4.9,
+      "damage": 4.9,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.52,
       "edID": 128671346,
       "eddbID": 1476,
-      "eps": 2.8,
+      "falloff": 600,
       "grp": "bl",
-      "hps": 2.7,
       "id": "b0",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Retributor",
-      "power": 0.69,
+      "piercing": 18,
+      "power": 0.62,
       "pp": "Edmund Mahon",
       "range": 3000,
       "rating": "E",
-      "type": "T"
+      "thermload": 2.7,
+      "symbol": "Hpt_BeamLaser_Fixed_Small_Heat"
+    },
+    {
+      "breachdmg": 12.8,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 299520,
+      "damage": 15.96,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3.16,
+      "edID": 128049429,
+      "eddbID": 842,
+      "falloff": 600,
+      "grp": "bl",
+      "id": "0r",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 35,
+      "power": 1.01,
+      "range": 3000,
+      "rating": "D",
+      "thermload": 5.1,
+      "symbol": "Hpt_BeamLaser_Fixed_Medium"
+    },
+    {
+      "breachdmg": 10,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 500600,
+      "damage": 12.52,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3.44,
+      "edID": 128049433,
+      "eddbID": 845,
+      "falloff": 600,
+      "grp": "bl",
+      "id": "0s",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 35,
+      "power": 0.99,
+      "range": 3000,
+      "rating": "D",
+      "thermload": 5.3,
+      "symbol": "Hpt_BeamLaser_Gimbal_Medium"
+    },
+    {
+      "breachdmg": 7.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 2099900,
+      "damage": 8.82,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.16,
+      "edID": 128049436,
+      "eddbID": 848,
+      "falloff": 600,
+      "grp": "bl",
+      "id": "0t",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 35,
+      "power": 0.93,
+      "range": 3000,
+      "rating": "E",
+      "thermload": 3.5,
+      "symbol": "Hpt_BeamLaser_Turret_Medium"
+    },
+    {
+      "breachdmg": 20.6,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 1177600,
+      "damage": 25.78,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 5.1,
+      "edID": 128049430,
+      "eddbID": 843,
+      "falloff": 600,
+      "grp": "bl",
+      "id": "0u",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 50,
+      "power": 1.62,
+      "range": 3000,
+      "rating": "C",
+      "thermload": 7.2,
+      "symbol": "Hpt_BeamLaser_Fixed_Large"
+    },
+    {
+      "breachdmg": 16.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 2396160,
+      "damage": 20.28,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 5.58,
+      "edID": 128049434,
+      "eddbID": 846,
+      "falloff": 600,
+      "grp": "bl",
+      "id": "0v",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "piercing": 50,
+      "power": 1.6,
+      "range": 3000,
+      "rating": "C",
+      "thermload": 7.6,
+      "symbol": "Hpt_BeamLaser_Gimbal_Large"
+    },
+    {
+      "breachdmg": 11.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 19399600,
+      "damage": 14.34,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3.51,
+      "edID": 128049437,
+      "eddbID": 849,
+      "falloff": 600,
+      "grp": "bl",
+      "id": "0o",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 50,
+      "power": 1.51,
+      "range": 3000,
+      "rating": "D",
+      "thermload": 5.1,
+      "symbol": "Hpt_BeamLaser_Turret_Large"
+    },
+    {
+      "breachdmg": 33.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 2396160,
+      "damage": 41.38,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 8.19,
+      "edID": 128049431,
+      "eddbID": 1540,
+      "falloff": 600,
+      "grp": "bl",
+      "id": "0w",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 60,
+      "power": 2.61,
+      "range": 3000,
+      "rating": "A",
+      "thermload": 9.9,
+      "symbol": "Hpt_BeamLaser_Fixed_Huge"
+    },
+    {
+      "breachdmg": 26.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 8746160,
+      "damage": 32.68,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 8.99,
+      "edID": 128681994,
+      "eddbID": 1544,
+      "falloff": 600,
+      "grp": "bl",
+      "id": "0x",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "piercing": 60,
+      "power": 2.57,
+      "range": 3000,
+      "rating": "A",
+      "thermload": 10.6,
+      "symbol": "Hpt_BeamLaser_Gimbal_Huge"
     }
   ]
-}
+}

modules/hardpoints/burst_laser.json

@@ -1,306 +1,355 @@
 {
   "ul": [
     {
-      "armourpen": 65,
-      "breachdps": 28,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 3,
-      "class": 4,
-      "cost": 281600,
-      "dps": 32.3,
-      "edID": 128049403,
-      "eddbID": 1549,
-      "eps": 5.936,
-      "grp": "ul",
-      "hps": 7.2,
-      "id": "7s",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 2.58,
-      "range": 3000,
-      "rating": "E",
-      "rof": 1.6,
-      "type": "T"
-    },
-    {
-      "armourpen": 65,
-      "breachdps": 21.63,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 5,
-      "class": 4,
-      "cost": 1245600,
-      "dps": 25.9,
-      "edID": 128727920,
-      "eddbID": 1550,
-      "eps": 5.712,
-      "grp": "ul",
-      "hps": 6.93,
-      "id": "7t",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 2.59,
-      "range": 3000,
-      "rating": "E",
-      "rof": 2.1,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 10.53,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 7,
-      "class": 3,
-      "cost": 140400,
-      "dps": 20.8,
-      "edID": 128049402,
-      "eddbID": 834,
-      "eps": 3.753,
-      "grp": "ul",
-      "hps": 4.59,
-      "id": "14",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 1.66,
-      "range": 3000,
-      "rating": "D",
-      "rof": 2.7,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 14.08,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 9,
-      "class": 3,
-      "cost": 281600,
-      "dps": 16.6,
-      "edID": 128049406,
-      "eddbID": 837,
-      "eps": 3.712,
-      "grp": "ul",
-      "hps": 4.48,
-      "id": "15",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "G",
-      "power": 1.65,
-      "range": 3000,
-      "rating": "E",
-      "rof": 3.2,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 5.58,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 11,
-      "class": 3,
-      "cost": 800400,
-      "dps": 11,
-      "edID": 128049409,
-      "eddbID": 840,
-      "eps": 1.913,
-      "grp": "ul",
-      "hps": 2.48,
-      "id": "16",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "T",
-      "power": 1.57,
-      "range": 3000,
-      "rating": "E",
-      "rof": 3.1,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 11.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 11,
-      "class": 2,
-      "cost": 23000,
-      "dps": 13,
-      "edID": 128049401,
-      "eddbID": 833,
-      "eps": 2.331,
-      "grp": "ul",
-      "hps": 2.96,
-      "id": "7h",
-      "integrity": 40,
-      "mass": 4,
-      "mount": "F",
-      "power": 1.05,
-      "range": 3000,
-      "rating": "E",
-      "rof": 3.7,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 8.82,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 13,
-      "class": 2,
-      "cost": 48500,
-      "dps": 10.3,
-      "edID": 128049405,
-      "eddbID": 836,
-      "eps": 2.31,
-      "grp": "ul",
-      "hps": 2.94,
-      "id": "7i",
-      "integrity": 40,
-      "mass": 4,
-      "mount": "G",
-      "power": 1.04,
-      "range": 3000,
-      "rating": "F",
-      "rof": 4.2,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 3.51,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 15,
-      "class": 2,
-      "cost": 162800,
-      "dps": 6.8,
-      "edID": 128049408,
-      "eddbID": 839,
-      "eps": 1.209,
-      "grp": "ul",
-      "hps": 1.56,
-      "id": "7j",
-      "integrity": 40,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.98,
-      "range": 3000,
-      "rating": "F",
-      "rof": 3.9,
-      "type": "T"
-    },
-    {
-      "armourpen": 20,
-      "breachdps": 7.05,
+      "breachdmg": 1.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
       "burstrof": 15,
       "class": 1,
       "cost": 4400,
-      "dps": 8.1,
+      "damage": 1.72,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.25,
       "edID": 128049400,
       "eddbID": 832,
-      "eps": 1.457,
+      "falloff": 500,
       "grp": "ul",
-      "hps": 1.88,
       "id": "11",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 20,
       "power": 0.65,
       "range": 3000,
       "rating": "F",
-      "rof": 4.7,
-      "type": "T"
+      "rof": 2,
+      "thermload": 0.38,
+      "symbol": "Hpt_PulseLaserBurst_Fixed_Small"
     },
     {
-      "armourpen": 20,
-      "breachdps": 5.3,
+      "breachdmg": 1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
       "burstrof": 17,
       "class": 1,
       "cost": 8600,
-      "dps": 6.4,
+      "damage": 1.22,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.24,
       "edID": 128049404,
       "eddbID": 835,
-      "eps": 1.4,
+      "falloff": 500,
       "grp": "ul",
-      "hps": 1.6,
       "id": "12",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 20,
       "power": 0.64,
       "range": 3000,
       "rating": "G",
-      "rof": 5.3,
-      "type": "T"
+      "rof": 2.23,
+      "thermload": 0.34,
+      "symbol": "Hpt_PulseLaserBurst_Gimbal_Small"
     },
     {
-      "armourpen": 20,
-      "breachdps": 1.92,
+      "breachdmg": 0.4,
       "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
       "burst": 3,
       "burstrof": 19,
       "class": 1,
       "cost": 52800,
-      "dps": 4.2,
+      "damage": 0.87,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.14,
       "edID": 128049407,
       "eddbID": 838,
-      "eps": 0.768,
+      "falloff": 500,
       "grp": "ul",
-      "hps": 0.96,
       "id": "13",
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 20,
       "power": 0.6,
       "range": 3000,
       "rating": "G",
-      "rof": 4.8,
-      "type": "T"
+      "rof": 1.92,
+      "thermload": 0.19,
+      "symbol": "Hpt_PulseLaserBurst_Turret_Small"
     },
     {
-      "armourpen": 1,
-      "breachdps": 15.25,
+      "breachdmg": 3.1,
       "breachmax": 0,
       "breachmin": 0,
       "burst": 8,
       "burstrof": 20,
       "class": 1,
       "cost": 8800,
-      "dps": 18.3,
+      "damage": 3.6,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.31,
       "edID": 128671449,
       "eddbID": 1477,
-      "eps": 3.05,
+      "falloff": 600,
       "grp": "ul",
-      "hps": 2.29,
       "id": "cy",
       "integrity": 40,
+      "jitter": 3.5,
       "mass": 2,
       "mount": "F",
       "name": "Cytoscrambler",
+      "piercing": 1,
       "power": 0.8,
       "pp": "Archon Delaine",
-      "range": 600,
+      "range": 3000,
       "rating": "F",
       "rof": 7.6,
-      "type": "T"
+      "thermload": 0.3,
+      "symbol": "Hpt_PulseLaserBurst_Fixed_Small_Scatter"
+    },
+    {
+      "breachdmg": 3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 11,
+      "class": 2,
+      "cost": 23000,
+      "damage": 3.53,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.5,
+      "edID": 128049401,
+      "eddbID": 833,
+      "falloff": 500,
+      "grp": "ul",
+      "id": "7h",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 35,
+      "power": 1.05,
+      "range": 3000,
+      "rating": "E",
+      "rof": 1.6,
+      "thermload": 0.78,
+      "symbol": "Hpt_PulseLaserBurst_Fixed_Medium"
+    },
+    {
+      "breachdmg": 2.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 13,
+      "class": 2,
+      "cost": 48500,
+      "damage": 2.45,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.49,
+      "edID": 128049405,
+      "eddbID": 836,
+      "falloff": 500,
+      "grp": "ul",
+      "id": "7i",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 35,
+      "power": 1.04,
+      "range": 3000,
+      "rating": "F",
+      "rof": 1.78,
+      "thermload": 0.67,
+      "symbol": "Hpt_PulseLaserBurst_Gimbal_Medium"
+    },
+    {
+      "breachdmg": 0.9,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "burst": 3,
+      "burstrof": 15,
+      "class": 2,
+      "cost": 162800,
+      "damage": 1.72,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.28,
+      "edID": 128049408,
+      "eddbID": 839,
+      "falloff": 500,
+      "grp": "ul",
+      "id": "7j",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 35,
+      "power": 0.98,
+      "range": 3000,
+      "rating": "F",
+      "rof": 1.57,
+      "thermload": 0.38,
+      "symbol": "Hpt_PulseLaserBurst_Turret_Medium"
+    },
+    {
+      "breachdmg": 3.9,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 7,
+      "class": 3,
+      "cost": 140400,
+      "damage": 7.73,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.11,
+      "edID": 128049402,
+      "eddbID": 834,
+      "falloff": 500,
+      "grp": "ul",
+      "id": "14",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 52,
+      "power": 1.66,
+      "range": 3000,
+      "rating": "D",
+      "rof": 1.2,
+      "thermload": 1.7,
+      "symbol": "Hpt_PulseLaserBurst_Fixed_Large"
+    },
+    {
+      "breachdmg": 4.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 9,
+      "class": 3,
+      "cost": 281600,
+      "damage": 5.16,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.03,
+      "edID": 128049406,
+      "eddbID": 837,
+      "falloff": 500,
+      "grp": "ul",
+      "id": "15",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "piercing": 52,
+      "power": 1.65,
+      "range": 3000,
+      "rating": "E",
+      "rof": 1.4,
+      "thermload": 1.42,
+      "symbol": "Hpt_PulseLaserBurst_Gimbal_Large"
+    },
+    {
+      "breachdmg": 1.8,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "burst": 3,
+      "burstrof": 11,
+      "class": 3,
+      "cost": 800400,
+      "damage": 3.53,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.56,
+      "edID": 128049409,
+      "eddbID": 840,
+      "falloff": 500,
+      "grp": "ul",
+      "id": "16",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 52,
+      "power": 1.57,
+      "range": 3000,
+      "rating": "E",
+      "rof": 1.272,
+      "thermload": 0.78,
+      "symbol": "Hpt_PulseLaserBurst_Turret_Large"
+    },
+    {
+      "breachdmg": 17.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 3,
+      "class": 4,
+      "cost": 281600,
+      "damage": 20.61,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.98,
+      "edID": 128049403,
+      "eddbID": 1549,
+      "falloff": 500,
+      "grp": "ul",
+      "id": "7s",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 65,
+      "power": 2.58,
+      "range": 3000,
+      "rating": "E",
+      "rof": 0.8,
+      "thermload": 4.53,
+      "symbol": "Hpt_PulseLaserBurst_Fixed_Huge"
+    },
+    {
+      "breachdmg": 10.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 5,
+      "class": 4,
+      "cost": 1245600,
+      "damage": 12.09,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.41,
+      "edID": 128727920,
+      "eddbID": 1550,
+      "falloff": 500,
+      "grp": "ul",
+      "id": "7t",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "piercing": 65,
+      "power": 2.59,
+      "range": 3000,
+      "rating": "E",
+      "rof": 1,
+      "thermload": 3.33,
+      "symbol": "Hpt_PulseLaserBurst_Gimbal_Huge"
     }
   ]
-}
+}

modules/hardpoints/cannon.json

@@ -1,98 +1,238 @@
 {
   "c": [
     {
-      "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 25.28,
+      "ammo": 120,
+      "breachdmg": 17.1,
       "breachmax": 0.8,
       "breachmin": 0.6,
-      "class": 4,
-      "clip": 5,
-      "cost": 2700800,
-      "dps": 25.3,
-      "edID": 128049441,
-      "eddbID": 853,
-      "eps": 0.644,
+      "class": 1,
+      "clip": 6,
+      "cost": 21100,
+      "damage": 22.5,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.46,
+      "edID": 128049438,
+      "eddbID": 850,
+      "falloff": 3000,
       "grp": "c",
-      "hps": 1.92,
-      "id": "1q",
-      "integrity": 80,
-      "mass": 16,
+      "id": "1h",
+      "integrity": 40,
+      "mass": 2,
       "mount": "F",
-      "power": 0.92,
-      "range": 4500,
-      "rating": "B",
-      "reload": 5,
-      "rof": 0.4,
-      "speed": 900,
-      "type": "K"
+      "piercing": 35,
+      "power": 0.34,
+      "range": 3000,
+      "rating": "D",
+      "reload": 3,
+      "rof": 0.5,
+      "shotspeed": 1200,
+      "thermload": 1.4,
+      "symbol": "Hpt_Cannon_Fixed_Small"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 16.92,
+      "breachdmg": 13.2,
+      "breachmax": 0.9,
+      "breachmin": 0.6,
+      "class": 1,
+      "clip": 5,
+      "cost": 42200,
+      "damage": 16,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.48,
+      "edID": 128049442,
+      "eddbID": 854,
+      "falloff": 3000,
+      "grp": "c",
+      "id": "1i",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "G",
+      "piercing": 35,
+      "power": 0.38,
+      "range": 3000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 0.52,
+      "shotspeed": 1000,
+      "thermload": 1.3,
+      "symbol": "Hpt_Cannon_Gimbal_Small"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 10.6,
       "breachmax": 0.8,
       "breachmin": 0.6,
-      "class": 4,
+      "class": 1,
       "clip": 5,
-      "cost": 5401600,
-      "dps": 19.7,
-      "edID": 128049444,
-      "eddbID": 856,
-      "eps": 0.688,
+      "cost": 506400,
+      "damage": 12.75,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.22,
+      "edID": 128049445,
+      "eddbID": 857,
+      "falloff": 3000,
       "grp": "c",
-      "hps": 1.76,
-      "id": "1r",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 1.03,
-      "range": 4500,
-      "rating": "B",
+      "id": "1j",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "piercing": 35,
+      "power": 0.32,
+      "range": 3000,
+      "rating": "F",
       "reload": 4,
-      "rof": 0.4,
-      "speed": 750,
-      "type": "K"
+      "rof": 0.435,
+      "shotspeed": 1000,
+      "thermload": 0.7,
+      "symbol": "Hpt_Cannon_Turret_Small"
+    },
+    {
+      "ammo": 120,
+      "breachdmg": 28,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 6,
+      "cost": 168430,
+      "damage": 36.5,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.7,
+      "edID": 128049439,
+      "eddbID": 851,
+      "falloff": 3500,
+      "grp": "c",
+      "id": "1k",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 50,
+      "power": 0.49,
+      "range": 3500,
+      "rating": "D",
+      "reload": 3,
+      "rof": 0.465,
+      "shotspeed": 1051,
+      "thermload": 2.1,
+      "symbol": "Hpt_Cannon_Fixed_Medium"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 16.92,
+      "breachdmg": 20.3,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 5,
+      "cost": 337600,
+      "damage": 24.5,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.75,
+      "edID": 128049443,
+      "eddbID": 855,
+      "falloff": 3500,
+      "grp": "c",
+      "id": "1l",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 50,
+      "power": 0.54,
+      "range": 3500,
+      "rating": "D",
+      "reload": 4,
+      "rof": 0.485,
+      "shotspeed": 875,
+      "thermload": 1.9,
+      "symbol": "Hpt_Cannon_Gimbal_Medium"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 16.3,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 5,
+      "cost": 4051200,
+      "damage": 19.77,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.34,
+      "edID": 128049446,
+      "eddbID": 858,
+      "falloff": 3500,
+      "grp": "c",
+      "id": "1m",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 50,
+      "power": 0.45,
+      "range": 3500,
+      "rating": "E",
+      "reload": 4,
+      "rof": 0.405,
+      "shotspeed": 875,
+      "thermload": 1,
+      "symbol": "Hpt_Cannon_Turret_Medium"
+    },
+    {
+      "ammo": 120,
+      "breachdmg": 42.3,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 3,
-      "clip": 5,
+      "clip": 6,
       "cost": 675200,
-      "dps": 18.7,
+      "damage": 54.94,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 1.07,
       "edID": 128049440,
       "eddbID": 852,
-      "eps": 0.428,
+      "falloff": 4000,
       "grp": "c",
-      "hps": 1.28,
       "id": "1n",
       "integrity": 64,
       "mass": 8,
       "mount": "F",
+      "piercing": 70,
       "power": 0.67,
       "range": 4000,
       "rating": "C",
-      "reload": 4,
-      "rof": 0.4,
-      "speed": 959,
-      "type": "K"
+      "reload": 3,
+      "rof": 0.425,
+      "shotspeed": 959,
+      "thermload": 3.2,
+      "symbol": "Hpt_Cannon_Fixed_Large"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 30.9,
+      "breachdmg": 30.9,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 3,
       "clip": 5,
       "cost": 1350400,
-      "dps": 14.3,
+      "damage": 37.39,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 1.14,
       "edID": 128671120,
       "eddbID": 1383,
+      "falloff": 4000,
       "eps": 0.456,
       "grp": "c",
       "hps": 1.16,
@@ -100,202 +240,112 @@
       "integrity": 64,
       "mass": 8,
       "mount": "G",
+      "piercing": 70,
       "power": 0.75,
       "range": 4000,
       "rating": "C",
       "reload": 4,
-      "rof": 0.4,
-      "speed": 800,
-      "type": "K"
+      "rof": 0.445,
+      "shotspeed": 800,
+      "thermload": 2.9,
+      "symbol": "Hpt_Cannon_Gimbal_Large"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 10.04,
+      "breachdmg": 25.14,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 3,
       "clip": 5,
       "cost": 16204800,
-      "dps": 9.7,
+      "damage": 30.4,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.53,
       "edID": 128049447,
       "eddbID": 859,
-      "eps": 0.212,
+      "falloff": 4000,
       "grp": "c",
-      "hps": 0.64,
       "id": "1p",
       "integrity": 64,
       "mass": 8,
       "mount": "T",
+      "piercing": 70,
       "power": 0.64,
       "range": 4000,
       "rating": "D",
       "reload": 4,
-      "rof": 0.4,
-      "speed": 800,
-      "type": "K"
+      "rof": 0.37,
+      "shotspeed": 800,
+      "thermload": 1.6,
+      "symbol": "Hpt_Cannon_Turret_Large"
     },
     {
-      "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 14,
+      "ammo": 120,
+      "breachdmg": 63.2,
       "breachmax": 0.8,
       "breachmin": 0.6,
-      "class": 2,
-      "clip": 5,
-      "cost": 168430,
-      "dps": 13.6,
-      "edID": 128049439,
-      "eddbID": 851,
-      "eps": 0.35,
+      "class": 4,
+      "clip": 6,
+      "cost": 2700800,
+      "damage": 82.1,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 1.61,
+      "edID": 128049441,
+      "eddbID": 853,
+      "falloff": 4500,
+      "eps": 0.644,
       "grp": "c",
-      "hps": 1.05,
-      "id": "1k",
-      "integrity": 51,
-      "mass": 4,
+      "hps": 1.92,
+      "id": "1q",
+      "integrity": 80,
+      "mass": 16,
       "mount": "F",
-      "power": 0.49,
-      "range": 3500,
-      "rating": "D",
-      "reload": 4,
-      "rof": 0.5,
-      "speed": 1051,
-      "type": "K"
+      "piercing": 90,
+      "power": 0.92,
+      "range": 4500,
+      "rating": "B",
+      "reload": 3,
+      "rof": 0.385,
+      "shotspeed": 900,
+      "thermload": 4.8,
+      "symbol": "Hpt_Cannon_Fixed_Huge"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 101.5,
+      "breachdmg": 46.7,
       "breachmax": 0.8,
       "breachmin": 0.6,
-      "class": 2,
+      "class": 4,
       "clip": 5,
-      "cost": 337600,
-      "dps": 10.3,
-      "edID": 128049443,
-      "eddbID": 855,
-      "eps": 0.375,
+      "cost": 5401600,
+      "damage": 56.58,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 1.72,
+      "edID": 128049444,
+      "eddbID": 856,
+      "falloff": 4500,
+      "eps": 0.688,
       "grp": "c",
-      "hps": 0.95,
-      "id": "1l",
-      "integrity": 51,
-      "mass": 4,
+      "hps": 1.76,
+      "id": "1r",
+      "integrity": 80,
+      "mass": 16,
       "mount": "G",
-      "power": 0.54,
-      "range": 3500,
-      "rating": "D",
-      "reload": 4,
-      "rof": 0.5,
-      "speed": 875,
-      "type": "K"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 6.52,
-      "breachmax": 0.8,
-      "breachmin": 0.6,
-      "class": 2,
-      "clip": 5,
-      "cost": 4051200,
-      "dps": 6.9,
-      "edID": 128049446,
-      "eddbID": 858,
-      "eps": 0.136,
-      "grp": "c",
-      "hps": 0.4,
-      "id": "1m",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.45,
-      "range": 3500,
-      "rating": "E",
+      "piercing": 90,
+      "power": 1.03,
+      "range": 4500,
+      "rating": "B",
       "reload": 4,
       "rof": 0.4,
-      "speed": 875,
-      "type": "K"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 8.55,
-      "breachmax": 0.8,
-      "breachmin": 0.6,
-      "class": 1,
-      "clip": 5,
-      "cost": 21100,
-      "dps": 9,
-      "edID": 128049438,
-      "eddbID": 850,
-      "eps": 0.23,
-      "grp": "c",
-      "hps": 0.7,
-      "id": "1h",
-      "integrity": 40,
-      "mass": 2,
-      "mount": "F",
-      "power": 0.34,
-      "range": 3000,
-      "rating": "D",
-      "reload": 4,
-      "rof": 0.5,
-      "speed": 1200,
-      "type": "K"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 35,
-      "breachdps": 6.6,
-      "breachmax": 0.9,
-      "breachmin": 0.6,
-      "class": 1,
-      "clip": 5,
-      "cost": 42200,
-      "dps": 7.2,
-      "edID": 128049442,
-      "eddbID": 854,
-      "eps": 0.24,
-      "grp": "c",
-      "hps": 0.65,
-      "id": "1i",
-      "integrity": 40,
-      "mass": 2,
-      "mount": "G",
-      "power": 0.38,
-      "range": 3000,
-      "rating": "E",
-      "reload": 4,
-      "rof": 0.5,
-      "speed": 1000,
-      "type": "K"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 4.24,
-      "breachmax": 0.8,
-      "breachmin": 0.6,
-      "class": 1,
-      "clip": 5,
-      "cost": 506400,
-      "dps": 4.8,
-      "edID": 128049445,
-      "eddbID": 857,
-      "eps": 0.088,
-      "grp": "c",
-      "hps": 0.28,
-      "id": "1j",
-      "integrity": 40,
-      "mass": 2,
-      "mount": "T",
-      "power": 0.32,
-      "range": 3000,
-      "rating": "F",
-      "reload": 4,
-      "rof": 0.4,
-      "speed": 1000,
-      "type": "K"
+      "shotspeed": 750,
+      "thermload": 4.4,
+      "symbol": "Hpt_Cannon_Gimbal_Huge"
     }
   ]
-}
+}

modules/hardpoints/cargo_scanner.json

@@ -13,7 +13,8 @@
       "power": 0.2,
       "range": 2000,
       "rating": "E",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CargoScanner_Size0_Class1"
     },
     {
       "angle": 15,
@@ -28,7 +29,8 @@
       "power": 0.4,
       "range": 2500,
       "rating": "D",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CargoScanner_Size0_Class2"
     },
     {
       "angle": 15,
@@ -43,7 +45,8 @@
       "power": 0.8,
       "range": 3000,
       "rating": "C",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CargoScanner_Size0_Class3"
     },
     {
       "angle": 15,
@@ -58,7 +61,8 @@
       "power": 1.6,
       "range": 3500,
       "rating": "B",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CargoScanner_Size0_Class4"
     },
     {
       "angle": 15,
@@ -73,7 +77,8 @@
       "power": 3.2,
       "range": 4000,
       "rating": "A",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CargoScanner_Size0_Class5"
     }
   ]
-}
+}

modules/hardpoints/chaff_launcher.json

@@ -0,0 +1,27 @@
+{
+  "ch": [
+    {
+      "ammo": 10,
+      "ammocost": 100,
+      "class": 0,
+      "clip": 1,
+      "cost": 8500,
+      "distdraw": 4,
+      "duration": 20,
+      "edID": 128049513,
+      "eddbID": 884,
+      "grp": "ch",
+      "id": "00",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Chaff Launcher",
+      "passive": 1,
+      "power": 0.2,
+      "rating": "I",
+      "reload": 10,
+      "rof": 1,
+      "thermload": 4,
+      "symbol": "Hpt_ChaffLauncher_Tiny"
+    }
+  ]
+}

modules/hardpoints/countermeasures.json

@@ -1,84 +0,0 @@
-{
-  "cm": [
-    {
-      "ammo": 10,
-      "class": 0,
-      "clip": 1,
-      "cost": 8500,
-      "duration": 20,
-      "edID": 128049513,
-      "eddbID": 884,
-      "eps": 4,
-      "grp": "cm",
-      "hps": 4,
-      "id": "00",
-      "integrity": 20,
-      "mass": 1.3,
-      "name": "Chaff Launcher",
-      "passive": 1,
-      "power": 0.2,
-      "rating": "I",
-      "reload": 10
-    },
-    {
-      "activepower": 4,
-      "chargeup": 4,
-      "class": 0,
-      "cooldown": 10,
-      "cost": 12500,
-      "edID": 128049516,
-      "eddbID": 885,
-      "grp": "cm",
-      "id": "01",
-      "integrity": 20,
-      "mass": 1.3,
-      "name": "Electronic Countermeasure",
-      "power": 0.2,
-      "range": 3000,
-      "rating": "F"
-    },
-    {
-      "ammo": 2,
-      "class": 0,
-      "clip": 1,
-      "cost": 3500,
-      "duration": 10,
-      "edID": 128049519,
-      "eddbID": 886,
-      "eps": 0.4,
-      "grp": "cm",
-      "id": "02",
-      "integrity": 20,
-      "mass": 1.3,
-      "name": "Heat Sink Launcher",
-      "passive": 1,
-      "power": 0.2,
-      "rating": "I",
-      "reload": 10,
-      "rof": 0.2
-    },
-    {
-      "ammo": 10000,
-      "burst": 4,
-      "burstrof": 15,
-      "class": 0,
-      "clip": 50,
-      "cost": 18550,
-      "edID": 128049522,
-      "eddbID": 887,
-      "grp": "cm",
-      "id": "03",
-      "integrity": 20,
-      "jitter": 1.5,
-      "mass": 0.5,
-      "name": "Point Defence",
-      "passive": 1,
-      "power": 0.2,
-      "rating": "I",
-      "reload": 0,
-      "rof": 10,
-      "speed": 1000,
-      "type": "K"
-    }
-  ]
-}

modules/hardpoints/electronic_countermeasure.json

@@ -0,0 +1,24 @@
+{
+  "ec": [
+    {
+      "activepower": 4,
+      "chargeup": 3,
+      "class": 0,
+      "cooldown": 10,
+      "cost": 12500,
+      "edID": 128049516,
+      "eddbID": 885,
+      "grp": "ec",
+      "id": "01",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Electronic Countermeasure",
+      "power": 0.2,
+      "range": 3000,
+      "rating": "F",
+      "reload": 10,
+      "thermload": 4,
+      "symbol": "Hpt_ElectronicCountermeasure_Tiny"
+    }
+  ]
+}

modules/hardpoints/fragment_cannon.json

@@ -1,287 +1,335 @@
 {
   "fc": [
     {
-      "ammo": 90,
-      "armourpen": 52,
-      "breachdps": 189,
+      "ammo": 180,
+      "breachdmg": 1.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 3,
+      "cost": 36000,
+      "damage": 1.43,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.21,
+      "edID": 128049448,
+      "eddbID": 860,
+      "falloff": 1800,
+      "grp": "fc",
+      "id": "20",
+      "integrity": 40,
+      "jitter": 5,
+      "mass": 2,
+      "mount": "F",
+      "piercing": 20,
+      "power": 0.45,
+      "range": 2000,
+      "rating": "E",
+      "reload": 5,
+      "rof": 5.555,
+      "roundspershot": 12,
+      "shotspeed": 667,
+      "thermload": 0.4,
+      "symbol": "Hpt_Slugshot_Fixed_Small"
+    },
+    {
+      "ammo": 180,
+      "breachdmg": 0.9,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 3,
+      "cost": 54720,
+      "damage": 1.01,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.26,
+      "edID": 128049451,
+      "eddbID": 863,
+      "falloff": 1800,
+      "grp": "fc",
+      "id": "21",
+      "integrity": 40,
+      "jitter": 5,
+      "mass": 2,
+      "mount": "G",
+      "piercing": 20,
+      "power": 0.59,
+      "range": 2000,
+      "rating": "E",
+      "reload": 5,
+      "rof": 5.88,
+      "roundspershot": 12,
+      "shotspeed": 667,
+      "thermload": 0.4,
+      "symbol": "Hpt_Slugshot_Gimbal_Small"
+    },
+    {
+      "ammo": 180,
+      "breachdmg": 0.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 3,
+      "cost": 182400,
+      "damage": 0.69,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.1,
+      "edID": 128049453,
+      "eddbID": 865,
+      "falloff": 1800,
+      "grp": "fc",
+      "id": "22",
+      "integrity": 40,
+      "jitter": 5,
+      "mass": 2,
+      "mount": "T",
+      "piercing": 20,
+      "power": 0.42,
+      "range": 2000,
+      "rating": "E",
+      "reload": 5,
+      "rof": 4.76,
+      "roundspershot": 12,
+      "shotspeed": 667,
+      "thermload": 0.2,
+      "symbol": "Hpt_Slugshot_Turret_Small"
+    },
+    {
+      "ammo": 180,
+      "breachdmg": 2.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 3,
+      "cost": 291840,
+      "damage": 3,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.37,
+      "edID": 128049449,
+      "eddbID": 861,
+      "falloff": 1800,
+      "grp": "fc",
+      "id": "1s",
+      "integrity": 80,
+      "jitter": 5,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 30,
+      "power": 0.74,
+      "range": 2000,
+      "rating": "A",
+      "reload": 5,
+      "rof": 4.975,
+      "roundspershot": 12,
+      "shotspeed": 667,
+      "thermload": 0.7,
+      "symbol": "Hpt_Slugshot_Fixed_Medium"
+    },
+    {
+      "ammo": 180,
+      "breachdmg": 1.8,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 3,
+      "cost": 437800,
+      "damage": 2.275,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.49,
+      "edID": 128049452,
+      "eddbID": 864,
+      "falloff": 1800,
+      "grp": "fc",
+      "id": "7e",
+      "integrity": 80,
+      "jitter": 5,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 30,
+      "power": 1.03,
+      "range": 2000,
+      "rating": "D",
+      "reload": 5,
+      "rof": 5.26,
+      "roundspershot": 12,
+      "shotspeed": 667,
+      "thermload": 0.8,
+      "symbol": "Hpt_Slugshot_Gimbal_Medium"
+    },
+    {
+      "ammo": 180,
+      "breachdmg": 1.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 3,
+      "cost": 1459200,
+      "damage": 1.7,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.21,
+      "edID": 128049454,
+      "eddbID": 866,
+      "falloff": 1800,
+      "grp": "fc",
+      "id": "7f",
+      "integrity": 80,
+      "jitter": 5,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 30,
+      "power": 0.79,
+      "range": 2000,
+      "rating": "D",
+      "reload": 5,
+      "rof": 4.26,
+      "roundspershot": 12,
+      "shotspeed": 667,
+      "thermload": 0.4,
+      "symbol": "Hpt_Slugshot_Turret_Medium"
+    },
+    {
+      "ammo": 180,
+      "breachdmg": 3.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 3,
       "clip": 3,
       "cost": 1167360,
-      "dps": 113.8,
+      "damage": 4.57,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.57,
       "edID": 128049450,
       "eddbID": 862,
-      "eps": 30.78,
+      "falloff": 1800,
       "grp": "fc",
-      "hps": 59.4,
       "id": "1t",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 8,
       "mount": "F",
+      "piercing": 45,
       "power": 1.02,
       "range": 2000,
       "rating": "C",
       "reload": 5,
-      "rof": 4.5,
+      "rof": 4.545,
       "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 1.1,
+      "symbol": "Hpt_Slugshot_Fixed_Large"
     },
     {
-      "ammo": 90,
-      "armourpen": 52,
-      "breachdps": 167.04,
+      "ammo": 180,
+      "breachdmg": 2.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 3,
       "clip": 3,
       "cost": 1751040,
-      "dps": 184.6,
+      "damage": 3.77,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.81,
       "edID": 128671321,
       "eddbID": 1454,
-      "eps": 46.66,
+      "falloff": 1800,
       "grp": "fc",
-      "hps": 80.64,
       "id": "1u",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 8,
       "mount": "G",
+      "piercing": 45,
       "power": 1.55,
       "range": 2000,
       "rating": "C",
       "reload": 5,
-      "rof": 4.8,
+      "rof": 4.76,
       "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 1.4,
+      "symbol": "Hpt_Slugshot_Gimbal_Large"
     },
     {
-      "ammo": 90,
-      "armourpen": 52,
-      "breachdps": 110.4,
+      "ammo": 180,
+      "breachdmg": 2.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 3,
       "clip": 3,
       "cost": 5836800,
-      "dps": 122.9,
+      "damage": 2.98,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.37,
       "edID": 128671322,
       "eddbID": 1455,
-      "eps": 17.76,
+      "falloff": 1800,
       "grp": "fc",
-      "hps": 33.6,
       "id": "1v",
       "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
       "mass": 8,
       "mount": "T",
+      "piercing": 45,
       "power": 1.29,
       "range": 2000,
       "rating": "C",
       "reload": 5,
       "rof": 4,
       "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7,
+      "symbol": "Hpt_Slugshot_Turret_Large"
     },
     {
-      "ammo": 90,
-      "armourpen": 35,
-      "breachdps": 138,
+      "ammo": 180,
+      "breachdmg": 3.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
-      "class": 2,
-      "clip": 3,
-      "cost": 291840,
-      "dps": 122.9,
-      "edID": 128049449,
-      "eddbID": 861,
-      "eps": 22.2,
-      "grp": "fc",
-      "hps": 42,
-      "id": "1s",
-      "integrity": 80,
-      "jitter": 0.5,
-      "mass": 4,
-      "mount": "F",
-      "power": 0.74,
-      "range": 2000,
-      "rating": "A",
-      "reload": 5,
-      "rof": 5,
-      "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
-    },
-    {
-      "ammo": 90,
-      "armourpen": 35,
-      "breachdps": 114.48,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "clip": 3,
-      "cost": 437800,
-      "dps": 153.6,
-      "edID": 128049452,
-      "eddbID": 864,
-      "eps": 31.6,
-      "grp": "fc",
-      "hps": 50.88,
-      "id": "7e",
-      "integrity": 80,
-      "jitter": 0.5,
-      "mass": 4,
-      "mount": "G",
-      "power": 1.03,
-      "range": 2000,
-      "rating": "D",
-      "reload": 5,
-      "rof": 5.3,
-      "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
-    },
-    {
-      "ammo": 90,
-      "armourpen": 35,
-      "breachdps": 67.08,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "clip": 3,
-      "cost": 1459200,
-      "dps": 123.2,
-      "edID": 128049454,
-      "eddbID": 866,
-      "eps": 10.84,
-      "grp": "fc",
-      "hps": 20.64,
-      "id": "7f",
-      "integrity": 80,
-      "jitter": 0.5,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.79,
-      "range": 2000,
-      "rating": "D",
-      "reload": 5,
-      "rof": 3.7,
-      "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
-    },
-    {
-      "ammo": 90,
-      "armourpen": 20,
-      "breachdps": 87.36,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 1,
-      "clip": 3,
-      "cost": 36000,
-      "dps": 95.3,
-      "edID": 128049448,
-      "eddbID": 860,
-      "eps": 14.112,
-      "grp": "fc",
-      "hps": 26.88,
-      "id": "20",
-      "integrity": 40,
-      "jitter": 0.5,
-      "mass": 2,
-      "mount": "F",
-      "power": 0.45,
-      "range": 2000,
-      "rating": "E",
-      "reload": 5,
-      "rof": 5.6,
-      "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
-    },
-    {
-      "ammo": 90,
-      "armourpen": 20,
-      "breachdps": 63.4,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 1,
-      "clip": 3,
-      "cost": 54720,
-      "dps": 71.3,
-      "edID": 128049451,
-      "eddbID": 863,
-      "eps": 18.408,
-      "grp": "fc",
-      "hps": 28.32,
-      "id": "21",
-      "integrity": 40,
-      "jitter": 0.5,
-      "mass": 2,
-      "mount": "G",
-      "power": 0.59,
-      "range": 2000,
-      "rating": "E",
-      "reload": 5,
-      "rof": 5.9,
-      "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
-    },
-    {
-      "ammo": 90,
-      "armourpen": 20,
-      "breachdps": 34.56,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 1,
-      "clip": 3,
-      "cost": 182400,
-      "dps": 39.4,
-      "edID": 128049453,
-      "eddbID": 865,
-      "eps": 6.72,
-      "grp": "fc",
-      "hps": 13.44,
-      "id": "22",
-      "integrity": 40,
-      "jitter": 0.5,
-      "mass": 2,
-      "mount": "T",
-      "power": 0.42,
-      "range": 2000,
-      "rating": "E",
-      "reload": 5,
-      "rof": 4.8,
-      "roundspershot": 12,
-      "speed": 667,
-      "type": "K"
-    },
-    {
-      "ammo": 90,
-      "armourpen": "A",
       "class": 3,
       "clip": 3,
       "cost": 1400830,
-      "damage": 3,
-      "dps": 9,
+      "damage": 3.4,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.57,
       "edID": 128671343,
       "eddbID": 1478,
+      "falloff": 1800,
       "grp": "fc",
       "id": "pa",
+      "integrity": 64,
+      "jitter": 1.7,
       "mass": 8,
       "mount": "F",
       "name": "Pacifier",
+      "piercing": 45,
       "power": 1.02,
       "pp": "Zachary Hudson",
       "rating": "C",
+      "reload": 5,
       "rof": 4.5,
-      "thermload": 1,
-      "type": "K"
+      "roundspershot": 12,
+      "shotspeed": 1000,
+      "thermload": 1.1,
+      "symbol": "Hpt_Slugshot_Fixed_Large_Range"
     }
   ]
-}
+}

modules/hardpoints/frame_shift_wake_scanner.json

@@ -12,7 +12,8 @@
       "power": 0.2,
       "range": 2000,
       "rating": "E",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CloudScanner_Size0_Class1"
     },
     {
       "class": 0,
@@ -26,7 +27,8 @@
       "power": 0.4,
       "range": 2500,
       "rating": "D",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CloudScanner_Size0_Class2"
     },
     {
       "class": 0,
@@ -40,7 +42,8 @@
       "power": 0.8,
       "range": 3000,
       "rating": "C",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CloudScanner_Size0_Class3"
     },
     {
       "class": 0,
@@ -54,7 +57,8 @@
       "power": 1.6,
       "range": 3500,
       "rating": "B",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CloudScanner_Size0_Class4"
     },
     {
       "class": 0,
@@ -68,7 +72,8 @@
       "power": 3.2,
       "range": 4000,
       "rating": "A",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CloudScanner_Size0_Class5"
     }
   ]
-}
+}

modules/hardpoints/heat_sink_launcher.json

@@ -0,0 +1,28 @@
+{
+  "hs": [
+    {
+      "ammo": 2,
+      "ammocost": 25,
+      "class": 0,
+      "clip": 1,
+      "cost": 3500,
+      "distdraw": 2,
+      "drain": 100,
+      "duration": 10,
+      "edID": 128049519,
+      "eddbID": 886,
+      "eps": 0.4,
+      "grp": "hs",
+      "id": "02",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Heat Sink Launcher",
+      "passive": 1,
+      "power": 0.2,
+      "rating": "I",
+      "reload": 10,
+      "rof": 0.2,
+      "symbol": "Hpt_HeatSinkLauncher_Turret_Tiny"
+    }
+  ]
+}

modules/hardpoints/kill_warrant_scanner.json

@@ -12,7 +12,8 @@
       "power": 0.2,
       "range": 2000,
       "rating": "E",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CrimeScanner_Size0_Class1"
     },
     {
       "class": 0,
@@ -26,7 +27,8 @@
       "power": 0.4,
       "range": 2500,
       "rating": "D",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CrimeScanner_Size0_Class2"
     },
     {
       "class": 0,
@@ -40,7 +42,8 @@
       "power": 0.8,
       "range": 3000,
       "rating": "C",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CrimeScanner_Size0_Class3"
     },
     {
       "class": 0,
@@ -54,7 +57,8 @@
       "power": 1.6,
       "range": 3500,
       "rating": "B",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CrimeScanner_Size0_Class4"
     },
     {
       "class": 0,
@@ -68,7 +72,8 @@
       "power": 3.2,
       "range": 4000,
       "rating": "A",
-      "time": 10
+      "scantime": 10,
+      "symbol": "Hpt_CrimeScanner_Size0_Class5"
     }
   ]
-}
+}

modules/hardpoints/mine_launcher.json

@@ -2,78 +2,91 @@
   "nl": [
     {
       "ammo": 36,
-      "armourpen": 60,
-      "breachdps": 0,
+      "breachdmg": 0,
       "breachmax": 0,
       "breachmin": 0,
       "class": 1,
-      "clip": 3,
+      "clip": 1,
       "cost": 24260,
-      "dps": 44,
+      "damage": 44,
+      "damagedist": {
+        "E": 0.5,
+        "T": 0.5
+      },
+      "distdraw": 0,
       "edID": 128049500,
       "eddbID": 880,
-      "eps": 0,
       "grp": "nl",
-      "hps": 5,
       "id": "2j",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 60,
       "power": 0.4,
       "rating": "I",
       "reload": 2,
       "rof": 1,
-      "type": "ET"
+      "thermload": 5,
+      "symbol": "Hpt_MineLauncher_Fixed_Small"
     },
     {
       "ammo": 36,
-      "armourpen": 60,
-      "breachdps": 0,
-      "breachmax": 0,
-      "breachmin": 0,
-      "class": 2,
-      "clip": 3,
-      "cost": 294080,
-      "dps": 44,
-      "edID": 128049501,
-      "eddbID": 881,
-      "eps": 0,
-      "grp": "nl",
-      "hps": 7.5,
-      "id": "2k",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "F",
-      "power": 0.4,
-      "rating": "I",
-      "reload": 2,
-      "rof": 1,
-      "type": "ET"
-    },
-    {
-      "ammo": 36,
-      "armourpen": "C",
-      "breachdps": 0,
+      "breachdmg": 0,
       "breachmax": 0,
       "breachmin": 0,
       "class": 1,
-      "clip": 3,
+      "clip": 1,
       "cost": 36400,
-      "dps": 32,
+      "damage": 32,
+      "damagedist": {
+        "E": 0.5,
+        "T": 0.5
+      },
+      "distdraw": 0,
       "edID": 128671448,
       "eddbID": 1523,
       "grp": "nl",
-      "hps": 5,
       "id": "kp",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Shock Mine Launcher",
+      "piercing": 60,
       "power": 0.4,
       "rating": "I",
       "reload": 2,
       "rof": 1,
-      "type": "ET"
+      "thermload": 5,
+      "symbol": "Hpt_MineLauncher_Fixed_Small_Impulse"
+    },
+    {
+      "ammo": 72,
+      "breachdmg": 0,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 2,
+      "clip": 3,
+      "cost": 294080,
+      "damage": 44,
+      "damagedist": {
+        "E": 0.5,
+        "T": 0.5
+      },
+      "distdraw": 0,
+      "edID": 128049501,
+      "eddbID": 881,
+      "grp": "nl",
+      "id": "2k",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 60,
+      "power": 0.4,
+      "rating": "I",
+      "reload": 6.6,
+      "rof": 1,
+      "thermload": 7.5,
+      "symbol": "Hpt_MineLauncher_Fixed_Medium"
     }
   ]
-}
+}

modules/hardpoints/mining_laser.json

@@ -1,62 +1,135 @@
 {
   "ml": [
     {
-      "armourpen": 18,
-      "breachdps": 0.3,
+      "breachdmg": 0.3,
       "breachmax": 0.2,
       "breachmin": 0.1,
       "class": 1,
       "cost": 6800,
-      "dps": 2,
+      "damage": 2,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.5,
       "edID": 128049525,
       "eddbID": 888,
-      "eps": 1.5,
+      "falloff": 300,
       "grp": "ml",
-      "hps": 2,
       "id": "2l",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 18,
       "power": 0.5,
-      "rating": "D"
+      "range": 500,
+      "rating": "D",
+      "thermload": 2,
+      "symbol": "Hpt_MiningLaser_Fixed_Small"
     },
     {
-      "armourpen": 18,
-      "breachdps": 0.6,
+      "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,
+      "symbol": "Hpt_MiningLaser_Turret_Small"
+    },
+    {
+      "breachdmg": 1.2,
+      "breachmax": 0.2,
+      "breachmin": 0.1,
+      "class": 1,
+      "cost": 13600,
+      "damage": 8,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.75,
+      "edID": 128671347,
+      "eddbID": 1479,
+      "falloff": 400,
+      "grp": "ml",
+      "id": "ml",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "name": "Mining Lance",
+      "piercing": 18,
+      "power": 0.7,
+      "pp": "Zemina Torval",
+      "range": 2000,
+      "rating": "D",
+      "thermload": 6
+    },
+    {
+      "breachdmg": 0.6,
       "breachmax": 0.2,
       "breachmin": 0.1,
       "class": 2,
       "cost": 22580,
-      "dps": 4,
+      "damage": 4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3,
       "edID": 128049526,
       "eddbID": 889,
-      "eps": 3,
+      "falloff": 300,
       "grp": "ml",
-      "hps": 4,
       "id": "2m",
       "integrity": 51,
       "mass": 2,
       "mount": "F",
+      "piercing": 18,
       "power": 0.75,
-      "rating": "D"
+      "range": 500,
+      "rating": "D",
+      "thermload": 4,
+      "symbol": "Hpt_MiningLaser_Fixed_Medium"
     },
     {
-      "armourpen": "D",
-      "class": 1,
-      "cost": 13600,
-      "damage": 3,
-      "dps": 3,
-      "eddbID": 1479,
+      "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": "ml",
+      "id": "w1",
+      "integrity": 51,
       "mass": 2,
-      "mount": "F",
-      "name": "Mining Lance",
-      "power": 0.7,
-      "pp": "Zemina Torval",
+      "mount": "T",
+      "piercing": 18,
+      "power": 0.75,
+      "range": 500,
       "rating": "D",
-      "thermload": 3,
-      "type": "T"
+      "thermload": 4,
+      "symbol": "Hpt_MiningLaser_Turret_Medium"
     }
   ]
-}
+}

modules/hardpoints/missile_rack.json

@@ -1,42 +1,78 @@
 {
   "mr": [
     {
-      "ammo": 48,
-      "armourpen": 60,
-      "breachdps": 4.8,
+      "ammo": 16,
+      "breachdmg": 20,
       "breachmax": 0,
       "breachmin": 0,
-      "class": 2,
-      "clip": 12,
-      "cost": 190227,
-      "dps": 25,
-      "eddbID": 1559,
-      "eps": 0.12,
+      "class": 1,
+      "clip": 8,
+      "cost": 32180,
+      "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
+      "edID": 128666724,
+      "eddbID": 1326,
       "grp": "mr",
-      "hps": 1.08,
-      "id": "1z",
-      "integrity": 51,
-      "mass": 4,
+      "id": "2d",
+      "integrity": 40,
+      "mass": 2,
       "missile": "D",
       "mount": "F",
-      "name": "Rocket Propelled FSD Disruptor",
-      "power": 1.2,
-      "pp": "Yuri Grom",
+      "piercing": 60,
+      "power": 0.4,
       "rating": "B",
+      "reload": 5,
       "rof": 0.5,
-      "speed": 750,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6,
+      "symbol": "Hpt_DumbfireMissileRack_Fixed_Small"
+    },
+    {
+      "ammo": 6,
+      "breachdmg": 16,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 1,
+      "clip": 6,
+      "cost": 72600,
+      "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
+      "edID": 128049492,
+      "eddbID": 878,
+      "grp": "mr",
+      "id": "2e",
+      "integrity": 40,
+      "mass": 2,
+      "missile": "S",
+      "mount": "F",
+      "piercing": 60,
+      "power": 0.6,
+      "rating": "B",
+      "reload": 12,
+      "rof": 0.333,
+      "shotspeed": 625,
+      "thermload": 3.6,
+      "symbol": "Hpt_BasicMissileRack_Fixed_Small"
     },
     {
       "ammo": 48,
-      "armourpen": 60,
-      "breachdps": 0,
+      "breachdmg": 20,
       "breachmax": 0,
       "breachmin": 0,
       "class": 2,
       "clip": 12,
       "cost": 240400,
-      "dps": 25,
+      "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
       "edID": 128666725,
       "eddbID": 1327,
       "eps": 0.12,
@@ -47,23 +83,28 @@
       "mass": 4,
       "missile": "D",
       "mount": "F",
+      "piercing": 60,
       "power": 1.2,
       "rating": "B",
       "reload": 5,
-      "roundspershot": 1,
-      "speed": 750,
-      "type": "E"
+      "rof": 0.5,
+      "shotspeed": 750,
+      "thermload": 3.6,
+      "symbol": "Hpt_DumbfireMissileRack_Fixed_Medium"
     },
     {
       "ammo": 18,
-      "armourpen": 60,
-      "breachdps": 0,
+      "breachdmg": 16,
       "breachmax": 0,
       "breachmin": 0,
       "class": 2,
       "clip": 6,
       "cost": 512400,
-      "dps": 13.3,
+      "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
       "edID": 128049493,
       "eddbID": 879,
       "eps": 0.07,
@@ -74,98 +115,81 @@
       "mass": 4,
       "missile": "S",
       "mount": "F",
+      "piercing": 60,
       "power": 1.2,
       "rating": "B",
       "reload": 12,
-      "roundspershot": 1,
-      "speed": 625,
-      "type": "E"
+      "rof": 0.333,
+      "shotspeed": 625,
+      "thermload": 3.6,
+      "symbol": "Hpt_BasicMissileRack_Fixed_Medium"
     },
     {
-      "ammo": 16,
-      "armourpen": 60,
-      "breachdps": 0,
+      "ammo": 48,
+      "breachdmg": 16,
       "breachmax": 0,
       "breachmin": 0,
-      "class": 1,
-      "clip": 8,
-      "cost": 32180,
-      "dps": 25,
-      "edID": 128666724,
-      "eddbID": 1326,
-      "eps": 0.12,
+      "class": 2,
+      "clip": 12,
+      "cost": 1951040,
+      "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
+      "eddbID": 1559,
       "grp": "mr",
-      "hps": 1.8,
-      "id": "2d",
-      "integrity": 40,
-      "mass": 2,
+      "edID": 128732552,
+      "id": "1z",
+      "integrity": 51,
+      "mass": 4,
       "missile": "D",
       "mount": "F",
-      "power": 0.4,
+      "name": "Rocket Propelled FSD Disruptor",
+      "piercing": 60,
+      "power": 1.2,
+      "pp": "Yuri Grom",
       "rating": "B",
       "reload": 5,
-      "rof": 0.5,
-      "roundspershot": 1,
-      "speed": 750,
-      "type": "E"
-    },
-    {
-      "ammo": 6,
-      "armourpen": 60,
-      "breachdps": 0,
-      "breachmax": 0,
-      "breachmin": 0,
-      "class": 1,
-      "clip": 6,
-      "cost": 72600,
-      "dps": 13.3,
-      "edID": 128049492,
-      "eddbID": 878,
-      "eps": 0.07,
-      "grp": "mr",
-      "hps": 1.08,
-      "id": "2e",
-      "integrity": 40,
-      "mass": 2,
-      "missile": "S",
-      "mount": "F",
-      "power": 0.6,
-      "rating": "B",
-      "reload": 12,
-      "rof": 0.3,
-      "roundspershot": 1,
-      "speed": 625,
-      "type": "E"
+      "rof": 0.333,
+      "shotspeed": 750,
+      "thermload": 3.6,
+      "symbol": "Hpt_DumbfireMissileRack_Fixed_Medium_Lasso"
     },
     {
       "ammo": 120,
-      "armourpen": 60,
-      "breachdps": 3.6,
+      "breachdmg": 3,
       "breachmax": 0,
       "breachmin": 0,
       "class": 2,
       "clip": 12,
       "cost": 768600,
-      "dps": 72,
+      "damage": 7.5,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
       "edID": 128671344,
       "eddbID": 1480,
-      "eps": 0.48,
+      "eps": 1.92,
       "grp": "mr",
-      "hps": 7.2,
+      "hps": 28.8,
       "id": "Ph",
       "integrity": 51,
       "mass": 4,
       "missile": "S",
       "mount": "F",
       "name": "Pack-Hound",
+      "piercing": 60,
       "power": 1.2,
       "pp": "Li Yong-Rui",
       "rating": "B",
       "reload": 5,
       "rof": 2,
       "roundspershot": 4,
-      "speed": 600,
-      "type": "E"
+      "shotspeed": 600,
+      "thermload": 3.6,
+      "symbol": "Hpt_DrunkMissileRack_Fixed_Medium"
     }
   ]
-}
+}

modules/hardpoints/multi_cannon.json

@@ -2,304 +2,347 @@
   "mc": [
     {
       "ammo": 2100,
-      "armourpen": 68,
-      "breachdps": 25.2,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "clip": 90,
-      "cost": 1177600,
-      "dps": 28,
-      "edID": 128049458,
-      "eddbID": 1542,
-      "eps": 1.44,
-      "grp": "mc",
-      "hps": 2.4,
-      "id": "7n",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 0.73,
-      "range": 4000,
-      "rating": "A",
-      "reload": 4,
-      "rof": 3,
-      "roundspershot": 2,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 68,
-      "breachdps": 21.08,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "clip": 90,
-      "cost": 6377600,
-      "dps": 23.3,
-      "edID": 128681996,
-      "eddbID": 1546,
-      "eps": 2.516,
-      "grp": "mc",
-      "hps": 3.4,
-      "id": "7o",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 1.22,
-      "range": 4000,
-      "rating": "A",
-      "reload": 4,
-      "rof": 3.4,
-      "roundspershot": 2,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 54,
-      "breachdps": 20.65,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "clip": 90,
-      "cost": 140400,
-      "dps": 23.1,
-      "edID": 128049457,
-      "eddbID": 1541,
-      "eps": 1.062,
-      "grp": "mc",
-      "hps": 1.77,
-      "id": "7k",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 0.64,
-      "range": 4000,
-      "rating": "C",
-      "reload": 4,
-      "rof": 5.9,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 54,
-      "breachdps": 17.42,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "clip": 90,
-      "cost": 578436,
-      "dps": 18.9,
-      "edID": 128049461,
-      "eddbID": 1543,
-      "eps": 1.675,
-      "grp": "mc",
-      "hps": 2.01,
-      "id": "7l",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "G",
-      "power": 0.97,
-      "range": 4000,
-      "rating": "C",
-      "reload": 4,
-      "rof": 6.7,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 37,
-      "breachdps": 14.2,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "clip": 90,
-      "cost": 38000,
-      "dps": 15.6,
-      "edID": 128049456,
-      "eddbID": 868,
-      "eps": 0.781,
-      "grp": "mc",
-      "hps": 1.42,
-      "id": "26",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "F",
-      "power": 0.46,
-      "range": 4000,
-      "rating": "E",
-      "reload": 4,
-      "rof": 7.1,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 37,
-      "breachdps": 11.55,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "clip": 90,
-      "cost": 57000,
-      "dps": 12.6,
-      "edID": 128049460,
-      "eddbID": 870,
-      "eps": 1.078,
-      "grp": "mc",
-      "hps": 1.54,
-      "id": "27",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "G",
-      "power": 0.64,
-      "range": 4000,
-      "rating": "F",
-      "reload": 4,
-      "rof": 7.7,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 37,
-      "breachdps": 6.82,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "clip": 90,
-      "cost": 1292800,
-      "dps": 7.3,
-      "edID": 128049463,
-      "eddbID": 872,
-      "eps": 0.372,
-      "grp": "mc",
-      "hps": 0.62,
-      "id": "28",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.5,
-      "range": 4000,
-      "rating": "F",
-      "reload": 4,
-      "rof": 6.2,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 22,
-      "breachdps": 7.7,
+      "breachdmg": 1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
-      "clip": 90,
+      "clip": 100,
       "cost": 9500,
-      "dps": 8.6,
+      "damage": 1.12,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.06,
       "edID": 128049455,
       "eddbID": 867,
-      "eps": 0.462,
+      "falloff": 1800,
       "grp": "mc",
-      "hps": 0.77,
       "id": "23",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 22,
       "power": 0.28,
       "range": 4000,
       "rating": "F",
       "reload": 4,
-      "rof": 7.7,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
+      "rof": 7.69,
+      "shotspeed": 1600,
+      "thermload": 0.09,
+      "symbol": "Hpt_MultiCannon_Fixed_Small"
     },
     {
       "ammo": 2100,
-      "armourpen": 22,
-      "breachdps": 5.8,
+      "breachdmg": 0.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "clip": 90,
       "cost": 14250,
-      "dps": 6.8,
+      "damage": 0.82,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.07,
       "edID": 128049459,
       "eddbID": 869,
-      "eps": 0.58,
+      "falloff": 1800,
       "grp": "mc",
-      "hps": 0.83,
       "id": "24",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 22,
       "power": 0.37,
       "range": 4000,
       "rating": "G",
-      "reload": 4,
-      "rof": 8.3,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
+      "reload": 5,
+      "rof": 8.33,
+      "shotspeed": 1600,
+      "thermload": 0.1,
+      "symbol": "Hpt_MultiCannon_Gimbal_Small"
     },
     {
       "ammo": 2100,
-      "armourpen": 22,
-      "breachdps": 3.55,
+      "breachdmg": 0.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "clip": 90,
       "cost": 81600,
-      "dps": 4,
+      "damage": 0.56,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.03,
       "edID": 128049462,
       "eddbID": 871,
-      "eps": 0.213,
+      "falloff": 1800,
       "grp": "mc",
-      "hps": 0,
       "id": "25",
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 22,
       "power": 0.26,
       "range": 4000,
       "rating": "G",
       "reload": 4,
-      "rof": 7.1,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
+      "rof": 7.14,
+      "shotspeed": 1600,
+      "thermload": 0.04,
+      "symbol": "Hpt_MultiCannon_Turret_Small"
     },
     {
       "ammo": 1000,
-      "armourpen": "A",
+      "breachdmg": 2.6,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
       "class": 1,
       "clip": 60,
       "cost": 13980,
-      "damage": 4,
-      "dps": 4,
+      "damage": 2.9,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.12,
+      "edID": 128671345,
       "eddbID": 1481,
+      "falloff": 1800,
       "grp": "mc",
       "id": "e0",
+      "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Enforcer",
+      "piercing": 30,
       "power": 0.28,
       "pp": "Pranav Antal",
+      "range": 4500,
       "rating": "F",
+      "reload": 4,
       "rof": 4.3,
-      "thermload": 1,
-      "type": "K"
+      "shotspeed": 1800,
+      "thermload": 0.2
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 100,
+      "cost": 38000,
+      "damage": 2.19,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.11,
+      "edID": 128049456,
+      "eddbID": 868,
+      "falloff": 1800,
+      "grp": "mc",
+      "id": "26",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 37,
+      "power": 0.46,
+      "range": 4000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 7.14,
+      "shotspeed": 1600,
+      "thermload": 0.18,
+      "symbol": "Hpt_MultiCannon_Fixed_Medium"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 1.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 90,
+      "cost": 57000,
+      "damage": 1.64,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.14,
+      "edID": 128049460,
+      "eddbID": 870,
+      "falloff": 1800,
+      "grp": "mc",
+      "id": "27",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 37,
+      "power": 0.64,
+      "range": 4000,
+      "rating": "F",
+      "reload": 5,
+      "rof": 7.69,
+      "shotspeed": 1600,
+      "thermload": 0.2,
+      "symbol": "Hpt_MultiCannon_Gimbal_Medium"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 1.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 90,
+      "cost": 1292800,
+      "damage": 1.17,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.06,
+      "edID": 128049463,
+      "eddbID": 872,
+      "falloff": 1800,
+      "grp": "mc",
+      "id": "28",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 37,
+      "power": 0.5,
+      "range": 4000,
+      "rating": "F",
+      "reload": 4,
+      "rof": 6.25,
+      "shotspeed": 1600,
+      "thermload": 0.09,
+      "symbol": "Hpt_MultiCannon_Turret_Medium"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 3.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 100,
+      "cost": 140400,
+      "damage": 3.92,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.18,
+      "edID": 128049457,
+      "eddbID": 1541,
+      "falloff": 1800,
+      "grp": "mc",
+      "id": "7k",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 54,
+      "power": 0.64,
+      "range": 4000,
+      "rating": "C",
+      "reload": 4,
+      "rof": 5.884,
+      "shotspeed": 1600,
+      "thermload": 0.28,
+      "symbol": "Hpt_MultiCannon_Fixed_Large"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 2.6,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 90,
+      "cost": 578436,
+      "damage": 2.84,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.25,
+      "edID": 128049461,
+      "eddbID": 1543,
+      "falloff": 1800,
+      "grp": "mc",
+      "id": "7l",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "piercing": 54,
+      "power": 0.97,
+      "range": 4000,
+      "rating": "C",
+      "reload": 5,
+      "rof": 6.665,
+      "shotspeed": 1600,
+      "thermload": 0.34,
+      "symbol": "Hpt_MultiCannon_Gimbal_Large"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 4.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 100,
+      "cost": 1177600,
+      "damage": 4.625,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.24,
+      "edID": 128049458,
+      "eddbID": 1542,
+      "falloff": 1800,
+      "grp": "mc",
+      "id": "7n",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 68,
+      "power": 0.73,
+      "range": 4000,
+      "rating": "A",
+      "reload": 4,
+      "rof": 3.03,
+      "roundspershot": 2,
+      "shotspeed": 1600,
+      "thermload": 0.39,
+      "symbol": "Hpt_MultiCannon_Fixed_Huge"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 3.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 90,
+      "cost": 6377600,
+      "damage": 3.46,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.37,
+      "edID": 128681996,
+      "eddbID": 1546,
+      "falloff": 1800,
+      "grp": "mc",
+      "id": "7o",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "piercing": 68,
+      "power": 1.22,
+      "range": 4000,
+      "rating": "A",
+      "reload": 5,
+      "rof": 3.365,
+      "roundspershot": 2,
+      "shotspeed": 1600,
+      "thermload": 0.51,
+      "symbol": "Hpt_MultiCannon_Gimbal_Huge"
     }
   ]
-}
+}

modules/hardpoints/plasma_accelerator.json

@@ -2,117 +2,137 @@
   "pa": [
     {
       "ammo": 100,
-      "armourpen": 85,
-      "breachdps": 30.62,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "clip": 5,
-      "cost": 13793600,
-      "dps": 30,
-      "edID": 128049467,
-      "eddbID": 875,
-      "eps": 6.312,
-      "grp": "pa",
-      "hps": 8.85,
-      "id": "2c",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 2.63,
-      "range": 3500,
-      "rating": "A",
-      "reload": 8,
-      "rof": 0.3,
-      "roundspershot": 1,
-      "speed": 875,
-      "type": "KT"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 70,
-      "breachdps": 20.4,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "clip": 5,
-      "cost": 3051200,
-      "dps": 23.2,
-      "edID": 128049466,
-      "eddbID": 874,
-      "eps": 4.08,
-      "grp": "pa",
-      "hps": 6.54,
-      "id": "2b",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 1.97,
-      "range": 3500,
-      "rating": "B",
-      "reload": 8,
-      "rof": 0.3,
-      "roundspershot": 1,
-      "speed": 875,
-      "type": "KT"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 55,
-      "breachdps": 13.26,
+      "breachdmg": 44.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
       "clip": 5,
       "cost": 834200,
-      "dps": 17.2,
+      "damage": 54.3,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
+      "distdraw": 8.65,
       "edID": 128049465,
       "eddbID": 873,
-      "eps": 2.595,
+      "falloff": 2000,
       "grp": "pa",
-      "hps": 4.68,
       "id": "1g",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 100,
       "power": 1.43,
       "range": 3500,
       "rating": "C",
-      "reload": 8,
-      "rof": 0.3,
-      "roundspershot": 1,
-      "speed": 875,
-      "type": "KT"
+      "reload": 6,
+      "rof": 0.33,
+      "shotspeed": 875,
+      "thermload": 15.6,
+      "symbol": "Hpt_PlasmaAccelerator_Fixed_Medium"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 68,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 5,
+      "cost": 3051200,
+      "damage": 83.4,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
+      "distdraw": 13.6,
+      "edID": 128049466,
+      "eddbID": 874,
+      "falloff": 2000,
+      "grp": "pa",
+      "id": "2b",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 100,
+      "power": 1.97,
+      "range": 3500,
+      "rating": "B",
+      "reload": 6,
+      "rof": 0.29,
+      "shotspeed": 875,
+      "thermload": 21.8,
+      "symbol": "Hpt_PlasmaAccelerator_Fixed_Large"
     },
     {
       "ammo": 300,
-      "armourpen": 70,
-      "breachdps": 22.48,
+      "breachdmg": 30.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 3,
       "clip": 20,
       "cost": 4119120,
-      "dps": 27.5,
+      "damage": 34.5,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
+      "distdraw": 5.5,
       "edID": 128671339,
       "eddbID": 1482,
-      "eps": 4.4,
+      "falloff": 2000,
       "grp": "pa",
-      "hps": 8.8,
       "id": "Ap",
       "integrity": 64,
       "mass": 8,
       "mount": "F",
       "name": "Advanced Plasma Accelerator",
+      "piercing": 100,
       "power": 1.97,
       "pp": "Denton Patreus",
       "range": 3500,
       "rating": "B",
-      "reload": 8,
+      "reload": 6,
       "rof": 0.8,
-      "roundspershot": 1,
-      "speed": 875,
-      "type": "KT"
+      "shotspeed": 875,
+      "thermload": 11,
+      "symbol": "Hpt_PlasmaAccelerator_Fixed_Large_Advanced"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 102,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 5,
+      "cost": 13793600,
+      "damage": 125.2,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
+      "distdraw": 21.04,
+      "edID": 128049467,
+      "eddbID": 875,
+      "falloff": 2000,
+      "grp": "pa",
+      "id": "2c",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 100,
+      "power": 2.63,
+      "range": 3500,
+      "rating": "A",
+      "reload": 6,
+      "rof": 0.25,
+      "shotspeed": 875,
+      "thermload": 29.5,
+      "symbol": "Hpt_PlasmaAccelerator_Fixed_Huge"
     }
   ]
-}
+}

modules/hardpoints/point_defence.json

@@ -0,0 +1,33 @@
+{
+  "po": [
+    {
+      "ammo": 10000,
+      "burst": 4,
+      "burstrof": 15,
+      "class": 0,
+      "clip": 12,
+      "cost": 18550,
+      "damage": 0.2,
+      "damagedist": {
+        "K": 1
+      },
+      "edID": 128049522,
+      "eddbID": 887,
+      "grp": "po",
+      "id": "03",
+      "integrity": 30,
+      "jitter": 0.75,
+      "mass": 0.5,
+      "name": "Point Defence",
+      "passive": 1,
+      "power": 0.2,
+      "range": 2500,
+      "rating": "I",
+      "reload": 0.4,
+      "rof": 10,
+      "shotspeed": 1000,
+      "thermload": 0.1,
+      "symbol": "Hpt_PlasmaPointDefence_Turret_Tiny"
+    }
+  ]
+}

modules/hardpoints/pulse_laser.json

@@ -1,276 +1,328 @@
 {
   "pl": [
     {
-      "armourpen": 65,
-      "breachdps": 22.62,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "cost": 177600,
-      "dps": 26.9,
-      "edID": 128049384,
-      "eddbID": 1539,
-      "eps": 4.264,
-      "grp": "pl",
-      "hps": 4.16,
-      "id": "7q",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 1.33,
-      "range": 3000,
-      "rating": "A",
-      "rof": 2.6,
-      "type": "T"
-    },
-    {
-      "armourpen": 65,
-      "breachdps": 18.48,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "cost": 877600,
-      "dps": 21.7,
-      "edID": 128681995,
-      "eddbID": 1545,
-      "eps": 4.368,
-      "grp": "pl",
-      "hps": 4.48,
-      "id": "7r",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 1.37,
-      "range": 3000,
-      "rating": "A",
-      "rof": 2.8,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 15.3,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 70400,
-      "dps": 18.1,
-      "edID": 128049383,
-      "eddbID": 825,
-      "eps": 2.88,
-      "grp": "pl",
-      "hps": 3,
-      "id": "1d",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 0.9,
-      "range": 3000,
-      "rating": "D",
-      "rof": 3,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 12.48,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 140600,
-      "dps": 14.8,
-      "edID": 128049387,
-      "eddbID": 828,
-      "eps": 2.944,
-      "grp": "pl",
-      "hps": 2.88,
-      "id": "1e",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "G",
-      "power": 0.92,
-      "range": 3000,
-      "rating": "E",
-      "rof": 3.2,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 8.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 400400,
-      "dps": 9.5,
-      "edID": 128049390,
-      "eddbID": 831,
-      "eps": 1.512,
-      "grp": "pl",
-      "hps": 1.62,
-      "id": "1f",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "T",
-      "power": 0.89,
-      "range": 3000,
-      "rating": "F",
-      "rof": 2.7,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 10.2,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 17600,
-      "dps": 12.1,
-      "edID": 128049382,
-      "eddbID": 824,
-      "eps": 1.904,
-      "grp": "pl",
-      "hps": 2.04,
-      "id": "1a",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "F",
-      "power": 0.6,
-      "range": 3000,
-      "rating": "F",
-      "rof": 3.4,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 8.28,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 35400,
-      "dps": 9.6,
-      "edID": 128049386,
-      "eddbID": 827,
-      "eps": 1.944,
-      "grp": "pl",
-      "hps": 1.8,
-      "id": "1b",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "G",
-      "power": 0.6,
-      "range": 3000,
-      "rating": "F",
-      "rof": 3.6,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 5.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 132800,
-      "dps": 6.2,
-      "edID": 128049389,
-      "eddbID": 830,
-      "eps": 1,
-      "grp": "pl",
-      "hps": 0.9,
-      "id": "1c",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.58,
-      "range": 3000,
-      "rating": "F",
-      "rof": 3,
-      "type": "T"
-    },
-    {
-      "armourpen": 20,
-      "breachdps": 6.46,
+      "breachdmg": 1.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 2200,
-      "dps": 7.9,
+      "damage": 2.05,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.3,
       "edID": 128049381,
       "eddbID": 823,
-      "eps": 1.254,
+      "falloff": 500,
       "grp": "pl",
-      "hps": 1.14,
       "id": "17",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 20,
       "power": 0.39,
       "range": 3000,
       "rating": "F",
-      "rof": 3.8,
-      "type": "T"
+      "rof": 3.85,
+      "thermload": 0.33,
+      "symbol": "Hpt_PulseLaser_Fixed_Small"
     },
     {
-      "armourpen": 20,
-      "breachdps": 5.2,
+      "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 6600,
-      "dps": 6.2,
+      "damage": 1.56,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.31,
       "edID": 128049385,
       "eddbID": 826,
-      "eps": 1.24,
+      "falloff": 500,
       "grp": "pl",
-      "hps": 1.2,
       "id": "18",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 20,
       "power": 0.39,
       "range": 3000,
       "rating": "G",
       "rof": 4,
-      "type": "T"
+      "thermload": 0.31,
+      "symbol": "Hpt_PulseLaser_Gimbal_Small"
     },
     {
-      "armourpen": 20,
-      "breachdps": 3.3,
+      "breachdmg": 1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 26000,
-      "dps": 4,
+      "damage": 1.19,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.19,
       "edID": 128049388,
       "eddbID": 829,
-      "eps": 0.627,
+      "falloff": 500,
       "grp": "pl",
-      "hps": 6.6,
       "id": "19",
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 20,
       "power": 0.38,
       "range": 3000,
       "rating": "G",
-      "rof": 3.3,
-      "type": "T"
+      "rof": 3.33,
+      "thermload": 0.19,
+      "symbol": "Hpt_PulseLaser_Turret_Small"
     },
     {
-      "armourpen": "A",
+      "breachdmg": 3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 17600,
+      "damage": 3.5,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.5,
+      "edID": 128049382,
+      "eddbID": 824,
+      "falloff": 500,
+      "grp": "pl",
+      "id": "1a",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 35,
+      "power": 0.6,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.45,
+      "thermload": 0.56,
+      "symbol": "Hpt_PulseLaser_Fixed_Medium"
+    },
+    {
+      "breachdmg": 2.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 35400,
+      "damage": 2.68,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.54,
+      "edID": 128049386,
+      "eddbID": 827,
+      "falloff": 500,
+      "grp": "pl",
+      "id": "1b",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 35,
+      "power": 0.6,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.57,
+      "thermload": 0.54,
+      "symbol": "Hpt_PulseLaser_Gimbal_Medium"
+    },
+    {
+      "breachdmg": 1.7,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 132800,
+      "damage": 2.05,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.33,
+      "edID": 128049389,
+      "eddbID": 830,
+      "falloff": 500,
+      "grp": "pl",
+      "id": "1c",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 35,
+      "power": 0.58,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.03,
+      "thermload": 0.33,
+      "symbol": "Hpt_PulseLaser_Turret_Medium"
+    },
+    {
+      "breachdmg": 2.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
       "class": 2,
       "cost": 26400,
-      "damage": 2,
-      "dps": 2,
+      "damage": 2.8,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.9,
+      "edID": 128671342,
       "eddbID": 1483,
+      "falloff": 500,
       "grp": "pl",
       "id": "PL",
+      "integrity": 51,
       "mass": 4,
       "mount": "F",
       "name": "Disruptor",
+      "piercing": 35,
       "power": 0.7,
       "pp": "Felicia Winters",
       "rating": "E",
-      "rof": 1.6,
-      "thermload": 1,
-      "type": "T"
+      "rof": 1.664,
+      "thermload": 1
+    },
+    {
+      "breachdmg": 5.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 70400,
+      "damage": 5.98,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.86,
+      "edID": 128049383,
+      "eddbID": 825,
+      "falloff": 500,
+      "grp": "pl",
+      "id": "1d",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 52,
+      "power": 0.9,
+      "range": 3000,
+      "rating": "D",
+      "rof": 3.03,
+      "thermload": 0.96,
+      "symbol": "Hpt_PulseLaser_Fixed_Large"
+    },
+    {
+      "breachdmg": 3.9,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 140600,
+      "damage": 4.58,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.92,
+      "edID": 128049387,
+      "eddbID": 828,
+      "falloff": 500,
+      "grp": "pl",
+      "id": "1e",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "piercing": 52,
+      "power": 0.92,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.23,
+      "thermload": 0.92,
+      "symbol": "Hpt_PulseLaser_Gimbal_Large"
+    },
+    {
+      "breachdmg": 3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 400400,
+      "damage": 3.5,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.56,
+      "edID": 128049390,
+      "eddbID": 831,
+      "falloff": 500,
+      "grp": "pl",
+      "id": "1f",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 52,
+      "power": 0.89,
+      "range": 3000,
+      "rating": "F",
+      "rof": 2.7,
+      "thermload": 0.56,
+      "symbol": "Hpt_PulseLaser_Turret_Large"
+    },
+    {
+      "breachdmg": 8.7,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 177600,
+      "damage": 10.24,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.48,
+      "edID": 128049384,
+      "eddbID": 1539,
+      "falloff": 500,
+      "grp": "pl",
+      "id": "7q",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 65,
+      "power": 1.33,
+      "range": 3000,
+      "rating": "A",
+      "rof": 2.63,
+      "thermload": 1.64,
+      "symbol": "Hpt_PulseLaser_Fixed_Huge"
+    },
+    {
+      "breachdmg": 6.6,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 877600,
+      "damage": 7.82,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.56,
+      "edID": 128681995,
+      "eddbID": 1545,
+      "falloff": 500,
+      "grp": "pl",
+      "id": "7r",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "piercing": 65,
+      "power": 1.37,
+      "range": 3000,
+      "rating": "A",
+      "rof": 2.78,
+      "thermload": 1.56,
+      "symbol": "Hpt_PulseLaser_Gimbal_Huge"
     }
   ]
-}
+}

modules/hardpoints/rail_gun.json

@@ -1,78 +1,101 @@
 {
   "rg": [
     {
-      "ammo": 30,
-      "armourpen": 30,
-      "breachdps": 35.2,
+      "ammo": 80,
+      "breachdmg": 22.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "clip": 1,
       "cost": 51600,
-      "dps": 37,
+      "damage": 23.25,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
+      "distdraw": 2.69,
       "edID": 128049488,
       "eddbID": 876,
-      "eps": 4.3,
+      "falloff": 1000,
       "grp": "rg",
-      "hps": 28.48,
       "id": "29",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 100,
       "power": 1.15,
       "range": 3000,
       "rating": "D",
       "reload": 1,
       "rof": 1.6,
-      "type": "KT"
+      "thermload": 12,
+      "symbol": "Hpt_Railgun_Fixed_Small"
     },
     {
-      "ammo": 30,
-      "armourpen": 48,
-      "breachdps": 47.4,
+      "ammo": 80,
+      "breachdmg": 39.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
       "clip": 1,
       "cost": 412800,
-      "dps": 50,
+      "damage": 41.5,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
+      "distdraw": 5.11,
       "edID": 128049489,
       "eddbID": 877,
-      "eps": 6.132,
+      "falloff": 1000,
       "grp": "rg",
-      "hps": 36,
       "id": "2a",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 100,
       "power": 1.63,
       "range": 3000,
       "rating": "B",
       "reload": 1,
       "rof": 1.2,
-      "type": "KT"
+      "thermload": 20,
+      "symbol": "Hpt_Railgun_Fixed_Medium"
     },
     {
-      "ammo": 90,
-      "armourpen": "A",
+      "ammo": 240,
+      "breachdmg": 14.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 6,
       "class": 2,
       "clip": 3,
       "cost": 619200,
-      "damage": 5,
-      "dps": 5,
+      "damage": 15,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
+      "distdraw": 2,
       "edID": 128671341,
       "eddbID": 1484,
+      "falloff": 1000,
       "grp": "rg",
       "id": "ih",
+      "integrity": 51,
       "mass": 4,
       "mount": "F",
       "name": "Imperial Hammer",
+      "piercing": 100,
       "power": 1.63,
       "pp": "Arissa Lavigny-Duval",
+      "range": 3000,
       "rating": "B",
-      "rof": 0.6,
-      "thermload": 3,
-      "type": "KT"
+      "reload": 1,
+      "rof": 4.1,
+      "thermload": 11,
+      "symbol": "Hpt_Railgun_Fixed_Medium_Burst"
     }
   ]
-}
+}

modules/hardpoints/remote_release_flak_launcher.json

@@ -0,0 +1,64 @@
+{
+  "rfl": [
+    {
+      "ammo": 32,
+      "breachdmg": 1.7,
+      "breachmax": 1,
+      "breachmin": 1,
+      "class": 2,
+      "clip": 1,
+      "cost": 261800,
+      "damage": 34,
+      "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,
+      "symbol": "Hpt_FlakMortar_Fixed_Medium"
+    },
+    {
+      "ammo": 32,
+      "breachdmg": 1.7,
+      "breachmax": 1,
+      "breachmin": 1,
+      "class": 2,
+      "clip": 1,
+      "cost": 1259200,
+      "damage": 34,
+      "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,
+      "symbol": "Hpt_FlakMortar_Turret_Medium"
+    }
+  ]
+}

modules/hardpoints/shield_booster.json

@@ -12,7 +12,8 @@
       "passive": 1,
       "power": 0.2,
       "rating": "E",
-      "shieldmul": 0.04
+      "shieldboost": 0.04,
+      "symbol": "Hpt_ShieldBooster_Size0_Class1"
     },
     {
       "class": 0,
@@ -26,7 +27,8 @@
       "passive": 1,
       "power": 0.5,
       "rating": "D",
-      "shieldmul": 0.08
+      "shieldboost": 0.08,
+      "symbol": "Hpt_ShieldBooster_Size0_Class2"
     },
     {
       "class": 0,
@@ -40,7 +42,8 @@
       "passive": 1,
       "power": 0.7,
       "rating": "C",
-      "shieldmul": 0.12
+      "shieldboost": 0.12,
+      "symbol": "Hpt_ShieldBooster_Size0_Class3"
     },
     {
       "class": 0,
@@ -54,7 +57,8 @@
       "passive": 1,
       "power": 1,
       "rating": "B",
-      "shieldmul": 0.16
+      "shieldboost": 0.16,
+      "symbol": "Hpt_ShieldBooster_Size0_Class4"
     },
     {
       "class": 0,
@@ -68,7 +72,8 @@
       "passive": 1,
       "power": 1.2,
       "rating": "A",
-      "shieldmul": 0.2
+      "shieldboost": 0.2,
+      "symbol": "Hpt_ShieldBooster_Size0_Class5"
     }
   ]
-}
+}

modules/hardpoints/shutdown_field_neutraliser.json

@@ -0,0 +1,23 @@
+{
+  "sfn": [
+    {
+      "class": 0,
+      "cost": 63000,
+      "edID": 128771884,
+      "eddbID": 1622,
+      "grp": "sfn",
+      "id": "Sn",
+      "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,
+      "symbol": "Hpt_AntiUnknownShutdown_Tiny"
+    }
+  ]
+}

modules/hardpoints/torpedo_pylon.json

@@ -2,57 +2,63 @@
   "tp": [
     {
       "ammo": 1,
-      "armourpen": 10000,
-      "breachdps": 60,
+      "breachdmg": 60,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 1,
       "clip": 1,
       "cost": 11200,
-      "dps": 120,
+      "damage": 120,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0,
       "edID": 128049509,
       "eddbID": 882,
-      "eps": 0,
       "grp": "tp",
-      "hps": 45,
       "id": "2h",
       "integrity": 40,
       "mass": 2,
       "missile": "S",
       "mount": "F",
+      "piercing": 10000,
       "power": 0.4,
       "rating": "I",
       "reload": 5,
       "rof": 1,
-      "speed": 250,
-      "type": "E"
+      "shotspeed": 250,
+      "thermload": 45,
+      "symbol": "Hpt_AdvancedTorpPylon_Fixed_Small"
     },
     {
       "ammo": 2,
-      "armourpen": 10000,
-      "breachdps": 60,
+      "breachdmg": 60,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 2,
       "clip": 1,
       "cost": 44800,
-      "dps": 120,
+      "damage": 120,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0,
       "edID": 128049510,
       "eddbID": 883,
-      "eps": 0,
       "grp": "tp",
-      "hps": 50,
       "id": "2i",
       "integrity": 51,
       "mass": 4,
       "missile": "S",
       "mount": "F",
+      "piercing": 10000,
       "power": 0.4,
       "rating": "I",
       "reload": 5,
       "rof": 1,
-      "speed": 250,
-      "type": "E"
+      "shotspeed": 250,
+      "thermload": 50,
+      "symbol": "Hpt_AdvancedTorpPylon_Fixed_Medium"
     }
   ]
-}
+}

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,
+      "symbol": "Hpt_XenoScanner_Basic_Tiny"
+    }
+  ]
+}

modules/index.js

@@ -14,19 +14,27 @@ 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,
     cs: require('./hardpoints/cargo_scanner').cs,
-    cm: require('./hardpoints/countermeasures').cm,
     ws: require('./hardpoints/frame_shift_wake_scanner').ws,
     kw: require('./hardpoints/kill_warrant_scanner').kw,
-    sb: require('./hardpoints/shield_booster').sb
+    sb: require('./hardpoints/shield_booster').sb,
+    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,
+    sfn: require('./hardpoints/shutdown_field_neutraliser').sfn,
+    xs: require('./hardpoints/xeno_scanner').xs
   },
   internal: {
     am: require('./internal/auto_field_maintenance_unit').am,
@@ -41,6 +49,7 @@ module.exports = {
     fx: require('./internal/fuel_transfer_limpet_controllers').fx,
     hb: require('./internal/hatch_breaker_limpet_controller').hb,
     hr: require('./internal/hull_reinforcement_package').hr,
+    mrp: require('./internal/module_reinforcement_package').mrp,
     pv: require('./internal/planetary_vehicle_hanger').pv,
     psg: require('./internal/pristmatic_shield_generator').psg,
     pc: require('./internal/prospector_limpet_controllers').pc,
@@ -51,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/auto_field_maintenance_unit.json

@@ -1,460 +1,5 @@
 {
   "am": [
-    {
-      "ammo": 10000,
-      "ammocost": 1,
-      "class": 8,
-      "cost": 612220,
-      "edID": 128667605,
-      "eddbID": 1335,
-      "grp": "am",
-      "id": "1f",
-      "power": 1.8,
-      "rating": "E",
-      "repair": 120
-    },
-    {
-      "ammo": 9000,
-      "ammocost": 1,
-      "class": 8,
-      "cost": 1836660,
-      "edID": 128667613,
-      "eddbID": 1343,
-      "grp": "am",
-      "id": "1e",
-      "power": 2.4,
-      "rating": "D",
-      "repair": 144
-    },
-    {
-      "ammo": 10000,
-      "ammocost": 1,
-      "class": 8,
-      "cost": 5509980,
-      "edID": 128667621,
-      "eddbID": 1351,
-      "grp": "am",
-      "id": "1d",
-      "power": 3,
-      "rating": "C",
-      "repair": 200
-    },
-    {
-      "ammo": 12000,
-      "ammocost": 1,
-      "class": 8,
-      "cost": 16529940,
-      "edID": 128667629,
-      "eddbID": 1359,
-      "grp": "am",
-      "id": "1c",
-      "power": 3.45,
-      "rating": "B",
-      "repair": 276
-    },
-    {
-      "ammo": 11000,
-      "ammocost": 1,
-      "class": 8,
-      "cost": 49589820,
-      "edID": 128667637,
-      "eddbID": 1367,
-      "grp": "am",
-      "id": "1b",
-      "power": 4.2,
-      "rating": "A",
-      "repair": 308
-    },
-    {
-      "ammo": 8700,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 340120,
-      "edID": 128667604,
-      "eddbID": 1334,
-      "grp": "am",
-      "id": "1a",
-      "power": 1.58,
-      "rating": "E",
-      "repair": 104.4
-    },
-    {
-      "ammo": 7800,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 1020370,
-      "edID": 128667612,
-      "eddbID": 1342,
-      "grp": "am",
-      "id": "19",
-      "power": 2.1,
-      "rating": "D",
-      "repair": 124.8
-    },
-    {
-      "ammo": 8700,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 3061100,
-      "edID": 128667620,
-      "eddbID": 1350,
-      "grp": "am",
-      "id": "18",
-      "power": 2.63,
-      "rating": "C",
-      "repair": 174
-    },
-    {
-      "ammo": 10400,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 9183300,
-      "edID": 128667628,
-      "eddbID": 1358,
-      "grp": "am",
-      "id": "17",
-      "power": 3.02,
-      "rating": "B",
-      "repair": 239.2
-    },
-    {
-      "ammo": 9600,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 27549900,
-      "edID": 128667636,
-      "eddbID": 1366,
-      "grp": "am",
-      "id": "16",
-      "power": 3.68,
-      "rating": "A",
-      "repair": 268.8
-    },
-    {
-      "ammo": 7400,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 188960,
-      "edID": 128667603,
-      "eddbID": 1333,
-      "grp": "am",
-      "id": "15",
-      "power": 1.4,
-      "rating": "E",
-      "repair": 88.8
-    },
-    {
-      "ammo": 6700,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 566870,
-      "edID": 128667611,
-      "eddbID": 1341,
-      "grp": "am",
-      "id": "14",
-      "power": 1.86,
-      "rating": "D",
-      "repair": 107.2
-    },
-    {
-      "ammo": 7400,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 1700610,
-      "edID": 128667619,
-      "eddbID": 1349,
-      "grp": "am",
-      "id": "13",
-      "power": 2.33,
-      "rating": "C",
-      "repair": 148
-    },
-    {
-      "ammo": 8900,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 5101830,
-      "edID": 128667627,
-      "eddbID": 1357,
-      "grp": "am",
-      "id": "12",
-      "power": 2.67,
-      "rating": "B",
-      "repair": 204.7
-    },
-    {
-      "ammo": 8100,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 15305500,
-      "edID": 128667635,
-      "eddbID": 1365,
-      "grp": "am",
-      "id": "11",
-      "power": 3.26,
-      "rating": "A",
-      "repair": 226.8
-    },
-    {
-      "ammo": 6100,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 104980,
-      "edID": 128667602,
-      "eddbID": 1332,
-      "grp": "am",
-      "id": "10",
-      "power": 1.17,
-      "rating": "E",
-      "repair": 73.2
-    },
-    {
-      "ammo": 5500,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 314930,
-      "edID": 128667610,
-      "eddbID": 1340,
-      "grp": "am",
-      "id": "0v",
-      "power": 1.56,
-      "rating": "D",
-      "repair": 88
-    },
-    {
-      "ammo": 6100,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 944780,
-      "edID": 128667618,
-      "eddbID": 1348,
-      "grp": "am",
-      "id": "0u",
-      "power": 1.95,
-      "rating": "C",
-      "repair": 122
-    },
-    {
-      "ammo": 7300,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 2834350,
-      "edID": 128667626,
-      "eddbID": 1356,
-      "grp": "am",
-      "id": "0t",
-      "power": 2.24,
-      "rating": "B",
-      "repair": 167.9
-    },
-    {
-      "ammo": 6700,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 8503060,
-      "edID": 128667634,
-      "eddbID": 1364,
-      "grp": "am",
-      "id": "0s",
-      "power": 2.73,
-      "rating": "A",
-      "repair": 187.6
-    },
-    {
-      "ammo": 4900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 58320,
-      "edID": 128667601,
-      "eddbID": 1331,
-      "grp": "am",
-      "id": "0r",
-      "power": 0.99,
-      "rating": "E",
-      "repair": 58.8
-    },
-    {
-      "ammo": 4400,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 174960,
-      "edID": 128667609,
-      "eddbID": 1339,
-      "grp": "am",
-      "id": "0q",
-      "power": 1.32,
-      "rating": "D",
-      "repair": 70.4
-    },
-    {
-      "ammo": 4900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 524880,
-      "edID": 128667617,
-      "eddbID": 1347,
-      "grp": "am",
-      "id": "0p",
-      "power": 1.65,
-      "rating": "C",
-      "repair": 98
-    },
-    {
-      "ammo": 5900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 1574640,
-      "edID": 128667625,
-      "eddbID": 1355,
-      "grp": "am",
-      "id": "0o",
-      "power": 1.9,
-      "rating": "B",
-      "repair": 135.7
-    },
-    {
-      "ammo": 5400,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 4723920,
-      "edID": 128667633,
-      "eddbID": 1363,
-      "grp": "am",
-      "id": "0n",
-      "power": 2.31,
-      "rating": "A",
-      "repair": 151.2
-    },
-    {
-      "ammo": 3600,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 32400,
-      "edID": 128667600,
-      "eddbID": 1330,
-      "grp": "am",
-      "id": "0m",
-      "power": 0.81,
-      "rating": "E",
-      "repair": 43.2
-    },
-    {
-      "ammo": 3200,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 97200,
-      "edID": 128667608,
-      "eddbID": 1338,
-      "grp": "am",
-      "id": "0l",
-      "power": 1.08,
-      "rating": "D",
-      "repair": 51.2
-    },
-    {
-      "ammo": 3600,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 291600,
-      "edID": 128667616,
-      "eddbID": 1346,
-      "grp": "am",
-      "id": "0k",
-      "power": 1.35,
-      "rating": "C",
-      "repair": 72
-    },
-    {
-      "ammo": 4300,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 874800,
-      "edID": 128667624,
-      "eddbID": 1354,
-      "grp": "am",
-      "id": "0j",
-      "power": 1.55,
-      "rating": "B",
-      "repair": 98.9
-    },
-    {
-      "ammo": 4000,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 2624400,
-      "edID": 128667632,
-      "eddbID": 1362,
-      "grp": "am",
-      "id": "0i",
-      "power": 1.89,
-      "rating": "A",
-      "repair": 112
-    },
-    {
-      "ammo": 2300,
-      "ammocost": 1,
-      "class": 2,
-      "cost": 18000,
-      "edID": 128667599,
-      "eddbID": 1329,
-      "grp": "am",
-      "id": "0h",
-      "power": 0.68,
-      "rating": "E",
-      "repair": 27.6
-    },
-    {
-      "ammo": 2100,
-      "ammocost": 1,
-      "class": 2,
-      "cost": 54000,
-      "edID": 128667607,
-      "eddbID": 1337,
-      "grp": "am",
-      "id": "0g",
-      "power": 0.9,
-      "rating": "D",
-      "repair": 33.6
-    },
-    {
-      "ammo": 2300,
-      "ammocost": 1,
-      "class": 2,
-      "cost": 162000,
-      "edID": 128667615,
-      "eddbID": 1345,
-      "grp": "am",
-      "id": "0f",
-      "power": 1.13,
-      "rating": "C",
-      "repair": 46
-    },
-    {
-      "ammo": 2800,
-      "ammocost": 1,
-      "class": 2,
-      "cost": 486000,
-      "edID": 128667623,
-      "eddbID": 1353,
-      "grp": "am",
-      "id": "0e",
-      "power": 1.29,
-      "rating": "B",
-      "repair": 64.4
-    },
-    {
-      "ammo": 2500,
-      "ammocost": 1,
-      "class": 2,
-      "cost": 1458000,
-      "edID": 128667631,
-      "eddbID": 1361,
-      "grp": "am",
-      "id": "0d",
-      "power": 1.58,
-      "rating": "A",
-      "repair": 70
-    },
     {
       "ammo": 1000,
       "ammocost": 1,
@@ -466,7 +11,8 @@
       "id": "0c",
       "power": 0.54,
       "rating": "E",
-      "repair": 12
+      "repair": 12,
+      "symbol": "Int_Repairer_Size1_Class1"
     },
     {
       "ammo": 900,
@@ -479,7 +25,8 @@
       "id": "0b",
       "power": 0.72,
       "rating": "D",
-      "repair": 14.4
+      "repair": 14.4,
+      "symbol": "Int_Repairer_Size1_Class2"
     },
     {
       "ammo": 1000,
@@ -492,7 +39,8 @@
       "id": "0a",
       "power": 0.9,
       "rating": "C",
-      "repair": 20
+      "repair": 20,
+      "symbol": "Int_Repairer_Size1_Class3"
     },
     {
       "ammo": 1200,
@@ -505,7 +53,8 @@
       "id": "09",
       "power": 1.04,
       "rating": "B",
-      "repair": 27.6
+      "repair": 27.6,
+      "symbol": "Int_Repairer_Size1_Class4"
     },
     {
       "ammo": 1100,
@@ -518,7 +67,498 @@
       "id": "08",
       "power": 1.26,
       "rating": "A",
-      "repair": 30.8
+      "repair": 30.8,
+      "symbol": "Int_Repairer_Size1_Class5"
+    },
+    {
+      "ammo": 2300,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 18000,
+      "edID": 128667599,
+      "eddbID": 1329,
+      "grp": "am",
+      "id": "0h",
+      "power": 0.68,
+      "rating": "E",
+      "repair": 27.6,
+      "symbol": "Int_Repairer_Size2_Class1"
+    },
+    {
+      "ammo": 2100,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 54000,
+      "edID": 128667607,
+      "eddbID": 1337,
+      "grp": "am",
+      "id": "0g",
+      "power": 0.9,
+      "rating": "D",
+      "repair": 33.6,
+      "symbol": "Int_Repairer_Size2_Class2"
+    },
+    {
+      "ammo": 2300,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 162000,
+      "edID": 128667615,
+      "eddbID": 1345,
+      "grp": "am",
+      "id": "0f",
+      "power": 1.13,
+      "rating": "C",
+      "repair": 46,
+      "symbol": "Int_Repairer_Size2_Class3"
+    },
+    {
+      "ammo": 2800,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 486000,
+      "edID": 128667623,
+      "eddbID": 1353,
+      "grp": "am",
+      "id": "0e",
+      "power": 1.29,
+      "rating": "B",
+      "repair": 64.4,
+      "symbol": "Int_Repairer_Size2_Class4"
+    },
+    {
+      "ammo": 2500,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 1458000,
+      "edID": 128667631,
+      "eddbID": 1361,
+      "grp": "am",
+      "id": "0d",
+      "power": 1.58,
+      "rating": "A",
+      "repair": 70,
+      "symbol": "Int_Repairer_Size2_Class5"
+    },
+    {
+      "ammo": 3600,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 32400,
+      "edID": 128667600,
+      "eddbID": 1330,
+      "grp": "am",
+      "id": "0m",
+      "power": 0.81,
+      "rating": "E",
+      "repair": 43.2,
+      "symbol": "Int_Repairer_Size3_Class1"
+    },
+    {
+      "ammo": 3200,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 97200,
+      "edID": 128667608,
+      "eddbID": 1338,
+      "grp": "am",
+      "id": "0l",
+      "power": 1.08,
+      "rating": "D",
+      "repair": 51.2,
+      "symbol": "Int_Repairer_Size3_Class2"
+    },
+    {
+      "ammo": 3600,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 291600,
+      "edID": 128667616,
+      "eddbID": 1346,
+      "grp": "am",
+      "id": "0k",
+      "power": 1.35,
+      "rating": "C",
+      "repair": 72,
+      "symbol": "Int_Repairer_Size3_Class3"
+    },
+    {
+      "ammo": 4300,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 874800,
+      "edID": 128667624,
+      "eddbID": 1354,
+      "grp": "am",
+      "id": "0j",
+      "power": 1.55,
+      "rating": "B",
+      "repair": 98.9,
+      "symbol": "Int_Repairer_Size3_Class4"
+    },
+    {
+      "ammo": 4000,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 2624400,
+      "edID": 128667632,
+      "eddbID": 1362,
+      "grp": "am",
+      "id": "0i",
+      "power": 1.89,
+      "rating": "A",
+      "repair": 112,
+      "symbol": "Int_Repairer_Size3_Class5"
+    },
+    {
+      "ammo": 4900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 58320,
+      "edID": 128667601,
+      "eddbID": 1331,
+      "grp": "am",
+      "id": "0r",
+      "power": 0.99,
+      "rating": "E",
+      "repair": 58.8,
+      "symbol": "Int_Repairer_Size4_Class1"
+    },
+    {
+      "ammo": 4400,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 174960,
+      "edID": 128667609,
+      "eddbID": 1339,
+      "grp": "am",
+      "id": "0q",
+      "power": 1.32,
+      "rating": "D",
+      "repair": 70.4,
+      "symbol": "Int_Repairer_Size4_Class2"
+    },
+    {
+      "ammo": 4900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 524880,
+      "edID": 128667617,
+      "eddbID": 1347,
+      "grp": "am",
+      "id": "0p",
+      "power": 1.65,
+      "rating": "C",
+      "repair": 98,
+      "symbol": "Int_Repairer_Size4_Class3"
+    },
+    {
+      "ammo": 5900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 1574640,
+      "edID": 128667625,
+      "eddbID": 1355,
+      "grp": "am",
+      "id": "0o",
+      "power": 1.9,
+      "rating": "B",
+      "repair": 135.7,
+      "symbol": "Int_Repairer_Size4_Class4"
+    },
+    {
+      "ammo": 5400,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 4723920,
+      "edID": 128667633,
+      "eddbID": 1363,
+      "grp": "am",
+      "id": "0n",
+      "power": 2.31,
+      "rating": "A",
+      "repair": 151.2,
+      "symbol": "Int_Repairer_Size4_Class5"
+    },
+    {
+      "ammo": 6100,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 104980,
+      "edID": 128667602,
+      "eddbID": 1332,
+      "grp": "am",
+      "id": "10",
+      "power": 1.17,
+      "rating": "E",
+      "repair": 73.2,
+      "symbol": "Int_Repairer_Size5_Class1"
+    },
+    {
+      "ammo": 5500,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 314930,
+      "edID": 128667610,
+      "eddbID": 1340,
+      "grp": "am",
+      "id": "0v",
+      "power": 1.56,
+      "rating": "D",
+      "repair": 88,
+      "symbol": "Int_Repairer_Size5_Class2"
+    },
+    {
+      "ammo": 6100,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 944780,
+      "edID": 128667618,
+      "eddbID": 1348,
+      "grp": "am",
+      "id": "0u",
+      "power": 1.95,
+      "rating": "C",
+      "repair": 122,
+      "symbol": "Int_Repairer_Size5_Class3"
+    },
+    {
+      "ammo": 7300,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 2834350,
+      "edID": 128667626,
+      "eddbID": 1356,
+      "grp": "am",
+      "id": "0t",
+      "power": 2.24,
+      "rating": "B",
+      "repair": 167.9,
+      "symbol": "Int_Repairer_Size5_Class4"
+    },
+    {
+      "ammo": 6700,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 8503060,
+      "edID": 128667634,
+      "eddbID": 1364,
+      "grp": "am",
+      "id": "0s",
+      "power": 2.73,
+      "rating": "A",
+      "repair": 187.6,
+      "symbol": "Int_Repairer_Size5_Class5"
+    },
+    {
+      "ammo": 7400,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 188960,
+      "edID": 128667603,
+      "eddbID": 1333,
+      "grp": "am",
+      "id": "15",
+      "power": 1.4,
+      "rating": "E",
+      "repair": 88.8,
+      "symbol": "Int_Repairer_Size6_Class1"
+    },
+    {
+      "ammo": 6700,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 566870,
+      "edID": 128667611,
+      "eddbID": 1341,
+      "grp": "am",
+      "id": "14",
+      "power": 1.86,
+      "rating": "D",
+      "repair": 107.2,
+      "symbol": "Int_Repairer_Size6_Class2"
+    },
+    {
+      "ammo": 7400,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 1700610,
+      "edID": 128667619,
+      "eddbID": 1349,
+      "grp": "am",
+      "id": "13",
+      "power": 2.33,
+      "rating": "C",
+      "repair": 148,
+      "symbol": "Int_Repairer_Size6_Class3"
+    },
+    {
+      "ammo": 8900,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 5101830,
+      "edID": 128667627,
+      "eddbID": 1357,
+      "grp": "am",
+      "id": "12",
+      "power": 2.67,
+      "rating": "B",
+      "repair": 204.7,
+      "symbol": "Int_Repairer_Size6_Class4"
+    },
+    {
+      "ammo": 8100,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 15305500,
+      "edID": 128667635,
+      "eddbID": 1365,
+      "grp": "am",
+      "id": "11",
+      "power": 3.26,
+      "rating": "A",
+      "repair": 226.8,
+      "symbol": "Int_Repairer_Size6_Class5"
+    },
+    {
+      "ammo": 8700,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 340120,
+      "edID": 128667604,
+      "eddbID": 1334,
+      "grp": "am",
+      "id": "1a",
+      "power": 1.58,
+      "rating": "E",
+      "repair": 104.4,
+      "symbol": "Int_Repairer_Size7_Class1"
+    },
+    {
+      "ammo": 7800,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 1020370,
+      "edID": 128667612,
+      "eddbID": 1342,
+      "grp": "am",
+      "id": "19",
+      "power": 2.1,
+      "rating": "D",
+      "repair": 124.8,
+      "symbol": "Int_Repairer_Size7_Class2"
+    },
+    {
+      "ammo": 8700,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 3061100,
+      "edID": 128667620,
+      "eddbID": 1350,
+      "grp": "am",
+      "id": "18",
+      "power": 2.63,
+      "rating": "C",
+      "repair": 174,
+      "symbol": "Int_Repairer_Size7_Class3"
+    },
+    {
+      "ammo": 10400,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 9183300,
+      "edID": 128667628,
+      "eddbID": 1358,
+      "grp": "am",
+      "id": "17",
+      "power": 3.02,
+      "rating": "B",
+      "repair": 239.2,
+      "symbol": "Int_Repairer_Size7_Class4"
+    },
+    {
+      "ammo": 9600,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 27549900,
+      "edID": 128667636,
+      "eddbID": 1366,
+      "grp": "am",
+      "id": "16",
+      "power": 3.68,
+      "rating": "A",
+      "repair": 268.8,
+      "symbol": "Int_Repairer_Size7_Class5"
+    },
+    {
+      "ammo": 10000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 612220,
+      "edID": 128667605,
+      "eddbID": 1335,
+      "grp": "am",
+      "id": "1f",
+      "power": 1.8,
+      "rating": "E",
+      "repair": 120,
+      "symbol": "Int_Repairer_Size8_Class1"
+    },
+    {
+      "ammo": 9000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 1836660,
+      "edID": 128667613,
+      "eddbID": 1343,
+      "grp": "am",
+      "id": "1e",
+      "power": 2.4,
+      "rating": "D",
+      "repair": 144,
+      "symbol": "Int_Repairer_Size8_Class2"
+    },
+    {
+      "ammo": 10000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 5509980,
+      "edID": 128667621,
+      "eddbID": 1351,
+      "grp": "am",
+      "id": "1d",
+      "power": 3,
+      "rating": "C",
+      "repair": 200,
+      "symbol": "Int_Repairer_Size8_Class3"
+    },
+    {
+      "ammo": 12000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 16529940,
+      "edID": 128667629,
+      "eddbID": 1359,
+      "grp": "am",
+      "id": "1c",
+      "power": 3.45,
+      "rating": "B",
+      "repair": 276,
+      "symbol": "Int_Repairer_Size8_Class4"
+    },
+    {
+      "ammo": 11000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 49589820,
+      "edID": 128667637,
+      "eddbID": 1367,
+      "grp": "am",
+      "id": "1b",
+      "power": 4.2,
+      "rating": "A",
+      "repair": 308,
+      "symbol": "Int_Repairer_Size8_Class5"
     }
   ]
-}
+}

modules/internal/bi_weave_shield_generator.json

@@ -1,148 +1,204 @@
 {
   "bsg": [
     {
+      "brokenregen": 2.4,
       "class": 1,
       "cost": 7710,
+      "distdraw": 0.6,
       "edID": 128671331,
       "eddbID": 1530,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B6",
+      "integrity": 40,
+      "kinres": 0.4,
       "mass": 1.3,
       "maxmass": 63,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 13,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 25,
       "optmul": 0.9,
       "power": 1.2,
       "rating": "C",
-      "recover": 2.4
+      "regen": 1.8,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size1_Class3_Fast"
     },
     {
+      "brokenregen": 2.4,
       "class": 2,
       "cost": 26710,
+      "distdraw": 0.6,
       "edID": 128671332,
       "eddbID": 1531,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B5",
+      "integrity": 51,
+      "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
-      "maxmul": 0.4,
-      "minmass": 23,
-      "minmul": 1.4,
+      "maxmul": 1.4,
+      "minmass": 28,
+      "minmul": 0.4,
       "optmass": 55,
       "optmul": 0.9,
       "power": 1.5,
       "rating": "C",
-      "recover": 2.4
+      "regen": 1.8,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size2_Class3_Fast"
     },
     {
+      "brokenregen": 2.8,
       "class": 3,
       "cost": 84650,
+      "distdraw": 0.6,
       "edID": 128671333,
       "eddbID": 1532,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B4",
+      "integrity": 64,
+      "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 83,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 165,
       "optmul": 0.9,
       "power": 1.8,
       "rating": "C",
-      "recover": 2.4
+      "regen": 1.8,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size3_Class3_Fast"
     },
     {
+      "brokenregen": 3.8,
       "class": 4,
       "cost": 268350,
+      "distdraw": 0.6,
       "edID": 128671334,
       "eddbID": 1533,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B3",
+      "integrity": 80,
+      "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 143,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 285,
       "optmul": 0.9,
       "power": 2.2,
       "rating": "C",
-      "recover": 2.85
+      "regen": 1.8,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size4_Class3_Fast"
     },
     {
+      "brokenregen": 5.6,
       "class": 5,
       "cost": 850660,
+      "distdraw": 0.6,
       "edID": 128671335,
       "eddbID": 1534,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B2",
+      "integrity": 96,
+      "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 203,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 405,
       "optmul": 0.9,
       "power": 2.6,
       "rating": "C",
-      "recover": 3.75
+      "regen": 2.2,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size5_Class3_Fast"
     },
     {
+      "brokenregen": 8,
       "class": 6,
       "cost": 2696600,
+      "distdraw": 0.6,
       "edID": 128671336,
       "eddbID": 1535,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B1",
+      "integrity": 113,
+      "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 270,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 540,
       "optmul": 0.9,
       "power": 3.1,
       "rating": "C",
-      "recover": 4.8
+      "regen": 3.2,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size6_Class3_Fast"
     },
     {
+      "brokenregen": 11,
       "class": 7,
       "cost": 8548200,
+      "distdraw": 0.6,
       "edID": 128671337,
       "eddbID": 1536,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B0",
+      "integrity": 131,
+      "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 530,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 1060,
       "optmul": 0.9,
       "power": 3.5,
       "rating": "C",
-      "recover": 6
+      "regen": 4.4,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size7_Class3_Fast"
     },
     {
+      "brokenregen": 14.4,
       "class": 8,
       "cost": 27097750,
+      "distdraw": 0.6,
       "edID": 128671338,
       "eddbID": 1537,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B7",
+      "integrity": 150,
+      "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 900,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 1800,
       "optmul": 0.9,
       "power": 4,
       "rating": "C",
-      "recover": 7.2
+      "regen": 5.8,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size8_Class3_Fast"
     }
   ]
-}
+}

modules/internal/business_passenger_cabin.json

@@ -2,43 +2,51 @@
   "pci": [
     {
       "class": 3,
-      "cost": -1,
+      "cost": 26720,
+      "edID": 128734692,
       "eddbID": 1568,
       "grp": "pci",
       "id": "mf",
       "mass": 5,
       "passengers": 3,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_PassengerCabin_Size3_Class2"
     },
     {
       "class": 4,
-      "cost": -1,
+      "cost": 56870,
+      "edID": 128727923,
       "eddbID": 1569,
       "grp": "pci",
       "id": "mg",
       "mass": 10,
       "passengers": 6,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_PassengerCabin_Size4_Class2"
     },
     {
       "class": 5,
-      "cost": -1,
+      "cost": 92370,
+      "edID": 128734694,
       "eddbID": 1570,
       "grp": "pci",
       "id": "mh",
       "mass": 20,
       "passengers": 10,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_PassengerCabin_Size5_Class2"
     },
     {
       "class": 6,
-      "cost": -1,
+      "cost": 184240,
+      "edID": 128727927,
       "eddbID": 1571,
       "grp": "pci",
       "id": "mi",
       "mass": 40,
       "passengers": 16,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_PassengerCabin_Size6_Class2"
     }
   ]
-}
+}

modules/internal/cargo_rack.json

@@ -8,7 +8,8 @@
       "eddbID": 1191,
       "grp": "cr",
       "id": "00",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CargoRack_Size1_Class1"
     },
     {
       "cargo": 4,
@@ -18,7 +19,8 @@
       "eddbID": 1192,
       "grp": "cr",
       "id": "01",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CargoRack_Size2_Class1"
     },
     {
       "cargo": 8,
@@ -28,7 +30,8 @@
       "eddbID": 1193,
       "grp": "cr",
       "id": "02",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CargoRack_Size3_Class1"
     },
     {
       "cargo": 16,
@@ -38,7 +41,8 @@
       "eddbID": 1194,
       "grp": "cr",
       "id": "03",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CargoRack_Size4_Class1"
     },
     {
       "cargo": 32,
@@ -48,7 +52,8 @@
       "eddbID": 1195,
       "grp": "cr",
       "id": "04",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CargoRack_Size5_Class1"
     },
     {
       "cargo": 64,
@@ -58,7 +63,8 @@
       "eddbID": 1196,
       "grp": "cr",
       "id": "05",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CargoRack_Size6_Class1"
     },
     {
       "cargo": 128,
@@ -68,7 +74,8 @@
       "eddbID": 1197,
       "grp": "cr",
       "id": "06",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CargoRack_Size7_Class1"
     },
     {
       "cargo": 256,
@@ -78,7 +85,8 @@
       "eddbID": 1198,
       "grp": "cr",
       "id": "07",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CargoRack_Size8_Class1"
     },
     {
       "cargo": 1,
@@ -89,7 +97,8 @@
       "grp": "cr",
       "id": "1w",
       "name": "Corrosion Resistant",
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_CorrosionProofCargoRack_Size1_Class1"
     },
     {
       "cargo": 2,
@@ -100,7 +109,8 @@
       "grp": "cr",
       "id": "1y",
       "name": "Corrosion Resistant",
-      "rating": "F"
+      "rating": "F",
+      "symbol": "Int_CorrosionProofCargoRack_Size1_Class2"
     }
   ]
-}
+}

modules/internal/collector_limpet_controllers.json

@@ -1,215 +1,5 @@
 {
   "cc": [
-    {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671244,
-      "eddbID": 1409,
-      "grp": "cc",
-      "id": "Cf",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.41,
-      "range": 1.36,
-      "rating": "E",
-      "time": 300
-    },
-    {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671245,
-      "eddbID": 1410,
-      "grp": "cc",
-      "id": "Cg",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.55,
-      "range": 1.02,
-      "rating": "D",
-      "time": 600
-    },
-    {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671246,
-      "eddbID": 1411,
-      "grp": "cc",
-      "id": "Ch",
-      "mass": 80,
-      "maximum": 4,
-      "power": 0.69,
-      "range": 1.7,
-      "rating": "C",
-      "time": 510
-    },
-    {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671247,
-      "eddbID": 1412,
-      "grp": "cc",
-      "id": "Ci",
-      "mass": 128,
-      "maximum": 4,
-      "power": 0.83,
-      "range": 2.38,
-      "rating": "B",
-      "time": 420
-    },
-    {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671248,
-      "eddbID": 1413,
-      "grp": "cc",
-      "id": "Cj",
-      "mass": 128,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 2.04,
-      "rating": "A",
-      "time": 720
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671239,
-      "eddbID": 1404,
-      "grp": "cc",
-      "id": "Ca",
-      "mass": 8,
-      "maximum": 3,
-      "power": 0.3,
-      "range": 1.04,
-      "rating": "E",
-      "time": 300
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671240,
-      "eddbID": 1405,
-      "grp": "cc",
-      "id": "Cb",
-      "mass": 8,
-      "maximum": 3,
-      "power": 0.4,
-      "range": 0.78,
-      "rating": "D",
-      "time": 600
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671241,
-      "eddbID": 1406,
-      "grp": "cc",
-      "id": "Cc",
-      "mass": 20,
-      "maximum": 3,
-      "power": 0.5,
-      "range": 1.3,
-      "rating": "C",
-      "time": 510
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671242,
-      "eddbID": 1407,
-      "grp": "cc",
-      "id": "Cd",
-      "mass": 32,
-      "maximum": 3,
-      "power": 0.6,
-      "range": 1.82,
-      "rating": "B",
-      "time": 420
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671243,
-      "eddbID": 1408,
-      "grp": "cc",
-      "id": "Ce",
-      "mass": 32,
-      "maximum": 3,
-      "power": 0.7,
-      "range": 1.56,
-      "rating": "A",
-      "time": 720
-    },
-    {
-      "class": 3,
-      "cost": 5400,
-      "edID": 128671234,
-      "eddbID": 1399,
-      "grp": "cc",
-      "id": "C6",
-      "mass": 2,
-      "maximum": 2,
-      "power": 0.2,
-      "range": 0.88,
-      "rating": "E",
-      "time": 300
-    },
-    {
-      "class": 3,
-      "cost": 10800,
-      "edID": 128671235,
-      "eddbID": 1400,
-      "grp": "cc",
-      "id": "C7",
-      "mass": 2,
-      "maximum": 2,
-      "power": 0.27,
-      "range": 0.66,
-      "rating": "D",
-      "time": 600
-    },
-    {
-      "class": 3,
-      "cost": 21600,
-      "edID": 128671236,
-      "eddbID": 1401,
-      "grp": "cc",
-      "id": "C8",
-      "mass": 5,
-      "maximum": 2,
-      "power": 0.34,
-      "range": 1.1,
-      "rating": "C",
-      "time": 510
-    },
-    {
-      "class": 3,
-      "cost": 43200,
-      "edID": 128671237,
-      "eddbID": 1402,
-      "grp": "cc",
-      "id": "C9",
-      "mass": 8,
-      "maximum": 2,
-      "power": 0.41,
-      "range": 1.54,
-      "rating": "B",
-      "time": 420
-    },
-    {
-      "class": 3,
-      "cost": 86400,
-      "edID": 128671238,
-      "eddbID": 1403,
-      "grp": "cc",
-      "id": "C0",
-      "mass": 8,
-      "maximum": 2,
-      "power": 0.48,
-      "range": 1.32,
-      "rating": "A",
-      "time": 720
-    },
     {
       "class": 1,
       "cost": 600,
@@ -222,7 +12,8 @@
       "power": 0.14,
       "range": 0.8,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_DroneControl_Collection_Size1_Class1"
     },
     {
       "class": 1,
@@ -236,7 +27,8 @@
       "power": 0.18,
       "range": 0.6,
       "rating": "D",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_DroneControl_Collection_Size1_Class2"
     },
     {
       "class": 1,
@@ -250,7 +42,8 @@
       "power": 0.23,
       "range": 1,
       "rating": "C",
-      "time": 510
+      "time": 510,
+      "symbol": "Int_DroneControl_Collection_Size1_Class3"
     },
     {
       "class": 1,
@@ -264,7 +57,8 @@
       "power": 0.28,
       "range": 1.4,
       "rating": "B",
-      "time": 420
+      "time": 420,
+      "symbol": "Int_DroneControl_Collection_Size1_Class4"
     },
     {
       "class": 1,
@@ -278,7 +72,233 @@
       "power": 0.32,
       "range": 1.2,
       "rating": "A",
-      "time": 720
+      "time": 720,
+      "symbol": "Int_DroneControl_Collection_Size1_Class5"
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128671234,
+      "eddbID": 1399,
+      "grp": "cc",
+      "id": "C6",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 0.88,
+      "rating": "E",
+      "time": 300,
+      "symbol": "Int_DroneControl_Collection_Size3_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128671235,
+      "eddbID": 1400,
+      "grp": "cc",
+      "id": "C7",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.27,
+      "range": 0.66,
+      "rating": "D",
+      "time": 600,
+      "symbol": "Int_DroneControl_Collection_Size3_Class2"
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128671236,
+      "eddbID": 1401,
+      "grp": "cc",
+      "id": "C8",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.34,
+      "range": 1.1,
+      "rating": "C",
+      "time": 510,
+      "symbol": "Int_DroneControl_Collection_Size3_Class3"
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128671237,
+      "eddbID": 1402,
+      "grp": "cc",
+      "id": "C9",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.41,
+      "range": 1.54,
+      "rating": "B",
+      "time": 420,
+      "symbol": "Int_DroneControl_Collection_Size3_Class4"
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128671238,
+      "eddbID": 1403,
+      "grp": "cc",
+      "id": "C0",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.48,
+      "range": 1.32,
+      "rating": "A",
+      "time": 720,
+      "symbol": "Int_DroneControl_Collection_Size3_Class5"
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671239,
+      "eddbID": 1404,
+      "grp": "cc",
+      "id": "Ca",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.3,
+      "range": 1.04,
+      "rating": "E",
+      "time": 300,
+      "symbol": "Int_DroneControl_Collection_Size5_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671240,
+      "eddbID": 1405,
+      "grp": "cc",
+      "id": "Cb",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.4,
+      "range": 0.78,
+      "rating": "D",
+      "time": 600,
+      "symbol": "Int_DroneControl_Collection_Size5_Class2"
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671241,
+      "eddbID": 1406,
+      "grp": "cc",
+      "id": "Cc",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.5,
+      "range": 1.3,
+      "rating": "C",
+      "time": 510,
+      "symbol": "Int_DroneControl_Collection_Size5_Class3"
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671242,
+      "eddbID": 1407,
+      "grp": "cc",
+      "id": "Cd",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.6,
+      "range": 1.82,
+      "rating": "B",
+      "time": 420,
+      "symbol": "Int_DroneControl_Collection_Size5_Class4"
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671243,
+      "eddbID": 1408,
+      "grp": "cc",
+      "id": "Ce",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.7,
+      "range": 1.56,
+      "rating": "A",
+      "time": 720,
+      "symbol": "Int_DroneControl_Collection_Size5_Class5"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671244,
+      "eddbID": 1409,
+      "grp": "cc",
+      "id": "Cf",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "E",
+      "time": 300,
+      "symbol": "Int_DroneControl_Collection_Size7_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671245,
+      "eddbID": 1410,
+      "grp": "cc",
+      "id": "Cg",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "D",
+      "time": 600,
+      "symbol": "Int_DroneControl_Collection_Size7_Class2"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671246,
+      "eddbID": 1411,
+      "grp": "cc",
+      "id": "Ch",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C",
+      "time": 510,
+      "symbol": "Int_DroneControl_Collection_Size7_Class3"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671247,
+      "eddbID": 1412,
+      "grp": "cc",
+      "id": "Ci",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.83,
+      "range": 2.38,
+      "rating": "B",
+      "time": 420,
+      "symbol": "Int_DroneControl_Collection_Size7_Class4"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671248,
+      "eddbID": 1413,
+      "grp": "cc",
+      "id": "Cj",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "A",
+      "time": 720,
+      "symbol": "Int_DroneControl_Collection_Size7_Class5"
     }
   ]
-}
+}

modules/internal/docking_computer.json

@@ -7,9 +7,11 @@
       "eddbID": 890,
       "grp": "dc",
       "id": "24",
+      "integrity": 10,
       "name": "Standard Docking Computer",
       "power": 0.39,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_DockingComputer_Standard"
     }
   ]
-}
+}

modules/internal/economy_passenger_cabin.json

@@ -2,53 +2,63 @@
   "pce": [
     {
       "class": 2,
-      "cost": -1,
+      "cost": 4320,
+      "edID": 128734690,
       "eddbID": 1563,
       "grp": "pce",
       "id": "ma",
       "mass": 2.5,
       "passengers": 2,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_PassengerCabin_Size2_Class1"
     },
     {
       "class": 3,
-      "cost": -1,
+      "cost": 8670,
+      "edID": 128734691,
       "eddbID": 1564,
       "grp": "pce",
       "id": "mb",
       "mass": 5,
       "passengers": 4,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_PassengerCabin_Size3_Class1"
     },
     {
       "class": 4,
-      "cost": -1,
+      "cost": 18960,
+      "edID": 128727922,
       "eddbID": 1565,
       "grp": "pce",
       "id": "mc",
       "mass": 10,
       "passengers": 8,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_PassengerCabin_Size4_Class1"
     },
     {
       "class": 5,
-      "cost": -1,
+      "cost": 34960,
+      "edID": 128734693,
       "eddbID": 1566,
       "grp": "pce",
       "id": "md",
       "mass": 20,
       "passengers": 16,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_PassengerCabin_Size5_Class1"
     },
     {
       "class": 6,
-      "cost": -1,
+      "cost": 61420,
+      "edID": 128727926,
       "eddbID": 1567,
       "grp": "pce",
       "id": "me",
       "mass": 40,
       "passengers": 32,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_PassengerCabin_Size6_Class1"
     }
   ]
-}
+}

modules/internal/fighter_hangar.json

@@ -1,40 +1,52 @@
 {
   "fh": [
     {
-      "bays": 2,
-      "class": 7,
-      "cost": -1,
-      "eddbID": 1560,
+      "bays": 1,
+      "class": 5,
+      "cost": 575660,
+      "edID": 128727930,
+      "eddbID": 1562,
+      "fightercost": 1030,
       "grp": "fh",
-      "id": "fh",
-      "mass": 60,
-      "power": 0.35,
+      "id": "fr",
+      "integrity": 60,
+      "mass": 20,
+      "power": 0.25,
       "rating": "D",
-      "rebuildsperbay": 15
+      "rebuildsperbay": 6,
+      "symbol": "Int_FighterBay_Size5_Class1"
     },
     {
       "bays": 2,
       "class": 6,
-      "cost": -1,
+      "cost": 1869350,
+      "edID": 128727931,
       "eddbID": 1561,
+      "fightercost": 1030,
       "grp": "fh",
       "id": "fm",
+      "integrity": 80,
       "mass": 40,
       "power": 0.35,
       "rating": "D",
-      "rebuildsperbay": 8
+      "rebuildsperbay": 8,
+      "symbol": "Int_FighterBay_Size6_Class1"
     },
     {
-      "bays": 1,
-      "class": 5,
-      "cost": -1,
-      "eddbID": 1562,
+      "bays": 2,
+      "class": 7,
+      "edID": 128727932,
+      "cost": 2369330,
+      "eddbID": 1560,
+      "fightercost": 1030,
       "grp": "fh",
-      "id": "fr",
-      "mass": 20,
-      "power": 0.25,
+      "id": "fh",
+      "integrity": 120,
+      "mass": 60,
+      "power": 0.35,
       "rating": "D",
-      "rebuildsperbay": 6
+      "rebuildsperbay": 15,
+      "symbol": "Int_FighterBay_Size7_Class1"
     }
   ]
-}
+}

modules/internal/first_passenger_cabin.json

@@ -2,33 +2,39 @@
   "pcm": [
     {
       "class": 4,
-      "cost": -1,
+      "cost": 170600,
+      "edID": 128727924,
       "eddbID": 1572,
       "grp": "pcm",
       "id": "mj",
       "mass": 10,
       "passengers": 3,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_PassengerCabin_Size4_Class3"
     },
     {
       "class": 5,
-      "cost": -1,
+      "cost": 340540,
+      "edID": 128734695,
       "eddbID": 1573,
       "grp": "pcm",
       "id": "mk",
       "mass": 20,
       "passengers": 6,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_PassengerCabin_Size5_Class3"
     },
     {
       "class": 6,
-      "cost": -1,
+      "cost": 552700,
+      "edID": 128727928,
       "eddbID": 1574,
       "grp": "pcm",
       "id": "ml",
       "mass": 40,
       "passengers": 12,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_PassengerCabin_Size6_Class3"
     }
   ]
-}
+}

modules/internal/frame_shift_drive_interdictor.json

@@ -1,244 +1,324 @@
 {
   "fi": [
     {
-      "class": 4,
-      "cost": 263420,
-      "edID": 128666707,
-      "eddbID": 1309,
-      "grp": "fi",
-      "id": "6p",
-      "mass": 10,
-      "power": 0.25,
-      "rangeRating": "B",
-      "rating": "E"
-    },
-    {
-      "class": 4,
-      "cost": 790270,
-      "edID": 128666711,
-      "eddbID": 1313,
-      "grp": "fi",
-      "id": "6o",
-      "mass": 4,
-      "power": 0.33,
-      "rangeRating": "A",
-      "rating": "D"
-    },
-    {
-      "class": 4,
-      "cost": 2370820,
-      "edID": 128666715,
-      "eddbID": 1317,
-      "grp": "fi",
-      "id": "6n",
-      "mass": 10,
-      "power": 0.41,
-      "rangeRating": "A",
-      "rating": "C"
-    },
-    {
-      "class": 4,
-      "cost": 7112450,
-      "edID": 128666719,
-      "eddbID": 1321,
-      "grp": "fi",
-      "id": "6m",
-      "mass": 16,
-      "power": 0.49,
-      "rangeRating": "A",
-      "rating": "B"
-    },
-    {
-      "class": 4,
-      "cost": 21337340,
-      "edID": 128666723,
-      "eddbID": 1325,
-      "grp": "fi",
-      "id": "6l",
-      "mass": 10,
-      "power": 0.57,
-      "rangeRating": "A",
-      "rating": "A"
-    },
-    {
-      "class": 3,
-      "cost": 94080,
-      "edID": 128666706,
-      "eddbID": 1308,
-      "grp": "fi",
-      "id": "6k",
-      "mass": 5,
-      "power": 0.2,
-      "rangeRating": "C",
-      "rating": "E"
-    },
-    {
-      "class": 3,
-      "cost": 282240,
-      "edID": 128666710,
-      "eddbID": 1312,
-      "grp": "fi",
-      "id": "6j",
-      "mass": 2,
-      "power": 0.27,
-      "rangeRating": "B",
-      "rating": "D"
-    },
-    {
-      "class": 3,
-      "cost": 846720,
-      "edID": 128666714,
-      "eddbID": 1316,
-      "grp": "fi",
-      "id": "6i",
-      "mass": 5,
-      "power": 0.34,
-      "rangeRating": "B",
-      "rating": "C"
-    },
-    {
-      "class": 3,
-      "cost": 2540160,
-      "edID": 128666718,
-      "eddbID": 1320,
-      "grp": "fi",
-      "id": "6h",
-      "mass": 8,
-      "power": 0.41,
-      "rangeRating": "B",
-      "rating": "B"
-    },
-    {
-      "class": 3,
-      "cost": 7620480,
-      "edID": 128666722,
-      "eddbID": 1324,
-      "grp": "fi",
-      "id": "6g",
-      "mass": 5,
-      "power": 0.48,
-      "rangeRating": "A",
-      "rating": "A"
-    },
-    {
-      "class": 2,
-      "cost": 33600,
-      "edID": 128666705,
-      "eddbID": 1307,
-      "grp": "fi",
-      "id": "6f",
-      "mass": 2.5,
-      "power": 0.17,
-      "rangeRating": "D",
-      "rating": "E"
-    },
-    {
-      "class": 2,
-      "cost": 100800,
-      "edID": 128666709,
-      "eddbID": 1311,
-      "grp": "fi",
-      "id": "6e",
-      "mass": 1,
-      "power": 0.22,
-      "rangeRating": "C",
-      "rating": "D"
-    },
-    {
-      "class": 2,
-      "cost": 302400,
-      "edID": 128666713,
-      "eddbID": 1315,
-      "grp": "fi",
-      "id": "6d",
-      "mass": 2.5,
-      "power": 0.28,
-      "rangeRating": "C",
-      "rating": "C"
-    },
-    {
-      "class": 2,
-      "cost": 907200,
-      "edID": 128666717,
-      "eddbID": 1319,
-      "grp": "fi",
-      "id": "6c",
-      "mass": 4,
-      "power": 0.34,
-      "rangeRating": "C",
-      "rating": "B"
-    },
-    {
-      "class": 2,
-      "cost": 2721600,
-      "edID": 128666721,
-      "eddbID": 1323,
-      "grp": "fi",
-      "id": "6b",
-      "mass": 2.5,
-      "power": 0.39,
-      "rangeRating": "B",
-      "rating": "A"
-    },
-    {
+      "boot": 15,
       "class": 1,
       "cost": 12000,
       "edID": 128666704,
       "eddbID": 1306,
+      "facinglimit": 50,
       "grp": "fi",
       "id": "6a",
+      "integrity": 32,
       "mass": 1.3,
       "power": 0.14,
-      "rangeRating": "E",
-      "rating": "E"
+      "ranget": 3,
+      "rating": "E",
+      "symbol": "Int_FSDInterdictor_Size1_Class1"
     },
     {
+      "boot": 15,
       "class": 1,
       "cost": 36000,
       "edID": 128666708,
       "eddbID": 1310,
+      "facinglimit": 50,
       "grp": "fi",
       "id": "69",
+      "integrity": 24,
       "mass": 0.5,
       "power": 0.18,
-      "rangeRating": "D",
-      "rating": "D"
+      "ranget": 4,
+      "rating": "D",
+      "symbol": "Int_FSDInterdictor_Size1_Class2"
     },
     {
+      "boot": 15,
       "class": 1,
       "cost": 108000,
       "edID": 128666712,
       "eddbID": 1314,
+      "facinglimit": 50,
       "grp": "fi",
       "id": "68",
+      "integrity": 40,
       "mass": 1.3,
       "power": 0.23,
-      "rangeRating": "D",
-      "rating": "C"
+      "ranget": 5,
+      "rating": "C",
+      "symbol": "Int_FSDInterdictor_Size1_Class3"
     },
     {
+      "boot": 15,
       "class": 1,
       "cost": 324000,
       "edID": 128666716,
       "eddbID": 1318,
+      "facinglimit": 50,
       "grp": "fi",
       "id": "67",
+      "integrity": 56,
       "mass": 2,
       "power": 0.28,
-      "rangeRating": "D",
-      "rating": "B"
+      "ranget": 6,
+      "rating": "B",
+      "symbol": "Int_FSDInterdictor_Size1_Class4"
     },
     {
+      "boot": 15,
       "class": 1,
       "cost": 972000,
       "edID": 128666720,
       "eddbID": 1322,
+      "facinglimit": 50,
       "grp": "fi",
       "id": "66",
+      "integrity": 48,
       "mass": 1.3,
       "power": 0.32,
-      "rangeRating": "C",
-      "rating": "A"
+      "ranget": 7,
+      "rating": "A",
+      "symbol": "Int_FSDInterdictor_Size1_Class5"
+    },
+    {
+      "boot": 15,
+      "class": 2,
+      "cost": 33600,
+      "edID": 128666705,
+      "eddbID": 1307,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6f",
+      "integrity": 41,
+      "mass": 2.5,
+      "power": 0.17,
+      "ranget": 6,
+      "rating": "E",
+      "symbol": "Int_FSDInterdictor_Size2_Class1"
+    },
+    {
+      "boot": 15,
+      "class": 2,
+      "cost": 100800,
+      "edID": 128666709,
+      "eddbID": 1311,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6e",
+      "integrity": 51,
+      "mass": 1,
+      "power": 0.22,
+      "ranget": 7,
+      "rating": "D",
+      "symbol": "Int_FSDInterdictor_Size2_Class2"
+    },
+    {
+      "boot": 15,
+      "class": 2,
+      "cost": 302400,
+      "edID": 128666713,
+      "eddbID": 1315,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6d",
+      "integrity": 51,
+      "mass": 2.5,
+      "power": 0.28,
+      "ranget": 8,
+      "rating": "C",
+      "symbol": "Int_FSDInterdictor_Size2_Class3"
+    },
+    {
+      "boot": 15,
+      "class": 2,
+      "cost": 907200,
+      "edID": 128666717,
+      "eddbID": 1319,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6c",
+      "integrity": 71,
+      "mass": 4,
+      "power": 0.34,
+      "ranget": 9,
+      "rating": "B",
+      "symbol": "Int_FSDInterdictor_Size2_Class4"
+    },
+    {
+      "boot": 15,
+      "class": 2,
+      "cost": 2721600,
+      "edID": 128666721,
+      "eddbID": 1323,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6b",
+      "integrity": 61,
+      "mass": 2.5,
+      "power": 0.39,
+      "ranget": 10,
+      "rating": "A",
+      "symbol": "Int_FSDInterdictor_Size2_Class5"
+    },
+    {
+      "boot": 15,
+      "class": 3,
+      "cost": 94080,
+      "edID": 128666706,
+      "eddbID": 1308,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6k",
+      "integrity": 51,
+      "mass": 5,
+      "power": 0.2,
+      "ranget": 9,
+      "rating": "E",
+      "symbol": "Int_FSDInterdictor_Size3_Class1"
+    },
+    {
+      "boot": 15,
+      "class": 3,
+      "cost": 282240,
+      "edID": 128666710,
+      "eddbID": 1312,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6j",
+      "integrity": 38,
+      "mass": 2,
+      "power": 0.27,
+      "ranget": 10,
+      "rating": "D",
+      "symbol": "Int_FSDInterdictor_Size3_Class2"
+    },
+    {
+      "boot": 15,
+      "class": 3,
+      "cost": 846720,
+      "edID": 128666714,
+      "eddbID": 1316,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6i",
+      "integrity": 64,
+      "mass": 5,
+      "power": 0.34,
+      "ranget": 11,
+      "rating": "C",
+      "symbol": "Int_FSDInterdictor_Size3_Class3"
+    },
+    {
+      "boot": 15,
+      "class": 3,
+      "cost": 2540160,
+      "edID": 128666718,
+      "eddbID": 1320,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6h",
+      "integrity": 90,
+      "mass": 8,
+      "power": 0.41,
+      "ranget": 12,
+      "rating": "B",
+      "symbol": "Int_FSDInterdictor_Size3_Class4"
+    },
+    {
+      "boot": 15,
+      "class": 3,
+      "cost": 7620480,
+      "edID": 128666722,
+      "eddbID": 1324,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6g",
+      "integrity": 77,
+      "mass": 5,
+      "power": 0.48,
+      "ranget": 13,
+      "rating": "A",
+      "symbol": "Int_FSDInterdictor_Size3_Class5"
+    },
+    {
+      "boot": 15,
+      "class": 4,
+      "cost": 263420,
+      "edID": 128666707,
+      "eddbID": 1309,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6p",
+      "integrity": 64,
+      "mass": 10,
+      "power": 0.25,
+      "ranget": 12,
+      "rating": "E",
+      "symbol": "Int_FSDInterdictor_Size4_Class1"
+    },
+    {
+      "boot": 15,
+      "class": 4,
+      "cost": 790270,
+      "edID": 128666711,
+      "eddbID": 1313,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6o",
+      "integrity": 48,
+      "mass": 4,
+      "power": 0.33,
+      "ranget": 13,
+      "rating": "D",
+      "symbol": "Int_FSDInterdictor_Size4_Class2"
+    },
+    {
+      "boot": 15,
+      "class": 4,
+      "cost": 2370820,
+      "edID": 128666715,
+      "eddbID": 1317,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6n",
+      "integrity": 80,
+      "mass": 10,
+      "power": 0.41,
+      "ranget": 14,
+      "rating": "C",
+      "symbol": "Int_FSDInterdictor_Size4_Class3"
+    },
+    {
+      "boot": 15,
+      "class": 4,
+      "cost": 7112450,
+      "edID": 128666719,
+      "eddbID": 1321,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6m",
+      "integrity": 112,
+      "mass": 16,
+      "power": 0.49,
+      "ranget": 15,
+      "rating": "B",
+      "symbol": "Int_FSDInterdictor_Size4_Class4"
+    },
+    {
+      "boot": 15,
+      "class": 4,
+      "cost": 21337340,
+      "edID": 128666723,
+      "eddbID": 1325,
+      "facinglimit": 50,
+      "grp": "fi",
+      "id": "6l",
+      "integrity": 96,
+      "mass": 10,
+      "power": 0.57,
+      "ranget": 16,
+      "rating": "A",
+      "symbol": "Int_FSDInterdictor_Size4_Class5"
     }
   ]
-}
+}

modules/internal/fuel_scoop.json

@@ -1,390 +1,5 @@
 {
   "fs": [
-    {
-      "class": 8,
-      "cost": 1083910,
-      "edID": 128666651,
-      "eddbID": 1253,
-      "grp": "fs",
-      "id": "3q",
-      "power": 0.48,
-      "rate": 720,
-      "rating": "E"
-    },
-    {
-      "class": 8,
-      "cost": 4516290,
-      "edID": 128666659,
-      "eddbID": 1261,
-      "grp": "fs",
-      "id": "3p",
-      "power": 0.64,
-      "rate": 960,
-      "rating": "D"
-    },
-    {
-      "class": 8,
-      "cost": 18065160,
-      "edID": 128666667,
-      "eddbID": 1269,
-      "grp": "fs",
-      "id": "3o",
-      "power": 0.8,
-      "rate": 1200,
-      "rating": "C"
-    },
-    {
-      "class": 8,
-      "cost": 72260660,
-      "edID": 128666675,
-      "eddbID": 1277,
-      "grp": "fs",
-      "id": "3n",
-      "power": 0.96,
-      "rate": 1440,
-      "rating": "B"
-    },
-    {
-      "class": 8,
-      "cost": 289042540,
-      "edID": 128666683,
-      "eddbID": 1285,
-      "grp": "fs",
-      "id": "3m",
-      "power": 1.12,
-      "rate": 1680,
-      "rating": "A"
-    },
-    {
-      "class": 7,
-      "cost": 341930,
-      "edID": 128666650,
-      "eddbID": 1252,
-      "grp": "fs",
-      "id": "3l",
-      "power": 0.41,
-      "rate": 534,
-      "rating": "E"
-    },
-    {
-      "class": 7,
-      "cost": 1424700,
-      "edID": 128666658,
-      "eddbID": 1260,
-      "grp": "fs",
-      "id": "3k",
-      "power": 0.55,
-      "rate": 712,
-      "rating": "D"
-    },
-    {
-      "class": 7,
-      "cost": 5698790,
-      "edID": 128666666,
-      "eddbID": 1268,
-      "grp": "fs",
-      "id": "3j",
-      "power": 0.69,
-      "rate": 890,
-      "rating": "C"
-    },
-    {
-      "class": 7,
-      "cost": 22795160,
-      "edID": 128666674,
-      "eddbID": 1276,
-      "grp": "fs",
-      "id": "3i",
-      "power": 0.83,
-      "rate": 1068,
-      "rating": "B"
-    },
-    {
-      "class": 7,
-      "cost": 91180640,
-      "edID": 128666682,
-      "eddbID": 1284,
-      "grp": "fs",
-      "id": "3h",
-      "power": 0.97,
-      "rate": 1245,
-      "rating": "A"
-    },
-    {
-      "class": 6,
-      "cost": 107860,
-      "edID": 128666649,
-      "eddbID": 1251,
-      "grp": "fs",
-      "id": "3g",
-      "power": 0.35,
-      "rate": 376,
-      "rating": "E"
-    },
-    {
-      "class": 6,
-      "cost": 449430,
-      "edID": 128666657,
-      "eddbID": 1259,
-      "grp": "fs",
-      "id": "3f",
-      "power": 0.47,
-      "rate": 502,
-      "rating": "D"
-    },
-    {
-      "class": 6,
-      "cost": 1797730,
-      "edID": 128666665,
-      "eddbID": 1267,
-      "grp": "fs",
-      "id": "3e",
-      "power": 0.59,
-      "rate": 627,
-      "rating": "C"
-    },
-    {
-      "class": 6,
-      "cost": 7190900,
-      "edID": 128666673,
-      "eddbID": 1275,
-      "grp": "fs",
-      "id": "3d",
-      "power": 0.71,
-      "rate": 752,
-      "rating": "B"
-    },
-    {
-      "class": 6,
-      "cost": 28763610,
-      "edID": 128666681,
-      "eddbID": 1283,
-      "grp": "fs",
-      "id": "3c",
-      "power": 0.83,
-      "rate": 878,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 34030,
-      "edID": 128666648,
-      "eddbID": 1250,
-      "grp": "fs",
-      "id": "3b",
-      "power": 0.3,
-      "rate": 247,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 141780,
-      "edID": 128666656,
-      "eddbID": 1258,
-      "grp": "fs",
-      "id": "3a",
-      "power": 0.4,
-      "rate": 330,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 567110,
-      "edID": 128666664,
-      "eddbID": 1266,
-      "grp": "fs",
-      "id": "39",
-      "power": 0.5,
-      "rate": 412,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 2268420,
-      "edID": 128666672,
-      "eddbID": 1274,
-      "grp": "fs",
-      "id": "38",
-      "power": 0.6,
-      "rate": 494,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 9073690,
-      "edID": 128666680,
-      "eddbID": 1282,
-      "grp": "fs",
-      "id": "37",
-      "power": 0.7,
-      "rate": 577,
-      "rating": "A"
-    },
-    {
-      "class": 4,
-      "cost": 10730,
-      "edID": 128666647,
-      "eddbID": 1249,
-      "grp": "fs",
-      "id": "36",
-      "power": 0.25,
-      "rate": 147,
-      "rating": "E"
-    },
-    {
-      "class": 4,
-      "cost": 44720,
-      "edID": 128666655,
-      "eddbID": 1257,
-      "grp": "fs",
-      "id": "35",
-      "power": 0.33,
-      "rate": 196,
-      "rating": "D"
-    },
-    {
-      "class": 4,
-      "cost": 178900,
-      "edID": 128666663,
-      "eddbID": 1265,
-      "grp": "fs",
-      "id": "34",
-      "power": 0.41,
-      "rate": 245,
-      "rating": "C"
-    },
-    {
-      "class": 4,
-      "cost": 715590,
-      "edID": 128666671,
-      "eddbID": 1273,
-      "grp": "fs",
-      "id": "33",
-      "power": 0.49,
-      "rate": 294,
-      "rating": "B"
-    },
-    {
-      "class": 4,
-      "cost": 2862360,
-      "edID": 128666679,
-      "eddbID": 1281,
-      "grp": "fs",
-      "id": "32",
-      "power": 0.57,
-      "rate": 342,
-      "rating": "A"
-    },
-    {
-      "class": 3,
-      "cost": 3390,
-      "edID": 128666646,
-      "eddbID": 1248,
-      "grp": "fs",
-      "id": "31",
-      "power": 0.2,
-      "rate": 75,
-      "rating": "E"
-    },
-    {
-      "class": 3,
-      "cost": 14110,
-      "edID": 128666654,
-      "eddbID": 1256,
-      "grp": "fs",
-      "id": "30",
-      "power": 0.27,
-      "rate": 100,
-      "rating": "D"
-    },
-    {
-      "class": 3,
-      "cost": 56440,
-      "edID": 128666662,
-      "eddbID": 1264,
-      "grp": "fs",
-      "id": "2v",
-      "power": 0.34,
-      "rate": 126,
-      "rating": "C"
-    },
-    {
-      "class": 3,
-      "cost": 225740,
-      "edID": 128666670,
-      "eddbID": 1272,
-      "grp": "fs",
-      "id": "2u",
-      "power": 0.41,
-      "rate": 151,
-      "rating": "B"
-    },
-    {
-      "class": 3,
-      "cost": 902950,
-      "edID": 128666678,
-      "eddbID": 1280,
-      "grp": "fs",
-      "id": "2t",
-      "power": 0.48,
-      "rate": 176,
-      "rating": "A"
-    },
-    {
-      "class": 2,
-      "cost": 1070,
-      "edID": 128666645,
-      "eddbID": 1247,
-      "grp": "fs",
-      "id": "2s",
-      "power": 0.17,
-      "rate": 32,
-      "rating": "E"
-    },
-    {
-      "class": 2,
-      "cost": 4450,
-      "edID": 128666653,
-      "eddbID": 1255,
-      "grp": "fs",
-      "id": "2r",
-      "power": 0.22,
-      "rate": 43,
-      "rating": "D"
-    },
-    {
-      "class": 2,
-      "cost": 17800,
-      "edID": 128666661,
-      "eddbID": 1263,
-      "grp": "fs",
-      "id": "2q",
-      "power": 0.28,
-      "rate": 54,
-      "rating": "C"
-    },
-    {
-      "class": 2,
-      "cost": 71210,
-      "edID": 128666669,
-      "eddbID": 1271,
-      "grp": "fs",
-      "id": "2p",
-      "power": 0.34,
-      "rate": 65,
-      "rating": "B"
-    },
-    {
-      "class": 2,
-      "cost": 284840,
-      "edID": 128666677,
-      "eddbID": 1279,
-      "grp": "fs",
-      "id": "2o",
-      "power": 0.39,
-      "rate": 75,
-      "rating": "A"
-    },
     {
       "class": 1,
       "cost": 310,
@@ -394,7 +9,8 @@
       "id": "2n",
       "power": 0.14,
       "rate": 18,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_FuelScoop_Size1_Class1"
     },
     {
       "class": 1,
@@ -405,7 +21,8 @@
       "id": "2m",
       "power": 0.18,
       "rate": 24,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_FuelScoop_Size1_Class2"
     },
     {
       "class": 1,
@@ -416,7 +33,8 @@
       "id": "2l",
       "power": 0.23,
       "rate": 30,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelScoop_Size1_Class3"
     },
     {
       "class": 1,
@@ -427,7 +45,8 @@
       "id": "2k",
       "power": 0.28,
       "rate": 36,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_FuelScoop_Size1_Class4"
     },
     {
       "class": 1,
@@ -438,7 +57,428 @@
       "id": "2j",
       "power": 0.32,
       "rate": 42,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_FuelScoop_Size1_Class5"
+    },
+    {
+      "class": 2,
+      "cost": 1070,
+      "edID": 128666645,
+      "eddbID": 1247,
+      "grp": "fs",
+      "id": "2s",
+      "power": 0.17,
+      "rate": 32,
+      "rating": "E",
+      "symbol": "Int_FuelScoop_Size2_Class1"
+    },
+    {
+      "class": 2,
+      "cost": 4450,
+      "edID": 128666653,
+      "eddbID": 1255,
+      "grp": "fs",
+      "id": "2r",
+      "power": 0.22,
+      "rate": 43,
+      "rating": "D",
+      "symbol": "Int_FuelScoop_Size2_Class2"
+    },
+    {
+      "class": 2,
+      "cost": 17800,
+      "edID": 128666661,
+      "eddbID": 1263,
+      "grp": "fs",
+      "id": "2q",
+      "power": 0.28,
+      "rate": 54,
+      "rating": "C",
+      "symbol": "Int_FuelScoop_Size2_Class3"
+    },
+    {
+      "class": 2,
+      "cost": 71210,
+      "edID": 128666669,
+      "eddbID": 1271,
+      "grp": "fs",
+      "id": "2p",
+      "power": 0.34,
+      "rate": 65,
+      "rating": "B",
+      "symbol": "Int_FuelScoop_Size2_Class4"
+    },
+    {
+      "class": 2,
+      "cost": 284840,
+      "edID": 128666677,
+      "eddbID": 1279,
+      "grp": "fs",
+      "id": "2o",
+      "power": 0.39,
+      "rate": 75,
+      "rating": "A",
+      "symbol": "Int_FuelScoop_Size2_Class5"
+    },
+    {
+      "class": 3,
+      "cost": 3390,
+      "edID": 128666646,
+      "eddbID": 1248,
+      "grp": "fs",
+      "id": "31",
+      "power": 0.2,
+      "rate": 75,
+      "rating": "E",
+      "symbol": "Int_FuelScoop_Size3_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 14110,
+      "edID": 128666654,
+      "eddbID": 1256,
+      "grp": "fs",
+      "id": "30",
+      "power": 0.27,
+      "rate": 100,
+      "rating": "D",
+      "symbol": "Int_FuelScoop_Size3_Class2"
+    },
+    {
+      "class": 3,
+      "cost": 56440,
+      "edID": 128666662,
+      "eddbID": 1264,
+      "grp": "fs",
+      "id": "2v",
+      "power": 0.34,
+      "rate": 126,
+      "rating": "C",
+      "symbol": "Int_FuelScoop_Size3_Class3"
+    },
+    {
+      "class": 3,
+      "cost": 225740,
+      "edID": 128666670,
+      "eddbID": 1272,
+      "grp": "fs",
+      "id": "2u",
+      "power": 0.41,
+      "rate": 151,
+      "rating": "B",
+      "symbol": "Int_FuelScoop_Size3_Class4"
+    },
+    {
+      "class": 3,
+      "cost": 902950,
+      "edID": 128666678,
+      "eddbID": 1280,
+      "grp": "fs",
+      "id": "2t",
+      "power": 0.48,
+      "rate": 176,
+      "rating": "A",
+      "symbol": "Int_FuelScoop_Size3_Class5"
+    },
+    {
+      "class": 4,
+      "cost": 10730,
+      "edID": 128666647,
+      "eddbID": 1249,
+      "grp": "fs",
+      "id": "36",
+      "power": 0.25,
+      "rate": 147,
+      "rating": "E",
+      "symbol": "Int_FuelScoop_Size4_Class1"
+    },
+    {
+      "class": 4,
+      "cost": 44720,
+      "edID": 128666655,
+      "eddbID": 1257,
+      "grp": "fs",
+      "id": "35",
+      "power": 0.33,
+      "rate": 196,
+      "rating": "D",
+      "symbol": "Int_FuelScoop_Size4_Class2"
+    },
+    {
+      "class": 4,
+      "cost": 178900,
+      "edID": 128666663,
+      "eddbID": 1265,
+      "grp": "fs",
+      "id": "34",
+      "power": 0.41,
+      "rate": 245,
+      "rating": "C",
+      "symbol": "Int_FuelScoop_Size4_Class3"
+    },
+    {
+      "class": 4,
+      "cost": 715590,
+      "edID": 128666671,
+      "eddbID": 1273,
+      "grp": "fs",
+      "id": "33",
+      "power": 0.49,
+      "rate": 294,
+      "rating": "B",
+      "symbol": "Int_FuelScoop_Size4_Class4"
+    },
+    {
+      "class": 4,
+      "cost": 2862360,
+      "edID": 128666679,
+      "eddbID": 1281,
+      "grp": "fs",
+      "id": "32",
+      "power": 0.57,
+      "rate": 342,
+      "rating": "A",
+      "symbol": "Int_FuelScoop_Size4_Class5"
+    },
+    {
+      "class": 5,
+      "cost": 34030,
+      "edID": 128666648,
+      "eddbID": 1250,
+      "grp": "fs",
+      "id": "3b",
+      "power": 0.3,
+      "rate": 247,
+      "rating": "E",
+      "symbol": "Int_FuelScoop_Size5_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 141780,
+      "edID": 128666656,
+      "eddbID": 1258,
+      "grp": "fs",
+      "id": "3a",
+      "power": 0.4,
+      "rate": 330,
+      "rating": "D",
+      "symbol": "Int_FuelScoop_Size5_Class2"
+    },
+    {
+      "class": 5,
+      "cost": 567110,
+      "edID": 128666664,
+      "eddbID": 1266,
+      "grp": "fs",
+      "id": "39",
+      "power": 0.5,
+      "rate": 412,
+      "rating": "C",
+      "symbol": "Int_FuelScoop_Size5_Class3"
+    },
+    {
+      "class": 5,
+      "cost": 2268420,
+      "edID": 128666672,
+      "eddbID": 1274,
+      "grp": "fs",
+      "id": "38",
+      "power": 0.6,
+      "rate": 494,
+      "rating": "B",
+      "symbol": "Int_FuelScoop_Size5_Class4"
+    },
+    {
+      "class": 5,
+      "cost": 9073690,
+      "edID": 128666680,
+      "eddbID": 1282,
+      "grp": "fs",
+      "id": "37",
+      "power": 0.7,
+      "rate": 577,
+      "rating": "A",
+      "symbol": "Int_FuelScoop_Size5_Class5"
+    },
+    {
+      "class": 6,
+      "cost": 107860,
+      "edID": 128666649,
+      "eddbID": 1251,
+      "grp": "fs",
+      "id": "3g",
+      "power": 0.35,
+      "rate": 376,
+      "rating": "E",
+      "symbol": "Int_FuelScoop_Size6_Class1"
+    },
+    {
+      "class": 6,
+      "cost": 449430,
+      "edID": 128666657,
+      "eddbID": 1259,
+      "grp": "fs",
+      "id": "3f",
+      "power": 0.47,
+      "rate": 502,
+      "rating": "D",
+      "symbol": "Int_FuelScoop_Size6_Class2"
+    },
+    {
+      "class": 6,
+      "cost": 1797730,
+      "edID": 128666665,
+      "eddbID": 1267,
+      "grp": "fs",
+      "id": "3e",
+      "power": 0.59,
+      "rate": 627,
+      "rating": "C",
+      "symbol": "Int_FuelScoop_Size6_Class3"
+    },
+    {
+      "class": 6,
+      "cost": 7190900,
+      "edID": 128666673,
+      "eddbID": 1275,
+      "grp": "fs",
+      "id": "3d",
+      "power": 0.71,
+      "rate": 752,
+      "rating": "B",
+      "symbol": "Int_FuelScoop_Size6_Class4"
+    },
+    {
+      "class": 6,
+      "cost": 28763610,
+      "edID": 128666681,
+      "eddbID": 1283,
+      "grp": "fs",
+      "id": "3c",
+      "power": 0.83,
+      "rate": 878,
+      "rating": "A",
+      "symbol": "Int_FuelScoop_Size6_Class5"
+    },
+    {
+      "class": 7,
+      "cost": 341930,
+      "edID": 128666650,
+      "eddbID": 1252,
+      "grp": "fs",
+      "id": "3l",
+      "power": 0.41,
+      "rate": 534,
+      "rating": "E",
+      "symbol": "Int_FuelScoop_Size7_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 1424700,
+      "edID": 128666658,
+      "eddbID": 1260,
+      "grp": "fs",
+      "id": "3k",
+      "power": 0.55,
+      "rate": 712,
+      "rating": "D",
+      "symbol": "Int_FuelScoop_Size7_Class2"
+    },
+    {
+      "class": 7,
+      "cost": 5698790,
+      "edID": 128666666,
+      "eddbID": 1268,
+      "grp": "fs",
+      "id": "3j",
+      "power": 0.69,
+      "rate": 890,
+      "rating": "C",
+      "symbol": "Int_FuelScoop_Size7_Class3"
+    },
+    {
+      "class": 7,
+      "cost": 22795160,
+      "edID": 128666674,
+      "eddbID": 1276,
+      "grp": "fs",
+      "id": "3i",
+      "power": 0.83,
+      "rate": 1068,
+      "rating": "B",
+      "symbol": "Int_FuelScoop_Size7_Class4"
+    },
+    {
+      "class": 7,
+      "cost": 91180640,
+      "edID": 128666682,
+      "eddbID": 1284,
+      "grp": "fs",
+      "id": "3h",
+      "power": 0.97,
+      "rate": 1245,
+      "rating": "A",
+      "symbol": "Int_FuelScoop_Size7_Class5"
+    },
+    {
+      "class": 8,
+      "cost": 1083910,
+      "edID": 128666651,
+      "eddbID": 1253,
+      "grp": "fs",
+      "id": "3q",
+      "power": 0.48,
+      "rate": 720,
+      "rating": "E",
+      "symbol": "Int_FuelScoop_Size8_Class1"
+    },
+    {
+      "class": 8,
+      "cost": 4516290,
+      "edID": 128666659,
+      "eddbID": 1261,
+      "grp": "fs",
+      "id": "3p",
+      "power": 0.64,
+      "rate": 960,
+      "rating": "D",
+      "symbol": "Int_FuelScoop_Size8_Class2"
+    },
+    {
+      "class": 8,
+      "cost": 18065160,
+      "edID": 128666667,
+      "eddbID": 1269,
+      "grp": "fs",
+      "id": "3o",
+      "power": 0.8,
+      "rate": 1200,
+      "rating": "C",
+      "symbol": "Int_FuelScoop_Size8_Class3"
+    },
+    {
+      "class": 8,
+      "cost": 72260660,
+      "edID": 128666675,
+      "eddbID": 1277,
+      "grp": "fs",
+      "id": "3n",
+      "power": 0.96,
+      "rate": 1440,
+      "rating": "B",
+      "symbol": "Int_FuelScoop_Size8_Class4"
+    },
+    {
+      "class": 8,
+      "cost": 289042540,
+      "edID": 128666683,
+      "eddbID": 1285,
+      "grp": "fs",
+      "id": "3m",
+      "power": 1.12,
+      "rate": 1680,
+      "rating": "A",
+      "symbol": "Int_FuelScoop_Size8_Class5"
     }
   ]
-}
+}

modules/internal/fuel_transfer_limpet_controllers.json

@@ -1,200 +1,5 @@
 {
   "fx": [
-    {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671264,
-      "eddbID": 1429,
-      "grp": "fx",
-      "id": "Ff",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.55,
-      "range": 1.02,
-      "rating": "E"
-    },
-    {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671265,
-      "eddbID": 1430,
-      "grp": "fx",
-      "id": "Fg",
-      "mass": 32,
-      "maximum": 8,
-      "power": 0.41,
-      "range": 1.36,
-      "rating": "D"
-    },
-    {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671266,
-      "eddbID": 1431,
-      "grp": "fx",
-      "id": "Fh",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.69,
-      "range": 1.7,
-      "rating": "C"
-    },
-    {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671267,
-      "eddbID": 1432,
-      "grp": "fx",
-      "id": "Fi",
-      "mass": 128,
-      "maximum": 8,
-      "power": 0.97,
-      "range": 2.04,
-      "rating": "B"
-    },
-    {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671268,
-      "eddbID": 1433,
-      "grp": "fx",
-      "id": "Fj",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.83,
-      "range": 2.38,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671259,
-      "eddbID": 1424,
-      "grp": "fx",
-      "id": "Fa",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.4,
-      "range": 0.78,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671260,
-      "eddbID": 1425,
-      "grp": "fx",
-      "id": "Fb",
-      "mass": 8,
-      "maximum": 4,
-      "power": 0.3,
-      "range": 1.04,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671261,
-      "eddbID": 1426,
-      "grp": "fx",
-      "id": "Fc",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.5,
-      "range": 1.3,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671262,
-      "eddbID": 1427,
-      "grp": "fx",
-      "id": "Fd",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 1.56,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671263,
-      "eddbID": 1428,
-      "grp": "fx",
-      "id": "Fe",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.6,
-      "range": 1.82,
-      "rating": "A"
-    },
-    {
-      "class": 3,
-      "cost": 5400,
-      "edID": 128671254,
-      "eddbID": 1419,
-      "grp": "fx",
-      "id": "F5",
-      "mass": 5,
-      "maximum": 2,
-      "power": 0.27,
-      "range": 0.66,
-      "rating": "E"
-    },
-    {
-      "class": 3,
-      "cost": 10800,
-      "edID": 128671255,
-      "eddbID": 1420,
-      "grp": "fx",
-      "id": "F6",
-      "mass": 2,
-      "maximum": 2,
-      "power": 0.2,
-      "range": 0.88,
-      "rating": "D"
-    },
-    {
-      "class": 3,
-      "cost": 21600,
-      "edID": 128671256,
-      "eddbID": 1421,
-      "grp": "fx",
-      "id": "F7",
-      "mass": 5,
-      "maximum": 2,
-      "power": 0.34,
-      "range": 1.1,
-      "rating": "C"
-    },
-    {
-      "class": 3,
-      "cost": 43200,
-      "edID": 128671257,
-      "eddbID": 1422,
-      "grp": "fx",
-      "id": "F8",
-      "mass": 8,
-      "maximum": 2,
-      "power": 0.48,
-      "range": 1.32,
-      "rating": "B"
-    },
-    {
-      "class": 3,
-      "cost": 86400,
-      "edID": 128671258,
-      "eddbID": 1423,
-      "grp": "fx",
-      "id": "F9",
-      "mass": 5,
-      "maximum": 2,
-      "power": 0.41,
-      "range": 1.54,
-      "rating": "A"
-    },
     {
       "class": 1,
       "cost": 600,
@@ -206,7 +11,8 @@
       "maximum": 1,
       "power": 0.18,
       "range": 0.6,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_DroneControl_FuelTransfer_Size1_Class1"
     },
     {
       "class": 1,
@@ -219,7 +25,8 @@
       "maximum": 1,
       "power": 0.14,
       "range": 0.8,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_DroneControl_FuelTransfer_Size1_Class2"
     },
     {
       "class": 1,
@@ -232,7 +39,8 @@
       "maximum": 1,
       "power": 0.23,
       "range": 1,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_DroneControl_FuelTransfer_Size1_Class3"
     },
     {
       "class": 1,
@@ -245,7 +53,8 @@
       "maximum": 1,
       "power": 0.32,
       "range": 1.2,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_DroneControl_FuelTransfer_Size1_Class4"
     },
     {
       "class": 1,
@@ -258,7 +67,218 @@
       "maximum": 1,
       "power": 0.28,
       "range": 1.4,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_DroneControl_FuelTransfer_Size1_Class5"
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128671254,
+      "eddbID": 1419,
+      "grp": "fx",
+      "id": "F5",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.27,
+      "range": 0.66,
+      "rating": "E",
+      "symbol": "Int_DroneControl_FuelTransfer_Size3_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128671255,
+      "eddbID": 1420,
+      "grp": "fx",
+      "id": "F6",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 0.88,
+      "rating": "D",
+      "symbol": "Int_DroneControl_FuelTransfer_Size3_Class2"
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128671256,
+      "eddbID": 1421,
+      "grp": "fx",
+      "id": "F7",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.34,
+      "range": 1.1,
+      "rating": "C",
+      "symbol": "Int_DroneControl_FuelTransfer_Size3_Class3"
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128671257,
+      "eddbID": 1422,
+      "grp": "fx",
+      "id": "F8",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.48,
+      "range": 1.32,
+      "rating": "B",
+      "symbol": "Int_DroneControl_FuelTransfer_Size3_Class4"
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128671258,
+      "eddbID": 1423,
+      "grp": "fx",
+      "id": "F9",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.41,
+      "range": 1.54,
+      "rating": "A",
+      "symbol": "Int_DroneControl_FuelTransfer_Size3_Class5"
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671259,
+      "eddbID": 1424,
+      "grp": "fx",
+      "id": "Fa",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.4,
+      "range": 0.78,
+      "rating": "E",
+      "symbol": "Int_DroneControl_FuelTransfer_Size5_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671260,
+      "eddbID": 1425,
+      "grp": "fx",
+      "id": "Fb",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.3,
+      "range": 1.04,
+      "rating": "D",
+      "symbol": "Int_DroneControl_FuelTransfer_Size5_Class2"
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671261,
+      "eddbID": 1426,
+      "grp": "fx",
+      "id": "Fc",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.5,
+      "range": 1.3,
+      "rating": "C",
+      "symbol": "Int_DroneControl_FuelTransfer_Size5_Class3"
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671262,
+      "eddbID": 1427,
+      "grp": "fx",
+      "id": "Fd",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 1.56,
+      "rating": "B",
+      "symbol": "Int_DroneControl_FuelTransfer_Size5_Class4"
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671263,
+      "eddbID": 1428,
+      "grp": "fx",
+      "id": "Fe",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.6,
+      "range": 1.82,
+      "rating": "A",
+      "symbol": "Int_DroneControl_FuelTransfer_Size5_Class5"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671264,
+      "eddbID": 1429,
+      "grp": "fx",
+      "id": "Ff",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "E",
+      "symbol": "Int_DroneControl_FuelTransfer_Size7_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671265,
+      "eddbID": 1430,
+      "grp": "fx",
+      "id": "Fg",
+      "mass": 32,
+      "maximum": 8,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "D",
+      "symbol": "Int_DroneControl_FuelTransfer_Size7_Class2"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671266,
+      "eddbID": 1431,
+      "grp": "fx",
+      "id": "Fh",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C",
+      "symbol": "Int_DroneControl_FuelTransfer_Size7_Class3"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671267,
+      "eddbID": 1432,
+      "grp": "fx",
+      "id": "Fi",
+      "mass": 128,
+      "maximum": 8,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "B",
+      "symbol": "Int_DroneControl_FuelTransfer_Size7_Class4"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671268,
+      "eddbID": 1433,
+      "grp": "fx",
+      "id": "Fj",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.83,
+      "range": 2.38,
+      "rating": "A",
+      "symbol": "Int_DroneControl_FuelTransfer_Size7_Class5"
     }
   ]
-}
+}

modules/internal/hatch_breaker_limpet_controller.json

@@ -1,215 +1,5 @@
 {
   "hb": [
-    {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128066547,
-      "eddbID": 1222,
-      "grp": "hb",
-      "id": "7d",
-      "mass": 80,
-      "maximum": 18,
-      "power": 0.42,
-      "range": 2.58,
-      "rating": "E",
-      "time": 25
-    },
-    {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128066548,
-      "eddbID": 1223,
-      "grp": "hb",
-      "id": "7c",
-      "mass": 32,
-      "maximum": 12,
-      "power": 0.56,
-      "range": 3.44,
-      "rating": "D",
-      "time": 22
-    },
-    {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128066549,
-      "eddbID": 1224,
-      "grp": "hb",
-      "id": "7b",
-      "mass": 80,
-      "maximum": 15,
-      "power": 0.7,
-      "range": 4.3,
-      "rating": "C",
-      "time": 18
-    },
-    {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128066550,
-      "eddbID": 1225,
-      "grp": "hb",
-      "id": "7a",
-      "mass": 128,
-      "maximum": 18,
-      "power": 0.84,
-      "range": 5.16,
-      "rating": "B",
-      "time": 14
-    },
-    {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128066551,
-      "eddbID": 1226,
-      "grp": "hb",
-      "id": "79",
-      "mass": 90,
-      "maximum": 12,
-      "power": 0.98,
-      "range": 6.02,
-      "rating": "A",
-      "time": 11
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128066542,
-      "eddbID": 1217,
-      "grp": "hb",
-      "id": "78",
-      "mass": 20,
-      "maximum": 9,
-      "power": 0.3,
-      "range": 1.98,
-      "rating": "E",
-      "time": 31
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128066543,
-      "eddbID": 1218,
-      "grp": "hb",
-      "id": "77",
-      "mass": 8,
-      "maximum": 6,
-      "power": 0.4,
-      "range": 2.64,
-      "rating": "D",
-      "time": 26
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128066544,
-      "eddbID": 1219,
-      "grp": "hb",
-      "id": "76",
-      "mass": 20,
-      "maximum": 7,
-      "power": 0.5,
-      "range": 3.3,
-      "rating": "C",
-      "time": 22
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128066545,
-      "eddbID": 1220,
-      "grp": "hb",
-      "id": "75",
-      "mass": 32,
-      "maximum": 9,
-      "power": 0.6,
-      "range": 3.96,
-      "rating": "B",
-      "time": 18
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128066546,
-      "eddbID": 1221,
-      "grp": "hb",
-      "id": "74",
-      "mass": 20,
-      "maximum": 6,
-      "power": 0.7,
-      "range": 4.62,
-      "rating": "A",
-      "time": 13
-    },
-    {
-      "class": 3,
-      "cost": 5400,
-      "edID": 128066537,
-      "eddbID": 1212,
-      "grp": "hb",
-      "id": "73",
-      "mass": 5,
-      "maximum": 4,
-      "power": 0.18,
-      "range": 1.62,
-      "rating": "E",
-      "time": 36
-    },
-    {
-      "class": 3,
-      "cost": 10800,
-      "edID": 128066538,
-      "eddbID": 1213,
-      "grp": "hb",
-      "id": "72",
-      "mass": 2,
-      "maximum": 3,
-      "power": 0.24,
-      "range": 2.16,
-      "rating": "D",
-      "time": 31
-    },
-    {
-      "class": 3,
-      "cost": 21600,
-      "edID": 128066539,
-      "eddbID": 1214,
-      "grp": "hb",
-      "id": "71",
-      "mass": 5,
-      "maximum": 3,
-      "power": 0.3,
-      "range": 2.7,
-      "rating": "C",
-      "time": 26
-    },
-    {
-      "class": 3,
-      "cost": 43200,
-      "edID": 128066540,
-      "eddbID": 1215,
-      "grp": "hb",
-      "id": "70",
-      "mass": 8,
-      "maximum": 4,
-      "power": 0.36,
-      "range": 3.24,
-      "rating": "B",
-      "time": 21
-    },
-    {
-      "class": 3,
-      "cost": 86400,
-      "edID": 128066541,
-      "eddbID": 1216,
-      "grp": "hb",
-      "id": "6v",
-      "mass": 5,
-      "maximum": 3,
-      "power": 0.42,
-      "range": 3.78,
-      "rating": "A",
-      "time": 16
-    },
     {
       "class": 1,
       "cost": 600,
@@ -222,7 +12,8 @@
       "power": 0.12,
       "range": 1.5,
       "rating": "E",
-      "time": 42
+      "time": 42,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size1_Class1"
     },
     {
       "class": 1,
@@ -236,7 +27,8 @@
       "power": 0.16,
       "range": 2,
       "rating": "D",
-      "time": 36
+      "time": 36,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size1_Class2"
     },
     {
       "class": 1,
@@ -250,7 +42,8 @@
       "power": 0.2,
       "range": 2.5,
       "rating": "C",
-      "time": 30
+      "time": 30,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size1_Class3"
     },
     {
       "class": 1,
@@ -264,7 +57,8 @@
       "power": 0.24,
       "range": 3,
       "rating": "B",
-      "time": 24
+      "time": 24,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size1_Class4"
     },
     {
       "class": 1,
@@ -278,7 +72,233 @@
       "power": 0.28,
       "range": 3.5,
       "rating": "A",
-      "time": 18
+      "time": 18,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size1_Class5"
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128066537,
+      "eddbID": 1212,
+      "grp": "hb",
+      "id": "73",
+      "mass": 5,
+      "maximum": 4,
+      "power": 0.18,
+      "range": 1.62,
+      "rating": "E",
+      "time": 36,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size3_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128066538,
+      "eddbID": 1213,
+      "grp": "hb",
+      "id": "72",
+      "mass": 2,
+      "maximum": 3,
+      "power": 0.24,
+      "range": 2.16,
+      "rating": "D",
+      "time": 31,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size3_Class2"
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128066539,
+      "eddbID": 1214,
+      "grp": "hb",
+      "id": "71",
+      "mass": 5,
+      "maximum": 3,
+      "power": 0.3,
+      "range": 2.7,
+      "rating": "C",
+      "time": 26,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size3_Class3"
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128066540,
+      "eddbID": 1215,
+      "grp": "hb",
+      "id": "70",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.36,
+      "range": 3.24,
+      "rating": "B",
+      "time": 21,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size3_Class4"
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128066541,
+      "eddbID": 1216,
+      "grp": "hb",
+      "id": "6v",
+      "mass": 5,
+      "maximum": 3,
+      "power": 0.42,
+      "range": 3.78,
+      "rating": "A",
+      "time": 16,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size3_Class5"
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128066542,
+      "eddbID": 1217,
+      "grp": "hb",
+      "id": "78",
+      "mass": 20,
+      "maximum": 9,
+      "power": 0.3,
+      "range": 1.98,
+      "rating": "E",
+      "time": 31,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size5_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128066543,
+      "eddbID": 1218,
+      "grp": "hb",
+      "id": "77",
+      "mass": 8,
+      "maximum": 6,
+      "power": 0.4,
+      "range": 2.64,
+      "rating": "D",
+      "time": 26,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size5_Class2"
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128066544,
+      "eddbID": 1219,
+      "grp": "hb",
+      "id": "76",
+      "mass": 20,
+      "maximum": 7,
+      "power": 0.5,
+      "range": 3.3,
+      "rating": "C",
+      "time": 22,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size5_Class3"
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128066545,
+      "eddbID": 1220,
+      "grp": "hb",
+      "id": "75",
+      "mass": 32,
+      "maximum": 9,
+      "power": 0.6,
+      "range": 3.96,
+      "rating": "B",
+      "time": 18,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size5_Class4"
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128066546,
+      "eddbID": 1221,
+      "grp": "hb",
+      "id": "74",
+      "mass": 20,
+      "maximum": 6,
+      "power": 0.7,
+      "range": 4.62,
+      "rating": "A",
+      "time": 13,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size5_Class5"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128066547,
+      "eddbID": 1222,
+      "grp": "hb",
+      "id": "7d",
+      "mass": 80,
+      "maximum": 18,
+      "power": 0.42,
+      "range": 2.58,
+      "rating": "E",
+      "time": 25,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size7_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128066548,
+      "eddbID": 1223,
+      "grp": "hb",
+      "id": "7c",
+      "mass": 32,
+      "maximum": 12,
+      "power": 0.56,
+      "range": 3.44,
+      "rating": "D",
+      "time": 22,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size7_Class2"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128066549,
+      "eddbID": 1224,
+      "grp": "hb",
+      "id": "7b",
+      "mass": 80,
+      "maximum": 15,
+      "power": 0.7,
+      "range": 4.3,
+      "rating": "C",
+      "time": 18,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size7_Class3"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128066550,
+      "eddbID": 1225,
+      "grp": "hb",
+      "id": "7a",
+      "mass": 128,
+      "maximum": 18,
+      "power": 0.84,
+      "range": 5.16,
+      "rating": "B",
+      "time": 14,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size7_Class4"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128066551,
+      "eddbID": 1226,
+      "grp": "hb",
+      "id": "79",
+      "mass": 90,
+      "maximum": 12,
+      "power": 0.98,
+      "range": 6.02,
+      "rating": "A",
+      "time": 11,
+      "symbol": "Int_DroneControl_ResourceSiphon_Size7_Class5"
     }
   ]
-}
+}

modules/internal/hull_reinforcement_package.json

@@ -1,114 +1,154 @@
 {
   "hr": [
     {
-      "armouradd": 360,
-      "class": 5,
-      "cost": 150000,
-      "edID": 128668545,
-      "eddbID": 1381,
-      "grp": "hr",
-      "id": "2e",
-      "mass": 64,
-      "rating": "E"
-    },
-    {
-      "armouradd": 390,
-      "class": 5,
-      "cost": 450000,
-      "edID": 128668546,
-      "eddbID": 1382,
-      "grp": "hr",
-      "id": "2d",
-      "mass": 32,
-      "rating": "D"
-    },
-    {
-      "armouradd": 300,
-      "class": 4,
-      "cost": 65000,
-      "edID": 128668543,
-      "eddbID": 1379,
-      "grp": "hr",
-      "id": "2c",
-      "mass": 32,
-      "rating": "E"
-    },
-    {
-      "armouradd": 330,
-      "class": 4,
-      "cost": 195000,
-      "edID": 128668544,
-      "eddbID": 1380,
-      "grp": "hr",
-      "id": "2b",
-      "mass": 16,
-      "rating": "D"
-    },
-    {
-      "armouradd": 230,
-      "class": 3,
-      "cost": 28000,
-      "edID": 128668541,
-      "eddbID": 1377,
-      "grp": "hr",
-      "id": "2a",
-      "mass": 16,
-      "rating": "E"
-    },
-    {
-      "armouradd": 260,
-      "class": 3,
-      "cost": 84000,
-      "edID": 128668542,
-      "eddbID": 1378,
-      "grp": "hr",
-      "id": "29",
-      "mass": 8,
-      "rating": "D"
-    },
-    {
-      "armouradd": 150,
-      "class": 2,
-      "cost": 12000,
-      "edID": 128668539,
-      "eddbID": 1375,
-      "grp": "hr",
-      "id": "28",
-      "mass": 8,
-      "rating": "E"
-    },
-    {
-      "armouradd": 190,
-      "class": 2,
-      "cost": 36000,
-      "edID": 128668540,
-      "eddbID": 1376,
-      "grp": "hr",
-      "id": "27",
-      "mass": 4,
-      "rating": "D"
-    },
-    {
-      "armouradd": 80,
+      "hullreinforcement": 80,
       "class": 1,
       "cost": 5000,
       "edID": 128668537,
       "eddbID": 1373,
+      "explres": 0.005,
       "grp": "hr",
       "id": "26",
-      "mass": 4,
-      "rating": "E"
+      "kinres": 0.005,
+      "mass": 2,
+      "rating": "E",
+      "thermres": 0.005,
+      "symbol": "Int_HullReinforcement_Size1_Class1"
     },
     {
-      "armouradd": 110,
+      "hullreinforcement": 110,
       "class": 1,
       "cost": 15000,
       "edID": 128668538,
       "eddbID": 1374,
+      "explres": 0.005,
       "grp": "hr",
       "id": "25",
+      "kinres": 0.005,
+      "mass": 1,
+      "rating": "D",
+      "thermres": 0.005,
+      "symbol": "Int_HullReinforcement_Size1_Class2"
+    },
+    {
+      "hullreinforcement": 150,
+      "class": 2,
+      "cost": 12000,
+      "edID": 128668539,
+      "eddbID": 1375,
+      "explres": 0.01,
+      "grp": "hr",
+      "id": "28",
+      "kinres": 0.01,
+      "mass": 4,
+      "rating": "E",
+      "thermres": 0.01,
+      "symbol": "Int_HullReinforcement_Size2_Class1"
+    },
+    {
+      "hullreinforcement": 190,
+      "class": 2,
+      "cost": 36000,
+      "edID": 128668540,
+      "eddbID": 1376,
+      "explres": 0.01,
+      "grp": "hr",
+      "id": "27",
+      "kinres": 0.01,
       "mass": 2,
-      "rating": "D"
+      "rating": "D",
+      "thermres": 0.01,
+      "symbol": "Int_HullReinforcement_Size2_Class2"
+    },
+    {
+      "hullreinforcement": 230,
+      "class": 3,
+      "cost": 28000,
+      "edID": 128668541,
+      "eddbID": 1377,
+      "explres": 0.015,
+      "grp": "hr",
+      "id": "2a",
+      "kinres": 0.015,
+      "mass": 8,
+      "rating": "E",
+      "thermres": 0.015,
+      "symbol": "Int_HullReinforcement_Size3_Class1"
+    },
+    {
+      "hullreinforcement": 260,
+      "class": 3,
+      "cost": 84000,
+      "edID": 128668542,
+      "eddbID": 1378,
+      "explres": 0.015,
+      "grp": "hr",
+      "id": "29",
+      "kinres": 0.015,
+      "mass": 4,
+      "rating": "D",
+      "thermres": 0.015,
+      "symbol": "Int_HullReinforcement_Size3_Class2"
+    },
+    {
+      "hullreinforcement": 300,
+      "class": 4,
+      "cost": 65000,
+      "edID": 128668543,
+      "eddbID": 1379,
+      "explres": 0.02,
+      "grp": "hr",
+      "id": "2c",
+      "kinres": 0.02,
+      "mass": 16,
+      "rating": "E",
+      "thermres": 0.02,
+      "symbol": "Int_HullReinforcement_Size4_Class1"
+    },
+    {
+      "hullreinforcement": 330,
+      "class": 4,
+      "cost": 195000,
+      "edID": 128668544,
+      "eddbID": 1380,
+      "explres": 0.02,
+      "grp": "hr",
+      "id": "2b",
+      "kinres": 0.02,
+      "mass": 8,
+      "rating": "D",
+      "thermres": 0.02,
+      "symbol": "Int_HullReinforcement_Size4_Class2"
+    },
+    {
+      "hullreinforcement": 360,
+      "class": 5,
+      "cost": 150000,
+      "edID": 128668545,
+      "eddbID": 1381,
+      "explres": 0.025,
+      "grp": "hr",
+      "id": "2e",
+      "kinres": 0.025,
+      "mass": 32,
+      "rating": "E",
+      "thermres": 0.025,
+      "symbol": "Int_HullReinforcement_Size5_Class1"
+    },
+    {
+      "hullreinforcement": 390,
+      "class": 5,
+      "cost": 450000,
+      "edID": 128668546,
+      "eddbID": 1382,
+      "explres": 0.025,
+      "grp": "hr",
+      "id": "2d",
+      "kinres": 0.025,
+      "mass": 16,
+      "rating": "D",
+      "thermres": 0.025,
+      "symbol": "Int_HullReinforcement_Size5_Class2"
     }
   ]
-}
+}

modules/internal/internal_fuel_tank.json

@@ -8,7 +8,8 @@
       "fuel": 2,
       "grp": "ft",
       "id": "f1",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size1_Class3"
     },
     {
       "class": 2,
@@ -18,7 +19,8 @@
       "fuel": 4,
       "grp": "ft",
       "id": "f2",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size2_Class3"
     },
     {
       "class": 3,
@@ -28,7 +30,8 @@
       "fuel": 8,
       "grp": "ft",
       "id": "f3",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size3_Class3"
     },
     {
       "class": 4,
@@ -38,7 +41,8 @@
       "fuel": 16,
       "grp": "ft",
       "id": "f4",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size4_Class3"
     },
     {
       "class": 5,
@@ -48,7 +52,8 @@
       "fuel": 32,
       "grp": "ft",
       "id": "f5",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size5_Class3"
     },
     {
       "class": 6,
@@ -58,7 +63,8 @@
       "fuel": 64,
       "grp": "ft",
       "id": "f6",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size6_Class3"
     },
     {
       "class": 7,
@@ -68,7 +74,8 @@
       "fuel": 128,
       "grp": "ft",
       "id": "f7",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size7_Class3"
     },
     {
       "class": 8,
@@ -78,7 +85,8 @@
       "fuel": 256,
       "grp": "ft",
       "id": "f8",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size8_Class3"
     }
   ]
-}
+}

modules/internal/luxury_passenger_cabin.json

@@ -2,23 +2,27 @@
   "pcq": [
     {
       "class": 5,
-      "cost": -1,
+      "cost": 1658100,
+      "edID": 128727925,
       "eddbID": 1575,
       "grp": "pcq",
       "id": "mm",
       "mass": 20,
       "passengers": 4,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_PassengerCabin_Size5_Class4"
     },
     {
       "class": 6,
-      "cost": -1,
+      "cost": 4974300,
+      "edID": 128727929,
       "eddbID": 1576,
       "grp": "pcq",
       "id": "mn",
       "mass": 40,
       "passengers": 8,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_PassengerCabin_Size6_Class4"
     }
   ]
-}
+}

modules/internal/module_reinforcement_package.json

@@ -0,0 +1,134 @@
+{
+  "mrp": [
+    {
+      "class": 1,
+      "cost": 5000,
+      "eddbID": 1577,
+      "edID": 128737270,
+      "grp": "mrp",
+      "id": "m0",
+      "integrity": 77,
+      "mass": 2,
+      "protection": 0.3,
+      "rating": "E",
+      "symbol": "Int_ModuleReinforcement_Size1_Class1"
+    },
+    {
+      "class": 1,
+      "cost": 15000,
+      "eddbID": 1578,
+      "edID": 128737271,
+      "grp": "mrp",
+      "id": "m1",
+      "integrity": 70,
+      "mass": 1,
+      "protection": 0.6,
+      "rating": "D",
+      "symbol": "Int_ModuleReinforcement_Size1_Class2"
+    },
+    {
+      "class": 2,
+      "cost": 12000,
+      "eddbID": 1579,
+      "edID": 128737272,
+      "grp": "mrp",
+      "id": "m2",
+      "integrity": 115,
+      "mass": 4,
+      "protection": 0.3,
+      "rating": "E",
+      "symbol": "Int_ModuleReinforcement_Size2_Class1"
+    },
+    {
+      "class": 2,
+      "cost": 36000,
+      "eddbID": 1580,
+      "edID": 128737273,
+      "grp": "mrp",
+      "id": "m3",
+      "integrity": 105,
+      "mass": 2,
+      "protection": 0.6,
+      "rating": "D",
+      "symbol": "Int_ModuleReinforcement_Size2_Class2"
+    },
+    {
+      "class": 3,
+      "cost": 28000,
+      "eddbID": 1581,
+      "edID": 128737274,
+      "grp": "mrp",
+      "id": "m4",
+      "integrity": 170,
+      "mass": 8,
+      "protection": 0.3,
+      "rating": "E",
+      "symbol": "Int_ModuleReinforcement_Size3_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 84000,
+      "eddbID": 1582,
+      "edID": 128737275,
+      "grp": "mrp",
+      "id": "m5",
+      "integrity": 155,
+      "mass": 4,
+      "protection": 0.6,
+      "rating": "D",
+      "symbol": "Int_ModuleReinforcement_Size3_Class2"
+    },
+    {
+      "class": 4,
+      "cost": 65000,
+      "eddbID": 1583,
+      "edID": 128737276,
+      "grp": "mrp",
+      "id": "m6",
+      "integrity": 260,
+      "mass": 16,
+      "protection": 0.3,
+      "rating": "E",
+      "symbol": "Int_ModuleReinforcement_Size4_Class1"
+    },
+    {
+      "class": 4,
+      "cost": 195000,
+      "eddbID": 1584,
+      "edID": 128737277,
+      "grp": "mrp",
+      "id": "m7",
+      "integrity": 235,
+      "mass": 8,
+      "protection": 0.6,
+      "rating": "D",
+      "symbol": "Int_ModuleReinforcement_Size4_Class2"
+    },
+    {
+      "class": 5,
+      "cost": 150000,
+      "eddbID": 1585,
+      "edID": 128737278,
+      "grp": "mrp",
+      "id": "m8",
+      "integrity": 385,
+      "mass": 32,
+      "protection": 0.3,
+      "rating": "E",
+      "symbol": "Int_ModuleReinforcement_Size5_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 450000,
+      "eddbID": 1586,
+      "edID": 128737279,
+      "grp": "mrp",
+      "id": "m9",
+      "integrity": 350,
+      "mass": 16,
+      "protection": 0.6,
+      "rating": "D",
+      "symbol": "Int_ModuleReinforcement_Size5_Class2"
+    }
+  ]
+}

modules/internal/planetary_vehicle_hanger.json

@@ -1,53 +1,5 @@
 {
   "pv": [
-    {
-      "bays": 4,
-      "class": 6,
-      "cost": 576000,
-      "edID": 128672292,
-      "eddbID": 1524,
-      "grp": "pv",
-      "id": "v1",
-      "mass": 34,
-      "power": 0.6,
-      "rating": "H"
-    },
-    {
-      "bays": 4,
-      "class": 6,
-      "cost": 691200,
-      "edID": 128672293,
-      "eddbID": 1525,
-      "grp": "pv",
-      "id": "v2",
-      "mass": 17,
-      "power": 1.8,
-      "rating": "G"
-    },
-    {
-      "bays": 2,
-      "class": 4,
-      "cost": 72000,
-      "edID": 128672290,
-      "eddbID": 1526,
-      "grp": "pv",
-      "id": "v3",
-      "mass": 20,
-      "power": 0.4,
-      "rating": "H"
-    },
-    {
-      "bays": 2,
-      "class": 4,
-      "cost": 86400,
-      "edID": 128672291,
-      "eddbID": 1527,
-      "grp": "pv",
-      "id": "v4",
-      "mass": 10,
-      "power": 1.2,
-      "rating": "G"
-    },
     {
       "bays": 1,
       "class": 2,
@@ -56,9 +8,11 @@
       "eddbID": 1528,
       "grp": "pv",
       "id": "v5",
+      "integrity": 30,
       "mass": 12,
       "power": 0.25,
-      "rating": "H"
+      "rating": "H",
+      "symbol": "Int_BuggyBay_Size2_Class1"
     },
     {
       "bays": 1,
@@ -68,9 +22,67 @@
       "eddbID": 1529,
       "grp": "pv",
       "id": "v6",
+      "integrity": 30,
       "mass": 6,
       "power": 0.75,
-      "rating": "G"
+      "rating": "G",
+      "symbol": "Int_BuggyBay_Size2_Class2"
+    },
+    {
+      "bays": 2,
+      "class": 4,
+      "cost": 72000,
+      "edID": 128672290,
+      "eddbID": 1526,
+      "grp": "pv",
+      "id": "v3",
+      "integrity": 30,
+      "mass": 20,
+      "power": 0.4,
+      "rating": "H",
+      "symbol": "Int_BuggyBay_Size4_Class1"
+    },
+    {
+      "bays": 2,
+      "class": 4,
+      "cost": 86400,
+      "edID": 128672291,
+      "eddbID": 1527,
+      "grp": "pv",
+      "id": "v4",
+      "integrity": 30,
+      "mass": 10,
+      "power": 1.2,
+      "rating": "G",
+      "symbol": "Int_BuggyBay_Size4_Class2"
+    },
+    {
+      "bays": 4,
+      "class": 6,
+      "cost": 576000,
+      "edID": 128672292,
+      "eddbID": 1524,
+      "grp": "pv",
+      "id": "v1",
+      "integrity": 30,
+      "mass": 34,
+      "power": 0.6,
+      "rating": "H",
+      "symbol": "Int_BuggyBay_Size6_Class1"
+    },
+    {
+      "bays": 4,
+      "class": 6,
+      "cost": 691200,
+      "edID": 128672293,
+      "eddbID": 1525,
+      "grp": "pv",
+      "id": "v2",
+      "integrity": 30,
+      "mass": 17,
+      "power": 1.8,
+      "rating": "G",
+      "symbol": "Int_BuggyBay_Size6_Class2"
     }
   ]
-}
+}

modules/internal/pristmatic_shield_generator.json

@@ -1,156 +1,212 @@
 {
   "psg": [
     {
+      "brokenregen": 1.2,
       "class": 1,
       "cost": 132200,
+      "distdraw": 0.6,
       "edID": 128671323,
       "eddbID": 1485,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p6",
+      "integrity": 48,
+      "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 63,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 13,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 25,
       "optmul": 1.5,
       "power": 2.52,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size1_Class5_Strong"
     },
     {
+      "brokenregen": 1.2,
       "class": 2,
       "cost": 240340,
+      "distdraw": 0.6,
       "edID": 128671324,
       "eddbID": 1486,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p5",
+      "integrity": 61,
+      "kinres": 0.4,
       "mass": 5,
       "maxmass": 138,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 23,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 55,
       "optmul": 1.5,
       "power": 3.15,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size2_Class5_Strong"
     },
     {
+      "brokenregen": 1.3,
       "class": 3,
       "cost": 761870,
+      "distdraw": 0.6,
       "edID": 128671325,
       "eddbID": 1487,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p4",
+      "integrity": 77,
+      "kinres": 0.4,
       "mass": 10,
       "maxmass": 413,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 83,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 165,
       "optmul": 1.5,
       "power": 3.78,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size3_Class5_Strong"
     },
     {
+      "brokenregen": 1.7,
       "class": 4,
       "cost": 2415120,
+      "distdraw": 0.6,
       "edID": 128671326,
       "eddbID": 1488,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p3",
+      "integrity": 96,
+      "kinres": 0.4,
       "mass": 20,
       "maxmass": 713,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 143,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 285,
       "optmul": 1.5,
       "power": 4.62,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.425
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size4_Class5_Strong"
     },
     {
+      "brokenregen": 2.3,
       "class": 5,
       "cost": 7655930,
+      "distdraw": 0.6,
       "edID": 128671327,
       "eddbID": 1489,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p2",
+      "integrity": 115,
+      "kinres": 0.4,
       "mass": 40,
       "maxmass": 1013,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 203,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 405,
       "optmul": 1.5,
       "power": 5.46,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.875
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size5_Class5_Strong"
     },
     {
+      "brokenregen": 3.2,
       "class": 6,
       "cost": 24269300,
+      "distdraw": 0.6,
       "edID": 128671328,
       "eddbID": 1490,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p1",
+      "integrity": 136,
+      "kinres": 0.4,
       "mass": 80,
       "maxmass": 1350,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 270,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 540,
       "optmul": 1.5,
       "power": 6.51,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 2.4
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size6_Class5_Strong"
     },
     {
+      "brokenregen": 4.2,
       "class": 7,
       "cost": 76933670,
+      "distdraw": 0.6,
       "edID": 128671329,
       "eddbID": 1491,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p0",
+      "integrity": 157,
+      "kinres": 0.4,
       "mass": 160,
       "maxmass": 2650,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 530,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 1060,
       "optmul": 1.5,
       "power": 7.35,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 3
+      "regen": 1.1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size7_Class5_Strong"
     },
     {
+      "brokenregen": 5.4,
       "class": 8,
       "cost": 243879730,
+      "distdraw": 0.6,
       "edID": 128671330,
       "eddbID": 1492,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p7",
+      "integrity": 180,
+      "kinres": 0.4,
       "mass": 320,
       "maxmass": 4500,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 900,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 1800,
       "optmul": 1.5,
       "power": 8.4,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 3.6
+      "regen": 1.4,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size8_Class5_Strong"
     }
   ]
-}
+}

modules/internal/prospector_limpet_controllers.json

@@ -1,200 +1,5 @@
 {
   "pc": [
-    {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671284,
-      "eddbID": 1449,
-      "grp": "pc",
-      "id": "Pf",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.55,
-      "range": 5.1,
-      "rating": "E"
-    },
-    {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671285,
-      "eddbID": 1450,
-      "grp": "pc",
-      "id": "Pg",
-      "mass": 32,
-      "maximum": 8,
-      "power": 0.41,
-      "range": 6.8,
-      "rating": "D"
-    },
-    {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671286,
-      "eddbID": 1451,
-      "grp": "pc",
-      "id": "Ph",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.69,
-      "range": 8.5,
-      "rating": "C"
-    },
-    {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671287,
-      "eddbID": 1452,
-      "grp": "pc",
-      "id": "Pi",
-      "mass": 128,
-      "maximum": 8,
-      "power": 0.97,
-      "range": 10.2,
-      "rating": "B"
-    },
-    {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671288,
-      "eddbID": 1453,
-      "grp": "pc",
-      "id": "Pj",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.83,
-      "range": 11.9,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671279,
-      "eddbID": 1444,
-      "grp": "pc",
-      "id": "Pa",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.4,
-      "range": 3.9,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671280,
-      "eddbID": 1445,
-      "grp": "pc",
-      "id": "Pb",
-      "mass": 8,
-      "maximum": 4,
-      "power": 0.3,
-      "range": 5.2,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671281,
-      "eddbID": 1446,
-      "grp": "pc",
-      "id": "Pc",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.5,
-      "range": 6.5,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671282,
-      "eddbID": 1447,
-      "grp": "pc",
-      "id": "Pd",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 7.8,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671283,
-      "eddbID": 1448,
-      "grp": "pc",
-      "id": "Pe",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.6,
-      "range": 9.1,
-      "rating": "A"
-    },
-    {
-      "class": 3,
-      "cost": 5400,
-      "edID": 128671274,
-      "eddbID": 1439,
-      "grp": "pc",
-      "id": "P5",
-      "mass": 5,
-      "maximum": 2,
-      "power": 0.27,
-      "range": 3.3,
-      "rating": "E"
-    },
-    {
-      "class": 3,
-      "cost": 10800,
-      "edID": 128671275,
-      "eddbID": 1440,
-      "grp": "pc",
-      "id": "P6",
-      "mass": 2,
-      "maximum": 2,
-      "power": 0.2,
-      "range": 4.4,
-      "rating": "D"
-    },
-    {
-      "class": 3,
-      "cost": 21600,
-      "edID": 128671276,
-      "eddbID": 1441,
-      "grp": "pc",
-      "id": "P7",
-      "mass": 5,
-      "maximum": 2,
-      "power": 0.34,
-      "range": 5.5,
-      "rating": "C"
-    },
-    {
-      "class": 3,
-      "cost": 43200,
-      "edID": 128671277,
-      "eddbID": 1442,
-      "grp": "pc",
-      "id": "P8",
-      "mass": 8,
-      "maximum": 2,
-      "power": 0.48,
-      "range": 6.6,
-      "rating": "B"
-    },
-    {
-      "class": 3,
-      "cost": 86400,
-      "edID": 128671278,
-      "eddbID": 1443,
-      "grp": "pc",
-      "id": "P9",
-      "mass": 5,
-      "maximum": 2,
-      "power": 0.41,
-      "range": 7.7,
-      "rating": "A"
-    },
     {
       "class": 1,
       "cost": 600,
@@ -206,7 +11,8 @@
       "maximum": 1,
       "power": 0.18,
       "range": 3,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_DroneControl_Prospector_Size1_Class1"
     },
     {
       "class": 1,
@@ -219,7 +25,8 @@
       "maximum": 1,
       "power": 0.14,
       "range": 4,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_DroneControl_Prospector_Size1_Class2"
     },
     {
       "class": 1,
@@ -232,7 +39,8 @@
       "maximum": 1,
       "power": 0.23,
       "range": 5,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_DroneControl_Prospector_Size1_Class3"
     },
     {
       "class": 1,
@@ -245,7 +53,8 @@
       "maximum": 1,
       "power": 0.32,
       "range": 6,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_DroneControl_Prospector_Size1_Class4"
     },
     {
       "class": 1,
@@ -258,7 +67,218 @@
       "maximum": 1,
       "power": 0.28,
       "range": 7,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_DroneControl_Prospector_Size1_Class5"
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128671274,
+      "eddbID": 1439,
+      "grp": "pc",
+      "id": "P5",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.27,
+      "range": 3.3,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Prospector_Size3_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128671275,
+      "eddbID": 1440,
+      "grp": "pc",
+      "id": "P6",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 4.4,
+      "rating": "D",
+      "symbol": "Int_DroneControl_Prospector_Size3_Class2"
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128671276,
+      "eddbID": 1441,
+      "grp": "pc",
+      "id": "P7",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.34,
+      "range": 5.5,
+      "rating": "C",
+      "symbol": "Int_DroneControl_Prospector_Size3_Class3"
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128671277,
+      "eddbID": 1442,
+      "grp": "pc",
+      "id": "P8",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.48,
+      "range": 6.6,
+      "rating": "B",
+      "symbol": "Int_DroneControl_Prospector_Size3_Class4"
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128671278,
+      "eddbID": 1443,
+      "grp": "pc",
+      "id": "P9",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.41,
+      "range": 7.7,
+      "rating": "A",
+      "symbol": "Int_DroneControl_Prospector_Size3_Class5"
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671279,
+      "eddbID": 1444,
+      "grp": "pc",
+      "id": "Pa",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.4,
+      "range": 3.9,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Prospector_Size5_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671280,
+      "eddbID": 1445,
+      "grp": "pc",
+      "id": "Pb",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.3,
+      "range": 5.2,
+      "rating": "D",
+      "symbol": "Int_DroneControl_Prospector_Size5_Class2"
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671281,
+      "eddbID": 1446,
+      "grp": "pc",
+      "id": "Pc",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.5,
+      "range": 6.5,
+      "rating": "C",
+      "symbol": "Int_DroneControl_Prospector_Size5_Class3"
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671282,
+      "eddbID": 1447,
+      "grp": "pc",
+      "id": "Pd",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 7.8,
+      "rating": "B",
+      "symbol": "Int_DroneControl_Prospector_Size5_Class4"
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671283,
+      "eddbID": 1448,
+      "grp": "pc",
+      "id": "Pe",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.6,
+      "range": 9.1,
+      "rating": "A",
+      "symbol": "Int_DroneControl_Prospector_Size5_Class5"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671284,
+      "eddbID": 1449,
+      "grp": "pc",
+      "id": "Pf",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.55,
+      "range": 5.1,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Prospector_Size7_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671285,
+      "eddbID": 1450,
+      "grp": "pc",
+      "id": "Pg",
+      "mass": 32,
+      "maximum": 8,
+      "power": 0.41,
+      "range": 6.8,
+      "rating": "D",
+      "symbol": "Int_DroneControl_Prospector_Size7_Class2"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671286,
+      "eddbID": 1451,
+      "grp": "pc",
+      "id": "Ph",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.69,
+      "range": 8.5,
+      "rating": "C",
+      "symbol": "Int_DroneControl_Prospector_Size7_Class3"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671287,
+      "eddbID": 1452,
+      "grp": "pc",
+      "id": "Pi",
+      "mass": 128,
+      "maximum": 8,
+      "power": 0.97,
+      "range": 10.2,
+      "rating": "B",
+      "symbol": "Int_DroneControl_Prospector_Size7_Class4"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671288,
+      "eddbID": 1453,
+      "grp": "pc",
+      "id": "Pj",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.83,
+      "range": 11.9,
+      "rating": "A",
+      "symbol": "Int_DroneControl_Prospector_Size7_Class5"
     }
   ]
-}
+}

modules/internal/refinery.json

@@ -1,170 +1,5 @@
 {
   "rf": [
-    {
-      "bins": 4,
-      "class": 4,
-      "cost": 55570,
-      "edID": 128666687,
-      "eddbID": 1289,
-      "grp": "rf",
-      "id": "23",
-      "power": 0.25,
-      "rating": "E"
-    },
-    {
-      "bins": 5,
-      "class": 4,
-      "cost": 166700,
-      "edID": 128666691,
-      "eddbID": 1293,
-      "grp": "rf",
-      "id": "22",
-      "power": 0.33,
-      "rating": "D"
-    },
-    {
-      "bins": 7,
-      "class": 4,
-      "cost": 500090,
-      "edID": 128666695,
-      "eddbID": 1297,
-      "grp": "rf",
-      "id": "21",
-      "power": 0.41,
-      "rating": "C"
-    },
-    {
-      "bins": 9,
-      "class": 4,
-      "cost": 1500280,
-      "edID": 128666699,
-      "eddbID": 1301,
-      "grp": "rf",
-      "id": "20",
-      "power": 0.49,
-      "rating": "B"
-    },
-    {
-      "bins": 10,
-      "class": 4,
-      "cost": 4500850,
-      "edID": 128666703,
-      "eddbID": 1305,
-      "grp": "rf",
-      "id": "1v",
-      "power": 0.57,
-      "rating": "A"
-    },
-    {
-      "bins": 3,
-      "class": 3,
-      "cost": 26460,
-      "edID": 128666686,
-      "eddbID": 1288,
-      "grp": "rf",
-      "id": "1u",
-      "power": 0.2,
-      "rating": "E"
-    },
-    {
-      "bins": 4,
-      "class": 3,
-      "cost": 79380,
-      "edID": 128666690,
-      "eddbID": 1292,
-      "grp": "rf",
-      "id": "1t",
-      "power": 0.27,
-      "rating": "D"
-    },
-    {
-      "bins": 6,
-      "class": 3,
-      "cost": 238140,
-      "edID": 128666694,
-      "eddbID": 1296,
-      "grp": "rf",
-      "id": "1s",
-      "power": 0.34,
-      "rating": "C"
-    },
-    {
-      "bins": 7,
-      "class": 3,
-      "cost": 714420,
-      "edID": 128666698,
-      "eddbID": 1300,
-      "grp": "rf",
-      "id": "1r",
-      "power": 0.41,
-      "rating": "B"
-    },
-    {
-      "bins": 8,
-      "class": 3,
-      "cost": 2143260,
-      "edID": 128666702,
-      "eddbID": 1304,
-      "grp": "rf",
-      "id": "1q",
-      "power": 0.48,
-      "rating": "A"
-    },
-    {
-      "bins": 2,
-      "class": 2,
-      "cost": 12600,
-      "edID": 128666685,
-      "eddbID": 1287,
-      "grp": "rf",
-      "id": "1p",
-      "power": 0.17,
-      "rating": "E"
-    },
-    {
-      "bins": 3,
-      "class": 2,
-      "cost": 37800,
-      "edID": 128666689,
-      "eddbID": 1291,
-      "grp": "rf",
-      "id": "1o",
-      "power": 0.22,
-      "rating": "D"
-    },
-    {
-      "bins": 4,
-      "class": 2,
-      "cost": 113400,
-      "edID": 128666693,
-      "eddbID": 1295,
-      "grp": "rf",
-      "id": "1n",
-      "power": 0.28,
-      "rating": "C"
-    },
-    {
-      "bins": 5,
-      "class": 2,
-      "cost": 340200,
-      "edID": 128666697,
-      "eddbID": 1299,
-      "grp": "rf",
-      "id": "1m",
-      "power": 0.34,
-      "rating": "B"
-    },
-    {
-      "bins": 6,
-      "class": 2,
-      "cost": 1020600,
-      "edID": 128666701,
-      "eddbID": 1303,
-      "grp": "rf",
-      "id": "1l",
-      "power": 0.39,
-      "rating": "A"
-    },
     {
       "bins": 1,
       "class": 1,
@@ -174,7 +9,8 @@
       "grp": "rf",
       "id": "1k",
       "power": 0.14,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Refinery_Size1_Class1"
     },
     {
       "bins": 1,
@@ -185,7 +21,8 @@
       "grp": "rf",
       "id": "1j",
       "power": 0.18,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Refinery_Size1_Class2"
     },
     {
       "bins": 2,
@@ -196,7 +33,8 @@
       "grp": "rf",
       "id": "1i",
       "power": 0.23,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Refinery_Size1_Class3"
     },
     {
       "bins": 3,
@@ -207,7 +45,8 @@
       "grp": "rf",
       "id": "1h",
       "power": 0.28,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Refinery_Size1_Class4"
     },
     {
       "bins": 4,
@@ -218,7 +57,188 @@
       "grp": "rf",
       "id": "1g",
       "power": 0.32,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Refinery_Size1_Class5"
+    },
+    {
+      "bins": 2,
+      "class": 2,
+      "cost": 12600,
+      "edID": 128666685,
+      "eddbID": 1287,
+      "grp": "rf",
+      "id": "1p",
+      "power": 0.17,
+      "rating": "E",
+      "symbol": "Int_Refinery_Size2_Class1"
+    },
+    {
+      "bins": 3,
+      "class": 2,
+      "cost": 37800,
+      "edID": 128666689,
+      "eddbID": 1291,
+      "grp": "rf",
+      "id": "1o",
+      "power": 0.22,
+      "rating": "D",
+      "symbol": "Int_Refinery_Size2_Class2"
+    },
+    {
+      "bins": 4,
+      "class": 2,
+      "cost": 113400,
+      "edID": 128666693,
+      "eddbID": 1295,
+      "grp": "rf",
+      "id": "1n",
+      "power": 0.28,
+      "rating": "C",
+      "symbol": "Int_Refinery_Size2_Class3"
+    },
+    {
+      "bins": 5,
+      "class": 2,
+      "cost": 340200,
+      "edID": 128666697,
+      "eddbID": 1299,
+      "grp": "rf",
+      "id": "1m",
+      "power": 0.34,
+      "rating": "B",
+      "symbol": "Int_Refinery_Size2_Class4"
+    },
+    {
+      "bins": 6,
+      "class": 2,
+      "cost": 1020600,
+      "edID": 128666701,
+      "eddbID": 1303,
+      "grp": "rf",
+      "id": "1l",
+      "power": 0.39,
+      "rating": "A",
+      "symbol": "Int_Refinery_Size2_Class5"
+    },
+    {
+      "bins": 3,
+      "class": 3,
+      "cost": 26460,
+      "edID": 128666686,
+      "eddbID": 1288,
+      "grp": "rf",
+      "id": "1u",
+      "power": 0.2,
+      "rating": "E",
+      "symbol": "Int_Refinery_Size3_Class1"
+    },
+    {
+      "bins": 4,
+      "class": 3,
+      "cost": 79380,
+      "edID": 128666690,
+      "eddbID": 1292,
+      "grp": "rf",
+      "id": "1t",
+      "power": 0.27,
+      "rating": "D",
+      "symbol": "Int_Refinery_Size3_Class2"
+    },
+    {
+      "bins": 6,
+      "class": 3,
+      "cost": 238140,
+      "edID": 128666694,
+      "eddbID": 1296,
+      "grp": "rf",
+      "id": "1s",
+      "power": 0.34,
+      "rating": "C",
+      "symbol": "Int_Refinery_Size3_Class3"
+    },
+    {
+      "bins": 7,
+      "class": 3,
+      "cost": 714420,
+      "edID": 128666698,
+      "eddbID": 1300,
+      "grp": "rf",
+      "id": "1r",
+      "power": 0.41,
+      "rating": "B",
+      "symbol": "Int_Refinery_Size3_Class4"
+    },
+    {
+      "bins": 8,
+      "class": 3,
+      "cost": 2143260,
+      "edID": 128666702,
+      "eddbID": 1304,
+      "grp": "rf",
+      "id": "1q",
+      "power": 0.48,
+      "rating": "A",
+      "symbol": "Int_Refinery_Size3_Class5"
+    },
+    {
+      "bins": 4,
+      "class": 4,
+      "cost": 55570,
+      "edID": 128666687,
+      "eddbID": 1289,
+      "grp": "rf",
+      "id": "23",
+      "power": 0.25,
+      "rating": "E",
+      "symbol": "Int_Refinery_Size4_Class1"
+    },
+    {
+      "bins": 5,
+      "class": 4,
+      "cost": 166700,
+      "edID": 128666691,
+      "eddbID": 1293,
+      "grp": "rf",
+      "id": "22",
+      "power": 0.33,
+      "rating": "D",
+      "symbol": "Int_Refinery_Size4_Class2"
+    },
+    {
+      "bins": 7,
+      "class": 4,
+      "cost": 500090,
+      "edID": 128666695,
+      "eddbID": 1297,
+      "grp": "rf",
+      "id": "21",
+      "power": 0.41,
+      "rating": "C",
+      "symbol": "Int_Refinery_Size4_Class3"
+    },
+    {
+      "bins": 9,
+      "class": 4,
+      "cost": 1500280,
+      "edID": 128666699,
+      "eddbID": 1301,
+      "grp": "rf",
+      "id": "20",
+      "power": 0.49,
+      "rating": "B",
+      "symbol": "Int_Refinery_Size4_Class4"
+    },
+    {
+      "bins": 10,
+      "class": 4,
+      "cost": 4500850,
+      "edID": 128666703,
+      "eddbID": 1305,
+      "grp": "rf",
+      "id": "1v",
+      "power": 0.57,
+      "rating": "A",
+      "symbol": "Int_Refinery_Size4_Class5"
     }
   ]
-}
+}

modules/internal/repair_limpet_controller.json

@@ -0,0 +1,284 @@
+{
+  "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",
+      "symbol": "Int_DroneControl_Repair_Size1_Class1"
+    },
+    {
+      "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",
+      "symbol": "Int_DroneControl_Repair_Size1_Class2"
+    },
+    {
+      "class": 1,
+      "cost": 2400,
+      "edID": 128777329,
+      "eddbID": 1596,
+      "grp": "rpl",
+      "id": "9a",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 1,
+      "rating": "C",
+      "symbol": "Int_DroneControl_Repair_Size1_Class3"
+    },
+    {
+      "class": 1,
+      "cost": 4800,
+      "edID": 128777330,
+      "eddbID": 1597,
+      "grp": "rpl",
+      "id": "9w",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 1.2,
+      "rating": "B",
+      "symbol": "Int_DroneControl_Repair_Size1_Class4"
+    },
+    {
+      "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",
+      "symbol": "Int_DroneControl_Repair_Size1_Class5"
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128777332,
+      "eddbID": 1599,
+      "grp": "rpl",
+      "id": "9x",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.27,
+      "range": 0.66,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Repair_Size3_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128777333,
+      "eddbID": 1600,
+      "grp": "rpl",
+      "id": "9e",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 0.88,
+      "rating": "D",
+      "symbol": "Int_DroneControl_Repair_Size3_Class2"
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128777334,
+      "eddbID": 1601,
+      "grp": "rpl",
+      "id": "9d",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.34,
+      "range": 1.1,
+      "rating": "C",
+      "symbol": "Int_DroneControl_Repair_Size3_Class3"
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128777335,
+      "eddbID": 1602,
+      "grp": "rpl",
+      "id": "9c",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.48,
+      "range": 1.32,
+      "rating": "B",
+      "symbol": "Int_DroneControl_Repair_Size3_Class4"
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128777336,
+      "eddbID": 1603,
+      "grp": "rpl",
+      "id": "9r",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.41,
+      "range": 1.54,
+      "rating": "A",
+      "symbol": "Int_DroneControl_Repair_Size3_Class5"
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128777337,
+      "eddbID": 1604,
+      "grp": "rpl",
+      "id": "9f",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.4,
+      "range": 0.78,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Repair_Size5_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128777338,
+      "eddbID": 1605,
+      "grp": "rpl",
+      "id": "9v",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.3,
+      "range": 1.04,
+      "rating": "D",
+      "symbol": "Int_DroneControl_Repair_Size5_Class2"
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128777339,
+      "eddbID": 1606,
+      "grp": "rpl",
+      "id": "9t",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.5,
+      "range": 1.3,
+      "rating": "C",
+      "symbol": "Int_DroneControl_Repair_Size5_Class3"
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128777340,
+      "eddbID": 1607,
+      "grp": "rpl",
+      "id": "9g",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.97,
+      "range": 1.56,
+      "rating": "B",
+      "symbol": "Int_DroneControl_Repair_Size5_Class4"
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128777341,
+      "eddbID": 1608,
+      "grp": "rpl",
+      "id": "9b",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.6,
+      "range": 1.82,
+      "rating": "A",
+      "symbol": "Int_DroneControl_Repair_Size5_Class5"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128777342,
+      "eddbID": 1609,
+      "grp": "rpl",
+      "id": "9y",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Repair_Size7_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128777343,
+      "eddbID": 1610,
+      "grp": "rpl",
+      "id": "9h",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "D",
+      "symbol": "Int_DroneControl_Repair_Size7_Class2"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128777344,
+      "eddbID": 1611,
+      "grp": "rpl",
+      "id": "9n",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C",
+      "symbol": "Int_DroneControl_Repair_Size7_Class3"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128777345,
+      "eddbID": 1612,
+      "grp": "rpl",
+      "id": "9u",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "B",
+      "symbol": "Int_DroneControl_Repair_Size7_Class4"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128777346,
+      "eddbID": 1613,
+      "grp": "rpl",
+      "id": "9j",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.83,
+      "range": 2.38,
+      "rating": "A",
+      "symbol": "Int_DroneControl_Repair_Size7_Class5"
+    }
+  ]
+}

modules/internal/scanner.json

@@ -7,11 +7,13 @@
       "eddbID": 1244,
       "grp": "sc",
       "id": "2f",
+      "integrity": 40,
       "mass": 2,
       "name": "Advanced Discovery Scanner",
       "power": 0,
       "rangeLS": null,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_StellarBodyDiscoveryScanner_Advanced"
     },
     {
       "class": 1,
@@ -20,11 +22,13 @@
       "eddbID": 1243,
       "grp": "sc",
       "id": "2g",
+      "integrity": 40,
       "mass": 2,
       "name": "Intermediate Discovery Scanner",
       "power": 0,
       "rangeLS": 1000,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_StellarBodyDiscoveryScanner_Intermediate"
     },
     {
       "class": 1,
@@ -33,23 +37,13 @@
       "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"
+      "rating": "E",
+      "symbol": "Int_StellarBodyDiscoveryScanner_Standard"
     }
   ]
-}
+}

modules/internal/surface_scanner.json

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

modules/standard/frame_shift_drive.json

@@ -9,11 +9,13 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fy",
+      "integrity": 93,
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
       "power": 0,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Hyperdrive_Size8_Class1"
     },
     {
       "class": 8,
@@ -24,11 +26,13 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fx",
+      "integrity": 37,
       "mass": 64,
       "maxfuel": 0,
       "optmass": 0,
       "power": 0,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Hyperdrive_Size8_Class2"
     },
     {
       "class": 8,
@@ -39,11 +43,13 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fw",
+      "integrity": 46,
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
       "power": 0,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Hyperdrive_Size8_Class3"
     },
     {
       "class": 8,
@@ -54,11 +60,13 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fv",
+      "integrity": 74,
       "mass": 256,
       "maxfuel": 0,
       "optmass": 0,
       "power": 0,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Hyperdrive_Size8_Class4"
     },
     {
       "class": 8,
@@ -69,11 +77,13 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fu",
+      "integrity": 46,
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
       "power": 0,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Hyperdrive_Size8_Class5"
     },
     {
       "class": 7,
@@ -84,11 +94,13 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Ft",
+      "integrity": 118,
       "mass": 80,
       "maxfuel": 8.5,
       "optmass": 1440,
       "power": 0.48,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Hyperdrive_Size7_Class1"
     },
     {
       "class": 7,
@@ -99,11 +111,13 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Fs",
+      "integrity": 105,
       "mass": 32,
       "maxfuel": 8.5,
       "optmass": 1620,
       "power": 0.54,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Hyperdrive_Size7_Class2"
     },
     {
       "class": 7,
@@ -114,11 +128,13 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Fr",
+      "integrity": 131,
       "mass": 80,
       "maxfuel": 8.5,
       "optmass": 1800,
       "power": 0.6,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Hyperdrive_Size7_Class3"
     },
     {
       "class": 7,
@@ -129,11 +145,13 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Fq",
+      "integrity": 157,
       "mass": 128,
       "maxfuel": 10.6,
       "optmass": 2250,
       "power": 0.75,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Hyperdrive_Size7_Class4"
     },
     {
       "class": 7,
@@ -144,11 +162,13 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Fp",
+      "integrity": 144,
       "mass": 80,
       "maxfuel": 12.8,
       "optmass": 2700,
       "power": 0.9,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Hyperdrive_Size7_Class5"
     },
     {
       "class": 6,
@@ -159,11 +179,13 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fo",
+      "integrity": 102,
       "mass": 40,
       "maxfuel": 5.3,
       "optmass": 960,
       "power": 0.4,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Hyperdrive_Size6_Class1"
     },
     {
       "class": 6,
@@ -174,11 +196,13 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fn",
+      "integrity": 90,
       "mass": 16,
       "maxfuel": 5.3,
       "optmass": 1080,
       "power": 0.45,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Hyperdrive_Size6_Class2"
     },
     {
       "class": 6,
@@ -189,11 +213,13 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fm",
+      "integrity": 113,
       "mass": 40,
       "maxfuel": 5.3,
       "optmass": 1200,
       "power": 0.5,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Hyperdrive_Size6_Class3"
     },
     {
       "class": 6,
@@ -204,11 +230,13 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fl",
+      "integrity": 136,
       "mass": 64,
       "maxfuel": 6.6,
       "optmass": 1500,
       "power": 0.63,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Hyperdrive_Size6_Class4"
     },
     {
       "class": 6,
@@ -219,11 +247,13 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fk",
+      "integrity": 124,
       "mass": 40,
       "maxfuel": 8,
       "optmass": 1800,
       "power": 0.75,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Hyperdrive_Size6_Class5"
     },
     {
       "class": 5,
@@ -234,11 +264,13 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Fj",
+      "integrity": 86,
       "mass": 20,
       "maxfuel": 3.3,
       "optmass": 560,
       "power": 0.32,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Hyperdrive_Size5_Class1"
     },
     {
       "class": 5,
@@ -249,11 +281,13 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Fi",
+      "integrity": 77,
       "mass": 8,
       "maxfuel": 3.3,
       "optmass": 630,
       "power": 0.36,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Hyperdrive_Size5_Class2"
     },
     {
       "class": 5,
@@ -264,11 +298,13 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Fh",
+      "integrity": 96,
       "mass": 20,
       "maxfuel": 3.3,
       "optmass": 700,
       "power": 0.4,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Hyperdrive_Size5_Class3"
     },
     {
       "class": 5,
@@ -279,11 +315,13 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Fg",
+      "integrity": 115,
       "mass": 32,
       "maxfuel": 4.1,
       "optmass": 875,
       "power": 0.5,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Hyperdrive_Size5_Class4"
     },
     {
       "class": 5,
@@ -294,11 +332,13 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Ff",
+      "integrity": 120,
       "mass": 20,
       "maxfuel": 5,
       "optmass": 1050,
       "power": 0.6,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Hyperdrive_Size5_Class5"
     },
     {
       "class": 4,
@@ -309,11 +349,13 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fe",
+      "integrity": 72,
       "mass": 10,
       "maxfuel": 2,
       "optmass": 280,
       "power": 0.24,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Hyperdrive_Size4_Class1"
     },
     {
       "class": 4,
@@ -324,11 +366,13 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fd",
+      "integrity": 64,
       "mass": 4,
       "maxfuel": 2,
       "optmass": 315,
       "power": 0.27,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Hyperdrive_Size4_Class2"
     },
     {
       "class": 4,
@@ -339,11 +383,13 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fc",
+      "integrity": 80,
       "mass": 10,
       "maxfuel": 2,
       "optmass": 350,
       "power": 0.3,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Hyperdrive_Size4_Class3"
     },
     {
       "class": 4,
@@ -354,11 +400,13 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fb",
+      "integrity": 96,
       "mass": 16,
       "maxfuel": 2.5,
-      "optmass": 438,
+      "optmass": 437.5,
       "power": 0.38,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Hyperdrive_Size4_Class4"
     },
     {
       "class": 4,
@@ -369,11 +417,13 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fa",
+      "integrity": 88,
       "mass": 10,
       "maxfuel": 3,
       "optmass": 525,
       "power": 0.45,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Hyperdrive_Size4_Class5"
     },
     {
       "class": 3,
@@ -384,11 +434,13 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F9",
+      "integrity": 58,
       "mass": 5,
       "maxfuel": 1.2,
       "optmass": 80,
       "power": 0.24,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Hyperdrive_Size3_Class1"
     },
     {
       "class": 3,
@@ -399,11 +451,13 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F8",
+      "integrity": 51,
       "mass": 2,
       "maxfuel": 1.2,
       "optmass": 90,
       "power": 0.27,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Hyperdrive_Size3_Class2"
     },
     {
       "class": 3,
@@ -414,11 +468,13 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F7",
+      "integrity": 64,
       "mass": 5,
       "maxfuel": 1.2,
       "optmass": 100,
       "power": 0.3,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Hyperdrive_Size3_Class3"
     },
     {
       "class": 3,
@@ -429,11 +485,13 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F6",
+      "integrity": 77,
       "mass": 8,
       "maxfuel": 1.5,
       "optmass": 125,
       "power": 0.38,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Hyperdrive_Size3_Class4"
     },
     {
       "class": 3,
@@ -444,11 +502,13 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F5",
+      "integrity": 70,
       "mass": 5,
       "maxfuel": 1.8,
       "optmass": 150,
       "power": 0.45,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Hyperdrive_Size3_Class5"
     },
     {
       "class": 2,
@@ -459,11 +519,13 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F4",
+      "integrity": 46,
       "mass": 2.5,
       "maxfuel": 0.6,
       "optmass": 48,
       "power": 0.16,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Hyperdrive_Size2_Class1"
     },
     {
       "class": 2,
@@ -474,11 +536,13 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F3",
+      "integrity": 41,
       "mass": 1,
       "maxfuel": 0.6,
       "optmass": 54,
       "power": 0.18,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Hyperdrive_Size2_Class2"
     },
     {
       "class": 2,
@@ -489,11 +553,13 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F2",
+      "integrity": 51,
       "mass": 2.5,
       "maxfuel": 0.6,
       "optmass": 60,
       "power": 0.2,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Hyperdrive_Size2_Class3"
     },
     {
       "class": 2,
@@ -504,11 +570,13 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F1",
+      "integrity": 61,
       "mass": 4,
       "maxfuel": 0.8,
       "optmass": 75,
       "power": 0.25,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Hyperdrive_Size2_Class4"
     },
     {
       "class": 2,
@@ -519,11 +587,13 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F0",
+      "integrity": 56,
       "mass": 2.5,
       "maxfuel": 0.9,
       "optmass": 90,
       "power": 0.3,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Hyperdrive_Size2_Class5"
     }
   ]
-}
+}

modules/standard/fuel_tank.json

@@ -8,7 +8,8 @@
       "fuel": 2,
       "grp": "ft",
       "id": "f1",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size1_Class3"
     },
     {
       "class": 2,
@@ -18,7 +19,8 @@
       "fuel": 4,
       "grp": "ft",
       "id": "f2",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size2_Class3"
     },
     {
       "class": 3,
@@ -28,7 +30,8 @@
       "fuel": 8,
       "grp": "ft",
       "id": "f3",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size3_Class3"
     },
     {
       "class": 4,
@@ -38,7 +41,8 @@
       "fuel": 16,
       "grp": "ft",
       "id": "f4",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size4_Class3"
     },
     {
       "class": 5,
@@ -48,7 +52,8 @@
       "fuel": 32,
       "grp": "ft",
       "id": "f5",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size5_Class3"
     },
     {
       "class": 6,
@@ -58,7 +63,8 @@
       "fuel": 64,
       "grp": "ft",
       "id": "f6",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size6_Class3"
     },
     {
       "class": 7,
@@ -68,7 +74,8 @@
       "fuel": 128,
       "grp": "ft",
       "id": "f7",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size7_Class3"
     },
     {
       "class": 8,
@@ -78,7 +85,8 @@
       "fuel": 256,
       "grp": "ft",
       "id": "f8",
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_FuelTank_Size8_Class3"
     }
   ]
-}
+}

modules/standard/life_support.json

@@ -1,484 +1,604 @@
 {
   "ls": [
     {
+      "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 697590,
       "edID": 128064173,
       "eddbID": 1031,
       "grp": "ls",
       "id": "lD",
+      "integrity": 120,
       "mass": 160,
-      "power": 0,
+      "power": 0.8,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_LifeSupport_Size8_Class1"
     },
     {
+      "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 1743970,
       "edID": 128064174,
       "eddbID": 1032,
       "grp": "ls",
       "id": "lC",
+      "integrity": 135,
       "mass": 64,
-      "power": 0,
+      "power": 0.9,
       "rating": "D",
-      "time": 450
+      "time": 450,
+      "symbol": "Int_LifeSupport_Size8_Class2"
     },
     {
+      "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 4359900,
       "edID": 128064175,
       "eddbID": 1033,
       "grp": "ls",
       "id": "lB",
+      "integrity": 150,
       "mass": 160,
-      "power": 0,
+      "power": 1,
       "rating": "C",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_LifeSupport_Size8_Class3"
     },
     {
+      "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 10899770,
       "edID": 128064176,
       "eddbID": 1034,
       "grp": "ls",
       "id": "lA",
+      "integrity": 165,
       "mass": 256,
-      "power": 0,
+      "power": 1.1,
       "rating": "B",
-      "time": 900
+      "time": 900,
+      "symbol": "Int_LifeSupport_Size8_Class4"
     },
     {
+      "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 27249400,
       "edID": 128064177,
       "eddbID": 1035,
       "grp": "ls",
       "id": "lz",
+      "integrity": 180,
       "mass": 160,
-      "power": 0,
+      "power": 1.2,
       "rating": "A",
-      "time": 1500
+      "time": 1500,
+      "symbol": "Int_LifeSupport_Size8_Class5"
     },
     {
+      "boot": 1,
       "class": 7,
       "cost": 249140,
       "edID": 128064168,
       "eddbID": 1026,
       "grp": "ls",
       "id": "ly",
+      "integrity": 105,
       "mass": 80,
       "power": 0.72,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_LifeSupport_Size7_Class1"
     },
     {
+      "boot": 1,
       "class": 7,
       "cost": 622840,
       "edID": 128064169,
       "eddbID": 1027,
       "grp": "ls",
       "id": "lx",
+      "integrity": 118,
       "mass": 32,
       "power": 0.81,
       "rating": "D",
-      "time": 450
+      "time": 450,
+      "symbol": "Int_LifeSupport_Size7_Class2"
     },
     {
+      "boot": 1,
       "class": 7,
       "cost": 1557110,
       "edID": 128064170,
       "eddbID": 1028,
       "grp": "ls",
       "id": "lw",
+      "integrity": 131,
       "mass": 80,
       "power": 0.9,
       "rating": "C",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_LifeSupport_Size7_Class3"
     },
     {
+      "boot": 1,
       "class": 7,
       "cost": 3892770,
       "edID": 128064171,
       "eddbID": 1029,
       "grp": "ls",
       "id": "lv",
+      "integrity": 144,
       "mass": 128,
       "power": 0.99,
       "rating": "B",
-      "time": 900
+      "time": 900,
+      "symbol": "Int_LifeSupport_Size7_Class4"
     },
     {
+      "boot": 1,
       "class": 7,
       "cost": 9731930,
       "edID": 128064172,
       "eddbID": 1030,
       "grp": "ls",
       "id": "lu",
+      "integrity": 157,
       "mass": 80,
       "power": 1.08,
       "rating": "A",
-      "time": 1500
+      "time": 1500,
+      "symbol": "Int_LifeSupport_Size7_Class5"
     },
     {
+      "boot": 1,
       "class": 6,
       "cost": 88980,
       "edID": 128064163,
       "eddbID": 1021,
       "grp": "ls",
       "id": "lt",
+      "integrity": 90,
       "mass": 40,
       "power": 0.64,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_LifeSupport_Size6_Class1"
     },
     {
+      "boot": 1,
       "class": 6,
       "cost": 222440,
       "edID": 128064164,
       "eddbID": 1022,
       "grp": "ls",
       "id": "ls",
+      "integrity": 102,
       "mass": 16,
       "power": 0.72,
       "rating": "D",
-      "time": 450
+      "time": 450,
+      "symbol": "Int_LifeSupport_Size6_Class2"
     },
     {
+      "boot": 1,
       "class": 6,
       "cost": 556110,
       "edID": 128064165,
       "eddbID": 1023,
       "grp": "ls",
       "id": "lr",
+      "integrity": 113,
       "mass": 40,
       "power": 0.8,
       "rating": "C",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_LifeSupport_Size6_Class3"
     },
     {
+      "boot": 1,
       "class": 6,
       "cost": 1390280,
       "edID": 128064166,
       "eddbID": 1024,
       "grp": "ls",
       "id": "lq",
+      "integrity": 124,
       "mass": 64,
       "power": 0.88,
       "rating": "B",
-      "time": 900
+      "time": 900,
+      "symbol": "Int_LifeSupport_Size6_Class4"
     },
     {
+      "boot": 1,
       "class": 6,
       "cost": 3475690,
       "edID": 128064167,
       "eddbID": 1025,
       "grp": "ls",
       "id": "lp",
+      "integrity": 136,
       "mass": 40,
       "power": 0.96,
       "rating": "A",
-      "time": 1500
+      "time": 1500,
+      "symbol": "Int_LifeSupport_Size6_Class5"
     },
     {
+      "boot": 1,
       "class": 5,
       "cost": 31780,
       "edID": 128064158,
       "eddbID": 1016,
       "grp": "ls",
       "id": "lo",
+      "integrity": 77,
       "mass": 20,
       "power": 0.57,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_LifeSupport_Size5_Class1"
     },
     {
+      "boot": 1,
       "class": 5,
       "cost": 79440,
       "edID": 128064159,
       "eddbID": 1017,
       "grp": "ls",
       "id": "ln",
+      "integrity": 86,
       "mass": 8,
       "power": 0.64,
       "rating": "D",
-      "time": 450
+      "time": 450,
+      "symbol": "Int_LifeSupport_Size5_Class2"
     },
     {
+      "boot": 1,
       "class": 5,
       "cost": 198610,
       "edID": 128064160,
       "eddbID": 1018,
       "grp": "ls",
       "id": "lm",
+      "integrity": 96,
       "mass": 20,
       "power": 0.71,
       "rating": "C",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_LifeSupport_Size5_Class3"
     },
     {
+      "boot": 1,
       "class": 5,
       "cost": 496530,
       "edID": 128064161,
       "eddbID": 1019,
       "grp": "ls",
       "id": "ll",
+      "integrity": 106,
       "mass": 32,
       "power": 0.78,
       "rating": "B",
-      "time": 900
+      "time": 900,
+      "symbol": "Int_LifeSupport_Size5_Class4"
     },
     {
+      "boot": 1,
       "class": 5,
       "cost": 1241320,
       "edID": 128064162,
       "eddbID": 1020,
       "grp": "ls",
       "id": "lk",
+      "integrity": 115,
       "mass": 20,
       "power": 0.85,
       "rating": "A",
-      "time": 1500
+      "time": 1500,
+      "symbol": "Int_LifeSupport_Size5_Class5"
     },
     {
+      "boot": 1,
       "class": 4,
       "cost": 11350,
       "edID": 128064153,
       "eddbID": 1011,
       "grp": "ls",
       "id": "lj",
+      "integrity": 64,
       "mass": 10,
       "power": 0.5,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_LifeSupport_Size4_Class1"
     },
     {
+      "boot": 1,
       "class": 4,
       "cost": 28370,
       "edID": 128064154,
       "eddbID": 1012,
       "grp": "ls",
       "id": "li",
+      "integrity": 72,
       "mass": 4,
       "power": 0.56,
       "rating": "D",
-      "time": 450
+      "time": 450,
+      "symbol": "Int_LifeSupport_Size4_Class2"
     },
     {
+      "boot": 1,
       "class": 4,
       "cost": 70930,
       "edID": 128064155,
       "eddbID": 1013,
       "grp": "ls",
       "id": "lh",
+      "integrity": 80,
       "mass": 10,
       "power": 0.62,
       "rating": "C",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_LifeSupport_Size4_Class3"
     },
     {
+      "boot": 1,
       "class": 4,
       "cost": 177330,
       "edID": 128064156,
       "eddbID": 1014,
       "grp": "ls",
       "id": "lg",
+      "integrity": 88,
       "mass": 16,
       "power": 0.68,
       "rating": "B",
-      "time": 900
+      "time": 900,
+      "symbol": "Int_LifeSupport_Size4_Class4"
     },
     {
+      "boot": 1,
       "class": 4,
       "cost": 443330,
       "edID": 128064157,
       "eddbID": 1015,
       "grp": "ls",
       "id": "lf",
+      "integrity": 96,
       "mass": 10,
       "power": 0.74,
       "rating": "A",
-      "time": 1500
+      "time": 1500,
+      "symbol": "Int_LifeSupport_Size4_Class5"
     },
     {
+      "boot": 1,
       "class": 3,
       "cost": 4050,
       "edID": 128064148,
       "eddbID": 1006,
       "grp": "ls",
       "id": "le",
+      "integrity": 51,
       "mass": 5,
       "power": 0.42,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_LifeSupport_Size3_Class1"
     },
     {
+      "boot": 1,
       "class": 3,
       "cost": 10130,
       "edID": 128064149,
       "eddbID": 1007,
       "grp": "ls",
       "id": "ld",
+      "integrity": 58,
       "mass": 2,
       "power": 0.48,
       "rating": "D",
-      "time": 450
+      "time": 450,
+      "symbol": "Int_LifeSupport_Size3_Class2"
     },
     {
+      "boot": 1,
       "class": 3,
       "cost": 25330,
       "edID": 128064150,
       "eddbID": 1008,
       "grp": "ls",
       "id": "lc",
+      "integrity": 64,
       "mass": 5,
       "power": 0.53,
       "rating": "C",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_LifeSupport_Size3_Class3"
     },
     {
+      "boot": 1,
       "class": 3,
       "cost": 63330,
       "edID": 128064151,
       "eddbID": 1009,
       "grp": "ls",
       "id": "lb",
+      "integrity": 70,
       "mass": 8,
       "power": 0.58,
       "rating": "B",
-      "time": 900
+      "time": 900,
+      "symbol": "Int_LifeSupport_Size3_Class4"
     },
     {
+      "boot": 1,
       "class": 3,
       "cost": 158330,
       "edID": 128064152,
       "eddbID": 1010,
       "grp": "ls",
       "id": "la",
+      "integrity": 77,
       "mass": 5,
       "power": 0.64,
       "rating": "A",
-      "time": 1500
+      "time": 1500,
+      "symbol": "Int_LifeSupport_Size3_Class5"
     },
     {
+      "boot": 1,
       "class": 2,
       "cost": 1450,
       "edID": 128064143,
       "eddbID": 1001,
       "grp": "ls",
       "id": "l9",
+      "integrity": 41,
       "mass": 2.5,
       "power": 0.37,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_LifeSupport_Size2_Class1"
     },
     {
+      "boot": 1,
       "class": 2,
       "cost": 3620,
       "edID": 128064144,
       "eddbID": 1002,
       "grp": "ls",
       "id": "l8",
+      "integrity": 46,
       "mass": 1,
       "power": 0.41,
       "rating": "D",
-      "time": 450
+      "time": 450,
+      "symbol": "Int_LifeSupport_Size2_Class2"
     },
     {
+      "boot": 1,
       "class": 2,
       "cost": 9050,
       "edID": 128064145,
       "eddbID": 1003,
       "grp": "ls",
       "id": "l7",
+      "integrity": 51,
       "mass": 2.5,
       "power": 0.46,
       "rating": "C",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_LifeSupport_Size2_Class3"
     },
     {
+      "boot": 1,
       "class": 2,
       "cost": 22620,
       "edID": 128064146,
       "eddbID": 1004,
       "grp": "ls",
       "id": "l6",
+      "integrity": 56,
       "mass": 4,
       "power": 0.51,
       "rating": "B",
-      "time": 900
+      "time": 900,
+      "symbol": "Int_LifeSupport_Size2_Class4"
     },
     {
+      "boot": 1,
       "class": 2,
       "cost": 56550,
       "edID": 128064147,
       "eddbID": 1005,
       "grp": "ls",
       "id": "l5",
+      "integrity": 61,
       "mass": 2.5,
       "power": 0.55,
       "rating": "A",
-      "time": 1500
+      "time": 1500,
+      "symbol": "Int_LifeSupport_Size2_Class5"
     },
     {
+      "boot": 1,
       "class": 1,
       "cost": 520,
       "edID": 128064138,
       "eddbID": 996,
       "grp": "ls",
       "id": "l4",
+      "integrity": 32,
       "mass": 1.3,
       "power": 0.32,
       "rating": "E",
-      "time": 300
+      "time": 300,
+      "symbol": "Int_LifeSupport_Size1_Class1"
     },
     {
+      "boot": 1,
       "class": 1,
       "cost": 1290,
       "edID": 128064139,
       "eddbID": 997,
       "grp": "ls",
       "id": "l3",
+      "integrity": 36,
       "mass": 0.5,
       "power": 0.36,
       "rating": "D",
-      "time": 450
+      "time": 450,
+      "symbol": "Int_LifeSupport_Size1_Class2"
     },
     {
+      "boot": 1,
       "class": 1,
       "cost": 3230,
       "edID": 128064140,
       "eddbID": 998,
       "grp": "ls",
       "id": "l2",
+      "integrity": 40,
       "mass": 1.3,
       "power": 0.4,
       "rating": "C",
-      "time": 600
+      "time": 600,
+      "symbol": "Int_LifeSupport_Size1_Class3"
     },
     {
+      "boot": 1,
       "class": 1,
       "cost": 8080,
       "edID": 128064141,
       "eddbID": 999,
       "grp": "ls",
       "id": "l1",
+      "integrity": 44,
       "mass": 2,
       "power": 0.44,
       "rating": "B",
-      "time": 900
+      "time": 900,
+      "symbol": "Int_LifeSupport_Size1_Class4"
     },
     {
+      "boot": 1,
       "class": 1,
       "cost": 20200,
       "edID": 128064142,
       "eddbID": 1000,
       "grp": "ls",
       "id": "l0",
+      "integrity": 48,
       "mass": 1.3,
       "power": 0.48,
       "rating": "A",
-      "time": 1500
+      "time": 1500,
+      "symbol": "Int_LifeSupport_Size1_Class5"
     }
   ]
-}
+}

modules/standard/planetary_approach_suite.json

@@ -9,7 +9,8 @@
       "id": "PA",
       "mass": 0,
       "power": 0,
-      "rating": "I"
+      "rating": "I",
+      "symbol": "Int_PlanetApproachSuite"
     }
   ]
-}
+}

modules/standard/power_plant.json

@@ -5,420 +5,490 @@
       "cost": 2007240,
       "edID": 128064063,
       "eddbID": 921,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "py",
+      "integrity": 135,
       "mass": 160,
-      "pGen": 24,
-      "rating": "E"
+      "pgen": 24,
+      "rating": "E",
+      "symbol": "Int_Powerplant_Size8_Class1"
     },
     {
       "class": 8,
       "cost": 6021720,
       "edID": 128064064,
       "eddbID": 922,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "px",
+      "integrity": 120,
       "mass": 64,
-      "pGen": 27,
-      "rating": "D"
+      "pgen": 27,
+      "rating": "D",
+      "symbol": "Int_Powerplant_Size8_Class2"
     },
     {
       "class": 8,
       "cost": 18065170,
       "edID": 128064065,
       "eddbID": 923,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "pw",
+      "integrity": 150,
       "mass": 80,
-      "pGen": 30,
-      "rating": "C"
+      "pgen": 30,
+      "rating": "C",
+      "symbol": "Int_Powerplant_Size8_Class3"
     },
     {
       "class": 8,
       "cost": 54195500,
       "edID": 128064066,
       "eddbID": 924,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pv",
+      "integrity": 180,
       "mass": 128,
-      "pGen": 33,
-      "rating": "B"
+      "pgen": 33,
+      "rating": "B",
+      "symbol": "Int_Powerplant_Size8_Class4"
     },
     {
       "class": 8,
       "cost": 162586490,
       "edID": 128064067,
       "eddbID": 925,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pu",
+      "integrity": 165,
       "mass": 80,
-      "pGen": 36,
-      "rating": "A"
+      "pgen": 36,
+      "rating": "A",
+      "symbol": "Int_Powerplant_Size8_Class5"
     },
     {
       "class": 7,
       "cost": 633200,
       "edID": 128064058,
       "eddbID": 916,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "pt",
+      "integrity": 118,
       "mass": 80,
-      "pGen": 20,
-      "rating": "E"
+      "pgen": 20,
+      "rating": "E",
+      "symbol": "Int_Powerplant_Size7_Class1"
     },
     {
       "class": 7,
       "cost": 1899600,
       "edID": 128064059,
       "eddbID": 917,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "ps",
+      "integrity": 105,
       "mass": 32,
-      "pGen": 22.5,
-      "rating": "D"
+      "pgen": 22.5,
+      "rating": "D",
+      "symbol": "Int_Powerplant_Size7_Class2"
     },
     {
       "class": 7,
       "cost": 5698790,
       "edID": 128064060,
       "eddbID": 918,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "pr",
+      "integrity": 131,
       "mass": 40,
-      "pGen": 25,
-      "rating": "C"
+      "pgen": 25,
+      "rating": "C",
+      "symbol": "Int_Powerplant_Size7_Class3"
     },
     {
       "class": 7,
       "cost": 17096370,
       "edID": 128064061,
       "eddbID": 919,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pq",
+      "integrity": 157,
       "mass": 64,
-      "pGen": 27.5,
-      "rating": "B"
+      "pgen": 27.5,
+      "rating": "B",
+      "symbol": "Int_Powerplant_Size7_Class4"
     },
     {
       "class": 7,
       "cost": 51289110,
       "edID": 128064062,
       "eddbID": 920,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pp",
+      "integrity": 144,
       "mass": 40,
-      "pGen": 30,
-      "rating": "A"
+      "pgen": 30,
+      "rating": "A",
+      "symbol": "Int_Powerplant_Size7_Class5"
     },
     {
       "class": 6,
       "cost": 199750,
       "edID": 128064053,
       "eddbID": 911,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "po",
+      "integrity": 102,
       "mass": 40,
-      "pGen": 16.8,
-      "rating": "E"
+      "pgen": 16.8,
+      "rating": "E",
+      "symbol": "Int_Powerplant_Size6_Class1"
     },
     {
       "class": 6,
       "cost": 599240,
       "edID": 128064054,
       "eddbID": 912,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "pn",
+      "integrity": 90,
       "mass": 16,
-      "pGen": 18.9,
-      "rating": "D"
+      "pgen": 18.9,
+      "rating": "D",
+      "symbol": "Int_Powerplant_Size6_Class2"
     },
     {
       "class": 6,
       "cost": 1797730,
       "edID": 128064055,
       "eddbID": 913,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "pm",
+      "integrity": 113,
       "mass": 20,
-      "pGen": 21,
-      "rating": "C"
+      "pgen": 21,
+      "rating": "C",
+      "symbol": "Int_Powerplant_Size6_Class3"
     },
     {
       "class": 6,
       "cost": 5393180,
       "edID": 128064056,
       "eddbID": 914,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pl",
+      "integrity": 136,
       "mass": 32,
-      "pGen": 23.1,
-      "rating": "B"
+      "pgen": 23.1,
+      "rating": "B",
+      "symbol": "Int_Powerplant_Size6_Class4"
     },
     {
       "class": 6,
       "cost": 16179530,
       "edID": 128064057,
       "eddbID": 915,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pk",
+      "integrity": 124,
       "mass": 20,
-      "pGen": 25.2,
-      "rating": "A"
+      "pgen": 25.2,
+      "rating": "A",
+      "symbol": "Int_Powerplant_Size6_Class5"
     },
     {
       "class": 5,
       "cost": 63010,
       "edID": 128064048,
       "eddbID": 906,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "pj",
+      "integrity": 86,
       "mass": 20,
-      "pGen": 13.6,
-      "rating": "E"
+      "pgen": 13.6,
+      "rating": "E",
+      "symbol": "Int_Powerplant_Size5_Class1"
     },
     {
       "class": 5,
       "cost": 189040,
       "edID": 128064049,
       "eddbID": 907,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "pi",
+      "integrity": 77,
       "mass": 8,
-      "pGen": 15.3,
-      "rating": "D"
+      "pgen": 15.3,
+      "rating": "D",
+      "symbol": "Int_Powerplant_Size5_Class2"
     },
     {
       "class": 5,
       "cost": 567110,
       "edID": 128064050,
       "eddbID": 908,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "ph",
+      "integrity": 96,
       "mass": 10,
-      "pGen": 17,
-      "rating": "C"
+      "pgen": 17,
+      "rating": "C",
+      "symbol": "Int_Powerplant_Size5_Class3"
     },
     {
       "class": 5,
       "cost": 1701320,
       "edID": 128064051,
       "eddbID": 909,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pg",
+      "integrity": 114,
       "mass": 16,
-      "pGen": 18.7,
-      "rating": "B"
+      "pgen": 18.7,
+      "rating": "B",
+      "symbol": "Int_Powerplant_Size5_Class4"
     },
     {
       "class": 5,
       "cost": 5103950,
       "edID": 128064052,
       "eddbID": 910,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pf",
+      "integrity": 106,
       "mass": 10,
-      "pGen": 20.4,
-      "rating": "A"
+      "pgen": 20.4,
+      "rating": "A",
+      "symbol": "Int_Powerplant_Size5_Class5"
     },
     {
       "class": 4,
       "cost": 19880,
       "edID": 128064043,
       "eddbID": 901,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "pe",
+      "integrity": 72,
       "mass": 10,
-      "pGen": 10.4,
-      "rating": "E"
+      "pgen": 10.4,
+      "rating": "E",
+      "symbol": "Int_Powerplant_Size4_Class1"
     },
     {
       "class": 4,
       "cost": 59630,
       "edID": 128064044,
       "eddbID": 902,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "pd",
+      "integrity": 64,
       "mass": 4,
-      "pGen": 11.7,
-      "rating": "D"
+      "pgen": 11.7,
+      "rating": "D",
+      "symbol": "Int_Powerplant_Size4_Class2"
     },
     {
       "class": 4,
       "cost": 178900,
       "edID": 128064045,
       "eddbID": 903,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "pc",
+      "integrity": 80,
       "mass": 5,
-      "pGen": 13,
-      "rating": "C"
+      "pgen": 13,
+      "rating": "C",
+      "symbol": "Int_Powerplant_Size4_Class3"
     },
     {
       "class": 4,
       "cost": 536690,
       "edID": 128064046,
       "eddbID": 904,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pb",
+      "integrity": 96,
       "mass": 8,
-      "pGen": 14.3,
-      "rating": "B"
+      "pgen": 14.3,
+      "rating": "B",
+      "symbol": "Int_Powerplant_Size4_Class4"
     },
     {
       "class": 4,
       "cost": 1610080,
       "edID": 128064047,
       "eddbID": 905,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pa",
+      "integrity": 88,
       "mass": 5,
-      "pGen": 15.6,
-      "rating": "A"
+      "pgen": 15.6,
+      "rating": "A",
+      "symbol": "Int_Powerplant_Size4_Class5"
     },
     {
       "class": 3,
       "cost": 6270,
       "edID": 128064038,
       "eddbID": 896,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "p9",
+      "integrity": 58,
       "mass": 5,
-      "pGen": 8,
-      "rating": "E"
+      "pgen": 8,
+      "rating": "E",
+      "symbol": "Int_Powerplant_Size3_Class1"
     },
     {
       "class": 3,
       "cost": 18810,
       "edID": 128064039,
       "eddbID": 897,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "p8",
+      "integrity": 51,
       "mass": 2,
-      "pGen": 9,
-      "rating": "D"
+      "pgen": 9,
+      "rating": "D",
+      "symbol": "Int_Powerplant_Size3_Class2"
     },
     {
       "class": 3,
       "cost": 56440,
       "edID": 128064040,
       "eddbID": 898,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "p7",
+      "integrity": 64,
       "mass": 2.5,
-      "pGen": 10,
-      "rating": "C"
+      "pgen": 10,
+      "rating": "C",
+      "symbol": "Int_Powerplant_Size3_Class3"
     },
     {
       "class": 3,
       "cost": 169300,
       "edID": 128064041,
       "eddbID": 899,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "p6",
+      "integrity": 77,
       "mass": 4,
-      "pGen": 11,
-      "rating": "B"
+      "pgen": 11,
+      "rating": "B",
+      "symbol": "Int_Powerplant_Size3_Class4"
     },
     {
       "class": 3,
       "cost": 507910,
       "edID": 128064042,
       "eddbID": 900,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "p5",
+      "integrity": 70,
       "mass": 2.5,
-      "pGen": 12,
-      "rating": "A"
+      "pgen": 12,
+      "rating": "A",
+      "symbol": "Int_Powerplant_Size3_Class5"
     },
     {
       "class": 2,
       "cost": 1980,
       "edID": 128064033,
       "eddbID": 891,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "p4",
+      "integrity": 46,
       "mass": 2.5,
-      "pGen": 6.4,
-      "rating": "E"
+      "pgen": 6.4,
+      "rating": "E",
+      "symbol": "Int_Powerplant_Size2_Class1"
     },
     {
       "class": 2,
       "cost": 5930,
       "edID": 128064034,
       "eddbID": 892,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "p3",
+      "integrity": 41,
       "mass": 1,
-      "pGen": 7.2,
-      "rating": "D"
+      "pgen": 7.2,
+      "rating": "D",
+      "symbol": "Int_Powerplant_Size2_Class2"
     },
     {
       "class": 2,
       "cost": 17800,
       "edID": 128064035,
       "eddbID": 893,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "p2",
+      "integrity": 51,
       "mass": 1.3,
-      "pGen": 8,
-      "rating": "C"
+      "pgen": 8,
+      "rating": "C",
+      "symbol": "Int_Powerplant_Size2_Class3"
     },
     {
       "class": 2,
       "cost": 53410,
       "edID": 128064036,
       "eddbID": 894,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "p1",
+      "integrity": 61,
       "mass": 2,
-      "pGen": 8.8,
-      "rating": "B"
+      "pgen": 8.8,
+      "rating": "B",
+      "symbol": "Int_Powerplant_Size2_Class4"
     },
     {
       "class": 2,
       "cost": 160220,
       "edID": 128064037,
       "eddbID": 895,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "p0",
+      "integrity": 56,
       "mass": 1.3,
-      "pGen": 9.6,
-      "rating": "A"
+      "pgen": 9.6,
+      "rating": "A",
+      "symbol": "Int_Powerplant_Size2_Class5"
     }
   ]
-}
+}

modules/standard/sensors.json

@@ -1,484 +1,604 @@
 {
   "s": [
     {
+      "angle": 30,
       "class": 8,
       "cost": 697580,
       "edID": 128064253,
       "eddbID": 1111,
       "grp": "s",
       "id": "sy",
+      "integrity": 135,
       "mass": 160,
       "power": 0.55,
       "range": 5.12,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Sensors_Size8_Class1"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 1743960,
       "edID": 128064254,
       "eddbID": 1112,
       "grp": "s",
       "id": "sx",
+      "integrity": 120,
       "mass": 64,
       "power": 0.62,
       "range": 5.76,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Sensors_Size8_Class2"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 4359900,
       "edID": 128064255,
       "eddbID": 1113,
       "grp": "s",
       "id": "sw",
+      "integrity": 150,
       "mass": 160,
       "power": 0.69,
       "range": 6.4,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Sensors_Size8_Class3"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 10899760,
       "edID": 128064256,
       "eddbID": 1114,
       "grp": "s",
       "id": "sv",
+      "integrity": 180,
       "mass": 256,
       "power": 1.14,
       "range": 7.04,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Sensors_Size8_Class4"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 27249390,
       "edID": 128064257,
       "eddbID": 1115,
       "grp": "s",
       "id": "su",
+      "integrity": 165,
       "mass": 160,
       "power": 2.07,
       "range": 7.68,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Sensors_Size8_Class5"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 249140,
       "edID": 128064248,
       "eddbID": 1106,
       "grp": "s",
       "id": "sD",
+      "integrity": 118,
       "mass": 80,
       "power": 0.47,
       "range": 4.96,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Sensors_Size7_Class1"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 622840,
       "edID": 128064249,
       "eddbID": 1107,
       "grp": "s",
       "id": "sC",
+      "integrity": 105,
       "mass": 32,
       "power": 0.53,
       "range": 5.58,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Sensors_Size7_Class2"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 1557110,
       "edID": 128064250,
       "eddbID": 1108,
       "grp": "s",
       "id": "sB",
+      "integrity": 131,
       "mass": 80,
       "power": 0.59,
       "range": 6.2,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Sensors_Size7_Class3"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 3892770,
       "edID": 128064251,
       "eddbID": 1109,
       "grp": "s",
       "id": "sA",
+      "integrity": 157,
       "mass": 128,
       "power": 0.97,
       "range": 6.82,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Sensors_Size7_Class4"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 9731930,
       "edID": 128064252,
       "eddbID": 1110,
       "grp": "s",
       "id": "sz",
+      "integrity": 144,
       "mass": 80,
       "power": 1.77,
       "range": 7.44,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Sensors_Size7_Class5"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 88980,
       "edID": 128064243,
       "eddbID": 1101,
       "grp": "s",
       "id": "st",
+      "integrity": 102,
       "mass": 40,
       "power": 0.4,
       "range": 4.8,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Sensors_Size6_Class1"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 222440,
       "edID": 128064244,
       "eddbID": 1102,
       "grp": "s",
       "id": "ss",
+      "integrity": 90,
       "mass": 16,
       "power": 0.45,
       "range": 5.4,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Sensors_Size6_Class2"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 556110,
       "edID": 128064245,
       "eddbID": 1103,
       "grp": "s",
       "id": "sr",
+      "integrity": 113,
       "mass": 40,
       "power": 0.5,
       "range": 6,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Sensors_Size6_Class3"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 1390280,
       "edID": 128064246,
       "eddbID": 1104,
       "grp": "s",
       "id": "sq",
+      "integrity": 136,
       "mass": 64,
       "power": 0.83,
       "range": 6.6,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Sensors_Size6_Class4"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 3475690,
       "edID": 128064247,
       "eddbID": 1105,
       "grp": "s",
       "id": "sp",
+      "integrity": 124,
       "mass": 40,
       "power": 1.5,
       "range": 7.2,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Sensors_Size6_Class5"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 31780,
       "edID": 128064238,
       "eddbID": 1096,
       "grp": "s",
       "id": "so",
+      "integrity": 86,
       "mass": 20,
       "power": 0.33,
       "range": 4.64,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Sensors_Size5_Class1"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 79440,
       "edID": 128064239,
       "eddbID": 1097,
       "grp": "s",
       "id": "sn",
+      "integrity": 77,
       "mass": 8,
       "power": 0.37,
       "range": 5.22,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Sensors_Size5_Class2"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 198610,
       "edID": 128064240,
       "eddbID": 1098,
       "grp": "s",
       "id": "sm",
+      "integrity": 96,
       "mass": 20,
       "power": 0.41,
       "range": 5.8,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Sensors_Size5_Class3"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 496530,
       "edID": 128064241,
       "eddbID": 1099,
       "grp": "s",
       "id": "sl",
+      "integrity": 115,
       "mass": 32,
       "power": 0.68,
       "range": 6.38,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Sensors_Size5_Class4"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 1241320,
       "edID": 128064242,
       "eddbID": 1100,
       "grp": "s",
       "id": "sk",
+      "integrity": 106,
       "mass": 20,
       "power": 1.23,
       "range": 6.96,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Sensors_Size5_Class5"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 11350,
       "edID": 128064233,
       "eddbID": 1091,
       "grp": "s",
       "id": "sj",
+      "integrity": 72,
       "mass": 10,
       "power": 0.27,
       "range": 4.48,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Sensors_Size4_Class1"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 28370,
       "edID": 128064234,
       "eddbID": 1092,
       "grp": "s",
       "id": "si",
+      "integrity": 64,
       "mass": 4,
       "power": 0.31,
       "range": 5.04,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Sensors_Size4_Class2"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 70930,
       "edID": 128064235,
       "eddbID": 1093,
       "grp": "s",
       "id": "sh",
+      "integrity": 80,
       "mass": 10,
       "power": 0.34,
       "range": 5.6,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Sensors_Size4_Class3"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 177330,
       "edID": 128064236,
       "eddbID": 1094,
       "grp": "s",
       "id": "sg",
+      "integrity": 96,
       "mass": 16,
       "power": 0.56,
       "range": 6.16,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Sensors_Size4_Class4"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 443330,
       "edID": 128064237,
       "eddbID": 1095,
       "grp": "s",
       "id": "sf",
+      "integrity": 88,
       "mass": 10,
       "power": 1.02,
       "range": 6.72,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Sensors_Size4_Class5"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 4050,
       "edID": 128064228,
       "eddbID": 1086,
       "grp": "s",
       "id": "se",
+      "integrity": 58,
       "mass": 5,
       "power": 0.22,
       "range": 4.32,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Sensors_Size3_Class1"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 10130,
       "edID": 128064229,
       "eddbID": 1087,
       "grp": "s",
       "id": "sd",
+      "integrity": 51,
       "mass": 2,
       "power": 0.25,
       "range": 4.86,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Sensors_Size3_Class2"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 25330,
       "edID": 128064230,
       "eddbID": 1088,
       "grp": "s",
       "id": "sc",
+      "integrity": 64,
       "mass": 5,
       "power": 0.28,
       "range": 5.4,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Sensors_Size3_Class3"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 63330,
       "edID": 128064231,
       "eddbID": 1089,
       "grp": "s",
       "id": "sb",
+      "integrity": 77,
       "mass": 8,
       "power": 0.46,
       "range": 5.94,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Sensors_Size3_Class4"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 158330,
       "edID": 128064232,
       "eddbID": 1090,
       "grp": "s",
       "id": "sa",
+      "integrity": 70,
       "mass": 5,
       "power": 0.84,
       "range": 6.48,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Sensors_Size3_Class5"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 1450,
       "edID": 128064223,
       "eddbID": 1081,
       "grp": "s",
       "id": "s9",
+      "integrity": 46,
       "mass": 2.5,
       "power": 0.18,
       "range": 4.16,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Sensors_Size2_Class1"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 3620,
       "edID": 128064224,
       "eddbID": 1082,
       "grp": "s",
       "id": "s8",
+      "integrity": 41,
       "mass": 1,
       "power": 0.21,
       "range": 4.68,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Sensors_Size2_Class2"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 9050,
       "edID": 128064225,
       "eddbID": 1083,
       "grp": "s",
       "id": "s7",
+      "integrity": 51,
       "mass": 2.5,
       "power": 0.23,
       "range": 5.2,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Sensors_Size2_Class3"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 22620,
       "edID": 128064226,
       "eddbID": 1084,
       "grp": "s",
       "id": "s6",
+      "integrity": 61,
       "mass": 4,
       "power": 0.38,
       "range": 5.72,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Sensors_Size2_Class4"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 56550,
       "edID": 128064227,
       "eddbID": 1085,
       "grp": "s",
       "id": "s5",
+      "integrity": 56,
       "mass": 2.5,
       "power": 0.69,
       "range": 6.24,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Sensors_Size2_Class5"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 520,
       "edID": 128064218,
       "eddbID": 1076,
       "grp": "s",
       "id": "s4",
+      "integrity": 46,
       "mass": 1.3,
       "power": 0.16,
       "range": 4,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Sensors_Size1_Class1"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 1290,
       "edID": 128064219,
       "eddbID": 1077,
       "grp": "s",
       "id": "s3",
+      "integrity": 41,
       "mass": 0.5,
       "power": 0.18,
       "range": 4.5,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Sensors_Size1_Class2"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 3230,
       "edID": 128064220,
       "eddbID": 1078,
       "grp": "s",
       "id": "s2",
+      "integrity": 51,
       "mass": 1.3,
       "power": 0.2,
       "range": 5,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Sensors_Size1_Class3"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 8080,
       "edID": 128064221,
       "eddbID": 1079,
       "grp": "s",
       "id": "s1",
+      "integrity": 61,
       "mass": 2,
       "power": 0.33,
       "range": 5.5,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Sensors_Size1_Class4"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 20200,
       "edID": 128064222,
       "eddbID": 1080,
       "grp": "s",
       "id": "s0",
+      "integrity": 56,
       "mass": 1.3,
       "power": 0.6,
       "range": 6,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Sensors_Size1_Class5"
     }
   ]
-}
+}

modules/standard/thrusters.json

@@ -1,561 +1,727 @@
 {
   "t": [
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 8,
       "cost": 2007240,
       "edID": 128064098,
       "eddbID": 956,
       "grp": "t",
       "id": "ty",
+      "integrity": 135,
       "mass": 160,
       "maxmass": 3360,
+      "maxmul": 1.03,
+      "minmass": 1120,
+      "minmul": 0.83,
       "optmass": 2240,
+      "optmul": 1,
       "power": 7.2,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Engine_Size8_Class1"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 8,
       "cost": 6021720,
       "edID": 128064099,
       "eddbID": 957,
       "grp": "t",
       "id": "tx",
+      "integrity": 120,
       "mass": 64,
       "maxmass": 3780,
+      "maxmul": 1.06,
+      "minmass": 1260,
+      "minmul": 0.86,
       "optmass": 2520,
+      "optmul": 1,
       "power": 8.1,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Engine_Size8_Class2"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 8,
       "cost": 18065170,
       "edID": 128064100,
       "eddbID": 958,
       "grp": "t",
       "id": "tw",
+      "integrity": 150,
       "mass": 160,
       "maxmass": 4200,
+      "maxmul": 1.1,
+      "minmass": 1400,
+      "minmul": 0.9,
       "optmass": 2800,
+      "optmul": 1,
       "power": 9,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Engine_Size8_Class3"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 8,
       "cost": 54195500,
       "edID": 128064101,
       "eddbID": 959,
       "grp": "t",
       "id": "tv",
+      "integrity": 180,
       "mass": 256,
       "maxmass": 4620,
+      "maxmul": 1.13,
+      "minmass": 1540,
+      "minmul": 0.93,
       "optmass": 3080,
+      "optmul": 1,
       "power": 9.9,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Engine_Size8_Class4"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 8,
       "cost": 162586490,
       "edID": 128064102,
       "eddbID": 960,
       "grp": "t",
       "id": "tu",
+      "integrity": 165,
       "mass": 160,
       "maxmass": 5040,
+      "maxmul": 1.16,
+      "minmass": 1680,
+      "minmul": 0.96,
       "optmass": 3360,
+      "optmul": 1,
       "power": 10.8,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size8_Class5"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 7,
       "cost": 633200,
       "edID": 128064093,
       "eddbID": 951,
       "grp": "t",
       "id": "tt",
+      "integrity": 118,
       "mass": 80,
       "maxmass": 2160,
+      "maxmul": 1.03,
+      "minmass": 720,
+      "minmul": 0.83,
       "optmass": 1440,
+      "optmul": 1,
       "power": 6.08,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Engine_Size7_Class1"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 7,
       "cost": 1899600,
       "edID": 128064094,
       "eddbID": 952,
       "grp": "t",
       "id": "ts",
+      "integrity": 105,
       "mass": 32,
       "maxmass": 2430,
+      "maxmul": 1.06,
+      "minmass": 810,
+      "minmul": 0.86,
       "optmass": 1620,
+      "optmul": 1,
       "power": 6.84,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Engine_Size7_Class2"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 7,
       "cost": 5698790,
       "edID": 128064095,
       "eddbID": 953,
       "grp": "t",
       "id": "tr",
+      "integrity": 131,
       "mass": 80,
       "maxmass": 2700,
+      "maxmul": 1.1,
+      "minmass": 900,
+      "minmul": 0.9,
       "optmass": 1800,
+      "optmul": 1,
       "power": 7.6,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Engine_Size7_Class3"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 7,
       "cost": 17096370,
       "edID": 128064096,
       "eddbID": 954,
       "grp": "t",
       "id": "tq",
+      "integrity": 157,
       "mass": 128,
       "maxmass": 2970,
+      "maxmul": 1.13,
+      "minmass": 990,
+      "minmul": 0.93,
       "optmass": 1980,
+      "optmul": 1,
       "power": 8.36,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Engine_Size7_Class4"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 7,
       "cost": 51289110,
       "edID": 128064097,
       "eddbID": 955,
       "grp": "t",
       "id": "tp",
+      "integrity": 144,
       "mass": 80,
       "maxmass": 3240,
+      "maxmul": 1.16,
+      "minmass": 1080,
+      "minmul": 0.96,
       "optmass": 2160,
+      "optmul": 1,
       "power": 9.12,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size7_Class5"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 6,
       "cost": 199750,
       "edID": 128064088,
       "eddbID": 946,
       "grp": "t",
       "id": "to",
+      "integrity": 102,
       "mass": 40,
       "maxmass": 1440,
+      "maxmul": 1.03,
+      "minmass": 480,
+      "minmul": 0.83,
       "optmass": 960,
+      "optmul": 1,
       "power": 5.04,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Engine_Size6_Class1"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 6,
       "cost": 599240,
       "edID": 128064089,
       "eddbID": 947,
       "grp": "t",
       "id": "tn",
+      "integrity": 90,
       "mass": 16,
       "maxmass": 1620,
+      "maxmul": 1.06,
+      "minmass": 540,
+      "minmul": 0.86,
       "optmass": 1080,
+      "optmul": 1,
       "power": 5.67,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Engine_Size6_Class2"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 6,
       "cost": 1797730,
       "edID": 128064090,
       "eddbID": 948,
       "grp": "t",
       "id": "tm",
+      "integrity": 113,
       "mass": 40,
       "maxmass": 1800,
+      "maxmul": 1.1,
+      "minmass": 600,
+      "minmul": 0.9,
       "optmass": 1200,
+      "optmul": 1,
       "power": 6.3,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Engine_Size6_Class3"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 6,
       "cost": 5393180,
       "edID": 128064091,
       "eddbID": 949,
       "grp": "t",
       "id": "tl",
+      "integrity": 136,
       "mass": 64,
       "maxmass": 1980,
+      "maxmul": 1.13,
+      "minmass": 660,
+      "minmul": 0.93,
       "optmass": 1320,
+      "optmul": 1,
       "power": 6.93,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Engine_Size6_Class4"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 6,
       "cost": 16179530,
       "edID": 128064092,
       "eddbID": 950,
       "grp": "t",
       "id": "tk",
+      "integrity": 124,
       "mass": 40,
       "maxmass": 2160,
+      "maxmul": 1.16,
+      "minmass": 720,
+      "minmul": 0.96,
       "optmass": 1440,
+      "optmul": 1,
       "power": 7.56,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size6_Class5"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 5,
       "cost": 63010,
       "edID": 128064083,
       "eddbID": 941,
       "grp": "t",
       "id": "tj",
+      "integrity": 86,
       "mass": 20,
       "maxmass": 840,
+      "maxmul": 1.03,
+      "minmass": 280,
+      "minmul": 0.83,
       "optmass": 560,
+      "optmul": 1,
       "power": 4.08,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Engine_Size5_Class1"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 5,
       "cost": 189040,
       "edID": 128064084,
       "eddbID": 942,
       "grp": "t",
       "id": "ti",
+      "integrity": 77,
       "mass": 8,
       "maxmass": 945,
+      "maxmul": 1.06,
+      "minmass": 315,
+      "minmul": 0.86,
       "optmass": 630,
+      "optmul": 1,
       "power": 4.59,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Engine_Size5_Class2"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 5,
       "cost": 567110,
       "edID": 128064085,
       "eddbID": 943,
       "grp": "t",
       "id": "th",
+      "integrity": 96,
       "mass": 20,
       "maxmass": 1050,
+      "maxmul": 1.1,
+      "minmass": 350,
+      "minmul": 0.9,
       "optmass": 700,
+      "optmul": 1,
       "power": 5.1,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Engine_Size5_Class3"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 5,
       "cost": 1701320,
       "edID": 128064086,
       "eddbID": 944,
       "grp": "t",
       "id": "tg",
+      "integrity": 115,
       "mass": 32,
       "maxmass": 1155,
+      "maxmul": 1.13,
+      "minmass": 385,
+      "minmul": 0.93,
       "optmass": 770,
+      "optmul": 1,
       "power": 5.61,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Engine_Size5_Class4"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 5,
       "cost": 5103950,
       "edID": 128064087,
       "eddbID": 945,
       "grp": "t",
       "id": "tf",
+      "integrity": 106,
       "mass": 20,
       "maxmass": 1260,
+      "maxmul": 1.16,
+      "minmass": 420,
+      "minmul": 0.96,
       "optmass": 840,
+      "optmul": 1,
       "power": 6.12,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size5_Class5"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 4,
       "cost": 19880,
       "edID": 128064078,
       "eddbID": 936,
       "grp": "t",
       "id": "te",
+      "integrity": 72,
       "mass": 10,
       "maxmass": 420,
+      "maxmul": 1.03,
+      "minmass": 140,
+      "minmul": 0.83,
       "optmass": 280,
+      "optmul": 1,
       "power": 3.28,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Engine_Size4_Class1"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 4,
       "cost": 59630,
       "edID": 128064079,
       "eddbID": 937,
       "grp": "t",
       "id": "td",
+      "integrity": 64,
       "mass": 4,
-      "maxmass": 473,
+      "maxmass": 472.5,
+      "maxmul": 1.06,
+      "minmass": 157.5,
+      "minmul": 0.86,
       "optmass": 315,
+      "optmul": 1,
       "power": 3.69,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Engine_Size4_Class2"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 4,
       "cost": 178900,
       "edID": 128064080,
       "eddbID": 938,
       "grp": "t",
       "id": "tc",
+      "integrity": 80,
       "mass": 10,
       "maxmass": 525,
+      "maxmul": 1.1,
+      "minmass": 175,
+      "minmul": 0.9,
       "optmass": 350,
+      "optmul": 1,
       "power": 4.1,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Engine_Size4_Class3"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 4,
       "cost": 536690,
       "edID": 128064081,
       "eddbID": 939,
       "grp": "t",
       "id": "tb",
+      "integrity": 96,
       "mass": 16,
-      "maxmass": 578,
+      "maxmass": 577.5,
+      "maxmul": 1.13,
+      "minmass": 192.5,
+      "minmul": 0.93,
       "optmass": 385,
+      "optmul": 1,
       "power": 4.51,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Engine_Size4_Class4"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 4,
       "cost": 1610080,
       "edID": 128064082,
       "eddbID": 940,
       "grp": "t",
       "id": "ta",
+      "integrity": 88,
       "mass": 10,
       "maxmass": 630,
+      "maxmul": 1.16,
+      "minmass": 210,
+      "minmul": 0.96,
       "optmass": 420,
+      "optmul": 1,
       "power": 4.92,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size4_Class5"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 3,
       "cost": 6270,
       "edID": 128064073,
       "eddbID": 931,
       "grp": "t",
       "id": "t9",
+      "integrity": 58,
       "mass": 5,
       "maxmass": 120,
+      "maxmul": 1.03,
+      "minmass": 40,
+      "minmul": 0.83,
       "optmass": 80,
+      "optmul": 1,
       "power": 2.48,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Engine_Size3_Class1"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 3,
       "cost": 18810,
       "edID": 128064074,
       "eddbID": 932,
       "grp": "t",
       "id": "t8",
+      "integrity": 51,
       "mass": 2,
       "maxmass": 135,
+      "maxmul": 1.06,
+      "minmass": 45,
+      "minmul": 0.86,
       "optmass": 90,
+      "optmul": 1,
       "power": 2.79,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Engine_Size3_Class2"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 3,
       "cost": 56440,
       "edID": 128064075,
       "eddbID": 933,
       "grp": "t",
       "id": "t7",
+      "integrity": 64,
       "mass": 5,
       "maxmass": 150,
+      "maxmul": 1.1,
+      "minmass": 50,
+      "minmul": 0.9,
       "optmass": 100,
+      "optmul": 1,
       "power": 3.1,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Engine_Size3_Class3"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 3,
       "cost": 169300,
       "edID": 128064076,
       "eddbID": 934,
       "grp": "t",
       "id": "t6",
+      "integrity": 77,
       "mass": 8,
       "maxmass": 165,
+      "maxmul": 1.13,
+      "minmass": 55,
+      "minmul": 0.93,
       "optmass": 110,
+      "optmul": 1,
       "power": 3.41,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Engine_Size3_Class4"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 3,
       "cost": 507910,
       "edID": 128064077,
       "eddbID": 935,
       "grp": "t",
       "id": "t5",
+      "integrity": 72,
       "mass": 5,
       "maxmass": 180,
+      "maxmul": 1.16,
+      "minmass": 60,
+      "minmul": 0.96,
       "optmass": 120,
+      "optmul": 1,
       "power": 3.72,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size3_Class5"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 2,
       "cost": 1980,
       "edID": 128064068,
       "eddbID": 926,
       "grp": "t",
       "id": "t4",
+      "integrity": 46,
       "mass": 2.5,
       "maxmass": 72,
+      "maxmul": 1.03,
+      "minmass": 24,
+      "minmul": 0.83,
       "optmass": 48,
+      "optmul": 1,
       "power": 2,
-      "rating": "E"
+      "rating": "E",
+      "symbol": "Int_Engine_Size2_Class1"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 2,
       "cost": 5930,
       "edID": 128064069,
       "eddbID": 927,
       "grp": "t",
       "id": "t3",
+      "integrity": 41,
       "mass": 1,
       "maxmass": 81,
+      "maxmul": 1.06,
+      "minmass": 27,
+      "minmul": 0.86,
       "optmass": 54,
+      "optmul": 1,
       "power": 2.25,
-      "rating": "D"
+      "rating": "D",
+      "symbol": "Int_Engine_Size2_Class2"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 2,
       "cost": 17800,
       "edID": 128064070,
       "eddbID": 928,
       "grp": "t",
       "id": "t2",
+      "integrity": 51,
       "mass": 2.5,
       "maxmass": 90,
+      "maxmul": 1.1,
+      "minmass": 30,
+      "minmul": 0.9,
       "optmass": 60,
+      "optmul": 1,
       "power": 2.5,
-      "rating": "C"
+      "rating": "C",
+      "symbol": "Int_Engine_Size2_Class3"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 2,
       "cost": 53410,
       "edID": 128064071,
       "eddbID": 929,
       "grp": "t",
       "id": "t1",
+      "integrity": 61,
       "mass": 4,
       "maxmass": 99,
+      "maxmul": 1.13,
+      "minmass": 33,
+      "minmul": 0.93,
       "optmass": 66,
+      "optmul": 1,
       "power": 2.75,
-      "rating": "B"
+      "rating": "B",
+      "symbol": "Int_Engine_Size2_Class4"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 2,
       "cost": 160220,
       "edID": 128064072,
       "eddbID": 930,
       "grp": "t",
       "id": "t0",
+      "integrity": 56,
       "mass": 2.5,
       "maxmass": 108,
+      "maxmul": 1.16,
+      "minmass": 36,
+      "minmul": 0.96,
       "optmass": 72,
+      "optmul": 1,
       "power": 3,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size2_Class5"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 3,
-      "cost": 5103952,
+      "cost": 5103950,
       "edID": 128682013,
       "eddbID": 1548,
       "grp": "t",
       "id": "tz",
+      "integrity": 55,
       "mass": 5,
       "maxmass": 200,
+      "maxmul": 1.367,
+      "maxmulacceleration": 1.2,
+      "maxmulrotation": 1.3,
+      "maxmulspeed": 1.6,
+      "minmass": 70,
+      "minmul": 0.9,
+      "minmulacceleration": 0.9,
+      "minmulrotation": 0.9,
+      "minmulspeed": 0.9,
       "name": "Enhanced Performance",
       "optmass": 90,
+      "optmul": 1.15,
+      "optmulacceleration": 1.1,
+      "optmulrotation": 1.1,
+      "optmulspeed": 1.25,
       "power": 5,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size3_Class5_Fast"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 2,
       "cost": 1610080,
       "edID": 128682014,
       "eddbID": 1547,
       "grp": "t",
       "id": "u0",
+      "integrity": 40,
       "mass": 2.5,
       "maxmass": 120,
+      "maxmul": 1.367,
+      "maxmulacceleration": 1.2,
+      "maxmulrotation": 1.3,
+      "maxmulspeed": 1.6,
+      "minmass": 50,
+      "minmul": 0.9,
+      "minmulacceleration": 0.9,
+      "minmulrotation": 0.9,
+      "minmulspeed": 0.9,
       "name": "Enhanced Performance",
       "optmass": 60,
+      "optmul": 1.15,
+      "optmulacceleration": 1.1,
+      "optmulrotation": 1.1,
+      "optmulspeed": 1.25,
       "power": 4,
-      "rating": "A"
+      "rating": "A",
+      "symbol": "Int_Engine_Size2_Class5_Fast"
     }
   ]
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.2.0",
+  "version": "2.5.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"
@@ -9,7 +9,7 @@
   "homepage": "https://coriolis.edcd.io",
   "bugs": "https://github.com/EDCD/coriolis/issues",
   "private": true,
-  "engine": "node >= 0.12.2",
+  "engine": "node >= 4.0.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint --plugin json --ext .json modules ships dist",
@@ -19,9 +19,9 @@
     "start": "node generate_distribution.js"
   },
   "devDependencies": {
-    "eslint": "^1.10.3",
+    "eslint": "^2.2.0",
     "eslint-plugin-json": "^1.1.0",
     "jasmine-node": "^1.14.5",
-    "uglify-js": "^2.6.1"
+    "uglify-js": "^2.7.5"
   }
 }

ships/adder.json

@@ -10,20 +10,24 @@
       "speed": 220,
       "boost": 320,
       "boostEnergy": 9,
-      "agility": 8,
-      "baseShieldStrength": 78,
-      "baseArmour": 162,
+      "baseShieldStrength": 60,
+      "baseArmour": 90,
+      "hardness": 35,
       "hullMass": 35,
       "masslock": 7,
-      "pipSpeed": 0.13625
+      "pipSpeed": 0.13625,
+      "pitch": 38,
+      "roll": 100,
+      "yaw": 14,
+      "crew": 2
     },
     "retailCost": 87810,
     "bulkheads": [
-      { "id": "BC", "edID": 128049268, "eddbID": 753, "cost": 0, "mass": 0 },
-      { "id": "BD", "edID": 128049269, "eddbID": 754, "cost": 35120, "mass": 3 },
-      { "id": "BE", "edID": 128049270, "eddbID": 755, "cost": 79030, "mass": 5 },
-      { "id": "BF", "edID": 128049271, "eddbID": 756, "cost": 186770, "mass": 5 },
-      { "id": "BG", "edID": 128049272, "eddbID": 757, "cost": 206960, "mass": 5 }
+      { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BF", "edID": 128049271, "eddbID": 756, "grp": "bh", "cost": 186770, "mass": 5, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
+      { "id": "BG", "edID": 128049272, "eddbID": 757, "grp": "bh", "cost": 206960, "mass": 5, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5  }
     ],
     "slots": {
       "standard": [3, 3, 3, 1, 2, 3, 3],

ships/alliance_chieftain.json

@@ -0,0 +1,50 @@
+{
+  "alliance_chieftain": {
+    "edID": 128816574,
+    "eddbID": 12,
+    "properties": {
+      "name": "Alliance Chieftain",
+      "manufacturer": "Lakon",
+      "class": 2,
+      "hullCost": 18182883,
+      "speed": 230,
+      "boost": 330,
+      "boostEnergy": 19,
+      "baseShieldStrength": 154,
+      "baseArmour": 280,
+      "hardness": 65,
+      "hullMass": 400,
+      "masslock": 13,
+      "pipSpeed": 0.03875,
+      "pitch": 39,
+      "roll": 92,
+      "yaw": 16,
+      "crew": 2
+    },
+    "retailCost": 19382252,
+    "requirements": {
+      "horizons": true
+    },
+    "bulkheads": [
+      { "id": "CI", "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "CJ", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "CK", "edID": 128816578, "eddbID": 815, "grp": "bh", "cost": 15307134, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "CL", "edID": 128816579, "eddbID": 816, "grp": "bh", "cost": 36175859, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "CM", "edID": 128816580, "eddbID": 817, "grp": "bh", "cost": 40087682, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [6, 6, 5, 5, 6, 4, 4],
+      "hardpoints": [3, 3, 2, 1, 1, 1, 0, 0, 0, 0],
+      "internal": [6, 5, 4, 2, 2,
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }
+      ]
+    },
+    "defaults": {
+      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
+      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["04", "4e", "02", "", "2h"]
+    }
+  }
+}

ships/anaconda.json

@@ -7,34 +7,42 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 3,
       "hullCost": 141889930,
-      "speed": 183,
-      "boost": 244,
-      "boostEnergy": 29,
-      "agility": 2,
-      "baseShieldStrength": 362,
-      "baseArmour": 945,
+      "speed": 180,
+      "boost": 240,
+      "boostEnergy": 27,
+      "baseShieldStrength": 350,
+      "baseArmour": 525,
+      "hardness": 65,
       "hullMass": 400,
       "masslock": 23,
       "pipSpeed": 0.13875,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 60,
+      "yaw": 10,
+      "crew": 3
     },
     "retailCost": 146969450,
     "bulkheads": [
-      { "id": "bT", "edID": 128049364, "eddbID": 818, "cost": 0, "mass": 0 },
-      { "id": "bU", "edID": 128049365, "eddbID": 819, "cost": 58787780, "mass": 30 },
-      { "id": "bV", "edID": 128049366, "eddbID": 820, "cost": 132272510, "mass": 60 },
-      { "id": "bW", "edID": 128049367, "eddbID": 821, "cost": 312604020, "mass": 60 },
-      { "id": "bX", "edID": 128049368, "eddbID": 822, "cost": 346407000, "mass": 60 }
+      { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bW", "edID": 128049367, "eddbID": 821, "grp": "bh", "cost": 312604020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bX", "edID": 128049368, "eddbID": 822, "grp": "bh", "cost": 346407000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 7, 6, 5, 8, 8, 5],
       "hardpoints": [4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [7, 6, 6, 6, 5, 5, 5, 4, 4, 4, 2]
+      "internal": [
+        7, 6, 6, 6, 5, 5, 5,
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 4, 4, 2
+      ]
     },
     "defaults": {
       "standard": ["8E", "7E", "6E", "5E", "8E", "8E", "5C"],
       "hardpoints": [0, 0, 0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, "2h", "00"]
+      "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, "2h", "00"]
     }
   }
 }

ships/asp.json

@@ -7,23 +7,27 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 6135660,
-      "speed": 254,
-      "boost": 345,
-      "boostEnergy": 14,
-      "agility": 6,
-      "baseShieldStrength": 152,
-      "baseArmour": 378,
+      "speed": 250,
+      "boost": 340,
+      "boostEnergy": 13,
+      "baseShieldStrength": 140,
+      "baseArmour": 210,
+      "hardness": 52,
       "hullMass": 280,
       "masslock": 11,
-      "pipSpeed": 0.13
+      "pipSpeed": 0.13,
+      "pitch": 38,
+      "roll": 100,
+      "yaw": 10,
+      "crew": 2
     },
     "retailCost": 6661150,
     "bulkheads": [
-      { "id": "BH", "edID": 128049304, "eddbID": 778, "cost": 0, "mass": 0 },
-      { "id": "BI", "edID": 128049305, "eddbID": 779, "cost": 2664460, "mass": 21 },
-      { "id": "BJ", "edID": 128049306, "eddbID": 780, "cost": 5995040, "mass": 42 },
-      { "id": "BK", "edID": 128049307, "eddbID": 781, "cost": 14168270, "mass": 42 },
-      { "id": "BL", "edID": 128049308, "eddbID": 782, "cost": 15700340, "mass": 42 }
+      { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BK", "edID": 128049307, "eddbID": 781, "grp": "bh", "cost": 14168270, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BL", "edID": 128049308, "eddbID": 782, "grp": "bh", "cost": 15700340, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [5, 5, 5, 4, 4, 5, 5],

ships/asp_scout.json

@@ -1,38 +1,43 @@
 {
   "asp_scout": {
-    "edID": 128672276, "eddbID": 24,
+    "edID": 128672276,
+    "eddbID": 24,
     "properties": {
       "name": "Asp Scout",
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 3818240,
-      "speed": 223,
-      "boost": 304,
+      "speed": 220,
+      "boost": 300,
       "boostEnergy": 13,
-      "agility": 8,
-      "baseShieldStrength": 105,
-      "baseArmour": 324,
+      "baseShieldStrength": 120,
+      "baseArmour": 180,
+      "hardness": 52,
       "hullMass": 150,
       "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 40,
+      "roll": 110,
+      "yaw": 15,
+      "crew": 2
     },
     "retailCost": 3961150,
     "bulkheads": [
-      { "id": "c1", "edID": 128672278, "eddbID": 1503, "cost": 0, "mass": 0 },
-      { "id": "c2", "edID": 128672279, "eddbID": 1504, "cost": 1584460, "mass": 21 },
-      { "id": "c3", "edID": 128672280, "eddbID": 1505, "cost": 3565040, "mass": 42 },
-      { "id": "c4", "edID": 128672281, "eddbID": 1506, "cost": 8425380, "mass": 42 },
-      { "id": "c5", "edID": 128672282, "eddbID": 1507, "cost": 9336440, "mass": 42 }
+      { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "c4", "edID": 128672281, "eddbID": 1506, "grp": "bh", "cost": 8425380, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "c5", "edID": 128672282, "eddbID": 1507, "grp": "bh", "cost": 9336440, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "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

@@ -1,48 +1,55 @@
 {
   "beluga": {
-    "edID": -1,
+    "edID": 128049345,
     "eddbID": 30,
     "properties": {
       "name": "Beluga Liner",
       "manufacturer": "Saud Kruger",
       "class": 3,
-      "hullCost": -1,
-      "speed": 195,
-      "boost": 273,
-      "boostEnergy": 20,
-      "agility": 2,
-      "baseShieldStrength": 92,
-      "baseArmour": 504,
-      "hullMass": 1100,
+      "hullCost": 79654610,
+      "speed": 200,
+      "boost": 280,
+      "boostEnergy": 19,
+      "baseShieldStrength": 280,
+      "baseArmour": 280,
+      "hardness": 60,
+      "hullMass": 950,
       "masslock": 18,
-      "pipSpeed": -1,
+      "pipSpeed": 0.1125,
       "luxuryCabins": true,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 60,
+      "yaw": 17,
+      "crew": 3
+    },
+    "retailCost": 84532770,
+    "requirements": {
+      "horizons": true
     },
-    "retailCost": -1,
     "bulkheads": [
-      { "id": "cl", "eddbID": 1554,"cost": 0, "mass": 0 },
-      { "id": "cm", "eddbID": 1555,"cost": -1, "mass": 83 },
-      { "id": "cn", "eddbID": 1556,"cost": -1, "mass": 165 },
-      { "id": "co", "eddbID": 1557,"cost": -1, "mass": 165 },
-      { "id": "cp", "eddbID": 1558,"cost": -1, "mass": 165 }
+      { "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 },
+      { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "co", "edID": 128049349, "eddbID": 1557,"grp": "bh", "cost": 179801200, "mass": 165, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cp", "edID": 128049350, "eddbID": 1558,"grp": "bh", "cost": 199243730, "mass": 165, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 7, 7, 8, 6, 5, 7],
       "hardpoints": [2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0],
       "internal": [
         6, 6,
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
         4, 3, 3, 3, 3
       ]
     },
     "defaults": {
       "standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"],
       "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h"]
+      "internal": ["4j", "04", "mi", "mi", "mg", "mg", "02", "01", 0, 0, "2h"]
     }
   }
 }

ships/cobra_mk_iii.json

@@ -7,23 +7,27 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 205800,
-      "speed": 282,
-      "boost": 402,
-      "boostEnergy": 11,
-      "agility": 6,
-      "baseShieldStrength": 92,
-      "baseArmour": 216,
+      "speed": 280,
+      "boost": 400,
+      "boostEnergy": 10,
+      "baseShieldStrength": 80,
+      "baseArmour": 120,
+      "hardness": 35,
       "hullMass": 180,
       "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 40,
+      "roll": 100,
+      "yaw": 10,
+      "crew": 2
     },
     "retailCost": 349720,
     "bulkheads": [
-      { "id": "bk", "edID": 128049280, "eddbID": 763, "cost": 0, "mass": 0 },
-      { "id": "bl", "edID": 128049281, "eddbID": 764, "cost": 151890, "mass": 14 },
-      { "id": "bm", "edID": 128049282, "eddbID": 765, "cost": 341750, "mass": 27 },
-      { "id": "bn", "edID": 128049283, "eddbID": 766, "cost": 797410, "mass": 27 },
-      { "id": "bo", "edID": 128049284, "eddbID": 767, "cost": 895000, "mass": 27 }
+      { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bn", "edID": 128049283, "eddbID": 766, "grp": "bh", "cost": 797410, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bo", "edID": 128049284, "eddbID": 767, "grp": "bh", "cost": 895000, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 3, 3, 3, 4],

ships/cobra_mk_iv.json

@@ -8,22 +8,29 @@
       "class": 1,
       "hullCost": 603740,
       "speed": 200,
-      "boost": 299,
-      "boostEnergy": 11,
-      "agility": 4,
-      "baseShieldStrength": 125,
-      "baseArmour": 216,
+      "boost": 300,
+      "boostEnergy": 10,
+      "baseShieldStrength": 120,
+      "baseArmour": 120,
+      "hardness": 35,
       "hullMass": 210,
       "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 30,
+      "roll": 90,
+      "yaw": 10,
+      "crew": 2 
     },
     "retailCost": 747660,
+    "requirements": {
+      "horizonsEarlyAdoption": true
+    },
     "bulkheads": [
-      { "id": "cg", "edID": 128672264, "eddbID": 1518, "cost": 0, "mass": 0 },
-      { "id": "ch", "edID": 128672265, "eddbID": 1519, "cost": 305890, "mass": 14 },
-      { "id": "ci", "edID": 128672266, "eddbID": 1520, "cost": 688250, "mass": 27 },
-      { "id": "cj", "edID": 128672267, "eddbID": 1521, "cost": 1605910, "mass": 27 },
-      { "id": "ck", "edID": 128672268, "eddbID": 1522, "cost": 1802440, "mass": 27 }
+      { "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 },
+      { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "cj", "edID": 128672267, "eddbID": 1521, "grp": "bh", "cost": 1605910, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "ck", "edID": 128672268, "eddbID": 1522, "grp": "bh", "cost": 1802440, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 3, 3, 3, 4],

ships/diamondback_explorer.json

@@ -1,38 +1,43 @@
 {
   "diamondback_explorer": {
-    "edID": 128671831, "eddbID": 5,
+    "edID": 128671831,
+    "eddbID": 5,
     "properties": {
       "name": "Diamondback Explorer",
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 1635700,
-      "speed": 242,
-      "boost": 316,
-      "boostEnergy": 14,
-      "agility": 5,
-      "baseShieldStrength": 115,
-      "baseArmour": 270,
-      "hullMass": 298,
+      "speed": 260,
+      "boost": 340,
+      "boostEnergy": 13,
+      "baseShieldStrength": 150,
+      "baseArmour": 150,
+      "hardness": 42,
+      "hullMass": 260,
       "masslock": 10,
-      "pipSpeed": 0.09625
+      "pipSpeed": 0.09625,
+      "pitch": 35,
+      "roll": 90,
+      "yaw": 13,
+      "crew": 1
     },
     "retailCost": 1894760,
     "bulkheads": [
-      { "id": "ba", "edID": 128671832, "eddbID": 1456, "cost": 0, "mass": 0 },
-      { "id": "bb", "edID": 128671833, "eddbID": 1457, "cost": 800000, "mass": 23 },
-      { "id": "bc", "edID": 128671834, "eddbID": 1458, "cost": 1800000, "mass": 47 },
-      { "id": "bd", "edID": 128671835, "eddbID": 1459, "cost": 4200000, "mass": 26 },
-      { "id": "be", "edID": 128671836, "eddbID": 1460, "cost": 4714000, "mass": 47 }
+      { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bd", "edID": 128671835, "eddbID": 1459, "grp": "bh", "cost": 4200000, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "be", "edID": 128671836, "eddbID": 1460, "grp": "bh", "cost": 4714000, "mass": 47, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "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/diamondback_scout.json

@@ -7,23 +7,27 @@
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 461340,
-      "speed": 283,
-      "boost": 384,
-      "boostEnergy": 11,
-      "agility": 8,
-      "baseShieldStrength": 93,
-      "baseArmour": 216,
+      "speed": 280,
+      "boost": 380,
+      "boostEnergy": 10,
+      "baseShieldStrength": 120,
+      "baseArmour": 120,
+      "hardness": 40,
       "hullMass": 170,
       "masslock": 8,
-      "pipSpeed": 0.09875
-    },
+      "pipSpeed": 0.09875,
+      "pitch": 42,
+      "roll": 100,
+      "yaw": 15,
+      "crew": 1
+    } ,
     "retailCost": 564330,
     "bulkheads": [
-      { "id": "b5", "edID": 128671218, "eddbID": 1384, "cost": 0, "mass": 0 },
-      { "id": "b6", "edID": 128671219, "eddbID": 1385, "cost": 225700, "mass": 13 },
-      { "id": "b7", "edID": 128671220, "eddbID": 1386, "cost": 507900, "mass": 26 },
-      { "id": "b8", "edID": 128671221, "eddbID": 1387, "cost": 1185100, "mass": 26 },
-      { "id": "b9", "edID": 128671222, "eddbID": 1388, "cost": 1330100, "mass": 26 }
+      { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "b8", "edID": 128671221, "eddbID": 1387, "grp": "bh", "cost": 1185100, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "b9", "edID": 128671222, "eddbID": 1388, "grp": "bh", "cost": 1330100, "mass": 26, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [ 4, 4, 4, 2, 3, 2, 4],

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

@@ -7,33 +7,41 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 10440,
-      "speed": 239,
-      "boost": 349,
-      "boostEnergy": 9,
-      "agility": 10,
-      "baseShieldStrength": 89,
-      "baseArmour": 72,
+      "speed": 240,
+      "boost": 350,
+      "boostEnergy": 8,
+      "baseShieldStrength": 60,
+      "baseArmour": 40,
+      "hardness": 28,
       "hullMass": 50,
       "masslock": 6,
-      "pipSpeed": 0.0625
+      "pipSpeed": 0.0625,
+      "pitch": 50,
+      "roll": 120,
+      "yaw": 18,
+      "crew": 1
     },
     "retailCost": 44800,
     "bulkheads": [
-      { "id": "bY", "edID": 128049256, "eddbID": 743, "cost": 0, "mass": 0 },
-      { "id": "bZ", "edID": 128049257, "eddbID": 744, "cost": 26880, "mass": 4 },
-      { "id": "B0", "edID": 128049258, "eddbID": 745, "cost": 90050, "mass": 8 },
-      { "id": "B1", "edID": 128049259, "eddbID": 746, "cost": 140090, "mass": 8 },
-      { "id": "B2", "edID": 128049260, "eddbID": 747, "cost": 150390, "mass": 8 }
+      { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "B1", "edID": 128049259, "eddbID": 746, "grp": "bh", "cost": 140090, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "B2", "edID": 128049260, "eddbID": 747, "grp": "bh", "cost": 150390, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [2, 3, 3, 1, 2, 2, 2],
       "hardpoints": [1, 1, 1, 0],
-      "internal": [3, 2, 1, 1]
+      "internal": [
+        3, 2, 
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        1, 1
+      ]
     },
     "defaults": {
       "standard": ["2E", "3E", "3E", "1E", "2E", "2E", "2C"],
       "hardpoints": [17, 17, 0, 0],
-      "internal": ["44", "00", "2h", 0]
+      "internal": ["44", "00", 0, "2h", 0]
     }
   }
 }

ships/federal_assault_ship.json

@@ -1,38 +1,51 @@
 {
   "federal_assault_ship": {
-    "edID": 128672145, "eddbID": 8,
+    "edID": 128672145,
+    "eddbID": 8,
     "properties": {
       "name": "Federal Assault Ship",
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 19072000,
-      "speed": 214,
-      "boost": 357,
-      "boostEnergy": 21,
-      "agility": 6,
-      "baseShieldStrength": 133,
-      "baseArmour": 540,
+      "speed": 210,
+      "boost": 350,
+      "boostEnergy": 19,
+      "baseShieldStrength": 200,
+      "baseArmour": 300,
+      "hardness": 60,
       "hullMass": 480,
       "masslock": 14,
-      "pipSpeed": 0.11125
+      "pipSpeed": 0.11125,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 19,
+      "crew": 2
     },
     "retailCost": 19814210,
+    "requirements": {
+      "federationRank": 5
+    },
     "bulkheads": [
-      { "id": "bz", "edID": 128672147, "eddbID": 1466, "cost": 0, "mass": 0 },
-      { "id": "bA", "edID": 128672148, "eddbID": 1467, "cost": 7925680, "mass": 44 },
-      { "id": "bB", "edID": 128672149, "eddbID": 1468, "cost": 17832780, "mass": 87 },
-      { "id": "bC", "edID": 128672150, "eddbID": 1469, "cost": 42144810, "mass": 87 },
-      { "id": "bD", "edID": 128672151, "eddbID": 1470, "cost": 46702080, "mass": 87 }
+      { "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 },
+      { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bC", "edID": 128672150, "eddbID": 1469, "grp": "bh", "cost": 42144810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bD", "edID": 128672151, "eddbID": 1470, "grp": "bh", "cost": 46702080, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],
       "hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
-      "internal": [5, 5, 4, 3, 2, 2]
+      "internal": [
+        5, 5, 4, 
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        3, 2, 2
+      ]
     },
     "defaults": {
       "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
       "hardpoints": [0, 0, 17, 17, 0, 0, 0, 0],
-      "internal": ["4e", "03", "02", "02", 0, 0]
+      "internal": ["4e", "03", "02", 0, 0, "02", 0, 0]
     }
   }
 }

ships/federal_corvette.json

@@ -7,34 +7,46 @@
       "manufacturer": "Core Dynamics",
       "class": 3,
       "hullCost": 182589570,
-      "speed": 198,
-      "boost": 257,
+      "speed": 200,
+      "boost": 260,
       "boostEnergy": 27,
-      "agility": 2,
-      "baseShieldStrength": 516,
-      "baseArmour": 666,
+      "baseShieldStrength": 555,
+      "baseArmour": 370,
+      "hardness": 70,
       "hullMass": 900,
       "masslock": 24,
       "pipSpeed": 0.125,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 28,
+      "roll": 75,
+      "yaw": 8,
+      "crew": 3 
     },
     "retailCost": 187969450,
+    "requirements": {
+      "federationRank": 12
+    },
     "bulkheads": [
-      { "id": "BW", "edID": 128049370, "eddbID": 1498, "cost": 0, "mass": 0 },
-      { "id": "BX", "edID": 128049371, "eddbID": 1499, "cost": 75187790, "mass": 30 },
-      { "id": "BY", "edID": 128049372, "eddbID": 1500, "cost": 169172510, "mass": 60 },
-      { "id": "BZ", "edID": 128049373, "eddbID": 1501, "cost": 399811020, "mass": 60 },
-      { "id": "c0", "edID": 128049374, "eddbID": 1502, "cost": 443044000, "mass": 60 }
+      { "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 },
+      { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BZ", "edID": 128049373, "eddbID": 1501, "grp": "bh", "cost": 399811020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "c0", "edID": 128049374, "eddbID": 1502, "grp": "bh", "cost": 443044000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 7, 6, 5, 8, 8, 5],
       "hardpoints": [4, 4, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [7, 7, 7, 6, 6, 5, 5, 4, 4, 3]
+      "internal": [
+        7, 7, 7, 6, 6, 5, 5,
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 4, 3
+      ]
     },
     "defaults": {
       "standard": ["8E", "7E" ,"6E", "5E", "8E", "8E", "5C"],
       "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4o", "05", 0, 0, 0, 0, 0, "02", "01", "2h"]
+      "internal": ["4o", "05", 0, 0, 0, 0, 0, 0, 0, "02", "01", "2h"]
     }
   }
 }

ships/federal_dropship.json

@@ -7,33 +7,45 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 13469990,
-      "speed": 182,
-      "boost": 304,
-      "boostEnergy": 21,
-      "agility": 2,
-      "baseShieldStrength": 104,
-      "baseArmour": 540,
+      "speed": 180,
+      "boost": 300,
+      "boostEnergy": 19,
+      "baseShieldStrength": 200,
+      "baseArmour": 300,
+      "hardness": 60,
       "hullMass": 580,
       "masslock": 14,
-      "pipSpeed": 0.0725
+      "pipSpeed": 0.0725,
+      "pitch": 30,
+      "roll": 80,
+      "yaw": 14,
+      "crew": 2
     },
     "retailCost": 14314210,
+    "requirements": {
+      "federationRank": 3
+    },
     "bulkheads": [
-      { "id": "bE", "edID": 128049322, "eddbID": 793, "cost": 0, "mass": 0 },
-      { "id": "bF", "edID": 128049323, "eddbID": 794, "cost": 5725680, "mass": 44 },
-      { "id": "bG", "edID": 128049324, "eddbID": 795, "cost": 12882780, "mass": 87 },
-      { "id": "bH", "edID": 128049325, "eddbID": 796, "cost": 30446310, "mass": 87 },
-      { "id": "bI", "edID": 128049326, "eddbID": 797, "cost": 33738580, "mass": 87 }
+      { "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 },
+      { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bH", "edID": 128049325, "eddbID": 796, "grp": "bh", "cost": 30446310, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bI", "edID": 128049326, "eddbID": 797, "grp": "bh", "cost": 33738580, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],
       "hardpoints": [3, 2, 2, 2, 2, 0, 0, 0, 0],
-      "internal": [6, 5, 5, 4, 3, 3, 2]
+      "internal": [
+        6, 5, 5, 4,
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        3, 3, 2
+      ]
     },
     "defaults": {
       "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["04", "03", "4e", "02", 0, 0, 0, 0, "2h"]
     }
   }
 }

ships/federal_gunship.json

@@ -7,34 +7,47 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 34774790,
-      "speed": 171,
-      "boost": 282,
-      "boostEnergy": 21,
-      "agility": 2,
-      "baseShieldStrength": 186,
-      "baseArmour": 630,
+      "speed": 170,
+      "boost": 280,
+      "boostEnergy": 23,
+      "baseShieldStrength": 250,
+      "baseArmour": 350,
+      "hardness": 60,
       "hullMass": 580,
       "masslock": 14,
       "pipSpeed": 0.1025,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 80,
+      "yaw": 18,
+      "crew": 2
     },
     "retailCost": 35814210,
+    "requirements": {
+      "federationRank": 7
+    },
     "bulkheads": [
-      { "id": "bJ", "edID": 128672154, "eddbID": 1471, "cost": 0, "mass": 0 },
-      { "id": "bK", "edID": 128672155, "eddbID": 1472, "cost": 14325690, "mass": 44 },
-      { "id": "bL", "edID": 128672156, "eddbID": 1473, "cost": 32232790, "mass": 87 },
-      { "id": "bM", "edID": 128672157, "eddbID": 1474, "cost": 76176810, "mass": 87 },
-      { "id": "bN", "edID": 128672158, "eddbID": 1475, "cost": 84414090, "mass": 87 }
+      { "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 },
+      { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bM", "edID": 128672157, "eddbID": 1474, "grp": "bh", "cost": 76176810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bN", "edID": 128672158, "eddbID": 1475, "grp": "bh", "cost": 84414090, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 7, 5, 4],
       "hardpoints": [3, 2, 2, 2, 2, 1, 1, 0, 0, 0, 0],
-      "internal": [6, 6, 5, 2, 2]
+      "internal": [
+        6, 6, 5,
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        2, 2
+      ]
     },
     "defaults": {
       "standard": ["6E", "6E", "5E", "5E", "7E", "5E", "4C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [0, "4j", "03", 0, "2h"]
+      "internal": [0, "4j", "03", 0, 0, 0, 0, "2h"]
     }
   }
 }

ships/fer_de_lance.json

@@ -7,23 +7,27 @@
       "manufacturer": "Zorgon Peterson",
       "class": 2,
       "hullCost": 51232230,
-      "speed": 265,
-      "boost": 357,
-      "boostEnergy": 21,
-      "agility": 6,
-      "baseShieldStrength": 271,
-      "baseArmour": 405,
+      "speed": 260,
+      "boost": 350,
+      "boostEnergy": 19,
+      "baseShieldStrength": 300,
+      "baseArmour": 225,
+      "hardness": 70,
       "hullMass": 250,
       "masslock": 12,
-      "pipSpeed": 0.03875
+      "pipSpeed": 0.03875,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 12,
+      "crew": 2
     },
     "retailCost": 51567040,
     "bulkheads": [
-      { "id": "Bd", "edID": 128049352, "eddbID": 813, "cost": 0, "mass": 0 },
-      { "id": "Be", "edID": 128049353, "eddbID": 814, "cost": 20626820, "mass": 19 },
-      { "id": "Bf", "edID": 128049354, "eddbID": 815, "cost": 46410340, "mass": 38 },
-      { "id": "Bg", "edID": 128049355, "eddbID": 816, "cost": 109683090, "mass": 38 },
-      { "id": "Bh", "edID": 128049356, "eddbID": 817, "cost": 121543510, "mass": 38 }
+      { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 5, 4, 4, 6, 4, 3],

ships/hauler.json

@@ -7,23 +7,27 @@
       "manufacturer": "Zorgon Peterson",
       "class": 1,
       "hullCost": 29790,
-      "speed": 203,
-      "boost": 305,
-      "agility": 6,
+      "speed": 200,
+      "boost": 300,
       "boostEnergy": 7,
-      "baseShieldStrength": 65,
-      "baseArmour": 90,
+      "baseShieldStrength": 50,
+      "baseArmour": 100,
+      "hardness": 20,
       "hullMass": 14,
       "masslock": 6,
-      "pipSpeed": 0.1625
+      "pipSpeed": 0.1625,
+      "pitch": 36,
+      "roll": 100,
+      "yaw": 14,
+      "crew": 1
     },
     "retailCost": 52720,
     "bulkheads": [
-      { "id": "Bi", "edID": 128049262, "eddbID": 748, "cost": 0, "mass": 0 },
-      { "id": "Bj", "edID": 128049263, "eddbID": 749, "cost": 42180, "mass": 1 },
-      { "id": "Bk", "edID": 128049264, "eddbID": 750, "cost": 185050, "mass": 2 },
-      { "id": "Bl", "edID": 128049265, "eddbID": 751, "cost": 270300, "mass": 2 },
-      { "id": "Bm", "edID": 128049266, "eddbID": 752, "cost": 282420, "mass": 2 }
+      { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bl", "edID": 128049265, "eddbID": 751, "grp": "bh", "cost": 270300, "mass": 2, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bm", "edID": 128049266, "eddbID": 752, "grp": "bh", "cost": 282420, "mass": 2, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [2, 2, 2, 1, 1, 1, 2],

ships/imperial_clipper.json

@@ -7,23 +7,30 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 21077780,
-      "speed": 306,
-      "boost": 388,
-      "boostEnergy": 21,
-      "agility": 2,
-      "baseShieldStrength": 186,
-      "baseArmour": 486,
+      "speed": 300,
+      "boost": 380,
+      "boostEnergy": 19,
+      "baseShieldStrength": 180,
+      "baseArmour": 270,
+      "hardness": 60,
       "hullMass": 400,
       "masslock": 12,
-      "pipSpeed": 0.1
+      "pipSpeed": 0.1,
+      "pitch": 40,
+      "roll": 80,
+      "yaw": 18,
+      "crew": 2
     },
     "retailCost": 22296860,
-      "bulkheads": [
-      { "id": "bp", "edID": 128049316, "eddbID": 788, "cost": 0, "mass": 0 },
-      { "id": "bq", "edID": 128049317, "eddbID": 789, "cost": 8918340, "mass": 30 },
-      { "id": "br", "edID": 128049318, "eddbID": 790, "cost": 20066270, "mass": 60 },
-      { "id": "bs", "edID": 128049319, "eddbID": 791, "cost": 47423290, "mass": 60 },
-      { "id": "bt", "edID": 128049320, "eddbID": 792, "cost": 52551340, "mass": 60 }
+    "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 },
+      { "id": "bs", "edID": 128049319, "eddbID": 791, "grp": "bh", "cost": 47423290, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bt", "edID": 128049320, "eddbID": 792, "grp": "bh", "cost": 52551340, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 5, 4],

ships/imperial_courier.json

@@ -1,6 +1,7 @@
 {
   "imperial_courier": {
-    "edID": 128671223, "eddbID": 14,
+    "edID": 128671223,
+    "eddbID": 14,
     "properties": {
       "name": "Imperial Courier",
       "manufacturer": "Gutamaya",
@@ -8,21 +9,28 @@
       "hullCost": 2481550,
       "speed": 280,
       "boost": 380,
-      "boostEnergy": 11,
-      "agility": 6,
-      "baseShieldStrength": 230,
-      "baseArmour": 144,
+      "boostEnergy": 10,
+      "baseShieldStrength": 200,
+      "baseArmour": 80,
+      "hardness": 30,
       "hullMass": 35,
       "masslock": 7,
-      "pipSpeed": 0.05375
+      "pipSpeed": 0.05375,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 16,
+      "crew": 1
     },
     "retailCost": 2542930,
+    "requirements": {
+      "empireRank": 3
+    },
     "bulkheads": [
-      { "id": "bf", "edID": 128671224, "eddbID": 1389, "cost": 0, "mass": 0 },
-      { "id": "bg", "edID": 128671225, "eddbID": 1390, "cost": 1017200, "mass": 4 },
-      { "id": "bh", "edID": 128671226, "eddbID": 1391, "cost": 2288600, "mass": 8 },
-      { "id": "bi", "edID": 128671227, "eddbID": 1392, "cost": 5408800, "mass": 8 },
-      { "id": "bj", "edID": 128671228, "eddbID": 1393, "cost": 5993700, "mass": 8 }
+      { "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 },
+      { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bi", "edID": 128671227, "eddbID": 1392, "grp": "bh", "cost": 5408800, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bj", "edID": 128671228, "eddbID": 1393, "grp": "bh", "cost": 5993700, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [ 4, 3, 3, 1, 3, 2, 3],

ships/imperial_cutter.json

@@ -1,39 +1,52 @@
 {
   "imperial_cutter": {
-    "edID": 128049375, "eddbID": 26,
+    "edID": 128049375,
+    "eddbID": 26,
     "properties": {
       "name": "Imperial Cutter",
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 199926890,
-      "speed": 202,
-      "boost": 323,
-      "boostEnergy": 24,
-      "agility": 2,
-      "baseShieldStrength": 703,
-      "baseArmour": 720,
+      "speed": 200,
+      "boost": 320,
+      "boostEnergy": 23,
+      "baseShieldStrength": 600,
+      "baseArmour": 400,
+      "hardness": 70,
       "hullMass": 1100,
       "masslock": 27,
       "pipSpeed": 0.05,
-       "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 18,
+      "roll": 45,
+      "yaw": 8,
+      "crew": 3 
     },
     "retailCost": 208969450,
+    "requirements": {
+      "empireRank": 12
+    },
     "bulkheads": [
-      { "id": "BR", "edID": 128049376, "eddbID": 1493, "cost": 0, "mass": 0 },
-      { "id": "BS", "edID": 128049377, "eddbID": 1494, "cost": 83587790, "mass": 30 },
-      { "id": "BT", "edID": 128049378, "eddbID": 1495, "cost": 188072510, "mass": 60 },
-      { "id": "BU", "edID": 128049379, "eddbID": 1496, "cost": 444478020, "mass": 60 },
-      { "id": "BV", "edID": 128049380, "eddbID": 1497, "cost": 492541000, "mass": 60 }
+      { "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 },
+      { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BU", "edID": 128049379, "eddbID": 1496, "grp": "bh", "cost": 444478020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BV", "edID": 128049380, "eddbID": 1497, "grp": "bh", "cost": 492541000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 8, 7, 7, 7, 7, 6],
       "hardpoints": [4, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [8, 8, 6, 6, 6, 5, 5, 4, 3]
+      "internal": [
+        8, 8, 6, 6, 6, 5, 5,
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 3
+      ]
     },
     "defaults": {
       "standard": ["8E", "8E", "7E", "7E", "7E", "7E", "6C"],
       "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4t", "06", "04", 0, 0, 0, 0, "01", "2h"]
+      "internal": ["4t", "06", "04", 0, 0, 0, 0, 0, 0, "01", "2h"]
     }
   }
 }

ships/imperial_eagle.json

@@ -7,33 +7,41 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 72180,
-      "speed": 298,
-      "boost": 397,
-      "boostEnergy": 9,
-      "agility": 6,
-      "baseShieldStrength": 104,
-      "baseArmour": 108,
+      "speed": 300,
+      "boost": 400,
+      "boostEnergy": 8,
+      "baseShieldStrength": 80,
+      "baseArmour": 60,
+      "hardness": 28,
       "hullMass": 50,
       "masslock": 6,
-      "pipSpeed": 0.075
+      "pipSpeed": 0.075,
+      "pitch": 40,
+      "roll": 100,
+      "yaw": 15,
+      "crew": 1
     },
     "retailCost": 110830,
     "bulkheads": [
-      { "id": "bu", "edID": 128672140, "eddbID": 1461, "cost": 0, "mass": 0 },
-      { "id": "bv", "edID": 128672141, "eddbID": 1462, "cost": 66500, "mass": 4 },
-      { "id": "bw", "edID": 128672142, "eddbID": 1463, "cost": 222760, "mass": 8 },
-      { "id": "bx", "edID": 128672143, "eddbID": 1464, "cost": 346550, "mass": 8 },
-      { "id": "by", "edID": 128672144, "eddbID": 1465, "cost": 372040, "mass": 8 }
+      { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bx", "edID": 128672143, "eddbID": 1464, "grp": "bh", "cost": 346550, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "by", "edID": 128672144, "eddbID": 1465, "grp": "bh", "cost": 372040, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [3, 3, 3, 1, 2, 2, 2],
       "hardpoints": [2, 1, 1, 0],
-      "internal": [3, 2, 1, 1]
+      "internal": [
+        3, 2, 
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        1, 1
+      ]
     },
     "defaults": {
       "standard": ["3E", "3E", "3E", "1E", "2E", "2E", "2C"],
       "hardpoints": [0, 17, 17, 0],
-      "internal": ["44", "00", "2h", 0]
+      "internal": ["44", "00", 0, "2h", 0]
     }
   }
 }

ships/index.js

@@ -1,5 +1,6 @@
 module.exports = {
   adder: require('./adder').adder,
+  alliance_chieftain: require('./alliance_chieftain').alliance_chieftain,
   anaconda: require('./anaconda').anaconda,
   asp: require('./asp').asp,
   asp_scout: require('./asp_scout').asp_scout,
@@ -8,6 +9,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 +28,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/keelback.json

@@ -6,25 +6,29 @@
       "name": "Keelback",
       "manufacturer": "Lakon",
       "class": 2,
-      "hullCost": 2951180,
-      "speed": 202,
-      "boost": 303,
+      "hullCost": 2943870,
+      "speed": 200,
+      "boost": 300,
       "boostEnergy": 10,
-      "agility": 2,
-      "baseShieldStrength": 99,
-      "baseArmour": 243,
+      "baseShieldStrength": 135,
+      "baseArmour": 270,
+      "hardness": 45,
       "hullMass": 180,
       "masslock": 8,
       "pipSpeed": 0.1375,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 27,
+      "roll": 100,
+      "yaw": 15,
+      "crew": 2
     },
     "retailCost": 3126150,
     "bulkheads": [
-      { "id": "cb", "edID": 128672271, "eddbID": 1513, "cost": 0, "mass": 0 },
-      { "id": "cc", "edID": 128672272, "eddbID": 1514, "cost": 1250460, "mass": 12 },
-      { "id": "cd", "edID": 128672273, "eddbID": 1515, "cost": 2813540, "mass": 23 },
-      { "id": "ce", "edID": 128672274, "eddbID": 1516, "cost": 6649330, "mass": 23 },
-      { "id": "cf", "edID": 128672275, "eddbID": 1517, "cost": 7368340, "mass": 23 }
+      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "ce", "edID": 128672274, "eddbID": 1516, "grp": "bh", "cost": 6649330, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cf", "edID": 128672275, "eddbID": 1517, "grp": "bh", "cost": 7368340, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 1, 3, 2, 4],

ships/orca.json

@@ -6,39 +6,43 @@
       "name": "Orca",
       "manufacturer": "Saud Kruger",
       "class": 3,
-      "hullCost": 47798080,
-      "speed": 303,
-      "boost": 384,
-      "boostEnergy": 17,
-      "agility": 2,
-      "baseShieldStrength": 114,
-      "baseArmour": 396,
-      "hullMass": 580,
-      "masslock": 13,
+      "hullCost": 47790590,
+      "speed": 300,
+      "boost": 380,
+      "boostEnergy": 16,
+      "baseShieldStrength": 220,
+      "baseArmour": 220,
+      "hardness": 55,
+      "hullMass": 290,
+      "masslock": 16,
       "pipSpeed": 0.08375,
-      "luxuryCabins": true
+      "luxuryCabins": true,
+      "pitch": 25,
+      "roll": 55,
+      "yaw": 18,
+      "crew": 2
     },
-    "retailCost": 48539890,
+    "retailCost": 48539900,
     "bulkheads": [
-      { "id": "BM", "edID": 128049328, "eddbID": 798, "cost": 0, "mass": 0 },
-      { "id": "BN", "edID": 128049329, "eddbID": 799, "cost": 19415950, "mass": 21 },
-      { "id": "BO", "edID": 128049330, "eddbID": 800, "cost": 43685900, "mass": 87 },
-      { "id": "BP", "edID": 128049331, "eddbID": 801, "cost": 103244340, "mass": 87 },
-      { "id": "BQ", "edID": 128049332, "eddbID": 802, "cost": 114408510, "mass": 87 }
+      { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BP", "edID": 128049331, "eddbID": 801, "grp": "bh", "cost": 103244340, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BQ", "edID": 128049332, "eddbID": 802, "grp": "bh", "cost": 114408510, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [5, 6, 5, 6, 5, 4, 5],
       "hardpoints": [3, 2, 2, 0, 0, 0, 0],
       "internal": [
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
         5, 5, 4, 3, 2, 2
       ]
     },
     "defaults": {
       "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["me", "mc", "03", "4e", "02", 0, 0, "2h"]
     }
   }
 }