From 93e69f215b259103b6c67d5df6629de83ecc94de Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Fri, 27 Jan 2017 09:46:32 +0000
Subject: [PATCH] Add weapon mods to damage dealt

---
 ChangeLog.md                       |  1 +
 src/app/components/DamageDealt.jsx | 11 +++++++++++
 2 files changed, 12 insertions(+)

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 3f06f87d..cbda88d4 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 * dropoff;
           const effectiveSDpsShields = (m.getClip() ?  (m.getClip() * m.getDps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()) * effectivenessShields : effectiveDpsShields) * dropoff;
@@ -153,6 +162,7 @@ export default class DamageDealt extends TranslatedComponent {
                          mount: m.mount,
                          name: m.name || m.grp,
                          classRating,
+                         engineering,
                          effectiveDpsShields,
                          effectiveSDpsShields,
                          effectivenessShields,
@@ -246,6 +256,7 @@ export default class DamageDealt extends TranslatedComponent {
                       {weapon.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : null}
                       {weapon.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : null}
                       {weapon.classRating} {translate(weapon.name)}
+                      {weapon.engineering ? ' (' + weapon.engineering + ')' : null }
                     </td>
                     <td className='ri'>{formats.round1(weapon.effectiveDpsShields)}</td>
                     <td className='ri'>{formats.round1(weapon.effectiveSDpsShields)}</td>