bendns' repos / mindus
mindustry logic execution, map- and schematic- parsing and rendering
Diffstat (limited to 'src/block/walls.rs')
-rw-r--r--src/block/walls.rs40
1 files changed, 1 insertions, 39 deletions
diff --git a/src/block/walls.rs b/src/block/walls.rs
index 6b14cda..018d7d8 100644
--- a/src/block/walls.rs
+++ b/src/block/walls.rs
@@ -10,39 +10,6 @@ make_simple!(WallBlock, |_, _, _, _, _, s| {
base
});
-make_register! {
- "copper-wall" -> WallBlock::new(1, true, cost!(Copper: 6));
- "copper-wall-large" -> WallBlock::new(2, true, cost!(Copper: 6 * 4));
- "titanium-wall" -> WallBlock::new(1, true, cost!(Titanium: 6));
- "titanium-wall-large" -> WallBlock::new(2, true, cost!(Titanium: 6 * 4));
- "plastanium-wall" -> WallBlock::new(1, true, cost!(Metaglass: 2, Plastanium: 5));
- "plastanium-wall-large" -> WallBlock::new(2, true, cost!(Metaglass: 2 * 4, Plastanium: 5 * 4));
- "thorium-wall" -> WallBlock::new(1, true, cost!(Thorium: 6));
- "thorium-wall-large" -> WallBlock::new(2, true, cost!(Thorium: 6 * 4));
- "phase-wall" -> WallBlock::new(1, true, cost!(PhaseFabric: 6));
- "phase-wall-large" -> WallBlock::new(2, true, cost!(PhaseFabric: 6 * 4));
- "surge-wall" -> WallBlock::new(1, true, cost!(SurgeAlloy: 6));
- "surge-wall-large" -> WallBlock::new(2, true, cost!(SurgeAlloy: 6 * 4));
- "door" => DoorBlock::new(1, true, cost!(Titanium: 6, Silicon: 4));
- "door-large" => DoorBlock::new(2, true, cost!(Titanium: 6 * 4, Silicon: 4 * 4));
- "tungsten-wall" -> WallBlock::new(1, true, cost!(Tungsten: 6));
- "tungsten-wall-large" -> WallBlock::new(2, true, cost!(Tungsten: 6 * 4));
- "blast-door" -> DoorBlock::new(2, true, cost!(Tungsten: 24, Silicon: 24));
- "reinforced-surge-wall" -> WallBlock::new(1, true, cost!(SurgeAlloy: 6, Tungsten: 2));
- "reinforced-surge-wall-large" -> WallBlock::new(2, true, cost!(SurgeAlloy: 6 * 4, Tungsten: 2 * 4));
- "carbide-wall" -> WallBlock::new(1, true, cost!(Thorium: 6, Carbide: 6));
- "carbide-wall-large" -> WallBlock::new(2, true, cost!(Thorium: 6 * 4, Carbide: 6 * 4));
- "shielded-wall" -> WallBlock::new(2, true, cost!(PhaseFabric: 20, SurgeAlloy: 12, Beryllium: 12));
- "beryllium-wall" -> WallBlock::new(1, true, cost!(Beryllium: 6));
- "beryllium-wall-large" -> WallBlock::new(2, true, cost!(Beryllium: 6 * 4));
- // sandbox only
- "scrap-wall" -> WallBlock::new(1, true, cost!(Scrap: 6));
- "scrap-wall-large" -> WallBlock::new(2, true, cost!(Scrap: 24));
- "scrap-wall-huge" -> WallBlock::new(3, true, cost!(Scrap: 54));
- "scrap-wall-gigantic" -> WallBlock::new(4, true, cost!(Scrap: 96));
- "thruster" => WallBlock::new(4, false, cost!(Scrap: 96));
-}
-
pub struct DoorBlock {
size: u8,
symmetric: bool,
@@ -105,12 +72,7 @@ impl BlockLogic for DoorBlock {
Ok(DynData::Boolean(*state))
}
- fn read(
- &self,
- build: &mut Build,
- _: &BlockRegistry,
- buff: &mut DataRead,
- ) -> Result<(), DataReadError> {
+ fn read(&self, build: &mut Build, buff: &mut DataRead) -> Result<(), DataReadError> {
build.state = Some(Self::create_state(buff.read_bool()?));
Ok(())
}