73 Commits

Author SHA1 Message Date
c3defaaa15 Update ide-helper 2026-11-17 22:05:44 +03:00
7ccaea2ed0 Math: end-space 2026-11-17 21:47:14 +03:00
c96bb2c0bc Class: minor formal changes 2026-11-17 21:35:05 +03:00
9fa3a0aff7 PlayerInventoryUI: item list count button update 2026-11-17 21:29:34 +03:00
e540107876 Mod: .getInfo() -> :getInfo() 2026-11-13 17:43:26 +03:00
1e91290b02 HelperLib: rename load() -> loadFile(), add doFile() 2026-11-13 17:06:08 +03:00
2243ed7532 HelperLib: load() update 2026-11-11 21:54:44 +03:00
20ebf5ad75 PlayerInventoryUI: end-spaces 2026-11-11 21:31:17 +03:00
1fe3200692 PlayerInventoryUI: separate action handling 2026-11-11 21:26:56 +03:00
24932b5d2e Mod & Require: add load function 2026-11-11 21:01:59 +03:00
af0b7c8beb check for negative quantities in crafting functions 2026-11-11 20:31:41 +03:00
ba8dad4798 bump commit 2026-11-09 22:15:33 +03:00
c2e16834d8 Add Smc.putOrDrop function 2026-11-09 21:30:23 +03:00
2d3bdf4d02 PlayerInventoryUI: remove TODO 2026-11-09 21:08:44 +03:00
841d269494 inventory: remove TODO 2026-11-09 21:07:05 +03:00
ced1397c76 Node: minor groups fix 2026-11-08 20:50:13 +03:00
56a9388676 ide-helper update 2026-11-08 20:49:47 +03:00
5d3e7b3620 adminCommands: update /list command - use PlayerInventoryUI 2026-11-05 20:59:51 +03:00
f995397f28 PlayerInventoryUI: add admin list tab, some changes, rename textures and minor refactoring 2026-11-05 20:59:04 +03:00
9566e0edde CraftSystem: BaseCraftHandler: use Smc.matchItemDescription() 2026-11-05 20:56:36 +03:00
316d2cac3b HelperLib: add matchItemDescription() function 2026-11-05 20:55:05 +03:00
3da8c3a27c update .luarc.json 2026-10-18 21:25:02 +03:00
266d44eca8 PlayerInventoryUI: modification of tab-switching button creation 2026-10-04 22:34:55 +03:00
d82cd28407 Formspec: new method imageButtonRow 2026-10-04 22:27:47 +03:00
02f7ca2894 MapGenerator: add peat_bog (Багно) biome. Add allwhere & marentine tree-schemes 2026-10-02 21:44:59 +03:00
7ef96bd434 AdminListUI: fix non-smc select items 2026-10-02 21:35:12 +03:00
26a73117a9 MapGen: fix trees replace trunks 2026-10-02 21:33:07 +03:00
87e5304acd HelperLib: new getItemDefinitionOrNil function 2026-10-02 21:32:00 +03:00
600c83ea04 wood: change braches registration 2026-10-02 21:30:53 +03:00
e8f547e98b soils: add new registrations, remove unused code 2026-10-02 21:29:59 +03:00
c7d2b94603 plants: update plants mod: add new, save & remove debug 2026-10-02 21:27:45 +03:00
934a8a8e83 adminCommands: add set_param2 command 2026-09-23 21:12:05 +03:00
50572e4c6b update ide-helper 2026-09-20 21:46:47 +03:00
b10f5c314a MapGen: fix water generation 2026-09-20 21:16:12 +03:00
a90c5a31d7 Fix mod depenses 2026-09-10 20:28:24 +03:00
f375e0aa19 MapGen: add MapGen:random() method 2026-09-09 22:02:35 +03:00
8c482b9cac Update ide-helper 2026-09-08 22:34:13 +03:00
92516f7ec4 Update ide-helper 2026-09-05 21:46:45 +03:00
a4249091e0 MapGen: minor fix 2026-09-05 21:35:41 +03:00
5a138cdf68 mapGeneration: rename tarion -> videre 2026-09-05 21:30:30 +03:00
bf4966afe4 mapGeneration: add end-space 2026-09-05 21:25:34 +03:00
f586121b12 mapGeneration: remove old maps 2026-09-05 21:24:40 +03:00
613e7a9c93 mapGeneration: update noise params 2026-09-05 21:22:25 +03:00
7a06e7fffb MapGenerator: new map 2026-08-30 18:19:05 +03:00
582658d437 Fix some mod depenses 2026-08-30 17:38:36 +03:00
4fcb15424e Update ide-helper 2026-08-14 22:16:17 +03:00
97711eccb8 mapGenerator: minor changes 2026-08-14 21:31:51 +03:00
c380638166 soils: idk, refactoring? Experements? 2026-08-14 21:31:25 +03:00
ccb89d2990 sands: minor changes 2026-08-14 21:30:05 +03:00
fe8e72cdde rocks: new rocks, remove old rocks 2026-08-14 21:29:09 +03:00
87a68f056e update luanti-ide-helper 2026-08-14 21:16:41 +03:00
6eac20e4f5 PlayerInventoryUI: resprite inventory 2026-08-13 21:03:29 +03:00
4210248343 Add ores mod 2026-08-02 19:05:50 +03:00
441fbb8323 Add sands mod 2026-08-02 19:04:35 +03:00
467d251681 Add clays mod 2026-08-02 19:03:55 +03:00
a9c5e54b00 Node: minor change 2026-07-23 19:00:09 +03:00
6935673be7 Add new admin command /create_locale 2026-07-23 18:59:39 +03:00
be2d28fc90 Minor changes: remove print() 2026-07-17 21:44:08 +03:00
204cd9b1aa MapGen: Ore: minor change 2026-07-17 21:28:59 +03:00
aafb0a3600 MapGen: add worm cavern type 2026-07-17 21:28:25 +03:00
f5c9122560 CraftSystem: add player progression support 2026-07-08 21:12:02 +03:00
118f27ae37 mapGenerator: minor changes 2026-07-08 21:11:37 +03:00
9e6bd5d952 ProgressionSystem: update system, add new methods 2026-07-08 20:25:54 +03:00
df5762abf6 Player: add PlayerMetaRef (overriding default PlayerMetaRef) 2026-07-08 20:25:14 +03:00
a504223240 Class: minor changes 2026-07-08 20:24:14 +03:00
b40b8c97c0 CraftSystem: return alt recipes, add player crafts cache, support learned recipes 2026-07-03 22:44:35 +03:00
a41817cc3d Item: local disable diagnostic 2026-07-03 19:58:59 +03:00
6f35ca8d6f CraftSystem: remove alt recipes 2026-07-03 19:53:27 +03:00
6c10201fa9 ProgressionSystem: add base functions and global progression 2026-07-01 21:12:14 +03:00
c0fe6c683e MapGen: minor biome weight fix 2026-06-26 22:24:52 +03:00
80c0f45f34 MapGen: add bime weight and minor fixes. Close #7 2026-06-26 22:09:22 +03:00
d04f3407b4 MapGen: add custom ore type 2026-06-26 20:31:58 +03:00
a31d606efe MapGen: add ore generation and minor refactoring 2026-06-26 20:30:50 +03:00
150 changed files with 3838 additions and 12715 deletions

View File

@@ -21,9 +21,7 @@
"diagnostics": { "diagnostics": {
"libraryFiles": "Enable", "libraryFiles": "Enable",
"workspaceDelay": 1, "workspaceDelay": 1,
"disable": [ "disable": [],
"inject-field"
],
"globals": [ "globals": [
// Smc globals: // Smc globals:
"Smc", "Smc",
@@ -48,5 +46,6 @@
"unbalanced": "Any" "unbalanced": "Any"
} }
}, },
"completion.callSnippet": "Both" "completion.callSnippet": "Both",
"completion.workspaceWord":false
} }

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__base_processing_station') local modInfo = Mod:getInfo('smc__core__base_processing_station')
local require = modInfo.require local require = modInfo.require
return require('BaseProcessingStation') return require('BaseProcessingStation')

View File

@@ -1,2 +1,2 @@
name = smc__core__base_processing_station name = smc__core__base_processing_station
depends = smc__core__craft_system, smc__core__node depends = smc__core__craft_system, smc__core__node, smc__ui__player_inventory

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__base_ui') local modInfo = Mod:getInfo('smc__core__base_ui')
local require = modInfo.require local require = modInfo.require
return require('BaseUI') return require('BaseUI')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__controls') local modInfo = Mod:getInfo('smc__core__controls')
local require = modInfo.require local require = modInfo.require
return require('Controls') return require('Controls')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__craft_system') local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require local require = modInfo.require
return require('CraftSystem') return require('CraftSystem')

View File

@@ -1,2 +1,2 @@
name = smc__core__craft_system name = smc__core__craft_system
depends = smc__system__system_loader, smc__core__creature depends = smc__system__system_loader, smc__core__creature, smc__core__progression_system

View File

@@ -1,6 +1,6 @@
local tableJoin = table.join local tableJoin = table.join
local modInfo = Mod.getInfo('smc__core__craft_system') local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require local require = modInfo.require
---@type CraftSystem.PrimitiveCraftHandler ---@type CraftSystem.PrimitiveCraftHandler
@@ -134,7 +134,7 @@ local function getMaterials(craft, recipeIndex, count)
local materialStacks = {} local materialStacks = {}
local materialGroups = {} local materialGroups = {}
for _, itemName in ipairs(craft:getRecipe(recipeIndex)) do for _, itemName in ipairs(craft.recipe) do
local group = itemName:match('group:(%S+)') local group = itemName:match('group:(%S+)')
local materialCount = itemName:match('group:%S+ (%S+)') or 1 local materialCount = itemName:match('group:%S+ (%S+)') or 1
@@ -205,9 +205,19 @@ end
---@return boolean check true if craft can be produced ---@return boolean check true if craft can be produced
---@return ItemStack[] materialStacks list of itemStacks for crafting ---@return ItemStack[] materialStacks list of itemStacks for crafting
function CraftSystem:checkPossiblePlayerInventoryCrafting(player, craft, recipeIndex, count) function CraftSystem:checkPossiblePlayerInventoryCrafting(player, craft, recipeIndex, count)
local OutputStack = ItemStack(craft.output)
if count <= 0 then
Logger.warningLog('`CraftSystem:checkPossiblePlayerInventoryCrafting()`: param `count` <= 0. '..
'Was force-reset to `1`. '..
'Info: value: `%s`, player: `%s`, craft: `%s`',
count, player:get_player_name(), craft.name
)
count = 1
end
local inventory = player:get_inventory() local inventory = player:get_inventory()
local OutputStack = ItemStack(craft.output)
OutputStack:set_count(OutputStack:get_count() * count) OutputStack:set_count(OutputStack:get_count() * count)
local materialStacks, materialGroups = getMaterials(craft, recipeIndex, count) local materialStacks, materialGroups = getMaterials(craft, recipeIndex, count)

View File

