Merge branch 'release/2.9.1'

resistances are buggered on shields and armour by the looks of things

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.5.2",
+  "version": "2.9.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1810,6 +1810,260 @@
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
+    "bugsnag-build-reporter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bugsnag-build-reporter/-/bugsnag-build-reporter-1.0.0.tgz",
+      "integrity": "sha512-uYhbiTOEahw9+ewR4GYxHsBL7OSCbA8EtBnugtT27ZTU3dDZRPJWptzrlEe7O4blTSz7YcFCmTnaG+c5Ng04Jg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.3.2",
+        "concat-stream": "1.6.0",
+        "find-nearest-file": "1.1.0",
+        "meow": "4.0.0",
+        "minimist": "1.2.0",
+        "pino": "4.16.1",
+        "run-parallel": "1.1.8"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
+          "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist": "1.2.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.2"
+          }
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "bugsnag-sourcemaps": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bugsnag-sourcemaps/-/bugsnag-sourcemaps-1.0.3.tgz",
+      "integrity": "sha512-QZNG948Qh2qgcZI9pTE3mN6/Do5JVj+VzZkziNw0K6aqzijIvJQc0LDQYlrX0IEvPDuiOu+jAqd8fa0MfitbwA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "listr": "0.12.0",
+        "meow": "3.7.0",
+        "rc": "1.2.6",
+        "read-pkg-up": "2.0.0",
+        "request": "2.83.0"
+      },
+      "dependencies": {
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -2011,6 +2265,22 @@
         "restore-cursor": "1.0.1"
       }
     },
+    "cli-spinners": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
+      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
+      "dev": true
+    },
+    "cli-truncate": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
+      "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=",
+      "dev": true,
+      "requires": {
+        "slice-ansi": "0.0.4",
+        "string-width": "1.0.2"
+      }
+    },
     "cli-width": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
@@ -3496,6 +3766,16 @@
         "object-assign": "4.1.1"
       }
     },
+    "cross-env": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.4.tgz",
+      "integrity": "sha512-Mx8mw6JWhfpYoEk7PGvHxJMLQwQHORAs8+2bX+C1lGQ4h3GkDb1zbzC2Nw85YH9ZQMlO0BHZxMacgrfPmMFxbg==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "is-windows": "1.0.2"
+      }
+    },
     "cross-spawn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -3969,6 +4249,12 @@
         "assert-plus": "1.0.0"
       }
     },
+    "date-fns": {
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz",
+      "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==",
+      "dev": true
+    },
     "date-now": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -3989,12 +4275,28 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
+    "decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "requires": {
+        "decamelize": "1.2.0",
+        "map-obj": "1.0.1"
+      }
+    },
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
       "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
       "dev": true
     },
+    "deep-extend": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+      "dev": true
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -4233,6 +4535,12 @@
       "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
       "dev": true
     },
+    "elegant-spinner": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
+      "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
+      "dev": true
+    },
     "elliptic": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
@@ -4268,6 +4576,15 @@
         "iconv-lite": "0.4.19"
       }
     },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
     "enhanced-resolve": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
@@ -4788,6 +5105,12 @@
       "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
       "dev": true
     },
+    "fast-json-parse": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
+      "dev": true
+    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -4800,6 +5123,12 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fast-safe-stringify": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz",
+      "integrity": "sha512-QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw==",
+      "dev": true
+    },
     "fastparse": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
@@ -4948,6 +5277,12 @@
         "pkg-dir": "2.0.0"
       }
     },
+    "find-nearest-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-nearest-file/-/find-nearest-file-1.1.0.tgz",
+      "integrity": "sha512-NMsS0ITOwpBPrHOyO7YUtDhaVEGUKS0kBJDVaWZPuCzO7JMW+uzFQQVts/gPyIV9ioyNWDb5LjhHWXVf1OnBDA==",
+      "dev": true
+    },
     "find-up": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -4969,6 +5304,12 @@
         "write": "0.2.1"
       }
     },
+    "flatstr": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz",
+      "integrity": "sha1-W0UbCMvUji6sVKK74L9GFlqhS+M=",
+      "dev": true
+    },
     "flatten": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
@@ -6586,6 +6927,12 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
     "inquirer": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
