testing

plus.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Dict
+from typing import Dict, Tuple
 from shared import Machine, Item
 from pydantic import BaseModel, Field, ConfigDict
 
@@ -17,6 +17,19 @@ class Machines(Enum):
     WetWasher = Machine(name="Wet Washer")
     BoilerMk1 = Machine(name="Boiler Mk1")
 
+MachineOrder: Tuple[Machines, ...] = (
+    Machines.Miner,
+    Machines.BoilerMk1,
+    Machines.Crusher,
+    Machines.WetWasher,
+    Machines.Sorter,
+    Machines.Smelter,
+    Machines.Foundry,
+    Machines.FlexibleBlastFurnace,
+    Machines.Reformer,
+    Machines.Constructor,
+    Machines.Assembler,
+)
 
 class Items(Enum):
     IronIngot = Item(name="Iron Ingot")
@@ -169,9 +182,11 @@ class Recipes(Enum):
         building=Machines.Crusher,
         outputs={
             Items.Silica: 60.0,
-            Items.Sand: 40.0,
         },
         inputs={Items.Kyalite: 60.0},
+        byproducts={
+            Items.Sand: 40.0,
+        }
     )
     # - Crushing Powders
     CoarseSand = Recipe(
@@ -206,9 +221,11 @@ class Recipes(Enum):
         outputs={
             Items.CrushedIron: 90.0,
             Items.CrushedTin: 60.0,
-            Items.CrushedGangue: 40.0,
         },
         inputs={Items.CrushedSiterite: 120.0},
+        byproducts={
+            Items.CrushedGangue: 40.0,
+        },
     )
     CrushedCopper = Recipe(
         name="Crushed Copper",
@@ -216,21 +233,23 @@ class Recipes(Enum):
         outputs={
             Items.CrushedCopper: 96.0,
             Items.CrushedMagnesium: 80.0,
-            Items.CrushedGangue: 40.0,
         },
         inputs={Items.CrushedCallanite: 120.0},
+        byproducts={
+            Items.CrushedGangue: 40.0,
+        },
     )
     CrushedZinc = Recipe(
         name="Crushed Zinc",
         building=Machines.Sorter,
         outputs={
             Items.CrushedZinc: 96.0,
-            Items.Sand: 48.0,
         },
         inputs={Items.CrushedLarrussite: 120.0},
         byproducts={
             Items.CrushedGangue: 60.0,
-        }
+            Items.Sand: 48.0,
+        },
     )
     CrushedCaterium = Recipe(
         name="Crushed Caterium",
@@ -744,14 +763,16 @@ class Recipes(Enum):
         name="Molten Steel",
         building=Machines.FlexibleBlastFurnace,
         outputs={
-            Items.MoltenSteel: 40.0,
-            Items.FlueGas: 30.0
+            Items.MoltenSteel: 40.0
         },
         inputs={
             Items.MoltenIron: 40.0,
             Items.CarbonPowder: 40.0,
             Items.Steam: 60.0
         },
+        byproducts={
+            Items.FlueGas: 30.0
+        }
     )
     DirectSteel = Recipe(
         name="Direct Steel",
@@ -890,11 +911,13 @@ class Recipes(Enum):
         building=Machines.WetWasher,
         outputs={
             Items.CrushedTin: 45.0,
-            Items.TailingsSlurry: 60.0
         },
         inputs={
             Items.SiteriteOre: 60.0,
             Items.Water: 30.0,
+        },
+        byproducts={
+            Items.TailingsSlurry: 60.0
         }
     )
     SteamMk1 = Recipe(