Merge branch 'release/2.4.0'

Bump version and generate dist.

ChangeLog.md

@@ -1,3 +1,26 @@
+#2.4.0
+  * Added Repair Limpet Computers
+
+#2.3.7
+  * Fixed Orca mass-lock
+
+#2.3.5
+  * Fix list of available blueprints for Point Defence
+  * Fix integrity values for class 6 power plants
+  * Add shot speed for long range weapon
+  * Fix components for dirty drive grade 3
+  * Update values for Cytoscrambler
+  * Add shotspeed modifier to cannon/multi-cannon/fragment cannon
+
+#2.3.4
+  * Add missing Long Range blueprint to multi-cannon
+  * Fix values for thermal load of focused weapon grade 4
+  * Fix internal module information for power plant blueprints
+  * Add 'FSD Interrupt' special to dumbfire missile racks; this module now has `specials_S` and `specials_D` keys for specials to differentiate
+
+#2.3.3
+  * Add Felicity Farseer to list of engineers that supply sensor and detailed surface scanner modifications
+
 #2.3.2
   * Update ownership of module blueprints for sensors and scanners
   * Update railgun penetration

dist/index.js

@@ -2170,7 +2170,7 @@ module.exports = {
         baseArmour: 220,
         hardness: 55,
         hullMass: 290,
-        masslock: 13,
+        masslock: 16,
         pipSpeed: .08375,
         luxuryCabins: true,
         pitch: 25,
@@ -3144,7 +3144,7 @@ module.exports = {
         eff: 1,
         grp: "pp",
         id: "po",
-        integrity: 90,
+        integrity: 102,
         mass: 40,
         pgen: 16.8,
         rating: "E"
@@ -3156,7 +3156,7 @@ module.exports = {
         eff: .75,
         grp: "pp",
         id: "pn",
-        integrity: 113,
+        integrity: 90,
         mass: 16,
         pgen: 18.9,
         rating: "D"
@@ -3168,7 +3168,7 @@ module.exports = {
         eff: .5,
         grp: "pp",
         id: "pm",
-        integrity: 136,
+        integrity: 113,
         mass: 20,
         pgen: 21,
         rating: "C"
@@ -3180,7 +3180,7 @@ module.exports = {
         eff: .45,
         grp: "pp",
         id: "pl",
-        integrity: 124,
+        integrity: 136,
         mass: 32,
         pgen: 23.1,
         rating: "B"
@@ -3192,7 +3192,7 @@ module.exports = {
         eff: .4,
         grp: "pp",
         id: "pk",
-        integrity: 118,
+        integrity: 124,
         mass: 20,
         pgen: 25.2,
         rating: "A"
@@ -4381,7 +4381,7 @@ module.exports = {
         fuelpower: 2.45,
         grp: "fsd",
         id: "Ff",
-        integrity: 106,
+        integrity: 120,
         mass: 20,
         maxfuel: 5,
         optmass: 1050,
@@ -6806,21 +6806,21 @@ module.exports = {
         rof: 1.92,
         thermload: .19
       }, {
-        breachdmg: 2,
+        breachdmg: 3.1,
         breachmax: 0,
         breachmin: 0,
         burst: 8,
         burstrof: 20,
         class: 1,
         cost: 8800,
-        damage: 2.4,
+        damage: 3.6,
         damagedist: {
           T: 1
         },
         distdraw: .31,
         edID: 128671449,
         eddbID: 1477,
-        falloff: 500,
+        falloff: 600,
         grp: "ul",
         id: "cy",
         integrity: 40,
@@ -6831,9 +6831,9 @@ module.exports = {
         piercing: 1,
         power: .8,
         pp: "Archon Delaine",
-        range: 600,
+        range: 3e3,
         rating: "F",
-        rof: 6.6,
+        rof: 7.6,
         thermload: .3
       }, {
         breachdmg: 3,
@@ -14439,6 +14439,247 @@ module.exports = {
         name: "Detailed Surface Scanner",
         power: 0,
         rating: "C"
+      } ],
+      rpl: [ {
+        class: 1,
+        cost: 600,
+        edID: 128777327,
+        eddbID: 1594,
+        grp: "rpl",
+        id: "rple1",
+        mass: 1.3,
+        maximum: 1,
+        power: .18,
+        range: .6,
+        rating: "E"
+      }, {
+        class: 1,
+        cost: 1200,
+        edID: 128777328,
+        eddbID: 1595,
+        grp: "rpl",
+        id: "rpld1",
+        mass: .5,
+        maximum: 1,
+        power: .14,
+        range: .8,
+        rating: "D"
+      }, {
+        class: 1,
+        cost: 2400,
+        edID: 128777329,
+        eddbID: 1596,
+        grp: "rpl",
+        id: "rplc1",
+        mass: 1.3,
+        maximum: 1,
+        power: .23,
+        range: 1,
+        rating: "C"
+      }, {
+        class: 1,
+        cost: 4800,
+        edID: 128777330,
+        eddbID: 1597,
+        grp: "rpl",
+        id: "rplb1",
+        mass: 2,
+        maximum: 1,
+        power: .32,
+        range: 1.2,
+        rating: "B"
+      }, {
+        class: 1,
+        cost: 9600,
+        edID: 128777331,
+        eddbID: 1598,
+        grp: "rpl",
+        id: "rpla1",
+        mass: 1.3,
+        maximum: 1,
+        power: .28,
+        range: 1.4,
+        rating: "A"
+      }, {
+        class: 3,
+        cost: 5400,
+        edID: 128777332,
+        eddbID: 1599,
+        grp: "rpl",
+        id: "rple3",
+        mass: 5,
+        maximum: 2,
+        power: .27,
+        range: .66,
+        rating: "E"
+      }, {
+        class: 3,
+        cost: 10800,
+        edID: 128777333,
+        eddbID: 1600,
+        grp: "rpl",
+        id: "rpld3",
+        mass: 2,
+        maximum: 2,
+        power: .2,
+        range: .88,
+        rating: "D"
+      }, {
+        class: 3,
+        cost: 21600,
+        edID: 128777334,
+        eddbID: 1601,
+        grp: "rpl",
+        id: "rplc3",
+        mass: 5,
+        maximum: 2,
+        power: .34,
+        range: 1.1,
+        rating: "C"
+      }, {
+        class: 3,
+        cost: 43200,
+        edID: 128777335,
+        eddbID: 1602,
+        grp: "rpl",
+        id: "rplb3",
+        mass: 8,
+        maximum: 2,
+        power: .48,
+        range: 1.32,
+        rating: "B"
+      }, {
+        class: 3,
+        cost: 86400,
+        edID: 128777336,
+        eddbID: 1603,
+        grp: "rpl",
+        id: "rpba3",
+        mass: 5,
+        maximum: 2,
+        power: .41,
+        range: 1.54,
+        rating: "A"
+      }, {
+        class: 5,
+        cost: 48600,
+        edID: 128777337,
+        eddbID: 1604,
+        grp: "rpl",
+        id: "rple5",
+        mass: 20,
+        maximum: 3,
+        power: .4,
+        range: .78,
+        rating: "E"
+      }, {
+        class: 5,
+        cost: 97200,
+        edID: 128777338,
+        eddbID: 1605,
+        grp: "rpl",
+        id: "rpld5",
+        mass: 8,
+        maximum: 3,
+        power: .3,
+        range: 1.04,
+        rating: "D"
+      }, {
+        class: 5,
+        cost: 194400,
+        edID: 128777339,
+        eddbID: 1606,
+        grp: "rpl",
+        id: "rplc5",
+        mass: 20,
+        maximum: 3,
+        power: .5,
+        range: 1.3,
+        rating: "C"
+      }, {
+        class: 5,
+        cost: 388800,
+        edID: 128777340,
+        eddbID: 1607,
+        grp: "rpl",
+        id: "rplb5",
+        mass: 32,
+        maximum: 3,
+        power: .97,
+        range: 1.56,
+        rating: "B"
+      }, {
+        class: 5,
+        cost: 777600,
+        edID: 128777341,
+        eddbID: 1608,
+        grp: "rpl",
+        id: "rpla5",
+        mass: 20,
+        maximum: 3,
+        power: .6,
+        range: 1.82,
+        rating: "A"
+      }, {
+        class: 7,
+        cost: 437400,
+        edID: 128777342,
+        eddbID: 1609,
+        grp: "rpl",
+        id: "rple7",
+        mass: 80,
+        maximum: 4,
+        power: .55,
+        range: 1.02,
+        rating: "E"
+      }, {
+        class: 7,
+        cost: 874800,
+        edID: 128777343,
+        eddbID: 1610,
+        grp: "rpl",
+        id: "rpld7",
+        mass: 32,
+        maximum: 4,
+        power: .41,
+        range: 1.36,
+        rating: "D"
+      }, {
+        class: 7,
+        cost: 1749600,
+        edID: 128777344,
+        eddbID: 1611,
+        grp: "rpl",
+        id: "rplc7",
+        mass: 80,
+        maximum: 4,
+        power: .69,
+        range: 1.7,
+        rating: "C"
+      }, {
+        class: 7,
+        cost: 3499200,
+        edID: 128777345,
+        eddbID: 1612,
+        grp: "rpl",
+        id: "rplb7",
+        mass: 128,
+        maximum: 4,
+        power: .97,
+        range: 2.04,
+        rating: "B"
+      }, {
+        class: 7,
+        cost: 6998400,
+        edID: 128777346,
+        eddbID: 1613,
+        grp: "rpl",
+        id: "rpla7",
+        mass: 80,
+        maximum: 4,
+        power: .83,
+        range: 2.38,
+        rating: "A"
       } ]
     }
   },
@@ -15608,7 +15849,7 @@ module.exports = {
           "3": {
             components: {
               Chromium: 1,
-              "Mechanical Equipment": 1,
+              "Mechanical Components": 1,
               "Specialised Legacy Firmware": 1
             },
             features: {
@@ -17933,8 +18174,8 @@ module.exports = {
           "3": {
             components: {
               "Anomalous Bulk Scan Data": 1,
-              Chromium: 1,
-              "Electrochemical Arrays": 1
+              "Hybrid Capacitors": 1,
+              Selenium: 1
             },
             features: {
               engcap: [ -.15, -.04 ],
@@ -18072,7 +18313,7 @@ module.exports = {
           }
         },
         id: 62,
-        modulename: [ "Power distributor", "Distributor" ],
+        modulename: [ "Power plant" ],
         name: "Armoured"
       },
       PowerPlant_Boosted: {
@@ -18137,7 +18378,7 @@ module.exports = {
           }
         },
         id: 63,
-        modulename: [ "Power distributor", "Distributor" ],
+        modulename: [ "Power plant" ],
         name: "Overcharged"
       },
       PowerPlant_Stealth: {
@@ -20260,7 +20501,7 @@ module.exports = {
               burst: [ 2, 2 ],
               burstrof: [ 14, 19 ],
               clip: [ 1, 1 ],
-              range: [ -.5, -.02 ]
+              range: [ -.05, -.02 ]
             }
           }
         },
@@ -20383,7 +20624,7 @@ module.exports = {
               piercing: [ .2, .4 ],
               range: [ .4, .8 ],
               rof: [ -.08, -.02 ],
-              thermload: [ -.2, -.1 ]
+              thermload: [ .2, .1 ]
             }
           },
           "5": {
@@ -20559,7 +20800,8 @@ module.exports = {
             features: {
               fallofffromrange: [ 1, 1 ],
               mass: [ .1, 0 ],
-              range: [ .1, .2 ]
+              range: [ .1, .2 ],
+              shotspeed: [ .1, .2 ]
             }
           },
           "2": {
@@ -20569,9 +20811,10 @@ module.exports = {
             },
             features: {
               fallofffromrange: [ 1, 1 ],
-              mass: [ .2, .04 ],
-              power: [ .04, 0 ],
-              range: [ .2, .4 ]
+              mass: [ .2, .05 ],
+              power: [ .05, 0 ],
+              range: [ .2, .4 ],
+              shotspeed: [ .2, .4 ]
             }
           },
           "3": {
@@ -20583,8 +20826,9 @@ module.exports = {
             features: {
               fallofffromrange: [ 1, 1 ],
               mass: [ .3, .1 ],
-              power: [ .1, .04 ],
-              range: [ .3, .6 ]
+              power: [ .1, .05 ],
+              range: [ .3, .6 ],
+              shotspeed: [ .3, .6 ]
             }
           },
           "4": {
@@ -20595,9 +20839,10 @@ module.exports = {
             },
             features: {
               fallofffromrange: [ 1, 1 ],
-              mass: [ .4, .14 ],
-              power: [ .14, .1 ],
-              range: [ .4, .8 ]
+              mass: [ .4, .15 ],
+              power: [ .15, .1 ],
+              range: [ .4, .8 ],
+              shotspeed: [ .4, .8 ]
             }
           },
           "5": {
@@ -20609,8 +20854,9 @@ module.exports = {
             features: {
               fallofffromrange: [ 1, 1 ],
               mass: [ .5, .2 ],
-              power: [ .2, .14 ],
-              range: [ .5, 1 ]
+              power: [ .2, .15 ],
+              range: [ .5, 1 ],
+              shotspeed: [ .5, 1 ]
             }
           }
         },
@@ -21456,6 +21702,10 @@ module.exports = {
         jitter: 1,
         speed: -.1667
       },
+      special_fsd_interrupt: {
+        damage: -.3,
+        rof: .5
+      },
       special_high_yield_shell: {
         rof: .1111111111111111
       },
@@ -22069,7 +22319,7 @@ module.exports = {
             }
           }
         },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "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: {
@@ -22470,25 +22720,6 @@ module.exports = {
               }
             }
           },
-          Weapon_LongRange: {
-            grades: {
-              "1": {
-                engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
-              },
-              "2": {
-                engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
-              },
-              "3": {
-                engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
-              },
-              "4": {
-                engineers: [ "Zacariah Nemo" ]
-              },
-              "5": {
-                engineers: [ "Zacariah Nemo" ]
-              }
-            }
-          },
           Weapon_Overcharged: {
             grades: {
               "1": {
@@ -22547,7 +22778,7 @@ module.exports = {
             }
           }
         },
-        modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "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: {
@@ -23199,6 +23430,25 @@ module.exports = {
               }
             }
           },
+          Weapon_LongRange: {
+            grades: {
+              "1": {
+                engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
+              },
+              "2": {
+                engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
+              },
+              "3": {
+                engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
+              },
+              "4": {
+                engineers: [ "Tod McQuinn" ]
+              },
+              "5": {
+                engineers: [ "Tod McQuinn" ]
+              }
+            }
+          },
           Weapon_Overcharged: {
             grades: {
               "1": {
@@ -23276,7 +23526,7 @@ module.exports = {
             }
           }
         },
-        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", "shotspeed", "thermload" ],
         specials: [ "special_auto_loader", "special_corrosive_shell", "special_emissive_munitions", "special_incendiary_rounds", "special_smart_rounds", "special_thermalshock" ]
       },
       ml: {
@@ -23363,7 +23613,8 @@ module.exports = {
           }
         },
         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" ]
+        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" ]
       },
       mrp: {
         blueprints: {},
@@ -23952,8 +24203,7 @@ module.exports = {
       },
       po: {
         blueprints: {
-          PointDefence_PointDefenseCapacity: [ 3 ],
-          HeatSinkLauncher_Shielded: {
+          PointDefence_PointDefenseCapacity: {
             grades: {
               "3": {
                 engineers: [ "Ram Tah" ]
@@ -24307,13 +24557,13 @@ module.exports = {
           Sensor_Sensor_LongRange: {
             grades: {
               "1": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "2": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "3": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "4": {
                 engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
@@ -24326,13 +24576,13 @@ module.exports = {
           Sensor_Sensor_WideAngle: {
             grades: {
               "1": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "2": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "3": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "4": {
                 engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
@@ -24566,13 +24816,13 @@ module.exports = {
           Sensor_SurfaceScanner_FastScan: {
             grades: {
               "1": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "2": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "3": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "4": {
                 engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
@@ -24585,13 +24835,13 @@ module.exports = {
           Sensor_SurfaceScanner_LongRange: {
             grades: {
               "1": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "2": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "3": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "4": {
                 engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
@@ -24604,13 +24854,13 @@ module.exports = {
           Sensor_SurfaceScanner_WideAngle: {
             grades: {
               "1": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "2": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "3": {
-                engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
+                engineers: [ "Bill Turner", "Felicity Farseer", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
               },
               "4": {
                 engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
@@ -25063,6 +25313,11 @@ module.exports = {
         edname: "special_force_shell",
         name: "Force shell"
       },
+      special_fsd_interrupt: {
+        id: 33,
+        edname: "special_fsd_interrupt",
+        name: "FSD interrupt"
+      },
       special_high_yield_shell: {
         id: 11,
         edname: "special_high_yield_shell",

dist/index.json

@@ -3426,7 +3426,7 @@
 				"baseArmour": 220,
 				"hardness": 55,
 				"hullMass": 290,
-				"masslock": 13,
+				"masslock": 16,
 				"pipSpeed": 0.08375,
 				"luxuryCabins": true,
 				"pitch": 25,
@@ -4891,7 +4891,7 @@
 					"eff": 1,
 					"grp": "pp",
 					"id": "po",
-					"integrity": 90,
+					"integrity": 102,
 					"mass": 40,
 					"pgen": 16.8,
 					"rating": "E"
@@ -4904,7 +4904,7 @@
 					"eff": 0.75,
 					"grp": "pp",
 					"id": "pn",
-					"integrity": 113,
+					"integrity": 90,
 					"mass": 16,
 					"pgen": 18.9,
 					"rating": "D"
@@ -4917,7 +4917,7 @@
 					"eff": 0.5,
 					"grp": "pp",
 					"id": "pm",
-					"integrity": 136,
+					"integrity": 113,
 					"mass": 20,
 					"pgen": 21,
 					"rating": "C"
@@ -4930,7 +4930,7 @@
 					"eff": 0.45,
 					"grp": "pp",
 					"id": "pl",
-					"integrity": 124,
+					"integrity": 136,
 					"mass": 32,
 					"pgen": 23.1,
 					"rating": "B"
@@ -4943,7 +4943,7 @@
 					"eff": 0.4,
 					"grp": "pp",
 					"id": "pk",
-					"integrity": 118,
+					"integrity": 124,
 					"mass": 20,
 					"pgen": 25.2,
 					"rating": "A"
@@ -6211,7 +6211,7 @@
 					"fuelpower": 2.45,
 					"grp": "fsd",
 					"id": "Ff",
-					"integrity": 106,
+					"integrity": 120,
 					"mass": 20,
 					"maxfuel": 5,
 					"optmass": 1050,
@@ -8803,21 +8803,21 @@
 					"thermload": 0.19
 				},
 				{
-					"breachdmg": 2,
+					"breachdmg": 3.1,
 					"breachmax": 0,
 					"breachmin": 0,
 					"burst": 8,
 					"burstrof": 20,
 					"class": 1,
 					"cost": 8800,
-					"damage": 2.4,
+					"damage": 3.6,
 					"damagedist": {
 						"T": 1
 					},
 					"distdraw": 0.31,
 					"edID": 128671449,
 					"eddbID": 1477,
-					"falloff": 500,
+					"falloff": 600,
 					"grp": "ul",
 					"id": "cy",
 					"integrity": 40,
@@ -8828,9 +8828,9 @@
 					"piercing": 1,
 					"power": 0.8,
 					"pp": "Archon Delaine",
-					"range": 600,
+					"range": 3000,
 					"rating": "F",
-					"rof": 6.6,
+					"rof": 7.6,
 					"thermload": 0.3
 				},
 				{
@@ -16937,6 +16937,268 @@
 					"power": 0,
 					"rating": "C"
 				}
+			],
+			"rpl": [
+				{
+					"class": 1,
+					"cost": 600,
+					"edID": 128777327,
+					"eddbID": 1594,
+					"grp": "rpl",
+					"id": "rple1",
+					"mass": 1.3,
+					"maximum": 1,
+					"power": 0.18,
+					"range": 0.6,
+					"rating": "E"
+				},
+				{
+					"class": 1,
+					"cost": 1200,
+					"edID": 128777328,
+					"eddbID": 1595,
+					"grp": "rpl",
+					"id": "rpld1",
+					"mass": 0.5,
+					"maximum": 1,
+					"power": 0.14,
+					"range": 0.8,
+					"rating": "D"
+				},
+				{
+					"class": 1,
+					"cost": 2400,
+					"edID": 128777329,
+					"eddbID": 1596,
+					"grp": "rpl",
+					"id": "rplc1",
+					"mass": 1.3,
+					"maximum": 1,
+					"power": 0.23,
+					"range": 1,
+					"rating": "C"
+				},
+				{
+					"class": 1,
+					"cost": 4800,
+					"edID": 128777330,
+					"eddbID": 1597,
+					"grp": "rpl",
+					"id": "rplb1",
+					"mass": 2,
+					"maximum": 1,
+					"power": 0.32,
+					"range": 1.2,
+					"rating": "B"
+				},
+				{
+					"class": 1,
+					"cost": 9600,
+					"edID": 128777331,
+					"eddbID": 1598,
+					"grp": "rpl",
+					"id": "rpla1",
+					"mass": 1.3,
+					"maximum": 1,
+					"power": 0.28,
+					"range": 1.4,
+					"rating": "A"
+				},
+				{
+					"class": 3,
+					"cost": 5400,
+					"edID": 128777332,
+					"eddbID": 1599,
+					"grp": "rpl",
+					"id": "rple3",
+					"mass": 5,
+					"maximum": 2,
+					"power": 0.27,
+					"range": 0.66,
+					"rating": "E"
+				},
+				{
+					"class": 3,
+					"cost": 10800,
+					"edID": 128777333,
+					"eddbID": 1600,
+					"grp": "rpl",
+					"id": "rpld3",
+					"mass": 2,
+					"maximum": 2,
+					"power": 0.2,
+					"range": 0.88,
+					"rating": "D"
+				},
+				{
+					"class": 3,
+					"cost": 21600,
+					"edID": 128777334,
+					"eddbID": 1601,
+					"grp": "rpl",
+					"id": "rplc3",
+					"mass": 5,
+					"maximum": 2,
+					"power": 0.34,
+					"range": 1.1,
+					"rating": "C"
+				},
+				{
+					"class": 3,
+					"cost": 43200,
+					"edID": 128777335,
+					"eddbID": 1602,
+					"grp": "rpl",
+					"id": "rplb3",
+					"mass": 8,
+					"maximum": 2,
+					"power": 0.48,
+					"range": 1.32,
+					"rating": "B"
+				},
+				{
+					"class": 3,
+					"cost": 86400,
+					"edID": 128777336,
+					"eddbID": 1603,
+					"grp": "rpl",
+					"id": "rpba3",
+					"mass": 5,
+					"maximum": 2,
+					"power": 0.41,
+					"range": 1.54,
+					"rating": "A"
+				},
+				{
+					"class": 5,
+					"cost": 48600,
+					"edID": 128777337,
+					"eddbID": 1604,
+					"grp": "rpl",
+					"id": "rple5",
+					"mass": 20,
+					"maximum": 3,
+					"power": 0.4,
+					"range": 0.78,
+					"rating": "E"
+				},
+				{
+					"class": 5,
+					"cost": 97200,
+					"edID": 128777338,
+					"eddbID": 1605,
+					"grp": "rpl",
+					"id": "rpld5",
+					"mass": 8,
+					"maximum": 3,
+					"power": 0.3,
+					"range": 1.04,
+					"rating": "D"
+				},
+				{
+					"class": 5,
+					"cost": 194400,
+					"edID": 128777339,
+					"eddbID": 1606,
+					"grp": "rpl",
+					"id": "rplc5",
+					"mass": 20,
+					"maximum": 3,
+					"power": 0.5,
+					"range": 1.3,
+					"rating": "C"
+				},
+				{
+					"class": 5,
+					"cost": 388800,
+					"edID": 128777340,
+					"eddbID": 1607,
+					"grp": "rpl",
+					"id": "rplb5",
+					"mass": 32,
+					"maximum": 3,
+					"power": 0.97,
+					"range": 1.56,
+					"rating": "B"
+				},
+				{
+					"class": 5,
+					"cost": 777600,
+					"edID": 128777341,
+					"eddbID": 1608,
+					"grp": "rpl",
+					"id": "rpla5",
+					"mass": 20,
+					"maximum": 3,
+					"power": 0.6,
+					"range": 1.82,
+					"rating": "A"
+				},
+				{
+					"class": 7,
+					"cost": 437400,
+					"edID": 128777342,
+					"eddbID": 1609,
+					"grp": "rpl",
+					"id": "rple7",
+					"mass": 80,
+					"maximum": 4,
+					"power": 0.55,
+					"range": 1.02,
+					"rating": "E"
+				},
+				{
+					"class": 7,
+					"cost": 874800,
+					"edID": 128777343,
+					"eddbID": 1610,
+					"grp": "rpl",
+					"id": "rpld7",
+					"mass": 32,
+					"maximum": 4,
+					"power": 0.41,
+					"range": 1.36,
+					"rating": "D"
+				},
+				{
+					"class": 7,
+					"cost": 1749600,
+					"edID": 128777344,
+					"eddbID": 1611,
+					"grp": "rpl",
+					"id": "rplc7",
+					"mass": 80,
+					"maximum": 4,
+					"power": 0.69,
+					"range": 1.7,
+					"rating": "C"
+				},
+				{
+					"class": 7,
+					"cost": 3499200,
+					"edID": 128777345,
+					"eddbID": 1612,
+					"grp": "rpl",
+					"id": "rplb7",
+					"mass": 128,
+					"maximum": 4,
+					"power": 0.97,
+					"range": 2.04,
+					"rating": "B"
+				},
+				{
+					"class": 7,
+					"cost": 6998400,
+					"edID": 128777346,
+					"eddbID": 1613,
+					"grp": "rpl",
+					"id": "rpla7",
+					"mass": 80,
+					"maximum": 4,
+					"power": 0.83,
+					"range": 2.38,
+					"rating": "A"
+				}
 			]
 		}
 	},
@@ -18864,7 +19126,7 @@
 					"3": {
 						"components": {
 							"Chromium": 1,
-							"Mechanical Equipment": 1,
+							"Mechanical Components": 1,
 							"Specialised Legacy Firmware": 1
 						},
 						"features": {
@@ -22913,8 +23175,8 @@
 					"3": {
 						"components": {
 							"Anomalous Bulk Scan Data": 1,
-							"Chromium": 1,
-							"Electrochemical Arrays": 1
+							"Hybrid Capacitors": 1,
+							"Selenium": 1
 						},
 						"features": {
 							"engcap": [
@@ -23152,8 +23414,7 @@
 				},
 				"id": 62,
 				"modulename": [
-					"Power distributor",
-					"Distributor"
+					"Power plant"
 				],
 				"name": "Armoured"
 			},
@@ -23265,8 +23526,7 @@
 				},
 				"id": 63,
 				"modulename": [
-					"Power distributor",
-					"Distributor"
+					"Power plant"
 				],
 				"name": "Overcharged"
 			},
@@ -26948,7 +27208,7 @@
 								1
 							],
 							"range": [
-								-0.5,
+								-0.05,
 								-0.02
 							]
 						}
@@ -27171,8 +27431,8 @@
 								-0.02
 							],
 							"thermload": [
-								-0.2,
-								-0.1
+								0.2,
+								0.1
 							]
 						}
 					},
@@ -27511,6 +27771,10 @@
 							"range": [
 								0.1,
 								0.2
+							],
+							"shotspeed": [
+								0.1,
+								0.2
 							]
 						}
 					},
@@ -27526,15 +27790,19 @@
 							],
 							"mass": [
 								0.2,
-								0.04
+								0.05
 							],
 							"power": [
-								0.04,
+								0.05,
 								0
 							],
 							"range": [
 								0.2,
 								0.4
+							],
+							"shotspeed": [
+								0.2,
+								0.4
 							]
 						}
 					},
@@ -27555,11 +27823,15 @@
 							],
 							"power": [
 								0.1,
-								0.04
+								0.05
 							],
 							"range": [
 								0.3,
 								0.6
+							],
+							"shotspeed": [
+								0.3,
+								0.6
 							]
 						}
 					},
@@ -27576,15 +27848,19 @@
 							],
 							"mass": [
 								0.4,
-								0.14
+								0.15
 							],
 							"power": [
-								0.14,
+								0.15,
 								0.1
 							],
 							"range": [
 								0.4,
 								0.8
+							],
+							"shotspeed": [
+								0.4,
+								0.8
 							]
 						}
 					},
@@ -27605,11 +27881,15 @@
 							],
 							"power": [
 								0.2,
-								0.14
+								0.15
 							],
 							"range": [
 								0.5,
 								1
+							],
+							"shotspeed": [
+								0.5,
+								1
 							]
 						}
 					}
@@ -28709,6 +28989,10 @@
 				"jitter": 1,
 				"speed": -0.1667
 			},
+			"special_fsd_interrupt": {
+				"damage": -0.3,
+				"rof": 0.5
+			},
 			"special_high_yield_shell": {
 				"rof": 0.1111111111111111
 			},
@@ -29670,6 +29954,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -30376,38 +30661,6 @@
 							}
 						}
 					},
-					"Weapon_LongRange": {
-						"grades": {
-							"1": {
-								"engineers": [
-									"Tod McQuinn",
-									"Zacariah Nemo"
-								]
-							},
-							"2": {
-								"engineers": [
-									"Tod McQuinn",
-									"Zacariah Nemo"
-								]
-							},
-							"3": {
-								"engineers": [
-									"Tod McQuinn",
-									"Zacariah Nemo"
-								]
-							},
-							"4": {
-								"engineers": [
-									"Zacariah Nemo"
-								]
-							},
-							"5": {
-								"engineers": [
-									"Zacariah Nemo"
-								]
-							}
-						}
-					},
 					"Weapon_Overcharged": {
 						"grades": {
 							"1": {
@@ -30522,6 +30775,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -31706,6 +31960,38 @@
 							}
 						}
 					},
+					"Weapon_LongRange": {
+						"grades": {
+							"1": {
+								"engineers": [
+									"Tod McQuinn",
+									"Zacariah Nemo"
+								]
+							},
+							"2": {
+								"engineers": [
+									"Tod McQuinn",
+									"Zacariah Nemo"
+								]
+							},
+							"3": {
+								"engineers": [
+									"Tod McQuinn",
+									"Zacariah Nemo"
+								]
+							},
+							"4": {
+								"engineers": [
+									"Tod McQuinn"
+								]
+							},
+							"5": {
+								"engineers": [
+									"Tod McQuinn"
+								]
+							}
+						}
+					},
 					"Weapon_Overcharged": {
 						"grades": {
 							"1": {
@@ -31850,6 +32136,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -32012,12 +32299,20 @@
 					"rof",
 					"thermload"
 				],
-				"specials": [
+				"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"
 				]
 			},
 			"mrp": {
@@ -33087,10 +33382,7 @@
 			},
 			"po": {
 				"blueprints": {
-					"PointDefence_PointDefenseCapacity": [
-						3
-					],
-					"HeatSinkLauncher_Shielded": {
+					"PointDefence_PointDefenseCapacity": {
 						"grades": {
 							"3": {
 								"engineers": [
@@ -33736,6 +34028,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33745,6 +34038,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33754,6 +34048,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33784,6 +34079,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33793,6 +34089,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33802,6 +34099,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34239,6 +34537,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34248,6 +34547,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34257,6 +34557,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34286,6 +34587,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34295,6 +34597,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34304,6 +34607,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34333,6 +34637,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34342,6 +34647,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34351,6 +34657,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -35163,6 +35470,11 @@
 				"edname": "special_force_shell",
 				"name": "Force shell"
 			},
+			"special_fsd_interrupt": {
+				"id": 33,
+				"edname": "special_fsd_interrupt",
+				"name": "FSD interrupt"
+			},
 			"special_high_yield_shell": {
 				"id": 11,
 				"edname": "special_high_yield_shell",

modifications/blueprints.json

@@ -1163,7 +1163,7 @@
       "3": {
         "components": {
           "Chromium": 1,
-          "Mechanical Equipment": 1,
+          "Mechanical Components": 1,
           "Specialised Legacy Firmware": 1
         },
         "features": {
@@ -3488,8 +3488,8 @@
       "3": {
         "components": {
           "Anomalous Bulk Scan Data": 1,
-          "Chromium": 1,
-          "Electrochemical Arrays": 1
+          "Hybrid Capacitors": 1,
+          "Selenium": 1
         },
         "features": {
           "engcap": [ -0.15, -0.04 ],
@@ -3627,7 +3627,7 @@
       }
     },
     "id": 62,
-    "modulename": ["Power distributor", "Distributor"],
+    "modulename": ["Power plant"],
     "name": "Armoured"
   },
   "PowerPlant_Boosted": {
@@ -3692,7 +3692,7 @@
       }
     },
     "id": 63,
-    "modulename": ["Power distributor", "Distributor"],
+    "modulename": ["Power plant"],
     "name": "Overcharged"
   },
   "PowerPlant_Stealth": {
@@ -5815,7 +5815,7 @@
           "burst": [ 2, 2 ],
           "burstrof": [ 14, 19 ],
           "clip": [ 1, 1 ],
-          "range": [ -0.5, -0.02 ]
+          "range": [ -0.05, -0.02 ]
         }
       }
     },
@@ -5938,7 +5938,7 @@
           "piercing": [ 0.2, 0.4 ],
           "range": [ 0.4, 0.8 ],
           "rof": [ -0.08, -0.02 ],
-          "thermload": [ -0.2, -0.1 ]
+          "thermload": [ 0.2, 0.1 ]
         }
       },
       "5": {
@@ -6114,7 +6114,8 @@
         "features": {
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.1, 0 ],
-          "range": [ 0.1, 0.2 ]
+          "range": [ 0.1, 0.2 ],
+          "shotspeed": [ 0.1, 0.2 ]
         }
       },
       "2": {
@@ -6124,9 +6125,10 @@
         },
         "features": {
           "fallofffromrange": [ 1, 1 ],
-          "mass": [ 0.2, 0.04 ],
-          "power": [ 0.04, 0 ],
-          "range": [ 0.2, 0.4 ]
+          "mass": [ 0.2, 0.05 ],
+          "power": [ 0.05, 0 ],
+          "range": [ 0.2, 0.4 ],
+          "shotspeed": [ 0.2, 0.4 ]
         }
       },
       "3": {
@@ -6138,8 +6140,9 @@
         "features": {
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.3, 0.1 ],
-          "power": [ 0.1, 0.04 ],
-          "range": [ 0.3, 0.6 ]
+          "power": [ 0.1, 0.05 ],
+          "range": [ 0.3, 0.6 ],
+          "shotspeed": [ 0.3, 0.6 ]
         }
       },
       "4": {
@@ -6150,9 +6153,10 @@
         },
         "features": {
           "fallofffromrange": [ 1, 1 ],
-          "mass": [ 0.4, 0.14 ],
-          "power": [ 0.14, 0.1 ],
-          "range": [ 0.4, 0.8 ]
+          "mass": [ 0.4, 0.15 ],
+          "power": [ 0.15, 0.1 ],
+          "range": [ 0.4, 0.8 ],
+          "shotspeed": [ 0.4, 0.8 ]
         }
       },
       "5": {
@@ -6164,8 +6168,9 @@
         "features": {
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.5, 0.2 ],
-          "power": [ 0.2, 0.14 ],
-          "range": [ 0.5, 1 ]
+          "power": [ 0.2, 0.15 ],
+          "range": [ 0.5, 1 ],
+          "shotspeed": [ 0.5, 1 ]
         }
       }
     },

modifications/modifierActions.json

@@ -211,6 +211,10 @@
     "jitter": 1,
     "speed": -0.1667
   },
+  "special_fsd_interrupt": {
+    "damage": -0.3,
+    "rof": 0.5
+  },
   "special_high_yield_shell": {
     "rof": 0.1111111111111111
   },

modifications/modules.json

@@ -805,6 +805,7 @@
       "range",
       "reload",
       "rof",
+      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -1515,38 +1516,6 @@
           }
         }
       },
