{translate('EPS')}: {formats.round1(m.getEps())}{u.MW} {m.getClip() ?
- ({formats.round1(m.getEps() / m.getDps() * m.getSDps())}{u.MW}) : null}
: null}
+ {translate('brokenregen')}: {formats.round1(m.getBrokenRegenerationRate())}{u.ps}
: null }
diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx
index ea6e9f1b..a98ad465 100644
--- a/src/app/components/ShipSummaryTable.jsx
+++ b/src/app/components/ShipSummaryTable.jsx
@@ -86,7 +86,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
@@ -160,10 +160,10 @@ export default class ShipSummaryTable extends TranslatedComponent {
| {formats.pct1(ship.shieldThermRes)} |
|
- {int(ship && ship.shield > 0 ? ship.shield : 0)}{u.MJ} |
- {int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldExplRes)))) : 0)}{u.MJ} |
- {int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldKinRes)))) : 0)}{u.MJ} |
- {int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldThermRes)))) : 0)}{u.MJ} |
+ {int(ship && sgMetrics.summary > 0 ? sgMetrics.summary : 0)}{u.MJ} |
+ {int(ship && sgMetrics.summary > 0 ? sgMetrics.summary / sgMetrics.explosive.base : 0)}{u.MJ} |
+ {int(ship && sgMetrics.summary ? sgMetrics.summary / sgMetrics.kinetic.base : 0)}{u.MJ} |
+ {int(ship && sgMetrics.summary ? sgMetrics.summary / sgMetrics.thermal.base : 0)}{u.MJ} |
|
{sgMetrics && sgMetrics.recover === Math.Inf ? translate('Never') : formats.time(sgMetrics.recover)} |
{sgMetrics && sgMetrics.recharge === Math.Inf ? translate('Never') : formats.time(sgMetrics.recharge)} |
@@ -198,11 +198,11 @@ export default class ShipSummaryTable extends TranslatedComponent {
{formats.pct1(ship.hullKinRes)} |
{formats.pct1(ship.hullThermRes)} |
{formats.pct1(ship.hullCausRes)} |
- {int(ship.armour)} |
- {int(ship.armour * ((1 / (1 - (ship.hullExplRes)))))} |
- {int(ship.armour * ((1 / (1 - (ship.hullKinRes)))))} |
- {int(ship.armour * ((1 / (1 - (ship.hullThermRes)))))} |
- {int(ship.armour * ((1 / (1 - (ship.hullCausRes)))))} |
+ {int(armourMetrics.total)} |
+ {int(armourMetrics.total / armourMetrics.explosive.total)} |
+ {int(armourMetrics.total/ armourMetrics.kinetic.total)} |
+ {int(armourMetrics.total / armourMetrics.thermal.total)} |
+ {int(armourMetrics.total/ armourMetrics.caustic.total)} |
{int(armourMetrics.modulearmour)} |
{int(armourMetrics.moduleprotection * 100) + '%'} |
diff --git a/src/app/i18n/cn.json b/src/app/i18n/cn.json
index ccbc4e0f..dcafd813 100644
--- a/src/app/i18n/cn.json
+++ b/src/app/i18n/cn.json
@@ -61,7 +61,7 @@
"TT_SUMMARY_SPEED": "给推进器分配4格能量值且满燃料",
"TT_SUMMARY_SPEED_NONFUNCTIONAL": "推进器被关闭或者飞船满燃料满载时的总质量超出推进器最大可推进质量",
"TT_SUMMARY_BOOST": "给推进器分配4格能量值且满燃料",
- "TT_SUMMARY_BOOST_TIME": "给推进器分配4格能量值时，每次助推间隔时间",
+ "TT_SUMMARY_BOOST_INTERVAL": "给推进器分配4格能量值时，每次助推间隔时间",
"TT_SUMMARY_BOOST_NONFUNCTIONAL": "配电器无法提供足够的能量以供助推",
"TT_SUMMARY_SHIELDS": "护盾的绝对值，包含增幅装置",
"TT_SUMMARY_SHIELDS_SCB": "护盾的绝对值，包含增幅装置和护盾电池",
@@ -157,7 +157,7 @@
"shield": "护盾",
"integrity": "强度",
"mass": "质量",
- "boost time": "推进时间",
+ "boost interval": "推进时间",
"resting heat (Beta)": "待机热量（测试）",
"No Shield": "无护盾",
"resistance": "抗性",
diff --git a/src/app/i18n/en.json b/src/app/i18n/en.json
index 6e05a98b..a1446bcd 100644
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
@@ -63,7 +63,7 @@
"TT_SUMMARY_SPEED": "With full fuel tank and 4 pips to ENG",
"TT_SUMMARY_SPEED_NONFUNCTIONAL": "Thrusters powered off or over maximum mass with full fuel and cargo loads",
"TT_SUMMARY_BOOST": "With full fuel tank and 4 pips to ENG",
- "TT_SUMMARY_BOOST_TIME": "Time between each boost with 4 pips to ENG",
+ "TT_SUMMARY_BOOST_INTERVAL": "Time between each boost with 4 pips to ENG",
"TT_SUMMARY_BOOST_NONFUNCTIONAL": "Power distributor not able to supply enough power to boost",
"TT_SUMMARY_SHIELDS": "Raw shield strength, including boosters",
"TT_SUMMARY_SHIELDS_SCB": "Raw shield strength, including boosters and SCBs",
@@ -205,7 +205,7 @@
"internal protection": "Internal protection",
"external protection": "External protection",
"engagement range": "Engagement range",
- "boost time": "Boost time",
+ "boost interval": "Boost intervall",
"total": "Total",
"ammo": "Ammunition maximum",
"boot": "Boot time",
diff --git a/src/app/shipyard/Calculations.js b/src/app/shipyard/Calculations.js
index 8159fcac..83718991 100644
--- a/src/app/shipyard/Calculations.js
+++ b/src/app/shipyard/Calculations.js
@@ -400,7 +400,7 @@ export function shieldMetrics(ship, sys) {
let shieldAddition = 0;
if (ship) {
for (const module of ship.internal) {
- if (module && module.m && module.m.grp === 'gsrp') {
+ if (module && module.m && module.m.grp === 'gsrp' && module.enabled) {
shieldAddition += module.m.getShieldAddition();
}
}
@@ -465,6 +465,7 @@ export function shieldMetrics(ship, sys) {
boosters: boostersStrength,
addition: shieldAddition,
cells: ship.shieldCells,
+ summary: generatorStrength + boostersStrength + shieldAddition,
total: generatorStrength + boostersStrength + ship.shieldCells + shieldAddition,
recover,
recharge,
@@ -573,7 +574,7 @@ export function armourMetrics(ship) {
// };
// Armour from HRPs and module armour from MRPs
for (let slot of ship.internal) {
- if (slot.m && (slot.m.grp === 'hr' || slot.m.grp === 'ghrp' || slot.m.grp == 'mahr')) {
+ if (slot.m && slot.enabled && (slot.m.grp === 'hr' || slot.m.grp === 'ghrp' || slot.m.grp == 'mahr')) {
armourReinforcement += slot.m.getHullReinforcement();
// Hull boost for HRPs is applied against the ship's base armour
armourReinforcement += ship.baseArmour * slot.m.getModValue('hullboost') / 10000;
@@ -585,7 +586,7 @@ export function armourMetrics(ship) {
hullThermDmg = hullThermDmg * (1 - slot.m.getThermalResistance());
hullCausDmg = hullCausDmg * (1 - slot.m.getCausticResistance());
}
- if (slot.m && (slot.m.grp == 'mrp' || slot.m.grp == 'gmrp')) {
+ if (slot.m && slot.enabled && (slot.m.grp == 'mrp' || slot.m.grp == 'gmrp')) {
moduleArmour += slot.m.getIntegrity();
moduleProtection = moduleProtection * (1 - slot.m.getProtection());
}
diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js
index 6fb3f497..22466f93 100755
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -583,20 +583,9 @@ export default class Module {
* @return {Number} the falloff of this module
*/
getFalloff(modified = true) {
- if (!modified) {
- const range = this.getRange(false);
- const falloff = this.get('falloff', false);
- return (falloff > range ? range : falloff);
- }
-
// Falloff from range is mapped to range
- if (this.mods && this.mods['fallofffromrange']) {
+ if (modified && this.mods && this.mods['fallofffromrange']) {
return this.getRange();
- // Need to find out if we have a focused modification, in which case our
- // falloff is scaled to range
- } else if (this.blueprint && this.blueprint.name === 'Focused') {
- const rangeMod = this.getModValue('range') / 10000;
- return this.falloff * (1 + rangeMod);
// Standard falloff calculation
} else {
const range = this.getRange();
@@ -818,12 +807,11 @@ export default class Module {
}
/**
- * Get the SDPS for this module
+ * Return the factor that gets applied when calculating certain "sustained"
+ * values, e.g. `SDPS = this.getSustainedFactor() * DPS`.
* @param {Boolean} [modified=true] Whether to take modifications into account
- * @return {Number} The SDPS of this module
*/
- getSDps(modified = true) {
- let dps = this.getDps(modified);
+ getSustainedFactor(modified = true) {
let clipSize = this.getClip(modified);
if (clipSize) {
// If auto-loader is applied, effective clip size will be nearly doubled
@@ -838,12 +826,21 @@ export default class Module {
// rof we need to take another burst without pause into account
let burstOverhead = (burstSize - 1) / (this.get('burstrof', modified) || 1);
let srof = clipSize / ((clipSize - burstSize) / rof + burstOverhead + this.getReload(modified));
- return dps * srof / rof;
+ return srof / rof;
} else {
- return dps;
+ return 1;
}
}
+ /**
+ * Get the SDPS for this module
+ * @param {Boolean} [modified=true] Whether to take modifications into account
+ * @return {Number} The SDPS of this module
+ */
+ getSDps(modified = true) {
+ return this.getDps(modified) * this.getSustainedFactor(modified);
+ }
+
/**
* Get the EPS for this module
* @param {Boolean} [modified=true] Whether to take modifications into account
diff --git a/src/app/utils/JournalUtils.js b/src/app/utils/JournalUtils.js
index a3ca11c1..1b264530 100644
--- a/src/app/utils/JournalUtils.js
+++ b/src/app/utils/JournalUtils.js
@@ -249,6 +249,13 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
if (!modifiers) return;
let special;
if (specialModifications) {
+ if (specialModifications == 'special_plasma_slug') {
+ if (module.symbol.match(/PlasmaAccelerator/i)) {
+ specialModifications = 'special_plasma_slug_pa';
+ } else {
+ specialModifications = 'special_plasma_slug_cooled';
+ }
+ }
special = Modifications.specials[specialModifications];
}
// Add the blueprint definition, grade and special
@@ -274,6 +281,9 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
if (value === Infinity) {
value = modifiers[i].Value * 100;
}
+ if (modifiers[i].Label.search('DamageFalloffRange') >= 0) {
+ value = (modifiers[i].Value / module.range - 1) * 100;
+ }
if (modifiers[i].Label.search('Resistance') >= 0) {
value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100);
}