Merge branch 'release/2.2.8'

ChangeLog.md

@@ -1,3 +1,14 @@
+#2.2.8
+  * Fix issue where filling all internals with cargo racks would include restricted slots
+  * Use coriolis-data 2.2.8:
+    * Set military slot of Viper Mk IV to class 3; was incorrectly set as class 2
+    * Update base regeneration rate of prismatic shield generators to values in 2.2.03
+    * Update specials with information in 2.2.03
+
+#2.2.7
+  * Fix resistance diminishing return calculations
+  * Do not allow -100% to be entered as a modification value
+
 #2.2.6
   * Add pitch/roll/yaw information
   * Use combination of pitch, roll and yaw to provide a more useful agility metric

__tests__/fixtures/anaconda-test-detailed-export-v4.json

@@ -285,10 +285,10 @@
     "totalThermSDps": 53.82,
     "baseShieldStrength": 350,
     "baseArmour": 945,
-    "hullExplRes": 0.78,
-    "hullKinRes": 0.73,
+    "hullExplRes": 0.22,
+    "hullKinRes": 0.27,
     "hullMass": 400,
-    "hullThermRes": 1.37,
+    "hullThermRes": -0.36,
     "masslock": 23,
     "pipSpeed": 0.14,
     "pitch": 25,
@@ -316,7 +316,7 @@
     "shield": 833,
     "shieldCells": 1840,
     "shieldExplRes": 0.5,
-    "shieldKinRes": 0.6,
-    "shieldThermRes": 1.2
+    "shieldKinRes": 0.4,
+    "shieldThermRes": -0.2
   }
 }

package.json

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

src/app/components/DamageReceived.jsx

@@ -105,34 +105,36 @@ export default class DamageReceived extends TranslatedComponent {
           // Effective DPS taking in to account shield resistance
           let effectivenessShields = 0;
           if (m.getDamageType().indexOf('E') != -1) {
-            effectivenessShields += ship.shieldExplRes;
+            effectivenessShields += (1 - ship.shieldExplRes);
           }
           if (m.getDamageType().indexOf('K') != -1) {
-            effectivenessShields += ship.shieldKinRes;
+            effectivenessShields += (1 - ship.shieldKinRes);
           }
           if (m.getDamageType().indexOf('T') != -1) {
-            effectivenessShields += ship.shieldThermRes;
+            effectivenessShields += (1 - ship.shieldThermRes);
+          }
+          if (m.getDamageType().indexOf('A') != -1) {
+            effectivenessShields += 1;
           }
           effectivenessShields /= m.getDamageType().length;
-          // Plasma accelerators deal absolute damage
-          if (m.grp == 'pa') effectivenessShields = 1;
           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 += ship.hullExplRes;
+            effectivenessHull += (1 - ship.hullExplRes);
           }
           if (m.getDamageType().indexOf('K') != -1) {
-            effectivenessHull += ship.hullKinRes;
+            effectivenessHull += (1 - ship.hullKinRes);
           }
           if (m.getDamageType().indexOf('T') != -1) {
-            effectivenessHull += ship.hullThermRes;
+            effectivenessHull += (1 - ship.hullThermRes);
+          }
+          if (m.getDamageType().indexOf('A') != -1) {
+            effectivenessHull += 1;
           }
           effectivenessHull /= m.getDamageType().length;
-          // Plasma accelerators deal absolute damage (but could be reduced by hardness)
-          if (m.grp == 'pa') effectivenessHull = 1;
           effectivenessHull *= Math.min(m.getPiercing() / ship.hardness, 1);
           const effectiveDpsHull = baseDps * effectivenessHull;
           const effectiveSDpsHull = baseSDps * effectivenessHull;

src/app/components/DefenceSummary.jsx

@@ -31,6 +31,7 @@ export default class DefenceSummary extends TranslatedComponent {
 
     const shieldGenerator = ship.findShieldGenerator();
 
+    // Damage values are 1 - resistance values
     return (
       <span>
         <h1>{translate('defence summary')}</h1>
@@ -52,15 +53,15 @@ export default class DefenceSummary extends TranslatedComponent {
               <td className='le'>{translate('damage from')}</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>
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - shieldGenerator.explres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(1 - ship.shieldExplRes)}</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>
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - shieldGenerator.kinres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(1 - ship.shieldKinRes)}</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>
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - shieldGenerator.thermres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(1 - ship.shieldThermRes)}</span>
               </td>
             </tr> : null }
 
