3 Commits

Author SHA1 Message Date
cfa75bd8f3 test 1.6 2026-01-25 12:46:24 +03:00
b08f808167 test 1.5 2026-01-25 12:29:18 +03:00
eb69779b0d Test1: setting up the tahrion map (turns out the mapgen is really f-ing slow (no shi-)) 2026-01-25 13:41:53 +07:00
47 changed files with 599 additions and 989 deletions

View File

@@ -1,5 +1,5 @@
name: PR-template name: Сообщение об ошибке
about: PR-template about: Сообщить о недоработке игры, которую необходимо исправить.
labels: labels:
- pr/wait review - pr/wait review
- review/need a maintainer - review/need a maintainer
@@ -23,12 +23,12 @@ body:
attributes: attributes:
label: Требования label: Требования
options: options:
- label: Я запускал игру и убедился в том, что она работает.
required: true
- label: Я ознакомлен с соглашением по разработке и мои изменения следуют принятым стандартам. - label: Я ознакомлен с соглашением по разработке и мои изменения следуют принятым стандартам.
required: true required: true
- label: Я запускал игру и убедился в том, что она работает.
required: false
- label: Я указал в описании запроса метки (label) с префиксом `Edit:` в соответствии с теми изменениями, которые сделал. - label: Я указал в описании запроса метки (label) с префиксом `Edit:` в соответствии с теми изменениями, которые сделал.
required: false required: true
- type: markdown - type: markdown
attributes: attributes:
value: | value: |

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,28 +1,117 @@
local HASH_SPLITTER = '&'
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 ---@alias CraftSystem.shapelessCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ShapelessCraft[]>>
local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler') ---@alias CraftSystem.processualCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ProcessualCraft[]>>
---@type CraftSystem.ImmersiveCraftHandler
local ImmersiveCraftHandler= require('CraftSystem.ImmersiveCraftHandler')
---@alias CraftSystem.CraftGroup string
---@alias CraftSystem.CraftRecipe string[]
---@alias CraftSystem.CraftType 'primitive'|'immersive'
---@class CraftSystem ---@class CraftSystem
local CraftSystem = {} ---@field shapelessCraftsList CraftSystem.shapelessCraftsList
---@field processualCraftsList CraftSystem.processualCraftsList
local CraftSystem = {
shapelessCraftsList = {},
processualCraftsList = {},
}
---@param craftName string ---@alias CraftSystem.Craft.Type
---@param def CraftSystem.PrimitiveCraftDef ---|'shapeless'
function CraftSystem.registerPrimitiveCraft(craftName, def) ---|'processual'
PrimitiveCraftHandler:addCraft(craftName, def) ---@alias CraftSystem.Craft.Group string
---@alias CraftSystem.Craft.Recipe string[]
---@alias shapelessCraftFunc fun(self:CraftSystem.ShapelessCraft, input:ItemStack[], workbenchMeta:NodeMetaRef?):boolean
---@alias processualCraftFunc fun(self:CraftSystem.ProcessualCraft, input:ItemStack[], workbenchMeta:NodeMetaRef?, processTime:number):boolean
---@class CraftSystem.BaseCraft
---@field type CraftSystem.Craft.Type
---@field group CraftSystem.Craft.Group
---@field output string
---@field recipe CraftSystem.Craft.Recipe
---@field return table? TODO: доделать тут тип
---@field craftFunc (fun(self, ...):boolean)?
---@class CraftSystem.ShapelessCraft : CraftSystem.BaseCraft
---@field craftFunc shapelessCraftFunc?
---@class CraftSystem.ProcessualCraft : CraftSystem.BaseCraft
---@field processTime number
---@field craftFunc processualCraftFunc?
---@param type CraftSystem.Craft.Type
---@return CraftSystem.shapelessCraftsList|CraftSystem.processualCraftsList
local function getCraftList(type)
local craftList
if type == 'shapeless' then
craftList = CraftSystem.shapelessCraftsList
elseif type == 'processual' then
craftList = CraftSystem.processualCraftsList
else
error(string.format('Craft type `%s` does not exist.', type))
end
return craftList
end end
---@param craftName string ---@param type CraftSystem.Craft.Type
---@param def CraftSystem.ImmersiveCraftDef ---@param group CraftSystem.Craft.Group
function CraftSystem.registerImmersiveCraft(craftName, def) ---@return table<string, table>
ImmersiveCraftHandler:addCraft(craftName, def) local function getCraftGroup(type, group)
local craftList = getCraftList(type)
---@type table<string, table>?
local craftGroup = craftList[group]
assert(craftGroup ~= nil, string.format('Craft group `%s` does not exist.', type))
return craftGroup
end end
return CraftSystem ---@param type CraftSystem.Craft.Type
---@param group CraftSystem.Craft.Group
function CraftSystem.registerCraftGroup(type, group)
local craftList = getCraftList(type)
assert(craftList[group] == nil, string.format('Craft group `%s` is already registered.', type))
craftList[group] = {}
end
---@param recipe CraftSystem.Craft.Recipe
---@return string
function CraftSystem.getCraftHash(recipe)
table.sort(recipe)
local hash = ''
for i = 0, #recipe-1 do
hash = hash..recipe[i]..HASH_SPLITTER
end
return hash..recipe[#recipe]
end
---@param craftDef CraftSystem.ShapelessCraft|CraftSystem.ProcessualCraft
function CraftSystem.registerCraft(craftDef)
local craftGroup = getCraftGroup(craftDef.type, craftDef.group)
local hash = CraftSystem.getCraftHash(craftDef.recipe)
table.insert(craftGroup[hash], craftDef)
end
---@param type CraftSystem.Craft.Type
---@param group CraftSystem.Craft.Group
---@return CraftSystem.ShapelessCraft[] |
--- CraftSystem.processualCraftsList[] |
--- nil
function CraftSystem.getCraftResults(type, group, recipe)
local craftGroup = getCraftGroup(type, group)
local hash = CraftSystem.getCraftHash(recipe)
return craftGroup[hash]
end
return CraftSystem

View File

@@ -1,13 +0,0 @@
---Abstract class for craft.
---@class CraftSystem.BaseCraft
---@field name string
---@field group CraftSystem.CraftGroup
local BaseCraft = {}
---Definition table for the `CraftSystem.BaseCraft`.
---
---**Only for EmmyLua.**
---@class CraftSystem.BaseCraftDef
---@field group CraftSystem.CraftGroup
return BaseCraft

View File

@@ -1,47 +0,0 @@
---Abstract class for handling crafting.
---@class CraftSystem.BaseCraftHandler
---@field craftsByName table<string, CraftSystem.BaseCraft>
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
---@field craftsList CraftSystem.BaseCraft[]
---@field learnedCrafts table<string, table<string, CraftSystem.BaseCraft>>
local BaseCraftHandler = {
craftsByName = {},
craftsByGroup = {},
craftsList = {},
learnedCrafts = {},
}
---@param craftName string
---@return CraftSystem.BaseCraft
function BaseCraftHandler:getCraftByName(craftName)
local craft = self.craftsByName[craftName]
assert(craft ~= nil, ('There is no primitive craft named `%s`.'):format(
craftName))
return craft
end
---@param craftGroup CraftSystem.CraftGroup
---@return CraftSystem.BaseCraft[]
function BaseCraftHandler:getCraftsByGroup(craftGroup)
local crafts = self.craftsByGroup[craftGroup]
assert(crafts ~= nil, ('There are no primitive crafts with `%s` group'):format(
craftGroup))
return crafts
end
---@param playerName string
---@return table<string, CraftSystem.BaseCraft>
function BaseCraftHandler:getLearnedCrafts(playerName)
local crafts = self.learnedCrafts[playerName]
assert(crafts ~= nil, ('There is no primitive crafting data for a player named `%s`.'):format(
playerName))
return crafts
end
return BaseCraftHandler

View File

@@ -1,51 +0,0 @@
local getInstance, extend = Class.getInstance, Class.extend
local modInfo = Mod.getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraft
local BaseCraft = require('CraftSystem.BaseCraft')
---@type CraftSystem.ImmersiveCraftStage
local ImmersiveCraftStage = require('CraftSystem.ImmersiveCraftStage')
---@class CraftSystem.ImmersiveCraft : CraftSystem.BaseCraft
---@field startStageName string
---@field triggerItem string
---@field output string
---@field stagesByName table<string, CraftSystem.ImmersiveCraftStage>
local ImmersiveCraft = extend(BaseCraft, {})
---Definition table for the `CraftSystem.ImmersiveCraft`.
---
---**Only for EmmyLua.**
---@class CraftSystem.ImmersiveCraftDef : CraftSystem.BaseCraftDef
---@field startStageName string
---@field triggerItem string
---@field output string
---@field stages CraftSystem.ImmersiveCraftStageDef[]
---@param name string
---@param def CraftSystem.ImmersiveCraftDef
---@return CraftSystem.ImmersiveCraft
function ImmersiveCraft:new(name, def)
local stagesByName = {}
for _, stageDef in ipairs(def.stages) do
local stage = ImmersiveCraftStage:new(stageDef)
stagesByName[stageDef.name] = stage
end
local instance = getInstance(self, {
name = name,
group = def.group,
startStageName = def.startStageName,
triggerItem = def.triggerItem,
output = def.output,
stagesByName = stagesByName,
})
return instance
end
return ImmersiveCraft

View File

@@ -1,56 +0,0 @@
local extend = Class.extend
local tableInsert = table.insert
local modInfo = Mod.getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraftHandler
local BaseCraftHandler = require('CraftSystem.BaseCraftHandler')
---@type CraftSystem.ImmersiveCraft
local ImmersiveCraft = require('CraftSystem.ImmersiveCraft')
---@class CraftSystem.ImmersiveCraftHandler : CraftSystem.BaseCraftHandler
---@field craftsByTriggerItem table<string, CraftSystem.ImmersiveCraft[]>
---@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 = extend(BaseCraftHandler, {
craftsByTriggerItem = {},
})
---@param craftName string
---@param def CraftSystem.ImmersiveCraftDef
function ImmersiveCraftHandler:addCraft(craftName, def)
assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format(
craftName))
local craft = ImmersiveCraft:new(craftName, def)
local group = def.group
if self.craftsByGroup[group] == nil then
self.craftsByGroup[group] = {}
end
local triggerItem = def.triggerItem
if self.craftsByTriggerItem[triggerItem] == nil then
self.craftsByTriggerItem[triggerItem] = {}
end
self.craftsByName[craftName] = craft
tableInsert(self.craftsByGroup[group], craft)
tableInsert(self.craftsByTriggerItem[triggerItem], craft)
tableInsert(self.craftsList, craft)
end
---@param triggerItem string
---@return CraftSystem.ImmersiveCraft[]?
function ImmersiveCraftHandler:getCraftsByTriggerItem(triggerItem)
local crafts = self.craftsByTriggerItem[triggerItem]
return crafts
end
return ImmersiveCraftHandler

