fix crashing on engineering and prod webpack

* Chinese translation

* Added Chinese translation for UI

* Made some strings translatable.

Changed the translation ID of certain words which were used with different meanings in difference places in order to achieve a more accurate translation.

* fixed en format

* Fixed one capitalization mistake

* removed vs folder

.docker/.dockerignore

@@ -1,2 +0,0 @@
-node_modules
-npm-debug.log

.docker/nginx.conf

@@ -1,45 +0,0 @@
-worker_processes 1;
-user nobody nobody;
-error_log /tmp/error.log;
-pid /tmp/nginx.pid;
-
-events {
-
-	worker_connections 1024;
-}
-
-http {
-
-	include /etc/nginx/mime.types;
-	default_type application/octet-stream;
-	sendfile on;
-	client_body_temp_path /tmp/client_body;
-	fastcgi_temp_path /tmp/fastcgi_temp;
-	proxy_temp_path /tmp/proxy_temp;
-	scgi_temp_path /tmp/scgi_temp;
-	uwsgi_temp_path /tmp/uwsgi_temp;
-	access_log /tmp/access.log;
-	error_log /tmp/error.log;
-
-	keepalive_timeout 3000;
-	server {
-		listen 80;
-		listen [::]:80;
-        index index.html;
-		server_name localhost;
-		root /usr/share/nginx/html;
-		autoindex on;
-
-		location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
-			expires -1;
-			add_header Access-Control-Allow-Origin *;
-			add_header Access-Control-Allow-Credentials true;
-			add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-			add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-			access_log off;
-		}
-		location / {
-			try_files $uri $uri/ /index.html =404;
-		}
-	}
-}

.dockerignore

@@ -0,0 +1,77 @@
+node_modules
+npm-debug.log
+### Node template
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+

.esdoc.json

@@ -35,7 +35,7 @@
           "title": "Coriolis",
           "description": "Coriolis Shipyard for Elite Dangerous",
           "repository": "https://github.com/EDCD/coriolis",
-          "site": "https://coriolis.edcd.io",
+          "site": "https://coriolis.io",
           "author": "https://github.com/edcd",
           "image": "./src/images/logo/192x192.png"
         }
@@ -81,7 +81,7 @@
           "title": "Coriolis",
           "description": "Coriolis Shipyard for Elite Dangerous",
           "repository": "https://github.com/EDCD/coriolis",
-          "site": "https://coriolis.edcd.io",
+          "site": "https://coriolis.io",
           "author": "https://github.com/edcd",
           "image": "./src/images/logo/192x192.png"
         }
@@ -100,4 +100,4 @@
       }
     }
   ]
-}
+}

.gitlab-ci.yml

@@ -0,0 +1,13 @@
+image: docker:stable
+services:
+  - docker:dind
+
+stages:
+  - Build image
+
+docker build:
+  stage: Build image
+  script:
+  - img build --build-arg branch=$CI_COMMIT_REF_NAME -t edcd/coriolis:$CI_COMMIT_REF_NAME .
+  - echo "$REGISTRY_PASSWORD" | img login --username "$REGISTRY_USER" --password-stdin
+  - img push edcd/coriolis:$CI_COMMIT_REF_NAME

Dockerfile

@@ -6,29 +6,28 @@ WORKDIR /src/app
 RUN mkdir -p /src/app/coriolis
 RUN mkdir -p /src/app/coriolis-data
 
-COPY ./coriolis/ /src/app/coriolis
+RUN apk add --update git
-COPY ./coriolis-data/ /src/app/coriolis-data
 
-RUN apk update
+COPY . /src/app/coriolis
-RUN apk add git
 
 RUN npm i -g npm
 
 # Set up coriolis-data
 WORKDIR /src/app/coriolis-data
-RUN git fetch --all
+RUN git clone https://github.com/EDCD/coriolis-data.git .
+RUN git checkout ${BRANCH}
 RUN npm install --no-package-lock
 RUN npm start
 
+# Set up coriolis
 WORKDIR /src/app/coriolis
-RUN git fetch --all
 RUN npm install --no-package-lock
 RUN npm run build
 
 
 ### STAGE 2: Production Environment ###
-FROM nginx:1.13.12-alpine as web
+FROM fholzer/nginx-brotli as web
-COPY coriolis/.docker/nginx.conf /etc/nginx/nginx.conf
+COPY nginx.conf /etc/nginx/nginx.conf
 COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html
 WORKDIR /usr/share/nginx/html
 EXPOSE 80

LICENSE.md

