From d8e9733170ee8bc0b356543d562339e16b2da9d4 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 15 Feb 2017 19:10:58 +0000 Subject: [PATCH 1/2] Fix issue where extreme values didn't know if a given value was higher == better or higher == worse --- ChangeLog.md | 3 +++ package.json | 2 +- src/app/components/ModificationsMenu.jsx | 2 +- src/index.html | 24 ++++++++++++------------ 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index c1ae7c71..f2ee4160 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +#2.2.16 + * Fix 'Extreme' blueprint roll where some incorrect ranges were chosen + #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 index 5c876bef..6c4627ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "2.2.15", + "version": "2.2.16b", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis" diff --git a/src/app/components/ModificationsMenu.jsx b/src/app/components/ModificationsMenu.jsx index facdd9c9..9bef6235 100644 --- 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 index 99cd1b18..d6742abf 100644 --- a/src/index.html +++ b/src/index.html @@ -22,24 +22,24 @@ - - -
+ + {% if (o.htmlWebpackPlugin.options.uaTracking) { %} + + + {% } %} + + +
- From 4ee5c03cd144be2b0292473077db57907cbdbc48 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 15 Feb 2017 20:44:09 +0000 Subject: [PATCH 2/2] Bump version --- ChangeLog.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index f2ee4160..bc978526 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,8 @@ #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 diff --git a/package.json b/package.json index 6c4627ce..3db4ab44 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "2.2.16b", + "version": "2.2.16", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis"