Merge branch 'release/2.3.4'

This commit is contained in:
Cmdr McDonald
2017-05-03 12:38:39 +01:00
8 changed files with 135 additions and 16 deletions

View File

@@ -1,3 +1,9 @@
#2.3.4
* Add missing Long Range blueprint to multi-cannon
* Fix values for thermal load of focused weapon grade 4
* Fix internal module information for power plant blueprints
* Add 'FSD Interrupt' special to dumbfire missile racks; this module now has `specials_S` and `specials_D` keys for specials to differentiate
#2.3.3 #2.3.3
* Add Felicity Farseer to list of engineers that supply sensor and detailed surface scanner modifications * Add Felicity Farseer to list of engineers that supply sensor and detailed surface scanner modifications

34
dist/index.js vendored
View File

@@ -18072,7 +18072,7 @@ module.exports = {
} }
}, },
id: 62, id: 62,
modulename: [ "Power distributor", "Distributor" ], modulename: [ "Power plant" ],
name: "Armoured" name: "Armoured"
}, },
PowerPlant_Boosted: { PowerPlant_Boosted: {
@@ -18137,7 +18137,7 @@ module.exports = {
} }
}, },
id: 63, id: 63,
modulename: [ "Power distributor", "Distributor" ], modulename: [ "Power plant" ],
name: "Overcharged" name: "Overcharged"
}, },
PowerPlant_Stealth: { PowerPlant_Stealth: {
@@ -20383,7 +20383,7 @@ module.exports = {
piercing: [ .2, .4 ], piercing: [ .2, .4 ],
range: [ .4, .8 ], range: [ .4, .8 ],
rof: [ -.08, -.02 ], rof: [ -.08, -.02 ],
thermload: [ -.2, -.1 ] thermload: [ .2, .1 ]
} }
}, },
"5": { "5": {
@@ -21456,6 +21456,7 @@ module.exports = {
jitter: 1, jitter: 1,
speed: -.1667 speed: -.1667
}, },
special_fsd_interrupt: {},
special_high_yield_shell: { special_high_yield_shell: {
rof: .1111111111111111 rof: .1111111111111111
}, },
@@ -23199,6 +23200,25 @@ module.exports = {
} }
} }
}, },
Weapon_LongRange: {
grades: {
"1": {
engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
},
"2": {
engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
},
"3": {
engineers: [ "Tod McQuinn", "Zacariah Nemo" ]
},
"4": {
engineers: [ "Tod McQuinn" ]
},
"5": {
engineers: [ "Tod McQuinn" ]
}
}
},
Weapon_Overcharged: { Weapon_Overcharged: {
grades: { grades: {
"1": { "1": {
@@ -23363,7 +23383,8 @@ module.exports = {
} }
}, },
modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "reload", "rof", "thermload" ], modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "reload", "rof", "thermload" ],
specials: [ "special_drag_munitions", "special_emissive_munitions", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ] specials_S: [ "special_drag_munitions", "special_emissive_munitions", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ],
specials_D: [ "special_drag_munitions", "special_emissive_munitions", "special_fsd_interrupt", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ]
}, },
mrp: { mrp: {
blueprints: {}, blueprints: {},
@@ -25063,6 +25084,11 @@ module.exports = {
edname: "special_force_shell", edname: "special_force_shell",
name: "Force shell" name: "Force shell"
}, },
special_fsd_interrupt: {
id: 33,
edname: "special_fsd_interrupt",
name: "FSD interrupt"
},
special_high_yield_shell: { special_high_yield_shell: {
id: 11, id: 11,
edname: "special_high_yield_shell", edname: "special_high_yield_shell",

58
dist/index.json vendored
View File

@@ -23152,8 +23152,7 @@
}, },
"id": 62, "id": 62,
"modulename": [ "modulename": [
"Power distributor", "Power plant"
"Distributor"
], ],
"name": "Armoured" "name": "Armoured"
}, },
@@ -23265,8 +23264,7 @@
}, },
"id": 63, "id": 63,
"modulename": [ "modulename": [
"Power distributor", "Power plant"
"Distributor"
], ],
"name": "Overcharged" "name": "Overcharged"
}, },
@@ -27171,8 +27169,8 @@
-0.02 -0.02
], ],
"thermload": [ "thermload": [
-0.2, 0.2,
-0.1 0.1
] ]
} }
}, },
@@ -28709,6 +28707,7 @@
"jitter": 1, "jitter": 1,
"speed": -0.1667 "speed": -0.1667
}, },
"special_fsd_interrupt": {},
"special_high_yield_shell": { "special_high_yield_shell": {
"rof": 0.1111111111111111 "rof": 0.1111111111111111
}, },
@@ -31706,6 +31705,38 @@
} }
} }
}, },
"Weapon_LongRange": {
"grades": {
"1": {
"engineers": [
"Tod McQuinn",
"Zacariah Nemo"
]
},
"2": {
"engineers": [
"Tod McQuinn",
"Zacariah Nemo"
]
},
"3": {
"engineers": [
"Tod McQuinn",
"Zacariah Nemo"
]
},
"4": {
"engineers": [
"Tod McQuinn"
]
},
"5": {
"engineers": [
"Tod McQuinn"
]
}
}
},
"Weapon_Overcharged": { "Weapon_Overcharged": {
"grades": { "grades": {
"1": { "1": {
@@ -32012,12 +32043,20 @@
"rof", "rof",
"thermload" "thermload"
], ],
"specials": [ "specials_S": [
"special_drag_munitions", "special_drag_munitions",
"special_emissive_munitions", "special_emissive_munitions",
"special_overload_munitions", "special_overload_munitions",
"special_penetrator_payload", "special_penetrator_payload",
"special_thermal_cascade" "special_thermal_cascade"
],
"specials_D": [
"special_drag_munitions",
"special_emissive_munitions",
"special_fsd_interrupt",
"special_overload_munitions",
"special_penetrator_payload",
"special_thermal_cascade"
] ]
}, },
"mrp": { "mrp": {
@@ -35178,6 +35217,11 @@
"edname": "special_force_shell", "edname": "special_force_shell",
"name": "Force shell" "name": "Force shell"
}, },
"special_fsd_interrupt": {
"id": 33,
"edname": "special_fsd_interrupt",
"name": "FSD interrupt"
},
"special_high_yield_shell": { "special_high_yield_shell": {
"id": 11, "id": 11,
"edname": "special_high_yield_shell", "edname": "special_high_yield_shell",

View File

@@ -3627,7 +3627,7 @@
} }
}, },
"id": 62, "id": 62,
"modulename": ["Power distributor", "Distributor"], "modulename": ["Power plant"],
"name": "Armoured" "name": "Armoured"
}, },
"PowerPlant_Boosted": { "PowerPlant_Boosted": {
@@ -3692,7 +3692,7 @@
} }
}, },
"id": 63, "id": 63,
"modulename": ["Power distributor", "Distributor"], "modulename": ["Power plant"],
"name": "Overcharged" "name": "Overcharged"
}, },
"PowerPlant_Stealth": { "PowerPlant_Stealth": {
@@ -5938,7 +5938,7 @@
"piercing": [ 0.2, 0.4 ], "piercing": [ 0.2, 0.4 ],
"range": [ 0.4, 0.8 ], "range": [ 0.4, 0.8 ],
"rof": [ -0.08, -0.02 ], "rof": [ -0.08, -0.02 ],
"thermload": [ -0.2, -0.1 ] "thermload": [ 0.2, 0.1 ]
} }
}, },
"5": { "5": {

View File

@@ -211,6 +211,8 @@
"jitter": 1, "jitter": 1,
"speed": -0.1667 "speed": -0.1667
}, },
"special_fsd_interrupt": {
},
"special_high_yield_shell": { "special_high_yield_shell": {
"rof": 0.1111111111111111 "rof": 0.1111111111111111
}, },

