Merge branch 'release/2.3.7'

Bump Version
Bump version and generate dist.
2025-12-08 23:23:23 +00:00 · 2017-08-29 19:58:36 +01:00 · 2017-08-29 19:58:04 +01:00 · 2017-08-17 15:20:20 +01:00 · 2017-06-24 09:30:33 +01:00 · 2017-06-24 09:30:28 +01:00
11 changed files with 317 additions and 115 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,23 @@
+#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
--- a/dist/index.js
+++ b/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"
@@ -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,
@@ -15608,7 +15608,7 @@ module.exports = {
          "3": {
            components: {
              Chromium: 1,
-              "Mechanical Equipment": 1,
+              "Mechanical Components": 1,
              "Specialised Legacy Firmware": 1
            },
            features: {
@@ -17933,8 +17933,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 +18072,7 @@ module.exports = {
          }
        },
        id: 62,
-        modulename: [ "Power distributor", "Distributor" ],
+        modulename: [ "Power plant" ],
        name: "Armoured"
      },
      PowerPlant_Boosted: {
@@ -18137,7 +18137,7 @@ module.exports = {
          }
        },
        id: 63,
-        modulename: [ "Power distributor", "Distributor" ],
+        modulename: [ "Power plant" ],
        name: "Overcharged"
      },
      PowerPlant_Stealth: {
@@ -20260,7 +20260,7 @@ module.exports = {
              burst: [ 2, 2 ],
              burstrof: [ 14, 19 ],
              clip: [ 1, 1 ],
-              range: [ -.5, -.02 ]
+              range: [ -.05, -.02 ]
            }
          }
        },
@@ -20383,7 +20383,7 @@ module.exports = {
              piercing: [ .2, .4 ],
              range: [ .4, .8 ],
              rof: [ -.08, -.02 ],
-              thermload: [ -.2, -.1 ]
+              thermload: [ .2, .1 ]
            }
          },
          "5": {
@@ -20559,7 +20559,8 @@ module.exports = {
            features: {
              fallofffromrange: [ 1, 1 ],
              mass: [ .1, 0 ],
-              range: [ .1, .2 ]
+              range: [ .1, .2 ],
+              shotspeed: [ .1, .2 ]
            }
          },
          "2": {
@@ -20569,9 +20570,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 +20585,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 +20598,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 +20613,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 +21461,10 @@ module.exports = {
        jitter: 1,
        speed: -.1667
      },
+      special_fsd_interrupt: {
+        damage: -.3,
+        rof: .5
+      },
      special_high_yield_shell: {
        rof: .1111111111111111
      },
@@ -22069,7 +22078,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: {
@@ -22547,7 +22556,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 +23208,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 +23304,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 +23391,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 +23981,7 @@ module.exports = {
      },
      po: {
        blueprints: {
-          PointDefence_PointDefenseCapacity: [ 3 ],
-          HeatSinkLauncher_Shielded: {
+          PointDefence_PointDefenseCapacity: {
            grades: {
              "3": {
                engineers: [ "Ram Tah" ]
@@ -24307,13 +24335,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 +24354,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 +24594,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 +24613,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 +24632,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 +25091,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",
--- a/dist/index.json
+++ b/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"
@@ -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
 				},
 				{
@@ -18864,7 +18864,7 @@
 					"3": {
 						"components": {
 							"Chromium": 1,
-							"Mechanical Equipment": 1,
+							"Mechanical Components": 1,
 							"Specialised Legacy Firmware": 1
 						},
 						"features": {
@@ -22913,8 +22913,8 @@
 					"3": {
 						"components": {
 							"Anomalous Bulk Scan Data": 1,
-							"Chromium": 1,
-							"Electrochemical Arrays": 1
+							"Hybrid Capacitors": 1,
+							"Selenium": 1
 						},
 						"features": {
 							"engcap": [
@@ -23152,8 +23152,7 @@
 				},
 				"id": 62,
 				"modulename": [
-					"Power distributor",
-					"Distributor"
+					"Power plant"
 				],
 				"name": "Armoured"
 			},
@@ -23265,8 +23264,7 @@
 				},
 				"id": 63,
 				"modulename": [
-					"Power distributor",
-					"Distributor"
+					"Power plant"
 				],
 				"name": "Overcharged"
 			},
@@ -26948,7 +26946,7 @@
 								1
 							],
 							"range": [
-								-0.5,
+								-0.05,
 								-0.02
 							]
 						}
@@ -27171,8 +27169,8 @@
 								-0.02
 							],
 							"thermload": [
-								-0.2,
-								-0.1
+								0.2,
+								0.1
 							]
 						}
 					},
@@ -27511,6 +27509,10 @@
 							"range": [
 								0.1,
 								0.2
+							],
+							"shotspeed": [
+								0.1,
+								0.2
 							]
 						}
 					},
@@ -27526,15 +27528,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 +27561,15 @@
 							],
 							"power": [
 								0.1,
-								0.04
+								0.05
 							],
 							"range": [
 								0.3,
 								0.6
+							],
+							"shotspeed": [
+								0.3,
+								0.6
 							]
 						}
 					},
