@@ -236,8 +244,8 @@ export default class Offence extends TranslatedComponent {
{translate('shield damage')}
- {translate('PHRASE_TIME_TO_REMOVE_SHIELDS')}
{totalShieldsSDps == 0 ? translate('never') : formats.time(opponentShields.total / totalShieldsSDps)}
- {translate('PHRASE_TIME_TO_REMOVE_ARMOUR')}
{totalArmourSDps == 0 ? translate('never') : formats.time(opponentArmour.total / totalArmourSDps)}
+ {translate('PHRASE_TIME_TO_REMOVE_SHIELDS')}
{timeToDepleteShields === Infinity ? translate('never') : formats.time(timeToDepleteShields)}
+ {translate('PHRASE_TIME_TO_REMOVE_ARMOUR')}
{timeToDepleteArmour === Infinity ? translate('never') : formats.time(timeToDepleteArmour)}
{translate('shield damage sources')}
diff --git a/src/app/i18n/en.js b/src/app/i18n/en.js
index ad969a1b..cf986c7b 100644
--- a/src/app/i18n/en.js
+++ b/src/app/i18n/en.js
@@ -44,6 +44,8 @@ export const terms = {
PHRASE_TIME_TO_RECHARGE_SHIELDS: 'Shields will recharge in',
PHRASE_SHIELD_SOURCES: 'Breakdown of the supply of shield energy',
PHRASE_EFFECTIVE_SHIELD: 'Effective shield strength against different damage types',
+ PHRASE_ARMOUR_SOURCES: 'Breakdown of the supply of armour',
+ PHRASE_EFFECTIVE_ARMOUR: 'Effective armour strength against different damage types',
PHRASE_DAMAGE_TAKEN: '% of raw damage taken for different damage types',
PHRASE_TIME_TO_LOSE_ARMOUR: 'Armour will hold for',
PHRASE_MODULE_PROTECTION_EXTERNAL: 'Protection for hardpoints',
@@ -51,6 +53,10 @@ export const terms = {
PHRASE_SHIELD_DAMAGE: 'Breakdown of sources for sustained DPS against shields',
PHRASE_ARMOUR_DAMAGE: 'Breakdown of sources for sustained DPS against armour',
+ PHRASE_TIME_TO_REMOVE_SHIELDS: 'Will remove shields in',
+ TT_TIME_TO_REMOVE_SHIELDS: 'With sustained fire by all weapons',
+ PHRASE_TIME_TO_REMOVE_ARMOUR: 'Will remove armour in',
+ TT_TIME_TO_REMOVE_ARMOUR: 'With sustained fire by all weapons',
TT_TIME_TO_LOSE_SHIELDS: 'Against sustained fire from all opponent\'s weapons',
TT_TIME_TO_LOSE_ARMOUR: 'Against sustained fire from all opponent\'s weapons',
TT_MODULE_ARMOUR: 'Armour protecting against module damage',
diff --git a/src/app/shipyard/Calculations.js b/src/app/shipyard/Calculations.js
index ea77c8a0..183ec30e 100644
--- a/src/app/shipyard/Calculations.js
+++ b/src/app/shipyard/Calculations.js
@@ -551,7 +551,8 @@ export function defenceMetrics(ship, opponent, sys, engagementrange) {
explosivesdps: sustainedDps.shieldsdps.explosive,
kineticsdps: sustainedDps.shieldsdps.kinetic,
thermalsdps: sustainedDps.shieldsdps.thermal,
- totalsdps: sustainedDps.shieldsdps.absolute + sustainedDps.shieldsdps.explosive + sustainedDps.shieldsdps.kinetic + sustainedDps.shieldsdps.thermal
+ totalsdps: sustainedDps.shieldsdps.absolute + sustainedDps.shieldsdps.explosive + sustainedDps.shieldsdps.kinetic + sustainedDps.shieldsdps.thermal,
+ totalseps: sustainedDps.eps
} : {};
const armourdamage = {
@@ -559,7 +560,8 @@ export function defenceMetrics(ship, opponent, sys, engagementrange) {
explosivesdps: sustainedDps.armoursdps.explosive,
kineticsdps: sustainedDps.armoursdps.kinetic,
thermalsdps: sustainedDps.armoursdps.thermal,
- totalsdps: sustainedDps.armoursdps.absolute + sustainedDps.armoursdps.explosive + sustainedDps.armoursdps.kinetic + sustainedDps.armoursdps.thermal
+ totalsdps: sustainedDps.armoursdps.absolute + sustainedDps.armoursdps.explosive + sustainedDps.armoursdps.kinetic + sustainedDps.armoursdps.thermal,
+ totalseps: sustainedDps.eps
};
return { shield, armour, shielddamage, armourdamage };
@@ -603,6 +605,7 @@ export function offenceMetrics(ship, opponent, wep, engagementrange) {
classRating,
engineering,
sdps: weaponSustainedDps.damage,
+ seps: weaponSustainedDps.eps,
effectiveness: weaponSustainedDps.effectiveness
});
}
@@ -682,6 +685,8 @@ export function _sustainedDps(ship, opponent, opponentShields, opponentArmour, e
thermal: 0
};
+ let eps = 0;
+
for (let i = 0; i < ship.hardpoints.length; i++) {
if (ship.hardpoints[i].m && ship.hardpoints[i].enabled && ship.hardpoints[i].maxClass > 0) {
const m = ship.hardpoints[i].m;
@@ -694,10 +699,11 @@ export function _sustainedDps(ship, opponent, opponentShields, opponentArmour, e
armoursdps.explosive += sustainedDps.damage.armour.explosive;
armoursdps.kinetic += sustainedDps.damage.armour.kinetic;
armoursdps.thermal += sustainedDps.damage.armour.thermal;
+ eps += sustainedDps.eps;
}
}
- return { shieldsdps, armoursdps };
+ return { shieldsdps, armoursdps, eps };
}
/**
@@ -712,6 +718,7 @@ export function _sustainedDps(ship, opponent, opponentShields, opponentArmour, e
export function _weaponSustainedDps(m, opponent, opponentShields, opponentArmour, engagementrange) {
const opponentHasShields = opponentShields.generator ? true : false;
const weapon = {
+ eps: 0,
damage: {
shields: {
absolute: 0,
@@ -742,6 +749,9 @@ export function _weaponSustainedDps(m, opponent, opponentShields, opponentArmour
}
};
+ // EPS
+ weapon.eps = m.getClip() ? (m.getClip() * m.getEps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()) : m.getEps();
+
// Initial sustained DPS
let sDps = m.getClip() ? (m.getClip() * m.getDps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()) : m.getDps();
@@ -822,3 +832,26 @@ export function timeToDrainWep(ship, wep) {
return initialCharge / drainPerSecond;
}
}
+
+/**
+ * Calculate the time to deplete an amount of shields or armour
+ */
+export function timeToDeplete(amount, dps, eps, capacity, recharge) {
+ const drainPerSecond = eps - recharge;
+ if (drainPerSecond <= 0) {
+ // Simple result
+ return amount / dps;
+ } else {
+ // We are draining the capacitor, but can we deplete before we run out
+ const timeToDrain = capacity / drainPerSecond;
+ const depletedBeforeDrained = dps * timeToDrain;
+ if (depletedBeforeDrained >= amount) {
+ return amount / dps;
+ } else {
+ const restToDeplete = amount - depletedBeforeDrained;
+ // We delete the rest at the reduced rate
+ const reducedDps = dps * (recharge / eps);
+ return timeToDrain + (restToDeplete / reducedDps);
+ }
+ }
+}