19 Commits

Author SHA1 Message Date
bc03aa4ba6 Rename custom field use snake_case and _ 2026-02-08 18:42:07 +03:00
04f90a7b2d Submodules: update ide-helper 2026-02-08 16:46:44 +03:00
66380fb873 WorkStation: create WorkStation class, register test node & crafts, add work station UI 2026-02-07 22:14:07 +03:00
169dd64bce CraftSystem: minor fixes 2026-02-07 22:13:16 +03:00
613b7ead83 Submodules: update ide-helper 2026-02-07 20:35:59 +03:00
94dc3fa819 CraftSystem: rewrite system, completion of work on immersive craft 2026-02-06 18:19:38 +03:00
6c77b5a38c Class: minor fixes 2026-02-06 17:14:02 +03:00
c41ee05b55 CraftSystem: add lastline space 2026-02-06 16:53:32 +03:00
87c6e5f3f3 CraftSystem: Immersive craft part 2 2026-02-05 22:30:25 +03:00
e435b21b43 Item: Corrections to the design, added the last empty lines 2026-02-02 14:25:20 +03:00
0baa7af759 Entity: create dummy-class 2026-02-02 14:19:14 +03:00
83304bbfc1 CraftSystem: add dummy-class ImmersiveCraftStage 2026-02-02 13:59:12 +03:00
7dbd2f3be8 CraftSystem: add immersive craft handler (no realisation) 2026-02-02 13:46:06 +03:00
b41448da7b CraftSystem: add primitive craft handler 2026-02-02 13:33:12 +03:00
865f46b734 Add Item.Rarity 2026-02-01 20:51:23 +03:00
3dd28858f5 Add some rocks 2026-02-01 19:44:59 +03:00
Van
9119582ddd Обновить .gitea/pull_request_template.yml 2026-01-29 16:04:00 +03:00
Van
a12091fc93 Обновить .gitea/pull_request_template.yml 2026-01-29 16:03:28 +03:00
Van
cfadf47951 Обновить .gitea/pull_request_template.yml 2026-01-29 16:02:47 +03:00
36 changed files with 703 additions and 215 deletions

View File

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

View File

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

View File

@@ -1,117 +1,28 @@
local HASH_SPLITTER = '&'
local modInfo = Mod.getInfo('smc__core__craft_system')
local require = modInfo.require
---@alias CraftSystem.shapelessCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ShapelessCraft[]>>
---@alias CraftSystem.processualCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ProcessualCraft[]>>
---@type CraftSystem.PrimitiveCraftHandler
local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler')
---@type CraftSystem.ImmersiveCraftHandler
local ImmersiveCraftHandler= require('CraftSystem.ImmersiveCraftHandler')
---@alias CraftSystem.CraftGroup string
---@alias CraftSystem.CraftRecipe string[]
---@alias CraftSystem.CraftType 'primitive'|'immersive'
---@class CraftSystem
---@field shapelessCraftsList CraftSystem.shapelessCraftsList
---@field processualCraftsList CraftSystem.processualCraftsList
local CraftSystem = {
shapelessCraftsList = {},
processualCraftsList = {},
}
local CraftSystem = {}
---@alias CraftSystem.Craft.Type
---|'shapeless'
---|'processual'
---@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
---@param craftName string
---@param def CraftSystem.PrimitiveCraftDef
function CraftSystem.registerPrimitiveCraft(craftName, def)
PrimitiveCraftHandler:addCraft(craftName, def)
end
---@param type CraftSystem.Craft.Type
---@param group CraftSystem.Craft.Group
---@return table<string, table>
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
---@param craftName string
---@param def CraftSystem.ImmersiveCraftDef
function CraftSystem.registerImmersiveCraft(craftName, def)
ImmersiveCraftHandler:addCraft(craftName, def)
end
---@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
return CraftSystem

View File

@@ -0,0 +1,13 @@
---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

@@ -0,0 +1,47 @@
---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

@@ -0,0 +1,51 @@
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

@@ -0,0 +1,56 @@
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

@@ -0,0 +1,39 @@
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

@@ -0,0 +1,38 @@
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

@@ -0,0 +1,39 @@
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

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

View File

