Merge branch 'release/2.3.6'

EDCD · Jun 24, 2017 · 51d011d · 51d011d
2 parents f8faf11 + ed34ccc
commit 51d011d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -4,6 +4,7 @@
   * 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

diff --git a/dist/index.js b/dist/index.js
@@ -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: {

diff --git a/dist/index.json b/dist/index.json
@@ -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": [

diff --git 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": [

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"