@@ -3,19 +3,22 @@
local CHECK = {YES = '[x]', NO = '[ ]', EMPTY = '-'} local CHECK = {YES = '[x]', NO = '[ ]', EMPTY = '-'}
---@class CraftSystem.BaseCraft : Class ---@class CraftSystem.BaseCraft : Class
---@field name string ---@field name string
---@field recipe ItemStackString[] ---@field hidden boolean?
---@field altRecipes CraftSystem.CraftRecipe[] ---@field recipe ItemStackString[]
---@field output ItemStackString ---@field output ItemStackString
---@field group CraftSystem.CraftGroup ---@field age ProgressionSystem.Age.Name,
---@field milestone string?
---@field group CraftSystem.CraftGroup
local BaseCraft = Class:extend({}) local BaseCraft = Class:extend({})
---Definition table for the `CraftSystem.BaseCraft`. ---Definition table for the `CraftSystem.BaseCraft`.
---@class CraftSystem.BaseCraftDef ---@class CraftSystem.BaseCraftDef
---@field recipe ItemStackString[] ---@field recipe ItemStackString[]
---@field altRecipes CraftSystem.CraftRecipe[]? ---@field output ItemStackString
---@field output ItemStackString ---@field age ProgressionSystem.Age.Name?
---@field group CraftSystem.CraftGroup? ---@field milestone string?
---@field group CraftSystem.CraftGroup?
---@param name string ---@param name string
---@param def CraftSystem.BaseCraftDef ---@param def CraftSystem.BaseCraftDef
@@ -23,11 +26,12 @@ local BaseCraft = Class:extend({})
function BaseCraft:new(name, def) function BaseCraft:new(name, def)
---@type CraftSystem.BaseCraft ---@type CraftSystem.BaseCraft
local instance = self:getInstance({}) local instance = self:getInstance({})
instance.name = name instance.name = name
instance.recipe = def.recipe instance.recipe = def.recipe
instance.altRecipes = def.altRecipes or {} instance.output = def.output
instance.output = def.output instance.age = def.age
instance.group = def.group instance.milestone = def.milestone
instance.group = def.group
return instance return instance
end end
@@ -80,46 +84,11 @@ local function getCheckMaterialGroup(material, count, list)
return CHECK.NO return CHECK.NO
end end
---Returns the crafting recipe corresponding to the index. ---@param mainList ItemStack[]?
---@param index integer Recipe number. If `0` is specified, ---@return string
--- the primary craft (`craft.recipe`) will be used; function BaseCraft:recipeToString(mainList)
--- if `1` or greater, the alternative craft
--- corresponding to the index will be used (`craft.altRecipes`).
---@return CraftSystem.CraftRecipe
function BaseCraft:getRecipe(index)
local recipe
if index == 0 or self.altRecipes == nil then
recipe = self.recipe
else
if index > #self.altRecipes then
recipe = self.altRecipes[#self.altRecipes]
else
recipe = self.altRecipes[index]
end
end
assert(recipe ~= nil)
return recipe
end
---@param recipeIndex integer?
---@param mainList ItemStack[]?
---@return string
function BaseCraft:recipeToString(recipeIndex, mainList)
local recipe
if recipeIndex == nil or recipeIndex == 0 or self.altRecipes == nil then
recipe = self.recipe
else
if recipeIndex > #self.altRecipes then
recipe = self.altRecipes[#self.altRecipes]
else
recipe = self.altRecipes[recipeIndex]
end
end
assert(recipe ~= nil)
local recipeDesc = '' local recipeDesc = ''
for _, itemName in ipairs(recipe) do for _, itemName in ipairs(self.recipe) do
local group, count = itemName:match('group:(%S+)'), itemName:match('group:%S+ (%S+)') or 1 local group, count = itemName:match('group:(%S+)'), itemName:match('group:%S+ (%S+)') or 1
if group == nil then if group == nil then
@@ -139,16 +108,15 @@ function BaseCraft:recipeToString(recipeIndex, mainList)
return recipeDesc return recipeDesc
end end
---@param recipeIndex integer? ---@param mainList ItemStack[]?
---@param mainList ItemStack[]? ---@return string
---@return string function BaseCraft:toString(mainList)
function BaseCraft:toString(recipeIndex, mainList)
local outputItem = ItemStack(self.output) local outputItem = ItemStack(self.output)
local outputItemSettings = Smc.getItemDefinition(outputItem).settings local outputItemSettings = Smc.getItemDefinition(outputItem).settings
local craftDesc = ('%s\n\nNeeded:\n%s'):format( local craftDesc = ('%s\n\nNeeded:\n%s'):format(
outputItemSettings._title, outputItemSettings._title,
self:recipeToString(recipeIndex, mainList)) self:recipeToString(mainList))
return craftDesc return craftDesc
end end

View File

@@ -1,7 +1,16 @@
local tableInsert = table.insert local assert, pairs, ipairs = assert, pairs, ipairs
local stringMatch = string.match
local PLAYERS_KNOW_ALL_RECIPES = true local tableInsert, tableSort, tableJoin = table.insert, table.sort, table.join
local stringMatch, stringLower = string.match, string_utf8.lower
local require = Mod:getInfo('smc__core__craft_system').require
---@type CraftSystem.BaseCraftHandler.PlayerCraftsCache
local PlayerCraftsCache = require('CraftSystem.BaseCraftHandler.PlayerCraftsCache')
---@type CraftSystem.BaseCraftHandler.ProgressionCraftsCache
local ProgressionCraftsCache = require('CraftSystem.BaseCraftHandler.ProgressionCraftsCache')
local PLAYERS_KNOW_ALL_RECIPES = false
---Abstract class for handling crafting. ---Abstract class for handling crafting.
---@class CraftSystem.BaseCraftHandler : Class ---@class CraftSystem.BaseCraftHandler : Class
@@ -9,19 +18,27 @@ local PLAYERS_KNOW_ALL_RECIPES = true
---@field type CraftSystem.CraftType ---@field type CraftSystem.CraftType
---@field defaultCraftDef CraftSystem.BaseCraftDef ---@field defaultCraftDef CraftSystem.BaseCraftDef
--- ---
---@field craftsByName table<string, CraftSystem.BaseCraft> ---@field craftsByName table<string, CraftSystem.BaseCraft>
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]> ---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
---@field craftsList CraftSystem.BaseCraft[] ---@field craftsByOutput table<ItemStackString, CraftSystem.BaseCraft[]>
---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[] ---@field craftsList CraftSystem.BaseCraft[]
---@field learnedCrafts table<string, CraftSystem.BaseCraft[]> ---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
---@field learnedGroupedCrafts table<string, (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]> ---
---@field playersCraftsCache table<string, CraftSystem.BaseCraftHandler.PlayerCraftsCache>
---
---@field agesCrafts table<ProgressionSystem.Age.Name, CraftSystem.BaseCraftHandler.ProgressionCraftsCache>
---@field milestonesCrafts table<ProgressionSystem.Age.Name, table<string, CraftSystem.BaseCraftHandler.ProgressionCraftsCache>>
local BaseCraftHandler = Class:extend({ local BaseCraftHandler = Class:extend({
craftsByName = {}, craftsByName = {},
craftsByGroup = {}, craftsByGroup = {},
craftsList = {}, craftsByOutput = {},
groupedCrafts = {}, craftsList = {},
learnedCrafts = {}, groupedCrafts = {},
learnedGroupedCrafts = {},
playersCraftsCache = {},
agesCrafts = {},
milestonesCrafts = {},
}) })
---@class CraftSystem.BaseCraftHandlerDef ---@class CraftSystem.BaseCraftHandlerDef
@@ -38,16 +55,111 @@ function BaseCraftHandler:new(baseType, type, def)
instance.type = type instance.type = type
instance.defaultCraftDef = def.defaultCraftDef or {} instance.defaultCraftDef = def.defaultCraftDef or {}
-- Initializing the temporary crafting cache for players.
core.register_on_joinplayer(function (player, last_login)
local playerName = player:get_player_name()
local cache = PlayerCraftsCache:new(playerName)
cache:update(instance.agesCrafts, instance.agesCrafts)
instance.playersCraftsCache[playerName] = cache
end)
-- Clearing the temporary crafting cache for players.
core.register_on_leaveplayer(function (player, timed_out)
local playerName = player:get_player_name()
instance.playersCraftsCache[playerName] = nil
end)
-- Initializing the list of crafts by groups.
core.register_on_mods_loaded(function()
for groupName, crafts in pairs(instance.craftsByGroup) do
tableSort(crafts, function(a, b)
if a.output < b.output then
return true
else
return false
end
end)
if groupName ~= 'craft_group:UNDEFINED' then
tableInsert(instance.groupedCrafts, crafts)
else
instance.groupedCrafts = tableJoin(instance.groupedCrafts, crafts)
end
end
tableSort(instance.groupedCrafts, function(a, b)
local outputA = (a[1] and a[1].output) or a.output
local outputB = (b[1] and b[1].output) or b.output
if outputA < outputB then
return true
else
return false
end
end)
end)
return instance return instance
end end
---Adds craft to its corresponding progression caches.
---@param craft CraftSystem.BaseCraft
function BaseCraftHandler:addCraftToProgressionTable(craft)
local age = craft.age or 'zero'
local milestone = craft.milestone
if milestone ~= nil then
if self.milestonesCrafts[age] == nil then
self.milestonesCrafts[age] = {}
end
if self.milestonesCrafts[age][milestone] == nil then
self.milestonesCrafts[age][milestone] = ProgressionCraftsCache:new()
end
self.milestonesCrafts[age][milestone]:addCraft(craft)
else
if self.agesCrafts[age] == nil then
self.agesCrafts[age] = ProgressionCraftsCache:new()
end
self.agesCrafts[age]:addCraft(craft)
end
end
---Returns a temporary cache of the player's crafts.
---
---If the player is not online, an error will be raised.
---@param playerName string
---@return CraftSystem.BaseCraftHandler.PlayerCraftsCache
function BaseCraftHandler:getPlayerCraftsCache(playerName)
local cache = self.playersCraftsCache[playerName]
assert(cache ~= nil)
return cache
end
---@param craftName string ---@param craftName string
---@return CraftSystem.BaseCraft ---@return CraftSystem.BaseCraft
function BaseCraftHandler:getCraftByName(craftName) function BaseCraftHandler:getCraftByName(craftName)
local craft = self.craftsByName[craftName] local craft = self.craftsByName[craftName]
assert(craft ~= nil, ('A craft `%s` not exists.'):format( assert(craft ~= nil, ('A craft `%s` not exists.'):format(craftName))
craftName))
return craft
end
---@param craftName string
---@return CraftSystem.BaseCraft?
function BaseCraftHandler:getLearnedCraftByName(playerName, craftName)
if PLAYERS_KNOW_ALL_RECIPES then
return self.craftsByName[craftName]
end
local cache = self:getPlayerCraftsCache(playerName)
local craft = cache.craftsByName[craftName]
return craft return craft
end end
@@ -57,25 +169,64 @@ end
function BaseCraftHandler:getCraftsByGroup(craftGroup) function BaseCraftHandler:getCraftsByGroup(craftGroup)
local crafts = self.craftsByGroup[craftGroup] local crafts = self.craftsByGroup[craftGroup]
assert(crafts ~= nil, ('A craft with group `%s` not exists.'):format( assert(crafts ~= nil, ('A craft with group `%s` not exists.'):format(craftGroup))
craftGroup))
return crafts
end
---@param craftGroup CraftSystem.CraftGroup
---@return CraftSystem.BaseCraft[]?
function BaseCraftHandler:getLearnedCraftsByGroup(playerName, craftGroup)
if PLAYERS_KNOW_ALL_RECIPES then
return self.craftsByGroup[craftGroup]
end
local cache = self:getPlayerCraftsCache(playerName)
local crafts = cache.craftsByGroup[craftGroup]
return crafts
end
---@return (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
function BaseCraftHandler:getGroupedCrafts()
return self.groupedCrafts
end
---@param playerName string
---@return (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
function BaseCraftHandler:getLearnedGroupedCrafts(playerName)
if PLAYERS_KNOW_ALL_RECIPES then
return self.groupedCrafts
end
local cache = self:getPlayerCraftsCache(playerName)
local crafts = cache.groupedCrafts
return crafts
end
---@param output ItemStackString
---@return CraftSystem.BaseCraft[]?
function BaseCraftHandler:getCraftsByOutput(output)
output = ItemStack(output):get_name()
local crafts = self.craftsByOutput[output]
return crafts return crafts
end end
---@param playerName string ---@param playerName string
---@return (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[] ---@param output ItemStackString
function BaseCraftHandler:getLearnedCrafts(playerName) ---@return CraftSystem.BaseCraft[]?
function BaseCraftHandler:getLearnedCraftsByOutput(playerName, output)
output = ItemStack(output):get_name()
if PLAYERS_KNOW_ALL_RECIPES then if PLAYERS_KNOW_ALL_RECIPES then
return self.groupedCrafts return self.craftsByOutput[output]
end end
local crafts = self.learnedGroupedCrafts[playerName] local cache = self:getPlayerCraftsCache(playerName)
local crafts = cache.craftsByOutput[output]
if crafts == nil then
crafts = {}
self.learnedGroupedCrafts[playerName] = crafts
end
return crafts return crafts
end end
@@ -84,18 +235,11 @@ end
---@param pattern string ---@param pattern string
---@return CraftSystem.BaseCraft[] ---@return CraftSystem.BaseCraft[]
local function getMathedCrafts(crafts, pattern) local function getMathedCrafts(crafts, pattern)
local pattern = string_utf8.lower(pattern) local pattern = stringLower(pattern)
local matchedCrafts = {} local matchedCrafts = {}
for _, craft in ipairs(crafts) do for _, craft in ipairs(crafts) do
local outputItem = ItemStack(craft.output) if Smc.matchItemDescription(ItemStack(craft.output):get_name(), pattern) then
local itemSettings = Smc.getItemDefinition(outputItem).settings
local ruName = string_utf8.lower(core.get_translated_string('ru', itemSettings._title))
local enName = string_utf8.lower(core.get_translated_string('en', itemSettings._title))
if stringMatch(outputItem:get_name(), pattern) or
stringMatch(ruName, pattern) or
stringMatch(enName, pattern) then
tableInsert(matchedCrafts, craft) tableInsert(matchedCrafts, craft)
end end
end end
@@ -103,6 +247,12 @@ local function getMathedCrafts(crafts, pattern)
return matchedCrafts return matchedCrafts
end end
---@param pattern string
---@return CraftSystem.BaseCraft[]
function BaseCraftHandler:getCraftsMatch(pattern)
return getMathedCrafts(self.craftsList, pattern)
end
---@param playerName string ---@param playerName string
---@param pattern string ---@param pattern string
---@return CraftSystem.BaseCraft[] ---@return CraftSystem.BaseCraft[]
@@ -111,16 +261,10 @@ function BaseCraftHandler:getLearnedCraftsMatch(playerName, pattern)
return getMathedCrafts(self.craftsList, pattern) return getMathedCrafts(self.craftsList, pattern)
end end
local crafts = self.learnedCrafts[playerName] local cache = self:getPlayerCraftsCache(playerName)
local crafts = getMathedCrafts(cache.craftsList, pattern)
if crafts == nil then
crafts = {}
self.learnedCrafts[playerName] = crafts
end
return crafts return crafts
end end
--TODO: сохранять выученные крафты игроков в сторадже
return BaseCraftHandler return BaseCraftHandler

View File

@@ -0,0 +1,141 @@
local assert, pairs = assert, pairs
local tableMerge, tableJoin, tableInsert, tableSort = table.merge, table.join, table.insert, table.sort
local ProgressionSystem = Smc.requireProgressionSystem()
---A player's temporary cache containing known crafts
---in the form of lists of various sorting types.
---
---Designed for quick access to the player's learned crafts.
---
---Initialized when a player joins the server and cleared when the player leaves the server.
---
---For more details see [BaseCraftHandler:new()](lua://CraftSystem.BaseCraftHandler)
---@class CraftSystem.BaseCraftHandler.PlayerCraftsCache : Class
---@field playerName string
---
---@field craftsByName table<string, CraftSystem.BaseCraft>
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
---@field craftsByOutput table<ItemStackString, CraftSystem.BaseCraft[]>
---@field craftsList CraftSystem.BaseCraft[]
---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
local PlayerCraftsCache = Class:extend({
craftsByName = {},
craftsByGroup = {},
craftsByOutput = {},
craftsList = {},
groupedCrafts = {},
})
---@param playerName string
---@return CraftSystem.BaseCraftHandler.PlayerCraftsCache
function PlayerCraftsCache:new(playerName)
local instance = self:getInstance({})
instance.playerName = playerName
return instance
end
---Adds all crafts from the passed cache to the player's cache.
---
---**Note**: Doesn't init (update) the list of grouped recipes (`self.groupedCrafts`).
---
---To initialize (update), use `self:initGroupedCrafts()`.
---@param cache CraftSystem.BaseCraftHandler.ProgressionCraftsCache
function PlayerCraftsCache:addCraftsByProgressionCache(cache)
self.craftsByName = tableMerge(self.craftsByName, cache.craftsByName, false)
for group, crafts in pairs(cache.craftsByGroup) do
local list = self.craftsByGroup[group]
if list == nil then
self.craftsByGroup[group] = crafts
else
self.craftsByGroup[group] = tableJoin(list, crafts)
end
end
for output, crafts in pairs(cache.craftsByOutput) do
local list = self.craftsByOutput[output]
if list == nil then
self.craftsByOutput[output] = crafts
else
self.craftsByOutput[output] = tableJoin(list, crafts)
end
end
self.craftsList = tableJoin(self.craftsList, cache.craftsList)
end
---Initializes a list of grouped crafts based
---on the crafts contained in the cache (uses `self.craftsByGroup`).
function PlayerCraftsCache:initGroupedCrafts()
for groupName, crafts in pairs(self.craftsByGroup) do
tableSort(crafts, function(a, b)
if a.output < b.output then
return true
else
return false
end
end)
if groupName ~= 'craft_group:UNDEFINED' then
tableInsert(self.groupedCrafts, crafts)
else
self.groupedCrafts = tableJoin(self.groupedCrafts, crafts)
end
end
tableSort(self.groupedCrafts, function(a, b)
local outputA = (a[#a] and a[#a].output) or a.output
local outputB = (b[#b] and b[#b].output) or b.output
if outputA < outputB then
return true
else
return false
end
end)
end
---Overwrites the player's craft cache based on the passed global progression craft caches.
---@param agesCrafts table<ProgressionSystem.Age.Name, CraftSystem.BaseCraftHandler.ProgressionCraftsCache>
---@param milestonesCrafts table<ProgressionSystem.Age.Name, table<string, CraftSystem.BaseCraftHandler.ProgressionCraftsCache>>
function PlayerCraftsCache:update(agesCrafts, milestonesCrafts)
self.craftsByName = {}
self.craftsByGroup = {}
self.craftsByOutput = {}
self.craftsList = {}
self.groupedCrafts = {}
local player = core.get_player_by_name(self.playerName)
assert(player ~= nil)
local playerMeta = player:get_meta()
local ageID = ProgressionSystem:getPlayerAge(playerMeta)
local milestones = ProgressionSystem:getPlayerMilestones(playerMeta)
for i = 0, ageID do
local ageName = ProgressionSystem:getAgeByID(i).name
local ageCache = agesCrafts[ageName]
if ageCache ~= nil then
self:addCraftsByProgressionCache(ageCache)
end
local milestonesList = milestones[ageID] or {}
local milestoneCache
for milestoneName, _ in pairs(milestonesList) do
if milestonesCrafts[ageName] ~= nil then
milestoneCache = milestonesCrafts[ageName][milestoneName]
if milestoneCache ~= nil then
self:addCraftsByProgressionCache(milestoneCache)
end
end
end
end
self:initGroupedCrafts()
end
return PlayerCraftsCache

View File

@@ -0,0 +1,50 @@
local tableInsert = table.insert
---Crafting cache for individual stages of global progression.
---
---Designed to store crafting associated with edges and milestones while the server is running,
---allowing for quick access to the crafting list.
---@class CraftSystem.BaseCraftHandler.ProgressionCraftsCache : Class
---@field craftsByName table<string, CraftSystem.BaseCraft>
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
---@field craftsByOutput table<ItemStackString, CraftSystem.BaseCraft[]>
---@field craftsList CraftSystem.BaseCraft[]
local ProgressionCraftsCache = Class:extend({
craftsByName = {},
craftsByGroup = {},
craftsByOutput = {},
craftsList = {},
})
---@return CraftSystem.BaseCraftHandler.ProgressionCraftsCache
function ProgressionCraftsCache:new()
local instance = self:getInstance({})
return instance
end
---Adds a craft to the cache.
---
---**Note**: If `craft.hidden = true`, the craft will not be added to the list of crafts by group.
---@param craft CraftSystem.BaseCraft
function ProgressionCraftsCache:addCraft(craft)
local group = craft.group
if self.craftsByGroup[group] == nil and craft.hidden ~= true then
self.craftsByGroup[group] = {}
end
local output = ItemStack(craft.output):get_name()
if self.craftsByOutput[output] == nil then
self.craftsByOutput[output] = {}
end
local craftName = craft.name
self.craftsByName[craftName] = craft
if craft.hidden ~= true then
tableInsert(self.craftsByGroup[group], craft)
end
tableInsert(self.craftsByOutput[output], craft)
tableInsert(self.craftsList, craft)
end
return ProgressionCraftsCache

View File

@@ -2,7 +2,7 @@ local v = vector.new
local assert, ipairs, tostring = assert, ipairs, tostring local assert, ipairs, tostring = assert, ipairs, tostring
local coreChatSendPlayer, coreItemDrop = core.chat_send_player, core.item_drop local coreChatSendPlayer, coreItemDrop = core.chat_send_player, core.item_drop
local require = Mod.getInfo('smc__core__craft_system').require local require = Mod:getInfo('smc__core__craft_system').require
local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]] local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]]
@@ -83,6 +83,15 @@ end
---@param amount integer ---@param amount integer
---@return boolean ---@return boolean
function ImmersiveCraft:startCraft(pos, player, amount) function ImmersiveCraft:startCraft(pos, player, amount)
if amount <= 0 then
Logger.warningLog('`ImmersiveCraft:startCraft()`: param `amount` <= 0. '..
'Was force-reset to `1`. '..
'Info: value: `%s`, player: `%s`, craft: `%s`',
amount, player:get_player_name(), self.name
)
amount = 1
end
local workStation = Smc.getNodeSuperclassByPos(pos) --[[@as ImmersiveWorkStation?]] local workStation = Smc.getNodeSuperclassByPos(pos) --[[@as ImmersiveWorkStation?]]
assert(workStation ~= nil) assert(workStation ~= nil)
@@ -124,7 +133,7 @@ function ImmersiveCraft:endCraft(pos, player)
local playerName = meta:get_string('player_name') local playerName = meta:get_string('player_name')
assert(playerName ~= '') assert(playerName ~= '')
local amount = meta:get_float('craft_amount') local amount = meta:get_float('craft_amount')
assert(amount ~= 0) assert(amount > 0)
-- Drop the result of crafting. -- Drop the result of crafting.
local dropPos = v(pos) + v(0, 0.9,0) local dropPos = v(pos) + v(0, 0.9,0)
@@ -198,7 +207,7 @@ function ImmersiveCraft:toString(recipeIndex, mainList)
local craftDesc = ('%s\n\nRecipe:\n%s\nActions:\n%s'):format( local craftDesc = ('%s\n\nRecipe:\n%s\nActions:\n%s'):format(
outputItemSettings._title, outputItemSettings._title,
BaseCraft.recipeToString(self, recipeIndex, mainList), BaseCraft.recipeToString(self, mainList),
self:recipeToString(recipeIndex, mainList)) self:recipeToString(recipeIndex, mainList))
return craftDesc return craftDesc

View File

@@ -1,6 +1,8 @@
local tableInsert, tableSort, tableJoin = table.insert, table.sort, table.join local assert = assert
local modInfo = Mod.getInfo('smc__core__craft_system') local tableInsert, tableMerge = table.insert, table.merge
local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require local require = modInfo.require
---@type CraftSystem.BaseCraftHandler ---@type CraftSystem.BaseCraftHandler
@@ -13,10 +15,7 @@ local ImmersiveCraft = require('CraftSystem.ImmersiveCraft')
---@class CraftSystem.ImmersiveCraftHandler : CraftSystem.BaseCraftHandler ---@class CraftSystem.ImmersiveCraftHandler : CraftSystem.BaseCraftHandler
---@field defaultCraftDef CraftSystem.BaseCraftDef ---@field defaultCraftDef CraftSystem.BaseCraftDef
--- ---
---@field new fun(self:CraftSystem.ImmersiveCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.ImmersiveCraftType, def:CraftSystem.ImmersiveCraftHandlerDef):CraftSystem.ImmersiveCraftHandler ---@field new fun(self:CraftSystem.ImmersiveCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.ImmersiveCraftType, def:CraftSystem.ImmersiveCraftHandlerDef):CraftSystem.ImmersiveCraftHandler
---@field getCraftByName fun(self, craftName:string):CraftSystem.ImmersiveCraft
---@field getCraftsByGroup fun(self, craftGroup):CraftSystem.ImmersiveCraft[]
---@field getLearnedCrafts fun(self, playerName):table<string, CraftSystem.ImmersiveCraft>
local ImmersiveCraftHandler = BaseCraftHandler:extend({}) local ImmersiveCraftHandler = BaseCraftHandler:extend({})
---@class CraftSystem.ImmersiveCraftHandlerDef : CraftSystem.BaseCraftHandlerDef ---@class CraftSystem.ImmersiveCraftHandlerDef : CraftSystem.BaseCraftHandlerDef
@@ -30,7 +29,7 @@ function ImmersiveCraftHandler:registerCraft(craftName, def)
assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format( assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format(
craftName)) craftName))
local def = table.merge(def, self.defaultCraftDef) local def = tableMerge(def, self.defaultCraftDef)
local group = 'craft_group:' .. (def.group or 'UNDEFINED') local group = 'craft_group:' .. (def.group or 'UNDEFINED')
def.group = group def.group = group
@@ -44,37 +43,8 @@ function ImmersiveCraftHandler:registerCraft(craftName, def)
self.craftsByName[craftName] = craft self.craftsByName[craftName] = craft
tableInsert(self.craftsByGroup[group], craft) tableInsert(self.craftsByGroup[group], craft)
tableInsert(self.craftsList, craft) tableInsert(self.craftsList, craft)
self:addCraftToProgressionTable(craft)
end end
-- Sort the list of crafts in alphabetical order by product name and combine crafts into groups.
-- Provides a convenient list of crafting items in the player's inventory.
core.register_on_mods_loaded(function()
for groupName, crafts in pairs(ImmersiveCraftHandler.craftsByGroup) do
tableSort(crafts, function(a, b)
if a.output < b.output then
return true
else
return false
end
end)
if groupName ~= 'craft_group:UNDEFINED' then
tableInsert(ImmersiveCraftHandler.groupedCrafts, crafts)
else
ImmersiveCraftHandler.groupedCrafts = tableJoin(ImmersiveCraftHandler.groupedCrafts, crafts)
end
end
tableSort(ImmersiveCraftHandler.groupedCrafts, function(a, b)
local outputA = (a[1] and a[1].output) or a.output
local outputB = (b[1] and b[1].output) or b.output
if outputA < outputB then
return true
else
return false
end
end)
end)
return ImmersiveCraftHandler return ImmersiveCraftHandler

View File

@@ -1,5 +1,5 @@
---@type Creature ---@type Creature
local Creature = Mod.getInfo('smc__core__creature').require('Creature') local Creature = Mod:getInfo('smc__core__creature').require('Creature')
---The entity the player interacts with during immersive crafting. ---The entity the player interacts with during immersive crafting.
---@class CraftSystem.ImmersiveCraftNode : Creature ---@class CraftSystem.ImmersiveCraftNode : Creature

View File

@@ -1,4 +1,4 @@
local require = Mod.getInfo('smc__core__craft_system').require local require = Mod:getInfo('smc__core__craft_system').require
local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]] local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]]

View File

@@ -3,7 +3,7 @@ local assert = assert
local extend = Class.extend local extend = Class.extend
local coreItemDrop = core.item_drop local coreItemDrop = core.item_drop
local require = Mod.getInfo('smc__core__craft_system').require local require = Mod:getInfo('smc__core__craft_system').require
local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]] local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]]
@@ -129,7 +129,7 @@ function TappingStage:new(def)
assert(stageData ~= nil) assert(stageData ~= nil)
local amount = meta:get_float('craft_amount') local amount = meta:get_float('craft_amount')
assert(amount ~= 0) assert(amount > 0)
---@type CraftSystem.ImmersiveCraftStage.TappingStageData? ---@type CraftSystem.ImmersiveCraftStage.TappingStageData?
local stageData = stageData local stageData = stageData

View File

@@ -1,6 +1,6 @@
local getInstance, extend = Class.getInstance, Class.extend local getInstance, extend = Class.getInstance, Class.extend
local modInfo = Mod.getInfo('smc__core__craft_system') local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require local require = modInfo.require
---@type CraftSystem.BaseCraft ---@type CraftSystem.BaseCraft

View File

