Merge branch 'release/2.9.16'

2.9.16
Temporary fix for EDCD/coriolis#286
2025-12-08 15:13:23 +00:00 · 2018-06-12 11:04:06 +10:00 · 2018-06-12 11:03:59 +10:00 · 2018-06-05 07:58:07 +10:00 · 2018-06-05 07:45:14 +10:00 · 2018-06-05 07:43:18 +10:00
7 changed files with 39 additions and 37 deletions
--- a/dist/index.js
+++ b/dist/index.js
@@ -16834,7 +16834,7 @@ module.exports = {
      ChaffLauncher_ChaffCapacity: {
        fdname: "ChaffLauncher_ChaffCapacity",
        grades: {
-          "1": {
+          "3": {
            components: {
              "Mechanical Scrap": 1,
              Niobium: 1,
@@ -17908,9 +17908,9 @@ module.exports = {
          },
          "4": {
            components: {
-              "Unidentfied Scan Archives": 1,
-              "Strange Wake Solution": 1,
-              "Atypical Encryption Archive": 1
+              "Unidentified Scan Archives": 1,
+              "Strange Wake Solutions": 1,
+              "Atypical Encryption Archives": 1
            },
            features: {
              facinglimit: [ -.25, -.25 ],
@@ -18336,7 +18336,7 @@ module.exports = {
      HeatSinkLauncher_HeatSinkCapacity: {
        fdname: "HeatSinkLauncher_HeatSinkCapacity",
        grades: {
-          "1": {
+          "3": {
            components: {
              "Mechanical Scrap": 1,
              Niobium: 1,
@@ -19349,7 +19349,7 @@ module.exports = {
      PointDefence_PointDefenseCapacity: {
        fdname: "PointDefence_PointDefenseCapacity",
        grades: {
-          "1": {
+          "3": {
            components: {
              "Mechanical Scrap": 1,
              Niobium: 1,
@@ -20059,7 +20059,7 @@ module.exports = {
            features: {
              eff: [ .15, .15 ],
              integrity: [ -.15, -.15 ],
-              pgen: [ .12, .19 ]
+              pgen: [ .19, .26 ]
            }
          },
          "4": {
@@ -20071,7 +20071,7 @@ module.exports = {
            features: {
              eff: [ .2, .2 ],
              integrity: [ -.2, -.2 ],
-              pgen: [ .19, .33 ]
+              pgen: [ .26, .33 ]
            }
          },
          "5": {
@@ -20083,7 +20083,7 @@ module.exports = {
            features: {
              eff: [ .25, .25 ],
              integrity: [ -.25, -.25 ],
-              pgen: [ .3, .4 ]
+              pgen: [ .33, .4 ]
            }
          }
        },
@@ -22535,7 +22535,7 @@ module.exports = {
              Sulphur: 1
            },
            features: {
-              fallofffromrange: [ 0, .2 ],
+              fallofffromrange: [ .2, .2 ],
              mass: [ .1, .1 ],
              power: [ .03, .03 ],
              range: [ 0, .2 ],
@@ -23623,7 +23623,7 @@ module.exports = {
      },
      special_weapon_rateoffire: {
        power: .05,
-        rof: .03
+        rof: -.03
      },
      special_weapon_efficient: {
        power: -.1
@@ -25826,7 +25826,7 @@ module.exports = {
          }
        },
        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
-        specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_lock_breaker", "special_thermal_conduit", "special_weapon_damage", "special_weapon_efficient", "special_weapon_rateoffire", "special_weapon_toughened", "special_weapon_lightweight" ]
+        specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_plasma_slug_cooled", "special_lock_breaker", "special_thermal_conduit", "special_weapon_damage", "special_weapon_efficient", "special_weapon_rateoffire", "special_weapon_toughened", "special_weapon_lightweight" ]
      },
      pas: {
        blueprints: {},
--- a/dist/index.json
+++ b/dist/index.json
@@ -19961,7 +19961,7 @@
 			"ChaffLauncher_ChaffCapacity": {
 				"fdname": "ChaffLauncher_ChaffCapacity",
 				"grades": {
-					"1": {
+					"3": {
 						"components": {
 							"Mechanical Scrap": 1,
 							"Niobium": 1,
@@ -21799,9 +21799,9 @@
 					},
 					"4": {
 						"components": {
-							"Unidentfied Scan Archives": 1,
-							"Strange Wake Solution": 1,
-							"Atypical Encryption Archive": 1
+							"Unidentified Scan Archives": 1,
+							"Strange Wake Solutions": 1,
+							"Atypical Encryption Archives": 1
 						},
 						"features": {
 							"facinglimit": [
@@ -22460,7 +22460,7 @@
 			"HeatSinkLauncher_HeatSinkCapacity": {
 				"fdname": "HeatSinkLauncher_HeatSinkCapacity",
 				"grades": {
-					"1": {
+					"3": {
 						"components": {
 							"Mechanical Scrap": 1,
 							"Niobium": 1,
@@ -24163,7 +24163,7 @@
 			"PointDefence_PointDefenseCapacity": {
 				"fdname": "PointDefence_PointDefenseCapacity",
 				"grades": {
-					"1": {
+					"3": {
 						"components": {
 							"Mechanical Scrap": 1,
 							"Niobium": 1,
@@ -25563,8 +25563,8 @@
 								-0.15
 							],
 							"pgen": [
-								0.12,
-								0.19
+								0.19,
+								0.26
 							]
 						}
 					},
@@ -25584,7 +25584,7 @@
 								-0.2
 							],
 							"pgen": [
-								0.19,
+								0.26,
 								0.33
 							]
 						}
@@ -25605,7 +25605,7 @@
 								-0.25
 							],
 							"pgen": [
-								0.3,
+								0.33,
 								0.4
 							]
 						}
@@ -29901,7 +29901,7 @@
 						},
 						"features": {
 							"fallofffromrange": [
-								0,
+								0.2,
 								0.2
 							],
 							"mass": [
@@ -31307,7 +31307,7 @@
 			},
 			"special_weapon_rateoffire": {
 				"power": 0.05,
-				"rof": 0.03
+				"rof": -0.03
 			},
 			"special_weapon_efficient": {
 				"power": -0.1
@@ -35176,6 +35176,7 @@
 					"special_dispersal_field",
 					"special_phasing_sequence",
 					"special_plasma_slug",
+					"special_plasma_slug_cooled",
 					"special_lock_breaker",
 					"special_thermal_conduit",
 					"special_weapon_damage",
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -575,7 +575,7 @@
  "ChaffLauncher_ChaffCapacity": {
    "fdname": "ChaffLauncher_ChaffCapacity",
    "grades": {
-      "1": {
+      "3": {
        "components": {
          "Mechanical Scrap": 1,
          "Niobium": 1,
@@ -1649,9 +1649,9 @@
      },
      "4": {
        "components": {
-          "Unidentfied Scan Archives": 1,
-          "Strange Wake Solution": 1,
-          "Atypical Encryption Archive": 1
+          "Unidentified Scan Archives": 1,
+          "Strange Wake Solutions": 1,
+          "Atypical Encryption Archives": 1
        },
        "features": {
          "facinglimit": [ -0.25, -0.25 ],
@@ -2077,7 +2077,7 @@
  "HeatSinkLauncher_HeatSinkCapacity": {
    "fdname": "HeatSinkLauncher_HeatSinkCapacity",
    "grades": {
-      "1": {
+      "3": {
        "components": {
          "Mechanical Scrap": 1,
          "Niobium": 1,
@@ -3090,7 +3090,7 @@
  "PointDefence_PointDefenseCapacity": {
    "fdname": "PointDefence_PointDefenseCapacity",
    "grades": {
-      "1": {
+      "3": {
        "components": {
          "Mechanical Scrap": 1,
          "Niobium": 1,
@@ -3801,7 +3801,7 @@
        "features": {
          "eff": [ 0.15, 0.15 ],
          "integrity": [ -0.15, -0.15 ],
-          "pgen": [ 0.12, 0.19 ]
+          "pgen": [ 0.19, 0.26 ]
        }
      },
      "4": {
@@ -3813,7 +3813,7 @@
        "features": {
          "eff": [ 0.2, 0.2 ],
          "integrity": [ -0.2, -0.2 ],
-          "pgen": [ 0.19, 0.33 ]
+          "pgen": [ 0.26, 0.33 ]
        }
      },
      "5": {
@@ -3825,7 +3825,7 @@
        "features": {
          "eff": [ 0.25, 0.25 ],
          "integrity": [ -0.25, -0.25 ],
-          "pgen": [ 0.3, 0.4 ]
+          "pgen": [ 0.33, 0.4 ]
        }
      }
    },
@@ -6277,7 +6277,7 @@
          "Sulphur": 1
        },
        "features": {
-          "fallofffromrange": [ 0, 0.2 ],
+          "fallofffromrange": [ 0.2, 0.2 ],
          "mass": [ 0.1, 0.1 ],
          "power": [ 0.03, 0.03 ],
          "range": [ 0, 0.2 ],
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -400,7 +400,7 @@
  },
  "special_weapon_rateoffire": {
    "power": 0.05,
-    "rof": 0.03
+    "rof": -0.03
  },
  "special_weapon_efficient": {
    "power": -0.1
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -3729,6 +3729,7 @@
      "special_dispersal_field",
      "special_phasing_sequence",
      "special_plasma_slug",
+      "special_plasma_slug_cooled",
      "special_lock_breaker",
      "special_thermal_conduit",
      "special_weapon_damage",
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.13",
+  "version": "2.9.16",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.13",
+  "version": "2.9.16",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
Author	SHA1	Message	Date
willyb321	8fb4bd08b5	Merge branch 'release/2.9.16'	2018-06-12 11:04:06 +10:00
willyb321	1ac1c85c7b	2.9.16	2018-06-12 11:03:59 +10:00
willyb321	9e1f7934d8	Temporary fix for EDCD/coriolis#286	2018-06-05 07:58:07 +10:00
willyb321	e1f91a5795	Merge branch 'develop'	2018-06-05 07:45:14 +10:00
willyb321	63751d1f26	Fix multi servos reducing ROF Closes EDCD/coriolis#287	2018-06-05 07:43:18 +10:00
willyb321	ad99e37c66	Fix OC PP Closes EDCD/coriolis#285	2018-06-05 07:39:45 +10:00
William Blythe	aa75ea6e85	Fix a couple mats in recipes Fixes edcd/coriolis#292	2018-05-31 10:48:18 +10:00
willyb321	355d14777d	Merge branch 'release/2.9.15'	2018-05-30 07:44:12 +10:00
willyb321	3ea5731067	Merge branch 'release/2.9.15' into develop	2018-05-30 07:44:12 +10:00
willyb321	4254abcc15	2.9.15	2018-05-30 07:44:07 +10:00
willyb321	be3229a57d	Merge branch 'release/2.9.14'	2018-05-29 07:04:11 +10:00
willyb321	7260d2f75d	Merge branch 'release/2.9.14' into develop	2018-05-29 07:04:11 +10:00
willyb321	84c2a2ad30	2.9.14	2018-05-29 07:04:02 +10:00
willyb321	5e24df467a	Merge branch 'develop'	2018-05-12 19:19:26 +10:00
willyb321	1a478758ee	fix pa plasma slug missing	2018-05-06 09:10:34 +10:00
willyb321	b58cb71e5a	Fix PD ammo cap crashing Fixes EDCD/coriolis#272	2018-05-06 09:00:33 +10:00
willyb321	652decf6b3	Merge branch 'develop'	2018-05-04 16:22:40 +10:00
willyb321	6b13b3a673	fix chaff ammo cap crashing	2018-05-04 16:21:42 +10:00
willyb321	a667fd2309	Merge remote-tracking branch 'origin/develop'	2018-05-03 10:59:27 +10:00
William Blythe	cff8cf71df	fix heat sink Closes #266	2018-05-03 10:49:58 +10:00
willyb321	e7bcba7360	Merge branch 'release/2.9.13' into develop	2018-05-03 07:15:41 +10:00