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

Update damage dealt to use actual resistances

Browse Source
This commit is contained in:
Cmdr McDonald
2017-01-11 21:57:49 +00:00
parent 80656a7a78
commit fb5ba6a0b2
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "coriolis_shipyard", "name": "coriolis_shipyard",
"version": "2.2.6", "version": "2.2.7",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/EDCD/coriolis" "url": "https://github.com/EDCD/coriolis"

22
src/app/components/DamageReceived.jsx
View File

@@ -105,34 +105,36 @@ export default class DamageReceived extends TranslatedComponent {
// Effective DPS taking in to account shield resistance // Effective DPS taking in to account shield resistance
let effectivenessShields = 0; let effectivenessShields = 0;
if (m.getDamageType().indexOf('E') != -1) { if (m.getDamageType().indexOf('E') != -1) {
effectivenessShields += ship.shieldExplRes; effectivenessShields += (1 - ship.shieldExplRes);
} }
if (m.getDamageType().indexOf('K') != -1) { if (m.getDamageType().indexOf('K') != -1) {
effectivenessShields += ship.shieldKinRes; effectivenessShields += (1 - ship.shieldKinRes);
} }
if (m.getDamageType().indexOf('T') != -1) { if (m.getDamageType().indexOf('T') != -1) {
effectivenessShields += ship.shieldThermRes; effectivenessShields += (1 - ship.shieldThermRes);
}
if (m.getDamageType().indexOf('A') != -1) {
effectivenessShields += 1;
} }
effectivenessShields /= m.getDamageType().length; effectivenessShields /= m.getDamageType().length;
// Plasma accelerators deal absolute damage
if (m.grp == 'pa') effectivenessShields = 1;
const effectiveDpsShields = baseDps * effectivenessShields; const effectiveDpsShields = baseDps * effectivenessShields;
const effectiveSDpsShields = baseSDps * effectivenessShields; const effectiveSDpsShields = baseSDps * effectivenessShields;
// Effective DPS taking in to account hull hardness and resistance // Effective DPS taking in to account hull hardness and resistance
let effectivenessHull = 0; let effectivenessHull = 0;
if (m.getDamageType().indexOf('E') != -1) { if (m.getDamageType().indexOf('E') != -1) {
effectivenessHull += ship.hullExplRes; effectivenessHull += (1 - ship.hullExplRes);
} }
if (m.getDamageType().indexOf('K') != -1) { if (m.getDamageType().indexOf('K') != -1) {
effectivenessHull += ship.hullKinRes; effectivenessHull += (1 - ship.hullKinRes);
} }
if (m.getDamageType().indexOf('T') != -1) { if (m.getDamageType().indexOf('T') != -1) {
effectivenessHull += ship.hullThermRes; effectivenessHull += (1 - ship.hullThermRes);
}
if (m.getDamageType().indexOf('A') != -1) {
effectivenessHull += 1;
} }
effectivenessHull /= m.getDamageType().length; effectivenessHull /= m.getDamageType().length;
// Plasma accelerators deal absolute damage (but could be reduced by hardness)
if (m.grp == 'pa') effectivenessHull = 1;
effectivenessHull *= Math.min(m.getPiercing() / ship.hardness, 1); effectivenessHull *= Math.min(m.getPiercing() / ship.hardness, 1);
const effectiveDpsHull = baseDps * effectivenessHull; const effectiveDpsHull = baseDps * effectivenessHull;
const effectiveSDpsHull = baseSDps * effectivenessHull; const effectiveSDpsHull = baseSDps * effectivenessHull;