@@ -0,0 +1,24 @@
+All Data and [associated JSON](https://github.com/EDCD/coriolis-data) files are intellectual property and copyright of Frontier Developments plc ('Frontier', 'Frontier Developments') and are subject to their
+[terms and conditions](https://www.frontierstore.net/terms-and-conditions/).
+
+The code (Javascript, CSS, HTML, and SVG files only) specificially for Coriolis.io is released under the MIT License.
+
+Copyright (c) 2015 Coriolis.io, Colin McLeod
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software (Javascript, CSS, HTML, and SVG files only), and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

docker-compose.yml

@@ -10,6 +10,8 @@ services:
     - web
     labels:
     - "traefik.docker.network=web"
+    - "traefik.frontend.redirect.regex=^https:\/\/coriolis\.edcd\.io\/(.*)"
+    - "traefik.frontend.redirect.replacement=https://coriolis.io/$1"
     - "traefik.enable=true"
     - "traefik.basic.frontend.rule=Host:coriolis.io,coriolis.edcd.io"
     - "traefik.basic.port=80"
@@ -25,6 +27,8 @@ services:
     labels:
     - "traefik.docker.network=web"
     - "traefik.enable=true"
+    - "traefik.frontend.redirect.regex=^https:\/\/beta\.coriolis\.edcd\.io\/(.*)"
+    - "traefik.frontend.redirect.replacement=https://beta.coriolis.io/$1"
     - "traefik.basic.frontend.rule=Host:beta.coriolis.io,beta.coriolis.edcd.io"
     - "traefik.basic.port=80"
     - "traefik.basic.protocol=http"

nginx.conf

@@ -1,61 +1,96 @@
-worker_processes      2;
+worker_processes 1;
-error_log             ./nginx.error.log;
+user nobody nobody;
-worker_rlimit_nofile  8192;
+error_log /tmp/error.log;
-pid                   nginx.pid;
+pid /tmp/nginx.pid;
 
 events {
-  worker_connections  1024;
+
-  multi_accept        on;
+	worker_connections 1024;
 }
 
 http {
 
-  access_log  off;
+    include /etc/nginx/mime.types;
-  charset UTF-8;
+    default_type application/octet-stream;
+    sendfile on;
+    client_body_temp_path /tmp/client_body;
+    fastcgi_temp_path /tmp/fastcgi_temp;
+    proxy_temp_path /tmp/proxy_temp;
+    scgi_temp_path /tmp/scgi_temp;
+    uwsgi_temp_path /tmp/uwsgi_temp;
+    access_log /tmp/access.log;
+    error_log /tmp/error.log;
 
-  types {
+    # https://nginx.org/en/docs/http/ngx_http_gzip_module.html
-    text/html                             html htm shtml;
+    # Enable gzip compression.
-    text/css                              css;
+    # Default: off
-    text/xml                              xml rss;
+    gzip off;
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
-    application/x-javascript              js;
-    text/plain                            txt;
-    image/png                             png;
-    image/svg+xml                         svg;
-    image/x-icon                          ico;
-    application/pdf                       pdf;
-    text/cache-manifest                   appcache;
-  }
 
-  gzip on;
+    # Compression level (1-9).
-  gzip_vary on;
+    # 5 is a perfect compromise between size and CPU usage, offering about
-  gzip_proxied any;
+    # 75% reduction for most ASCII files (almost identical to level 9).
-  gzip_comp_level 6;
+    # Default: 1
-  gzip_buffers 16 8k;
+    gzip_comp_level 5;
-  gzip_http_version 1.1;
-  gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
 
-  server {
+    # Don't compress anything that's already small and unlikely to shrink much
-    listen       3301;
+    # if at all (the default is 20 bytes, which is bad as that usually leads to
-    server_name  localhost;
+    # larger files after gzipping).
-    root   ./build/;
+    # Default: 20
-    index  index.html;
+    gzip_min_length 256;
 
-    location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
+    # Compress data even for clients that are connecting to us via proxies,
-            expires -1;
+    # identified by the "Via" header (required for CloudFront).
-            add_header Access-Control-Allow-Origin *;
+    # Default: off
+    gzip_proxied any;
+
+    # Tell proxies to cache both the gzipped and regular version of a resource
+    # whenever the client's Accept-Encoding capabilities header varies;
+    # Avoids the issue where a non-gzip capable client (which is extremely rare
+    # today) would display gibberish if their proxy gave them the gzipped version.
+    # Default: off
+    gzip_vary on;
+
+    # Compress all output labeled with one of the following MIME-types.
+    # text/html is always compressed by gzip module.
+    # Default: text/html
+    gzip_types *;
+    brotli on;
+    # brotli_static on;
+    brotli_types *;
+    # This should be turned on if you are going to have pre-compressed copies (.gz) of
+    # static files available. If not it should be left off as it will cause extra I/O
+    # for the check. It is best if you enable this in a location{} block for
+    # a specific directory, or on an individual server{} level.
+    # gzip_static on;
+	keepalive_timeout 3000;
+	server {
+		listen 80;
+		listen [::]:80;
+        index index.html;
+		server_name localhost;
+		root /usr/share/nginx/html;
+		autoindex on;
+
+		location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
+			add_header Access-Control-Allow-Origin *;
+			add_header Access-Control-Allow-Credentials true;
+			add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
+			add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+			access_log off;
+		}
+		location /service-worker.js {
+		    expires -1;
+		    add_header Access-Control-Allow-Origin *;
             add_header Access-Control-Allow-Credentials true;
             add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
             add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-            access_log  off;
+            access_log off;
-    }
+		}
-
+		location / {
-    location / {
+            try_files $uri $uri/ /index.html =404;
-      try_files $uri $uri/ /index.html =404;
+		}
-    }
+		location /iframe.html {
-    location /iframe.html {
+            try_files $uri $uri/ /iframe.html =404;
-      try_files $uri $uri/ /iframe.html =404;
+        }
-    }
+	}
-  }
 }

package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"
   },
-  "homepage": "https://coriolis.edcd.io",
+  "homepage": "https://coriolis.io",
   "bugs": "https://github.com/EDCD/coriolis/issues",
   "private": true,
   "engine": "node >= 4.8.1",
@@ -120,6 +120,7 @@
     "webpack-notifier": "^1.6.0",
     "workbox-webpack-plugin": "^3.6.1"
   },
+  "sideEffects": false,
   "dependencies": {
     "@babel/polyfill": "^7.0.0",
     "browserify-zlib-next": "^1.0.1",

src/app/Coriolis.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Router from './Router';
-import { register } from 'register-service-worker'
+import { register } from 'register-service-worker';
 import { EventEmitter } from 'fbemitter';
 import { getLanguage } from './i18n/Language';
 import Persist from './stores/Persist';
@@ -72,7 +72,7 @@ export default class Coriolis extends React.Component {
       route: {},
       sizeRatio: Persist.getSizeRatio()
     };
-    this._getAnnouncements()
+    this._getAnnouncements();
     Router('', (r) => this._setPage(ShipyardPage, r));
     Router('/import?', (r) => this._importBuild(r));
     Router('/import/:data', (r) => this._importBuild(r));
@@ -105,18 +105,20 @@ export default class Coriolis extends React.Component {
       }
       r.params.ship = ship.id;
       r.params.code = ship.toString();
-      this._setPage(OutfittingPage, r);
+      this._setPage(OutfittingPage, r)
     } catch (err) {
       this._onError('Failed to import ship', r.path, 0, 0, err);
     }
   }
 
