Compare commits

...

47 Commits

Author SHA1 Message Date
willyb321
8fb4bd08b5 Merge branch 'release/2.9.16' 2018-06-12 11:04:06 +10:00
willyb321
1ac1c85c7b 2.9.16 2018-06-12 11:03:59 +10:00
willyb321
9e1f7934d8 Temporary fix for EDCD/coriolis#286 2018-06-05 07:58:07 +10:00
willyb321
e1f91a5795 Merge branch 'develop' 2018-06-05 07:45:14 +10:00
willyb321
63751d1f26 Fix multi servos reducing ROF
Closes EDCD/coriolis#287
2018-06-05 07:43:18 +10:00
willyb321
ad99e37c66 Fix OC PP
Closes EDCD/coriolis#285
2018-06-05 07:39:45 +10:00
William Blythe
aa75ea6e85 Fix a couple mats in recipes
Fixes edcd/coriolis#292
2018-05-31 10:48:18 +10:00
willyb321
355d14777d Merge branch 'release/2.9.15' 2018-05-30 07:44:12 +10:00
willyb321
3ea5731067 Merge branch 'release/2.9.15' into develop 2018-05-30 07:44:12 +10:00
willyb321
4254abcc15 2.9.15 2018-05-30 07:44:07 +10:00
willyb321
be3229a57d Merge branch 'release/2.9.14' 2018-05-29 07:04:11 +10:00
willyb321
7260d2f75d Merge branch 'release/2.9.14' into develop 2018-05-29 07:04:11 +10:00
willyb321
84c2a2ad30 2.9.14 2018-05-29 07:04:02 +10:00
willyb321
5e24df467a Merge branch 'develop' 2018-05-12 19:19:26 +10:00
willyb321
1a478758ee fix pa plasma slug missing 2018-05-06 09:10:34 +10:00
willyb321
b58cb71e5a Fix PD ammo cap crashing
Fixes EDCD/coriolis#272
2018-05-06 09:00:33 +10:00
willyb321
652decf6b3 Merge branch 'develop' 2018-05-04 16:22:40 +10:00
willyb321
6b13b3a673 fix chaff ammo cap crashing 2018-05-04 16:21:42 +10:00
willyb321
a667fd2309 Merge remote-tracking branch 'origin/develop' 2018-05-03 10:59:27 +10:00
William Blythe
cff8cf71df fix heat sink
Closes #266
2018-05-03 10:49:58 +10:00
willyb321
e8c1ae4c89 Merge branch 'release/2.9.13' 2018-05-03 07:15:42 +10:00
willyb321
e7bcba7360 Merge branch 'release/2.9.13' into develop 2018-05-03 07:15:41 +10:00
willyb321
68682f062c 2.9.13 2018-05-03 07:15:35 +10:00
willyb321
c81e4fd554 dist 2018-05-03 07:13:35 +10:00
willyb321
ae744982c6 add LE g4,5 2018-05-03 07:12:36 +10:00
William Blythe
e7a8c2eeb9 pd, interdictor also sb 2018-04-30 10:58:09 +10:00
William Blythe
90035fc057 dist 2018-04-30 10:24:15 +10:00
William
c67fcc6497 Merge pull request #30 from UrukCan/patch-3
last blueprints
2018-04-30 10:18:34 +10:00
UrukCan
2f3410c462 last blueprints
AFMU
Cargo/Kill/Manifest scanner
Chaff
ECM
FSD interdictor
Heat Sink
PDT
Collector/Fuel/Hatch/Prospector Limpet
Fuel Scoop
Life Support
Refinery
SCB
Weapon_DoubleShot
Weapon_HighCapacity
Weapon_RapidFire

fixed spme PP values

(in short, everything that was missing except heavy duty shield boosters)
2018-04-30 02:16:55 +02:00
willyb321
6d8c74ad3f Merge branch 'release/2.9.12' 2018-04-28 12:15:32 +10:00
willyb321
d9729fa252 Merge branch 'release/2.9.12' into develop 2018-04-28 12:15:31 +10:00
willyb321
0e6d01e145 2.9.12 2018-04-28 12:15:25 +10:00
willyb321
a11731c7ea dist 2018-04-28 12:13:51 +10:00
willyb321
4a16789340 add recon limpet controllers 2018-04-28 12:13:20 +10:00
willyb321
c140856334 Merge branch 'develop' 2018-04-28 09:57:05 +10:00
willyb321
37fd278e23 Fix dirty g3 optmass
Fixes edcd/coriolis#258
2018-04-26 14:32:33 +10:00
willyb321
9ac6427ee0 Merge branch 'release/2.9.11' 2018-04-26 09:20:42 +10:00
willyb321
cf5352aaef 2.9.11 2018-04-26 09:20:29 +10:00
willyb321
fbafd96386 update chieftain armour mass 2018-04-26 09:10:17 +10:00
willyb321
e9bb7fe748 Fix HRP deep plating 2018-04-26 09:05:47 +10:00
willyb321
be5f139dc5 Fix monstered pp
Closes #259
2018-04-25 20:49:58 +10:00
willyb321
1275242796 Merge tag 'release/v2.9.10' into develop
2.9.10
2018-04-25 20:01:17 +10:00
willyb321
f2baefc4c8 Merge branch 'release/release/v2.9.10' 2018-04-25 20:01:02 +10:00
willyb321
94ed362d14 2.9.10 2018-04-25 20:00:52 +10:00
willyb321
d1e0e937ab Merge branch 'release/2.9.8' 2018-04-23 07:40:05 +10:00
willyb321
69afe0a89d Merge branch 'release/2.9.7' 2018-04-22 12:26:49 +10:00
willyb321
a110545bd7 Merge branch 'release/2.9.6' 2018-04-22 06:59:52 +10:00
10 changed files with 2853 additions and 2339 deletions

