From 9a79101f579dc3e3836920db9aaa69790e2dc557 Mon Sep 17 00:00:00 2001 From: Delyth Williams Date: Thu, 25 Jun 2020 21:12:31 +0000 Subject: [PATCH] Welsh pixie/grassets --- .../voxel/sprite/flowers/flower_purple-5.vox | 3 + .../voxel/sprite/flowers/flower_purple-6.vox | 3 + .../voxel/sprite/flowers/flower_purple-7.vox | 3 + .../voxel/sprite/flowers/flower_purple-8.vox | 3 + .../voxel/sprite/flowers/flower_red-5.vox | 3 + .../voxel/sprite/grass/grass_large-0.vox | 3 + .../voxel/sprite/grass/grass_large-1.vox | 3 + .../voxel/sprite/grass/grass_large-2.vox | 3 + .../voxel/sprite/mushrooms/mushroom-11.vox | 3 + .../voxel/sprite/mushrooms/mushroom-12.vox | 3 + .../voxel/sprite/mushrooms/mushroom-13.vox | 3 + .../voxel/sprite/mushrooms/mushroom-14.vox | 3 + .../voxel/sprite/mushrooms/mushroom-15.vox | 3 + .../voxel/sprite/mushrooms/mushroom-16.vox | 3 + common/src/terrain/block.rs | 2 + voxygen/src/scene/terrain.rs | 122 +++++++++++++++++- 16 files changed, 163 insertions(+), 3 deletions(-) create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_red-5.vox create mode 100644 assets/voxygen/voxel/sprite/grass/grass_large-0.vox create mode 100644 assets/voxygen/voxel/sprite/grass/grass_large-1.vox create mode 100644 assets/voxygen/voxel/sprite/grass/grass_large-2.vox create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox 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..917808d637 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf16e2c9606f7597bbb1cfe1a34d553bcdf5a64fb9edd84e65ac7de7dab1573e +size 1360 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..d03b98f78c --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5681b49c2095fcc415b6376293c746f7439c1932e92eabd1ec8a94e304a559ec +size 1508 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..5419329297 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6957686de02b0e0683ea3847161ef60418102aaca3c222f61f516390b5fcdb7c +size 1756 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..381394fe1e --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:718b6cb94746ae28da1e4400f7bec440d17239fe356993ea5b2366ad51e67447 +size 1884 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..184f839fb2 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_red-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96bab6b07686cf2feb1558e10b53161a82bda89717a5ea28ca1e860279209ca2 +size 1444 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..73148ba696 --- /dev/null +++ b/assets/voxygen/voxel/sprite/grass/grass_large-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41217ba6e6cb8dfa3c67ec254c8061cf342649967e412524a1bbc38361cabe73 +size 1312 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..5d23e1afe6 --- /dev/null +++ b/assets/voxygen/voxel/sprite/grass/grass_large-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6a020933415c0dd4fe7673201475ea61e725cea29c15333a1b9740f7822a06b +size 2392 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..e3937911bc --- /dev/null +++ b/assets/voxygen/voxel/sprite/grass/grass_large-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a3154d3fd80c7200eef5e80350ec187639973a9353a0222ad488dbd91788ae3 +size 1804 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..839cbdbfdf --- /dev/null +++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24192d838c222d46947f35bb08f576de98527c4be117415737e185aea7ac9a3c +size 2172 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..7c64b6296c --- /dev/null +++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f8b78d81cbded1b3048f9b4a22158811184f82ec48451bff7cd838cdf0e7234 +size 1940 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..5604f0aead --- /dev/null +++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f603419647ce820d1febec67024de850190fd212d043c84cf7c90213700622f +size 2568 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..cee190637a --- /dev/null +++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd79f61bc97ce9f7627a46ebefb98f5e9bf247307d7e2020b54fa31e6e085048 +size 1328 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..8d6de3ddb6 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e3620f7d5f93a8a42e8217585e9ca19a5e7a621b5d1a66dbbe2d457df6aa6e4 +size 1192 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..704403d6ed --- /dev/null +++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9f476c9705758491e8b4f2dcbd78379698a7b20528d4e802a646ca750634fb9 +size 1600 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(