Merge pull request #49 from EDCD/feature/fixes

Various fixes
This commit is contained in:
William
2018-09-12 08:11:14 +10:00
committed by GitHub
2 changed files with 41 additions and 42 deletions

View File

@@ -4250,7 +4250,7 @@
"features": {
"explres": [
0,
0.029
0.03
],
"hullreinforcement": [
0,
@@ -4258,7 +4258,7 @@
],
"kinres": [
0,
0.029
0.03
],
"mass": [
0.08,
@@ -4266,7 +4266,7 @@
],
"thermres": [
0,
0.029
0.03
]
},
"uuid": "e174a927-ab55-4691-be3e-832f6d68d679"
@@ -4278,24 +4278,24 @@
},
"features": {
"explres": [
0.029,
0.059
0.03,
0.06
],
"hullreinforcement": [
0.24,
0.36
],
"kinres": [
0.029,
0.059
0.03,
0.06
],
"mass": [
0.16,
0.16
],
"thermres": [
0.029,
0.059
0.03,
0.06
]
},
"uuid": "2cd3f87c-5ea3-4bd5-ab6d-70458f29de7e"
@@ -4308,24 +4308,24 @@
},
"features": {
"explres": [
0.059,
0.088
0.06,
0.09
],
"hullreinforcement": [
0.36,
0.48
],
"kinres": [
0.059,
0.088
0.06,
0.09
],
"mass": [
0.24,
0.24
],
"thermres": [
0.059,
0.088
0.06,
0.09
]
},
"uuid": "251e8773-d06a-4b0e-9e30-a5114a45a5c1"
@@ -4338,24 +4338,24 @@
},
"features": {
"explres": [
0.088,
0.117
0.09,
0.12
],
"hullreinforcement": [
0.48,
0.6
],
"kinres": [
0.088,
0.117
0.09,
0.12
],
"mass": [
0.32,
0.32
],
"thermres": [
0.088,
0.117
0.09,
0.12
]
},
"uuid": "d6b14f0e-9a32-4838-b41f-986f4a5abd6d"
@@ -4368,24 +4368,24 @@
},
"features": {
"explres": [
0.117,
0.146
0.12,
0.15
],
"hullreinforcement": [
0.6,
0.72
],
"kinres": [
0.117,
0.146
0.12,
0.15
],
"mass": [
0.4,
0.4
],
"thermres": [
0.117,
0.146
0.12,
0.15
]
},
"uuid": "137a648d-394b-48ac-a4de-bfa145fa9cf0"
@@ -9994,7 +9994,7 @@
],
"optmul": [
0,
0.045
0.03
],
"power": [
0,
@@ -10022,8 +10022,8 @@
-0.03
],
"optmul": [
0.02,
0.09
0.03,
0.06
],
"power": [
-0.2,
@@ -10052,8 +10052,8 @@
-0.04
],
"optmul": [
0.09,
0.135
0.06,
0.09
],
"power": [
-0.25,
@@ -10082,8 +10082,8 @@
-0.05
],
"optmul": [
0.135,
0.18
0.09,
0.12
],
"power": [
-0.3,
@@ -10112,8 +10112,8 @@
-0.06
],
"optmul": [
0.18,
0.225
0.12,
0.15
],
"power": [
-0.35,
@@ -10914,7 +10914,7 @@
],
"distdraw": [
-0.15,
-0.24
-0.25
],
"power": [
-0.12,
@@ -10939,7 +10939,7 @@
0.2
],
"distdraw": [
-0.24,
-0.25,
-0.35
],
"power": [
@@ -10970,7 +10970,7 @@
],
"power": [
-0.36,
-0.45
-0.48
],
"thermload": [
-0.52,

View File

@@ -178,6 +178,7 @@
"ammo": -0.2
},
"special_plasma_slug_cooled": {
"damage": -0.1,
"thermload": -0.4
},
"special_dispersal_field": {
@@ -251,9 +252,7 @@
"special_thermal_conduit": {
"damage": -0.2
},
"special_thermal_vent": {
"thermload": 0.25
},
"special_thermal_vent": {},
"special_thermalshock": {
"damage": -0.2
},