diff --git a/assets/voxygen/voxel/object/cauldron.vox b/assets/voxygen/voxel/object/cauldron.vox new file mode 100644 index 0000000000..a95497913a --- /dev/null +++ b/assets/voxygen/voxel/object/cauldron.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f083632d05ea1d59674e477b789efce291b4487e0cb287ea9fada817940bb3f3 +size 10696 diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 659583a2f0..6cc7d1fb5d 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -4,6 +4,7 @@ use rand::{seq::SliceRandom, thread_rng}; pub enum Body { Bomb, Scarecrow, + Cauldron, ChestVines, Chest, ChestDark, @@ -35,9 +36,10 @@ impl Body { } } -const ALL_OBJECTS: [Body; 24] = [ +const ALL_OBJECTS: [Body; 25] = [ Body::Bomb, Body::Scarecrow, + Body::Cauldron, Body::ChestVines, Body::Chest, Body::ChestDark, diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 3185282d06..f75e852870 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -516,6 +516,7 @@ impl FigureModelCache { let (name, offset) = match obj { object::Body::Bomb => ("object/bomb.vox", Vec3::new(-5.5, -5.5, 0.0)), object::Body::Scarecrow => ("object/scarecrow.vox", Vec3::new(-9.5, -4.0, 0.0)), + object::Body::Cauldron => ("object/cauldron.vox", Vec3::new(-10.0, -10.0, 0.0)), object::Body::ChestVines => ("object/chest_vines.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::Chest => ("object/chest.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::ChestDark => ("object/chest_dark.vox", Vec3::new(-7.5, -6.0, 0.0)),