mindustry logic execution, map- and schematic- parsing and rendering
Diffstat (limited to 'src/block/defense.rs')
-rw-r--r--src/block/defense.rs27
1 files changed, 17 insertions, 10 deletions
diff --git a/src/block/defense.rs b/src/block/defense.rs
index 05f8e98..d136dc6 100644
--- a/src/block/defense.rs
+++ b/src/block/defense.rs
@@ -8,29 +8,36 @@ use crate::data::dynamic::{DynData, DynType};
use crate::data::GridPos;
use crate::item::storage::Storage;
-make_register!
-(
+make_register! {
"copper-wall" => SimpleBlock::new(1, true, cost!(Copper: 6));
- "copper-wall-large" => SimpleBlock::new(2, true, cost!(Copper: 24));
+ "copper-wall-large" => SimpleBlock::new(2, true, cost!(Copper: 6 * 4));
"titanium-wall" => SimpleBlock::new(1, true, cost!(Titanium: 6));
- "titanium-wall-large" => SimpleBlock::new(2, true, cost!(Titanium: 24));
+ "titanium-wall-large" => SimpleBlock::new(2, true, cost!(Titanium: 6 * 4));
"plastanium-wall" => SimpleBlock::new(1, true, cost!(Metaglass: 2, Plastanium: 5));
- "plastanium-wall-large" => SimpleBlock::new(2, true, cost!(Metaglass: 8, Plastanium: 20));
+ "plastanium-wall-large" => SimpleBlock::new(2, true, cost!(Metaglass: 2 * 4, Plastanium: 5 * 4));
"thorium-wall" => SimpleBlock::new(1, true, cost!(Thorium: 6));
- "thorium-wall-large" => SimpleBlock::new(2, true, cost!(Thorium: 24));
+ "thorium-wall-large" => SimpleBlock::new(2, true, cost!(Thorium: 6 * 4));
"phase-wall" => SimpleBlock::new(1, true, cost!(PhaseFabric: 6));
- "phase-wall-large" => SimpleBlock::new(2, true, cost!(PhaseFabric: 24));
+ "phase-wall-large" => SimpleBlock::new(2, true, cost!(PhaseFabric: 6 * 4));
"surge-wall" => SimpleBlock::new(1, true, cost!(SurgeAlloy: 6));
- "surge-wall-large" => SimpleBlock::new(2, true, cost!(SurgeAlloy: 24));
+ "surge-wall-large" => SimpleBlock::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: 24, Silicon: 16));
+ "door-large" => DoorBlock::new(2, true, cost!(Titanium: 6 * 4, Silicon: 4 * 4));
+ "tungsten-wall" => SimpleBlock::new(1, true, cost!(Tungsten: 6));
+ "large-tungsten-wall" => SimpleBlock::new(2, true, cost!(Tungsten: 6 * 4));
+ "blast-door" => DoorBlock::new(2, true, cost!(Tungsten: 24, Silicon: 24));
+ "reinforced-surge-wall" => SimpleBlock::new(1, true, cost!(SurgeAlloy: 6, Tungsten: 2));
+ "reinforced-surge-wall-large" => SimpleBlock::new(2, true, cost!(SurgeAlloy: 6 * 4, Tungsten: 2 * 4));
+ "carbide-wall" => SimpleBlock::new(1, true, cost!(Thorium: 6, Carbide: 6));
+ "carbide-wall-large" => SimpleBlock::new(2, true, cost!(Thorium: 6 * 4, Carbide: 6 * 4));
+ "shielded-wall" => SimpleBlock::new(2, true, cost!(PhaseFabric: 20, SurgeAlloy: 12, Beryllium: 12));
// sandbox only
"scrap-wall" => SimpleBlock::new(1, true, cost!(Scrap: 6));
"scrap-wall-large" => SimpleBlock::new(2, true, cost!(Scrap: 24));
"scrap-wall-huge" => SimpleBlock::new(3, true, cost!(Scrap: 54));
"scrap-wall-gigantic" => SimpleBlock::new(4, true, cost!(Scrap: 96));
"thruster" => SimpleBlock::new(4, false, cost!(Scrap: 96));
-);
+}
pub struct DoorBlock {
size: u8,