2 Commits

3 changed files with 70 additions and 34 deletions

View File

@@ -273,7 +273,7 @@ local rivers = {
['landscape'] = { ['landscape'] = {
offset = -5, offset = -5,
scale = 2, scale = 2,
spread = {x = 5, y = 5, z = 100}, spread = {x = 50, y = 50, z = 100},
seed = 44444, seed = 44444,
octaves = 2, octaves = 2,
persistence = 0.3, persistence = 0.3,
@@ -303,7 +303,7 @@ local lakes = {
['landscape'] = { ['landscape'] = {
offset = -8, offset = -8,
scale = 2, scale = 2,
spread = {x = 15, y = 15, z = 15}, spread = {x = 150, y = 150, z = 15},
seed = 55555, seed = 55555,
octaves = 2, octaves = 2,
persistence = 0.3, persistence = 0.3,
@@ -333,7 +333,7 @@ local rocky_shores = {
['landscape'] = { ['landscape'] = {
offset = 2, offset = 2,
scale = 4, scale = 4,
spread = {x = 8, y = 8, z = 8}, spread = {x = 80, y = 80, z = 80},
seed = 66666, seed = 66666,
octaves = 3, octaves = 3,
persistence = 0.5, persistence = 0.5,
@@ -391,9 +391,9 @@ local rocky_islands = {
local swamp_land = { local swamp_land = {
['landscape'] = { ['landscape'] = {
offset = 1, offset = 10,
scale = 2, scale = 2,
spread = {x = 12, y = 12, z = 12}, spread = {x = 120, y = 120, z = 120},
seed = 88888, seed = 88888,
octaves = 2, octaves = 2,
persistence = 0.4, persistence = 0.4,
@@ -687,6 +687,7 @@ local function postProcessing(biome, mapGenerator, factors, data, index, x, y, z
end end
end end
--[[
mapGenerator:registerBiome('midgard', 'swamp', { mapGenerator:registerBiome('midgard', 'swamp', {
tempPoint = 0, tempPoint = 0,
humidityPoint = 80, humidityPoint = 80,
@@ -703,6 +704,24 @@ mapGenerator:registerBiome('midgard', 'swamp', {
generateTurf = generateTurf, generateTurf = generateTurf,
generateSoil = generateSoil, generateSoil = generateSoil,
postProcessing = postProcessing postProcessing = postProcessing
})--]]
mapGenerator:registerBiome('midgard', 'green_meadow', {
tempPoint = 80,
humidityPoint = 60,
minY = 100,
maxY = -50,
groundNodes = {
soil = 'soils:humus',
turf = 'soils:turf_meadow',
rock = 'rocks:sylite',
bottom = 'soils:humus',
},
soilHeight = 5,
--generateRock = generateRock,
--generateTurf = generateTurf,
--generateSoil = generateSoil,
--postProcessing = postProcessing
}) })
return mapGenerator return mapGenerator

View File

@@ -1,27 +1,50 @@
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet() local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
---@type Node.NodeDefinition
local defaultSoilDef = {
settings = {
name = "",
_description = "A soil",
tiles = {},
groups = {
dig_immediate = 2,
soil = 1,
soil_fertiliry = 100, -- Soil fertility for agriculture
}
},
}
---@type Node
local defaultSoil = Node:getExtended(defaultSoilDef)
local soilFactory = defaultSoil:getFactory()
---@type TileSheet ---@type TileSheet
local ts = TileSheet:new("soils_sheet.png", 16, 16) local soilTileSheet = TileSheet:new("soils_sheet.png", 16, 16)
---@class SoilDef
---@field rarity Item.Rarity?
---@field maxFertility integer
---@param name string
---@param x number
---@param def SoilDef
---@param turfs table<string, integer>?
local function registerSoil(name, x, def, turfs)
local defaultSoil = Node:getExtended({
settings = {
name = '',
groups = {
dig_immediate = 2,
soil = 1,
soil_fertility = def.maxFertility,
},
},
})
local soilTexture = soilTileSheet:t(x, 0)
defaultSoil:new({
settings = {
name = name,
tiles = {soilTexture}
},
})
if turfs ~= nil then
for turfName, turfX in pairs(turfs) do
defaultSoil:new({
settings = {
name = turfName,
tiles = {soilTileSheet:t(turfX,1), soilTexture, soilTexture..'^'..soilTileSheet:t(turfX,2)},
},
})
end
end
end
--[[
local clayTiles = { local clayTiles = {
ts:t(0,0) ts:t(0,0)
} }
@@ -237,15 +260,9 @@ soilFactory:registerItems({
}, },
}, },
}) })--]]
---@type TileSheet ---@type TileSheet
local tsT = TileSheet:new("soils_turfs_sheet.png", 16, 16) local tsT = TileSheet:new("soils_turfs_sheet.png", 16, 16)
defaultSoil:new({ registerSoil('humus', 0, {maxFertility = 100, rarity = 'uncommon'}, {turf_meadow=0})
settings = {
name = 'turf_swamp',
tiles = {tsT:t(0,0), ts:t(6, 0), ts:t(6,0)..'^'..tsT:t(0,1)},
_rarity = 'unique'
}
})

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 21 KiB