Merge branch 'remove-mountains' into main

Remove mountain terrain (forest covers the high elevation band for now).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Leonid Pershin
2026-06-14 23:24:19 +03:00
co-authored by Claude Opus 4.8
4 changed files with 4 additions and 8 deletions
+2 -4
View File
@@ -19,7 +19,7 @@
{ "chance": 0.20, "options": ["Strawberry", "Raspberry"] }, { "chance": 0.20, "options": ["Strawberry", "Raspberry"] },
{ "chance": 0.14, "options": ["DandelionA", "DandelionB", "DandelionC", "DaylilyA", "DaylilyB", "RoseA"] } { "chance": 0.14, "options": ["DandelionA", "DandelionB", "DandelionC", "DaylilyA", "DaylilyB", "RoseA"] }
] }, ] },
{ "defName": "Forest", "label": "terrain.forest", "maxHeight": 0.85, "color": [44, 110, 50], { "defName": "Forest", "label": "terrain.forest", "maxHeight": 1.01, "color": [44, 110, 50],
"isLand": true, "surface": "terrain/surfaces/soil", "fertility": 1.6, "isLand": true, "surface": "terrain/surfaces/soil", "fertility": 1.6,
"scatter": [ "scatter": [
{ "chance": 0.35, "options": ["TreeOakA", "TreeOakB", "TreeBirchA", "TreeGrayPineA", { "chance": 0.35, "options": ["TreeOakA", "TreeOakB", "TreeBirchA", "TreeGrayPineA",
@@ -28,8 +28,6 @@
{ "chance": 0.16, "options": ["BushA", "BushB", "BushC"] }, { "chance": 0.16, "options": ["BushA", "BushB", "BushC"] },
{ "chance": 0.14, "options": ["Strawberry", "Raspberry"] }, { "chance": 0.14, "options": ["Strawberry", "Raspberry"] },
{ "chance": 0.16, "options": ["GlowstoolA", "GlowstoolB", "TimbershroomA", "TimbershroomB", "NutrifungusA"] } { "chance": 0.16, "options": ["GlowstoolA", "GlowstoolB", "TimbershroomA", "TimbershroomB", "NutrifungusA"] }
] }, ] }
{ "defName": "Mountain", "label": "terrain.mountain", "maxHeight": 1.01, "color": [136, 132, 128],
"surface": "terrain/surfaces/roughhewnrock", "fertility": 0.2, "blocksLight": true }
] ]
} }
-1
View File
@@ -146,7 +146,6 @@
"terrain.sand": "sand", "terrain.sand": "sand",
"terrain.grass": "grass", "terrain.grass": "grass",
"terrain.forest": "forest", "terrain.forest": "forest",
"terrain.mountain": "mountains",
"plant.oak": "oak", "plant.oak": "oak",
"plant.birch": "birch", "plant.birch": "birch",
"plant.pine": "pine", "plant.pine": "pine",
-1
View File
@@ -146,7 +146,6 @@
"terrain.sand": "песок", "terrain.sand": "песок",
"terrain.grass": "трава", "terrain.grass": "трава",
"terrain.forest": "лес", "terrain.forest": "лес",
"terrain.mountain": "горы",
"plant.oak": "дуб", "plant.oak": "дуб",
"plant.birch": "берёза", "plant.birch": "берёза",
"plant.pine": "сосна", "plant.pine": "сосна",
+2 -2
View File
@@ -70,8 +70,8 @@ public sealed class WorldScene : Scene
private SkillSet _skills = null!; private SkillSet _skills = null!;
private float[] _cellFertility = []; private float[] _cellFertility = [];
private bool[] _cellLand = []; private bool[] _cellLand = [];
private bool[] _cellOccluderBase = []; // горы (статично из террейна) private bool[] _cellOccluderBase = []; // светонепроницаемый террейн (статично; сейчас такого нет)
private bool[] _cellOccluder = []; // горы + зрелые деревья (пересобирается лайтмапом) private bool[] _cellOccluder = []; // террейн-окклюдеры + зрелые деревья (пересобирается лайтмапом)
/// <summary>Новый мир из конфига.</summary> /// <summary>Новый мир из конфига.</summary>
public WorldScene(WorldConfig config) public WorldScene(WorldConfig config)