cavern sprites

assets/voxygen/voxel/sprite_manifest.ron

@@ -3258,6 +3258,7 @@ CookingPot: Some((
     ],
     wind_sway: 0.0,
 )),
+// Ensnaring Vines
 EnsnaringVines: Some((
     variations: [
         (
@@ -3310,4 +3311,164 @@ Bones: Some((
     ],
     wind_sway: 0.0,
 )),
+// Short Cavern Grass Blue
+CavernGrassBlueShort: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_short-0",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_short-1",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_short-2",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_short-3",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_short-4",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+// Medium Cavern Grass Blue
+CavernGrassBlueMedium: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_med-0",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_med-1",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_med-2",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_med-3",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+// Long Cavern Grass Blue
+CavernGrassBlueLong: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_long-0",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_long-1",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_long-2",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_long-3",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_long-4",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_long-5",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_long-6",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.grass_long-7",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+// Cavern Lillypads Blue
+CavernLillypadBlue: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cavern.lillypad-0",
+            offset: (-5.5, -5.5, -1.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.lillypad-1",
+            offset: (-5.5, -5.5, -1.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.lillypad-2",
+            offset: (-5.5, -5.5, -1.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.lillypad-3",
+            offset: (-5.5, -5.5, -1.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.lillypad-4",
+            offset: (-5.5, -5.5, -1.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+// Cavern Hanging Mycel Blue
+CavernMycelBlue: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cavern.mycel-0",
+            offset: (-0.5, -0.5, -21.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.mycel-1",
+            offset: (-0.5, -0.5, -31.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.mycel-2",
+            offset: (-0.5, -0.5, -14.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cavern.mycel-3",
+            offset: (-0.5, -0.5, -40.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.1,
+)),
 )

common/src/terrain/block.rs

@@ -179,7 +179,7 @@ impl Block {
         match self.kind() {
             BlockKind::Lava => Some(24),
             BlockKind::GlowingRock | BlockKind::GlowingWeakRock => Some(15),
-            BlockKind::BlockKind::GlowingMushroom => Some(20),
+            BlockKind::GlowingMushroom => Some(20),
             _ => match self.get_sprite()? {
                 SpriteKind::StreetLamp | SpriteKind::StreetLampTall => Some(24),
                 SpriteKind::Ember => Some(20),

common/src/terrain/sprite.rs

@@ -177,6 +177,11 @@ make_case_elim!(
         WitchWindow = 0x96,
         SmokeDummy = 0x97,
         Bones = 0x98,
+        CavernGrassBlueShort = 0x99,
+        CavernGrassBlueMedium = 0x9A,
+        CavernGrassBlueLong = 0x9B,
+        CavernLillypadBlue = 0x9C,
+        CavernMycelBlue = 0x9D,
     }
 );
 

voxygen/src/scene/terrain/watcher.rs

@@ -79,6 +79,8 @@ impl BlocksOfInterest {
                     river.push(pos)
                 },
                 BlockKind::Snow if rng.gen_range(0..16) == 0 => snow.push(pos),
+                BlockKind::Lava if rng.gen_range(0..5) == 0 => fires.push(pos + Vec3::unit_z()),
+                BlockKind::Snow if rng.gen_range(0..16) == 0 => snow.push(pos),
                 _ => match block.get_sprite() {
                     Some(SpriteKind::Ember) => {
                         fires.push(pos);
@@ -109,66 +111,30 @@ impl BlocksOfInterest {
                     Some(SpriteKind::CraftingBench) => {
                         interactables.push((pos, Interaction::Craft(CraftingTab::All)))
                     },
-                    BlockKind::Lava if rng.gen_range(0..5) == 0 => fires.push(pos + Vec3::unit_z()),
+                    Some(SpriteKind::SmokeDummy) => {
-                    BlockKind::Snow if rng.gen_range(0..16) == 0 => snow.push(pos),
+                        smokers.push(pos);
-                    _ => match block.get_sprite() {
+                    },
-                        Some(SpriteKind::Ember) => {
+                    Some(SpriteKind::Forge) => {
-                            fires.push(pos);
+                        interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle)))
-                            smokers.push(pos);
+                    },
-                        },
+                    Some(SpriteKind::TanningRack) => interactables
-                        Some(SpriteKind::SmokeDummy) => {
+                        .push((pos, Interaction::Craft(CraftingTab::ProcessedMaterial))),
-                            smokers.push(pos);
+                    Some(SpriteKind::SpinningWheel) => {
-                        },
+                        interactables.push((pos, Interaction::Craft(CraftingTab::All)))
-                        // Offset positions to account for block height.
+                    },
-                        // TODO: Is this a good idea?
+                    Some(SpriteKind::Loom) => {
-                        Some(SpriteKind::StreetLamp) => fire_bowls.push(pos + Vec3::unit_z() * 2),
+                        interactables.push((pos, Interaction::Craft(CraftingTab::All)))
-                        Some(SpriteKind::FireBowlGround) => fire_bowls.push(pos + Vec3::unit_z()),
+                    },
-                        Some(SpriteKind::StreetLampTall) => {
+                    Some(SpriteKind::Cauldron) => {
-                            fire_bowls.push(pos + Vec3::unit_z() * 3);
+                        fires.push(pos);
-                        },
+                        interactables.push((pos, Interaction::Craft(CraftingTab::Potion)))
-                        Some(SpriteKind::WallSconce) => fire_bowls.push(pos + Vec3::unit_z()),
+                    },
-                        Some(SpriteKind::Beehive) => beehives.push(pos),
+                    Some(SpriteKind::Anvil) => {
-                        Some(SpriteKind::CrystalHigh) => fireflies.push(pos),
+                        interactables.push((pos, Interaction::Craft(CraftingTab::Weapon)))
-                        Some(SpriteKind::Reed) => {
+                    },
-                            reeds.push(pos);
+                    Some(SpriteKind::CookingPot) => {
-                            fireflies.push(pos);
+                        fires.push(pos);
-                            if rng.gen_range(0..12) == 0 {
+                        interactables.push((pos, Interaction::Craft(CraftingTab::Food)))
-                                frogs.push(pos);
-                            }
-                        },
-                        Some(SpriteKind::CaveMushroom) => fireflies.push(pos),
-                        Some(SpriteKind::PinkFlower) => flowers.push(pos),
-                        Some(SpriteKind::PurpleFlower) => flowers.push(pos),
-                        Some(SpriteKind::RedFlower) => flowers.push(pos),
-                        Some(SpriteKind::WhiteFlower) => flowers.push(pos),
-                        Some(SpriteKind::YellowFlower) => flowers.push(pos),
-                        Some(SpriteKind::Sunflower) => flowers.push(pos),
-                        Some(SpriteKind::CraftingBench) => {
-                            interactables.push((pos, Interaction::Craft(CraftingTab::All)))
-                        },
-                        Some(SpriteKind::Forge) => {
-                            interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle)))
-                        },
-                        Some(SpriteKind::TanningRack) => interactables
-                            .push((pos, Interaction::Craft(CraftingTab::ProcessedMaterial))),
-                        Some(SpriteKind::SpinningWheel) => {
-                            interactables.push((pos, Interaction::Craft(CraftingTab::All)))
-                        },
-                        Some(SpriteKind::Loom) => {
-                            interactables.push((pos, Interaction::Craft(CraftingTab::All)))
-                        },
-                        Some(SpriteKind::Cauldron) => {
-                            fires.push(pos);
-                            interactables.push((pos, Interaction::Craft(CraftingTab::Potion)))
-                        },
-                        Some(SpriteKind::Anvil) => {
-                            interactables.push((pos, Interaction::Craft(CraftingTab::Weapon)))
-                        },
-                        Some(SpriteKind::CookingPot) => {
-                            fires.push(pos);
-                            interactables.push((pos, Interaction::Craft(CraftingTab::Food)))
-                        },
-                        _ => {},
                     },
                     _ => {},
                 },