Merge branch 'release/2.3.6'

ChangeLog.md

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

dist/index.js

@@ -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,
+              "Hybrid Capacitors": 1,
-              "Electrochemical Arrays": 1
+              Selenium: 1
             },
             features: {
               engcap: [ -.15, -.04 ],
@@ -20260,7 +20260,7 @@ module.exports = {
               burst: [ 2, 2 ],
               burstrof: [ 14, 19 ],
               clip: [ 1, 1 ],
-              range: [ -.5, -.02 ]
+              range: [ -.05, -.02 ]
             }
           }
         },
@@ -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 ],
+              mass: [ .2, .05 ],
-              power: [ .04, 0 ],
+              power: [ .05, 0 ],
-              range: [ .2, .4 ]
+              range: [ .2, .4 ],
+              shotspeed: [ .2, .4 ]
             }
           },
           "3": {
@@ -20583,8 +20585,9 @@ module.exports = {
             features: {
               fallofffromrange: [ 1, 1 ],
               mass: [ .3, .1 ],
-              power: [ .1, .04 ],
+              power: [ .1, .05 ],
-              range: [ .3, .6 ]
+              range: [ .3, .6 ],
+              shotspeed: [ .3, .6 ]
             }
           },
           "4": {
@@ -20595,9 +20598,10 @@ module.exports = {
             },
             features: {
               fallofffromrange: [ 1, 1 ],
-              mass: [ .4, .14 ],
+              mass: [ .4, .15 ],
-              power: [ .14, .1 ],
+              power: [ .15, .1 ],
-              range: [ .4, .8 ]
+              range: [ .4, .8 ],
+              shotspeed: [ .4, .8 ]
             }
           },
           "5": {
@@ -20609,8 +20613,9 @@ module.exports = {
             features: {
               fallofffromrange: [ 1, 1 ],
               mass: [ .5, .2 ],
-              power: [ .2, .14 ],
+              power: [ .2, .15 ],
-              range: [ .5, 1 ]
+              range: [ .5, 1 ],
+              shotspeed: [ .5, 1 ]
             }
           }
         },
@@ -21456,7 +21461,10 @@ module.exports = {
         jitter: 1,
         speed: -.1667
       },
-      special_fsd_interrupt: {},
+      special_fsd_interrupt: {
+        damage: -.3,
+        rof: .5
+      },
       special_high_yield_shell: {
         rof: .1111111111111111
       },
@@ -22070,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: {
@@ -22548,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: {
@@ -23296,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: {
@@ -23973,8 +23981,7 @@ module.exports = {
       },
       po: {
         blueprints: {
-          PointDefence_PointDefenseCapacity: [ 3 ],
+          PointDefence_PointDefenseCapacity: {
-          HeatSinkLauncher_Shielded: {
             grades: {
               "3": {
                 engineers: [ "Ram Tah" ]

dist/index.json

@@ -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,
+							"Hybrid Capacitors": 1,
-							"Electrochemical Arrays": 1
+							"Selenium": 1
 						},
 						"features": {
 							"engcap": [
@@ -26946,7 +26946,7 @@
 								1
 							],
 							"range": [
-								-0.5,
+								-0.05,
 								-0.02
 							]
 						}
@@ -27509,6 +27509,10 @@
 							"range": [
 								0.1,
 								0.2
+							],
+							"shotspeed": [
+								0.1,
+								0.2
 							]
 						}
 					},
@@ -27524,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
 							]
 						}
 					},
@@ -27553,11 +27561,15 @@
 							],
 							"power": [
 								0.1,
-								0.04
+								0.05
 							],
 							"range": [
 								0.3,
 								0.6
+							],
+							"shotspeed": [
+								0.3,
+								0.6
 							]
 						}
 					},
@@ -27574,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
 							]
 						}
 					},
@@ -27603,11 +27619,15 @@
 							],
 							"power": [
 								0.2,
-								0.14
+								0.15
 							],
 							"range": [
 								0.5,
 								1
+							],
+							"shotspeed": [
+								0.5,
+								1
 							]
 						}
 					}
@@ -28707,7 +28727,10 @@
 				"jitter": 1,
 				"speed": -0.1667
 			},
-			"special_fsd_interrupt": {},
+			"special_fsd_interrupt": {
+				"damage": -0.3,
+				"rof": 0.5
+			},
 			"special_high_yield_shell": {
 				"rof": 0.1111111111111111
 			},
@@ -29669,6 +29692,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -30521,6 +30545,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -31881,6 +31906,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -33126,10 +33152,7 @@
 			},
 			"po": {
 				"blueprints": {
-					"PointDefence_PointDefenseCapacity": [
+					"PointDefence_PointDefenseCapacity": {
-						3
-					],
-					"HeatSinkLauncher_Shielded": {
 						"grades": {
 							"3": {
 								"engineers": [

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,
+          "Hybrid Capacitors": 1,
-          "Electrochemical Arrays": 1
+          "Selenium": 1
         },
         "features": {
           "engcap": [ -0.15, -0.04 ],
@@ -5815,7 +5815,7 @@
           "burst": [ 2, 2 ],
           "burstrof": [ 14, 19 ],
           "clip": [ 1, 1 ],
-          "range": [ -0.5, -0.02 ]
+          "range": [ -0.05, -0.02 ]
         }
       }
     },
@@ -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 ],
+          "mass": [ 0.2, 0.05 ],
-          "power": [ 0.04, 0 ],
+          "power": [ 0.05, 0 ],
-          "range": [ 0.2, 0.4 ]
+          "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 ],
+          "power": [ 0.1, 0.05 ],
-          "range": [ 0.3, 0.6 ]
+          "range": [ 0.3, 0.6 ],
+          "shotspeed": [ 0.3, 0.6 ]
         }
       },
       "4": {
@@ -6150,9 +6153,10 @@
         },
         "features": {
           "fallofffromrange": [ 1, 1 ],
-          "mass": [ 0.4, 0.14 ],
+          "mass": [ 0.4, 0.15 ],
-          "power": [ 0.14, 0.1 ],
+          "power": [ 0.15, 0.1 ],
-          "range": [ 0.4, 0.8 ]
+          "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 ],
+          "power": [ 0.2, 0.15 ],
-          "range": [ 0.5, 1 ]
+          "range": [ 0.5, 1 ],
+          "shotspeed": [ 0.5, 1 ]
         }
       }
     },

modifications/modifierActions.json

@@ -212,6 +212,8 @@
     "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": [
@@ -1661,6 +1662,7 @@
       "range",
       "reload",
       "rof",
+      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -3025,6 +3027,7 @@
       "range",
       "reload",
       "rof",
+      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -4284,8 +4287,7 @@
   },
   "po": {
     "blueprints": {
-      "PointDefence_PointDefenseCapacity": [3],
+      "PointDefence_PointDefenseCapacity": {
-      "HeatSinkLauncher_Shielded": {
         "grades": {
           "3": {
             "engineers": [

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/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.4",
+  "version": "2.3.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"