From 12bcdfe57b79a84cec40968c6dc7426327b02a24 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Fri, 1 Jul 2022 15:01:43 -0400 Subject: [PATCH] make luacheck semi sane --- .luacheckrc | 35 ++++++++++++++++------------------- init.lua | 2 +- node_defs.lua | 32 ++++++++++++++++++++++---------- saplings.lua | 9 +++++++-- 4 files changed, 46 insertions(+), 32 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 459b2e2..b888a19 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,28 +1,25 @@ -std = "lua51+minetest" unused_args = false allow_defined_top = true -max_line_length = 999 -max_comment_line_length = 999 -stds.minetest = { - read_globals = { - "minetest", - "vector", - "VoxelManip", - "VoxelArea", - "PseudoRandom", - "ItemStack", - "default", - table = { - fields = { - "copy", - }, - }, - "dump", - } +exclude_files = {".luacheckrc"} + + +globals = { + "minetest", + "vector", + "VoxelManip", + "VoxelArea", + "PseudoRandom", + "ItemStack", + "default", + "dump", + "moretrees", } read_globals = { + string = {fields = {"split"}}, + table = {fields = {"copy", "getn"}}, + "biome_lib", "stairsplus", "stairs", diff --git a/init.lua b/init.lua index 64d932b..2940867 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ dofile(modpath.."/node_defs.lua") dofile(modpath.."/date_palm.lua") dofile(modpath.."/cocos_palm.lua") dofile(modpath.."/biome_defs.lua") ---dofile(modpath.."/saplings.lua") +dofile(modpath.."/saplings.lua") dofile(modpath.."/crafts.lua") -- tree spawning setup diff --git a/node_defs.lua b/node_defs.lua index 863db71..c5510e3 100644 --- a/node_defs.lua +++ b/node_defs.lua @@ -463,17 +463,29 @@ for i in ipairs(moretrees.treelist) do sounds = default.node_sound_defaults(), drop = "moretrees:"..treename.."_sapling", on_place = function(itemstack, placer, pointed_thing) - itemstack = default.sapling_on_place(itemstack, placer, pointed_thing, - "moretrees:" ..treename.. "_sapling_ongen", - -- minp, maxp to be checked, relative to sapling pos - -- minp_relative.y = 1 because sapling pos has been checked - {x = -3, y = 1, z = -3}, - {x = 3, y = 6, z = 3}, - -- maximum interval of interior volume check - 4) + itemstack = default.sapling_on_place(itemstack, placer, pointed_thing, + "moretrees:" ..treename.. "_sapling_ongen", + -- minp, maxp to be checked, relative to sapling pos + -- minp_relative.y = 1 because sapling pos has been checked + {x = -3, y = 1, z = -3}, + {x = 3, y = 6, z = 3}, + -- maximum interval of interior volume check + 4) - return itemstack - end, + return itemstack + end, + on_construct = function(pos) + minetest.get_node_timer(pos):start(2) + end, + on_timer = function(pos, elapsed) + if moretrees.can_grow(pos, treename) then + minetest.chat_send_all("can grow") + minetest.chat_send_all("grow_" .. treename) + --moretrees["grow_" .. treename](pos) + else + minetest.get_node_timer(pos):start(300) + end + end, }) local fruitname = nil diff --git a/saplings.lua b/saplings.lua index 9a94aa2..9cbd6d7 100644 --- a/saplings.lua +++ b/saplings.lua @@ -39,7 +39,12 @@ local sand_surfaces = { -- too cold for a palm, too... well... sandy for anything else. } -for i in ipairs(moretrees.treelist) do +function moretrees.can_grow(pos, treename) + minetest.chat_send_all(treename) + return true +end + +--[[ for i in ipairs(moretrees.treelist) do local treename = moretrees.treelist[i][1] local tree_model = treename.."_model" local tree_biome = treename.."_biome" @@ -81,4 +86,4 @@ for i in ipairs(moretrees.treelist) do grow_nodes = surfaces, grow_function = grow_function, }) -end +end ]]