@@ -2,7 +2,7 @@ local extend = Class.extend
local tableInsert, tableSort, tableJoin = table.insert, table.sort, table.join local tableInsert, tableSort, tableJoin = table.insert, table.sort, table.join
local modInfo = Mod.getInfo('smc__core__craft_system') local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require local require = modInfo.require
---@type CraftSystem.BaseCraftHandler ---@type CraftSystem.BaseCraftHandler
@@ -16,13 +16,11 @@ local PrimitiveCraft = require('CraftSystem.PrimitiveCraft')
---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler ---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler
---@field defaultCraftDef CraftSystem.PrimitiveCraftDef ---@field defaultCraftDef CraftSystem.PrimitiveCraftDef
--- ---
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.PrimitiveCraft[]> ---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.PrimitiveCraft[]>
---@field groupedCrafts (CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[] ---@field craftsByOutput table<ItemStackString, CraftSystem.BaseCraft[]>
---@field groupedCrafts (CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[]
--- ---
---@field new fun(self:CraftSystem.PrimitiveCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.PrimitiveCraftType, def:CraftSystem.PrimitiveCraftHandlerDef):CraftSystem.PrimitiveCraftHandler ---@field new fun(self:CraftSystem.PrimitiveCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.PrimitiveCraftType, def:CraftSystem.PrimitiveCraftHandlerDef):CraftSystem.PrimitiveCraftHandler
---@field getCraftByName fun(self, craftName:string):CraftSystem.PrimitiveCraft
---@field getCraftsByGroup fun(self, craftGroup:string):CraftSystem.PrimitiveCraft[]
---@field getLearnedCrafts fun(self, playerName:string):(CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[]
local PrimitiveCraftHandler = BaseCraftHandler:extend({}) local PrimitiveCraftHandler = BaseCraftHandler:extend({})
---@class CraftSystem.PrimitiveCraftHandlerDef : CraftSystem.BaseCraftHandlerDef ---@class CraftSystem.PrimitiveCraftHandlerDef : CraftSystem.BaseCraftHandlerDef
@@ -46,51 +44,21 @@ function PrimitiveCraftHandler:registerCraft(craftName, def)
self.craftsByGroup[group] = {} self.craftsByGroup[group] = {}
end end
self.craftsByName[craftName] = craft local output = ItemStack(craft.output):get_name()
tableInsert(self.craftsByGroup[group], craft) if self.craftsByOutput[output] == nil then
tableInsert(self.craftsList, craft) self.craftsByOutput[output] = {}
end elseif craft.hidden == nil then
craft.hidden = true
---Adds alternative recipes to the craft with the specified name.
---
---If a craft with the specified name does not exist, an error will call.
---@param craftName string
---@param recipes CraftSystem.CraftRecipe[]
function PrimitiveCraftHandler:registerAlternativeRecipes(craftName, recipes)
local craft = PrimitiveCraftHandler:getCraftByName(craftName)
craft.altRecipes = tableJoin(craft.altRecipes or {}, recipes)
end
-- Sort the list of crafts in alphabetical order by product name and combine crafts into groups.
-- Provides a convenient list of crafting items in the player's inventory.
core.register_on_mods_loaded(function()
for groupName, crafts in pairs(PrimitiveCraftHandler.craftsByGroup) do
tableSort(crafts, function(a, b)
if a.output < b.output then
return true
else
return false
end
end)
if groupName ~= 'craft_group:UNDEFINED' then
tableInsert(PrimitiveCraftHandler.groupedCrafts, crafts)
else
PrimitiveCraftHandler.groupedCrafts = tableJoin(PrimitiveCraftHandler.groupedCrafts, crafts)
end
end end
tableSort(PrimitiveCraftHandler.groupedCrafts, function(a, b) self.craftsByName[craftName] = craft
local outputA = (a[1] and a[1].output) or a.output if craft.hidden ~= true then
local outputB = (b[1] and b[1].output) or b.output tableInsert(self.craftsByGroup[group], craft)
end
tableInsert(self.craftsByOutput[output], craft)
tableInsert(self.craftsList, craft)
if outputA < outputB then self:addCraftToProgressionTable(craft)
return true end
else
return false
end
end)
end)
return PrimitiveCraftHandler return PrimitiveCraftHandler

View File

@@ -1,6 +1,6 @@
local getInstance, extend = Class.getInstance, Class.extend local getInstance, extend = Class.getInstance, Class.extend
local modInfo = Mod.getInfo('smc__core__craft_system') local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require local require = modInfo.require
---@type CraftSystem.BaseCraft ---@type CraftSystem.BaseCraft

View File

@@ -2,7 +2,7 @@ local HASH_SEPARATOR = ','
local tableInsert, tableCopy, tableSort, tableConcat, tableIsEmpty = table.insert, table.copy, table.sort, table.concat, table.is_empty local tableInsert, tableCopy, tableSort, tableConcat, tableIsEmpty = table.insert, table.copy, table.sort, table.concat, table.is_empty
local modInfo = Mod.getInfo('smc__core__craft_system') local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require local require = modInfo.require
---@type CraftSystem.BaseCraftHandler ---@type CraftSystem.BaseCraftHandler
@@ -18,10 +18,7 @@ local ProcessingCraft = require('CraftSystem.ProcessingCraft')
--- ---
---@field craftsByHash table<string, CraftSystem.ProcessingCraft> ---@field craftsByHash table<string, CraftSystem.ProcessingCraft>
--- ---
---@field new fun(self:CraftSystem.ProcessingCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.ProcessingCraftType, def:CraftSystem.ProcessingCraftHandlerDef):CraftSystem.ProcessingCraftHandler ---@field new fun(self:CraftSystem.ProcessingCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.ProcessingCraftType, def:CraftSystem.ProcessingCraftHandlerDef):CraftSystem.ProcessingCraftHandler
---@field getCraftByName fun(self, craftName:string):CraftSystem.ProcessingCraft
---@field getCraftsByGroup fun(self, craftGroup:string):CraftSystem.ProcessingCraft[]
---@field getLearnedCrafts fun(self, playerName:string):(CraftSystem.ProcessingCraft[]|CraftSystem.ProcessingCraft)[]
local ProcessingCraftHandler = BaseCraftHandler:extend({ local ProcessingCraftHandler = BaseCraftHandler:extend({
craftsByHash = {} craftsByHash = {}
}) })

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__creature') local modInfo = Mod:getInfo('smc__core__creature')
local require = modInfo.require local require = modInfo.require
return require('Creature') return require('Creature')

View File

@@ -1 +1,2 @@
name = smc__core__creature name = smc__core__creature
depends = smc__system__system_loader

View File

@@ -48,7 +48,7 @@ function Creature:new(entityDef)
-- Add the short mod name prefix to the entity name. -- Add the short mod name prefix to the entity name.
if s._add_mod_name then if s._add_mod_name then
s._name = Mod.getInfo().shortName .. ':' .. s._name s._name = Mod:getInfo().shortName .. ':' .. s._name
end end
local onActivate = c.on_activate or function() end local onActivate = c.on_activate or function() end

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__formspec') local modInfo = Mod:getInfo('smc__core__formspec')
local require = modInfo.require local require = modInfo.require
return require('Formspec') return require('Formspec')

View File

@@ -745,6 +745,41 @@ function Formspec:imageButton(x, y, w, h, textureName, name, label, pressedTextu
return self return self
end end
---@alias Formspec.ImageButtonRowElement {
--- [1] : string,
--- [2] : string,
--- [3] : string?,
--- [4] : string?,
--- [5] : boolean?,
--- [6] : boolean?,
--- }
---Creates a row of buttons, automatically calculating the coordinates of buttons based on the width.
---
---@see Formspec.imageButton
---@param x number
---@param y number
---@param w number
---@param h number
---@param imageButtonRow Formspec.ImageButtonRowElement[]
---@return Formspec
function Formspec:imageButtonRow(x, y, w, h, imageButtonRow)
---@param element Formspec.ImageButtonRowElement
for i, element in ipairs(imageButtonRow) do
local ex = x + ( ( i - 1 ) * w)
self:imageButton(ex, y, w, h,
element[1],
element[2],
element[3],
element[4],
element[5],
element[6]
)
end
return self
end
---Clickable item image button. When clicked, fields will be sent. ---Clickable item image button. When clicked, fields will be sent.
--- ---
---**Element:** `item_image_button[<X>,<Y>;<W>,<H>;<item name>;<name>;<label>]` ---**Element:** `item_image_button[<X>,<Y>;<W>,<H>;<item name>;<name>;<label>]`

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__immersive_work_station') local modInfo = Mod:getInfo('smc__core__immersive_work_station')
local require = modInfo.require local require = modInfo.require
return require('ImmersiveWorkStation') return require('ImmersiveWorkStation')

View File

@@ -1,2 +1,2 @@
name = smc__core__immersive_work_station name = smc__core__immersive_work_station
depends = smc__core__craft_system, smc__core__node, smc__ui__work_station depends = smc__core__craft_system, smc__core__node, smc__ui__work_station, smc__ui__player_inventory

View File

@@ -170,7 +170,7 @@ function ImmersiveWorkStation:abortCraft(pos)
return return
end end
local craft = self.handler:getCraftByName(craftName) local craft = self.handler:getCraftByName(craftName) --[[@as CraftSystem.ImmersiveCraft]]
craft:abortCraft(pos) craft:abortCraft(pos)
end end
@@ -178,7 +178,7 @@ end
local handler = CraftSystem:getImmersiveCraftHandler('workbench') local handler = CraftSystem:getImmersiveCraftHandler('workbench')
local require = Mod.getInfo('smc__ui__player_inventory').require local require = Mod:getInfo('smc__ui__player_inventory').require
local baseGetCraftTab = require('PlayerInventoryUI.baseGetCraftTab') local baseGetCraftTab = require('PlayerInventoryUI.baseGetCraftTab')
---@param self PlayerInventoryUI ---@param self PlayerInventoryUI

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__item') local modInfo = Mod:getInfo('smc__core__item')
local require = modInfo.require local require = modInfo.require
return require('Item') return require('Item')

View File

@@ -86,7 +86,7 @@ end
---@param itemDef Item.ItemDefinition ---@param itemDef Item.ItemDefinition
---@return ItemDefinition ---@return ItemDefinition
local function itemDefToLuantiDef(itemDef) local function itemDefToLuantiDef(itemDef)
local modName = Mod.getInfo().shortName local modName = Mod:getInfo().shortName
local S = core.get_translator(modName) local S = core.get_translator(modName)
local s = itemDef.settings local s = itemDef.settings
@@ -129,6 +129,7 @@ end
---@param luantiDef NodeDefinition ---@param luantiDef NodeDefinition
local function registerNode(luantiDef) local function registerNode(luantiDef)
local name = luantiDef.name local name = luantiDef.name
---@diagnostic disable-next-line: inject-field
luantiDef.name = nil luantiDef.name = nil
core.register_node(':'..name, luantiDef) core.register_node(':'..name, luantiDef)
@@ -137,6 +138,7 @@ end
---@param luantiDef ItemDefinition ---@param luantiDef ItemDefinition
local function registerCraftitem(luantiDef) local function registerCraftitem(luantiDef)
local name = luantiDef.name local name = luantiDef.name
---@diagnostic disable-next-line: inject-field
luantiDef.name = nil luantiDef.name = nil
core.register_craftitem(':'..name, luantiDef) core.register_craftitem(':'..name, luantiDef)
@@ -145,6 +147,7 @@ end
---@param luantiDef ItemDefinition ---@param luantiDef ItemDefinition
local function registerTool(luantiDef) local function registerTool(luantiDef)
local name = luantiDef.name local name = luantiDef.name
---@diagnostic disable-next-line: inject-field
luantiDef.name = nil luantiDef.name = nil
core.register_tool(':'..name, luantiDef) core.register_tool(':'..name, luantiDef)
@@ -164,7 +167,7 @@ function Item:new(itemDef)
itemDef = tableMerge(itemDef, self.defaultDef, true) --[[@as Item.ItemDefinition]] itemDef = tableMerge(itemDef, self.defaultDef, true) --[[@as Item.ItemDefinition]]
local s = itemDef.settings local s = itemDef.settings
local shortModName = Mod.getInfo().shortName local shortModName = Mod:getInfo().shortName
if s._add_mod_name then if s._add_mod_name then
s.name = shortModName .. ':' .. s.name s.name = shortModName .. ':' .. s.name

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__item_factory') local modInfo = Mod:getInfo('smc__core__item_factory')
local require = modInfo.require local require = modInfo.require
return require('ItemFactory') return require('ItemFactory')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__map_gen') local modInfo = Mod:getInfo('smc__core__map_gen')
local require = modInfo.require local require = modInfo.require
return require('MapGen') return require('MapGen')

View File

@@ -1,13 +1,15 @@
local mathRound, mathRandom, mathClamp, tableInsert local assert = assert
= math.round, math.random, math.clamp, table.insert local pairs, ipairs = pairs, ipairs
local corePosToString, coreGetUsTime = core.pos_to_string, core.get_us_time local bitToBit, bitBxor, bitRshift, bitBand = bit.tobit, bit.bxor, bit.rshift, bit.band
local mathFloor, mathRound, mathRandom, mathClamp = math.floor, math.round, math.random, math.clamp
local pairs, ipairs, assert = pairs, ipairs, assert local tableInsert, tableSort = table.insert, table.sort
local v = vector.new local v = vector.new
local id = core.get_content_id local id = core.get_content_id
local AIR_ID = core.CONTENT_AIR local AIR_ID = core.CONTENT_AIR
local corePosToString, coreGetUsTime = core.pos_to_string, core.get_us_time
local PcgRandom = PcgRandom
local getInstance = Class.getInstance local getInstance = Class.getInstance
@@ -18,16 +20,15 @@ local function mglog(text, ...)
core.log((text):format(...)) core.log((text):format(...))
end end
local modInfo = Mod.getInfo('smc__core__map_gen') local require = Mod:getInfo('smc__core__map_gen').require
local require = modInfo.require
---Numeric values ​​defining the surface height and climate for the node. ---Numeric values ​​defining the surface height and climate for the node.
---@alias MapGen.factors {height:number, temp:number, humidity:number} ---@alias MapGen.Factors {height:number, temp:number, humidity:number, weight:number}
---Table of all past generation factor calculations for nodes. ---Table of all past generation factor calculations for nodes.
--- ---
---Contains generation factors by layer name and coordinate. ---Contains generation factors by layer name and coordinate.
---@type table<string, table<string, MapGen.factors>> ---@type table<string, table<string, MapGen.Factors>>
local pastNoiseValues = {} local pastNoiseValues = {}
---The triangle in which generation occurred for the previous node. ---The triangle in which generation occurred for the previous node.
@@ -46,6 +47,8 @@ local Cavern = require('MapGen.Cavern')
local Region = require('MapGen.Region') local Region = require('MapGen.Region')
---@type MapGen.Tree ---@type MapGen.Tree
local Tree = require('MapGen.Tree') local Tree = require('MapGen.Tree')
---@type MapGen.Ore
local Ore = require('MapGen.Ore')
---@class MapGen ---@class MapGen
---@field layersByName table<string, MapGen.Layer> ---@field layersByName table<string, MapGen.Layer>
@@ -58,10 +61,11 @@ local Tree = require('MapGen.Tree')
--- ---
---@field isLayersNoisesInitialized boolean Is the fractal noise of the layer initialized? This is necessary for a one-time noise initialization. ---@field isLayersNoisesInitialized boolean Is the fractal noise of the layer initialized? This is necessary for a one-time noise initialization.
---@field isCavernsNoiseInitialized boolean Is the fractal noise of the caverns initialized? This is necessary for a one-time noise initialization. ---@field isCavernsNoiseInitialized boolean Is the fractal noise of the caverns initialized? This is necessary for a one-time noise initialization.
---@field isOresNoiseInitialized boolean Is the fractal noise of the ores initialized? This is necessary for a one-time noise initialization.
---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work. ---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work.
--- ---
---@field nodes table<string, string> ---@field nodes table<string, string>
---@field nodeIDs table<string, number> ---@field nodeIDs table<string, integer>
local MapGen = { local MapGen = {
layersByName = {}, layersByName = {},
layersList = {}, layersList = {},
@@ -70,6 +74,7 @@ local MapGen = {
treesByName = {}, treesByName = {},
isLayersNoisesInitialized = false, isLayersNoisesInitialized = false,
isCavernsNoiseInitialized = false, isCavernsNoiseInitialized = false,
isOresNoiseInitialized = false,
isRunning = false, isRunning = false,
} }
@@ -109,7 +114,7 @@ function MapGen:getLayerByName(layerName)
end end
---Determines which layer a node belongs to based on its height coordinate. ---Determines which layer a node belongs to based on its height coordinate.
---@param y number ---@param y integer
---@return MapGen.Layer? ---@return MapGen.Layer?
function MapGen:getLayerByHeight(y) function MapGen:getLayerByHeight(y)
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм --- TODO: возможно здесь получится сделать более оптимизированный алгоритм
@@ -126,7 +131,7 @@ function MapGen:getLayerByHeight(y)
end end
---Determines which statics layer a node belongs to based on its height coordinate. ---Determines which statics layer a node belongs to based on its height coordinate.
---@param y number ---@param y integer
---@return MapGen.StaticLayer? ---@return MapGen.StaticLayer?
function MapGen:getStaticByHeight(y) function MapGen:getStaticByHeight(y)
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм --- TODO: возможно здесь получится сделать более оптимизированный алгоритм
@@ -206,6 +211,32 @@ function MapGen:getTree(name)
return self.treesByName[name] return self.treesByName[name]
end end
---Returns a pseudorandom number within
---a specified range based on coordinates.
---
---Use this to generate deterministic random
---numbers within node generation functions.
---@param x integer
---@param y integer
---@param z integer
---@param min integer
---@param max integer
---@return integer
function MapGen:random(x, y, z, min, max)
local n = bitToBit(bitBxor(x, 0xB57B6AE1) * 0x9E3779B9)
n = bitToBit(bitBxor(n, y) * 0x85EBCA6B)
n = bitToBit(bitBxor(n, z) * 0xC2B2AE35)
n = bitBxor(n, bit.rshift(n, 16))
n = bitToBit(n * 0x27D4EB2D)
n = bitBxor(n, bit.rshift(n, 15))
n = bitBand(n, 0x7FFFFFFF)
local range = max - min + 1
return min + mathFloor((n / 2147483648) * range)
end
-- --- API METHODS: REGISTRATION --- -- --- API METHODS: REGISTRATION ---
@@ -231,7 +262,7 @@ function MapGen:registerLayer(name, def)
pastNoiseValues[name] = {} pastNoiseValues[name] = {}
-- Sort layers by maxY descending for processing priority. -- Sort layers by maxY descending for processing priority.
table.sort(self.layersList, function(a, b) tableSort(self.layersList, function(a, b)
return a.maxY > b.maxY return a.maxY > b.maxY
end) end)
end end
@@ -266,7 +297,7 @@ function MapGen:registerStaticLayer(name, def)
tableInsert(self.staticsList, static) tableInsert(self.staticsList, static)
-- Sort srtatics by maxY descending for processing priority. -- Sort srtatics by maxY descending for processing priority.
table.sort(self.staticsList, function(a, b) tableSort(self.staticsList, function(a, b)
return a.maxY > b.maxY return a.maxY > b.maxY
end) end)
end end
@@ -331,6 +362,17 @@ function MapGen:registerTree(name, def)
self.treesByName[name] = tree self.treesByName[name] = tree
end end
---@param layerName string
---@param name string
---@param def MapGen.OreDef
function MapGen:registerOre(layerName, name, def)
local layer = self:getLayerByName(layerName)
local ore = Ore:new(name, def)
layer:addOre(name, ore)
end
-- --- HELPER METHODS --- -- --- HELPER METHODS ---
@@ -406,7 +448,7 @@ end
local function vertexKey(peak) local function vertexKey(peak)
local pos = peak.pos local pos = peak.pos
return string.format("%.6f,%.6f", pos.x, pos.z) return ('%.6f,%.6f'):format(pos.x, pos.z)
end end
---Creates a canonical (sorted) key for an edge. ---Creates a canonical (sorted) key for an edge.
@@ -576,13 +618,25 @@ function MapGen:initCavernsNoise()
self.isCavernsNoiseInitialized = true self.isCavernsNoiseInitialized = true
end end
---Initialize ores's noises. This should be called after the map object is loaded.
function MapGen:initOresNoise()
---@param layer MapGen.Layer
for _, layer in ipairs(self.layersList) do
for _, ore in pairs(layer.oresByName) do
ore:initNoise()
end
end
self.isOresNoiseInitialized = true
end
-- --- GENERATION METHODS --- -- --- GENERATION METHODS ---
---@alias MapGen.nodeType 'AIR'|'WATER'|'CAVERN_AIR'|'TURF'|'SOIL'|'ROCK'|'BOTTOM' ---@alias MapGen.nodeType 'AIR'|'WATER'|'CAVERN_AIR'|'TURF'|'SOIL'|'ROCK'|'BOTTOM'
---@alias MapGen.dataPostProcessingData {biome:MapGen.Biome, mapGenerator:MapGen, factors:MapGen.factors, index:number, x:number, y:number, z:number, nodeType:MapGen.nodeType} ---@alias MapGen.dataPostProcessingData {biome:MapGen.Biome, mapGenerator:MapGen, factors:MapGen.Factors, index:integer, x:integer, y:integer, z:integer, nodeType:MapGen.nodeType}
---@alias MapGen.vmPostProcessingData {biome:MapGen.Biome, mapGenerator:MapGen, factors:MapGen.factors, x:number, y:number, z:number, nodeType:MapGen.nodeType} ---@alias MapGen.vmPostProcessingData {biome:MapGen.Biome, mapGenerator:MapGen, factors:MapGen.Factors, x:integer, y:integer, z:integer, nodeType:MapGen.nodeType}
---@type table<number, MapGen.dataPostProcessingData> ---@type table<number, MapGen.dataPostProcessingData>
@@ -592,8 +646,8 @@ local vmPostProcessing = {}
---@param biome MapGen.Biome ---@param biome MapGen.Biome
---@param mapGenerator MapGen ---@param mapGenerator MapGen
---@param factors MapGen.factors ---@param factors MapGen.Factors
---@param index number ---@param index integer
---@param x integer ---@param x integer
---@param y integer ---@param y integer
---@param z integer ---@param z integer
@@ -629,15 +683,14 @@ end
---and which biome will be generated at the specified coordinates. ---and which biome will be generated at the specified coordinates.
---@param mapGenerator MapGen ---@param mapGenerator MapGen
---@param layer MapGen.Layer ---@param layer MapGen.Layer
---@param factors MapGen.factors ---@param factors MapGen.Factors
---@param data number[] ---@param data integer[]
---@param data2 number[] ---@param data2 integer[]
---@param index number ---@param index integer
---@param x integer ---@param x integer
---@param y integer ---@param y integer
---@param z integer ---@param z integer
local function generateNode(mapGenerator, layer, factors, data, data2, index, x, y, z) local function generateNode(mapGenerator, layer, factors, data, data2, index, x, y, z)
local ids = mapGenerator.nodeIDs local ids = mapGenerator.nodeIDs
local waterLevel = layer.waterLevel local waterLevel = layer.waterLevel
local height, temp, humidity = factors.height, factors.temp, factors.humidity local height, temp, humidity = factors.height, factors.temp, factors.humidity
@@ -645,9 +698,8 @@ local function generateNode(mapGenerator, layer, factors, data, data2, index, x,
-- Creating a rougher biome boundary. -- Creating a rougher biome boundary.
local scatteringGorizontal = layer.biomesGorizontalScattering or 0 local scatteringGorizontal = layer.biomesGorizontalScattering or 0
local scatteringVertical = layer.biomesVerticalScattering or 0 local scatteringVertical = layer.biomesVerticalScattering or 0
local scattTemp = factors.temp local scattTemp = temp
local scattHumidity = humidity local scattHumidity = humidity
---@type number
local scattHeight = y local scattHeight = y
if scatteringGorizontal ~= 0 then if scatteringGorizontal ~= 0 then
@@ -666,8 +718,10 @@ local function generateNode(mapGenerator, layer, factors, data, data2, index, x,
scattHeight, scattTemp, scattHumidity = mathRound(scattHeight), mathRound(scattTemp), mathRound(scattHumidity) scattHeight, scattTemp, scattHumidity = mathRound(scattHeight), mathRound(scattTemp), mathRound(scattHumidity)
height, temp, humidity = mathRound(height), mathRound(scattTemp), mathRound(scattHumidity) height, temp, humidity = mathRound(height), mathRound(scattTemp), mathRound(scattHumidity)
local diagramPoint = layer.biomesDiagram[height][scattTemp][scattHumidity] -- TODO: разобраться со смещением по вертикали
---@type MapGen.Biome ---@type MapGen.Biome
local biome = layer.biomesDiagram[scattHeight][scattTemp][scattHumidity] local biome = diagramPoint.biome
factors.weight = diagramPoint.weight
-- If the block is above surface height and above water level... -- If the block is above surface height and above water level...
if y > height and y > waterLevel then if y > height and y > waterLevel then
@@ -690,7 +744,7 @@ local function generateNode(mapGenerator, layer, factors, data, data2, index, x,
addPostProccessing(biome, mapGenerator, factors, index, x, y, z, 'CAVERN_AIR') addPostProccessing(biome, mapGenerator, factors, index, x, y, z, 'CAVERN_AIR')
-- ... or if the surface height is above the water level... -- ... or if the surface height is above the water level...
elseif height > waterLevel then elseif height >= waterLevel then
--- ... and the height of the block is equal to the height of the surface... --- ... and the height of the block is equal to the height of the surface...
if y == height then if y == height then
-- ... then turf is generated. -- ... then turf is generated.
@@ -708,7 +762,7 @@ local function generateNode(mapGenerator, layer, factors, data, data2, index, x,
end end
-- ... or if the surface height is below the water level... -- ... or if the surface height is below the water level...
elseif height <= waterLevel then elseif height < waterLevel then
-- ... and if the height of the block falls within the thickness of the soil layer... -- ... and if the height of the block falls within the thickness of the soil layer...
if y > height - biome.soilHeight then if y > height - biome.soilHeight then
-- ... then the river/ocean bottom is generated. -- ... then the river/ocean bottom is generated.
@@ -726,6 +780,14 @@ local function generateNode(mapGenerator, layer, factors, data, data2, index, x,
Logger.warningLog('If you see this error, it means that the map generator does'.. Logger.warningLog('If you see this error, it means that the map generator does'..
'not handle all cases of generation on coordinates: %s, %s, %s.', x, y, z) 'not handle all cases of generation on coordinates: %s, %s, %s.', x, y, z)
end end
-- Ore generation
-- Biome ores are generated first.
-- If no ores are generated, the ores registered in the layer are generated.
-- This means that biome ores have priority over layer ores.
if not biome:generateOre(factors, data, data2, index, x, y, z) then
layer:generateOre(factors, data, data2, index, x, y, z)
end
end end
---Calculates a weight for a coordinate using the projection onto ---Calculates a weight for a coordinate using the projection onto
@@ -768,7 +830,7 @@ local function calcNoise2dValue(category, layer, triangle, x, y, z)
-- If the triangle is monochromatic (all peaks have the same color and, -- If the triangle is monochromatic (all peaks have the same color and,
-- accordingly, the same noise), then there is no point in smoothing out the noise. -- accordingly, the same noise), then there is no point in smoothing out the noise.
if triangleColor ~= nil then if triangleColor ~= nil then
return layer:getNoiseByColor(category, triangleColor):get_2d({x = x, y = z}) return layer:getNoiseByColor(category, triangleColor):get_3d({x = x, y = 0, z = z})
end end
local peak1 = triangle.p1 local peak1 = triangle.p1
@@ -787,15 +849,15 @@ local function calcNoise2dValue(category, layer, triangle, x, y, z)
-- ( peak1 * weight1 + peak2 * weight2 + peak3 * weight3) / totalWeight, when -- ( peak1 * weight1 + peak2 * weight2 + peak3 * weight3) / totalWeight, when
-- totalWeight = weight1 + weight2 + weight3 -- totalWeight = weight1 + weight2 + weight3
local weight = calcWeight(triangle.h1, x, y, z) local weight = calcWeight(triangle.h1, x, y, z)
noiseValue = noiseValue + noise1:get_2d({x = x, y = z}) * weight noiseValue = noiseValue + noise1:get_3d({x = x, y = 0, z = z}) * weight
totalWeight = totalWeight + weight totalWeight = totalWeight + weight
weight = calcWeight(triangle.h2, x, y, z) weight = calcWeight(triangle.h2, x, y, z)
noiseValue = noiseValue + noise2:get_2d({x = x, y = z}) * weight noiseValue = noiseValue + noise2:get_3d({x = x, y = 0, z = z}) * weight
totalWeight = totalWeight + weight totalWeight = totalWeight + weight
weight = calcWeight(triangle.h3, x, y, z) weight = calcWeight(triangle.h3, x, y, z)
noiseValue = noiseValue + noise3:get_2d({x = x, y = z}) * weight noiseValue = noiseValue + noise3:get_3d({x = x, y = 0, z = z}) * weight
totalWeight = totalWeight + weight totalWeight = totalWeight + weight
return (noiseValue / totalWeight) return (noiseValue / totalWeight)
@@ -870,9 +932,9 @@ end
---Generator handler for specific coordinates. ---Generator handler for specific coordinates.
---@param mapGenerator MapGen ---@param mapGenerator MapGen
---@param layer MapGen.Layer? ---@param layer MapGen.Layer?
---@param data number[] ---@param data integer[]
---@param data2 number[] ---@param data2 integer[]
---@param index number ---@param index integer
---@param x integer ---@param x integer
---@param y integer ---@param y integer
---@param z integer ---@param z integer
@@ -894,6 +956,7 @@ local function generatorHandler(mapGenerator, layer, data, data2, index, x, y, z
local endGetLayerTime = coreGetUsTime() local endGetLayerTime = coreGetUsTime()
local startNoiseCalcTime = endGetLayerTime local startNoiseCalcTime = endGetLayerTime
-- If the value of the noise is `nil`, -- If the value of the noise is `nil`,
-- then the point does not fall within any of the triangles. -- then the point does not fall within any of the triangles.
local height, temp, humidity = mapGenerator:getFactors(layer, x, y, z) local height, temp, humidity = mapGenerator:getFactors(layer, x, y, z)
@@ -907,7 +970,7 @@ local function generatorHandler(mapGenerator, layer, data, data2, index, x, y, z
temp = layer:calcTemp(temp, y) temp = layer:calcTemp(temp, y)
humidity = layer:calcHumidity(humidity, y) humidity = layer:calcHumidity(humidity, y)
---@type MapGen.factors ---@type MapGen.Factors
local factors = { local factors = {
height = height, height = height,
temp = temp, temp = temp,
@@ -944,6 +1007,10 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
self:initCavernsNoise() self:initCavernsNoise()
end end
if not self.isOresNoiseInitialized then
self:initOresNoise()
end
local data, data2 = voxelManip:get_data(), voxelManip:get_param2_data() local data, data2 = voxelManip:get_data(), voxelManip:get_param2_data()
-- local param2_data = voxelManip:get_param2_data() -- local param2_data = voxelManip:get_param2_data()
local area = VoxelArea:new({MinEdge = eMin, MaxEdge = eMax}) local area = VoxelArea:new({MinEdge = eMin, MaxEdge = eMax})
@@ -1000,6 +1067,9 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
end end
end end
-- Clear post processing tables
dataPostProcessing, vmPostProcessing = {}, {}
core.generate_ores(voxelManip, minPos, maxPos) core.generate_ores(voxelManip, minPos, maxPos)
core.generate_decorations(voxelManip, minPos, maxPos) core.generate_decorations(voxelManip, minPos, maxPos)

View File

@@ -1,147 +1,105 @@
local assert = assert
local pairs, ipairs = pairs, ipairs
local tableInsert = table.insert
local id = core.get_content_id local id = core.get_content_id
local getInstance = Class.getInstance local getInstance = Class.getInstance
---@alias MapGen.Biome.generateFunc fun(self, mapGenerator:MapGen, factors:MapGen.Factors, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer)
---@alias MapGen.Biome.dataPostProcessingFunc fun(self, mapGenerator:MapGen, factors:MapGen.Factors, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer, nodeType:MapGen.nodeType, area:VoxelArea)
---@alias MapGen.Biome.vmPostProcessingFunc fun(self, mapGenerator:MapGen, factors:MapGen.Factors, voxelManip:VoxelManip, x:integer, y:integer, z:integer, nodeType:MapGen.nodeType, area:VoxelArea)
---@class MapGen.Biome ---@class MapGen.Biome
---@field name string ---@field name string
---@field tempPoint number ---@field tempPoint integer
---@field humidityPoint number ---@field humidityPoint integer
---@field minY number ---@field minY integer
---@field maxY number ---@field maxY integer
---@field groundNodes MapGen.Biome.GroundNodes ---@field groundNodes MapGen.Biome.GroundNodes
---@field groundNodesIDs MapGen.Biome.GroundNodesIDs ---@field groundNodesIDs MapGen.Biome.GroundNodesIDs
---@field soilHeight number ---@field soilHeight integer
--- ---
---@field generateAir generateFunc ---@field generateAir MapGen.Biome.generateFunc
---@field generateCavernAir generateFunc ---@field generateCavernAir MapGen.Biome.generateFunc
---@field generateWater generateFunc ---@field generateWater MapGen.Biome.generateFunc
---@field generateRock generateFunc ---@field generateRock MapGen.Biome.generateFunc
---@field generateTurf generateFunc ---@field generateTurf MapGen.Biome.generateFunc
---@field generateSoil generateFunc ---@field generateSoil MapGen.Biome.generateFunc
---@field generateBottom generateFunc ---@field generateBottom MapGen.Biome.generateFunc
--- ---
---@field dataPostProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], data2:number[], index:number, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)? ---@field dataPostProcessing MapGen.Biome.dataPostProcessingFunc?
---@field vmPostProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, voxelManip:VoxelManip, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)? ---@field vmPostProcessing MapGen.Biome.vmPostProcessingFunc?
local Biome = {} ---
---@field oresByName table<string, MapGen.Ore>
---@alias generateFunc fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], data2:number[], index:number, x:number, y:number, z:number) ---@field oresByWhereinName table<string, MapGen.Ore[]>
---@field oresByWhereinID table<integer, MapGen.Ore[]>
local Biome = {
oresByName = {},
oresByWhereinName = {},
oresByWhereinID = {},
}
---Definition table for the `MapGen.Biome`. ---Definition table for the `MapGen.Biome`.
--- ---
---**Only for EmmyLua.** ---**Only for EmmyLua.**
---@class MapGen.BiomeDef ---@class MapGen.BiomeDef
---@field tempPoint number ---@field tempPoint integer
---@field humidityPoint number ---@field humidityPoint integer
---@field minY number ---@field minY integer
---@field maxY number ---@field maxY integer
---@field groundNodes MapGen.Biome.GroundNodes ---@field groundNodes MapGen.Biome.GroundNodes
---@field soilHeight number ---@field soilHeight integer
--- ---
---@field generateAir generateFunc? ---@field generateAir MapGen.Biome.generateFunc?
---@field generateCavernAir generateFunc? ---@field generateCavernAir MapGen.Biome.generateFunc?
---@field generateWater generateFunc? ---@field generateWater MapGen.Biome.generateFunc?
---@field generateRock generateFunc? ---@field generateRock MapGen.Biome.generateFunc?
---@field generateTurf generateFunc? ---@field generateTurf MapGen.Biome.generateFunc?
---@field generateSoil generateFunc? ---@field generateSoil MapGen.Biome.generateFunc?
---@field generateBottom generateFunc? ---@field generateBottom MapGen.Biome.generateFunc?
--- ---
---@field dataPostProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], data2:number[], index:number, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)? ---@field dataPostProcessing MapGen.Biome.dataPostProcessingFunc?
---@field vmPostProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, voxelManip:VoxelManip, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)? ---@field vmPostProcessing MapGen.Biome.vmPostProcessingFunc?
-- Default generate functions -- Default generate functions
---@param self MapGen.Biome ---@type MapGen.Biome.generateFunc
---@param mapGenerator MapGen
---@param factors MapGen.factors
---@param data number[]
---@param data2 number[]
---@param index number
---@param x number
---@param y number
---@param z number
local defaultGenerateAir = function(self, mapGenerator, factors, data, data2, index, x, y, z) local defaultGenerateAir = function(self, mapGenerator, factors, data, data2, index, x, y, z)
data[index] = mapGenerator.nodeIDs.air data[index] = mapGenerator.nodeIDs.air
end end
---@param self MapGen.Biome ---@type MapGen.Biome.generateFunc
---@param mapGenerator MapGen
---@param factors MapGen.factors
---@param data number[]
---@param data2 number[]
---@param index number
---@param x number
---@param y number
---@param z number
local defaultGenerateCavernAir = function(self, mapGenerator, factors, data, data2, index, x, y, z) local defaultGenerateCavernAir = function(self, mapGenerator, factors, data, data2, index, x, y, z)
self:generateAir(mapGenerator, factors, data, data2, index, x, y, z) self:generateAir(mapGenerator, factors, data, data2, index, x, y, z)
end end
---@param self MapGen.Biome ---@type MapGen.Biome.generateFunc
---@param mapGenerator MapGen
---@param factors MapGen.factors
---@param data number[]
---@param data2 number[]
---@param index number
---@param x number
---@param y number
---@param z number
local defaultGenerateWater = function(self, mapGenerator, factors, data, data2, index, x, y, z) local defaultGenerateWater = function(self, mapGenerator, factors, data, data2, index, x, y, z)
data[index] = mapGenerator.nodeIDs.water data[index] = mapGenerator.nodeIDs.water
end end
---@param self MapGen.Biome ---@type MapGen.Biome.generateFunc
---@param mapGenerator MapGen
---@param factors MapGen.factors
---@param data number[]
---@param data2 number[]
---@param index number
---@param x number
---@param y number
---@param z number
local defaultGenerateRock = function(self, mapGenerator, factors, data, data2, index, x, y, z) local defaultGenerateRock = function(self, mapGenerator, factors, data, data2, index, x, y, z)
data[index] = self.groundNodesIDs.rock data[index] = self.groundNodesIDs.rock
end end
---@param self MapGen.Biome ---@type MapGen.Biome.generateFunc
---@param mapGenerator MapGen
---@param factors MapGen.factors
---@param data number[]
---@param data2 number[]
---@param index number
---@param x number
---@param y number
---@param z number
local defaultGenerateTurf = function(self, mapGenerator, factors, data, data2, index, x, y, z) local defaultGenerateTurf = function(self, mapGenerator, factors, data, data2, index, x, y, z)
data[index] = self.groundNodesIDs.turf data[index] = self.groundNodesIDs.turf
end end
---@param self MapGen.Biome ---@type MapGen.Biome.generateFunc
---@param mapGenerator MapGen
---@param factors MapGen.factors
---@param data number[]
---@param data2 number[]
---@param index number
---@param x number
---@param y number
---@param z number
local defaultGenerateSoil = function(self, mapGenerator, factors, data, data2, index, x, y, z) local defaultGenerateSoil = function(self, mapGenerator, factors, data, data2, index, x, y, z)
data[index] = self.groundNodesIDs.soil data[index] = self.groundNodesIDs.soil
end end
---@param self MapGen.Biome ---@type MapGen.Biome.generateFunc
---@param mapGenerator MapGen
---@param factors MapGen.factors
---@param data number[]
---@param data2 number[]
---@param index number
---@param x number
---@param y number
---@param z number
local defaultGenerateBottom = function(self, mapGenerator, factors, data, data2, index, x, y, z) local defaultGenerateBottom = function(self, mapGenerator, factors, data, data2, index, x, y, z)
data[index] = self.groundNodesIDs.bottom data[index] = self.groundNodesIDs.bottom
end end
---@param name string ---@param name string
---@param def MapGen.BiomeDef ---@param def MapGen.BiomeDef
---@return MapGen.Biome ---@return MapGen.Biome
@@ -189,27 +147,79 @@ function Biome:new(name, def)
---@type MapGen.Biome ---@type MapGen.Biome
local instance = getInstance(self, {}) local instance = getInstance(self, {})
instance.name = name instance.name = name
instance.tempPoint = def.tempPoint instance.tempPoint = def.tempPoint
instance.humidityPoint = def.humidityPoint instance.humidityPoint = def.humidityPoint
instance.minY = def.minY instance.minY = def.minY
instance.maxY = def.maxY instance.maxY = def.maxY
instance.groundNodes = def.groundNodes instance.groundNodes = def.groundNodes
instance.groundNodesIDs = groundNodesIDs instance.groundNodesIDs = groundNodesIDs
instance.soilHeight = def.soilHeight instance.soilHeight = def.soilHeight
instance.generateAir = def.generateAir instance.generateAir = def.generateAir
instance.generateCavernAir = def.generateCavernAir instance.generateCavernAir = def.generateCavernAir
instance.generateWater = def.generateWater instance.generateWater = def.generateWater
instance.generateRock = def.generateRock instance.generateRock = def.generateRock
instance.generateSoil = def.generateSoil instance.generateSoil = def.generateSoil
instance.generateTurf = def.generateTurf instance.generateTurf = def.generateTurf
instance.generateBottom = def.generateBottom instance.generateBottom = def.generateBottom
instance.dataPostProcessing = def.dataPostProcessing instance.dataPostProcessing = def.dataPostProcessing
instance.vmPostProcessing = def.vmPostProcessing instance.vmPostProcessing = def.vmPostProcessing
return instance return instance
end end
---@param oreName string
---@param ore MapGen.Ore
function Biome:addOre(oreName, ore)
assert(self.oresByName[oreName] == nil, ('A ore named `%s` is already registered.'):format(oreName))
self.oresByName[oreName] = ore
for _, nodeName in ipairs(ore.wherein) do
tableInsert(self.oresByWhereinName[nodeName], ore)
tableInsert(self.oresByWhereinID[id(nodeName)], ore)
end
end
---@param nodeName string
---@return MapGen.Ore[]?
function Biome:getOresByWhereinName(nodeName)
local ores = self.oresByWhereinName[nodeName]
return ores
end
---@param nodeID integer
---@return MapGen.Ore[]?
function Biome:getOresByWhereinID(nodeID)
local ores = self.oresByWhereinID[nodeID]
return ores
end
---@param factors MapGen.Factors
---@param data integer[]
---@param data2 integer[]
---@param index integer
---@param x integer
---@param y integer
---@param z integer
---@return boolean
function Biome:generateOre(factors, data, data2, index, x, y, z)
local ores = self:getOresByWhereinID(data[index])
if ores == nil then
return false
end
for _, ore in ipairs(ores) do
if ore:generate(factors, data, data2, index, x, y, z) then
return true
end
end
return false
end
return Biome return Biome

View File

@@ -1,4 +1,4 @@
--- Only for EmmyLua ---@meta
---**Only for EmmyLua.** ---**Only for EmmyLua.**
---@class MapGen.Biome.GroundNodes ---@class MapGen.Biome.GroundNodes
@@ -6,6 +6,3 @@
---@field soil string The soil beneath the turf. The height of this layer depends on `Biome.soilHeight` ---@field soil string The soil beneath the turf. The height of this layer depends on `Biome.soilHeight`
---@field rock string The rock found beneath the soil of a biome. ---@field rock string The rock found beneath the soil of a biome.
---@field bottom string Covering the bottom of reservoirs. ---@field bottom string Covering the bottom of reservoirs.
local GroundNodes = {}
return GroundNodes

View File

@@ -1,11 +1,8 @@
--- Only for EmmyLua ---@meta
---**Only for EmmyLua.** ---**Only for EmmyLua.**
---@class MapGen.Biome.GroundNodesIDs ---@class MapGen.Biome.GroundNodesIDs
---@field turf number The soil covering the surface of the biome ---@field turf integer The soil covering the surface of the biome
---@field soil number The soil beneath the turf. The height of this layer depends on `Biome.soilHeight` ---@field soil integer The soil beneath the turf. The height of this layer depends on `Biome.soilHeight`
---@field rock number The rock found beneath the soil of a biome. ---@field rock integer The rock found beneath the soil of a biome.
---@field bottom number Covering the bottom of reservoirs. ---@field bottom integer Covering the bottom of reservoirs.
local GroundNodes = {}
return GroundNodes

View File

@@ -1,30 +1,46 @@
local assert = assert local assert = assert
local pairs = pairs
local mathMin, mathAbs, mathClamp local mathFloor, mathMin, mathAbs, mathClamp, mathRound = math.floor, math.min, math.abs, math.clamp, math.round
= math.min, math.abs, math.clamp
local coreGetValueNoise, corePosToString = core.get_value_noise, core.pos_to_string
local getInstance = Class.getInstance local getInstance = Class.getInstance
---@alias MapGen.Cavern.Type 'cheesed'|'warped' ---@alias MapGen.Cavern.Type 'cheesy'|'warped'|'worm'
---@alias MapGen.Cavern.NoiseParams {baseNoise:NoiseParams, xNoise?:NoiseParams, yNoise?:NoiseParams, zNoise?:NoiseParams}
---@alias MapGen.Cavern.ValueNoise {baseNoise:ValueNoise, xNoise?:ValueNoise, yNoise?:ValueNoise, zNoise?:ValueNoise}
---@class MapGen.Cavern ---@class MapGen.Cavern
---@field name string ---@field name string
---@field isRegional boolean? ---@field isRegional boolean?
---@field type MapGen.Cavern.Type ---@field type MapGen.Cavern.Type
---@field minY number ---@field minY integer
---@field maxY number ---@field maxY integer
---@field smoothDistance number ---@field smoothDistance number?
---@field threshold number ---@field threshold number?
--- ---
---@field step integer? ---@field warpStrength number?
---@field warpStrength number ---
---@field regionSize integer?
---@field wormStep integer?
---@field lenght integer?
---@field maxRadius integer?
---@field minRadius integer?
---@field defaulDirection IntegerPosition?
---@field wormOffset IntegerPosition?
--- ---
---@field getNoise fun(self:MapGen.Cavern):MapGen.Cavern.ValueNoise ---@field getNoise fun(self:MapGen.Cavern):MapGen.Cavern.ValueNoise
---@field initNoise fun(self:MapGen.Cavern) ---@field initNoise fun(self:MapGen.Cavern)
local Cavern = {} ---
---A table that stores pre-calculated coordinates of worm-type caves. Filled as needed
---@alias MapGen.Cavern.NoiseParams {baseNoise:NoiseParams, xNoise?:NoiseParams, yNoise?:NoiseParams, zNoise?:NoiseParams} ---
---@alias MapGen.Cavern.ValueNoise {baseNoise:ValueNoise, xNoise?:ValueNoise, yNoise?:ValueNoise, zNoise?:ValueNoise} ---TODO: It might be worth clearing the cache to save RAM.
---@field wormCache table<string, table<string, boolean>>
local Cavern = {
wormCache = {}
}
---Definition table for the `MapGen.Cavern`. ---Definition table for the `MapGen.Cavern`.
--- ---
@@ -32,14 +48,21 @@ local Cavern = {}
---@class MapGen.CavernDef ---@class MapGen.CavernDef
---@field isRegional boolean? ---@field isRegional boolean?
---@field type MapGen.Cavern.Type ---@field type MapGen.Cavern.Type
---@field minY number ---@field minY integer
---@field maxY number ---@field maxY integer
---@field noiseParams MapGen.Cavern.NoiseParams ---@field noiseParams MapGen.Cavern.NoiseParams
---@field smoothDistance number ---@field smoothDistance number?
---@field threshold number? ---@field threshold number?
--- ---
---@field step integer? ---@field warpStrength number?
---@field warpStrength number ---
---@field regionSize integer?
---@field wormStep integer?
---@field lenght integer?
---@field maxRadius integer?
---@field minRadius integer?
---@field defaulDirection IntegerPosition?
---@field wormOffset IntegerPosition?
---@param name string ---@param name string
---@param def MapGen.CavernDef ---@param def MapGen.CavernDef
@@ -50,18 +73,24 @@ function Cavern:new(name, def)
if def.type == 'warped' then if def.type == 'warped' then
local noises = def.noiseParams local noises = def.noiseParams
assert(def.step ~= nil, 'The cavern cannot be `warped` but has no `step`')
assert(def.warpStrength ~= nil, 'The cavern cannot be `warped` but has no `warpStrength`') assert(def.warpStrength ~= nil, 'The cavern cannot be `warped` but has no `warpStrength`')
assert(noises.xNoise ~= nil, 'The cavern cannot be `warped` but has no `xNoise`') assert(noises.xNoise ~= nil, 'The cavern cannot be `warped` but has no `xNoise`')
assert(noises.yNoise ~= nil, 'The cavern cannot be `warped` but has no `yNoise`') assert(noises.yNoise ~= nil, 'The cavern cannot be `warped` but has no `yNoise`')
assert(noises.zNoise ~= nil, 'The cavern cannot be `warped` but has no `zNoise`') assert(noises.zNoise ~= nil, 'The cavern cannot be `warped` but has no `zNoise`')
end end
---@type MapGen.Cavern.NoiseParams if def.type == 'worm' then
local _noiseParams = def.noiseParams local noises = def.noiseParams
assert(def.regionSize ~= nil, 'The cavern cannot be `worm` but has no `regionSize`')
assert(def.lenght ~= nil, 'The cavern cannot be `worm` but has no `lenght`')
assert(def.maxRadius ~= nil, 'The cavern cannot be `worm` but has no `maxRadius`')
assert(noises.xNoise ~= nil, 'The cavern cannot be `worm` but has no `xNoise`')
assert(noises.yNoise ~= nil, 'The cavern cannot be `worm` but has no `yNoise`')
assert(noises.zNoise ~= nil, 'The cavern cannot be `worm` but has no `zNoise`')
end
---@type MapGen.Cavern.ValueNoise local _noiseParams = def.noiseParams
local _noise = {} -- note: must be nil until luanti mapgen objects are loaded. local _noise = {}
---@type MapGen.Cavern ---@type MapGen.Cavern
local instance = getInstance(self, {}) local instance = getInstance(self, {})
@@ -72,8 +101,16 @@ function Cavern:new(name, def)
instance.maxY = def.maxY instance.maxY = def.maxY
instance.smoothDistance = def.smoothDistance instance.smoothDistance = def.smoothDistance
instance.threshold = def.threshold or 0.1 instance.threshold = def.threshold or 0.1
instance.step = def.step
instance.warpStrength = def.warpStrength instance.warpStrength = def.warpStrength
instance.wormStep = def.wormStep or 1
instance.regionSize = def.regionSize
instance.lenght = def.lenght
instance.maxRadius = def.maxRadius
instance.minRadius = def.minRadius or 0
instance.defaulDirection = def.defaulDirection or {x = 0, y = -1, z = 0}
instance.wormOffset = def.wormOffset or {x = 0, y = 0, z = 0}
function instance:getNoise() function instance:getNoise()
return _noise return _noise
@@ -81,7 +118,7 @@ function Cavern:new(name, def)
function instance:initNoise() function instance:initNoise()
for noiseName, noiseParams in pairs(_noiseParams) do for noiseName, noiseParams in pairs(_noiseParams) do
_noise[noiseName] = core.get_value_noise(_noiseParams[noiseName]) _noise[noiseName] = coreGetValueNoise(noiseParams)
end end
end end
@@ -102,7 +139,7 @@ end
function Cavern:isCheesedCavern(x, y, z, weight) function Cavern:isCheesedCavern(x, y, z, weight)
local noises = self:getNoise() local noises = self:getNoise()
return noises.baseNoise:get_3d({x = x, y = y, z = z}) * weight > self.threshold return noises.baseNoise:get_3d({x = x, y = y, z = z}) * weight >= self.threshold
end end
---@param x integer ---@param x integer
@@ -125,10 +162,148 @@ function Cavern:isWarpedCavern(x, y, z, weight)
local value = noises.baseNoise:get_3d({x = warpedX, y = warpedY, z = warpedZ}) local value = noises.baseNoise:get_3d({x = warpedX, y = warpedY, z = warpedZ})
return value * weight > self.threshold return value * weight >= self.threshold
end
---Calculates the worm offset for one coordinate.
---
---If the worm is closer to the boundary than the radius of its tunnel,
---it will be forced to turn in the opposite direction.
---@param x integer
---@param minX integer
---@param maxX integer
---@param noiseValue number
---@param radius integer
---@return integer
local function calcWormOffset(x, minX, maxX, noiseValue, radius)
local distance1 = x - minX
local distance2 = maxX - x
if distance1 <= radius then
return 1
elseif distance2 <= radius then
return -1
else
return mathRound(mathClamp(noiseValue, -1, 1))
end
end
local function drawSphere(wx, wy, wz, radius, cache)
local radiusSqrt = (radius + 0.25) ^ 2 -- `+ 0.25` is needed to make the sphere appear more round.
for sx = -radius, radius do
local xSqrt = sx * sx
for sy = -radius, radius do
local xySqrt = xSqrt + sy * sy
if xySqrt <= radiusSqrt then
for sz = -radius, radius do
if xySqrt + (sz * sz) <= radiusSqrt then
local posString = corePosToString({x = wx+sx, y = wy+sy, z = wz+sz})
cache[posString] = true
end
end
end
end
end
end
---Calculates a full cave for a given region and saves it to the cache.
---@param regionPos IntegerPosition
---@return table<string, boolean>
function Cavern:caclRegionWormCache(regionPos)
---@type IntegerPosition
local offset = self.wormOffset
---@type integer, integer
local maxRadius, minRadius = self.maxRadius, self.minRadius
local step, size = self.wormStep, self.regionSize
local noise = self:getNoise()
local cache = {}
local regionMin = {
x = regionPos.x * size + offset.x,
y = regionPos.y * size + offset.y,
z = regionPos.z * size + offset.z
}
local regionMax = {
x = regionMin.x + size,
y = regionMin.y + size,
z = regionMin.z + size
}
-- Coordinates of the worm's head
local wx = regionMin.x + mathFloor(0.5 * size)
local wy = regionMin.y + mathFloor(0.5 * size)
local wz = regionMin.z + mathFloor(0.5 * size)
-- Direction vector of the worm's head movement
local wormDirection = {x = 0, y = - 1, z = 0}
for i=1, self.lenght do
-- Calculating the new direction of movement of the worm
wormDirection = {
x = mathClamp(wormDirection.x + calcWormOffset(wx, regionMin.x, regionMax.x, noise.xNoise:get_3d({x=wx, y=wy, z=wz}), maxRadius), -1, 1),
y = mathClamp(wormDirection.y + calcWormOffset(wy, regionMin.y, regionMax.y, noise.yNoise:get_3d({x=wx, y=wy, z=wz}), maxRadius), -1, 1),
z = mathClamp(wormDirection.z + calcWormOffset(wz, regionMin.z, regionMax.z, noise.zNoise:get_3d({x=wx, y=wy, z=wz}), maxRadius), -1, 1)
}
-- To prevent the worm from getting stuck in place,
-- when receiving a zero motion vector, we reset the vector to the default
if wormDirection.x == 0 and wormDirection.y == 0 and wormDirection.z == 0 then
wormDirection = { x = 0, y = -1, z = 0}
end
wx = wx + wormDirection.x
wy = wy + wormDirection.y
wz = wz + wormDirection.z
local radius = mathFloor(noise.baseNoise:get_3d({x = wz, y = wy, z = wz}))
if radius > maxRadius then
radius = maxRadius
end
if radius < minRadius then
radius = minRadius
end
if i % step == 0 then
drawSphere(wx, wy, wz, radius, cache)
end
end
return cache
end
---@param x integer
---@param y integer
---@param z integer
---@param weight number
---@return boolean
function Cavern:isWormCavern(x, y, z, weight)
---@type IntegerPosition
local offset = self.wormOffset
local regionPos = {
x = mathFloor((x - offset.x)/self.regionSize),
y = mathFloor((y - offset.y)/self.regionSize),
z = mathFloor((z - offset.z)/self.regionSize)
}
local regionPosString = corePosToString(regionPos)
local posString = corePosToString({x = x, y = y, z = z})
local regionWormCache = self.wormCache[regionPosString]
if regionWormCache ~= nil then
return regionWormCache[posString] == true
else
local regionCache = self:caclRegionWormCache(regionPos)
self.wormCache[regionPosString] = regionCache
return regionCache[posString] == true
end
end end
---Returns `true` if there is a cavern at the specified coordinates.
---@param x integer ---@param x integer
---@param y integer ---@param y integer
---@param z integer ---@param z integer
@@ -145,10 +320,12 @@ function Cavern:isCavern(x, y, z, distance)
local weight = self:calcCavernWeight(distance) local weight = self:calcCavernWeight(distance)
if self.type == 'warped' then if self.type == 'cheesy' then
return self:isWarpedCavern(x, y, z, weight)
elseif self.type == 'cheesed' then
return self:isCheesedCavern(x, y, z, weight) return self:isCheesedCavern(x, y, z, weight)
elseif self.type == 'warped' then
return self:isWarpedCavern(x, y, z, weight)
elseif self.type == 'worm' then
return self:isWormCavern(x, y, z, weight)
else else
error(('unknown type of cave `%s`'):format(self.type)) error(('unknown type of cave `%s`'):format(self.type))
end end
@@ -170,10 +347,12 @@ function Cavern:isLayeredCavern(x, y, z)
local weight = self:calcCavernWeight(distance) local weight = self:calcCavernWeight(distance)
if self.type == 'warped' then if self.type == 'cheesy' then
return self:isWarpedCavern(x, y, z, weight)
elseif self.type == 'cheesed' then
return self:isCheesedCavern(x, y, z, weight) return self:isCheesedCavern(x, y, z, weight)
elseif self.type == 'warped' then
return self:isWarpedCavern(x, y, z, weight)
elseif self.type == 'worm' then
return self:isWormCavern(x, y, z, weight)
else else
error(('unknown type of cave `%s`'):format(self.type)) error(('unknown type of cave `%s`'):format(self.type))
end end

View File

@@ -1,9 +1,11 @@
local tostring = tostring
local getInstance = Class.getInstance local getInstance = Class.getInstance
---@class MapGen.Edge ---@class MapGen.Edge
---@field p1 MapGen.Peak ---@field p1 MapGen.Peak
---@field p2 MapGen.Peak ---@field p2 MapGen.Peak
---@field vec vector ---@field vec vector
local Edge = {} local Edge = {}
---@param p1 MapGen.Peak ---@param p1 MapGen.Peak

View File

@@ -1,5 +1,6 @@
local modInfo = Mod.getInfo('smc__core__map_gen') local extend = Class.extend
local require = modInfo.require
local require = Mod:getInfo('smc__core__map_gen').require
---@type MapGen.Peak ---@type MapGen.Peak
local Peak = require('MapGen.Peak') local Peak = require('MapGen.Peak')
@@ -10,7 +11,7 @@ local Peak = require('MapGen.Peak')
---@class MapGen.FakePeak : MapGen.Peak ---@class MapGen.FakePeak : MapGen.Peak
---@field id number ---@field id number
---@field getPeakPos fun():vector ---@field getPeakPos fun():vector
local FakePeak = Class.extend(Peak, {}) local FakePeak = extend(Peak, {})
---Returns a fake `MapGen.Peak` that has no noise parameters. ---Returns a fake `MapGen.Peak` that has no noise parameters.
---Note that the initialized peak should not be used in generation. ---Note that the initialized peak should not be used in generation.

View File

@@ -1,7 +1,15 @@
local assert, dump, type = assert, dump, type
local pairs, ipairs = pairs, ipairs
local mathHuge, mathClamp = math.huge, math.clamp
local tableInsert, tableSort = table.insert, table.sort
local id = core.get_content_id
local corePosToString, coreGetValueNoise = core.pos_to_string, core.get_value_noise
local getInstance = Class.getInstance local getInstance = Class.getInstance
local modInfo = Mod.getInfo('smc__core__map_gen') local require = Mod:getInfo('smc__core__map_gen').require
local require = modInfo.require
---@type MapGen.Peak ---@type MapGen.Peak
local Peak = require('MapGen.Peak') local Peak = require('MapGen.Peak')
@@ -9,32 +17,44 @@ local Peak = require('MapGen.Peak')
local Triangle = require('MapGen.Triangle') local Triangle = require('MapGen.Triangle')
---@class MapGen.Layer ---@class MapGen.Layer
---@field name string ---@field name string
---@field minY integer ---@field minY integer
---@field maxY integer ---@field maxY integer
---@field minTemp integer ---@field minTemp integer
---@field maxTemp integer ---@field maxTemp integer
---@field minHumidity integer ---@field minHumidity integer
---@field maxHumidity integer ---@field maxHumidity integer
---@field waterLevel integer ---@field waterLevel integer
---@field calcTemp fun(self:MapGen.Layer, value:number, height:number):number ---
---@field calcHumidity fun(self:MapGen.Layer, value:number, height:number):number ---@field calcTemp fun(self:MapGen.Layer, value:number, height:integer):number
---@field peaksList MapGen.Peak[] ---@field calcHumidity fun(self:MapGen.Layer, value:number, height:integer):number
---@field peaksByPos table<string, MapGen.Peak> ---
---@field noisesByColor table<MapGen.Layer.Category, table<ColorString, ValueNoise>> ---@field peaksList MapGen.Peak[]
---@field noisesParamsByColor table<MapGen.Layer.Category, table<ColorString, NoiseParams>> ---@field peaksByPos table<string, MapGen.Peak>
---@field biomesByName table<string, MapGen.Biome> ---
---@field biomesList MapGen.Biome[] ---@field noisesParamsByColor table<MapGen.Layer.Category, table<ColorString, NoiseParams>>
---@field biomesDiagram table ---@field noisesByColor table<MapGen.Layer.Category, table<ColorString, ValueNoise>>
---
---@field biomesGorizontalScattering integer ---@field biomesGorizontalScattering integer
---@field biomesVerticalScattering integer ---@field biomesVerticalScattering integer
---@field cavernsByName table<string, MapGen.Cavern> ---@field biomesByName table<string, MapGen.Biome>
---@field cavernsList MapGen.Cavern[] ---@field biomesList MapGen.Biome[]
---@field regionsByName table<string, MapGen.Region> ---@field biomesDiagram table<integer, table<integer, table<integer, {biome:MapGen.Biome, weight:number}>>>
---@field trianglesList MapGen.Triangle[] ---
---@field cavernsByName table<string, MapGen.Cavern>
---@field cavernsList MapGen.Cavern[]
---
---@field regionsByName table<string, MapGen.Region>
---
---@field oresByName table<string, MapGen.Ore>
---@field oresByWhereinName table<string, MapGen.Ore[]>
---@field oresByWhereinID table<integer, MapGen.Ore[]>
---
---@field trianglesList MapGen.Triangle[]
local Layer = { local Layer = {
peaksList = {}, peaksList = {},
peaksByPos = {}, peaksByPos = {},
noisesByColor = { noisesByColor = {
landscape = {}, landscape = {},
temp = {}, temp = {},
@@ -45,14 +65,21 @@ local Layer = {
temp = {}, temp = {},
humidity = {}, humidity = {},
}, },
biomesByName = {},
biomesList = {}, biomesByName = {},
biomesDiagram = {}, biomesList = {},
cavernsByName = {}, biomesDiagram = {},
cavernsList = {},
regionsByName = {}, cavernsByName = {},
trianglesList = {}, cavernsList = {},
tetrahedronsList = {},
regionsByName = {},
oresByName = {},
oresByWhereinName = {},
oresByWhereinID = {},
trianglesList = {},
} }
---Definition table for the `MapGen.Layer`. ---Definition table for the `MapGen.Layer`.
@@ -66,8 +93,8 @@ local Layer = {
---@field minHumidity integer ---@field minHumidity integer
---@field maxHumidity integer ---@field maxHumidity integer
---@field waterLevel? integer ---@field waterLevel? integer
---@field calcTemp (fun(self:MapGen.Layer, value:number, height:number):number)? ---@field calcTemp (fun(self:MapGen.Layer, value:number, height:integer):number)?
---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:number):number)? ---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:integer):number)?
---@field biomesGorizontalScattering integer? ---@field biomesGorizontalScattering integer?
---@field biomesVerticalScattering integer? ---@field biomesVerticalScattering integer?
---@field triangulationLandscapeFile string ---@field triangulationLandscapeFile string
@@ -79,79 +106,12 @@ local Layer = {
---@param self MapGen.Layer ---@param self MapGen.Layer
---@param value number ---@param value number
---@param height number ---@param height integer
---@return number ---@return number
local function defaultCalcFunc(self, value, height) local function defaultCalcFunc(self, value, height)
return value return value
end end
---Checks `def` for compliance with `MapGen.PeakDef` and creates a new peak
---if a peak with such coordinates has not yet been registered or returns an existing one.
---
---**Note:** If the colors of the new peak and the existing one at the same coordinates
---are different, an error will be called.
---@param def MapGen.PeakDef
---@param scale integer
---@return MapGen.Peak
function Layer:registerPeak(def, scale)
assert(def.pos ~= nil)
assert(def.pos.x ~= nil)
assert(def.pos.z ~= nil)
assert(def.color ~= nil)
assert(type(def.color) == 'string')
def.pos.x = def.pos.x * scale
def.pos.z = def.pos.z * scale
def.pos.y = 0
local positionStr = core.pos_to_string(def.pos)
local peak = self.peaksByPos[positionStr]
if peak == nil then
peak = Peak:new(def)
self.peaksByPos[positionStr] = peak
elseif peak.color ~= def.color then
error('There cannot be two peaks with the same coordinates but different colors.')
end
return peak
end
function Layer:initTrianglesNeighbours()
local triangles = self.trianglesList
for _, triangle in pairs(triangles) do
for _, id in ipairs(triangle.neighboursIDs) do
table.insert(triangle.neighbours, triangles[id])
end
end
end
---@param fileName string
---@param category MapGen.Layer.Category
---@param scale integer
function Layer:getTriaglesFromFile(fileName, category, scale)
local file = io.open(core.get_modpath(core.get_current_modname())..'/maps/'..fileName, 'r')
assert(file ~= nil)
local json = core.parse_json(file:read('*a')) or {}
file:close()
local triangles = json.triangles
assert(triangles ~= nil)
for _, tr in ipairs(triangles) do
local p1 = self:registerPeak( tr.vertices[1], scale)
local p2 = self:registerPeak( tr.vertices[2], scale)
local p3 = self:registerPeak( tr.vertices[3], scale)
local triangle = Triangle:new(tr.id,p1, p2, p3, tr.adjacent_triangle_ids)
self:addTriangle(category, triangle)
end
end
---@param name string ---@param name string
---@param def MapGen.LayerDef ---@param def MapGen.LayerDef
---@return MapGen.Layer ---@return MapGen.Layer
@@ -185,10 +145,12 @@ function Layer:new(name, def)
def.triangulationLandscapeFile, def.triangulationLandscapeFile,
'landscape', 'landscape',
def.landscapeMapScale) def.landscapeMapScale)
instance:getTriaglesFromFile( instance:getTriaglesFromFile(
def.triangulationTempFile, def.triangulationTempFile,
'temp', 'temp',
def.tempMapScale) def.tempMapScale)
instance:getTriaglesFromFile( instance:getTriaglesFromFile(
def.triangulationHumidityFile, def.triangulationHumidityFile,
'humidity', 'humidity',
@@ -199,8 +161,76 @@ function Layer:new(name, def)
return instance return instance
end end
---Checks `def` for compliance with `MapGen.PeakDef` and creates a new peak
---if a peak with such coordinates has not yet been registered or returns an existing one.
---
---**Note:** If the colors of the new peak and the existing one at the same coordinates
---are different, an error will be called.
---@param def MapGen.PeakDef
---@param scale integer
---@return MapGen.Peak
function Layer:registerPeak(def, scale)
assert(def.pos ~= nil)
assert(def.pos.x ~= nil)
assert(def.pos.z ~= nil)
assert(def.color ~= nil)
assert(type(def.color) == 'string')
def.pos.x = def.pos.x * scale
def.pos.z = def.pos.z * scale
def.pos.y = 0
local positionStr = corePosToString(def.pos)
local peak = self.peaksByPos[positionStr]
if peak == nil then
peak = Peak:new(def)
self.peaksByPos[positionStr] = peak
elseif peak.color ~= def.color then
error('There cannot be two peaks with the same coordinates but different colors.')
end
return peak
end
function Layer:initTrianglesNeighbours()
local triangles = self.trianglesList
for _, triangle in pairs(triangles) do
for _, id in ipairs(triangle.neighboursIDs) do
tableInsert(triangle.neighbours, triangles[id])
end
end
end
---@param fileName string
---@param category MapGen.Layer.Category
---@param scale integer
function Layer:getTriaglesFromFile(fileName, category, scale)
local file = io.open(core.get_modpath(core.get_current_modname())..'/maps/'..fileName, 'r')
assert(file ~= nil)
local json = core.parse_json(file:read('*a')) or {}
file:close()
local triangles = json.triangles
assert(triangles ~= nil)
for _, tr in ipairs(triangles) do
local p1 = self:registerPeak( tr.vertices[1], scale)
local p2 = self:registerPeak( tr.vertices[2], scale)
local p3 = self:registerPeak( tr.vertices[3], scale)
local triangle = Triangle:new(tr.id,p1, p2, p3, tr.adjacent_triangle_ids)
self:addTriangle(category, triangle)
end
end
---A category of noise that affects specific map generation objects. ---A category of noise that affects specific map generation objects.
---@alias MapGen.Layer.Category 'landscape'|'temp'|'humidity' ---@alias MapGen.Layer.Category 'landscape'|'temp'|'humidity'
---Adds a triangle to the `Layer.trianglesList` ---Adds a triangle to the `Layer.trianglesList`
---@param category MapGen.Layer.Category ---@param category MapGen.Layer.Category
@@ -218,14 +248,14 @@ end
---@param category MapGen.Layer.Category ---@param category MapGen.Layer.Category
---@param peak MapGen.Peak ---@param peak MapGen.Peak
function Layer:addPeak(category, peak) function Layer:addPeak(category, peak)
table.insert(self.peaksList, peak) tableInsert(self.peaksList, peak)
end end
---Returns the `MapGen.Peak` at the coordinates. If there is no peak at these coordinates, it returns `nil`. ---Returns the `MapGen.Peak` at the coordinates. If there is no peak at these coordinates, it returns `nil`.
---@param pos Position Coordinate of the desired peak. ---@param pos Position Coordinate of the desired peak.
---@return MapGen.Peak? ---@return MapGen.Peak?
function Layer:getPeakByPos(pos) function Layer:getPeakByPos(pos)
local positionStr = core.pos_to_string(pos) local positionStr = corePosToString(pos)
local peak = self.peaksByPos[positionStr] local peak = self.peaksByPos[positionStr]
@@ -287,7 +317,7 @@ function Layer:addBiome(biomeName, biome)
biomeName, self.name)) biomeName, self.name))
self.biomesByName[biomeName] = biome self.biomesByName[biomeName] = biome
table.insert(self.biomesList, biome) tableInsert(self.biomesList, biome)
end end
---Returns a biome by name, if there is no such biome, it will raise an error. ---Returns a biome by name, if there is no such biome, it will raise an error.
@@ -310,7 +340,7 @@ function Layer:addCavern(cavernName, cavern)
cavernName, self.name)) cavernName, self.name))
self.cavernsByName[cavernName] = cavern self.cavernsByName[cavernName] = cavern
table.insert(self.cavernsList, cavern) tableInsert(self.cavernsList, cavern)
end end
---Returns a cavern by name, if there is no such cavern, it will raise an error. ---Returns a cavern by name, if there is no such cavern, it will raise an error.
@@ -344,6 +374,85 @@ function Layer:getRegionByName(regionName)
return region return region
end end
---@param oreName string
---@param ore MapGen.Ore
function Layer:addOre(oreName, ore)
assert(self.oresByName[oreName] == nil, ('A ore named `%s` is already registered.'):format(oreName))
self.oresByName[oreName] = ore
for _, nodeName in ipairs(ore.wherein) do
if self.oresByWhereinName[nodeName] == nil then
self.oresByWhereinName[nodeName] = { ore }
else
tableInsert(self.oresByWhereinName[nodeName], ore)
end
local nodeID = id(nodeName)
if self.oresByWhereinID[nodeID] == nil then
self.oresByWhereinID[nodeID] = { ore }
else
tableInsert(self.oresByWhereinID[nodeID], ore)
end
end
if ore.biomes ~= nil then
for _, biomeName in ipairs(ore.biomes) do
local biome = self:getBiomeByName(biomeName)
biome:addOre(oreName, ore)
end
end
end
---@param oreName string
---@return MapGen.Ore
function Layer:getOreByName(oreName)
local ore = self.oresByName[oreName]
assert(ore ~= nil, ('Ore named `%s` does not exist in the `%s` layer.'):format(
oreName, self.name))
return ore
end
---@param nodeName string
---@return MapGen.Ore[]?
function Layer:getOresByWhereinName(nodeName)
local ores = self.oresByWhereinName[nodeName]
return ores
end
---@param nodeID integer
---@return MapGen.Ore[]?
function Layer:getOresByWhereinID(nodeID)
local ores = self.oresByWhereinID[nodeID]
return ores
end
---@param factors MapGen.Factors
---@param data integer[]
---@param data2 integer[]
---@param index integer
---@param x integer
---@param y integer
---@param z integer
---@return boolean
function Layer:generateOre(factors, data, data2, index, x, y, z)
local ores = self:getOresByWhereinID(data[index])
if ores == nil then
return false
end
for _, ore in ipairs(ores) do
if ore:generate(factors, data, data2, index, x, y, z) then
return true
end
end
return false
end
---@param height number ---@param height number
---@param biomesList MapGen.Biome[] ---@param biomesList MapGen.Biome[]
@@ -354,12 +463,12 @@ local function getBiomesNamesByHeight(height, biomesList)
for _, biome in ipairs(biomesList) do for _, biome in ipairs(biomesList) do
if height >= biome.minY and height <= biome.maxY then if height >= biome.minY and height <= biome.maxY then
table.insert(biomesNames, biome.name) tableInsert(biomesNames, biome.name)
table.insert(biomes, biome) tableInsert(biomes, biome)
end end
end end
table.sort(biomesNames) tableSort(biomesNames)
return biomesNames, biomes return biomesNames, biomes
end end
@@ -372,7 +481,7 @@ function Layer:initNoises()
for category, noisesParams in pairs(self.noisesParamsByColor) do for category, noisesParams in pairs(self.noisesParamsByColor) do
for color, noiseParams in pairs(noisesParams) do for color, noiseParams in pairs(noisesParams) do
noises[category][color] = core.get_value_noise(noiseParams) noises[category][color] = coreGetValueNoise(noiseParams)
end end
end end
end end
@@ -402,7 +511,8 @@ function Layer:initBiomesDiagram()
diagram[height][temp] = {} diagram[height][temp] = {}
for humidity = self.minHumidity, self.maxHumidity do for humidity = self.minHumidity, self.maxHumidity do
local minDistance = math.huge local minDistance = mathHuge
local pastClosestBiome = nil
local closestBiome = nil local closestBiome = nil
---@param biome MapGen.Biome ---@param biome MapGen.Biome
@@ -411,17 +521,28 @@ function Layer:initBiomesDiagram()
if distance < minDistance then if distance < minDistance then
minDistance = distance minDistance = distance
pastClosestBiome = closestBiome
closestBiome = biome closestBiome = biome
end end
end end
-- If there is no nearby biome for this height...
if closestBiome == nil then if closestBiome == nil then
-- ... then the first registered biome in the layer will be the default one. closestBiome = self.biomesList[1]
diagram[height][temp][humidity] = self.biomesList[1]
else
diagram[height][temp][humidity] = closestBiome
end end
local weight
if pastClosestBiome ~= nil then
---Distances from the center of the nearest biome to the current point.
local distance1 = (temp - closestBiome.tempPoint)^2 + (humidity - closestBiome.humidityPoint)^2
---Half the distance between the centers of two nearest biomes (i.e. the distance to the biome boundary)
local distance2 = (pastClosestBiome.tempPoint - closestBiome.tempPoint)^2 + (pastClosestBiome.humidityPoint - closestBiome.humidityPoint) / 2
weight = 1 - mathClamp(distance1 / distance2, 0, 1)
else
weight = 1
end
diagram[height][temp][humidity] = { biome = closestBiome, weight = weight}
end end
end end

