Merge branch 'release/2.9.12'

2.9.12
dist
2025-12-08 15:13:23 +00:00 · 2018-04-28 12:15:32 +10:00 · 2018-04-28 12:15:25 +10:00 · 2018-04-28 12:13:51 +10:00 · 2018-04-28 12:13:20 +10:00 · 2018-04-28 09:57:05 +10:00
9 changed files with 229 additions and 33 deletions
--- a/dist/index.js
+++ b/dist/index.js
@@ -133,7 +133,7 @@ module.exports = {
        eddbID: 1641,
        grp: "bh",
        cost: 6803170,
-        mass: 75,
+        mass: 40,
        explres: -.4,
        kinres: -.2,
        thermres: 0,
@@ -144,7 +144,7 @@ module.exports = {
        eddbID: 1642,
        grp: "bh",
        cost: 15307134,
-        mass: 150,
+        mass: 78,
        explres: -.4,
        kinres: -.2,
        thermres: 0,
@@ -155,7 +155,7 @@ module.exports = {
        eddbID: 1643,
        grp: "bh",
        cost: 36175859,
-        mass: 150,
+        mass: 78,
        explres: -.5,
        kinres: -.75,
        thermres: .5,
@@ -166,7 +166,7 @@ module.exports = {
        eddbID: 1644,
        grp: "bh",
        cost: 40087682,
-        mass: 150,
+        mass: 78,
        explres: .2,
        kinres: .25,
        thermres: -.4,
@@ -16192,6 +16192,67 @@ module.exports = {
        range: 2.38,
        rating: "A",
        symbol: "Int_DroneControl_Repair_Size7_Class5"
+      } ],
+      rcpl: [ {
+        class: 1,
+        cost: 2600,
+        edID: 128837858,
+        eddbID: 1636,
+        grp: "rcpl",
+        id: "0L",
+        mass: 1.3,
+        maximum: 1,
+        power: .18,
+        range: 1.2,
+        rating: "E",
+        integrity: 24,
+        hacktime: 22,
+        symbol: "Int_DroneControl_Recon_Size1_Class1"
+      }, {
+        class: 3,
+        cost: 8200,
+        edID: 128841592,
+        eddbID: 1637,
+        grp: "rcpl",
+        id: "0M",
+        mass: 2,
+        maximum: 1,
+        power: .2,
+        range: 1.4,
+        rating: "E",
+        integrity: 51,
+        hacktime: 17,
+        symbol: "Int_DroneControl_Recon_Size3_Class1"
+      }, {
+        class: 5,
+        cost: 75800,
+        edID: 128841593,
+        eddbID: 1638,
+        grp: "rcpl",
+        id: "0N",
+        mass: 20,
+        maximum: 1,
+        power: .5,
+        range: 1.7,
+        rating: "E",
+        integrity: 96,
+        hacktime: 13,
+        symbol: "Int_DroneControl_Recon_Size5_Class1"
+      }, {
+        class: 7,
+        cost: 612200,
+        edID: 128841594,
+        eddbID: 1639,
+        grp: "rcpl",
+        id: "0O",
+        mass: 128,
+        maximum: 1,
+        power: .97,
+        range: 2,
+        rating: "E",
+        integrity: 157,
+        hacktime: 10,
+        symbol: "Int_DroneControl_Recon_Size7_Class1"
      } ]
    }
  },
@@ -17366,7 +17427,7 @@ module.exports = {
            },
            features: {
              integrity: [ -.06, -.09 ],
-              optmass: [ -.5, -.08 ],
+              optmass: [ -.05, -.08 ],
              optmul: [ .19, .26 ],
              power: [ .06, .08 ],
              thermload: [ .3, .4 ]
@@ -23452,7 +23513,7 @@ module.exports = {
      },
      special_powerplant_highcharge: {
        mass: .1,
-        power: .05
+        pgen: .05
      },
      special_powerplant_cooled: {
        eff: -.1
@@ -23554,9 +23615,9 @@ module.exports = {
      },
      special_hullreinforcement_chunky: {
        hullreinforcement: .1,
-        explres: 2,
-        thermres: 2,
-        kinres: 2
+        explres: -2,
+        thermres: -2,
+        kinres: -2
      },
      special_shieldbooster_thermic: {
        optmul: -.01,
--- a/dist/index.json
+++ b/dist/index.json
@@ -181,7 +181,7 @@
 					"eddbID": 1641,
 					"grp": "bh",
 					"cost": 6803170,
-					"mass": 75,
+					"mass": 40,
 					"explres": -0.4,
 					"kinres": -0.2,
 					"thermres": 0,
@@ -193,7 +193,7 @@
 					"eddbID": 1642,
 					"grp": "bh",
 					"cost": 15307134,
-					"mass": 150,
+					"mass": 78,
 					"explres": -0.4,
 					"kinres": -0.2,
 					"thermres": 0,
@@ -205,7 +205,7 @@
 					"eddbID": 1643,
 					"grp": "bh",
 					"cost": 36175859,
-					"mass": 150,
+					"mass": 78,
 					"explres": -0.5,
 					"kinres": -0.75,
 					"thermres": 0.5,
@@ -217,7 +217,7 @@
 					"eddbID": 1644,
 					"grp": "bh",
 					"cost": 40087682,
-					"mass": 150,
+					"mass": 78,
 					"explres": 0.2,
 					"kinres": 0.25,
 					"thermres": -0.4,
@@ -18888,6 +18888,72 @@
 					"rating": "A",
 					"symbol": "Int_DroneControl_Repair_Size7_Class5"
 				}
+			],
+			"rcpl": [
+				{
+					"class": 1,
+					"cost": 2600,
+					"edID": 128837858,
+					"eddbID": 1636,
+					"grp": "rcpl",
+					"id": "0L",
+					"mass": 1.3,
+					"maximum": 1,
+					"power": 0.18,
+					"range": 1.2,
+					"rating": "E",
+					"integrity": 24,
+					"hacktime": 22,
+					"symbol": "Int_DroneControl_Recon_Size1_Class1"
+				},
+				{
+					"class": 3,
+					"cost": 8200,
+					"edID": 128841592,
+					"eddbID": 1637,
+					"grp": "rcpl",
+					"id": "0M",
+					"mass": 2,
+					"maximum": 1,
+					"power": 0.2,
+					"range": 1.4,
+					"rating": "E",
+					"integrity": 51,
+					"hacktime": 17,
+					"symbol": "Int_DroneControl_Recon_Size3_Class1"
+				},
+				{
+					"class": 5,
+					"cost": 75800,
+					"edID": 128841593,
+					"eddbID": 1638,
+					"grp": "rcpl",
+					"id": "0N",
+					"mass": 20,
+					"maximum": 1,
+					"power": 0.5,
+					"range": 1.7,
+					"rating": "E",
+					"integrity": 96,
+					"hacktime": 13,
+					"symbol": "Int_DroneControl_Recon_Size5_Class1"
+				},
+				{
+					"class": 7,
+					"cost": 612200,
+					"edID": 128841594,
+					"eddbID": 1639,
+					"grp": "rcpl",
+					"id": "0O",
+					"mass": 128,
+					"maximum": 1,
+					"power": 0.97,
+					"range": 2,
+					"rating": "E",
+					"integrity": 157,
+					"hacktime": 10,
+					"symbol": "Int_DroneControl_Recon_Size7_Class1"
+				}
 			]
 		}
 	},
