Improve code style and clarify some parts of the code

This commit is contained in:
Hugo Locurcio 2019-02-24 22:48:26 +01:00
parent b851252996
commit 54e52ce1ce
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C

156
init.lua

@ -10,11 +10,6 @@ Licensed under the zlib license. See LICENSE.md for more information.
moreores = {} moreores = {}
local default_tin = false
if minetest.registered_items["default:tin_ingot"] then
default_tin = true
end
local S local S
if minetest.get_modpath("intllib") then if minetest.get_modpath("intllib") then
S = intllib.Getter() S = intllib.Getter()
@ -26,37 +21,55 @@ local modpath = minetest.get_modpath("moreores")
dofile(modpath .. "/_config.txt") dofile(modpath .. "/_config.txt")
-- `mg` support: -- `mg` mapgen support
if minetest.get_modpath("mg") then if minetest.get_modpath("mg") then
dofile(modpath .. "/mg.lua") dofile(modpath .. "/mg.lua")
end end
-- Utility functions
-- =================
local default_stone_sounds = default.node_sound_stone_defaults() local default_stone_sounds = default.node_sound_stone_defaults()
local default_metal_sounds = default.node_sound_metal_defaults() local default_metal_sounds = default.node_sound_metal_defaults()
local function get_recipe(c, name) -- Returns the crafting recipe table for a given material and item.
if name == "sword" then local function get_recipe(material, item)
return {{c}, {c}, {"group:stick"}} if item == "sword" then
return {
{material},
{material},
{"group:stick"},
}
end end
if name == "shovel" then if item == "shovel" then
return {{c}, {"group:stick"}, {"group:stick"}} return {
{material},
{"group:stick"},
{"group:stick"},
}
end end
if name == "axe" then if item == "axe" then
return {{c, c}, {c, "group:stick"}, {"", "group:stick"}} return {
{material, material},
{material, "group:stick"},
{"", "group:stick"},
}
end end
if name == "pick" then if item == "pick" then
return {{c, c, c}, {"", "group:stick", ""}, {"", "group:stick", ""}} return {
{material, material, material},
{"", "group:stick", ""},
{"", "group:stick", ""},
}
end end
if name == "block" then if item == "block" then
return {{c, c, c}, {c, c, c}, {c, c, c}} return {
{material, material, material},
{material, material, material},
{material, material, material},
}
end end
if name == "lockedchest" then if item == "lockedchest" then
return { return {
{"group:wood", "group:wood", "group:wood"}, {"group:wood", "group:wood", "group:wood"},
{"group:wood", c, "group:wood"}, {"group:wood", material, "group:wood"},
{"group:wood", "group:wood", "group:wood"}, {"group:wood", "group:wood", "group:wood"},
} }
end end
@ -77,7 +90,7 @@ local function add_ore(modname, description, mineral_name, oredef)
tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"}, tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"},
groups = {cracky = 2}, groups = {cracky = 2},
sounds = default_stone_sounds, sounds = default_stone_sounds,
drop = lump_item drop = lump_item,
}) })
end end
@ -98,7 +111,7 @@ local function add_ore(modname, description, mineral_name, oredef)
minetest.register_craft( { minetest.register_craft( {
output = ingot .. " 9", output = ingot .. " 9",
recipe = { recipe = {
{ block_item } {block_item},
} }
}) })
end end
@ -114,7 +127,7 @@ local function add_ore(modname, description, mineral_name, oredef)
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = ingot, output = ingot,
recipe = lump_item recipe = lump_item,
}) })
end end
end end
@ -132,7 +145,7 @@ local function add_ore(modname, description, mineral_name, oredef)
output = "default:chest_locked", output = "default:chest_locked",
recipe = { recipe = {
{ingot}, {ingot},
{"default:chest"} {"default:chest"},
} }
}) })
minetest.register_craft( { minetest.register_craft( {
@ -153,7 +166,7 @@ local function add_ore(modname, description, mineral_name, oredef)
inventory_image = toolimg_base .. tool_name .. ".png", inventory_image = toolimg_base .. tool_name .. ".png",
tool_capabilities = { tool_capabilities = {
max_drop_level = 3, max_drop_level = 3,
groupcaps = tooldef groupcaps = tooldef,
}, },
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},
} }
@ -210,9 +223,6 @@ local function add_ore(modname, description, mineral_name, oredef)
end end
end end
-- Add everything:
local modname = "moreores"
local oredefs = { local oredefs = {
silver = { silver = {
description = "Silver", description = "Silver",
@ -222,17 +232,17 @@ local oredefs = {
clust_num_ores = moreores.silver_ore_per_chunk, clust_num_ores = moreores.silver_ore_per_chunk,
clust_size = moreores.silver_chunk_size, clust_size = moreores.silver_chunk_size,
y_min = moreores.silver_min_depth, y_min = moreores.silver_min_depth,
y_max = moreores.silver_max_depth y_max = moreores.silver_max_depth,
}, },
tools = { tools = {
pick = { pick = {
cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel= 1} cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
}, },
hoe = { hoe = {
uses = 300 uses = 300,
}, },
shovel = { shovel = {
crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel= 1} crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1},
}, },
axe = { axe = {
choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1}, choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1},
@ -241,7 +251,7 @@ local oredefs = {
sword = { sword = {
fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1},
snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1},
choppy = {times = {[3] = 0.80}, uses = 100, maxlevel= 0} choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0},
}, },
}, },
full_punch_interval = 1.0, full_punch_interval = 1.0,
@ -255,17 +265,17 @@ local oredefs = {
clust_num_ores = moreores.mithril_ore_per_chunk, clust_num_ores = moreores.mithril_ore_per_chunk,
clust_size = moreores.mithril_chunk_size, clust_size = moreores.mithril_chunk_size,
y_min = moreores.mithril_min_depth, y_min = moreores.mithril_min_depth,
y_max = moreores.mithril_max_depth y_max = moreores.mithril_max_depth,
}, },
tools = { tools = {
pick = { pick = {
cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2} cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2}
}, },
hoe = { hoe = {
uses = 1000 uses = 1000,
}, },
shovel = { shovel = {
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 2} crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 2},
}, },
axe = { axe = {
choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 2}, choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 2},
@ -274,15 +284,28 @@ local oredefs = {
sword = { sword = {
fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2},
snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 2}, snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 2},
choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0} choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0},
} },
}, },
full_punch_interval = 0.45, full_punch_interval = 0.45,
damage_groups = {fleshy = 9}, damage_groups = {fleshy = 9},
} }
} }
if not default_tin then -- If tin is available in the `default` mod, don't register More Ores' variant of tin
local default_tin
if minetest.registered_items["default:tin_ingot"] then
default_tin = true
else
default_tin = false
end
if default_tin then
minetest.register_alias("moreores:mineral_tin", "default:stone_with_tin")
minetest.register_alias("moreores:tin_lump", "default:tin_lump")
minetest.register_alias("moreores:tin_ingot", "default:tin_ingot")
minetest.register_alias("moreores:tin_block", "default:tinblock")
else
oredefs.tin = { oredefs.tin = {
description = "Tin", description = "Tin",
makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, makes = {ore = true, block = true, lump = true, ingot = true, chest = false},
@ -291,33 +314,12 @@ if not default_tin then
clust_num_ores = moreores.tin_ore_per_chunk, clust_num_ores = moreores.tin_ore_per_chunk,
clust_size = moreores.tin_chunk_size, clust_size = moreores.tin_chunk_size,
y_min = moreores.tin_min_depth, y_min = moreores.tin_min_depth,
y_max = moreores.tin_max_depth y_max = moreores.tin_max_depth,
}, },
tools = {}, tools = {},
} }
end
for orename,def in pairs(oredefs) do -- Bronze has some special cases, because it is made from copper and tin
add_ore(modname, def.description, orename, def)
end
-- Copper rail (special node):
minetest.register_craft({
output = "moreores:copper_rail 24",
recipe = {
{"default:copper_ingot", "", "default:copper_ingot"},
{"default:copper_ingot", "group:stick", "default:copper_ingot"},
{"default:copper_ingot", "", "default:copper_ingot"}
}
})
if default_tin then
minetest.register_alias("moreores:mineral_tin", "default:stone_with_tin")
minetest.register_alias("moreores:tin_lump", "default:tin_lump")
minetest.register_alias("moreores:tin_ingot", "default:tin_ingot")
minetest.register_alias("moreores:tin_block", "default:tinblock")
else
-- Bronze has some special cases, because it is made from copper and tin:
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "default:bronze_ingot 3", output = "default:bronze_ingot 3",
@ -325,11 +327,11 @@ else
"moreores:tin_ingot", "moreores:tin_ingot",
"default:copper_ingot", "default:copper_ingot",
"default:copper_ingot", "default:copper_ingot",
} },
}) })
end end
-- Unique node: -- Copper rail (unique node)
minetest.register_node("moreores:copper_rail", { minetest.register_node("moreores:copper_rail", {
description = S("Copper Rail"), description = S("Copper Rail"),
drawtype = "raillike", drawtype = "raillike",
@ -346,7 +348,14 @@ minetest.register_node("moreores:copper_rail", {
walkable = false, walkable = false,
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, fixed = {
-1/2,
-1/2,
-1/2,
1/2,
-1/2 + 1/16,
1/2,
},
}, },
sounds = default_metal_sounds, sounds = default_metal_sounds,
groups = {bendy = 2, snappy = 1, dig_immediate = 2, rail = 1, connect_to_raillike = 1}, groups = {bendy = 2, snappy = 1, dig_immediate = 2, rail = 1, connect_to_raillike = 1},
@ -363,6 +372,19 @@ minetest.register_node("moreores:copper_rail", {
}, },
}) })
minetest.register_craft({
output = "moreores:copper_rail 24",
recipe = {
{"default:copper_ingot", "", "default:copper_ingot"},
{"default:copper_ingot", "group:stick", "default:copper_ingot"},
{"default:copper_ingot", "", "default:copper_ingot"},
},
})
for orename, def in pairs(oredefs) do
-- Register everything
add_ore("moreores", def.description, orename, def)
end
if minetest.settings:get_bool("log_mods") then if minetest.settings:get_bool("log_mods") then
minetest.log("action", S("[moreores] loaded.")) minetest.log("action", S("[moreores] loaded."))