View File

@@ -0,0 +1,161 @@
local assert = assert
local pairs = pairs
local id = core.get_content_id
local coreGetValueNoise = core.get_value_noise
local getInstance = Class.getInstance
---@alias MapGen.Ore.Type 'cheesy'|'custom'
---@alias MapGen.Ore.NoiseParams {baseNoise:NoiseParams, xNoise?:NoiseParams, yNoise?:NoiseParams, zNoise?:NoiseParams}
---@alias MapGen.Ore.ValueNoise {baseNoise:ValueNoise, xNoise?:ValueNoise, yNoise?:ValueNoise, zNoise?:ValueNoise}
---@class MapGen.Ore
---@field name string
---@field type MapGen.Ore.Type
---@field biomes string[]?
---@field minY integer
---@field maxY integer
---
---@field wherein string[]
---@field nodeName string?
---@field nodeParam2 integer
---@field nodeID integer?
---@field oreFunc (fun(self:MapGen.Ore, factors:MapGen.Factors, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer):boolean)?
---
---@field threshold number
---
---@field getNoise fun(self:MapGen.Ore):MapGen.Ore.ValueNoise
---@field initNoise fun(self:MapGen.Ore)
local Ore = {}
---Definition table for the `MapGen.Ore`.
---
---**Only for EmmyLua.**
---@class MapGen.OreDef
---@field type MapGen.Ore.Type
---A list of biome names where ore will generate.
---
---If `nil`, ore will generate on the entire layer.
---@field biomes string[]?
---@field minY integer
---@field maxY integer
---
---List of node names where ore will spawn.
---@field wherein string[]
---
---The name of the ore that will be generated.
---@field nodeName string?
---@field nodeParam2 integer?
---
---The function that will be called to generate ore.
---
---Can be used to customize generation.
---@field oreFunc (fun(self:MapGen.Ore, factors:MapGen.Factors, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer):boolean)?
---
---@field threshold number
---
---@field noiseParams MapGen.Ore.NoiseParams
---@param name string
---@param def MapGen.OreDef
function Ore:new(name, def)
assert(def.nodeName ~= nil or def.oreFunc ~= nil, '`nodeName` and `oreFunc` cannot be nil for ore definition')
local _noiseParams = def.noiseParams
local _noise = {}
local instance = getInstance(self, {})
instance.name = name
instance.type = def.type
instance.biomes = def.biomes
instance.minY = def.minY
instance.maxY = def.maxY
instance.wherein = def.wherein
instance.nodeName = def.nodeName
instance.nodeParam2 = def.nodeParam2 or 0
instance.nodeID = id(instance.nodeName)
instance.oreFunc = def.oreFunc
instance.threshold = def.threshold
function instance:getNoise()
return _noise
end
function instance:initNoise()
for noiseName, noiseParams in pairs(_noiseParams) do
_noise[noiseName] = coreGetValueNoise(noiseParams)
end
end
return instance
end
---Places ore at the given coordinates.
---
---If a generation function is specified, it is called.
---
---**Note**: This method is guaranteed to place ore. To generate ore procedurally, use `:generate()`
---@param factors MapGen.Factors
---@param data integer[]
---@param data2 integer[]
---@param index integer
---@param x integer
---@param y integer
---@param z integer
---@return boolean
function Ore:set(factors, data, data2, index, x, y, z)
if self.nodeID ~= nil then
data[index] = self.nodeID
data2[index] = self.nodeParam2
end
if self.oreFunc ~= nil then
return self:oreFunc(factors, data, data2, index, x, y, z)
end
return true
end
---@param factors MapGen.Factors
---@param data integer[]
---@param data2 integer[]
---@param index integer
---@param x integer
---@param y integer
---@param z integer
---@return boolean
function Ore:generateCheesed(factors, data, data2, index, x, y, z)
local noises = self:getNoise()
if noises.baseNoise:get_3d({x = x, y = y, z = z}) >= self.threshold then
self:set(factors, data, data2, index, x, y, z)
return true
else
return false
end
end
---@param factors MapGen.Factors
---@param data integer[]
---@param data2 integer[]
---@param index integer
---@param x integer
---@param y integer
---@param z integer
---@return boolean
function Ore:generate(factors, data, data2, index, x, y, z)
if y > self.maxY or y < self.minY then
return false
end
if self.type == 'cheesy' then
return self:generateCheesed(factors, data, data2, index, x, y, z)
elseif self.type == 'custom' then
return self:oreFunc(factors, data, data2, index, x, y, z)
else
error()
end
end
return Ore

