Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-08 15:13:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/x' into develop

Browse Source
This commit is contained in:
Cmdr McDonald
2017-02-08 09:24:27 +00:00
parent ea9294fd88 6d4f79dda9
commit 229e2742a7
9 changed files with 16787 additions and 10549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.md
View File

@@ -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

6537
dist/index.js vendored
View File

File diff suppressed because it is too large Load Diff

14228
dist/index.json vendored
View File

File diff suppressed because it is too large Load Diff

6517
modifications/blueprints.json
View File

File diff suppressed because it is too large Load Diff

4
modifications/modifications.json
View File

@@ -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"},

10
modifications/modules.json
View File

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

2
modules/internal/economy_passenger_cabin.json
View File

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

2
ships/keelback.json
View File

@@ -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 },

31
spec/data-spec.js
View File

@@ -169,23 +169,26 @@ describe('JSON Data', function() {
it('has valid blueprints', function() {
var ids = {};
var names = {};
for (var k in Modifications.blueprints) {
const blueprint = Modifications.blueprints[k];
for (var blueprintname in Modifications.blueprints) {
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);
}
}
});