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

View File

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