View File

@@ -1,39 +0,0 @@
local getInstance = Class.getInstance
---@alias CraftSystem.ImmersiveCraftStage.HandlerFunc fun(self, Player)
---@class CraftSystem.ImmersiveCraftStage
---@field name string
---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field data table
---@field returnItems table? TODO: доделать тут тип
local ImmersiveCraftStage = {
data = {}
}
---Definition table for the `CraftSystem.ImmersiveCraft`.
---
---**Only for EmmyLua.**
---@class CraftSystem.ImmersiveCraftStageDef
---@field name string
---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field returnItems table? TODO: доделать тут тип
---@param def CraftSystem.ImmersiveCraftStageDef
---@return CraftSystem.ImmersiveCraftStage
function ImmersiveCraftStage:new(def)
local instance = getInstance(self, {
name = def.name,
startHandler = def.startHandler,
processHandler = def.processHandler,
endHandler = def.endHandler
})
return instance
end
return ImmersiveCraftStage

View File

@@ -1,38 +0,0 @@
local getInstance, extend = Class.getInstance, Class.extend
local modInfo = Mod.getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraft
local BaseCraft = require('CraftSystem.BaseCraft')
---@class CraftSystem.PrimitiveCraft : CraftSystem.BaseCraft
---@field output string
---@field recipe CraftSystem.CraftRecipe
---@field returnItems table? TODO: доделать тут тип
local PrimitiveCraft = extend(BaseCraft, {})
---Definition table for the `CraftSystem.PrimitiveCraft`.
---
---**Only for EmmyLua.**
---@class CraftSystem.PrimitiveCraftDef : CraftSystem.BaseCraftDef
---@field output string
---@field recipe CraftSystem.CraftRecipe
---@field returnItems table? TODO: доделать тут тип
---@param name string
---@param def CraftSystem.PrimitiveCraftDef
---@return CraftSystem.PrimitiveCraft
function PrimitiveCraft:new(name, def)
local instance = getInstance(self, {
name = name,
group = def.group,
output = def.output,
recipe = def.recipe,
returnItems = def.returnItems or {}
})
return instance
end
return PrimitiveCraft

View File

@@ -1,39 +0,0 @@
local extend = Class.extend
local tableInsert = table.insert
local modInfo = Mod.getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraftHandler
local BaseCraftHandler = require('CraftSystem.BaseCraftHandler')
---@type CraftSystem.PrimitiveCraft
local PrimitiveCraft = require('CraftSystem.PrimitiveCraft')
---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler
---@field getCraftByName fun(self, craftName:string):CraftSystem.PrimitiveCraft
---@field getCraftsByGroup fun(self, craftGroup):CraftSystem.PrimitiveCraft[]
---@field getLearnedCrafts fun(self, playerName):table<string, CraftSystem.PrimitiveCraft>
local PrimitiveCraftHandler = extend(BaseCraftHandler, {})
---@param craftName string
---@param def CraftSystem.PrimitiveCraftDef
function PrimitiveCraftHandler:addCraft(craftName, def)
assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format(
craftName))
local craft = PrimitiveCraft:new(craftName, def)
local group = def.group
if self.craftsByGroup[group] == nil then
self.craftsByGroup[group] = {}
end
self.craftsByName[craftName] = craft
tableInsert(self.craftsByGroup[group], craft)
tableInsert(self.craftsList, craft)
end
return PrimitiveCraftHandler

View File

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

View File

@@ -1 +0,0 @@
name = smc__core__creature

View File

@@ -1,84 +0,0 @@
local getInstance, extend = Class.getInstance, Class.extend
local tableCopy, tableMerge = table.copy, table.merge
---@class Creature
---@field entityDef Creature.CreatureDefinition
---@field luantiDef EntityDefinition
---@field defaultDef Creature.CreatureDefinition
local Creature = {
defaultDef = {
settings = {
_name = '',
_add_mod_name = true,
initial_properties = {},
},
callbacks = {}
}
}
---The alias `table.merge` for EmmyLua
---@type fun(...):(EntityDefinition)
local defMerge = function(...)
return tableMerge(...)
end
---@param entityDef Creature.CreatureDefinition
---@return EntityDefinition
local function entityDefToLuantiDef(entityDef)
entityDef = tableCopy(entityDef)
local s = entityDef.settings
local c = entityDef.callbacks
local luantiDef = defMerge(s, c)
return luantiDef
end
---The alias `table.merge` for EmmyLua
---@type fun(...):(Creature.CreatureDefinition)
local defMerge = function(...)
return tableMerge(...)
end
---@param entityDef Creature.CreatureDefinition
---@return Creature
function Creature:new(entityDef)
-- Adding default parameters
entityDef = defMerge(entityDef, self.defaultDef, true)
local s = entityDef.settings
if s._add_mod_name then
s._name = Mod.getInfo().shortName .. ':' .. s._name
end
---@type Creature
local instance = getInstance(self, {})
local luantiDef = entityDefToLuantiDef(entityDef)
instance.entityDef = entityDef
instance.luantiDef = luantiDef
core.register_entity(s._name, luantiDef)
return instance
end
---Allows you to create a child class of an entity by specifying
---default parameters that will be added to the entity's parameters
---when an instance is received.
---@param defaultDef Creature.CreatureDefinition
---@return Creature
function Creature:getExtended(defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef)
---@type Creature
local ChildClass = extend(self, {
defaultDef = defaultDef,
})
return ChildClass
end
return Creature

