Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-10 15:55:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61 from EDCD/fix/armour-resistance-modding

Browse Source 
Fix armour/hr resistance modding to not include diminishing returns in base values
This commit is contained in:
William
2018-11-21 08:52:39 +11:00
committed by GitHub
parent a8b151fe10 c2892fcfee
commit 0682718298
2 changed files with 189 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

372
modifications/blueprints.json
View File

@@ -89,7 +89,7 @@
"features": { "features": {
"explres": [ "explres": [
0, 0,
0.042 0.03
], ],
"hullboost": [ "hullboost": [
-0.01, -0.01,
@@ -97,7 +97,7 @@
], ],
"kinres": [ "kinres": [
0, 0,
0.036 0.03
], ],
"mass": [ "mass": [
0, 0,
@@ -117,16 +117,16 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.042, 0.03,
0.084 0.06
], ],
"hullboost": [ "hullboost": [
-0.02, -0.02,
-0.02 -0.02
], ],
"kinres": [ "kinres": [
0.036, 0.03,
0.072 0.06
], ],
"mass": [ "mass": [
-0.15, -0.15,
@@ -147,16 +147,16 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.084, 0.06,
0.126 0.09
], ],
"hullboost": [ "hullboost": [
-0.03, -0.03,
-0.03 -0.03
], ],
"kinres": [ "kinres": [
0.072, 0.06,
0.108 0.09
], ],
"mass": [ "mass": [
-0.25, -0.25,
@@ -177,16 +177,16 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.126, 0.09,
0.168 0.12
], ],
"hullboost": [ "hullboost": [
-0.04, -0.04,
-0.04 -0.04
], ],
"kinres": [ "kinres": [
0.108, 0.09,
0.144 0.12
], ],
"mass": [ "mass": [
-0.35, -0.35,
@@ -207,16 +207,16 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.168, 0.12,
0.21 0.15
], ],
"hullboost": [ "hullboost": [
-0.05, -0.05,
-0.05 -0.05
], ],
"kinres": [ "kinres": [
0.144, 0.12,
0.18 0.15
], ],
"mass": [ "mass": [
-0.45, -0.45,
@@ -247,11 +247,11 @@
"features": { "features": {
"explres": [ "explres": [
0, 0,
0.168 0.12
], ],
"kinres": [ "kinres": [
-0.05, -0.04,
-0.05 -0.04
], ],
"thermres": [ "thermres": [
-0.04, -0.04,
@@ -267,12 +267,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.168, 0.12,
0.266 0.19
], ],
"kinres": [ "kinres": [
-0.07, -0.06,
-0.07 -0.06
], ],
"thermres": [ "thermres": [
-0.06, -0.06,
@@ -288,12 +288,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.366, 0.19,
0.364 0.26
], ],
"kinres": [ "kinres": [
-0.1, -0.08,
-0.1 -0.08
], ],
"thermres": [ "thermres": [
-0.08, -0.08,
@@ -310,12 +310,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.364, 0.26,
0.462 0.33
], ],
"kinres": [ "kinres": [
-0.12, -0.1,
-0.12 -0.1
], ],
"thermres": [ "thermres": [
-0.1, -0.1,
@@ -332,12 +332,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.462, 0.33,
0.56 0.40
], ],
"kinres": [ "kinres": [
-0.14, -0.12,
-0.14 -0.12
], ],
"thermres": [ "thermres": [
-0.12, -0.12,
@@ -364,7 +364,7 @@
"features": { "features": {
"explres": [ "explres": [
0, 0,
0.014 0.01
], ],
"hullboost": [ "hullboost": [
0, 0,
@@ -372,7 +372,7 @@
], ],
"kinres": [ "kinres": [
0, 0,
0.012 0.01
], ],
"mass": [ "mass": [
0.1, 0.1,
@@ -392,16 +392,16 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.014, 0.01,
0.028 0.02
], ],
"hullboost": [ "hullboost": [
0.12, 0.12,
0.17 0.17
], ],
"kinres": [ "kinres": [
0.012, 0.01,
0.024 0.02
], ],
"mass": [ "mass": [
0.15, 0.15,
@@ -422,16 +422,16 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.028, 0.02,
0.042 0.03
], ],
"hullboost": [ "hullboost": [
0.17, 0.17,
0.22 0.22
], ],
"kinres": [ "kinres": [
0.024, 0.02,
0.036 0.03
], ],
"mass": [ "mass": [
0.2, 0.2,
@@ -452,16 +452,16 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.042, 0.03,
0.056 0.04
], ],
"hullboost": [ "hullboost": [
0.22, 0.22,
0.27 0.27
], ],
"kinres": [ "kinres": [
0.036, 0.03,
0.048 0.04
], ],
"mass": [ "mass": [
0.25, 0.25,
@@ -482,16 +482,16 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.056, 0.04,
0.07 0.05
], ],
"hullboost": [ "hullboost": [
0.27, 0.27,
0.32 0.32
], ],
"kinres": [ "kinres": [
0.048, 0.04,
0.06 0.05
], ],
"mass": [ "mass": [
0.3, 0.3,
@@ -521,12 +521,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.06, -0.04,
-0.06 -0.04
], ],
"kinres": [ "kinres": [
0, 0,
0.144 0.12
], ],
"thermres": [ "thermres": [
-0.04, -0.04,
@@ -542,12 +542,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.08, -0.06,
-0.08 -0.06
], ],
"kinres": [ "kinres": [
0.144, 0.12,
0.228 0.19
], ],
"thermres": [ "thermres": [
-0.06, -0.06,
@@ -564,12 +564,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.11, -0.08,
-0.11 -0.08
], ],
"kinres": [ "kinres": [
0.228, 0.19,
0.312 0.26
], ],
"thermres": [ "thermres": [
-0.08, -0.08,
@@ -586,12 +586,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.14, -0.1,
-0.14 -0.1
], ],
"kinres": [ "kinres": [
0.312, 0.26,
0.396 0.33
], ],
"thermres": [ "thermres": [
-0.1, -0.1,
@@ -608,12 +608,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.17, -0.12,
-0.17 -0.12
], ],
"kinres": [ "kinres": [
0.396, 0.33,
0.48 0.40
], ],
"thermres": [ "thermres": [
-0.12, -0.12,
@@ -639,12 +639,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.06, -0.04,
-0.06 -0.04
], ],
"kinres": [ "kinres": [
-0.05, -0.04,
-0.05 -0.04
], ],
"thermres": [ "thermres": [
0, 0,
@@ -660,12 +660,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.08, -0.06,
-0.08 -0.06
], ],
"kinres": [ "kinres": [
-0.07, -0.06,
-0.07 -0.06
], ],
"thermres": [ "thermres": [
0.12, 0.12,
@@ -682,12 +682,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.11, -0.08,
-0.11 -0.08
], ],
"kinres": [ "kinres": [
-0.1, -0.08,
-0.1 -0.08
], ],
"thermres": [ "thermres": [
0.19, 0.19,
@@ -704,12 +704,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.14, -0.1,
-0.14 -0.1
], ],
"kinres": [ "kinres": [
-0.12, -0.1,
-0.12 -0.1
], ],
"thermres": [ "thermres": [
0.26, 0.26,
@@ -726,12 +726,12 @@
}, },
"features": { "features": {
"explres": [ "explres": [
-0.17, -0.12,
-0.17 -0.12
], ],
"kinres": [ "kinres": [
-0.14, -0.12,
-0.14 -0.12
], ],
"thermres": [ "thermres": [
0.33, 0.33,
@@ -4111,7 +4111,7 @@
"features": { "features": {
"explres": [ "explres": [
0, 0,
0.117 0.12
], ],
"hullreinforcement": [ "hullreinforcement": [
0, 0,
@@ -4135,8 +4135,8 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.117, 0.12,
0.185 0.19
], ],
"hullreinforcement": [ "hullreinforcement": [
0.03, 0.03,
@@ -4161,8 +4161,8 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.185, 0.19,
0.254 0.26
], ],
"hullreinforcement": [ "hullreinforcement": [
0.06, 0.06,
@@ -4187,8 +4187,8 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.254, 0.26,
0.322 0.33
], ],
"hullreinforcement": [ "hullreinforcement": [
0.09, 0.09,
@@ -4213,8 +4213,8 @@
}, },
"features": { "features": {
"explres": [ "explres": [
0.322, 0.33,
0.39 0.40
], ],
"hullreinforcement": [ "hullreinforcement": [
0.12, 0.12,
@@ -4417,7 +4417,7 @@
], ],
"kinres": [ "kinres": [
0, 0,
0.117 0.12
], ],
"thermres": [ "thermres": [
-0.02, -0.02,
@@ -4441,8 +4441,8 @@
0.06 0.06
], ],
"kinres": [ "kinres": [
0.117, 0.12,
0.185 0.19
], ],
"thermres": [ "thermres": [
-0.04, -0.04,
@@ -4467,8 +4467,8 @@
0.09 0.09
], ],
"kinres": [ "kinres": [
0.185, 0.19,
0.254 0.26
], ],
"thermres": [ "thermres": [
-0.06, -0.06,
@@ -4493,8 +4493,8 @@
0.12 0.12
], ],
"kinres": [ "kinres": [
0.254, 0.26,
0.322 0.33
], ],
"thermres": [ "thermres": [
-0.08, -0.08,
@@ -4519,8 +4519,8 @@
0.15 0.15
], ],
"kinres": [ "kinres": [
0.322, 0.33,
0.29 0.4
], ],
"thermres": [ "thermres": [
-0.1, -0.1,
@@ -4560,7 +4560,7 @@
], ],
"thermres": [ "thermres": [
0, 0,
0.117 0.12
] ]
}, },
"uuid": "cc3d62d5-9769-480d-9e37-620c61a276ab" "uuid": "cc3d62d5-9769-480d-9e37-620c61a276ab"
@@ -4584,8 +4584,8 @@
-0.04 -0.04
], ],
"thermres": [ "thermres": [
0.117, 0.12,
0.185 0.19
] ]
}, },
"uuid": "e4aa2331-7dc5-479c-9959-d90f0e473da9" "uuid": "e4aa2331-7dc5-479c-9959-d90f0e473da9"
@@ -4610,8 +4610,8 @@
-0.06 -0.06
], ],
"thermres": [ "thermres": [
0.185, 0.19,
0.254 0.26
] ]
}, },
"uuid": "29f49ae9-e241-4791-a9e3-bfdccd6cdfbb" "uuid": "29f49ae9-e241-4791-a9e3-bfdccd6cdfbb"
@@ -4636,8 +4636,8 @@
-0.08 -0.08
], ],
"thermres": [ "thermres": [
0.254, 0.26,
0.322 0.33
] ]
}, },
"uuid": "19e30f32-a789-4acf-8f69-f97677ace963" "uuid": "19e30f32-a789-4acf-8f69-f97677ace963"
@@ -4662,8 +4662,8 @@
-0.1 -0.1
], ],
"thermres": [ "thermres": [
0.322, 0.33,
0.39 0.4
] ]
}, },
"uuid": "e6151657-1317-4aec-9e49-2d7e7a093d74" "uuid": "e6151657-1317-4aec-9e49-2d7e7a093d74"
@@ -9868,11 +9868,11 @@
], ],
"kinres": [ "kinres": [
0, 0,
0.06 0.1
], ],
"thermres": [ "thermres": [
-0.04, -0.03,
-0.04 -0.03
] ]
}, },
"uuid": "df87f0c1-bd60-4e18-8a03-76063d635235" "uuid": "df87f0c1-bd60-4e18-8a03-76063d635235"
@@ -9888,12 +9888,12 @@
0.25 0.25
], ],
"kinres": [ "kinres": [
0.06, 0.1,
0.12 0.2
], ],
"thermres": [ "thermres": [
-0.07, -0.06,
-0.07 -0.06
] ]
}, },
"uuid": "b67f86a0-866c-4233-9cd3-f5ea87a572eb" "uuid": "b67f86a0-866c-4233-9cd3-f5ea87a572eb"
@@ -9910,12 +9910,12 @@
0.3 0.3
], ],
"kinres": [ "kinres": [
0.12, 0.2,
0.18 0.3
], ],
"thermres": [ "thermres": [
-0.11, -0.09,
-0.11 -0.09
] ]
}, },
"uuid": "93979fd6-d135-4221-9a60-c9354e02619f" "uuid": "93979fd6-d135-4221-9a60-c9354e02619f"
@@ -9932,12 +9932,12 @@
0.35 0.35
], ],
"kinres": [ "kinres": [
0.18, 0.3,
0.24 0.4
], ],
"thermres": [ "thermres": [
-0.14, -0.12,
-0.14 -0.12
] ]
}, },
"uuid": "0e14c801-fd35-4bca-b97b-24da20d8c716" "uuid": "0e14c801-fd35-4bca-b97b-24da20d8c716"
@@ -9954,12 +9954,12 @@
0.4 0.4
], ],
"kinres": [ "kinres": [
0.18, 0.4,
0.3 0.5
], ],
"thermres": [ "thermres": [
-0.18, -0.15,
-0.18 -0.15
] ]
}, },
"uuid": "dfdb4767-78e1-4e5f-ae1a-aeb6ae2748c9" "uuid": "dfdb4767-78e1-4e5f-ae1a-aeb6ae2748c9"
@@ -10148,11 +10148,11 @@
], ],
"explres": [ "explres": [
0, 0,
0.0225 0.045
], ],
"kinres": [ "kinres": [
0, 0,
0.027 0.045
], ],
"optmul": [ "optmul": [
0, 0,
@@ -10160,7 +10160,7 @@
], ],
"thermres": [ "thermres": [
0, 0,
0.054 0.045
] ]
}, },
"uuid": "47ad77c0-e49b-44e5-9824-4074b63db369" "uuid": "47ad77c0-e49b-44e5-9824-4074b63db369"
@@ -10180,20 +10180,20 @@
0.06 0.06
], ],
"explres": [ "explres": [
0.0225, 0.045,
0.0375 0.075
], ],
"kinres": [ "kinres": [
0.027, 0.045,
0.045 0.075
], ],
"optmul": [ "optmul": [
0.14, 0.14,
0.2 0.2
], ],
"thermres": [ "thermres": [
0.054, 0.045,
0.09 0.075
] ]
}, },
"uuid": "823f8f82-745d-4051-8f35-4e38a561932e" "uuid": "823f8f82-745d-4051-8f35-4e38a561932e"
@@ -10214,20 +10214,20 @@
0.08 0.08
], ],
"explres": [ "explres": [
0.0375, 0.075,
0.0525 0.105
], ],
"kinres": [ "kinres": [
0.045, 0.075,
0.063 0.105
], ],
"optmul": [ "optmul": [
0.2, 0.2,
0.26 0.26
], ],
"thermres": [ "thermres": [
0.09, 0.075,
0.126 0.105
] ]
}, },
"uuid": "a1a29713-f2e5-4e15-a913-e01dc065f99f" "uuid": "a1a29713-f2e5-4e15-a913-e01dc065f99f"
@@ -10248,20 +10248,20 @@
0.1 0.1
], ],
"explres": [ "explres": [
0.0525, 0.105,
0.0675 0.135
], ],
"kinres": [ "kinres": [
0.063, 0.105,
0.081 0.135
], ],
"optmul": [ "optmul": [
0.26, 0.26,
0.32 0.32
], ],
"thermres": [ "thermres": [
0.126, 0.105,
0.162 0.135
] ]
}, },
"uuid": "87ac1315-7904-48f6-a5fe-f044be546490" "uuid": "87ac1315-7904-48f6-a5fe-f044be546490"
@@ -10282,20 +10282,20 @@
0.12 0.12
], ],
"explres": [ "explres": [
0.0675, 0.135,
0.0825 0.165
], ],
"kinres": [ "kinres": [
0.081, 0.135,
0.099 0.165
], ],
"optmul": [ "optmul": [
0.32, 0.32,
0.38 0.38
], ],
"thermres": [ "thermres": [
0.162, 0.135,
0.198 0.165
] ]
}, },
"uuid": "1d9af376-c7c9-4b1a-9bc9-e77b4025e328" "uuid": "1d9af376-c7c9-4b1a-9bc9-e77b4025e328"
@@ -10321,12 +10321,12 @@
0.2 0.2
], ],
"kinres": [ "kinres": [
-0.02, -0.04,
-0.02 -0.04
], ],
"thermres": [ "thermres": [
0, 0,
0.12 0.1
] ]
}, },
"uuid": "ef5a3026-0777-4715-a1f4-5c65eff85b12" "uuid": "ef5a3026-0777-4715-a1f4-5c65eff85b12"
@@ -10342,12 +10342,12 @@
0.25 0.25
], ],
"kinres": [ "kinres": [
-0.05, -0.08,
-0.05 -0.08
], ],
"thermres": [ "thermres": [
0.12, 0.1,
0.24 0.2
] ]
}, },
"uuid": "54e6e07a-3281-41aa-afa0-bbf292131c0f" "uuid": "54e6e07a-3281-41aa-afa0-bbf292131c0f"
@@ -10364,12 +10364,12 @@
0.3 0.3
], ],
"kinres": [ "kinres": [
-0.07, -0.12,
-0.07 -0.12
], ],
"thermres": [ "thermres": [
0.24, 0.2,
0.36 0.3
] ]
}, },
"uuid": "307935bf-60d3-4887-b449-24d712518154" "uuid": "307935bf-60d3-4887-b449-24d712518154"
@@ -10386,12 +10386,12 @@
0.35 0.35
], ],
"kinres": [ "kinres": [
-0.1, -0.16,
-0.1 -0.16
], ],
"thermres": [ "thermres": [
0.36, 0.3,
0.48 0.4
] ]
}, },
"uuid": "ef6a4d70-9996-4db8-ae22-7c61c3dcaf74" "uuid": "ef6a4d70-9996-4db8-ae22-7c61c3dcaf74"
@@ -10408,12 +10408,12 @@
0.4 0.4
], ],
"kinres": [ "kinres": [
-0.12, -0.20,
-0.12 -0.20
], ],
"thermres": [ "thermres": [
0.48, 0.4,
0.6 0.5
] ]
}, },
"uuid": "f14e779f-d09a-47e4-8f4e-89c85b730f6b" "uuid": "f14e779f-d09a-47e4-8f4e-89c85b730f6b"

6
modifications/modifierActions.json
View File

@@ -263,9 +263,9 @@
"special_shield_regenerative": { "special_shield_regenerative": {
"brokenregen": 0.15, "brokenregen": 0.15,
"regen": 0.15, "regen": 0.15,
"thermres": -1, "thermres": -1.5,
"kinres": -1, "kinres": -1.5,
"explres": -1 "explres": -1.5
}, },
"special_shield_resistive": { "special_shield_resistive": {
"thermres": 3, "thermres": 3,