diff --git a/ChangeLog.md b/ChangeLog.md
index 62ea91bf..a3d1a7d4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,7 @@
#2.2.12
* Tidy up old references to coriolis.io
* Add ability to add and remove special effects to weapon modifications
+ * Add weapon engineering information to Damage Dealt section
#2.2.11
* Add help system and initial help file
diff --git a/src/app/components/DamageDealt.jsx b/src/app/components/DamageDealt.jsx
index 17bbc9b1..4b3926f4 100644
--- a/src/app/components/DamageDealt.jsx
+++ b/src/app/components/DamageDealt.jsx
@@ -103,6 +103,8 @@ export default class DamageDealt extends TranslatedComponent {
* @return {boolean} Returns the per-weapon damage
*/
_calcWeapons(ship, against, range) {
+ const translate = this.context.language.translate;
+
// Tidy up the range so that it's to 4 decimal places
range = Math.round(10000 * range) / 10000;
@@ -137,6 +139,13 @@ export default class DamageDealt extends TranslatedComponent {
}
}
const classRating = `${m.class}${m.rating}${m.missile ? '/' + m.missile : ''}`;
+ let engineering;
+ if (m.blueprint && m.blueprint.name) {
+ engineering = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
+ if (m.blueprint.special && m.blueprint.special.id) {
+ engineering += ', ' + translate(m.blueprint.special.name);
+ }
+ }
const effectivenessShields = dropoff;
const effectiveDpsShields = m.getDps() * effectivenessShields;
const effectiveSDpsShields = (m.getClip() ? (m.getClip() * m.getDps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()) * effectivenessShields : effectiveDpsShields);
@@ -154,6 +163,7 @@ export default class DamageDealt extends TranslatedComponent {
mount: m.mount,
name: m.name || m.grp,
classRating,
+ engineering,
effectiveDpsShields,
effectiveSDpsShields,
effectivenessShields,
@@ -249,6 +259,7 @@ console.log('total effective dps shields is ' + totals.effectiveDpsShields);
{weapon.mount == 'G' ?