View File

@@ -1,72 +0,0 @@
---@class Creature.Callbacks
local Callbacks = {}
---Called when the object is instantiated.
--- * `dtime_s` is the time passed since the object was unloaded,
---which can be used for updating the entity state.
---@type fun(self:LuaEntity, staticdata:string, dtime_s:number)?
Callbacks.on_activate = nil
---Called when the object is about to get removed or unloaded.
--- * `removal`: boolean indicating whether the object is about to get removed.
--- Calling `object:remove()` on an active object will call this with `removal=true`.
--- The mapblock the entity resides in being unloaded will call this with `removal=false`.
---
---Note that this won't be called if the object hasn't been activated in the first place.
---In particular, `core.clear_objects({mode = "full"})` won't call this,
---whereas `core.clear_objects({mode = "quick"})` might call this.
---@type fun(self:LuaEntity, removal:boolean)?
Callbacks.on_deactivate = nil
---Called on every server tick, after movement and collision processing.
--- * `dtime`: elapsed time since last call
--- * `s`: table with collision info (only available if `physical=true`)
---@type fun(self:LuaEntity, dtime:number, moveresult:table)? -- TODO: дописать более точный тип moveresult
Callbacks.on_step = nil
---Called when somebody punches the object.
---Note that you probably want to handle most punches using the automatic armor group system.
--- * `puncher`: an `ObjectRef `(can be `nil`)
--- * `time_from_last_punch`: Meant for disallowing spamming of clicks (can be `nil`).
--- * `tool_capabilities`: capability table of used item
--- * `dir`: unit vector of direction of punch. Always defined. Points from the puncher to the punched.
--- * `damage``: damage that will be done to entity.
---
---Can return `true` to prevent the default damage mechanism.
---@type (fun(self:LuaEntity, puncher:ObjectRef|Player|nil, time_from_last_punch:number|nil, tool_capabilities:table|nil, dir:vector, damage:number):boolean)? -- TODO: дописать более точный тип для tool_capabilities
Callbacks.on_punch = nil
---Called when the object dies.
--- * `killer`: an `ObjectRef` (can be `nil`)
---@type fun(self:LuaEntity, killer:ObjectRef|Player|nil)?
Callbacks.on_death = nil
---Called when `clicker` pressed the 'place/use' key while
---pointing to the object (not necessarily an actual rightclick)
--- * `clicker`: an `ObjectRef` (may or may not be a player)
---@type fun(self:LuaEntity, clicker:ObjectRef|Player)?
Callbacks.on_rightclick = nil
---Called after another object is attached to this object.
--- * `child`: an `ObjectRef` of the child
---@type fun(self:LuaEntity, child:ObjectRef)?
Callbacks.on_attach_child = nil
---Called after another object has detached from this object.
--- * `child`: an `ObjectRef` of the child
---@type fun(self:LuaEntity, child:ObjectRef)?
Callbacks.on_detach_child = nil
---Called after detaching from another object.
--- * `parent`: an ObjectRef from where it got detached
---
---**Note**: this is also called before removal from the world.
---@type fun(self:LuaEntity, parent)?
Callbacks.on_detach = nil
---Should return a string that will be passed to `on_activate` when the object
---is instantiated the next time.
---@type (fun(self:LuaEntity):string)?
Callbacks.get_staticdata = nil
return Callbacks

View File

@@ -1,6 +0,0 @@
---@class Creature.CreatureDefinition
---@field settings Creature.Settings
---@field callbacks Creature.Callbacks?
local CreatureDefinition = {}
return CreatureDefinition

View File

@@ -1,14 +0,0 @@
---@class Creature.Settings
local Settings = {}
---Registration name for the entity. Must be unique.
---@type string
Settings._name = nil
---Whether to add the mod name to the settings._name. Default: `true`
Settings._add_mod_name = nil
---@type ObjectProperties
Settings.initial_properties = nil
return Settings

View File

View File

@@ -0,0 +1 @@
name = smc__core__entity

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

@@ -1,9 +0,0 @@
# textdomain: item
Rarity=Редкость
common=простой
uncommon=необычный
distinguished=выдающийся
eminent=исключительный
prime=Превосходный
unique=Уникальный

View File

@@ -1,98 +1,51 @@
local getInstance, extend = Class.getInstance, Class.extend local getInstance = Class.getInstance
local tableCopy, tableMerge, colorize = table.copy, table.merge, core.colorize
local modInfo = Mod.getInfo('smc__core__item') local modInfo = Mod.getInfo('smc__core__item')
local require = modInfo.require local require = modInfo.require
local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory') local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
---Determines whether common rarity will be shown in item descriptions or not.
local SHOW_COMMON_RARITY = true
---Colors corresponding to the rarity color in the item description.
---@type table<Item.Rarity, ColorString>
local RARITY_COLORS = {
['common'] = '#C0C0C0',
['uncommon'] = '#7cd2e2',
['distinguished'] = '#7ce2da',
['eminent'] = '#44d1a9',
['prime'] = '#9CF0B1',
['unique'] = '#f4c95a'
}
---Whether to show the numeric index in the rarity description.
local SHOW_RARITY_INDEX = true
---@type table<Item.Rarity, integer>
local RARITY_INDEX = {
['common'] = 1,
['uncommon'] = 2,
['distinguished'] = 3,
['eminent'] = 4,
['prime'] = 5,
['unique'] = 0
}
---@class Item ---@class Item
---@field itemDef Item.ItemDefinition ---@field itemDef Item.ItemDefinition
---@field luantiDef ItemDefinition ---@field luantiDef table
---@field getVisual fun(): string ---@field getVisual fun(): string
---@field defaultDef Item.ItemDefinition ---@field defaultDef Item.ItemDefinition
local Item = { local Item = {
defaultDef = { defaultDef = {
settings = { settings = {
name = '', name = '',
_title = '', title = '',
_description = '', description = '',
_title_color = '#FFFFFF', titleColor = '#FFFFFF',
_description_color = '#C0C0C0', descriptionColor = '#C0C0C0',
_rarity = 'common', addModName = true,
_add_mod_name = true,
}, },
callbacks = {} callbacks = {}
} }
} }
---Adds an item's rarity tag to the description.
---@param rarity Item.Rarity
---@param desc string
---@return string
local function addRarityToDesc(rarity, desc)
if not SHOW_COMMON_RARITY and rarity == 'common' then
return desc
end
local S = core.get_translator('item')
local color = RARITY_COLORS[rarity]
local rarityString = S('Rarity')..': '..S(rarity)
if SHOW_RARITY_INDEX then
rarityString = rarityString..' ['..RARITY_INDEX[rarity]..']'
end
return desc..'\n'..colorize(color, rarityString)
end
---The alias `table.merge` for EmmyLua ---The alias `table.merge` for EmmyLua
---@type fun(...):(NodeDefinition|ItemDefinition) ---@type fun(...):(NodeDefinition|ItemDefinition)
local defMerge = function(...) local defMerge = function(...)
return tableMerge(...) return table.merge(...)
end end
---@param itemDef Item.ItemDefinition ---@param itemDef Item.ItemDefinition
---@return NodeDefinition|ItemDefinition ---@return NodeDefinition|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)
itemDef = tableCopy(itemDef) itemDef = table.copy(itemDef)
local s = itemDef.settings local s = itemDef.settings
local c = itemDef.callbacks local c = itemDef.callbacks
local title = s._title if s.addModName then
local description = s._description s.name = modName .. ':' .. s.name
end
local title = s.title
local description = s.description
if title == nil or title == '' then if title == nil or title == '' then
title = string.match(s.name, '%S:(%S+)')..'-title' title = string.match(s.name, '%S:(%S+)')..'-title'
@@ -102,73 +55,59 @@ local function itemDefToLuantiDef(itemDef)
description = string.match(s.name, '%S:(%S+)')..'-desc' description = string.match(s.name, '%S:(%S+)')..'-desc'
end end
if s._title_color ~= nil and s._description_color ~= nil then if s.titleColor ~= nil and s.descriptionColor ~= nil then
description = colorize(s._title_color ,S(title))..'\n'.. description = core.colorize(s.titleColor ,S(title))..'\n'..
colorize(s._description_color, S(description)) core.colorize(s.descriptionColor, S(description))
else else
error('Item description color parameters cannot be empty.') error('Item description color parameters cannot be empty.')
end end
assert(s._rarity ~= nil, 'The rarity of an item cannot be empty.') s.title, s.description = nil, description
description = addRarityToDesc(s._rarity, description)
s.description = description..core.get_background_escape_sequence('#110F13')
local luantiDef = defMerge(s, c) local luantiDef = defMerge(s, c)
return luantiDef return luantiDef
end end
---@param luantiDef NodeDefinition ---@param luantiDef NodeDefinition|ItemDefinition
local function register3dItem(luantiDef) local function register3dItem(luantiDef)
local name = luantiDef.name local ld = luantiDef
luantiDef.name = nil local name = ld.name
ld.name = nil
core.register_node(':'..name, luantiDef) core.register_node(':'..name, luantiDef)
end end
---@param luantiDef ItemDefinition ---@param luantiDef ItemDefinition
local function registerFlatItem(luantiDef) local function registerFlatItem(luantiDef)
local name = luantiDef.name local ld = luantiDef
luantiDef.name = nil local name = ld.name
ld.name = nil
core.register_craftitem(':'..name, luantiDef) core.register_craftitem(':'..name, luantiDef)
end end
---The alias `table.merge` for EmmyLua ---The alias `table.merge` for EmmyLua
---@type fun(...):(Item.ItemDefinition) ---@type fun(...):(Item.ItemDefinition)
local defMerge = function(...) local defMerge = function(...)
return tableMerge(...) return table.merge(...)
end end
---@param itemDef Item.ItemDefinition|Node.NodeDefinition ---@param itemDef Item.ItemDefinition|Node.NodeDefinition
---@return Item ---@return Item
function Item:new(itemDef) function Item:new(itemDef)
assert(itemDef.settings.description == nil, ---Adding default parameters
'The item description was specified using `description`, not `_description`. '..
'Please note that the `description` field should not be used when registering an item. '..
'Use `_title` and `_description` instead.')
-- Adding default parameters
itemDef = defMerge(itemDef, self.defaultDef, true) itemDef = defMerge(itemDef, self.defaultDef, true)
local s = itemDef.settings
if s._add_mod_name then
s.name = Mod.getInfo().shortName .. ':' .. s.name
end
---@type Item ---@type Item
local instance = getInstance(self, {}) local instance = getInstance(self, {})
local luantiDef = itemDefToLuantiDef(itemDef) local luantiDef = itemDefToLuantiDef(itemDef)
local visual = itemDef.settings._visual local visual = itemDef.settings.visual
if visual == nil then if visual == nil then
visual = 'item_2d' visual = 'item_2d'
end end
itemDef.settings._visual = nil itemDef.settings.visual = nil
if visual == 'item_3d' then if visual == 'item_3d' then
register3dItem(luantiDef) register3dItem(luantiDef)
@@ -193,10 +132,8 @@ end
---@param defaultDef Item.ItemDefinition ---@param defaultDef Item.ItemDefinition
---@return Item ---@return Item
function Item:getExtended(defaultDef) function Item:getExtended(defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef)
---@type Item ---@type Item
local ChildClass = extend(self, { local ChildClass = Class.extend(self, {
defaultDef = defaultDef, defaultDef = defaultDef,
}) })
@@ -209,8 +146,6 @@ end
function Item:getFactory(defaultDef) function Item:getFactory(defaultDef)
if defaultDef == nil then if defaultDef == nil then
defaultDef = self.defaultDef defaultDef = self.defaultDef
else
defaultDef = defMerge(self.defaultDef, defaultDef)
end end
---@type ItemFactory ---@type ItemFactory

View File

@@ -64,4 +64,4 @@ Callbacks.on_use = nil
---@type fun(itemstack:ItemStack, user:Player|ObjectRef|nil, node, digparams)? ---@type fun(itemstack:ItemStack, user:Player|ObjectRef|nil, node, digparams)?
Callbacks.after_use = nil Callbacks.after_use = nil
return Callbacks return Callbacks

View File

@@ -1,8 +0,0 @@
---Rarity of items:
--- * `common`
--- * `uncommon`
--- * `distinguished`
--- * `eminent`
--- * `prime`
--- * `unique`
---@alias Item.Rarity 'common'|'uncommon'|'distinguished'|'eminent'|'prime'|'unique'

View File

@@ -5,40 +5,38 @@ local Settings = {}
---@type string ---@type string
Settings.name = '' Settings.name = ''
---@type string?
Settings.description = nil
---Whether to add the mod name to the settings.name. Default: `true` ---Whether to add the mod name to the settings.name. Default: `true`
---@type boolean? ---@type boolean?
Settings._add_mod_name = nil Settings.addModName = nil
---Item description. 1st line of item description. ---Item description. 1st line of item description.
---@type string? ---@type string?
Settings._title = nil Settings.title = nil
---Item description. The rest of item description. ---Item description. The rest of item description.
---@type string? ---@type string?
Settings._description = nil Settings.description = nil
---Item title color in description. ---Item title color in description.
--- ---
---Default: `#FFFFFF` ---Default: `#FFFFFF`
---@type ColorString? ---@type ColorString?
Settings._title_color = nil Settings.titleColor = nil
---Item description color in description. ---Item description color in description.
--- ---
---Default: `#C0C0C0` ---Default: `#C0C0C0`
---@type ColorString? ---@type ColorString?
Settings._description_color = nil Settings.descriptionColor = nil
---@alias Item.Visual
---'item_2d'|
---'item_3d'
---Visual node type. ---Visual node type.
---@type Item.Visual? ---@type Item.Visual?
Settings._visual = nil Settings.visual = nil
---Formal (lore) rarity of an item. Default `common`.
---@type Item.Rarity?
Settings._rarity = nil
---Table of groups-characteristics of Item. ---Table of groups-characteristics of Item.
@@ -185,4 +183,4 @@ Settings.touch_interaction = nil
Settings.sound = nil Settings.sound = nil
return Settings return Settings