1453
dist/index.js vendored

File diff suppressed because it is too large Load Diff

2249
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

@@ -341,7 +341,7 @@
},
"special_powerplant_highcharge": {
"mass": 0.1,
"power": 0.05
"pgen": 0.05
},
"special_powerplant_cooled": {
"eff": -0.1
@@ -400,7 +400,7 @@
},
"special_weapon_rateoffire": {
"power": 0.05,
"rof": 0.03
"rof": -0.03
},
"special_weapon_efficient": {
"power": -0.1
@@ -443,9 +443,9 @@
},
"special_hullreinforcement_chunky": {
"hullreinforcement": 0.1,
"explres": 2,
"thermres": 2,
"kinres": 2
"explres": -2,
"thermres": -2,
"kinres": -2
},
"special_shieldbooster_thermic": {
"optmul": -0.01,

View File

@@ -1740,6 +1740,11 @@
"Colonel Bris Dekker",
"Tiana Fortune"
]
},
"4": {
"engineers": [
"Colonel Bris Dekker"
]
}
}
}
@@ -3724,6 +3729,7 @@
"special_dispersal_field",
"special_phasing_sequence",
"special_plasma_slug",
"special_plasma_slug_cooled",
"special_lock_breaker",
"special_thermal_conduit",
"special_weapon_damage",
@@ -3945,6 +3951,16 @@
"Marco Qwent",
"The Dweller"
]
},
"4": {
"engineers": [
"The Dweller"
]
},
"5": {
"engineers": [
"The Dweller"
]
}
}
},
@@ -4040,6 +4056,16 @@
"Marco Qwent",
"The Dweller"
]
},
"4": {
"engineers": [
"The Dweller"
]
},
"5": {
"engineers": [
"The Dweller"
]
}
}
},
@@ -4065,6 +4091,16 @@
"Marco Qwent",
"The Dweller"
]
},
"4": {
"engineers": [
"The Dweller"
]
},
"5": {
"engineers": [
"The Dweller"
]
}
}
}
@@ -4546,6 +4582,17 @@
"Hera Tani",
"Marco Qwent"
]
},
"4": {
"engineers": [
"Hera Tani",
"Marco Qwent"
]
},
"5": {
"engineers": [
"Hera Tani"
]
}
}
},
@@ -5337,6 +5384,7 @@
"kinres",
"mass",
"power",
"optmul",
"shieldboost",
"thermres"
],

View File

@@ -64,6 +64,7 @@ module.exports = {
scb: require('./internal/shield_cell_bank').scb,
sg: require('./internal/shield_generator').sg,
ss: require('./internal/surface_scanner').ss,
rpl: require('./internal/repair_limpet_controller').rpl
rpl: require('./internal/repair_limpet_controller').rpl,
rcpl: require('./internal/recon_limpet_controllers').rcpl
}
}

View File

@@ -0,0 +1,68 @@
{
"rcpl": [
{
"class": 1,
"cost": 2600,
"edID": 128837858,
"eddbID": 1636,
"grp": "rcpl",
"id": "0L",
"mass": 1.3,
"maximum": 1,
"power": 0.18,
"range": 1.2,
"rating": "E",
"integrity": 24,
"hacktime": 22,
"symbol": "Int_DroneControl_Recon_Size1_Class1"
},
{
"class": 3,
"cost": 8200,
"edID": 128841592,
"eddbID": 1637,
"grp": "rcpl",
"id": "0M",
"mass": 2,
"maximum": 1,
"power": 0.2,
"range": 1.4,
"rating": "E",
"integrity": 51,
"hacktime": 17,
"symbol": "Int_DroneControl_Recon_Size3_Class1"
},
{
"class": 5,
"cost": 75800,
"edID": 128841593,
"eddbID": 1638,
"grp": "rcpl",
"id": "0N",
"mass": 20,
"maximum": 1,
"power": 0.5,
"range": 1.7,
"rating": "E",
"integrity": 96,
"hacktime": 13,
"symbol": "Int_DroneControl_Recon_Size5_Class1"
},
{
"class": 7,
"cost": 612200,
"edID": 128841594,
"eddbID": 1639,
"grp": "rcpl",
"id": "0O",
"mass": 128,
"maximum": 1,
"power": 0.97,
"range": 2,
"rating": "E",
"integrity": 157,
"hacktime": 10,
"symbol": "Int_DroneControl_Recon_Size7_Class1"
}
]
}

2
package-lock.json generated
View File

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

View File

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

View File

@@ -27,10 +27,10 @@
},
"bulkheads": [
{ "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 }
{ "id": "CJ", "edID": 128816577, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
{ "id": "CK", "edID": 128816578, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
{ "id": "CL", "edID": 128816579, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
{ "id": "CM", "edID": 128816580, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
],
"slots": {
"standard": [6, 6, 5, 5, 6, 4, 4],