From 9514cd71c67909d44dba9b09949b2e3dfe55f343 Mon Sep 17 00:00:00 2001 From: DemonicOnPc <53798251+DemonicOnPc@users.noreply.github.com> Date: Thu, 28 Oct 2021 06:53:13 -0400 Subject: [PATCH] Jungle and River update -Added Lillypads to rivers -Added new types of reeds -Added reeds to water -Added more Ferns/Flowers/Plants to jungles --- .../sprite/flowers/jungle_flower_red-0.vox | 3 + .../sprite/flowers/jungle_flower_red-1.vox | 3 + .../sprite/flowers/jungle_flower_red-2.vox | 3 + .../sprite/flowers/jungle_flower_red-3.vox | 3 + .../sprite/flowers/jungle_flower_red-4.vox | 3 + .../sprite/flowers/jungle_flower_red-5.vox | 3 + .../sprite/flowers/jungle_flower_red-6.vox | 3 + .../sprite/flowers/jungle_flower_red-7.vox | 3 + assets/voxygen/voxel/sprite/junglefern/1.vox | 3 + assets/voxygen/voxel/sprite/junglefern/2.vox | 3 + assets/voxygen/voxel/sprite/junglefern/3.vox | 3 + assets/voxygen/voxel/sprite/junglefern/4.vox | 3 + .../sprite/leafy_plant/jungle_plant-0.vox | 3 + .../sprite/leafy_plant/jungle_plant-1.vox | 3 + .../sprite/leafy_plant/jungle_plant-2.vox | 3 + .../sprite/leafy_plant/jungle_plant-3.vox | 3 + .../sprite/leafy_plant/jungle_plant-4.vox | 3 + .../sprite/lillypads/temperate-lilypad-1.vox | 3 + .../sprite/lillypads/temperate-lilypad-2.vox | 3 + .../sprite/lillypads/temperate-lilypad-3.vox | 3 + .../sprite/lillypads/temperate-lilypad-4.vox | 3 + .../sprite/lillypads/temperate-lilypad-5.vox | 3 + .../sprite/lillypads/temperate-lilypad-6.vox | 3 + .../sprite/lillypads/temperate-lilypad-7.vox | 3 + .../sprite/lillypads/temperate-lilypad-8.vox | 3 + .../sprite/lillypads/temperate-lilypad-9.vox | 3 + .../sprite/lillypads/temperate-reeds-1.vox | 3 + .../sprite/lillypads/temperate-reeds-2.vox | 3 + .../sprite/lillypads/temperate-reeds-3.vox | 3 + .../sprite/lillypads/temperate-reeds-4.vox | 3 + .../sprite/lillypads/temperate-reeds-5.vox | 3 + assets/voxygen/voxel/sprite_manifest.ron | 166 ++++++++++++++++++ common/src/terrain/sprite.rs | 3 + world/src/layer/scatter.rs | 48 +++-- 34 files changed, 296 insertions(+), 14 deletions(-) create mode 100644 assets/voxygen/voxel/sprite/flowers/jungle_flower_red-0.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/jungle_flower_red-1.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/jungle_flower_red-2.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/jungle_flower_red-3.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/jungle_flower_red-4.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/jungle_flower_red-5.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/jungle_flower_red-6.vox create mode 100644 assets/voxygen/voxel/sprite/flowers/jungle_flower_red-7.vox create mode 100644 assets/voxygen/voxel/sprite/junglefern/1.vox create mode 100644 assets/voxygen/voxel/sprite/junglefern/2.vox create mode 100644 assets/voxygen/voxel/sprite/junglefern/3.vox create mode 100644 assets/voxygen/voxel/sprite/junglefern/4.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-0.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-1.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-2.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-3.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-4.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-1.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-2.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-3.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-4.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-5.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-6.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-7.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-8.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-9.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-reeds-1.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-reeds-2.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-reeds-3.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-reeds-4.vox create mode 100644 assets/voxygen/voxel/sprite/lillypads/temperate-reeds-5.vox diff --git a/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-0.vox b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-0.vox new file mode 100644 index 0000000000..b94e7da17d --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e6e57d527cc1ed1425f4ff50a8f294f5241afc9801c158ea6ecc20b2382c0b8 +size 1544 diff --git a/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-1.vox b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-1.vox new file mode 100644 index 0000000000..41d8380331 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea475ea6f0dc4814732f6caa7059715fedcd7042c41ddc322e626ea0af16906e +size 2212 diff --git a/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-2.vox b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-2.vox new file mode 100644 index 0000000000..32069d697d --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eaf9bc76440f8690565c95f7d7e6e41f2a3bac71dde15c9ae8a05cee5de455a0 +size 1560 diff --git a/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-3.vox b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-3.vox new file mode 100644 index 0000000000..4afb7cd584 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0e227fe8791ea2c07f40154852e16517c3fb30f20cfb2cac47f81f766fcbcc0 +size 2304 diff --git a/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-4.vox b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-4.vox new file mode 100644 index 0000000000..19ea424730 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:103a7fbd4e9eaadc057f8e81f47205e9a61ef55b2164a3302efcdde5660bd4e9 +size 2016 diff --git a/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-5.vox b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-5.vox new file mode 100644 index 0000000000..c0cc5155b0 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41144723880c38825244c30948b5ccfde3dff22419b23d68961d204cb69c806e +size 2072 diff --git a/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-6.vox b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-6.vox new file mode 100644 index 0000000000..e6d3ef992b --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:651c431d9120364a50a9a0cce9d3920174f72ed9694f863e5970ebb1957f30ed +size 2660 diff --git a/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-7.vox b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-7.vox new file mode 100644 index 0000000000..c35c0b2659 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/jungle_flower_red-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d06d70fbf621ab36c7568a366fef1c5fb6a73e7576235dd085e108dc46eeebfa +size 2224 diff --git a/assets/voxygen/voxel/sprite/junglefern/1.vox b/assets/voxygen/voxel/sprite/junglefern/1.vox new file mode 100644 index 0000000000..bedc33e2e3 --- /dev/null +++ b/assets/voxygen/voxel/sprite/junglefern/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fa250884f2611ea2114d4d0058879c715f24a2c8cd9cf6fa2b5d9785b02d23a +size 3172 diff --git a/assets/voxygen/voxel/sprite/junglefern/2.vox b/assets/voxygen/voxel/sprite/junglefern/2.vox new file mode 100644 index 0000000000..b747a1d59a --- /dev/null +++ b/assets/voxygen/voxel/sprite/junglefern/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0996b27f32eb4f801620617600c15b99c64105b97d1814ccb4adbf960d41b98d +size 1572 diff --git a/assets/voxygen/voxel/sprite/junglefern/3.vox b/assets/voxygen/voxel/sprite/junglefern/3.vox new file mode 100644 index 0000000000..91d59f0e79 --- /dev/null +++ b/assets/voxygen/voxel/sprite/junglefern/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ca544785f2203695f52020a5166764c32b6f86793a012313b1a23894065d4d6 +size 2040 diff --git a/assets/voxygen/voxel/sprite/junglefern/4.vox b/assets/voxygen/voxel/sprite/junglefern/4.vox new file mode 100644 index 0000000000..76b531be0d --- /dev/null +++ b/assets/voxygen/voxel/sprite/junglefern/4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88f5127a827df367cd3bc17dee1a92aa77f194183418f4ac1f55a6f9223d1ba4 +size 1708 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-0.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-0.vox new file mode 100644 index 0000000000..eb4d882270 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9567bd293b468a54c98b02c0eacee5022d82c73db8eb4c32c436e04a30adc3d +size 1336 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-1.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-1.vox new file mode 100644 index 0000000000..76d9f71414 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b24457ee129b2365704e8653eaa07f8e0a43c1d22134f2697e70b4b3b5f4bc5e +size 1472 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-2.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-2.vox new file mode 100644 index 0000000000..496fd22ebd --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ff768249835bc0f0250916337f6a986b7009ceb48361a291fa210a9de01a9d7 +size 1460 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-3.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-3.vox new file mode 100644 index 0000000000..fba5d65ea1 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c06309ecf7c4d84050082e2eb012311607772d9e28ca7504013a4f7065a96b2d +size 1540 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-4.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-4.vox new file mode 100644 index 0000000000..305d771d2b --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf4b1c3255516c194f220c76f80f08e4d1896c14bda3a2bb5263815ee08e3a87 +size 1752 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-1.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-1.vox new file mode 100644 index 0000000000..bda34f200c --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5adad6323edd520559c65b33d180bf61ef0626b9b827983037da5cc92b1e6bd1 +size 1428 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-2.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-2.vox new file mode 100644 index 0000000000..7d4dda1eaa --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8a68b4f1814a2f21a7fb96ec7776a30419e6f5d46ddbc31bb59fb1169d401cb +size 1428 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-3.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-3.vox new file mode 100644 index 0000000000..772cbbe74b --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c6f4b5374d0d6207d7fd3fe0f63b4c25aa01884bb7ed876d4865684791aa9c0 +size 1452 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-4.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-4.vox new file mode 100644 index 0000000000..37ae3ecc79 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89ec967111c4fa94b6e6c99223f877ff77a69ff35f7e0f5fe464cd286d323564 +size 1472 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-5.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-5.vox new file mode 100644 index 0000000000..951c4ef891 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9fb7016ec453370632bebe29bd3f3ce17615ffef15675376205a547af8f78b4 +size 1472 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-6.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-6.vox new file mode 100644 index 0000000000..06401cdb4a --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b2244ed2438aa0aa22c3aeafe5b483504860d7cc01f5b4d2baa6061e21c2365 +size 1560 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-7.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-7.vox new file mode 100644 index 0000000000..27f41620a7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b8154cc877fb216a7a9d75a90ea4b79520b7f81afd48d72d93baedba524cbd3 +size 1560 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-8.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-8.vox new file mode 100644 index 0000000000..1810d63ea4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6ea8fe4fbdab8a07f9cf085af61b39353fe46b8056c77902389950909d395bd +size 1480 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-9.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-9.vox new file mode 100644 index 0000000000..15ec014769 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-lilypad-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a24495db14af3800f717011f36f141b8d720fb510fb44d5bfcdd76e77dacd27a +size 1480 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-1.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-1.vox new file mode 100644 index 0000000000..a70df5a88b --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e4dff3380b7c49247dfdb40333fbd568579b7b4a0bd8fb7e6a9e58729ca9ce8 +size 1664 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-2.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-2.vox new file mode 100644 index 0000000000..38f971c435 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:545c462fc7e8b8c90f74bd9db172642a3eb991bffd69e26f9a1c20fdb6db754f +size 1596 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-3.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-3.vox new file mode 100644 index 0000000000..74587b12be --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa8526bf720f05a2500e9c9b2fd766c879943df7dace2510f5907ea769cbf72f +size 1528 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-4.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-4.vox new file mode 100644 index 0000000000..4271cf8dd8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd34f95f95afa6fa174f48c87f7b8f5d716513c5cce01249cf0d3e526d643489 +size 1724 diff --git a/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-5.vox b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-5.vox new file mode 100644 index 0000000000..41a075dc3e --- /dev/null +++ b/assets/voxygen/voxel/sprite/lillypads/temperate-reeds-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb26c34e910b65024bc08c0433b50256d01fd2fc6ef62b97a13d79a88dd5601d +size 1708 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 68ba9e835b..dbb8ed2578 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -260,6 +260,46 @@ RedFlower: Some(( offset: (-3.5, -3.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), + ( + model: "voxygen.voxel.sprite.flowers.jungle_flower_red-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.flowers.jungle_flower_red-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.flowers.jungle_flower_red-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.flowers.jungle_flower_red-3", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.flowers.jungle_flower_red-4", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.flowers.jungle_flower_red-5", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.flowers.jungle_flower_red-6", + offset: (-7.5, -7.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.flowers.jungle_flower_red-7", + offset: (-7.5, -7.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), ], wind_sway: 0.1, )), @@ -943,6 +983,31 @@ LeafyPlant: Some(( offset: (-6.0, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), + ( + model: "voxygen.voxel.sprite.leafy_plant.jungle_plant-0", + offset: (-5.5, -1.5, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.leafy_plant.jungle_plant-1", + offset: (-6.5, -2.5, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.leafy_plant.jungle_plant-2", + offset: (-6.5, -2.5, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.leafy_plant.jungle_plant-3", + offset: (-7.5, -2.5, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.leafy_plant.jungle_plant-4", + offset: (-7.5, -5.5, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), ], wind_sway: 0.4, )), @@ -1017,6 +1082,31 @@ Fern: Some(( ], wind_sway: 0.4, )), +JungleFern: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.junglefern.1", + offset: (-9.5, -9.5, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.junglefern.2", + offset: (-7.5, -3.5, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.junglefern.3", + offset: (-8.0, -8.0, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.junglefern.4", + offset: (-6.0, -6.0, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.4, +)), // Savanna Flora SavannaGrass: Some(( variations: [ @@ -2222,6 +2312,31 @@ Reed: Some(( offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.5), ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-reeds-1", + offset: (-4.5, -4.0, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-reeds-2", + offset: (-4.5, -4.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-reeds-3", + offset: (-4.5, -4.0, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-reeds-4", + offset: (-4.5, -4.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-reeds-5", + offset: (-4.0, -4.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), ], wind_sway: 0.3, )), @@ -3482,4 +3597,55 @@ CavernMycelBlue: Some(( ], wind_sway: 0.1, )), +// LillyPads on rivers +LillyPads: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-1", + offset: (-4.5, -4.5, -18.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-2", + offset: (-4.5, -4.5, -18.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-3", + offset: (-5.5, -5.0, -18.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-4", + offset: (-5.5, -5.5, -18.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-5", + offset: (-5.5, -5.5, -18.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-6", + offset: (-5.5, -5.5, -18.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-7", + offset: (-5.5, -5.5, -17.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-8", + offset: (-4.5, -4.5, -17.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-9", + offset: (-4.5, -4.5, -17.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.1, +)), ) diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index a8acf2c2a5..638608fa21 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -183,6 +183,8 @@ make_case_elim!( CavernLillypadBlue = 0x9C, CavernMycelBlue = 0x9D, DismantlingBench = 0x9E, + JungleFern = 0x9F, + LillyPads = 0xA0, } ); @@ -271,6 +273,7 @@ impl SpriteKind { | SpriteKind::Silver | SpriteKind::Gold => 0.6, SpriteKind::EnsnaringVines | SpriteKind::CavernLillypadBlue => 0.1, + SpriteKind::LillyPads => 0.1, _ => return None, }) } diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs index 7f072f0243..3461295870 100644 --- a/world/src/layer/scatter.rs +++ b/world/src/layer/scatter.rs @@ -148,6 +148,14 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { Some((0.0, 64.0, 0.2)), ) }), + (JungleFern, Surface, |_, col| { + ( + close(col.temp, 0.3, 0.4).min(close(col.humidity, CONFIG.jungle_hum, 0.3)) + * GRASS_FACT + * 4.0, + Some((0.0, 64.0, 0.5)), + ) + }), (Blueberry, Surface, |_, col| { ( close(col.temp, CONFIG.temperate_temp, 0.5).min(close( @@ -344,17 +352,6 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { None, ) }), - (Reed, Surface, |_, col| { - ( - close(col.humidity, CONFIG.jungle_hum, 0.9) - * col - .water_dist - .map(|wd| Lerp::lerp(0.2, 0.0, (wd / 8.0).clamped(0.0, 1.0))) - .unwrap_or(0.0) - * ((col.alt - CONFIG.sea_level) / 12.0).clamped(0.0, 1.0), - Some((0.2, 128.0, 0.5)), - ) - }), // Underwater chests (ChestBuried, Underwater, |_, col| { ( @@ -608,13 +605,36 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { None, ) }), - (CavernLillypadBlue, Floating, |_, col| { + //River-related scatter + (LillyPads, Floating, |_, col| { ( close(col.temp, 0.2, 0.6).min(close(col.humidity, CONFIG.jungle_hum, 0.4)) * GRASS_FACT - * 120.0 + * 100.0 + * ((col.alt - CONFIG.sea_level) / 12.0).clamped(0.0, 1.0) + * col.water_dist.map_or(0.0, |d| 1.0 / (1.0 + (d.abs() * 0.45).powi(2))), + Some((0.0, 128.0, 0.35)), + ) + }), + (Reed, Underwater, |_, col| { + ( + close(col.temp, 0.2, 0.6).min(close(col.humidity, CONFIG.jungle_hum, 0.4)) + * GRASS_FACT + * 100.0 + * ((col.alt - CONFIG.sea_level) / 12.0).clamped(0.0, 1.0) + * col.water_dist.map_or(0.0, |d| 1.0 / (1.0 + (d.abs() * 0.40).powi(2))), + Some((0.2, 128.0, 0.5)), + ) + }), + (Reed, Surface, |_, col| { + ( + close(col.humidity, CONFIG.jungle_hum, 0.9) + * col + .water_dist + .map(|wd| Lerp::lerp(0.2, 0.0, (wd / 8.0).clamped(0.0, 1.0))) + .unwrap_or(0.0) * ((col.alt - CONFIG.sea_level) / 12.0).clamped(0.0, 1.0), - Some((0.0, 256.0, 0.25)), + Some((0.2, 128.0, 0.5)), ) }), ];