Merge branch 'release/2.9.12'

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.9.11",
+  "version": "2.9.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.9.11",
+  "version": "2.9.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"

src/app/components/AvailableModulesMenu.jsx

@@ -44,6 +44,7 @@ const GRPCAT = {
   'rg': 'projectiles',
   'mr': 'ordnance',
   'axmr': 'experimental',
+  'rcpl': 'experimental',
   'tp': 'ordnance',
   'nl': 'ordnance',
   'sc': 'scanners',
@@ -86,7 +87,7 @@ const CATEGORIES = {
   'defence': ['ch', 'po', 'ec'],
   'scanners': ['sc', 'ss', 'cs', 'kw', 'ws'], // Overloaded with internal scanners
   // Experimental
-  'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn'],
+  'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn', 'rcpl'],
 
   // Guardian
   'guardian': ['gpp', 'gpc', 'ggc']

src/app/components/InternalSlot.jsx

@@ -70,6 +70,7 @@ export default class InternalSlot extends Slot {
           { m.getRange() ? <div className={'l'}>{translate('range')} {formats.f2(m.getRange())}{u.km}</div> : null }
           { m.getRangeT() ? <div className={'l'}>{translate('ranget')} {formats.f1(m.getRangeT())}{u.s}</div> : null }
           { m.getTime() ? <div className={'l'}>{translate('time')}: {formats.time(m.getTime())}</div> : null }
+          { m.getHackTime() ? <div className={'l'}>{translate('hacktime')}: {formats.time(m.getHackTime())}</div> : null }
           { m.maximum ? <div className={'l'}>{translate('max')}: {(m.maximum)}</div> : null }
           { m.rangeLS ? <div className={'l'}>{translate('range')}: {m.rangeLS}{u.Ls}</div> : null }
           { m.rangeLS === null ? <div className={'l'}>∞{u.Ls}</div> : null }

src/app/components/ModificationsMenu.jsx

@@ -262,7 +262,7 @@ export default class ModificationsMenu extends TranslatedComponent {
     let haveBlueprint = false;
     let blueprintTt;
     let blueprintCv;
-    if (m.blueprint && m.blueprint.name) {
+    if (m.blueprint && m.blueprint.name && Modifications.modules[m.grp].blueprints[m.blueprint.fdname].grades[m.blueprint.grade]) {
       blueprintLabel = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
       haveBlueprint = true;
       blueprintTt  = blueprintTooltip(translate, m.blueprint.grades[m.blueprint.grade], Modifications.modules[m.grp].blueprints[m.blueprint.fdname].grades[m.blueprint.grade].engineers, m.grp);

src/app/components/ShipSummaryTable.jsx

@@ -15,30 +15,22 @@ export default class ShipSummaryTable extends TranslatedComponent {
     cargo: PropTypes.number.isRequired,
     fuel: PropTypes.number.isRequired,
     marker: PropTypes.string.isRequired,
-    pips: PropTypes.object.isRequired
   };
 
-  constructor(props) {
-    super(props)
-    this.didContextChange = this.didContextChange.bind(this);
-    this.state = {
-      shieldColour: 'blue'
-    }
-  }
-
   /**
    * Render the table
    * @return {React.Component} Summary table
    */
   render() {
-    const { ship, cargo, fuel, pips } = this.props;
+    const { ship, cargo, fuel } = this.props;
     let { language, tooltip, termtip } = this.context;
     let translate = language.translate;
     let u = language.units;
     let formats = language.formats;
     let { time, int, round, f1, f2 } = formats;
     let hide = tooltip.bind(null, null);
-    const shieldGenerator = ship.findInternalByGroup('sg') || ship.findInternalByGroup('psg');
+
+    const shieldGenerator = ship.findInternalByGroup('sg');
     const sgClassNames = cn({ warning: shieldGenerator && !ship.shield, muted: !shieldGenerator });
     const sgTooltip = shieldGenerator ? 'TT_SUMMARY_SHIELDS' : 'TT_SUMMARY_SHIELDS_NONFUNCTIONAL';
     const timeToDrain = Calc.timeToDrainWep(ship, 4);
@@ -46,13 +38,9 @@ export default class ShipSummaryTable extends TranslatedComponent {
     const speedTooltip = canThrust ? 'TT_SUMMARY_SPEED' : 'TT_SUMMARY_SPEED_NONFUNCTIONAL';
     const canBoost = ship.canBoost(cargo, ship.fuelCapacity);
     const boostTooltip = canBoost ? 'TT_SUMMARY_BOOST' : canThrust ? 'TT_SUMMARY_BOOST_NONFUNCTIONAL' : 'TT_SUMMARY_SPEED_NONFUNCTIONAL';
-    const sgMetrics = Calc.shieldMetrics(ship, pips.sys || 2);
-    const armourMetrics = Calc.armourMetrics(ship);
-    this.state = {
-      shieldColour: shieldGenerator && shieldGenerator.m.grp === 'psg' ? 'green' : 'blue'
-    }
+
     return <div id='summary'>
-      <table className={'summaryTable'}>
+      <table id='summaryTable'>
         <thead>
           <tr className='main'>
             <th rowSpan={2} className={ cn({ 'bg-warning-disabled': !canThrust }) }>{translate('speed')}</th>
@@ -110,66 +98,6 @@ export default class ShipSummaryTable extends TranslatedComponent {
           </tr>
         </tbody>
       </table>
-      <table className={'summaryTable'}>
-        <thead className={this.state.shieldColour}>
-          <tr>
-            <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('explres')}</th>
-            <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('kinres')}</th>
-            <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('thermres')}</th>
-
-            <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('absolute') + ' ' + translate('HP')}</th>
-            <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('explosive') + ' ' + translate('HP')}</th>
-            <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('kinetic') + ' ' + translate('HP')}</th>
-            <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('thermal') + ' ' + translate('HP')}</th>
-            <th onMouseEnter={termtip.bind(null, 'PHRASE_SG_RECOVER', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('recovery')}</th>
-            <th onMouseEnter={termtip.bind(null, 'PHRASE_SG_RECHARGE', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('recharge')}</th>
-          </tr>
-        </thead>
-        <tbody>
-        <tr >
-          <td>{int(ship.shieldExplRes * 100) + '%'}</td>
-          <td>{int(ship.shieldThermRes * 100) + '%'}</td>
-          <td>{int(ship.shieldKinRes * 100) + '%'}</td>
-          <td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.absolute.total : 0)}</td>
-          <td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.explosive.total : 0)}</td>
-          <td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.kinetic.total : 0 )}</td>
-          <td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.thermal.total : 0 )}</td>
-          <td>{formats.time(sgMetrics.recover)}</td>
-          <td>{formats.time(sgMetrics.recharge)}</td>
-        </tr>
-        </tbody>
-        <thead>
-          <tr>
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('explres')}</th>
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('kinres')}</th>
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('thermres')}</th>
-
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('absolute') + ' ' + translate('HP')}</th>
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('explosive') + ' ' + translate('HP')}</th>
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('kinetic') + ' ' + translate('HP')}</th>
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('thermal') + ' ' + translate('HP')}</th>
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('raw module armour')}</th>
-            <th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('internal protection')}</th>
-
-
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>{int(ship.hullExplRes * 100) + '%'}</td>
-            <td>{int(ship.hullThermRes * 100) + '%'}</td>
-            <td>{int(ship.hullKinRes * 100) + '%'}</td>
-            <td>{int(armourMetrics.total / armourMetrics.absolute.total)}</td>
-            <td>{int(armourMetrics.total / armourMetrics.explosive.total)}</td>
-            <td>{int(armourMetrics.total / armourMetrics.kinetic.total)}</td>
-            <td>{int(armourMetrics.total / armourMetrics.thermal.total)}</td>
-            <td>{int(armourMetrics.modulearmour)}</td>
-            <td>{int(armourMetrics.moduleprotection * 100) + '%'}</td>
-
-          </tr>
-        </tbody>
-      </table>
-
     </div>;
   }
 }

