Merge branch 'release/2.2.19' into develop

ChangeLog.md

@@ -3,6 +3,9 @@
   * Shot speed can no longer be modified directly.  Its value is derived from the range modifier for Long Range and Focused modifications
   * Ensure that jump range chart updates when fuel slider is changed
   * Add 'Engine profile' and 'FSD profile' charts.  These show how your maximum speed/jump range will alter as you alter the mass of your build
+  * Use coriolis-data 2.2.19:
+    * Remove shot speed modification - it is directly tied to range
+    * Fix incorrect minimal mass for 3C bi-weave shield generator
 
 #2.2.18
   * Change methodology for calculating explorer role; can result in lighter builds

package.json

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

src/app/components/EngineProfile.jsx

@@ -125,7 +125,7 @@ export default class EngineProfile extends TranslatedComponent {
         />
         {ship.cargoCapacity ? 
         <span>
-          <h3>{translate('cargo carried')}</h3>
+          <h3>{translate('cargo carried')}: {formats.int(cargo)}{units.T}</h3>
           <table style={{ width: '100%', lineHeight: '1em', backgroundColor: 'transparent' }}>
             <tbody >
               <tr>
@@ -140,9 +140,6 @@ export default class EngineProfile extends TranslatedComponent {
                     onResize={onWindowResize}
                   />
                 </td>
-                <td className='primary' style={{ width: '5em', verticalAlign: 'top', fontSize: '0.9em', textAlign: 'left' }}>
-                  {formats.int(cargo)}{units.T}
-                </td>
               </tr>
             </tbody>
           </table>

src/app/components/FSDProfile.jsx

@@ -126,7 +126,7 @@ export default class FSDProfile extends TranslatedComponent {
         />
         {ship.cargoCapacity ? 
         <span>
-          <h3>{translate('cargo carried')}</h3>
+          <h3>{translate('cargo carried')}: {formats.int(cargo)}{units.T}</h3>
           <table style={{ width: '100%', lineHeight: '1em', backgroundColor: 'transparent' }}>
             <tbody >
               <tr>
@@ -141,9 +141,6 @@ export default class FSDProfile extends TranslatedComponent {
                     onResize={onWindowResize}
                   />
                 </td>
-                <td className='primary' style={{ width: '5em', verticalAlign: 'top', fontSize: '0.9em', textAlign: 'left' }}>
-                  {formats.int(cargo)}{units.T}
-                </td>
               </tr>
             </tbody>
           </table>

src/app/components/JumpRange.jsx

@@ -102,7 +102,7 @@ export default class JumpRange extends TranslatedComponent {
           points={200}
           code={code}
         />
-        <h3>{translate('fuel carried')}</h3>
+        <h3>{translate('fuel carried')}: {formats.f2(fuelLevel * ship.fuelCapacity)}{units.T}</h3>
         <table style={{ width: '100%', lineHeight: '1em', backgroundColor: 'transparent' }}>
           <tbody >
             <tr>
@@ -117,9 +117,6 @@ export default class JumpRange extends TranslatedComponent {
                   onResize={onWindowResize}
                 />
               </td>
-              <td className='primary' style={{ width: '10em', verticalAlign: 'top', fontSize: '0.9em', textAlign: 'left' }}>
-                {formats.f2(fuelLevel * ship.fuelCapacity)}{units.T} {formats.pct1(fuelLevel)}
-              </td>
             </tr>
           </tbody>
         </table>