Fixed: Improved handling for fluid type recipes

clarabstract · May 5, 2017 · 2fcefe6 · 2fcefe6
1 parent c2d9751
commit 2fcefe6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/calculator.js b/calculator.js
@@ -75,8 +75,10 @@ App.Calculator = {
 		if (rawDataForDifficulty.results) {
 			var selfResult = _.findWhere(rawDataForDifficulty.results, {name: recipe.name});
 			recipe.outputs = selfResult ? selfResult.amount : 1;
+			recipe.type = selfResult ? selfResult.type : "item";
 		} else {
 			recipe.outputs = rawDataForDifficulty.result_count || 1;
+			recipe.type = "item"
 		}
 
 		recipe.ingredients = this._asArray(rawDataForDifficulty.ingredients).map(function(rawIngredient) {

diff --git a/explain.jsx b/explain.jsx
@@ -39,6 +39,7 @@ App.Explain = React.createClass({
 
             var madeBySingular = "assembler";
             var madeByPlural = "assemblers";
+            var madeUnits = "items";
             var assemblerPartOne = (<span>Your chosen assembler has a crafting speed of { bmono(this.props.options.asslvl) }. This means it will take {decimalNumber(recipe.assemblyTime)} seconds to create { wholeNumber(recipe.outputs)} { bmono(recipe.name) }.</span>);
             if (recipe.category == "ore") {
               madeBySingular = "drill";
@@ -49,27 +50,37 @@ App.Explain = React.createClass({
               madeByPlural = "furnaces";
               assemblerPartOne = (<span>Your chosen furnace has a crafting speed of { bmono(this.props.options.smeltlvl) }. This means it will take {decimalNumber(recipe.assemblyTime)} seconds to smelt { wholeNumber(recipe.outputs)} { bmono(recipe.name) }.</span>);
             } else if (recipe.category == "chemistry") {
-              madeBySingular = "furnace";
+              madeBySingular = "chemplant";
               madeByPlural = "chemplants";
               assemblerPartOne = (<span>Chemplants have a crafting speed of { bmono(1.25) }. This means it will take {decimalNumber(recipe.assemblyTime)} seconds to create { wholeNumber(recipe.outputs)} { bmono(recipe.name) }.</span>);
             }
-
+            if (recipe.type == "fluid")
+            {
+              madeUnits = "units"
+            }
+
+            var assemb = null;
+            if (recipe.type != "fluid") {
+                assemb = [
+                  <div className="section"># Assembly Lines</div>,
+                  <div>
+                    One lane of your chosen transport belt can transport only { decimalNumber(this.props.options.beltlvl * 60) } {madeUnits}/min. Since one { madeBySingular } produces at a rate of { decimalNumber(60 / recipe.assemblyTime) } {madeUnits}/min, if { wholeNumber(recipe.assemblersPerLine) } or more { madeByPlural } output onto the same belt, then the belt will back up, limiting production. 
+                  </div>,
+                  <div>
+                    Since you need { wholeNumber(recipe.assemblersRequired) } { madeByPlural }, this means you will need { decimalNumber(recipe.lines) } separate belt lines, which in real life means { wholeNumber(recipe.lines) } belt lines.
+                  </div>,
+                ];
+            }
             details = (
               <div className="details">
                 <div className="section"># Assemblers</div>
                 <div>
-                  { assemblerPartOne } This in turn means one { madeBySingular } produces at a rate of { decimalNumber(recipe.oneAssemblerRate * 60) } items/min.
-                </div>
-                <div>
-                  Therefore, to meet the required rate of { decimalNumber(recipe.ips * 60) } items/min, you need { decimalNumber(recipe.assemblersRequired) } { madeByPlural }, which in real life means { wholeNumber(recipe.assemblersRequired) } { madeByPlural }.
-                </div>
-                <div className="section"># Assembly Lines</div>
-                <div>
-                  One lane of your chosen transport belt can transport only { decimalNumber(this.props.options.beltlvl * 60) } items/min. Since one { madeBySingular } produces at a rate of { decimalNumber(60 / recipe.assemblyTime) } items/min, if { wholeNumber(recipe.assemblersPerLine) } or more { madeByPlural } output onto the same belt, then the belt will back up, limiting production. 
+                  { assemblerPartOne } This in turn means one { madeBySingular } produces at a rate of { decimalNumber(recipe.oneAssemblerRate * 60) } {madeUnits}/min.
                 </div>
                 <div>
-                  Since you need { wholeNumber(recipe.assemblersRequired) } { madeByPlural }, this means you will need { decimalNumber(recipe.lines) } separate belt lines, which in real life means { wholeNumber(recipe.lines) } belt lines.
+                  Therefore, to meet the required rate of { decimalNumber(recipe.ips * 60) } {madeUnits}/min, you need { decimalNumber(recipe.assemblersRequired) } { madeByPlural }, which in real life means { wholeNumber(recipe.assemblersRequired) } { madeByPlural }.
                 </div>
+                {assemb}
               </div>
             );
           }

diff --git a/ingredients.jsx b/ingredients.jsx
@@ -49,11 +49,16 @@ var Ingredients = React.createClass({
       details = [
         <div key="assemblers" className="assemblers">
           { this._wholeNumberRoundUp(this.props.req.assemblersRequired) } <span className="madeBy">{madeBy}</span>
-        </div>,
-        <div key="lines_required" className="lines_required">
-          { this._wholeNumberRoundUp(this.props.req.lines) }
         </div>
       ];
+      if (this.props.req.type != "fluid")
+      {
+        details.push(
+          <div key="lines_required" className="lines_required">
+            { this._wholeNumberRoundUp(this.props.req.lines) }
+          </div>
+        );
+      }
     } else {
       details = null;
     }