Add furnaces to blueprint graph

factorio-blueprint-generator/factory_graph_black_science.yml

@@ -2,23 +2,23 @@ subfactories:
   - !SubFactory
     recipe: military-science-pack
     machines: 40
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: piercing-rounds-magazine
     machines: 12
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: firearm-magazine
     machines: 4
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: grenade
     machines: 32
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: stone-wall
     machines: 4
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !ExternalConnection
 factory_connections:
   - item: military-science-pack

factorio-blueprint-generator/factory_graph_blue_science.yml

@@ -2,43 +2,43 @@ subfactories:
   - !SubFactory
     recipe: chemical-science-pack
     machines: 96
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: engine-unit
     machines: 80
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: iron-gear-wheel
     machines: 4
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: pipe
     machines: 8
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: advanced-circuit
     machines: 72
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: electronic-circuit
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: electronic-circuit
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 10
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 10
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 10
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !ExternalConnection
   - !Splitter
   - !Splitter

factorio-blueprint-generator/factory_graph_blue_science_distributor.yml

@@ -2,46 +2,56 @@ subfactories:
   - !SubFactory
     recipe: chemical-science-pack
     machines: 96
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: engine-unit
     machines: 80
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: iron-gear-wheel
     machines: 4
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: pipe
     machines: 8
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: advanced-circuit
     machines: 72
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: electronic-circuit
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: electronic-circuit
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 10
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 10
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 10
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !ExternalConnection
   - !Distributor
   - !Distributor
+  - !Distributor
+  - !SubFactory
+    recipe: copper-plate
+    machines: 64
+    machine: electric-furnace
+  - !Distributor
+  - !SubFactory
+    recipe: copper-plate
+    machines: 48
+    machine: electric-furnace
 factory_connections:
   - item: chemical-science-pack
     amount: 10
@@ -73,12 +83,20 @@ factory_connections:
     to: 1
   - item: iron-plate
     amount: 20
-    from: 10
+    from: 13
     to: 2
   - item: iron-plate
     amount: 20
-    from: 10
+    from: 13
     to: 3
+  - item: iron-ore
+    amount: 40
+    from: 10
+    to: 14
+  - item: iron-plate
+    amount: 40
+    from: 14
+    to: 13
   - item: electronic-circuit
     amount: 30
     from: 12
@@ -97,12 +115,20 @@ factory_connections:
     to: 4
   - item: iron-plate
     amount: 15
-    from: 10
+    from: 15
     to: 5
   - item: iron-plate
     amount: 15
-    from: 10
+    from: 15
     to: 6
+  - item: iron-plate
+    amount: 30
+    from: 16
+    to: 15
+  - item: iron-ore
+    amount: 30
+    from: 10
+    to: 16
   - item: copper-plate
     amount: 25
     from: 10

factorio-blueprint-generator/factory_graph_fast_inserter.yml

@@ -2,24 +2,24 @@ subfactories:
   - !SubFactory
     recipe: iron-gear-wheel
     machines: 2
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 9
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: electronic-circuit
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !Splitter
   - !SubFactory
     recipe: inserter
     machines: 2
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: fast-inserter
     machines: 2
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SideLoader
   - !ExternalConnection
   - !SideLoader

factorio-blueprint-generator/factory_graph_green_science.yml

@@ -2,27 +2,27 @@ subfactories:
   - !SubFactory
     recipe: logistic-science-pack
     machines: 48
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: inserter
     machines: 4
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: electronic-circuit
     machines: 4
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: transport-belt
     machines: 2
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: iron-gear-wheel
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !ExternalConnection
   - !Splitter
 factory_connections:

factorio-blueprint-generator/factory_graph_inserter.yml

@@ -2,19 +2,19 @@ subfactories:
   - !SubFactory
     recipe: iron-gear-wheel
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: copper-cable
     machines: 9
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: electronic-circuit
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !SubFactory
     recipe: inserter
     machines: 6
-    machine: assembly-machine-3
+    machine: assembling-machine-3
   - !ExternalConnection
 factory_connections:
   - item: iron-gear-wheel

factorio-blueprint-generator/src/assembly.rs

@@ -1,7 +1,11 @@
 use factorio_blueprint::abstraction::{Blueprint, ElectricPoleType, Entity, InserterType};
 use factorio_core::{beltoptions::Beltspeed, prelude::*};
 
-pub fn assembly_line(assembly_machines: usize, recipe: impl AsRef<str>) -> Blueprint {
+pub fn assembly_line(
+    assembly_machines: usize,
+    machine: impl AsRef<str>,
+    recipe: impl AsRef<str>,
+) -> Blueprint {
     let mut blueprint = Blueprint::new();
     let mut last = None;
     for i in 0..assembly_machines.div_ceil(3) {
@@ -26,7 +30,7 @@ pub fn assembly_line(assembly_machines: usize, recipe: impl AsRef<str>) -> Bluep
 
     for i in 0..assembly_machines {
         blueprint.add_entity(Entity::new_production(
-            "assembling-machine-3",
+            &machine,
             recipe.as_ref(),
             Position::new(3 + 6 * i as PositionType, 9),
             Direction::Up,
@@ -217,6 +221,7 @@ pub fn assembly_line(assembly_machines: usize, recipe: impl AsRef<str>) -> Bluep
 
 pub fn assembly_line_2_input(
     assembly_machines: usize,
+    machine: impl AsRef<str>,
     recipe: impl AsRef<str>,
     input_belt1: Beltspeed,
     input_belt2: Option<Beltspeed>,
@@ -260,14 +265,14 @@ pub fn assembly_line_2_input(
 
     for i in 0..halve_machines {
         blueprint.add_entity(Entity::new_production(
-            "assembling-machine-3",
+            &machine,
             recipe.as_ref(),
             Position::new(3 + 6 * i as PositionType, 9),
             Direction::Up,
             Position::new(6, 6),
         ));
         blueprint.add_entity(Entity::new_production(
-            "assembling-machine-3",
+            &machine,
             recipe.as_ref(),
             Position::new(3 + 6 * i as PositionType, 21),
             Direction::Up,

factorio-blueprint-generator/src/factory.rs

@@ -87,7 +87,7 @@ pub fn generate_factory<L: Layouter, P: Pathfinder + Sync, R: Rng + SeedableRng
                 machines,
                 machine,
             } => {
-                assert_eq!(machine, "assembly-machine-3");
+                // assert_eq!(machine, "assembly-machine-3");
                 assert_eq!(output_connections.len(), 1);
                 assert!(input_connections.len() <= 3);
                 let output_connection = output_connections.first().unwrap();
@@ -224,6 +224,7 @@ pub fn generate_factory<L: Layouter, P: Pathfinder + Sync, R: Rng + SeedableRng
 
                 let (b, size, y_output, y_inputs) = assembly_line_2_input(
                     *machines,
+                    machine,
                     recipe,
                     input_belt1,
                     input_belt2,