Merge branch 'release/2.5.1'

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

.gitignore

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

ChangeLog.md

@@ -1,3 +1,13 @@
+#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

dist/index.js

@@ -2749,6 +2749,113 @@ module.exports = {
         internal: [ "06", "05", "4j", "03", "02", 0, "01", 0, "2h" ]
       }
     },
+    type_10_defender: {
+      edID: 128785619,
+      eddbID: 32,
+      properties: {
+        name: "Type-10 Defender",
+        manufacturer: "Lakon",
+        class: 3,
+        hullCost: 121454173,
+        speed: 179,
+        boost: 219,
+        boostEnergy: 19,
+        baseShieldStrength: 320,
+        baseArmour: 580,
+        hardness: 75,
+        hullMass: 1200,
+        masslock: 26,
+        pipSpeed: .17375,
+        fighterHangars: true,
+        pitch: 20,
+        roll: 20,
+        yaw: 8,
+        crew: 3
+      },
+      retailCost: 121454652,
+      bulkheads: [ {
+        id: "Bx",
+        edID: 128049334,
+        eddbID: 803,
+        grp: "bh",
+        cost: 0,
+        mass: 0,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: .8
+      }, {
+        id: "By",
+        edID: 128049335,
+        eddbID: 804,
+        grp: "bh",
+        cost: 30622340,
+        mass: 75,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: 1.52
+      }, {
+        id: "Bz",
+        edID: 128049336,
+        eddbID: 805,
+        grp: "bh",
+        cost: 68900260,
+        mass: 150,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: 2.5
+      }, {
+        id: "BA",
+        edID: 128049337,
+        eddbID: 806,
+        grp: "bh",
+        cost: 162834280,
+        mass: 150,
+        explres: -.5,
+        kinres: -.75,
+        thermres: .5,
+        hullboost: 2.5
+      }, {
+        id: "BB",
+        edID: 128049338,
+        eddbID: 807,
+        grp: "bh",
+        cost: 180442120,
+        mass: 150,
+        explres: .2,
+        kinres: .25,
+        thermres: -.4,
+        hullboost: 2.5
+      } ],
+      slots: {
+        standard: [ 8, 7, 7, 5, 6, 4, 6 ],
+        hardpoints: [ 3, 3, 3, 3, 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ],
+        internal: [ 8, 7, 6, 5, 4, 4, 3, 3, 2, {
+          class: 5,
+          name: "Military",
+          eligible: {
+            hr: 1,
+            scb: 1,
+            mrp: 1
+          }
+        }, {
+          class: 5,
+          name: "Military",
+          eligible: {
+            hr: 1,
+            scb: 1,
+            mrp: 1
+          }
+        } ]
+      },
+      defaults: {
+        standard: [ "6E", "7E", "6E", "5E", "6E", "4E", "6C" ],
+        hardpoints: [ 0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
+        internal: [ "06", "05", "4j", "03", "02", 0, "01", 0, "2h", 0, 0 ]
+      }
+    },
     viper: {
       edID: 128049273,
       eddbID: 22,
@@ -7699,6 +7806,123 @@ module.exports = {
         shotspeed: 1600,
         thermload: .51
       } ],
+      axmc: [ {
+        ammo: 2100,
+        breachdmg: 2.8,
+        breachmax: .5,
+        breachmin: .8,
+        class: 2,
+        clip: 100,
+        cost: 379e3,
+        damage: 3.3,
+        damagedist: {
+          X: 1
+        },
+        distdraw: .11,
+        edID: 128788701,
+        eddbID: 1618,
+        falloff: 2e3,
+        grp: "axmc",
+        id: "x0",
+        integrity: 51,
+        mass: 4,
+        mount: "F",
+        piercing: 17,
+        power: .46,
+        range: 4e3,
+        rating: "E",
+        reload: 4,
+        rof: 7.1,
+        shotspeed: 1600,
+        thermload: .2
+      }, {
+        ammo: 2100,
+        breachdmg: .4,
+        breachmax: .5,
+        breachmin: .5,
+        class: 2,
+        clip: 90,
+        cost: 1826500,
+        damage: 1.7,
+        damagedist: {
+          X: 1
+        },
+        distdraw: .06,
+        edID: 128793059,
+        eddbID: 1619,
+        falloff: 2e3,
+        grp: "axmc",
+        id: "x1",
+        integrity: 51,
+        mass: 4,
+        mount: "T",
+        piercing: 17,
+        power: .5,
+        range: 4e3,
+        rating: "F",
+        reload: 4,
+        rof: 6.2,
+        shotspeed: 1600,
+        thermload: .1
+      }, {
+        ammo: 2100,
+        breachdmg: 5.2,
+        breachmax: .5,
+        breachmin: .8,
+        class: 3,
+        clip: 100,
+        cost: 1181500,
+        damage: 6.1,
+        damagedist: {
+          X: 1
+        },
+        distdraw: .18,
+        edID: 128788702,
+        eddbID: 1625,
+        falloff: 2e3,
+        grp: "axmc",
+        id: "x2",
+        integrity: 64,
+        mass: 8,
+        mount: "F",
+        piercing: 33,
+        power: .64,
+        range: 4e3,
+        rating: "C",
+        reload: 4,
+        rof: 5.9,
+        shotspeed: 1600,
+        thermload: .3
+      }, {
+        ammo: 2100,
+        breachdmg: .8,
+        breachmax: .5,
+        breachmin: .5,
+        class: 3,
+        clip: 90,
+        cost: 3821600,
+        damage: 3.3,
+        damagedist: {
+          X: 1
+        },
+        distdraw: .06,
+        edID: 128793060,
+        eddbID: 1626,
+        falloff: 2e3,
+        grp: "axmc",
+        id: "x3",
+        integrity: 64,
+        mass: 8,
+        mount: "T",
+        piercing: 33,
+        power: .64,
+        range: 4e3,
+        rating: "E",
+        reload: 4,
+        rof: 6.2,
+        shotspeed: 1600,
+        thermload: .1
+      } ],
       c: [ {
         ammo: 120,
         breachdmg: 17.1,
@@ -8337,6 +8561,63 @@ module.exports = {
         shotspeed: 1e3,
         thermload: 1.1
       } ],
+      rfl: [ {
+        ammo: 32,
+        breachdmg: 1.7,
+        breachmax: 1,
+        breachmin: 1,
+        class: 2,
+        clip: 1,
+        cost: 261800,
+        damage: 34,
+        damagedist: {
+          E: 1
+        },
+        distdraw: .24,
+        edID: 128785626,
+        eddbID: 1620,
+        falloff: 1e5,
+        grp: "rfl",
+        id: "x8",
+        integrity: 51,
+        mass: 4,
+        mount: "F",
+        piercing: 60,
+        power: 1.2,
+        rating: "B",
+        reload: 2,
+        rof: .5,
+        shotspeed: 550,
+        thermload: 3.6
+      }, {
+        ammo: 32,
+        breachdmg: 1.7,
+        breachmax: 1,
+        breachmin: 1,
+        class: 2,
+        clip: 1,
+        cost: 1259200,
+        damage: 34,
+        damagedist: {
+          E: 1
+        },
+        distdraw: .24,
+        edID: 128793058,
+        eddbID: 1621,
+        falloff: 1e5,
+        grp: "rfl",
+        id: "x9",
+        integrity: 51,
+        mass: 4,
+        mount: "T",
+        piercing: 60,
+        power: 1.2,
+        rating: "B",
+        reload: 2,
+        rof: .5,
+        shotspeed: 550,
+        thermload: 3.6
+      } ],
       rg: [ {
         ammo: 80,
         breachdmg: 22.2,
@@ -8736,6 +9017,123 @@ module.exports = {
         shotspeed: 600,
         thermload: 3.6
       } ],
+      axmr: [ {
+        ammo: 64,
+        breachdmg: .1,
+        breachmax: .8,
+        breachmin: 1,
+        class: 2,
+        clip: 8,
+        cost: 540900,
+        damage: 64,
+        damagedist: {
+          X: 1
+        },
+        distdraw: .14,
+        edID: 128788699,
+        eddbID: 1614,
+        falloff: 1e4,
+        grp: "axmr",
+        id: "x4",
+        integrity: 51,
+        mass: 4,
+        missile: "D",
+        mount: "F",
+        piercing: 60,
+        power: 1.2,
+        rating: "B",
+        reload: 5,
+        rof: .5,
+        shotspeed: 750,
+        thermload: 2.4
+      }, {
+        ammo: 64,
+        breachdmg: .1,
+        breachmax: .8,
+        breachmin: 1,
+        class: 2,
+        clip: 8,
+        cost: 2022700,
+        damage: 50,
+        damagedist: {
+          X: 1
+        },
+        distdraw: .08,
+        edID: 128788704,
+        eddbID: 1615,
+        falloff: 1e4,
+        grp: "axmr",
+        id: "x5",
+        integrity: 51,
+        mass: 4,
+        missile: "D",
+        mount: "T",
+        piercing: 60,
+        power: 1.2,
+        rating: "B",
+        reload: 5,
+        rof: .5,
+        shotspeed: 750,
+        thermload: 1.5
+      }, {
+        ammo: 128,
+        breachdmg: .1,
+        breachmax: .8,
+        breachmin: 1,
+        class: 3,
+        clip: 12,
+        cost: 1352250,
+        damage: 64,
+        damagedist: {
+          X: 1
+        },
+        distdraw: .24,
+        edID: 128788700,
+        eddbID: 1623,
+        falloff: 1e4,
+        grp: "axmr",
+        id: "x6",
+        integrity: 64,
+        mass: 8,
+        missile: "D",
+        mount: "F",
+        piercing: 60,
+        power: 1.62,
+        rating: "A",
+        reload: 5,
+        rof: .5,
+        shotspeed: 750,
+        thermload: 3.6
+      }, {
+        ammo: 128,
+        breachdmg: .1,
+        breachmax: .8,
+        breachmin: 1,
+        class: 3,
+        clip: 12,
+        cost: 4056750,
+        damage: 64,
+        damagedist: {
+          X: 1
+        },
+        distdraw: .14,
+        edID: 128788705,
+        eddbID: 1624,
+        falloff: 1e4,
+        grp: "axmr",
+        id: "x7",
+        integrity: 64,
+        mass: 8,
+        missile: "D",
+        mount: "T",
+        piercing: 60,
+        power: 1.75,
+        rating: "A",
+        reload: 5,
+        rof: .5,
+        shotspeed: 750,
+        thermload: 1.9
+      } ],
       tp: [ {
         ammo: 1,
         breachdmg: 60,
@@ -9359,6 +9757,41 @@ module.exports = {
         rof: 10,
         shotspeed: 1e3,
         thermload: .1
+      } ],
+      sfn: [ {
+        class: 0,
+        cost: 63e3,
+        edID: 128771884,
+        eddbID: 1622,
+        grp: "sfn",
+        id: "sfn",
+        integrity: 35,
+        mass: 1.3,
+        name: "Shutdown Field Neutraliser",
+        passive: 1,
+        power: .2,
+        activepower: .25,
+        rating: "F",
+        cooldown: 10,
+        duration: 1,
+        range: 3e3
+      } ],
+      xs: [ {
+        class: 0,
+        cost: 365698,
+        edID: 128793115,
+        eddbID: 1616,
+        grp: "xs",
+        id: "xs",
+        integrity: 56,
+        mass: 1.3,
+        name: "Xeno Scanner",
+        power: .2,
+        range: 500,
+        rating: "E",
+        boot: 2,
+        scantime: 10,
+        angle: 23
       } ]
     },
     internal: {
@@ -21522,192 +21955,167 @@ module.exports = {
       }
     },
     modifierActions: {
-      mod_boot_time: {
+      OutfittingFieldType_BootTime: {
         boot: 1
       },
-      mod_defencemodifier_explosive_mult: {
+      OutfittingFieldType_ExplosiveResistance: {
         explres: 1
       },
-      mod_defencemodifier_global_hull_mult: {
+      OutfittingFieldType_DefenceModifierHealthAddition: {
-        explres: 1,
-        kinres: 1,
-        thermres: 1
-      },
-      mod_defencemodifier_global_shield_mult: {
-        explres: 1,
-        kinres: 1,
-        thermres: 1
-      },
-      mod_defencemodifier_health_add: {
         hullreinforcement: 1
       },
-      mod_defencemodifier_health_mult: {
+      OutfittingFieldType_DefenceModifierHealthMultiplier: {
         hullboost: 1
       },
-      mod_defencemodifier_kinetic_mult: {
+      OutfittingFieldType_KineticResistance: {
         kinres: 1
       },
-      mod_defencemodifier_shield_explosive_mult: {
+      OutfittingFieldType_DefenceModifierShieldMultiplier: {
-        explres: 1
-      },
-      mod_defencemodifier_shield_kinetic_mult: {
-        kinres: 1
-      },
-      mod_defencemodifier_shield_mult: {
         shieldboost: 1
       },
-      mod_defencemodifier_shield_thermic_mult: {
+      OutfittingFieldType_ThermicResistance: {
         thermres: 1
       },
-      mod_defencemodifier_thermic_mult: {
+      OutfittingFieldType_EngineHeatRate: {
-        thermres: 1
-      },
-      mod_engine_heat: {
         thermload: 1
       },
-      mod_engine_mass_curve: {
+      OutfittingFieldType_EngineOptimalMass: {
         optmass: 1
       },
-      mod_engine_mass_curve_multiplier: {
+      OutfittingFieldType_EngineOptPerformance: {
         optmul: 1
       },
-      mod_fsd_heat_rate: {
+      OutfittingFieldType_FSDHeatRate: {
         thermload: 1
       },
-      mod_fsd_max_fuel_per_jump: {
+      OutfittingFieldType_FSDMaxFuelPerJump: {
         maxfuel: 1
       },
-      mod_fsd_optimised_mass: {
+      OutfittingFieldType_FSDOptimalMass: {
         optmass: 1
       },
-      mod_fsdinterdictor_facing_limit: {
+      OutfittingFieldType_FSDInterdictorFacingLimit: {
         facinglimit: 1
       },
-      mod_fsdinterdictor_range: {
+      OutfittingFieldType_FSDInterdictorRange: {
         ranget: 1
       },
-      mod_health: {
+      OutfittingFieldType_Integrity: {
         integrity: 1
       },
-      mod_mass: {
+      OutfittingFieldType_Mass: {
         mass: 1
       },
-      mod_passive_power: {
+      OutfittingFieldType_SensorTargetScanAngle: {
-        power: 1
+        angle: 1
       },
-      mod_powerdistributor_engine_charge: {
+      OutfittingFieldType_DSS_RateMult: {
-        engcap: 1
+        scanrate: 1
       },
-      mod_powerdistributor_engine_rate: {
+      OutfittingFieldType_ScannerTimeToScan: {
-        engrate: 1
+        scantime: 1
       },
-      mod_powerdistributor_global_charge: {
+      OutfittingFieldType_ScannerRange: {
-        engcap: 1,
-        syscap: 1,
-        wepcap: 1
-      },
-      mod_powerdistributor_global_rate: {
-        engrate: 1,
-        sysrate: 1,
-        weprate: 1
-      },
-      mod_powerdistributor_system_charge: {
-        syscap: 1
-      },
-      mod_powerdistributor_system_rate: {
-        sysrate: 1
-      },
-      mod_powerdistributor_weapon_charge: {
-        wepcap: 1
-      },
-      mod_powerdistributor_weapon_rate: {
-        weprate: 1
-      },
-      mod_powerplant_heat: {
-        eff: 1
-      },
-      mod_powerplant_power: {
-        pgen: 1
-      },
-      mod_shield_broken_regen: {
-        brokenregen: 1
-      },
-      mod_shield_energy_per_regen: {
-        distdraw: 1
-      },
-      mod_shield_explosive_mult: {
-        explres: 1
-      },
-      mod_shield_global_mult: {
-        explres: 1,
-        kinres: 1,
-        thermres: 1
-      },
-      mod_shield_kinetic_mult: {
-        kinres: 1
-      },
-      mod_shield_mass_curve: {
-        optmass: 1
-      },
-      mod_shield_mass_curve_multiplier: {
-        optmul: 1
-      },
-      mod_shield_normal_regen: {
-        regen: 1
-      },
-      mod_shield_thermal_mult: {
-        thermres: 1
-      },
-      mod_shieldcell_charge_heat: {
-        thermload: 1
-      },
-      mod_shieldcell_duration: {
-        duration: 1
-      },
-      mod_shieldcell_shield_units: {
-        shieldreinforcement: 1
-      },
-      mod_shieldcell_spin_up: {
-        spinup: 1
-      },
-      mod_weapon_active_heat: {
-        thermload: 1
-      },
-      mod_weapon_active_power: {
-        distdraw: 1
-      },
-      mod_weapon_ammo_capacity: {
-        ammo: 1
-      },
-      mod_weapon_burst_interval: {
-        rof: 1
-      },
-      mod_weapon_burst_rof: {
-        burstrof: 1
-      },
-      mod_weapon_burst_size: {
-        burst: 1
-      },
-      mod_weapon_clip_size: {
-        clip: 1
-      },
-      mod_weapon_clip_size_override: {
-        clip: 1
-      },
-      mod_weapon_damage: {
-        damage: 1
-      },
-      mod_weapon_falloffrange_from_range: {},
-      mod_weapon_hardness_piercing: {
-        piercing: 1
-      },
-      mod_weapon_jitter_radius: {
-        jitter: 1
-      },
-      mod_weapon_range: {
         range: 1
       },
-      mod_weapon_reload_time: {
+      OutfittingFieldType_MaxAngle: {
+        angle: 1
+      },
+      OutfittingFieldType_Range: {
+        range: 1
+      },
+      OutfittingFieldType_PowerDraw: {
+        power: 1
+      },
+      OutfittingFieldType_EnginesCapacity: {
+        engcap: 1
+      },
+      OutfittingFieldType_EnginesRecharge: {
+        engrate: 1
+      },
+      OutfittingFieldType_SystemsCapacity: {
+        syscap: 1
+      },
+      OutfittingFieldType_SystemsRecharge: {
+        sysrate: 1
+      },
+      OutfittingFieldType_WeaponsCapacity: {
+        wepcap: 1
+      },
+      OutfittingFieldType_WeaponsRecharge: {
+        weprate: 1
+      },
+      OutfittingFieldType_HeatEfficiency: {
+        eff: 1
+      },
+      OutfittingFieldType_PowerCapacity: {
+        pgen: 1
+      },
+      OutfittingFieldType_BrokenRegenRate: {
+        brokenregen: 1
+      },
+      OutfittingFieldType_EnergyPerRegen: {
+        distdraw: 1
+      },
+      OutfittingFieldType_ShieldGenOptimalMass: {
+        optmass: 1
+      },
+      OutfittingFieldType_ShieldGenStrength: {
+        optmul: 1
+      },
+      OutfittingFieldType_RegenRate: {
+        regen: 1
+      },
+      OutfittingFieldType_ShieldBankHeat: {
+        thermload: 1
+      },
+      OutfittingFieldType_ShieldBankDuration: {
+        duration: 1
+      },
+      OutfittingFieldType_ShieldBankReinforcement: {
+        shieldreinforcement: 1
+      },
+      OutfittingFieldType_ShieldBankSpinUp: {
+        spinup: 1
+      },
+      OutfittingFieldType_ThermalLoad: {
+        thermload: 1
+      },
+      OutfittingFieldType_DistributorDraw: {
+        distdraw: 1
+      },
+      OutfittingFieldType_AmmoMaximum: {
+        ammo: 1
+      },
+      OutfittingFieldType_RateOfFire: {
+        rof: 1
+      },
+      OutfittingFieldType_weapon_burst_rof: {
+        burstrof: 1
+      },
+      OutfittingFieldType_weapon_burst_size: {
+        burst: 1
+      },
+      OutfittingFieldType_AmmoClipSize: {
+        clip: 1
+      },
+      OutfittingFieldType_weapon_clip_size_override: {
+        clip: 1
+      },
+      OutfittingFieldType_Damage: {
+        damage: 1
+      },
+      OutfittingFieldType_weapon_falloffrange_from_range: {},
+      OutfittingFieldType_ArmourPenetration: {
+        piercing: 1
+      },
+      OutfittingFieldType_Jitter: {
+        jitter: 1
+      },
+      OutfittingFieldType_MaximumRange: {
+        range: 1
+      },
+      OutfittingFieldType_ReloadTime: {
         reload: 1
       },
       special_auto_loader: {},
@@ -22815,6 +23223,10 @@ module.exports = {
         modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
         specials: [ "special_corrosive_shell", "special_blinding_shell", "special_incendiary_rounds", "special_drag_munitions", "special_screening_shell" ]
       },
+      rfl: {
+        blueprints: {},
+        modifications: []
+      },
       fh: {
         blueprints: {},
         modifications: []
@@ -23563,6 +23975,10 @@ module.exports = {
         modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
         specials: [ "special_auto_loader", "special_corrosive_shell", "special_emissive_munitions", "special_incendiary_rounds", "special_smart_rounds", "special_thermalshock" ]
       },
+      axmc: {
+        blueprints: {},
+        modifications: []
+      },
       ml: {
         blueprints: {},
         modifications: []
@@ -23650,6 +24066,10 @@ module.exports = {
         specials_S: [ "special_drag_munitions", "special_emissive_munitions", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ],
         specials_D: [ "special_drag_munitions", "special_emissive_munitions", "special_fsd_interrupt", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ]
       },
+      axmr: {
+        blueprints: {},
+        modifications: []
+      },
       mrp: {
         blueprints: {},
         modifications: []
@@ -24729,6 +25149,10 @@ module.exports = {
         },
         modifications: [ "explres", "integrity", "kinres", "mass", "power", "shieldboost", "thermres" ]
       },
+      sfn: {
+        blueprints: {},
+        modifications: []
+      },
       sc: {
         blueprints: {},
         modifications: []
@@ -24907,6 +25331,10 @@ module.exports = {
         },
         modifications: [ "mass", "angle", "range", "scanrate" ]
       },
+      xs: {
+        blueprints: {},
+        modifications: []
+      },
       t: {
         blueprints: {
           Engine_Dirty: {

dist/index.json

@@ -4335,6 +4335,195 @@
 				]
 			}
 		},
+		"type_10_defender": {
+			"edID": 128785619,
+			"eddbID": 32,
+			"properties": {
+				"name": "Type-10 Defender",
+				"manufacturer": "Lakon",
+				"class": 3,
+				"hullCost": 121454173,
+				"speed": 179,
+				"boost": 219,
+				"boostEnergy": 19,
+				"baseShieldStrength": 320,
+				"baseArmour": 580,
+				"hardness": 75,
+				"hullMass": 1200,
+				"masslock": 26,
+				"pipSpeed": 0.17375,
+				"fighterHangars": true,
+				"pitch": 20,
+				"roll": 20,
+				"yaw": 8,
+				"crew": 3
+			},
+			"retailCost": 121454652,
+			"bulkheads": [
+				{
+					"id": "Bx",
+					"edID": 128049334,
+					"eddbID": 803,
+					"grp": "bh",
+					"cost": 0,
+					"mass": 0,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 0.8
+				},
+				{
+					"id": "By",
+					"edID": 128049335,
+					"eddbID": 804,
+					"grp": "bh",
+					"cost": 30622340,
+					"mass": 75,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 1.52
+				},
+				{
+					"id": "Bz",
+					"edID": 128049336,
+					"eddbID": 805,
+					"grp": "bh",
+					"cost": 68900260,
+					"mass": 150,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 2.5
+				},
+				{
+					"id": "BA",
+					"edID": 128049337,
+					"eddbID": 806,
+					"grp": "bh",
+					"cost": 162834280,
+					"mass": 150,
+					"explres": -0.5,
+					"kinres": -0.75,
+					"thermres": 0.5,
+					"hullboost": 2.5
+				},
+				{
+					"id": "BB",
+					"edID": 128049338,
+					"eddbID": 807,
+					"grp": "bh",
+					"cost": 180442120,
+					"mass": 150,
+					"explres": 0.2,
+					"kinres": 0.25,
+					"thermres": -0.4,
+					"hullboost": 2.5
+				}
+			],
+			"slots": {
+				"standard": [
+					8,
+					7,
+					7,
+					5,
+					6,
+					4,
+					6
+				],
+				"hardpoints": [
+					3,
+					3,
+					3,
+					3,
+					2,
+					2,
+					2,
+					1,
+					1,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					8,
+					7,
+					6,
+					5,
+					4,
+					4,
+					3,
+					3,
+					2,
+					{
+						"class": 5,
+						"name": "Military",
+						"eligible": {
+							"hr": 1,
+							"scb": 1,
+							"mrp": 1
+						}
+					},
+					{
+						"class": 5,
+						"name": "Military",
+						"eligible": {
+							"hr": 1,
+							"scb": 1,
+							"mrp": 1
+						}
+					}
+				]
+			},
+			"defaults": {
+				"standard": [
+					"6E",
+					"7E",
+					"6E",
+					"5E",
+					"6E",
+					"4E",
+					"6C"
+				],
+				"hardpoints": [
+					0,
+					0,
+					0,
+					0,
+					17,
+					17,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					"06",
+					"05",
+					"4j",
+					"03",
+					"02",
+					0,
+					"01",
+					0,
+					"2h",
+					0,
+					0
+				]
+			}
+		},
 		"viper": {
 			"edID": 128049273,
 			"eddbID": 22,
@@ -9730,6 +9919,128 @@
 					"thermload": 0.51
 				}
 			],
+			"axmc": [
+				{
+					"ammo": 2100,
+					"breachdmg": 2.8,
+					"breachmax": 0.5,
+					"breachmin": 0.8,
+					"class": 2,
+					"clip": 100,
+					"cost": 379000,
+					"damage": 3.3,
+					"damagedist": {
+						"X": 1
+					},
+					"distdraw": 0.11,
+					"edID": 128788701,
+					"eddbID": 1618,
+					"falloff": 2000,
+					"grp": "axmc",
+					"id": "x0",
+					"integrity": 51,
+					"mass": 4,
+					"mount": "F",
+					"piercing": 17,
+					"power": 0.46,
+					"range": 4000,
+					"rating": "E",
+					"reload": 4,
+					"rof": 7.1,
+					"shotspeed": 1600,
+					"thermload": 0.2
+				},
+				{
+					"ammo": 2100,
+					"breachdmg": 0.4,
+					"breachmax": 0.5,
+					"breachmin": 0.5,
+					"class": 2,
+					"clip": 90,
+					"cost": 1826500,
+					"damage": 1.7,
+					"damagedist": {
+						"X": 1
+					},
+					"distdraw": 0.06,
+					"edID": 128793059,
+					"eddbID": 1619,
+					"falloff": 2000,
+					"grp": "axmc",
+					"id": "x1",
+					"integrity": 51,
+					"mass": 4,
+					"mount": "T",
+					"piercing": 17,
+					"power": 0.5,
+					"range": 4000,
+					"rating": "F",
+					"reload": 4,
+					"rof": 6.2,
+					"shotspeed": 1600,
+					"thermload": 0.1
+				},
+				{
+					"ammo": 2100,
+					"breachdmg": 5.2,
+					"breachmax": 0.5,
+					"breachmin": 0.8,
+					"class": 3,
+					"clip": 100,
+					"cost": 1181500,
+					"damage": 6.1,
+					"damagedist": {
+						"X": 1
+					},
+					"distdraw": 0.18,
+					"edID": 128788702,
+					"eddbID": 1625,
+					"falloff": 2000,
+					"grp": "axmc",
+					"id": "x2",
+					"integrity": 64,
+					"mass": 8,
+					"mount": "F",
+					"piercing": 33,
+					"power": 0.64,
+					"range": 4000,
+					"rating": "C",
+					"reload": 4,
+					"rof": 5.9,
+					"shotspeed": 1600,
+					"thermload": 0.3
+				},
+				{
+					"ammo": 2100,
+					"breachdmg": 0.8,
+					"breachmax": 0.5,
+					"breachmin": 0.5,
+					"class": 3,
+					"clip": 90,
+					"cost": 3821600,
+					"damage": 3.3,
+					"damagedist": {
+						"X": 1
+					},
+					"distdraw": 0.06,
+					"edID": 128793060,
+					"eddbID": 1626,
+					"falloff": 2000,
+					"grp": "axmc",
+					"id": "x3",
+					"integrity": 64,
+					"mass": 8,
+					"mount": "T",
+					"piercing": 33,
+					"power": 0.64,
+					"range": 4000,
+					"rating": "E",
+					"reload": 4,
+					"rof": 6.2,
+					"shotspeed": 1600,
+					"thermload": 0.1
+				}
+			],
 			"c": [
 				{
 					"ammo": 120,
@@ -10391,6 +10702,66 @@
 					"thermload": 1.1
 				}
 			],
+			"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
+				},
+				{
+					"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
+				}
+			],
 			"rg": [
 				{
 					"ammo": 80,
@@ -10806,6 +11177,128 @@
 					"thermload": 3.6
 				}
 			],
+			"axmr": [
+				{
+					"ammo": 64,
+					"breachdmg": 0.1,
+					"breachmax": 0.8,
+					"breachmin": 1,
+					"class": 2,
+					"clip": 8,
+					"cost": 540900,
+					"damage": 64,
+					"damagedist": {
+						"X": 1
+					},
+					"distdraw": 0.14,
+					"edID": 128788699,
+					"eddbID": 1614,
+					"falloff": 10000,
+					"grp": "axmr",
+					"id": "x4",
+					"integrity": 51,
+					"mass": 4,
+					"missile": "D",
+					"mount": "F",
+					"piercing": 60,
+					"power": 1.2,
+					"rating": "B",
+					"reload": 5,
+					"rof": 0.5,
+					"shotspeed": 750,
+					"thermload": 2.4
+				},
+				{
+					"ammo": 64,
+					"breachdmg": 0.1,
+					"breachmax": 0.8,
+					"breachmin": 1,
+					"class": 2,
+					"clip": 8,
+					"cost": 2022700,
+					"damage": 50,
+					"damagedist": {
+						"X": 1
+					},
+					"distdraw": 0.08,
+					"edID": 128788704,
+					"eddbID": 1615,
+					"falloff": 10000,
+					"grp": "axmr",
+					"id": "x5",
+					"integrity": 51,
+					"mass": 4,
+					"missile": "D",
+					"mount": "T",
+					"piercing": 60,
+					"power": 1.2,
+					"rating": "B",
+					"reload": 5,
+					"rof": 0.5,
+					"shotspeed": 750,
+					"thermload": 1.5
+				},
+				{
+					"ammo": 128,
+					"breachdmg": 0.1,
+					"breachmax": 0.8,
+					"breachmin": 1,
+					"class": 3,
+					"clip": 12,
+					"cost": 1352250,
+					"damage": 64,
+					"damagedist": {
+						"X": 1
+					},
+					"distdraw": 0.24,
+					"edID": 128788700,
+					"eddbID": 1623,
+					"falloff": 10000,
+					"grp": "axmr",
+					"id": "x6",
+					"integrity": 64,
+					"mass": 8,
+					"missile": "D",
+					"mount": "F",
+					"piercing": 60,
+					"power": 1.62,
+					"rating": "A",
+					"reload": 5,
+					"rof": 0.5,
+					"shotspeed": 750,
+					"thermload": 3.6
+				},
+				{
+					"ammo": 128,
+					"breachdmg": 0.1,
+					"breachmax": 0.8,
+					"breachmin": 1,
+					"class": 3,
+					"clip": 12,
+					"cost": 4056750,
+					"damage": 64,
+					"damagedist": {
+						"X": 1
+					},
+					"distdraw": 0.14,
+					"edID": 128788705,
+					"eddbID": 1624,
+					"falloff": 10000,
+					"grp": "axmr",
+					"id": "x7",
+					"integrity": 64,
+					"mass": 8,
+					"missile": "D",
+					"mount": "T",
+					"piercing": 60,
+					"power": 1.75,
+					"rating": "A",
+					"reload": 5,
+					"rof": 0.5,
+					"shotspeed": 750,
+					"thermload": 1.9
+				}
+			],
 			"tp": [
 				{
 					"ammo": 1,
@@ -11474,6 +11967,45 @@
 					"shotspeed": 1000,
 					"thermload": 0.1
 				}
+			],
+			"sfn": [
+				{
+					"class": 0,
+					"cost": 63000,
+					"edID": 128771884,
+					"eddbID": 1622,
+					"grp": "sfn",
+					"id": "sfn",
+					"integrity": 35,
+					"mass": 1.3,
+					"name": "Shutdown Field Neutraliser",
+					"passive": 1,
+					"power": 0.2,
+					"activepower": 0.25,
+					"rating": "F",
+					"cooldown": 10,
+					"duration": 1,
+					"range": 3000
+				}
+			],
+			"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
+				}
 			]
 		},
 		"internal": {
@@ -28809,192 +29341,167 @@
 			}
 		},
 		"modifierActions": {
-			"mod_boot_time": {
+			"OutfittingFieldType_BootTime": {
 				"boot": 1
 			},
-			"mod_defencemodifier_explosive_mult": {
+			"OutfittingFieldType_ExplosiveResistance": {
 				"explres": 1
 			},
-			"mod_defencemodifier_global_hull_mult": {
+			"OutfittingFieldType_DefenceModifierHealthAddition": {
-				"explres": 1,
-				"kinres": 1,
-				"thermres": 1
-			},
-			"mod_defencemodifier_global_shield_mult": {
-				"explres": 1,
-				"kinres": 1,
-				"thermres": 1
-			},
-			"mod_defencemodifier_health_add": {
 				"hullreinforcement": 1
 			},
-			"mod_defencemodifier_health_mult": {
+			"OutfittingFieldType_DefenceModifierHealthMultiplier": {
 				"hullboost": 1
 			},
-			"mod_defencemodifier_kinetic_mult": {
+			"OutfittingFieldType_KineticResistance": {
 				"kinres": 1
 			},
-			"mod_defencemodifier_shield_explosive_mult": {
+			"OutfittingFieldType_DefenceModifierShieldMultiplier": {
-				"explres": 1
-			},
-			"mod_defencemodifier_shield_kinetic_mult": {
-				"kinres": 1
-			},
-			"mod_defencemodifier_shield_mult": {
 				"shieldboost": 1
 			},
-			"mod_defencemodifier_shield_thermic_mult": {
+			"OutfittingFieldType_ThermicResistance": {
 				"thermres": 1
 			},
-			"mod_defencemodifier_thermic_mult": {
+			"OutfittingFieldType_EngineHeatRate": {
-				"thermres": 1
-			},
-			"mod_engine_heat": {
 				"thermload": 1
 			},
-			"mod_engine_mass_curve": {
+			"OutfittingFieldType_EngineOptimalMass": {
 				"optmass": 1
 			},
-			"mod_engine_mass_curve_multiplier": {
+			"OutfittingFieldType_EngineOptPerformance": {
 				"optmul": 1
 			},
-			"mod_fsd_heat_rate": {
+			"OutfittingFieldType_FSDHeatRate": {
 				"thermload": 1
 			},
-			"mod_fsd_max_fuel_per_jump": {
+			"OutfittingFieldType_FSDMaxFuelPerJump": {
 				"maxfuel": 1
 			},
-			"mod_fsd_optimised_mass": {
+			"OutfittingFieldType_FSDOptimalMass": {
 				"optmass": 1
 			},
-			"mod_fsdinterdictor_facing_limit": {
+			"OutfittingFieldType_FSDInterdictorFacingLimit": {
 				"facinglimit": 1
 			},
-			"mod_fsdinterdictor_range": {
+			"OutfittingFieldType_FSDInterdictorRange": {
 				"ranget": 1
 			},
-			"mod_health": {
+			"OutfittingFieldType_Integrity": {
 				"integrity": 1
 			},
-			"mod_mass": {
+			"OutfittingFieldType_Mass": {
 				"mass": 1
 			},
-			"mod_passive_power": {
+			"OutfittingFieldType_SensorTargetScanAngle": {
-				"power": 1
+				"angle": 1
 			},
-			"mod_powerdistributor_engine_charge": {
+			"OutfittingFieldType_DSS_RateMult": {
-				"engcap": 1
+				"scanrate": 1
 			},
-			"mod_powerdistributor_engine_rate": {
+			"OutfittingFieldType_ScannerTimeToScan": {
-				"engrate": 1
+				"scantime": 1
 			},
-			"mod_powerdistributor_global_charge": {
+			"OutfittingFieldType_ScannerRange": {
-				"engcap": 1,
-				"syscap": 1,
-				"wepcap": 1
-			},
-			"mod_powerdistributor_global_rate": {
-				"engrate": 1,
-				"sysrate": 1,
-				"weprate": 1
-			},
-			"mod_powerdistributor_system_charge": {
-				"syscap": 1
-			},
-			"mod_powerdistributor_system_rate": {
-				"sysrate": 1
-			},
-			"mod_powerdistributor_weapon_charge": {
-				"wepcap": 1
-			},
-			"mod_powerdistributor_weapon_rate": {
-				"weprate": 1
-			},
-			"mod_powerplant_heat": {
-				"eff": 1
-			},
-			"mod_powerplant_power": {
-				"pgen": 1
-			},
-			"mod_shield_broken_regen": {
-				"brokenregen": 1
-			},
-			"mod_shield_energy_per_regen": {
-				"distdraw": 1
-			},
-			"mod_shield_explosive_mult": {
-				"explres": 1
-			},
-			"mod_shield_global_mult": {
-				"explres": 1,
-				"kinres": 1,
-				"thermres": 1
-			},
-			"mod_shield_kinetic_mult": {
-				"kinres": 1
-			},
-			"mod_shield_mass_curve": {
-				"optmass": 1
-			},
-			"mod_shield_mass_curve_multiplier": {
-				"optmul": 1
-			},
-			"mod_shield_normal_regen": {
-				"regen": 1
-			},
-			"mod_shield_thermal_mult": {
-				"thermres": 1
-			},
-			"mod_shieldcell_charge_heat": {
-				"thermload": 1
-			},
-			"mod_shieldcell_duration": {
-				"duration": 1
-			},
-			"mod_shieldcell_shield_units": {
-				"shieldreinforcement": 1
-			},
-			"mod_shieldcell_spin_up": {
-				"spinup": 1
-			},
-			"mod_weapon_active_heat": {
-				"thermload": 1
-			},
-			"mod_weapon_active_power": {
-				"distdraw": 1
-			},
-			"mod_weapon_ammo_capacity": {
-				"ammo": 1
-			},
-			"mod_weapon_burst_interval": {
-				"rof": 1
-			},
-			"mod_weapon_burst_rof": {
-				"burstrof": 1
-			},
-			"mod_weapon_burst_size": {
-				"burst": 1
-			},
-			"mod_weapon_clip_size": {
-				"clip": 1
-			},
-			"mod_weapon_clip_size_override": {
-				"clip": 1
-			},
-			"mod_weapon_damage": {
-				"damage": 1
-			},
-			"mod_weapon_falloffrange_from_range": {},
-			"mod_weapon_hardness_piercing": {
-				"piercing": 1
-			},
-			"mod_weapon_jitter_radius": {
-				"jitter": 1
-			},
-			"mod_weapon_range": {
 				"range": 1
 			},
-			"mod_weapon_reload_time": {
+			"OutfittingFieldType_MaxAngle": {
+				"angle": 1
+			},
+			"OutfittingFieldType_Range": {
+				"range": 1
+			},
+			"OutfittingFieldType_PowerDraw": {
+				"power": 1
+			},
+			"OutfittingFieldType_EnginesCapacity": {
+				"engcap": 1
+			},
+			"OutfittingFieldType_EnginesRecharge": {
+				"engrate": 1
+			},
+			"OutfittingFieldType_SystemsCapacity": {
+				"syscap": 1
+			},
+			"OutfittingFieldType_SystemsRecharge": {
+				"sysrate": 1
+			},
+			"OutfittingFieldType_WeaponsCapacity": {
+				"wepcap": 1
+			},
+			"OutfittingFieldType_WeaponsRecharge": {
+				"weprate": 1
+			},
+			"OutfittingFieldType_HeatEfficiency": {
+				"eff": 1
+			},
+			"OutfittingFieldType_PowerCapacity": {
+				"pgen": 1
+			},
+			"OutfittingFieldType_BrokenRegenRate": {
+				"brokenregen": 1
+			},
+			"OutfittingFieldType_EnergyPerRegen": {
+				"distdraw": 1
+			},
+			"OutfittingFieldType_ShieldGenOptimalMass": {
+				"optmass": 1
+			},
+			"OutfittingFieldType_ShieldGenStrength": {
+				"optmul": 1
+			},
+			"OutfittingFieldType_RegenRate": {
+				"regen": 1
+			},
+			"OutfittingFieldType_ShieldBankHeat": {
+				"thermload": 1
+			},
+			"OutfittingFieldType_ShieldBankDuration": {
+				"duration": 1
+			},
+			"OutfittingFieldType_ShieldBankReinforcement": {
+				"shieldreinforcement": 1
+			},
+			"OutfittingFieldType_ShieldBankSpinUp": {
+				"spinup": 1
+			},
+			"OutfittingFieldType_ThermalLoad": {
+				"thermload": 1
+			},
+			"OutfittingFieldType_DistributorDraw": {
+				"distdraw": 1
+			},
+			"OutfittingFieldType_AmmoMaximum": {
+				"ammo": 1
+			},
+			"OutfittingFieldType_RateOfFire": {
+				"rof": 1
+			},
+			"OutfittingFieldType_weapon_burst_rof": {
+				"burstrof": 1
+			},
+			"OutfittingFieldType_weapon_burst_size": {
+				"burst": 1
+			},
+			"OutfittingFieldType_AmmoClipSize": {
+				"clip": 1
+			},
+			"OutfittingFieldType_weapon_clip_size_override": {
+				"clip": 1
+			},
+			"OutfittingFieldType_Damage": {
+				"damage": 1
+			},
+			"OutfittingFieldType_weapon_falloffrange_from_range": {},
+			"OutfittingFieldType_ArmourPenetration": {
+				"piercing": 1
+			},
+			"OutfittingFieldType_Jitter": {
+				"jitter": 1
+			},
+			"OutfittingFieldType_MaximumRange": {
+				"range": 1
+			},
+			"OutfittingFieldType_ReloadTime": {
 				"reload": 1
 			},
 			"special_auto_loader": {},
@@ -30820,6 +31327,10 @@
 					"special_screening_shell"
 				]
 			},
+			"rfl": {
+				"blueprints": {},
+				"modifications": []
+			},
 			"fh": {
 				"blueprints": {},
 				"modifications": []
@@ -32182,6 +32693,10 @@
 					"special_thermalshock"
 				]
 			},
+			"axmc": {
+				"blueprints": {},
+				"modifications": []
+			},
 			"ml": {
 				"blueprints": {},
 				"modifications": []
@@ -32349,6 +32864,10 @@
 					"special_thermal_cascade"
 				]
 			},
+			"axmr": {
+				"blueprints": {},
+				"modifications": []
+			},
 			"mrp": {
 				"blueprints": {},
 				"modifications": []
@@ -34346,6 +34865,10 @@
 					"thermres"
 				]
 			},
+			"sfn": {
+				"blueprints": {},
+				"modifications": []
+			},
 			"sc": {
 				"blueprints": {},
 				"modifications": []
@@ -34724,6 +35247,10 @@
 					"scanrate"
 				]
 			},
+			"xs": {
+				"blueprints": {},
+				"modifications": []
+			},
 			"t": {
 				"blueprints": {
 					"Engine_Dirty": {

modifications/modifierActions.json

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

modifications/modules.json

@@ -1647,6 +1647,12 @@
       "special_screening_shell"
     ]
   },
+  "rfl": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "fh": {
     "blueprints": {
     },
@@ -3013,6 +3019,12 @@
       "special_thermalshock"
     ]
   },
+  "axmc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "ml": {
     "blueprints": {
     },
@@ -3182,6 +3194,12 @@
       "special_thermal_cascade"
     ]
   },
+  "axmr": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "mrp": {
     "blueprints": {
     },
@@ -5193,6 +5211,12 @@
       "thermres"
     ]
   },
+  "sfn": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "sc": {
     "blueprints": {
     },
@@ -5573,7 +5597,12 @@
       "scanrate"
     ]
   },
-
+  "xs": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "t": {
     "blueprints": {
       "Engine_Dirty": {

modules/hardpoints/ax_missile_rack.json

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

modules/hardpoints/ax_multi_cannon.json

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

modules/hardpoints/remote_release_flak_launcher.json

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

modules/hardpoints/shutdown_field_neutraliser.json

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

modules/hardpoints/xeno_scanner.json

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

modules/index.js

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

package-lock.json

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

package.json

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

ships/index.js

@@ -27,6 +27,7 @@ module.exports = {
   type_6_transporter: require('./type_6_transporter').type_6_transporter,
   type_7_transport: require('./type_7_transport').type_7_transport,
   type_9_heavy: require('./type_9_heavy').type_9_heavy,
+  type_10_defender: require('./type_10_defender').type_10_defender,
   viper: require('./viper').viper,
   viper_mk_iv: require('./viper_mk_iv').viper_mk_iv,
   vulture: require('./vulture').vulture

ships/type_10_defender.json

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