View File

@@ -2849,6 +2849,38 @@
} }
} }
}, },
"Weapon_LongRange": {
"grades": {
"1": {
"engineers": [
"Tod McQuinn",
"Zacariah Nemo"
]
},
"2": {
"engineers": [
"Tod McQuinn",
"Zacariah Nemo"
]
},
"3": {
"engineers": [
"Tod McQuinn",
"Zacariah Nemo"
]
},
"4": {
"engineers": [
"Tod McQuinn"
]
},
"5": {
"engineers": [
"Tod McQuinn"
]
}
}
},
"Weapon_Overcharged": { "Weapon_Overcharged": {
"grades": { "grades": {
"1": { "1": {
@@ -3157,12 +3189,20 @@
"rof", "rof",
"thermload" "thermload"
], ],
"specials": [ "specials_S": [
"special_drag_munitions", "special_drag_munitions",
"special_emissive_munitions", "special_emissive_munitions",
"special_overload_munitions", "special_overload_munitions",
"special_penetrator_payload", "special_penetrator_payload",
"special_thermal_cascade" "special_thermal_cascade"
],
"specials_D": [
"special_drag_munitions",
"special_emissive_munitions",
"special_fsd_interrupt",
"special_overload_munitions",
"special_penetrator_payload",
"special_thermal_cascade"
] ]
}, },
"mrp": { "mrp": {

View File

@@ -10,6 +10,7 @@
"special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"}, "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
"special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"}, "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
"special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"}, "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
"special_fsd_interrupt": {"id": 33, "edname": "special_fsd_interrupt", "name": "FSD interrupt"},
"special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"}, "special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"},
"special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"}, "special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"},
"special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"}, "special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"},

View File

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