cleaning up some stuff with luacheck.

.luacheckrc

@@ -0,0 +1,66 @@
+read_globals = {
+	"minetest",
+	"ItemStack",
+	"VoxelArea",
+	"AreaStore",
+	table = {fields = {"copy", "indexof"}},
+	"vector",
+	"default",
+	"dump",
+	"core",
+}
+
+globals = {
+	"awards",
+	"big_webs",
+	"bones_loot",
+	"bubblesponge",
+	"bucket",
+	"chasms",
+	"collectible_lore",
+	"cottages",
+	"df_achievements",
+	"df_ambience",
+	"df_caverns",
+	"df_dependencies",
+	"df_dependencies",
+	"df_farming",
+	"df_mapitems",
+	"df_primordial_items",
+	"df_trees",
+	"df_underworld_items",
+	"doors",
+	"dungeon_loot",
+	"dynamic_liquid",
+	"footprints",
+	"hunter_statue",
+	"ice_sprites",
+	"looped_node_sound",
+	"mapgen_helper",
+	"mcl_buckets",
+	"mcl_explosions",
+	"mcl_fences",
+	"mcl_flowers",
+	"mcl_formspec",
+	"mcl_mapgen",
+	"mcl_sounds",
+	"mcl_stairs",
+	"mcl_vars",
+	"mcl_worlds",
+	"mesecon",
+	"name_generator",
+	"named_waypoints",
+	"oil",
+	"pit_caves",
+	"playerplus",
+	"radiant_damage",
+	"simplecrafting_lib",
+	"stairs",
+	"stairsplus",
+	"subterrane",
+	"tnt",
+}
+
+max_line_length = false
+unused_args = false
+unused = false

chasms/init.lua

@@ -121,12 +121,12 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	local webs
 	local webs_present = false
 	if big_webs_path then
-		local seed = math.random()*10000000
+		local web_seed = math.random()*10000000
 		math.randomseed(minp.y + z_displace*minp.z) -- use consistent seeds across the x axis
 		if math.random() < web_probability then
 			webs_present = true
 		end
-		math.randomseed(seed)
+		math.randomseed(web_seed)
 	end
 
 	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")

collectible_lore/init.lua

@@ -7,7 +7,7 @@ collectible_lore.lorebooks = {}
 
 local ids = {}
 
-on_collected_callbacks = {}
+local on_collected_callbacks = {}
 
 collectible_lore.register_on_collected = function(callback)
 	table.insert(on_collected_callbacks, callback)

collectible_lore/items.lua

@@ -15,7 +15,7 @@ end
 
 local get_itemslot_bg = df_dependencies.get_itemslot_bg
 
-function get_cairn_formspec(pos)
+local function get_cairn_formspec(pos)
 	local spos = pos.x .. "," .. pos.y .. "," .. pos.z
 	local formspec =
 		"size[8,9]"
@@ -278,7 +278,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	end
 end)
 
-function tour(player, loc_list)
+local function tour(player, loc_list)
 	local pop = table.remove(loc_list)
 	if pop then
 		player:set_pos(pop)

df_achievements/misc.lua

