Merge branch 'release/2.3.7'

Bump Version
Bump version and generate dist.
2025-12-10 07:55:33 +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
6 changed files with 17 additions and 7 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,9 +1,13 @@
+#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
--- 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,
@@ -22078,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: {
@@ -22556,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: {
@@ -23304,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: {
--- 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,
@@ -29692,6 +29692,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -30544,6 +30545,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -31904,6 +31906,7 @@
 					"range",
 					"reload",
 					"rof",
+					"shotspeed",
 					"thermload"
 				],
 				"specials": [
--- 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": [
@@ -3025,6 +3027,7 @@
      "range",
      "reload",
      "rof",
+      "shotspeed",
      "thermload"
    ],
    "specials": [
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.3.5",
+  "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