use input fluid temperature for boilers

From ShadowTheAge#218
shpaass · Jan 23, 2024 · d7c675f · d7c675f
1 parent 33d9197
commit d7c675f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/YAFCmodel/Model/ProductionTable.cs b/YAFCmodel/Model/ProductionTable.cs
@@ -252,7 +252,7 @@ public override async Task<string> Solve(ProjectPage page)
             for (var i = 0; i < allRecipes.Count; i++)
             {
                 var recipe = allRecipes[i];
-                recipe.parameters.CalculateParameters(recipe.recipe, recipe.entity, recipe.fuel, recipe); 
+                recipe.parameters.CalculateParameters(recipe.recipe, recipe.entity, recipe.fuel, recipe.variants, recipe); 
                 var variable = solver.MakeNumVar(0f, double.PositiveInfinity, recipe.recipe.name);
                 if (recipe.fixedBuildings > 0f)
                 {

diff --git a/YAFCmodel/Model/RecipeParameters.cs b/YAFCmodel/Model/RecipeParameters.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace YAFC.Model
 {
@@ -56,7 +57,7 @@ public void Clear()
             modules = default;
         }
 
-        public void CalculateParameters(Recipe recipe, EntityCrafter entity, Goods fuel, IModuleFiller moduleFiller)
+        public void CalculateParameters(Recipe recipe, EntityCrafter entity, Goods fuel, HashSet<FactorioObject> variants, IModuleFiller moduleFiller)
         {
             warningFlags = 0;
             if (entity == null)
@@ -135,6 +136,14 @@ public void CalculateParameters(Recipe recipe, EntityCrafter entity, Goods fuel,
                     if (fluid != null)
                     {
                         float inputTemperature = fluid.temperature;
+                        foreach (var variant in variants)
+                        {
+                            if (variant is Fluid fluidVariant && fluidVariant.originalName == fluid.originalName)
+                            {
+                                inputTemperature = fluidVariant.temperature;
+                            }
+                        }
+
                         var outputTemp = recipe.products[0].goods.fluid.temperature;
                         var deltaTemp = (outputTemp - inputTemperature);
                         var energyPerUnitOfFluid = deltaTemp * fluid.heatCapacity;