Merge branch 'release/2.10'

EDCD · Jan 23, 2017 · fcf0494 · fcf0494
2 parents dd1175a + 20ba6eb
commit fcf0494
Show file tree

Hide file tree

Showing 18 changed files with 337 additions and 74 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,15 @@
+#2.2.10
+  * Fix detailed export of module reinforcement packages
+  * Use damagedist for exact breakdown of weapons that have more than one type of damage
+  * Use new-style modification validity data
+  * Provide ability to select engineering blueprint and roll sample values for them
+  * Use coriolis-data 2.2.10:
+    * Fix incorrect base shield values for Cutter and Corvette
+    * Update weapons to have %-based damage distributions
+    * Remove power draw for detailed surface scanner - although shown in outfitting it is not part of active power
+    * Fix incorrect names for lightweight and kinetic armour
+    * Add engineering blueprints
+
 #2.2.9
   * Use SSL-enabled server for shortlinks
   * Add falloff for weapons

diff --git a/__tests__/fixtures/anaconda-test-detailed-export-v4.json b/__tests__/fixtures/anaconda-test-detailed-export-v4.json
@@ -269,20 +269,20 @@
     "topSpeed": 187.01,
     "totalCost": 882362058,
     "totalDpe": 142.68,
-    "totalDps": 101.13,
+    "totalDps": 103.8,
     "totalEps": 22.71,
     "totalHps": 677.29,
     "totalExplDpe": 0,
     "totalExplDps": 0,
     "totalExplSDps": 0,
     "totalHps": 33.62,
-    "totalKinDpe": 116.29,
-    "totalKinDps": 16.01,
-    "totalKinSDps": 12.09,
-    "totalSDps": 89.99,
-    "totalThermDpe": 20.44,
-    "totalThermDps": 53.82,
-    "totalThermSDps": 53.82,
+    "totalKinDpe": 117.48,
+    "totalKinDps": 24.94,
+    "totalKinSDps": 18.76,
+    "totalSDps": 91.84,
+    "totalThermDpe": 21.63,
+    "totalThermDps": 60.08,
+    "totalThermSDps": 58.64,
     "baseShieldStrength": 350,
     "baseArmour": 945,
     "hullExplRes": 0.22,

