5 Commits

Author SHA1 Message Date
51e6763457 HelperLib: add require methods 2026-02-27 20:34:37 +03:00
c47ab6ac3c soils: update textures 2026-02-27 20:23:35 +03:00
6fd8295500 Item: minor fixes & set default stack is 128 2026-02-27 20:23:15 +03:00
b12f890740 adminCommands: minor fixes & test shaders 2026-02-27 20:22:19 +03:00
4c90041c68 Add essences (rofl) 2026-02-27 20:21:26 +03:00
17 changed files with 119 additions and 51 deletions

View File

@@ -2,10 +2,7 @@ local getInstance, extend = Class.getInstance, Class.extend
local tableCopy, tableMerge, colorize = table.copy, table.merge, core.colorize
local modInfo = Mod.getInfo('smc__core__item')
local require = modInfo.require
local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
local ItemFactory = Smc.requireItemFactory()
---Determines whether common rarity will be shown in item descriptions or not.
local SHOW_COMMON_RARITY = true
@@ -49,6 +46,7 @@ local Item = {
_description_color = '#C0C0C0',
_rarity = 'common',
_add_mod_name = true,
stack_max = 128,
},
callbacks = {}
}
@@ -195,7 +193,7 @@ end
---@param defaultDef Item.ItemDefinition
---@return Item
function Item:getExtended(defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef, true)
---@type Item
local ChildClass = extend(self, {
@@ -212,7 +210,7 @@ function Item:getFactory(defaultDef)
if defaultDef == nil then
defaultDef = self.defaultDef
else
defaultDef = defMerge(self.defaultDef, defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef, true)
end
---@type ItemFactory

View File

@@ -1,10 +1,4 @@
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')
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
---@class Node : Item
---@field defaultDef Node.NodeDefinition

View File

@@ -1,10 +1,4 @@
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')
local Node = Smc.requireNode()
---@class Plant : Node
local Plant = Node:getExtended({
@@ -24,4 +18,4 @@ local Plant = Node:getExtended({
}
})
return Plant
return Plant

View File

@@ -6,8 +6,7 @@ local ImmersiveCraftHandler = Mod.getInfo('smc__core__craft_system').require('Cr
---@type WorkStationUI
local WorkStationUI = Mod.getInfo('smc__ui__work_station').require('WorkStationUI')
---@type Node
local Node = Mod.getInfo('smc__core__node').require('Node')
local Node = Smc.requireNode()
-- Default settings that a work station node should have.
local WorkStationNode = Node:getExtended({

View File

@@ -13,7 +13,7 @@ local function getForm()
local listFormItems = Formspec:new()
local items = table.get_keys(core.registered_nodes)
local items = table.get_keys(core.registered_items)
table.sort(items)
local w, h = 0, 0
@@ -79,9 +79,22 @@ end)
core.register_on_joinplayer(function(player, last_login)
player:set_sky({
sky_color = {
day_sky = '#F1DAC0',
day_horizon = '#F1B795',
day_sky = '#FAE6E0',
day_horizon = '#E7A985',
},
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)

View File

@@ -0,0 +1,35 @@
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)
}
})

View File

@@ -0,0 +1,10 @@
# textdomain: essences
essence_experience-title=Эссенция опыта
essence_experience-desc=Сгусток желеобразной материи,@nзаключающий в себе ремесленный опыт.
essence_spell-title=Эссенция заклятия
essence_spell-desc=Сгусток желеобразной материи,@nзаключающий в себе мистическую силу.
essence_life-title=Эссенция жизни
essence_life-desc=Сгусток желеобразной материи,@nзаключающий в себе жизненную энергию.

View File

@@ -0,0 +1,2 @@
name = smc__game__items__essences
depends = smc__core__item

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -1,5 +1,4 @@
---@type Node
local Node = Mod.getInfo('smc__core__node').require('Node')
local Node = Smc.requireNode()
---@type Node.NodeDefinition
local defaultLiquidDef = {

View File

@@ -1,10 +1,4 @@
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')
local Plant, TileSheet = Smc.requirePlant(), Smc.requireTileSheet()
Plant:new({
settings = {

View File

@@ -1,8 +1,4 @@
---@type TileSheet
local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
---@type Node
local Node = Mod.getInfo('smc__core__node').require('Node')
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
---@type Node.NodeDefinition
local defaultRockDef = {

View File

@@ -1,8 +1,4 @@
---@type TileSheet
local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
---@type Node
local Node = Mod.getInfo('smc__core__node').require('Node')
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
---@type Node.NodeDefinition
local defaultSoilDef = {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -1,8 +1,4 @@
---@type Node
local Node = Mod.getInfo('smc__core__node').require('Node')
---@type TileSheet
local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet()
---@type Node.NodeDefinition
local defaultLogDef = {

View File

@@ -7,4 +7,5 @@ require('Lib.globalStep')
require('Lib.color')
require('Lib.immersiveCraftData')
require('Lib.getObjectByGUID')
require('Lib.receiveFields')
require('Lib.receiveFields')
require('Lib.requires')

View File

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