@@ -6829,6 +7176,12 @@
       "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
       "dev": true
     },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
@@ -6885,6 +7238,12 @@
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
     "is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
@@ -8099,6 +8458,12 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -8400,6 +8765,72 @@
         "type-check": "0.3.2"
       }
     },
+    "listr": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
+      "integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-truncate": "0.2.1",
+        "figures": "1.7.0",
+        "indent-string": "2.1.0",
+        "is-promise": "2.1.0",
+        "is-stream": "1.1.0",
+        "listr-silent-renderer": "1.1.1",
+        "listr-update-renderer": "0.2.0",
+        "listr-verbose-renderer": "0.4.1",
+        "log-symbols": "1.0.2",
+        "log-update": "1.0.2",
+        "ora": "0.2.3",
+        "p-map": "1.2.0",
+        "rxjs": "5.5.10",
+        "stream-to-observable": "0.1.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "listr-silent-renderer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
+      "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=",
+      "dev": true
+    },
+    "listr-update-renderer": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
+      "integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-truncate": "0.2.1",
+        "elegant-spinner": "1.0.1",
+        "figures": "1.7.0",
+        "indent-string": "3.2.0",
+        "log-symbols": "1.0.2",
+        "log-update": "1.0.2",
+        "strip-ansi": "3.0.1"
+      },
+      "dependencies": {
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        }
+      }
+    },
+    "listr-verbose-renderer": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
+      "integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "date-fns": "1.29.0",
+        "figures": "1.7.0"
+      }
+    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -8463,6 +8894,25 @@
       "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
       "dev": true
     },
+    "log-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3"
+      }
+    },
+    "log-update": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
+      "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "1.4.0",
+        "cli-cursor": "1.0.2"
+      }
+    },
     "loglevel": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.5.1.tgz",
@@ -8729,6 +9179,16 @@
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },
+    "minimist-options": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "is-plain-obj": "1.1.0"
+      }
+    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -9064,6 +9524,18 @@
         "wordwrap": "1.0.0"
       }
     },
+    "ora": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
+      "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "cli-spinners": "0.1.2",
+        "object-assign": "4.1.1"
+      }
+    },
     "original": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
@@ -9297,6 +9769,65 @@
         "pinkie": "2.0.4"
       }
     },
+    "pino": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/pino/-/pino-4.16.1.tgz",
+      "integrity": "sha512-ST/IC5RMyqrOZL+Hq6LDwz5h4fGKABXzx2/5Ze7rz5TjuPvE8uI72dzj409xkq9JjyWsKoOOApgXn8kEjJ73yg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.3.2",
+        "fast-json-parse": "1.0.3",
+        "fast-safe-stringify": "1.2.3",
+        "flatstr": "1.0.5",
+        "pino-std-serializers": "2.0.0",
+        "pump": "3.0.0",
+        "quick-format-unescaped": "1.1.2",
+        "split2": "2.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "pino-std-serializers": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.0.0.tgz",
+      "integrity": "sha512-8OtC69pAB3wixI521iDkdBkmWAGuNwSbUGAOaIK99whgusDm3/ST5EUlTSluBW2jsvjx3Khk5eBcm3CVl2IGMg==",
+      "dev": true
+    },
     "pkg-dir": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
@@ -10015,6 +10546,16 @@
         "randombytes": "2.0.5"
       }
     },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
+      }
+    },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -10060,6 +10601,21 @@
       "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
       "dev": true
     },
+    "quick-format-unescaped": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz",
+      "integrity": "sha1-DKWB3jF0vs7yWsPC6JVjQjgdtpg=",
+      "dev": true,
+      "requires": {
+        "fast-safe-stringify": "1.2.3"
+      }
+    },
+    "quick-lru": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+      "dev": true
+    },
     "raf": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
@@ -10146,6 +10702,26 @@
         "unpipe": "1.0.0"
       }
     },
+    "rc": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz",
+      "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=",
+      "dev": true,
+      "requires": {
+        "deep-extend": "0.4.2",
+        "ini": "1.3.5",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
     "react": {
       "version": "15.6.2",
       "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
@@ -10710,6 +11286,18 @@
         "once": "1.4.0"
       }
     },