View File

@@ -1,29 +1,30 @@
local tabeCopyWithMetatable, tableMerge = table.copy_with_metatables, table.merge
local v = vector.new
local getInstance = Class.getInstance local getInstance = Class.getInstance
---@class MapGen.Peak ---@class MapGen.Peak
---@field id number ---@field id number
---@field pos vector ---@field pos vector
---@field color ColorString ---@field color ColorString
---@field getGroups fun(self):table<string, number> ---@field getGroups fun(self):table<string, number>
---@field addGroups fun(self, groups:table<string, number>) ---@field addGroups fun(self, groups:table<string, number>)
local Peak = { local Peak = {
id = 0, id = 0,
} }
-- --- Class registration ---
---Definition table for the `MapGen.Peak`. ---Definition table for the `MapGen.Peak`.
--- ---
---**Only for EmmyLua.** ---**Only for EmmyLua.**
---@class MapGen.PeakDef ---@class MapGen.PeakDef
---@field pos MapVector ---@field pos MapVector
---@field color ColorString ---@field color ColorString
---@field groups? table<string, number> ---@field groups table<string, number>?
---@param def MapGen.PeakDef ---@param def MapGen.PeakDef
---@return MapGen.Peak ---@return MapGen.Peak
function Peak:new(def) function Peak:new(def)
local _color = def.color
local _groups local _groups
if def.groups == nil then if def.groups == nil then
@@ -34,16 +35,15 @@ function Peak:new(def)
end end
---@type MapGen.Peak ---@type MapGen.Peak
local instance = getInstance(self,{}, local instance = getInstance(self, {}, {
{
__tostring = self.toString, __tostring = self.toString,
__eq = self.eq __eq = self.eq
}) })
instance.pos = vector.new(def.pos) instance.pos = v(def.pos)
instance.color = def.color instance.color = def.color
function instance:getGroups() function instance:getGroups()
return table.copy_with_metatables(_groups) return tabeCopyWithMetatable(_groups)
end end
function instance:addGroups(groups) function instance:addGroups(groups)
@@ -51,7 +51,7 @@ function Peak:new(def)
groups.is2d = nil groups.is2d = nil
groups.is3d = nil groups.is3d = nil
_groups = table.merge(_groups, groups, true) _groups = tableMerge(_groups, groups, true)
end end
return instance return instance
@@ -61,7 +61,8 @@ end
---@return string ---@return string
function Peak:toString() function Peak:toString()
local pos = self.pos local pos = self.pos
return ('Peak (%s) x: %.2f y: %.2f z: %.2f'):format( self.id, pos.x, pos.y, pos.z)
return ('Peak (%s) x: %.2f y: %.2f z: %.2f'):format(self.id, pos.x, pos.y, pos.z)
end end
---Returns true if the peaks are equivalent. ---Returns true if the peaks are equivalent.

