Merge branch 'release/2.9.7'

bump
Merge branch 'release/2.9.6'
2025-12-08 15:13:23 +00:00 · 2018-04-22 12:26:49 +10:00 · 2018-04-22 12:26:32 +10:00 · 2018-04-22 06:59:52 +10:00 · 2018-04-22 06:59:21 +10:00 · 2018-04-22 06:57:34 +10:00
7 changed files with 2148 additions and 1759 deletions
--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/index.json
+++ b/dist/index.json
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.4",
+  "version": "2.9.7",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.4",
+  "version": "2.9.7",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
--- a/ships/alliance_chieftain.json
+++ b/ships/alliance_chieftain.json
@@ -1,7 +1,7 @@
 {
  "alliance_chieftain": {
    "edID": 128816574,
-    "eddbID": 12,
+    "eddbID": 33,
    "properties": {
      "name": "Alliance Chieftain",
      "manufacturer": "Lakon",
@@ -26,11 +26,11 @@
      "horizons": true
    },
    "bulkheads": [
-      { "id": "CI", "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "CJ", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "CK", "edID": 128816578, "eddbID": 815, "grp": "bh", "cost": 15307134, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "CL", "edID": 128816579, "eddbID": 816, "grp": "bh", "cost": 36175859, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "CM", "edID": 128816580, "eddbID": 817, "grp": "bh", "cost": 40087682, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "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 }
    ],
    "slots": {
      "standard": [6, 6, 5, 5, 6, 4, 4],
@@ -43,8 +43,8 @@
    },
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
-      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "4e", "02", "", "2h"]
+      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["04", "4e", "02", "", "2h", "", "", ""]
    }
  }
 }
--- a/ships/type_10_defender.json
+++ b/ships/type_10_defender.json
@@ -24,11 +24,11 @@
      },
      "retailCost": 121454652,
      "bulkheads": [
-        { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-        { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-        { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-        { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-        { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+        { "id": "Bx", "edID": 128785621, "eddbID": 1627, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+        { "id": "By", "edID": 128785622, "eddbID": 1628, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+        { "id": "Bz", "edID": 128785623, "eddbID": 1629, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+        { "id": "BA", "edID": 128785624, "eddbID": 1630, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+        { "id": "BB", "edID": 128785625, "eddbID": 1631, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
      ],
      "slots": {
        "standard": [8, 7, 7, 5, 7, 4, 6],
Author	SHA1	Message	Date
willyb321	69afe0a89d	Merge branch 'release/2.9.7'	2018-04-22 12:26:49 +10:00
willyb321	b79976c524	bump	2018-04-22 12:26:32 +10:00
willyb321	a110545bd7	Merge branch 'release/2.9.6'	2018-04-22 06:59:52 +10:00
willyb321	14f06a4893	bump	2018-04-22 06:59:21 +10:00
willyb321	dd20855654	dist	2018-04-22 06:57:34 +10:00
willyb321	e4062f07a8	Merge branch 'patch-1' into develop	2018-04-22 06:51:19 +10:00
UrukCan	eee56ac5ab	DSS blueprints V3 Sensor_SurfaceScanner_FastScan Sensor_SurfaceScanner_LongRange Sensor_SurfaceScanner_WideAngle	2018-04-21 19:22:50 +02:00
UrukCan	f34a550346	sensor blueprints V3 Sensor_Sensor_LightWeight Sensor_Sensor_LongRange Sensor_Sensor_WideAngle	2018-04-21 19:17:16 +02:00
UrukCan	4856750792	small fix fixed mass for Armour_HeavyDuty	2018-04-21 18:32:47 +02:00
UrukCan	a006515a93	Thruster blueprints V3 Engine_Dirty Engine_Reinforced Engine_Tuned	2018-04-21 18:25:30 +02:00
UrukCan	e40fbf0cab	fixes Weapon_Overcharged (added clipsize modifier) 6293: added missing '{' 6342: added missing ','	2018-04-21 18:10:33 +02:00
UrukCan	3d781687bd	PD blueprints V3 PowerDistributor_HighCapacity PowerDistributor_HighFrequency PowerDistributor_PriorityEngines (added G4 & G5, including comp) PowerDistributor_PrioritySystems (added G4 & G5, including comp) PowerDistributor_PriorityWeapons (added G4 & G5, including comp) PowerDistributor_Shielded	2018-04-21 17:52:16 +02:00
UrukCan	f5913acaf8	weapon blueprints V3 Weapon_Efficient Weapon_Focused Weapon_LightWeight Weapon_LongRange Weapon_Overcharged Weapon_Sturdy	2018-04-21 16:35:32 +02:00
UrukCan	4246a18b4b	blueprints V3 Armour_Advanced (aka Liightweight) Armour_Explosive Armour_HeavyDuty	2018-04-21 15:47:07 +02:00
willyb321	ebd90b49b8	fix eddb and ed ids for chietain and t10	2018-04-21 14:20:50 +10:00
willyb321	577cc26f2d	Merge branch 'release/2.9.5'	2018-04-21 11:06:04 +10:00
willyb321	6957491021	bump	2018-04-21 11:05:08 +10:00
willyb321	32d890f279	dist	2018-04-21 11:02:03 +10:00
William	118d0e3832	Merge pull request #27 from ExitCode/develop updated Weapon_ShortRange with v3 values	2018-04-21 06:36:53 +10:00
Patrick Tetz	ed3f7b9db2	updated Weapon_ShortRange with v3 values	2018-04-20 14:58:15 +02:00
willyb321	3998a6519c	Merge branch 'master' into develop	2018-04-20 12:49:28 +10:00
willyb321	78f939db0c	Chieftain update eddbid Fixes #26	2018-04-20 09:38:41 +10:00