Display power generation recipes

Sankeyfactory · Sep 8, 2024 · 08b2434 · 08b2434
1 parent d3753f1
commit 08b2434
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/src/RecipeSelectionModal.ts b/src/RecipeSelectionModal.ts
@@ -350,7 +350,17 @@ export class RecipeSelectionModal extends EventTarget
             this._selectedRecipe.recipe.products
         );
 
-        this._selectedRecipePower.innerText = `${this._selectedRecipe.madeIn.powerConsumption} MW`;
+        this._selectedRecipePowerText.innerText = `${this._selectedRecipe.madeIn.powerConsumption} MW`;
+
+        // Power generators showing "0 MW" is not intuitive.
+        if (this._selectedRecipe.recipe.id.startsWith("Power_"))
+        {
+            this._selectedRecipePower.classList.add("hidden");
+        }
+        else
+        {
+            this._selectedRecipePower.classList.remove("hidden");
+        }
 
         this._selectedRecipeDisplay.classList.remove("hidden");
 
@@ -632,7 +642,8 @@ export class RecipeSelectionModal extends EventTarget
     private _selectedRecipeMachine = this._selectedRecipeDisplay.querySelector("#selected-recipe-machine>.machine>img.icon") as HTMLImageElement;
     private _selectedRecipeInput = this._selectedRecipeDisplay.querySelector("#selected-recipe-input") as HTMLDivElement;
     private _selectedRecipeOutput = this._selectedRecipeDisplay.querySelector("#selected-recipe-output") as HTMLDivElement;
-    private _selectedRecipePower = this._selectedRecipeDisplay.querySelector("#selected-recipe-power>.text") as HTMLDivElement;
+    private _selectedRecipePower = this._selectedRecipeDisplay.querySelector("#selected-recipe-power") as HTMLDivElement;
+    private _selectedRecipePowerText = this._selectedRecipePower.querySelector(".text") as HTMLDivElement;
 
     private _confirmRecipeButton = this._modalContainer.querySelector("#confirm-recipe") as HTMLDivElement;
     private _discardRecipeButton = this._modalContainer.querySelector("#discard-recipe") as HTMLDivElement;

diff --git a/src/Sankey/NodeResourceDisplay.ts b/src/Sankey/NodeResourceDisplay.ts
@@ -19,7 +19,12 @@ export class NodeResourceDisplay
         this.createOverclockDisplay(recipeContainer);
         this.createInputsDisplay(recipeContainer, recipe);
         this.createOutputsDisplay(recipeContainer, recipe);
-        this.createPowerDisplay(recipeContainer, machine.powerConsumption);
+
+        // Recipes with id beginning with "Power_" are created by parsing tool for power production.
+        if (!recipe.id.startsWith("Power_"))
+        {
+            this.createPowerDisplay(recipeContainer, machine.powerConsumption);
+        }
 
         this._displayContainer.appendChild(recipeContainer);
 

diff --git a/src/Tools/SatisfactoryRecipeExporter/DocsTypes.ts b/src/Tools/SatisfactoryRecipeExporter/DocsTypes.ts
@@ -44,6 +44,7 @@ type DocsPowerGenerator = DocsBuilding & {
     mFuel: DocsFuel[];
     mSupplementalToPowerRatio: string;
     mPowerProduction: string;
+    mFuelResourceForm: string;
 };
 
 type DocsFuel = {

diff --git a/src/Tools/SatisfactoryRecipeExporter/Exporter.ts b/src/Tools/SatisfactoryRecipeExporter/Exporter.ts
@@ -342,8 +342,12 @@ let powerGenerators: Building[] = satisfactory
                 fixCubicMeters(byproduct, byproductDescriptor);
             }
 
+            let resourceForm = docsPowerGenerator.mFuelResourceForm.replace("RF_", "") as ResourceForm;
+
             for (const fuelType of fuelTypes)
             {
+                if (fuelType.energyValue === 0 || fuelType.form !== resourceForm) continue;
+
                 let productionDuration = fuelType.energyValue / powerProduct.amount;
 
                 if (fuelType.form === "LIQUID" || fuelType.form === "GAS")
@@ -356,11 +360,15 @@ let powerGenerators: Building[] = satisfactory
                     amount: 1,
                 };
 
+                // Crutches to make the recipe more universal and compatible with others when
+                // displaying amounts.
+                let powerProduction = powerProduct.amount / (60 / productionDuration);
+
                 let recipe: BuildingRecipe = {
                     id: `Power_${docsPowerGenerator.ClassName}_${fuelType.id}`,
-                    displayName: `Power ${docsPowerGenerator.mDisplayName} with ${fuelType.displayName}`,
+                    displayName: `${fuelType.displayName} (burning)`,
                     ingredients: [fuelIngredient],
-                    products: [powerProduct],
+                    products: [{ id: powerProduct.id, amount: powerProduction }],
                     manufacturingDuration: productionDuration,
                 };
 
@@ -378,7 +386,7 @@ let powerGenerators: Building[] = satisfactory
 
                 if (byproduct != undefined)
                 {
-                    recipe.ingredients.push(byproduct);
+                    recipe.products.push(byproduct);
                 }
 
                 recipes.push(recipe);