soils: add new registrations, remove unused code
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
|
||||
|
||||
---@type TileSheet
|
||||
local soilTileSheet = TileSheet:new("soils_sheet.png", 16, 16)
|
||||
local soilTileSheet = TileSheet:new('soils_sheet.png', 16, 16)
|
||||
---@type TileSheet
|
||||
local grassTileSheet = TileSheet:new('soils_grass_sheet.png', 16, 16)
|
||||
|
||||
---@class SoilDef
|
||||
---@field rarity Item.Rarity?
|
||||
@@ -28,7 +30,10 @@ local function registerSoil(name, x, def, turfs)
|
||||
defaultSoil:new({
|
||||
settings = {
|
||||
name = name,
|
||||
tiles = { soilTexture }
|
||||
tiles = { soilTexture },
|
||||
paramtype2 ='color4dir',
|
||||
palette = 'soils_grass_palette.png',
|
||||
drop = 'soils:'..name,
|
||||
},
|
||||
})
|
||||
|
||||
@@ -56,238 +61,35 @@ local function registerSoil(name, x, def, turfs)
|
||||
})
|
||||
|
||||
if turfs ~= nil then
|
||||
for turfName, turfX in pairs(turfs) do
|
||||
for turfName, turfY in pairs(turfs) do
|
||||
defaultSoil:new({
|
||||
settings = {
|
||||
name = turfName,
|
||||
tiles = {
|
||||
--soilTileSheet:t(turfX,2),
|
||||
{ name = 'soils_test_top.png', align_style = 'world', scale = 2},
|
||||
soilTexture,
|
||||
{ soilTexture..'^'..soilTileSheet:t(turfX,3) }
|
||||
grassTileSheet:t(0, turfY),
|
||||
{name = soilTexture, color = 'white'},
|
||||
},
|
||||
overlay_tiles = {
|
||||
'',
|
||||
'',
|
||||
grassTileSheet:t(1, turfY),
|
||||
grassTileSheet:t(2, turfY),
|
||||
grassTileSheet:t(3, turfY),
|
||||
grassTileSheet:t(4, turfY),
|
||||
},
|
||||
paramtype2 ='color4dir',
|
||||
palette = 'soils_grass_palette.png',
|
||||
drop = 'soils:'..turfName,
|
||||
},
|
||||
})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--[[
|
||||
local clayTiles = {
|
||||
ts:t(0,0)
|
||||
}
|
||||
registerSoil('mud', 0, {maxFertility = 20, rarity = 'common'}, {
|
||||
turf_bog = 0,
|
||||
})
|
||||
|
||||
local sandyTiles = {
|
||||
ts:t(2,0)
|
||||
}
|
||||
|
||||
local mixedTiles = {
|
||||
ts:t(4,0)
|
||||
}
|
||||
|
||||
local rockyTiles = {
|
||||
ts:t(6,0)
|
||||
}
|
||||
|
||||
soilFactory:registerItems({
|
||||
--- Clay soils
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_baren",
|
||||
_title = "Barren Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_poor",
|
||||
_title = "Poor Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_moderate",
|
||||
_title = "Moderate Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_fertile",
|
||||
_title = "Fertile Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_rich",
|
||||
_title = "Rich Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
|
||||
--- Sandy soils
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_baren",
|
||||
_title = "Barren Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_poor",
|
||||
_title = "Poor Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_moderate",
|
||||
_title = "Moderate Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_fertile",
|
||||
_title = "Fertile Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_rich",
|
||||
_title = "Rich Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
|
||||
--- Mixed soils
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_baren",
|
||||
_title = "Barren Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_poor",
|
||||
_title = "Poor Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_moderate",
|
||||
_title = "Moderate Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_fertile",
|
||||
_title = "Fertile Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_rich",
|
||||
_title = "Rich Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
|
||||
--- Rocky soils
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "rocky_soil_baren",
|
||||
_title = "Barren Rocky Soil",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
rarity = 'uncommon'
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "rocky_soil_poor",
|
||||
_title = "Poor Rocky Soil",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
rarity = 'distinguished'
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "rocky_soil_moderate",
|
||||
_title = "Moderate Rocky Soil",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
rarity = 'eminent'
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "rocky_soil_fertile",
|
||||
_title = "Fertile Rocky Soil",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
rarity = 'prime'
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "rocky_soil_rich",
|
||||
_title = "Rich Rocky Soil",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
},
|
||||
},
|
||||
|
||||
})--]]
|
||||
|
||||
registerSoil('humus', 0, {maxFertility = 100, rarity = 'uncommon'}, {turf_meadow=0})
|
||||
registerSoil('chernozem', 1, {maxFertility = 100, rarity = 'uncommon'}, {
|
||||
turf_meadow = 0,
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user