@@ -20824,7 +20890,7 @@
 								-0.09
 							],
 							"optmass": [
-								-0.5,
+								-0.05,
 								-0.08
 							],
 							"optmul": [
@@ -31087,7 +31153,7 @@
 			},
 			"special_powerplant_highcharge": {
 				"mass": 0.1,
-				"power": 0.05
+				"pgen": 0.05
 			},
 			"special_powerplant_cooled": {
 				"eff": -0.1
@@ -31189,9 +31255,9 @@
 			},
 			"special_hullreinforcement_chunky": {
 				"hullreinforcement": 0.1,
-				"explres": 2,
-				"thermres": 2,
-				"kinres": 2
+				"explres": -2,
+				"thermres": -2,
+				"kinres": -2
 			},
 			"special_shieldbooster_thermic": {
 				"optmul": -0.01,
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -1168,7 +1168,7 @@
        },
        "features": {
          "integrity": [ -0.06, -0.09 ],
-          "optmass": [ -0.5, -0.08 ],
+          "optmass": [ -0.05, -0.08 ],
          "optmul": [ 0.19, 0.26 ],
          "power": [ 0.06, 0.08 ],
          "thermload": [ 0.3, 0.4 ]
@@ -3203,9 +3203,9 @@
    "modulename": ["Point defence"],
    "name": "Shielded"
  },