View File

@@ -7,16 +7,18 @@ local getInstance = Class.getInstance
---@field vertices MapVector[] ---@field vertices MapVector[]
local Region = {} local Region = {}
---Definition table for the `MapGen.Region`.
---
---**Only for EmmyLua.**
---@class MapGen.RegionDef ---@class MapGen.RegionDef
---@field vertices MapVector[] ---@field vertices MapVector[]
---@param def MapGen.RegionDef ---@param def MapGen.RegionDef
---@return MapGen.Region ---@return MapGen.Region
function Region:new(name, def) function Region:new(name, def)
local instance = getInstance(self, { local instance = getInstance(self, {})
name = name, instance.name = name
vertices = def.vertices instance.vertices = def.vertices
})
return instance return instance
end end

View File

@@ -1,33 +1,35 @@
local assert = assert
local id = core.get_content_id local id = core.get_content_id
local getInstance = Class.getInstance local getInstance = Class.getInstance
---@class MapGen.StaticLayer ---@class MapGen.StaticLayer
---@field name string ---@field name string
---@field minY number ---@field minY integer
---@field maxY number ---@field maxY integer
---@field staticNode string ---@field staticNode string
---@field staticNodeID number ---@field staticNodeID integer
---@field generateStaticNode fun(self, mapGenerator:MapGen, data:number[], data2:number[], index:number, x:number, y:number, z:number) ---@field generateStaticNode fun(self, mapGenerator:MapGen, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer)
local StaticLayer = {} local StaticLayer = {}
---Definition table for the `MapGen.StaticLayer`. ---Definition table for the `MapGen.StaticLayer`.
--- ---
---**Only for EmmyLua.** ---**Only for EmmyLua.**
---@class MapGen.StaticLayerDef ---@class MapGen.StaticLayerDef
---@field minY number ---@field minY integer
---@field maxY number ---@field maxY integer
---@field staticNode string ---@field staticNode string
---@field generateStaticNode fun(self, mapGenerator:MapGen, data:number[], data2:number[], index:number, x:number, y:number, z:number) ---@field generateStaticNode fun(self, mapGenerator:MapGen, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer)
---@param self MapGen.StaticLayer ---@param self MapGen.StaticLayer
---@param mapGenerator MapGen ---@param mapGenerator MapGen
---@param data number[] ---@param data integer[]
---@param data2 number[] ---@param data2 integer[]
---@param index number ---@param index integer
---@param x number ---@param x integer
---@param y number ---@param y integer
---@param z number ---@param z integer
local defaultGenerateStaticNode = function(self, mapGenerator, data, data2, index, x, y, z) local defaultGenerateStaticNode = function(self, mapGenerator, data, data2, index, x, y, z)
data[index] = self.staticNodeID data[index] = self.staticNodeID
end end
@@ -46,14 +48,13 @@ function StaticLayer:new(name, def)
local staticNodeID = id(def.staticNode) local staticNodeID = id(def.staticNode)
---@type MapGen.StaticLayer ---@type MapGen.StaticLayer
local instance = getInstance(self, { local instance = getInstance(self, {})
name = name, instance.name = name
minY = def.minY, instance.minY = def.minY
maxY = def.maxY, instance.maxY = def.maxY
staticNode = def.staticNode, instance.staticNode = def.staticNode
staticNodeID = staticNodeID, instance.staticNodeID = staticNodeID
generateStaticNode = def.generateStaticNode instance.generateStaticNode = def.generateStaticNode
})
return instance return instance
end end

