Add white wallows biome

Rearth · Oct 25, 2023 · 6bea17a · 6bea17a
1 parent c10b3fd
commit 6bea17a
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 43 deletions.
diff --git a/biome-distribution/presets/single.yml b/biome-distribution/presets/single.yml
@@ -1,3 +1,3 @@
 biomes:
   type: SINGLE
-  biome: ARID_ARBORETUM # The singular biome that will be used.
+  biome: WHITE_WALLOWS # The singular biome that will be used.
diff --git a/biome-distribution/stages/fill_temperature_zones.yml b/biome-distribution/stages/fill_temperature_zones.yml
@@ -40,6 +40,7 @@ stages:
       SCARLET_SANCTUARY: 2
       GLOOMY_GORGE: 2
       ROCKY_REFUGE: 2
+      WHITE_WALLOWS: 2
       _plateao: 2
       # LAND_MEDIUM_A: 1
       # LAND_MEDIUM_B: 1

diff --git a/biomes/rearth/base/eq_eroded_valley_mountains.yml b/biomes/rearth/base/eq_eroded_valley_mountains.yml
@@ -0,0 +1,42 @@
+id: EQ_ERODED_VALLEY_MOUNTAINS
+type: BIOME
+abstract: true
+
+vars: &variables
+  base: 73
+  height: 25
+  valleyDepth: 50
+  valleyCutoff: 0.15
+  valleyCutoffStart: -0.97
+  caveStrength: 35
+
+terrain:
+  sampler:
+    dimensions: 3
+    type: EXPRESSION
+    variables: *variables
+    expression: |
+      -y + base
+      + valleyDepth * (clamp(valleys(x,z), valleyCutoffStart, valleyCutoffStart + valleyCutoff) - valleyCutoffStart) * (1 / valleyCutoff)
+      + lerp(valleys(x,z), valleyCutoffStart, 0.2, valleyCutoffStart + valleyCutoff, 1) * height * surfaceOffset(x,z)
+      - abs(caves(x,y * 1.85,z) * caveStrength) * lerp(y, 65, 0, 70, 1)
+    samplers:
+      surfaceOffset:
+        dimensions: 2
+        type: FBM
+        sampler:
+          type: OPEN_SIMPLEX_2S
+          frequency: 0.006
+        octaves: 3
+        lacunarity: 4
+        gain: 0.3
+      caves:
+        dimensions: 3
+        type: OPEN_SIMPLEX_2S
+        frequency: 0.018
+      valleys:
+        dimensions: 2
+        type: CELLULAR
+        frequency: 0.005
+        distance: Euclidean
+        return: Distance2Sub
diff --git a/biomes/rearth/rivers/gloomy_gorge_river.yml b/biomes/rearth/rivers/gloomy_gorge_river.yml
@@ -2,7 +2,7 @@ id: GLOOMY_GORGE_RIVER
 type: BIOME
 extends: [RIVER, GLOOMY_GORGE]
 
-original-noise: &originalNoise $biomes/rearth/variants/gloomy_gorge.yml:terrain.sampler # Original noise to be turned into river
+original-noise: &originalNoise $biomes/rearth/base/eq_eroded_valley_mountains.yml:terrain.sampler # Original noise to be turned into river
 
 vars: &variables
   ceilingHeight:    90  # Base Y level of the ceiling

diff --git a/biomes/rearth/variants/gloomy_gorge.yml b/biomes/rearth/variants/gloomy_gorge.yml
@@ -1,7 +1,7 @@
 id: GLOOMY_GORGE
 type: BIOME
 vanilla: minecraft:plains
-extends: [ CARVING_LAND, BASE ]
+extends: [ EQ_ERODED_VALLEY_MOUNTAINS, CARVING_LAND, BASE ]
 
 color: $biomes/colors.yml:PLAINS
 
@@ -14,45 +14,6 @@ colors:
   grass: 0x79CF85
   foliage: 0x79CF85
 
-vars: &variables
-  base: 73
-  height: 25
-  valleyDepth: 50
-  valleyCutoff: 0.15
-  valleyCutoffStart: -0.97
-  caveStrength: 35
-
-terrain:
-  sampler:
-    dimensions: 3
-    type: EXPRESSION
-    variables: *variables
-    expression: |
-      -y + base
-      + valleyDepth * (clamp(valleys(x,z), valleyCutoffStart, valleyCutoffStart + valleyCutoff) - valleyCutoffStart) * (1 / valleyCutoff)
-      + lerp(valleys(x,z), valleyCutoffStart, 0.2, valleyCutoffStart + valleyCutoff, 1) * height * surfaceOffset(x,z)
-      - abs(caves(x,y * 1.85,z) * caveStrength) * lerp(y, 65, 0, 70, 1)
-    samplers:
-      surfaceOffset:
-        dimensions: 2
-        type: FBM
-        sampler:
-          type: OPEN_SIMPLEX_2S
-          frequency: 0.006
-        octaves: 3
-        lacunarity: 4
-        gain: 0.3
-      caves:
-        dimensions: 3
-        type: OPEN_SIMPLEX_2S
-        frequency: 0.018
-      valleys:
-        dimensions: 2
-        type: CELLULAR
-        frequency: 0.005
-        distance: Euclidean
-        return: Distance2Sub
-
 palette:
   - GRASS_SANDY_VARIATION: 319
   - GRASS_PODZOL_MUDDY: 71

diff --git a/biomes/rearth/variants/white_wallows.yml b/biomes/rearth/variants/white_wallows.yml
@@ -0,0 +1,37 @@
+id: WHITE_WALLOWS
+type: BIOME
+vanilla: minecraft:windswept_hills
+extends: [ EQ_ERODED_VALLEY_MOUNTAINS, CARVING_LAND, BASE ]
+
+color: $biomes/colors.yml:PLAINS
+
+tags:
+  - USE_RIVER
+
+palette:
+  - GRASS_MUSHY: 319
+  - GRASS_PODZOL_MUDDY: 75
+  - MUDDY_BEACH: 63
+  - << meta.yml:palette-bottom
+
+slant:
+  - threshold: 0.7
+    palette:
+      - ROCKY_SLANT: 319
+      # - CALCITE_DIORITE_MIX: 319
+      - << meta.yml:palette-bottom
+
+features:
+  landforms:
+    - MOSSY_BOULDERS
+  flora:
+    - GRASS
+    - LARGE_CEILING_VINES
+    - AZALEA_BLOCK
+    - FLOWERING_AZALEA_BLOCK
+    - MIXED_BUSHES
+    - FERNS
+    - WHITE_FLOWER_COVER
+  trees:
+    - GREAT_AZALEA_TREES
+    - MESQUITE_TREES
diff --git a/features/vegetation/trees/great_azalea_trees.yml b/features/vegetation/trees/great_azalea_trees.yml
@@ -13,7 +13,7 @@ locator:
     - type: TOP
       range:
         min: ${meta.yml:deepslate-top} - 7
-        max: ${meta.yml:ocean-level} - 11
+        max: ${meta.yml:ocean-level} + 80
 
 structures:
   distribution: