feat: prefer selected fuel

shpaass · May 5, 2024 · d80260e · d80260e
1 parent bca42c8
commit d80260e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Yafc/Workspace/ProductionTable/ProductionTableView.cs b/Yafc/Workspace/ProductionTable/ProductionTableView.cs
@@ -595,12 +595,13 @@ public override void CreateModelDropdown(ImGui gui, Type type, Project project)
         }
 
         private static readonly IComparer<Goods> DefaultVariantOrdering = new DataUtils.FactorioObjectComparer<Goods>((x, y) => (y.ApproximateFlow() / MathF.Abs(y.Cost())).CompareTo(x.ApproximateFlow() / MathF.Abs(x.Cost())));
-        private RecipeRow AddRecipe(ProductionTable table, Recipe recipe) {
+        private RecipeRow AddRecipe(ProductionTable table, Recipe recipe, Goods SelectedFuel = null) {
             RecipeRow recipeRow = new RecipeRow(table, recipe);
             table.RecordUndo().recipes.Add(recipeRow);
-            recipeRow.entity = recipe.crafters.AutoSelect(DataUtils.FavoriteCrafter);
+            EntityCrafter SelectedFuelCrafter = SelectedFuel?.fuelFor.OfType<EntityCrafter>().Where(e => e.recipes.OfType<Recipe>().Any(e => e == recipe)).AutoSelect(DataUtils.FavoriteCrafter);
+            recipeRow.entity = SelectedFuelCrafter ?? recipe.crafters.AutoSelect(DataUtils.FavoriteCrafter);
             if (recipeRow.entity != null) {
-                recipeRow.fuel = recipeRow.entity.energy.fuels.AutoSelect(DataUtils.FavoriteFuel);
+                recipeRow.fuel = recipeRow.entity.energy.fuels.FirstOrDefault(e => e == SelectedFuel) ?? recipeRow.entity.energy.fuels.AutoSelect(DataUtils.FavoriteFuel);
             }
 
             foreach (var ingr in recipeRow.recipe.ingredients) {
@@ -657,6 +658,7 @@ bool recipeExists(Recipe rec) {
                 return allRecipes.Contains(rec);
             }
 
+            Goods selectedFuel = null;
             async void addRecipe(Recipe rec) {
                 if (variants == null) {
                     CreateLink(context, goods);
@@ -674,7 +676,7 @@ async void addRecipe(Recipe rec) {
                     }
                 }
                 if (!allRecipes.Contains(rec) || (await MessageBox.Show("Recipe already exists", $"Add a second copy of {rec.locName}?", "Add a copy", "Cancel")).choice) {
-                    _ = AddRecipe(context, rec);
+                    _ = AddRecipe(context, rec, selectedFuel);
                 }
             }
 
@@ -774,7 +776,7 @@ void DropDownContent(ImGui gui) {
                 }
 
                 if (type != ProductDropdownType.Fuel && goods != null && type != ProductDropdownType.Ingredient && fuelUseList.Length > 0) {
-                    gui.BuildInlineObjectListAndButton(fuelUseList, DataUtils.AlreadySortedRecipe, addRecipe, "Add fuel usage", type == ProductDropdownType.Product ? 6 : 3, true, recipeExists);
+                    gui.BuildInlineObjectListAndButton(fuelUseList, DataUtils.AlreadySortedRecipe, (x) => { selectedFuel = goods; addRecipe(x); }, "Add fuel usage", type == ProductDropdownType.Product ? 6 : 3, true, recipeExists);
                 }
 
                 if (type == ProductDropdownType.Product && goods != null && allProduction.Length > 0) {