Merge branch 'release/2.2.16'

EDCD · Feb 15, 2017 · 230351b · 230351b
2 parents 45e6b71 + 4ee5c03
commit 230351b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,9 @@
+#2.2.16
+  * Fix 'Extreme' blueprint roll where some incorrect ranges were chosen
+  * Use coriolis-data 2.2.16:
+    * Fix incorrect thermal load modifiers for dirty drives
+    * Provide explicit information about if values are higher numeric value == better or not
+
 #2.2.15
   * Ensure that standard slots are repainted when any component changes
   * Reload page if Safari throws a security error

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.2.15",
+  "version": "2.2.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"

diff --git a/src/app/components/ModificationsMenu.jsx b/src/app/components/ModificationsMenu.jsx
@@ -220,7 +220,7 @@ export default class ModificationsMenu extends TranslatedComponent {
     const { m, ship } = this.props;
     const features = m.blueprint.grades[m.blueprint.grade].features;
     for (const featureName in features) {
-      const value = Math.abs(features[featureName][0]) < Math.abs(features[featureName][1]) ? features[featureName][1] : features[featureName][0];
+      const value = Modifications.modifications[featureName].higherbetter ? features[featureName][1] : features[featureName][0];
       this._setRollResult(ship, m, featureName, value);
     }
     this.setState({ modifications: this._setModifications(this.props) });

diff --git a/src/index.html b/src/index.html
@@ -22,24 +22,24 @@
     <meta name="msapplication-TileImage" content="/mstile-144x144.png">
     <meta name="msapplication-config" content="/browserconfig.xml">
     <meta name="theme-color" content="#000000">
-  </head>
-  <body style="background-color:#000;">
-    <section id="coriolis"></section>
+
     <script>
       window.CORIOLIS_GAPI_KEY = '{%= o.htmlWebpackPlugin.options.gapiKey %}';
       window.CORIOLIS_VERSION = '{%= o.htmlWebpackPlugin.options.version %}';
       window.CORIOLIS_DATE = '{%= new Date().toISOString().slice(0, 10)  %}';
     </script>
-    <script src="{%= o.htmlWebpackPlugin.files.chunks.lib.entry %}" charset="utf-8" crossorigin="anonymous"></script>
-    <script src="{%= o.htmlWebpackPlugin.files.chunks.app.entry %}" charset="utf-8" crossorigin="anonymous"></script>
+    {% if (o.htmlWebpackPlugin.options.uaTracking) { %}
     <script>
-      {% if (o.htmlWebpackPlugin.options.uaTracking) { %}
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-        ga('create', '{%= o.htmlWebpackPlugin.options.uaTracking %}', 'auto');
-      {% } %}
+      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+      ga('create', '{%= o.htmlWebpackPlugin.options.uaTracking %}', 'auto');
+      ga('send', 'pageview');
     </script>
+    <script async src='https://www.google-analytics.com/analytics.js'></script>
+    {% } %}
+  </head>
+  <body style="background-color:#000;">
+    <section id="coriolis"></section>
+    <script src="{%= o.htmlWebpackPlugin.files.chunks.lib.entry %}" charset="utf-8" crossorigin="anonymous"></script>
+    <script src="{%= o.htmlWebpackPlugin.files.chunks.app.entry %}" charset="utf-8" crossorigin="anonymous"></script>
   </body>
 </html>