Merge branch 'release/2.2.14'

ChangeLog.md

@@ -1,3 +1,8 @@
+#2.2.14
+  * Alter blueprint structure to combine components and features
+  * Make hidden value of modifications its own attribute
+  * Fix incorrect ED ID for class 6 passenger cabins
+
 #2.2.13
   * Add plasma slug special effect for plasma accelerator
   * Tweak hull costs of ships

modifications/modifications.json

@@ -6,7 +6,7 @@
     "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite"},
     "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative"},
     "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative"},
-    "damagedist": {"id": 40, "name": "damage", "type": "hidden", "method": "overwrite"},
+    "damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
     "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative"},
     "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative"},
     "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative"},
@@ -15,7 +15,7 @@
     "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
     "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
     "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative"},
-    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "hidden", "method": "overwrite"},
+    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "numeric", "hidden": true, "method": "overwrite"},
     "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative"},
     "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
     "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative"},

modifications/modules.json

@@ -340,9 +340,9 @@
   },
   "ls": {
     "blueprints": {
-      "LifeSupport_LightWeight": [1, 2, 3, 4, 5],
+      "LifeSupport_LightWeight": [1, 2, 3, 4],
-      "LifeSupport_Reinforced": [1, 2, 3, 4, 5],
+      "LifeSupport_Reinforced": [1, 2, 3, 4],
-      "LifeSupport_Shielded": [1, 2, 3, 4, 5]
+      "LifeSupport_Shielded": [1, 2, 3, 4]
     },
     "modifications": [
       "boot",
@@ -728,8 +728,8 @@
   },
   "scb": {
     "blueprints": {
-      "ShieldCellBank_Rapid": [1, 2, 3, 4],
+      "ShieldCellBank_Rapid": [1, 2, 3],
-      "ShieldCellBank_Specialised": [1, 2, 3, 4]
+      "ShieldCellBank_Specialised": [1, 2, 3]
     },
     "modifications": [
       "boot",

modules/internal/economy_passenger_cabin.json

@@ -47,7 +47,7 @@
     {
       "class": 6,
       "cost": 61420,
-      "edID": 12872926,
+      "edID": 128727926,
       "eddbID": 1567,
       "grp": "pce",
       "id": "me",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.2.13",
+  "version": "2.2.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"

ships/keelback.json

@@ -21,7 +21,7 @@
       "roll": 100,
       "yaw": 15
     },
-    "retailCost": 3126160,
+    "retailCost": 3126150,
     "bulkheads": [
       { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

spec/data-spec.js

@@ -169,23 +169,26 @@ describe('JSON Data', function() {
 
   it('has valid blueprints', function() {
     var ids = {};
+    var names = {};
 
-    for (var k in Modifications.blueprints) {
+    for (var blueprintname in Modifications.blueprints) {
-      const blueprint = Modifications.blueprints[k];
+      const blueprint = Modifications.blueprints[blueprintname];
+      expect(names[blueprintname]).toBeFalsy('Name already exists: ' + blueprintname);
+      names[blueprintname] = true;
       expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
-      expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
-
-      for (var x in blueprint.features) {
-        var b = blueprint.features[x];
-        var bfs = {};
-        for (var bf in b) {
-          expect(bfs[bf]).toBeFalsy(`Blueprint feature [${bf}] already exists: ${blueprint.name}`);
-          expect(Modifications.modifications[bf]).toBeDefined(`Blueprint feature [${bf}] uknown: ${blueprint.name}`);
-          bfs[bf] = true;
-        }
-      }
-
       ids[blueprint.id] = true;
+      expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
+      expect(blueprint.grades).toBeDefined('Blueprint has no grades, ID:' + blueprint.id);
+
+      grades = {}
+      for (var grade in blueprint.grades) {
+        expect(grades[grade]).toBeFalsy('Grade already exists: ' + grade + ' for ' + blueprintname);
+        grades[grade] = true;
+
+        const blueprintgrade = blueprint.grades[grade];
+        expect(blueprintgrade.components).toBeDefined('Blueprint grade ' + grade + ' has no components for ' + blueprintname);
+        expect(blueprintgrade.features).toBeDefined('Blueprint grade ' + grade + ' has no features for ' + blueprintname);
+      }
     }
   });