-      "Weapon_LongRange": {
-        "grades": {
-          "1": {
-            "engineers": [
-              "Tod McQuinn",
-              "Zacariah Nemo"
-            ]
-          },
-          "2": {
-            "engineers": [
-              "Tod McQuinn",
-              "Zacariah Nemo"
-            ]
-          },
-          "3": {
-            "engineers": [
-              "Tod McQuinn",
-              "Zacariah Nemo"
-            ]
-          },
-          "4": {
-            "engineers": [
-              "Zacariah Nemo"
-            ]
-          },
-          "5": {
-            "engineers": [
-              "Zacariah Nemo"
-            ]
-          }
-        }
-      },
       "Weapon_Overcharged": {
         "grades": {
           "1": {
@@ -1661,6 +1630,7 @@
       "range",
       "reload",
       "rof",
+      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -2849,6 +2819,38 @@
           }
         }
       },
+      "Weapon_LongRange": {
+        "grades": {
+          "1": {
+            "engineers": [
+              "Tod McQuinn",
+              "Zacariah Nemo"
+            ]
+          },
+          "2": {
+            "engineers": [
+              "Tod McQuinn",
+              "Zacariah Nemo"
+            ]
+          },
+          "3": {
+            "engineers": [
+              "Tod McQuinn",
+              "Zacariah Nemo"
+            ]
+          },
+          "4": {
+            "engineers": [
+              "Tod McQuinn"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "Tod McQuinn"
+            ]
+          }
+        }
+      },
       "Weapon_Overcharged": {
         "grades": {
           "1": {
@@ -2993,6 +2995,7 @@
       "range",
       "reload",
       "rof",
+      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -3157,12 +3160,20 @@
       "rof",
       "thermload"
     ],
-    "specials": [
+    "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"
     ]
   },
   "mrp": {
@@ -4244,8 +4255,7 @@
   },
   "po": {
     "blueprints": {
-      "PointDefence_PointDefenseCapacity": [3],
-      "HeatSinkLauncher_Shielded": {
+      "PointDefence_PointDefenseCapacity": {
         "grades": {
           "3": {
             "engineers": [
@@ -4893,6 +4903,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4902,6 +4913,7 @@
           "2": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4911,6 +4923,7 @@
           "3": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4941,6 +4954,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4950,6 +4964,7 @@
           "2": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4959,6 +4974,7 @@
           "3": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5398,6 +5414,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5407,6 +5424,7 @@
           "2": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5416,6 +5434,7 @@
           "3": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5445,6 +5464,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5454,6 +5474,7 @@
           "2": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5463,6 +5484,7 @@
           "3": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5492,6 +5514,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5501,6 +5524,7 @@
           "2": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5510,6 +5534,7 @@
           "3": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",

modifications/specials.json

@@ -10,6 +10,7 @@
     "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
     "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
     "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
+    "special_fsd_interrupt": {"id": 33, "edname": "special_fsd_interrupt", "name": "FSD interrupt"},
     "special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"},
     "special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"},
     "special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"},

modules/hardpoints/burst_laser.json

@@ -85,21 +85,21 @@
       "thermload": 0.19
     },
     {
-      "breachdmg": 2,
+      "breachdmg": 3.1,
       "breachmax": 0,
       "breachmin": 0,
       "burst": 8,
       "burstrof": 20,
       "class": 1,
       "cost": 8800,
-      "damage": 2.4,
+      "damage": 3.6,
       "damagedist": {
         "T": 1
       },
       "distdraw": 0.31,
       "edID": 128671449,
       "eddbID": 1477,
-      "falloff": 500,
+      "falloff": 600,
       "grp": "ul",
       "id": "cy",
       "integrity": 40,
@@ -110,9 +110,9 @@
       "piercing": 1,
       "power": 0.8,
       "pp": "Archon Delaine",
-      "range": 600,
+      "range": 3000,
       "rating": "F",
-      "rof": 6.6,
+      "rof": 7.6,
       "thermload": 0.3
     },
     {

modules/index.js

@@ -56,6 +56,7 @@ module.exports = {
     sc: require('./internal/scanner').sc,
     scb: require('./internal/shield_cell_bank').scb,
     sg: require('./internal/shield_generator').sg,
-    ss: require('./internal/surface_scanner').ss
+    ss: require('./internal/surface_scanner').ss,
+    rpl: require('./internal/repair_limpet_controller').rpl
   }
 };

modules/internal/repair_limpet_controller.json

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

modules/standard/frame_shift_drive.json

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

modules/standard/power_plant.json

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

package.json

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

ships/orca.json

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