From 227224ccfe71fc29a41a8f07bcbc50f0c2473698 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 25 Jan 2025 03:56:52 +0300
Subject: [PATCH] update base:demo generator

---
 .../base/generators/demo.files/biomes.toml    | 10 +++---
 .../base/generators/demo.files/script.lua     | 32 +++++++++++--------
 res/content/base/generators/demo.toml         |  2 +-
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/res/content/base/generators/demo.files/biomes.toml b/res/content/base/generators/demo.files/biomes.toml
index c01eaa535..9b45e9790 100644
--- a/res/content/base/generators/demo.files/biomes.toml
+++ b/res/content/base/generators/demo.files/biomes.toml
@@ -1,7 +1,7 @@
 [forest]
 parameters = [
-    {weight=1, value=0},
-    {weight=0.5, value=0.2}
+    {weight=2, value=0.0},
+    {weight=1.6, value=-0.0}
 ]
 layers = [
     {below-sea-level=false, height=1, block="base:grass_block"},
@@ -28,8 +28,8 @@ structures = [
 
 [desert]
 parameters = [
-    {weight=1.0, value=1},
-    {weight=0.8, value=0}
+    {weight=1.0, value=0.0},
+    {weight=2.0, value=1.1}
 ]
 layers = [
     {height=6, block="base:sand"},
@@ -44,7 +44,7 @@ sea-layers = [
 [plains]
 parameters = [
     {weight=0.8, value=0.5},
-    {weight=0.8, value=0.0}
+    {weight=0.8, value=-0.2}
 ]
 layers = [
     {below-sea-level=false, height=1, block="base:grass_block"},
diff --git a/res/content/base/generators/demo.files/script.lua b/res/content/base/generators/demo.files/script.lua
index 9a9952240..522cc9a7f 100644
--- a/res/content/base/generators/demo.files/script.lua
+++ b/res/content/base/generators/demo.files/script.lua
@@ -50,14 +50,19 @@ function generate_heightmap(x, y, w, h, s, inputs)
     local vmap = Heightmap(w, h)
     umap.noiseSeed = SEED
     vmap.noiseSeed = SEED
-    vmap:noise({x+521, y+70}, 0.1*s, 3, 25.8)
-    vmap:noise({x+95, y+246}, 0.15*s, 3, 25.8)
+    vmap:noise({x+521, y+70}, 0.1*s, 2, 25.8)
+    vmap:noise({x+95, y+246}, 0.15*s, 2, 25.8)
 
     local map = Heightmap(w, h)
     map.noiseSeed = SEED
-    map:noise({x, y}, 0.8*s, 4, 0.02)
-    map:cellnoise({x, y}, 0.1*s, 3, 0.3, umap, vmap)
-    map:add(0.7)
+    map:noise({x, y}, 0.5*s, 3, -0.1)
+    --map:cellnoise({x, y}, 0.1*s, 3, 0.3, umap, vmap)
+    map:mul(inputs[1])
+    --map:add(1.0)
+    --map:pow(0.2)
+    --map:mul(0.02)
+    map:mul(0.3)
+    map:add(0.3)
 
     local rivermap = Heightmap(w, h)
     rivermap.noiseSeed = SEED
@@ -66,26 +71,25 @@ function generate_heightmap(x, y, w, h, s, inputs)
     rivermap:mul(2.0)
     rivermap:pow(0.15)
     rivermap:max(0.5)
-    map:mul(rivermap)
+    --map:mul(rivermap)
 
     local desertmap = Heightmap(w, h)
     desertmap.noiseSeed = SEED
-    desertmap:cellnoise({x+52, y+326}, 0.3*s, 2, 0.2)
-    desertmap:add(0.5)
-    map:mixin(desertmap, inputs[1])
+    desertmap:cellnoise({x+52, y+326}, 0.3*s, 2, 0.1)
+    desertmap:add(0.35)
+
+    map:mixin(desertmap, inputs[2])
     return map
 end
 
 function generate_biome_parameters(x, y, w, h, s)
     local tempmap = Heightmap(w, h)
     tempmap.noiseSeed = SEED + 5324
-    tempmap:noise({x, y}, 0.08*s, 6)
-    tempmap:mul(0.5)
+    tempmap:noise({x, y}, 0.4*s, 4)
+    tempmap:mul(0.3)
     tempmap:add(0.5)
     local hummap = Heightmap(w, h)
     hummap.noiseSeed = SEED + 953
-    hummap:noise({x, y}, 0.08*s, 6)
-    tempmap:pow(3)
-    hummap:pow(3)
+    hummap:noise({x, y}, 0.2*s, 6)
     return tempmap, hummap
 end
diff --git a/res/content/base/generators/demo.toml b/res/content/base/generators/demo.toml
index 43def20e2..73811d50e 100644
--- a/res/content/base/generators/demo.toml
+++ b/res/content/base/generators/demo.toml
@@ -2,4 +2,4 @@
 # 2 - humidity
 biome-parameters = 2
 sea-level = 64
-heightmap-inputs = [1]
+heightmap-inputs = [1, 2]