From 02eb76416f39f2a41d829b86500dba83e232366a Mon Sep 17 00:00:00 2001 From: Sarra Date: Thu, 25 Feb 2021 23:39:41 -0500 Subject: [PATCH] tweaking coral models and seagrass spawns --- assets/voxygen/voxel/sprite/coral/plating_acropora-0.vox | 4 ++-- assets/voxygen/voxel/sprite/coral/plating_acropora-1.vox | 4 ++-- assets/voxygen/voxel/sprite/coral/plating_acropora-2.vox | 4 ++-- assets/voxygen/voxel/sprite/coral/plating_acropora-3.vox | 4 ++-- assets/voxygen/voxel/sprite/coral/plating_acropora-4.vox | 4 ++-- assets/voxygen/voxel/sprite/coral/plating_acropora-5.vox | 4 ++-- assets/voxygen/voxel/sprite/coral/plating_acropora-6.vox | 4 ++-- assets/voxygen/voxel/sprite/coral/plating_acropora-7.vox | 4 ++-- world/src/layer/scatter.rs | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-0.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-0.vox index a800c3d750..3c56f0fbf0 100644 --- a/assets/voxygen/voxel/sprite/coral/plating_acropora-0.vox +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d10a3d4ad091a7f0b5c1f9720e8f816b9b3c5895db2b213f086b2c11f5d7667 -size 2972 +oid sha256:76e372003c80dae6535c583ce1f2e9d93a7e5fe0d939a0a3d66c3e67397b72bd +size 2816 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-1.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-1.vox index a6b45e5e32..a99498ae9f 100644 --- a/assets/voxygen/voxel/sprite/coral/plating_acropora-1.vox +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1abb2b5cd0cbec4824b0d1256660a228046bc5a4b6660babccafae1a27d0759b -size 2540 +oid sha256:960be07d8e943b7deb9353a00d5494cb26dda5d9dbd6c215859f49a3fca7b259 +size 2360 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-2.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-2.vox index 5a71528e06..c9499b52f5 100644 --- a/assets/voxygen/voxel/sprite/coral/plating_acropora-2.vox +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10f0ca7931dcc379fbe5012d6dba05f9096b44b26dac6bcb39ffd3de9eb8fe69 -size 5648 +oid sha256:2a0486d47a75114643ea4929d6fe1ec871ac4871a0b7e3958c440faf46bf907b +size 5260 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-3.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-3.vox index 605cd2f5fb..7af7afbad9 100644 --- a/assets/voxygen/voxel/sprite/coral/plating_acropora-3.vox +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d27916e91892e7bad086baf4c364acd069a9ad9f67fc68166973d921ebe016ce -size 3568 +oid sha256:cc949c2001de1e5cd9ed5c96051e4df5e718b19dfe46b610023592f8261248ce +size 3408 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-4.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-4.vox index 273122bfbe..e9d4dba096 100644 --- a/assets/voxygen/voxel/sprite/coral/plating_acropora-4.vox +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c55ae35ca5f2beb6a8baa99ccbafc40147c5c8cb9d42f2c070465ef1330166fd -size 2920 +oid sha256:ff396d9f99ba5468ce472ec9fee6446924d35ef836b92063ec29c06241efa4af +size 2768 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-5.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-5.vox index 993d040abc..6ee9ff8422 100644 --- a/assets/voxygen/voxel/sprite/coral/plating_acropora-5.vox +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68257c0b0fddd37022f6fba8a0f3aa53eecf653bb71a1e61f5c2e3aba94d97f1 -size 3276 +oid sha256:040a87748d94b47fcc3e789629b1919fbe20bef942926f8be5a189d53fe22f9d +size 3112 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-6.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-6.vox index df7abf9177..da2310d045 100644 --- a/assets/voxygen/voxel/sprite/coral/plating_acropora-6.vox +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b641cd7a9f50d207d126c0a01fdf8468aa22523c0e8fc95b2f431c47ee471fa -size 3540 +oid sha256:f07702558e9d254733570d12a0ca4093ec2042d2f0b303d7db31bab7fa48a5a2 +size 3360 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-7.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-7.vox index cd929e710a..038f94e693 100644 --- a/assets/voxygen/voxel/sprite/coral/plating_acropora-7.vox +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5608bc11927fa5a0ae9ca41a327ee3a7a50fd54644c228ddd93019fcd27e322 -size 2512 +oid sha256:bced95611c3aba1b387ebf27e20bbb8ee1769acd1beedc72583c992b116e322a +size 2452 diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs index 4157f8fb75..7bc54057d6 100644 --- a/world/src/layer/scatter.rs +++ b/world/src/layer/scatter.rs @@ -322,13 +322,13 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { (Seagrass, true, |_, col| { ( MUSH_FACT - * 300.0 + * 600.0 * if col.water_level < CONFIG.sea_level && (col.water_level - col.alt) < 3.0 { 1.0 } else { 0.0 }, - Some((90.0, 0.4)), + Some((150.0, 0.4)), ) }), // scattered seaweed (temperate species)