+    "run-parallel": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz",
+      "integrity": "sha512-e5t1NVhr5VWmD9V9U4KjjSGkf5w6CcTPgw11A3CfIvkkQxlAKzX3usPUp1NUQTmpOOjU+f9QRICU3tMbKwn9ZQ==",
+      "dev": true
+    },
+    "run-parallel-limit": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz",
+      "integrity": "sha512-zpNZCoIA+x0fWw2tiD15lrGecycMbao/n4uBER53pcW5GB9TUEu4pZxd5CTgXLBh2MwI0E4nhRv7xymfo592vA==",
+      "dev": true
+    },
     "rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
@@ -10721,6 +11309,15 @@
       "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
       "dev": true
     },
+    "rxjs": {
+      "version": "5.5.10",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
+      "integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==",
+      "dev": true,
+      "requires": {
+        "symbol-observable": "1.0.1"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
@@ -11099,6 +11696,15 @@
         }
       }
     },
+    "split2": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+      "dev": true,
+      "requires": {
+        "through2": "2.0.3"
+      }
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -11150,6 +11756,12 @@
         "xtend": "4.0.1"
       }
     },
+    "stream-to-observable": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.1.0.tgz",
+      "integrity": "sha1-Rb8dny19wJvtgfHDB8Qw5ouEz/4=",
+      "dev": true
+    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -11294,6 +11906,12 @@
         "whet.extend": "0.9.9"
       }
     },
+    "symbol-observable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+      "dev": true
+    },
     "symbol-tree": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
@@ -11384,6 +12002,16 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
     "thunky": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz",
@@ -11861,6 +12489,17 @@
         }
       }
     },
+    "webpack-bugsnag-plugins": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/webpack-bugsnag-plugins/-/webpack-bugsnag-plugins-1.1.1.tgz",
+      "integrity": "sha512-QMjpQSBn4Et0q3OWVLEFTMuFrAwisKwpamq9bGG47ruRupBiiJC6n81pdUn3JYyRvMRDCviKvAO6P/0qs2179A==",
+      "dev": true,
+      "requires": {
+        "bugsnag-build-reporter": "1.0.0",
+        "bugsnag-sourcemaps": "1.0.3",
+        "run-parallel-limit": "1.0.4"
+      }
+    },
     "webpack-dev-middleware": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.5.3",
+  "version": "2.9.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"
@@ -19,7 +19,7 @@
     "test": "jest",
     "prod-serve": "nginx -p $(pwd) -c nginx.conf",
     "prod-stop": "kill -QUIT $(cat nginx.pid)",
-    "build": "npm run clean && NODE_ENV=production webpack -p --config webpack.config.prod.js",
+    "build": "npm run clean && cross-env NODE_ENV=production webpack -p --config webpack.config.prod.js",
     "rsync": "rsync -ae \"ssh -i $CORIOLIS_PEM\" --delete build/ $CORIOLIS_USER@$CORIOLIS_HOST:~/wwws",
     "deploy": "npm run lint && npm test && npm run build && npm run rsync"
   },
@@ -66,6 +66,7 @@
     "babel-preset-stage-0": "*",
     "create-react-class": "^15.6.2",
     "css-loader": "^0.28.0",
+    "cross-env": "^5.1.4",
     "d3-selection": "1",
     "eslint": "3.19.0",
     "eslint-plugin-react": "^6.10.3",
@@ -91,7 +92,8 @@
     "url-loader": "^0.5.8",
     "webpack": "^2.4.1",
     "webpack-dev-server": "^2.4.4",
-    "webpack-notifier": "^1.6.0"
+    "webpack-notifier": "^1.6.0",
+    "webpack-bugsnag-plugins": "^1.1.1"
   },
   "dependencies": {
     "babel-polyfill": "*",

src/app/shipyard/Module.js

@@ -64,7 +64,6 @@ export default class Module {
         }
       }
     }
-
     // Sanitise the resultant value to 4dp equivalent
     return isNaN(result) ? result : Math.round(result);
   }
