From cdcda004f31b2f65675cfab6594804921d9678f7 Mon Sep 17 00:00:00 2001
From: Felix Linker <linkerfelix@gmail.com>
Date: Thu, 31 Dec 2020 18:54:36 +0100
Subject: [PATCH] Implement units in modifications menu

---
 src/app/components/Modification.jsx      | 35 +++++++++++-------------
 src/app/components/ModificationsMenu.jsx | 23 +++++++++++++---
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/app/components/Modification.jsx b/src/app/components/Modification.jsx
index cd7a854c..8dafdfe0 100644
--- a/src/app/components/Modification.jsx
+++ b/src/app/components/Modification.jsx
@@ -10,9 +10,10 @@ import { Module } from 'ed-forge';
  */
 export default class Modification extends TranslatedComponent {
   static propTypes = {
+    highlight: PropTypes.bool,
     m: PropTypes.instanceOf(Module).isRequired,
     property: PropTypes.string.isRequired,
-    highlight: PropTypes.bool,
+    onSet: PropTypes.func.isRequired,
   };
 
   /**
@@ -21,19 +22,22 @@ export default class Modification extends TranslatedComponent {
    */
   constructor(props) {
     super(props);
-    this.state = {};
+    const { m, property } = props;
+    const { beneficial, unit, value } = m.getFormatted(property, true);
+    this.state = { beneficial, unit, value };
   }
 
   /**
    * Notify listeners that a new value has been entered and commited.
    */
   _updateFinished() {
-    const { m, property, value } = this.props;
+    const { onSet, m, property } = this.props;
     const { inputValue } = this.state;
     const numValue = Number(inputValue);
-    if (!isNaN(numValue) && value !== numValue) {
-      m.set(property, numValue);
-      this.setState({ inputValue: undefined });
+    if (!isNaN(numValue) && this.state.value !== numValue) {
+      onSet(property, numValue);
+      const { beneficial, unit, value } = m.getFormatted(property, true);
+      this.setState({ beneficial, unit, value });
     }
   }
 
@@ -43,8 +47,8 @@ export default class Modification extends TranslatedComponent {
    */
   render() {
     const { translate, formats } = this.context.language;
-    const { m, property, highlight, value } = this.props;
-    const { inputValue } = this.state;
+    const { highlight, m, property } = this.props;
+    const { beneficial, unit, value, inputValue } = this.state;
 
     // Some features only apply to specific modules; these features will be
     // undefined on items that do not belong to the same class. Filter these
@@ -66,10 +70,7 @@ export default class Modification extends TranslatedComponent {
                 <span>
                   <NumberEditor value={inputValue || value} stepModifier={1}
                     decimals={2} step={0.01} style={{ textAlign: 'right' }}
-                    className={cn(
-                      'cb',
-                      { 'greyed-out': !highlight },
-                    )}
+                    className={cn('cb', { 'greyed-out': !highlight })}
                     onKeyDown={(event) => {
                       if (event.key == 'Enter') {
                         this._updateFinished();
@@ -81,17 +82,13 @@ export default class Modification extends TranslatedComponent {
                         this.setState({ inputValue });
                       }
                     }} />
-                  {/* TODO: support unit */}
-                  <span className="unit-container">{/* unit */}</span>
+                  <span className="unit-container">{unit}</span>
                 </span>
               </td>
               <td style={{ textAlign: 'center' }}
                 className={cn({
-                  // TODO:
-                  // secondary: isBeneficial,
-                  // Is beneficial might be undefined; in this case we have a 0%
-                  // modifier. Check this here.
-                  // warning: isBeneficial === false,
+                  secondary: beneficial,
+                  warning: beneficial === false,
                 })}
               // TODO: support absolute modifiers
               >{formats.pct(m.getModifier(property))}</td>
diff --git a/src/app/components/ModificationsMenu.jsx b/src/app/components/ModificationsMenu.jsx
index 675429fb..0a28f2f5 100644
--- a/src/app/components/ModificationsMenu.jsx
+++ b/src/app/components/ModificationsMenu.jsx
@@ -67,7 +67,7 @@ export default class ModificationsMenu extends TranslatedComponent {
             // onMouseOver={termtip.bind(null, tooltipContent)}
             // onMouseOut={tooltip.bind(null, null)}
             onClick={() => {
-              m.setBlueprint(blueprint, grade);
+              m.setBlueprint(blueprint, grade, 1);
               this.setState({
                 blueprintMenuOpened: false,
                 specialMenuOpened: true,
@@ -144,8 +144,19 @@ export default class ModificationsMenu extends TranslatedComponent {
    */
   _mkModification(property, highlight) {
     const { m } = this.props;
-    return <Modification key={property} highlight={highlight} m={m}
-      property={property} value={m.get(property)} />;
+
+    let onSet = m.set.bind(m);
+    // Show resistance instead of effectiveness
+    if (property.endsWith('effectiveness')) {
+      const oldProperty = property;
+      property = property.replace('effectiveness', 'resistance');
+      onSet = (_, v) => {
+        m.set(oldProperty, 1 - v / 100);
+      };
+    }
+
+    return <Modification key={property} m={m} property={property}
+      onSet={onSet} highlight={highlight} />;
   }
 
   /**
@@ -275,7 +286,11 @@ export default class ModificationsMenu extends TranslatedComponent {
               m.resetEngineering();
               this.selectedModRef = null;
               this.selectedSpecialRef = null;
-              this.setState({ blueprintProgress: undefined });
+              tooltip(null);
+              this.setState({
+                blueprintMenuOpened: true,
+                blueprintProgress: undefined,
+              });
             }}
             onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RESET')}
             onMouseOut={tooltip.bind(null, null)}