-  _getAnnouncements() {
+  async _getAnnouncements() {
-    return request.get('https://orbis.zone/api/announcement')
+    try {
-    .query({showInCoriolis: true})
+      const announces = await request.get('https://orbis.zone/api/announcement')
-    .then(announces => {
+        .query({ showInCoriolis: true });
-      this.setState({ announcements: announces.body })
+      this.setState({ announcements: announces.body });
-    })
+    } catch (err) {
+      console.error(err)
+    }
   }
 
   /**
@@ -351,27 +353,27 @@ export default class Coriolis extends React.Component {
       const self = this;
       if (process.env.NODE_ENV === 'production') {
         register('/service-worker.js', {
-          ready (registration) {
+          ready(registration) {
-            console.log('Service worker is active.')
+            console.log('Service worker is active.');
           },
-          registered (registration) {
+          registered(registration) {
-            console.log('Service worker has been registered.')
+            console.log('Service worker has been registered.');
           },
-          cached (registration) {
+          cached(registration) {
-            console.log('Content has been cached for offline use.')
+            console.log('Content has been cached for offline use.');
           },
-          updatefound (registration) {
+          updatefound(registration) {
-            console.log('New content is downloading.')
+            console.log('New content is downloading.');
           },
-          updated (registration) {
+          updated(registration) {
             self.setState({ appCacheUpdate: true });
-            console.log('New content is available; please refresh.')
+            console.log('New content is available; please refresh.');
           },
-          offline () {
+          offline() {
-            console.log('No internet connection found. App is running in offline mode.')
+            console.log('No internet connection found. App is running in offline mode.');
           },
-          error (error) {
+          error(error) {
-            console.error('Error during service worker registration:', error)
+            console.error('Error during service worker registration:', error);
           }
         });
       }
@@ -394,21 +396,24 @@ export default class Coriolis extends React.Component {
     let currentMenu = this.state.currentMenu;
 
     return <div style={{ minHeight: '100%' }} onClick={this._closeMenu}
-      className={this.state.noTouch ? 'no-touch' : null}>
+                className={this.state.noTouch ? 'no-touch' : null}>
-      <Header announcements={this.state.announcements} appCacheUpdate={this.state.appCacheUpdate} currentMenu={currentMenu} />
+      <Header announcements={this.state.announcements} appCacheUpdate={this.state.appCacheUpdate}
-      <div className="announcement-container">{this.state.announcements.map(a => <Announcement text={a.message}/>)}</div>
+              currentMenu={currentMenu}/>
+      <div className="announcement-container">{this.state.announcements.map(a => <Announcement
+        text={a.message}/>)}</div>
       {this.state.error ? this.state.error : this.state.page ? React.createElement(this.state.page, { currentMenu }) :
-        <NotFoundPage />}
+        <NotFoundPage/>}
       {this.state.modal}
       {this.state.tooltip}
       <footer>
         <div className="right cap">
           <a href="https://github.com/EDCD/coriolis" target="_blank" rel="noopener noreferrer"
-            title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
+             title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
           <br/>
           <a
             href={'https://github.com/EDCD/coriolis/compare/edcd:develop@{' + window.CORIOLIS_DATE + '}...edcd:develop'}
-            target="_blank" rel="noopener noreferrer" title={'Coriolis Commits since' + window.CORIOLIS_DATE}>Commits since last release
+            target="_blank" rel="noopener noreferrer" title={'Coriolis Commits since' + window.CORIOLIS_DATE}>Commits
+            since last release
             ({window.CORIOLIS_DATE})</a>
         </div>
       </footer>

src/app/components/AvailableModulesMenu.jsx

@@ -73,7 +73,12 @@ const GRPCAT = {
   'gfsb': 'guardian',
   'gmrp': 'guardian',
   'gsc': 'guardian',
-  'ghrp': 'guardian'
+  'ghrp': 'guardian',
+
+  // Mining
+  'scl': 'mining',
+  'pwa': 'mining',
+  'sdm': 'mining'
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -90,7 +95,7 @@ const CATEGORIES = {
   'structural reinforcement': ['hr', 'mrp'],
   'dc': ['dc'],
   // Hardpoints
-  'lasers': ['pl', 'ul', 'bl', 'ml'],
+  'lasers': ['pl', 'ul', 'bl'],
   'projectiles': ['mc', 'c', 'fc', 'pa', 'rg'],
   'ordnance': ['mr', 'tp', 'nl'],
   // Utilities
@@ -102,7 +107,9 @@ const CATEGORIES = {
   'experimental': ['axmc', 'axmr', 'rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],
 
   // Guardian
-  'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc']
+  'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc'],
+
+  'mining': ['ml', 'scl', 'pwa', 'sdm', 'abl'],
 };
 
 /**
@@ -221,7 +228,16 @@ export default class AvailableModulesMenu extends TranslatedComponent {
               }
               list.push(buildGroup(grp, modules[grp]));
               for (const i of modules[grp]) {
-                fuzzy.push({ grp, m: i, name: `${i.class}${i.rating} ${translate(grp)} ${i.mount ? i.mount : ''}` });
+                let mount = '';
+                if (i.mount === 'F') {
+                  mount = 'Fixed';
+                } else if (i.mount === 'G') {
+                  mount = 'Gimballed';
+                } else if (i.mount === 'T') {
+                  mount = 'Turreted';
+                }
+                const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' '  + mount : ''} ${translate(grp)}` };
+                fuzzy.push(fuzz);
               }
             }
           }
@@ -363,10 +379,14 @@ export default class AvailableModulesMenu extends TranslatedComponent {
    * mounted module and the hovered modules
    */
   _showSearch() {
+    if (this.props.modules instanceof Array) {
+      return;
+    }
     return (
       <FuzzySearch
         list={this.state.fuzzy}
         keys={['grp', 'name']}
+        tokenize={true}
         className={'input'}
         width={'100%'}
         style={{ padding: 0 }}

src/app/components/Defence.jsx

@@ -52,12 +52,12 @@ export default class Defence extends TranslatedComponent {
    * @return {React.Component} contents
    */
   render() {
-    const { ship, sys, opponentWep } = this.props;
+    const { opponent, sys, opponentWep } = this.props;
     const { language, tooltip, termtip } = this.context;
     const { formats, translate, units } = language;
     const { shield, armour, shielddamage, armourdamage } = this.state;
 
-    const pd = ship.standard[4].m;
+    const pd = opponent.standard[4].m;
 
     const shieldSourcesData = [];
     const effectiveShieldData = [];

src/app/components/HardpointSlot.jsx

@@ -121,11 +121,14 @@ export default class HardpointSlot extends Slot {
           {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.getReload() ? <div className={'l'}>{translate('reload')}: {formats.round(m.getReload())}{u.s}</div> : null}
+          {m.getReload() ? <div className={'l'}>{translate('wep_reload')}: {formats.round(m.getReload())}{u.s}</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}
+          {m.getScanAngle() ? <div className={'l'}>{translate('scan angle')}: {formats.f2(m.getScanAngle())}°</div> : null}
+          {m.getScanRange() ? <div className={'l'}>{translate('scan range')}: {formats.int(m.getScanRange())}{u.m}</div> : null}
+          {m.getMaxAngle() ? <div className={'l'}>{translate('max angle')}: {formats.f2(m.getMaxAngle())}°</div> : null}
           {showModuleResistances && m.getExplosiveResistance() ? <div
             className='l'>{translate('explres')}: {formats.pct(m.getExplosiveResistance())}</div> : null}
           {showModuleResistances && m.getKineticResistance() ? <div

src/app/components/Header.jsx

@@ -349,7 +349,7 @@ export default class Header extends TranslatedComponent {
   _getShipsMenu() {
     let shipList = [];
 
-    for (let s in Ships) {
+    for (let s of this.shipOrder) {
       shipList.push(<ActiveLink key={s} href={outfitURL(s)} className='block'>{Ships[s].properties.name}</ActiveLink>);
     }
 

src/app/components/ModalShoppingList.jsx

@@ -109,17 +109,18 @@ export default class ModalShoppingList extends TranslatedComponent {
    */
   sendToEDEng(event) {
     event.preventDefault();
+    let translate = this.context.language.translate;
     const target = event.target;
     target.disabled = this.state.blueprints.length > 0;
     if (this.state.blueprints.length === 0) {
-      target.innerText = 'No modded components.';
+      target.innerText = translate('No modded components.');
       target.disabled = true;
       setTimeout(() => {
-        target.innerText = 'Send to EDEngineer';
+        target.innerText = translate('Send to EDEngineer');
         target.disabled = false;
       }, 3000);
     } else {
-      target.innerText = 'Sending...';
+      target.innerText = translate('Sending...');
     }
     let countSent = 0;
     let countTotal = this.state.blueprints.length;
@@ -139,7 +140,7 @@ export default class ModalShoppingList extends TranslatedComponent {
           countSent++;
           if (countSent === countTotal) {
             target.disabled = false;
-            target.innerText = 'Send to EDEngineer';
+            target.innerText = translate('Send to EDEngineer');
           }
         });
     }
@@ -230,32 +231,32 @@ export default class ModalShoppingList extends TranslatedComponent {
     this.sendToEDEng = this.sendToEDEng.bind(this);
     return <div className='modal' onClick={ (e) => e.stopPropagation() }>
       <h2>{translate('PHRASE_SHOPPING_MATS')}</h2>
-      <label>Grade 1 rolls </label>
+      <label>{translate('Grade 1 rolls ')}</label>
       <input id={1} type={'number'} min={0} defaultValue={this.state.matsPerGrade[1]} onChange={this.changeHandler} />
       <br/>
-      <label>Grade 2 rolls </label>
+      <label>{translate('Grade 2 rolls ')}</label>
       <input id={2} type={'number'} min={0} defaultValue={this.state.matsPerGrade[2]} onChange={this.changeHandler} />
       <br/>
-      <label>Grade 3 rolls </label>
+      <label>{translate('Grade 3 rolls ')}</label>
       <input id={3} type={'number'} min={0} value={this.state.matsPerGrade[3]} onChange={this.changeHandler} />
       <br/>
-      <label>Grade 4 rolls </label>
+      <label>{translate('Grade 4 rolls ')}</label>
       <input id={4} type={'number'} min={0} value={this.state.matsPerGrade[4]} onChange={this.changeHandler} />
       <br/>
-      <label>Grade 5 rolls </label>
+      <label>{translate('Grade 5 rolls ')}</label>
       <input id={5} type={'number'} min={0} value={this.state.matsPerGrade[5]} onChange={this.changeHandler} />
       <div>
         <textarea className='cb json' readOnly value={this.state.matsList} />
       </div>
-      <label hidden={!compatible} className={'l cap'}>CMDR Name </label>
+      <label hidden={!compatible} className={'l cap'}>{translate('CMDR Name')}</label>
       <br/>
       <select hidden={!compatible} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
         {this.state.cmdrs.map(e => <option key={e}>{e}</option>)}
       </select>
       <br/>
-      <p hidden={!this.state.failed} id={'failed'} className={'l'}>Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)</p>
+      <p hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAIL_EDENGINEER')}</p>
-      <p hidden={compatible} id={'browserbad'} className={'l'}>Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.</p>
+      <p hidden={compatible} id={'browserbad'} className={'l'}>{translate('PHRASE_FIREFOX_EDENGINEER')}</p>
-      <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send To EDEngineer')}</button>
+      <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
       <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
     </div>;
   }

src/app/components/ModificationsMenu.jsx

@@ -478,7 +478,7 @@ export default class ModificationsMenu extends TranslatedComponent {
             <tbody>
               { showRolls ?
                 <tr>
-                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: false }) }> { translate('roll') }: </td>
+                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: false }) }> { translate('mroll') }: </td>
                   <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===    0 }) } style={{ cursor: 'pointer' }} onClick={_rollWorst} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_WORST')} onMouseOut={tooltip.bind(null, null)}> { translate('0%') } </td>
                   <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===   50 })} style={{ cursor: 'pointer' }} onClick={_rollFifty} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_FIFTY')} onMouseOut={tooltip.bind(null, null)}> { translate('50%') } </td>
                   <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===  100 })} style={{ cursor: 'pointer' }} onClick={_rollFull} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_BEST')} onMouseOut={tooltip.bind(null, null)}> { translate('100%') } </td>