@@ -79,6 +78,9 @@ export default class Module {
     if (!this.mods) {
       this.mods = {};
     }
+    if (!this.origVals) {
+      this.origVals = {};
+    }
     if (valueiswithspecial && this.blueprint && this.blueprint.special) {
       // This module has a special effect, see if we need to alter the stored value
       const modifierActions = Modifications.modifierActions[this.blueprint.special.edname];
@@ -117,7 +119,6 @@ export default class Module {
   _getModifiedValue(name) {
     const modification = Modifications.modifications[name];
     let result = this[name];
-
     if (!result) {
       if (modification && modification.method === 'additive') {
         // Additive modifications start at 0 rather than NULL
@@ -135,7 +136,7 @@ export default class Module {
         if (modification.type === 'percentage') {
           modValue = this.getModValue(name) / 10000;
         } else if (modification.type === 'numeric') {
-          modValue = this.getModValue(name) / 100;
+          modValue = this.getModValue(name)/ 100;
         } else {
           modValue = this.getModValue(name);
         }

src/app/shipyard/Ship.js

@@ -490,7 +490,6 @@ export default class Ship {
       // Value passed is invalid; reset it to 0
       value = 0;
     }
-
     // Handle special cases
     if (name === 'pgen') {
       // Power generation
@@ -771,7 +770,7 @@ export default class Ship {
       // Alter as required due to changes in the (build) code from one version to the next
       this.upgradeInternals(internal, 1 + this.standard.length + this.hardpoints.length, priorities, enabled, modifications, blueprints, version);
     }
-    
+
     return this.buildWith(
       {
         bulkheads: code.charAt(0) * 1,

src/app/utils/BlueprintFunctions.js

@@ -225,7 +225,12 @@ export function isValueBeneficial(feature, value) {
  */
 export function getBlueprint(name, module) {
   // Start with a copy of the blueprint
-  const blueprint = JSON.parse(JSON.stringify(Modifications.blueprints[name]));
+  const findMod = val => Object.keys(Modifications.blueprints).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0)
+  const found = Modifications.blueprints[findMod(name)];
+  if (!found || !found.fdname) {
+    return undefined;
+  }
+  const blueprint = JSON.parse(JSON.stringify(found));
   if (module) {
     if (module.grp === 'bh' || module.grp === 'hr' || module.grp === 'sg' || module.grp === 'psg' || module.grp === 'bsg') {
       // Bulkheads, hull reinforcements and shield generators need to have their resistances altered by the base values

src/app/utils/CompanionApiUtils.js

@@ -106,7 +106,7 @@ function _moduleFromEdId(edId) {
  * @return {string} the Coriolis model of the ship
  */
 function _shipModelFromEDName(edName) {
-  return SHIP_FD_NAME_TO_CORIOLIS_NAME[edName];
+  return SHIP_FD_NAME_TO_CORIOLIS_NAME[Object.keys(SHIP_FD_NAME_TO_CORIOLIS_NAME).find(elem => elem.toLowerCase() === edName.toLowerCase())];
 }
 
 /**

src/app/utils/JournalUtils.js

@@ -3,22 +3,24 @@ import { HARDPOINT_NUM_TO_CLASS, shipModelFromJson } from './CompanionApiUtils'
 import { Ships } from 'coriolis-data/dist'
 import Module from '../shipyard/Module'
 import { Modules } from 'coriolis-data/dist'
+import { Modifications } from 'coriolis-data/dist'
+import { getBlueprint } from './BlueprintFunctions'
 
 /**
  * Obtain a module given its FD Name
  * @param {string} fdname the FD Name of the module
  * @return {Module} the module
  */
-function _moduleFromFdName(fdname) {
+function _moduleFromFdName (fdname) {
-  if (!fdname) return null;
+  if (!fdname) return null
-  fdname = fdname.toLowerCase();
+  fdname = fdname.toLowerCase()
   // Check standard modules
   for (const grp in Modules.standard) {
     if (Modules.standard.hasOwnProperty(grp)) {
       for (const i in Modules.standard[grp]) {
         if (Modules.standard[grp][i].symbol && Modules.standard[grp][i].symbol.toLowerCase() === fdname) {
           // Found it
-          return new Module({ template: Modules.standard[grp][i] });
+          return new Module({template: Modules.standard[grp][i]})
         }
       }
     }
@@ -30,7 +32,7 @@ function _moduleFromFdName(fdname) {
       for (const i in Modules.hardpoints[grp]) {
         if (Modules.hardpoints[grp][i].symbol && Modules.hardpoints[grp][i].symbol.toLowerCase() === fdname) {
           // Found it
-          return new Module({ template: Modules.hardpoints[grp][i] });
+          return new Module({template: Modules.hardpoints[grp][i]})
         }
       }
     }
@@ -42,180 +44,249 @@ function _moduleFromFdName(fdname) {
       for (const i in Modules.internal[grp]) {
         if (Modules.internal[grp][i].symbol && Modules.internal[grp][i].symbol.toLowerCase() === fdname) {
           // Found it
-          return new Module({ template: Modules.internal[grp][i] });
+          return new Module({template: Modules.internal[grp][i]})
         }
       }
     }
   }
-  console.log(fdname)
 
   // Not found
-  return null;
+  return null
 }
+
 /**
  * Build a ship from the journal Loadout event JSON
  * @param {object} json the Loadout event JSON
  * @return {Ship} the built ship
  */
-export function shipFromLoadoutJSON(json) {
+export function shipFromLoadoutJSON (json) {
 // Start off building a basic ship
-  const shipModel = shipModelFromJson(json);
+  const shipModel = shipModelFromJson(json)
   if (!shipModel) {
-    throw 'No such ship found: "' + json.Ship + '"';
+    throw 'No such ship found: "' + json.Ship + '"'
   }
-  const shipTemplate = Ships[shipModel];
+  const shipTemplate = Ships[shipModel]
 
-  let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots);
+  let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots)
-  ship.buildWith(null);
+  ship.buildWith(null)
   // Initial Ship building, don't do engineering yet.
+  let opts = [];
+
   for (const module of json.Modules) {
     switch (module.Slot) {
       // Cargo Hatch.
       case 'CargoHatch':
-        ship.cargoHatch.enabled = module.On;
+        ship.cargoHatch.enabled = module.On
-        ship.cargoHatch.priority = module.Priority;
+        ship.cargoHatch.priority = module.Priority
-        break;
+        break
       // Add the bulkheads
       case 'Armour':
-        if (module.Item.endsWith('_Armour_Grade1')) {
+        if (module.Item.toLowerCase().endsWith('_armour_grade1')) {
-          ship.useBulkhead(0, true);
+          ship.useBulkhead(0, true)
-        } else if (module.Item.endsWith('_Armour_Grade2')) {
+        } else if (module.Item.toLowerCase().endsWith('_armour_grade2')) {
-          ship.useBulkhead(1, true);
+          ship.useBulkhead(1, true)
-        } else if (module.Item.endsWith('_Armour_Grade3')) {
+        } else if (module.Item.toLowerCase().endsWith('_armour_grade3')) {
-          ship.useBulkhead(2, true);
+          ship.useBulkhead(2, true)
-        } else if (module.Item.endsWith('_Armour_Mirrored')) {
+        } else if (module.Item.toLowerCase().endsWith('_armour_mirrored')) {
-          ship.useBulkhead(3, true);
+          ship.useBulkhead(3, true)
-        } else if (module.Item.endsWith('_Armour_Reactive')) {
+        } else if (module.Item.toLowerCase().endsWith('_armour_reactive')) {
-          ship.useBulkhead(4, true);
+          ship.useBulkhead(4, true)
         } else {
-          throw 'Unknown bulkheads "' + module.Item + '"';
+          throw 'Unknown bulkheads "' + module.Item + '"'
         }
-        ship.bulkheads.enabled = true;
+        ship.bulkheads.enabled = true
-        break;
+        if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'PowerPlant':
-        const powerplant = _moduleFromFdName(module.Item);
+        const powerplant = _moduleFromFdName(module.Item)
-        ship.use(ship.standard[0], powerplant, true);
+        ship.use(ship.standard[0], powerplant, true)
-        ship.standard[0].enabled = module.On;
+        ship.standard[0].enabled = module.On
-        ship.standard[0].priority = module.Priority;
+        ship.standard[0].priority = module.Priority
-        break;
+        if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'MainEngines':
-        const thrusters = _moduleFromFdName(module.Item);
+        const thrusters = _moduleFromFdName(module.Item)
-        ship.use(ship.standard[1], thrusters, true);
+        ship.use(ship.standard[1], thrusters, true)
-        ship.standard[1].enabled = module.On;
+        ship.standard[1].enabled = module.On
-        ship.standard[1].priority = module.Priority;
+        ship.standard[1].priority = module.Priority
-        break;
+        if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'FrameShiftDrive':
-        const frameshiftdrive = _moduleFromFdName(module.Item);
+        const frameshiftdrive = _moduleFromFdName(module.Item)
-        ship.use(ship.standard[2], frameshiftdrive, true);
+        ship.use(ship.standard[2], frameshiftdrive, true)
-        ship.standard[2].enabled = module.On;
+        ship.standard[2].enabled = module.On
-        ship.standard[2].priority = module.Priority;
+        ship.standard[2].priority = module.Priority
-        break;
+        if (module.Engineering)  _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'LifeSupport':
-        const lifesupport = _moduleFromFdName(module.Item);
+        const lifesupport = _moduleFromFdName(module.Item)
-        ship.use(ship.standard[3], lifesupport, true);
+        ship.use(ship.standard[3], lifesupport, true)
-        ship.standard[3].enabled = module.On === true;
+        ship.standard[3].enabled = module.On === true
-        ship.standard[3].priority = module.Priority;
+        ship.standard[3].priority = module.Priority
-        break;
+        if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'PowerDistributor':
-        const powerdistributor = _moduleFromFdName(module.Item);
+        const powerdistributor = _moduleFromFdName(module.Item)
-        ship.use(ship.standard[4], powerdistributor, true);
+        ship.use(ship.standard[4], powerdistributor, true)
-        ship.standard[4].enabled = module.On;
+        ship.standard[4].enabled = module.On
-        ship.standard[4].priority = module.Priority;
+        ship.standard[4].priority = module.Priority
-        break;
+        if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'Radar':
-        const sensors = _moduleFromFdName(module.Item);
+        const sensors = _moduleFromFdName(module.Item)
-        ship.use(ship.standard[5], sensors, true);
+        ship.use(ship.standard[5], sensors, true)
-        ship.standard[5].enabled = module.On;
+        ship.standard[5].enabled = module.On
-        ship.standard[5].priority = module.Priority;
+        ship.standard[5].priority = module.Priority
-        break;
+        if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'FuelTank':
-        const fueltank = _moduleFromFdName(module.Item);
+        const fueltank = _moduleFromFdName(module.Item)
-        ship.use(ship.standard[6], fueltank, true);
+        ship.use(ship.standard[6], fueltank, true)
-        ship.standard[6].enabled = true;
+        ship.standard[6].enabled = true
-        ship.standard[6].priority = 0;
+        ship.standard[6].priority = 0
-        break;
+        break
       default:
     }
-    if (module.Slot.search(/Hardpoint/) !== -1) {
+    for (const module of json.Modules) {
-      // Add hardpoints
+      if (module.Slot.search(/Hardpoint/) !== -1) {
-      let hardpointClassNum = -1;
+        // Add hardpoints
-      let hardpointSlotNum = -1;
+        let hardpoint;
-      let hardpointArrayNum = 0;
+        let hardpointClassNum = -1
-      for (let i in shipTemplate.slots.hardpoints) {
+        let hardpointSlotNum = -1
-        if (shipTemplate.slots.hardpoints[i] === hardpointClassNum) {
+        let hardpointArrayNum = 0
-          // Another slot of the same class
+        for (let i in shipTemplate.slots.hardpoints) {
-          hardpointSlotNum++;
+          if (shipTemplate.slots.hardpoints[i] === hardpointClassNum) {
-        } else {
+            // Another slot of the same class
-          // The first slot of a new class
+            hardpointSlotNum++
-          hardpointClassNum = shipTemplate.slots.hardpoints[i];
+          } else {
-          hardpointSlotNum = 1;
+            // The first slot of a new class
-        }
+            hardpointClassNum = shipTemplate.slots.hardpoints[i]
+            hardpointSlotNum = 1
+          }
 
-        // Now that we know what we're looking for, find it
+          // Now that we know what we're looking for, find it
-        const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum;
+          const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum
-        const hardpointSlot = json.Modules.find(elem => elem.Slot === hardpointName);
+          const hardpointSlot = json.Modules.find(elem => elem.Slot === hardpointName)
-        if (!hardpointSlot) {
+          if (!hardpointSlot) {
-          // This can happen with old imports that don't contain new hardpoints
+            // This can happen with old imports that don't contain new hardpoints
-        } else if (!hardpointSlot) {
+          } else if (!hardpointSlot) {
-          // No module
+            // No module
-        } else {
+          } else {
-          const hardpoint = _moduleFromFdName(hardpointSlot.Item);
+            hardpoint = _moduleFromFdName(hardpointSlot.Item)
-          ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
+            ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true)
-          ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On;
+            ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On
-          ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority;
+            ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority
+            opts.push({coriolisMod: hardpoint, json: hardpointSlot});
+          }
+          hardpointArrayNum++
         }
-        hardpointArrayNum++;
       }
-    }
+      if (module.Slot.search(/Slot\d/) !== -1) {
-    if (module.Slot.search(/Slot\d/) !== -1) {
+        let internalSlotNum = 1
-      let internalSlotNum = 1;
+        let militarySlotNum = 1
-      let militarySlotNum = 1;
+        for (let i in shipTemplate.slots.internal) {
-      for (let i in shipTemplate.slots.internal) {
+          const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name = 'Military' : false
-        const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name = 'Military' : false;
 
-        // The internal slot might be a standard or a military slot.  Military slots have a different naming system
+          // The internal slot might be a standard or a military slot.  Military slots have a different naming system
-        let internalSlot = null;
+          let internalSlot = null
-        if (isMilitary) {
+          if (isMilitary) {
-          const internalName = 'Military0' + militarySlotNum;
+            const internalName = 'Military0' + militarySlotNum
-          internalSlot = json.Modules.find(elem => elem.Slot === internalName);
+            internalSlot = json.Modules.find(elem => elem.Slot === internalName)
-          militarySlotNum++;
+            militarySlotNum++
-        } else {
+          } else {
-          // Slot numbers are not contiguous so handle skips.
+            // Slot numbers are not contiguous so handle skips.
-          while (internalSlot === null && internalSlotNum < 99) {
+            while (internalSlot === null && internalSlotNum < 99) {
-            // Slot sizes have no relationship to the actual size, either, so check all possibilities
+              // Slot sizes have no relationship to the actual size, either, so check all possibilities
-            for (let slotsize = 0; slotsize < 9; slotsize++) {
+              for (let slotsize = 0; slotsize < 9; slotsize++) {
-              const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize;
+                const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize
-              if (json.Modules.find(elem => elem.Slot === internalName)) {
+                if (json.Modules.find(elem => elem.Slot === internalName)) {
-                internalSlot = json.Modules.find(elem => elem.Slot === internalName);
+                  internalSlot = json.Modules.find(elem => elem.Slot === internalName);
-                break;
+                  break
+                }
               }
+              internalSlotNum++
             }
-            internalSlotNum++;
+          }
+
+          if (!internalSlot) {
+            // This can happen with old imports that don't contain new slots
+          } else if (!internalSlot) {
+            // No module
+          } else {
+            const internalJson = internalSlot
+            const internal = _moduleFromFdName(internalJson.Item)
+            ship.use(ship.internal[i], internal, true)
+            ship.internal[i].enabled = internalJson.On === true
+            ship.internal[i].priority = internalJson.Priority
+            opts.push({coriolisMod: internal, json: internalSlot});
           }
         }
-
-        if (!internalSlot) {
-          // This can happen with old imports that don't contain new slots
-        } else if (!internalSlot) {
-          // No module
-        } else {
-          const internalJson = internalSlot;
-          const internal = _moduleFromFdName(internalJson.Item);
-          ship.use(ship.internal[i], internal, true);
-          ship.internal[i].enabled = internalJson.On === true;
-          ship.internal[i].priority = internalJson.Priority;
-        }
       }
     }
+  }
 
+  for (const i of opts) {
+    if (i.json.Engineering) _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect)
   }
   // We don't have any information on it so guess it's priority 5 and disabled
   if (!ship.cargoHatch) {
-    ship.cargoHatch.enabled = false;
+    ship.cargoHatch.enabled = false
-    ship.cargoHatch.priority = 4;
+    ship.cargoHatch.priority = 4
   }
-  console.log(ship);
+  console.log(ship)
 
   // Now update the ship's codes before returning it
-  return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString();
+  return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString()
+}
+
+/**
+ * Add the modifications for a module
+ * @param {Module} module the module
+ * @param {Object} modifiers the modifiers
+ * @param {Object} blueprint the blueprint of the modification
+ * @param {Object} grade the grade of the modification
+ * @param {Object} specialModifications special modification
+ */
+function _addModifications (module, modifiers, blueprint, grade, specialModifications) {
+  if (!modifiers) return
+  let special
+  if (specialModifications) {
+    special = Modifications.specials[Object.keys(specialModifications)[0]]
+  }
+  for (const i in modifiers) {
+    // Some special modifications
+    // Look up the modifiers to find what we need to do
+    const findMod = val => Object.keys(Modifications.modifierActions).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0)
+    const modifierActions = Modifications.modifierActions[findMod(modifiers[i].Label)]
+    //TODO: Figure out how to scale this value.
+    if (!!modifiers[i].LessIsGood) {
+
+    }
+    let value = (modifiers[i].Value / modifiers[i].OriginalValue * 100 - 100)  * 100;
+    if (value === Infinity) {
+      value = modifiers[i].Value * 100;
+    }
+    if (modifiers[i].Label === 'DefenceModifierHealthMultiplier' && blueprint.toLowerCase().startsWith('armour_')) {
+      value = modifiers[i].Value * 100 - modifiers[i].OriginalValue;
+    }
+    // Carry out the required changes
+    for (const action in modifierActions) {
+      if (isNaN(modifierActions[action])) {
+        module.setModValue(action, modifierActions[action])
+      } else {
+        module.setModValue(action, value)
+      }
+    }
+  }
+
+  // Add the blueprint definition, grade and special
+  if (blueprint) {
+    module.blueprint = getBlueprint(blueprint, module)
+    if (grade) {
+      module.blueprint.grade = Number(grade)
+    }
+    if (special) {
+      module.blueprint.special = special
+    }
+  }
 }

webpack.config.dev.js

@@ -18,7 +18,7 @@ CopyDirPlugin.prototype.apply = function(compiler) {
 };
 
 module.exports = {
-  devtool: 'source-map',
+  devtool: 'eval',
   devServer: {
     headers: { "Access-Control-Allow-Origin": "*" }
   },

webpack.config.prod.js

@@ -5,6 +5,7 @@ var pkgJson = require('./package');
 var HtmlWebpackPlugin = require("html-webpack-plugin");
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 var AppCachePlugin = require('appcache-webpack-plugin');
+var { BugsnagSourceMapUploaderPlugin } = require('webpack-bugsnag-plugins');
 
 function CopyDirPlugin(source, destination) {
     this.source = source;
@@ -19,11 +20,11 @@ CopyDirPlugin.prototype.apply = function(compiler) {
 
 module.exports = {
   cache: true,
+  devtool: 'source-map',
   entry: {
     app: ['babel-polyfill', path.resolve(__dirname, 'src/app/index')],
     lib: ['d3', 'react', 'react-dom', 'classnames', 'fbemitter', 'lz-string']
   },
-  devtool: 'source-map',
   resolve: {
     extensions: ['.js', '.jsx', '.json', '.less']
   },
@@ -35,7 +36,8 @@ module.exports = {
   },
   plugins: [
     new webpack.optimize.UglifyJsPlugin({
-      'screw-ie8': true
+      'screw-ie8': true,
+      sourceMap: true
     }),
     //new webpack.optimize.CommonsChunkPlugin({
     //  name: 'lib',
@@ -64,6 +66,10 @@ module.exports = {
         disable: false,
         allChunks: true
     }),
+    new BugsnagSourceMapUploaderPlugin({
+      apiKey: 'ba9fae819372850fb660755341fa6ef5',
+      appVersion: pkgJson.version
+    }),
     new CopyDirPlugin(path.join(__dirname, 'src/schemas'), 'schemas'),
     new CopyDirPlugin(path.join(__dirname, 'src/images/logo/*'), ''),
     new CopyDirPlugin(path.join(__dirname, 'src/.htaccess'), ''),