From 191e31ff1834fc5ec6dead2afa8929ab831e94dc Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Sun, 5 Feb 2017 15:38:04 +0000
Subject: [PATCH] Use new-style blueprint data; fix numeric special effect
 calculations

---
 ChangeLog.md                             | 4 ++++
 src/app/components/ModificationsMenu.jsx | 8 ++++----
 src/app/shipyard/Module.js               | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index e3d5949c..36cd33e0 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+#2.2.14
+  * Ensure that jitter is shown correctly when the result of a special effect
+  * Use restyled blueprint information
+
 #2.2.13
   * Add 'time to drain' summary value.  This is the time to drain the WEP capacitor if firing all enabled weapons
   * Do not include utility slot DPS/EPS/HPS in summary information
diff --git a/src/app/components/ModificationsMenu.jsx b/src/app/components/ModificationsMenu.jsx
index ee662e8f..0ba1caeb 100644
--- a/src/app/components/ModificationsMenu.jsx
+++ b/src/app/components/ModificationsMenu.jsx
@@ -152,7 +152,7 @@ export default class ModificationsMenu extends TranslatedComponent {
    */
   _rollWorst() {
     const { m, ship } = this.props;
-    const features = m.blueprint.features[m.blueprint.grade];
+    const features = m.blueprint.grades[m.blueprint.grade].features;
     for (const featureName in features) {
       if (Modifications.modifications[featureName].method == 'overwrite') {
         ship.setModification(m, featureName, features[featureName][1]);
@@ -180,7 +180,7 @@ export default class ModificationsMenu extends TranslatedComponent {
    */
   _rollAverage() {
     const { m, ship } = this.props;
-    const features = m.blueprint.features[m.blueprint.grade];
+    const features = m.blueprint.grades[m.blueprint.grade].features;
     for (const featureName in features) {
       if (Modifications.modifications[featureName].method == 'overwrite') {
         ship.setModification(m, featureName, (features[featureName][0] + features[featureName][1]) / 2);
@@ -208,7 +208,7 @@ export default class ModificationsMenu extends TranslatedComponent {
    */
   _rollRandom() {
     const { m, ship } = this.props;
-    const features = m.blueprint.features[m.blueprint.grade];
+    const features = m.blueprint.grades[m.blueprint.grade].features;
     for (const featureName in features) {
       if (Modifications.modifications[featureName].method == 'overwrite') {
         ship.setModification(m, featureName, features[featureName][1]);
@@ -236,7 +236,7 @@ export default class ModificationsMenu extends TranslatedComponent {
    */
   _rollBest() {
     const { m, ship } = this.props;
-    const features = m.blueprint.features[m.blueprint.grade];
+    const features = m.blueprint.grades[m.blueprint.grade].features;
     for (const featureName in features) {
       if (Modifications.modifications[featureName].method == 'overwrite') {
         ship.setModification(m, featureName, features[featureName][1]);
diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js
index b47dec02..7f357f51 100755
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -60,7 +60,8 @@ export default class Module {
           } else {
             mod = modifierActions[name];
           }
-          result = (((1 + result / 10000) * (1 + mod)) - 1) * 10000;
+          const multiplier = modification.type === 'percentage' ? 10000 : 100;
+          result = (((1 + result / multiplier) * (1 + mod)) - 1) * multiplier;
         }
       }
     }