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

Merge branch 'release/2.2.13'

Browse Source
This commit is contained in:
Cmdr McDonald
2017-02-02 23:00:00 +00:00
parent 67cb16da99 fa51463972
commit e020ee62c1
8 changed files with 371 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.md
View File

@@ -1,3 +1,7 @@
#2.2.13
* Add plasma slug special effect for plasma accelerator
* Tweak hull costs of ships
#2.2.12
* Add special effects for each blueprint
* Add IDs for most Powerplay modules

166
dist/index.js vendored
View File

@@ -1949,7 +1949,7 @@ module.exports = {
name: "Keelback",
manufacturer: "Lakon",
class: 2,
hullCost: 2943880,
hullCost: 2943870,
speed: 200,
boost: 300,
boostEnergy: 10,
@@ -2240,7 +2240,7 @@ module.exports = {
name: "Sidewinder",
manufacturer: "Faulcon DeLacy",
class: 1,
hullCost: 12870,
hullCost: 4070,
speed: 220,
boost: 320,
boostEnergy: 7,
@@ -2254,7 +2254,7 @@ module.exports = {
roll: 110,
yaw: 16
},
retailCost: 40800,
retailCost: 32e3,
bulkheads: [ {
id: "b0",
edID: 128049250,
@@ -14130,10 +14130,6 @@ module.exports = {
"4": {
integrity: [ .81, 2 ],
power: [ 1.2, .79 ]
},
"5": {
integrity: [ 1, 2.5 ],
power: [ 1.5, 1 ]
}
},
name: "Shielded"
@@ -15557,6 +15553,25 @@ module.exports = {
},
LifeSupport_LightWeight: {
id: 49,
components: {
"1": {
Phosphorus: 1
},
"2": {
Manganese: 1,
"Salvaged Alloys": 1
},
"3": {
"Conductive Ceramics": 1,
Manganese: 1,
"Salvaged Alloys": 1
},
"4": {
"Conductive Components": 1,
"Phase Alloys": 1,
"Proto Light Alloys": 1
}
},
features: {
"1": {
integrity: [ -.2, -.1 ],
@@ -15573,16 +15588,31 @@ module.exports = {
"4": {
integrity: [ -.5, -.4 ],
mass: [ -.6, -.7 ]
},
"5": {
integrity: [ -.6, -.5 ],
mass: [ -.7, -.8 ]
}
},
name: "Lightweight"
},
LifeSupport_Reinforced: {
id: 50,
components: {
"1": {
Nickel: 1
},
"2": {
Nickel: 1,
"Shield Emitters": 1
},
"3": {
Nickel: 1,
"Shield Emitters": 1,
Tungsten: 1
},
"4": {
Molybdenum: 1,
Tungsten: 1,
Zinc: 1
}
},
features: {
"1": {
integrity: [ .2, .5 ],
@@ -15599,16 +15629,31 @@ module.exports = {
"4": {
integrity: [ .8, 2 ],
mass: [ 2.5, 1.6 ]
},
"5": {
integrity: [ 1, 2.5 ],
mass: [ 3, 2 ]
}
},
name: "Reinforced"
},
LifeSupport_Shielded: {
id: 51,
components: {
"1": {
"Worn Shield Emitters": 1
},
"2": {
Carbon: 1,
"Shield Emitters": 1
},
"3": {
Carbon: 1,
"High Density Composites": 1,
"Shield Emitters": 1
},
"4": {
"Proprietary Composites": 1,
"Sielding Sensors": 1,
Vanadium: 1
}
},
features: {
"1": {
integrity: [ .2, .5 ],
@@ -15625,10 +15670,6 @@ module.exports = {
"4": {
integrity: [ .8, 2 ],
power: [ 1.2, .8 ]
},
"5": {
integrity: [ 1, 1.5 ],
power: [ 1.5, 1 ]
}
},
name: "Shielded"
@@ -16093,6 +16134,25 @@ module.exports = {
},
Refineries_Shielded: {
id: 92,
components: {
"1": {
"Worn Shield Emitters": 1
},
"2": {
Carbon: 1,
"Shield Emitters": 1
},
"3": {
Carbon: 1,
"High Density Composites": 1,
"Shield Emitters": 1
},
"4": {
"Proprietary Composites": 1,
"Shielding Sensors": 1,
Vanadium: 1
}
},
features: {
"1": {
integrity: [ .2, .5 ],
@@ -16494,6 +16554,20 @@ module.exports = {
},
WakeScanner_LightWeight: {
id: 79,
components: {
"1": {
Phosphorus: 1
},
"2": {
Manganese: 1,
"Salvaged Alloys": 1
},
"3": {
"Conductive Ceramics": 1,
Manganese: 1,
"Salvaged Alloys": 1
}
},
features: {
"1": {
integrity: [ -.2, -.1 ],
@@ -16506,20 +16580,26 @@ module.exports = {
"3": {
integrity: [ -.4, -.3 ],
mass: [ -.5, -.6 ]
},
"4": {
integrity: [ -.5, -.4 ],
mass: [ -.6, -.7 ]
},
"5": {
integrity: [ -.6, -.5 ],
mass: [ -.7, -.8 ]
}
},
name: "Lightweight"
},
WakeScanner_Shielded: {
id: 80,
components: {
"1": {
"Worn Shield Emitters": 1
},
"2": {
Carbon: 1,
"Shield Emitters": 1
},
"3": {
Carbon: 1,
"High Density Composites": 1,
"Shield Emitters": 1
}
},
features: {
"1": {
integrity: [ .2, .5 ],
@@ -16532,20 +16612,26 @@ module.exports = {
"3": {
integrity: [ .6, 1.5 ],
power: [ .9, .6 ]
},
"4": {
integrity: [ .8, 2 ],
power: [ 1.2, .8 ]
},
"5": {
integrity: [ 1, 1.5 ],
power: [ 1.5, 1 ]
}
},
name: "Shielded"
},
WakeScanner_Reinforced: {
id: 81,
components: {
"1": {
Nickel: 1
},
"2": {
Nickel: 1,
"Shield Emitters": 1
},
"3": {
Nickel: 1,
"Shield Emitters": 1,
Tungsten: 1
}
},
features: {
"1": {
integrity: [ .2, .5 ],
@@ -16558,14 +16644,6 @@ module.exports = {
"3": {
integrity: [ .6, 1.5 ],
mass: [ 2, 1.2 ]
},
"4": {
integrity: [ .8, 2 ],
mass: [ 2.5, 1.6 ]
},
"5": {
integrity: [ 1, 2.5 ],
mass: [ 3, 2 ]
}
},
name: "Reinforced"
@@ -18048,7 +18126,7 @@ module.exports = {
Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
},
modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_target_lock_breaker", "special_thermal_conduit" ]
specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_target_lock_breaker", "special_thermal_conduit" ]
},
pas: {
blueprints: {},

225
dist/index.json vendored
View File

@@ -3099,7 +3099,7 @@
"name": "Keelback",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 2943880,
"hullCost": 2943870,
"speed": 200,
"boost": 300,
"boostEnergy": 10,
@@ -3560,7 +3560,7 @@
"name": "Sidewinder",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"hullCost": 12870,
"hullCost": 4070,
"speed": 220,
"boost": 320,
"boostEnergy": 7,
@@ -3574,7 +3574,7 @@
"roll": 110,
"yaw": 16
},
"retailCost": 40800,
"retailCost": 32000,
"bulkheads": [
{
"id": "b0",
@@ -16595,16 +16595,6 @@
1.2,
0.79
]
},
"5": {
"integrity": [
1,
2.5
],
"power": [
1.5,
1
]
}
},
"name": "Shielded"
@@ -19792,6 +19782,25 @@
},
"LifeSupport_LightWeight": {
"id": 49,
"components": {
"1": {
"Phosphorus": 1
},
"2": {
"Manganese": 1,
"Salvaged Alloys": 1
},
"3": {
"Conductive Ceramics": 1,
"Manganese": 1,
"Salvaged Alloys": 1
},
"4": {
"Conductive Components": 1,
"Phase Alloys": 1,
"Proto Light Alloys": 1
}
},
"features": {
"1": {
"integrity": [
@@ -19832,22 +19841,31 @@
-0.6,
-0.7
]
},
"5": {
"integrity": [
-0.6,
-0.5
],
"mass": [
-0.7,
-0.8
]
}
},
"name": "Lightweight"
},
"LifeSupport_Reinforced": {
"id": 50,
"components": {
"1": {
"Nickel": 1
},
"2": {
"Nickel": 1,
"Shield Emitters": 1
},
"3": {
"Nickel": 1,
"Shield Emitters": 1,
"Tungsten": 1
},
"4": {
"Molybdenum": 1,
"Tungsten": 1,
"Zinc": 1
}
},
"features": {
"1": {
"integrity": [
@@ -19888,22 +19906,31 @@
2.5,
1.6
]
},
"5": {
"integrity": [
1,
2.5
],
"mass": [
3,
2
]
}
},
"name": "Reinforced"
},
"LifeSupport_Shielded": {
"id": 51,
"components": {
"1": {
"Worn Shield Emitters": 1
},
"2": {
"Carbon": 1,
"Shield Emitters": 1
},
"3": {
"Carbon": 1,
"High Density Composites": 1,
"Shield Emitters": 1
},
"4": {
"Proprietary Composites": 1,
"Sielding Sensors": 1,
"Vanadium": 1
}
},
"features": {
"1": {
"integrity": [
@@ -19944,16 +19971,6 @@
1.2,
0.8
]
},
"5": {
"integrity": [
1,
1.5
],
"power": [
1.5,
1
]
}
},
"name": "Shielded"
@@ -21096,6 +21113,25 @@
},
"Refineries_Shielded": {
"id": 92,
"components": {
"1": {
"Worn Shield Emitters": 1
},
"2": {
"Carbon": 1,
"Shield Emitters": 1
},
"3": {
"Carbon": 1,
"High Density Composites": 1,
"Shield Emitters": 1
},
"4": {
"Proprietary Composites": 1,
"Shielding Sensors": 1,
"Vanadium": 1
}
},
"features": {
"1": {
"integrity": [
@@ -22142,6 +22178,20 @@
},
"WakeScanner_LightWeight": {
"id": 79,
"components": {
"1": {
"Phosphorus": 1
},
"2": {
"Manganese": 1,
"Salvaged Alloys": 1
},
"3": {
"Conductive Ceramics": 1,
"Manganese": 1,
"Salvaged Alloys": 1
}
},
"features": {
"1": {
"integrity": [
@@ -22172,32 +22222,26 @@
-0.5,
-0.6
]
},
"4": {
"integrity": [
-0.5,
-0.4
],
"mass": [
-0.6,
-0.7
]
},
"5": {
"integrity": [
-0.6,
-0.5
],
"mass": [
-0.7,
-0.8
]
}
},
"name": "Lightweight"
},
"WakeScanner_Shielded": {
"id": 80,
"components": {
"1": {
"Worn Shield Emitters": 1
},
"2": {
"Carbon": 1,
"Shield Emitters": 1
},
"3": {
"Carbon": 1,
"High Density Composites": 1,
"Shield Emitters": 1
}
},
"features": {
"1": {
"integrity": [
@@ -22228,32 +22272,26 @@
0.9,
0.6
]
},
"4": {
"integrity": [
0.8,
2
],
"power": [
1.2,
0.8
]
},
"5": {
"integrity": [
1,
1.5
],
"power": [
1.5,
1
]
}
},
"name": "Shielded"
},
"WakeScanner_Reinforced": {
"id": 81,
"components": {
"1": {
"Nickel": 1
},
"2": {
"Nickel": 1,
"Shield Emitters": 1
},
"3": {
"Nickel": 1,
"Shield Emitters": 1,
"Tungsten": 1
}
},
"features": {
"1": {
"integrity": [
@@ -22284,26 +22322,6 @@
2,
1.2
]
},
"4": {
"integrity": [
0.8,
2
],
"mass": [
2.5,
1.6
]
},
"5": {
"integrity": [
1,
2.5
],
"mass": [
3,
2
]
}
},
"name": "Reinforced"
@@ -25213,6 +25231,7 @@
"special_blinding_shell",
"special_dispersal_field",
"special_phasing_sequence",
"special_plasma_slug",
"special_target_lock_breaker",
"special_thermal_conduit"
]

158
modifications/blueprints.json
View File

@@ -36,10 +36,6 @@
"4": {
"integrity": [ 0.81, 2 ],
"power": [ 1.2, 0.79 ]
},
"5": {
"integrity": [ 1, 2.5 ],
"power": [ 1.5, 1 ]
}
},
"name": "Shielded"
@@ -1463,6 +1459,25 @@
},
"LifeSupport_LightWeight": {
"id": 49,
"components": {
"1": {
"Phosphorus": 1
},
"2": {
"Manganese": 1,
"Salvaged Alloys": 1
},
"3": {
"Conductive Ceramics": 1,
"Manganese": 1,
"Salvaged Alloys": 1
},
"4": {
"Conductive Components": 1,
"Phase Alloys": 1,
"Proto Light Alloys": 1
}
},
"features": {
"1": {
"integrity": [ -0.2, -0.1 ],
@@ -1479,16 +1494,31 @@
"4": {
"integrity": [ -0.5, -0.4 ],
"mass": [ -0.6, -0.7 ]
},
"5": {
"integrity": [ -0.6, -0.5 ],
"mass": [ -0.7, -0.8 ]
}
},
"name": "Lightweight"
},
"LifeSupport_Reinforced": {
"id": 50,
"components": {
"1": {
"Nickel": 1
},
"2": {
"Nickel": 1,
"Shield Emitters": 1
},
"3": {
"Nickel": 1,
"Shield Emitters": 1,
"Tungsten": 1
},
"4": {
"Molybdenum": 1,
"Tungsten": 1,
"Zinc": 1
}
},
"features": {
"1": {
"integrity": [ 0.2, 0.5 ],
@@ -1505,16 +1535,31 @@
"4": {
"integrity": [ 0.8, 2 ],
"mass": [ 2.5, 1.6 ]
},
"5": {
"integrity": [ 1, 2.5 ],
"mass": [ 3.0, 2.0 ]
}
},
"name": "Reinforced"
},
"LifeSupport_Shielded": {
"id": 51,
"components": {
"1": {
"Worn Shield Emitters": 1
},
"2": {
"Carbon": 1,
"Shield Emitters": 1
},
"3": {
"Carbon": 1,
"High Density Composites": 1,
"Shield Emitters": 1
},
"4": {
"Proprietary Composites": 1,
"Sielding Sensors": 1,
"Vanadium": 1
}
},
"features": {
"1": {
"integrity": [ 0.2, 0.5 ],
@@ -1531,10 +1576,6 @@
"4": {
"integrity": [ 0.8, 2 ],
"power": [ 1.2, 0.8 ]
},
"5": {
"integrity": [ 1, 1.5 ],
"power": [ 1.5, 1 ]
}
},
"name": "Shielded"
@@ -1999,6 +2040,25 @@
},
"Refineries_Shielded": {
"id": 92,
"components": {
"1": {
"Worn Shield Emitters": 1
},
"2": {
"Carbon": 1,
"Shield Emitters": 1
},
"3": {
"Carbon": 1,
"High Density Composites": 1,
"Shield Emitters": 1
},
"4": {
"Proprietary Composites": 1,
"Shielding Sensors": 1,
"Vanadium": 1
}
},
"features": {
"1": {
"integrity": [ 0.2, 0.5 ],
@@ -2400,6 +2460,20 @@
},
"WakeScanner_LightWeight": {
"id": 79,
"components": {
"1": {
"Phosphorus": 1
},
"2": {
"Manganese": 1,
"Salvaged Alloys": 1
},
"3": {
"Conductive Ceramics": 1,
"Manganese": 1,
"Salvaged Alloys": 1
}
},
"features": {
"1": {
"integrity": [ -0.2, -0.1 ],
@@ -2412,20 +2486,26 @@
"3": {
"integrity": [ -0.4, -0.3 ],
"mass": [ -0.5, -0.6 ]
},
"4": {
"integrity": [ -0.5, -0.4 ],
"mass": [ -0.6, -0.7 ]
},
"5": {
"integrity": [ -0.6, -0.5 ],
"mass": [ -0.7, -0.8 ]
}
},
"name": "Lightweight"
},
"WakeScanner_Shielded": {
"id": 80,
"components": {
"1": {
"Worn Shield Emitters": 1
},
"2": {
"Carbon": 1,
"Shield Emitters": 1
},
"3": {
"Carbon": 1,
"High Density Composites": 1,
"Shield Emitters": 1
}
},
"features": {
"1": {
"integrity": [ 0.2, 0.5 ],
@@ -2438,20 +2518,26 @@
"3": {
"integrity": [ 0.6, 1.5 ],
"power": [ 0.9, 0.6 ]
},
"4": {
"integrity": [ 0.8, 2 ],
"power": [ 1.2, 0.8 ]
},
"5": {
"integrity": [ 1, 1.5 ],
"power": [ 1.5, 1 ]
}
},
"name": "Shielded"
},
"WakeScanner_Reinforced": {
"id": 81,
"components": {
"1": {
"Nickel": 1
},
"2": {
"Nickel": 1,
"Shield Emitters": 1
},
"3": {
"Nickel": 1,
"Shield Emitters": 1,
"Tungsten": 1
}
},
"features": {
"1": {
"integrity": [ 0.2, 0.5 ],
@@ -2464,14 +2550,6 @@
"3": {
"integrity": [ 0.6, 1.5 ],
"mass": [ 2.0, 1.2 ]
},
"4": {
"integrity": [ 0.8, 2 ],
"mass": [ 2.5, 1.6 ]
},
"5": {
"integrity": [ 1, 2.5 ],
"mass": [ 3.0, 2.0 ]
}
},
"name": "Reinforced"

1
modifications/modules.json
View File

@@ -497,6 +497,7 @@
"special_blinding_shell",
"special_dispersal_field",
"special_phasing_sequence",
"special_plasma_slug",
"special_target_lock_breaker",
"special_thermal_conduit"
]

2
package.json
View File

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

2
ships/keelback.json
View File

@@ -6,7 +6,7 @@
"name": "Keelback",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 2943880,
"hullCost": 2943870,
"speed": 200,
"boost": 300,
"boostEnergy": 10,

4
ships/sidewinder.json
View File

@@ -6,7 +6,7 @@
"name": "Sidewinder",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"hullCost": 12870,
"hullCost": 4070,
"speed": 220,
"boost": 320,
"boostEnergy": 7,
@@ -20,7 +20,7 @@
"roll": 110,
"yaw": 16
},
"retailCost": 40800,
"retailCost": 32000,
"bulkheads": [
{ "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
{ "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },