Merge branch 'feature/specials' into develop

Merge for #25
This commit is contained in:
Cmdr McDonald
2016-11-27 19:45:43 +00:00
6 changed files with 299 additions and 3 deletions

View File

@@ -2,6 +2,7 @@
* Fix incorrect ID for class 5 luxury passenger cabin
* Add damage type modifier
* Change modifications from simple strings to objects, to allow more data-driven behaviour
* Add special effects
#2.2.3
* Fix mismatch between class 5 and class 7 fighter hangars

132
dist/index.js vendored
View File

@@ -13946,7 +13946,7 @@ module.exports = {
method: "multiplicative"
},
shieldreinforcement: {
id: 38,
id: 39,
name: "shieldreinforcement",
type: "numeric",
method: "multiplicative"
@@ -14271,6 +14271,136 @@ module.exports = {
thermload: 1
}
},
specials: {
special_auto_loader: {
id: 0,
name: "Auto loader"
},
special_choke_canister: {
id: 1,
name: "Choke canister"
},
special_concordant_sequence: {
id: 2,
name: "Concordant sequence"
},
special_corrosive_shell: {
id: 3,
name: "Corrosive shell"
},
special_dazzle_shell: {
id: 4,
name: "Dazzle shell"
},
special_dispersal_field: {
id: 5,
name: "Dispersal field"
},
special_distortion_field: {
id: 6,
name: "Distortion field"
},
special_drag_munitions: {
id: 7,
name: "Drag munitions"
},
special_emissive_munitions: {
id: 9,
name: "Emissive munitions"
},
special_feedback_cascade: {
id: 9,
name: "Feedback cascade"
},
special_force_shell: {
id: 10,
name: "Force shell"
},
special_high_yield_shell: {
id: 11,
name: "High yield shell"
},
special_incendiary_rounds: {
id: 12,
name: "Incendiary rounds"
},
special_ion_disruptor: {
id: 13,
name: "Ion disruptor"
},
special_mass_lock_munition: {
id: 14,
name: "Mass lock munition"
},
special_overload_munitions: {
id: 15,
name: "Overload munitions"
},
special_penetrator_payload: {
id: 16,
name: "Penetrator payload"
},
special_phasing_sequence: {
id: 17,
name: "Phasing sequence"
},
special_plasma_slug: {
id: 18,
name: "Plasma slug"
},
special_radiant_canister: {
id: 19,
name: "Radiant Canister"
},
special_regeneration_sequence: {
id: 20,
name: "Regeneration sequence"
},
special_reverberating_cascade: {
id: 21,
name: "Reverberating cascade"
},
special_scramble_spectrum: {
id: 22,
name: "Scramble spectrum"
},
special_screening_shell: {
id: 23,
name: "Screening shell"
},
special_shiftlock_canister: {
id: 24,
name: "Shift-lock canister"
},
special_smart_rounds: {
id: 25,
name: "Smart rounds"
},
special_super_penetrator: {
id: 26,
name: "Super penetrator"
},
special_target_lock_breaker: {
id: 27,
name: "Target lock breaker"
},
special_thermal_cascade: {
id: 28,
name: "Thermal cascade"
},
special_thermal_conduit: {
id: 29,
name: "Thermal conduit"
},
special_thermal_vent: {
id: 30,
name: "Thermal vent"
},
special_thermalshock: {
id: 31,
name: "Thermal shock"
}
},
validity: {
am: [ "integrity", "power" ],
bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ],

132
dist/index.json vendored
View File