src/app/i18n/en.json

@@ -138,6 +138,7 @@
     "ul": "Burst Laser",
     "ws": "Frame Shift Wake Scanner",
     "rpl": "Repair Limpet Controller",
+    "rcpl": "Recon Limpet Controller",
     "xs": "Xeno Scanner",
     "emptyrestricted": "empty (restricted)",
     "damage dealt to": "Damage dealt to",
@@ -179,6 +180,7 @@
     "total": "Total",
     "ammo": "Ammunition maximum",
     "boot": "Boot time",
+    "hacktime": "Hack time",
     "brokenregen": "Broken regeneration rate",
     "burst": "Burst",
     "burstrof": "Burst rate of fire",
@@ -213,7 +215,6 @@
     "scanrate": "Scan rate",
     "scantime": "Scan time",
     "shield": "Shield",
-    "armour": "Armour",
     "shieldboost": "Shield boost",
     "shieldreinforcement": "Shield reinforcement",
     "shotspeed": "Shot speed",

src/app/pages/OutfittingPage.jsx

@@ -602,7 +602,7 @@ export default class OutfittingPage extends Page {
         </div>
 
         {/* Main tables */}
-        <ShipSummaryTable ship={ship} fuel={fuel} cargo={cargo} marker={shipSummaryMarker} pips={{sys: this.state.sys, wep: this.state.wep, eng: this.state.eng}} />
+        <ShipSummaryTable ship={ship} fuel={fuel} cargo={cargo} marker={shipSummaryMarker} />
         <StandardSlotSection ship={ship} fuel={fuel} cargo={cargo} code={standardSlotMarker} onChange={shipUpdated} onCargoChange={this._cargoUpdated} onFuelChange={this._fuelUpdated} currentMenu={menu} />
         <InternalSlotSection ship={ship} code={internalSlotMarker} onChange={shipUpdated} onCargoChange={this._cargoUpdated} onFuelChange={this._fuelUpdated} currentMenu={menu} />
         <HardpointSlotSection ship={ship} code={hardpointsSlotMarker} onChange={shipUpdated} onCargoChange={this._cargoUpdated} onFuelChange={this._fuelUpdated} currentMenu={menu} />

src/app/shipyard/Constants.js

@@ -80,6 +80,7 @@ export const ModuleGroupToName = {
   tp: 'Torpedo Pylon',
   sfn: 'Shutdown Field Neutraliser',
   xs: 'Xeno Scanner',
+  rcpl: 'Recon Limpet Controller',
   gpc: 'Guardian Plasma Charger',
   ggc: 'Guardian Gauss Cannon',
 };

src/app/shipyard/Module.js

@@ -722,4 +722,13 @@ export default class Module {
   getTime() {
     return this._getModifiedValue('time');
   }
+
+  /**
+   * Get the hack time for this module, taking in to account modifications
+   * @return {string} the time for this module
+   */
+  getHackTime() {
+    return this._getModifiedValue('hacktime');
+  }
+
 }

src/less/colors.less

@@ -10,7 +10,6 @@
 @secondary: #1FB0FF;  // Light blue
 @warning: #FF3B00;  // Dark Orange
 @disabled: #555;    // Light grey
-@success: #71a052;    // Green
 @primary-disabled: darken(@primary, @disabledDarken);
 @secondary-disabled: darken(@secondary, @disabledDarken);
 @warning-disabled: darken(@warning, @disabledDarken);

src/less/outfit.less

@@ -70,22 +70,10 @@
   padding: 0.5em 0.2em;
   font-size: 0.9em;
 
-  .summaryTable {
+  #summaryTable {
     .user-select-none();
     width: 100%;
     border-collapse: collapse;
-
-    & > thead.blue {
-      background-color: @secondary;
-      border-left: 1px solid @primary-bg;
-      color: @primary-bg;
-    }
-
-    & > thead.green {
-      background-color: @success;
-      border-left: 1px solid @primary-bg;
-      color: @primary-bg;
-    }
   }
 }