diff --git a/assets/voxygen/voxel/sprite/ember/dummy.vox b/assets/voxygen/voxel/sprite/ember/dummy.vox new file mode 100644 index 0000000000..72795fce01 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ember/dummy.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d19fae26a4a3a4f34b21a98524789c2f6807d17c9a83996b43de40415fd75ec5 +size 1096 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index f39631287e..6967488fad 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -1247,6 +1247,17 @@ Ember: Some(( ], wind_sway: 0.8, )), +// Smoke dummy +Smoke: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.ember.dummy", + offset: (-5.5, -5.5, -5.5), + lod_axes: (1.0, 1.0, 0.0), + ), + ], + wind_sway: 0.8, +)), // Corn Corn: Some(( variations: [ diff --git a/assets/world/manifests/spots_general/witch_hut.ron b/assets/world/manifests/spots_general/witch_hut.ron index a4bf9577d4..db02fde774 100644 --- a/assets/world/manifests/spots_general/witch_hut.ron +++ b/assets/world/manifests/spots_general/witch_hut.ron @@ -10,7 +10,7 @@ 44: Filled(GlowingRock, (r: 54, g: 180, b: 64)), 8: Filled(Air, (r: 255, g: 255, b: 255)), 249: Sprite(PotionMinor), - 251: Sprite(Ember), + 251: Sprite(SmokeDummy), }, ), ] diff --git a/assets/world/structure/natural/witch-hut-black_0.vox b/assets/world/structure/natural/witch-hut-black_0.vox index 08320ec78d..47a68f4895 100644 --- a/assets/world/structure/natural/witch-hut-black_0.vox +++ b/assets/world/structure/natural/witch-hut-black_0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e38a81edae8894abc3b2c25becb3ef1c5318c704beb2252564c3d81fcffe080f +oid sha256:a24c4dab24601c30564959f2e2db5daf59fdfdae9e74ec34045f9d5de17cba06 size 34376 diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 347146c682..9c48b4282b 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -175,6 +175,7 @@ make_case_elim!( Orb = 0x94, EnsnaringVines = 0x95, WitchWindow = 0x96, + SmokeDummy = 0x97, } ); diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs index f28236cc71..be36ceb4c8 100644 --- a/voxygen/src/scene/terrain/watcher.rs +++ b/voxygen/src/scene/terrain/watcher.rs @@ -98,6 +98,9 @@ impl BlocksOfInterest { fires.push(pos); smokers.push(pos); }, + Some(SpriteKind::SmokeDummy) => { + smokers.push(pos); + }, // Offset positions to account for block height. // TODO: Is this a good idea? Some(SpriteKind::StreetLamp) => fire_bowls.push(pos + Vec3::unit_z() * 2),