@@ -27576,15 +27586,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 +27619,15 @@
 							],
 							"power": [
 								0.2,
-								0.14
+								0.15
 							],
 							"range": [
 								0.5,
 								1
+							],
+							"shotspeed": [
+								0.5,
+								1
 							]
 						}
 					}
@@ -28709,6 +28727,10 @@
 				"jitter": 1,
 				"speed": -0.1667
 			},
+			"special_fsd_interrupt": {
+				"damage": -0.3,
+				"rof": 0.5
+			},
 			"special_high_yield_shell": {
 				"rof": 0.1111111111111111
 			},
@@ -29670,6 +29692,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -30522,6 +30545,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -31706,6 +31730,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 +31906,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -32012,12 +32069,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 +33152,7 @@
 			},
 			"po": {
 				"blueprints": {
-					"PointDefence_PointDefenseCapacity": [
-						3
-					],
-					"HeatSinkLauncher_Shielded": {
+					"PointDefence_PointDefenseCapacity": {
 						"grades": {
 							"3": {
 								"engineers": [
@@ -33736,6 +33798,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33745,6 +33808,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33754,6 +33818,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33784,6 +33849,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33793,6 +33859,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -33802,6 +33869,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34239,6 +34307,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34248,6 +34317,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34257,6 +34327,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34286,6 +34357,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34295,6 +34367,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34304,6 +34377,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34333,6 +34407,7 @@
 							"1": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34342,6 +34417,7 @@
 							"2": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -34351,6 +34427,7 @@
 							"3": {
 								"engineers": [
 									"Bill Turner",
+									"Felicity Farseer",
 									"Juri Ishmaak",
 									"Lei Chung",
 									"Lori Jameson",
@@ -35163,6 +35240,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",
--- a/modifications/blueprints.json
+++ b/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 ]
        }
      }
    },
--- a/modifications/modifierActions.json
+++ b/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
  },
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -805,6 +805,7 @@
      "range",
      "reload",
      "rof",
+      "shotspeed",
      "thermload"
    ],
    "specials": [
@@ -1661,6 +1662,7 @@
      "range",
      "reload",
      "rof",
+      "shotspeed",
      "thermload"
    ],
    "specials": [
@@ -2849,6 +2851,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 +3027,7 @@
      "range",
      "reload",
      "rof",
+      "shotspeed",
      "thermload"
    ],
    "specials": [
@@ -3157,12 +3192,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 +4287,7 @@
  },
  "po": {
    "blueprints": {
-      "PointDefence_PointDefenseCapacity": [3],
-      "HeatSinkLauncher_Shielded": {
+      "PointDefence_PointDefenseCapacity": {
        "grades": {
          "3": {
            "engineers": [
@@ -4893,6 +4935,7 @@
          "1": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -4902,6 +4945,7 @@
          "2": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -4911,6 +4955,7 @@
          "3": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -4941,6 +4986,7 @@
          "1": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -4950,6 +4996,7 @@
          "2": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -4959,6 +5006,7 @@
          "3": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5398,6 +5446,7 @@
          "1": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5407,6 +5456,7 @@
          "2": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5416,6 +5466,7 @@
          "3": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5445,6 +5496,7 @@
          "1": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5454,6 +5506,7 @@
          "2": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5463,6 +5516,7 @@
          "3": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5492,6 +5546,7 @@
          "1": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5501,6 +5556,7 @@
          "2": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
@@ -5510,6 +5566,7 @@
          "3": {
            "engineers": [
              "Bill Turner",
+              "Felicity Farseer",
              "Juri Ishmaak",
              "Lei Chung",
              "Lori Jameson",
--- a/modifications/specials.json
+++ b/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"},
--- a/modules/hardpoints/burst_laser.json
+++ b/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
    },
    {
--- a/modules/standard/power_plant.json
+++ b/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"
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.3.2",
+  "version": "2.3.7",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -14,7 +14,7 @@
      "baseArmour": 220,
      "hardness": 55,
      "hullMass": 290,
-      "masslock": 13,
+      "masslock": 16,
      "pipSpeed": 0.08375,
      "luxuryCabins": true,
      "pitch": 25,
Author	SHA1	Message	Date
Unknown	0ba60d2993	Merge branch 'release/2.3.7'	2017-08-29 19:58:36 +01:00
Unknown	b3fd528ad1	Bump Version Bump version and generate dist.	2017-08-29 19:58:04 +01:00
strideynet	1de49ec2f2	Update MLF	2017-08-17 15:20:20 +01:00
Cmdr McDonald	74d3a43bc7	Merge branch 'release/2.3.6' into develop	2017-06-24 09:30:33 +01:00
Cmdr McDonald	51d011da76	Merge branch 'release/2.3.6'	2017-06-24 09:30:28 +01:00
Cmdr McDonald	ed34cccf54	Version bump	2017-06-24 09:30:24 +01:00
Cmdr McDonald	87603e4466	Add shot speed to relevant kinetics	2017-06-24 09:29:39 +01:00
Cmdr McDonald	8b92dfbf10	Merge branch 'release/2.3.5' into develop	2017-05-17 07:30:36 +01:00
Cmdr McDonald	f8faf11e3c	Merge branch 'release/2.3.5'	2017-05-17 07:30:32 +01:00
Cmdr McDonald	c029ed0e0d	Version bump	2017-05-17 07:30:26 +01:00
Cmdr McDonald	5570c66010	Fix typo	2017-05-15 16:07:24 +01:00
Cmdr McDonald	0af85f4d31	Fixes	2017-05-15 10:11:58 +01:00
Cmdr McDonald	3597ae4093	Add shot speed for long-range weapon	2017-05-12 00:29:38 +01:00
Cmdr McDonald	662efeaace	Fix integrity for class 6 power plants	2017-05-07 10:23:50 +01:00
Cmdr McDonald	8250994ebe	Fix blueprints for point defence	2017-05-06 10:29:10 +01:00
Cmdr McDonald	ba08e5184f	Add values for FSD interrupt	2017-05-03 14:33:06 +01:00
Cmdr McDonald	839b9b80a9	Merge branch 'release/2.3.4' into develop	2017-05-03 12:38:42 +01:00
Cmdr McDonald	f11ce05c03	Merge branch 'release/2.3.4'	2017-05-03 12:38:39 +01:00
Cmdr McDonald	355d2ef88d	Version bump	2017-05-03 12:38:32 +01:00
Cmdr McDonald	6a5817237d	Separate specials for dumbfire and seeker missiles	2017-05-03 10:15:54 +01:00
Cmdr McDonald	9825474117	Add FSD interrupt special	2017-05-03 09:57:56 +01:00
Cmdr McDonald	64b7ca503a	Fix internal names for power plant blueprints	2017-04-27 06:59:06 -04:00
Cmdr McDonald	d7922eda7f	Fix thermal load of focused grade 4	2017-04-27 06:56:05 -04:00
Cmdr McDonald	d51c2a7562	Add long-range blueprint to multi-cannon	2017-04-25 07:33:03 +01:00
Cmdr McDonald	74e5b8298f	Merge branch 'release/2.3.3' into develop	2017-04-15 20:46:09 +01:00
Cmdr McDonald	c56ee502e9	Merge branch 'release/2.3.3'	2017-04-15 20:46:06 +01:00
Cmdr McDonald	55350abd2d	Bump version	2017-04-15 20:46:01 +01:00
Cmdr McDonald	e9d8ecc79f	Add Felicity Farseer to s and ss modifications	2017-04-15 20:29:32 +01:00
Cmdr McDonald	bb47e289ce	Merge branch 'release/2.3.2' into develop	2017-04-14 11:01:13 +01:00