Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-09 07:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/3.0-cleanup' into develop

Browse Source
This commit is contained in:
Unknown
2018-03-01 07:38:37 +00:00
parent 44d57f26a8 8178c938c9
commit 1e057c068c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ships/alliance_chieftain.json
View File

@@ -13,7 +13,7 @@
"baseShieldStrength": 154, "baseShieldStrength": 154,
"baseArmour": 280, "baseArmour": 280,
"hardness": 65, "hardness": 65,
"hullMass": 420, "hullMass": 400,
"masslock": 13, "masslock": 13,
"pipSpeed": 0.03875, "pipSpeed": 0.03875,
"pitch": 39, "pitch": 39,
@@ -21,7 +21,7 @@
"yaw": 16, "yaw": 16,
"crew": 2 "crew": 2
}, },
"retailCost": 18897696, "retailCost": 19382252,
"requirements": { "requirements": {
"horizons": true "horizons": true
}, },
@@ -35,7 +35,7 @@
"slots": { "slots": {
"standard": [6, 6, 5, 5, 6, 4, 4], "standard": [6, 6, 5, 5, 6, 4, 4],
"hardpoints": [3, 3, 2, 1, 1, 1, 0, 0, 0, 0], "hardpoints": [3, 3, 2, 1, 1, 1, 0, 0, 0, 0],
"internal": [5, 5, 4, 2, 2, "internal": [6, 5, 4, 2, 2,
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } } { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }
@@ -44,7 +44,7 @@
"defaults": { "defaults": {
"standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"], "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
"hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0], "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0],
"internal": ["03", "4e", "02", "", "2h"] "internal": ["04", "4e", "02", "", "2h"]
} }
} }
} }

2
ships/keelback.json
View File

@@ -20,7 +20,7 @@
"pitch": 27, "pitch": 27,
"roll": 100, "roll": 100,
"yaw": 15, "yaw": 15,
"crew": 1 "crew": 2
}, },
"retailCost": 3126150, "retailCost": 3126150,
"bulkheads": [ "bulkheads": [

8
ships/type_7_transport.json
View File

@@ -13,7 +13,7 @@
"baseShieldStrength": 155, "baseShieldStrength": 155,
"baseArmour": 340, "baseArmour": 340,
"hardness": 54, "hardness": 54,
"hullMass": 420, "hullMass": 350,
"masslock": 10, "masslock": 10,
"pipSpeed": 0.16625, "pipSpeed": 0.16625,
"pitch": 22, "pitch": 22,
@@ -30,14 +30,14 @@
{ "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } { "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
], ],
"slots": { "slots": {
"standard": [4, 5, 5, 4, 3, 3, 5], "standard": [5, 5, 5, 4, 4, 3, 5],
"hardpoints": [1, 1, 1, 1, 0, 0, 0, 0], "hardpoints": [1, 1, 1, 1, 0, 0, 0, 0],
"internal": [6, 6, 6, 5, 5, 5, 3, 3] "internal": [6, 6, 6, 5, 5, 5, 3, 3, 2]
}, },
"defaults": { "defaults": {
"standard": ["4E", "5E", "5E", "4E", "3E", "3E", "5C"], "standard": ["4E", "5E", "5E", "4E", "3E", "3E", "5C"],
"hardpoints": [17, 17, 0, 0, 0, 0, 0, 0], "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0],
"internal": ["04", "04", "04", "03", "03", "49", 0, "2h"] "internal": ["04", "04", "04", "03", "03", "49", 0, 0, "2h"]
} }
} }
} }