cleaning up some stuff with luacheck.

This commit is contained in:
FaceDeer
2023-09-29 16:09:25 -06:00
parent c9dedef095
commit f537af33bc
88 changed files with 1695 additions and 1644 deletions

View File

@ -30,7 +30,7 @@ local register_cave_wheat = function(number)
on_timer = function(pos, elapsed)
df_farming.grow_underground_plant(pos, name, elapsed)
end,
drop = {
max_items = 1,
items = {
@ -48,11 +48,11 @@ local register_cave_wheat = function(number)
},
},
},
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
}
if number < 8 then
def._dfcaverns_next_stage_time = wheat_grow_time
def._dfcaverns_next_stage = "df_farming:cave_wheat_"..tostring(number+1)
@ -215,7 +215,7 @@ if minetest.get_modpath("footprints") then
_mcl_blast_resistance = 0.5,
_mcl_hardness = 0.5,
})
footprints.register_trample_node("df_farming:cave_wheat_5", {
trampled_node_name = "df_farming:wheat_trampled",
randomize_trampled_param2 = true,

View File

@ -17,10 +17,10 @@ local function setting(stype, name, default, description)
value = default
end
df_farming.config[name] = value
if print_settingtypes then
minetest.debug(CONFIG_FILE_PREFIX..name.." ("..description..") "..stype.." "..tostring(default))
end
end
end
local plants = {

View File

@ -26,11 +26,11 @@ local register_dimple_cup = function(number)
{-8/16, -8/16, -8/16, 8/16, -8/16 + 4*number/16, 8/16},
},
},
on_timer = function(pos, elapsed)
df_farming.grow_underground_plant(pos, name, elapsed)
end,
drop = {
max_items = 1,
items = {
@ -47,12 +47,12 @@ local register_dimple_cup = function(number)
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
}
if number < 4 then
def._dfcaverns_next_stage_time = dimple_grow_time
def._dfcaverns_next_stage = "df_farming:dimple_cup_"..tostring(number+1)
end
minetest.register_node(name, def)
end

View File

@ -26,11 +26,11 @@ local register_pig_tail = function(number)
{-8/16, -8/16, -8/16, 8/16, -8/16 + 2*number/16, 8/16},
},
},
on_timer = function(pos, elapsed)
df_farming.grow_underground_plant(pos, name, elapsed)
end,
drop = {
max_items = 1,
items = {
@ -51,12 +51,12 @@ local register_pig_tail = function(number)
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
}
if number < 8 then
def._dfcaverns_next_stage_time = pig_tail_grow_time
def._dfcaverns_next_stage = "df_farming:pig_tail_"..tostring(number+1)
end
minetest.register_node(name, def)
end
@ -143,7 +143,7 @@ if minetest.get_modpath("footprints") then
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
})
footprints.register_trample_node("df_farming:pig_tail_5", {
trampled_node_name = "df_farming:pig_tail_trampled",
randomize_trampled_param2 = true,

View File

@ -80,7 +80,7 @@ end
df_farming.plant_timer = function(pos, plantname, elapsed)
local next_stage_time = minetest.registered_nodes[plantname]._dfcaverns_next_stage_time
if not next_stage_time then return end
local growable_factor = df_farming.growth_factor(plantname, pos) or 1
if growable_factor == true then growable_factor = 1 end -- backwards compatibility in case other mods are overriding growth factor to "true/false"
@ -141,7 +141,7 @@ local place_seed = function(itemstack, placer, pointed_thing, plantname)
if not minetest.registered_nodes[above.name].buildable_to then
return itemstack
end
-- if the plant can't grow here, don't permit the seed to be placed
local growth_permitted_function = df_farming.growth_permitted[plantname]
if not growth_permitted_function or not growth_permitted_function(pt.above) then
@ -153,7 +153,7 @@ local place_seed = function(itemstack, placer, pointed_thing, plantname)
local oldnode= above
minetest.add_node(pt.above, {name = plantname, param2 = 1})
df_farming.plant_timer(pt.above, plantname)
-- Run script hook
local take_item = true
for _, callback in ipairs(core.registered_on_placenodes) do
@ -165,8 +165,8 @@ local place_seed = function(itemstack, placer, pointed_thing, plantname)
if callback(place_to_copy, newnode_copy, placer, oldnode_copy, itemstack, pointed_thing_copy) then
take_item = false
end
end
end
if not minetest.is_creative_enabled(placer:get_player_name()) then
itemstack:take_item()
end
@ -196,21 +196,21 @@ df_farming.register_seed = function(name, description, image, stage_one, grow_ti
fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
},
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
_mcl_hardness = 0.2,
on_place = function(itemstack, placer, pointed_thing)
return place_seed(itemstack, placer, pointed_thing, "df_farming:"..name)
end,
on_timer = function(pos, elapsed)
df_farming.grow_underground_plant(pos, "df_farming:"..name, elapsed)
end,
on_destruct = function(pos)
minetest.get_node_timer(pos):stop()
end,
}
minetest.register_node("df_farming:"..name, def)
minetest.register_craft({
type = "fuel",
@ -248,10 +248,10 @@ if df_farming.config.light_kills_fungus then
end
local node_def = minetest.registered_nodes[node.name]
local light_sensitive_fungus_level = node_def.groups.light_sensitive_fungus
-- This should never be the case, but I've received a report of it happening anyway in the ABM so guarding against it.
if not light_sensitive_fungus_level then return false end
local dead_node = node_def._dfcaverns_dead_node or "df_farming:dead_fungus"
-- 11 is the value adjacent to a torch
local light_level = minetest.get_node_light(pos, 0.5) -- check at 0.5 to get how bright it would be here at noon,

View File

@ -59,7 +59,7 @@ local plump_helmet_on_place = function(itemstack, placer, pointed_thing, plantn
local newnode= {name = plantname, param2 = new_param2, param1=0}
local oldnode= minetest.get_node(pt.above)
minetest.add_node(pt.above, newnode)
local growth_permitted_function = df_farming.growth_permitted["df_farming:plump_helmet_spawn"] -- use the same permitted function for all plump helmets
if not growth_permitted_function or growth_permitted_function(pt.above) then
df_farming.plant_timer(pt.above, plantname)
@ -108,16 +108,16 @@ minetest.register_node("df_farming:plump_helmet_spawn", {
}
},
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
_mcl_hardness = 0.2,
on_place = function(itemstack, placer, pointed_thing)
return plump_helmet_on_place(itemstack, placer, pointed_thing, "df_farming:plump_helmet_spawn")
end,
on_timer = function(pos, elapsed)
df_farming.grow_underground_plant(pos, "df_farming:plump_helmet_spawn", elapsed)
end,
on_destruct = function(pos)
minetest.get_node_timer(pos):stop()
end,
@ -162,7 +162,7 @@ minetest.register_node("df_farming:plump_helmet_1", {
}
},
_mcl_blast_resistance = 0.3,
_mcl_hardness = 0.3,
_mcl_hardness = 0.3,
on_place = function(itemstack, placer, pointed_thing)
return plump_helmet_on_place(itemstack, placer, pointed_thing, "df_farming:plump_helmet_1")
@ -206,12 +206,12 @@ minetest.register_node("df_farming:plump_helmet_2", {
}
},
_mcl_blast_resistance = 0.4,
_mcl_hardness = 0.4,
_mcl_hardness = 0.4,
on_place = function(itemstack, placer, pointed_thing)
return plump_helmet_on_place(itemstack, placer, pointed_thing, "df_farming:plump_helmet_2")
end,
on_use = minetest.item_eat(2),
_hunger_ng = {satiates = 2},
_mcl_saturation = 0.7,
@ -254,7 +254,7 @@ minetest.register_node("df_farming:plump_helmet_3", {
on_place = function(itemstack, placer, pointed_thing)
return plump_helmet_on_place(itemstack, placer, pointed_thing, "df_farming:plump_helmet_3")
end,
on_use = minetest.item_eat(3),
_hunger_ng = {satiates = 3},
_mcl_saturation = 0.9,
@ -317,7 +317,7 @@ minetest.register_node("df_farming:plump_helmet_4", {
on_place = function(itemstack, placer, pointed_thing)
return plump_helmet_on_place(itemstack, placer, pointed_thing, "df_farming:plump_helmet_4")
end,
on_use = minetest.item_eat(4),
_hunger_ng = {satiates = 4},
_mcl_saturation = 1,
@ -363,7 +363,7 @@ minetest.register_node("df_farming:plump_helmet_4_picked", {
on_place = function(itemstack, placer, pointed_thing)
return plump_helmet_on_place(itemstack, placer, pointed_thing, "df_farming:plump_helmet_4_picked")
end,
on_use = minetest.item_eat(4),
_hunger_ng = {satiates = 4},
_mcl_saturation = 1,

View File

@ -31,7 +31,7 @@ local register_sweet_pod = function(number)
},
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
on_timer = function(pos, elapsed)
df_farming.grow_underground_plant(pos, name, elapsed)
end,
@ -54,12 +54,12 @@ local register_sweet_pod = function(number)
},
},
}
if number < 6 then
def._dfcaverns_next_stage = "df_farming:sweet_pod_"..tostring(number+1)
def._dfcaverns_next_stage_time = sweet_pod_grow_time
end
minetest.register_node(name, def)
end
@ -195,7 +195,7 @@ if df_dependencies.bucket_register_liquid then
_mcl_blast_resistance = 100,
_mcl_hardness = -1,
})
minetest.register_node("df_farming:dwarven_syrup_flowing", {
description = S("Flowing Dwarven Syrup"),
_doc_items_longdesc = df_farming.doc.sweet_pod_syrup_desc,
@ -254,7 +254,7 @@ if df_dependencies.bucket_register_liquid then
"dfcaverns_bucket_dwarven_syrup.png",
S("Dwarven Syrup Bucket")
)
if minetest.get_modpath("crafting") then
simplecrafting_lib.register("furnace", {
input = {
@ -271,7 +271,7 @@ if df_dependencies.bucket_register_liquid then
recipe = {df_dependencies.node_name_bucket_empty, "df_farming:sugar", "df_farming:sugar", "df_farming:sugar"},
})
end
if minetest.get_modpath("dynamic_liquid") then
dynamic_liquid.liquid_abm("df_farming:dwarven_syrup_source", "df_farming:dwarven_syrup_flowing", 5)
end