View File

@@ -1,8 +1,11 @@
local v = vector.new
local mathFloor = math.floor local mathFloor = math.floor
local v = vector.new
local VoxelManip, VoxelArea = VoxelManip, VoxelArea
local corePlaceSchematic, corePlaceSchematicOnVM, coreEmergeArea = core.place_schematic, core.place_schematic_on_vmanip, core.emerge_area local corePlaceSchematic, corePlaceSchematicOnVM, coreEmergeArea = core.place_schematic, core.place_schematic_on_vmanip, core.emerge_area
local CONTENT_IGNORE = core.CONTENT_IGNORE local CONTENT_IGNORE = core.CONTENT_IGNORE
local VoxelManip, VoxelArea = VoxelManip, VoxelArea
local getInstance = Class.getInstance
local Node local Node
@@ -10,8 +13,6 @@ if not Smc.isAsync then
Node = Smc.requireNode() Node = Smc.requireNode()
end end
local getInstance = Class.getInstance
---@class MapGen.Tree ---@class MapGen.Tree
---@field name string ---@field name string
---@field path string ---@field path string
@@ -31,7 +32,7 @@ function Tree:new(name, def)
local intance = getInstance(self, {}) local intance = getInstance(self, {})
intance.name = name intance.name = name
intance.path = def.path intance.path = def.path
intance.placerName = Mod.getInfo().shortName..':'..name..'_placer' intance.placerName = Mod:getInfo().shortName..':'..name..'_placer'
intance:registerPlacer() intance:registerPlacer()
@@ -112,7 +113,7 @@ function Tree:place(pos)
local pos1, pos2 = pos - v(16, 0, 16), pos + v(16, 80, 16) --[[@as MapVector]] local pos1, pos2 = pos - v(16, 0, 16), pos + v(16, 80, 16) --[[@as MapVector]]
if isAreaGenerated(pos1, pos2) then if isAreaGenerated(pos1, pos2) then
corePlaceSchematic(pos, self.path, getRotation(pos), nil, nil, 'place_center_x, place_center_z') corePlaceSchematic(pos, self.path, getRotation(pos), nil, false, 'place_center_x, place_center_z')
else else
coreEmergeArea(pos1, pos2) coreEmergeArea(pos1, pos2)
end end
@@ -121,7 +122,7 @@ end
---@param voxelManip VoxelManip ---@param voxelManip VoxelManip
---@param pos MapVector ---@param pos MapVector
function Tree:placeOnVM(voxelManip, pos) function Tree:placeOnVM(voxelManip, pos)
local result = corePlaceSchematicOnVM(voxelManip, pos, self.path, getRotation(pos), nil, nil, 'place_center_x, place_center_z') local result = corePlaceSchematicOnVM(voxelManip, pos, self.path, getRotation(pos), nil, false, 'place_center_x, place_center_z')
if not result then if not result then
voxelManip:set_node_at(pos, {name = self.placerName, force_place = true}) voxelManip:set_node_at(pos, {name = self.placerName, force_place = true})

View File

@@ -1,10 +1,12 @@
local mathSqrt, mathAbs local assert, tostring = assert, tostring
= math.sqrt, math.abs
local mathSqrt, mathAbs = math.sqrt, math.abs
local v = vector.new
local getInstance = Class.getInstance local getInstance = Class.getInstance
local modInfo = Mod.getInfo('smc__core__map_gen') local require = Mod:getInfo('smc__core__map_gen').require
local require = modInfo.require
---@type MapGen.Edge ---@type MapGen.Edge
local Edge = require('MapGen.Edge') local Edge = require('MapGen.Edge')
@@ -259,7 +261,7 @@ function Triangle:getCircumCenter2D()
( pos2.x * pos2.x + pos2.z * pos2.z) * (pos1.x - pos3.x) + ( pos2.x * pos2.x + pos2.z * pos2.z) * (pos1.x - pos3.x) +
( pos3.x * pos3.x + pos3.z * pos3.z) * (pos2.x - pos1.x)) ( pos3.x * pos3.x + pos3.z * pos3.z) * (pos2.x - pos1.x))
return vector.new(x / D, 0, z / D) return v(x / D, 0, z / D)
end end
---Returns the radius of the circumcircle. ---Returns the radius of the circumcircle.

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__node') local modInfo = Mod:getInfo('smc__core__node')
local require = modInfo.require local require = modInfo.require
return require('Node') return require('Node')

View File

@@ -22,8 +22,8 @@ local function registerSlab(nodeDef)
settings.drawtype = 'nodebox' settings.drawtype = 'nodebox'
settings.paramtype = 'light' settings.paramtype = 'light'
settings.paramtype2 = 'facedir' settings.paramtype2 = 'facedir'
settings.groups['segments'] = nil settings.groups.segments = nil
settings.groups['slabs'] = 1 settings.groups.slabs = 1
if nodeDef.callbacks ~= nil then if nodeDef.callbacks ~= nil then
nodeDef.callbacks.on_place = core.rotate_and_place nodeDef.callbacks.on_place = core.rotate_and_place
else else
@@ -52,8 +52,8 @@ local function registerStair(nodeDef)
settings.drawtype = 'nodebox' settings.drawtype = 'nodebox'
settings.paramtype = 'light' settings.paramtype = 'light'
settings.paramtype2 = 'facedir' settings.paramtype2 = 'facedir'
settings.groups['segments'] = nil settings.groups.segments = nil
settings.groups['slabs'] = 1 settings.groups.stairs = 1
if nodeDef.callbacks ~= nil then if nodeDef.callbacks ~= nil then
nodeDef.callbacks.on_place = core.rotate_and_place nodeDef.callbacks.on_place = core.rotate_and_place
else else
@@ -72,10 +72,12 @@ function Node:new(nodeDef)
local settings = nodeDef.settings local settings = nodeDef.settings
settings._type = 'node' settings._type = 'node'
local instance = Item:new(nodeDef) --[[@as Node]]
-- Registration of segmented blocks. -- Registration of segmented blocks.
-- If you specify a specific group with a specific index for a node, -- If you specify a specific group with a specific index for a node,
-- the slabs and stairs will be registered automatically. -- the slabs and stairs will be registered automatically.
local segmentsIndex = settings.groups and settings.groups['segments'] local segmentsIndex = settings.groups and settings.groups.segments
if segmentsIndex == 1 then if segmentsIndex == 1 then
-- Only slabs -- Only slabs
registerSlab(nodeDef) registerSlab(nodeDef)
@@ -88,8 +90,6 @@ function Node:new(nodeDef)
registerStair(nodeDef) registerStair(nodeDef)
end end
local instance = Item:new(nodeDef) --[[@as Node]]
return instance return instance
end end

View File

@@ -1,4 +1,4 @@
---@meta ---@meta
---@class Node.Settings : Item.Settings, NodeDefinition.Settings ---@class Node.Settings : NodeDefinition.Settings, Item.Settings
local Settings = {} local Settings = {}

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__plant') local modInfo = Mod:getInfo('smc__core__plant')
local require = modInfo.require local require = modInfo.require
return require('Plant') return require('Plant')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__player') local modInfo = Mod:getInfo('smc__core__player')
local require = modInfo.require local require = modInfo.require
return require('Player') return require('Player')

View File

@@ -2,7 +2,7 @@
local Player = {} local Player = {}
---@type PlayerInventoryUI ---@type PlayerInventoryUI
local PlayerInventoryUI = Mod.getInfo('smc__ui__player_inventory').require('PlayerInventoryUI') local PlayerInventoryUI = Mod:getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
core.register_on_joinplayer(function(player) core.register_on_joinplayer(function(player)
player:set_inventory_formspec(PlayerInventoryUI:getFormSpecString(player:get_player_name())) player:set_inventory_formspec(PlayerInventoryUI:getFormSpecString(player:get_player_name()))
@@ -29,7 +29,7 @@ core.register_chatcommand('show_inv',
} }
) )
local require = Mod.getInfo('smc__core__player').require local require = Mod:getInfo('smc__core__player').require
require('Player.inventory') require('Player.inventory')

View File

@@ -0,0 +1,19 @@
---@meta
---@alias PlayerMetaRef.IntKey
---| 'progression_system.player_age'
---@alias PlayerMetaRef.FloatKey string
---@alias PlayerMetaRef.StringKey string
---| 'progression_system.player_milestones'
-- Overriding PlayerMetaRef for annotations and metadata field hints.
---@class PlayerMetaRef : MetaDataRef
---@field get_int fun(self, key:PlayerMetaRef.IntKey):integer
---@field set_int fun(self, key:PlayerMetaRef.IntKey, value:integer)
---@field get_float fun(self, key:PlayerMetaRef.FloatKey, string):number
---@field set_float fun(self, key:PlayerMetaRef.FloatKey, string, value:number)
---@field get_string fun(self, key:PlayerMetaRef.StringKey):string
---@field set_string fun(self, key:PlayerMetaRef.StringKey, value:string)

View File

@@ -1,6 +1,2 @@
---@type PlayerInventoryUI ---@type PlayerInventoryUI
local PlayerInventoryUI = Mod.getInfo('smc__ui__player_inventory').require('PlayerInventoryUI') local PlayerInventoryUI = Mod:getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
-- TODO: перенести обработки в PlayerUI

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__processing_container_station') local modInfo = Mod:getInfo('smc__core__processing_container_station')
local require = modInfo.require local require = modInfo.require
return require('ProcessingContainerStation') return require('ProcessingContainerStation')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__processing_fuel_station') local modInfo = Mod:getInfo('smc__core__processing_fuel_station')
local require = modInfo.require local require = modInfo.require
return require('ProcessingFuelStation') return require('ProcessingFuelStation')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__processing_station') local modInfo = Mod:getInfo('smc__core__processing_station')
local require = modInfo.require local require = modInfo.require
return require('ProcessingStation') return require('ProcessingStation')

View File

@@ -0,0 +1,4 @@
local modInfo = Mod:getInfo('smc__core__progression_system')
local require = modInfo.require
return require('ProgressionSystem')

View File

@@ -0,0 +1,2 @@
name = smc__core__progression_system
depends = smc__system__system_loader

View File