src/app/components/OutfittingSubpages.jsx

@@ -174,7 +174,7 @@ export default class OutfittingSubpages extends TranslatedComponent {
               <th style={{ width:'25%' }} className={cn({ active: tab == 'power' })} onClick={this._showTab.bind(this, 'power')} >{translate('power and costs')}</th>
               <th style={{ width:'25%' }} className={cn({ active: tab == 'profiles' })} onClick={this._showTab.bind(this, 'profiles')} >{translate('profiles')}</th>
               <th style={{ width:'25%' }} className={cn({ active: tab == 'offence' })} onClick={this._showTab.bind(this, 'offence')} >{translate('offence')}</th>
-              <th style={{ width:'25%' }} className={cn({ active: tab == 'defence' })} onClick={this._showTab.bind(this, 'defence')} >{translate('defence')}</th>
+              <th style={{ width:'25%' }} className={cn({ active: tab == 'defence' })} onClick={this._showTab.bind(this, 'defence')} >{translate('tab_defence')}</th>
             </tr>
           </thead>
         </table>

src/app/i18n/Language.jsx

@@ -7,8 +7,12 @@ import * as IT from './it';
 import * as RU from './ru';
 import * as PL from './pl';
 import * as PT from './pt';
+import * as CN from './cn';
 import * as d3 from 'd3';
 
+const owofy = require("owofy");
+
+
 let fallbackTerms = EN.terms;
 
 /**
@@ -27,6 +31,7 @@ export function getLanguage(langCode) {
     case 'ru': lang = RU; break;
     case 'pl': lang = PL; break;
     case 'pt': lang = PT; break;
+    case 'cn': lang = CN; break;
     default:
       lang = EN;
   }
@@ -37,7 +42,14 @@ export function getLanguage(langCode) {
   const round = function(x, n) { const ten_n = Math.pow(10,n); return Math.round(x * ten_n) / ten_n; };
 
   if(lang === EN) {
-    translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || t; };
+    translate = (t, x) => {
+      if (currentTerms[t + '_' + x]) {
+        return owofy(currentTerms[t + '_' + x])
+      } else if (currentTerms[t]) {
+        return owofy(currentTerms[t])
+      }
+      return t;
+    };
   } else {
     translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || fallbackTerms[t + '_' + x] || fallbackTerms[t] || t; };
   }
@@ -94,5 +106,6 @@ export const Languages = {
   fr: 'Français',
   ru: 'ру́сский',
   pl: 'polski',
-  pt: 'português'
+  pt: 'português',
+  cn: '中文'
 };

src/app/i18n/cn.js

@@ -0,0 +1,16 @@
+export const formats = {
+  decimal: '.',
+  thousands: ',',
+  grouping: [3],
+  currency: ['￥', ''],
+  dateTime: '%a %b %e %X %Y',
+  date: '%Y年%m月%d日',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
+  shortDays: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+  months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+  shortMonths: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
+};
+
+export { default as terms } from './cn.json';

src/app/i18n/en.json

@@ -81,6 +81,8 @@
     "TT_SUMMARY_UNLADEN_TOTAL_JUMP": "Farthest possible range with no cargo, a full fuel tank, and jumping as far as possible each time",
     "TT_SUMMARY_LADEN_TOTAL_JUMP": "Farthest possible range with full cargo, a full fuel tank, and jumping as far as possible each time",
     "HELP_MODIFICATIONS_MENU": "Click on a number to enter a new value, or drag along the bar for small changes",
+	"PHRASE_FAIL_EDENGINEER": "Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)",
+	"PHRASE_FIREFOX_EDENGINEER": "Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.",
     "am": "Auto Field-Maintenance Unit",
     "bh": "Bulkheads",
     "bl": "Beam Laser",
@@ -132,6 +134,10 @@
     "gfsb": "Guardian Frame Shift Drive Booster",
     "ghrp": "Guardian Hull Reinforcement Package",
     "gmrp": "Guardian Module Reinforcement Package",
+    "pwa": "Pulse Wave Analyser",
+    "abl": "Abrasion Blaster",
+    "scl": "Seismic Charge Launcher",
+    "sdm": "Sub-Surface Displacement Missile",
     "tbsc": "Shock Cannon",
     "gsc": "Guardian Shard Cannon",
     "psg": "Prismatic Shield Generator",
@@ -168,6 +174,7 @@
     "ammunition": "Ammo",
     "secs": "s",
     "rebuildsperbay": "Rebuilds per bay",
+	"mroll": "Roll",
     "worst": "Worst",
     "average": "Average",
     "random": "Random",
@@ -234,6 +241,7 @@
     "rof": "Rate of fire",
     "angle": "Scan angle",
     "scanrate": "Scan rate",
+    "proberadius": "Probe Radius",
     "scantime": "Scan time",
     "shield": "Shield",
     "armour": "Armour",
@@ -315,6 +323,7 @@
     "never": "never",
     "stock": "stock",
     "boost": "boost",
+	"tab_defence": "defence",
     "federation rank 1": "Recruit",
     "federation rank 2": "Cadet",
     "federation rank 3": "Midshipman",

src/app/pages/AboutPage.jsx

@@ -103,7 +103,7 @@ export default class AboutPage extends Page {
             patreon.com/coriolis_elite
           </a>
           , which will be used to keep Coriolis up to date and the servers
-          running. I also run ads, which are also used for development and hosting.
+          running.
         </p>
         <form
           action="https://www.paypal.com/cgi-bin/webscr"

src/app/pages/OutfittingPage.jsx

@@ -224,9 +224,12 @@ export default class OutfittingPage extends Page {
         const control = LZString.decompressFromBase64(
           Utils.fromUrlSafe(parts[4])
         ).split('/');
-        sys = parseFloat(control[0]) || sys;
+        sys = parseFloat(control[0]);
-        eng = parseFloat(control[1]) || eng;
+        eng = parseFloat(control[1]);
-        wep = parseFloat(control[2]) || wep;
+        wep = parseFloat(control[2]);
+        if (sys + eng + wep > 6) {
+          sys = eng = wep = 2;
+        }
         boost = control[3] == 1 ? true : false;
         fuel = parseFloat(control[4]) || fuel;
         cargo = parseInt(control[5]) || cargo;

src/app/pages/Page.jsx

@@ -70,6 +70,13 @@ export default class Page extends React.Component {
     document.title = this.state.title || 'Coriolis';
   }
 
+  /**
+   * Update the window title upon mount
+   */
+  componentDidMount() {
+    document.title = this.state.title || 'Coriolis';
+  }
+
   /**
    * Updates the title upon change
    * @param  {Object} newProps  Incoming properties

src/app/pages/ShipyardPage.jsx

@@ -6,6 +6,7 @@ import Ship from '../shipyard/Ship';
 import * as ModuleUtils from '../shipyard/ModuleUtils';
 import { SizeMap } from '../shipyard/Constants';
 import Link from '../components/Link';
+const owofy = require("owofy");
 
 /**
  * Counts the hardpoints by class/size
@@ -169,23 +170,21 @@ export default class ShipyardPage extends Page {
    * @param  {Object} u           Localized unit map
    * @param  {Function} fInt      Localized integer formatter
    * @param  {Function} fRound    Localized round formatter
-   * @param  {Boolean} highlight  Should this row be highlighted
    * @return {React.Component}    Table Row
    */
-  _shipRowElement(s, translate, u, fInt, fRound, highlight) {
+  _shipRowElement(s, translate, u, fInt, fRound) {
     let noTouch = this.context.noTouch;
 
     return (
       <tr
         key={s.id}
-        style={{ height: '1.5em' }}
+        style={{ height: "1.5em" }}
         className={cn({
-          highlighted: noTouch && this.state.shipId === s.id,
+          highlighted: noTouch && this.state.shipId === s.id
-          alt: highlight
         })}
         onMouseEnter={noTouch && this._highlightShip.bind(this, s.id)}
       >
-        <td className="ri">{s.manufacturer}</td>
+        <td className="ri">{owofy(s.manufacturer)}</td>
         <td className="ri">{fInt(s.retailCost)}</td>
         <td className="ri cap">{translate(SizeMap[s.class])}</td>
         <td className="ri">{fInt(s.crew)}</td>
@@ -286,27 +285,13 @@ export default class ShipyardPage extends Page {
     let shipRows = new Array(shipSummaries.length);
     let detailRows = new Array(shipSummaries.length);
 
-    let lastShipSortValue = null;
-    let backgroundHighlight = false;
-
     for (let s of shipSummaries) {
-      let shipSortValue = s[shipPredicate];
-      if (shipPredicateIndex != undefined) {
-        shipSortValue = shipSortValue[shipPredicateIndex];
-      }
-
-      if (shipSortValue != lastShipSortValue) {
-        backgroundHighlight = !backgroundHighlight;
-        lastShipSortValue = shipSortValue;
-      }
-
       detailRows[i] = this._shipRowElement(
         s,
         translate,
         units,
         fInt,
         formats.f1,
-        backgroundHighlight
       );
       shipRows[i] = (
         <tr
@@ -314,18 +299,16 @@ export default class ShipyardPage extends Page {
           style={{ height: '1.5em' }}
           className={cn({
             highlighted: noTouch && this.state.shipId === s.id,
-            alt: backgroundHighlight
           })}
           onMouseEnter={noTouch && this._highlightShip.bind(this, s.id)}
         >
           <td className="le">
-            <Link href={'/outfit/' + s.id}>{s.name} {s.beta === true ? '(Beta)' : null}</Link>
+            <Link href={'/outfit/' + s.id}>{owofy(s.name)} {s.beta === true ? '(Beta)' : null}</Link>
           </td>
         </tr>
       );
       i++;
     }
-
     return (
       <div className="page" style={{ fontSize: sizeRatio + 'em' }}>
         <div
@@ -612,6 +595,7 @@ export default class ShipyardPage extends Page {
                 {detailRows}
               </tbody>
             </table>
+
           </div>
         </div>
       </div>

src/app/shipyard/Constants.js

@@ -94,6 +94,10 @@ export const ModuleGroupToName = {
   gsc: 'Guardian Shard Cannon',
   tbem: 'Enzyme Missile Rack',
   tbrfl: 'Remote Release Flechette Launcher',
+  pwa: 'Pulse Wave Analyser',
+  abl: 'Abrasion Blaster',
+  scl: 'Seismic Charge Launcher',
+  sdm: 'Sub-Surface Displacement Missile',
 };
 
 let GrpNameToCodeMap = {};

src/app/shipyard/Module.js

@@ -167,7 +167,7 @@ export default class Module {
     } else if (name === 'shieldboost' || name === 'hullboost') {
       modValue = (1 + value) / (1 + baseValue) - 1;
     } else { // multiplicative
-      modValue = value / baseValue - 1;
+      modValue = baseValue == 0 ? 0 : value / baseValue - 1;
     }
 
     if (modification.type === 'percentage') {
@@ -703,8 +703,7 @@ export default class Module {
     let result = 0;
     if (this['maxmass']) {
       result = this['maxmass'];
-      // max mass is only modified for non-shield boosters
+      if (result && modified) {
-      if (result && modified && this.grp !== 'sg') {
         let mult = this.getModValue('optmass') / 10000;
         if (mult) { result = result * (1 + mult); }
       }
@@ -1073,4 +1072,31 @@ export default class Module {
   getHackTime(modified = true) {
     return this.get('hacktime', modified);
   }
+
+  /**
+   * Get the scan range for this module
+   * @param {Boolean} [modified=true] Whether to take modifications into account
+   * @return {string} the time for this module
+   */
+  getScanRange(modified = true) {
+    return this.get('scanrange', modified);
+  }
+
+  /**
+   * Get the scan angle for this module
+   * @param {Boolean} [modified=true] Whether to take modifications into account
+   * @return {string} the time for this module
+   */
+  getScanAngle(modified = true) {
+    return this.get('scanangle', modified);
+  }
+
+  /**
+   * Get the max angle for this module
+   * @param {Boolean} [modified=true] Whether to take modifications into account
+   * @return {string} the time for this module
+   */
+  getMaxAngle(modified = true) {
+    return this.get('maxangle', modified);
+  }
 }

src/app/shipyard/Serializer.js

@@ -85,12 +85,12 @@ export function toDetailedBuild(buildName, ship) {
       code = ship.toString();
 
   let data = {
-    $schema: 'https://coriolis.edcd.io/schemas/ship-loadout/4.json#',
+    $schema: 'https://coriolis.io/schemas/ship-loadout/4.json#',
     name: buildName,
     ship: ship.name,
     references: [{
       name: 'Coriolis.io',
-      url: 'https://coriolis.edcd.io' + outfitURL(ship.id, code, buildName),
+      url: 'https://coriolis.io' + outfitURL(ship.id, code, buildName),
       code,
       shipId: ship.id
     }],

src/app/shipyard/Ship.js

@@ -1308,7 +1308,7 @@ export default class Ship {
     let fsd = this.standard[2].m;   // Frame Shift Drive;
     let { unladenMass, fuelCapacity } = this;
     this.unladenRange = this.calcUnladenRange(); // Includes fuel weight for jump
-    this.fullTankRange = Calc.jumpRange(unladenMass + fuelCapacity, fsd, this); // Full Tank
+    this.fullTankRange = Calc.jumpRange(unladenMass + fuelCapacity, fsd, fuelCapacity, this); // Full Tank
     this.ladenRange = this.calcLadenRange(); // Includes full tank and caro
     this.unladenFastestRange = Calc.totalJumpRange(unladenMass + this.fuelCapacity, fsd, fuelCapacity, this);
     this.ladenFastestRange = Calc.totalJumpRange(unladenMass + this.fuelCapacity + this.cargoCapacity, fsd, fuelCapacity, this);

src/app/shipyard/StatsFormatting.js

@@ -78,5 +78,6 @@ export const STATS_FORMATTING = {
   'thermres': { 'format': 'pct' },
   'wepcap': { 'format': 'round1', 'unit': 'MJ' },
   'weprate': { 'format': 'round1', 'unit': 'MW' },
-  'jumpboost': { 'format': 'round1', 'unit': 'LY' }
+  'jumpboost': { 'format': 'round1', 'unit': 'LY' },
+  'proberadius': { 'format': 'pct1', 'unit': 'pct' },
 };

src/app/utils/SlotFunctions.js

@@ -145,11 +145,11 @@ export function diffDetails(language, m, mm) {
   if (m.grp === 'pp') {
     let mPowerGeneration = m.pgen || 0;
     let mmPowerGeneration = mm ? mm.getPowerGeneration() : 0;
-    if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MJ}</span></div>);
+    if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MW}</span></div>);
   } else {
     let mPowerUsage = m.power || 0;
     let mmPowerUsage = mm ? mm.getPowerUsage() || 0 : 0;
-    if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MJ}</span></div>);
+    if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MW}</span></div>);
   }
 
   let mDps = m.damage * (m.rpshot || 1) * (m.rof || 1);

src/clippy.css

@@ -0,0 +1,61 @@
+.clippy, .clippy-balloon {
+    position: fixed;
+    z-index: 1000;
+    cursor: pointer;
+}
+
+.clippy-balloon {
+
+    background: #FFC;
+    color: black;
+    padding: 8px;
+    border: 1px solid black;
+    border-radius: 5px;
+
+}
+
+.clippy-content {
+    max-width: 200px;
+    min-width: 120px;
+    font-family: "Microsoft Sans", sans-serif;
+    font-size: 10pt;
+}
+
+.clippy-tip {
+    width: 10px;
+    height: 16px;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAgCAMAAAAlvKiEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAlQTFRF///MAAAA////52QwgAAAAAN0Uk5T//8A18oNQQAAAGxJREFUeNqs0kEOwCAIRFHn3//QTUU6xMyyxii+jQosrTPkyPEM6IN3FtzIRk1U4dFeKWQiH6pRRowMVKEmvronEynkwj0uZJgR22+YLopPSo9P34wJSamLSU7lSIWLJU7NkNomNlhqxUeAAQC+TQLZyEuJBwAAAABJRU5ErkJggg==) no-repeat;
+    position: absolute;
+}
+
+.clippy-top-left .clippy-tip {
+    top: 100%;
+    margin-top: 0px;
+    left: 100%;
+    margin-left: -50px;
+}
+
+.clippy-top-right .clippy-tip {
+    top: 100%;
+    margin-top: 0px;
+    left: 0;
+    margin-left: 50px;
+    background-position: -10px 0;
+
+}
+
+.clippy-bottom-right .clippy-tip {
+    top: 0;
+    margin-top: -16px;
+    left: 0;
+    margin-left: 50px;
+    background-position: -10px -16px;
+}
+
+.clippy-bottom-left .clippy-tip {
+    top: 0;
+    margin-top: -16px;
+    left: 100%;
+    margin-left: -50px;
+    background-position: 0px -16px;
+}

src/index.ejs

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
     <title>Coriolis EDCD Edition</title>
     <meta charset="UTF-8">
     <link rel="stylesheet" href="<%= htmlWebpackPlugin.files.css[0] %>">
@@ -13,7 +13,7 @@
     <link rel="manifest" href="/manifest.json">
     <link rel="shortcut icon" href=/favicon2.ico>
     <link rel="icon" sizes="152x152 192x192" type="image/png"
-      href="/192x192.png">
+          href="/192x192.png">
 
     <!-- Apple/iOS headers -->
     <meta name="apple-mobile-web-app-capable" content="yes">
@@ -29,44 +29,74 @@
     <script>
       window.CORIOLIS_GAPI_KEY = '<%- htmlWebpackPlugin.options.gapiKey %>';
       window.CORIOLIS_VERSION = '<%- htmlWebpackPlugin.options.version %>';
-      window.CORIOLIS_DATE = '<%- htmlWebpackPlugin.options.date.toISOString().slice(0, 10)  %>';
+      window.CORIOLIS_DATE = '<%- htmlWebpackPlugin.options.date.toISOString().slice(0, 10) %>';
-      window.BUGSNAG_VERSION = '<%- htmlWebpackPlugin.options.version + '-' + htmlWebpackPlugin.options.date.toISOString()  %>';
+      window.BUGSNAG_VERSION = '<%- htmlWebpackPlugin.options.version + '-' + htmlWebpackPlugin.options.date.toISOString() %>';
     </script>
     <% if (htmlWebpackPlugin.options.uaTracking) { %>
-      <script>
-      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
-      ga('create', '<%- htmlWebpackPlugin.options.uaTracking %>', 'auto');
-      ga('send', 'pageview');
-    </script>
-      <script async src='https://www.google-analytics.com/analytics.js'></script>
-      <% } %>
-
-        <!-- Piwik -->
-        <!-- <script type="text/javascript">
-      var _paq = _paq || [];
-      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-      _paq.push(["setCookieDomain", "*.coriolis.edcd.io"]);
-      _paq.push(['trackPageView']);
-      _paq.push(['enableLinkTracking']);
-      (function() {
-        var u="//stats.isadankme.me/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', '4']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-      })();
-    </script>-->
-        <!-- End Piwik Code -->
-
-        <!-- Bugsnag -->
-        <script src="https://d2wy8f7a9ursnm.cloudfront.net/v5.0.0/bugsnag.min.js"></script>
         <script>
-      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.BUGSNAG_VERSION || undefined})
+          window.ga = window.ga || function() {(ga.q = ga.q || []).push(arguments);};
-      window.Bugsnag = window.bugsnagClient
+          ga.l = +new Date;
-    </script>
+          ga('create', '<%- htmlWebpackPlugin.options.uaTracking %>', 'auto');
-      </head>
+          ga('send', 'pageview');
-      <body style="background-color:#000;">
+        </script>
-        <section id="coriolis"></section>
+        <script async src='https://www.google-analytics.com/analytics.js'></script>
+    <% } %>
 
-      </body>
+    <!-- Piwik -->
-    </html>
+    <!-- <script type="text/javascript">
+  var _paq = _paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setCookieDomain", "*.coriolis.edcd.io"]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//stats.isadankme.me/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '4']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>-->
+    <!-- End Piwik Code -->
+
+    <!-- Bugsnag -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
+    <script src="https://d2wy8f7a9ursnm.cloudfront.net/v5.0.0/bugsnag.min.js"></script>
+    <script src="/clippy.min.js"></script>
+    <script type="text/javascript">
+      const advice = ['When all else fails, Put a docking computer in every slot. My name is Clippy.',
+        'Fly in a stright line and roll, your evasion increases by 200%!',
+        'Boost!!!',
+        'If you are running out of power, consider deactivating thrusters!',
+        'Make sure to set fire-groups for your SCBs!',
+        'If you find yourself dying often - git gud!',
+        'Remember, shield boosters increase skill!',
+        'Remember, B rated drives offer greater speed!',
+        'Point directly into the jet cone and full throttle for optimal FSD boost.',
+        'Raxxla can only be found in open play.',
+      'Try silent running when under focus to drop aggro, and reboot when your opponents lose sight of you!'];
+      clippy.load('Clippy', function(agent) {
+        // do anything with the loaded agent
+        agent.show();
+
+        setInterval(() => {
+          agent.animate();
+          const toSpeak = advice[Math.random() * advice.length >> 0];
+          agent.speak(toSpeak);
+        }, (20000));
+        setInterval(() => {
+          agent.animate();
+          agent.speak('@everyone FDL. :pray:');
+        }, (69000));
+      });
+    </script>
+    <script>
+      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', { appVersion: window.BUGSNAG_VERSION || undefined });
+      window.Bugsnag = window.bugsnagClient;
+    </script>
+</head>
+<body style="background-color:#000;">
+<section id="coriolis"></section>
+
+</body>
+</html>

src/less/app.less

@@ -184,3 +184,5 @@ footer {
   border: 1px @secondary solid;
   padding: 10px;
 }
+
+@import "../../node_modules/clippy.js/build/clippy.css";

src/less/colors.less

@@ -6,8 +6,8 @@
 // Foreground colors
 @fg: #CCC;
 @muted: #999;
-@primary: #FF8C0D; // Light Orange
+@primary: #e64980; // Light Orange
-@secondary: #1FB0FF;  // Light blue
+@secondary: #9775fa;  // Light blue
 @warning: #FF3B00;  // Dark Orange
 @disabled: #555;    // Light grey
 @success: #71a052;    // Green

src/less/table.less

@@ -55,7 +55,7 @@ tbody tr {
     background-color: @warning-bg;
   }
 
-  &.alt {
+  &:nth-child(odd){
     background-color: @alt-primary-bg;
   }
 }

src/schemas/ship-loadout/1.json

@@ -1,6 +1,6 @@
 {
   "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/1.json#",
+  "id":                 "https://coriolis.io/schemas/ship-loadout/1.json#",
   "title":              "Ship Loadout",
   "type":               "object",
   "description":        "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",

src/schemas/ship-loadout/2.json

@@ -1,6 +1,6 @@
 {
   "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/2.json#",
+  "id":                 "https://coriolis.io/schemas/ship-loadout/2.json#",
   "title":              "Ship Loadout",
   "type":               "object",
   "description":        "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",

src/schemas/ship-loadout/3.json

@@ -1,6 +1,6 @@
 {
   "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/3.json#",
+  "id":                 "https://coriolis.io/schemas/ship-loadout/3.json#",
   "title":              "Ship Loadout",
   "type":               "object",
   "description":        "The details for a specific ship build/loadout",

src/schemas/ship-loadout/4.json

@@ -1,6 +1,6 @@
 {
   "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/4.json#",
+  "id":                 "https://coriolis.io/schemas/ship-loadout/4.json#",
   "title":              "Ship Loadout",
   "type":               "object",
   "description":        "The details for a specific ship build/loadout",

src/sw.js

@@ -8,7 +8,13 @@ if (workbox) {
 
   workbox.routing.registerRoute(
     new RegExp('/(.*?)'),
-    workbox.strategies.staleWhileRevalidate()
+    workbox.strategies.staleWhileRevalidate({
+      plugins: [
+        new workbox.cacheableResponse.Plugin({
+          statuses: [0, 200]
+        })
+      ]
+    })
   );
 
   workbox.routing.registerRoute(

webpack.config.dev.js

@@ -14,7 +14,7 @@ module.exports = {
   },
   mode: 'development',
   entry: {
-    main: './src/app/index.js'
+    main: './src/app/index.js',
   },
   resolve: {
     // When requiring, you don't need to add these extensions
@@ -22,17 +22,15 @@ module.exports = {
   },
   optimization: {
     minimize: false,
-    splitChunks: {
+    usedExports: true
-      chunks: 'all'
-    }
   },
   output: {
     path: path.join(__dirname, 'build'),
-    filename: 'app.js',
+    chunkFilename: '[name].bundle.js',
     publicPath: '/'
   },
   plugins: [
-    new CopyWebpackPlugin(['src/.htaccess', 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js']),
+    new CopyWebpackPlugin(['src/.htaccess', 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js', 'src/clippy.min.js']),
     // new webpack.optimize.CommonsChunkPlugin({
     //   name: 'lib',
     //   filename: 'lib.js'
@@ -56,7 +54,10 @@ module.exports = {
   module: {
     rules: [
       { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) },
-      { test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' }) },
+      {
+        test: /\.less$/,
+        loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' })
+      },
       { test: /\.(js|jsx)$/, loaders: ['babel-loader'], include: path.join(__dirname, 'src') },
       { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
       { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },

webpack.config.prod.js

@@ -11,26 +11,28 @@ const buildDate = new Date();
 module.exports = {
   devtool: 'source-map',
   entry: {
-    main: ['./src/app/index.js']
+    main: './src/app/index.js'
   },
   resolve: {
     extensions: ['.js', '.jsx', '.json', '.less']
   },
   output: {
     path: path.join(__dirname, 'build'),
-    filename: '[name].[hash].js',
+    chunkFilename: '[name].bundle.js',
     publicPath: '/',
     globalObject: 'this'
   },
   mode: 'production',
   optimization: {
     minimize: true,
-    splitChunks: {
+    usedExports: true
-      chunks: 'all'
-    }
   },
   plugins: [
-    new CopyWebpackPlugin(['src/.htaccess', { from: 'src/schemas', to: 'schemas' }, {from: 'src/images/logo/*', flatten: true, to: ''}, 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js']),
+    new CopyWebpackPlugin(['src/.htaccess', { from: 'src/schemas', to: 'schemas' }, {
+      from: 'src/images/logo/*',
+      flatten: true,
+      to: ''
+    }, 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js', 'src/clippy.min.js']),
     // new webpack.optimize.CommonsChunkPlugin({
     //  name: 'lib',
     //  filename: 'lib.[chunkhash:6].js'
@@ -48,15 +50,15 @@ module.exports = {
       disable: false,
       allChunks: true
     }),
-    new BugsnagBuildReporterPlugin({
+    // new BugsnagBuildReporterPlugin({
-      apiKey: 'ba9fae819372850fb660755341fa6ef5',
+    //   apiKey: 'ba9fae819372850fb660755341fa6ef5',
-      appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
+    //   appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
-    }, { /* opts */ }),
+    // }, { /* opts */ }),
-    new BugsnagSourceMapUploaderPlugin({
+    // new BugsnagSourceMapUploaderPlugin({
-      apiKey: 'ba9fae819372850fb660755341fa6ef5',
+    //   apiKey: 'ba9fae819372850fb660755341fa6ef5',
-      overwrite: true,
+    //   overwrite: true,
-      appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
+    //   appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
-    }),
+    // }),
     new InjectManifest({
       swSrc: './src/sw.js',
       importWorkboxFrom: 'cdn',
@@ -66,7 +68,10 @@ module.exports = {
   module: {
     rules: [
       { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) },
-      { test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' }) },
+      {
+        test: /\.less$/,
+        loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' })
+      },
       { test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src') },
       { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
       { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },