From eb69779b0dff678f0ed30a09f2c7835ba4433db6 Mon Sep 17 00:00:00 2001 From: Doloment Date: Sun, 25 Jan 2026 13:41:53 +0700 Subject: [PATCH] Test1: setting up the tahrion map (turns out the mapgen is really f-ing slow (no shi-)) --- .../mapGenerator/src/mapGenerator.lua | 489 ++++++++++++++---- .../mapGenerator/textures/maps/map.ff | Bin 2064 -> 131088 bytes 2 files changed, 375 insertions(+), 114 deletions(-) diff --git a/mods/ENVIRONMENT/mapGenerator/src/mapGenerator.lua b/mods/ENVIRONMENT/mapGenerator/src/mapGenerator.lua index 05242fc..5bd40e5 100644 --- a/mods/ENVIRONMENT/mapGenerator/src/mapGenerator.lua +++ b/mods/ENVIRONMENT/mapGenerator/src/mapGenerator.lua @@ -15,16 +15,16 @@ local MapGen = mapGenRequire('MapGen') air = 'air', -- Rocks - sylite = 'rocks:sylite', - syliteGray = 'rocks:sylite_gray', + sylite = 'rocks:sylite', + syliteGray = 'rocks:sylite_gray', syliteBlack = 'rocks:sylite_black', - tauitite = 'rocks:tauitite', - iyellite = 'rocks:iyellite', - falmyte = 'rocks:falmyte', - hapcoryte = 'rocks:hapcoryte', - burcite = 'rocks:burcite', - felhor = 'rocks:felhor', - malachite = 'rocks:malachite', + tauitite = 'rocks:tauitite', + iyellite = 'rocks:iyellite', + falmyte = 'rocks:falmyte', + hapcoryte = 'rocks:hapcoryte', + burcite = 'rocks:burcite', + felhor = 'rocks:felhor', + malachite = 'rocks:malachite', -- Liquids water = 'liquids:water_source', @@ -52,128 +52,389 @@ mapGenerator:registerLayer('midgard', { biomesGorizontalScattering = 5 }) -local land1 = { - offset = -10, - scale = 5, - spread = {x = 10, y = 10, z = 10}, - seed = 47, - octaves = 3, - persistence = 0.4, - lacunarity = 2, + +-- TODO: Config should be imported from .json file in the world's folder +local ocean = { + ['landscape'] = { + offset = -10, + scale = 3, + spread = {x = 10, y = 10, z = 10}, + seed = 420, + octaves = 2, + persistence = 0.4, + lacunarity = 2, + }, + ['temp'] = { + offset = -10, + scale = 5, + spread = {x = 10, y = 10, z = 10}, + seed = 47, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = -10, + scale = 5, + spread = {x = 10, y = 10, z = 10}, + seed = 47, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, } -local land2 = { - offset = 20, - scale = 5, - spread = {x = 30, y = 30, z = 30}, - seed = 47, - octaves = 3, - persistence = 0.4, - lacunarity = 2, +local common_lands = { + ['landscape'] = { + offset = 0, + scale = 5, + spread = {x = 10, y = 10, z = 10}, + seed = 88005553535, + octaves = 2, + persistence = 0.4, + lacunarity = 2, + }, + ['temp'] = { + offset = -10, + scale = 5, + spread = {x = 10, y = 10, z = 10}, + seed = 47, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = -10, + scale = 5, + spread = {x = 10, y = 10, z = 10}, + seed = 47, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, } -local land3 = { - offset = 40, - scale = 5, - spread = {x = 45, y = 20, z = 45}, - seed = 472, - octaves = 3, - persistence = 0.3, - lacunarity = 2, +local foresty_lands = { + ['landscape'] = { + offset = 5, + scale = 8, + spread = {x = 15, y = 15, z = 15}, + seed = 12345, + octaves = 3, + persistence = 0.5, + lacunarity = 2, + }, + ['temp'] = { + offset = 20, + scale = 10, + spread = {x = 20, y = 20, z = 20}, + seed = 48, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 60, + scale = 15, + spread = {x = 15, y = 15, z = 15}, + seed = 49, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, } -local climat1 = { - offset = 80, - scale = 10, - spread = {x = 10, y = 10, z = 10}, - seed = 47, - octaves = 8, - persistence = 0.6, - lacunarity = 2, +local hilly_lands = { + ['landscape'] = { + offset = 15, + scale = 12, + spread = {x = 20, y = 20, z = 20}, + seed = 54321, + octaves = 3, + persistence = 0.5, + lacunarity = 2, + }, + ['temp'] = { + offset = 15, + scale = 10, + spread = {x = 25, y = 25, z = 25}, + seed = 50, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 40, + scale = 15, + spread = {x = 20, y = 20, z = 20}, + seed = 51, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, } -local climat2 = { - offset = 30, - scale = 10, - spread = {x = 10, y = 10, z = 10}, - seed = 47, - octaves = 8, - persistence = 0.6, - lacunarity = 2, +local low_mountains = { + ['landscape'] = { + offset = 30, + scale = 20, + spread = {x = 25, y = 25, z = 25}, + seed = 11111, + octaves = 4, + persistence = 0.5, + lacunarity = 2, + }, + ['temp'] = { + offset = 5, + scale = 15, + spread = {x = 30, y = 30, z = 30}, + seed = 52, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 30, + scale = 15, + spread = {x = 25, y = 25, z = 25}, + seed = 53, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, } -local climat0 = { - offset = 50, - scale = 0, - spread = {x = 10, y = 10, z = 10}, - seed = 47, - octaves = 8, - persistence = 0.4, - lacunarity = 2, +local high_mountains = { + ['landscape'] = { + offset = 60, + scale = 35, + spread = {x = 30, y = 30, z = 30}, + seed = 22222, + octaves = 4, + persistence = 0.55, + lacunarity = 2, + }, + ['temp'] = { + offset = -10, + scale = 15, + spread = {x = 35, y = 35, z = 35}, + seed = 54, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 20, + scale = 10, + spread = {x = 30, y = 30, z = 30}, + seed = 55, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, } +local highest_peaks = { + ['landscape'] = { + offset = 100, + scale = 50, + spread = {x = 40, y = 40, z = 40}, + seed = 33333, + octaves = 5, + persistence = 0.6, + lacunarity = 2, + }, + ['temp'] = { + offset = -30, + scale = 10, + spread = {x = 50, y = 50, z = 50}, + seed = 56, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 10, + scale = 10, + spread = {x = 40, y = 40, z = 40}, + seed = 57, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, +} + +local rivers = { + ['landscape'] = { + offset = -5, + scale = 2, + spread = {x = 5, y = 5, z = 100}, + seed = 44444, + octaves = 2, + persistence = 0.3, + lacunarity = 2, + }, + ['temp'] = { + offset = 10, + scale = 5, + spread = {x = 50, y = 50, z = 50}, + seed = 58, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 80, + scale = 10, + spread = {x = 20, y = 20, z = 20}, + seed = 59, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, +} + +local lakes = { + ['landscape'] = { + offset = -8, + scale = 2, + spread = {x = 15, y = 15, z = 15}, + seed = 55555, + octaves = 2, + persistence = 0.3, + lacunarity = 2, + }, + ['temp'] = { + offset = 10, + scale = 5, + spread = {x = 30, y = 30, z = 30}, + seed = 60, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 90, + scale = 5, + spread = {x = 20, y = 20, z = 20}, + seed = 61, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, +} + +local rocky_shores = { + ['landscape'] = { + offset = 2, + scale = 4, + spread = {x = 8, y = 8, z = 8}, + seed = 66666, + octaves = 3, + persistence = 0.5, + lacunarity = 2, + }, + ['temp'] = { + offset = 15, + scale = 8, + spread = {x = 15, y = 15, z = 15}, + seed = 62, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 70, + scale = 10, + spread = {x = 15, y = 15, z = 15}, + seed = 63, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, +} + +local rocky_islands = { + ['landscape'] = { + offset = 8, + scale = 10, + spread = {x = 12, y = 12, z = 12}, + seed = 77777, + octaves = 3, + persistence = 0.5, + lacunarity = 2, + }, + ['temp'] = { + offset = 20, + scale = 8, + spread = {x = 20, y = 20, z = 20}, + seed = 64, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 60, + scale = 15, + spread = {x = 20, y = 20, z = 20}, + seed = 65, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, +} + +local swamp_land = { + ['landscape'] = { + offset = 1, + scale = 2, + spread = {x = 12, y = 12, z = 12}, + seed = 88888, + octaves = 2, + persistence = 0.4, + lacunarity = 2, + }, + ['temp'] = { + offset = 25, + scale = 5, + spread = {x = 15, y = 15, z = 15}, + seed = 66, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, + ['humidity'] = { + offset = 85, + scale = 10, + spread = {x = 15, y = 15, z = 15}, + seed = 67, + octaves = 3, + persistence = 0.4, + lacunarity = 2, + }, +} + + local v = vector.new ---[[ -mapGenerator:register2DPeaks('midgard', -{ - landscapeNoise = land1, - tempNoise = climat2, - humidityNoise = climat2, -},{ - v(500, 0, 500), - v(-500, 0, -500), - v(-500, 0, 500), - v(500, 0, -500), -}) - -mapGenerator:register2DPeaks('midgard', -{ - landscapeNoise = land2, - tempNoise = climat1, - humidityNoise = climat1, -},{ - v(-300, 0, 300), - v(200, 0, -400), -}) - -mapGenerator:register2DPeaks('midgard', -{ - landscapeNoise = land2, - tempNoise = climat2, - humidityNoise = climat2, -},{ - v(200, 0, 100), - v(-300, 0, -200), -})--]] for _, c in ipairs({'landscape', 'temp', 'humidity'}) do - mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', land1) - mapGenerator:registerLayerNoiseColor('midgard', c, '#77ea72', land2) - mapGenerator:registerLayerNoiseColor('midgard', c, '#46B331', land3) - --[[ - mapGenerator:register2DPeaks('midgard', c, { - { - color = '#77ea72', - pos = vector.new(512, 0, 512) - }, - { - color = '#4978c6', - pos = vector.new(512, 0, -512) - }, - { - color = '#77ea72', - pos = vector.new(-512, 0, -512) - }, - { - color = '#4978c6', - pos = vector.new(-512, 0, 512) - }, - })--]] + mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', ocean[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#81c948', common_lands[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#187726', foresty_lands[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#357a60', hilly_lands[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#5a7269', low_mountains[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#773b18', high_mountains[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#a3a3a3', highest_peaks[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#182077', rivers[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#06f5ff', lakes[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#677a48', rocky_shores[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#e4dc36', rocky_islands[c]) + mapGenerator:registerLayerNoiseColor('midgard', c, '#3b7718', swamp_land[c]) end -mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 100,{x=0, y=0}, 'landscape') -mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 150,{x=0, y=0}, 'temp') -mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 200,{x=0, y=0}, 'humidity') +mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'landscape') +mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'temp') +mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'humidity') -- [[ mapGenerator:registerCavern('midgard', 'cavern1', { diff --git a/mods/ENVIRONMENT/mapGenerator/textures/maps/map.ff b/mods/ENVIRONMENT/mapGenerator/textures/maps/map.ff index 4295421b6dc541405fcaabe7e6306ce1b548b964..975008cf249992c97953d41cfd62dad10158c22a 100644 GIT binary patch literal 131088 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 rYxlo>-}`94!yVd3