Compare commits

...

33 Commits

Author SHA1 Message Date
willyb321
a7b57a43da 2.9.9 2018-04-25 19:55:06 +10:00
willyb321
19445ca9f3 hopefully fix guardian powerplants 2018-04-25 18:00:37 +10:00
willyb321
1ccb966436 dist 2018-04-25 15:05:21 +10:00
willyb321
1264a6edf9 add guardian plasma charger 2018-04-25 15:05:17 +10:00
willyb321
b1da2a50d2 add gauss cannon
still needs cost
2018-04-25 14:46:52 +10:00
willyb321
2de999ef4d add guardian pp
not 100% sure on cost
2018-04-25 14:41:41 +10:00
willyb321
2ce259a53d update pp values 2018-04-23 18:49:46 +10:00
William
3fd4ec4dbe Merge pull request #29 from UrukCan/patch-2
Patch 2
2018-04-23 10:30:28 +10:00
UrukCan
1121a679a0 shield boosters
ShieldBooster_Explosive
ShieldBooster_HeavyDuty
ShieldBooster_Kinetic
ShieldBooster_Resistive
ShieldBooster_Thermic
2018-04-23 01:13:34 +02:00
UrukCan
d07e9500c2 armour and HRP blueprints V3
Armour_Kinetic
Armour_Thermic
HullReinforcement_Advanced
HullReinforcement_Explosive
HullReinforcement_HeavyDuty
HullReinforcement_Kinetic
HullReinforcement_Thermic
2018-04-23 00:20:49 +02:00
willyb321
8e628fc11c bump 2018-04-23 07:39:41 +10:00
willyb321
048bbb11dd add legacy to old rg specials 2018-04-23 07:33:41 +10:00
UrukCan
2dc0c9b44b FSD blueprints V3
FSD_FastBoot
FSD_LongRange
FSD_Shielded
2018-04-22 11:28:39 +02:00
willyb321
b79976c524 bump 2018-04-22 12:26:32 +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
13 changed files with 4020 additions and 2871 deletions

1863
dist/index.js vendored

File diff suppressed because it is too large Load Diff

