mindustry logic execution, map- and schematic- parsing and rendering
Diffstat (limited to 'src/block/turrets.rs')
| -rw-r--r-- | src/block/turrets.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/block/turrets.rs b/src/block/turrets.rs index 5aeaeaa..160c991 100644 --- a/src/block/turrets.rs +++ b/src/block/turrets.rs @@ -1,4 +1,4 @@ -//! idk why its not in the [crate::block::defense] module +//! idk why its not in the [`crate::block::defense`] module use crate::block::make_register; use crate::block::simple::cost; @@ -32,15 +32,15 @@ make_register! { "malign" => TurretBlock::new(5, true, cost!(Carbide: 400, Beryllium: 2000, Silicon: 800, Graphite: 800, PhaseFabric: 300)); } -use crate::data::renderer::load; +use crate::data::renderer::*; +use crate::utils::ImageUtils; crate::block::simple::make_simple!(TurretBlock, |me: &Self, _, name, _| { let path = match name { "breach" | "diffuse" | "sublimate" | "titan" | "disperse" | "afflict" | "lustre" | "scathe" | "malign" => format!("bases/reinforced-block-{}", me.size), _ => format!("bases/block-{}", me.size), }; - let mut base = load("turrets", &path).unwrap(); - let top = load("turrets", name).unwrap(); - image::imageops::overlay(&mut base, &top, 0, 0); - Some(base) + let mut base = load("turrets", &path).unwrap().value().clone(); + base.overlay(load("turrets", name).unwrap().value(), 0, 0); + Some(ImageHolder::from(base)) }); |