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 4295421..975008c 100644 Binary files a/mods/ENVIRONMENT/mapGenerator/textures/maps/map.ff and b/mods/ENVIRONMENT/mapGenerator/textures/maps/map.ff differ