mindustry logic execution, map- and schematic- parsing and rendering
implement the heat reactor
| -rw-r--r-- | mindus/assets/blocks/production/heat-reactor-top1.png | bin | 0 -> 358 bytes | |||
| -rw-r--r-- | mindus/assets/blocks/production/heat-reactor-top2.png | bin | 0 -> 359 bytes | |||
| -rw-r--r-- | mindus/assets/blocks/production/heat-reactor.png | bin | 0 -> 897 bytes | |||
| -rw-r--r-- | mindus/src/block/mod.rs | 2 | ||||
| -rw-r--r-- | mindus/src/block/production.rs | 6 | ||||
| -rw-r--r-- | mindus/src/lib.rs | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/mindus/assets/blocks/production/heat-reactor-top1.png b/mindus/assets/blocks/production/heat-reactor-top1.png Binary files differnew file mode 100644 index 0000000..b9648a8 --- /dev/null +++ b/mindus/assets/blocks/production/heat-reactor-top1.png diff --git a/mindus/assets/blocks/production/heat-reactor-top2.png b/mindus/assets/blocks/production/heat-reactor-top2.png Binary files differnew file mode 100644 index 0000000..f0415fd --- /dev/null +++ b/mindus/assets/blocks/production/heat-reactor-top2.png diff --git a/mindus/assets/blocks/production/heat-reactor.png b/mindus/assets/blocks/production/heat-reactor.png Binary files differnew file mode 100644 index 0000000..4f5c72d --- /dev/null +++ b/mindus/assets/blocks/production/heat-reactor.png diff --git a/mindus/src/block/mod.rs b/mindus/src/block/mod.rs index 7fdecc8..0503b29 100644 --- a/mindus/src/block/mod.rs +++ b/mindus/src/block/mod.rs @@ -860,7 +860,7 @@ make_register! { "surge-crucible" -> ProductionBlock::new(3, true, cost!(Silicon: 100, Graphite: 80, Tungsten: 80, Oxide: 80)); "cyanogen-synthesizer" -> ProductionBlock::new(3, true, cost!(Carbide: 50, Silicon: 80, Beryllium: 90)); "phase-synthesizer" -> ProductionBlock::new(3, true, cost!(Carbide: 90, Silicon: 100, Thorium: 100, Tungsten: 200)); - // heat reactor + "heat-reactor" => HeatCrafter::new(3, false, cost!(Oxide: 70, Graphite: 20, Carbide: 10, Thorium: 80)); "payload-conveyor" => PayloadConveyor::new(3, false, cost!(Copper: 10, Graphite: 10)); "payload-router" => PayloadRouter::new(3, false, cost!(Copper: 10, Graphite: 15)); "reinforced-payload-conveyor" => PayloadConveyor::new(3, false, cost!(Tungsten: 10)); diff --git a/mindus/src/block/production.rs b/mindus/src/block/production.rs index e785805..589e73c 100644 --- a/mindus/src/block/production.rs +++ b/mindus/src/block/production.rs @@ -40,13 +40,13 @@ make_simple!( make_simple!( HeatCrafter, |_, n, _, _, r: Rotation, s| { - let mut base = load!(from n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source"], s); + let mut base = load!(from n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source" | "heat-reactor"], s); let mut top = match r { Rotation::Up | Rotation::Right => { - load!(concat "top1" => n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source"], s) + load!(concat "top1" => n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source" | "heat-reactor"], s) } Rotation::Down | Rotation::Left => { - load!(concat "top2" => n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source"], s) + load!(concat "top2" => n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source" | "heat-reactor"], s) } }; unsafe { top.rotate(r.rotated(false).count()) }; diff --git a/mindus/src/lib.rs b/mindus/src/lib.rs index b65dd16..4541f8e 100644 --- a/mindus/src/lib.rs +++ b/mindus/src/lib.rs @@ -13,7 +13,7 @@ derive_const, try_trait_v2, try_blocks, - const_from, + const_convert, coroutines )] #![allow(clippy::redundant_closure_call, incomplete_features)] |
