mindustry logic execution, map- and schematic- parsing and rendering
oopsies
| -rw-r--r-- | mindus/assets/blocks/floors/grass.png (renamed from mindus/assets/blocks/environment/grass.png) | bin | 134 -> 134 bytes | |||
| -rw-r--r-- | mindus/assets/blocks/floors/molten-slag.png (renamed from mindus/assets/blocks/environment/molten-slag.png) | bin | 1259 -> 1259 bytes | |||
| -rw-r--r-- | mindus/src/data/map.rs | 5 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mindus/assets/blocks/environment/grass.png b/mindus/assets/blocks/floors/grass.png Binary files differindex 9e1aca0..9e1aca0 100644 --- a/mindus/assets/blocks/environment/grass.png +++ b/mindus/assets/blocks/floors/grass.png diff --git a/mindus/assets/blocks/environment/molten-slag.png b/mindus/assets/blocks/floors/molten-slag.png Binary files differindex 07db3b0..07db3b0 100644 --- a/mindus/assets/blocks/environment/molten-slag.png +++ b/mindus/assets/blocks/floors/molten-slag.png diff --git a/mindus/src/data/map.rs b/mindus/src/data/map.rs index c9c8f76..68b5d3b 100644 --- a/mindus/src/data/map.rs +++ b/mindus/src/data/map.rs @@ -119,7 +119,7 @@ macro_rules! lo { #[inline] pub(crate) fn ore(ore: BlockEnum, s: Scale) -> DynImage<&'static [u8]> { - lo!(ore => ["ore-copper" | "ore-beryllium" | "ore-lead" | "ore-scrap" | "ore-coal" | "ore-thorium" | "ore-titanium" | "ore-tungsten" | "pebbles" | "tendrils" | "ore-wall-tungsten" | "ore-wall-beryllium" | "ore-wall-thorium" | "spawn" | "ore-crystal-thorium" | "molten-slag"], s).map(DynImage::Rgba).unwrap_or_else(|| floor(ore, s)) + lo!(ore => ["ore-copper" | "ore-beryllium" | "ore-lead" | "ore-scrap" | "ore-coal" | "ore-thorium" | "ore-titanium" | "ore-tungsten" | "pebbles" | "tendrils" | "ore-wall-tungsten" | "ore-wall-beryllium" | "ore-wall-thorium" | "spawn" | "ore-crystal-thorium"], s).map(DynImage::Rgba).unwrap_or_else(|| floor(ore, s)) } #[inline] @@ -143,7 +143,7 @@ pub(crate) fn floor(tile: BlockEnum, s: Scale) -> DynImage<&'static [u8]> { | "moss" | "mud" | "ice-snow" | "snow" | "salt" | "ice" - | "hotrock" | "char" | "magmarock" + | "hotrock" | "char" | "magmarock" | "molten-slag" | "shale" | "metal-floor" | "metal-floor-2" | "metal-floor-3" | "metal-floor-4" | "metal-floor-5" | "metal-floor-damaged" | "dark-panel-1" | "dark-panel-2" | "dark-panel-3" | "dark-panel-4" | "dark-panel-5" | "dark-panel-6" @@ -154,6 +154,7 @@ pub(crate) fn floor(tile: BlockEnum, s: Scale) -> DynImage<&'static [u8]> { | "bluemat" | "ferric-craters" | "beryllic-stone" + | "grass" | "rhyolite" | "rough-rhyolite" | "rhyolite-crater" | "rhyolite-vent" | "core-zone" | "crater-stone" |