View File

@@ -1 +0,0 @@
---@alias Item.Visual 'item_2d'|'item_3d'

View File

@@ -425,9 +425,9 @@ end
function MapGen:registerPeak(layerName, category, def) function MapGen:registerPeak(layerName, category, def)
local layer = self:getLayerByName(layerName) local layer = self:getLayerByName(layerName)
assert(self:getPeakByPos(layer, category, def.pos) == nil, --assert(self:getPeakByPos(layer, category, def.pos) == nil,
('In the `%s` layer in the `%s` category there is already a peak with coordinates: %s, %s, %s.'):format( --('In the `%s` layer in the `%s` category there is already a peak with coordinates: %s, %s, %s.'):format(
layerName, category, def.pos.x, def.pos.y, def.pos.z)) -- layerName, category, def.pos.x, def.pos.y, def.pos.z))
---@type MapGen.Peak ---@type MapGen.Peak
local peak = Peak:new(def) local peak = Peak:new(def)
@@ -607,7 +607,7 @@ function MapGen:initLayersTriangultaion()
local triangles = Triangulation.triangulate(peaks) local triangles = Triangulation.triangulate(peaks)
layer.trianglesList[category] = triangles layer.trianglesList[category] = triangles
self:initTriangultaionBoundaryRegion(layer, category, triangles) --self:initTriangultaionBoundaryRegion(layer, category, triangles)
-- layer.tetrahedronsList = Triangulation.tetrahedralize(layer.peaksList) -- 3D not supported -- layer.tetrahedronsList = Triangulation.tetrahedralize(layer.peaksList) -- 3D not supported
end end
end end

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,7 +22,7 @@ function Node:new(nodeDef)
---Adding default parameters ---Adding default parameters
nodeDef = defMerge(nodeDef, self.defaultDef, true) nodeDef = defMerge(nodeDef, self.defaultDef, true)
nodeDef.settings._visual = 'item_3d' nodeDef.settings.visual = 'item_3d'
---@type Node ---@type Node
local instance = Item:new(nodeDef) local instance = Item:new(nodeDef)
@@ -35,8 +35,6 @@ end
---@param defaultDef Node.NodeDefinition ---@param defaultDef Node.NodeDefinition
---@return Node ---@return Node
function Node:getExtended(defaultDef) function Node:getExtended(defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef)
---@type Node ---@type Node
local ChildClass = Class.extend(self, { local ChildClass = Class.extend(self, {
defaultDef = defaultDef, defaultDef = defaultDef,
@@ -51,8 +49,6 @@ end
function Node:getFactory(defaultDef) function Node:getFactory(defaultDef)
if defaultDef == nil then if defaultDef == nil then
defaultDef = self.defaultDef defaultDef = self.defaultDef
else
defaultDef = defMerge(self.defaultDef, defaultDef)
end end
---@type ItemFactory ---@type ItemFactory
@@ -61,4 +57,4 @@ function Node:getFactory(defaultDef)
return instance return instance
end end
return Node return Node

View File

@@ -187,4 +187,4 @@ Callbacks.on_metadata_inventory_take = nil
---@type (fun(pos:Position, intensity:number): void)? ---@type (fun(pos:Position, intensity:number): void)?
Callbacks.on_blast = nil Callbacks.on_blast = nil
return Callbacks return Callbacks

View File

@@ -337,4 +337,4 @@ Settings.sounds = nil
---@type (table|string)? ---@type (table|string)?
Settings.drop = nil Settings.drop = nil
return Settings return Settings

View File

@@ -1,4 +0,0 @@
local modInfo = Mod.getInfo('smc__core__work_station')
local require = modInfo.require
return require('WorkStation')

View File

@@ -1,2 +0,0 @@
name = smc__core__work_station
depends = smc__core__craft_system, smc__core__node, smc__ui__work_station

View File

@@ -1,112 +0,0 @@
local getInstance = Class.getInstance
---@type CraftSystem.ImmersiveCraftHandler
local ImmersiveCraftHandler = Mod.getInfo('smc__core__craft_system').require('CraftSystem.ImmersiveCraftHandler')
---@type WorkStationUI
local WorkStationUI = Mod.getInfo('smc__ui__work_station').require('WorkStationUI')
---@type Node
local Node = Mod.getInfo('smc__core__node').require('Node')
local WorkStationNode = Node:getExtended({
settings = {
name = 'work_station',
drawtype = 'normal',
paramtype = 'light',
groups = {work_station = 1}
}
})
---@class WorkStation
---@field name string
---@field group CraftSystem.CraftGroup
---@field nodeDef Node.NodeDefinition
local WorkStation = {}
---Definition table for the `CraftSystem.WorkStation`.
---
---**Only for EmmyLua.**
---@class WorkStationDef
---@field group CraftSystem.CraftGroup
---@field nodeDef Node.NodeDefinition
---@param name string
---@param def WorkStationDef
function WorkStation:new(name, def)
local nodeDef = def.nodeDef
if nodeDef.callbacks == nil then
nodeDef.callbacks = {}
end
local settings = nodeDef.settings
local callbacks = nodeDef.callbacks
callbacks.on_construct = function(pos)
local meta = core.get_meta(pos)
--meta:set_string('work_station_name', name)
--meta:set_string('craft_group', def.group)
end
callbacks.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
Logger.warningLog('Punch')
local crafts = ImmersiveCraftHandler:getCraftsByTriggerItem(itemstack:get_name())
if crafts == nil then
return
end
self:showSelectionCraftForm(clicker, crafts)
end
local instance = getInstance(self, {
name = name,
group = def.group,
nodeDef = nodeDef
})
print('NODEDEF: ',dump(nodeDef.callbacks))
WorkStationNode:new(nodeDef)
return instance
end
---@param player Player
---@param crafts CraftSystem.ImmersiveCraft[]
function WorkStation:showSelectionCraftForm(player, crafts)
local outputs = {}
for i, craft in ipairs(crafts) do
outputs[i] = craft.output
end
core.show_formspec(player:get_player_name(), 'work_station:selection_craft', WorkStationUI:selectionCraftForm(outputs))
end
WorkStation:new('test_station', {
group = 'test',
nodeDef = {
settings = {
name = 'test_station',
tiles = {'test_station.png'}
}
}
})
ImmersiveCraftHandler:addCraft('bricks', {
triggerItem = 'rocks:sylite',
output = 'rocks:sylite_bricks',
startStageName = 'ab',
group = 'test',
stages = {},
})
ImmersiveCraftHandler:addCraft('block', {
triggerItem = 'rocks:sylite',
output = 'rocks:sylite_block',
startStageName = 'ab',
group = 'test',
stages = {},
})
return WorkStation

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -15,16 +15,16 @@ local MapGen = mapGenRequire('MapGen')
air = 'air', air = 'air',
-- Rocks -- Rocks
sylite = 'rocks:sylite', sylite = 'rocks:sylite',
syliteGray = 'rocks:sylite_gray', syliteGray = 'rocks:sylite_gray',
syliteBlack = 'rocks:sylite_black', syliteBlack = 'rocks:sylite_black',
tauitite = 'rocks:tauitite', tauitite = 'rocks:tauitite',
iyellite = 'rocks:iyellite', iyellite = 'rocks:iyellite',
falmyte = 'rocks:falmyte', falmyte = 'rocks:falmyte',
hapcoryte = 'rocks:hapcoryte', hapcoryte = 'rocks:hapcoryte',
burcite = 'rocks:burcite', burcite = 'rocks:burcite',
felhor = 'rocks:felhor', felhor = 'rocks:felhor',
malachite = 'rocks:malachite', malachite = 'rocks:malachite',
-- Liquids -- Liquids
water = 'liquids:water_source', water = 'liquids:water_source',
@@ -52,128 +52,389 @@ mapGenerator:registerLayer('midgard', {
biomesGorizontalScattering = 5 biomesGorizontalScattering = 5
}) })
local land1 = {
offset = -10, -- TODO: Config should be imported from .json file in the world's folder
scale = 5, local ocean = {
spread = {x = 10, y = 10, z = 10}, ['landscape'] = {
seed = 47, offset = -10,
octaves = 3, scale = 3,
persistence = 0.4, spread = {x = 10, y = 10, z = 10},
lacunarity = 2, seed = 420,
octaves = 2,
persistence = 0.4,
lacunarity = 2,
},
['temp'] = {
offset = -10,
scale = 5,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = -10,
scale = 5,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
} }
local land2 = { local common_lands = {
offset = 20, ['landscape'] = {
scale = 5, offset = 0,
spread = {x = 30, y = 30, z = 30}, scale = 5,
seed = 47, spread = {x = 10, y = 10, z = 10},
octaves = 3, seed = 88005553535,
persistence = 0.4, octaves = 2,
lacunarity = 2, persistence = 0.4,
lacunarity = 2,
},
['temp'] = {
offset = -10,
scale = 5,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = -10,
scale = 5,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
} }
local land3 = { local foresty_lands = {
offset = 40, ['landscape'] = {
scale = 5, offset = 5,
spread = {x = 45, y = 20, z = 45}, scale = 8,
seed = 472, spread = {x = 15, y = 15, z = 15},
octaves = 3, seed = 12345,
persistence = 0.3, octaves = 3,
lacunarity = 2, persistence = 0.5,
lacunarity = 2,
},
['temp'] = {
offset = 20,
scale = 10,
spread = {x = 20, y = 20, z = 20},
seed = 48,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 60,
scale = 15,
spread = {x = 15, y = 15, z = 15},
seed = 49,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
} }
local climat1 = { local hilly_lands = {
offset = 80, ['landscape'] = {
scale = 10, offset = 15,
spread = {x = 10, y = 10, z = 10}, scale = 12,
seed = 47, spread = {x = 20, y = 20, z = 20},
octaves = 8, seed = 54321,
persistence = 0.6, octaves = 3,
lacunarity = 2, persistence = 0.5,
lacunarity = 2,
},
['temp'] = {
offset = 15,
scale = 10,
spread = {x = 25, y = 25, z = 25},
seed = 50,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 40,
scale = 15,
spread = {x = 20, y = 20, z = 20},
seed = 51,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
} }
local climat2 = { local low_mountains = {
offset = 30, ['landscape'] = {
scale = 10, offset = 30,
spread = {x = 10, y = 10, z = 10}, scale = 20,
seed = 47, spread = {x = 25, y = 25, z = 25},
octaves = 8, seed = 11111,
persistence = 0.6, octaves = 4,
lacunarity = 2, persistence = 0.5,
lacunarity = 2,
},
['temp'] = {
offset = 5,
scale = 15,
spread = {x = 30, y = 30, z = 30},
seed = 52,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 30,
scale = 15,
spread = {x = 25, y = 25, z = 25},
seed = 53,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
} }
local climat0 = { local high_mountains = {
offset = 50, ['landscape'] = {
scale = 0, offset = 60,
spread = {x = 10, y = 10, z = 10}, scale = 35,
seed = 47, spread = {x = 30, y = 30, z = 30},
octaves = 8, seed = 22222,
persistence = 0.4, octaves = 4,
lacunarity = 2, persistence = 0.55,
lacunarity = 2,
},
['temp'] = {
offset = -10,
scale = 15,
spread = {x = 35, y = 35, z = 35},
seed = 54,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 20,
scale = 10,
spread = {x = 30, y = 30, z = 30},
seed = 55,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
} }
local highest_peaks = {
['landscape'] = {
offset = 100,
scale = 50,
spread = {x = 40, y = 40, z = 40},
seed = 33333,
octaves = 5,
persistence = 0.6,
lacunarity = 2,
},
['temp'] = {
offset = -30,
scale = 10,
spread = {x = 50, y = 50, z = 50},
seed = 56,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 10,
scale = 10,
spread = {x = 40, y = 40, z = 40},
seed = 57,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
}
local rivers = {
['landscape'] = {
offset = -5,
scale = 2,
spread = {x = 5, y = 5, z = 100},
seed = 44444,
octaves = 2,
persistence = 0.3,
lacunarity = 2,
},
['temp'] = {
offset = 10,
scale = 5,
spread = {x = 50, y = 50, z = 50},
seed = 58,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 80,
scale = 10,
spread = {x = 20, y = 20, z = 20},
seed = 59,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
}
local lakes = {
['landscape'] = {
offset = -8,
scale = 2,
spread = {x = 15, y = 15, z = 15},
seed = 55555,
octaves = 2,
persistence = 0.3,
lacunarity = 2,
},
['temp'] = {
offset = 10,
scale = 5,
spread = {x = 30, y = 30, z = 30},
seed = 60,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 90,
scale = 5,
spread = {x = 20, y = 20, z = 20},
seed = 61,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
}
local rocky_shores = {
['landscape'] = {
offset = 2,
scale = 4,
spread = {x = 8, y = 8, z = 8},
seed = 66666,
octaves = 3,
persistence = 0.5,
lacunarity = 2,
},
['temp'] = {
offset = 15,
scale = 8,
spread = {x = 15, y = 15, z = 15},
seed = 62,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 70,
scale = 10,
spread = {x = 15, y = 15, z = 15},
seed = 63,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
}
local rocky_islands = {
['landscape'] = {
offset = 8,
scale = 10,
spread = {x = 12, y = 12, z = 12},
seed = 77777,
octaves = 3,
persistence = 0.5,
lacunarity = 2,
},
['temp'] = {
offset = 20,
scale = 8,
spread = {x = 20, y = 20, z = 20},
seed = 64,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 60,
scale = 15,
spread = {x = 20, y = 20, z = 20},
seed = 65,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
}
local swamp_land = {
['landscape'] = {
offset = 1,
scale = 2,
spread = {x = 12, y = 12, z = 12},
seed = 88888,
octaves = 2,
persistence = 0.4,
lacunarity = 2,
},
['temp'] = {
offset = 25,
scale = 5,
spread = {x = 15, y = 15, z = 15},
seed = 66,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
['humidity'] = {
offset = 85,
scale = 10,
spread = {x = 15, y = 15, z = 15},
seed = 67,
octaves = 3,
persistence = 0.4,
lacunarity = 2,
},
}
local v = vector.new local v = vector.new
--[[
mapGenerator:register2DPeaks('midgard',
{
landscapeNoise = land1,
tempNoise = climat2,
humidityNoise = climat2,
},{
v(500, 0, 500),
v(-500, 0, -500),
v(-500, 0, 500),
v(500, 0, -500),
})
mapGenerator:register2DPeaks('midgard',
{
landscapeNoise = land2,
tempNoise = climat1,
humidityNoise = climat1,
},{
v(-300, 0, 300),
v(200, 0, -400),
})
mapGenerator:register2DPeaks('midgard',
{
landscapeNoise = land2,
tempNoise = climat2,
humidityNoise = climat2,
},{
v(200, 0, 100),
v(-300, 0, -200),
})--]]
for _, c in ipairs({'landscape', 'temp', 'humidity'}) do for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', land1) mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', ocean[c])
mapGenerator:registerLayerNoiseColor('midgard', c, '#77ea72', land2) mapGenerator:registerLayerNoiseColor('midgard', c, '#81c948', common_lands[c])
mapGenerator:registerLayerNoiseColor('midgard', c, '#46B331', land3) mapGenerator:registerLayerNoiseColor('midgard', c, '#187726', foresty_lands[c])
--[[ mapGenerator:registerLayerNoiseColor('midgard', c, '#357a60', hilly_lands[c])
mapGenerator:register2DPeaks('midgard', c, { mapGenerator:registerLayerNoiseColor('midgard', c, '#5a7269', low_mountains[c])
{ mapGenerator:registerLayerNoiseColor('midgard', c, '#773b18', high_mountains[c])
color = '#77ea72', mapGenerator:registerLayerNoiseColor('midgard', c, '#a3a3a3', highest_peaks[c])
pos = vector.new(512, 0, 512) mapGenerator:registerLayerNoiseColor('midgard', c, '#182077', rivers[c])
}, mapGenerator:registerLayerNoiseColor('midgard', c, '#06f5ff', lakes[c])
{ mapGenerator:registerLayerNoiseColor('midgard', c, '#677a48', rocky_shores[c])
color = '#4978c6', mapGenerator:registerLayerNoiseColor('midgard', c, '#e4dc36', rocky_islands[c])
pos = vector.new(512, 0, -512) mapGenerator:registerLayerNoiseColor('midgard', c, '#3b7718', swamp_land[c])
},
{
color = '#77ea72',
pos = vector.new(-512, 0, -512)
},
{
color = '#4978c6',
pos = vector.new(-512, 0, 512)
},
})--]]
end end
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 100,{x=0, y=0}, 'landscape') mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'landscape')
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 150,{x=0, y=0}, 'temp') mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'temp')
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 200,{x=0, y=0}, 'humidity') mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'humidity')
-- [[ -- [[
mapGenerator:registerCavern('midgard', 'cavern1', { mapGenerator:registerCavern('midgard', 'cavern1', {

View File

@@ -5,7 +5,7 @@ local Node = Mod.getInfo('smc__core__node').require('Node')
local defaultLiquidDef = { local defaultLiquidDef = {
settings = { settings = {
name = '', name = '',
_add_mod_name = false, addModName = false,
tiles = {}, tiles = {},
waving = 3, waving = 3,
use_texture_alpha = "blend", use_texture_alpha = "blend",

View File

@@ -21,7 +21,7 @@ for i=0, 3 do
Plant:new({ Plant:new({
settings = { settings = {
name = 'plant'..tostring(i), name = 'plant'..tostring(i),
_title = 'Plant', title = 'Plant',
tiles = { ts:t(i,0) }, tiles = { ts:t(i,0) },
place_param2 = 3, place_param2 = 3,
}, },

View File

@@ -8,7 +8,7 @@ local Node = Mod.getInfo('smc__core__node').require('Node')
local defaultRockDef = { local defaultRockDef = {
settings = { settings = {
name = "", name = "",
_description = "A rocks", description = "A rocks",
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,
@@ -45,28 +45,9 @@ local function registerRocksTypes(postfix, x)
}) })
end end
local function registerPilarStaff(rock, y)
local columnTop = ts:t(9, y)
rockFactory:registerNodesByShortDef({
{rock..'_fluted_column', {columnTop, columnTop, ts:t(6, y)}},
{rock..'_ionic_chapiter', {
ts:t(3, y),
columnTop,
ts:t(7, y),
ts:t(7, y),
ts:t(8, y),
ts:t(8, y)}},
})
end
registerPilarStaff('sylite_black', 2)
registerRocksTypes('', 0) registerRocksTypes('', 0)
registerRocksTypes('_chipped', 1) registerRocksTypes('_block', 2)
registerRocksTypes('_block', 3) registerRocksTypes('_bricks', 5)
registerRocksTypes('_bricks', 4)
registerRocksTypes('_bricks_2', 5)
--[[ --[[
rockFactory:registerItems({ rockFactory:registerItems({

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 106 KiB

View File

@@ -8,7 +8,7 @@ local Node = Mod.getInfo('smc__core__node').require('Node')
local defaultSoilDef = { local defaultSoilDef = {
settings = { settings = {
name = "", name = "",
_description = "A soil", description = "A soil",
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,
@@ -47,7 +47,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "clay_soil_baren", name = "clay_soil_baren",
_title = "Barren Clay Soil", title = "Barren Clay Soil",
--description = "", --description = "",
tiles = clayTiles, tiles = clayTiles,
}, },
@@ -56,7 +56,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "clay_soil_poor", name = "clay_soil_poor",
_title = "Poor Clay Soil", title = "Poor Clay Soil",
--description = "", --description = "",
tiles = clayTiles, tiles = clayTiles,
}, },
@@ -65,7 +65,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "clay_soil_moderate", name = "clay_soil_moderate",
_title = "Moderate Clay Soil", title = "Moderate Clay Soil",
--description = "", --description = "",
tiles = clayTiles, tiles = clayTiles,
}, },
@@ -74,7 +74,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "clay_soil_fertile", name = "clay_soil_fertile",
_title = "Fertile Clay Soil", title = "Fertile Clay Soil",
--description = "", --description = "",
tiles = clayTiles, tiles = clayTiles,
}, },
@@ -83,7 +83,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "clay_soil_rich", name = "clay_soil_rich",
_title = "Rich Clay Soil", title = "Rich Clay Soil",
--description = "", --description = "",
tiles = clayTiles, tiles = clayTiles,
}, },
@@ -96,7 +96,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "sandy_soil_baren", name = "sandy_soil_baren",
_title = "Barren Sandy Soil", title = "Barren Sandy Soil",
--description = "", --description = "",
tiles = sandyTiles, tiles = sandyTiles,
}, },
@@ -105,7 +105,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "sandy_soil_poor", name = "sandy_soil_poor",
_title = "Poor Sandy Soil", title = "Poor Sandy Soil",
--description = "", --description = "",
tiles = sandyTiles, tiles = sandyTiles,
}, },
@@ -114,7 +114,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "sandy_soil_moderate", name = "sandy_soil_moderate",
_title = "Moderate Sandy Soil", title = "Moderate Sandy Soil",
--description = "", --description = "",
tiles = sandyTiles, tiles = sandyTiles,
}, },
@@ -123,7 +123,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "sandy_soil_fertile", name = "sandy_soil_fertile",
_title = "Fertile Sandy Soil", title = "Fertile Sandy Soil",
--description = "", --description = "",
tiles = sandyTiles, tiles = sandyTiles,
}, },
@@ -132,7 +132,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "sandy_soil_rich", name = "sandy_soil_rich",
_title = "Rich Sandy Soil", title = "Rich Sandy Soil",
--description = "", --description = "",
tiles = sandyTiles, tiles = sandyTiles,
}, },
@@ -145,7 +145,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "mixed_soil_baren", name = "mixed_soil_baren",
_title = "Barren Mixed Soil", title = "Barren Mixed Soil",
--description = "", --description = "",
tiles = mixedTiles, tiles = mixedTiles,
}, },
@@ -154,7 +154,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "mixed_soil_poor", name = "mixed_soil_poor",
_title = "Poor Mixed Soil", title = "Poor Mixed Soil",
--description = "", --description = "",
tiles = mixedTiles, tiles = mixedTiles,
}, },
@@ -163,7 +163,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "mixed_soil_moderate", name = "mixed_soil_moderate",
_title = "Moderate Mixed Soil", title = "Moderate Mixed Soil",
--description = "", --description = "",
tiles = mixedTiles, tiles = mixedTiles,
}, },
@@ -172,7 +172,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "mixed_soil_fertile", name = "mixed_soil_fertile",
_title = "Fertile Mixed Soil", title = "Fertile Mixed Soil",
--description = "", --description = "",
tiles = mixedTiles, tiles = mixedTiles,
}, },
@@ -181,7 +181,7 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "mixed_soil_rich", name = "mixed_soil_rich",
_title = "Rich Mixed Soil", title = "Rich Mixed Soil",
--description = "", --description = "",
tiles = mixedTiles, tiles = mixedTiles,
}, },
@@ -194,47 +194,43 @@ soilFactory:registerItems({
{ {
settings = { settings = {
name = "rocky_soil_baren", name = "rocky_soil_baren",
_title = "Barren Rocky Soil", title = "Barren Rocky Soil",
--description = "", --description = "",
tiles = rockyTiles, tiles = rockyTiles,
rarity = 'uncommon'
}, },
}, },
---@type Node.NodeDefinition ---@type Node.NodeDefinition
{ {
settings = { settings = {
name = "rocky_soil_poor", name = "rocky_soil_poor",
_title = "Poor Rocky Soil", title = "Poor Rocky Soil",
--description = "", --description = "",
tiles = rockyTiles, tiles = rockyTiles,
rarity = 'distinguished'
}, },
}, },
---@type Node.NodeDefinition ---@type Node.NodeDefinition
{ {
settings = { settings = {
name = "rocky_soil_moderate", name = "rocky_soil_moderate",
_title = "Moderate Rocky Soil", title = "Moderate Rocky Soil",
--description = "", --description = "",
tiles = rockyTiles, tiles = rockyTiles,
rarity = 'eminent'
}, },
}, },
---@type Node.NodeDefinition ---@type Node.NodeDefinition
{ {
settings = { settings = {
name = "rocky_soil_fertile", name = "rocky_soil_fertile",
_title = "Fertile Rocky Soil", title = "Fertile Rocky Soil",
--description = "", --description = "",
tiles = rockyTiles, tiles = rockyTiles,
rarity = 'prime'
}, },
}, },
---@type Node.NodeDefinition ---@type Node.NodeDefinition
{ {
settings = { settings = {
name = "rocky_soil_rich", name = "rocky_soil_rich",
_title = "Rich Rocky Soil", title = "Rich Rocky Soil",
--description = "", --description = "",
tiles = rockyTiles, tiles = rockyTiles,
}, },
@@ -252,7 +248,6 @@ Node:new({
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,
soil_fertiliry = 100, -- Soil fertility for agriculture soil_fertiliry = 100, -- Soil fertility for agriculture
}, }
_rarity = 'unique'
} }
}) })

View File

@@ -8,7 +8,7 @@ local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
local defaultRockDef = { local defaultRockDef = {
settings = { settings = {
name = "", name = "",
_description = "A log", description = "A log",
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,
@@ -21,7 +21,7 @@ local defaultRockDef = {
local defaultPlanksDef = { local defaultPlanksDef = {
settings = { settings = {
name = "", name = "",
_description = "A planks", description = "A planks",
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,
@@ -54,7 +54,7 @@ logFactory:registerItems({
{ {
settings = { settings = {
name = "marentine_log", name = "marentine_log",
_title = "Marentine Log", title = "Marentine Log",
--description = "", --description = "",
tiles = t(0, 1), tiles = t(0, 1),
}, },
@@ -63,7 +63,7 @@ logFactory:registerItems({
{ {
settings = { settings = {
name = "allwhere_log", name = "allwhere_log",
_title = "Allwhere Log", title = "Allwhere Log",
--description = "", --description = "",
tiles = t(2, 1), tiles = t(2, 1),
}, },
@@ -72,7 +72,7 @@ logFactory:registerItems({
{ {
settings = { settings = {
name = "fis_log", name = "fis_log",
_title = "Fis Log", title = "Fis Log",
--description = "", --description = "",
tiles = t(4, 1), tiles = t(4, 1),
}, },
@@ -81,7 +81,7 @@ logFactory:registerItems({
{ {
settings = { settings = {
name = "tammoy_log", name = "tammoy_log",
_title = "Tammoy Log", title = "Tammoy Log",
--description = "", --description = "",
tiles = t(6, 1), tiles = t(6, 1),
}, },
@@ -90,7 +90,7 @@ logFactory:registerItems({
{ {
settings = { settings = {
name = "dallalia_log", name = "dallalia_log",
_title = "Dallalia Log", title = "Dallalia Log",
--description = "", --description = "",
tiles = t(8, 1), tiles = t(8, 1),
}, },
@@ -99,7 +99,7 @@ logFactory:registerItems({
{ {
settings = { settings = {
name = "zuph_log", name = "zuph_log",
_title = "Zuph Log", title = "Zuph Log",
--description = "", --description = "",
tiles = t(10, 1), tiles = t(10, 1),
}, },
@@ -111,7 +111,7 @@ planksFactory:registerItems({
{ {
settings = { settings = {
name = "marentine_planks", name = "marentine_planks",
_title = "Marentine Planks", title = "Marentine Planks",
--description = "", --description = "",
tiles = { logTileSheet:t(0, 4) }, tiles = { logTileSheet:t(0, 4) },
}, },
@@ -120,7 +120,7 @@ planksFactory:registerItems({
{ {
settings = { settings = {
name = "allwhere_planks", name = "allwhere_planks",
_title = "Allwhere Planks", title = "Allwhere Planks",
--description = "", --description = "",
tiles = { logTileSheet:t(2, 4) }, tiles = { logTileSheet:t(2, 4) },
}, },
@@ -129,7 +129,7 @@ planksFactory:registerItems({
{ {
settings = { settings = {
name = "fis_planks", name = "fis_planks",
_title = "Fis Planks", title = "Fis Planks",
--description = "", --description = "",
tiles = { logTileSheet:t(4, 4) }, tiles = { logTileSheet:t(4, 4) },
}, },
@@ -138,7 +138,7 @@ planksFactory:registerItems({
{ {
settings = { settings = {
name = "tammoy_planks", name = "tammoy_planks",
_title = "Tammoy Planks", title = "Tammoy Planks",
--description = "", --description = "",
tiles = { logTileSheet:t(6, 4) }, tiles = { logTileSheet:t(6, 4) },
}, },
@@ -147,7 +147,7 @@ planksFactory:registerItems({
{ {
settings = { settings = {
name = "dallalia_planks", name = "dallalia_planks",
_title = "Dallalia Planks", title = "Dallalia Planks",
--description = "", --description = "",
tiles = { logTileSheet:t(8, 4) }, tiles = { logTileSheet:t(8, 4) },
}, },
@@ -156,7 +156,7 @@ planksFactory:registerItems({
{ {
settings = { settings = {
name = "zuph_planks", name = "zuph_planks",
_title = "Zuph Planks", title = "Zuph Planks",
--description = "", --description = "",
tiles = { logTileSheet:t(10, 4) }, tiles = { logTileSheet:t(10, 4) },
}, },
@@ -183,7 +183,7 @@ planksFactory:registerItems({
{ {
settings = { settings = {
name = "case_closed", name = "case_closed",
_title = "Case", title = "Case",
--description = "", --description = "",
tiles = t(0,0) tiles = t(0,0)
}, },
@@ -192,7 +192,7 @@ planksFactory:registerItems({
{ {
settings = { settings = {
name = "case_open", name = "case_open",
_title = "Case", title = "Case",
--description = "", --description = "",
tiles = t(1,0); tiles = t(1,0);
drawtype = 'nodebox'; drawtype = 'nodebox';

View File

@@ -1,13 +1,13 @@
local setMetaTable, tableCopy = setmetatable, table.copy_with_metatables local setMetaTable, TableCopy = setmetatable, table.copy_with_metatables
---@class Class ---@class Class
Class = {} Class = {}
---Returns a child class with inherited parameters from the parent class. ---Returns a child class with inherited parameters from the parent 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 setmetatable(child or {}, { __index = TableCopy(parent) })
end end
---Intended for class constructors. ---Intended for class constructors.
@@ -23,7 +23,7 @@ function Class.getInstance(self, params, metatable)
metatable = {} metatable = {}
end end
metatable.__index = tableCopy(self) metatable.__index = TableCopy(self)
local instance = setMetaTable(params, metatable) local instance = setMetaTable(params, metatable)

View File

@@ -1,4 +0,0 @@
local modInfo = Mod.getInfo('smc__ui__work_station')
local require = modInfo.require
return require('WorkStationUI')

View File

@@ -1,2 +0,0 @@
name = smc__ui__work_station
depends = smc__core__formspec

View File

@@ -1,40 +0,0 @@
local modInfo = Mod.getInfo('smc__core__formspec')
local require = modInfo.require
---@type Formspec
local Formspec = require('Formspec')
---@class WorkStationUI
local WorkStationUI = {}
---@param items string[]
---@return string
function WorkStationUI:selectionCraftForm(items)
local listForm = Formspec:new({
size = {x=10, y=8},
})
local listFormItems = Formspec:new()
table.sort(items)
local w, h = 0, 0
---@param name string
for _, name in ipairs(items) do
listFormItems:itemImageButton(w, h, 2, 2, name, name..'::item_button')
w = w + 2
if w > 9 then
w = 0
h = h + 2
end
end
listForm:
scrollContainer(listFormItems, 0.5, 0.5, 8, 6, 'work_station:list_items', 'vertical'):
scrollbar(8, 0.5, 0.25, 7, 'vertical', 'work_station:list_items')
return listForm:toString()
end
return WorkStationUI