diff --git a/assets/voxygen/voxel/sprite/castle/drop_gate_bars-0.vox b/assets/voxygen/voxel/sprite/castle/drop_gate_bars-0.vox new file mode 100644 index 0000000000..af1d7539c8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/castle/drop_gate_bars-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c336506cf0c529f31d0f09e9f5eef136607b08ea3f6f0eb859d46820646d921 +size 1588 diff --git a/assets/voxygen/voxel/sprite/castle/drop_gate_bottom-0.vox b/assets/voxygen/voxel/sprite/castle/drop_gate_bottom-0.vox new file mode 100644 index 0000000000..d4f2b9f807 --- /dev/null +++ b/assets/voxygen/voxel/sprite/castle/drop_gate_bottom-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e954d6f39d2eaede5fb4f44b900f9575e6cc6f33c5918032f1e17fb54168fbd5 +size 1228 diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index cc0188d266..39e940448b 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -88,6 +88,8 @@ pub enum BlockKind { Stones, Twigs, ShinyGem, + DropGate, + DropGateBottom, } impl fmt::Display for BlockKind { @@ -191,6 +193,8 @@ impl BlockKind { BlockKind::Stones => true, BlockKind::Twigs => true, BlockKind::ShinyGem => true, + BlockKind::DropGate => false, + BlockKind::DropGateBottom => false, _ => false, } } @@ -288,6 +292,8 @@ impl BlockKind { BlockKind::Stones => false, BlockKind::Twigs => false, BlockKind::ShinyGem => false, + BlockKind::DropGate => false, + BlockKind::DropGateBottom => false, _ => true, } } @@ -362,6 +368,8 @@ impl BlockKind { BlockKind::Stones => false, BlockKind::Twigs => false, BlockKind::ShinyGem => false, + BlockKind::DropGate => true, + BlockKind::DropGateBottom => false, _ => true, } } @@ -486,7 +494,10 @@ impl Block { | BlockKind::WardrobeSingle | BlockKind::WardrobeDouble | BlockKind::Pot + | BlockKind::DropGate + | BlockKind::DropGateBottom | BlockKind::Door => Some(self.color[0] & 0b111), + _ => None, } } diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 6cffd77fd8..6fa942cda8 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -350,6 +350,14 @@ fn sprite_config_for(kind: BlockKind) -> Option { variations: 3, wind_sway: 0.0, }), + BlockKind::DropGate => Some(SpriteConfig { + variations: 1, + wind_sway: 0.0, + }), + BlockKind::DropGateBottom => Some(SpriteConfig { + variations: 1, + wind_sway: 0.0, + }), _ => None, } } @@ -2733,6 +2741,23 @@ impl Terrain { Vec3::one(), ), ), + // Drop Gate Parts + ( + (BlockKind::DropGate, 0), + make_models( + "voxygen.voxel.sprite.castle.drop_gate_bars-0", + Vec3::new(-5.5, -5.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::DropGateBottom, 0), + make_models( + "voxygen.voxel.sprite.castle.drop_gate_bottom-0", + Vec3::new(-5.5, -5.5, 0.0), + Vec3::one(), + ), + ), ] .into_iter() .collect(),