diff --git a/__tests__/test-import.js b/__tests__/test-import.js
@@ -238,7 +238,7 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA02SO0sDQRSFbxJ389jgJOsaN%2FGVmPXVKKRQC8FSA9oJWihWWgV%2FgIWFYBNb8RcIWiiIYiF2NqksIqaRoD%2FBQghB41zPFVa3OdzZ890zM3snpBeI6DsEyZgGkbpg5tg2lhzWGbEikN6aSVS0HSL3Ogxo6IvZmdbM9hFsjuickGgn%2B8SGv%2FvJ7DpxIqeCHjb0vJ80GrWIxu5RFmqARnYQEj%2FrMCdesFQzSOeYXvPP1BmGZPeiREa9xWyW0WifwnFX0MMJve4Hd5IQo4I9TcclGrxCUmoO34qVDaK%2BJuiJfD6%2FytZ%2Fj%2FGQAL7fD%2Fyiy8fbcNQdjsXJAFn9DRbyQchZIS9RqZJcGpckt4xjsdKL%2FtndJYjVQJkW8URUVYJTAegLat0IJOKJqCeB0gHoQ6BHgUQ8EdUNZvgghj3tAPmKa1vPQhIqTyp1KHE9AWgKV7Ka8NMinoiywLCrV%2F5Gvolo61ySpMn7xMdwsc3cf4w48w2Is40fwFld9oPzLbyL6CT88QaWoZpMcyDg32Jo0br4EaxDJXk8BT3o%2B7ktGS9B3GU8puS7zJh%2FAHGMT2qjAgAA&bn=Imported%20Federal%20Corvette');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA02Svy9DURTHT1vvtfoat32eekVV9fm1kBgwSIw0YWYgBqmpMZkMBomFVfwFEoZKhBjE1qWTgegiDX%2BCQdKI1j2%2BR%2FJ4yzfnvu%2FnfO%2B979yQXiCi7xAkbRpEqsLMsRKWHNZpsSKQnppJVLAdIvc6DGiwxexMaWb7GDZHdJ%2BQaCf71Ia%2F88XsOp1EThk9bOh5P2kkahGN3qPM1wANbyOk87zNHH%2FBUs0gnWN61T9TOwfJ7EWJjMcms1lEo30Gx11BD8f1mh%2FcTkCMMvY0HZcoe4Wk5By%2BFcrrRL0N0OOlrd0Ntv57jGoc%2BH4%2F8EqHj3%2FCUXc4FicC5NFvsJBVIWeFvESlpuXSuCS5RRyLlV70z%2B4uQaw6ypSIJ6KOJDgZgFpQ60YgEU9EPQmUCkAfAj0IJOKJqC4wuYMY9rQD5CuubT0LSag8qdShxHUHoElcyWrAT4l4IsoCw65e%2BRv5BqKtC0mSJu8LH8OFT%2Bb%2BE8SZb0CcEn4AZ3TRDx5q4l1EJ%2BCP1bEM1WSaAwH%2FFkOLPoofwTo0LY8nr7O%2B37cp4yWIu4zHlHiXGfMPmat5gqMCAAA%3D&bn=Imported%20Federal%20Corvette');
     });
 
     it('imports a valid v4 build', function() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.2.9",
+  "version": "2.2.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"

diff --git a/src/app/components/DamageDealt.jsx b/src/app/components/DamageDealt.jsx
@@ -153,7 +153,7 @@ export default class DamageDealt extends TranslatedComponent {
     }
     totals.effectiveness = totals.effectiveDps / totalDps;
 
-    return {weapons: weapons, totals: totals};
+    return { weapons, totals };
   }
 
   /**

diff --git a/src/app/components/DamageReceived.jsx b/src/app/components/DamageReceived.jsx
@@ -93,7 +93,7 @@ export default class DamageReceived extends TranslatedComponent {
     let weapons = [];
 
     for (let grp in Modules.hardpoints) {
-      if (Modules.hardpoints[grp][0].damage && Modules.hardpoints[grp][0].type) {
+      if (Modules.hardpoints[grp][0].damage && Modules.hardpoints[grp][0].damagedist) {
         for (let mId in Modules.hardpoints[grp]) {
           const m = new Module(Modules.hardpoints[grp][mId]);
           const classRating = `${m.class}${m.rating}${m.missile ? '/' + m.missile : ''}`;
@@ -104,37 +104,35 @@ export default class DamageReceived extends TranslatedComponent {
 
           // Effective DPS taking in to account shield resistance
           let effectivenessShields = 0;
-          if (m.getDamageType().indexOf('E') != -1) {
-            effectivenessShields += (1 - ship.shieldExplRes);
+          if (m.getDamageDist().E) {
+            effectivenessShields += m.getDamageDist().E * (1 - ship.shieldExplRes);
           }
-          if (m.getDamageType().indexOf('K') != -1) {
-            effectivenessShields += (1 - ship.shieldKinRes);
+          if (m.getDamageDist().K) {
+            effectivenessShields += m.getDamageDist().K * (1 - ship.shieldKinRes);
           }
-          if (m.getDamageType().indexOf('T') != -1) {
-            effectivenessShields += (1 - ship.shieldThermRes);
+          if (m.getDamageDist().T) {
+            effectivenessShields += m.getDamageDist().T * (1 - ship.shieldThermRes);
           }
-          if (m.getDamageType().indexOf('A') != -1) {
-            effectivenessShields += 1;
+          if (m.getDamageDist().A) {
+            effectivenessShields += m.getDamageDist().A;
           }
-          effectivenessShields /= m.getDamageType().length;
           const effectiveDpsShields = baseDps * effectivenessShields;
           const effectiveSDpsShields = baseSDps * effectivenessShields;
 
           // Effective DPS taking in to account hull hardness and resistance
           let effectivenessHull = 0;
-          if (m.getDamageType().indexOf('E') != -1) {
-            effectivenessHull += (1 - ship.hullExplRes);
+          if (m.getDamageDist().E) {
+            effectivenessHull += m.getDamageDist().E * (1 - ship.hullExplRes);
           }
-          if (m.getDamageType().indexOf('K') != -1) {
-            effectivenessHull += (1 - ship.hullKinRes);
+          if (m.getDamageDist().K) {
+            effectivenessHull += m.getDamageDist().K * (1 - ship.hullKinRes);
           }
-          if (m.getDamageType().indexOf('T') != -1) {
-            effectivenessHull += (1 - ship.hullThermRes);
+          if (m.getDamageDist().T) {
+            effectivenessHull += m.getDamageDist().T * (1 - ship.hullThermRes);
           }
-          if (m.getDamageType().indexOf('A') != -1) {
-            effectivenessHull += 1;
+          if (m.getDamageDist().A) {
+            effectivenessHull += m.getDamageDist().A;
           }
-          effectivenessHull /= m.getDamageType().length;
           effectivenessHull *= Math.min(m.getPiercing() / ship.hardness, 1);
           const effectiveDpsHull = baseDps * effectivenessHull;
           const effectiveSDpsHull = baseSDps * effectivenessHull;

diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx
@@ -41,7 +41,7 @@ export default class HardpointSlot extends Slot {
       let classRating = `${m.class}${m.rating}${m.missile ? '/' + m.missile : ''}`;
       let { drag, drop } = this.props;
       let { termtip, tooltip } = this.context;
-      let validMods = Modifications.validity[m.grp] || [];
+      let validMods = Modifications.modules[m.grp].modifications || [];
       let showModuleResistances = Persist.showModuleResistances();
 
       // Modifications tooltip shows blueprint and grade, if available
@@ -59,9 +59,9 @@ export default class HardpointSlot extends Slot {
           {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.getDamageType() && m.getDamageType().match('K') ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''}
-          {m.getDamageType() && m.getDamageType().match('T') ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''}
-          {m.getDamageType() && m.getDamageType().match('E') ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''}
+          {m.getDamageDist() && m.getDamageDist().K ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''}
+          {m.getDamageDist() && m.getDamageDist().T ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''}
+          {m.getDamageDist() && m.getDamageDist().E ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''}
           {classRating} {translate(m.name || m.grp)}{ m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }
           </div>
 
@@ -77,6 +77,7 @@ export default class HardpointSlot extends Slot {
           { m.getFalloff() ? <div className={'l'}>{translate('falloff')} {formats.f1(m.getFalloff() / 1000)}{u.km}</div> : null }
           { m.getShieldBoost() ? <div className={'l'}>+{formats.pct1(m.getShieldBoost())}</div> : null }
           { m.getAmmo() ? <div className={'l'}>{translate('ammunition')}: {formats.int(m.getClip())}/{formats.int(m.getAmmo())}</div> : null }
+          { m.getShotSpeed() ? <div className={'l'}>{translate('shotspeed')}: {formats.int(m.getShotSpeed())}{u.mps}</div> : null }
           { m.getPiercing() ? <div className={'l'}>{translate('piercing')}: {formats.int(m.getPiercing())}</div> : null }
           { m.getJitter() ? <div className={'l'}>{translate('jitter')}: {formats.f2(m.getJitter())}°</div> : null }
           { showModuleResistances && m.getExplosiveResistance() ? <div className='l'>{translate('explres')}: {formats.pct(m.getExplosiveResistance())}</div> : null }

diff --git a/src/app/components/InternalSlot.jsx b/src/app/components/InternalSlot.jsx
@@ -23,7 +23,7 @@ export default class InternalSlot extends Slot {
       let classRating = m.class + m.rating;
       let { drag, drop, ship } = this.props;
       let { termtip, tooltip } = this.context;
-      let validMods = Modifications.validity[m.grp] || [];
+      let validMods = Modifications.modules[m.grp].modifications || [];
       let showModuleResistances = Persist.showModuleResistances();
 
       // Modifications tooltip shows blueprint and grade, if available

diff --git a/src/app/components/Modification.jsx b/src/app/components/Modification.jsx
@@ -13,6 +13,7 @@ export default class Modification extends TranslatedComponent {
     ship: React.PropTypes.object.isRequired,
     m: React.PropTypes.object.isRequired,
     name: React.PropTypes.string.isRequired,
+    value: React.PropTypes.number.isRequired,
     onChange: React.PropTypes.func.isRequired
   };
 
@@ -24,7 +25,7 @@ export default class Modification extends TranslatedComponent {
   constructor(props, context) {
     super(props);
     this.state = {};
-    this.state.value = this.props.m.getModValue(this.props.name) / 100 || 0;
+    this.state.value = props.value;
   }
 
   /**
@@ -61,10 +62,10 @@ export default class Modification extends TranslatedComponent {
    */
   render() {
     let translate = this.context.language.translate;
-    let name = this.props.name;
+    let { m, name } = this.props;
 
-    if (name === 'type') {
-      // We don't show type
+    if (name === 'damagedist') {
+      // We don't show damage distribution
       return null;
     }
 
@@ -81,7 +82,7 @@ export default class Modification extends TranslatedComponent {
     return (
       <div className={'cb'} key={name}>
         <div className={'cb'}>{translate(name)}{symbol}</div>
-        <NumberEditor className={'cb'} style={{ width: '90%', textAlign: 'center' }} step={0.01} stepModifier={1} decimals={2} value={this.state.value} onValueChange={this._updateValue.bind(this)} />
+        <NumberEditor className={'cb'} style={{ width: '90%', textAlign: 'center' }} step={0.01} stepModifier={1} decimals={2} value={m.getModValue(name) / 100 || 0} onValueChange={this._updateValue.bind(this)} />
       </div>
     );
   }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         totals.effectiveness = totals.effectiveDps / totalDps;
-        return {weapons: weapons, totals: totals};
+        return { weapons, totals };
       }
       /**
@@ Expand Down @@