mirror of
https://github.com/FaceDeer/dfcaverns.git
synced 2025-06-28 14:36:20 +02:00
cleaning up some stuff with luacheck.
This commit is contained in:
@ -19,10 +19,10 @@ local function setting(stype, name, default, description)
|
||||
value = default
|
||||
end
|
||||
config[name] = value
|
||||
|
||||
|
||||
if print_settingtypes then
|
||||
minetest.debug(CONFIG_FILE_PREFIX..name.." ("..description..") "..stype.." "..tostring(default))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--Caverns
|
||||
|
@ -55,7 +55,7 @@ local node_name_to_stair_properties = function(name, override_def)
|
||||
|
||||
local node_def = minetest.registered_nodes[mod..":"..name]
|
||||
override_def = override_def or {}
|
||||
|
||||
|
||||
local node_copy = deep_copy(node_def)
|
||||
for index, value in pairs(override_def) do
|
||||
node_copy[index] = value
|
||||
@ -98,11 +98,11 @@ df_dependencies.register_all_fences = function (name, override_def)
|
||||
local mod, node_def = node_name_to_stair_properties(name, override_def)
|
||||
|
||||
override_def = override_def or {}
|
||||
|
||||
|
||||
local material = override_def.material or mod..":"..name
|
||||
local burntime = override_def.burntime
|
||||
local texture = override_def.texture or node_def.tiles[1]
|
||||
|
||||
|
||||
if minetest.get_modpath("default") then
|
||||
if default.register_fence then
|
||||
default.register_fence(material .. "_fence", {
|
||||
@ -120,7 +120,7 @@ df_dependencies.register_all_fences = function (name, override_def)
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if default.register_fence_rail then
|
||||
default.register_fence_rail(material .. "_fence_rail", {
|
||||
description = S("@1 Fence Rail", node_def.description),
|
||||
@ -148,7 +148,7 @@ df_dependencies.register_all_fences = function (name, override_def)
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if minetest.get_modpath("doors") and doors.register_fencegate then
|
||||
doors.register_fencegate(material .. "_fence_gate", {
|
||||
description = S("@1 Fence Gate", node_def.description),
|
||||
@ -157,7 +157,7 @@ df_dependencies.register_all_fences = function (name, override_def)
|
||||
groups = deep_copy(node_def.groups or {}), -- the default register_fence_rail function modifies the groups table passed in, so send a copy instead to be on the safe side.
|
||||
sounds = node_def.sounds
|
||||
})
|
||||
|
||||
|
||||
if burntime then
|
||||
minetest.register_craft({
|
||||
type = "fuel",
|
||||
@ -166,11 +166,11 @@ df_dependencies.register_all_fences = function (name, override_def)
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if minetest.get_modpath("mcl_fences") and mcl_fences.register_fence_and_fence_gate then
|
||||
local groups = deep_copy(node_def.groups or {})
|
||||
groups.fence_wood = 1
|
||||
mcl_fences.register_fence_and_fence_gate(name .. "_fence",
|
||||
mcl_fences.register_fence_and_fence_gate(name .. "_fence",
|
||||
S("@1 Fence", node_def.description),
|
||||
S("@1 Fence Gate", node_def.description),
|
||||
texture,
|
||||
@ -205,7 +205,7 @@ df_dependencies.get_itemslot_bg = function(X,Y,W,H) return "" end
|
||||
df_dependencies.get_itemslot_bg_padded = function(X,Y,W,H) return "" end
|
||||
if minetest.get_modpath("mcl_formspec") then
|
||||
df_dependencies.get_itemslot_bg = mcl_formspec.get_itemslot_bg
|
||||
|
||||
|
||||
df_dependencies.get_itemslot_bg_padded = function(x,y,w,h, padding)
|
||||
local out = ""
|
||||
for i = 0, w - 1, 1 do
|
||||
|
@ -48,7 +48,7 @@ local extend_ores = function()
|
||||
|
||||
local wherein_stonelike = {"mcl_core:stone"}
|
||||
local localseed = 12345
|
||||
|
||||
|
||||
local stone_blobs = {
|
||||
wherein = wherein_stonelike,
|
||||
clust_scarcity = 1000,
|
||||
@ -72,7 +72,7 @@ local extend_ores = function()
|
||||
scale = 1
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
local register_blob = function(ore, cluster_size, cluster_scarcity_cuberoot, ymin, ymax)
|
||||
localseed = localseed + 1 -- increment this every time it's called to ensure different distributions
|
||||
local blob_copy = deep_copy(stone_blobs)
|
||||
@ -157,21 +157,21 @@ local extend_ores = function()
|
||||
register_blob("mcl_core:stone_with_coal", 80, 10, config.oil_sea_level-200, config.oil_sea_level+200) -- tons of coal in the oil sea
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if ores_registered["mcl_core:stone_with_lapis"] then
|
||||
register_scattered("mcl_core:stone_with_lapis", 3, 25, config.sunless_sea_min, config.level3_min) -- Lapis is an ocean gem, I decided
|
||||
if config.enable_primordial then
|
||||
register_scattered("mcl_core:stone_with_lapis", 3, 25, config.primordial_min, config.primordial_max)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if ores_registered["mcl_core:stone_with_redstone"] then
|
||||
register_scattered("mcl_core:stone_with_redstone", 3, 15, config.level3_min, config.level2_min) -- Level 3 is the most magical, scatter redstone there
|
||||
if config.enable_lava_sea then
|
||||
register_scattered("mcl_core:stone_with_redstone", 4, 15, config.lava_sea_level-200, config.lava_sea_level+100) -- and of course plenty of redstone in the lava sea
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if ores_registered["mcl_core:stone_with_diamond"] then
|
||||
register_scattered("mcl_core:stone_with_diamond", 2, 18, config.sunless_sea_min, config.level2_min)
|
||||
if config.enable_oil_sea then
|
||||
@ -181,7 +181,7 @@ local extend_ores = function()
|
||||
register_scattered("mcl_core:stone_with_diamond", 3, 15, config.primordial_min, config.primordial_max)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if ores_registered["mcl_core:stone_with_gold"] then
|
||||
register_scattered("mcl_core:stone_with_gold", 2, 18)
|
||||
if config.enable_primordial then
|
||||
@ -210,9 +210,9 @@ local extend_ores = function()
|
||||
end
|
||||
|
||||
if minetest.get_modpath("mcl_init") then -- Mineclone 2
|
||||
|
||||
|
||||
old_overworld_min = mcl_vars.mg_overworld_min -- remember this for weather control
|
||||
|
||||
|
||||
mcl_vars.mg_overworld_min = lowest_elevation
|
||||
mcl_vars.mg_bedrock_overworld_min = mcl_vars.mg_overworld_min
|
||||
mcl_vars.mg_lava_overworld_max = mcl_vars.mg_overworld_min + 10
|
||||
@ -229,7 +229,7 @@ if minetest.get_modpath("mcl_init") then -- Mineclone 2
|
||||
--if minetest.get_modpath("mcl_structures") and minetest.get_modpath("mcl_strongholds") then
|
||||
-- local elevation_delta = old_overworld_min - lowest_elevation
|
||||
-- local strongholds = mcl_structures.get_structure_data("stronghold")
|
||||
-- mcl_structures.register_structure_data("stronghold", strongholds)
|
||||
-- mcl_structures.register_structure_data("stronghold", strongholds)
|
||||
--end
|
||||
end
|
||||
if minetest.get_modpath("mcl_compatibility") then -- Mineclone 5
|
||||
@ -253,7 +253,7 @@ if minetest.get_modpath("mcl_mapgen") then -- Mineclone 5
|
||||
mcl_mapgen.overworld.lava_max = mcl_mapgen.overworld.min+6
|
||||
mcl_mapgen.overworld.railcorridors_height_min = -50
|
||||
mcl_mapgen.overworld.railcorridors_height_max = -2
|
||||
|
||||
|
||||
mcl_mapgen.end_.max = mcl_mapgen.overworld.min - 2000
|
||||
mcl_mapgen.realm_barrier_overworld_end_max = mcl_mapgen.end_.max
|
||||
mcl_mapgen.realm_barrier_overworld_end_min = mcl_mapgen.end_.max - 11
|
||||
@ -265,7 +265,7 @@ if minetest.get_modpath("mcl_mapgen") then -- Mineclone 5
|
||||
.."does not have an mcl_mapgen.on_settings_changed method. This will likely result in "
|
||||
.."altitudes below the original bedrock being inaccessible to players.")
|
||||
end
|
||||
|
||||
|
||||
extend_ores()
|
||||
end
|
||||
if minetest.get_modpath("mcl_worlds") then
|
||||
|
@ -32,7 +32,7 @@ minetest.after(0, function()
|
||||
table.insert(problem_nodes, node_name)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
assert(#problem_nodes == 0, "Nodes " .. table.concat(problem_nodes, ", ") .. " were returned by a selection call but are not registered.")
|
||||
end)
|
||||
|
||||
|
Reference in New Issue
Block a user