@@ -76,14 +77,14 @@ export default class DefenceSummary extends TranslatedComponent {
               <td className='le'>{translate('damage from')}</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>
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - ship.bulkheads.m.explres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(1 - ship.hullExplRes)}</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>
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - ship.bulkheads.m.kinres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(1 - ship.hullKinRes)}</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>
+                <span onMouseOver={termtip.bind(null, translate('base') + ' ' + formats.pct1(1 - ship.bulkheads.m.thermres))} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(1 - ship.hullThermRes)}</span>
               </td>
             </tr>
 

src/app/components/InternalSlotSection.jsx

@@ -4,6 +4,7 @@ import SlotSection from './SlotSection';
 import InternalSlot from './InternalSlot';
 import * as ModuleUtils from '../shipyard/ModuleUtils';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
+import { canMount } from '../utils/SlotFunctions';
 
 /**
  * Internal slot section
@@ -47,7 +48,7 @@ export default class InternalSlotSection extends SlotSection {
     let clobber = event.getModifierState('Alt');
     let ship = this.props.ship;
     ship.internal.forEach((slot) => {
-      if ((clobber || !slot.m) && (!slot.eligible || slot.eligible.cr)) {
+      if ((clobber || !slot.m) && canMount(ship, slot, 'cr')) {
         ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'));
       }
     });
@@ -63,7 +64,7 @@ export default class InternalSlotSection extends SlotSection {
     let clobber = event.getModifierState('Alt');
     let ship = this.props.ship;
     ship.internal.forEach((slot) => {
-      if ((clobber || !slot.m) && (!slot.eligible || slot.eligible.ft)) {
+      if ((clobber || !slot.m) && canMount(ship, slot, 'ft')) {
         ship.use(slot, ModuleUtils.findInternal('ft', slot.maxClass, 'C'));
       }
     });
@@ -79,7 +80,7 @@ export default class InternalSlotSection extends SlotSection {
     let clobber = event.getModifierState('Alt');
     let ship = this.props.ship;
     ship.internal.forEach((slot) => {
-      if ((clobber || !slot.m) && (!slot.eligible || slot.eligible.pcq)) {
+      if ((clobber || !slot.m) && canMount(ship, slot, 'pcq')) {
         ship.use(slot, ModuleUtils.findInternal('pcq', Math.min(slot.maxClass, 6), 'B')); // Passenger cabins top out at 6
       }
     });
@@ -95,7 +96,7 @@ export default class InternalSlotSection extends SlotSection {
     let clobber = event.getModifierState('Alt');
     let ship = this.props.ship;
     ship.internal.forEach((slot) => {
-      if ((clobber || !slot.m) && (!slot.eligible || slot.eligible.pcm)) {
+      if ((clobber || !slot.m) && canMount(ship, slot, 'pcm')) {
         ship.use(slot, ModuleUtils.findInternal('pcm', Math.min(slot.maxClass, 6), 'C')); // Passenger cabins top out at 6
       }
     });
@@ -111,7 +112,7 @@ export default class InternalSlotSection extends SlotSection {
     let clobber = event.getModifierState('Alt');
     let ship = this.props.ship;
     ship.internal.forEach((slot) => {
-      if ((clobber || !slot.m) && (!slot.eligible || slot.eligible.pci)) {
+      if ((clobber || !slot.m) && canMount(ship, slot, 'pci')) {
         ship.use(slot, ModuleUtils.findInternal('pci', Math.min(slot.maxClass, 6), 'D')); // Passenger cabins top out at 6
       }
     });
@@ -127,7 +128,7 @@ export default class InternalSlotSection extends SlotSection {
     let clobber = event.getModifierState('Alt');
     let ship = this.props.ship;
     ship.internal.forEach((slot) => {
-      if ((clobber || !slot.m) && (!slot.eligible || slot.eligible.pce)) {
+      if ((clobber || !slot.m) && canMount(ship, slot, 'pce')) {
         ship.use(slot, ModuleUtils.findInternal('pce', Math.min(slot.maxClass, 6), 'E')); // Passenger cabins top out at 6
       }
     });
@@ -144,7 +145,7 @@ export default class InternalSlotSection extends SlotSection {
     let ship = this.props.ship;
     let chargeCap = 0; // Capacity of single activation
     ship.internal.forEach(function(slot) {
-      if ((clobber || (!slot.m && !ModuleUtils.isShieldGenerator(slot.m.grp))) && (!slot.eligible || slot.eligible.scb)) {
+      if ((clobber && !(slot.m && ModuleUtils.isShieldGenerator(slot.m.grp)) || !slot.m) && canMount(ship, slot, 'scb')) {
         ship.use(slot, ModuleUtils.findInternal('scb', slot.maxClass, 'A'));
         ship.setSlotEnabled(slot, chargeCap <= ship.shieldStrength); // Don't waste cell capacity on overcharge
         chargeCap += slot.m.recharge;
@@ -162,7 +163,7 @@ export default class InternalSlotSection extends SlotSection {
     let clobber = event.getModifierState('Alt');
     let ship = this.props.ship;
     ship.internal.forEach((slot) => {
-      if ((clobber || !slot.m) && (!slot.eligible || slot.eligible.hr)) {
+      if ((clobber || !slot.m) && canMount(ship, slot, 'hr')) {
         ship.use(slot, ModuleUtils.findInternal('hr', Math.min(slot.maxClass, 5), 'D')); // Hull reinforcements top out at 5D
       }
     });
@@ -178,7 +179,7 @@ export default class InternalSlotSection extends SlotSection {
     let clobber = event.getModifierState('Alt');
     let ship = this.props.ship;
     ship.internal.forEach((slot) => {
-      if ((clobber || !slot.m) && (!slot.eligible || slot.eligible.mrp)) {
+      if ((clobber || !slot.m) && canMount(ship, slot, 'mrp')) {
         ship.use(slot, ModuleUtils.findInternal('mrp', Math.min(slot.maxClass, 5), 'D')); // Module reinforcements top out at 5D
       }
     });

src/app/components/Modification.jsx

@@ -42,9 +42,9 @@ export default class Modification extends TranslatedComponent {
       scaledValue = 100000;
       value = 1000;
     }
-    if (scaledValue < -10000) {
-      scaledValue = -10000;
-      value = -100;
+    if (scaledValue < -9999) {
+      scaledValue = -9999;
+      value = -99.99;
     }
 
     let m = this.props.m;

src/app/shipyard/Ship.js

@@ -918,11 +918,10 @@ export default class Ship {
    * @return {this} The ship instance (for chaining operations)
    */
   diminishingReturns(val, drll, drul) {
-    if (val > drll) {
-      val = drll + (val - drll) / 2;
-    }
-    if (val > drul) {
-      val = drul;
+    if (val < drll) {
+      val = drll;
+    }  else if (val < drul) {
+      val = drul - (drul - val) / 2;
     }
     return val;
   }
@@ -1143,14 +1142,26 @@ export default class Ship {
     let shieldExplRes = null;
     let shieldKinRes = null;
     let shieldThermRes = null;
+    let shieldExplDRStart = null;
+    let shieldExplDREnd = null;
+    let shieldKinDRStart = null;
+    let shieldKinDREnd = null;
+    let shieldThermDRStart = null;
+    let shieldThermDREnd = null;
 
     const sgSlot = this.findInternalByGroup('sg');
     if (sgSlot && sgSlot.enabled) {
       // Shield from generator
       shield = Calc.shieldStrength(this.hullMass, this.baseShieldStrength, sgSlot.m, 1);
       shieldExplRes = 1 - sgSlot.m.getExplosiveResistance();
+      shieldExplDRStart = shieldExplRes * 0.7;
+      shieldExplDREnd = shieldExplRes * 0; // Currently don't know where this is
       shieldKinRes = 1 - sgSlot.m.getKineticResistance();
+      shieldKinDRStart = shieldKinRes * 0.7;
+      shieldKinDREnd = shieldKinRes * 0; // Currently don't know where this is
       shieldThermRes = 1 - sgSlot.m.getThermalResistance();
+      shieldThermDRStart = shieldThermRes * 0.7;
+      shieldThermDREnd = shieldThermRes * 0; // Currently don't know where this is
 
       // Shield from boosters
       for (let slot of this.hardpoints) {
@@ -1170,9 +1181,9 @@ export default class Ship {
     shield = shield * shieldBoost;
     
     this.shield = shield;
-    this.shieldExplRes = shieldExplRes ? 1 - this.diminishingReturns(1 - shieldExplRes, 0.5, 0.75) : null;
-    this.shieldKinRes = shieldKinRes ? 1 - this.diminishingReturns(1 - shieldKinRes, 0.5, 0.75) : null;
-    this.shieldThermRes = shieldThermRes ? 1 - this.diminishingReturns(1 - shieldThermRes, 0.5, 0.75) : null;
+    this.shieldExplRes = shieldExplRes ? 1 - this.diminishingReturns(shieldExplRes, shieldExplDREnd, shieldExplDRStart) : null;
+    this.shieldKinRes = shieldKinRes ? 1 - this.diminishingReturns(shieldKinRes, shieldKinDREnd, shieldKinDRStart) : null;
+    this.shieldThermRes = shieldThermRes ? 1 - this.diminishingReturns(shieldThermRes, shieldThermDREnd, shieldThermDRStart) : null;
 
     return this;
   }
@@ -1206,8 +1217,14 @@ export default class Ship {
     let modulearmour = 0;
     let moduleprotection = 1;
     let hullExplRes = 1 - bulkhead.getExplosiveResistance();
+    const hullExplResDRStart = hullExplRes * 0.7;
+    const hullExplResDREnd = hullExplRes * 0; // Currently don't know where this is
     let hullKinRes = 1 - bulkhead.getKineticResistance();
+    const hullKinResDRStart = hullKinRes * 0.7;
+    const hullKinResDREnd = hullKinRes * 0; // Currently don't know where this is
     let hullThermRes = 1 - bulkhead.getThermalResistance();
+    const hullThermResDRStart = hullThermRes * 0.7;
+    const hullThermResDREnd = hullThermRes * 0; // Currently don't know where this is
 
     // Armour from HRPs and module armour from MRPs
     for (let slot of this.internal) {
@@ -1230,9 +1247,9 @@ export default class Ship {
     this.armour = armour;
     this.modulearmour = modulearmour;
     this.moduleprotection = moduleprotection;
-    this.hullExplRes = 1 - this.diminishingReturns(1 - hullExplRes, 0.5, 0.75);
-    this.hullKinRes = 1 - this.diminishingReturns(1 - hullKinRes, 0.5, 0.75);
-    this.hullThermRes = 1 - this.diminishingReturns(1 - hullThermRes, 0.5, 0.75);
+    this.hullExplRes = 1 - this.diminishingReturns(hullExplRes, hullExplResDREnd, hullExplResDRStart);
+    this.hullKinRes = 1 - this.diminishingReturns(hullKinRes, hullKinResDREnd, hullKinResDRStart);
+    this.hullThermRes = 1 - this.diminishingReturns(hullThermRes, hullThermResDREnd, hullThermResDRStart);
 
     return this;
   }

src/app/shipyard/ShipRoles.js

@@ -39,7 +39,9 @@ export function trader(ship, shielded, standardOpts) {
       ship.use(slot, sg);
       sg = null;
     } else {
-      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'));
+      if (canMount(ship, slot, 'cr')) {
+        ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'));
+      }
     }
   }
 

src/app/utils/ShortenUrl.js

@@ -1,6 +1,12 @@
 import request from 'superagent';
 
 
+/**
+ * Shorten a URL
+ * @param  {string} url        The URL to shorten
+ * @param  {function} success   Success callback
+ * @param  {function} error     Failure/Error callback
+ */ 
 export default function shorternUrl(url, success, error) {
   shortenUrlEddp(url, success, error);
 }