Merge branch 'uniior/cacti' into 'master'

New/revamped cacti sprites

See merge request veloren/veloren!3986

assets/voxygen/voxel/sprite_manifest.ron

@@ -44,25 +44,61 @@ Window4: Some((
     wind_sway: 0.0,
 )),
 // Cacti
-LargeCactus: Some((
+BarrelCactus: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.cacti.large_cactus",
-            offset: (-13.5, -5.5, 0.0),
+            model: "voxygen.voxel.sprite.cacti.barrel_cactus",
+            offset: (-6.0, -6.0, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
 		(
-            model: "voxygen.voxel.sprite.cacti.tall",
+            model: "voxygen.voxel.sprite.cacti.cactus_barrel_flower",
             offset: (-6.0, -6.0, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
     ],
     wind_sway: 0.0,
 )),
-BarrelCactus: Some((
+LargeCactus: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.cacti.barrel_cactus",
+            model: "voxygen.voxel.sprite.cacti.large_cactus",
+            offset: (-12.5, -4.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+		(
+            model: "voxygen.voxel.sprite.cacti.cactus_branch_large_1",
+            offset: (-2.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cacti.cactus_branch_large_2",
+            offset: (-11.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+			
+        ),
+		(
+            model: "voxygen.voxel.sprite.cacti.cactus_branch_large_1_flower",
+            offset: (-2.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+		(
+            model: "voxygen.voxel.sprite.cacti.cactus_branch_large_2_flower",
+            offset: (-11.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+TallCactus: Some((
+    variations: [
+		(
+            model: "voxygen.voxel.sprite.cacti.tall",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cacti.tall2",
             offset: (-6.0, -6.0, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
@@ -73,7 +109,7 @@ RoundCactus: Some((
     variations: [
         (
             model: "voxygen.voxel.sprite.cacti.cactus_round",
-            offset: (-6.0, -6.0, 0.0),
+            offset: (-4.5, -4.5, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
     ],
@@ -83,7 +119,7 @@ ShortCactus: Some((
     variations: [
         (
             model: "voxygen.voxel.sprite.cacti.cactus_short",
-            offset: (-6.0, -6.0, 0.0),
+            offset: (-10.5, -4.5, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
     ],
@@ -93,7 +129,7 @@ MedFlatCactus: Some((
     variations: [
         (
             model: "voxygen.voxel.sprite.cacti.flat_cactus_med",
-            offset: (-6.0, -6.0, 0.0),
+            offset: (-6.0, -2.0, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
     ],
@@ -103,7 +139,7 @@ ShortFlatCactus: Some((
     variations: [
         (
             model: "voxygen.voxel.sprite.cacti.flat_cactus_short",
-            offset: (-6.0, -6.0, 0.0),
+            offset: (-6.0, -2.0, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
     ],

common/src/terrain/sprite.rs

@@ -253,6 +253,7 @@ make_case_elim!(
         GlowIceCrystal = 0xE1,
         OneWayWall = 0xE2,
         GlassKeyhole = 0xE3,
+        TallCactus = 0xE4,
     }
 );
 
@@ -266,7 +267,9 @@ impl SpriteKind {
             SpriteKind::BedrollSnow => 0.4,
             SpriteKind::BedrollPirate => 0.3,
             SpriteKind::Tomato => 1.65,
-            SpriteKind::LargeCactus => 2.5,
+            SpriteKind::BarrelCactus => 1.0,
+            SpriteKind::LargeCactus => 3.0,
+            SpriteKind::TallCactus => 2.5,
             SpriteKind::Scarecrow => 3.0,
             SpriteKind::Turnip => 0.36,
             SpriteKind::Pumpkin => 0.81,
@@ -323,8 +326,7 @@ impl SpriteKind {
             SpriteKind::IceSpike => 1.0,
             SpriteKind::RepairBench => 1.2,
             // TODO: Find suitable heights.
-            SpriteKind::BarrelCactus
-            | SpriteKind::RoundCactus
+            SpriteKind::RoundCactus
             | SpriteKind::ShortCactus
             | SpriteKind::MedFlatCactus
             | SpriteKind::ShortFlatCactus

world/src/layer/scatter.rs

@@ -576,13 +576,35 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti
                 )
             },
         },
+        ScatterConfig {
+            kind: BarrelCactus,
+            water_mode: Ground,
+            permit: |b| matches!(b, BlockKind::Grass),
+            f: |_, col| {
+                (
+                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0,
+                    None,
+                )
+            },
+        },
+        ScatterConfig {
+            kind: TallCactus,
+            water_mode: Ground,
+            permit: |b| matches!(b, BlockKind::Grass),
+            f: |_, col| {
+                (
+                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 1.5,
+                    None,
+                )
+            },
+        },
         ScatterConfig {
             kind: RoundCactus,
             water_mode: Ground,
             permit: |b| matches!(b, BlockKind::Grass),
             f: |_, col| {
                 (
-                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.5,
+                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0,
                     None,
                 )
             },
@@ -593,7 +615,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti
             permit: |b| matches!(b, BlockKind::Grass),
             f: |_, col| {
                 (
-                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.5,
+                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0,
                     None,
                 )
             },
@@ -604,7 +626,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti
             permit: |b| matches!(b, BlockKind::Grass),
             f: |_, col| {
                 (
-                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.5,
+                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0,
                     None,
                 )
             },
@@ -615,7 +637,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti
             permit: |b| matches!(b, BlockKind::Grass),
             f: |_, col| {
                 (
-                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.5,
+                    close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0,
                     None,
                 )
             },