Merge branch 'feature/issue29' into develop

This commit is contained in:
Cmdr McDonald
2016-11-23 00:55:20 +00:00
5 changed files with 30 additions and 16 deletions

View File

@@ -1,4 +1,9 @@
#2.2.x
#2.2.3
* Fix mismatch between class 5 and class 7 fighter hangars
* Add details for concordant sequence special effect
* Fix details for thermal shock special effect
#2.2.2
* Add distributor draw modifier to shield generators
* Remove modifiers for sensors
* Add initial loadout passenger cabins for Beluga

13
dist/index.js vendored
View File

@@ -9585,8 +9585,8 @@ module.exports = {
bays: 2,
class: 7,
cost: 575660,
edID: 128727930,
eddbID: 1560,
edID: 128727932,
eddbID: 1562,
fightercost: 1030,
grp: "fh",
id: "fh",
@@ -9611,8 +9611,8 @@ module.exports = {
bays: 1,
class: 5,
cost: 2369330,
edID: 128727932,
eddbID: 1562,
edID: 128727930,
eddbID: 1560,
fightercost: 1030,
grp: "fh",
id: "fr",
@@ -13528,6 +13528,9 @@ module.exports = {
},
special_auto_loader: {},
special_choke_canister: {},
special_concordant_sequence: {
thermload: .5
},
special_corrosive_shell: {
ammo: -.2
},
@@ -13565,7 +13568,7 @@ module.exports = {
thermload: .25
},
special_thermalshock: {
damage: -.25
damage: -.2
},
trade_cell_heat_cell_units: {},
trade_defence_health_add_defence_global_mult: {},

13
dist/index.json vendored
View File

@@ -11695,8 +11695,8 @@
"bays": 2,
"class": 7,
"cost": 575660,
"edID": 128727930,
"eddbID": 1560,
"edID": 128727932,
"eddbID": 1562,
"fightercost": 1030,
"grp": "fh",
"id": "fh",
@@ -11723,8 +11723,8 @@
"bays": 1,
"class": 5,
"cost": 2369330,
"edID": 128727932,
"eddbID": 1562,
"edID": 128727930,
"eddbID": 1560,
"fightercost": 1030,
"grp": "fh",
"id": "fr",
@@ -15965,6 +15965,9 @@
},
"special_auto_loader": {},
"special_choke_canister": {},
"special_concordant_sequence": {
"thermload": 0.5
},
"special_corrosive_shell": {
"ammo": -0.2
},
@@ -16002,7 +16005,7 @@
"thermload": 0.25
},
"special_thermalshock": {
"damage": -0.25
"damage": -0.2
},
"trade_cell_heat_cell_units": {},
"trade_defence_health_add_defence_global_mult": {},

View File

@@ -181,6 +181,9 @@
},
"special_auto_loader": {},
"special_choke_canister": {},
"special_concordant_sequence": {
"thermload": 0.5
},
"special_corrosive_shell": {
"ammo": -0.2
},
@@ -218,7 +221,7 @@
"thermload": 0.25
},
"special_thermalshock": {
"damage": -0.25
"damage": -0.2
},
"trade_cell_heat_cell_units": {},
"trade_defence_health_add_defence_global_mult": {},

View File

@@ -4,8 +4,8 @@
"bays": 2,
"class": 7,
"cost": 575660,
"edID": 128727930,
"eddbID": 1560,
"edID": 128727932,
"eddbID": 1562,
"fightercost": 1030,
"grp": "fh",
"id": "fh",
@@ -32,8 +32,8 @@
"bays": 1,
"class": 5,
"cost": 2369330,
"edID": 128727932,
"eddbID": 1562,
"edID": 128727930,
"eddbID": 1560,
"fightercost": 1030,
"grp": "fh",
"id": "fr",