Add mineclone2, mineclonia and mineclone5 support (#55)

* Added mineclone2 support apart from with mg
* Add Mineclone2 adjustments
* Fix, Ores now spawn in stone in Mineclone2
* Added Bronze ingot recipe and copper rail
* Made ores breakable
* Made tools work with Mineclone2
* Nerf mithril sword to be same as diamond

---------

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
This commit is contained in:
James Clarke 2024-01-15 23:24:12 +00:00 committed by GitHub
parent b20cc8d102
commit 4f7ec3b3ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 192 additions and 57 deletions

View File

@ -3,6 +3,11 @@ unused_args = false
allow_defined_top = true allow_defined_top = true
max_line_length = 90 max_line_length = 90
ignore = {
"default_stone_sounds",
"default_metal_sounds"
}
stds.minetest = { stds.minetest = {
read_globals = { read_globals = {
"DIR_DELIM", "DIR_DELIM",
@ -30,4 +35,5 @@ read_globals = {
"frame", "frame",
"mg", "mg",
"toolranks", "toolranks",
"mcl_sounds"
} }

View File

@ -54,6 +54,25 @@ moreores.mithril_clust_size_high = 3
moreores.mithril_clust_size = 3 moreores.mithril_clust_size = 3
moreores.mithril_clust_size_deep = 3 moreores.mithril_clust_size_deep = 3
if minetest.get_modpath("mcl_core") then
-- Example adjustments for MineClone2
moreores.tin_max_depth_high = 0
moreores.tin_min_depth_high = -10
moreores.tin_max_depth = -11
moreores.tin_min_depth = -57
-- Similar adjustments for silver and mithril
moreores.silver_max_depth_high = 0
moreores.silver_min_depth_high = -10
moreores.silver_max_depth = -11
moreores.silver_min_depth = -57
moreores.mithril_max_depth_high = 0
moreores.mithril_min_depth_high = -20
moreores.mithril_max_depth = -21
moreores.mithril_min_depth = -57
else
-- Maximal and minimal depths of ore generation (Y coordinate, 0 being sea level by default) -- Maximal and minimal depths of ore generation (Y coordinate, 0 being sea level by default)
-- Tin -- Tin
moreores.tin_max_depth_high = 31000 moreores.tin_max_depth_high = 31000
@ -78,3 +97,4 @@ moreores.mithril_max_depth = -2048 -- For v6 mapgen, -256 fits better
moreores.mithril_min_depth = -4095 -- For v6 mapgen, -511 fits better moreores.mithril_min_depth = -4095 -- For v6 mapgen, -511 fits better
moreores.mithril_max_depth_deep = -4096 -- For v6 mapgen, -512 fits better moreores.mithril_max_depth_deep = -4096 -- For v6 mapgen, -512 fits better
moreores.mithril_min_depth_deep = -31000 moreores.mithril_min_depth_deep = -31000
end

165
init.lua
View File

@ -25,11 +25,29 @@ end
-- `frame` support -- `frame` support
local use_frame = minetest.get_modpath("frame") local use_frame = minetest.get_modpath("frame")
local is_mcl_core_present = minetest.get_modpath("mcl_core") ~= nil
local is_mcl_sounds_present = minetest.get_modpath("mcl_sounds") ~= nil
local is_mcl_copper_present = minetest.registered_items["mcl_copper:copper_ingot"] ~= nil
local stone_ingredient = is_mcl_core_present and "mcl_core:stone" or "default:stone"
local copper_ingredient =
is_mcl_core_present and "mcl_copper:copper_ingot" or 'default:copper_ingot'
if is_mcl_sounds_present then
local default_stone_sounds = mcl_sounds.node_sound_stone_defaults()
local default_metal_sounds = mcl_sounds.node_sound_metal_defaults()
else
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()
end
-- Returns the crafting recipe table for a given material and item. -- Returns the crafting recipe table for a given material and item.
local function get_recipe(material, item) local function get_recipe(material, item)
if is_mcl_core_present then
material = material:gsub("default:", "mcl_core:")
end
if item == "sword" then if item == "sword" then
return { return {
{material}, {material},
@ -74,7 +92,12 @@ local function get_recipe(material, item)
end end
end end
local function add_ore(modname, description, mineral_name, oredef) local function add_ore(modname, description, mineral_name, oredef, extra_node_def)
if mineral_name == "copper" and is_mcl_copper_present then
return
end
local img_base = modname .. "_" .. mineral_name local img_base = modname .. "_" .. mineral_name
local toolimg_base = modname .. "_tool_"..mineral_name local toolimg_base = modname .. "_tool_"..mineral_name
local tool_base = modname .. ":" local tool_base = modname .. ":"
@ -83,14 +106,27 @@ local function add_ore(modname, description, mineral_name, oredef)
local ingot = item_base .. "_ingot" local ingot = item_base .. "_ingot"
local lump_item = item_base .. "_lump" local lump_item = item_base .. "_lump"
local function merge_tables(t1, t2)
if t2 then
for k,v in pairs(t2) do t1[k] = v end
end
return t1
end
if oredef.makes.ore then if oredef.makes.ore then
minetest.register_node(modname .. ":mineral_" .. mineral_name, { local node_def_tbl = {
description = S("@1 Ore", S(description)), description = S("@1 Ore", S(description)),
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,
}) }
if extra_node_def then
node_def_tbl = merge_tables(node_def_tbl, extra_node_def)
end
minetest.register_node(modname .. ":mineral_" .. mineral_name, node_def_tbl)
if use_frame then if use_frame then
frame.register(modname .. ":mineral_" .. mineral_name) frame.register(modname .. ":mineral_" .. mineral_name)
@ -153,6 +189,7 @@ local function add_ore(modname, description, mineral_name, oredef)
end end
if oredef.makes.chest then if oredef.makes.chest then
if not is_mcl_core_present then
minetest.register_craft( { minetest.register_craft( {
output = "default:chest_locked", output = "default:chest_locked",
recipe = { recipe = {
@ -160,23 +197,25 @@ local function add_ore(modname, description, mineral_name, oredef)
{"default:chest"}, {"default:chest"},
} }
}) })
minetest.register_craft( { minetest.register_craft( {
output = "default:chest_locked", output = "default:chest_locked",
recipe = get_recipe(ingot, "lockedchest") recipe = get_recipe(ingot, "lockedchest")
}) })
end end
end
oredef.oredef_high.ore_type = "scatter" oredef.oredef_high.ore_type = "scatter"
oredef.oredef_high.ore = modname .. ":mineral_" .. mineral_name oredef.oredef_high.ore = modname .. ":mineral_" .. mineral_name
oredef.oredef_high.wherein = "default:stone" oredef.oredef_high.wherein = stone_ingredient
oredef.oredef.ore_type = "scatter" oredef.oredef.ore_type = "scatter"
oredef.oredef.ore = modname .. ":mineral_" .. mineral_name oredef.oredef.ore = modname .. ":mineral_" .. mineral_name
oredef.oredef.wherein = "default:stone" oredef.oredef.wherein = stone_ingredient
oredef.oredef_deep.ore_type = "scatter" oredef.oredef_deep.ore_type = "scatter"
oredef.oredef_deep.ore = modname .. ":mineral_" .. mineral_name oredef.oredef_deep.ore = modname .. ":mineral_" .. mineral_name
oredef.oredef_deep.wherein = "default:stone" oredef.oredef_deep.wherein = stone_ingredient
minetest.register_ore(oredef.oredef_high) minetest.register_ore(oredef.oredef_high)
minetest.register_ore(oredef.oredef) minetest.register_ore(oredef.oredef)
@ -193,26 +232,46 @@ local function add_ore(modname, description, mineral_name, oredef)
full_punch_interval = oredef.full_punch_interval, full_punch_interval = oredef.full_punch_interval,
}, },
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},
_repair_material = ingot,
_mcl_toollike_wield = true,
mcl_diggroups = tooldef._mcl_diggroups,
groups = tooldef.groups,
} }
if tool_name == "sword" then if tool_name == "sword" then
tdef.description = S("@1 Sword", S(description)) tdef.description = S("@1 Sword", S(description))
if tdef.groups then
tdef.groups = merge_tables(tdef.groups, {sword = 1})
else
tdef.groups = {sword = 1} tdef.groups = {sword = 1}
end end
end
if tool_name == "pick" then if tool_name == "pick" then
tdef.description = S("@1 Pickaxe", S(description)) tdef.description = S("@1 Pickaxe", S(description))
tdef.groups = {pickaxe = 1} if tdef.groups then
tdef.groups = merge_tables(tdef.groups, {pickaxe = 1, tool=1})
else
tdef.groups = {pickaxe = 1, tool=1}
end
end end
if tool_name == "axe" then if tool_name == "axe" then
tdef.description = S("@1 Axe", S(description)) tdef.description = S("@1 Axe", S(description))
tdef.groups = {axe = 1} if tdef.groups then
tdef.groups = merge_tables(tdef.groups, {axe = 1, tool=1})
else
tdef.groups = {axe = 1, tool=1}
end
end end
if tool_name == "shovel" then if tool_name == "shovel" then
tdef.description = S("@1 Shovel", S(description)) tdef.description = S("@1 Shovel", S(description))
tdef.groups = {shovel = 1} if tdef.groups then
tdef.groups = merge_tables(tdef.groups, {shovel = 1, tool=1})
else
tdef.groups = {shovel = 1, tool=1}
end
tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90" tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
end end
@ -286,15 +345,23 @@ local oredefs = {
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},
}, },
damage_groups = {fleshy = 4}, damage_groups = {fleshy = 4},
groups = {dig_speed_class=4, enchantability=14},
_mcl_diggroups = {
pickaxey = { speed = 6, level = 4, uses = 126 }
},
}, },
hoe = { hoe = {
max_uses = 300, max_uses = 150,
}, },
shovel = { shovel = {
groupcaps = { groupcaps = {
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},
}, },
damage_groups = {fleshy = 3}, damage_groups = {fleshy = 3},
groups = {dig_speed_class=4, enchantability=14},
_mcl_diggroups = {
shovely = { speed = 6, level = 4, uses = 126 }
},
}, },
axe = { axe = {
groupcaps = { groupcaps = {
@ -302,6 +369,10 @@ local oredefs = {
fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1}, fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1},
}, },
damage_groups = {fleshy = 5}, damage_groups = {fleshy = 5},
groups = {dig_speed_class=4, enchantability=14},
_mcl_diggroups = {
axey = { speed = 6, level = 4, uses = 126 }
},
}, },
sword = { sword = {
groupcaps = { groupcaps = {
@ -310,9 +381,19 @@ local oredefs = {
choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0}, choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0},
}, },
damage_groups = {fleshy = 6}, damage_groups = {fleshy = 6},
_mcl_diggroups = {
swordy = { speed = 6, level = 4, uses = 126 },
swordy_cobweb = { speed = 6, level = 4, uses = 126 }
},
}, },
}, },
full_punch_interval = 1.0, full_punch_interval = 1.0,
extra_node_def = {
_mcl_blast_resistance = 3,
_mcl_hardness = 4,
_mcl_silk_touch_drop = true,
groups = {pickaxey = 4}
}
}, },
mithril = { mithril = {
description = "Mithril", description = "Mithril",
@ -341,36 +422,58 @@ local oredefs = {
tools = { tools = {
pick = { pick = {
groupcaps = { groupcaps = {
cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3}, cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 3126, maxlevel = 3},
}, },
damage_groups = {fleshy = 6}, damage_groups = {fleshy = 6},
groups = {dig_speed_class=5, enchantability=10},
_mcl_diggroups = {
pickaxey = { speed = 8, level = 5, uses = 3126 }
},
}, },
hoe = { hoe = {
max_uses = 1000, max_uses = 2000,
}, },
shovel = { shovel = {
groupcaps = { groupcaps = {
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3}, crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 3126, maxlevel = 3},
},
damage_groups = {fleshy = 6},
groups = {dig_speed_class=5, enchantability=10},
_mcl_diggroups = {
shovely = { speed = 8, level = 5, uses = 3126 }
}, },
damage_groups = {fleshy = 5},
}, },
axe = { axe = {
groupcaps = { groupcaps = {
choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3}, choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 3126, maxlevel = 3},
fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 3126, maxlevel = 3},
},
damage_groups = {fleshy = 10},
groups = {dig_speed_class=5, enchantability=10},
_mcl_diggroups = {
axey = { speed = 8, level = 5, uses = 3126 }
}, },
damage_groups = {fleshy = 8},
}, },
sword = { sword = {
groupcaps = { groupcaps = {
fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 3126, maxlevel = 3},
snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3}, snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 3126, maxlevel = 3},
choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, choppy = {times = {[3] = 0.80}, uses = 3126, maxlevel = 0},
},
damage_groups = {fleshy = 7},
_mcl_diggroups = {
swordy = { speed = 8, level = 5, uses = 3126 },
swordy_cobweb = { speed = 8, level = 5, uses = 3126 }
}, },
damage_groups = {fleshy = 10},
}, },
}, },
full_punch_interval = 0.45, full_punch_interval = 0.45,
extra_node_def = {
_mcl_blast_resistance = 3,
_mcl_hardness = 5,
_mcl_silk_touch_drop = true,
groups = {pickaxey = 5}
},
} }
} }
@ -413,6 +516,12 @@ else
y_max = moreores.tin_max_depth_deep, y_max = moreores.tin_max_depth_deep,
}, },
tools = {}, tools = {},
extra_node_def = {
_mcl_blast_resistance = 3,
_mcl_hardness = 3,
_mcl_silk_touch_drop = true,
groups = {pickaxey = 3}
},
} }
-- Bronze has some special cases, because it is made from copper and tin -- Bronze has some special cases, because it is made from copper and tin
@ -421,8 +530,8 @@ else
output = "default:bronze_ingot 3", output = "default:bronze_ingot 3",
recipe = { recipe = {
"moreores:tin_ingot", "moreores:tin_ingot",
"default:copper_ingot", copper_ingredient,
"default:copper_ingot", copper_ingredient,
}, },
}) })
end end
@ -446,13 +555,13 @@ end
minetest.register_craft({ minetest.register_craft({
output = "moreores:copper_rail 24", output = "moreores:copper_rail 24",
recipe = { recipe = {
{"default:copper_ingot", "", "default:copper_ingot"}, {copper_ingredient, "", copper_ingredient},
{"default:copper_ingot", "group:stick", "default:copper_ingot"}, {copper_ingredient, "group:stick", copper_ingredient},
{"default:copper_ingot", "", "default:copper_ingot"}, {copper_ingredient, "", copper_ingredient},
}, },
}) })
for orename, def in pairs(oredefs) do for orename, def in pairs(oredefs) do
-- Register everything -- Register everything
add_ore("moreores", def.description, orename, def) add_ore("moreores", def.description, orename, def, def.extra_node_def)
end end

View File

@ -1,5 +1,5 @@
name = moreores name = moreores
description = Adds new ore types. description = Adds new ore types.
depends = default optional_depends = carts,farming,frame,mg,toolranks,mcl_core,mcl_sounds
optional_depends = carts,farming,frame,mg,toolranks
min_minetest_version = 5.0.0 min_minetest_version = 5.0.0
supported_games = mineclone2,mineclonia,minetest_game