diff --git a/mods/CORE/adminCommands/init.lua b/mods/CORE/adminCommands/init.lua index ba8e580..b4cc021 100644 --- a/mods/CORE/adminCommands/init.lua +++ b/mods/CORE/adminCommands/init.lua @@ -4,43 +4,47 @@ local require = modInfo.require ---@type Formspec local Formspec = require('Formspec') -local listForm = Formspec:new({ - size = {x=21, y=12}, -}) +local function getForm() + local listForm = Formspec:new({ + size = {x=21, y=12}, + }) -listForm:list('current_player', 'main', 10.5, 6.5, 8, 4) + listForm:list('current_player', 'main', 10.5, 6.5, 8, 4) -local listFormItems = Formspec:new() + local listFormItems = Formspec:new() -local items = table.get_keys(core.registered_nodes) -table.sort(items) -local w, h = 0, 0 + 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') + ---@param name string + for _, name in ipairs(items) do + listFormItems:itemImageButton(w, h, 1, 1, name, name..'::item_button') - w = w + 1 + w = w + 1 - if w > 9 then - w = 0 - h = h + 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') + + return listForm 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()) + core.show_formspec(name, 'admin_commands:list_form', getForm():toString()) return true, '' end diff --git a/mods/CORE/adminCommands/mod.conf b/mods/CORE/adminCommands/mod.conf index c06ae88..e88700a 100644 --- a/mods/CORE/adminCommands/mod.conf +++ b/mods/CORE/adminCommands/mod.conf @@ -1,2 +1,2 @@ name = smc__core__admin_commands -depends = smc__system__system_loader, smc__core__formspec, smc__core__item +depends = smc__system__system_loader, smc__core__formspec diff --git a/mods/GAME/ITEMS/ItemsLoader/mod.conf b/mods/GAME/ITEMS/ItemsLoader/mod.conf index 4ab7bfe..c0853af 100644 --- a/mods/GAME/ITEMS/ItemsLoader/mod.conf +++ b/mods/GAME/ITEMS/ItemsLoader/mod.conf @@ -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 +depends = smc__game__items__rocks, smc__game__items__wood, smc__game__items__soils, smc__game__items__liquids, smc__game__items__plants diff --git a/mods/GAME/ITEMS/wood/init.lua b/mods/GAME/ITEMS/wood/init.lua index c72c92e..2945425 100644 --- a/mods/GAME/ITEMS/wood/init.lua +++ b/mods/GAME/ITEMS/wood/init.lua @@ -5,39 +5,54 @@ local Node = Mod.getInfo('smc__core__node').require('Node') local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet') ---@type Node.NodeDefinition -local defaultRockDef = { +local defaultLogDef = { settings = { - name = "", - _description = "A log", + name = '', tiles = {}, groups = { dig_immediate = 2, }, - paramtype2 = "facedir", + paramtype2 = 'facedir', }, } ---@type Node.NodeDefinition local defaultPlanksDef = { settings = { - name = "", - _description = "A planks", + name = '', tiles = {}, groups = { dig_immediate = 2, }, - paramtype2 = "facedir", + paramtype2 = 'facedir', }, } -local defaultLog = Node:getExtended(defaultRockDef) +---@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 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 { @@ -47,126 +62,51 @@ local function getLogTiles(x, y) } end -local t = getLogTiles +local t = logTileSheet -logFactory:registerItems({ - ---@type Node.NodeDefinition - { +local function registerWood(name, x) + defaultLog:new({ settings = { - name = "marentine_log", - _title = "Marentine Log", - --description = "", - tiles = t(0, 1), + name = name..'_log', + tiles = getLogTiles(x, 1) }, - }, - ---@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 - { + defaultLog:new({ settings = { - name = "marentine_planks", - _title = "Marentine Planks", - --description = "", - tiles = { logTileSheet:t(0, 4) }, + name = name..'_trunk', + tiles = getLogTiles(x, 1), + inventory_overlay = 'wood_trunk_overlay.png', + drop = 'wood:'..name..'_log' }, - }, - ---@type Node.NodeDefinition - { + }) + + defaultPlanks:new({ settings = { - name = "allwhere_planks", - _title = "Allwhere Planks", - --description = "", - tiles = { logTileSheet:t(2, 4) }, + name = name..'_planks', + tiles = { logTileSheet:t(x, 4) }, }, - }, - ---@type Node.NodeDefinition - { + }) + + defaultLeafs:new({ settings = { - name = "fis_planks", - _title = "Fis Planks", - --description = "", - tiles = { logTileSheet:t(4, 4) }, + name = name..'_leafs', + tiles = { logTileSheet:t(x, 0) }, }, - }, - ---@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) }, - }, - }, -}) + }) +end + +registerWood('marentine', 0) +registerWood('allwhere', 2) +registerWood('fis', 4) +registerWood('tammoy', 6) +registerWood('dallalia', 8) +registerWood('zuph', 10) -- сундучки ---@type TileSheet -local caseTileSheet = TileSheet:new("cases_sheet.png", 16, 16) +local caseTileSheet = TileSheet:new('cases_sheet.png', 16, 16) local function getCaseTiles(x, y) return { @@ -182,22 +122,22 @@ planksFactory:registerItems({ ---@type Node.NodeDefinition { settings = { - name = "case_closed", - _title = "Case", - --description = "", + name = 'case_closed', + _title = 'Case', + --description = '', tiles = t(0,0) }, }, ---@type Node.NodeDefinition { settings = { - name = "case_open", - _title = "Case", - --description = "", + name = 'case_open', + _title = 'Case', + --description = '', tiles = t(1,0); drawtype = 'nodebox'; node_box = { - type = "fixed", + type = 'fixed', fixed = { {-0.5, -0.5, -0.5, 0.5, 0.5 - 1/16*2, 0.5}, } diff --git a/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png b/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png index 2e3fdb2..21b732e 100644 Binary files a/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png and b/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png differ diff --git a/mods/GAME/ITEMS/wood/textures/wood_trunk_overlay.png b/mods/GAME/ITEMS/wood/textures/wood_trunk_overlay.png new file mode 100644 index 0000000..f75435d Binary files /dev/null and b/mods/GAME/ITEMS/wood/textures/wood_trunk_overlay.png differ