Merge branch 'release/2.2.0' into develop

2025-12-08 22:33:24 +00:00 · 2016-10-22 09:31:08 +01:00
parent bf0701340c cd87184169
commit f29f3f4f8f
8 changed files with 54 additions and 26 deletions
--- a/tests/test-import.js
+++ b/tests/test-import.js
@@ -108,7 +108,8 @@ describe('Import Modal', function() {
    it('catches an invalid backup', function() {
      const importData = require('./fixtures/valid-backup');
      let invalidImportData = Object.assign({}, importData);
-      invalidImportData.builds.asp = null;   // Remove Asp Miner build used in comparison
+      //invalidImportData.builds.asp = null;   // Remove Asp Miner build used in comparison
+      delete(invalidImportData.builds.asp);

      pasteText('"this is not valid"');
      expect(modal.state.importValid).toBeFalsy();
--- a/tests/test-ship.js
+++ b/tests/test-ship.js
@@ -16,7 +16,7 @@ describe("Ship", function() {
      ship.buildWith(shipData.defaults);

      expect(ship.totalCost).toEqual(shipData.retailCost, s + ' retail cost does not match default build cost');
-      expect(ship.cargoCapacity).toBeDefined(s + ' cargo');
+      expect(ship.cargoCapacity).toBeDefined();
      expect(ship.priorityBands[0].retracted).toBeGreaterThan(0, s + ' priorityBands');
      expect(ship.powerAvailable).toBeGreaterThan(0, s + ' powerAvailable');
      expect(ship.unladenRange).toBeGreaterThan(0, s + ' unladenRange');
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
  "name": "coriolis_shipyard",
-  "version": "2.1.2",
+  "version": "2.2.0",
  "repository": {
    "type": "git",
-    "url": "https://github.com/cmmcleod/coriolis"
+    "url": "https://github.com/EDCD/coriolis"
  },
-  "homepage": "https://coriolis.io",
-  "bugs": "https://github.com/cmmcleod/coriolis/issues",
+  "homepage": "https://coriolis.edcd.io",
+  "bugs": "https://github.com/EDCD/coriolis/issues",
  "private": true,
  "engine": "node >= 4.0.0",
  "license": "MIT",
@@ -24,14 +24,13 @@
  },
  "jest": {
    "scriptPreprocessor": "<rootDir>/node_modules/babel-jest",
-    "testFileExtensions": [
-      "js"
-    ],
+    "testRegex": "(/__tests__/test-.*|\\.(test|spec))\\.js$",
    "moduleFileExtensions": [
      "js",
      "json",
      "jsx"
    ],
+    "automock": true,
    "unmockedModulePathPatterns": [
      "<rootDir>/node_modules/react",
      "<rootDir>/node_modules/react-dom",
@@ -68,7 +67,7 @@
    "extract-text-webpack-plugin": "^0.9.1",
    "file-loader": "^0.8.4",
    "html-webpack-plugin": "^1.7.0",
-    "jest-cli": "^0.9.2",
+    "jest-cli": "^16.0.1",
    "jsen": "^0.6.0",
    "json-loader": "^0.5.3",
    "less": "^2.5.3",
--- a/src/app/components/CostSection.jsx
+++ b/src/app/components/CostSection.jsx
@@ -606,6 +606,7 @@ export default class CostSection extends TranslatedComponent {
    }

    if (nextProps.ship != this.props.ship || nextProps.code != this.props.code) {
+      nextProps.ship.applyDiscounts(Persist.getShipDiscount(), Persist.getModuleDiscount());
      this._updateAmmoCosts(nextProps.ship);
      this._updateRetrofit(nextProps.ship, retrofitShip);
      this._sortCost(nextProps.ship);
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -45,8 +45,8 @@ export default class HardpointSlot extends Slot {
 	  {m.mount && m.mount == 'T' ? <MountTurret /> : ''}
 	  {m.type && m.type == 'K' ? <DamageKinetic /> : ''}
 	  {m.type && m.type == 'T' ? <DamageThermal /> : ''}
-	  {m.type && m.type == 'KT' ? <span><DamageKinetic /><DamageThermal /></span>: ''}
-	  {m.type && m.type == 'E' ? <DamageExplosive />: ''}
+	  {m.type && m.type == 'KT' ? <span><DamageKinetic /><DamageThermal /></span> : ''}
+	  {m.type && m.type == 'E' ? <DamageExplosive /> : ''}
          {classRating} {translate(m.name || m.grp)}</div>
          <div className={'r'}>{m.mass}{u.T}</div>
        </div>
@@ -56,7 +56,7 @@ export default class HardpointSlot extends Slot {
          { m.hps ? <div className={'l'}>{translate('HPS')}: {formats.round1(m.hps)} { m.clip ? <span>({formats.round1((m.clip * m.hps / m.rof) / ((m.clip / m.rof) + m.reload)) })</span> : null }</div> : null }
          { m.dps && m.eps ? <div className={'l'}>{translate('DPE')}: {formats.round1(m.dps / m.eps)}</div> : null }
          { m.rof ? <div className={'l'}>{translate('ROF')}: {m.rof}{u.ps}</div> : null }
-          { m.range && !m.dps ? <div className={'l'}>{translate('Range')}: {formats.round(m.range/1000)}{u.km}</div> : null }
+          { m.range && !m.dps ? <div className={'l'}>{translate('Range')} : {formats.round(m.range / 1000)}{u.km}</div> : null }
          { m.shieldmul ? <div className={'l'}>+{formats.rPct(m.shieldmul)}</div> : null }
          { m.ammo >= 0 ? <div className={'l'}>{translate('ammo')}: {formats.int(m.clip)}/{formats.int(m.ammo)}</div> : null }
        </div>
--- a/src/app/shipyard/Serializer.js
+++ b/src/app/shipyard/Serializer.js
@@ -6,6 +6,29 @@ import LZString from 'lz-string';

 const STANDARD = ['powerPlant', 'thrusters', 'frameShiftDrive', 'lifeSupport', 'powerDistributor', 'sensors', 'fuelTank'];

+/**
+ * Generates ship-loadout JSON Schema standard object
+ * @param  {Object} standard model
+ * @return {Object} JSON Schema
+ */
+function standardToSchema(standard) {
+  if (standard.m) {
+    let o = {
+      class: standard.m.class,
+      rating: standard.m.rating,
+      enabled: Boolean(standard.enabled),
+      priority: standard.priority + 1
+    };
+
+    if (standard.m.name) {
+      o.name = standard.m.name;
+    }
+
+    return o;
+  }
+  return null;
+}
+
 /**
 * Generates ship-loadout JSON Schema slot object
 * @param  {Object} slot Slot model
@@ -61,13 +84,13 @@ export function toDetailedBuild(buildName, ship) {
      standard: {
        bulkheads: BulkheadNames[ship.bulkheads.m.index],
        cargoHatch: { enabled: Boolean(ship.cargoHatch.enabled), priority: ship.cargoHatch.priority + 1 },
-        powerPlant: { class: standard[0].m.class, rating: standard[0].m.rating, enabled: Boolean(standard[0].enabled), priority: standard[0].priority + 1 },
-        thrusters: { class: standard[1].m.class, rating: standard[1].m.rating, enabled: Boolean(standard[1].enabled), priority: standard[1].priority + 1 },
-        frameShiftDrive: { class: standard[2].m.class, rating: standard[2].m.rating, enabled: Boolean(standard[2].enabled), priority: standard[2].priority + 1 },
-        lifeSupport: { class: standard[3].m.class, rating: standard[3].m.rating, enabled: Boolean(standard[3].enabled), priority: standard[3].priority + 1 },
-        powerDistributor: { class: standard[4].m.class, rating: standard[4].m.rating, enabled: Boolean(standard[4].enabled), priority: standard[4].priority + 1 },
-        sensors: { class: standard[5].m.class, rating: standard[5].m.rating, enabled: Boolean(standard[5].enabled), priority: standard[5].priority + 1 },
-        fuelTank: { class: standard[6].m.class, rating: standard[6].m.rating, enabled: Boolean(standard[6].enabled), priority: standard[6].priority + 1 }
+        powerPlant: standardToSchema(standard[0]),
+        thrusters: standardToSchema(standard[1]),
+        frameShiftDrive: standardToSchema(standard[2]),
+        lifeSupport: standardToSchema(standard[3]),
+        powerDistributor: standardToSchema(standard[4]),
+        sensors: standardToSchema(standard[5]),
+        fuelTank: standardToSchema(standard[6])
      },
      hardpoints: hardpoints.filter(slot => slot.maxClass > 0).map(slotToSchema),
      utility: hardpoints.filter(slot => slot.maxClass === 0).map(slotToSchema),
--- a/src/app/utils/SlotFunctions.js
+++ b/src/app/utils/SlotFunctions.js
@@ -13,11 +13,11 @@ import Persist from '../stores/Persist';
 * @return {Boolean}        True if the slot can mount the module
 */
 export function canMount(ship, slot, group, clazz) {
-  if (slot
-   && (!slot.eligible || slot.eligible[group])
-   && (group != 'pcq' || (ship.luxuryCabins && ship.luxuryCabins  === true))
-   && (group != 'fh' || (ship.fighterHangars && ship.fighterHangars  === true))
-   && (clazz === undefined || slot.maxClass >= clazz)) {
+  if (slot &&
+      (!slot.eligible || slot.eligible[group]) &&
+      (group != 'pcq' || (ship.luxuryCabins && ship.luxuryCabins  === true)) &&
+      (group != 'fh' || (ship.fighterHangars && ship.fighterHangars  === true)) &&
+      (clazz === undefined || slot.maxClass >= clazz)) {
    return true;
  }
  return false;
--- a/src/schemas/ship-loadout/3.json
+++ b/src/schemas/ship-loadout/3.json
@@ -76,7 +76,11 @@
                "class": { "type": "integer", "minimum": 2, "maximum": 8 },
                "rating": { "$ref": "#/definitions/standardRatings" },
                "enabled": { "type": "boolean" },
-                "priority": { "type": "integer", "minimum": 1, "maximum": 5 }
+                "priority": { "type": "integer", "minimum": 1, "maximum": 5 },
+                "name": {
+                  "description": "The name identifing the thrusters (if applicable), e.g. 'Enhanced Performance'",
+                  "type": "string"
+                }
              }
            },
            "frameShiftDrive": {