From 930cbb1647137b494558a75f84aecce215438f72 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 19 Jul 2021 18:05:57 +0100
Subject: [PATCH] More mushroom sprites

---
 world/src/layer/mod.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs
index 12ccdd2f8a..a5da8ea33b 100644
--- a/world/src/layer/mod.rs
+++ b/world/src/layer/mod.rs
@@ -741,7 +741,13 @@ pub fn apply_caverns_to<R: Rng>(canvas: &mut Canvas, dynamic_rng: &mut R) {
                     && dist > head_radius * 0.85
                     && dynamic_rng.gen_bool(0.1)
                 {
-                    return Some(Block::air(SpriteKind::Orb));
+                    use SpriteKind::*;
+                    let sprites = if dynamic_rng.gen_bool(0.1) {
+                        &[Beehive, Lantern]
+                    } else {
+                        &[Orb, Liana]
+                    };
+                    return Some(Block::air(*sprites.choose(dynamic_rng).unwrap()));
                 }
             }
         }
@@ -852,6 +858,11 @@ pub fn apply_caverns_to<R: Rng>(canvas: &mut Canvas, dynamic_rng: &mut R) {
                 mushroom_block
             } else if z < water_level {
                 Block::water(SpriteKind::Empty)
+                    .with_sprite(if z == cavern_bottom + floor && dynamic_rng.gen_bool(0.01) {
+                        SpriteKind::CaveMushroom
+                    } else {
+                        SpriteKind::Empty
+                    })
             } else if z == cavern_bottom + floor && dynamic_rng.gen_bool(0.025) && on_ground {
                 Block::air(
                     *[
@@ -863,9 +874,11 @@ pub fn apply_caverns_to<R: Rng>(canvas: &mut Canvas, dynamic_rng: &mut R) {
                         Pyrebloom,
                         Moonbell,
                         Welwitch,
+                        LargeGrass,
                         LongGrass,
                         MediumGrass,
                         ShortGrass,
+                        GrassBlue,
                     ]
                     .choose(dynamic_rng)
                     .unwrap(),