@@ -0,0 +1,16 @@
local getInstance = Class.getInstance
---@class Entity
local Entity = {}
---@param def Entity.EntityDefinition
---@return Entity
function Entity:new(def)
local instance = getInstance(self, {
})
return instance
end
return Entity

View File

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

View File

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

View File

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

View File

@@ -1,51 +1,102 @@
local getInstance = Class.getInstance
local getInstance, extend = Class.getInstance, Class.extend
local tableCopy, tableMerge, colorize = table.copy, table.merge, core.colorize
local modInfo = Mod.getInfo('smc__core__item')
local require = modInfo.require
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
---@field itemDef Item.ItemDefinition
---@field luantiDef table
---@field getVisual fun(): string
---@field defaultDef Item.ItemDefinition
---@field itemDef Item.ItemDefinition
---@field luantiDef ItemDefinition
---@field getVisual fun(): string
---@field defaultDef Item.ItemDefinition
local Item = {
defaultDef = {
settings = {
name = '',
title = '',
description = '',
titleColor = '#FFFFFF',
descriptionColor = '#C0C0C0',
addModName = true,
name = '',
_title = '',
_description = '',
_title_color = '#FFFFFF',
_description_color = '#C0C0C0',
_rarity = 'common',
_add_mod_name = true,
},
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
---@type fun(...):(NodeDefinition|ItemDefinition)
local defMerge = function(...)
return table.merge(...)
return tableMerge(...)
end
---@param itemDef Item.ItemDefinition
---@return NodeDefinition|ItemDefinition
---@param itemDef Item.ItemDefinition
---@return NodeDefinition|ItemDefinition
local function itemDefToLuantiDef(itemDef)
local modName = Mod.getInfo().shortName
local S = core.get_translator(modName)
itemDef = table.copy(itemDef)
itemDef = tableCopy(itemDef)
local s = itemDef.settings
local c = itemDef.callbacks
if s.addModName then
if s._add_mod_name then
s.name = modName .. ':' .. s.name
end
local title = s.title
local description = s.description
local title = s._title
local description = s._description
if title == nil or title == '' then
title = string.match(s.name, '%S:(%S+)')..'-title'
@@ -55,59 +106,68 @@ local function itemDefToLuantiDef(itemDef)
description = string.match(s.name, '%S:(%S+)')..'-desc'
end
if s.titleColor ~= nil and s.descriptionColor ~= nil then
description = core.colorize(s.titleColor ,S(title))..'\n'..
core.colorize(s.descriptionColor, S(description))
if s._title_color ~= nil and s._description_color ~= nil then
description = colorize(s._title_color ,S(title))..'\n'..
colorize(s._description_color, S(description))
else
error('Item description color parameters cannot be empty.')
end
s.title, s.description = nil, description
assert(s._rarity ~= nil, 'The rarity of an item cannot be empty.')
description = addRarityToDesc(s._rarity, description)
s.description = description..core.get_background_escape_sequence('#110F13')
local luantiDef = defMerge(s, c)
return luantiDef
end
---@param luantiDef NodeDefinition|ItemDefinition
---@param luantiDef NodeDefinition
local function register3dItem(luantiDef)
local ld = luantiDef
local name = ld.name
ld.name = nil
local name = luantiDef.name
luantiDef.name = nil
core.register_node(':'..name, luantiDef)
end
---@param luantiDef ItemDefinition
local function registerFlatItem(luantiDef)
local ld = luantiDef
local name = ld.name
ld.name = nil
local name = luantiDef.name
luantiDef.name = nil
core.register_craftitem(':'..name, luantiDef)
end
---The alias `table.merge` for EmmyLua
---@type fun(...):(Item.ItemDefinition)
local defMerge = function(...)
return table.merge(...)
return tableMerge(...)
end
---@param itemDef Item.ItemDefinition|Node.NodeDefinition
---@return Item
function Item:new(itemDef)
---@param def Item.ItemDefinition|Node.NodeDefinition
---@return Item
function Item:new(def)
assert(def.settings.description == nil,
'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)
def = defMerge(def, self.defaultDef, true)
---@type Item
local instance = getInstance(self, {})
local luantiDef = itemDefToLuantiDef(itemDef)
local visual = itemDef.settings.visual
local luantiDef = itemDefToLuantiDef(def)
local visual = def.settings._visual
if visual == nil then
visual = 'item_2d'
end
itemDef.settings.visual = nil
def.settings._visual = nil
if visual == 'item_3d' then
register3dItem(luantiDef)
@@ -120,7 +180,7 @@ function Item:new(itemDef)
return visual
end
instance.itemDef = itemDef
instance.itemDef = def
instance.luantiDef = luantiDef
return instance
@@ -133,7 +193,7 @@ end
---@return Item
function Item:getExtended(defaultDef)
---@type Item
local ChildClass = Class.extend(self, {
local ChildClass = extend(self, {
defaultDef = defaultDef,
})

View File

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

View File

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

View File

@@ -5,38 +5,40 @@ local Settings = {}
---@type string
Settings.name = ''
---@type string?
Settings.description = nil
---Whether to add the mod name to the settings.name. Default: `true`
---@type boolean?
Settings.addModName = nil
Settings._add_mod_name = nil
---Item description. 1st line of item description.
---@type string?
Settings.title = nil
Settings._title = nil
---Item description. The rest of item description.
---@type string?
Settings.description = nil
Settings._description = nil
---Item title color in description.
---
---Default: `#FFFFFF`
---@type ColorString?
Settings.titleColor = nil
Settings._title_color = nil
---Item description color in description.
---
---Default: `#C0C0C0`
---@type ColorString?
Settings.descriptionColor = nil
---@alias Item.Visual
---'item_2d'|
---'item_3d'
Settings._description_color = nil
---Visual node type.
---@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.
@@ -183,4 +185,4 @@ Settings.touch_interaction = nil
Settings.sound = nil
return Settings
return Settings

View File

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

View File

@@ -22,7 +22,7 @@ function Node:new(nodeDef)
---Adding default parameters
nodeDef = defMerge(nodeDef, self.defaultDef, true)
nodeDef.settings.visual = 'item_3d'
nodeDef.settings._visual = 'item_3d'
---@type Node
local instance = Item:new(nodeDef)

View File

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

View File

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

View File

@@ -0,0 +1,112 @@
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.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

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

View File

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

View File

@@ -8,7 +8,7 @@ local Node = Mod.getInfo('smc__core__node').require('Node')
local defaultRockDef = {
settings = {
name = "",
description = "A rocks",
_description = "A rocks",
tiles = {},
groups = {
dig_immediate = 2,
@@ -45,9 +45,28 @@ local function registerRocksTypes(postfix, x)
})
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('_block', 2)
registerRocksTypes('_bricks', 5)
registerRocksTypes('_chipped', 1)
registerRocksTypes('_block', 3)
registerRocksTypes('_bricks', 4)
registerRocksTypes('_bricks_2', 5)
--[[
rockFactory:registerItems({

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 151 KiB

View File

@@ -8,7 +8,7 @@ local Node = Mod.getInfo('smc__core__node').require('Node')
local defaultSoilDef = {
settings = {
name = "",
description = "A soil",
_description = "A soil",
tiles = {},
groups = {
dig_immediate = 2,
@@ -47,7 +47,7 @@ soilFactory:registerItems({
{
settings = {
name = "clay_soil_baren",
title = "Barren Clay Soil",
_title = "Barren Clay Soil",
--description = "",
tiles = clayTiles,
},
@@ -56,7 +56,7 @@ soilFactory:registerItems({
{
settings = {
name = "clay_soil_poor",
title = "Poor Clay Soil",
_title = "Poor Clay Soil",
--description = "",
tiles = clayTiles,
},
@@ -65,7 +65,7 @@ soilFactory:registerItems({
{
settings = {
name = "clay_soil_moderate",
title = "Moderate Clay Soil",
_title = "Moderate Clay Soil",
--description = "",
tiles = clayTiles,
},
@@ -74,7 +74,7 @@ soilFactory:registerItems({
{
settings = {
name = "clay_soil_fertile",
title = "Fertile Clay Soil",
_title = "Fertile Clay Soil",
--description = "",
tiles = clayTiles,
},
@@ -83,7 +83,7 @@ soilFactory:registerItems({
{
settings = {
name = "clay_soil_rich",
title = "Rich Clay Soil",
_title = "Rich Clay Soil",
--description = "",
tiles = clayTiles,
},
@@ -96,7 +96,7 @@ soilFactory:registerItems({
{
settings = {
name = "sandy_soil_baren",
title = "Barren Sandy Soil",
_title = "Barren Sandy Soil",
--description = "",
tiles = sandyTiles,
},
@@ -105,7 +105,7 @@ soilFactory:registerItems({
{
settings = {
name = "sandy_soil_poor",
title = "Poor Sandy Soil",
_title = "Poor Sandy Soil",
--description = "",
tiles = sandyTiles,
},
@@ -114,7 +114,7 @@ soilFactory:registerItems({
{
settings = {
name = "sandy_soil_moderate",
title = "Moderate Sandy Soil",
_title = "Moderate Sandy Soil",
--description = "",
tiles = sandyTiles,
},
@@ -123,7 +123,7 @@ soilFactory:registerItems({
{
settings = {
name = "sandy_soil_fertile",
title = "Fertile Sandy Soil",
_title = "Fertile Sandy Soil",
--description = "",
tiles = sandyTiles,
},
@@ -132,7 +132,7 @@ soilFactory:registerItems({
{
settings = {
name = "sandy_soil_rich",
title = "Rich Sandy Soil",
_title = "Rich Sandy Soil",
--description = "",
tiles = sandyTiles,
},
@@ -145,7 +145,7 @@ soilFactory:registerItems({
{
settings = {
name = "mixed_soil_baren",
title = "Barren Mixed Soil",
_title = "Barren Mixed Soil",
--description = "",
tiles = mixedTiles,
},
@@ -154,7 +154,7 @@ soilFactory:registerItems({
{
settings = {
name = "mixed_soil_poor",
title = "Poor Mixed Soil",
_title = "Poor Mixed Soil",
--description = "",
tiles = mixedTiles,
},
@@ -163,7 +163,7 @@ soilFactory:registerItems({
{
settings = {
name = "mixed_soil_moderate",
title = "Moderate Mixed Soil",
_title = "Moderate Mixed Soil",
--description = "",
tiles = mixedTiles,
},
@@ -172,7 +172,7 @@ soilFactory:registerItems({
{
settings = {
name = "mixed_soil_fertile",
title = "Fertile Mixed Soil",
_title = "Fertile Mixed Soil",
--description = "",
tiles = mixedTiles,
},
@@ -181,7 +181,7 @@ soilFactory:registerItems({
{
settings = {
name = "mixed_soil_rich",
title = "Rich Mixed Soil",
_title = "Rich Mixed Soil",
--description = "",
tiles = mixedTiles,
},
@@ -194,43 +194,47 @@ soilFactory:registerItems({
{
settings = {
name = "rocky_soil_baren",
title = "Barren Rocky Soil",
_title = "Barren Rocky Soil",
--description = "",
tiles = rockyTiles,
rarity = 'uncommon'
},
},
---@type Node.NodeDefinition
{
settings = {
name = "rocky_soil_poor",
title = "Poor Rocky Soil",
_title = "Poor Rocky Soil",
--description = "",
tiles = rockyTiles,
rarity = 'distinguished'
},
},
---@type Node.NodeDefinition
{
settings = {
name = "rocky_soil_moderate",
title = "Moderate Rocky Soil",
_title = "Moderate Rocky Soil",
--description = "",
tiles = rockyTiles,
rarity = 'eminent'
},
},
---@type Node.NodeDefinition
{
settings = {
name = "rocky_soil_fertile",
title = "Fertile Rocky Soil",
_title = "Fertile Rocky Soil",
--description = "",
tiles = rockyTiles,
rarity = 'prime'
},
},
---@type Node.NodeDefinition
{
settings = {
name = "rocky_soil_rich",
title = "Rich Rocky Soil",
_title = "Rich Rocky Soil",
--description = "",
tiles = rockyTiles,
},
@@ -248,6 +252,7 @@ Node:new({
groups = {
dig_immediate = 2,
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 = {
settings = {
name = "",
description = "A log",
_description = "A log",
tiles = {},
groups = {
dig_immediate = 2,
@@ -21,7 +21,7 @@ local defaultRockDef = {
local defaultPlanksDef = {
settings = {
name = "",
description = "A planks",
_description = "A planks",
tiles = {},
groups = {
dig_immediate = 2,
@@ -54,7 +54,7 @@ logFactory:registerItems({
{
settings = {
name = "marentine_log",
title = "Marentine Log",
_title = "Marentine Log",
--description = "",
tiles = t(0, 1),
},
@@ -63,7 +63,7 @@ logFactory:registerItems({
{
settings = {
name = "allwhere_log",
title = "Allwhere Log",
_title = "Allwhere Log",
--description = "",
tiles = t(2, 1),
},
@@ -72,7 +72,7 @@ logFactory:registerItems({
{
settings = {
name = "fis_log",
title = "Fis Log",
_title = "Fis Log",
--description = "",
tiles = t(4, 1),
},
@@ -81,7 +81,7 @@ logFactory:registerItems({
{
settings = {
name = "tammoy_log",
title = "Tammoy Log",
_title = "Tammoy Log",
--description = "",
tiles = t(6, 1),
},
@@ -90,7 +90,7 @@ logFactory:registerItems({
{
settings = {
name = "dallalia_log",
title = "Dallalia Log",
_title = "Dallalia Log",
--description = "",
tiles = t(8, 1),
},
@@ -99,7 +99,7 @@ logFactory:registerItems({
{
settings = {
name = "zuph_log",
title = "Zuph Log",
_title = "Zuph Log",
--description = "",
tiles = t(10, 1),
},
@@ -111,7 +111,7 @@ planksFactory:registerItems({
{
settings = {
name = "marentine_planks",
title = "Marentine Planks",
_title = "Marentine Planks",
--description = "",
tiles = { logTileSheet:t(0, 4) },
},
@@ -120,7 +120,7 @@ planksFactory:registerItems({
{
settings = {
name = "allwhere_planks",
title = "Allwhere Planks",
_title = "Allwhere Planks",
--description = "",
tiles = { logTileSheet:t(2, 4) },
},
@@ -129,7 +129,7 @@ planksFactory:registerItems({
{
settings = {
name = "fis_planks",
title = "Fis Planks",
_title = "Fis Planks",
--description = "",
tiles = { logTileSheet:t(4, 4) },
},
@@ -138,7 +138,7 @@ planksFactory:registerItems({
{
settings = {
name = "tammoy_planks",
title = "Tammoy Planks",
_title = "Tammoy Planks",
--description = "",
tiles = { logTileSheet:t(6, 4) },
},
@@ -147,7 +147,7 @@ planksFactory:registerItems({
{
settings = {
name = "dallalia_planks",
title = "Dallalia Planks",
_title = "Dallalia Planks",
--description = "",
tiles = { logTileSheet:t(8, 4) },
},
@@ -156,7 +156,7 @@ planksFactory:registerItems({
{
settings = {
name = "zuph_planks",
title = "Zuph Planks",
_title = "Zuph Planks",
--description = "",
tiles = { logTileSheet:t(10, 4) },
},
@@ -183,7 +183,7 @@ planksFactory:registerItems({
{
settings = {
name = "case_closed",
title = "Case",
_title = "Case",
--description = "",
tiles = t(0,0)
},
@@ -192,7 +192,7 @@ planksFactory:registerItems({
{
settings = {
name = "case_open",
title = "Case",
_title = "Case",
--description = "",
tiles = t(1,0);
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 = {}
---Returns a child class with inherited parameters from the parent class.
---@param parent table
---@param child table
function Class.extend(parent ,child)
return setmetatable(child or {}, { __index = TableCopy(parent) })
---@param child table?
function Class.extend(parent, child)
return setMetaTable(child or {}, { __index = tableCopy(parent) })
end
---Intended for class constructors.
@@ -23,7 +23,7 @@ function Class.getInstance(self, params, metatable)
metatable = {}
end
metatable.__index = TableCopy(self)
metatable.__index = tableCopy(self)
local instance = setMetaTable(params, metatable)

View File

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

View File

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

View File

@@ -0,0 +1,40 @@
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