@@ -85,7 +85,7 @@ end
 if minetest.get_modpath("df_lorebooks") then
 	collectible_lore.register_on_collected(function(player_name, id, state, collected)
 		local count = 0
-		for id, val in pairs(collected) do
+		for _id, val in pairs(collected) do
 			if val then count = count + 1 end
 		end
 		if count >= #(collectible_lore.lorebooks) then

df_ambience/init.lua

@@ -76,11 +76,11 @@ local get_ambience = function(player, name)
 		if random() < set.frequency then
 			local check_passed
 			local sound_check = set.sound_check
-			local set_nodes = set.nodes
+			local nodes = set.nodes
-			if sound_check or set_nodes then
+			if sound_check or nodes then
 				player_data = player_data or get_player_data(player, name)
 			end
-			if ((not set_nodes) or check_nodes(player_data.totals, set_nodes)) and
+			if ((not nodes) or check_nodes(player_data.totals, nodes)) and
 				((not sound_check) or sound_check(player_data)) then
 				return set
 			end

df_caverns/level2.lua

@@ -295,7 +295,6 @@ local decorate_level_2 = function(minp, maxp, seed, vm, node_arrays, area, data)
 			end
 		else
 			-- air pockets
-			local ystride = area.ystride
 			local cracks = nvals_cracks[index2d]
 			if cracks > 0.4 and data[vi-ystride] == c_water then
 				data[vi-ystride] = c_air

df_caverns/lorebooks.lua

@@ -6,10 +6,10 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
 	if maxp.y > 0 or maxp.y < df_caverns.config.primordial_min then return end
 
 	-- using after so that all other mapgen should be finished fiddling with stuff by the time this runs
-	minetest.after(1, function(minp, maxp)
+	minetest.after(1, function(minp_after, maxp_after)
-		local middle = vector.divide(vector.add(minp, maxp), 2)
+		local middle = vector.divide(vector.add(minp_after, maxp_after), 2)
 		if collectible_lore.are_cairns_close_to_pos(middle) then return end -- quick and dirty check to discard mapblocks close to other cairns
-		local possibles = minetest.find_nodes_in_area_under_air(minp, maxp, foundations)
+		local possibles = minetest.find_nodes_in_area_under_air(minp_after, maxp_after, foundations)
 		if next(possibles) then
 			local target = possibles[math.random(#possibles)]
 			target.y=target.y+1

df_primordial_items/giant_mycelium.lua

@@ -379,8 +379,8 @@ minetest.register_node("df_primordial_items:giant_hypha_apical_meristem", {
 
 -- this version grows instantly, it is meant for mapgen usage.
 
-local grow_mycelium_immediately = function(pos)
+local grow_mycelium_immediately = function(pos_spawn)
-	local stack = {pos}
+	local stack = {pos_spawn}
 	while #stack > 0 do
 		local pos = table.remove(stack)
 		if not (df_farming and df_farming.kill_if_sunlit(pos)) then

df_trees/blood_thorn.lua

@@ -321,7 +321,7 @@ df_trees.spawn_blood_thorn_vm = function(vi, area, data, data_param2, height)
 		if node_id == c_air or node_id == c_ignore then
 			data[vi] = c_blood_thorn
 
-			for i = 1, 2 do
+			for j = 1, 2 do
 				local facedir = math.random(1,4)-1
 				local spike_vi = vi + facedir_to_increment(facedir, area)
 				if data[spike_vi] == c_air or data[spike_vi] == c_ignore then
@@ -335,8 +335,3 @@ df_trees.spawn_blood_thorn_vm = function(vi, area, data, data_param2, height)
 		vi = vi + area.ystride
 	end
 end
-
-
-
-
-	

df_trees/fungiwood.lua

@@ -175,9 +175,9 @@ function df_trees.spawn_fungiwood(pos)
 	vm:update_map()
 end
 
-df_trees.spawn_fungiwood_vm = function(vi, area, data, height)
+df_trees.spawn_fungiwood_vm = function(vi_spawn, area, data, height)
 	if height == nil then height = math.random(6, 10) end
-	local pos = area:position(vi)
+	local pos = area:position(vi_spawn)
 	local x = pos.x
 	local y = pos.y
 	local z = pos.z

df_trees/spindlestem.lua

@@ -328,8 +328,8 @@ df_trees.spawn_spindlestem = function(pos)
 	local cap_item = minetest.get_name_from_content_id(get_spindlestem_cap_type(pos))
 	local node = minetest.get_node(pos)
 	minetest.set_node(pos, {name=cap_item, param2 = node.param2})
-	local disp = {x=3, y=3, z=3}
+	local range = {x=3, y=3, z=3}
-	local nearby = minetest.find_nodes_in_area(vector.add(pos, disp), vector.subtract(pos, disp), {"group:spindlestem"})
+	local nearby = minetest.find_nodes_in_area(vector.add(pos, range), vector.subtract(pos, range), {"group:spindlestem"})
 	local count = #nearby
 	local height = math.random(1,3)
 	if count > 10 then height = height + 2 end -- if there are a lot of nearby spindlestems, grow taller

df_trees/spore_tree.lua

@@ -201,17 +201,15 @@ local c_spore_pod = minetest.get_content_id("df_trees:spore_tree_fruiting_body")
 local c_tree = minetest.get_content_id("df_trees:spore_tree")
 local c_spore_frond = minetest.get_content_id("df_trees:spore_tree_hyphae")
 
-df_trees.spawn_spore_tree_vm = function(vi, area, data, data_param2, height, size, iters, has_fruiting_bodies)
+df_trees.spawn_spore_tree_vm = function(vi_spawn, area, data, data_param2, height, size, iters, has_fruiting_bodies)
 	if height == nil then height = math.random(3,6) end
 	if size == nil then size = 2 end
 	if iters == nil then iters = 10 end
 	if has_fruiting_bodies == nil then has_fruiting_bodies = math.random() < 0.5 end
 
-	local pos = area:position(vi)
+	local pos = area:position(vi_spawn)
 	local x, y, z = pos.x, pos.y, pos.z
 
-	local has_fruiting_bodies = true
-
 	-- Trunk
 	for yy = y, y + height - 1 do
 		local vi = area:index(x, yy, z)

df_trees/torchspine.lua

@@ -346,13 +346,14 @@ df_trees.spawn_torchspine = function(pos)
 	local vm = minetest.get_voxel_manip()
 	local minp, maxp = vm:read_from_map(
 		{x = x, y = y, z = z},
-		{x = x, y = y+height-1, z = z}
+		{x = x, y = y+stem_height-1, z = z}
 	)
 	local area = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
 	local data = vm:get_data()
 	local data_param2 = vm:get_param2_data()
+	local vi = area:index(pos)
 
-	df_trees.spawn_torchspine_vm(vi, area, data, data_param2, height)
+	df_trees.spawn_torchspine_vm(vi, area, data, data_param2, stem_height)
 
 	vm:set_data(data)
 	vm:write_to_map()

mine_gas/init.lua

@@ -101,8 +101,8 @@ minetest.register_abm({
 				minetest.swap_node(pos, next_node)
 			else
 				local dir = directions[math.random(1,4)]
-				local next_pos = vector.add(pos, dir)
+				next_pos = vector.add(pos, dir)
-				local next_node = minetest.get_node(next_pos)
+				next_node = minetest.get_node(next_pos)
 				if next_node.name == "air" or  minetest.get_item_group(next_node.name, "liquid") > 0 then
 					if next_node.name == "air" or math.random() < 0.5 then -- gas never "climbs" above air.
 						minetest.swap_node(next_pos, gas_node)

pit_caves/init.lua

@@ -166,14 +166,6 @@ end)
 ----------------------------------------------------------------------------------------------
 -- Debugging and sightseeing commands
 
-function round(val, decimal)
-  if (decimal) then
-    return math.floor( (val * 10^decimal) + 0.5) / (10^decimal)
-  else
-    return math.floor(val+0.5)
-  end
-end
-
 local send_pit_state = function(pos, name)
 	local pit = get_pit(pos)
 	if pit == nil then