diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox new file mode 100644 index 0000000000..ef6786d847 Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox differ diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox new file mode 100644 index 0000000000..7a957d70f6 Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox differ diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox new file mode 100644 index 0000000000..1b2d067e26 Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox differ diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox new file mode 100644 index 0000000000..747443745f Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox differ diff --git a/assets/voxygen/voxel/sprite/flowers/flower_red-5.vox b/assets/voxygen/voxel/sprite/flowers/flower_red-5.vox new file mode 100644 index 0000000000..fa6c49be7d Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/flower_red-5.vox differ diff --git a/assets/voxygen/voxel/sprite/grass/grass_large-0.vox b/assets/voxygen/voxel/sprite/grass/grass_large-0.vox new file mode 100644 index 0000000000..c896adafed Binary files /dev/null and b/assets/voxygen/voxel/sprite/grass/grass_large-0.vox differ diff --git a/assets/voxygen/voxel/sprite/grass/grass_large-1.vox b/assets/voxygen/voxel/sprite/grass/grass_large-1.vox new file mode 100644 index 0000000000..dd6e0a0a15 Binary files /dev/null and b/assets/voxygen/voxel/sprite/grass/grass_large-1.vox differ diff --git a/assets/voxygen/voxel/sprite/grass/grass_large-2.vox b/assets/voxygen/voxel/sprite/grass/grass_large-2.vox new file mode 100644 index 0000000000..07f2393791 Binary files /dev/null and b/assets/voxygen/voxel/sprite/grass/grass_large-2.vox differ diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox new file mode 100644 index 0000000000..bd0964fd5d Binary files /dev/null and b/assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox differ diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox new file mode 100644 index 0000000000..b824175151 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox differ diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox new file mode 100644 index 0000000000..87d69de590 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox differ diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox new file mode 100644 index 0000000000..7952c4543a Binary files /dev/null and b/assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox differ diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox new file mode 100644 index 0000000000..a13bfd9e88 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox differ diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox new file mode 100644 index 0000000000..c7704394f8 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox differ diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 5a4b579211..5f9f5899e7 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -74,6 +74,7 @@ pub enum BlockKind { TableLarge, TableSmall, Wardrobe, + LargeGrass, } impl BlockKind { @@ -230,6 +231,7 @@ impl BlockKind { BlockKind::TableLarge => false, BlockKind::TableSmall => false, BlockKind::Wardrobe => false, + BlockKind::LargeGrass => false, _ => true, } } diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 08106b0953..a61a07b00f 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -109,11 +109,11 @@ fn sprite_config_for(kind: BlockKind) -> Option { wind_sway: 0.1, }), BlockKind::PurpleFlower => Some(SpriteConfig { - variations: 4, + variations: 8, wind_sway: 0.1, }), BlockKind::RedFlower => Some(SpriteConfig { - variations: 4, + variations: 5, wind_sway: 0.1, }), BlockKind::WhiteFlower => Some(SpriteConfig { @@ -141,13 +141,17 @@ fn sprite_config_for(kind: BlockKind) -> Option { variations: 5, wind_sway: 0.1, }), + BlockKind::LargeGrass => Some(SpriteConfig { + variations: 3, + wind_sway: 0.5, + }), BlockKind::Apple => Some(SpriteConfig { variations: 1, wind_sway: 0.0, }), BlockKind::Mushroom => Some(SpriteConfig { - variations: 11, + variations: 17, wind_sway: 0.0, }), BlockKind::Liana => Some(SpriteConfig { @@ -609,6 +613,38 @@ impl Terrain { Vec3::one(), ), ), + ( + (BlockKind::PurpleFlower, 4), + make_models( + "voxygen.voxel.sprite.flowers.flower_purple-5", + Vec3::new(-2.5, -2.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::PurpleFlower, 5), + make_models( + "voxygen.voxel.sprite.flowers.flower_purple-6", + Vec3::new(-4.5, -4.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::PurpleFlower, 6), + make_models( + "voxygen.voxel.sprite.flowers.flower_purple-7", + Vec3::new(-5.5, -5.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::PurpleFlower, 7), + make_models( + "voxygen.voxel.sprite.flowers.flower_purple-8", + Vec3::new(-6.0, -6.0, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::RedFlower, 0), make_models( @@ -641,6 +677,14 @@ impl Terrain { Vec3::one(), ), ), + ( + (BlockKind::RedFlower, 4), + make_models( + "voxygen.voxel.sprite.flowers.flower_red-5", + Vec3::new(-3.5, -3.5, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::WhiteFlower, 0), make_models( @@ -714,6 +758,30 @@ impl Terrain { ), ), // Grass + ( + (BlockKind::LargeGrass, 0), + make_models( + "voxygen.voxel.sprite.grass.grass_large-0", + Vec3::new(-2.0, -2.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::LongGrass, 1), + make_models( + "voxygen.voxel.sprite.grass.grass_large-1", + Vec3::new(-5.5, -5.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::LongGrass, 2), + make_models( + "voxygen.voxel.sprite.grass.grass_large-2", + Vec3::new(-5.5, -5.0, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::LongGrass, 0), make_models( @@ -938,6 +1006,54 @@ impl Terrain { Vec3::one(), ), ), + ( + (BlockKind::Mushroom, 11), + make_models( + "voxygen.voxel.sprite.mushrooms.mushroom-11", + Vec3::new(-8.0, -8.0, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::Mushroom, 12), + make_models( + "voxygen.voxel.sprite.mushrooms.mushroom-12", + Vec3::new(-5.0, -5.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::Mushroom, 13), + make_models( + "voxygen.voxel.sprite.mushrooms.mushroom-13", + Vec3::new(-5.5, -5.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::Mushroom, 14), + make_models( + "voxygen.voxel.sprite.mushrooms.mushroom-14", + Vec3::new(-2.5, -2.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::Mushroom, 15), + make_models( + "voxygen.voxel.sprite.mushrooms.mushroom-15", + Vec3::new(-1.5, -1.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::Mushroom, 16), + make_models( + "voxygen.voxel.sprite.mushrooms.mushroom-16", + Vec3::new(-5.5, -5.5, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::Liana, 0), make_models(