From c1f4a8d416eb553514ab66c7a1b739edd97c667e Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Fri, 4 Nov 2016 13:12:44 +0000
Subject: [PATCH] Add tooltips for icons; fix import of old-style modification
 strings

---
 src/app/components/HardpointSlot.jsx | 13 ++++++-------
 src/app/shipyard/Ship.js             |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx
index 7d876bf8..796fc2c0 100644
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -45,13 +45,12 @@ export default class HardpointSlot extends Slot {
       return <div className='details' draggable='true' onDragStart={drag} onDragEnd={drop}>
         <div className={'cb'}>
           <div className={'l'}>
-	  {m.mount && m.mount == 'F' ? <MountFixed /> : ''}
-	  {m.mount && m.mount == 'G' ? <MountGimballed /> : ''}
-	  {m.mount && m.mount == 'T' ? <MountTurret /> : ''}
-	  {m.type && m.type == 'K' ? <DamageKinetic /> : ''}
-	  {m.type && m.type == 'T' ? <DamageThermal /> : ''}
-	  {m.type && m.type == 'KT' ? <span><DamageKinetic /><DamageThermal /></span> : ''}
-	  {m.type && m.type == 'E' ? <DamageExplosive /> : ''}
+	  {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')} onMouseOut={tooltip.bind(null, null)}><MountFixed /></span> : ''}
+	  {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : ''}
+	  {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : ''}
+	  {m.type && m.type.match('K') ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''}
+	  {m.type && m.type.match('T') ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''}
+	  {m.type && m.type.match('E') ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''}
           {classRating} {translate(m.name || m.grp)}</div>
           <div className={'r'}>{formats.round1(m.getMass())}{u.T}</div>
         </div>
diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index 459824ff..f7949c5e 100755
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -573,7 +573,7 @@ export default class Ship {
     if (parts[3]) {
       const modstr = parts[3].replace(/-/g, '/');
       if (modstr.match(':')) {
-        this.decodeModificationsString(LZString.decompressFromBase64(modstr), mods);
+        this.decodeModificationsString(modstr, mods);
       } else {
         this.decodeModificationsStruct(Buffer.from(modstr, 'base64'), mods);
       }