diff --git a/assets/world/structure/natural/witch-hut.vox b/assets/world/structure/natural/witch-hut.vox index f8e1306088..37cb72b490 100644 --- a/assets/world/structure/natural/witch-hut.vox +++ b/assets/world/structure/natural/witch-hut.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97f5726c4087bc79fda164c2d110aeb1e82f5e0c28d0d6e40cbc60cf821c7c53 -size 52573 +oid sha256:b141134c8afbc89cd2858d83e390b175a4f119d36482a053f18a6928ec21046a +size 9708 diff --git a/common/src/terrain/structure.rs b/common/src/terrain/structure.rs index 842569edf6..c84041bf19 100644 --- a/common/src/terrain/structure.rs +++ b/common/src/terrain/structure.rs @@ -12,6 +12,7 @@ use vek::*; pub enum StructureBlock { TemperateLeaves, PineLeaves, + Acacia, PalmLeaves, Block(Block), } @@ -90,6 +91,7 @@ impl Asset for Structure { 0 => StructureBlock::TemperateLeaves, 1 => StructureBlock::PineLeaves, 2 => StructureBlock::PalmLeaves, + 4 => StructureBlock::Acacia, index => { let color = palette .get(index as usize) diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs index f26b014560..e9275630e0 100644 --- a/world/src/block/mod.rs +++ b/world/src/block/mod.rs @@ -318,6 +318,15 @@ impl<'a> BlockGen<'a> { ) .map(|e| e as u8), ), + StructureBlock::Acacia => Block::new( + 1, + Lerp::lerp( + Rgb::new(60.0, 165.0, 20.0), + Rgb::new(150.0, 245.0, 30.0), + lerp, + ) + .map(|e| e as u8), + ), StructureBlock::Block(block) => block, } } diff --git a/world/src/block/natural.rs b/world/src/block/natural.rs index 2f3141125e..a5246d2f74 100644 --- a/world/src/block/natural.rs +++ b/world/src/block/natural.rs @@ -421,7 +421,7 @@ lazy_static! { pub static ref QUIRKY: Vec> = vec![ st_asset("world/structure/natural/tower-ruin.vox", (11, 14, 5)), - st_asset("world/structure/natural/witch-hut.vox", (10, 13, 3)), + st_asset("world/structure/natural/witch-hut.vox", (10, 13, 9)), ]; pub static ref QUIRKY_DRY: Vec> = vec![