PolyhedralDev · astrsh · Jul 12, 2023 · Jul 12, 2023 · Jul 12, 2023 · Jul 13, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "images"]
 	path = .wiki/images
-	url = git@github.com:PolyhedralDev/TerraOverworldConfigImages.git
+	url = https://github.com/PolyhedralDev/TerraOverworldConfigImages.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,13 +41,15 @@ generate in an area where it previously did not (resulting in a chunk border).
 
 ## [Unreleased]
 ### Added
-
+- Added cold steppe.
+- Added the spawn island, a flattened landmass at 0,0 that guarantees the world spawn is on land.
 
 ### Changed
-
+- Reworked terrain to use a global heightmap.
+- Reworked biome distribution to be based on the [Koppen Climate Classification](https://en.wikipedia.org/wiki/K%C3%B6ppen_climate_classification)
 
 ### Removed
-
+- Removed elevation biome variants, as biomes now use a global height map for terrain.
 
 ### Fixed
 

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ specific to a different domain of configuration:
 - `biomes`
   Where all biome configs are defined.
 
-- `biome-providers`
+- `biome-distribution`
   Contains configuration files related *where* biomes generate.
 
 - `structures`
@@ -51,7 +51,7 @@ This pack comes with several biome distribution presets, which can be chosen
 within the [`pack.yml`](./pack.yml) file. If none of these presets do exactly
 what you want, you can further modify biome distribution presets with alternate
 sources and stages. Check out the
-[`biome-providers/presets/default.yml`](./biome-providers/presets/default.yml)
+[`biome-distribution/presets/default.yml`](./biome-distribution/presets/default.yml)
 config for these alternative sources and stages.
 
 ### Where can I learn more about configuration?

diff --git a/biome-distribution/README.md b/biome-distribution/README.md
@@ -0,0 +1,22 @@
+# Biome Distribution
+
+This directory contains configuration files related to **biome distribution**. 
+For individual biome configuration, checkout the `biomes` directory instead.
+
+This directory is organized into 3 subdirectories:
+
+## Presets
+A collection of preset biome provider configurations. A biome provider is simply
+something that tells Terra how to distribute biomes. The provider in use is
+determined under the `biomes` parameter in the pack manifest (`pack.yml`). (Only
+one can be selected at a time.)
+
+## Stages
+Contains various mutation stages that are applied to pipeline biome providers.
+These do things such as add different climate zones, add rivers, add volcanoes,
+etc. Similarly to sources, the ordering of stages is determined by the provider
+preset.
+
+## Extrusions
+Contains extrusion stages that relate to 3D biome distribution. This is primarily
+for handling the placement of cave biomes.
diff --git a/biome-distribution/extrusions/add_cave_biomes.yml b/biome-distribution/extrusions/add_cave_biomes.yml
@@ -0,0 +1,43 @@
+extrusions:
+  - type: REPLACE
+    from: LAND_CAVES
+    sampler:
+      type: CELLULAR
+      return: CellValue
+      salt: 1252
+      frequency: 1 / 200 / ${customization.yml:cave-biome-scale} / ${customization.yml:global-scale}
+    to:
+      - SELF: 6
+      - LUSH_CAVES: 1
+      - DRIPSTONE_CAVES: 1
+    range:
+      min: $meta.yml:deepslate-bottom
+      max: ${meta.yml:ocean-level} - 13
+
+  - type: REPLACE
+    from: ICE_CAVES
+    sampler:
+      type: CELLULAR
+      return: CellValue
+      salt: 1252
+      frequency: 1 / 200 / ${customization.yml:cave-biome-scale} / ${customization.yml:global-scale}
+    to:
+      - SELF: 3
+      - ICE_CAVES: 7
+    range:
+      min: $meta.yml:deepslate-bottom
+      max: ${meta.yml:ocean-level} - 13
+
+  - type: REPLACE
+    from: ANCIENT_CAVES
+    sampler:
+      type: CELLULAR
+      return: CellValue
+      salt: 6457
+      frequency: 1 / 200 / ${customization.yml:cave-biome-scale} / ${customization.yml:global-scale}
+    to:
+      - SELF: 3
+      - ANCIENT_CAVES: 1
+    range:
+      min: $meta.yml:bottom-y
+      max: $meta.yml:deepslate-top
diff --git a/biome-providers/extrusions/add_deep_dark.yml → ...distribution/extrusions/add_deep_dark.yml b/biome-providers/extrusions/add_deep_dark.yml → ...distribution/extrusions/add_deep_dark.yml
@@ -4,10 +4,10 @@ extrusions:
     sampler:
       type: OPEN_SIMPLEX_2
       salt: 9238
-      frequency: 0.2 / ${meta.yml:biome-distribution.variation-scale} / ${meta.yml:biome-distribution.global-scale}
+      frequency: 1 / 40 / ${customization.yml:variation-scale} / ${customization.yml:global-scale}
     to:
       - SELF: 4
       - DEEP_DARK: 1
     range:
-      min: -64
-      max: 0
+      min: $meta.yml:bottom-y
+      max: $meta.yml:deepslate-top
diff --git a/biome-distribution/presets/default.yml b/biome-distribution/presets/default.yml
@@ -0,0 +1,58 @@
+biomes:
+  type: EXTRUSION
+  extrusions:
+    - << biome-distribution/extrusions/add_cave_biomes.yml:extrusions
+    - << biome-distribution/extrusions/add_deep_dark.yml:extrusions
+  provider:
+    type: PIPELINE
+    resolution: 4
+    blend:
+      amplitude: 2
+      sampler:
+        type: OPEN_SIMPLEX_2
+        frequency: 0.1
+    pipeline:
+      source:
+        type: SAMPLER
+        sampler:
+          type: EXPRESSION
+          expression: continents(x, z)
+        biomes:
+          ocean: 1
+          land: 1
+      stages:
+        - << biome-distribution/stages/add_spots.yml:stages
+        - << biome-distribution/stages/add_coast.yml:stages
+        - << biome-distribution/stages/climate/temperature.yml:stages
+        - << biome-distribution/stages/climate/precipitation.yml:stages
+        - << biome-distribution/stages/climate/elevation.yml:stages
+        - << biome-distribution/stages/climate/color.yml:stages
+        - << biome-distribution/stages/add_travertine_terraces.yml:stages
+        - << biome-distribution/stages/set_biomes_in_climates.yml:stages
+
+        - type: REPLACE
+          from: todo
+          to: PLAINS
+          sampler:
+            type: CONSTANT
+
+        - type: FRACTAL_EXPAND
+          sampler:
+            type: WHITE_NOISE
+        - type: FRACTAL_EXPAND
+          sampler:
+            type: WHITE_NOISE
+        - type: FRACTAL_EXPAND
+          sampler:
+            type: WHITE_NOISE
+        - type: FRACTAL_EXPAND
+          sampler:
+            type: WHITE_NOISE
+        - type: SMOOTH
+          sampler:
+            type: WHITE_NOISE
+        - type: SMOOTH
+          sampler:
+            type: WHITE_NOISE
+
+        - << biome-distribution/stages/add_rivers.yml:stages
diff --git a/biome-distribution/presets/single.yml b/biome-distribution/presets/single.yml
@@ -0,0 +1,21 @@
+biomes:
+  type: EXTRUSION
+  extrusions:
+    - << biome-distribution/extrusions/add_cave_biomes.yml:extrusions
+    - << biome-distribution/extrusions/add_deep_dark.yml:extrusions
+  provider:
+    type: PIPELINE
+    resolution: 4
+    blend:
+      amplitude: 2
+      sampler:
+        type: OPEN_SIMPLEX_2
+        frequency: 0.1
+    pipeline:
+      source:
+        type: SAMPLER
+        biomes: $pack.yml:preset-single-biome
+        sampler:
+          type: CONSTANT
+      stages:
+        - << biome-distribution/stages/add_rivers.yml:stages
diff --git a/biome-distribution/presets/single_debug.yml b/biome-distribution/presets/single_debug.yml
@@ -0,0 +1,3 @@
+biomes:
+  type: SINGLE
+  biome: $pack.yml:preset-single-debug-biome
diff --git a/biome-distribution/stages/add_coast.yml b/biome-distribution/stages/add_coast.yml
@@ -0,0 +1,24 @@
+stages:
+  - type: REPLACE
+    from: ocean
+    sampler:
+      type: EXPRESSION
+      expression: continentBorder(x, z)
+    to:
+      SELF: 1
+      coast: 1
+  - type: BORDER
+    sampler:
+      type: CONSTANT
+    from: land
+    replace: ocean
+    to: coast
+  - type: REPLACE
+    from: coast
+    to:
+      land: 1
+      SELF: 1
+    sampler:
+      type: OPEN_SIMPLEX_2
+      frequency: 1 / 300 / ${customization.yml:global-scale}
+      salt: 1023
diff --git a/biome-providers/stages/add_rivers.yml → biome-distribution/stages/add_rivers.yml b/biome-providers/stages/add_rivers.yml → biome-distribution/stages/add_rivers.yml
@@ -1,8 +1,27 @@
-# The sampler that controls how rivers generate, you can find various presets
-# in the biome-providers/stages/river-samplers/ folder.
-riverSampler: &riverSampler $biome-providers/stages/river-samplers/default.yml:sampler
-# To pick the preset, simply change the file reference above ^
-# You can further edit and customize the parameters of a river sampler preset within its own file.
+riverSampler: &riverSampler
+  type: EXPRESSION
+  expression: segment(riverBiomeMap(x, z), riverValue, borderValue, (elevation(x, z) < lowlandsThreshold) && (borderMask(x, z) < borderMaskThreshold))
+  variables:
+    riverValue: $math/samplers/rivers.yml:variables.riverValue
+    borderValue: $math/samplers/rivers.yml:variables.borderValue
+    borderMaskThreshold: 0.2
+    lowlandsThreshold: $customization.yml:elevation-lowlands-threshold
+  functions:
+    segment:
+      arguments:
+        - river
+        - riverValue
+        - borderValue
+        - borderPredicate
+      expression: if(river <= riverValue, 1, if((river <= borderValue) && borderPredicate, -0.4, -1))
+  samplers:
+    borderMask:
+      dimensions: 2
+      type: PROBABILITY
+      sampler:
+        type: OPEN_SIMPLEX_2
+        salt: 4812
+        frequency: 0.003
 
 # Tags are used by biomes to determine the kind of river to use, except for biomes with
 # their own specific river biome. These tags are formatted by the type of river, and optionally
@@ -27,9 +46,9 @@ stages:
       XERIC_MOUNTAINS:
         - SELF: 1
         - XERIC_MOUNTAINS_RIVER: 1
-      BADLANDS_MOUNTAINS:
+      BADLANDS:
         - SELF: 1
-        - BADLANDS_MOUNTAINS_RIVER: 1
+        - BADLANDS_RIVER: 1
       DRY_TEMPERATE_MOUNTAINS:
         - SELF: 1
         - DRY_TEMPERATE_MOUNTAINS_RIVER: 1
@@ -39,12 +58,26 @@ stages:
       SNOWY_MOUNTAINS:
         - SELF: 1
         - SNOWY_MOUNTAINS_RIVER: 1
-      SNOWY_TERRACED_MOUNTAINS:
+      SNOWY_TUFF_MOUNTAINS:
         - SELF: 1
-        - SNOWY_TERRACED_MOUNTAINS_RIVER: 1
-      SNOWY_ERODED_TERRACED_MOUNTAINS:
+        - SNOWY_TUFF_MOUNTAINS_RIVER: 1
+      SNOWY_BLACKSTONE_MOUNTAINS:
         - SELF: 1
-        - SNOWY_ERODED_TERRACED_MOUNTAINS_RIVER: 1
+        - SNOWY_BLACKSTONE_MOUNTAINS_RIVER: 1
+    sampler: *riverSampler
+  # Desert rivers
+  - type: REPLACE
+    from: USE_DESERT_RIVER
+    to:
+      - SELF: 1
+      - DESERT_RIVER: 1
+    sampler: *riverSampler
+  # Red desert rivers
+  - type: REPLACE
+    from: USE_RED_DESERT_RIVER
+    to:
+      - SELF: 1
+      - RED_DESERT_RIVER: 1
     sampler: *riverSampler
   # Regular rivers with temperate marshes
   - type: REPLACE
@@ -62,13 +95,34 @@ stages:
       - SWAMP: 1
       - RIVER: 2
     sampler: *riverSampler
-  # Regular coastal rivers with mangrove swamps
+  # Warm rivers
+  - type: REPLACE
+    from: USE_LUKEWARM_RIVER
+    to:
+      - SELF: 1
+      - LUKEWARM_RIVER: 1
+    sampler: *riverSampler
+  # Tropical rivers
+  - type: REPLACE
+    from: USE_TROPICAL_RIVER
+    to:
+      - SELF: 1
+      - TROPICAL_RIVER: 1
+    sampler: *riverSampler
+  # Tropical coastal rivers with mangrove swamps
   - type: REPLACE
     from: USE_RIVER_COASTAL_TROPICAL_SWAMP
     to:
       - SELF: 1
       - MANGROVE_SWAMP: 1
-      - RIVER: 2
+      - TROPICAL_RIVER: 2
+    sampler: *riverSampler
+  # Cold rivers
+  - type: REPLACE
+    from: USE_COLD_RIVER
+    to:
+      - SELF: 1
+      - COLD_RIVER: 1
     sampler: *riverSampler
   # Frozen Rivers
   - type: REPLACE

diff --git a/biome-distribution/stages/add_spots.yml b/biome-distribution/stages/add_spots.yml
@@ -0,0 +1,46 @@
+stages:
+  - type: REPLACE
+    from: ALL
+    to:
+      - SELF: 1
+      - spot: 1
+    sampler:
+      type: EXPRESSION
+      expression: if(spotDistance(x, z) < spotRadius(x, z) + biomeBorder, 1, -1)
+      variables: $math/samplers/spots.yml:variables
+
+  - type: REPLACE
+    from: spot
+    to:
+      - volcano: 1
+      - mesa: 1
+    sampler:
+      type: EXPRESSION
+      expression: spotSizePercent(x, z)*2-1
+
+  - type: REPLACE
+    from: volcano
+    to:
+      - extinct-volcano: 5
+      - active-volcano: 1
+    sampler:
+      type: EXPRESSION
+      expression: volcanoActivity(x, z)
+
+  - type: REPLACE
+    from: extinct-volcano
+    to:
+      - extinct-volcano: 4
+      # - crater-lake: 1 # Crater lakes are disabled until a good method of adding fluid is implemented
+    sampler:
+      type: EXPRESSION
+      expression: spotEdgeRadiusPercent(x, z)*2-1
+
+  - type: REPLACE
+    from: active-volcano
+    to:
+      - ERUPTED_VOLCANO: 4
+      - PRISMATIC_SPRING: 1
+    sampler:
+      type: EXPRESSION
+      expression: spotEdgeRadiusPercent(x, z)*2-1