Compare commits
3 Commits
mapgen-opt
...
tahrion_te
| Author | SHA1 | Date | |
|---|---|---|---|
| cfa75bd8f3 | |||
| b08f808167 | |||
| eb69779b0d |
@@ -32,8 +32,7 @@
|
||||
"vector",
|
||||
"Ensure",
|
||||
"string",
|
||||
"string_utf8",
|
||||
"Profiler"
|
||||
"string_utf8"
|
||||
],
|
||||
"globalsRegex": []
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: PR-template
|
||||
about: PR-template
|
||||
name: Сообщение об ошибке
|
||||
about: Сообщить о недоработке игры, которую необходимо исправить.
|
||||
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: false
|
||||
required: true
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# Source code licensing
|
||||
Source code licensing:
|
||||
|
||||
**The MIT License (MIT)**
|
||||
|
||||
Copyright (c) 2025 Apancore.Studio, Van (varttist), Doloment
|
||||
The MIT License (MIT)
|
||||
Copyright (c) 2025 Apancore.Studio, Doloment
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
@@ -12,13 +11,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
||||
|
||||
------------------------
|
||||
|
||||
# Sprites licensing
|
||||
Sprites licensing:
|
||||
|
||||
**CC BY 4.0**
|
||||
|
||||
Copyright (c) 2025 Apancore.Studio, Van (varttist) and others (see list below)
|
||||
|
||||
All textures except those listed here are copyrighted by Van (varttist) and are distributed under the CC BY 4.0.
|
||||
CC BY 4.0
|
||||
Copyright (c) 2025 Apancore.Studio, Doloment and others (see list below)
|
||||
|
||||
List of all textures and authors:
|
||||
- ...
|
||||
@@ -1,4 +0,0 @@
|
||||
local modInfo = Mod.getInfo('smc__core__base_ui')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('BaseUI')
|
||||
@@ -1,2 +0,0 @@
|
||||
name = smc__core__base_ui
|
||||
depends = smc__system__system_loader
|
||||
@@ -1,130 +0,0 @@
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@class BaseUI
|
||||
---Context for transferring data between displaying
|
||||
---the form spec to the player and handling callbacks.
|
||||
---@field name string
|
||||
---@field getFormSpecString fun(self:BaseUI,playerName:string,...):string
|
||||
---@field contex table<string, table>
|
||||
local BaseUI = {
|
||||
contex = {}
|
||||
}
|
||||
|
||||
---@param name string The name of the formspec that will be shown to the player. It is recommended that the name be unique.
|
||||
---@param getFormSpecString fun(self:BaseUI,playerName:string,...):string
|
||||
---@param clearContex boolean? Whether to clear the context stored for a player when that player closes the form. Default `true`.
|
||||
function BaseUI:new(name, getFormSpecString, clearContex)
|
||||
if clearContex == nil then
|
||||
clearContex = true
|
||||
end
|
||||
|
||||
---@type BaseUI
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.getFormSpecString = getFormSpecString
|
||||
|
||||
if clearContex then
|
||||
core.log(name)
|
||||
-- Ensure that when the form is closed, the context is cleared.
|
||||
instance:registerOnFormQuit(function(player)
|
||||
instance:clearContex(player)
|
||||
end)
|
||||
end
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
---Set a value for a specific key.
|
||||
---Recommended for use where `core.show_formspec` is used.
|
||||
---
|
||||
---In the future, the key value can be obtained in the formspec callback.
|
||||
---@param player string|Player Player as an object (entity) or his name
|
||||
---@param key string
|
||||
---@param value any
|
||||
function BaseUI:setContex(player, key, value)
|
||||
if type(player) ~= 'string' then
|
||||
player = player:get_player_name()
|
||||
end
|
||||
|
||||
local contex = self.contex[player]
|
||||
|
||||
if contex == nil then
|
||||
self.contex[player] = {[key]=value}
|
||||
else
|
||||
contex[key] = value
|
||||
end
|
||||
end
|
||||
|
||||
---Get the value of a specific key.
|
||||
---Recommended for use in a formspec callback.
|
||||
---@param player string|Player Player as an object (entity) or his name
|
||||
---@param key string
|
||||
---@return any?
|
||||
function BaseUI:getContex(player, key)
|
||||
if type(player) ~= 'string' then
|
||||
player = player:get_player_name()
|
||||
end
|
||||
|
||||
local contex = self.contex[player] or {}
|
||||
return contex[key]
|
||||
end
|
||||
|
||||
---Clear saved context data for a player.
|
||||
---Recommended for use when closing formspec.
|
||||
---@param player string|Player Player as an object (entity) or his name
|
||||
function BaseUI:clearContex(player)
|
||||
if type(player) ~= 'string' then
|
||||
player = player:get_player_name()
|
||||
end
|
||||
|
||||
self.contex[player] = {}
|
||||
end
|
||||
|
||||
---Register a callback for a specific player action in FormSpec.
|
||||
---
|
||||
---The callback is guaranteed to be called only for the specified field.
|
||||
---@param fieldName string the name of the field for which the callback will be called.
|
||||
---@param callback fun(player:Player, fieldName:string, fieldValue:any) Callback to handle the action. Parameters:
|
||||
--- * `player` - the player who performed the action.
|
||||
--- * `fieldName` - the name of the field on which the callback is called.
|
||||
--- * `fieldValue` - the field value that is passed in the `fields` table.
|
||||
function BaseUI:registerOnFormFieldAction(fieldName, callback)
|
||||
Smc.registerOnFormFieldAction(self.name, fieldName, callback)
|
||||
end
|
||||
|
||||
---Register a callback function to close the FormSpec.
|
||||
---
|
||||
---The callback is guaranteed to be called only for the specified form.
|
||||
---@param callback fun(player:Player) Callback to handle the close. Parameters:
|
||||
--- * `player` - the player who closed the form.
|
||||
function BaseUI:registerOnFormQuit(callback)
|
||||
Smc.registerOnFormQuit(self.name, callback)
|
||||
end
|
||||
|
||||
---Register a callback for a specific player action in FormSpec.
|
||||
---
|
||||
---The callback function is guaranteed to be called only for the specified form and
|
||||
---for the field whose name matches the pattern.
|
||||
---@param fieldNamePattern string the name pattern of the field for which the callback will be called.
|
||||
---@param callback fun(player:Player, fieldName:string, fieldValue:any) Callback to handle the action. Parameters:
|
||||
--- * `player` - the player who performed the action.
|
||||
--- * `fieldName` - the name of the field on which the callback is called (will match the pattern).
|
||||
--- * `fieldValue` - the field value that is passed in the `fields` table.
|
||||
function BaseUI:registerOnFormFieldActionMatch( fieldNamePattern, callback)
|
||||
Smc.registerOnFormFieldActionMatch(self.name, fieldNamePattern, callback)
|
||||
end
|
||||
|
||||
---Shows the player the FormSpec registered by the instance of this UI.
|
||||
---@param playerName string
|
||||
function BaseUI:showForm(playerName, ...)
|
||||
core.show_formspec(playerName, self.name, self:getFormSpecString(playerName, ...))
|
||||
end
|
||||
|
||||
---Close the player the FormSpec registered by the instance of this UI.
|
||||
---@param playerName string
|
||||
function BaseUI:closeForm(playerName)
|
||||
core.close_formspec(playerName, self.name)
|
||||
end
|
||||
|
||||
|
||||
return BaseUI
|
||||
@@ -2,6 +2,7 @@
|
||||
local Control = {}
|
||||
|
||||
-- control.on_press
|
||||
Events.registerEvent('control.on_press')
|
||||
|
||||
---@param callbackFunc fun(player:Player, controlName:string)
|
||||
function Control.subcribeOnPress(callbackFunc)
|
||||
@@ -10,6 +11,7 @@ end
|
||||
|
||||
|
||||
-- control.on_release
|
||||
Events.registerEvent('control.on_release')
|
||||
|
||||
---@param callbackFunc fun(player:Player, controlName:string, holdTime:number)
|
||||
function Control.subcribeOnRelease(callbackFunc)
|
||||
@@ -18,6 +20,7 @@ end
|
||||
|
||||
|
||||
-- control.on_hold
|
||||
Events.registerEvent('control.on_hold')
|
||||
|
||||
---@param callbackFunc fun(player:Player, controlName:string, holdTime:number, dtime:number)
|
||||
function Control.subcribeOnHold(callbackFunc)
|
||||
@@ -26,6 +29,7 @@ end
|
||||
|
||||
|
||||
-- control.on_wield_change
|
||||
Events.registerEvent('control.on_wield_change')
|
||||
|
||||
---@param callbackFunc fun(player:Player, player_wield_index:number, player_last_wield_index:number)
|
||||
function Control.subcribeOnWieldChange(callbackFunc)
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
name = smc__core__craft_system
|
||||
depends = smc__system__system_loader, smc__core__creature
|
||||
depends = smc__system__system_loader
|
||||
|
||||
@@ -1,28 +1,117 @@
|
||||
local HASH_SPLITTER = '&'
|
||||
|
||||
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||
local require = modInfo.require
|
||||
|
||||
---@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'
|
||||
---@alias CraftSystem.shapelessCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ShapelessCraft[]>>
|
||||
---@alias CraftSystem.processualCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ProcessualCraft[]>>
|
||||
|
||||
---@class CraftSystem
|
||||
local CraftSystem = {}
|
||||
---@field shapelessCraftsList CraftSystem.shapelessCraftsList
|
||||
---@field processualCraftsList CraftSystem.processualCraftsList
|
||||
local CraftSystem = {
|
||||
shapelessCraftsList = {},
|
||||
processualCraftsList = {},
|
||||
}
|
||||
|
||||
---@param craftName string
|
||||
---@param def CraftSystem.PrimitiveCraftDef
|
||||
function CraftSystem.registerPrimitiveCraft(craftName, def)
|
||||
PrimitiveCraftHandler:registerCraft(craftName, def)
|
||||
---@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
|
||||
end
|
||||
|
||||
---@param craftName string
|
||||
---@param def CraftSystem.ImmersiveCraftDef
|
||||
function CraftSystem.registerImmersiveCraft(craftName, def)
|
||||
ImmersiveCraftHandler:registerCraft(craftName, def)
|
||||
---@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
|
||||
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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -1,237 +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.ImmersiveCraftCounter
|
||||
local ImmersiveCraftCounter = require('CraftSystem.ImmersiveCraftCounter')
|
||||
|
||||
---Types of immersive stages.
|
||||
---@class CraftSystem.StagesTypes : table<CraftSystem.ImmersiveCraftStage.Type, CraftSystem.ImmersiveCraftStage>
|
||||
local stageTypes = {
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingStage
|
||||
tapping = require('CraftSystem.ImmersiveCraftStage.TappingStage'),
|
||||
}
|
||||
|
||||
---Immersive crafting aimed at a more logical process of crafting items.
|
||||
---@class CraftSystem.ImmersiveCraft : CraftSystem.BaseCraft
|
||||
---@field startStageName string
|
||||
---@field triggerItem string
|
||||
---@field output ItemStackString
|
||||
---@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)
|
||||
-- We create a table of crafting stages that the player needs to complete.
|
||||
---@type table<string, CraftSystem.ImmersiveCraftStage>
|
||||
local stagesByName = {}
|
||||
|
||||
for _, stageDef in ipairs(def.stages) do
|
||||
-- We get the stage class based on its type.
|
||||
local StageClass = stageTypes[stageDef.type]
|
||||
|
||||
-- Create a stage and add the craft name to the instance.
|
||||
stageDef.craftName = name
|
||||
local stage = StageClass:new(stageDef)
|
||||
|
||||
-- We add an instance of the stage to the table by name.
|
||||
stagesByName[stageDef.name] = stage
|
||||
end
|
||||
|
||||
---@type CraftSystem.ImmersiveCraft
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.group = def.group
|
||||
instance.startStageName = def.startStageName
|
||||
instance.triggerItem = def.triggerItem
|
||||
instance.output = def.output
|
||||
instance.stagesByName = stagesByName
|
||||
|
||||
-- Subscribe to an event that will determine that the player has completed the crafting stage.
|
||||
Events.subscribe('craft_system:next_immersive_stage:'..name,
|
||||
---@param eventName string
|
||||
---@param stage CraftSystem.ImmersiveCraftStage
|
||||
---@param pos MapPosition
|
||||
---@param Player Player
|
||||
function(eventName, stage, pos, Player)
|
||||
-- From the current stage (which has been completed) we get the name of the next one.
|
||||
local nextStageName = stage.nextStage
|
||||
|
||||
-- If there is no next stage...
|
||||
if nextStageName == nil then
|
||||
-- ...we are finishing the craft.
|
||||
instance:endCraft(pos, Player)
|
||||
else
|
||||
-- ...else we start the next stage.
|
||||
local nextStage = instance.stagesByName[nextStageName]
|
||||
|
||||
-- We get a table of temporary data.
|
||||
local craftData = Smc.getCraftDataByPos(pos)
|
||||
assert(craftData ~= nil, 'Immersive crafting data is empty.')
|
||||
|
||||
-- We are updating the crafting stage in it.
|
||||
craftData.stageName = nextStageName
|
||||
-- We save it to the workstation metadata.
|
||||
Smc.setCraftDataByPos(pos, craftData)
|
||||
|
||||
-- We are starting the next stage of crafting.
|
||||
nextStage:startHandler(pos, Player)
|
||||
end
|
||||
end)
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
---Initialize the start of the immersive crafting process.
|
||||
---
|
||||
---Returns `true` if the crafting process was running.
|
||||
---@param pos MapPosition
|
||||
---@param player Player
|
||||
---@param amount integer
|
||||
---@return boolean
|
||||
function ImmersiveCraft:startCraft(pos, player, amount)
|
||||
-- Adding craft to the counter.
|
||||
-- If crafting has not been added...
|
||||
if not ImmersiveCraftCounter:addCraft(pos, player:get_player_name()) then
|
||||
-- ...then we don't let the player start a new craft.
|
||||
core.chat_send_player(player:get_player_name(),
|
||||
'The limit of simultaneously active crafts has been reached: '..
|
||||
'complete or cancel active crafts to start a new one')
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
-- We get the material as an ItemStack.
|
||||
---@type ItemStack
|
||||
local stack = ItemStack(self.triggerItem)
|
||||
-- We edit the amount of materials in accordance with the number of crafts being performed.
|
||||
stack:set_count(stack:get_count() * amount)
|
||||
|
||||
-- We get the player's inventory, from where we must take the materials for crafting.
|
||||
local playerInventory = player:get_inventory()
|
||||
|
||||
-- If the player does not have the necessary materials for crafting...
|
||||
if not playerInventory:contains_item('main', stack) then
|
||||
-- ...we inform him about this.
|
||||
core.chat_send_player(player:get_player_name(),
|
||||
'Not enough materials for crafting')
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
-- If we have the materials, we take them and start initializing the craft.
|
||||
playerInventory:remove_item('main', stack)
|
||||
|
||||
-- We get the first stage of crafting.
|
||||
local stage = self.stagesByName[self.startStageName]
|
||||
|
||||
-- Create a temporary data table for crafting.
|
||||
---@type ImmersiveCraftData
|
||||
local craftData = {
|
||||
playerName = player:get_player_name(), -- The name of the player who started the craft.
|
||||
craftName = self.name,
|
||||
stageName = stage.name,
|
||||
amount = amount,
|
||||
}
|
||||
-- We save it to the workstation metadata.
|
||||
Smc.setCraftDataByPos(pos, craftData)
|
||||
|
||||
-- We are starting the first stage of crafting.
|
||||
stage:startHandler(pos, player)
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
---Complete the immersive crafting process.
|
||||
---@param pos MapPosition
|
||||
---@param player Player
|
||||
function ImmersiveCraft:endCraft(pos, player)
|
||||
-- We get current data on crafting.
|
||||
---@type ImmersiveCraftData?
|
||||
local craftData = Smc.getCraftDataByPos(pos)
|
||||
assert(craftData ~= nil, 'Immersive crafting data is empty.')
|
||||
|
||||
-- We drop the result of crafting.
|
||||
local dropPos = vector.new(pos) + vector.new(0, 0.9,0)
|
||||
for i=1, craftData.amount do
|
||||
core.item_drop(ItemStack(self.output), nil, dropPos)
|
||||
end
|
||||
|
||||
-- Remove craft from the counter.
|
||||
ImmersiveCraftCounter:removeCraft(pos, craftData.playerName)
|
||||
|
||||
-- Clearing the temporary data table for crafting, freeing up the work station for new crafts.
|
||||
Smc.setCraftDataByPos(pos)
|
||||
end
|
||||
|
||||
---Stop the crafting process and free up the workbench.
|
||||
---@param pos MapPosition
|
||||
function ImmersiveCraft:abortCraft(pos)
|
||||
-- We get current data on crafting.
|
||||
---@type ImmersiveCraftData?
|
||||
local craftData = Smc.getCraftDataByPos(pos)
|
||||
assert(craftData ~= nil, 'Immersive crafting data is empty.')
|
||||
|
||||
-- We get the current stage and start the abort process.
|
||||
local stage = self.stagesByName[craftData.stageName]
|
||||
stage:abortHandler(pos)
|
||||
|
||||
-- Clearing the temporary data table for crafting, freeing up the work station for new crafts.
|
||||
Smc.setCraftDataByPos(pos)
|
||||
|
||||
-- Remove craft from the counter.
|
||||
ImmersiveCraftCounter:removeCraft(pos, craftData.playerName)
|
||||
end
|
||||
|
||||
---Returns a human-readable description of the crafting process.
|
||||
---@return string
|
||||
function ImmersiveCraft:toString()
|
||||
-- We get the material as an ItemStack.
|
||||
---@type ItemStack
|
||||
local stack = ItemStack(self.triggerItem)
|
||||
-- We obtain a table of item parameters.
|
||||
---@type ItemDefinition
|
||||
local itemDef = stack:get_definition()
|
||||
|
||||
-- Let's start writing a description of the craft.
|
||||
local craftDesc = ('Material: %s x%s\n\n'):format(itemDef._title, stack:get_count())..
|
||||
'Crafting process:\n'
|
||||
|
||||
-- Let's start with the first crafting stage.
|
||||
---@type string?
|
||||
local stageName = self.startStageName
|
||||
local stages = self.stagesByName
|
||||
|
||||
-- While we have a stage name...
|
||||
local count = 1
|
||||
while stageName ~= nil do
|
||||
-- We get a crafting stage...
|
||||
local stage = stages[stageName]
|
||||
|
||||
-- ...and we add its description to the list of actions for crafting.
|
||||
craftDesc = craftDesc..tostring(count)..'. '..stage:toString()..'\n'
|
||||
|
||||
-- We also get the name of the next stage.
|
||||
stageName = stage.nextStage
|
||||
end
|
||||
|
||||
-- If the cycle is interrupted, it means we have processed all the stages.
|
||||
-- Return the craft description.
|
||||
return craftDesc
|
||||
end
|
||||
|
||||
return ImmersiveCraft
|
||||
@@ -1,78 +0,0 @@
|
||||
local posToString, getSize = core.pos_to_string, table.get_size
|
||||
|
||||
local CRAFT_LIMIT_PER_PLAYER = 2
|
||||
local CRAFT_LIMIT_PER_SERVER = 10
|
||||
|
||||
local modStorage = core.get_mod_storage()
|
||||
|
||||
---@param key string
|
||||
---@return table
|
||||
local function getStorageTable(key)
|
||||
return core.deserialize(modStorage:get_string(key)) or {}
|
||||
end
|
||||
|
||||
---@param key string
|
||||
---@param t table
|
||||
local function setStorageTable(key, t)
|
||||
modStorage:set_string(key, core.serialize(t))
|
||||
end
|
||||
|
||||
---Designed to keep track of active immersive
|
||||
---crafts so as not to overload the server.
|
||||
---
|
||||
---The counter is individual for each player,
|
||||
---but the total number of active crafts is also tracked.
|
||||
---@class CraftSystem.ImmersiveCraftCounter
|
||||
---@field craftsCountForPlayers table<string, table<string, boolean>>
|
||||
---@field craftsCountForServer table<string, boolean>
|
||||
local ImmersiveCraftCounter = {
|
||||
craftsCountForPlayers = getStorageTable('crafts_count_for_players'),
|
||||
craftsCountForServer = getStorageTable('crafts_count_for_serves')
|
||||
}
|
||||
|
||||
---Add craft to the counter.
|
||||
---
|
||||
---Returns `false` if the counter is already full.
|
||||
---@param pos MapPosition
|
||||
---@param playerName string
|
||||
---@return boolean
|
||||
function ImmersiveCraftCounter:addCraft(pos, playerName)
|
||||
if self.craftsCountForPlayers[playerName] == nil then
|
||||
self.craftsCountForPlayers[playerName] = {}
|
||||
end
|
||||
|
||||
if getSize(self.craftsCountForPlayers[playerName]) >= CRAFT_LIMIT_PER_PLAYER then
|
||||
return false
|
||||
end
|
||||
|
||||
if getSize(self.craftsCountForServer) >= CRAFT_LIMIT_PER_SERVER then
|
||||
return false
|
||||
end
|
||||
|
||||
local posString = posToString(pos)
|
||||
self.craftsCountForPlayers[playerName][posString] = true
|
||||
self.craftsCountForServer[posString] = true
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
---Remove craft from the counter.
|
||||
---@param pos MapPosition
|
||||
---@param playerName string
|
||||
function ImmersiveCraftCounter:removeCraft(pos, playerName)
|
||||
local playerCrafts = self.craftsCountForPlayers[playerName]
|
||||
if playerCrafts == nil then
|
||||
return
|
||||
end
|
||||
|
||||
local posString = posToString(pos)
|
||||
playerCrafts[posString] = nil
|
||||
self.craftsCountForServer[posString] = nil
|
||||
end
|
||||
|
||||
core.register_on_shutdown(function()
|
||||
setStorageTable('crafts_count_for_players', ImmersiveCraftCounter.craftsCountForPlayers)
|
||||
setStorageTable('crafts_count_for_server', ImmersiveCraftCounter.craftsCountForServer)
|
||||
end)
|
||||
|
||||
return ImmersiveCraftCounter
|
||||
@@ -1,71 +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')
|
||||
|
||||
---A handler for immersive crafting that requires the player to complete
|
||||
---crafting stages and interact with entities (crafting nodes)
|
||||
---@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 = {},
|
||||
})
|
||||
|
||||
---Register an immersive crafting experience that requires the player to complete
|
||||
---one or more crafting stages that involve interaction with entities (crafting nodes)
|
||||
---@param craftName string
|
||||
---@param def CraftSystem.ImmersiveCraftDef
|
||||
function ImmersiveCraftHandler:registerCraft(craftName, def)
|
||||
assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format(
|
||||
craftName))
|
||||
|
||||
-- We obtain a crafting instance according to the given parameters.
|
||||
local craft = ImmersiveCraft:new(craftName, def)
|
||||
|
||||
-- The craft group to which the craft belongs.
|
||||
local group = def.group
|
||||
|
||||
-- If no craft with this group has been registered before...
|
||||
if self.craftsByGroup[group] == nil then
|
||||
-- ...then we create a list for this group.
|
||||
self.craftsByGroup[group] = {}
|
||||
end
|
||||
|
||||
-- The material from which crafting begins (also known as the starting item).
|
||||
local triggerItem = def.triggerItem
|
||||
|
||||
-- If no crafting for such a starting item has been registered before...
|
||||
if self.craftsByTriggerItem[triggerItem] == nil then
|
||||
-- ...then we create a list for this item.
|
||||
self.craftsByTriggerItem[triggerItem] = {}
|
||||
end
|
||||
|
||||
-- Adding craft to the lists:
|
||||
self.craftsByName[craftName] = craft
|
||||
tableInsert(self.craftsByGroup[group], craft)
|
||||
tableInsert(self.craftsByTriggerItem[triggerItem], craft)
|
||||
tableInsert(self.craftsList, craft)
|
||||
end
|
||||
|
||||
---Returns a list of crafts that use the given item as a starting material.
|
||||
---
|
||||
---Will return `nil` if the item is not used in any craft as a starting item.
|
||||
---@param triggerItem string
|
||||
---@return CraftSystem.ImmersiveCraft[]?
|
||||
function ImmersiveCraftHandler:getCraftsByTriggerItem(triggerItem)
|
||||
local crafts = self.craftsByTriggerItem[triggerItem]
|
||||
|
||||
return crafts
|
||||
end
|
||||
|
||||
return ImmersiveCraftHandler
|
||||
@@ -1,14 +0,0 @@
|
||||
---@type Creature
|
||||
local Creature = Mod.getInfo('smc__core__creature').require('Creature')
|
||||
|
||||
---The entity the player interacts with during immersive crafting.
|
||||
---@class CraftSystem.ImmersiveCraftNode : Creature
|
||||
local ImmersiveCraftNode = Creature:getExtended({
|
||||
settings = {
|
||||
_name = 'craft_system:immersive_craft_node',
|
||||
_add_mod_name = false,
|
||||
initial_properties = {},
|
||||
}
|
||||
})
|
||||
|
||||
return ImmersiveCraftNode
|
||||
@@ -1,95 +0,0 @@
|
||||
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||
local require = modInfo.require
|
||||
|
||||
---@type CraftSystem.ImmersiveCraftNode
|
||||
local ImmersiveCraftNode = require('CraftSystem.ImmersiveCraftNode')
|
||||
|
||||
---A class that extends `Creature.LuaEntity` to annotate custom fields needed for immersive crafting.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class CraftSystem.ImmersiveCraftNode.LuaTappingNode : Creature.LuaEntity
|
||||
---The name of the item that the crafting node display.
|
||||
---@field _item_name ItemStackString
|
||||
---Sets the entity display of the item. If the item stack was not transferred, `self._item_name` is used.
|
||||
---@field _set_item fun(self:CraftSystem.ImmersiveCraftNode.LuaTappingNode, itemName:ItemStackString?)
|
||||
---@field _craft_name string
|
||||
---@field _stage_name string
|
||||
---@field _work_station_pos MapPosition
|
||||
|
||||
-- A crafting node (entity) that is used in the tapping crafting stage.
|
||||
local tappingNode = ImmersiveCraftNode:new({
|
||||
settings = {
|
||||
_name = 'craft_system:tapping_node',
|
||||
_add_mod_name = false,
|
||||
|
||||
---@type ObjectProperties
|
||||
initial_properties = {
|
||||
visual = 'wielditem',
|
||||
visual_size = {x=0.5, y=0.5, z=0.5},
|
||||
collisionbox = {
|
||||
-0.375, -0.375, -0.375,
|
||||
0.375, 0.375, 0.375
|
||||
},
|
||||
},
|
||||
|
||||
_item_name = '',
|
||||
_craft_name = '',
|
||||
_stage_name = '',
|
||||
_work_station_pos = {},
|
||||
},
|
||||
callbacks = {
|
||||
---@param luaEntity CraftSystem.ImmersiveCraftNode.LuaTappingNode
|
||||
on_activate = function(luaEntity, staticdata, dtime)
|
||||
-- We obtain a table of initial parameters for the craft node entity.
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingNode.InitParams?
|
||||
local params = core.deserialize(staticdata)
|
||||
|
||||
-- We enter parameters into the entity's custom fields.
|
||||
if params ~= nil then
|
||||
luaEntity._item_name = params.targetItem
|
||||
luaEntity._craft_name = params.craftName
|
||||
luaEntity._stage_name = params.stageName
|
||||
luaEntity._work_station_pos = params.WorkStationPos
|
||||
end
|
||||
|
||||
-- we set the appearance of the item to be processed on the crafting node.
|
||||
luaEntity:_set_item(luaEntity._item_name)
|
||||
-- We add an immortal group to the entity so that it cannot be killed.
|
||||
luaEntity.object:set_armor_groups({immortal = 1})
|
||||
end,
|
||||
|
||||
---@param luaEntity CraftSystem.ImmersiveCraftNode.LuaTappingNode
|
||||
on_punch = function(luaEntity, puncher, time_from_last_punch, tool_capabilities, dir, damage)
|
||||
-- We simply trigger the event that the player hits the crafting node, bound to the work station with coordinates.
|
||||
Events.call(('craft_system:punch_tapping_node:%s:%s'):format(
|
||||
luaEntity._craft_name, luaEntity._stage_name), luaEntity._work_station_pos, puncher, luaEntity)
|
||||
|
||||
return false
|
||||
end,
|
||||
|
||||
---@param luaEntity CraftSystem.ImmersiveCraftNode.LuaTappingNode
|
||||
get_staticdata = function(luaEntity)
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingNode.InitParams?
|
||||
local params = {
|
||||
targetItem = luaEntity._item_name,
|
||||
craftName = luaEntity._craft_name,
|
||||
stageName = luaEntity._stage_name,
|
||||
WorkStationPos = luaEntity._work_station_pos
|
||||
}
|
||||
|
||||
return core.serialize(params)
|
||||
end,
|
||||
|
||||
---Sets the entity display of the item. If the item stack was not transferred, `self._item_name` is used.
|
||||
---@param luaEntity CraftSystem.ImmersiveCraftNode.LuaTappingNode
|
||||
---@param itemName ItemStackString?
|
||||
_set_item = function(luaEntity, itemName)
|
||||
-- We change the entity field so that the engine itself displays it as a given item.
|
||||
luaEntity.object:set_properties({
|
||||
wield_item = itemName or luaEntity._item_name,
|
||||
})
|
||||
end,
|
||||
}
|
||||
})
|
||||
|
||||
return tappingNode
|
||||
@@ -1,43 +0,0 @@
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@alias CraftSystem.ImmersiveCraftStage.Type 'tapping'
|
||||
|
||||
---One of the stages of immersive crafting.
|
||||
---@class CraftSystem.ImmersiveCraftStage
|
||||
---@field name string
|
||||
---@field type CraftSystem.ImmersiveCraftStage.Type
|
||||
---@field craftName string
|
||||
---@field startHandler fun(self, pos:Position, player:Player)
|
||||
---@field processHandler fun(self, pos:Position, player:Player)
|
||||
---@field endHandler fun(self, pos:Position, player:Player)
|
||||
---@field abortHandler fun(self, pos:Position)
|
||||
---@field toString fun(self):string
|
||||
---@field nextStage string?
|
||||
---@field returnItems ItemStackString[]?
|
||||
local ImmersiveCraftStage = {}
|
||||
|
||||
---Definition table for the `CraftSystem.ImmersiveCraft`.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class CraftSystem.ImmersiveCraftStageDef
|
||||
---@field name string
|
||||
---@field type CraftSystem.ImmersiveCraftStage.Type
|
||||
---@field craftName string?
|
||||
---@field nextStage string?
|
||||
---@field returnItems ItemStackString[]?
|
||||
|
||||
---@param def CraftSystem.ImmersiveCraftStageDef
|
||||
---@return CraftSystem.ImmersiveCraftStage
|
||||
function ImmersiveCraftStage:new(def)
|
||||
---@type CraftSystem.ImmersiveCraftStage
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = def.name
|
||||
instance.type = def.type
|
||||
instance.craftName = def.craftName
|
||||
instance.nextStage = def.nextStage
|
||||
instance.returnItems = def.returnItems
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
return ImmersiveCraftStage
|
||||
@@ -1,202 +0,0 @@
|
||||
local extend = Class.extend
|
||||
|
||||
local getStageDataByPos, setStageDataByPos = Smc.getStageDataByPos, Smc.setStageDataByPos
|
||||
|
||||
local require = Mod.getInfo('smc__core__craft_system').require
|
||||
|
||||
---@type CraftSystem.ImmersiveCraftStage
|
||||
local ImmersiveCraftStage = require('CraftSystem.ImmersiveCraftStage')
|
||||
|
||||
---A crafting step that requires the player to hit a crafting node (entity) a certain number of times.
|
||||
---@class CraftSystem.ImmersiveCraftStage.TappingStage : CraftSystem.ImmersiveCraftStage
|
||||
---@field targetItem string
|
||||
---@field clicksNeed string
|
||||
---@field toolGroup string?
|
||||
---@field startHandler fun(self:CraftSystem.ImmersiveCraftStage.TappingStage, pos:MapPosition, Player:Player)
|
||||
---@field processHandler fun(self:CraftSystem.ImmersiveCraftStage.TappingStage, pos:MapPosition, Player:Player)
|
||||
---@field endHandler fun(self:CraftSystem.ImmersiveCraftStage.TappingStage, pos:MapPosition, Player:Player)
|
||||
---@field toString fun(self:CraftSystem.ImmersiveCraftStage.TappingStage):string
|
||||
local TappingStage = extend(ImmersiveCraftStage, {})
|
||||
|
||||
---Definition table for the `CraftSystem.ImmersiveCraftStage.TappingStage`.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class CraftSystem.ImmersiveCraftStage.TappingStageDef : CraftSystem.ImmersiveCraftStageDef
|
||||
---@field targetItem string
|
||||
---@field clicksNeed string
|
||||
---@field toolGroup string?
|
||||
|
||||
---Data table for transferring various time parameters between calls.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class ImmersiveStageData.TappingStageData : ImmersiveStageData
|
||||
---How many clicks were made by the player on the entity.
|
||||
---@field clickCount integer
|
||||
---Unique identifier of the entity (craft node).
|
||||
---@field entityGUID string
|
||||
|
||||
---@param def CraftSystem.ImmersiveCraftStage.TappingStageDef
|
||||
function TappingStage:new(def)
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingStage
|
||||
local instance = ImmersiveCraftStage:new(def)
|
||||
instance.targetItem = def.targetItem
|
||||
instance.clicksNeed = def.clicksNeed
|
||||
instance.toolGroup = def.toolGroup
|
||||
|
||||
-- Registering the crafting stage start handler.
|
||||
instance.startHandler = function(tappingStage , pos, player)
|
||||
-- We determine the coordinate where we will create the crafting node (entity).
|
||||
local entityPos = vector.new(pos) + vector.new(0,0.875,0)
|
||||
|
||||
-- We create a table of initial parameters that we will pass to the entity.
|
||||
---@class CraftSystem.ImmersiveCraftStage.TappingNode.InitParams
|
||||
local params = {
|
||||
targetItem = tappingStage.targetItem,
|
||||
craftName = tappingStage.craftName,
|
||||
stageName = tappingStage.name,
|
||||
WorkStationPos = pos,
|
||||
}
|
||||
|
||||
-- Adding an entity to the world.
|
||||
local obj = core.add_entity(entityPos, 'craft_system:tapping_node', core.serialize(params))
|
||||
|
||||
-- If the entity was not returned, something went wrong.
|
||||
if obj == nil then
|
||||
return
|
||||
end
|
||||
|
||||
-- Create a temporary table of crafting stage data.
|
||||
---@type ImmersiveStageData.TappingStageData
|
||||
local stageData = {
|
||||
clickCount = 0,
|
||||
entityGUID = obj:get_guid()
|
||||
}
|
||||
|
||||
-- Saving temporary data in work station metadata.
|
||||
setStageDataByPos(pos, stageData)
|
||||
end
|
||||
|
||||
-- Registering the crafting stage process handler.
|
||||
-- Called when a player clicks on a crafting node (entity).
|
||||
instance.processHandler = function(tappingStage, pos, player)
|
||||
-- Obtaining stage time data from work station metadata.
|
||||
---@type ImmersiveStageData.TappingStageData?
|
||||
local stageData = getStageDataByPos(pos)
|
||||
assert(stageData ~= nil, 'Immersive stage data is empty.')
|
||||
|
||||
-- Increasing the click counter
|
||||
local clickCount = stageData.clickCount
|
||||
clickCount = clickCount + 1
|
||||
|
||||
-- If the number of clicks is greater than required to complete the step...
|
||||
if clickCount >= tappingStage.clicksNeed then
|
||||
-- ...we are completing the stage.
|
||||
tappingStage:endHandler(pos, player)
|
||||
else
|
||||
-- ...else we save the number of clicks in the temporary data table.
|
||||
stageData.clickCount = clickCount
|
||||
Smc.setStageDataByPos(pos, stageData)
|
||||
end
|
||||
end
|
||||
|
||||
-- Registering the crafting stage end handler.
|
||||
instance.endHandler = function(tappingStage, pos, player)
|
||||
-- Obtaining stage time data from work station metadata.
|
||||
---@type ImmersiveStageData.TappingStageData?
|
||||
local stageData = getStageDataByPos(pos)
|
||||
assert(stageData ~= nil, 'Immersive stage data is empty.')
|
||||
|
||||
-- We get the entity object.
|
||||
local entity = Smc.getObjectByGUID(stageData.entityGUID)
|
||||
assert(entity ~= nil, 'The entity for immersive crafting is nil.')
|
||||
|
||||
-- Removing an entity from the world.
|
||||
entity:remove()
|
||||
|
||||
-- We trigger an event that the crafting stage has been completed.
|
||||
Events.call('craft_system:next_immersive_stage:'..tappingStage.craftName, tappingStage, pos, player)
|
||||
end
|
||||
|
||||
-- Registering the aborting the crafting process handler.
|
||||
---@param tappingStage CraftSystem.ImmersiveCraftStage.TappingStage
|
||||
instance.abortHandler = function(tappingStage, pos)
|
||||
-- We receive current data on crafting.
|
||||
---@type ImmersiveCraftData?
|
||||
local craftData = Smc.getCraftDataByPos(pos)
|
||||
assert(craftData ~= nil, 'Immersive crafting data is empty.')
|
||||
|
||||
-- Obtaining stage time data from work station metadata.
|
||||
---@type ImmersiveStageData.TappingStageData?
|
||||
local stageData = craftData.stageData
|
||||
assert(stageData ~= nil, 'Immersive stage data is empty.')
|
||||
|
||||
-- We get the entity object.
|
||||
local entity = Smc.getObjectByGUID(stageData.entityGUID)
|
||||
assert(entity ~= nil, 'The entity for immersive crafting is nil.')
|
||||
|
||||
-- Removing an entity from the world.
|
||||
entity:remove()
|
||||
|
||||
-- We drop the item as it was before processing.
|
||||
local dropPos = vector.new(pos)+vector.new(0, 0.9,0)
|
||||
for i=1, craftData.amount do
|
||||
core.item_drop(ItemStack(tappingStage.targetItem), nil, dropPos)
|
||||
end
|
||||
end
|
||||
|
||||
-- Returns a human-readable description of the crafting stage.
|
||||
instance.toString = function(tappingStage)
|
||||
local stageDesc
|
||||
if tappingStage.toolGroup ~= nil then
|
||||
stageDesc = ('Tapping x%s tool with a group "%s"'):format(tappingStage.clicksNeed, tappingStage.toolGroup)
|
||||
else
|
||||
stageDesc = ('Tapping x%s'):format(tappingStage.clicksNeed)
|
||||
end
|
||||
|
||||
return stageDesc
|
||||
end
|
||||
|
||||
-- Subscribe to an event that means the player hit the entity.
|
||||
Events.subscribe(('craft_system:punch_tapping_node:%s:%s'):format(instance.craftName, instance.name),
|
||||
---@param craftNode LuaEntity
|
||||
---@param player Player
|
||||
function(eventName, pos, player, craftNode)
|
||||
-- We get the item that the player clicked on the crafting node.
|
||||
local toolDef = player:get_wielded_item():get_definition()
|
||||
|
||||
-- If a crafting stage requires a specific tool group and he doesn't have it...
|
||||
if instance.toolGroup and (not toolDef.groups or not toolDef.groups[instance.toolGroup]) then
|
||||
-- ...then we don't do anything.
|
||||
return
|
||||
end
|
||||
|
||||
-- DRAFT START:
|
||||
-- Creating particles
|
||||
for i=0, 10 do
|
||||
core.add_particle({
|
||||
pos = vector.new(pos)+vector.new(0,0.5,0),
|
||||
velocity = {x=math.random(-1,1), y=4, z=math.random(-1,1)},
|
||||
acceleration = {x=0, y=-9.8, z=0},
|
||||
expirationtime = 2,
|
||||
collision_removal = true,
|
||||
node = {name=instance.targetItem}
|
||||
})
|
||||
end
|
||||
|
||||
-- Making the entity shake (silly method :P).
|
||||
craftNode.object:set_rotation(vector.new(0.01,0.1,0.01))
|
||||
core.after(0.1, function() craftNode.object:set_rotation(vector.new(-0.01,-0.1,-0.01))end)
|
||||
core.after(0.2, function() craftNode.object:set_rotation(vector.new(0,0,0))end)
|
||||
-- DRAFT END
|
||||
|
||||
-- Calling the crafting stage process handler.
|
||||
instance:processHandler(pos, player)
|
||||
end)
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
-- Registering an entity for immersive tapping crafting.
|
||||
require('CraftSystem.ImmersiveCraftNode.tappingNode')
|
||||
|
||||
return TappingStage
|
||||
@@ -1,39 +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 ItemStackString[]
|
||||
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 ItemStackString[]
|
||||
|
||||
---@param name string
|
||||
---@param def CraftSystem.PrimitiveCraftDef
|
||||
---@return CraftSystem.PrimitiveCraft
|
||||
function PrimitiveCraft:new(name, def)
|
||||
---@type CraftSystem.PrimitiveCraft
|
||||
local instance = getInstance(self, {
|
||||
name = name,
|
||||
group = def.group,
|
||||
output = def.output,
|
||||
recipe = def.recipe,
|
||||
returnItems = def.returnItems or {}
|
||||
})
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
return PrimitiveCraft
|
||||
@@ -1,42 +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')
|
||||
|
||||
---A primitive crafting processor that doesn't require much interaction and provides
|
||||
---simple crafting based on a recipe-result scheme.
|
||||
---@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, {})
|
||||
|
||||
---Register a primitive craft that does not require special interaction.
|
||||
---@param craftName string
|
||||
---@param def CraftSystem.PrimitiveCraftDef
|
||||
function PrimitiveCraftHandler:registerCraft(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
|
||||
@@ -1,4 +0,0 @@
|
||||
local modInfo = Mod.getInfo('smc__core__creature')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('Creature')
|
||||
@@ -1 +0,0 @@
|
||||
name = smc__core__creature
|
||||
@@ -1,109 +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 = {}
|
||||
}
|
||||
}
|
||||
|
||||
---@param entityDef Creature.CreatureDefinition
|
||||
---@return EntityDefinition
|
||||
local function entityDefToLuantiDef(entityDef)
|
||||
entityDef = tableCopy(entityDef)
|
||||
local s = entityDef.settings
|
||||
local c = entityDef.callbacks or {}
|
||||
|
||||
---@type EntityDefinition
|
||||
local luantiDef = tableMerge(s, c)
|
||||
|
||||
return luantiDef
|
||||
end
|
||||
|
||||
---@param entityDef Creature.CreatureDefinition
|
||||
---@return Creature
|
||||
function Creature:new(entityDef)
|
||||
-- Adding default parameters.
|
||||
---@type Creature.CreatureDefinition
|
||||
entityDef = tableMerge(entityDef, self.defaultDef, true)
|
||||
|
||||
-- The callback table may not be specified.
|
||||
if entityDef.callbacks == nil then
|
||||
---@type Creature.Callbacks
|
||||
entityDef.callbacks = {}
|
||||
end
|
||||
|
||||
local s = entityDef.settings
|
||||
local c = entityDef.callbacks
|
||||
|
||||
-- Add the short mod name prefix to the entity name.
|
||||
if s._add_mod_name then
|
||||
s._name = Mod.getInfo().shortName .. ':' .. s._name
|
||||
end
|
||||
|
||||
local onActivate = c.on_activate or function() end
|
||||
|
||||
-- We rewrite the entity initialization function so that custom fields
|
||||
-- can be passed to it directly via `core.add_entity(pos, name, [staticdata])`.
|
||||
c.on_activate = function(luaEntity, staticdata, dtime)
|
||||
local initCustomFields = {}
|
||||
|
||||
if staticdata and staticdata ~= '' then
|
||||
initCustomFields = core.deserialize(staticdata) or {}
|
||||
end
|
||||
|
||||
-- We reset the fields that should not be overwritten.
|
||||
initCustomFields.name = nil
|
||||
initCustomFields.object = nil
|
||||
|
||||
---@type LuaEntity
|
||||
self = tableMerge(self, initCustomFields)
|
||||
|
||||
-- If an initialization callback was specified for the entity, then we call it.
|
||||
if c.on_activate ~= nil then
|
||||
onActivate(luaEntity, staticdata, dtime)
|
||||
end
|
||||
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)
|
||||
-- Adding default parameters.
|
||||
---@type Creature.CreatureDefinition
|
||||
defaultDef = tableMerge(self.defaultDef, defaultDef)
|
||||
|
||||
---@type Creature
|
||||
local ChildClass = extend(self, {
|
||||
defaultDef = defaultDef,
|
||||
})
|
||||
|
||||
return ChildClass
|
||||
end
|
||||
|
||||
return Creature
|
||||
@@ -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
|
||||
@@ -1,6 +0,0 @@
|
||||
---@class Creature.CreatureDefinition
|
||||
---@field settings Creature.Settings
|
||||
---@field callbacks Creature.Callbacks?
|
||||
local CreatureDefinition = {}
|
||||
|
||||
return CreatureDefinition
|
||||
@@ -1,9 +0,0 @@
|
||||
---A class that extends `LuaEntity` to annotate custom fields.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class Creature.LuaEntity : LuaEntity
|
||||
---@field _name string
|
||||
---@field _add_mod_name boolean
|
||||
local LuaEntity = {}
|
||||
|
||||
return LuaEntity
|
||||
@@ -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
|
||||
0
mods/CORE/Entity/init.lua
Normal file
1
mods/CORE/Entity/mod.conf
Normal file
@@ -0,0 +1 @@
|
||||
name = smc__core__entity
|
||||
@@ -1,9 +0,0 @@
|
||||
# textdomain: item
|
||||
|
||||
Rarity=Редкость
|
||||
common=простой
|
||||
uncommon=необычный
|
||||
distinguished=выдающийся
|
||||
eminent=исключительный
|
||||
prime=Превосходный
|
||||
unique=Уникальный
|
||||
@@ -1,82 +1,33 @@
|
||||
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 require = modInfo.require
|
||||
|
||||
local ItemFactory = Smc.requireItemFactory()
|
||||
|
||||
---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
|
||||
}
|
||||
local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
|
||||
|
||||
---@class Item
|
||||
---@field itemDef Item.ItemDefinition
|
||||
---@field luantiDef ItemDefinition
|
||||
---@field getType fun():string
|
||||
---@field luantiDef table
|
||||
---@field getVisual fun(): string
|
||||
---@field defaultDef Item.ItemDefinition
|
||||
local Item = {
|
||||
defaultDef = {
|
||||
settings = {
|
||||
name = '',
|
||||
_title = '',
|
||||
_description = '',
|
||||
_title_color = '#FFFFFF',
|
||||
_description_color = '#838383',
|
||||
_rarity = 'common',
|
||||
_add_mod_name = true,
|
||||
stack_max = 128,
|
||||
title = '',
|
||||
description = '',
|
||||
titleColor = '#FFFFFF',
|
||||
descriptionColor = '#C0C0C0',
|
||||
addModName = 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 tableMerge(...)
|
||||
return table.merge(...)
|
||||
end
|
||||
|
||||
---@param itemDef Item.ItemDefinition
|
||||
@@ -85,10 +36,16 @@ local function itemDefToLuantiDef(itemDef)
|
||||
local modName = Mod.getInfo().shortName
|
||||
local S = core.get_translator(modName)
|
||||
|
||||
itemDef = table.copy(itemDef)
|
||||
local s = itemDef.settings
|
||||
local c = itemDef.callbacks
|
||||
|
||||
local title, description = s._title, s._description
|
||||
if s.addModName then
|
||||
s.name = modName .. ':' .. s.name
|
||||
end
|
||||
|
||||
local title = s.title
|
||||
local description = s.description
|
||||
|
||||
if title == nil or title == '' then
|
||||
title = string.match(s.name, '%S:(%S+)')..'-title'
|
||||
@@ -98,106 +55,74 @@ local function itemDefToLuantiDef(itemDef)
|
||||
description = string.match(s.name, '%S:(%S+)')..'-desc'
|
||||
end
|
||||
|
||||
if s._title_color ~= nil and s._description_color ~= nil then
|
||||
title = colorize(s._title_color , S(title))
|
||||
description = colorize(s._description_color, S(description))
|
||||
if s.titleColor ~= nil and s.descriptionColor ~= nil then
|
||||
description = core.colorize(s.titleColor ,S(title))..'\n'..
|
||||
core.colorize(s.descriptionColor, S(description))
|
||||
else
|
||||
error('Item description color parameters cannot be empty.')
|
||||
end
|
||||
|
||||
assert(s._rarity ~= nil, 'The rarity of an item cannot be empty.')
|
||||
|
||||
local luantiDescription = addRarityToDesc(s._rarity, title..'\n '..description)
|
||||
|
||||
s._title = title
|
||||
s._description = description
|
||||
s.description = luantiDescription..core.get_background_escape_sequence('#110F13')
|
||||
s.title, s.description = nil, description
|
||||
|
||||
local luantiDef = defMerge(s, c)
|
||||
|
||||
return luantiDef
|
||||
end
|
||||
|
||||
---@param luantiDef NodeDefinition
|
||||
local function registerNode(luantiDef)
|
||||
local name = luantiDef.name
|
||||
luantiDef.name = nil
|
||||
|
||||
---@param luantiDef NodeDefinition|ItemDefinition
|
||||
local function register3dItem(luantiDef)
|
||||
local ld = luantiDef
|
||||
local name = ld.name
|
||||
ld.name = nil
|
||||
core.register_node(':'..name, luantiDef)
|
||||
end
|
||||
|
||||
---@param luantiDef ItemDefinition
|
||||
local function registerCraftitem(luantiDef)
|
||||
local name = luantiDef.name
|
||||
luantiDef.name = nil
|
||||
|
||||
local function registerFlatItem(luantiDef)
|
||||
local ld = luantiDef
|
||||
local name = ld.name
|
||||
ld.name = nil
|
||||
core.register_craftitem(':'..name, luantiDef)
|
||||
end
|
||||
|
||||
---@param luantiDef ItemDefinition
|
||||
local function registerTool(luantiDef)
|
||||
local name = luantiDef.name
|
||||
luantiDef.name = nil
|
||||
|
||||
core.register_tool(':'..name, luantiDef)
|
||||
end
|
||||
|
||||
---The alias `table.merge` for EmmyLua
|
||||
---@type fun(...):(Item.ItemDefinition)
|
||||
local defMerge = function(...)
|
||||
return tableMerge(...)
|
||||
return table.merge(...)
|
||||
end
|
||||
|
||||
---@param itemDef Item.ItemDefinition|Node.NodeDefinition
|
||||
---@return Item
|
||||
function Item:new(itemDef)
|
||||
assert(itemDef.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.')
|
||||
|
||||
itemDef = tableCopy(itemDef)
|
||||
|
||||
-- Adding default parameters
|
||||
---Adding default parameters
|
||||
itemDef = defMerge(itemDef, self.defaultDef, true)
|
||||
local s = itemDef.settings
|
||||
|
||||
local shortModName = Mod.getInfo().shortName
|
||||
|
||||
if s._add_mod_name then
|
||||
s.name = shortModName .. ':' .. s.name
|
||||
end
|
||||
|
||||
---@type Item
|
||||
local instance = getInstance(self, {})
|
||||
|
||||
local luantiDef = itemDefToLuantiDef(itemDef)
|
||||
local type = itemDef.settings._type
|
||||
local visual = itemDef.settings.visual
|
||||
|
||||
if type == nil then
|
||||
type = 'craftitem'
|
||||
if visual == nil then
|
||||
visual = 'item_2d'
|
||||
end
|
||||
|
||||
itemDef.settings._type = nil
|
||||
itemDef.settings.visual = nil
|
||||
|
||||
if type == 'node' then
|
||||
registerNode(luantiDef)
|
||||
elseif type == 'craftitem' then
|
||||
registerCraftitem(luantiDef)
|
||||
elseif type == 'tool' then
|
||||
registerTool(luantiDef)
|
||||
if visual == 'item_3d' then
|
||||
register3dItem(luantiDef)
|
||||
else
|
||||
error(('Unknown item type: `%s`.'):format(type))
|
||||
visual = 'item_2d'
|
||||
registerFlatItem(luantiDef)
|
||||
end
|
||||
|
||||
function instance:getType()
|
||||
return type
|
||||
function instance:getVisual()
|
||||
return visual
|
||||
end
|
||||
|
||||
instance.itemDef = itemDef
|
||||
instance.luantiDef = luantiDef
|
||||
|
||||
Smc.addRegisteredItem(shortModName, instance)
|
||||
return instance
|
||||
end
|
||||
|
||||
@@ -207,10 +132,8 @@ end
|
||||
---@param defaultDef Item.ItemDefinition
|
||||
---@return Item
|
||||
function Item:getExtended(defaultDef)
|
||||
defaultDef = defMerge(defaultDef, self.defaultDef, true)
|
||||
|
||||
---@type Item
|
||||
local ChildClass = extend(self, {
|
||||
local ChildClass = Class.extend(self, {
|
||||
defaultDef = defaultDef,
|
||||
})
|
||||
|
||||
@@ -223,8 +146,6 @@ end
|
||||
function Item:getFactory(defaultDef)
|
||||
if defaultDef == nil then
|
||||
defaultDef = self.defaultDef
|
||||
else
|
||||
defaultDef = defMerge(self.defaultDef, defaultDef, true)
|
||||
end
|
||||
|
||||
---@type ItemFactory
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
---Rarity of items:
|
||||
--- * `common`
|
||||
--- * `uncommon`
|
||||
--- * `distinguished`
|
||||
--- * `eminent`
|
||||
--- * `prime`
|
||||
--- * `unique`
|
||||
---@alias Item.Rarity 'common'|'uncommon'|'distinguished'|'eminent'|'prime'|'unique'
|
||||
@@ -5,40 +5,38 @@ 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._add_mod_name = nil
|
||||
Settings.addModName = 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._title_color = nil
|
||||
Settings.titleColor = nil
|
||||
|
||||
---Item description color in description.
|
||||
---
|
||||
---Default: `#C0C0C0`
|
||||
---@type ColorString?
|
||||
Settings._description_color = nil
|
||||
Settings.descriptionColor = nil
|
||||
|
||||
---@alias Item.Visual
|
||||
---'item_2d'|
|
||||
---'item_3d'
|
||||
|
||||
---Visual node type.
|
||||
---@type Item.Type?
|
||||
Settings._type = nil
|
||||
---@type Item.Visual?
|
||||
Settings.visual = nil
|
||||
|
||||
---Formal (lore) rarity of an item. Default `common`.
|
||||
---@type Item.Rarity?
|
||||
Settings._rarity = nil
|
||||
|
||||
|
||||
---Table of groups-characteristics of Item.
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
---@alias Item.Type 'craftitem'|'node'|'tool'
|
||||
@@ -18,10 +18,9 @@ local getInstance = Class.getInstance
|
||||
---@field generateTurf generateFunc
|
||||
---@field generateSoil generateFunc
|
||||
---@field generateBottom generateFunc
|
||||
---@field postProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], index:number, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)?
|
||||
local Biome = {}
|
||||
|
||||
---@alias generateFunc fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], index:number, x:number, y:number, z:number)
|
||||
---@alias generateFunc fun(self, mapGenerator:MapGen, data:number[], index:number, x:number, y:number, z:number)
|
||||
|
||||
---Definition table for the `MapGen.Biome`.
|
||||
---
|
||||
@@ -40,91 +39,84 @@ local Biome = {}
|
||||
---@field generateTurf generateFunc?
|
||||
---@field generateSoil generateFunc?
|
||||
---@field generateBottom generateFunc?
|
||||
---@field postProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], index:number, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)?
|
||||
|
||||
|
||||
-- Default generate functions
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
local defaultGenerateAir = function(self, mapGenerator, factors, data, index, x, y, z)
|
||||
local defaultGenerateAir = function(self, mapGenerator, data, index, x, y, z)
|
||||
data[index] = mapGenerator.nodeIDs.air
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
local defaultGenerateCavernAir = function(self, mapGenerator, factors, data, index, x, y, z)
|
||||
self:generateAir(mapGenerator, factors, data, index, x, y, z)
|
||||
local defaultGenerateCavernAir = function(self, mapGenerator, data, index, x, y, z)
|
||||
self:generateAir(mapGenerator, data, index, x, y, z)
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
local defaultGenerateWater = function(self, mapGenerator, factors, data, index, x, y, z)
|
||||
local defaultGenerateWater = function(self, mapGenerator, data, index, x, y, z)
|
||||
data[index] = mapGenerator.nodeIDs.water
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
local defaultGenerateRock = function(self, mapGenerator, factors, data, index, x, y, z)
|
||||
local defaultGenerateRock = function(self, mapGenerator, data, index, x, y, z)
|
||||
data[index] = self.groundNodesIDs.rock
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
local defaultGenerateTurf = function(self, mapGenerator, factors, data, index, x, y, z)
|
||||
local defaultGenerateTurf = function(self, mapGenerator, data, index, x, y, z)
|
||||
data[index] = self.groundNodesIDs.turf
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
local defaultGenerateSoil = function(self, mapGenerator, factors, data, index, x, y, z)
|
||||
local defaultGenerateSoil = function(self, mapGenerator,data, index, x, y, z)
|
||||
data[index] = self.groundNodesIDs.soil
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
local defaultGenerateBottom = function(self, mapGenerator, factors, data, index, x, y, z)
|
||||
local defaultGenerateBottom = function(self, mapGenerator, data, index, x, y, z)
|
||||
data[index] = self.groundNodesIDs.bottom
|
||||
end
|
||||
|
||||
@@ -175,23 +167,23 @@ function Biome:new(name, def)
|
||||
end
|
||||
|
||||
---@type MapGen.Biome
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.tempPoint = def.tempPoint
|
||||
instance.humidityPoint = def.humidityPoint
|
||||
instance.minY = def.minY
|
||||
instance.maxY = def.maxY
|
||||
instance.groundNodes = def.groundNodes
|
||||
instance.groundNodesIDs = groundNodesIDs
|
||||
instance.soilHeight = def.soilHeight
|
||||
instance.generateAir = def.generateAir
|
||||
instance.generateCavernAir = def.generateCavernAir
|
||||
instance.generateWater = def.generateWater
|
||||
instance.generateRock = def.generateRock
|
||||
instance.generateSoil = def.generateSoil
|
||||
instance.generateTurf = def.generateTurf
|
||||
instance.generateBottom = def.generateBottom
|
||||
instance.postProcessing = def.postProcessing
|
||||
local instance = getInstance(self, {
|
||||
name = name,
|
||||
tempPoint = def.tempPoint,
|
||||
humidityPoint = def.humidityPoint,
|
||||
minY = def.minY,
|
||||
maxY = def.maxY,
|
||||
groundNodes = def.groundNodes,
|
||||
groundNodesIDs = groundNodesIDs,
|
||||
soilHeight = def.soilHeight,
|
||||
generateAir = def.generateAir,
|
||||
generateCavernAir = def.generateCavernAir,
|
||||
generateWater = def.generateWater,
|
||||
generateRock = def.generateRock,
|
||||
generateSoil = def.generateSoil,
|
||||
generateTurf = def.generateTurf,
|
||||
generateBottom = def.generateBottom,
|
||||
})
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
@@ -1,13 +1,5 @@
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
|
||||
---@type MapGen.Peak
|
||||
local Peak = require('MapGen.Peak')
|
||||
---@type MapGen.Triangle
|
||||
local Triangle = require('MapGen.Triangle')
|
||||
|
||||
---@class MapGen.Layer
|
||||
---@field name string
|
||||
---@field minY integer
|
||||
@@ -19,10 +11,9 @@ local Triangle = require('MapGen.Triangle')
|
||||
---@field waterLevel integer
|
||||
---@field calcTemp fun(self:MapGen.Layer, value:number, height:number):number
|
||||
---@field calcHumidity fun(self:MapGen.Layer, value:number, height:number):number
|
||||
---@field peaksList MapGen.Peak[]
|
||||
---@field peaksByPos table<string, MapGen.Peak>
|
||||
---@field noisesByColor table<MapGen.Layer.Category, table<ColorString, ValueNoise>>
|
||||
---@field noisesParamsByColor table<MapGen.Layer.Category, table<ColorString, NoiseParams>>
|
||||
---@field peaksList {['landscape']:MapGen.Peak[],['temp']:MapGen.Peak[],['humidity']:MapGen.Peak[]}
|
||||
---@field noisesByColor {['landscape']:table<ColorString, ValueNoise>,['temp']:table<ColorString, ValueNoise>,['humidity']:table<ColorString, ValueNoise>}
|
||||
---@field noisesParamsByColor {['landscape']:table<ColorString, NoiseParams>,['temp']:table<ColorString, NoiseParams>,['humidity']:table<ColorString, NoiseParams>}
|
||||
---@field biomesByName table<string, MapGen.Biome>
|
||||
---@field biomesList MapGen.Biome[]
|
||||
---@field biomesDiagram table
|
||||
@@ -31,10 +22,14 @@ local Triangle = require('MapGen.Triangle')
|
||||
---@field cavernsByName table<string, MapGen.Cavern>
|
||||
---@field cavernsList MapGen.Cavern[]
|
||||
---@field regionsByName table<string, MapGen.Region>
|
||||
---@field trianglesList MapGen.Triangle[]
|
||||
---@field trianglesList {['landscape']:MapGen.Triangle[],['temp']:MapGen.Triangle[],['humidity']:MapGen.Triangle[]}
|
||||
---@field tetrahedronsList MapGen.Tetrahedron[] **Not supported**
|
||||
local Layer = {
|
||||
peaksList = {},
|
||||
peaksByPos = {},
|
||||
peaksList = {
|
||||
landscape = {},
|
||||
temp = {},
|
||||
humidity = {},
|
||||
},
|
||||
noisesByColor = {
|
||||
landscape = {},
|
||||
temp = {},
|
||||
@@ -51,7 +46,11 @@ local Layer = {
|
||||
cavernsByName = {},
|
||||
cavernsList = {},
|
||||
regionsByName = {},
|
||||
trianglesList = {},
|
||||
trianglesList = {
|
||||
landscape = {},
|
||||
temp = {},
|
||||
humidity = {},
|
||||
},
|
||||
tetrahedronsList = {},
|
||||
}
|
||||
|
||||
@@ -59,23 +58,17 @@ local Layer = {
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.LayerDef
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field minTemp integer
|
||||
---@field maxTemp integer
|
||||
---@field minHumidity integer
|
||||
---@field maxHumidity integer
|
||||
---@field waterLevel? integer
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field minTemp number
|
||||
---@field maxTemp number
|
||||
---@field minHumidity number
|
||||
---@field maxHumidity number
|
||||
---@field waterLevel? number
|
||||
---@field calcTemp (fun(self:MapGen.Layer, value:number, height:number):number)?
|
||||
---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:number):number)?
|
||||
---@field biomesGorizontalScattering integer?
|
||||
---@field biomesVerticalScattering integer?
|
||||
---@field triangulationLandscapeFile string
|
||||
---@field triangulationTempFile string
|
||||
---@field triangulationHumidityFile string
|
||||
---@field landscapeMapScale number
|
||||
---@field tempMapScale number
|
||||
---@field humidityMapScale number
|
||||
---@field biomesGorizontalScattering number?
|
||||
---@field biomesVerticalScattering number?
|
||||
|
||||
---@param self MapGen.Layer
|
||||
---@param value number
|
||||
@@ -85,73 +78,6 @@ local function defaultCalcFunc(self, value, height)
|
||||
return value
|
||||
end
|
||||
|
||||
---Checks `def` for compliance with `MapGen.PeakDef` and creates a new peak
|
||||
---if a peak with such coordinates has not yet been registered or returns an existing one.
|
||||
---
|
||||
---**Note:** If the colors of the new peak and the existing one at the same coordinates
|
||||
---are different, an error will be called.
|
||||
---@param def MapGen.PeakDef
|
||||
---@param scale number
|
||||
---@return MapGen.Peak
|
||||
function Layer:registerPeak(def, scale)
|
||||
assert(def.pos ~= nil)
|
||||
assert(def.pos.x ~= nil)
|
||||
assert(def.pos.z ~= nil)
|
||||
assert(def.color ~= nil)
|
||||
assert(type(def.color) == 'string')
|
||||
|
||||
def.pos.x = def.pos.x * scale
|
||||
def.pos.z = def.pos.z * scale
|
||||
def.pos.y = 0
|
||||
|
||||
local positionStr = core.pos_to_string(def.pos)
|
||||
|
||||
local peak = self.peaksByPos[positionStr]
|
||||
|
||||
if peak == nil then
|
||||
peak = Peak:new(def)
|
||||
self.peaksByPos[positionStr] = peak
|
||||
elseif peak.color ~= def.color then
|
||||
error('There cannot be two peaks with the same coordinates but different colors.')
|
||||
end
|
||||
|
||||
return peak
|
||||
end
|
||||
|
||||
function Layer:initTrianglesNeighbours()
|
||||
local triangles = self.trianglesList
|
||||
|
||||
for _, triangle in pairs(triangles) do
|
||||
for _, id in ipairs(triangle.neighboursIDs) do
|
||||
table.insert(triangle.neighbours, triangles[id])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---@param fileName string
|
||||
---@param category MapGen.Layer.Category
|
||||
---@param scale number
|
||||
function Layer:getTriaglesFromFile(fileName, category, scale)
|
||||
local file = io.open(core.get_modpath(core.get_current_modname())..'/maps/'..fileName, 'r')
|
||||
assert(file ~= nil)
|
||||
|
||||
local json = core.parse_json(file:read('*a')) or {}
|
||||
file:close()
|
||||
|
||||
local triangles = json.triangles
|
||||
assert(triangles ~= nil)
|
||||
|
||||
for _, tr in ipairs(triangles) do
|
||||
local p1 = self:registerPeak( tr.vertices[1], scale)
|
||||
local p2 = self:registerPeak( tr.vertices[2], scale)
|
||||
local p3 = self:registerPeak( tr.vertices[3], scale)
|
||||
|
||||
local triangle = Triangle:new(tr.id,p1, p2, p3, tr.adjacent_triangle_ids)
|
||||
|
||||
self:addTriangle(category, triangle)
|
||||
end
|
||||
end
|
||||
|
||||
---@param name string
|
||||
---@param def MapGen.LayerDef
|
||||
---@return MapGen.Layer
|
||||
@@ -167,34 +93,20 @@ function Layer:new(name, def)
|
||||
end
|
||||
|
||||
---@type MapGen.Layer
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.minY = def.minY
|
||||
instance.maxY = def.maxY
|
||||
instance.minTemp = def.minTemp
|
||||
instance.maxTemp = def.maxTemp
|
||||
instance.minHumidity = def.minHumidity
|
||||
instance.maxHumidity = def.maxHumidity
|
||||
instance.waterLevel = def.waterLevel or 0
|
||||
instance.calcTemp = def.calcTemp
|
||||
instance.calcHumidity = def.calcHumidity
|
||||
instance.biomesGorizontalScattering = def.biomesGorizontalScattering or 0
|
||||
instance.biomesVerticalScattering = def.biomesVerticalScattering or 0
|
||||
|
||||
instance:getTriaglesFromFile(
|
||||
def.triangulationLandscapeFile,
|
||||
'landscape',
|
||||
def.landscapeMapScale)
|
||||
instance:getTriaglesFromFile(
|
||||
def.triangulationTempFile,
|
||||
'temp',
|
||||
def.tempMapScale)
|
||||
instance:getTriaglesFromFile(
|
||||
def.triangulationHumidityFile,
|
||||
'humidity',
|
||||
def.humidityMapScale)
|
||||
|
||||
instance:initTrianglesNeighbours()
|
||||
local instance = getInstance(self, {
|
||||
name = name,
|
||||
minY = def.minY,
|
||||
maxY = def.maxY,
|
||||
minTemp = def.minTemp,
|
||||
maxTemp = def.maxTemp,
|
||||
minHumidity = def.minHumidity,
|
||||
maxHumidity = def.maxHumidity,
|
||||
waterLevel = def.waterLevel or 0,
|
||||
calcTemp = def.calcTemp,
|
||||
calcHumidity = def.calcHumidity,
|
||||
biomesGorizontalScattering = def.biomesGorizontalScattering or 0,
|
||||
biomesVerticalScattering = def.biomesVerticalScattering or 0,
|
||||
})
|
||||
|
||||
return instance
|
||||
end
|
||||
@@ -202,34 +114,34 @@ end
|
||||
---A category of noise that affects specific map generation objects.
|
||||
---@alias MapGen.Layer.Category 'landscape'|'temp'|'humidity'
|
||||
|
||||
---Adds a triangle to the `Layer.trianglesList`
|
||||
---Adds a peak to the `Layer.peaksList`
|
||||
---@param category MapGen.Layer.Category
|
||||
---@param triangle MapGen.Triangle
|
||||
function Layer:addTriangle(category, triangle)
|
||||
local triangles = self.trianglesList
|
||||
if triangles ~= nil then
|
||||
triangles[triangle.id] = triangle
|
||||
---@param peak MapGen.Peak
|
||||
function Layer:addPeak(category, peak)
|
||||
if category == 'landscape' then
|
||||
table.insert(self.peaksList.landscape, peak)
|
||||
elseif category == 'temp' then
|
||||
table.insert(self.peaksList.temp, peak)
|
||||
elseif category == 'humidity' then
|
||||
table.insert(self.peaksList.humidity, peak)
|
||||
else
|
||||
error(('There is no peak category named %s.'):format(category))
|
||||
end
|
||||
end
|
||||
|
||||
---Adds a peak to the `Layer.peaksList`
|
||||
---@param category MapGen.Layer.Category
|
||||
---@param peak MapGen.Peak
|
||||
function Layer:addPeak(category, peak)
|
||||
table.insert(self.peaksList, peak)
|
||||
end
|
||||
|
||||
---Returns the `MapGen.Peak` at the coordinates. If there is no peak at these coordinates, it returns `nil`.
|
||||
---@param category MapGen.Layer.Category The category in which the peak is located.
|
||||
---@param pos Position Coordinate of the desired peak.
|
||||
---@return MapGen.Peak?
|
||||
function Layer:getPeakByPos(pos)
|
||||
local positionStr = core.pos_to_string(pos)
|
||||
|
||||
local peak = self.peaksByPos[positionStr]
|
||||
function Layer:getPeakByPos(category, pos)
|
||||
pos = vector.new(pos)
|
||||
|
||||
---@param peak MapGen.Peak
|
||||
for _, peak in ipairs(self.peaksList[category]) do
|
||||
if peak:getPeakPos() == pos then
|
||||
return peak
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---Adds a NoiseParams color to the `Layer.noisesParamsByColor`
|
||||
|
||||
@@ -2,8 +2,8 @@ local getInstance = Class.getInstance
|
||||
|
||||
---@class MapGen.Peak
|
||||
---@field id number
|
||||
---@field pos vector
|
||||
---@field color ColorString
|
||||
---@field getPeakPos fun(self):vector
|
||||
---@field getColor fun(self):ColorString
|
||||
---@field getGroups fun(self):table<string, number>
|
||||
---@field addGroups fun(self, groups:table<string, number>)
|
||||
local Peak = {
|
||||
@@ -16,13 +16,14 @@ local Peak = {
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.PeakDef
|
||||
---@field pos MapPosition|vector
|
||||
---@field pos vector
|
||||
---@field color ColorString
|
||||
---@field groups? table<string, number>
|
||||
|
||||
---@param def MapGen.PeakDef
|
||||
---@return MapGen.Peak
|
||||
function Peak:new(def)
|
||||
local _pos = def.pos
|
||||
local _color = def.color
|
||||
local _groups
|
||||
|
||||
@@ -38,8 +39,14 @@ function Peak:new(def)
|
||||
__tostring = self.toString,
|
||||
__eq = self.eq
|
||||
})
|
||||
instance.pos = vector.new(def.pos)
|
||||
instance.color = def.color
|
||||
|
||||
function instance:getPeakPos()
|
||||
return _pos:copy()
|
||||
end
|
||||
|
||||
function instance:getColor()
|
||||
return _color
|
||||
end
|
||||
|
||||
function instance:getGroups()
|
||||
return table.copy_with_metatables(_groups)
|
||||
@@ -59,7 +66,7 @@ end
|
||||
---Returns a string describing the object in a readable form.
|
||||
---@return string
|
||||
function Peak:toString()
|
||||
local pos = self.pos
|
||||
local pos = self:getPeakPos()
|
||||
return ('Peak (%s) x: %.2f y: %.2f z: %.2f'):format( self.id, pos.x, pos.y, pos.z)
|
||||
end
|
||||
|
||||
@@ -67,8 +74,8 @@ end
|
||||
---@param other MapGen.Peak
|
||||
---@return boolean
|
||||
function Peak:eq(other)
|
||||
local pos1 = self.pos
|
||||
local pos2 = other.pos
|
||||
local pos1 = self:getPeakPos()
|
||||
local pos2 = other:getPeakPos()
|
||||
|
||||
return pos1.x == pos2.x and pos1.z == pos2.z
|
||||
end
|
||||
|
||||
@@ -4,11 +4,11 @@ local getInstance = Class.getInstance
|
||||
|
||||
---@class MapGen.Region
|
||||
---@field name string
|
||||
---@field vertices MapPosition[]
|
||||
---@field vertices Position[]
|
||||
local Region = {}
|
||||
|
||||
---@class MapGen.RegionDef
|
||||
---@field vertices MapPosition[]
|
||||
---@field vertices Position[]
|
||||
|
||||
---@param def MapGen.RegionDef
|
||||
---@return MapGen.Region
|
||||
@@ -50,7 +50,7 @@ local function calcDistanceSq(px, pz, x1, z1, x2, z2)
|
||||
end
|
||||
|
||||
---Checks if a point is inside a `MapGen.Region` (2D check using x and z coordinates).
|
||||
---@param point MapPosition
|
||||
---@param point Position
|
||||
---@return boolean, number?
|
||||
function Region:pointInRegion(point)
|
||||
local vertices = self.vertices
|
||||
|
||||
@@ -8,7 +8,7 @@ local getInstance = Class.getInstance
|
||||
---@field maxY number
|
||||
---@field staticNode string
|
||||
---@field staticNodeID number
|
||||
---@field generateStaticNode fun(self, mapGenerator:MapGen, data:number[], index:number, x:number, y:number, z:number)
|
||||
---@field generateStaticNode generateFunc
|
||||
local StaticLayer = {}
|
||||
|
||||
---Definition table for the `MapGen.StaticLayer`.
|
||||
@@ -18,7 +18,7 @@ local StaticLayer = {}
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field staticNode string
|
||||
---@field generateStaticNode fun(self, mapGenerator:MapGen, data:number[], index:number, x:number, y:number, z:number)
|
||||
---@field generateStaticNode generateFunc
|
||||
|
||||
---@param self MapGen.StaticLayer
|
||||
---@param mapGenerator MapGen
|
||||
|
||||
154
mods/CORE/MapGen/src/MapGen/Tetrahedron.lua
Normal file
@@ -0,0 +1,154 @@
|
||||
local mathAbs = math.abs
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
|
||||
---@type MapGen.Triangle
|
||||
local Triangle = require('MapGen.Triangle')
|
||||
---@type MapGen.Triangulation.Edge
|
||||
local Edge = require('MapGen.Triangulation.Edge')
|
||||
---@type MapGen.Triangulation.FakePeak
|
||||
local FakePeak = require('MapGen.Triangulation.FakePeak')
|
||||
|
||||
---@class MapGen.Tetrahedron
|
||||
---@field p1 MapGen.Peak
|
||||
---@field p2 MapGen.Peak
|
||||
---@field p3 MapGen.Peak
|
||||
---@field p4 MapGen.Peak
|
||||
---@field h1 MapGen.Triangulation.Edge
|
||||
---@field h2 MapGen.Triangulation.Edge
|
||||
---@field h3 MapGen.Triangulation.Edge
|
||||
---@field h4 MapGen.Triangulation.Edge
|
||||
---@field f1 MapGen.Triangle
|
||||
---@field f2 MapGen.Triangle
|
||||
---@field f3 MapGen.Triangle
|
||||
---@field f4 MapGen.Triangle
|
||||
local Tetrahedron = {}
|
||||
|
||||
---@param p1 MapGen.Peak
|
||||
---@param p2 MapGen.Peak
|
||||
---@param p3 MapGen.Peak
|
||||
---@param p4 MapGen.Peak
|
||||
---@return MapGen.Tetrahedron
|
||||
function Tetrahedron:new(p1, p2, p3, p4)
|
||||
local instance = getInstance(self, {
|
||||
p1 = p1,
|
||||
p2 = p2,
|
||||
p3 = p3,
|
||||
p4 = p4,
|
||||
h1 = self:getHeight(p1, p2, p3, p4),
|
||||
h2 = self:getHeight(p2, p3, p4, p1),
|
||||
h3 = self:getHeight(p3, p4, p1, p2),
|
||||
h4 = self:getHeight(p4, p1, p2, p3),
|
||||
f1 = Triangle:new(p1, p2, p3),
|
||||
f2 = Triangle:new(p1, p2, p4),
|
||||
f3 = Triangle:new(p1, p3, p4),
|
||||
f4 = Triangle:new(p2, p3, p4),
|
||||
},
|
||||
{
|
||||
__tostring = self.toString
|
||||
})
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
---Returns a string describing the object in a readable form.
|
||||
---@return string
|
||||
function Tetrahedron:toString()
|
||||
return ('Tetrahedron: \n %s\n %s\n %s\n %s'):format(
|
||||
tostring(self.p1.getPeakPos()),
|
||||
tostring(self.p2.getPeakPos()),
|
||||
tostring(self.p3.getPeakPos()),
|
||||
tostring(self.p4.getPeakPos())
|
||||
)
|
||||
end
|
||||
|
||||
---@param p1 MapGen.Peak
|
||||
---@param p2 MapGen.Peak
|
||||
---@param p3 MapGen.Peak
|
||||
---@param p4 MapGen.Peak
|
||||
function Tetrahedron:getHeight(p1, p2, p3, p4)
|
||||
local pos1 = p1:getPeakPos()
|
||||
local pos2 = p2:getPeakPos()
|
||||
local pos3 = p3:getPeakPos()
|
||||
local pos4 = p4:getPeakPos()
|
||||
|
||||
-- Векторы, лежащие в плоскости
|
||||
local AB = pos3 - pos2
|
||||
local AC = pos4 - pos2
|
||||
|
||||
-- Нормаль к плоскости
|
||||
local normal = AB:cross(AC)
|
||||
local normal_length = normal:length()
|
||||
|
||||
-- Если плоскость вырождена (точки на одной прямой)
|
||||
if normal_length < 1e-10 then
|
||||
return nil -- или другая обработка ошибки
|
||||
end
|
||||
|
||||
-- Вектор от точки на плоскости к нашей точке
|
||||
local AP = pos1 - pos2
|
||||
|
||||
-- Расстояние от точки до плоскости
|
||||
local distance = AP:dot(normal) / normal_length
|
||||
|
||||
-- Проекция точки на плоскость (вектор!)
|
||||
local projection = pos1 - (normal * (distance / normal_length))
|
||||
|
||||
return Edge:new(p1, FakePeak:new(projection))
|
||||
end
|
||||
|
||||
---Returns the center of the circumscribed sphere.
|
||||
---@return vector
|
||||
function Tetrahedron:getCircumSphereCenter()
|
||||
local pos1 = self.p1.getPeakPos()
|
||||
local pos2 = self.p2.getPeakPos()
|
||||
local pos3 = self.p3.getPeakPos()
|
||||
local pos4 = self.p4.getPeakPos()
|
||||
|
||||
local a = pos2 - pos1
|
||||
local b = pos3 - pos1
|
||||
local c = pos4 - pos1
|
||||
|
||||
local a2 = a:dot(a)
|
||||
local b2 = b:dot(b)
|
||||
local c2 = c:dot(c)
|
||||
|
||||
local cross_bc = b:cross(c)
|
||||
local cross_ca = c:cross(a)
|
||||
local cross_ab = a:cross(b)
|
||||
|
||||
local det = a:dot(b:cross(c)) * 2
|
||||
|
||||
if mathAbs(det) < 0 then
|
||||
return (pos1 + pos2 + pos3 + pos4) / 4
|
||||
end
|
||||
|
||||
local center = pos1 + (cross_bc * a2 + cross_ca * b2 + cross_ab * c2) / det
|
||||
|
||||
return center
|
||||
end
|
||||
|
||||
---Returns the radius of the circumscribed sphere.
|
||||
---@return number
|
||||
function Tetrahedron:getCircumSphereRadius()
|
||||
local center = self:getCircumSphereCenter()
|
||||
local pos1 = self.p1.getPeakPos()
|
||||
return (pos1 - center):length()
|
||||
end
|
||||
|
||||
---Checks whether a given point lies within the circumscribed sphere of a tetrahedron.
|
||||
---@param p MapGen.Peak
|
||||
function Tetrahedron:inCircumSphere(p)
|
||||
local pos = p.getPeakPos()
|
||||
local c = self:getCircumSphereCenter()
|
||||
local r = self:getCircumSphereRadius()
|
||||
|
||||
local distance = (pos - c):length()
|
||||
|
||||
return distance <= r
|
||||
end
|
||||
|
||||
return Tetrahedron
|
||||
@@ -6,10 +6,10 @@ local getInstance = Class.getInstance
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
|
||||
---@type MapGen.Edge
|
||||
local Edge = require('MapGen.Edge')
|
||||
---@type MapGen.FakePeak
|
||||
local FakePeak = require('MapGen.FakePeak')
|
||||
---@type MapGen.Triangulation.Edge
|
||||
local Edge = require('MapGen.Triangulation.Edge')
|
||||
---@type MapGen.Triangulation.FakePeak
|
||||
local FakePeak = require('MapGen.Triangulation.FakePeak')
|
||||
|
||||
-- --- Helpers functions ---
|
||||
|
||||
@@ -29,9 +29,9 @@ end
|
||||
---@param p3 MapGen.Peak
|
||||
---@return boolean
|
||||
local function isFlatAngle(p1, p2, p3)
|
||||
local pos1 = p1.pos
|
||||
local pos2 = p2.pos
|
||||
local pos3 = p3.pos
|
||||
local pos1 = p1:getPeakPos()
|
||||
local pos2 = p2:getPeakPos()
|
||||
local pos3 = p3:getPeakPos()
|
||||
|
||||
local vec1 = pos1 - pos2 -- Vector from p2 to p1
|
||||
local vec2 = pos3 - pos2 -- Vector from p2 to p3
|
||||
@@ -63,18 +63,16 @@ end
|
||||
---@alias MapGen.Triangle.Neighbours {t1:MapGen.Triangle?,t2:MapGen.Triangle?,t3:MapGen.Triangle?}
|
||||
|
||||
---@class MapGen.Triangle
|
||||
---@field id integer
|
||||
---@field p1 MapGen.Peak
|
||||
---@field p2 MapGen.Peak
|
||||
---@field p3 MapGen.Peak
|
||||
---@field e1 MapGen.Edge
|
||||
---@field e2 MapGen.Edge
|
||||
---@field e3 MapGen.Edge
|
||||
---@field h1 MapGen.Edge
|
||||
---@field h2 MapGen.Edge
|
||||
---@field h3 MapGen.Edge
|
||||
---@field neighboursIDs integer[]
|
||||
---@field neighbours MapGen.Triangle[]
|
||||
---@field e1 MapGen.Triangulation.Edge
|
||||
---@field e2 MapGen.Triangulation.Edge
|
||||
---@field e3 MapGen.Triangulation.Edge
|
||||
---@field h1 MapGen.Triangulation.Edge
|
||||
---@field h2 MapGen.Triangulation.Edge
|
||||
---@field h3 MapGen.Triangulation.Edge
|
||||
---@field neighbours MapGen.Triangle.Neighbours
|
||||
---@field color ColorString?
|
||||
local Triangle = {
|
||||
neighbours = {}
|
||||
@@ -84,21 +82,20 @@ local Triangle = {
|
||||
---@param p2 MapGen.Peak
|
||||
---@param p3 MapGen.Peak
|
||||
---@return MapGen.Triangle
|
||||
function Triangle:new(id, p1, p2, p3, neighboursIDs)
|
||||
function Triangle:new(p1, p2, p3)
|
||||
assert(not isFlatAngle(p1, p2, p3), ("angle (p1, p2, p3) is flat:\n %s\n %s\n %s")
|
||||
:format(tostring(p1), tostring(p2), tostring(p3)))
|
||||
|
||||
---@type ColorString?
|
||||
local color = nil
|
||||
|
||||
local c1, c2, c3 = p1.color, p2.color, p3.color
|
||||
local c1, c2, c3 = p1.getColor(), p2.getColor(), p3.getColor()
|
||||
|
||||
if c1 == c2 and c2 == c3 and c3 == c1 then
|
||||
color = c1
|
||||
end
|
||||
|
||||
local instance = getInstance(self, {
|
||||
id = id,
|
||||
p1 = p1,
|
||||
p2 = p2,
|
||||
p3 = p3,
|
||||
@@ -108,8 +105,7 @@ function Triangle:new(id, p1, p2, p3, neighboursIDs)
|
||||
e1 = Edge:new(p1, p2),
|
||||
e2 = Edge:new(p2, p3),
|
||||
e3 = Edge:new(p3, p1),
|
||||
neighboursIDs = neighboursIDs,
|
||||
color = color,
|
||||
color = color
|
||||
},
|
||||
{
|
||||
__tostring = self.toString,
|
||||
@@ -123,9 +119,9 @@ end
|
||||
---@return string
|
||||
function Triangle:toString()
|
||||
return ('Triangle: \n %s\n %s\n %s'):format(
|
||||
tostring(self.p1.pos),
|
||||
tostring(self.p2.pos),
|
||||
tostring(self.p3.pos)
|
||||
tostring(self.p1.getPeakPos()),
|
||||
tostring(self.p2.getPeakPos()),
|
||||
tostring(self.p3.getPeakPos())
|
||||
)
|
||||
end
|
||||
|
||||
@@ -148,9 +144,9 @@ end
|
||||
---Returns the coordinates of the triangle's center.
|
||||
---@return vector
|
||||
function Triangle:getCenter()
|
||||
local pos1 = self.p1.pos
|
||||
local pos2 = self.p2.pos
|
||||
local pos3 = self.p3.pos
|
||||
local pos1 = self.p1:getPeakPos()
|
||||
local pos2 = self.p2:getPeakPos()
|
||||
local pos3 = self.p3:getPeakPos()
|
||||
|
||||
return (pos1 + pos2 + pos3) / 3
|
||||
end
|
||||
@@ -167,11 +163,11 @@ end
|
||||
---@param p1 MapGen.Peak
|
||||
---@param p2 MapGen.Peak
|
||||
---@param p3 MapGen.Peak
|
||||
---@return MapGen.Edge
|
||||
---@return MapGen.Triangulation.Edge
|
||||
function Triangle:getHeight(p1, p2, p3)
|
||||
local pos1 = p1.pos
|
||||
local pos2 = p2.pos
|
||||
local pos3 = p3.pos
|
||||
local pos1 = p1:getPeakPos()
|
||||
local pos2 = p2:getPeakPos()
|
||||
local pos3 = p3:getPeakPos()
|
||||
|
||||
local v = pos3 - pos2
|
||||
---@type vector
|
||||
@@ -193,11 +189,11 @@ end
|
||||
---@param p1 MapGen.Peak
|
||||
---@param p2 MapGen.Peak
|
||||
---@param p3 MapGen.Peak
|
||||
---@return MapGen.Edge
|
||||
---@return MapGen.Triangulation.Edge
|
||||
function Triangle:getHeight2D(p1, p2, p3)
|
||||
local pos1 = p1.pos
|
||||
local pos2 = p2.pos
|
||||
local pos3 = p3.pos
|
||||
local pos1 = p1:getPeakPos()
|
||||
local pos2 = p2:getPeakPos()
|
||||
local pos3 = p3:getPeakPos()
|
||||
|
||||
pos1.y = 0
|
||||
pos2.y = 0
|
||||
@@ -228,9 +224,9 @@ end
|
||||
---that is, the calculation is performed on the projection of the triangle XZ.
|
||||
---@return number, number, number
|
||||
function Triangle:getSidesLength2D()
|
||||
local pos1 = self.p1.pos
|
||||
local pos2 = self.p2.pos
|
||||
local pos3 = self.p3.pos
|
||||
local pos1 = self.p1:getPeakPos()
|
||||
local pos2 = self.p2:getPeakPos()
|
||||
local pos3 = self.p3:getPeakPos()
|
||||
|
||||
pos1.y = 0
|
||||
pos2.y = 0
|
||||
@@ -245,9 +241,9 @@ end
|
||||
---that is, the calculation is performed on the projection of the triangle XZ.
|
||||
---@return vector
|
||||
function Triangle:getCircumCenter2D()
|
||||
local pos1 = self.p1.pos
|
||||
local pos2 = self.p2.pos
|
||||
local pos3 = self.p3.pos
|
||||
local pos1 = self.p1:getPeakPos()
|
||||
local pos2 = self.p2:getPeakPos()
|
||||
local pos3 = self.p3:getPeakPos()
|
||||
|
||||
local D = ( pos1.x * (pos2.z - pos3.z) +
|
||||
pos2.x * (pos3.z - pos1.z) +
|
||||
@@ -294,7 +290,7 @@ end
|
||||
---@param p MapGen.Peak
|
||||
---@return boolean
|
||||
function Triangle:inCircumCircle2D(p)
|
||||
local pos = p.pos
|
||||
local pos = p:getPeakPos()
|
||||
|
||||
local c, r = self:getCircumCircle2D()
|
||||
|
||||
|
||||
326
mods/CORE/MapGen/src/MapGen/Triangulation.lua
Normal file
@@ -0,0 +1,326 @@
|
||||
-- Tringulation lib
|
||||
-- Original code: https://github.com/iskolbin/Triangulation/blob/master/Triangulation.lua
|
||||
-- Date of copying: 07.11.2025
|
||||
-- Commit: e8d26241767cd6af377b5eda0c1e27122b6afe8a
|
||||
|
||||
-- Main changes:
|
||||
-- * refactoring code to our standard;
|
||||
-- * splitting code into different files (classes);
|
||||
-- * Adapting the code to the mapgen concept;
|
||||
-- * Adding tetrahedralization;
|
||||
-- * Fixed non-determinism by sorting vertices before processing;
|
||||
|
||||
local assert, mathMax, tableRemove, tableSort
|
||||
= assert, math.max, table.remove, table.sort
|
||||
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
|
||||
---@type MapGen.Triangle
|
||||
local Triangle = require('MapGen.Triangle')
|
||||
---@type MapGen.Tetrahedron
|
||||
local Tetrahedron = require('MapGen.Tetrahedron')
|
||||
---@type MapGen.Triangulation.FakePeak
|
||||
local FakePeak = require('MapGen.Triangulation.FakePeak')
|
||||
|
||||
---@class MapGen.Triangulation
|
||||
---@field convexMultiplier number
|
||||
local Triangulation = {
|
||||
convexMultiplier = 1e3,
|
||||
}
|
||||
|
||||
---Finds and writes adjacent triangles into triangles.
|
||||
---@param triangles MapGen.Triangle[]
|
||||
local function findTrianglesNeighbours(triangles)
|
||||
for _, triangle in ipairs(triangles) do
|
||||
for _, t in ipairs(triangles) do
|
||||
if triangle.e1 == t.e1 and triangle.p3 ~= t.p3 then
|
||||
triangle.neighbours.t1 = t
|
||||
elseif triangle.e2 == t.e2 and triangle.p3 ~= t.p1 then
|
||||
triangle.neighbours.t2 = t
|
||||
elseif triangle.e3 == t.e3 and triangle.p3 ~= t.p2 then
|
||||
triangle.neighbours.t3 = t
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---Filter vertices by group and return a new table
|
||||
---@param vertices table<integer, MapGen.Peak>
|
||||
---@param groupKey string
|
||||
---@return table<integer, MapGen.Peak>
|
||||
local function filterVerticesByGroup(vertices, groupKey)
|
||||
local result = {}
|
||||
for i = 1, #vertices do
|
||||
local vertex = vertices[i]
|
||||
if vertex:getGroups()[groupKey] ~= nil then
|
||||
result[#result + 1] = vertex
|
||||
end
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
---Sort vertices deterministically by position to ensure consistent triangulation
|
||||
---@param vertices table<integer, MapGen.Peak>
|
||||
local function sortVerticesDeterministically(vertices)
|
||||
tableSort(vertices, function(a, b)
|
||||
local posA = a:getPeakPos()
|
||||
local posB = b:getPeakPos()
|
||||
|
||||
-- Sort by X first
|
||||
if posA.x ~= posB.x then
|
||||
return posA.x < posB.x
|
||||
end
|
||||
|
||||
-- Then by Z
|
||||
if posA.z ~= posB.z then
|
||||
return posA.z < posB.z
|
||||
end
|
||||
|
||||
-- Then by Y
|
||||
if posA.y ~= posB.y then
|
||||
return posA.y < posB.y
|
||||
end
|
||||
|
||||
-- Fallback to unique identifier if positions are identical
|
||||
-- This handles potential duplicate positions
|
||||
local nameA = a.getName and a:getName() or ""
|
||||
local nameB = b.getName and b:getName() or ""
|
||||
return nameA < nameB
|
||||
end)
|
||||
end
|
||||
|
||||
---The Delaunay method divides a plane into triangles based on a list of their vertices.
|
||||
---
|
||||
---Doesn't take into account the Y coordinate of the vertices.
|
||||
---That is, all triangles that don't lie in the XZ plane will be projected onto it.
|
||||
---
|
||||
---Vertices that do not have a `is2d` group will not participate in the triangulation.
|
||||
---@param vertices table<integer, MapGen.Peak>
|
||||
function Triangulation.triangulate(vertices)
|
||||
-- Filter vertices with is2d group (creates a new table)
|
||||
vertices = filterVerticesByGroup(vertices, "is2d")
|
||||
|
||||
-- Sort deterministically to ensure consistent results across sessions
|
||||
sortVerticesDeterministically(vertices)
|
||||
|
||||
local nvertices = #vertices
|
||||
|
||||
assert(nvertices > 2, "Cannot triangulate, needs more than 3 vertices")
|
||||
|
||||
if nvertices == 3 then
|
||||
return {Triangle:new(vertices[1], vertices[2], vertices[3])}
|
||||
end
|
||||
|
||||
local minPos = vertices[1]:getPeakPos()
|
||||
local minX, minY = minPos.x, minPos.z
|
||||
local maxX, maxY = minX, minY
|
||||
|
||||
for i = 1, nvertices do
|
||||
local vertex = vertices[i]
|
||||
local vertexPos = vertex:getPeakPos()
|
||||
vertex.id = i
|
||||
|
||||
if vertexPos.x < minX then
|
||||
minX = vertexPos.x
|
||||
end
|
||||
|
||||
if vertexPos.z < minY then
|
||||
minY = vertexPos.z
|
||||
end
|
||||
|
||||
if vertexPos.x > maxX then
|
||||
maxX = vertexPos.x
|
||||
end
|
||||
|
||||
if vertexPos.z > maxY then
|
||||
maxY = vertexPos.z
|
||||
end
|
||||
end
|
||||
|
||||
-- Finding the vertices of a supertriangle
|
||||
local convex_mult = Triangulation.convexMultiplier
|
||||
local dx, dy = (maxX - minX) * convex_mult, (maxY - minY) * convex_mult
|
||||
local deltaMax = mathMax(dx, dy)
|
||||
local midx, midy = (minX + maxX) * 0.5, (minY + maxY) * 0.5
|
||||
|
||||
local p1 = FakePeak:new(vector.new(midx - 2 * deltaMax, 0, midy - deltaMax))
|
||||
local p2 = FakePeak:new(vector.new(midx, 0, midy + 2 * deltaMax))
|
||||
local p3 = FakePeak:new(vector.new(midx + 2 * deltaMax, 0, midy - deltaMax))
|
||||
|
||||
p1.id, p2.id, p3.id = nvertices + 1, nvertices + 2, nvertices + 3
|
||||
vertices[p1.id], vertices[p2.id], vertices[p3.id] = p1, p2, p3
|
||||
|
||||
---@type MapGen.Triangle[]
|
||||
local triangles = {Triangle:new(vertices[nvertices + 1], vertices[nvertices + 2], vertices[nvertices + 3])}
|
||||
|
||||
for i = 1, nvertices do
|
||||
---@type MapGen.Triangulation.Edge[]
|
||||
local edges = {}
|
||||
|
||||
-- Finding bad triangles.
|
||||
for j = #triangles, 1, -1 do
|
||||
local curTriangle = triangles[j]
|
||||
|
||||
if curTriangle:inCircumCircle2D(vertices[i]) then
|
||||
edges[#edges + 1] = curTriangle.e1
|
||||
edges[#edges + 1] = curTriangle.e2
|
||||
edges[#edges + 1] = curTriangle.e3
|
||||
tableRemove(triangles, j)
|
||||
end
|
||||
end
|
||||
|
||||
-- Removing duplicate edges.
|
||||
for j = #edges - 1, 1, -1 do
|
||||
for k = #edges, j + 1, -1 do
|
||||
if edges[j] and edges[k] and edges[j]:same(edges[k]) then
|
||||
tableRemove(edges, j)
|
||||
tableRemove(edges, k - 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Create new triangles.
|
||||
for j = 1, #edges do
|
||||
triangles[#triangles + 1] = Triangle:new(edges[j].p1, edges[j].p2, vertices[i])
|
||||
end
|
||||
end
|
||||
|
||||
-- Remove triangles associated with the vertices of a supertriangle.
|
||||
for i = #triangles, 1, -1 do
|
||||
local triangle = triangles[i]
|
||||
if triangle.p1.id > nvertices or triangle.p2.id > nvertices or triangle.p3.id > nvertices then
|
||||
tableRemove(triangles, i)
|
||||
end
|
||||
end
|
||||
|
||||
-- Removing the vertices of a supertriangle.
|
||||
for _ = 1, 3 do
|
||||
tableRemove(vertices)
|
||||
end
|
||||
|
||||
findTrianglesNeighbours(triangles)
|
||||
|
||||
return triangles
|
||||
end
|
||||
|
||||
---The Delaunay method divides space into tetrahedra based on a list of their vertices.
|
||||
---
|
||||
---Vertices that do not have a `is3d` group will not participate in the triangulation.
|
||||
---@param vertices table<integer, MapGen.Peak>
|
||||
function Triangulation.tetrahedralize(vertices)
|
||||
-- Filter vertices with is3d group (creates a new table)
|
||||
vertices = filterVerticesByGroup(vertices, "is3d")
|
||||
|
||||
-- Sort deterministically to ensure consistent results across sessions
|
||||
sortVerticesDeterministically(vertices)
|
||||
|
||||
local nvertices = #vertices
|
||||
|
||||
assert(nvertices > 3, "Cannot tetrahedralize, needs more than 4 vertices")
|
||||
|
||||
if nvertices == 4 then
|
||||
return {Tetrahedron:new(vertices[1], vertices[2], vertices[3], vertices[4])}
|
||||
end
|
||||
|
||||
local minPos = vertices[1]:getPeakPos()
|
||||
local minX, minY, minZ = minPos.x, minPos.y, minPos.z
|
||||
local maxX, maxY, maxZ = minX, minY, minZ
|
||||
|
||||
for i = 1, nvertices do
|
||||
local vertex = vertices[i]
|
||||
local vertexPos = vertex:getPeakPos()
|
||||
vertex.id = i
|
||||
|
||||
if vertexPos.x < minX then
|
||||
minX = vertexPos.x
|
||||
end
|
||||
|
||||
if vertexPos.y < minY then
|
||||
minY = vertexPos.y
|
||||
end
|
||||
|
||||
if vertexPos.z < minZ then
|
||||
minZ = vertexPos.z
|
||||
end
|
||||
|
||||
if vertexPos.x > maxX then
|
||||
maxX = vertexPos.x
|
||||
end
|
||||
|
||||
if vertexPos.y > maxY then
|
||||
maxY = vertexPos.y
|
||||
end
|
||||
|
||||
if vertexPos.z > maxZ then
|
||||
maxZ = vertexPos.z
|
||||
end
|
||||
end
|
||||
|
||||
-- Finding the vertices of a supertetrahedron
|
||||
local convex_mult = Triangulation.convexMultiplier
|
||||
local dx, dy, dz = (maxX - minX) * convex_mult, (maxY - minY) * convex_mult, (maxZ - minZ) * convex_mult
|
||||
local deltaMax = mathMax(dx, dy, dz)
|
||||
local midx, midy, midz = (minX + maxX) * 0.5, (minY + maxY) * 0.5, (minZ + maxZ) * 0.5
|
||||
|
||||
local p1 = FakePeak:new(vector.new(midx - 2 * deltaMax, midy - deltaMax, midz - deltaMax))
|
||||
local p2 = FakePeak:new(vector.new(midx + 2 * deltaMax, midy - deltaMax, midz - deltaMax))
|
||||
local p3 = FakePeak:new(vector.new(midx, midy + 2 * deltaMax, midz - deltaMax))
|
||||
local p4 = FakePeak:new(vector.new(midx, midy, midz + 2 * deltaMax))
|
||||
|
||||
p1.id, p2.id, p3.id, p4.id = nvertices + 1, nvertices + 2, nvertices + 3, nvertices + 4
|
||||
vertices[p1.id], vertices[p2.id], vertices[p3.id], vertices[p4.id] = p1, p2, p3, p4
|
||||
|
||||
---@type MapGen.Tetrahedron[]
|
||||
local tetrahedrons = {Tetrahedron:new(p1, p2, p3, p4)}
|
||||
|
||||
for i = 1, nvertices do
|
||||
---@type MapGen.Triangle[]
|
||||
local faces = {}
|
||||
|
||||
-- Finding bad tetrahedrons.
|
||||
for j = #tetrahedrons, 1, -1 do
|
||||
local curTetrahedron = tetrahedrons[j]
|
||||
|
||||
if curTetrahedron:inCircumSphere(vertices[i]) then
|
||||
faces[#faces + 1] = curTetrahedron.f1
|
||||
faces[#faces + 1] = curTetrahedron.f2
|
||||
faces[#faces + 1] = curTetrahedron.f3
|
||||
faces[#faces + 1] = curTetrahedron.f4
|
||||
tableRemove(tetrahedrons, j)
|
||||
end
|
||||
end
|
||||
|
||||
-- Removing duplicate faces.
|
||||
for j = #faces - 1, 1, -1 do
|
||||
for k = #faces, j + 1, -1 do
|
||||
if faces[j] and faces[k] and faces[j]:same(faces[k]) then
|
||||
tableRemove(faces, j)
|
||||
tableRemove(faces, k - 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Create new tetrahedrons.
|
||||
for j = 1, #faces do
|
||||
tetrahedrons[#tetrahedrons + 1] = Tetrahedron:new(faces[j].p1, faces[j].p2, faces[j].p3, vertices[i])
|
||||
end
|
||||
end
|
||||
|
||||
-- Remove tetrahedra associated with the vertices of a supertetrahedron.
|
||||
for i = #tetrahedrons, 1, -1 do
|
||||
local tetrahedron = tetrahedrons[i]
|
||||
if tetrahedron.p1.id > nvertices or tetrahedron.p2.id > nvertices or tetrahedron.p3.id > nvertices or tetrahedron.p4.id > nvertices then
|
||||
tableRemove(tetrahedrons, i)
|
||||
end
|
||||
end
|
||||
|
||||
-- Removing the vertices of a supertetrahedron.
|
||||
for _ = 1, 4 do
|
||||
tableRemove(vertices)
|
||||
end
|
||||
|
||||
return tetrahedrons
|
||||
end
|
||||
|
||||
return Triangulation
|
||||
@@ -1,20 +1,18 @@
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@class MapGen.Edge
|
||||
---@class MapGen.Triangulation.Edge
|
||||
---@field p1 MapGen.Peak
|
||||
---@field p2 MapGen.Peak
|
||||
---@field vec vector
|
||||
local Edge = {}
|
||||
|
||||
---@param p1 MapGen.Peak
|
||||
---@param p2 MapGen.Peak
|
||||
---@return MapGen.Edge
|
||||
---@return MapGen.Triangulation.Edge
|
||||
function Edge:new( p1, p2 )
|
||||
---@type MapGen.Edge
|
||||
---@type MapGen.Triangulation.Edge
|
||||
local instance = getInstance(self, {
|
||||
p1 = p1,
|
||||
p2 = p2,
|
||||
vec = p2.pos - p1.pos
|
||||
p2 = p2
|
||||
},
|
||||
{
|
||||
__tostring = self.toString,
|
||||
@@ -31,14 +29,14 @@ function Edge:toString()
|
||||
end
|
||||
|
||||
---Returns true if the edges are equivalent.
|
||||
---@param other MapGen.Edge
|
||||
---@param other MapGen.Triangulation.Edge
|
||||
---@return boolean
|
||||
function Edge:eq(other)
|
||||
return self.p1 == other.p1 and self.p2 == other.p2
|
||||
end
|
||||
|
||||
---Returns true if the edges are similar.
|
||||
---@param other MapGen.Edge
|
||||
---@param other MapGen.Triangulation.Edge
|
||||
---@return boolean
|
||||
function Edge:same(other)
|
||||
return (self.p1 == other.p1 and self.p2 == other.p2)
|
||||
@@ -48,14 +46,14 @@ end
|
||||
---Returns the length of an edge.
|
||||
---@return number
|
||||
function Edge:length()
|
||||
return (self.p1.pos - self.p2.pos):length()
|
||||
return (self.p1.getPeakPos() - self.p2.getPeakPos()):length()
|
||||
end
|
||||
|
||||
---Returns the vector of the point located in the middle of the edge.
|
||||
---@return vector
|
||||
function Edge:getMidPoint()
|
||||
local pos1 = self.p1.pos
|
||||
local pos2 = self.p2.pos
|
||||
local pos1 = self.p1:getPeakPos()
|
||||
local pos2 = self.p2:getPeakPos()
|
||||
|
||||
return (pos1 + pos2 )/2
|
||||
end
|
||||
@@ -7,14 +7,14 @@ local Peak = require('MapGen.Peak')
|
||||
---Allows you to create a `MapGen.Peak` without specifying a noise parameter.
|
||||
---
|
||||
---**WARNING: MUST NOT BE PARTICIPATED IN GENERATION**
|
||||
---@class MapGen.FakePeak : MapGen.Peak
|
||||
---@class MapGen.Triangulation.FakePeak : MapGen.Peak
|
||||
---@field id number
|
||||
---@field getPeakPos fun():vector
|
||||
local FakePeak = Class.extend(Peak, {})
|
||||
|
||||
---Returns a fake `MapGen.Peak` that has no noise parameters.
|
||||
---Note that the initialized peak should not be used in generation.
|
||||
---@param peakPos MapPosition|vector
|
||||
---@param peakPos vector
|
||||
---@return MapGen.Peak
|
||||
function FakePeak:new(peakPos)
|
||||
local instance = Peak:new({pos = peakPos, color = '#000000'})
|
||||
@@ -1,4 +1,10 @@
|
||||
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
|
||||
local itemRequire = Mod.getInfo('smc__core__item').require
|
||||
|
||||
---@type Item
|
||||
local Item = itemRequire('Item')
|
||||
|
||||
---@type ItemFactory
|
||||
local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
|
||||
|
||||
---@class Node : Item
|
||||
---@field defaultDef Node.NodeDefinition
|
||||
@@ -16,7 +22,7 @@ function Node:new(nodeDef)
|
||||
---Adding default parameters
|
||||
nodeDef = defMerge(nodeDef, self.defaultDef, true)
|
||||
|
||||
nodeDef.settings._type = 'node'
|
||||
nodeDef.settings.visual = 'item_3d'
|
||||
|
||||
---@type Node
|
||||
local instance = Item:new(nodeDef)
|
||||
@@ -29,8 +35,6 @@ end
|
||||
---@param defaultDef Node.NodeDefinition
|
||||
---@return Node
|
||||
function Node:getExtended(defaultDef)
|
||||
defaultDef = defMerge(defaultDef, self.defaultDef)
|
||||
|
||||
---@type Node
|
||||
local ChildClass = Class.extend(self, {
|
||||
defaultDef = defaultDef,
|
||||
@@ -45,8 +49,6 @@ end
|
||||
function Node:getFactory(defaultDef)
|
||||
if defaultDef == nil then
|
||||
defaultDef = self.defaultDef
|
||||
else
|
||||
defaultDef = defMerge(self.defaultDef, defaultDef)
|
||||
end
|
||||
|
||||
---@type ItemFactory
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
local Node = Smc.requireNode()
|
||||
local nodeRequire = Mod.getInfo('smc__core__node').require
|
||||
|
||||
---@type Node
|
||||
local Node = nodeRequire('Node')
|
||||
|
||||
-- -@type ItemFactory
|
||||
---local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
|
||||
|
||||
---@class Plant : Node
|
||||
local Plant = Node:getExtended({
|
||||
|
||||
@@ -1,23 +1,4 @@
|
||||
---@class Player
|
||||
local Player = {}
|
||||
|
||||
---@type PlayerInventoryUI
|
||||
local PlayerInventoryUI = Mod.getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
|
||||
|
||||
core.register_on_joinplayer(function(player)
|
||||
player:set_inventory_formspec(PlayerInventoryUI:getFormSpecString(player:get_player_name()))
|
||||
player:hud_set_hotbar_itemcount(9)
|
||||
local inv = player:get_inventory()
|
||||
inv:set_size('main', 18)
|
||||
end)
|
||||
|
||||
core.register_chatcommand('show_inv',
|
||||
{
|
||||
func = function(name, param)
|
||||
PlayerInventoryUI:showForm(name)
|
||||
return true
|
||||
end
|
||||
}
|
||||
)
|
||||
|
||||
return Player
|
||||
@@ -1,4 +0,0 @@
|
||||
local modInfo = Mod.getInfo('smc__core__tool')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('Tool')
|
||||
@@ -1,2 +0,0 @@
|
||||
name = smc__core__tool
|
||||
depends = smc__core__item
|
||||
@@ -1,70 +0,0 @@
|
||||
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
|
||||
|
||||
---@class Tool : Item
|
||||
---@field defaultDef Item.ItemDefinition
|
||||
local Tool = Class.extend(Item, {})
|
||||
|
||||
---The alias `table.merge` for EmmyLua
|
||||
---@type fun(...):(Item.ItemDefinition)
|
||||
local defMerge = function(...)
|
||||
return table.merge(...)
|
||||
end
|
||||
|
||||
---@param ToolDef Item.ItemDefinition
|
||||
---@return Tool
|
||||
function Tool:new(ToolDef)
|
||||
---Adding default parameters
|
||||
ToolDef = defMerge(ToolDef, self.defaultDef, true)
|
||||
|
||||
ToolDef.settings._type = 'tool'
|
||||
|
||||
---@type Tool
|
||||
local instance = Item:new(ToolDef)
|
||||
return instance
|
||||
end
|
||||
|
||||
---Allows you to create a child class of an tool by specifying
|
||||
---default parameters that will be added to the tool's parameters
|
||||
---when an instance is received.
|
||||
---@param defaultDef Item.ItemDefinition
|
||||
---@return Tool
|
||||
function Tool:getExtended(defaultDef)
|
||||
defaultDef = defMerge(defaultDef, self.defaultDef)
|
||||
|
||||
---@type Tool
|
||||
local ChildClass = Class.extend(self, {
|
||||
defaultDef = defaultDef,
|
||||
})
|
||||
|
||||
return ChildClass
|
||||
end
|
||||
|
||||
---Returns an instance of the `ItemFactory` class that can be used to mass-register identical items.
|
||||
---@param defaultDef? Item.ItemDefinition
|
||||
---@return ItemFactory
|
||||
function Tool:getFactory(defaultDef)
|
||||
if defaultDef == nil then
|
||||
defaultDef = self.defaultDef
|
||||
else
|
||||
defaultDef = defMerge(self.defaultDef, defaultDef)
|
||||
end
|
||||
|
||||
---@type ItemFactory
|
||||
local instance = ItemFactory:new(self, defaultDef)
|
||||
|
||||
return instance
|
||||
end
|
||||
--[[
|
||||
Tool:new({
|
||||
settings = {
|
||||
name = 'tool',
|
||||
inventory_image = 'anoba.png',
|
||||
tool_capabilities = {
|
||||
groupcaps={
|
||||
crumbly={maxlevel=2, uses=20, times={[1]=1.60, [2]=1.20, [3]=0.80}}
|
||||
},
|
||||
}
|
||||
}
|
||||
})--]]
|
||||
|
||||
return Tool
|
||||
@@ -1,4 +0,0 @@
|
||||
local modInfo = Mod.getInfo('smc__core__work_station')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('WorkStation')
|
||||
@@ -1,2 +0,0 @@
|
||||
name = smc__core__work_station
|
||||
depends = smc__core__craft_system, smc__core__node, smc__ui__work_station
|
||||
@@ -1,258 +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')
|
||||
|
||||
local Node = Smc.requireNode()
|
||||
|
||||
-- Default settings that a work station node should have.
|
||||
local WorkStationNode = Node:getExtended({
|
||||
settings = {
|
||||
name = 'work_station',
|
||||
drawtype = 'normal',
|
||||
paramtype = 'light',
|
||||
groups = {work_station = 1, dig_immediate = 2,}
|
||||
}
|
||||
})
|
||||
|
||||
---A work station (node) that enables player interaction
|
||||
---with the immersive crafting mechanics.
|
||||
---@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
|
||||
---@type Node.Callbacks
|
||||
nodeDef.callbacks = {}
|
||||
end
|
||||
local settings = nodeDef.settings
|
||||
local callbacks = nodeDef.callbacks
|
||||
|
||||
-- Callback when the work station block is installed in the world
|
||||
-- Ensures initialization of necessary parameters
|
||||
callbacks.on_construct = function(pos)
|
||||
-- Getting node metadata
|
||||
local meta = core.get_meta(pos)
|
||||
|
||||
-- Initializing the table of temporary parameters for crafting.
|
||||
Smc.setCraftDataByMeta(meta)
|
||||
end
|
||||
|
||||
-- Callback for interaction with a work station (start of crafting)
|
||||
callbacks.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
|
||||
-- If the workstation is occupied by another craft...
|
||||
if not Smc.workStationIsFree(pos) then
|
||||
-- ...we inform the player about this...
|
||||
core.chat_send_player(clicker:get_player_name(), 'The workbench is occupied by another craft.')
|
||||
-- ...and do nothing.
|
||||
return
|
||||
end
|
||||
|
||||
-- We get a list of crafts that can be produced using the item that the player was holding in his hand.
|
||||
local crafts = ImmersiveCraftHandler:getCraftsByTriggerItem(itemstack:get_name())
|
||||
|
||||
-- If the list is empty...
|
||||
if crafts == nil then
|
||||
-- ..this means there are no crafts for this item,
|
||||
-- so we don't do anything.
|
||||
return
|
||||
else
|
||||
-- ...else we show the player the formspec for choosing a craft.
|
||||
self:showSelectionCraftForm(clicker, crafts, pos)
|
||||
end
|
||||
end
|
||||
|
||||
callbacks.on_punch = function(pos, node, puncher, pointed_thing)
|
||||
if Smc.workStationIsFree(pos) then
|
||||
return
|
||||
end
|
||||
|
||||
local craftData = Smc.getCraftDataByPos(pos)
|
||||
assert(craftData ~= nil, 'Immersive crafting data is empty.')
|
||||
|
||||
local craft = ImmersiveCraftHandler:getCraftByName(craftData.craftName)
|
||||
craft:abortCraft(pos)
|
||||
end
|
||||
|
||||
callbacks.on_dig = function(pos, node, digger)
|
||||
if Smc.workStationIsFree(pos) then
|
||||
return core.node_dig(pos, node, digger)
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
---@type WorkStation
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.group = def.group
|
||||
instance.nodeDef = nodeDef
|
||||
|
||||
-- Registering a node for Luanti.
|
||||
WorkStationNode:new(nodeDef)
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
---Show the player the initial workstation interface for choosing a craft.
|
||||
---@param player Player
|
||||
---@param crafts CraftSystem.ImmersiveCraft[]
|
||||
---@param pos Position
|
||||
function WorkStation:showSelectionCraftForm(player, crafts, pos)
|
||||
-- Create a table in the format craft result - craft name.
|
||||
local outputs = {}
|
||||
for _, craft in ipairs(crafts) do
|
||||
-- TODO: добавить проверку только на известные игроку рецепты
|
||||
outputs[craft.output] = craft.name
|
||||
end
|
||||
|
||||
-- We get the name of the player who wants to start crafting.
|
||||
local playerName = player:get_player_name()
|
||||
|
||||
-- We set the context for transferring data about the workstation coordinates and the list of crafts.
|
||||
WorkStationUI:setContex(playerName, 'pos', pos)
|
||||
WorkStationUI:setContex(playerName, 'outputs', outputs)
|
||||
|
||||
-- Showing the desktop interface to the player.
|
||||
WorkStationUI:showForm(playerName,false)
|
||||
end
|
||||
|
||||
-- Registering a callback for player choice of craft (this does not start crafting).
|
||||
WorkStationUI:registerOnFormFieldActionMatch('%S+::item_button',function(player, fieldName, fieldValue)
|
||||
-- We get the name of the craft from the name of the button the player pressed.
|
||||
local craftName = string.match(fieldName, '(%S+)::item_button')
|
||||
assert(craftName ~= nil, 'Craft name cannot be empty')
|
||||
|
||||
-- We get a craft object.
|
||||
local craft = ImmersiveCraftHandler:getCraftByName(craftName)
|
||||
-- We get the name of the player who wants to start crafting.
|
||||
local playerName = player:get_player_name()
|
||||
|
||||
-- We enter into the context the craft that the player has chosen.
|
||||
WorkStationUI:setContex(playerName, 'craft', craft)
|
||||
-- We show the player a new interface with a crafting description tab.
|
||||
WorkStationUI:showForm(playerName, true)
|
||||
end)
|
||||
|
||||
-- We register a callback when the player starts crafting.
|
||||
WorkStationUI:registerOnFormFieldAction('work_station:start_craft', function(player, fieldName, fieldValue)
|
||||
-- We get the name of the player who wants to start crafting.
|
||||
local playerName = player:get_player_name()
|
||||
|
||||
-- We get the workstation position and craft from the context.
|
||||
local pos = WorkStationUI:getContex(playerName, 'pos')
|
||||
---@type CraftSystem.ImmersiveCraft
|
||||
local craft = WorkStationUI:getContex(playerName, 'craft')
|
||||
|
||||
|
||||
-- We process the amount of crafting.
|
||||
local isCraftStart = false
|
||||
if fieldValue == 'x1' then
|
||||
-- Single craft
|
||||
isCraftStart = craft:startCraft(pos, player, 1)
|
||||
elseif fieldValue == 'x10' then
|
||||
-- Ten crafts at a time.
|
||||
isCraftStart = craft:startCraft(pos, player, 10)
|
||||
end
|
||||
|
||||
-- If the craft was started...
|
||||
if isCraftStart then
|
||||
-- ...we are closing the formspec.
|
||||
WorkStationUI:closeForm(playerName)
|
||||
end
|
||||
end)
|
||||
|
||||
-- --- DEBUG ---
|
||||
|
||||
WorkStation:new('test_station', {
|
||||
group = 'test',
|
||||
nodeDef = {
|
||||
settings = {
|
||||
name = 'test_station',
|
||||
tiles = {'test_station.png'}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
ImmersiveCraftHandler:registerCraft('bricks', {
|
||||
triggerItem = 'rocks:sylite',
|
||||
output = 'rocks:sylite_bricks',
|
||||
startStageName = 'tapping',
|
||||
group = 'test',
|
||||
stages = {
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingStageDef
|
||||
{
|
||||
name = 'tapping',
|
||||
targetItem = 'rocks:sylite',
|
||||
type = 'tapping',
|
||||
clicksNeed = 3,
|
||||
nextStage = 'tapping_2',
|
||||
},
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingStageDef
|
||||
{
|
||||
name = 'tapping_2',
|
||||
toolGroup = 'crushing',
|
||||
targetItem = 'rocks:sylite_block',
|
||||
type = 'tapping',
|
||||
clicksNeed = 5,
|
||||
nextStage = 'tapping_3',
|
||||
},
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingStageDef
|
||||
{
|
||||
name = 'tapping_3',
|
||||
targetItem = 'rocks:sylite_bricks',
|
||||
type = 'tapping',
|
||||
clicksNeed = 1,
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
ImmersiveCraftHandler:registerCraft('block', {
|
||||
triggerItem = 'rocks:sylite',
|
||||
output = 'rocks:sylite_block',
|
||||
startStageName = 'tapping',
|
||||
group = 'test',
|
||||
stages = {
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingStageDef
|
||||
{
|
||||
name = 'tapping',
|
||||
targetItem = 'rocks:sylite',
|
||||
type = 'tapping',
|
||||
clicksNeed = 5,
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
ImmersiveCraftHandler:registerCraft('marentine_planks', {
|
||||
triggerItem = 'wood:marentine_log',
|
||||
output = 'wood:marentine_planks',
|
||||
startStageName = 'tapping',
|
||||
group = 'test',
|
||||
stages = {
|
||||
---@type CraftSystem.ImmersiveCraftStage.TappingStageDef
|
||||
{
|
||||
name = 'tapping',
|
||||
targetItem = 'wood:marentine_log',
|
||||
type = 'tapping',
|
||||
clicksNeed = 5,
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
return WorkStation
|
||||
|
Before Width: | Height: | Size: 1.2 KiB |
73
mods/CORE/adminCommands/init.lua
Normal file
@@ -0,0 +1,73 @@
|
||||
local modInfo = Mod.getInfo('smc__core__formspec')
|
||||
local require = modInfo.require
|
||||
|
||||
---@type Formspec
|
||||
local Formspec = require('Formspec')
|
||||
|
||||
local listForm = Formspec:new({
|
||||
size = {x=21, y=12},
|
||||
})
|
||||
|
||||
listForm:list('current_player', 'main', 10.5, 6.5, 8, 4)
|
||||
|
||||
local listFormItems = Formspec:new()
|
||||
|
||||
local items = table.get_keys(core.registered_nodes)
|
||||
table.sort(items)
|
||||
local w, h = 0, 0
|
||||
|
||||
---@param name string
|
||||
for _, name in ipairs(items) do
|
||||
listFormItems:itemImageButton(w, h, 1, 1, name, name..'::item_button')
|
||||
|
||||
w = w + 1
|
||||
|
||||
if w > 9 then
|
||||
w = 0
|
||||
h = h + 1
|
||||
end
|
||||
end
|
||||
|
||||
--listFormItems:list('current_player', 'main', 0, 0, 1, 32)
|
||||
|
||||
listForm:
|
||||
scrollContainer(listFormItems, 0.5, 0.5, 9, 11, 'admin_commands:list_items', 'vertical'):
|
||||
scrollbar(10, 0.5, 0.25, 10, 'vertical', 'admin_commands:list_items')
|
||||
|
||||
core.register_chatcommand('list', {
|
||||
privs = {server = true},
|
||||
|
||||
func = function(name, param)
|
||||
local player = core.get_player_by_name(name)
|
||||
|
||||
core.show_formspec(name, 'admin_commands:list_form', listForm:toString())
|
||||
|
||||
return true, ''
|
||||
end
|
||||
})
|
||||
|
||||
core.register_on_player_receive_fields(function(player, formname, fields)
|
||||
if formname ~= 'admin_commands:list_form' then
|
||||
return
|
||||
end
|
||||
|
||||
for key, value in pairs(fields) do
|
||||
if string.ends_with(key, '::item_button') then
|
||||
---@type ItemStackString?
|
||||
local stack = string.match(key, '(%S+)::item_button')
|
||||
|
||||
if stack == nil then
|
||||
return
|
||||
end
|
||||
|
||||
core.log(tostring(stack))
|
||||
|
||||
---@type InvRef
|
||||
local inv = player:get_inventory()
|
||||
|
||||
if inv:room_for_item("main", stack) then
|
||||
inv:add_item("main", stack)
|
||||
end
|
||||
end
|
||||
end
|
||||
end)
|
||||
2
mods/CORE/adminCommands/mod.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
name = smc__core__admin_commands
|
||||
depends = smc__system__system_loader, smc__core__formspec, smc__core__item
|
||||
@@ -1,8 +1,6 @@
|
||||
-- World generation occurs in a separate thread (MapGen Environment).
|
||||
-- But for the main thread, the mapgenerator object is also initialized.
|
||||
|
||||
--core.set_mapgen_setting('chunksize', '{x=2,y=10,z=2}', true)
|
||||
|
||||
local mapGeneneratorRequire = Mod.getInfo('smc__core__map_generator').require
|
||||
|
||||
-- Main env init
|
||||
|
||||
@@ -17,9 +17,6 @@ dofile(core.get_modpath('smc__system__logger')..'/init.lua')
|
||||
-- Math
|
||||
dofile(core.get_modpath('smc__system__math')..'/init.lua')
|
||||
|
||||
-- Profile
|
||||
dofile(core.get_modpath('smc__system__profiler')..'/init.lua')
|
||||
|
||||
-- Require
|
||||
dofile(core.get_modpath('smc__system__require')..'/init.lua')
|
||||
|
||||
|
||||
@@ -49,15 +49,10 @@ mapGenerator:registerLayer('midgard', {
|
||||
calcTemp = calcTemp,
|
||||
calcHumidity = calcHumidity,
|
||||
biomesVerticalScattering = 5,
|
||||
biomesGorizontalScattering = 5,
|
||||
triangulationLandscapeFile = 'tarion.json',
|
||||
triangulationTempFile = 'tarion.json',
|
||||
triangulationHumidityFile = 'tarion.json',
|
||||
landscapeMapScale = 100,
|
||||
tempMapScale = 100,
|
||||
humidityMapScale = 100,
|
||||
biomesGorizontalScattering = 5
|
||||
})
|
||||
|
||||
|
||||
-- TODO: Config should be imported from .json file in the world's folder
|
||||
local ocean = {
|
||||
['landscape'] = {
|
||||
@@ -437,127 +432,10 @@ for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#3b7718', swamp_land[c])
|
||||
end
|
||||
|
||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'landscape')
|
||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'temp')
|
||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'humidity')
|
||||
|
||||
--[[
|
||||
local land1 = {
|
||||
offset = -10,
|
||||
scale = 5,
|
||||
spread = {x = 10, y = 10, z = 10},
|
||||
seed = 47,
|
||||
octaves = 3,
|
||||
persistence = 0.4,
|
||||
lacunarity = 2,
|
||||
}
|
||||
|
||||
local land2 = {
|
||||
offset = 20,
|
||||
scale = 5,
|
||||
spread = {x = 30, y = 30, z = 30},
|
||||
seed = 47,
|
||||
octaves = 3,
|
||||
persistence = 0.4,
|
||||
lacunarity = 2,
|
||||
}
|
||||
|
||||
local land3 = {
|
||||
offset = 40,
|
||||
scale = 5,
|
||||
spread = {x = 45, y = 20, z = 45},
|
||||
seed = 472,
|
||||
octaves = 3,
|
||||
persistence = 0.3,
|
||||
lacunarity = 2,
|
||||
}
|
||||
|
||||
local climat1 = {
|
||||
offset = 80,
|
||||
scale = 10,
|
||||
spread = {x = 10, y = 10, z = 10},
|
||||
seed = 47,
|
||||
octaves = 8,
|
||||
persistence = 0.6,
|
||||
lacunarity = 2,
|
||||
}
|
||||
|
||||
local climat2 = {
|
||||
offset = 30,
|
||||
scale = 10,
|
||||
spread = {x = 10, y = 10, z = 10},
|
||||
seed = 47,
|
||||
octaves = 8,
|
||||
persistence = 0.6,
|
||||
lacunarity = 2,
|
||||
}
|
||||
|
||||
local climat0 = {
|
||||
offset = 50,
|
||||
scale = 0,
|
||||
spread = {x = 10, y = 10, z = 10},
|
||||
seed = 47,
|
||||
octaves = 8,
|
||||
persistence = 0.4,
|
||||
lacunarity = 2,
|
||||
}
|
||||
|
||||
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
|
||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', land1)
|
||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#77ea72', land2)
|
||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#46B331', land3)
|
||||
--[[
|
||||
mapGenerator:register2DPeaks('midgard', c, {
|
||||
{
|
||||
color = '#77ea72',
|
||||
pos = vector.new(512, 0, 512)
|
||||
},
|
||||
{
|
||||
color = '#4978c6',
|
||||
pos = vector.new(512, 0, -512)
|
||||
},
|
||||
{
|
||||
color = '#77ea72',
|
||||
pos = vector.new(-512, 0, -512)
|
||||
},
|
||||
{
|
||||
color = '#4978c6',
|
||||
pos = vector.new(-512, 0, 512)
|
||||
},
|
||||
})
|
||||
end
|
||||
--]]
|
||||
-- [[
|
||||
mapGenerator:registerCavern('midgard', 'cavern1', {
|
||||
minY = -48,
|
||||
@@ -597,7 +475,7 @@ local rocksNoiseParams ={
|
||||
lacunarity = 4,
|
||||
}
|
||||
|
||||
local function generateRock(biome, mapGenerator, factors, data, index, x, y, z)
|
||||
local function generateRock(biome, mapGenerator, data, index, x, y, z)
|
||||
local ids = mapGenerator.nodeIDs
|
||||
|
||||
if rocksNoise == nil then
|
||||
@@ -632,7 +510,7 @@ local function generateRock(biome, mapGenerator, factors, data, index, x, y, z)
|
||||
end
|
||||
|
||||
---@param biome MapGen.Biome
|
||||
local function generateSoil(biome, mapGenerator, factors, data, index, x, y, z)
|
||||
local function generateSoil(biome, mapGenerator, data, index, x, y, z)
|
||||
local ids = mapGenerator.nodeIDs
|
||||
if rocksNoise == nil then
|
||||
rocksNoise = core.get_value_noise(rocksNoiseParams)
|
||||
@@ -652,7 +530,7 @@ local function generateSoil(biome, mapGenerator, factors, data, index, x, y, z)
|
||||
end
|
||||
|
||||
---@param biome MapGen.Biome
|
||||
local function generateTurf(biome, mapGenerator, factors, data, index, x, y, z)
|
||||
local function generateTurf(biome, mapGenerator, data, index, x, y, z)
|
||||
local ids = mapGenerator.nodeIDs
|
||||
if rocksNoise == nil then
|
||||
rocksNoise = core.get_value_noise(rocksNoiseParams)
|
||||
@@ -671,22 +549,6 @@ local function generateTurf(biome, mapGenerator, factors, data, index, x, y, z)
|
||||
end
|
||||
end
|
||||
|
||||
---@param area VoxelArea
|
||||
local function postProcessing(biome, mapGenerator, factors, data, index, x, y, z, nodeType, area)
|
||||
local trufID = biome.groundNodesIDs.turf
|
||||
local waterID = mapGenerator.nodeIDs.water
|
||||
if data[index] ~= trufID then
|
||||
return
|
||||
end
|
||||
|
||||
if (data[area:index(x+1, y, z)] == trufID or data[area:index(x+1, y, z)] == waterID) and
|
||||
(data[area:index(x-1, y, z)] == trufID or data[area:index(x-1, y, z)] == waterID) and
|
||||
(data[area:index(x, y, z+1)] == trufID or data[area:index(x, y, z+1)] == waterID) and
|
||||
(data[area:index(x, y, z-1)] == trufID or data[area:index(x, y, z-1)] == waterID) then
|
||||
data[index] = mapGenerator.nodeIDs.water
|
||||
end
|
||||
end
|
||||
|
||||
mapGenerator:registerBiome('midgard', 'swamp', {
|
||||
tempPoint = 0,
|
||||
humidityPoint = 80,
|
||||
@@ -702,7 +564,6 @@ mapGenerator:registerBiome('midgard', 'swamp', {
|
||||
generateRock = generateRock,
|
||||
generateTurf = generateTurf,
|
||||
generateSoil = generateSoil,
|
||||
postProcessing = postProcessing
|
||||
})
|
||||
|
||||
return mapGenerator
|
||||
|
Before Width: | Height: | Size: 2.2 KiB |
@@ -1,3 +1,3 @@
|
||||
name = smc__game__items__items_loader
|
||||
description = Include this mod in your `depends` to ensure all items are registered
|
||||
depends = smc__game__items__rocks, smc__game__items__wood, smc__game__items__soils, smc__game__items__liquids, smc__game__items__plants
|
||||
depends = smc__game__items__rocks, smc__game__items__wood, smc__game__items__soils, smc__game__items__liquids
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
local Item, TileSheet = Smc.requireItem(), Smc.requireTileSheet()
|
||||
|
||||
---@type Item.ItemDefinition
|
||||
local defaultEssenceDef = {
|
||||
settings = {
|
||||
name = '',
|
||||
_rarity = 'uncommon',
|
||||
stack_max = 32,
|
||||
}
|
||||
}
|
||||
|
||||
local defaultEssence = Item:getExtended(defaultEssenceDef)
|
||||
|
||||
local ts = TileSheet:new('essences_sheet.png', 16, 16)
|
||||
|
||||
defaultEssence:new({
|
||||
settings = {
|
||||
name = 'essence_experience',
|
||||
inventory_image = ts:t(0, 0)
|
||||
}
|
||||
})
|
||||
|
||||
defaultEssence:new({
|
||||
settings = {
|
||||
name = 'essence_spell',
|
||||
inventory_image = ts:t(1, 0)
|
||||
}
|
||||
})
|
||||
|
||||
defaultEssence:new({
|
||||
settings = {
|
||||
name = 'essence_life',
|
||||
inventory_image = ts:t(2, 0)
|
||||
}
|
||||
})
|
||||
@@ -1,10 +0,0 @@
|
||||
# textdomain: essences
|
||||
|
||||
essence_experience-title=Эссенция опыта
|
||||
essence_experience-desc=Сгусток желеобразной материи,@nзаключающий в себе ремесленный опыт.
|
||||
|
||||
essence_spell-title=Эссенция заклятия
|
||||
essence_spell-desc=Сгусток желеобразной материи,@nзаключающий в себе мистическую силу.
|
||||
|
||||
essence_life-title=Эссенция жизни
|
||||
essence_life-desc=Сгусток желеобразной материи,@nзаключающий в себе жизненную энергию.
|
||||
@@ -1,2 +0,0 @@
|
||||
name = smc__game__items__essences
|
||||
depends = smc__core__item
|
||||
|
Before Width: | Height: | Size: 3.2 KiB |
@@ -1,10 +1,11 @@
|
||||
local Node = Smc.requireNode()
|
||||
---@type Node
|
||||
local Node = Mod.getInfo('smc__core__node').require('Node')
|
||||
|
||||
---@type Node.NodeDefinition
|
||||
local defaultLiquidDef = {
|
||||
settings = {
|
||||
name = '',
|
||||
_add_mod_name = false,
|
||||
addModName = false,
|
||||
tiles = {},
|
||||
waving = 3,
|
||||
use_texture_alpha = "blend",
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
local Plant, TileSheet = Smc.requirePlant(), Smc.requireTileSheet()
|
||||
local modInfo = Mod.getInfo('smc__core__plant')
|
||||
|
||||
---@type TileSheet
|
||||
local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
|
||||
|
||||
---@type Plant
|
||||
local Plant = modInfo.require('Plant')
|
||||
|
||||
Plant:new({
|
||||
settings = {
|
||||
@@ -15,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,
|
||||
},
|
||||
|
||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -1,9 +1,14 @@
|
||||
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
|
||||
---@type TileSheet
|
||||
local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
|
||||
|
||||
---@type Node
|
||||
local Node = Mod.getInfo('smc__core__node').require('Node')
|
||||
|
||||
---@type Node.NodeDefinition
|
||||
local defaultRockDef = {
|
||||
settings = {
|
||||
name = '',
|
||||
name = "",
|
||||
description = "A rocks",
|
||||
tiles = {},
|
||||
groups = {
|
||||
dig_immediate = 2,
|
||||
@@ -40,27 +45,84 @@ 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', 0)
|
||||
registerPilarStaff('sylite_gray', 1)
|
||||
registerPilarStaff('sylite_black', 2)
|
||||
|
||||
registerRocksTypes('', 0)
|
||||
registerRocksTypes('_chipped', 1)
|
||||
registerRocksTypes('_block', 3)
|
||||
registerRocksTypes('_bricks', 4)
|
||||
registerRocksTypes('_bricks_2', 5)
|
||||
registerRocksTypes('_block', 2)
|
||||
registerRocksTypes('_bricks', 5)
|
||||
|
||||
--[[
|
||||
rockFactory:registerItems({
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "sylite",
|
||||
title = "Sylite",
|
||||
--description = "",
|
||||
tiles = {"rocks_sheet.png^[sheet:7x15:0,0"},
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "tauitite",
|
||||
title = "Tauitite",
|
||||
--description = "",
|
||||
tiles = {"rocks_sheet.png^[sheet:7x15:0,2"},
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "iyellite",
|
||||
title = "Iyellite",
|
||||
--description = "",
|
||||
tiles = {"rocks_sheet.png^[sheet:7x15:0,4"},
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "falmyte",
|
||||
title = "Falmyte",
|
||||
--description = "",
|
||||
tiles = {"rocks_sheet.png^[sheet:7x15:0,6"},
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "hapcoryte",
|
||||
title = "Hapcoryte",
|
||||
--description = "",
|
||||
tiles = {"rocks_sheet.png^[sheet:7x15:0,8"},
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "burcite",
|
||||
title = "Burcite",
|
||||
--description = "",
|
||||
tiles = {"rocks_sheet.png^[sheet:7x15:0,10"},
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "felhor",
|
||||
title = "Felhor",
|
||||
--description = "",
|
||||
tiles = {"rocks_sheet.png^[sheet:7x15:0,12"},
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "malachite",
|
||||
title = "Malachite",
|
||||
--description = "",
|
||||
tiles = {"rocks_sheet.png^[sheet:7x15:0,14"},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
--]]
|
||||
@@ -1,6 +0,0 @@
|
||||
# textdomain: rocks
|
||||
|
||||
sylite_block-title=Силитовый блок
|
||||
sylite_block-desc=Массивный блок из цельного куска силита.
|
||||
sylite_bricks-title=Силитовые кирпичи
|
||||
sylite_bricks-desc=Кладка из силитовых кирпичей.
|
||||
|
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 106 KiB |
@@ -1,14 +1,17 @@
|
||||
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
|
||||
---@type TileSheet
|
||||
local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
|
||||
|
||||
---@type Node
|
||||
local Node = Mod.getInfo('smc__core__node').require('Node')
|
||||
|
||||
---@type Node.NodeDefinition
|
||||
local defaultSoilDef = {
|
||||
settings = {
|
||||
name = "",
|
||||
_description = "A soil",
|
||||
description = "A soil",
|
||||
tiles = {},
|
||||
groups = {
|
||||
dig_immediate = 2,
|
||||
soil = 1,
|
||||
soil_fertiliry = 100, -- Soil fertility for agriculture
|
||||
}
|
||||
},
|
||||
@@ -44,7 +47,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_baren",
|
||||
_title = "Barren Clay Soil",
|
||||
title = "Barren Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
@@ -53,7 +56,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_poor",
|
||||
_title = "Poor Clay Soil",
|
||||
title = "Poor Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
@@ -62,7 +65,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_moderate",
|
||||
_title = "Moderate Clay Soil",
|
||||
title = "Moderate Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
@@ -71,7 +74,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_fertile",
|
||||
_title = "Fertile Clay Soil",
|
||||
title = "Fertile Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
@@ -80,7 +83,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "clay_soil_rich",
|
||||
_title = "Rich Clay Soil",
|
||||
title = "Rich Clay Soil",
|
||||
--description = "",
|
||||
tiles = clayTiles,
|
||||
},
|
||||
@@ -93,7 +96,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_baren",
|
||||
_title = "Barren Sandy Soil",
|
||||
title = "Barren Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
@@ -102,7 +105,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_poor",
|
||||
_title = "Poor Sandy Soil",
|
||||
title = "Poor Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
@@ -111,7 +114,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_moderate",
|
||||
_title = "Moderate Sandy Soil",
|
||||
title = "Moderate Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
@@ -120,7 +123,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_fertile",
|
||||
_title = "Fertile Sandy Soil",
|
||||
title = "Fertile Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
@@ -129,7 +132,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "sandy_soil_rich",
|
||||
_title = "Rich Sandy Soil",
|
||||
title = "Rich Sandy Soil",
|
||||
--description = "",
|
||||
tiles = sandyTiles,
|
||||
},
|
||||
@@ -142,7 +145,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_baren",
|
||||
_title = "Barren Mixed Soil",
|
||||
title = "Barren Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
@@ -151,7 +154,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_poor",
|
||||
_title = "Poor Mixed Soil",
|
||||
title = "Poor Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
@@ -160,7 +163,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_moderate",
|
||||
_title = "Moderate Mixed Soil",
|
||||
title = "Moderate Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
@@ -169,7 +172,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_fertile",
|
||||
_title = "Fertile Mixed Soil",
|
||||
title = "Fertile Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
@@ -178,7 +181,7 @@ soilFactory:registerItems({
|
||||
{
|
||||
settings = {
|
||||
name = "mixed_soil_rich",
|
||||
_title = "Rich Mixed Soil",
|
||||
title = "Rich Mixed Soil",
|
||||
--description = "",
|
||||
tiles = mixedTiles,
|
||||
},
|
||||
@@ -191,47 +194,43 @@ 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,
|
||||
},
|
||||
@@ -242,10 +241,13 @@ soilFactory:registerItems({
|
||||
---@type TileSheet
|
||||
local tsT = TileSheet:new("soils_turfs_sheet.png", 16, 16)
|
||||
|
||||
defaultSoil:new({
|
||||
Node:new({
|
||||
settings = {
|
||||
name = 'turf_swamp',
|
||||
tiles = {tsT:t(0,0), ts:t(6, 0), ts:t(6,0)..'^'..tsT:t(0,1)},
|
||||
_rarity = 'unique'
|
||||
groups = {
|
||||
dig_immediate = 2,
|
||||
soil_fertiliry = 100, -- Soil fertility for agriculture
|
||||
}
|
||||
}
|
||||
})
|
||||
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
@@ -1,99 +0,0 @@
|
||||
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
|
||||
|
||||
local defaultStorage = Node:getExtended({
|
||||
settings = {
|
||||
name = '',
|
||||
groups = {
|
||||
dig_immediate = 2,
|
||||
storage = 1
|
||||
},
|
||||
paramtype = 'light',
|
||||
paramtype2 = 'facedir',
|
||||
}
|
||||
})
|
||||
|
||||
local storageFactory = defaultStorage:getFactory()
|
||||
|
||||
---@type TileSheet
|
||||
local caseTileSheet = TileSheet:new('cases_sheet.png', 16, 16)
|
||||
|
||||
local function getCaseTiles(x, y)
|
||||
return {
|
||||
caseTileSheet:t(x, y),
|
||||
caseTileSheet:t(x, y),
|
||||
caseTileSheet:t(x, y+1),
|
||||
}
|
||||
end
|
||||
|
||||
local t = getCaseTiles
|
||||
|
||||
storageFactory:registerItems({
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = 'case_closed',
|
||||
_title = 'Case',
|
||||
--description = '',
|
||||
tiles = t(0,0)
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = 'case_open',
|
||||
_title = 'Case',
|
||||
--description = '',
|
||||
tiles = t(1,0);
|
||||
drawtype = 'nodebox';
|
||||
node_box = {
|
||||
type = 'fixed',
|
||||
fixed = {
|
||||
{-0.5, -0.5, -0.5, 0.5, 0.5 - 1/16*2, 0.5},
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
drawtype = 'mesh',
|
||||
name = 'chest_close',
|
||||
tiles = {'storage_chest.png'},
|
||||
mesh = 'storage_chest_close.obj',
|
||||
node_box = {
|
||||
type = 'fixed',
|
||||
fixed = {
|
||||
{-7/16, -0.5, -7/16, 23/16, 6/16, 7/16},
|
||||
}
|
||||
},
|
||||
selection_box = {
|
||||
type = 'fixed',
|
||||
fixed = {
|
||||
{-7/16, -0.5, -7/16, 23/16, 6/16, 7/16},
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
drawtype = 'mesh',
|
||||
name = 'chest_open',
|
||||
tiles = {'storage_chest.png'},
|
||||
mesh = 'storage_chest_open.obj',
|
||||
node_box = {
|
||||
type = 'fixed',
|
||||
fixed = {
|
||||
{-7/16, -0.5, -7/16, 23/16, 6/16, 7/16},
|
||||
}
|
||||
},
|
||||
selection_box = {
|
||||
type = 'fixed',
|
||||
fixed = {
|
||||
{-7/16, -0.5, -7/16, 23/16, 6/16, 7/16},
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
name = smc__game__items__storages
|
||||
depends = smc__core__node, smc__core__tilesheet
|
||||
@@ -1,49 +0,0 @@
|
||||
# Made in Blockbench 4.12.5
|
||||
mtllib storage_chest_close.mtl
|
||||
|
||||
o chest_close
|
||||
v 0.4375 0.375 0.4375
|
||||
v 0.4375 0.375 -0.4375
|
||||
v 0.4375 -0.5 0.4375
|
||||
v 0.4375 -0.5 -0.4375
|
||||
v -1.4375 0.375 -0.4375
|
||||
v -1.4375 0.375 0.4375
|
||||
v -1.4375 -0.5 -0.4375
|
||||
v -1.4375 -0.5 0.4375
|
||||
vt 0.109375 0.890625
|
||||
vt 0.34375 0.890625
|
||||
vt 0.34375 0.78125
|
||||
vt 0.109375 0.78125
|
||||
vt 0 0.890625
|
||||
vt 0.109375 0.890625
|
||||
vt 0.109375 0.78125
|
||||
vt 0 0.78125
|
||||
vt 0.453125 0.890625
|
||||
vt 0.6875 0.890625
|
||||
vt 0.6875 0.78125
|
||||
vt 0.453125 0.78125
|
||||
vt 0.34375 0.890625
|
||||
vt 0.453125 0.890625
|
||||
vt 0.453125 0.78125
|
||||
vt 0.34375 0.78125
|
||||
vt 0.34375 0.890625
|
||||
vt 0.109375 0.890625
|
||||
vt 0.109375 1
|
||||
vt 0.34375 1
|
||||
vt 0.578125 1
|
||||
vt 0.34375 1
|
||||
vt 0.34375 0.890625
|
||||
vt 0.578125 0.890625
|
||||
vn 0 0 -1
|
||||
vn 1 0 0
|
||||
vn 0 0 1
|
||||
vn -1 0 0
|
||||
vn 0 1 0
|
||||
vn 0 -1 0
|
||||
usemtl m_79b8a0d4-4f5c-1950-bda6-ec259f602f6d
|
||||
f 4/4/1 7/3/1 5/2/1 2/1/1
|
||||
f 3/8/2 4/7/2 2/6/2 1/5/2
|
||||
f 8/12/3 3/11/3 1/10/3 6/9/3
|
||||
f 7/16/4 8/15/4 6/14/4 5/13/4
|
||||
f 6/20/5 1/19/5 2/18/5 5/17/5
|
||||
f 7/24/6 4/23/6 3/22/6 8/21/6
|
||||
@@ -1,95 +0,0 @@
|
||||
# Made in Blockbench 4.12.5
|
||||
mtllib storage_chest_open.mtl
|
||||
|
||||
o сундук
|
||||
v 0.4375 0.25 0.4375
|
||||
v 0.4375 0.25 -0.4375
|
||||
v 0.4375 -0.5 0.4375
|
||||
v 0.4375 -0.5 -0.4375
|
||||
v -1.4375 0.25 -0.4375
|
||||
v -1.4375 0.25 0.4375
|
||||
v -1.4375 -0.5 -0.4375
|
||||
v -1.4375 -0.5 0.4375
|
||||
vt 0.109375 0.875
|
||||
vt 0.34375 0.875
|
||||
vt 0.34375 0.78125
|
||||
vt 0.109375 0.78125
|
||||
vt 0 0.875
|
||||
vt 0.109375 0.875
|
||||
vt 0.109375 0.78125
|
||||
vt 0 0.78125
|
||||
vt 0.453125 0.875
|
||||
vt 0.6875 0.875
|
||||
vt 0.6875 0.78125
|
||||
vt 0.453125 0.78125
|
||||
vt 0.34375 0.875
|
||||
vt 0.453125 0.875
|
||||
vt 0.453125 0.78125
|
||||
vt 0.34375 0.78125
|
||||
vt 0.8125 0.890625
|
||||
vt 0.578125 0.890625
|
||||
vt 0.578125 1
|
||||
vt 0.8125 1
|
||||
vt 0.578125 1
|
||||
vt 0.34375 1
|
||||
vt 0.34375 0.890625
|
||||
vt 0.578125 0.890625
|
||||
vn 0 0 -1
|
||||
vn 1 0 0
|
||||
vn 0 0 1
|
||||
vn -1 0 0
|
||||
vn 0 1 0
|
||||
vn 0 -1 0
|
||||
usemtl m_79b8a0d4-4f5c-1950-bda6-ec259f602f6d
|
||||
f 4/4/1 7/3/1 5/2/1 2/1/1
|
||||
f 3/8/2 4/7/2 2/6/2 1/5/2
|
||||
f 8/12/3 3/11/3 1/10/3 6/9/3
|
||||
f 7/16/4 8/15/4 6/14/4 5/13/4
|
||||
f 6/20/5 1/19/5 2/18/5 5/17/5
|
||||
f 7/24/6 4/23/6 3/22/6 8/21/6
|
||||
o крышка
|
||||
v 0.4375 0.33838834764831843 0.46338834764831843
|
||||
v 0.4375 0.9571067811865475 -0.15533008588991049
|
||||
v 0.4375 0.25 0.375
|
||||
v 0.4375 0.8687184335382291 -0.24371843353822897
|
||||
v -1.4375 0.9571067811865475 -0.15533008588991049
|
||||
v -1.4375 0.33838834764831843 0.46338834764831843
|
||||
v -1.4375 0.8687184335382291 -0.24371843353822897
|
||||
v -1.4375 0.25 0.375
|
||||
vt 0.109375 0.890625
|
||||
vt 0.34375 0.890625
|
||||
vt 0.34375 0.875
|
||||
vt 0.109375 0.875
|
||||
vt 0 0.890625
|
||||
vt 0.109375 0.890625
|
||||
vt 0.109375 0.875
|
||||
vt 0 0.875
|
||||
vt 0.453125 0.890625
|
||||
vt 0.6875 0.890625
|
||||
vt 0.6875 0.875
|
||||
vt 0.453125 0.875
|
||||
vt 0.34375 0.890625
|
||||
vt 0.453125 0.890625
|
||||
vt 0.453125 0.875
|
||||
vt 0.34375 0.875
|
||||
vt 0.34375 0.890625
|
||||
vt 0.109375 0.890625
|
||||
vt 0.109375 1
|
||||
vt 0.34375 1
|
||||
vt 0.578125 1
|
||||
vt 0.34375 1
|
||||
vt 0.34375 0.890625
|
||||
vt 0.578125 0.890625
|
||||
vn 0 0.7071067811865476 -0.7071067811865475
|
||||
vn 1 0 0
|
||||
vn 0 -0.7071067811865476 0.7071067811865475
|
||||
vn -1 0 0
|
||||
vn 0 0.7071067811865475 0.7071067811865476
|
||||
vn 0 -0.7071067811865475 -0.7071067811865476
|
||||
usemtl m_79b8a0d4-4f5c-1950-bda6-ec259f602f6d
|
||||
f 12/28/7 15/27/7 13/26/7 10/25/7
|
||||
f 11/32/8 12/31/8 10/30/8 9/29/8
|
||||
f 16/36/9 11/35/9 9/34/9 14/33/9
|
||||
f 15/40/10 16/39/10 14/38/10 13/37/10
|
||||
f 14/44/11 9/43/11 10/42/11 13/41/11
|
||||
f 15/48/12 12/47/12 11/46/12 16/45/12
|
||||
|
Before Width: | Height: | Size: 64 KiB |
@@ -1,54 +1,43 @@
|
||||
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
|
||||
---@type Node
|
||||
local Node = Mod.getInfo('smc__core__node').require('Node')
|
||||
|
||||
---@type TileSheet
|
||||
local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
|
||||
|
||||
---@type Node.NodeDefinition
|
||||
local defaultLogDef = {
|
||||
local defaultRockDef = {
|
||||
settings = {
|
||||
name = '',
|
||||
name = "",
|
||||
description = "A log",
|
||||
tiles = {},
|
||||
groups = {
|
||||
dig_immediate = 2,
|
||||
wood = 1
|
||||
},
|
||||
}
|
||||
paramtype2 = "facedir",
|
||||
},
|
||||
}
|
||||
|
||||
---@type Node.NodeDefinition
|
||||
local defaultPlanksDef = {
|
||||
settings = {
|
||||
name = '',
|
||||
name = "",
|
||||
description = "A planks",
|
||||
tiles = {},
|
||||
groups = {
|
||||
dig_immediate = 2,
|
||||
},
|
||||
paramtype2 = 'facedir',
|
||||
paramtype2 = "facedir",
|
||||
},
|
||||
}
|
||||
|
||||
---@type Node.NodeDefinition
|
||||
local defaultLeafsDef = {
|
||||
settings = {
|
||||
drawtype = 'allfaces_optional',
|
||||
name = '',
|
||||
tiles = {},
|
||||
groups = {
|
||||
dig_immediate = 2,
|
||||
},
|
||||
--paramtype = 'light',
|
||||
paramtype2 = 'facedir',
|
||||
use_texture_alpha = 'clip',
|
||||
sunlight_propagates = true,
|
||||
},
|
||||
}
|
||||
|
||||
local defaultLog = Node:getExtended(defaultLogDef)
|
||||
local defaultLog = Node:getExtended(defaultRockDef)
|
||||
local defaultPlanks = Node:getExtended(defaultPlanksDef)
|
||||
local defaultLeafs = Node:getExtended(defaultLeafsDef)
|
||||
|
||||
local logFactory = defaultLog:getFactory()
|
||||
local planksFactory = defaultPlanks:getFactory()
|
||||
|
||||
---@type TileSheet
|
||||
local logTileSheet = TileSheet:new('wood_sheet.png', 16, 16)
|
||||
local logTileSheet = TileSheet:new("wood_sheet.png", 16, 16)
|
||||
|
||||
local function getLogTiles(x, y)
|
||||
return {
|
||||
@@ -58,149 +47,161 @@ local function getLogTiles(x, y)
|
||||
}
|
||||
end
|
||||
|
||||
local t = logTileSheet
|
||||
local t = getLogTiles
|
||||
|
||||
|
||||
---@class WoodDef
|
||||
---@field rarity Item.Rarity?
|
||||
|
||||
---@param name string
|
||||
---@param x number
|
||||
---@param def WoodDef?
|
||||
local function registerWood(name, x, def)
|
||||
if def == nil then
|
||||
def = {}
|
||||
end
|
||||
|
||||
defaultLog:new({
|
||||
logFactory:registerItems({
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = name..'_log',
|
||||
tiles = getLogTiles(x, 2),
|
||||
paramtype2 = 'facedir',
|
||||
_rarity = def.rarity,
|
||||
name = "marentine_log",
|
||||
title = "Marentine Log",
|
||||
--description = "",
|
||||
tiles = t(0, 1),
|
||||
},
|
||||
callbacks = {
|
||||
on_place = core.rotate_node
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "allwhere_log",
|
||||
title = "Allwhere Log",
|
||||
--description = "",
|
||||
tiles = t(2, 1),
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "fis_log",
|
||||
title = "Fis Log",
|
||||
--description = "",
|
||||
tiles = t(4, 1),
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "tammoy_log",
|
||||
title = "Tammoy Log",
|
||||
--description = "",
|
||||
tiles = t(6, 1),
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "dallalia_log",
|
||||
title = "Dallalia Log",
|
||||
--description = "",
|
||||
tiles = t(8, 1),
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "zuph_log",
|
||||
title = "Zuph Log",
|
||||
--description = "",
|
||||
tiles = t(10, 1),
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
planksFactory:registerItems({
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "marentine_planks",
|
||||
title = "Marentine Planks",
|
||||
--description = "",
|
||||
tiles = { logTileSheet:t(0, 4) },
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "allwhere_planks",
|
||||
title = "Allwhere Planks",
|
||||
--description = "",
|
||||
tiles = { logTileSheet:t(2, 4) },
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "fis_planks",
|
||||
title = "Fis Planks",
|
||||
--description = "",
|
||||
tiles = { logTileSheet:t(4, 4) },
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "tammoy_planks",
|
||||
title = "Tammoy Planks",
|
||||
--description = "",
|
||||
tiles = { logTileSheet:t(6, 4) },
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "dallalia_planks",
|
||||
title = "Dallalia Planks",
|
||||
--description = "",
|
||||
tiles = { logTileSheet:t(8, 4) },
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "zuph_planks",
|
||||
title = "Zuph Planks",
|
||||
--description = "",
|
||||
tiles = { logTileSheet:t(10, 4) },
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
-- сундучки
|
||||
|
||||
---@type TileSheet
|
||||
local caseTileSheet = TileSheet:new("cases_sheet.png", 16, 16)
|
||||
|
||||
local function getCaseTiles(x, y)
|
||||
return {
|
||||
caseTileSheet:t(x, y),
|
||||
caseTileSheet:t(x, y),
|
||||
caseTileSheet:t(x, y+1),
|
||||
}
|
||||
})
|
||||
|
||||
defaultLog:new({
|
||||
settings = {
|
||||
name = name..'_log_stripped',
|
||||
tiles = getLogTiles(x, 4),
|
||||
paramtype2 = 'facedir',
|
||||
_rarity = def.rarity
|
||||
},
|
||||
callbacks = {
|
||||
on_place = core.rotate_node
|
||||
}
|
||||
})
|
||||
|
||||
defaultLog:new({
|
||||
settings = {
|
||||
name = name..'_timber',
|
||||
tiles = {logTileSheet:t(x, 8), logTileSheet:t(x, 8),
|
||||
logTileSheet:t(x, 7), logTileSheet:t(x, 7),
|
||||
logTileSheet:t(x, 8), logTileSheet:t(x, 8),},
|
||||
paramtype2 = 'facedir',
|
||||
_rarity = def.rarity,
|
||||
},
|
||||
callbacks = {
|
||||
on_place = core.rotate_node
|
||||
}
|
||||
})
|
||||
|
||||
defaultLog:new({
|
||||
settings = {
|
||||
name = name..'_trunk',
|
||||
tiles = {logTileSheet:t(x, 3)},
|
||||
inventory_overlay = 'wood_trunk_overlay.png',
|
||||
drop = 'wood:'..name..'_log',
|
||||
paramtype2 = 'facedir',
|
||||
_rarity = def.rarity,
|
||||
},
|
||||
callbacks = {
|
||||
on_place = core.rotate_node
|
||||
}
|
||||
})
|
||||
|
||||
defaultLog:new({
|
||||
settings = {
|
||||
name = name..'_trunk_vertical',
|
||||
tiles = getLogTiles(x, 2),
|
||||
inventory_overlay = 'wood_trunk_overlay.png',
|
||||
drop = 'wood:'..name..'_log',
|
||||
paramtype2 = 'facedir',
|
||||
_rarity = def.rarity,
|
||||
},
|
||||
callbacks = {
|
||||
on_place = core.rotate_node
|
||||
}
|
||||
})
|
||||
|
||||
defaultLog:new({
|
||||
settings = {
|
||||
drawtype = 'nodebox',
|
||||
name = name..'_trunk_branch',
|
||||
tiles = {logTileSheet:t(x, 3)},
|
||||
inventory_overlay = 'wood_trunk_overlay.png',
|
||||
drop = 'wood:'..name..'_log',
|
||||
paramtype = 'light',
|
||||
node_box = {
|
||||
type = 'connected',
|
||||
fixed = {-.25,-.25,-.25, .25,.25,.25},
|
||||
connect_top = {-.25,-.25,-.25, .25,.5,.25},
|
||||
connect_bottom = {-.25,-.5,-.25, .25,.25,.25},
|
||||
connect_front = {-.25,-.25,-.5, .25,.25,.25},
|
||||
connect_left = {-.5,-.25,-.25, .25,.25,.25},
|
||||
connect_back = {-.25,-.25,-.25, .25,.25,.5},
|
||||
connect_right = {-.25,-.25,-.25, .5,.25,.25},
|
||||
},
|
||||
connects_to = {'group:wood', 'group:soil'},
|
||||
_rarity = def.rarity,
|
||||
},
|
||||
})
|
||||
|
||||
defaultLog:new({
|
||||
settings = {
|
||||
drawtype = 'nodebox',
|
||||
name = name..'_trunk_branch_vertical',
|
||||
tiles = getLogTiles(x, 2),
|
||||
inventory_overlay = 'wood_trunk_overlay.png',
|
||||
drop = 'wood:'..name..'_log',
|
||||
paramtype = 'light',
|
||||
node_box = {
|
||||
type = 'connected',
|
||||
fixed = {-.25,-.25,-.25, .25,.25,.25},
|
||||
connect_top = {-.25,-.25,-.25, .25,.5,.25},
|
||||
connect_bottom = {-.25,-.5,-.25, .25,.25,.25},
|
||||
},
|
||||
connects_to = {'group:wood', 'group:soil'},
|
||||
_rarity = def.rarity,
|
||||
},
|
||||
})
|
||||
|
||||
defaultPlanks:new({
|
||||
settings = {
|
||||
name = name..'_planks',
|
||||
tiles = { logTileSheet:t(x, 6) },
|
||||
_rarity = def.rarity,
|
||||
},
|
||||
})
|
||||
|
||||
defaultLeafs:new({
|
||||
settings = {
|
||||
name = name..'_leafs',
|
||||
tiles = { logTileSheet:t(x, 1) },
|
||||
_rarity = def.rarity,
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
registerWood('marentine', 0)
|
||||
registerWood('allwhere', 1)
|
||||
registerWood('fis', 2)
|
||||
registerWood('tammoy', 3)
|
||||
registerWood('gi', 4, {rarity = 'uncommon'})
|
||||
registerWood('dallalia', 5)
|
||||
registerWood('zuph', 6, {rarity = 'uncommon'})
|
||||
local t = getCaseTiles
|
||||
|
||||
planksFactory:registerItems({
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "case_closed",
|
||||
title = "Case",
|
||||
--description = "",
|
||||
tiles = t(0,0)
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
{
|
||||
settings = {
|
||||
name = "case_open",
|
||||
title = "Case",
|
||||
--description = "",
|
||||
tiles = t(1,0);
|
||||
drawtype = 'nodebox';
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-0.5, -0.5, -0.5, 0.5, 0.5 - 1/16*2, 0.5},
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
})
|
||||
@@ -1,133 +0,0 @@
|
||||
# textdomain: wood
|
||||
marentine_log-title=Бревно марентина
|
||||
marentine_log-desc=Темная древесина, отдающая синевой.@n Часто встречается вблизи крупных водоёмов.
|
||||
marentine_log_stripped-title=Обтёсанное бревно марентина
|
||||
marentine_log_stripped-desc=Освобождённое от тёмно-синей коры@n более светлая древесная сердцевина.
|
||||
marentine_timber-title=
|
||||
marentine_timber-desc=
|
||||
marentine_trunk-title=
|
||||
marentine_trunk-desc=
|
||||
marentine_trunk_vertical-title=
|
||||
marentine_trunk_vertical-desc=
|
||||
marentine_trunk_branch-title=
|
||||
marentine_trunk_branch-desc=
|
||||
marentine_trunk_branch_vertical-title=
|
||||
marentine_trunk_branch_vertical-desc=
|
||||
marentine_planks-title=Марентиновые доски
|
||||
marentine_planks-desc=Темные плотно скрепленные между собой@n доски из марентиновой древесины.
|
||||
marentine_leafs-title=
|
||||
marentine_leafs-desc=
|
||||
|
||||
allwhere_log-title=Бревно всемира
|
||||
allwhere_log-desc=Распростроенный древесный материал,@n встречающийся почти во всех местах Тариона.@n Эта древесина не обладает особыми свойствами,@n но за счёт своей распространённости широко@n применяется во многих базовых изделиях.
|
||||
allwhere_log_stripped-title=Обтёсанное бревно всемира.
|
||||
allwhere_log_stripped-desc=Светлая мягкая сердцевина,@n лишённая своей коры.
|
||||
allwhere_timber-title=
|
||||
allwhere_timber-desc=
|
||||
allwhere_trunk-title=
|
||||
allwhere_trunk-desc=
|
||||
allwhere_trunk_vertical-title=
|
||||
allwhere_trunk_vertical-desc=
|
||||
allwhere_trunk_branch-title=
|
||||
allwhere_trunk_branch-desc=
|
||||
allwhere_trunk_branch_vertical-title=
|
||||
allwhere_trunk_branch_vertical-desc=
|
||||
allwhere_planks-title=Всемировые доски
|
||||
allwhere_planks-desc=Светлые доски, плотно@n состыкованные между собой.
|
||||
allwhere_leafs-title=
|
||||
allwhere_leafs-desc=
|
||||
|
||||
fis_log-title=Бревно фиса
|
||||
fis_log-desc=Необычное бревно с кроваво-красной@n сердцевиной и коры цвета белой кости.
|
||||
fis_log_stripped-title=Обтёсанное бревно фиса
|
||||
fis_log_stripped-desc=Кроваво-красная сердцевина,@n лишенная оболочки из светлой коры.
|
||||
fis_timber-title=
|
||||
fis_timber-desc=
|
||||
fis_trunk-title=
|
||||
fis_trunk-desc=
|
||||
fis_trunk_vertical-title=
|
||||
fis_trunk_vertical-desc=
|
||||
fis_trunk_branch-title=
|
||||
fis_trunk_branch-desc=
|
||||
fis_trunk_branch_vertical-title=
|
||||
fis_trunk_branch_vertical-desc=
|
||||
fis_planks-title=Фисовые доски
|
||||
fis_planks-desc=Красные подогнанные друг к другу и@n доски из фисовой древесины.
|
||||
fis_leafs-title=
|
||||
fis_leafs-desc=
|
||||
|
||||
tammoy_log-title=Бревно таммоя
|
||||
tammoy_log-desc=Светлая хвойная древесина, покрытая@n легкоотдираемой чешуйчатой корой.
|
||||
tammoy_log_stripped-title=Обтёсанное бревно таммоя
|
||||
tammoy_log_stripped-desc=Светлая хвойная древесина,@n сочащаяся смолой взамен удалённой коры.
|
||||
tammoy_timber-title=
|
||||
tammoy_timber-desc=
|
||||
tammoy_trunk-title=
|
||||
tammoy_trunk-desc=
|
||||
tammoy_trunk_vertical-title=
|
||||
tammoy_trunk_vertical-desc=
|
||||
tammoy_trunk_branch-title=
|
||||
tammoy_trunk_branch-desc=
|
||||
tammoy_trunk_branch_vertical-title=
|
||||
tammoy_trunk_branch_vertical-desc=
|
||||
tammoy_planks-title=Таммоевые доски
|
||||
tammoy_planks-desc=Смолянистые плотно прилегающие друг к другу светлые доски.
|
||||
tammoy_leafs-title=
|
||||
tammoy_leafs-desc=
|
||||
|
||||
gi_log-title=Бревно ги
|
||||
gi_log-desc=Благодорно-тёмная хвойная древесина,@n относящаяся к высококачественным древесным породам.@n Эта древесина особенно славится своими прочностными@n свойствами и фактурой волокон.
|
||||
gi_log_stripped-title=Обтёсанное бревно ги
|
||||
gi_log_stripped-desc=Плотная хвойная сердцевина, являющаяся идеальным@n материалом для изготовления различных предметов.@n В руках умелого мастера фактура этого дерева@n приобретает особенно красивый узор.
|
||||
gi_timber-title=
|
||||
gi_timber-desc=
|
||||
gi_trunk-title=
|
||||
gi_trunk-desc=
|
||||
gi_trunk_vertical-title=
|
||||
gi_trunk_vertical-desc=
|
||||
gi_trunk_branch-title=
|
||||
gi_trunk_branch-desc=
|
||||
gi_trunk_branch_vertical-title=
|
||||
gi_trunk_branch_vertical-desc=
|
||||
gi_planks-title=Гиевые доски
|
||||
gi_planks-desc=Прочные хорошо сложенные@n доски из благодорного дерева ги.
|
||||
gi_leafs-title=
|
||||
gi_leafs-desc=
|
||||
|
||||
dallalia_log-title=Бревно даллалии
|
||||
dallalia_log-desc=Сладко-жёлтоватая древесина, покрытая пепельно-серой корой.@n Плотность и прочность этого вида дерева@n позволяет дереву устремляться в небо на несколько десятков метров.
|
||||
dallalia_log_stripped-title=Обтёсанное бревно даллалии
|
||||
dallalia_log_stripped-desc=Освобожденная от своей бледной коры жёлтовая древесина,@n сочащаяся сладким соком.
|
||||
dallalia_timber-title=
|
||||
dallalia_timber-desc=
|
||||
dallalia_trunk-title=
|
||||
dallalia_trunk-desc=
|
||||
dallalia_trunk_vertical-title=
|
||||
dallalia_trunk_vertical-desc=
|
||||
dallalia_trunk_branch-title=
|
||||
dallalia_trunk_branch-desc=
|
||||
dallalia_trunk_branch_vertical-title=
|
||||
dallalia_trunk_branch_vertical-desc=
|
||||
dallalia_planks-title=Даллалиевые доски
|
||||
dallalia_planks-desc=Жёлтые плотно сложенные доски,@n покрытие застывшим соком дерева.
|
||||
dallalia_leafs-title=
|
||||
dallalia_leafs-desc=
|
||||
|
||||
zuph_log-title=Бревно зуфа
|
||||
zuph_log-desc=Светлая древесина с корой из мелких волокон.@n Из-за толстой плотной оболочки плохо поддается рубке.
|
||||
zuph_log_stripped-title=Обтёсанное бревно зуфа
|
||||
zuph_log_stripped-desc=Жёлтая древесина,@n лишённая трудноразрубаемой коры.
|
||||
zuph_timber-title=
|
||||
zuph_timber-desc=
|
||||
zuph_trunk-title=
|
||||
zuph_trunk-desc=
|
||||
zuph_trunk_vertical-title=
|
||||
zuph_trunk_vertical-desc=
|
||||
zuph_trunk_branch-title=
|
||||
zuph_trunk_branch-desc=
|
||||
zuph_trunk_branch_vertical-title=
|
||||
zuph_trunk_branch_vertical-desc=
|
||||
zuph_planks-title=Зуфовые доски
|
||||
zuph_planks-desc=Хорошо скрепленные между собой жёлтые древестные изделия.
|
||||
zuph_leafs-title=
|
||||
zuph_leafs-desc=
|
||||
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
@@ -1,132 +0,0 @@
|
||||
local modInfo = Mod.getInfo('smc__core__formspec')
|
||||
local require = modInfo.require
|
||||
|
||||
---@type AdminListUI
|
||||
local AdminListUI = Mod.getInfo('smc__ui__admin_list').require('AdminListUI')
|
||||
|
||||
core.register_chatcommand('list', {
|
||||
privs = {server = true},
|
||||
|
||||
func = function(name, param)
|
||||
local player = core.get_player_by_name(name)
|
||||
|
||||
AdminListUI:showForm(name)
|
||||
|
||||
return true, ''
|
||||
end
|
||||
})
|
||||
|
||||
AdminListUI:registerOnFormFieldActionMatch('%S+::item_button',function(player, fieldName, fieldValue)
|
||||
---@type ItemStackString?
|
||||
local stack = string.match(fieldName, '(%S+)::item_button')
|
||||
|
||||
if stack == nil then
|
||||
return
|
||||
end
|
||||
|
||||
local playerName = player:get_player_name()
|
||||
AdminListUI:setContex(playerName, 'select_item', stack)
|
||||
|
||||
AdminListUI:showForm(playerName)
|
||||
end)
|
||||
|
||||
AdminListUI:registerOnFormFieldAction('admin_commands:list_add_item', function(player, fieldName, fieldValue)
|
||||
---@type InvRef
|
||||
local inv = player:get_inventory()
|
||||
|
||||
local playerName = player:get_player_name()
|
||||
local stack = AdminListUI:getContex(playerName, 'select_item')
|
||||
stack = ItemStack(stack)
|
||||
stack:set_count(fieldValue)
|
||||
|
||||
if inv:room_for_item('main', stack) then
|
||||
inv:add_item('main', stack)
|
||||
end
|
||||
end)
|
||||
|
||||
core.register_on_joinplayer(function(player, last_login)
|
||||
player:set_sky({
|
||||
sky_color = {
|
||||
day_sky = '#FCF0ED',
|
||||
day_horizon = '#F1D4C3',
|
||||
},
|
||||
type = 'regular',
|
||||
})
|
||||
|
||||
player:set_lighting({
|
||||
shadows = { intensity = 0.33 },
|
||||
volumetric_light = { strength = 0.45 },
|
||||
exposure = {
|
||||
luminance_min = -3.5,
|
||||
luminance_max = -2.5,
|
||||
exposure_correction = 0.35,
|
||||
speed_dark_bright = 1500,
|
||||
speed_bright_dark = 700,
|
||||
},
|
||||
saturation = 1.0,
|
||||
})
|
||||
|
||||
end)
|
||||
|
||||
-- Keys indicating the languages for which localization presence is checked.
|
||||
local LANG_CODES = {'en', 'ru'}
|
||||
|
||||
-- Number of missed localizations.
|
||||
local missedLocaleCount = 0
|
||||
|
||||
local function checkLocale(strTranslate, langCodes)
|
||||
local str = core.strip_escapes(strTranslate)
|
||||
|
||||
for _, langCode in ipairs(langCodes or LANG_CODES) do
|
||||
if core.strip_escapes(core.get_translated_string(langCode, strTranslate)) == str then
|
||||
missedLocaleCount = missedLocaleCount + 1
|
||||
Logger.warningLog('Localization missing[%s][%s]. String: `%s`.', missedLocaleCount, langCode, str)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
core.register_chatcommand('get_missing_locale', {
|
||||
privs = {server = true},
|
||||
description = '{short_mod_name:string?, lang_codes:string[]?}',
|
||||
func = function(name, paramsStr)
|
||||
local params = core.deserialize('return '..paramsStr or '{}')
|
||||
|
||||
if params == nil then
|
||||
return false
|
||||
end
|
||||
|
||||
local shortModName = params.short_mod_name
|
||||
local langCodes = params.lang_codes
|
||||
|
||||
if shortModName ~= nil and type(shortModName) ~= 'string' then
|
||||
return false
|
||||
end
|
||||
|
||||
if langCodes ~= nil and type(langCodes) ~= 'table' then
|
||||
return false
|
||||
end
|
||||
|
||||
local items
|
||||
if shortModName == '' or shortModName == nil then
|
||||
items = Smc.getRegisteredItems()
|
||||
else
|
||||
items = Smc.getRegisteredItemsByMod(shortModName)
|
||||
end
|
||||
|
||||
if items == nil then
|
||||
return false, 'There are no items registered for this mod (or the entire game)'
|
||||
end
|
||||
|
||||
---@param name string
|
||||
---@param item Item
|
||||
for name, item in pairs(items) do
|
||||
local itemSettings = item.itemDef.settings
|
||||
local title, desc = itemSettings._title, itemSettings._description
|
||||
|
||||
checkLocale(title, langCodes)
|
||||
checkLocale(desc, langCodes)
|
||||
end
|
||||
|
||||
return true, ''
|
||||
end
|
||||
})
|
||||
@@ -1,2 +0,0 @@
|
||||
name = smc__game__admin_commands
|
||||
depends = smc__system__system_loader, smc__ui__admin_list
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -5,16 +5,20 @@ Events = {}
|
||||
---@type table<string, Events.callback[]>
|
||||
local registeredEvents = {}
|
||||
|
||||
---@param eventName string
|
||||
function Events.registerEvent(eventName)
|
||||
assert(registeredEvents[eventName] == nil, ('Event %s is already registered.'):format(eventName))
|
||||
|
||||
registeredEvents[eventName] = {}
|
||||
end
|
||||
|
||||
---@param eventName string
|
||||
---@param callback Events.callback
|
||||
function Events.subscribe(eventName, callback)
|
||||
local callbacks = registeredEvents[eventName]
|
||||
assert(callbacks ~= nil, ('Event %s does not exist'):format(eventName))
|
||||
|
||||
if callbacks == nil then
|
||||
registeredEvents[eventName] = {callback}
|
||||
else
|
||||
table.insert(callbacks, callback)
|
||||
end
|
||||
end
|
||||
|
||||
---@param eventName string
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
# Game fonts
|
||||
Description of the fonts that are pre-installed for the project and passed on to all clients for displaying text.
|
||||
|
||||
## Philosopher
|
||||
Download site: https://fonts-online.ru/fonts/doloto.
|
||||
|
||||
Used in:
|
||||
- `regular.ttf`
|
||||
- `mono.ttf`
|
||||
|
||||
### Info
|
||||
Designed by **Jovanny Lemonad**.
|
||||
|
||||
### Licence
|
||||
Copyright 2011 The Philosopher Project Authors (https://github.com/alexeiva/philosopher)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1 . This license is copied below, and is also available with a FAQ at: https://openfontlicense.org
|
||||
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
|
||||
#### PREAMBLE
|
||||
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
|
||||
|
||||
#### DEFINITIONS
|
||||
|
||||
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
|
||||
"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
|
||||
|
||||
#### PERMISSION & CONDITIONS
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
|
||||
|
||||
- Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
|
||||
- Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
|
||||
- No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
|
||||
- The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
|
||||
- The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
|
||||
|
||||
#### TERMINATION
|
||||
|
||||
This license becomes null and void if any of the above conditions are not met.
|
||||
|
||||
#### DISCLAIMER
|
||||
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
|
||||
---
|
||||
@@ -5,8 +5,3 @@ local require = modInfo.require
|
||||
|
||||
require('Lib.globalStep')
|
||||
require('Lib.color')
|
||||
require('Lib.immersiveCraftData')
|
||||
require('Lib.getObjectByGUID')
|
||||
require('Lib.receiveFields')
|
||||
require('Lib.registeredItems')
|
||||
require('Lib.requires')
|
||||
@@ -1,16 +0,0 @@
|
||||
---Returns an active object by unique identifier (GUID).
|
||||
---* For players, this is a player name.
|
||||
---* For Lua entities, this is a uniquely generated string, guaranteed not to collide with player names.
|
||||
---
|
||||
---**Note**: If an object with such an identifier does not exist or is inactive, the value `nil` will be returned.
|
||||
---@param guid string only use printable ASCII characters. Example: `@bGh3p2AbRE29Mb4biqX6OA`.
|
||||
---@return ObjectRef|Player|Entity|nil
|
||||
function Smc.getObjectByGUID(guid)
|
||||
local obj = core.objects_by_guid[guid]
|
||||
|
||||
if obj == nil then
|
||||
return
|
||||
else
|
||||
return obj
|
||||
end
|
||||
end
|
||||
@@ -1,94 +0,0 @@
|
||||
local EMPTY_FLAG = 'EMPTY_FLAG'
|
||||
|
||||
---@class ImmersiveStageData
|
||||
|
||||
---@class ImmersiveCraftData
|
||||
---@field playerName string The name of the player who started the craft.
|
||||
---@field craftName string
|
||||
---@field stageName string
|
||||
---@field amount integer
|
||||
---@field stageData ImmersiveStageData?
|
||||
|
||||
---Returns craft data for immersive crafting, which is stored in the desktop metadata.
|
||||
---@param meta NodeMetaRef
|
||||
---@return ImmersiveCraftData?
|
||||
function Smc.getCraftDataByMeta(meta)
|
||||
local dataString = meta:get_string('craft_data')
|
||||
|
||||
if dataString == EMPTY_FLAG then
|
||||
return
|
||||
end
|
||||
|
||||
return core.deserialize(dataString)
|
||||
end
|
||||
|
||||
---Sets craft data for immersive crafting that is stored in the work station metadata.
|
||||
---
|
||||
---If `data` is `nil`, the data is cleared.
|
||||
---@param meta NodeMetaRef
|
||||
---@param craftData ImmersiveCraftData?
|
||||
function Smc.setCraftDataByMeta(meta, craftData)
|
||||
if craftData == nil then
|
||||
meta:set_string('craft_data', EMPTY_FLAG)
|
||||
end
|
||||
|
||||
meta:set_string('craft_data', core.serialize(craftData))
|
||||
end
|
||||
|
||||
---Returns craft data for immersive crafting, which is stored in the work station metadata.
|
||||
---@param pos MapPosition
|
||||
---@return ImmersiveCraftData?
|
||||
function Smc.getCraftDataByPos(pos)
|
||||
local meta = core.get_meta(pos)
|
||||
|
||||
return Smc.getCraftDataByMeta(meta)
|
||||
end
|
||||
|
||||
---Sets craft data for immersive crafting that is stored in the work station metadata.
|
||||
---
|
||||
---If `data` is `nil`, the data is cleared.
|
||||
---@param pos MapPosition
|
||||
---@param craftData ImmersiveCraftData?
|
||||
function Smc.setCraftDataByPos(pos, craftData)
|
||||
local meta = core.get_meta(pos)
|
||||
|
||||
Smc.setCraftDataByMeta(meta, craftData)
|
||||
end
|
||||
|
||||
---Returns stage data for immersive crafting, which is stored in the work station metadata.
|
||||
---
|
||||
---**Note**: If the workbench does not have crafting data, an error will be thrown.
|
||||
---@param pos MapPosition
|
||||
---@return ImmersiveStageData?
|
||||
function Smc.getStageDataByPos(pos)
|
||||
local craftData = Smc.getCraftDataByPos(pos)
|
||||
assert(craftData ~= nil, 'Immersive crafting data is empty.')
|
||||
|
||||
return craftData.stageData
|
||||
end
|
||||
|
||||
---Sets stage data for immersive crafting that is stored in the work station metadata.
|
||||
---@param pos MapPosition
|
||||
---@param stageData ImmersiveStageData
|
||||
function Smc.setStageDataByPos(pos, stageData)
|
||||
local craftData = Smc.getCraftDataByPos(pos)
|
||||
assert(craftData ~= nil, 'Immersive crafting data is empty.')
|
||||
|
||||
craftData.stageData = stageData
|
||||
Smc.setCraftDataByPos(pos, craftData)
|
||||
end
|
||||
|
||||
---Checks if the workstation is busy or free for new crafting.
|
||||
---
|
||||
---The verification is based on `ImmersiveCraftData`.
|
||||
---@param pos MapPosition
|
||||
---@return boolean
|
||||
function Smc.workStationIsFree(pos)
|
||||
local data = Smc.getCraftDataByPos(pos)
|
||||
|
||||
if data == nil then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
@@ -1,67 +0,0 @@
|
||||
---Register a callback for a specific player action in FormSpec.
|
||||
---
|
||||
---The callback is guaranteed to be called only for the specified form and the specified field.
|
||||
---@param formName string the name of the formspec for which the callback will be called.
|
||||
---@param fieldName string the name of the field for which the callback will be called.
|
||||
---@param callback fun(player:Player, fieldName:string, fieldValue:any) Callback to handle the action. Parameters:
|
||||
--- * `player` - the player who performed the action.
|
||||
--- * `fieldName` - the name of the field on which the callback is called.
|
||||
--- * `fieldValue` - the field value that is passed in the `fields` table.
|
||||
function Smc.registerOnFormFieldAction(formName, fieldName, callback)
|
||||
core.register_on_player_receive_fields(function(player, formname, fields)
|
||||
-- If the form name does not match the given...
|
||||
if formName ~= formname then
|
||||
-- ...we do nothing.
|
||||
return
|
||||
end
|
||||
|
||||
local fieldValue = fields[fieldName]
|
||||
-- If the field value is not nil (the player called this field)...
|
||||
if fieldValue ~= nil then
|
||||
-- ...calling a callback.
|
||||
callback(player, fieldName, fieldValue)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
---Register a callback function to close the FormSpec.
|
||||
---
|
||||
---The callback is guaranteed to be called only for the specified form.
|
||||
---@param formName string the name of the form that is being closed.
|
||||
---@param callback fun(player:Player) Callback to handle the close. Parameters:
|
||||
--- * `player` - the player who closed the form.
|
||||
function Smc.registerOnFormQuit(formName, callback)
|
||||
Smc.registerOnFormFieldAction(formName, 'quit', callback)
|
||||
end
|
||||
|
||||
---Register a callback for a specific player action in FormSpec.
|
||||
---
|
||||
---The callback function is guaranteed to be called only for the specified form and
|
||||
---for the field whose name matches the pattern.
|
||||
---@param formName string the name of the formspec for which the callback will be called.
|
||||
---@param fieldNamePattern string the name pattern of the field for which the callback will be called.
|
||||
---@param callback fun(player:Player, fieldName:string, fieldValue:any) Callback to handle the action. Parameters:
|
||||
--- * `player` - the player who performed the action.
|
||||
--- * `fieldName` - the name of the field on which the callback is called (will match the pattern).
|
||||
--- * `fieldValue` - the field value that is passed in the `fields` table.
|
||||
function Smc.registerOnFormFieldActionMatch(formName, fieldNamePattern, callback)
|
||||
core.register_on_player_receive_fields(function(player, formname, fields)
|
||||
-- If the form name does not match the given...
|
||||
if formName ~= formname then
|
||||
-- ...we do nothing.
|
||||
return
|
||||
end
|
||||
|
||||
-- We go through each field in the list of fields.
|
||||
for fieldName, fieldValue in pairs(fields) do
|
||||
-- We check the field name pattern compliance.
|
||||
local capturedName = string.match(fieldName, fieldNamePattern)
|
||||
|
||||
-- If the captured name is not nil...
|
||||
if capturedName ~= nil then
|
||||
-- ...calling a callback.
|
||||
callback(player, fieldName, fieldValue)
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
@@ -1,33 +0,0 @@
|
||||
---@type table<string, Item>
|
||||
local registeredItems = {}
|
||||
|
||||
---@type table<string, table<string, Item>>
|
||||
local registeredItemsByMod = {}
|
||||
|
||||
---@param shortModName string
|
||||
---@param item Item
|
||||
function Smc.addRegisteredItem(shortModName, item)
|
||||
local itemName = item.itemDef.settings.name
|
||||
local modItems = registeredItemsByMod[shortModName]
|
||||
|
||||
if modItems == nil then
|
||||
registeredItemsByMod[shortModName] = {[itemName]=item}
|
||||
return
|
||||
end
|
||||
|
||||
assert(modItems[itemName] == nil)
|
||||
|
||||
registeredItems[itemName] = item
|
||||
modItems[itemName] = item
|
||||
end
|
||||
|
||||
---@param shortModName string
|
||||
---@return table<string, Item>?
|
||||
function Smc.getRegisteredItemsByMod(shortModName)
|
||||
return table.copy_with_metatables(registeredItemsByMod[shortModName])
|
||||
end
|
||||
|
||||
---@return table<string, Item>?
|
||||
function Smc.getRegisteredItems()
|
||||
return table.copy_with_metatables(registeredItems)
|
||||
end
|
||||
@@ -1,66 +0,0 @@
|
||||
-- Global methods for require classes.
|
||||
|
||||
---@return Item
|
||||
function Smc.requireItem()
|
||||
---@type Item
|
||||
local class = Mod.getInfo('smc__core__item').require('Item')
|
||||
|
||||
return class
|
||||
end
|
||||
|
||||
---@return Node
|
||||
function Smc.requireNode()
|
||||
---@type Node
|
||||
local class = Mod.getInfo('smc__core__node').require('Node')
|
||||
|
||||
return class
|
||||
end
|
||||
|
||||
---@return Tool
|
||||
function Smc.requireTool()
|
||||
---@type Tool
|
||||
local class = Mod.getInfo('smc__core__tool').require('Tool')
|
||||
|
||||
return class
|
||||
end
|
||||
|
||||
---@return Plant
|
||||
function Smc.requirePlant()
|
||||
---@type Plant
|
||||
local class = Mod.getInfo('smc__core__plant').require('Plant')
|
||||
|
||||
return class
|
||||
end
|
||||
|
||||
---@return ItemFactory
|
||||
function Smc.requireItemFactory()
|
||||
---@type ItemFactory
|
||||
local class = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
|
||||
|
||||
return class
|
||||
end
|
||||
|
||||
---@return TileSheet
|
||||
function Smc.requireTileSheet()
|
||||
---@type TileSheet
|
||||
local class = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
|
||||
|
||||
return class
|
||||
end
|
||||
|
||||
---@return BaseUI
|
||||
function Smc.requireBaseUI()
|
||||
---@type BaseUI
|
||||
local class = Mod.getInfo('smc__core__base_ui').require('BaseUI')
|
||||
|
||||
return class
|
||||
end
|
||||
|
||||
---@return Formspec
|
||||
function Smc.requireFormspec()
|
||||
---@type Formspec
|
||||
local class = Mod.getInfo('smc__core__formspec').require('Formspec')
|
||||
|
||||
return class
|
||||
end
|
||||
|
||||