diff --git a/world/src/all.rs b/world/src/all.rs index 3020c4711f..d3a37c27dc 100644 --- a/world/src/all.rs +++ b/world/src/all.rs @@ -4,6 +4,6 @@ pub enum ForestKind { Savannah, Oak, Pine, - // SnowPine, + Birch, Mangrove, } diff --git a/world/src/layer/tree.rs b/world/src/layer/tree.rs index 1ff70b4815..9228646ba2 100644 --- a/world/src/layer/tree.rs +++ b/world/src/layer/tree.rs @@ -71,15 +71,11 @@ pub fn apply_trees_to(canvas: &mut Canvas) { match col.forest_kind { ForestKind::Oak if QUIRKY_RAND.get(seed) % 16 == 7 => &OAK_STUMPS, ForestKind::Oak if QUIRKY_RAND.get(seed) % 19 == 7 => &FRUIT_TREES, - ForestKind::Oak | ForestKind::Pine - if QUIRKY_RAND.get(seed) % 14 == 7 => - { - &BIRCHES - }, ForestKind::Palm => &PALMS, ForestKind::Savannah => &ACACIAS, ForestKind::Oak => &OAKS, ForestKind::Pine => &PINES, + ForestKind::Birch => &BIRCHES, ForestKind::Mangrove => &MANGROVE_TREES, } }; diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs index 8a9383e7c2..e099bde409 100644 --- a/world/src/sim/mod.rs +++ b/world/src/sim/mod.rs @@ -2213,7 +2213,7 @@ impl SimChunk { ( ForestKind::Palm, (CONFIG.desert_hum, 1.5), - (CONFIG.tropical_temp, 0.5), + (CONFIG.tropical_temp, 1.5), (1.0, 2.0), ), ( @@ -2236,10 +2236,16 @@ impl SimChunk { ), ( ForestKind::Pine, - (CONFIG.desert_hum, 2.0), + (CONFIG.forest_hum, 1.25), (CONFIG.snow_temp, 2.5), (0.0, 1.0), ), + ( + ForestKind::Birch, + (CONFIG.desert_hum, 1.5), + (CONFIG.temperate_temp, 1.5), + (0.0, 1.0), + ), ]; candidates