Jungle and River update

-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles

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,
+)),
 )

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,
         })
     }

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)),
             )
         }),
     ];