diff --git a/common/net/src/msg/compression.rs b/common/net/src/msg/compression.rs index b98d5d19e7..db2bd0c31d 100644 --- a/common/net/src/msg/compression.rs +++ b/common/net/src/msg/compression.rs @@ -609,6 +609,11 @@ impl VoxelImageDecoding for TriPngEncoding Rgb { + r: 61, + g: 185, + b: 240, + }, Grass => Rgb { r: 51, g: 160, diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 5f653b2ce3..c675202462 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -38,6 +38,7 @@ make_case_elim!( WeakRock = 0x11, // Explodable Lava = 0x12, // TODO: Reevaluate whether this should be in the rock section GlowingRock = 0x13, + GlowingWeakRock = 0x14, // 0x12 <= x < 0x20 is reserved for future rocks Grass = 0x20, // Note: *not* the same as grass sprites Snow = 0x21, @@ -168,7 +169,7 @@ impl Block { pub fn get_glow(&self) -> Option { match self.kind() { BlockKind::Lava => Some(24), - BlockKind::GlowingRock => Some(12), + BlockKind::GlowingRock | BlockKind::GlowingWeakRock => Some(12), _ => match self.get_sprite()? { SpriteKind::StreetLamp | SpriteKind::StreetLampTall => Some(24), SpriteKind::Ember => Some(20), @@ -272,7 +273,7 @@ impl Block { #[inline] pub fn mine_tool(&self) -> Option { match self.kind() { - BlockKind::WeakRock => Some(ToolKind::Pick), + BlockKind::WeakRock | BlockKind::GlowingWeakRock => Some(ToolKind::Pick), _ => self.get_sprite().and_then(|s| s.mine_tool()), } } diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index fc85e49c1d..bb5d07c67e 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -253,7 +253,7 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { canvas.set( Vec3::new(wpos2d.x, wpos2d.y, z), Block::new( - BlockKind::GlowingRock, + BlockKind::GlowingWeakRock, noisy_color(info.index().colors.layer.vein.into(), 16), ), ); @@ -265,7 +265,7 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { canvas.set( Vec3::new(wpos2d.x, wpos2d.y, z), Block::new( - BlockKind::GlowingRock, + BlockKind::GlowingWeakRock, noisy_color(info.index().colors.layer.vein.into(), 16), ), );