HybridDog/treecapitator-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a .luacheckrc and code style changes

Browse Source
This commit is contained in:
HybridDog 2020-10-11 17:58:45 +02:00
parent 23f5060825
commit 2b112e6ac1
2 changed files with 74 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.luacheckrc Normal file
View File

@ -0,0 +1,15 @@
read_globals = {
"dump",
"vector",
"DIR_DELIM",
minetest = {
fields = {
check_for_falling = {
read_only = false
}
},
other_fields = true
}
}
globals = {"treecapitator"}
ignore = {"421", "423"}

58
init.lua
View File

@ -128,7 +128,7 @@ else
end end
table_contains = function(t, v) local function table_contains(t, v)
for i = 1,#t do for i = 1,#t do
if t[i] == v then if t[i] == v then
return true return true
@ -301,11 +301,11 @@ local function get_stem(trunktop_ps, trunks, tr, head_ps)
end end
-- part of healthy stem searching -- part of healthy stem searching
local function here_neat_stemps(p, tr) local function here_neat_stemps(pos, tr)
local ps = {} local ps = {}
for i = 1,#tr.stem_offsets do for i = 1,#tr.stem_offsets do
local o = tr.stem_offsets[i] local o = tr.stem_offsets[i]
local p = {x = p.x + o[1], y = p.y, z = p.z + o[2]} local p = {x = pos.x + o[1], y = pos.y, z = pos.z + o[2]}
-- air test is too simple (makeshift solution) -- air test is too simple (makeshift solution)
if get_node(p).name ~= "air" then if get_node(p).name ~= "air" then
return return
@ -333,11 +333,11 @@ local function find_neat_stemps(pos, tr)
end end
-- part of incomplete stem searching -- part of incomplete stem searching
local function here_incomplete_stemps(p, tr) local function here_incomplete_stemps(pos, tr)
local ps = {} local ps = {}
for i = 1,#tr.stem_offsets do for i = 1,#tr.stem_offsets do
local o = tr.stem_offsets[i] local o = tr.stem_offsets[i]
local p = {x = p.x + o[1], y = p.y+1, z = p.z + o[2]} local p = {x = pos.x + o[1], y = pos.y+1, z = pos.z + o[2]}
if is_trunk_of_tree(tr.trees, get_node(p)) then if is_trunk_of_tree(tr.trees, get_node(p)) then
p.y = p.y-1 p.y = p.y-1
local node = get_node(p) local node = get_node(p)
@ -606,8 +606,8 @@ function capitate_funcs.acacia(pos, tr, node_above, digger)
minetest.sound_play("tree_falling", {pos = pos, max_hear_distance = 32}) minetest.sound_play("tree_falling", {pos = pos, max_hear_distance = 32})
end end
for i = 1,n-1 do for i = 1,n-1 do
local pos,node = unpack(tab[i]) local pos_stem, node = unpack(tab[i])
destroy_node(pos, node, digger) destroy_node(pos_stem, node, digger)
end end
return true return true
end end
@ -616,7 +616,9 @@ end
----------------------- Palm tree function ------------------------------------- ----------------------- Palm tree function -------------------------------------
-- the 17 vectors used for walking the stem -- the 17 vectors used for walking the stem
local palm_stem_dirs = { local palm_stem_dirs
do
palm_stem_dirs = {
{0,1,0} {0,1,0}
} }
local n = 2 local n = 2
@ -644,6 +646,7 @@ for i = 1,17 do
local p = palm_stem_dirs[i] local p = palm_stem_dirs[i]
palm_stem_dirs[i] = vector.new(unpack(p)) palm_stem_dirs[i] = vector.new(unpack(p))
end end
end
local pos_from_hash = minetest.get_position_from_hash local pos_from_hash = minetest.get_position_from_hash
@ -712,12 +715,12 @@ local function get_palm_head(hcp, tr, max_forbi)
end end
end end
local ps = {} local ps = {}
local n = 0 local num_leaves = 0
for ph in pairs(leaves) do for ph in pairs(leaves) do
n = n+1 num_leaves = num_leaves+1
ps[n] = pos_from_hash(ph) ps[num_leaves] = pos_from_hash(ph)
end end
return ps,n return ps, num_leaves
end end
-- returns positions for palm leaves allowed to be dug -- returns positions for palm leaves allowed to be dug
@ -736,8 +739,8 @@ local function palm_find_valid_head_ps(pos, head_ps, tr)
local hcp = {x=pos.x+x, y=pos.y+y, z=pos.z+z} local hcp = {x=pos.x+x, y=pos.y+y, z=pos.z+z}
if not vector.equals(hcp, pos) if not vector.equals(hcp, pos)
and get_node(hcp).name == tr.trunk_top then and get_node(hcp).name == tr.trunk_top then
local leaves,n = get_palm_head(hcp, tr, 0) local leaves, num_leaves = get_palm_head(hcp, tr, 0)
for i = 1,n do for i = 1, num_leaves do
tab[poshash(leaves[i])] = true tab[poshash(leaves[i])] = true
end end
end end
@ -757,12 +760,12 @@ local function palm_find_valid_head_ps(pos, head_ps, tr)
return n return n
end end
function capitate_funcs.palm(pos, tr, node_above, digger) function capitate_funcs.palm(startpos, tr, node_above, digger)
local trunk = tr.trees[1] local trunk = tr.trees[1]
-- walk the stem up to the fruit carrier -- walk the stem up to the fruit carrier
pos = {x=pos.x, y=pos.y+1, z=pos.z} local pos_current = {x=startpos.x, y=startpos.y+1, z=startpos.z}
local trunks = {{pos, node_above}} local trunks = {{pos_current, node_above}}
local trunk_found = true local trunk_found = true
local nohori = false local nohori = false
local hcp local hcp
@ -773,12 +776,12 @@ function capitate_funcs.palm(pos, tr, node_above, digger)
local hori = i > 1 and i < 10 local hori = i > 1 and i < 10
if not hori if not hori
or not nohori then or not nohori then
local p = vector.add(pos, palm_stem_dirs[i]) local p = vector.add(pos_current, palm_stem_dirs[i])
local node = get_node(p) local node = get_node(p)
if node.name == trunk then if node.name == trunk then
trunk_found = true trunk_found = true
trunks[#trunks+1] = {p, node} trunks[#trunks+1] = {p, node}
pos = p pos_current = p
nohori = hori nohori = hori
break break
end end
@ -811,7 +814,8 @@ function capitate_funcs.palm(pos, tr, node_above, digger)
local lc = palm_find_valid_head_ps(hcp, leaves_ps, tr) local lc = palm_find_valid_head_ps(hcp, leaves_ps, tr)
if treecapitator.play_sound then if treecapitator.play_sound then
minetest.sound_play("tree_falling", {pos = pos, max_hear_distance = 32}) minetest.sound_play("tree_falling", {pos = pos_current,
max_hear_distance = 32})
end end
local nodeupdate = minetest.check_for_falling local nodeupdate = minetest.check_for_falling
@ -892,15 +896,15 @@ function capitate_funcs.moretrees(pos, tr, _, digger)
local maxy = pos.y+tr.height local maxy = pos.y+tr.height
local num_trunks = 0 local num_trunks = 0
local num_leaves = 0 local num_leaves = 0
local ps = get_tab({x=pos.x, y=pos.y+1, z=pos.z}, function(pos) local ps = get_tab({x=pos.x, y=pos.y+1, z=pos.z}, function(p)
if pos.x < minx if p.x < minx
or pos.x > maxx or p.x > maxx
or pos.z < minz or p.z < minz
or pos.z > maxz or p.z > maxz
or pos.y > maxy then or p.y > maxy then
return false return false
end end
local nam = get_node(pos).name local nam = get_node(p).name
if table_contains(trees, nam) then if table_contains(trees, nam) then
num_trunks = num_trunks+1 num_trunks = num_trunks+1
elseif table_contains(leaves, nam) then elseif table_contains(leaves, nam) then