3144
dist/index.json vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -3427,12 +3427,24 @@
"special_weapon_lightweight"
]
},
"gpc": {
"blueprints": {
},
"modifications": [
]
},
"gpl": {
"blueprints": {
},
"modifications": [
]
},
"gpp": {
"blueprints": {
},
"modifications": [
]
},
"ggc": {
"blueprints": {
},

View File

@@ -47,7 +47,7 @@
"special_feedback_cascade": {
"id": 9,
"edname": "special_feedback_cascade",
"name": "Feedback cascade"
"name": "Feedback cascade (Legacy)"
},
"special_force_shell": {
"id": 10,
@@ -102,7 +102,7 @@
"special_plasma_slug": {
"id": 18,
"edname": "special_plasma_slug",
"name": "Plasma slug"
"name": "Plasma slug (Legacy)"
},
"special_radiant_canister": {
"id": 19,
@@ -142,7 +142,7 @@
"special_super_penetrator": {
"id": 26,
"edname": "special_super_penetrator",
"name": "Super penetrator"
"name": "Super penetrator (Legacy)"
},
"special_lock_breaker": {
"id": 27,

View File

@@ -0,0 +1,39 @@
{
"ggc": [
{
"ammo": 80,
"breachdmg": 35,
"breachmax": 0.4,
"breachmin": 0.2,
"burst": 1,
"burstrof": 0.83,
"class": 2,
"clip": 1,
"cost": 0,
"damage": 70,
"damagedist": {
"T": 1
},
"distdraw": 7.20,
"edID": 128833687,
"eddbID": 876,
"falloff": 1500,
"grp": "ggc",
"id": "0H",
"integrity": 42,
"mass": 4,
"mount": "F",
"piercing": 140,
"power": 2.61,
"range": 3000,
"rating": "B",
"reload": 1,
"rof": 1.205,
"thermload": 25,
"symbol": "Hpt_Guardian_GaussCannon_Fixed_Medium",
"requirements": {
"horizons": true
}
}
]
}

View File

@@ -0,0 +1,66 @@
{
"gpc": [
{
"ammo": 200,
"breachdmg": 0.7,
"breachmax": 0.8,
"breachmin": 0.5,
"class": 2,
"clip": 15,
"cost": 3051200,
"damage": 5,
"damagedist": {
"A": 1
},
"distdraw": 13.6,
"edID": 128049466,
"eddbID": 874,
"falloff": 1000,
"grp": "gpc",
"id": "0J",
"integrity": 42,
"mass": 4,
"mount": "F",
"piercing": 80,
"power": 2.13,
"range": 3500,
"rating": "B",
"reload": 3,
"rof": 5,
"shotspeed": 1200,
"thermload": 5.2,
"symbol": "Hpt_Guardian_PlasmaLauncher_Fixed_Medium"
},
{
"ammo": 200,
"breachdmg": 1.0,
"breachmax": 0.8,
"breachmin": 0.5,
"class": 2,
"clip": 15,
"cost": 3051200,
"damage": 4,
"damagedist": {
"A": 1
},
"distdraw": 13.6,
"edID": 128049466,
"eddbID": 874,
"falloff": 1000,
"grp": "gpc",
"id": "0I",
"integrity": 42,
"mass": 4,
"mount": "T",
"piercing": 80,
"power": 2.01,
"range": 3500,
"rating": "E",
"reload": 3,
"rof": 5,
"shotspeed": 1200,
"thermload": 5.8,
"symbol": "Hpt_Guardian_PlasmaLauncher_Turret_Medium"
}
]
}

View File

@@ -33,6 +33,8 @@ module.exports = {
ec: require('./hardpoints/electronic_countermeasure').ec,
hs: require('./hardpoints/heat_sink_launcher').hs,
po: require('./hardpoints/point_defence').po,
gpc: require('./hardpoints/guardian_plasma_charger').gpc,
ggc: require('./hardpoints/guardian_gauss_cannon').ggc,
sfn: require('./hardpoints/shutdown_field_neutraliser').sfn,
xs: require('./hardpoints/xeno_scanner').xs
},

View File

@@ -489,6 +489,111 @@
"pgen": 9.6,
"rating": "A",
"symbol": "Int_Powerplant_Size2_Class5"
},
{
"class": 2,
"cost": 162000,
"edID": 128064037,
"eddbID": 895,
"eff": 0.5,
"grp": "pp",
"id": "0A",
"integrity": 56,
"mass": 1.5,
"pgen": 12.7,
"rating": "A",
"name": "Guardian Hybrid Power Plant",
"symbol": "Int_GuardianPowerplant_Size2"
},
{
"class": 3,
"cost": 291600,
"edID": 128064037,
"eddbID": 895,
"eff": 0.5,
"grp": "pp",
"id": "0B",
"integrity": 70,
"mass": 2.9,
"pgen": 15.8,
"rating": "A",
"name": "Guardian Hybrid Power Plant",
"symbol": "Int_GuardianPowerplant_Size3"
},
{
"class": 4,
"cost": 524880,
"edID": 128064037,
"eddbID": 895,
"eff": 0.5,
"grp": "pp",
"id": "0C",
"integrity": 88,
"mass": 5.9,
"pgen": 20.6,
"rating": "A",
"name": "Guardian Hybrid Power Plant",
"symbol": "Int_GuardianPowerplant_Size4"
},
{
"class": 5,
"cost": 944790,
"edID": 128064037,
"eddbID": 895,
"eff": 0.5,
"grp": "pp",
"id": "0D",
"integrity": 106,
"mass": 11.7,
"pgen": 26.9,
"rating": "A",
"name": "Guardian Hybrid Power Plant",
"symbol": "Int_GuardianPowerplant_Size5"
},
{
"class": 6,
"cost": 1700610,
"edID": 128064037,
"eddbID": 895,
"eff": 0.5,
"grp": "pp",
"id": "0E",
"integrity": 124,
"mass": 23.4,
"pgen": 33.3,
"rating": "A",
"name": "Guardian Hybrid Power Plant",
"symbol": "Int_GuardianPowerplant_Size6"
},
{
"class": 7,
"cost": 3061100,
"edID": 128064037,
"eddbID": 895,
"eff": 0.5,
"grp": "pp",
"id": "0F",
"integrity": 144,
"mass": 46.8,
"pgen": 39.6,
"rating": "A",
"name": "Guardian Hybrid Power Plant",
"symbol": "Int_GuardianPowerplant_Size7"
},
{
"class": 8,
"cost": 5509980,
"edID": 128064037,
"eddbID": 895,
"eff": 0.5,
"grp": "pp",
"id": "0G",
"integrity": 165,
"mass": 93.6,
"pgen": 47.5,
"rating": "A",
"name": "Guardian Hybrid Power Plant",
"symbol": "Int_GuardianPowerplant_Size8"
}
]
}

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "coriolis-data",
"version": "2.9.4",
"version": "2.9.9",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

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

View File

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

View File

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