bendns' repos / mindus
mindustry logic execution, map- and schematic- parsing and rendering
Diffstat (limited to 'src/block/production.rs')
-rw-r--r--src/block/production.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/block/production.rs b/src/block/production.rs
index 9954669..c8d435f 100644
--- a/src/block/production.rs
+++ b/src/block/production.rs
@@ -1,5 +1,5 @@
//! the industry part of mindustry
-use crate::block::simple::{cost, make_simple};
+use crate::block::simple::*;
use crate::block::*;
use crate::data::DataRead;
@@ -22,7 +22,7 @@ make_register! {
"spore-press" -> ProductionBlock::new(2, true, cost!(Lead: 35, Silicon: 30));
"pulverizer" -> ProductionBlock::new(1, true, cost!(Copper: 30, Lead: 25));
"coal-centrifuge" -> ProductionBlock::new(2, true, cost!(Lead: 30, Graphite: 40, Titanium: 20));
- "incinerator" -> Incinerator::new(1, true, cost!(Lead: 15, Graphite: 5));
+ "incinerator" -> BasicBlock::new(1, true, cost!(Lead: 15, Graphite: 5));
"silicon-arc-furnace" -> ProductionBlock::new(3, true, cost!(Beryllium: 70, Graphite: 80));
"electrolyzer" -> ProductionBlock::new(3, true, cost!(Silicon: 50, Graphite: 40, Beryllium: 130, Tungsten: 80));
"atmospheric-concentrator" -> ProductionBlock::new(3, true, cost!(Oxide: 60, Beryllium: 180, Silicon: 150));
@@ -32,7 +32,7 @@ make_register! {
"phase-heater" => HeatCrafter::new(2, false, cost!(Oxide: 30, Carbide: 30, Beryllium: 30));
"heat-redirector" => HeatConduit::new(3, false, cost!(Tungsten: 10, Graphite: 10));
"heat-router" => HeatConduit::new(3, false, cost!(Tungsten: 15, Graphite: 10));
- "slag-incinerator" -> Incinerator::new(1, true, cost!(Tungsten: 15));
+ "slag-incinerator" -> BasicBlock::new(1, true, cost!(Tungsten: 15));
"carbide-crucible" -> ProductionBlock::new(3, true, cost!(Tungsten: 110, Thorium: 150, Oxide: 60));
// slag centrifuge
"surge-crucible" -> ProductionBlock::new(3, true, cost!(Silicon: 100, Graphite: 80, Tungsten: 80, Oxide: 80));
@@ -91,4 +91,3 @@ make_simple!(HeatConduit, |_, n, _, _, r: Rotation, s| {
}.rotate(r.rotated(false).count()));
base
});
-make_simple!(Incinerator);