Merge branch 'release/2.2.13'

ChangeLog.md

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

dist/index.js

@@ -1949,7 +1949,7 @@ module.exports = {
         name: "Keelback",
         manufacturer: "Lakon",
         class: 2,
-        hullCost: 2943880,
+        hullCost: 2943870,
         speed: 200,
         boost: 300,
         boostEnergy: 10,
@@ -2240,7 +2240,7 @@ module.exports = {
         name: "Sidewinder",
         manufacturer: "Faulcon DeLacy",
         class: 1,
-        hullCost: 12870,
+        hullCost: 4070,
         speed: 220,
         boost: 320,
         boostEnergy: 7,
@@ -2254,7 +2254,7 @@ module.exports = {
         roll: 110,
         yaw: 16
       },
-      retailCost: 40800,
+      retailCost: 32e3,
       bulkheads: [ {
         id: "b0",
         edID: 128049250,
@@ -6411,6 +6411,7 @@ module.exports = {
           T: 1
         },
         distdraw: .9,
+        edID: 128671342,
         eddbID: 1483,
         falloff: 500,
         grp: "pl",
@@ -7272,6 +7273,7 @@ module.exports = {
           K: 1
         },
         distdraw: .12,
+        edID: 128671345,
         eddbID: 1481,
         falloff: 1800,
         grp: "mc",
@@ -8704,6 +8706,7 @@ module.exports = {
           T: 1
         },
         distdraw: 1.75,
+        edID: 128671347,
         eddbID: 1479,
         falloff: 400,
         grp: "ml",
@@ -14092,6 +14095,25 @@ module.exports = {
     blueprints: {
       AFM_Shielded: {
         id: 3,
+        components: {
+          "1": {
+            "Worn Shield Emitters": 1
+          },
+          "2": {
+            Carbon: 1,
+            "Shield Emitters": 1
+          },
+          "3": {
+            Carbon: 1,
+            "High Density Composites": 1,
+            "Shield Emitters": 1
+          },
+          "4": {
+            "Proprietary Composites": 1,
+            "Shielding Sensors": 1,
+            Vanadium: 1
+          }
+        },
         features: {
           "1": {
             integrity: [ .2, .5 ],
@@ -14108,16 +14130,36 @@ module.exports = {
           "4": {
             integrity: [ .81, 2 ],
             power: [ 1.2, .79 ]
-          },
-          "5": {
-            integrity: [ 1, 2.5 ],
-            power: [ 1.5, 1 ]
           }
         },
         name: "Shielded"
       },
       Armour_Kinetic: {
         id: 4,
+        components: {
+          "1": {
+            Nickel: 1
+          },
+          "2": {
+            Nickel: 1,
+            Vanadium: 1
+          },
+          "3": {
+            "High Density Composites": 1,
+            "Salvaged Alloys": 1,
+            Vanadium: 1
+          },
+          "4": {
+            "Galvanising Alloys": 1,
+            "Proprietary Composites": 1,
+            Tungsten: 1
+          },
+          "5": {
+            "Core Dynamics Composites": 1,
+            Molybdenum: 1,
+            "Phase Alloys": 1
+          }
+        },
         features: {
           "1": {
             explres: [ -.056, -.028 ],
@@ -14149,6 +14191,29 @@ module.exports = {
       },
       Armour_Explosive: {
         id: 5,
+        components: {
+          "1": {
+            Nickel: 1
+          },
+          "2": {
+            Carbon: 1,
+            Zinc: 1
+          },
+          "3": {
+            "Salvaged Alloys": 1,
+            Vanadium: 1
+          },
+          "4": {
+            "Galvanising Alloys": 1,
+            Mercury: 1,
+            Tungsten: 1
+          },
+          "5": {
+            Molybdenum: 1,
+            "Phase Alloys": 1,
+            Ruthenium: 1
+          }
+        },
         features: {
           "1": {
             explres: [ .07, .112 ],
@@ -14180,6 +14245,20 @@ module.exports = {
       },
       Armour_Advanced: {
         id: 6,
+        components: {
+          "1": {
+            Iron: 1
+          },
+          "2": {
+            "Conductive Components": 1,
+            Iron: 1
+          },
+          "3": {
+            "Conductive Components": 1,
+            "High Density Composites": 1,
+            Iron: 1
+          }
+        },
         features: {
           "1": {
             explres: [ 0, .028 ],
@@ -14616,76 +14695,124 @@ module.exports = {
       },
       Engine_Dirty: {
         id: 22,
+        components: {
+          "1": {
+            "Specialised Legacy Firmware": 1
+          },
+          "2": {
+            "Mechanical Equipment": 1,
+            "Specialised Legacy Firmware": 1
+          },
+          "3": {
+            Chromium: 1,
+            "Mechanical Equipment": 1,
+            "Specialised Legacy Firmware": 1
+          },
+          "4": {
+            "Configurable Components": 1,
+            "Modified Consumer Firmware": 1,
+            Selenium: 1
+          },
+          "5": {
+            Cadmium: 1,
+            "Cracked Industrial Firmware": 1,
+            "Pharmaceutical Isolators": 1
+          }
+        },
         features: {
           "1": {
             integrity: [ -.06, 0 ],
-            optmass: [ -.03, 0 ],
+            optmass: [ -.04, 0 ],
-            optmul: [ .05, .1 ],
+            optmul: [ .04, .1 ],
             power: [ -.04, 0 ],
             thermload: [ -.2, 0 ]
           },
           "2": {
-            integrity: [ -.12, .02 ],
+            integrity: [ -.12, .01 ],
             optmass: [ -.06, -.01 ],
-            optmul: [ .1, .15 ],
+            optmul: [ .1, .14 ],
             power: [ -.08, .02 ],
-            thermload: [ -.4, .1 ]
+            thermload: [ -.39, .1 ]
           },
           "3": {
             integrity: [ -.18, .04 ],
-            optmass: [ -.09, -.02 ],
+            optmass: [ -.1, -.02 ],
-            optmul: [ .15, .2 ],
+            optmul: [ .14, .2 ],
-            power: [ -.12, .04 ],
+            power: [ -.11, .03 ],
-            thermload: [ -.6, .2 ]
+            thermload: [ -.61, .2 ]
           },
           "4": {
-            integrity: [ -.24, .06 ],
+            integrity: [ -.24, .05 ],
-            optmass: [ -.12, -.03 ],
+            optmass: [ -.12, -.04 ],
             optmul: [ .2, .25 ],
-            power: [ -.16, .06 ],
+            power: [ -.15, .05 ],
-            thermload: [ -.8, .3 ]
+            thermload: [ -.79, .29 ]
           },
           "5": {
-            integrity: [ -.3, .08 ],
+            integrity: [ -.31, .08 ],
-            optmass: [ -.15, -.04 ],
+            optmass: [ -.16, -.05 ],
-            optmul: [ .25, .3 ],
+            optmul: [ .25, .29 ],
             power: [ -.2, .08 ],
-            thermload: [ -1, .4 ]
+            thermload: [ -1, .39 ]
           }
         },
         name: "Dirty"
       },
       Engine_Reinforced: {
         id: 23,
-        features: {
+        components: {
           "1": {
-            integrity: [ .15, .3 ],
+            Carbon: 1
-            mass: [ .1, 0 ],
-            optmul: [ -.02, 0 ],
-            thermload: [ 0, -.1 ]
           },
           "2": {
-            integrity: [ .3, .5 ],
+            "Heat Conduction Wiring": 1,
+            Vanadium: 1
+          },
+          "3": {
+            "Heat Conduction Wiring": 1,
+            "Shielding Sensors": 1,
+            Vanadium: 1
+          },
+          "4": {
+            "Compound Shielding": 1,
+            "Heat Dispersion Plate": 1,
+            "High Density Composites": 1
+          },
+          "5": {
+            "Heat Exchangers": 1,
+            "Imperial Shielding": 1,
+            "Proprietary Composites": 1
+          }
+        },
+        features: {
+          "1": {
+            integrity: [ .14, .31 ],
+            mass: [ .1, 0 ],
+            optmul: [ -.03, 0 ],
+            thermload: [ 0, -.11 ]
+          },
+          "2": {
+            integrity: [ .31, .5 ],
             mass: [ .2, .05 ],
-            optmul: [ -.04, -.01 ],
+            optmul: [ -.05, -.02 ],
-            thermload: [ -.05, -.2 ]
+            thermload: [ -.06, -.2 ]
           },
           "3": {
             integrity: [ .45, .7 ],
-            mass: [ .3, .1 ],
+            mass: [ .31, .1 ],
-            optmul: [ -.06, -.02 ],
+            optmul: [ -.06, -.03 ],
-            thermload: [ -.1, -.3 ]
+            thermload: [ -.11, -.31 ]
           },
           "4": {
-            integrity: [ .6, .9 ],
+            integrity: [ .61, .9 ],
-            mass: [ .4, .15 ],
+            mass: [ .39, .14 ],
-            optmul: [ -.08, -.04 ],
+            optmul: [ -.09, -.04 ],
             thermload: [ -.15, -.4 ]
           },
           "5": {
-            integrity: [ .75, 1.1 ],
+            integrity: [ .75, 1.11 ],
             mass: [ .5, .2 ],
-            optmul: [ -.1, -.04 ],
+            optmul: [ -.11, -.05 ],
             thermload: [ -.2, -.5 ]
           }
         },
@@ -14693,41 +14820,65 @@ module.exports = {
       },
       Engine_Tuned: {
         id: 24,
+        components: {
+          "1": {
+            Sulphur: 1
+          },
+          "2": {
+            "Conductive Components": 1,
+            "Specialised Legacy Firmware": 1
+          },
+          "3": {
+            "Conductive Components": 1,
+            "Specialised Legacy Firmware": 1,
+            "Unexpected Emission Data": 1
+          },
+          "4": {
+            "Conductive Ceramics": 1,
+            "Decoded Emission Data": 1,
+            "Modified Consumer Firmware": 1
+          },
+          "5": {
+            "Abnormal Compact Emissions Data": 1,
+            "Conductive Ceramics": 1,
+            Tin: 1
+          }
+        },
         features: {
           "1": {
             integrity: [ -.05, 0 ],
             optmass: [ -.02, 0 ],
-            optmul: [ .02, .06 ],
+            optmul: [ .01, .05 ],
-            power: [ .05, 0 ],
+            power: [ .04, 0 ],
-            thermload: [ -.05, -.2 ]
+            thermload: [ -.06, -.2 ]
           },
           "2": {
             integrity: [ -.1, -.04 ],
-            optmass: [ -.04, -.01 ],
+            optmass: [ -.05, -.01 ],
-            optmul: [ .04, .09 ],
+            optmul: [ .03, .09 ],
-            power: [ .1, .04 ],
+            power: [ .1, .03 ],
-            thermload: [ -.1, -.3 ]
+            thermload: [ -.11, -.31 ]
           },
           "3": {
             integrity: [ -.15, -.08 ],
             optmass: [ -.06, -.02 ],
-            optmul: [ .06, .12 ],
+            optmul: [ .05, .12 ],
-            power: [ .15, .08 ],
+            power: [ .14, .08 ],
             thermload: [ -.15, -.4 ]
           },
           "4": {
             integrity: [ -.2, -.12 ],
-            optmass: [ -.08, -.03 ],
+            optmass: [ -.08, -.04 ],
-            optmul: [ .08, .15 ],
+            optmul: [ .08, .14 ],
-            power: [ .2, .12 ],
+            power: [ .2, .11 ],
             thermload: [ -.2, -.5 ]
           },
           "5": {
             integrity: [ -.25, -.16 ],
-            optmass: [ -.12, -.04 ],
+            optmass: [ -.11, -.05 ],
             optmul: [ .1, .18 ],
             power: [ .25, .16 ],
-            thermload: [ -.25, -.6 ]
+            thermload: [ -.25, -.61 ]
           }
         },
         name: "Clean"
@@ -15402,6 +15553,25 @@ module.exports = {
       },
       LifeSupport_LightWeight: {
         id: 49,
+        components: {
+          "1": {
+            Phosphorus: 1
+          },
+          "2": {
+            Manganese: 1,
+            "Salvaged Alloys": 1
+          },
+          "3": {
+            "Conductive Ceramics": 1,
+            Manganese: 1,
+            "Salvaged Alloys": 1
+          },
+          "4": {
+            "Conductive Components": 1,
+            "Phase Alloys": 1,
+            "Proto Light Alloys": 1
+          }
+        },
         features: {
           "1": {
             integrity: [ -.2, -.1 ],
@@ -15418,16 +15588,31 @@ module.exports = {
           "4": {
             integrity: [ -.5, -.4 ],
             mass: [ -.6, -.7 ]
-          },
-          "5": {
-            integrity: [ -.6, -.5 ],
-            mass: [ -.7, -.8 ]
           }
         },
         name: "Lightweight"
       },
       LifeSupport_Reinforced: {
         id: 50,
+        components: {
+          "1": {
+            Nickel: 1
+          },
+          "2": {
+            Nickel: 1,
+            "Shield Emitters": 1
+          },
+          "3": {
+            Nickel: 1,
+            "Shield Emitters": 1,
+            Tungsten: 1
+          },
+          "4": {
+            Molybdenum: 1,
+            Tungsten: 1,
+            Zinc: 1
+          }
+        },
         features: {
           "1": {
             integrity: [ .2, .5 ],
@@ -15444,16 +15629,31 @@ module.exports = {
           "4": {
             integrity: [ .8, 2 ],
             mass: [ 2.5, 1.6 ]
-          },
-          "5": {
-            integrity: [ 1, 2.5 ],
-            mass: [ 3, 2 ]
           }
         },
         name: "Reinforced"
       },
       LifeSupport_Shielded: {
         id: 51,
+        components: {
+          "1": {
+            "Worn Shield Emitters": 1
+          },
+          "2": {
+            Carbon: 1,
+            "Shield Emitters": 1
+          },
+          "3": {
+            Carbon: 1,
+            "High Density Composites": 1,
+            "Shield Emitters": 1
+          },
+          "4": {
+            "Proprietary Composites": 1,
+            "Sielding Sensors": 1,
+            Vanadium: 1
+          }
+        },
         features: {
           "1": {
             integrity: [ .2, .5 ],
@@ -15470,10 +15670,6 @@ module.exports = {
           "4": {
             integrity: [ .8, 2 ],
             power: [ 1.2, .8 ]
-          },
-          "5": {
-            integrity: [ 1, 1.5 ],
-            power: [ 1.5, 1 ]
           }
         },
         name: "Shielded"
@@ -15938,6 +16134,25 @@ module.exports = {
       },
       Refineries_Shielded: {
         id: 92,
+        components: {
+          "1": {
+            "Worn Shield Emitters": 1
+          },
+          "2": {
+            Carbon: 1,
+            "Shield Emitters": 1
+          },
+          "3": {
+            Carbon: 1,
+            "High Density Composites": 1,
+            "Shield Emitters": 1
+          },
+          "4": {
+            "Proprietary Composites": 1,
+            "Shielding Sensors": 1,
+            Vanadium: 1
+          }
+        },
         features: {
           "1": {
             integrity: [ .2, .5 ],
@@ -16339,6 +16554,20 @@ module.exports = {
       },
       WakeScanner_LightWeight: {
         id: 79,
+        components: {
+          "1": {
+            Phosphorus: 1
+          },
+          "2": {
+            Manganese: 1,
+            "Salvaged Alloys": 1
+          },
+          "3": {
+            "Conductive Ceramics": 1,
+            Manganese: 1,
+            "Salvaged Alloys": 1
+          }
+        },
         features: {
           "1": {
             integrity: [ -.2, -.1 ],
@@ -16351,20 +16580,26 @@ module.exports = {
           "3": {
             integrity: [ -.4, -.3 ],
             mass: [ -.5, -.6 ]
-          },
-          "4": {
-            integrity: [ -.5, -.4 ],
-            mass: [ -.6, -.7 ]
-          },
-          "5": {
-            integrity: [ -.6, -.5 ],
-            mass: [ -.7, -.8 ]
           }
         },
         name: "Lightweight"
       },
       WakeScanner_Shielded: {
         id: 80,
+        components: {
+          "1": {
+            "Worn Shield Emitters": 1
+          },
+          "2": {
+            Carbon: 1,
+            "Shield Emitters": 1
+          },
+          "3": {
+            Carbon: 1,
+            "High Density Composites": 1,
+            "Shield Emitters": 1
+          }
+        },
         features: {
           "1": {
             integrity: [ .2, .5 ],
@@ -16377,20 +16612,26 @@ module.exports = {
           "3": {
             integrity: [ .6, 1.5 ],
             power: [ .9, .6 ]
-          },
-          "4": {
-            integrity: [ .8, 2 ],
-            power: [ 1.2, .8 ]
-          },
-          "5": {
-            integrity: [ 1, 1.5 ],
-            power: [ 1.5, 1 ]
           }
         },
         name: "Shielded"
       },
       WakeScanner_Reinforced: {
         id: 81,
+        components: {
+          "1": {
+            Nickel: 1
+          },
+          "2": {
+            Nickel: 1,
+            "Shield Emitters": 1
+          },
+          "3": {
+            Nickel: 1,
+            "Shield Emitters": 1,
+            Tungsten: 1
+          }
+        },
         features: {
           "1": {
             integrity: [ .2, .5 ],
@@ -16403,14 +16644,6 @@ module.exports = {
           "3": {
             integrity: [ .6, 1.5 ],
             mass: [ 2, 1.2 ]
-          },
-          "4": {
-            integrity: [ .8, 2 ],
-            mass: [ 2.5, 1.6 ]
-          },
-          "5": {
-            integrity: [ 1, 2.5 ],
-            mass: [ 3, 2 ]
           }
         },
         name: "Reinforced"
@@ -17113,6 +17346,12 @@ module.exports = {
         type: "percentage",
         method: "multiplicative"
       },
+      falloff: {
+        id: 45,
+        name: "falloff",
+        type: "percentage",
+        method: "multiplicative"
+      },
       fallofffromrange: {
         id: 42,
         name: "fallofffromrange",
@@ -17191,6 +17430,12 @@ module.exports = {
         type: "percentage",
         method: "multiplicative"
       },
+      protection: {
+        id: 44,
+        name: "protection",
+        type: "percentage",
+        method: "multiplicative"
+      },
       range: {
         id: 25,
         name: "range",
@@ -17666,7 +17911,8 @@ module.exports = {
           Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "thermload" ]
+        modifications: [ "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "thermload" ],
+        specials: [ "special_concordant_sequence", "special_regeneration_sequence", "special_thermal_conduit", "special_thermalshock", "special_thermal_vent" ]
       },
       bsg: {
         blueprints: {
@@ -17688,7 +17934,8 @@ module.exports = {
           Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ]
+        modifications: [ "ammo", "clip", "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
+        specials: [ "special_auto_loader", "special_dispersal_field", "special_smart_rounds", "special_force_shell", "special_high_yield_shell", "special_thermal_cascade" ]
       },
       cc: {
         blueprints: {
@@ -17742,7 +17989,8 @@ module.exports = {
           Weapon_RapidFire: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ]
+        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" ]
       },
       fh: {
         blueprints: {},
@@ -17835,7 +18083,8 @@ module.exports = {
           Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ]
+        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" ]
       },
       ml: {
         blueprints: {},
@@ -17848,7 +18097,8 @@ module.exports = {
           Weapon_RapidFire: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "reload", "rof", "thermload" ]
+        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "reload", "rof", "thermload" ],
+        specials: [ "special_drag_munitions", "special_emissive_munitions", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ]
       },
       mrp: {
         blueprints: {},
@@ -17861,7 +18111,8 @@ module.exports = {
           Weapon_RapidFire: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "ammo", "boot", "clip", "damage", "damagedist", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "reload", "rof", "thermload" ]
+        modifications: [ "ammo", "boot", "clip", "damage", "damagedist", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "reload", "rof", "thermload" ],
+        specials: [ "special_ion_disruptor", "special_overload_munitions", "special_radiant_canister", "special_reverberating_cascade", "special_shiftlock_canister", "special_emissive_munitions" ]
       },
       pa: {
         blueprints: {
@@ -17874,7 +18125,8 @@ module.exports = {
           Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ]
+        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
+        specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_target_lock_breaker", "special_thermal_conduit" ]
       },
       pas: {
         blueprints: {},
@@ -17926,7 +18178,8 @@ module.exports = {
           Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ]
+        modifications: [ "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
+        specials: [ "special_concordant_sequence", "special_emissive_munitions", "special_phasing_sequence", "special_scramble_spectrum", "special_thermalshock" ]
       },
       po: {
         blueprints: {
@@ -17972,7 +18225,8 @@ module.exports = {
           Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ]
+        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
+        specials: [ "special_feedback_cascade", "special_plasma_slug", "special_super_penetrator" ]
       },
       s: {
         blueprints: {},
@@ -18021,7 +18275,8 @@ module.exports = {
           Weapon_LightWeight: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ]
+        modifications: [ "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
+        specials: [ "special_mass_lock_munition", "special_penetrator_payload", "special_reverberating_cascade" ]
       },
       ul: {
         blueprints: {
@@ -18034,7 +18289,8 @@ module.exports = {
           Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
           Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "burst", "burstrof", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ]
+        modifications: [ "burst", "burstrof", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
+        specials: [ "special_concordant_sequence", "special_inertial_impact", "special_phasing_sequence", "special_scramble_spectrum", "special_thermalshock" ]
       },
       ws: {
         blueprints: {
@@ -18048,134 +18304,167 @@ module.exports = {
     specials: {
       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_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_target_lock_breaker: {
         id: 27,
+        edname: "special_target_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"
       }
     }

modifications/blueprints.json

@@ -1,6 +1,25 @@
 {
   "AFM_Shielded": {
     "id": 3,
+    "components": {
+      "1": {
+        "Worn Shield Emitters": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Carbon": 1,
+        "High Density Composites": 1,
+        "Shield Emitters": 1
+      },
+      "4": {
+        "Proprietary Composites": 1,
+        "Shielding Sensors": 1,
+        "Vanadium": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -17,16 +36,36 @@
       "4": {
         "integrity": [ 0.81, 2 ],
         "power": [ 1.2, 0.79 ]
-      },
-      "5": {
-        "integrity": [ 1, 2.5 ],
-        "power": [ 1.5, 1 ]
       }
     },
     "name": "Shielded"
   },
   "Armour_Kinetic": {
     "id": 4,
+    "components": {
+      "1": {
+        "Nickel": 1
+      },
+      "2": {
+        "Nickel": 1,
+        "Vanadium": 1
+      },
+      "3": {
+        "High Density Composites": 1,
+        "Salvaged Alloys": 1,
+        "Vanadium": 1
+      },
+      "4": {
+        "Galvanising Alloys": 1,
+        "Proprietary Composites": 1,
+        "Tungsten": 1
+      },
+      "5": {
+        "Core Dynamics Composites": 1,
+        "Molybdenum": 1,
+        "Phase Alloys": 1
+      }
+    },
     "features": {
       "1": {
         "explres": [ -0.056, -0.028 ],
@@ -58,6 +97,29 @@
   },
   "Armour_Explosive": {
     "id": 5,
+    "components": {
+      "1": {
+        "Nickel": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Zinc": 1
+      },
+      "3": {
+        "Salvaged Alloys": 1,
+        "Vanadium": 1
+      },
+      "4": {
+        "Galvanising Alloys": 1,
+        "Mercury": 1,
+        "Tungsten": 1
+      },
+      "5": {
+        "Molybdenum": 1,
+        "Phase Alloys": 1,
+        "Ruthenium": 1
+      }
+    },
     "features": {
       "1": {
         "explres": [ 0.07, 0.112 ],
@@ -89,6 +151,20 @@
   },
   "Armour_Advanced": {
     "id": 6,
+    "components": {
+      "1": {
+        "Iron": 1
+      },
+      "2": {
+        "Conductive Components": 1,
+        "Iron": 1
+      },
+      "3": {
+        "Conductive Components": 1,
+        "High Density Composites": 1,
+        "Iron": 1
+      }
+    },
     "features": {
       "1": {
         "explres": [ 0, 0.028 ],
@@ -525,76 +601,124 @@
   },
   "Engine_Dirty": {
     "id": 22,
+    "components": {
+      "1": {
+        "Specialised Legacy Firmware": 1
+      },
+      "2": {
+        "Mechanical Equipment": 1,
+        "Specialised Legacy Firmware": 1
+      },
+      "3": {
+        "Chromium": 1,
+        "Mechanical Equipment": 1,
+        "Specialised Legacy Firmware": 1
+      },
+      "4": {
+        "Configurable Components": 1,
+        "Modified Consumer Firmware": 1,
+        "Selenium": 1
+      },
+      "5": {
+        "Cadmium": 1,
+        "Cracked Industrial Firmware": 1,
+        "Pharmaceutical Isolators": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ -0.06, 0 ],
-        "optmass": [ -0.03, 0 ],
+        "optmass": [ -0.04, 0 ],
-        "optmul": [ 0.05, 0.1 ],
+        "optmul": [ 0.04, 0.1 ],
         "power": [ -0.04, 0 ],
         "thermload": [ -0.2, 0 ]
       },
       "2": {
-        "integrity": [ -0.12, 0.02 ],
+        "integrity": [ -0.12, 0.01 ],
         "optmass": [ -0.06, -0.01 ],
-        "optmul": [ 0.1, 0.15 ],
+        "optmul": [ 0.1, 0.14 ],
         "power": [ -0.08, 0.02 ],
-        "thermload": [ -0.4, 0.1 ]
+        "thermload": [ -0.39, 0.1 ]
       },
       "3": {
         "integrity": [ -0.18, 0.04 ],
-        "optmass": [ -0.09, -0.02 ],
+        "optmass": [ -0.1, -0.02 ],
-        "optmul": [ 0.15, 0.2 ],
+        "optmul": [ 0.14, 0.2 ],
-        "power": [ -0.12, 0.04 ],
+        "power": [ -0.11, 0.03 ],
-        "thermload": [ -0.6, 0.2 ]
+        "thermload": [ -0.61, 0.2 ]
       },
       "4": {
-        "integrity": [ -0.24, 0.06 ],
+        "integrity": [ -0.24, 0.05 ],
-        "optmass": [ -0.12, -0.03 ],
+        "optmass": [ -0.12, -0.04 ],
         "optmul": [ 0.2, 0.25 ],
-        "power": [ -0.16, 0.06 ],
+        "power": [ -0.15, 0.05 ],
-        "thermload": [ -0.8, 0.3 ]
+        "thermload": [ -0.79, 0.29 ]
       },
       "5": {
-        "integrity": [ -0.3, 0.08 ],
+        "integrity": [ -0.31, 0.08 ],
-        "optmass": [ -0.15, -0.04 ],
+        "optmass": [ -0.16, -0.05 ],
-        "optmul": [ 0.25, 0.3 ],
+        "optmul": [ 0.25, 0.29 ],
         "power": [ -0.2, 0.08 ],
-        "thermload": [ -1, 0.4 ]
+        "thermload": [ -1, 0.39 ]
       }
     },
     "name": "Dirty"
   },
   "Engine_Reinforced": {
     "id": 23,
-    "features": {
+    "components": {
       "1": {
-        "integrity": [ 0.15, 0.3 ],
+        "Carbon": 1
-        "mass": [ 0.1, 0 ],
-        "optmul": [ -0.02, 0 ],
-        "thermload": [ 0, -0.1 ]
       },
       "2": {
-        "integrity": [ 0.3, 0.5 ],
+        "Heat Conduction Wiring": 1,
+        "Vanadium": 1
+      },
+      "3": {
+        "Heat Conduction Wiring": 1,
+        "Shielding Sensors": 1,
+        "Vanadium": 1
+      },
+      "4": {
+        "Compound Shielding": 1,
+        "Heat Dispersion Plate": 1,
+        "High Density Composites": 1
+      },
+      "5": {
+        "Heat Exchangers": 1,
+        "Imperial Shielding": 1,
+        "Proprietary Composites": 1
+      }
+    },
+    "features": {
+      "1": {
+        "integrity": [ 0.14, 0.31 ],
+        "mass": [ 0.1, 0 ],
+        "optmul": [ -0.03, 0 ],
+        "thermload": [ 0, -0.11 ]
+      },
+      "2": {
+        "integrity": [ 0.31, 0.5 ],
         "mass": [ 0.2, 0.05 ],
-        "optmul": [ -0.04, -0.01 ],
+        "optmul": [ -0.05, -0.02 ],
-        "thermload": [ -0.05, -0.2 ]
+        "thermload": [ -0.06, -0.2 ]
       },
       "3": {
         "integrity": [ 0.45, 0.7 ],
-        "mass": [ 0.3, 0.1 ],
+        "mass": [ 0.31, 0.1 ],
-        "optmul": [ -0.06, -0.02 ],
+        "optmul": [ -0.06, -0.03 ],
-        "thermload": [ -0.1, -0.3 ]
+        "thermload": [ -0.11, -0.31 ]
       },
       "4": {
-        "integrity": [ 0.6, 0.9 ],
+        "integrity": [ 0.61, 0.9 ],
-        "mass": [ 0.4, 0.15 ],
+        "mass": [ 0.39, 0.14 ],
-        "optmul": [ -0.08, -0.04 ],
+        "optmul": [ -0.09, -0.04 ],
         "thermload": [ -0.15, -0.4 ]
       },
       "5": {
-        "integrity": [ 0.75, 1.1 ],
+        "integrity": [ 0.75, 1.11 ],
         "mass": [ 0.5, 0.2 ],
-        "optmul": [ -0.1, -0.04 ],
+        "optmul": [ -0.11, -0.05 ],
         "thermload": [ -0.2, -0.5 ]
       }
     },
@@ -602,41 +726,65 @@
   },
   "Engine_Tuned": {
     "id": 24,
+    "components": {
+      "1": {
+        "Sulphur": 1
+      },
+      "2": {
+        "Conductive Components": 1,
+        "Specialised Legacy Firmware": 1
+      },
+      "3": {
+        "Conductive Components": 1,
+        "Specialised Legacy Firmware": 1,
+        "Unexpected Emission Data": 1
+      },
+      "4": {
+        "Conductive Ceramics": 1,
+        "Decoded Emission Data": 1,
+        "Modified Consumer Firmware": 1
+      },
+      "5": {
+        "Abnormal Compact Emissions Data": 1,
+        "Conductive Ceramics": 1,
+        "Tin": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ -0.05, 0 ],
         "optmass": [ -0.02, 0 ],
-        "optmul": [ 0.02, 0.06 ],
+        "optmul": [ 0.01, 0.05 ],
-        "power": [ 0.05, 0 ],
+        "power": [ 0.04, 0 ],
-        "thermload": [ -0.05, -0.2 ]
+        "thermload": [ -0.06, -0.2 ]
       },
       "2": {
-        "integrity": [ -0.10, -0.04 ],
+        "integrity": [ -0.1, -0.04 ],
-        "optmass": [ -0.04, -0.01 ],
+        "optmass": [ -0.05, -0.01 ],
-        "optmul": [ 0.04, 0.09 ],
+        "optmul": [ 0.03, 0.09 ],
-        "power": [ 0.1, 0.04 ],
+        "power": [ 0.1, 0.03 ],
-        "thermload": [ -0.1, -0.3 ]
+        "thermload": [ -0.11, -0.31 ]
       },
       "3": {
         "integrity": [ -0.15, -0.08 ],
         "optmass": [ -0.06, -0.02 ],
-        "optmul": [ 0.06, 0.12 ],
+        "optmul": [ 0.05, 0.12 ],
-        "power": [ 0.15, 0.08 ],
+        "power": [ 0.14, 0.08 ],
         "thermload": [ -0.15, -0.4 ]
       },
       "4": {
         "integrity": [ -0.2, -0.12 ],
-        "optmass": [ -0.08, -0.03 ],
+        "optmass": [ -0.08, -0.04 ],
-        "optmul": [ 0.08, 0.15 ],
+        "optmul": [ 0.08, 0.14 ],
-        "power": [ 0.2, 0.12 ],
+        "power": [ 0.2, 0.11 ],
         "thermload": [ -0.2, -0.5 ]
       },
       "5": {
         "integrity": [ -0.25, -0.16 ],
-        "optmass": [ -0.12, -0.04 ],
+        "optmass": [ -0.11, -0.05 ],
         "optmul": [ 0.1, 0.18 ],
         "power": [ 0.25, 0.16 ],
-        "thermload": [ -0.25, -0.6 ]
+        "thermload": [ -0.25, -0.61 ]
       }
     },
     "name": "Clean"
@@ -1311,6 +1459,25 @@
   },
   "LifeSupport_LightWeight": {
     "id": 49,
+    "components": {
+      "1": {
+        "Phosphorus": 1
+      },
+      "2": {
+        "Manganese": 1,
+        "Salvaged Alloys": 1
+      },
+      "3": {
+        "Conductive Ceramics": 1,
+        "Manganese": 1,
+        "Salvaged Alloys": 1
+      },
+      "4": {
+        "Conductive Components": 1,
+        "Phase Alloys": 1,
+        "Proto Light Alloys": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ -0.2, -0.1 ],
@@ -1327,16 +1494,31 @@
       "4": {
         "integrity": [ -0.5, -0.4 ],
         "mass": [ -0.6, -0.7 ]
-      },
-      "5": {
-        "integrity": [ -0.6, -0.5 ],
-        "mass": [ -0.7, -0.8 ]
       }
     },
     "name": "Lightweight"
   },
   "LifeSupport_Reinforced": {
     "id": 50,
+    "components": {
+      "1": {
+        "Nickel": 1
+      },
+      "2": {
+        "Nickel": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Nickel": 1,
+        "Shield Emitters": 1,
+        "Tungsten": 1
+      },
+      "4": {
+        "Molybdenum": 1,
+        "Tungsten": 1,
+        "Zinc": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -1353,16 +1535,31 @@
       "4": {
         "integrity": [ 0.8, 2 ],
         "mass": [ 2.5, 1.6 ]
-      },
-      "5": {
-        "integrity": [ 1, 2.5 ],
-        "mass": [ 3.0, 2.0 ]
       }
     },
     "name": "Reinforced"
   },
   "LifeSupport_Shielded": {
     "id": 51,
+    "components": {
+      "1": {
+        "Worn Shield Emitters": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Carbon": 1,
+        "High Density Composites": 1,
+        "Shield Emitters": 1
+      },
+      "4": {
+        "Proprietary Composites": 1,
+        "Sielding Sensors": 1,
+        "Vanadium": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -1379,10 +1576,6 @@
       "4": {
         "integrity": [ 0.8, 2 ],
         "power": [ 1.2, 0.8 ]
-      },
-      "5": {
-        "integrity": [ 1, 1.5 ],
-        "power": [ 1.5, 1 ]
       }
     },
     "name": "Shielded"
@@ -1847,6 +2040,25 @@
   },
   "Refineries_Shielded": {
     "id": 92,
+    "components": {
+      "1": {
+        "Worn Shield Emitters": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Carbon": 1,
+        "High Density Composites": 1,
+        "Shield Emitters": 1
+      },
+      "4": {
+        "Proprietary Composites": 1,
+        "Shielding Sensors": 1,
+        "Vanadium": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -2248,6 +2460,20 @@
   },
   "WakeScanner_LightWeight": {
     "id": 79,
+    "components": {
+      "1": {
+        "Phosphorus": 1
+      },
+      "2": {
+        "Manganese": 1,
+        "Salvaged Alloys": 1
+      },
+      "3": {
+        "Conductive Ceramics": 1,
+        "Manganese": 1,
+        "Salvaged Alloys": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ -0.2, -0.1 ],
@@ -2260,20 +2486,26 @@
       "3": {
         "integrity": [ -0.4, -0.3 ],
         "mass": [ -0.5, -0.6 ]
-      },
-      "4": {
-        "integrity": [ -0.5, -0.4 ],
-        "mass": [ -0.6, -0.7 ]
-      },
-      "5": {
-        "integrity": [ -0.6, -0.5 ],
-        "mass": [ -0.7, -0.8 ]
       }
     },
     "name": "Lightweight"
   },
   "WakeScanner_Shielded": {
     "id": 80,
+    "components": {
+      "1": {
+        "Worn Shield Emitters": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Carbon": 1,
+        "High Density Composites": 1,
+        "Shield Emitters": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -2286,20 +2518,26 @@
       "3": {
         "integrity": [ 0.6, 1.5 ],
         "power": [ 0.9, 0.6 ]
-      },
-      "4": {
-        "integrity": [ 0.8, 2 ],
-        "power": [ 1.2, 0.8 ]
-      },
-      "5": {
-        "integrity": [ 1, 1.5 ],
-        "power": [ 1.5, 1 ]
       }
     },
     "name": "Shielded"
   },
   "WakeScanner_Reinforced": {
     "id": 81,
+    "components": {
+      "1": {
+        "Nickel": 1
+      },
+      "2": {
+        "Nickel": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Nickel": 1,
+        "Shield Emitters": 1,
+        "Tungsten": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -2312,14 +2550,6 @@
       "3": {
         "integrity": [ 0.6, 1.5 ],
         "mass": [ 2.0, 1.2 ]
-      },
-      "4": {
-        "integrity": [ 0.8, 2 ],
-        "mass": [ 2.5, 1.6 ]
-      },
-      "5": {
-        "integrity": [ 1, 2.5 ],
-        "mass": [ 3.0, 2.0 ]
       }
     },
     "name": "Reinforced"

modifications/modifications.json

@@ -14,6 +14,7 @@
     "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative"},
     "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
     "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
+    "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative"},
     "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "hidden", "method": "overwrite"},
     "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative"},
     "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
@@ -27,6 +28,7 @@
     "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative"},
     "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative"},
     "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative"},
+    "protection": {"id": 44, "name": "protection", "type": "percentage", "method": "multiplicative"},
     "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative"},
     "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative"},
     "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative"},

modifications/modules.json

@@ -45,6 +45,13 @@
       "power",
       "range",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_regeneration_sequence",
+      "special_thermal_conduit",
+      "special_thermalshock",
+      "special_thermal_vent"
     ]
   },
   "bsg": {
@@ -98,6 +105,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_auto_loader",
+      "special_dispersal_field",
+      "special_smart_rounds",
+      "special_force_shell",
+      "special_high_yield_shell",
+      "special_thermal_cascade"
     ]
   },
   "cc": {
@@ -194,6 +209,13 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_corrosive_shell",
+      "special_blinding_shell",
+      "special_incendiary_rounds",
+      "special_drag_munitions",
+      "special_screening_shell"
     ]
   },
   "fh": {
@@ -357,6 +379,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_auto_loader",
+      "special_corrosive_shell",
+      "special_emissive_munitions",
+      "special_incendiary_rounds",
+      "special_smart_rounds",
+      "special_thermalshock"
     ]
   },
   "ml": {
@@ -387,6 +417,13 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_drag_munitions",
+      "special_emissive_munitions",
+      "special_overload_munitions",
+      "special_penetrator_payload",
+      "special_thermal_cascade"
     ]
   },
   "mrp": {
@@ -417,6 +454,14 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_ion_disruptor",
+      "special_overload_munitions",
+      "special_radiant_canister",
+      "special_reverberating_cascade",
+      "special_shiftlock_canister",
+      "special_emissive_munitions"
     ]
   },
   "pa": {
@@ -447,6 +492,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_blinding_shell",
+      "special_dispersal_field",
+      "special_phasing_sequence",
+      "special_plasma_slug",
+      "special_target_lock_breaker",
+      "special_thermal_conduit"
     ]
   },
   "pas": {
@@ -537,6 +590,13 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_emissive_munitions",
+      "special_phasing_sequence",
+      "special_scramble_spectrum",
+      "special_thermalshock"
     ]
   },
   "po": {
@@ -629,6 +689,11 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_feedback_cascade",
+      "special_plasma_slug",
+      "special_super_penetrator"
     ]
   },
   "s": {
@@ -732,6 +797,11 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_mass_lock_munition",
+      "special_penetrator_payload",
+      "special_reverberating_cascade"
     ]
   },
   "ul": {
@@ -760,6 +830,13 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_inertial_impact",
+      "special_phasing_sequence",
+      "special_scramble_spectrum",
+      "special_thermalshock"
     ]
   },
   "ws": {

modifications/specials.json

@@ -1,35 +1,35 @@
 {
-    "special_auto_loader": {"id": 0, "name": "Auto loader"},
+    "special_auto_loader": {"id": 0, "edname": "special_auto_loader", "name": "Auto loader"},
-    "special_choke_canister": {"id": 1, "name": "Choke canister"},
+    "special_choke_canister": {"id": 1, "edname": "special_choke_canister", "name": "Choke canister"},
-    "special_concordant_sequence": {"id": 2, "name": "Concordant sequence"},
+    "special_concordant_sequence": {"id": 2, "edname": "special_concordant_sequence", "name": "Concordant sequence"},
-    "special_corrosive_shell": {"id": 3, "name": "Corrosive shell"},
+    "special_corrosive_shell": {"id": 3, "edname": "special_corrosive_shell", "name": "Corrosive shell"},
-    "special_blinding_shell": {"id": 4, "name": "Dazzle shell"},
+    "special_blinding_shell": {"id": 4, "edname": "special_blinding_shell", "name": "Dazzle shell"},
-    "special_dispersal_field": {"id": 5, "name": "Dispersal field"},
+    "special_dispersal_field": {"id": 5, "edname": "special_dispersal_field", "name": "Dispersal field"},
-    "special_distortion_field": {"id": 6, "name": "Distortion field"},
+    "special_distortion_field": {"id": 6, "edname": "special_distortion_field", "name": "Distortion field"},
-    "special_drag_munitions": {"id": 7, "name": "Drag munitions"},
+    "special_drag_munitions": {"id": 7, "edname": "special_drag_munitions", "name": "Drag munitions"},
-    "special_emissive_munitions": {"id": 8, "name": "Emissive munitions"},
+    "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
-    "special_feedback_cascade": {"id": 9, "name": "Feedback cascade"},
+    "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
-    "special_force_shell": {"id": 10, "name": "Force shell"},
+    "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
-    "special_high_yield_shell": {"id": 11, "name": "High yield shell"},
+    "special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"},
-    "special_incendiary_rounds": {"id": 12, "name": "Incendiary rounds"},
+    "special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"},
-    "special_inertial_impact": {"id": 32, "name": "Inertial impact"},
+    "special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"},
-    "special_ion_disruptor": {"id": 13, "name": "Ion disruptor"},
+    "special_ion_disruptor": {"id": 13, "edname": "special_ion_disruptor", "name": "Ion disruptor"},
-    "special_mass_lock_munition": {"id": 14, "name": "Mass lock munition"},
+    "special_mass_lock_munition": {"id": 14, "edname": "special_mass_lock_munition", "name": "Mass lock munition"},
-    "special_overload_munitions": {"id": 15, "name": "Overload munitions"},
+    "special_overload_munitions": {"id": 15, "edname": "special_overload_munitions", "name": "Overload munitions"},
-    "special_penetrator_payload": {"id": 16, "name": "Penetrator payload"},
+    "special_penetrator_payload": {"id": 16, "edname": "special_penetrator_payload", "name": "Penetrator payload"},
-    "special_phasing_sequence": {"id": 17, "name": "Phasing sequence"},
+    "special_phasing_sequence": {"id": 17, "edname": "special_phasing_sequence", "name": "Phasing sequence"},
-    "special_plasma_slug": {"id": 18, "name": "Plasma slug"},
+    "special_plasma_slug": {"id": 18, "edname": "special_plasma_slug", "name": "Plasma slug"},
-    "special_radiant_canister": {"id": 19, "name": "Radiant Canister"},
+    "special_radiant_canister": {"id": 19, "edname": "special_radiant_canister", "name": "Radiant Canister"},
-    "special_regeneration_sequence": {"id": 20, "name": "Regeneration sequence"},
+    "special_regeneration_sequence": {"id": 20, "edname": "special_regeneration_sequence", "name": "Regeneration sequence"},
-    "special_reverberating_cascade": {"id": 21, "name": "Reverberating cascade"},
+    "special_reverberating_cascade": {"id": 21, "edname": "special_reverberating_cascade", "name": "Reverberating cascade"},
-    "special_scramble_spectrum": {"id": 22, "name": "Scramble spectrum"},
+    "special_scramble_spectrum": {"id": 22, "edname": "special_scramble_spectrum", "name": "Scramble spectrum"},
-    "special_screening_shell": {"id": 23, "name": "Screening shell"},
+    "special_screening_shell": {"id": 23, "edname": "special_screening_shell", "name": "Screening shell"},
-    "special_shiftlock_canister": {"id": 24, "name": "Shift-lock canister"},
+    "special_shiftlock_canister": {"id": 24, "edname": "special_shiftlock_canister", "name": "Shift-lock canister"},
-    "special_smart_rounds": {"id": 25, "name": "Smart rounds"},
+    "special_smart_rounds": {"id": 25, "edname": "special_smart_rounds", "name": "Smart rounds"},
-    "special_super_penetrator": {"id": 26, "name": "Super penetrator"},
+    "special_super_penetrator": {"id": 26, "edname": "special_super_penetrator", "name": "Super penetrator"},
-    "special_target_lock_breaker": {"id": 27, "name": "Target lock breaker"},
+    "special_target_lock_breaker": {"id": 27, "edname": "special_target_lock_breaker", "name": "Target lock breaker"},
-    "special_thermal_cascade": {"id": 28, "name": "Thermal cascade"},
+    "special_thermal_cascade": {"id": 28, "edname": "special_thermal_cascade", "name": "Thermal cascade"},
-    "special_thermal_conduit": {"id": 29, "name": "Thermal conduit"},
+    "special_thermal_conduit": {"id": 29, "edname": "special_thermal_conduit", "name": "Thermal conduit"},
-    "special_thermal_vent": {"id": 30, "name": "Thermal vent"},
+    "special_thermal_vent": {"id": 30, "edname": "special_thermal_vent", "name": "Thermal vent"},
-    "special_thermalshock": {"id": 31, "name": "Thermal shock"}
+    "special_thermalshock": {"id": 31, "edname": "special_thermalshock", "name": "Thermal shock"}
 }

modules/hardpoints/mining_laser.json

@@ -34,6 +34,7 @@
         "T": 1
       },
       "distdraw": 1.75,
+      "edID": 128671347,
       "eddbID": 1479,
       "falloff": 400,
       "grp": "ml",

modules/hardpoints/multi_cannon.json

@@ -103,6 +103,7 @@
         "K": 1
       },
       "distdraw": 0.12,
+      "edID": 128671345,
       "eddbID": 1481,
       "falloff": 1800,
       "grp": "mc",

modules/hardpoints/pulse_laser.json

@@ -167,6 +167,7 @@
         "T": 1
       },
       "distdraw": 0.9,
+      "edID": 128671342,
       "eddbID": 1483,
       "falloff": 500,
       "grp": "pl",

package.json

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

ships/keelback.json

@@ -6,7 +6,7 @@
       "name": "Keelback",
       "manufacturer": "Lakon",
       "class": 2,
-      "hullCost": 2943880,
+      "hullCost": 2943870,
       "speed": 200,
       "boost": 300,
       "boostEnergy": 10,

ships/sidewinder.json

@@ -6,7 +6,7 @@
       "name": "Sidewinder",
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
-      "hullCost": 12870,
+      "hullCost": 4070,
       "speed": 220,
       "boost": 320,
       "boostEnergy": 7,
@@ -20,7 +20,7 @@
       "roll": 110,
       "yaw": 16
     },
-    "retailCost": 40800,
+    "retailCost": 32000,
     "bulkheads": [
       { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

spec/data-spec.js

@@ -40,7 +40,7 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
         expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
+        expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
         if (s != 'ft' && s != 'pas' ) {
           expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
         }
@@ -70,7 +70,7 @@ describe('JSON Data', function() {
         expect(group[i].mass).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing mass`);
         expect(group[i].integrity).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing integrity`);
         expect(group[i].eddbID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
-        expect(group[i].edID > 0 || group[i].pp).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
+        expect(group[i].edID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
         expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
         expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
         if (group[i].eddbID) {
@@ -110,7 +110,7 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`);
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
+        expect(group[i].eddbID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
         expect(group[i].edID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
         if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs
           expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists:  ${id}`);