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

Resistance special effects now applied correctly

Browse Source
This commit is contained in:
felixlinker
2018-07-20 17:54:07 +02:00
parent d2380a5c9c
commit 690bc5a64a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/shipyard/Module.js
View File

@@ -47,7 +47,16 @@ export default class Module {
if (modifierActions && modifierActions[name]) { if (modifierActions && modifierActions[name]) {
// this special effect modifies our returned value // this special effect modifies our returned value
const modification = Modifications.modifications[name]; const modification = Modifications.modifications[name];
if (modification.method === 'additive') { const multiplier = modification.type === 'percentage' ? 10000 : 100;
if (name === 'explres' || name === 'kinres' || name === 'thermres') {
// Resistance modifications in itself are additive, however their
// special effects are multiplicative. They affect the overall result
// by (special effect resistance) * (damage mult after modification),
// i. e. we need to apply the special effect as a multiplier to the
// overall result and then calculate the difference.
let baseMult = this[name] ? 1 - this[name] : 1;
result = (baseMult - (baseMult - result / multiplier) * (1 - modifierActions[name] / 100)) * multiplier;
} else if (modification.method === 'additive') {
result = result + modifierActions[name] * 100; result = result + modifierActions[name] * 100;
} else if (modification.method === 'overwrite') { } else if (modification.method === 'overwrite') {
result = modifierActions[name]; result = modifierActions[name];
@@ -59,7 +68,6 @@ export default class Module {
} else { } else {
mod = modifierActions[name]; mod = modifierActions[name];
} }
const multiplier = modification.type === 'percentage' ? 10000 : 100;
result = (((1 + result / multiplier) * (1 + mod)) - 1) * multiplier; result = (((1 + result / multiplier) * (1 + mod)) - 1) * multiplier;
} }
} }