@@ -0,0 +1,122 @@
local assert = assert
local require = Mod:getInfo('smc__core__progression_system').require
---@type ProgressionSystem.Age
local Age = require('ProgressionSystem.Age')
---@type ProgressionSystem.Milestone
local Milestone = require('ProgressionSystem.Milestone')
---The zeroth century, from which progression begins.
---
---It is not registered through the usual mechanism,
---but is integrated directly into the progression system.
local zeroAge = Age:new('zero', {})
zeroAge.id = 0
---@class ProgressionSystem
---@field agesByName table<ProgressionSystem.Age.Name, ProgressionSystem.Age>
---@field agesByID table<integer, ProgressionSystem.Age>
---
---The age ID currently reached by players in global progression.
---@field serverAge integer
local ProgressionSystem = {
agesByName = { ['zero'] = zeroAge, },
agesByID = { [0] = zeroAge },
serverAge = 10, -- DEBUG
}
---@param ageName ProgressionSystem.Age.Name
---@param def ProgressionSystem.AgeDef
function ProgressionSystem:registerAge(ageName, def)
assert(self.agesByName[ageName] == nil)
local age = Age:new(ageName, def)
self.agesByName[ageName] = age
age.id = #self.agesByID + 1
self.agesByID[age.id] = age
end
---@param ageName ProgressionSystem.Age.Name
---@return ProgressionSystem.Age
function ProgressionSystem:getAgeByName(ageName)
assert(self.agesByName[ageName] ~= nil)
return self.agesByName[ageName]
end
---@param id integer
---@return ProgressionSystem.Age
function ProgressionSystem:getAgeByID(id)
assert(self.agesByID[id] ~= nil)
return self.agesByID[id]
end
---@param ageName ProgressionSystem.Age.Name
---@param milestoneName string
---@param def ProgressionSystem.MilestoneDef
function ProgressionSystem:registerMilestone(ageName, milestoneName, def)
local age = self:getAgeByName(ageName)
local milestone = Milestone:new(milestoneName, def)
age:addMilestone(milestoneName, milestone)
end
---@param ageName ProgressionSystem.Age.Name
---@param milestoneName string
---@return ProgressionSystem.Milestone
function ProgressionSystem:getMilestoneByName(ageName, milestoneName)
local age = self:getAgeByName(ageName)
return age:getMilestoneByName(milestoneName)
end
---@param ageID integer
function ProgressionSystem:setServerAge(ageID)
assert(ageID <= #self.agesByID)
self.serverAge = ageID
end
---@return integer
function ProgressionSystem:getServerAge()
return self.serverAge
end
---@param playerMeta PlayerMetaRef
---@return integer
function ProgressionSystem:getPlayerAge(playerMeta)
return playerMeta:get_int('progression_system.player_age')
end
---@param playerMeta PlayerMetaRef
---@param ageID integer
function ProgressionSystem:setPlayerAge(playerMeta, ageID)
assert(ageID <= ProgressionSystem.serverAge, 'The players progress age cannot exceed the servers progress age.')
playerMeta:set_int('progression_system.player_age', ageID)
end
---The table of progression milestones, which is stored in the player's metadata.
---
---Milestones are divided into their Ages and are listed by name.
---@alias ProgressionSystem.PlayerMilestones table<integer, table<string, ProgressionSystem.Milestone>>
---@param playerMeta PlayerMetaRef
---@return ProgressionSystem.PlayerMilestones
function ProgressionSystem:getPlayerMilestones(playerMeta)
local milestones = core.deserialize(playerMeta:get_string('progression_system.player_milestones')) or {}
return milestones
end
---@param playerMeta PlayerMetaRef
---@param milestones ProgressionSystem.PlayerMilestones
function ProgressionSystem:setPlayerMilestones(playerMeta, milestones)
playerMeta:set_string('progression_system.player_milestones', core.serialize(milestones))
end
return ProgressionSystem

View File

@@ -0,0 +1,47 @@
local assert = assert
local tableInsert = table.insert
---@alias ProgressionSystem.Age.Name
---| 'zero'
---@class ProgressionSystem.Age : Class
---@field name ProgressionSystem.Age.Name
---@field id integer
---
---@field milestonesByName ProgressionSystem.Milestone[]
---@field milestonesList ProgressionSystem.Milestone[]
local Age = Class:extend({
milestonesByName = {},
milestonesList = {},
})
---@class ProgressionSystem.AgeDef
---@param name ProgressionSystem.Age.Name
---@param def ProgressionSystem.AgeDef
function Age:new(name, def)
local instance = self:getInstance({})
instance.name = name
return instance
end
---@param milestoneName string
---@param milestone ProgressionSystem.Milestone
function Age:addMilestone(milestoneName, milestone)
assert(self.milestonesByName[milestoneName] == nil)
self.milestonesByName[milestoneName] = milestone
tableInsert(self.milestonesList, milestone)
end
---@param milestoneName string
---@return ProgressionSystem.Milestone
function Age:getMilestoneByName(milestoneName)
assert(self.milestonesByName[milestoneName] ~= nil)
return self.milestonesByName[milestoneName]
end
return Age

View File

@@ -0,0 +1,16 @@
---@class ProgressionSystem.Milestone : Class
---@field name string
local Milestone = Class:extend()
---@class ProgressionSystem.MilestoneDef
---@param name string
---@param def ProgressionSystem.MilestoneDef
function Milestone:new(name, def)
local instance = self:getInstance({})
instance.name = name
return instance
end
return Milestone

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__sound') local modInfo = Mod:getInfo('smc__core__sound')
local require = modInfo.require local require = modInfo.require
return require('Sound') return require('Sound')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__tilesheet') local modInfo = Mod:getInfo('smc__core__tilesheet')
local require = modInfo.require local require = modInfo.require
return require('TileSheet') return require('TileSheet')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__tool') local modInfo = Mod:getInfo('smc__core__tool')
local require = modInfo.require local require = modInfo.require
return require('Tool') return require('Tool')

View File

@@ -3,7 +3,7 @@
--core.set_mapgen_setting('chunksize', '{x=2,y=10,z=2}', true) --core.set_mapgen_setting('chunksize', '{x=2,y=10,z=2}', true)
local mapGeneneratorRequire = Mod.getInfo('smc__core__map_generator').require local mapGeneneratorRequire = Mod:getInfo('smc__core__map_generator').require
-- Main env init -- Main env init
local mapGenerator = mapGeneneratorRequire('mapGenerator') local mapGenerator = mapGeneneratorRequire('mapGenerator')

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -1,2 +1,2 @@
name = smc__core__map_generator name = smc__core__map_generator
depends = smc__core__map_gen, smc__game__items__rocks, smc__game__items__liquids depends = smc__core__map_gen, smc__game__items__rocks, smc__game__items__liquids, smc__game__items__soils, smc__game__items__clays, smc__game__items__sands, smc__game__items__plants

View File

@@ -5,12 +5,16 @@
-- so global tables need to be preloaded manually. -- so global tables need to be preloaded manually.
-- --- Global APIs load -- -- --- Global APIs load --
-- Class
dofile(core.get_modpath('smc__system__class')..'/init.lua')
-- Ensure -- Ensure
dofile(core.get_modpath('smc__system__ensure')..'/init.lua') dofile(core.get_modpath('smc__system__ensure')..'/init.lua')
-- Table
dofile(core.get_modpath('smc__system__table')..'/init.lua')
-- Class
dofile(core.get_modpath('smc__system__class')..'/init.lua')
-- Logger -- Logger
dofile(core.get_modpath('smc__system__logger')..'/init.lua') dofile(core.get_modpath('smc__system__logger')..'/init.lua')
@@ -34,9 +38,6 @@ dofile(core.get_modpath('smc__system__mod')..'/init.lua')
-- String -- String
-- dofile(core.get_modpath('smc__system__string')..'/init.lua') -- dofile(core.get_modpath('smc__system__string')..'/init.lua')
-- Table
dofile(core.get_modpath('smc__system__table')..'/init.lua')
-- TODO: пока что закоментировано, поскольку вызывает ошибку из-за global_step -- TODO: пока что закоментировано, поскольку вызывает ошибку из-за global_step
-- Smc lib loader -- Smc lib loader
-- dofile(core.get_modpath('smc__system__helper_lib')..'/init.lua') -- dofile(core.get_modpath('smc__system__helper_lib')..'/init.lua')

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -0,0 +1,47 @@
local Item, Node, TileSheet = Smc.requireItem(), Smc.requireNode(), Smc.requireTileSheet()
local CraftSystem = Smc.requireCraftSystem()
-- local InventoryCraftHandler = CraftSystem:getPrimitiveCraftHandler('inside_player_inventory')
---@type TileSheet
local clayTileSheet = TileSheet:new('clays_sheet.png', 16, 16)
---@param type string
---@param y integer
local function registerSand(type, y)
Node:new({
settings = {
name = type..'_clay_block',
groups = { clay_block = 1, dig_immediate = 2 },
tiles = { clayTileSheet:t(0, y)}
}
})
Item:new({
settings = {
name = type..'_clay',
inventory_image = clayTileSheet:t(1, y),
groups = { clay = 1 }
}
})
Node:new({
settings = {
name = type..'_clay_bricks',
tiles = { clayTileSheet:t(2, y)},
groups = { clay_bricks = 1, dig_immediate = 2 }
}
})
Item:new({
settings = {
name = type..'_clay_brick',
inventory_image = clayTileSheet:t(3, y),
groups = { clay_brick = 1 }
}
})
end
registerSand('red', 0)
registerSand('white', 1)
registerSand('fireproof', 2)

View File

@@ -0,0 +1,2 @@
name = smc__game__items__clays
depends = smc__core__node, smc__core__tilesheet

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -0,0 +1,67 @@
local Item, Node, TileSheet = Smc.requireItem(), Smc.requireNode(), Smc.requireTileSheet()
local CraftSystem = Smc.requireCraftSystem()
-- local InventoryCraftHandler = CraftSystem:getPrimitiveCraftHandler('inside_player_inventory')
---@type TileSheet
local oreTileSheet = TileSheet:new('ores_sheet.png', 16, 16)
---@class OreDef
---@field rarity Item.Rarity?
---@param name string
---@param y integer
---@param def OreDef?
local function registerOre(name, y, def)
if def == nil then
def = {}
end
Item:new({
settings = {
name = name,
rarity = def.rarity,
inventory_image = oreTileSheet:t(0, y),
groups = { ore = 1 }
}
})
end
-- Ores Items --
-- Slag
registerOre('slag', 0, {})
-- Copper ores
registerOre('chalcopyrite', 1, {})
registerOre('malachite', 2, {})
registerOre('cuprite', 3, {})
registerOre('native_copper', 4, {})
-- Tin ores
registerOre('cassiterite', 5, {})
registerOre('stannite', 6, {})
-- Iron oresLimonite
registerOre('limonite', 7, {})
registerOre('hematite', 8, {})
registerOre('magnetite', 9, {})
registerOre('meteoric_iron', 10, {})
-- Ores blocks --
-- Slag
Node:new({
settings = {
name = 'slag_block',
tiles = { oreTileSheet:t(1, 0) },
groups = { ore = 1, dig_immediate = 2 }
}
})
-- Malachite
Node:new({
settings = {
name = 'malachite_block',
tiles = { oreTileSheet:t(1, 2) },
groups = { ore = 1, dig_immediate = 2 }
}
})

View File

@@ -0,0 +1,2 @@
name = smc__game__items__ores
depends = smc__core__node, smc__core__tilesheet

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

@@ -1,16 +1,40 @@
local Plant, TileSheet = Smc.requirePlant(), Smc.requireTileSheet() local Plant, TileSheet = Smc.requirePlant(), Smc.requireTileSheet()
Plant:new({ local placeParam2 = {
settings = { 2,
name = 'plants', 3,
tiles = { "test_plant.png" }, 4,
place_param2 = 3, 34,
}, 35,
}) 36
}
local function afterPlaceNode(pos, placer, itemstack, pointed_thing)
local node = core.get_node(pos)
node.param2 = 8 + placeParam2[math.random(#placeParam2)]
core.set_node(pos, node)
end
-- --- Bog plants ---
local BogPlantsTileSheet = TileSheet:new('plants_bog_sheet.png', 16, 16)
for i=1, 3 do
Plant:new({
settings = {
name = 'bog_grass_'..tostring(i),
tiles = { BogPlantsTileSheet:t(i-1, 0) },
place_param2 = 8,
},
callbacks = {
after_place_node = afterPlaceNode,
}
})
end
-- DEBUG
local PlantsTileSheet = TileSheet:new('plants_test_sheet.png', 16, 16) local PlantsTileSheet = TileSheet:new('plants_test_sheet.png', 16, 16)
for i=0, 3 do for i=0, 3 do
Plant:new({ Plant:new({
settings = { settings = {
@@ -53,6 +77,3 @@ Plant:new({
place_param2 = 3, place_param2 = 3,
} }
}) })

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -4,7 +4,7 @@ local CraftSystem = Smc.requireCraftSystem()
local InventoryCraftHandler = CraftSystem:getPrimitiveCraftHandler('inside_player_inventory') local InventoryCraftHandler = CraftSystem:getPrimitiveCraftHandler('inside_player_inventory')
---@type TileSheet ---@type TileSheet
local rocksTileSheet = TileSheet:new("rocks_sheet.png", 16, 16) local rocksTileSheet = TileSheet:new('rocks_sheet.png', 16, 16)
---@class RockDef ---@class RockDef
---@field rarity Item.Rarity? ---@field rarity Item.Rarity?
@@ -24,7 +24,7 @@ local function registerSegmentsCrafts(name, craftGroup)
end end
---@param name string ---@param name string
---@param y number ---@param y integer
---@param def RockDef? ---@param def RockDef?
---@param staff {block:boolean?,bricks:boolean?,pillar:boolean?} ---@param staff {block:boolean?,bricks:boolean?,pillar:boolean?}
local function registerRock(name, y, def, staff) local function registerRock(name, y, def, staff)
@@ -32,7 +32,7 @@ local function registerRock(name, y, def, staff)
def = {} def = {}
end end
local modPrefix = Mod.getInfo().shortName..':' local modPrefix = Mod:getInfo().shortName..':'
local craftGroup = 'rocks_'..name..'_staff' local craftGroup = 'rocks_'..name..'_staff'
-- Default rock -- Default rock
@@ -150,6 +150,7 @@ local function registerRock(name, y, def, staff)
end end
end end
--[[
-- Sylite group -- Sylite group
registerRock('sylite', 0, {}, {block = true, bricks = true, pillar = true}) registerRock('sylite', 0, {}, {block = true, bricks = true, pillar = true})
registerRock('sylite_gray', 1, {}, {block = true, bricks = true, pillar = true}) registerRock('sylite_gray', 1, {}, {block = true, bricks = true, pillar = true})
@@ -165,11 +166,10 @@ registerRock('falmyte_light', 6, {}, {block = true, bricks = true})
registerRock('falmyte_yellow', 7, {}, {block = true, bricks = true}) registerRock('falmyte_yellow', 7, {}, {block = true, bricks = true})
registerRock('falmyte_red', 8, {}, {block = true, bricks = true}) registerRock('falmyte_red', 8, {}, {block = true, bricks = true})
registerRock('falmyte_dark', 9, {}, {block = true, bricks = true}) registerRock('falmyte_dark', 9, {}, {block = true, bricks = true})
--]]
registerRock('basalt', 0, {}, {block = true, bricks = true})
registerRock('granite_red', 1, {}, {block = true, bricks = true})
registerRock('limestone', 2, {}, {block = true, bricks = true})
registerRock('dolomit', 3, {}, {block = true, bricks = true})
-- TODO:
-- iyellite
-- falmyte
-- hapcoryte
-- burcite
-- felhor
-- malachite

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@@ -0,0 +1,46 @@
local Item, Node, TileSheet = Smc.requireItem(), Smc.requireNode(), Smc.requireTileSheet()
local CraftSystem = Smc.requireCraftSystem()
-- local InventoryCraftHandler = CraftSystem:getPrimitiveCraftHandler('inside_player_inventory')
---@type TileSheet
local sandTileSheet = TileSheet:new('sands_sheet.png', 16, 16)
---@param type string
---@param y integer
local function registerSand(type, y)
local defaultSandNode = Node:getExtended({
settings = {
name = '',
groups = { dig_immediate = 2 }
}
})
defaultSandNode:new({
settings = {
name = type..'_sand',
tiles = { sandTileSheet:t(0, y) },
groups = { sand = 1 }
}
})
defaultSandNode:new({
settings = {
name = type..'_sandstone',
tiles = { sandTileSheet:t(1, y) },
groups = { sandstone = 1 }
}
})
defaultSandNode:new({
settings = {
name = type..'_sandstone_chipped',
tiles = { sandTileSheet:t(2, y) },
groups = { sandstone = 1 }
}
})
end
registerSand('yellow', 0)
registerSand('red', 1)
registerSand('black', 2)

View File

@@ -0,0 +1,2 @@
name = smc__game__items__sands
depends = smc__core__node, smc__core__tilesheet

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -1,7 +1,9 @@
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet() local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
---@type TileSheet ---@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 ---@class SoilDef
---@field rarity Item.Rarity? ---@field rarity Item.Rarity?
@@ -28,7 +30,10 @@ local function registerSoil(name, x, def, turfs)
defaultSoil:new({ defaultSoil:new({
settings = { settings = {
name = name, name = name,
tiles = {soilTexture} tiles = { soilTexture },
paramtype2 ='color4dir',
palette = 'soils_grass_palette.png',
drop = 'soils:'..name,
}, },
}) })
@@ -56,240 +61,35 @@ local function registerSoil(name, x, def, turfs)
}) })
if turfs ~= nil then if turfs ~= nil then
for turfName, turfX in pairs(turfs) do for turfName, turfY in pairs(turfs) do
defaultSoil:new({ defaultSoil:new({
settings = { settings = {
name = turfName, name = turfName,
tiles = { tiles = {
soilTileSheet:t(turfX,2), grassTileSheet:t(0, turfY),
soilTexture, {name = soilTexture, color = 'white'},
soilTexture..'^'..soilTileSheet:t(turfX,3)
}, },
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 end
end end
--[[ registerSoil('mud', 0, {maxFertility = 20, rarity = 'common'}, {
local clayTiles = { turf_bog = 0,
ts:t(0,0) })
}
local sandyTiles = { registerSoil('chernozem', 1, {maxFertility = 100, rarity = 'uncommon'}, {
ts:t(2,0) turf_meadow = 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,
},
},
})--]]
---@type TileSheet
local tsT = TileSheet:new("soils_turfs_sheet.png", 16, 16)
registerSoil('humus', 0, {maxFertility = 100, rarity = 'uncommon'}, {turf_meadow=0})

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -83,6 +83,7 @@ local function registerWood(name, x, def)
def = {} def = {}
end end
-- Tree log with cut annual rings
defaultLog:new({ defaultLog:new({
settings = { settings = {
name = name..'_log', name = name..'_log',
@@ -96,6 +97,7 @@ local function registerWood(name, x, def)
} }
}) })
-- Stripped Log
defaultLog:new({ defaultLog:new({
settings = { settings = {
name = name..'_log_stripped', name = name..'_log_stripped',
@@ -108,25 +110,11 @@ local function registerWood(name, x, def)
} }
}) })
-- Tree trunk completely covered in bark
defaultLog:new({ defaultLog:new({
settings = { settings = {
name = name..'_timber', name = name..'_trunk',
tiles = {
woodTileSheet:t(x, 8)..'^[transformR90', woodTileSheet:t(x, 8)..'^[transformR90',
woodTileSheet:t(x, 8), woodTileSheet:t(x, 8),
woodTileSheet:t(x, 7), woodTileSheet:t(x, 7)
},
paramtype2 = 'facedir',
_rarity = def.rarity,
groups = {segments = 1}
},
})
defaultLog:new({
settings = {
name = name..'_trunk_6_sides',
tiles = {woodTileSheet:t(x, 3)}, tiles = {woodTileSheet:t(x, 3)},
inventory_overlay = 'wood_trunk_overlay.png',
drop = 'wood:'..name..'_log', drop = 'wood:'..name..'_log',
paramtype2 = 'facedir', paramtype2 = 'facedir',
_rarity = def.rarity, _rarity = def.rarity,
@@ -136,24 +124,13 @@ local function registerWood(name, x, def)
} }
}) })
-- --- Tree branches ---
-- Branch completely covered in bark
defaultLog:new({ defaultLog:new({
settings = {
name = name..'_trunk_4_sides',
tiles = getLogTiles(x, 2),
inventory_overlay = 'wood_trunk_overlay.png',
drop = 'wood:'..name..'_log',
paramtype2 = 'facedir',
_rarity = def.rarity,
},
callbacks = {
on_place = core.rotate_node
}
})
local defaultBranch6Sides = defaultLog:getExtended({
settings = { settings = {
drawtype = 'nodebox', drawtype = 'nodebox',
name = '', name = name..'_log_branch_6_sides',
tiles = {woodTileSheet:t(x, 3)}, tiles = {woodTileSheet:t(x, 3)},
paramtype = 'light', paramtype = 'light',
node_box = { node_box = {
@@ -171,24 +148,11 @@ local function registerWood(name, x, def)
}, },
}) })
local node = defaultBranch6Sides:new({ -- Branch with cut annual rings
settings = { defaultLog:new({
name = name..'_log_branch_6_sides',
}
})
defaultBranch6Sides:new({
settings = {
name = name..'_trunk_branch_6_sides',
inventory_overlay = 'wood_trunk_overlay.png',
drop = name..'_log_branch_6_sides',
}
})
local defaultBranch4Sides = defaultLog:getExtended({
settings = { settings = {
drawtype = 'nodebox', drawtype = 'nodebox',
name = '', name = name..'_log_branch_4_sides',
tiles = getLogTiles(x, 2), tiles = getLogTiles(x, 2),
drop = 'wood:'..name..'_log', drop = 'wood:'..name..'_log',
paramtype = 'light', paramtype = 'light',
@@ -203,20 +167,43 @@ local function registerWood(name, x, def)
}, },
}) })
defaultBranch4Sides:new({ -- Tree leafs
defaultLeafs:new({
settings = { settings = {
name = name..'_log_branch_4_sides', name = name..'_leafs',
} tiles = { woodTileSheet:t(x, 1) },
}) _rarity = def.rarity,
},
defaultBranch4Sides:new({ })
settings = {
name = name..'_trunk_branch_4_sides',
inventory_overlay = 'wood_trunk_overlay.png', -- --- Tree lumber ---
drop = name..'_log_branch_4_sides',
-- Timber (block)
defaultLog:new({
settings = {
name = name..'_timber',
tiles = {
woodTileSheet:t(x, 8)..'^[transformR90',
woodTileSheet:t(x, 8)..'^[transformR90',
woodTileSheet:t(x, 8), woodTileSheet:t(x, 8),
woodTileSheet:t(x, 7), woodTileSheet:t(x, 7)
},
paramtype2 = 'facedir',
_rarity = def.rarity,
groups = {segments = 1}
},
})
-- Bar (item)
defaultStick:new({
settings = {
name = name..'_bar',
inventory_image = woodTileSheet:t(x, 11)
} }
}) })
-- Planks (block)
defaultPlanks:new({ defaultPlanks:new({
settings = { settings = {
name = name..'_planks', name = name..'_planks',
@@ -226,21 +213,7 @@ local function registerWood(name, x, def)
}, },
}) })
defaultLeafs:new({ -- Plank (item)
settings = {
name = name..'_leafs',
tiles = { woodTileSheet:t(x, 1) },
_rarity = def.rarity,
},
})
defaultStick:new({
settings = {
name = name..'_stick',
inventory_image = woodTileSheet:t(x, 9)
}
})
defaultStick:new({ defaultStick:new({
settings = { settings = {
name = name..'_plank', name = name..'_plank',
@@ -248,13 +221,15 @@ local function registerWood(name, x, def)
} }
}) })
defaultStick:new({ -- Stick
defaultStick:new({
settings = { settings = {
name = name..'_bar', name = name..'_stick',
inventory_image = woodTileSheet:t(x, 11) inventory_image = woodTileSheet:t(x, 9)
} }
}) })
-- --- Crafts ---
InventoryCraftHandler:registerCraft('wood:'..name..'_planks', { InventoryCraftHandler:registerCraft('wood:'..name..'_planks', {
recipe = { recipe = {
'wood:'..name..'_log' 'wood:'..name..'_log'
@@ -271,6 +246,14 @@ local function registerWood(name, x, def)
group = 'wood:logs_stripped', group = 'wood:logs_stripped',
}) })
InventoryCraftHandler:registerCraft('wood:'..name..'_log_stripped_2', {
recipe = {
'wood:'..name..'_log 2'
},
output = 'wood:'..name..'_log_stripped 2',
group = 'wood:logs_stripped',
})
InventoryCraftHandler:registerCraft('wood:'..name..'_bar', { InventoryCraftHandler:registerCraft('wood:'..name..'_bar', {
recipe = { recipe = {
'wood:'..name..'_log' 'wood:'..name..'_log'
@@ -291,10 +274,6 @@ local function registerWood(name, x, def)
recipe = { recipe = {
'wood:'..name..'_bar' 'wood:'..name..'_bar'
}, },
altRecipes = {
{ 'wood:'..name..'_plank 2' },
{ 'wood:'..name..'_log'}
},
output = 'wood:'..name..'_stick 4', output = 'wood:'..name..'_stick 4',
group = 'wood:sticks', group = 'wood:sticks',
}) })

View File

@@ -1,54 +1,44 @@
local modInfo = Mod.getInfo('smc__core__formspec') local modInfo = Mod:getInfo('smc__core__formspec')
local require = modInfo.require local require = modInfo.require
---@type AdminListUI ---@type PlayerInventoryUI
local AdminListUI = Mod.getInfo('smc__ui__admin_list').require('AdminListUI') local PlayerInventoryUI = Mod:getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
core.register_chatcommand('list', { core.register_chatcommand('list', {
privs = {server = true}, privs = {give = true},
func = function(name, param) func = function(name, param)
local player = core.get_player_by_name(name) PlayerInventoryUI:setContex(name, 'left_tab_name', 'admin_list_tab')
PlayerInventoryUI:showForm(name)
AdminListUI:showForm(name)
return true, '' return true, ''
end end
}) })
AdminListUI:registerOnFormFieldActionMatch('%S+::item_button',function(player, fieldName, fieldValue) core.register_chatcommand('set_param2', {
---@type ItemStackString? privs = {server = true},
local stack = string.match(fieldName, '(%S+)::item_button')
if stack == nil then func = function(name, param)
return local player = core.get_player_by_name(name)
if player == nil then
return
end
local pos = player:get_pos() - vector.new(0, 0.5, 0)
pos = pos:round()
local node = core.get_node(pos)
node.param2 = param
core.set_node(pos, node)
return true, ''
end end
})
local playerName = player:get_player_name()
AdminListUI:setContex(playerName, 'select_item', stack)
AdminListUI:showForm(playerName)
end)
AdminListUI:registerOnFormFieldAction('admin_commands:list_add_item', function(player, fieldName, fieldValue)
---@type InvRef
local inv = player:get_inventory()
local playerName = player:get_player_name()
local stack = AdminListUI:getContex(playerName, 'select_item')
stack = ItemStack(stack)
stack:set_count(fieldValue)
if inv:room_for_item('main', stack) then
inv:add_item('main', stack)
end
end)
core.register_on_joinplayer(function(player, last_login) core.register_on_joinplayer(function(player, last_login)
player:set_sky({ player:set_sky({
sky_color = { sky_color = {
day_sky = '#FCF0ED', day_sky = '#b5e8ff',
day_horizon = '#F1D4C3', day_horizon = '#80bbe2',
}, },
type = 'regular', type = 'regular',
}) })
@@ -99,11 +89,11 @@ core.register_chatcommand('get_missing_locale', {
local langCodes = params.lang_codes local langCodes = params.lang_codes
if shortModName ~= nil and type(shortModName) ~= 'string' then if shortModName ~= nil and type(shortModName) ~= 'string' then
return false return false, 'Incorrect mod name'
end end
if langCodes ~= nil and type(langCodes) ~= 'table' then if langCodes ~= nil and type(langCodes) ~= 'table' then
return false return false, 'Incorrect lang code'
end end
local items local items
@@ -130,3 +120,60 @@ core.register_chatcommand('get_missing_locale', {
return true, '' return true, ''
end end
}) })
core.register_chatcommand('create_locale', {
privs = { server = true },
description = '<short_mod_name> <lang_code>',
func = function(name, params)
local shortModName, langCode = string.match(params, '(%S+) (%S+)')
if shortModName == nil or shortModName == '' then
return false, 'Incorrect mod name!'
end
if langCode == nil or langCode == '' or not table.contains(LANG_CODES, langCode)then
return false, 'Incorrect lang code!'
end
local items = Smc.getRegisteredItemsListByMod(shortModName)
if items == nil then
return false, 'There are no items registered for this mod (or the entire game)'
end
local filePath = core.get_worldpath()..('/%s.%s.tr'):format(shortModName, langCode)
local file, err = io.open(filePath, 'w')
if not file then
return false, 'Cannot open file: '..err
end
file:write('# textdomain: '..shortModName..'\n\n')
for _, item in ipairs(items) do
local itemSettings = item.itemDef.settings
local name = string.match(itemSettings.name, ('%S+:(%S+)'))
local title = core.strip_colors(core.get_translated_string(langCode, itemSettings._title))
local desc = core.strip_colors(core.get_translated_string(langCode, itemSettings._description))
if title ~= name..'-title' then
title = '[locale already exists]'
else
title = ''
end
if desc ~= name..'-desc' then
desc = '[locale already exists]'
else
desc = ''
end
file:write(('%s-title=%s\n%s-desc=%s\n'):format(name, title, name, desc))
end
file:write('\n')
file:close()
return true, 'File created: '..filePath
end
})

View File

@@ -1,2 +1,2 @@
name = smc__game__admin_commands name = smc__game__admin_commands
depends = smc__system__system_loader, smc__ui__admin_list depends = smc__system__system_loader, smc__ui__player_inventory

View File

@@ -1,4 +1,4 @@
local setMetaTable, tableCopy = setmetatable, table.copy_with_metatables local tableMerge, setmetatable, tableCopy = table.merge, setmetatable, table.copy_with_metatables
---@class Class ---@class Class
Class = {} Class = {}
@@ -7,7 +7,7 @@ Class = {}
---@param parent table ---@param parent table
---@param child table? ---@param child table?
function Class.extend(parent, child) function Class.extend(parent, child)
return setMetaTable(child or {}, { __index = tableCopy(parent) }) return tableMerge(child or {}, tableCopy(parent))
end end
---Intended for class constructors. ---Intended for class constructors.
@@ -16,7 +16,8 @@ end
---@generic T:table ---@generic T:table
---@param self T Parent class. ---@param self T Parent class.
---@param params table Child object parameters. ---@param params table Child object parameters.
---@param metatable table? The table that will become the metatable for the object. Note: The `__index` field will be overwritten by a copy of `self`. ---@param metatable table? The table that will become the metatable for the object.
--- Note: The `__index` field will be overwritten by a copy of `self`.
---@return T ---@return T
function Class.getInstance(self, params, metatable) function Class.getInstance(self, params, metatable)
if metatable == nil then if metatable == nil then
@@ -25,7 +26,7 @@ function Class.getInstance(self, params, metatable)
metatable.__index = tableCopy(self) metatable.__index = tableCopy(self)
local instance = setMetaTable(params, metatable) local instance = setmetatable(params, metatable)
return instance return instance
end end

View File

@@ -1 +1,2 @@
name = smc__system__class name = smc__system__class
depends = smc__system__table

Some files were not shown because too many files have changed in this diff Show More