-  
-  
-  
+
+
+
  "PowerDistributor_HighCapacity": {
    "fdname": "PowerDistributor_HighCapacity",
    "grades": {
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -341,7 +341,7 @@
  },
  "special_powerplant_highcharge": {
    "mass": 0.1,
-    "power": 0.05
+    "pgen": 0.05
  },
  "special_powerplant_cooled": {
    "eff": -0.1
@@ -443,9 +443,9 @@
  },
  "special_hullreinforcement_chunky": {
    "hullreinforcement": 0.1,
-    "explres": 2,
-    "thermres": 2,
-    "kinres": 2
+    "explres": -2,
+    "thermres": -2,
+    "kinres": -2
  },
  "special_shieldbooster_thermic": {
    "optmul": -0.01,
--- a/modules/index.js
+++ b/modules/index.js
@@ -64,6 +64,7 @@ module.exports = {
    scb: require('./internal/shield_cell_bank').scb,
    sg: require('./internal/shield_generator').sg,
    ss: require('./internal/surface_scanner').ss,
-    rpl: require('./internal/repair_limpet_controller').rpl
+    rpl: require('./internal/repair_limpet_controller').rpl,
+    rcpl: require('./internal/recon_limpet_controllers').rcpl
  }
 }
--- a/modules/internal/recon_limpet_controllers.json
+++ b/modules/internal/recon_limpet_controllers.json
@@ -0,0 +1,68 @@
+{
+  "rcpl": [
+    {
+      "class": 1,
+      "cost": 2600,
+      "edID": 128837858,
+      "eddbID": 1636,
+      "grp": "rcpl",
+      "id": "0L",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 1.2,
+      "rating": "E",
+      "integrity": 24,
+      "hacktime": 22,
+      "symbol": "Int_DroneControl_Recon_Size1_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 8200,
+      "edID": 128841592,
+      "eddbID": 1637,
+      "grp": "rcpl",
+      "id": "0M",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.2,
+      "range": 1.4,
+      "rating": "E",
+      "integrity": 51,
+      "hacktime": 17,
+      "symbol": "Int_DroneControl_Recon_Size3_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 75800,
+      "edID": 128841593,
+      "eddbID": 1638,
+      "grp": "rcpl",
+      "id": "0N",
+      "mass": 20,
+      "maximum": 1,
+      "power": 0.5,
+      "range": 1.7,
+      "rating": "E",
+      "integrity": 96,
+      "hacktime": 13,
+      "symbol": "Int_DroneControl_Recon_Size5_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 612200,
+      "edID": 128841594,
+      "eddbID": 1639,
+      "grp": "rcpl",
+      "id": "0O",
+      "mass": 128,
+      "maximum": 1,
+      "power": 0.97,
+      "range": 2,
+      "rating": "E",
+      "integrity": 157,
+      "hacktime": 10,
+      "symbol": "Int_DroneControl_Recon_Size7_Class1"
+    }
+  ]
+}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.10",
+  "version": "2.9.12",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.10",
+  "version": "2.9.12",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
--- a/ships/alliance_chieftain.json
+++ b/ships/alliance_chieftain.json
@@ -27,10 +27,10 @@
    },
    "bulkheads": [
      { "id": "CI", "edID": 128816576, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "CJ", "edID": 128816577, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "CK", "edID": 128816578, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "CL", "edID": 128816579, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "CM", "edID": 128816580, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "CJ", "edID": 128816577, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "CK", "edID": 128816578, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "CL", "edID": 128816579, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "CM", "edID": 128816580, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
    ],
    "slots": {
      "standard": [6, 6, 5, 5, 6, 4, 4],
Author	SHA1	Message	Date
willyb321	6d8c74ad3f	Merge branch 'release/2.9.12'	2018-04-28 12:15:32 +10:00
willyb321	0e6d01e145	2.9.12	2018-04-28 12:15:25 +10:00
willyb321	a11731c7ea	dist	2018-04-28 12:13:51 +10:00
willyb321	4a16789340	add recon limpet controllers	2018-04-28 12:13:20 +10:00
willyb321	c140856334	Merge branch 'develop'	2018-04-28 09:57:05 +10:00
willyb321	37fd278e23	Fix dirty g3 optmass Fixes edcd/coriolis#258	2018-04-26 14:32:33 +10:00
willyb321	9ac6427ee0	Merge branch 'release/2.9.11'	2018-04-26 09:20:42 +10:00
willyb321	cf5352aaef	2.9.11	2018-04-26 09:20:29 +10:00
willyb321	fbafd96386	update chieftain armour mass	2018-04-26 09:10:17 +10:00
willyb321	e9bb7fe748	Fix HRP deep plating	2018-04-26 09:05:47 +10:00
willyb321	be5f139dc5	Fix monstered pp Closes #259	2018-04-25 20:49:58 +10:00
willyb321	1275242796	Merge tag 'release/v2.9.10' into develop 2.9.10	2018-04-25 20:01:17 +10:00
willyb321	f2baefc4c8	Merge branch 'release/release/v2.9.10'	2018-04-25 20:01:02 +10:00
willyb321	d1e0e937ab	Merge branch 'release/2.9.8'	2018-04-23 07:40:05 +10:00
willyb321	69afe0a89d	Merge branch 'release/2.9.7'	2018-04-22 12:26:49 +10:00
willyb321	a110545bd7	Merge branch 'release/2.9.6'	2018-04-22 06:59:52 +10:00