@@ -16342,7 +16342,7 @@
"method": "multiplicative"
},
"shieldreinforcement": {
"id": 38,
"id": 39,
"name": "shieldreinforcement",
"type": "numeric",
"method": "multiplicative"
@@ -16667,6 +16667,136 @@
"thermload": 1
}
},
"specials": {
"special_auto_loader": {
"id": 0,
"name": "Auto loader"
},
"special_choke_canister": {
"id": 1,
"name": "Choke canister"
},
"special_concordant_sequence": {
"id": 2,
"name": "Concordant sequence"
},
"special_corrosive_shell": {
"id": 3,
"name": "Corrosive shell"
},
"special_dazzle_shell": {
"id": 4,
"name": "Dazzle shell"
},
"special_dispersal_field": {
"id": 5,
"name": "Dispersal field"
},
"special_distortion_field": {
"id": 6,
"name": "Distortion field"
},
"special_drag_munitions": {
"id": 7,
"name": "Drag munitions"
},
"special_emissive_munitions": {
"id": 9,
"name": "Emissive munitions"
},
"special_feedback_cascade": {
"id": 9,
"name": "Feedback cascade"
},
"special_force_shell": {
"id": 10,
"name": "Force shell"
},
"special_high_yield_shell": {
"id": 11,
"name": "High yield shell"
},
"special_incendiary_rounds": {
"id": 12,
"name": "Incendiary rounds"
},
"special_ion_disruptor": {
"id": 13,
"name": "Ion disruptor"
},
"special_mass_lock_munition": {
"id": 14,
"name": "Mass lock munition"
},
"special_overload_munitions": {
"id": 15,
"name": "Overload munitions"
},
"special_penetrator_payload": {
"id": 16,
"name": "Penetrator payload"
},
"special_phasing_sequence": {
"id": 17,
"name": "Phasing sequence"
},
"special_plasma_slug": {
"id": 18,
"name": "Plasma slug"
},
"special_radiant_canister": {
"id": 19,
"name": "Radiant Canister"
},
"special_regeneration_sequence": {
"id": 20,
"name": "Regeneration sequence"
},
"special_reverberating_cascade": {
"id": 21,
"name": "Reverberating cascade"
},
"special_scramble_spectrum": {
"id": 22,
"name": "Scramble spectrum"
},
"special_screening_shell": {
"id": 23,
"name": "Screening shell"
},
"special_shiftlock_canister": {
"id": 24,
"name": "Shift-lock canister"
},
"special_smart_rounds": {
"id": 25,
"name": "Smart rounds"
},
"special_super_penetrator": {
"id": 26,
"name": "Super penetrator"
},
"special_target_lock_breaker": {
"id": 27,
"name": "Target lock breaker"
},
"special_thermal_cascade": {
"id": 28,
"name": "Thermal cascade"
},
"special_thermal_conduit": {
"id": 29,
"name": "Thermal conduit"
},
"special_thermal_vent": {
"id": 30,
"name": "Thermal vent"
},
"special_thermalshock": {
"id": 31,
"name": "Thermal shock"
}
},
"validity": {
"am": [
"integrity",

View File

@@ -2,5 +2,6 @@ module.exports = {
blueprints: require('./blueprints'),
modifications: require('./modifications'),
modifierActions: require('./modifierActions'),
specials: require('./specials'),
validity: require('./validity')
};

View File

@@ -38,6 +38,6 @@
"thermres": {"id": 36, "name": "thermres", "type": "numeric", "method": "additive"},
"wepcap": {"id": 37, "name": "wepcap", "type": "numeric", "method": "multiplicative"},
"weprate": {"id": 38, "name": "weprate", "type": "numeric", "method": "multiplicative"},
"shieldreinforcement": {"id": 38, "name": "shieldreinforcement", "type": "numeric", "method": "multiplicative"},
"shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "numeric", "method": "multiplicative"},
"type": {"id": 40, "name": "type", "type": "alphabetic", "method": "overwrite"}
}

View File

@@ -0,0 +1,34 @@
{
"special_auto_loader": {"id": 0, "name": "Auto loader"},
"special_choke_canister": {"id": 1, "name": "Choke canister"},
"special_concordant_sequence": {"id": 2, "name": "Concordant sequence"},
"special_corrosive_shell": {"id": 3, "name": "Corrosive shell"},
"special_dazzle_shell": {"id": 4, "name": "Dazzle shell"},
"special_dispersal_field": {"id": 5, "name": "Dispersal field"},
"special_distortion_field": {"id": 6, "name": "Distortion field"},
"special_drag_munitions": {"id": 7, "name": "Drag munitions"},
"special_emissive_munitions": {"id": 9, "name": "Emissive munitions"},
"special_feedback_cascade": {"id": 9, "name": "Feedback cascade"},
"special_force_shell": {"id": 10, "name": "Force shell"},
"special_high_yield_shell": {"id": 11, "name": "High yield shell"},
"special_incendiary_rounds": {"id": 12, "name": "Incendiary rounds"},
"special_ion_disruptor": {"id": 13, "name": "Ion disruptor"},
"special_mass_lock_munition": {"id": 14, "name": "Mass lock munition"},
"special_overload_munitions": {"id": 15, "name": "Overload munitions"},
"special_penetrator_payload": {"id": 16, "name": "Penetrator payload"},
"special_phasing_sequence": {"id": 17, "name": "Phasing sequence"},
"special_plasma_slug": {"id": 18, "name": "Plasma slug"},
"special_radiant_canister": {"id": 19, "name": "Radiant Canister"},
"special_regeneration_sequence": {"id": 20, "name": "Regeneration sequence"},
"special_reverberating_cascade": {"id": 21, "name": "Reverberating cascade"},
"special_scramble_spectrum": {"id": 22, "name": "Scramble spectrum"},
"special_screening_shell": {"id": 23, "name": "Screening shell"},
"special_shiftlock_canister": {"id": 24, "name": "Shift-lock canister"},
"special_smart_rounds": {"id": 25, "name": "Smart rounds"},
"special_super_penetrator": {"id": 26, "name": "Super penetrator"},
"special_target_lock_breaker": {"id": 27, "name": "Target lock breaker"},
"special_thermal_cascade": {"id": 28, "name": "Thermal cascade"},
"special_thermal_conduit": {"id": 29, "name": "Thermal conduit"},
"special_thermal_vent": {"id": 30, "name": "Thermal vent"},
"special_thermalshock": {"id": 31, "name": "Thermal shock"}
}