Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-11 16:53:02 +00:00
Code Issues Projects Releases Wiki Activity

Rework per-module resistance calculations

Browse Source
This commit is contained in:
Cmdr McDonald
2016-11-13 13:13:57 +00:00
parent 9556f28ba4
commit 8397d3505b
8 changed files with 94 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/app/utils/CompanionApiUtils.js
View File

@@ -247,12 +247,11 @@ export function shipFromJson(json) {
let internalSlot = null;
while (internalSlot === null && internalSlotNum < 99) {
// Slot numbers are not contiguous so handle skips
const internalName = 'Slot' + (internalSlotNum < 9 ? '0' : '') + internalSlotNum + '_Size' + internalClassNum;
const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + internalClassNum;
if (json.modules[internalName]) {
internalSlot = json.modules[internalName];
} else {
internalSlotNum++;
}
internalSlotNum++;
}
if (!internalSlot.module) {
// No module
@@ -304,6 +303,35 @@ function _addModifications(module, modifiers) {
module.setModValue('shieldboost', alteredBoost / module.shieldboost);
}
// Shield booster resistance is actually a damage modifier, so needs to be inverted.
if (module.grp === 'sb') {
if (module.getModValue('explres')) {
module.setModValue('explres', module.getModValue('explres') * -1);
}
if (module.getModValue('kinres')) {
module.setModValue('kinres', module.getModValue('kinres') * -1);
}
if (module.getModValue('thermres')) {
module.setModValue('thermres', module.getModValue('thermres') * -1);
}
}
// Shield generator resistance is actually a damage modifier, so needs to be inverted.
// In addition, the modification is based off the inherent resistance of the module
if (module.isShieldGenerator()) {
if (module.getModValue('explres')) {
module.setModValue('explres', (1 - (1 - module.explres) * (1 + module.getModValue('explres'))) - module.explres);
}
if (module.getModValue('kinres')) {
module.setModValue('kinres', (1 - (1 - module.kinres) * (1 + module.getModValue('kinres')))- module.kinres);
}
if (module.getModValue('thermres')) {
module.setModValue('thermres', (1 - (1 - module.thermres) * (1 + module.getModValue('thermres'))) - module.thermres);
}
}
//TODO do this for armour resistances as well ?
// Jitter is in degrees not % so need to divide it by 100 to obtain the correct number
if (module.getModValue('jitter')) {
module.setModValue('jitter', module.getModValue('jitter') / 100);
@@ -313,5 +341,5 @@ function _addModifications(module, modifiers) {
if (module.getModValue('rof')) {
module.setModValue('rof', (1 / (1 + module.getModValue('jitter'))) - 1);
}
}
}