Merge branch 'develop' into dw2

src/app/Coriolis.jsx

@@ -6,6 +6,7 @@ import { EventEmitter } from 'fbemitter';
 import { getLanguage } from './i18n/Language';
 import Persist from './stores/Persist';
 
+import Announcement from './components/Announcement';
 import Header from './components/Header';
 import Tooltip from './components/Tooltip';
 import ModalExport from './components/ModalExport';
@@ -395,6 +396,7 @@ export default class Coriolis extends React.Component {
     return <div style={{ minHeight: '100%' }} onClick={this._closeMenu}
       className={this.state.noTouch ? 'no-touch' : null}>
       <Header announcements={this.state.announcements} appCacheUpdate={this.state.appCacheUpdate} currentMenu={currentMenu} />
+      <div className="announcement-container">{this.state.announcements.map(a => <Announcement text={a.message}/>)}</div>
       {this.state.error ? this.state.error : this.state.page ? React.createElement(this.state.page, { currentMenu }) :
         <NotFoundPage />}
       {this.state.modal}

src/app/components/Announcement.jsx

@@ -25,7 +25,7 @@ export default class Announcement extends React.Component {
    * @return {React.Component} A href element
    */
   render() {
-    return <p>{this.props.text}</p>;
+    return <div className="announcement" >{this.props.text}</div>;
   }
 
 }

src/app/components/ModalOrbis.jsx

@@ -23,8 +23,10 @@ export default class ModalOrbis extends TranslatedComponent {
     this.state = {
       orbisCreds: Persist.getOrbisCreds(),
       orbisUrl: '...',
+      ship: this.props.ship,
       authenticatedStatus: 'Checking...'
     };
+    this.orbisCategory = this.orbisCategory.bind(this);
   }
 
   /**
@@ -88,6 +90,17 @@ export default class ModalOrbis extends TranslatedComponent {
     });
   }
 
+  /**
+   * Handler for changing category
+   * @param {SyntheticEvent} e React Event
+   */
+  orbisCategory(e) {
+    let ship = this.state.ship;
+    let cat = e.target.value;
+    ship.category = cat;
+    this.setState({ship});
+  }
+
   /**
    * Render the modal
    * @return {React.Component} Modal Content
@@ -106,6 +119,17 @@ export default class ModalOrbis extends TranslatedComponent {
       <br/><br/>
       <a className='button' href="https://orbis.zone/api/auth">Log in / signup to Orbis</a>
       <br/><br/>
+      <h3>Category</h3>
+      <select onChange={this.orbisCategory}>
+        <option value="">No Category</option>
+        <option>Combat</option>
+        <option>Mining</option>
+        <option>Trading</option>
+        <option>Exploration</option>
+        <option>Passenger Liner</option>
+        <option>PvP</option>
+      </select>
+      <br/><br/>
       <h3 >{translate('Orbis link')}</h3>
       <input value={this.state.orbisUrl} readOnly size={25} onFocus={ (e) => e.target.select() }/>
       <br/><br/>

src/app/components/ShipSummaryTable.jsx

@@ -52,6 +52,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
     const boostTooltip = canBoost ? 'TT_SUMMARY_BOOST' : canThrust ? 'TT_SUMMARY_BOOST_NONFUNCTIONAL' : 'TT_SUMMARY_SPEED_NONFUNCTIONAL';
     const sgMetrics = Calc.shieldMetrics(ship, pips.sys);
     const shipBoost = canBoost ?  Calc.calcBoost(ship) : 'No Boost';
+    const restingHeat = Math.sqrt(((ship.standard[0].m.pgen * ship.standard[0].m.eff) / ship.heatCapacity) / 0.2);
     const armourMetrics = Calc.armourMetrics(ship);
     let shieldColour = 'blue';
     if (shieldGenerator && shieldGenerator.m.grp === 'psg') {
@@ -85,6 +86,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
                 <th rowSpan={2}>{translate('crew')}</th>
                 <th onMouseEnter={termtip.bind(null, 'mass lock factor', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('MLF')}</th>
                 <th onMouseEnter={termtip.bind(null, 'TT_SUMMARY_BOOST_TIME', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('boost time')}</th>
+                <th rowSpan={2}>{translate('resting heat (Beta)')}</th>
               </tr>
               <tr>
                 <th className='lft'>{translate('max')}</th>
@@ -122,6 +124,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
                 <td>{ship.crew}</td>
                 <td>{ship.masslock}</td>
                 <td>{shipBoost !== 'No Boost' ? formats.time(shipBoost) : 'No Boost'}</td>
+                <td>{formats.pct(restingHeat)}</td>
               </tr>
             </tbody>
           </table>

src/app/shipyard/Module.js

@@ -41,6 +41,7 @@ export default class Module {
    * @return {object}     The value of the modification. If it is a numeric value then it is returned as an integer value scaled so that 1.23% == 123
    */
   getModValue(name, raw) {
+    let baseVal = this[name];
     let result = this.mods  && this.mods[name] ? this.mods[name] : null;
 
     if ((!raw) && this.blueprint && this.blueprint.special) {
@@ -51,13 +52,8 @@ export default class Module {
         const modification = Modifications.modifications[name];
         const multiplier = modification.type === 'percentage' ? 10000 : 100;
         if (name === 'explres' || name === 'kinres' || name === 'thermres' || name === 'causres') {
-          // Resistance modifications in itself are additive, however their
+          // Apply resistance modding mechanisms to special effects subsequently
-          // special effects are multiplicative. They affect the overall result
+          result = result + modifierActions[name] * (1 - (this[name] + result / multiplier)) * 100;
-          // by (special effect resistance) * (damage mult after modification),
-          // i. e. we need to apply the special effect as a multiplier to the
-          // overall result and then calculate the difference.
-          let baseMult = this[name] ? 1 - this[name] : 1;
-          result = (baseMult - (baseMult - result / multiplier) * (1 - modifierActions[name] / 100)) * multiplier;
         } else if (modification.method === 'additive') {
           result = result + modifierActions[name] * 100;
         } else if (modification.method === 'overwrite') {
@@ -75,15 +71,6 @@ export default class Module {
       }
     }
 
-    // Resistance modding for hull reinforcement packages has additional
-    // diminishing returns implemented. The mod value gets lowered by
-    // the amount of base resistance the hrp has.
-    if (!isNaN(result) && this.grp === 'hr' &&
-      (name === 'kinres' || name === 'thermres' || name === 'explres')) {
-      let baseRes = this[name];
-      result = result * (1 - baseRes);
-    }
-
     // Sanitise the resultant value to 4dp equivalent
     return isNaN(result) ? result : Math.round(result);
   }
@@ -108,11 +95,11 @@ export default class Module {
         // This special effect modifies the value being set, so we need to revert it prior to storing the value
         const modification = Modifications.modifications[name];
         if (name === 'explres' || name === 'kinres' || name === 'thermres' || name === 'causres') {
-          // Resistance modifications in itself are additive but their
+          let res = (this[name] ? this[name] : 0) + value / 10000;
-          // experimentals are applied multiplicatively therefor we must handle
+          let experimental = modifierActions[name] / 100;
-          // them differently here (cf. documentation in getModValue).
+          value = (experimental - res) / (experimental - 1) - this[name];
-          let baseMult = (this[name] ? 1 - this[name] : 1);
+          value *= 10000;
-          value = ((baseMult - value / 10000) / (1 - modifierActions[name] / 100) - baseMult) * -10000;
+          // value = ((baseMult - value / 10000) / (1 - modifierActions[name] / 100) - baseMult) * -10000;
         } else if (modification.method === 'additive') {
           value = value - modifierActions[name];
         } else if (modification.method === 'overwrite') {
@@ -177,10 +164,6 @@ export default class Module {
         baseValue = 0;
       }
       modValue = value - baseValue;
-      if (this.grp === 'hr' &&
-        (name === 'kinres' || name === 'thermres' || name === 'explres')) {
-        modValue = modValue / (1 - baseValue);
-      }
     } else if (name === 'shieldboost' || name === 'hullboost') {
       modValue = (1 + value) / (1 + baseValue) - 1;
     } else { // multiplicative

src/app/shipyard/Ship.js

@@ -505,6 +505,11 @@ export default class Ship {
     if (isAbsolute) {
       m.setPretty(name, value, sentfromui);
     } else {
+      // Resistance modifiers scale with the base value
+      if (name == 'kinres' || name == 'thermres' || name == 'causres' || name == 'explres') {
+        let baseValue = m.get(name, false);
+        value = (1 - baseValue) * value;
+      }
       m.setModValue(name, value, sentfromui);
     }
 

src/less/app.less

@@ -171,3 +171,16 @@ footer {
     text-align: right;
   }
 }
+
+.announcement-container {
+  display: flex;
+  align-items: center;
+  padding-top: 10px;
+  justify-content: center;
+  flex-flow: row wrap;
+}
+
+.announcement {
+  border: 1px @secondary solid;
+  padding: 10px;
+}