From 2e42a328e0199a0bea4f334c78e84de35ad14c76 Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Mon, 19 Dec 2016 17:56:54 +0000
Subject: [PATCH] Add base resistances to defence summary tooltip

---
 ChangeLog.md                          |  1 +
 src/app/components/DefenceSummary.jsx | 31 +++++++++++++++++++++------
 src/app/shipyard/Ship.js              |  9 ++++++++
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index db6b395f..13eb8550 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -18,6 +18,7 @@
   * Add 'Piercing' information to hardpoints
   * Add 'Hardness' information to ship summary
   * Add module copy functionality - drag module whilst holding 'alt' to copy
+  * Add base resistances to defence summary tooltip
 
 #2.2.5
   * Calculate rate of fire for multi-burst weapons
diff --git a/src/app/components/DefenceSummary.jsx b/src/app/components/DefenceSummary.jsx
index 94831068..a20b1bb5 100644
--- a/src/app/components/DefenceSummary.jsx
+++ b/src/app/components/DefenceSummary.jsx
@@ -29,6 +29,8 @@ export default class DefenceSummary extends TranslatedComponent {
     let { formats, translate, units } = language;
     let hide = tooltip.bind(null, null);
 
+    const shieldGenerator = ship.findShieldGenerator();
+
     return (
       <span>
         <h1>{translate('defence summary')}</h1>
@@ -48,9 +50,18 @@ export default class DefenceSummary extends TranslatedComponent {
             {ship.shield ?
             <tr>
               <td className='le'>{translate('damage from')}</td>
-              <td className='ri' onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /> {formats.pct1(ship.shieldExplRes || 1)}</td>
-              <td className='ri' onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /> {formats.pct1(ship.shieldKinRes || 1)}</td>
-              <td className='ri' onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /> {formats.pct1(ship.shieldThermRes || 1)}</td>
+              <td className='ri'>
+                <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span>&nbsp;
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - shieldGenerator.explres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(ship.shieldExplRes || 1)}</span>
+              </td>
+              <td className='ri'>
+                <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span>&nbsp;
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - shieldGenerator.kinres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(ship.shieldKinRes || 1)}</span>
+              </td>
+              <td className='ri'>
+                <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span>&nbsp;
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - shieldGenerator.thermres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(ship.shieldThermRes || 1)}</span>
+              </td>
             </tr> : null }
 
             { ship.shield && ship.shieldCells ?
@@ -63,9 +74,17 @@ export default class DefenceSummary extends TranslatedComponent {
             </tr>
             <tr>
               <td className='le'>{translate('damage from')}</td>
-              <td className='ri' onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /> {formats.pct1(ship.hullExplRes || 1)}</td>
-              <td className='ri' onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /> {formats.pct1(ship.hullKinRes || 1)}</td>
-              <td className='ri' onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /> {formats.pct1(ship.hullThermRes || 1)}</td>
+              <td className='ri'>
+                <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span>&nbsp;
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - ship.bulkheads.m.explres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(ship.hullExplRes || 1)}</span></td>
+              <td className='ri'>
+                <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span>&nbsp;
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - ship.bulkheads.m.kinres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(ship.hullKinRes || 1)}</span>
+              </td>
+              <td className='ri'>
+                <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span>&nbsp;
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - ship.bulkheads.m.thermres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(ship.hullThermRes || 1)}</span>
+              </td>
             </tr>
 
 	    {ship.modulearmour > 0 ?
diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index 34f54f84..9778fae2 100755
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -295,6 +295,15 @@ export default class Ship {
     }
   }
 
+  /**
+   * Find the shield generator for this ship
+   * @return {object}       The shield generator module for this ship
+   */
+  findShieldGenerator() {
+    const slot = this.internal.find(slot => slot.m && ModuleUtils.isShieldGenerator(slot.m.grp));
+    return slot ? slot.m : undefined;
+  }
+
   /**
    * Serializes the ship to a string
    * @return {String} Serialized ship 'code'