Merge branch 'synis/cave-stuff' into 'master'

Cave improvements

See merge request veloren/veloren!4337

.cargo/config

@@ -25,10 +25,10 @@ tracy-server-debuginfo = "run --bin veloren-server-cli --features tracy,simd --p
 tracy-server-releasedebuginfo = "run --bin veloren-server-cli --features tracy,simd --profile releasedebuginfo"
 tracy-test-server = "run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow"
 # voxygen
-test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui,shaderc-from-source"
+test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui,shaderc-from-source,hot-reloading"
 tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui,shaderc-from-source --profile no_overflow"
 dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo"
 # misc
 swarm = "run --bin swarm --features client/bin_bot,client/tick_network --"
 ci-clippy = "clippy --all-targets --locked --features=bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_asset_migrate,asset_tweak,bin,stat"
-ci-clippy2 = "clippy -p veloren-voxygen --locked --no-default-features --features=default-publish"
+ci-clippy2 = "clippy -p veloren-voxygen --locked --no-default-features --features=default-publish"

CHANGELOG.md

@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added Autumn Forests, Cherry Blossom Forests, and Maple Trees.
 - Added reworked dungeon: Haniwa Catacombs
 - Added dungeon: Terracotta Ruins
+- Sand and crystal cave biome
 
 ### Changed
 
@@ -92,6 +93,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Sword Changes; Pommel Strike has been nerfed -> increased energy cost, increased _durations, and decreased poise damage. Heavy Sweep has been nerfed -> decreased poise damage and stun vulnerability damage. Pillar Thrust has been altered -> decreased maximum base damage with an increase in stun vulnerability damage.
 - Weapons block are based on poise
 - Wooden Shield recipe
+- Overhauled the visuals of several cave biomes
 
 ### Removed
 - Medium and large potions from all loot tables

Cargo.lock

@@ -7401,7 +7401,6 @@ dependencies = [
  "fxhash",
  "hashbrown 0.13.2",
  "image",
- "inline_tweak",
  "itertools 0.10.5",
  "kiddo",
  "lazy_static",

assets/voxygen/shaders/particle-vert.glsl

@@ -96,6 +96,7 @@ const int PHOENIX_BEAM = 56;
 const int PHOENIX_BUILD_UP_AIM = 57;
 const int CLAY_SHRAPNEL = 58;
 const int AIRFLOW = 59;
+const int SPORE = 60;
 
 // meters per second squared (acceleration)
 const float earth_gravity = 9.807;
@@ -1016,6 +1017,18 @@ void main() {
                 spin_in_axis(perp_axis, asin(inst_dir.z / length(inst_dir)) + PI / 2.0)
             );
             break;
+        case SPORE:
+            f_reflect = 0.0;
+            attr = Attr(
+                linear_motion(
+                    vec3(0),
+                    vec3(0, 0, -1.1)
+                ) + vec3(sin((lifetime + rand9 * 0.1) * 0.5) * 3.0, sin((lifetime+ rand8 * 0.1) * 0.5) * 3.0, sin(lifetime * 0.5) * 1.5),
+                vec3(0.4 + 0.4 * abs(sin(lifetime))),
+                vec4(vec3(0.8, 6.0 + rand6 * 1.75, 7.5 + (1.75 + rand5 * 0.5)), 1),
+                spin_in_axis(vec3(rand1, rand2, rand3), rand4 * 1.5 + lifetime)
+            );
+            break;
         default:
             attr = Attr(
                 linear_motion(